Merge pull request #1695 from nestjs/feat/schematics-v14

chore(deps): support angular schematics v14
nestjs · Jul 8, 2022 · e6354e6 · e6354e6
2 parents 07d0278 + d31cd59
commit e6354e6
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 19,265 deletions.
diff --git a/actions/generate.action.ts b/actions/generate.action.ts
@@ -121,10 +121,7 @@ const mapSchematicOptions = (inputs: Input[]): SchematicOption[] => {
   const options: SchematicOption[] = [];
   inputs.forEach((input) => {
     if (!excludedInputNames.includes(input.name) && input.value !== undefined) {
-      const keepInputName = input.options
-        ? 'keepInputNameFormat' in input.options
-        : false;
-      options.push(new SchematicOption(input.name, input.value, keepInputName));
+      options.push(new SchematicOption(input.name, input.value));
     }
   });
   return options;

diff --git a/commands/generate.command.ts b/commands/generate.command.ts
@@ -81,9 +81,6 @@ export class GenerateCommand extends AbstractCommand {
           options.push({
             name: 'skipImport',
             value: command.skipImport,
-            options: {
-              keepInputNameFormat: true,
-            },
           });
 
           const inputs: Input[] = [];

diff --git a/lib/schematics/schematic.option.ts b/lib/schematics/schematic.option.ts
@@ -1,28 +1,26 @@
 import { normalizeToKebabOrSnakeCase } from '../utils/formatting';
 
 export class SchematicOption {
-  constructor(
-    private name: string,
-    private value: boolean | string,
-    private keepInputNameFormat: boolean = false,
-  ) {}
+  constructor(private name: string, private value: boolean | string) {}
+
+  get normalizedName() {
+    return normalizeToKebabOrSnakeCase(this.name);
+  }
 
   public toCommandString(): string {
     if (typeof this.value === 'string') {
       if (this.name === 'name') {
-        return `--${this.name}=${this.format()}`;
+        return `--${this.normalizedName}=${this.format()}`;
       } else if (this.name === 'version' || this.name === 'path') {
-        return `--${this.name}=${this.value}`;
+        return `--${this.normalizedName}=${this.value}`;
       } else {
-        return `--${this.name}="${this.value}"`;
+        return `--${this.normalizedName}="${this.value}"`;
       }
     } else if (typeof this.value === 'boolean') {
-      const str = this.keepInputNameFormat
-        ? this.name
-        : normalizeToKebabOrSnakeCase(this.name);
+      const str = this.normalizedName;
       return this.value ? `--${str}` : `--no-${str}`;
     } else {
-      return `--${normalizeToKebabOrSnakeCase(this.name)}=${this.value}`;
+      return `--${this.normalizedName}=${this.value}`;
     }
   }