@angular-devkit/architect-cli 0.1400.0-next.2 → 0.1400.0-next.5

package/bin/architect.js

@@ -26,9 +26,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 });
 const architect_1 = require("@angular-devkit/architect");
 const node_1 = require("@angular-devkit/architect/node");
@@ -36,9 +33,9 @@ const core_1 = require("@angular-devkit/core");
 const node_2 = require("@angular-devkit/core/node");
 const ansiColors = __importStar(require("ansi-colors"));
 const fs_1 = require("fs");
-const minimist_1 = __importDefault(require("minimist"));
 const path = __importStar(require("path"));
 const operators_1 = require("rxjs/operators");
+const yargs_parser_1 = __importStar(require("yargs-parser"));
 const progress_1 = require("../src/progress");
 function findUp(names, from) {
     if (!Array.isArray(names)) {
@@ -86,15 +83,21 @@ async function _executeTarget(parentLogger, workspace, root, argv, registry) {
     const architectHost = new node_1.WorkspaceNodeModulesArchitectHost(workspace, root);
     const architect = new architect_1.Architect(architectHost, registry);
     // Split a target into its parts.
-    const targetStr = argv._.shift() || '';
-    const [project, target, configuration] = targetStr.split(':');
+    const { _: [targetStr = ''], help, ...options } = argv;
+    const [project, target, configuration] = targetStr.toString().split(':');
     const targetSpec = { project, target, configuration };
-    delete argv['help'];
     const logger = new core_1.logging.Logger('jobs');
     const logs = [];
     logger.subscribe((entry) => logs.push({ ...entry, message: `${entry.name}: ` + entry.message }));
-    const { _, ...options } = argv;
-    const run = await architect.scheduleTarget(targetSpec, options, { logger });
+    // Camelize options as yargs will return the object in kebab-case when camel casing is disabled.
+    const camelCasedOptions = {};
+    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)}?`);
+        }
+        camelCasedOptions[(0, yargs_parser_1.camelCase)(key)] = value;
+    }
+    const run = await architect.scheduleTarget(targetSpec, camelCasedOptions, { logger });
     const bars = new progress_1.MultiProgressBar(':name :bar (:current/:total) :status');
     run.progress.subscribe((update) => {
         const data = bars.get(update.id) || {
@@ -103,7 +106,7 @@ async function _executeTarget(parentLogger, workspace, root, argv, registry) {
             target: update.target,
             status: update.status || '',
             name: ((update.target ? _targetStringFromTarget(update.target) : update.builder.name) +
-                ' '.repeat(80)).substr(0, 40),
+                ' '.repeat(80)).substring(0, 40),
         };
         if (update.status !== undefined) {
             data.status = update.status;
@@ -158,7 +161,15 @@ async function _executeTarget(parentLogger, workspace, root, argv, registry) {
 }
 async function main(args) {
     /** Parse the command line. */
-    const argv = (0, minimist_1.default)(args, { boolean: ['help'] });
+    const argv = (0, yargs_parser_1.default)(args, {
+        boolean: ['help'],
+        configuration: {
+            'dot-notation': false,
+            'boolean-negation': true,
+            'strip-aliased': true,
+            'camel-case-expansion': false,
+        },
+    });
     /** Create the DevKit Logger used through the CLI. */
     const logger = (0, node_2.createConsoleLogger)(argv['verbose'], process.stdout, process.stderr, {
         info: (s) => s,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-devkit/architect-cli",
-  "version": "0.1400.0-next.2",
+  "version": "0.1400.0-next.5",
   "description": "Angular Architect CLI",
   "homepage": "https://github.com/angular/angular-cli",
   "experimental": true,
@@ -19,20 +19,20 @@
     "tooling"
   ],
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-next.2",
-    "@angular-devkit/core": "14.0.0-next.2",
+    "@angular-devkit/architect": "0.1400.0-next.5",
+    "@angular-devkit/core": "14.0.0-next.5",
     "ansi-colors": "4.1.1",
-    "minimist": "1.2.5",
     "progress": "2.0.3",
     "rxjs": "6.6.7",
-    "symbol-observable": "4.0.0"
+    "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/src/progress.d.ts

@@ -10,7 +10,9 @@ export declare class MultiProgressBar<Key, T> {
     private _status;
     private _stream;
     private _bars;
-    constructor(_status: string, _stream?: NodeJS.WriteStream);
+    constructor(_status: string, _stream?: NodeJS.WriteStream & {
+        fd: 2;
+    });
     private _add;
     complete(id: Key): void;
     add(id: Key, data: T): void;