include prettier ignore in format command

electrovir · Oct 19, 2021 · 81e48cc · 81e48cc
1 parent faad1a3
commit 81e48cc
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "virmator",
-    "version": "1.3.6",
+    "version": "1.3.7",
     "description": "Handle all the stuffs in one package.",
     "keywords": [
         "automation",

diff --git a/src/cli/cli.test.ts b/src/cli/cli.test.ts
@@ -234,6 +234,10 @@ testGroup({
         runTest({
             description: 'verify that format config is created',
             expect: [
+                {
+                    name: 'previous config exists',
+                    result: false,
+                },
                 {
                     name: 'previous config exists',
                     result: false,
@@ -250,6 +254,10 @@ testGroup({
                     name: 'config was created',
                     result: true,
                 },
+                {
+                    name: 'config was created',
+                    result: true,
+                },
                 {
                     name: 'second format has stderr',
                     result: false,
@@ -258,6 +266,10 @@ testGroup({
                     name: 'config exists after cleanup',
                     result: false,
                 },
+                {
+                    name: 'config exists after cleanup',
+                    result: false,
+                },
                 {
                     name: 'symlink exists after cleanup',
                     result: false,
@@ -269,6 +281,10 @@ testGroup({
                         testFormatPaths.validRepo,
                         getRepoConfigFilePath(ConfigKey.Prettier, false),
                     ),
+                    join(
+                        testFormatPaths.validRepo,
+                        getRepoConfigFilePath(ConfigKey.PrettierIgnore, false),
+                    ),
                 ]),
         });
 
@@ -283,6 +299,10 @@ testGroup({
                     name: 'previous config exists',
                     result: false,
                 },
+                {
+                    name: 'previous config exists',
+                    result: false,
+                },
                 {
                     name: 'symlink was created',
                     result: true,
@@ -299,6 +319,10 @@ testGroup({
                     name: 'config was created',
                     result: true,
                 },
+                {
+                    name: 'config was created',
+                    result: true,
+                },
                 {
                     name: 'second format has stderr',
                     result: false,
@@ -311,6 +335,10 @@ testGroup({
                     name: 'config exists after cleanup',
                     result: false,
                 },
+                {
+                    name: 'config exists after cleanup',
+                    result: false,
+                },
                 {
                     name: 'symlink exists after cleanup',
                     result: false,
@@ -326,6 +354,10 @@ testGroup({
                         testFormatPaths.validRepo,
                         getExtendableBaseConfigName(ConfigKey.Prettier),
                     ),
+                    join(
+                        testFormatPaths.validRepo,
+                        getRepoConfigFilePath(ConfigKey.PrettierIgnore, false),
+                    ),
                 ]),
         });
 
@@ -340,6 +372,10 @@ testGroup({
                     name: 'previous config exists',
                     result: false,
                 },
+                {
+                    name: 'previous config exists',
+                    result: false,
+                },
                 {
                     name: 'symlink was created',
                     result: true,
@@ -352,6 +388,10 @@ testGroup({
                     name: 'config was created',
                     result: true,
                 },
+                {
+                    name: 'config was created',
+                    result: true,
+                },
                 {
                     name: 'second format has stderr',
                     result: false,
@@ -360,6 +400,10 @@ testGroup({
                     name: 'config exists after cleanup',
                     result: false,
                 },
+                {
+                    name: 'config exists after cleanup',
+                    result: false,
+                },
                 {
                     name: 'symlink exists after cleanup',
                     result: false,
@@ -402,6 +446,10 @@ module.exports = {...baseConfig, printWidth: 80};`;
                                 testFormatPaths.validRepo,
                                 getExtendableBaseConfigName(ConfigKey.Prettier),
                             ),
+                            join(
+                                testFormatPaths.validRepo,
+                                getRepoConfigFilePath(ConfigKey.PrettierIgnore, false),
+                            ),
                         ],
                     )),
                 );

diff --git a/src/cli/commands/implementations/format.command.ts b/src/cli/commands/implementations/format.command.ts
@@ -66,7 +66,7 @@ export const formatImplementation: CliCommandImplementation = {
                     ${packageName} ${CliCommandName.Format} --ignore-path .prettierignore
                     ${packageName} ${CliCommandName.Format} ${FormatOperation.Write}  --ignore-path .prettierignore
                     ${packageName} ${CliCommandName.Format} ${FormatOperation.Write}  --ignore-path .prettierignore ${filesMarkerArg} md json`,
-    configKeys: [ConfigKey.Prettier],
+    configKeys: [ConfigKey.Prettier, ConfigKey.PrettierIgnore],
     implementation: runFormatCommand,
     configFlagSupport: {
         [CliFlagName.NoWriteConfig]: true,

diff --git a/src/cli/commands/run-command.ts b/src/cli/commands/run-command.ts
@@ -23,7 +23,7 @@ export async function runCommand(
     const defaultFlagSupport = {
         [CliFlagName.Silent]: true,
         [CliFlagName.Help]: true,
-        [CliFlagName.ExtendableConfig]: !!commandImplementation.configKeys?.every((configKey) =>
+        [CliFlagName.ExtendableConfig]: !!commandImplementation.configKeys?.some((configKey) =>
             isExtendableConfig(configKey),
         ),
     };

diff --git a/src/cli/config/config-key.ts b/src/cli/config/config-key.ts
@@ -6,7 +6,6 @@ export enum BareConfigKey {
     GitHubActionsPrerelease = 'GitHubActionsPrerelease',
     GitIgnore = 'GitIgnore',
     NpmIgnore = 'NpmIgnore',
-    PrettierIgnore = 'PrettierIgnore',
     VsCodeSettings = 'VsCodeSettings',
 }
 
@@ -16,6 +15,7 @@ export enum CommandConfigKey {
     Prettier = 'Prettier',
     TsConfig = 'TsConfig',
     PackageJson = 'PackageJson',
+    PrettierIgnore = 'PrettierIgnore',
 }
 
 export const ConfigKey = {...CommandConfigKey, ...BareConfigKey};

diff --git a/src/cli/config/copy-config.ts b/src/cli/config/copy-config.ts
@@ -58,7 +58,7 @@ export async function copyConfig({
         });
     }
 
-    if (shouldExtend) {
+    if (shouldExtend && isExtendableConfig(configKey)) {
         if (!isExtendableConfig(configKey)) {
             throw new ConfigFileError(`Extendable config files are not supported for ${configKey}`);
         }