@angular-devkit/schematics-cli 14.0.0-next.3 → 14.0.0-next.6

package/bin/schematics.js

@@ -9,7 +9,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -26,9 +30,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.main = void 0;
 // symbol polyfill must go first
@@ -39,7 +40,7 @@ const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const ansiColors = __importStar(require("ansi-colors"));
 const inquirer = __importStar(require("inquirer"));
-const minimist_1 = __importDefault(require("minimist"));
+const yargs_parser_1 = __importStar(require("yargs-parser"));
 /**
  * Parse the name of schematic passed in argument, and return a {collection, schematic} named
  * tuple. The user can pass in `collection-name:schematic-name`, and this function will either
@@ -57,10 +58,11 @@ const minimist_1 = __importDefault(require("minimist"));
 function parseSchematicName(str) {
     let collection = '@angular-devkit/schematics-cli';
     let schematic = str;
-    if (schematic && schematic.indexOf(':') != -1) {
+    if (schematic === null || schematic === void 0 ? void 0 : schematic.includes(':')) {
+        const lastIndexOfColon = schematic.lastIndexOf(':');
         [collection, schematic] = [
-            schematic.slice(0, schematic.lastIndexOf(':')),
-            schematic.substring(schematic.lastIndexOf(':') + 1),
+            schematic.slice(0, lastIndexOfColon),
+            schematic.substring(lastIndexOfColon + 1),
         ];
     }
     return { collection, schematic };
@@ -117,32 +119,32 @@ function _createPromptProvider() {
 }
 // eslint-disable-next-line max-lines-per-function
 async function main({ args, stdout = process.stdout, stderr = process.stderr, }) {
-    const argv = parseArgs(args);
+    const { cliOptions, schematicOptions, _ } = parseArgs(args);
     // Create a separate instance to prevent unintended global changes to the color configuration
     // Create function is not defined in the typings. See: https://github.com/doowb/ansi-colors/pull/44
     const colors = ansiColors.create();
     /** Create the DevKit Logger used through the CLI. */
-    const logger = (0, node_1.createConsoleLogger)(argv['verbose'], stdout, stderr, {
+    const logger = (0, node_1.createConsoleLogger)(!!cliOptions.verbose, stdout, stderr, {
         info: (s) => s,
         debug: (s) => s,
         warn: (s) => colors.bold.yellow(s),
         error: (s) => colors.bold.red(s),
         fatal: (s) => colors.bold.red(s),
     });
-    if (argv.help) {
+    if (cliOptions.help) {
         logger.info(getUsage());
         return 0;
     }
     /** Get the collection an schematic name from the first argument. */
-    const { collection: collectionName, schematic: schematicName } = parseSchematicName(argv._.shift() || null);
+    const { collection: collectionName, schematic: schematicName } = parseSchematicName(_.shift() || null);
     const isLocalCollection = collectionName.startsWith('.') || collectionName.startsWith('/');
     /** Gather the arguments for later use. */
-    const debugPresent = argv['debug'] !== null;
-    const debug = debugPresent ? !!argv['debug'] : isLocalCollection;
-    const dryRunPresent = argv['dry-run'] !== null;
-    const dryRun = dryRunPresent ? !!argv['dry-run'] : debug;
-    const force = argv['force'];
-    const allowPrivate = argv['allow-private'];
+    const debugPresent = cliOptions.debug !== null;
+    const debug = debugPresent ? !!cliOptions.debug : isLocalCollection;
+    const dryRunPresent = cliOptions['dry-run'] !== null;
+    const dryRun = dryRunPresent ? !!cliOptions['dry-run'] : debug;
+    const force = !!cliOptions.force;
+    const allowPrivate = !!cliOptions['allow-private'];
     /** Create the workflow scoped to the working directory that will be executed with this run. */
     const workflow = new tools_1.NodeWorkflow(process.cwd(), {
         force,
@@ -151,7 +153,7 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
         schemaValidation: true,
     });
     /** If the user wants to list schematics, we simply show all the schematic names. */
-    if (argv['list-schematics']) {
+    if (cliOptions['list-schematics']) {
         return _listSchematics(workflow, collectionName, logger);
     }
     if (!schematicName) {
@@ -216,35 +218,12 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
             error = false;
         }
     });
-    /**
-     * Remove every options from argv that we support in schematics itself.
-     */
-    const parsedArgs = Object.assign({}, argv);
-    delete parsedArgs['--'];
-    for (const key of booleanArgs) {
-        delete parsedArgs[key];
-    }
-    /**
-     * Add options from `--` to args.
-     */
-    const argv2 = (0, minimist_1.default)(argv['--']);
-    for (const key of Object.keys(argv2)) {
-        parsedArgs[key] = argv2[key];
-    }
     // Show usage of deprecated options
     workflow.registry.useXDeprecatedProvider((msg) => logger.warn(msg));
     // Pass the rest of the arguments as the smart default "argv". Then delete it.
-    workflow.registry.addSmartDefaultProvider('argv', (schema) => {
-        if ('index' in schema) {
-            return argv._[Number(schema['index'])];
-        }
-        else {
-            return argv._;
-        }
-    });
-    delete parsedArgs._;
+    workflow.registry.addSmartDefaultProvider('argv', (schema) => 'index' in schema ? _[Number(schema['index'])] : _);
     // Add prompts.
-    if (argv['interactive'] && isTTY()) {
+    if (cliOptions.interactive && isTTY()) {
         workflow.registry.usePromptProvider(_createPromptProvider());
     }
     /**
@@ -260,7 +239,7 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
             .execute({
             collection: collectionName,
             schematic: schematicName,
-            options: parsedArgs,
+            options: schematicOptions,
             allowPrivate: allowPrivate,
             debug: debug,
             logger: logger,
@@ -280,10 +259,10 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
             logger.fatal('The Schematic workflow failed. See above.');
         }
         else if (debug) {
-            logger.fatal('An error occured:\n' + err.stack);
+            logger.fatal(`An error occured:\n${err.stack}`);
         }
         else {
-            logger.fatal(err.stack || err.message);
+            logger.fatal(`Error: ${err.message}`);
         }
         return 1;
     }
@@ -294,7 +273,7 @@ exports.main = main;
  */
 function getUsage() {
     return core_1.tags.stripIndent `
-  schematics [CollectionName:]SchematicName [options, ...]
+  schematics [collection-name:]schematic-name [options, ...]
 
   By default, if the collection name is not specified, use the internal collection provided
   by the Schematics CLI.
@@ -325,33 +304,51 @@ function getUsage() {
 }
 /** Parse the command line. */
 const booleanArgs = [
-    'allowPrivate',
     'allow-private',
     'debug',
     'dry-run',
-    'dryRun',
     'force',
     'help',
     'list-schematics',
-    'listSchematics',
     'verbose',
     'interactive',
 ];
+/** Parse the command line. */
 function parseArgs(args) {
-    return (0, minimist_1.default)(args, {
+    const { _, ...options } = (0, yargs_parser_1.default)(args, {
         boolean: booleanArgs,
-        alias: {
-            'dryRun': 'dry-run',
-            'listSchematics': 'list-schematics',
-            'allowPrivate': 'allow-private',
-        },
         default: {
             'interactive': true,
             'debug': null,
-            'dryRun': null,
+            'dry-run': null,
+        },
+        configuration: {
+            'dot-notation': false,
+            'boolean-negation': true,
+            'strip-aliased': true,
+            'camel-case-expansion': false,
         },
-        '--': true,
     });
+    // Camelize options as yargs will return the object in kebab-case when camel casing is disabled.
+    const schematicOptions = {};
+    const cliOptions = {};
+    const isCliOptions = (key) => booleanArgs.includes(key);
+    for (const [key, value] of Object.entries(options)) {
+        if (/[A-Z]/.test(key)) {
+            throw new Error(`Unknown argument ${key}. Did you mean ${(0, yargs_parser_1.decamelize)(key)}?`);
+        }
+        if (isCliOptions(key)) {
+            cliOptions[key] = value;
+        }
+        else {
+            schematicOptions[(0, yargs_parser_1.camelCase)(key)] = value;
+        }
+    }
+    return {
+        _: _.map((v) => v.toString()),
+        schematicOptions,
+        cliOptions,
+    };
 }
 function isTTY() {
     const isTruthy = (value) => {

package/blank/project-files/package.json

@@ -15,10 +15,10 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "typescript": "~4.5.2"
+    "typescript": "~4.6.2"
   },
   "devDependencies": {
-    "@types/node": "^12.11.1",
+    "@types/node": "^14.15.0",
     "@types/jasmine": "~3.10.0",
     "jasmine": "^4.0.0"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/schematics-cli",
-  "version": "14.0.0-next.3",
+  "version": "14.0.0-next.6",
   "description": "Angular Schematics - CLI",
   "homepage": "https://github.com/angular/angular-cli",
   "bin": {
@@ -21,19 +21,19 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "14.0.0-next.3",
-    "@angular-devkit/schematics": "14.0.0-next.3",
+    "@angular-devkit/core": "14.0.0-next.6",
+    "@angular-devkit/schematics": "14.0.0-next.6",
     "ansi-colors": "4.1.1",
-    "inquirer": "8.2.0",
-    "minimist": "1.2.5",
-    "symbol-observable": "4.0.0"
+    "inquirer": "8.2.1",
+    "symbol-observable": "4.0.0",
+    "yargs-parser": "21.0.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.20.0 || ^14.15.0 || >=16.10.0",
+    "node": "^14.15.0 || >=16.10.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/schematic/files/package.json

@@ -15,10 +15,10 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "typescript": "~4.5.2"
+    "typescript": "~4.6.2"
   },
   "devDependencies": {
-    "@types/node": "^12.11.1",
+    "@types/node": "^14.15.0",
     "@types/jasmine": "~3.10.0",
     "jasmine": "~4.0.0"
   }