@angular/cli 14.0.0-next.5 → 14.0.0-next.8

package/src/analytics/analytics.js

@@ -8,7 +8,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];
@@ -29,13 +33,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAnalytics = exports.getSharedAnalytics = exports.getWorkspaceAnalytics = exports.hasWorkspaceAnalyticsConfiguration = exports.getGlobalAnalytics = exports.hasGlobalAnalyticsConfiguration = exports.promptProjectAnalytics = exports.promptGlobalAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = exports.AnalyticsProperties = void 0;
+exports.getAnalyticsInfoString = exports.createAnalytics = exports.getSharedAnalytics = exports.getAnalytics = exports.promptAnalytics = exports.setAnalyticsConfig = exports.isPackageNameSafeForAnalytics = exports.analyticsPackageSafelist = exports.AnalyticsProperties = void 0;
 const core_1 = require("@angular-devkit/core");
 const debug_1 = __importDefault(require("debug"));
-const inquirer = __importStar(require("inquirer"));
 const uuid_1 = require("uuid");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
+const environment_options_1 = require("../utilities/environment-options");
 const tty_1 = require("../utilities/tty");
 const version_1 = require("../utilities/version");
 const analytics_collector_1 = require("./analytics-collector");
@@ -51,12 +55,10 @@ exports.AnalyticsProperties = {
         }
         const v = version_1.VERSION.full;
         // The logic is if it's a full version then we should use the prod GA property.
-        if (/^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0') {
-            _defaultAngularCliPropertyCache = exports.AnalyticsProperties.AngularCliProd;
-        }
-        else {
-            _defaultAngularCliPropertyCache = exports.AnalyticsProperties.AngularCliStaging;
-        }
+        _defaultAngularCliPropertyCache =
+            /^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0'
+                ? exports.AnalyticsProperties.AngularCliProd
+                : exports.AnalyticsProperties.AngularCliStaging;
         return _defaultAngularCliPropertyCache;
     },
 };
@@ -82,10 +84,11 @@ function isPackageNameSafeForAnalytics(name) {
 exports.isPackageNameSafeForAnalytics = isPackageNameSafeForAnalytics;
 /**
  * Set analytics settings. This does not work if the user is not inside a project.
- * @param level Which config to use. "global" for user-level, and "local" for project-level.
+ * @param global Which config to use. "global" for user-level, and "local" for project-level.
  * @param value Either a user ID, true to generate a new User ID, or false to disable analytics.
  */
-function setAnalyticsConfig(level, value) {
+function setAnalyticsConfig(global, value) {
+    const level = global ? 'global' : 'local';
     analyticsDebug('setting %s level analytics to: %s', level, value);
     const [config, configPath] = (0, config_1.getWorkspaceRaw)(level);
     if (!config || !configPath) {
@@ -108,84 +111,36 @@ exports.setAnalyticsConfig = setAnalyticsConfig;
  * @param force Whether to ask regardless of whether or not the user is using an interactive shell.
  * @return Whether or not the user was shown a prompt.
  */
-async function promptGlobalAnalytics(force = false) {
-    analyticsDebug('prompting global analytics.');
-    if (force || (0, tty_1.isTTY)()) {
-        const answers = await inquirer.prompt([
-            {
-                type: 'confirm',
-                name: 'analytics',
-                message: core_1.tags.stripIndents `
-          Would you like to share anonymous usage data with the Angular Team at Google under
-          Google’s Privacy Policy at https://policies.google.com/privacy? For more details and
-          how to change this setting, see https://angular.io/analytics.
-        `,
-                default: false,
-            },
-        ]);
-        setAnalyticsConfig('global', answers.analytics);
-        if (answers.analytics) {
-            console.log('');
-            console.log(core_1.tags.stripIndent `
-        Thank you for sharing anonymous usage data. If you change your mind, the following
-        command will disable this feature entirely:
-
-            ${color_1.colors.yellow('ng analytics off')}
-      `);
-            console.log('');
-            // Send back a ping with the user `optin`.
-            const ua = new analytics_collector_1.AnalyticsCollector(exports.AnalyticsProperties.AngularCliDefault, 'optin');
-            ua.pageview('/telemetry/optin');
-            await ua.flush();
-        }
-        else {
-            // Send back a ping with the user `optout`. This is the only thing we send.
-            const ua = new analytics_collector_1.AnalyticsCollector(exports.AnalyticsProperties.AngularCliDefault, 'optout');
-            ua.pageview('/telemetry/optout');
-            await ua.flush();
-        }
-        return true;
-    }
-    else {
-        analyticsDebug('Either STDOUT or STDIN are not TTY and we skipped the prompt.');
-    }
-    return false;
-}
-exports.promptGlobalAnalytics = promptGlobalAnalytics;
-/**
- * Prompt the user for usage gathering permission for the local project. Fails if there is no
- * local workspace.
- * @param force Whether to ask regardless of whether or not the user is using an interactive shell.
- * @return Whether or not the user was shown a prompt.
- */
-async function promptProjectAnalytics(force = false) {
+async function promptAnalytics(global, force = false) {
     analyticsDebug('prompting user');
-    const [config, configPath] = (0, config_1.getWorkspaceRaw)('local');
+    const level = global ? 'global' : 'local';
+    const [config, configPath] = (0, config_1.getWorkspaceRaw)(level);
     if (!config || !configPath) {
-        throw new Error(`Could not find a local workspace. Are you in a project?`);
+        throw new Error(`Could not find a ${level} workspace. Are you in a project?`);
     }
     if (force || (0, tty_1.isTTY)()) {
-        const answers = await inquirer.prompt([
+        const { prompt } = await Promise.resolve().then(() => __importStar(require('inquirer')));
+        const answers = await prompt([
             {
                 type: 'confirm',
                 name: 'analytics',
                 message: core_1.tags.stripIndents `
           Would you like to share anonymous usage data about this project with the Angular Team at
-          Google under Google’s Privacy Policy at https://policies.google.com/privacy? For more
+          Google under Google’s Privacy Policy at https://policies.google.com/privacy. For more
           details and how to change this setting, see https://angular.io/analytics.
 
         `,
                 default: false,
             },
         ]);
-        setAnalyticsConfig('local', answers.analytics);
+        setAnalyticsConfig(global, answers.analytics);
         if (answers.analytics) {
             console.log('');
             console.log(core_1.tags.stripIndent `
         Thank you for sharing anonymous usage data. Should you change your mind, the following
         command will disable this feature entirely:
 
-            ${color_1.colors.yellow('ng analytics project off')}
+            ${color_1.colors.yellow(`ng analytics disable${global ? ' --global' : ''}`)}
       `);
             console.log('');
             // Send back a ping with the user `optin`.
@@ -199,109 +154,34 @@ async function promptProjectAnalytics(force = false) {
             ua.pageview('/telemetry/project/optout');
             await ua.flush();
         }
+        process.stderr.write(await getAnalyticsInfoString());
         return true;
     }
     return false;
 }
-exports.promptProjectAnalytics = promptProjectAnalytics;
-async function hasGlobalAnalyticsConfiguration() {
-    try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('global');
-        const analyticsConfig = globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
-        if (analyticsConfig !== null && analyticsConfig !== undefined) {
-            return true;
-        }
-    }
-    catch { }
-    return false;
-}
-exports.hasGlobalAnalyticsConfiguration = hasGlobalAnalyticsConfiguration;
+exports.promptAnalytics = promptAnalytics;
 /**
- * Get the global analytics object for the user. This returns an instance of UniversalAnalytics,
- * or undefined if analytics are disabled.
+ * Get the analytics object for the user.
  *
- * If any problem happens, it is considered the user has been opting out of analytics.
+ * @returns
+ * - `AnalyticsCollector` when enabled.
+ * - `analytics.NoopAnalytics` when disabled.
+ * - `undefined` when not configured.
  */
-async function getGlobalAnalytics() {
-    analyticsDebug('getGlobalAnalytics');
-    const propertyId = exports.AnalyticsProperties.AngularCliDefault;
-    if ('NG_CLI_ANALYTICS' in process.env) {
-        if (process.env['NG_CLI_ANALYTICS'] == 'false' || process.env['NG_CLI_ANALYTICS'] == '') {
-            analyticsDebug('NG_CLI_ANALYTICS is false');
-            return undefined;
-        }
-        if (process.env['NG_CLI_ANALYTICS'] === 'ci') {
-            analyticsDebug('Running in CI mode');
-            return new analytics_collector_1.AnalyticsCollector(propertyId, 'ci');
-        }
-    }
-    // If anything happens we just keep the NOOP analytics.
-    try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('global');
-        const analyticsConfig = globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
-        analyticsDebug('Client Analytics config found: %j', analyticsConfig);
-        if (analyticsConfig === false) {
-            analyticsDebug('Analytics disabled. Ignoring all analytics.');
-            return undefined;
-        }
-        else if (analyticsConfig === undefined || analyticsConfig === null) {
-            analyticsDebug('Analytics settings not found. Ignoring all analytics.');
-            // globalWorkspace can be null if there is no file. analyticsConfig would be null in this
-            // case. Since there is no file, the user hasn't answered and the expected return value is
-            // undefined.
-            return undefined;
-        }
-        else {
-            let uid = undefined;
-            if (typeof analyticsConfig == 'string') {
-                uid = analyticsConfig;
-            }
-            else if (typeof analyticsConfig == 'object' && typeof analyticsConfig['uid'] == 'string') {
-                uid = analyticsConfig['uid'];
-            }
-            analyticsDebug('client id: %j', uid);
-            if (uid == undefined) {
-                return undefined;
-            }
-            return new analytics_collector_1.AnalyticsCollector(propertyId, uid);
-        }
-    }
-    catch (err) {
-        analyticsDebug('Error happened during reading of analytics config: %s', err.message);
-        return undefined;
-    }
-}
-exports.getGlobalAnalytics = getGlobalAnalytics;
-async function hasWorkspaceAnalyticsConfiguration() {
-    try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('local');
-        const analyticsConfig = globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
-        if (analyticsConfig !== undefined) {
-            return true;
-        }
+async function getAnalytics(level) {
+    analyticsDebug('getAnalytics');
+    if (environment_options_1.analyticsDisabled) {
+        analyticsDebug('NG_CLI_ANALYTICS is false');
+        return new core_1.analytics.NoopAnalytics();
     }
-    catch { }
-    return false;
-}
-exports.hasWorkspaceAnalyticsConfiguration = hasWorkspaceAnalyticsConfiguration;
-/**
- * Get the workspace analytics object for the user. This returns an instance of AnalyticsCollector,
- * or undefined if analytics are disabled.
- *
- * If any problem happens, it is considered the user has been opting out of analytics.
- */
-async function getWorkspaceAnalytics() {
-    analyticsDebug('getWorkspaceAnalytics');
     try {
-        const globalWorkspace = await (0, config_1.getWorkspace)('local');
-        const analyticsConfig = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.getCli()['analytics'];
+        const workspace = await (0, config_1.getWorkspace)(level);
+        const analyticsConfig = workspace === null || workspace === void 0 ? void 0 : workspace.getCli()['analytics'];
         analyticsDebug('Workspace Analytics config found: %j', analyticsConfig);
         if (analyticsConfig === false) {
-            analyticsDebug('Analytics disabled. Ignoring all analytics.');
-            return undefined;
+            return new core_1.analytics.NoopAnalytics();
         }
         else if (analyticsConfig === undefined || analyticsConfig === null) {
-            analyticsDebug('Analytics settings not found. Ignoring all analytics.');
             return undefined;
         }
         else {
@@ -324,19 +204,16 @@ async function getWorkspaceAnalytics() {
         return undefined;
     }
 }
-exports.getWorkspaceAnalytics = getWorkspaceAnalytics;
+exports.getAnalytics = getAnalytics;
 /**
  * Return the usage analytics sharing setting, which is either a property string (GA-XXXXXXX-XX),
  * or undefined if no sharing.
  */
 async function getSharedAnalytics() {
     analyticsDebug('getSharedAnalytics');
-    const envVarName = 'NG_CLI_ANALYTICS_SHARE';
-    if (envVarName in process.env) {
-        if (process.env[envVarName] == 'false' || process.env[envVarName] == '') {
-            analyticsDebug('NG_CLI_ANALYTICS is false');
-            return undefined;
-        }
+    if (environment_options_1.analyticsShareDisabled) {
+        analyticsDebug('NG_CLI_ANALYTICS is false');
+        return undefined;
     }
     // If anything happens we just keep the NOOP analytics.
     try {
@@ -357,33 +234,71 @@ async function getSharedAnalytics() {
 }
 exports.getSharedAnalytics = getSharedAnalytics;
 async function createAnalytics(workspace, skipPrompt = false) {
-    let config = await getGlobalAnalytics();
-    // If in workspace and global analytics is enabled, defer to workspace level
-    if (workspace && config) {
-        const skipAnalytics = skipPrompt ||
-            (process.env['NG_CLI_ANALYTICS'] &&
-                (process.env['NG_CLI_ANALYTICS'].toLowerCase() === 'false' ||
-                    process.env['NG_CLI_ANALYTICS'] === '0'));
-        // TODO: This should honor the `no-interactive` option.
-        //       It is currently not an `ng` option but rather only an option for specific commands.
-        //       The concept of `ng`-wide options are needed to cleanly handle this.
-        if (!skipAnalytics && !(await hasWorkspaceAnalyticsConfiguration())) {
-            await promptProjectAnalytics();
+    // Global config takes precedence over local config only for the disabled check.
+    // IE:
+    // global: disabled & local: enabled = disabled
+    // global: id: 123 & local: id: 456 = 456
+    var _a;
+    // check global
+    const globalConfig = await getAnalytics('global');
+    if (globalConfig instanceof core_1.analytics.NoopAnalytics) {
+        return globalConfig;
+    }
+    let config = globalConfig;
+    // Not disabled globally, check locally or not set globally and command is run outside of workspace example: `ng new`
+    if (workspace || globalConfig === undefined) {
+        const level = workspace ? 'local' : 'global';
+        let localOrGlobalConfig = await getAnalytics(level);
+        if (localOrGlobalConfig === undefined) {
+            if (!skipPrompt) {
+                // config is unset, prompt user.
+                // TODO: This should honor the `no-interactive` option.
+                // It is currently not an `ng` option but rather only an option for specific commands.
+                // The concept of `ng`-wide options are needed to cleanly handle this.
+                await promptAnalytics(!workspace /** global */);
+                localOrGlobalConfig = await getAnalytics(level);
+            }
+        }
+        if (localOrGlobalConfig instanceof core_1.analytics.NoopAnalytics) {
+            return localOrGlobalConfig;
+        }
+        else if (localOrGlobalConfig) {
+            // Favor local settings over global when defined.
+            config = localOrGlobalConfig;
         }
-        config = await getWorkspaceAnalytics();
     }
+    // Get shared analytics
+    // TODO: evalute if this should be completly removed.
     const maybeSharedAnalytics = await getSharedAnalytics();
     if (config && maybeSharedAnalytics) {
         return new core_1.analytics.MultiAnalytics([config, maybeSharedAnalytics]);
     }
-    else if (config) {
-        return config;
+    return (_a = config !== null && config !== void 0 ? config : maybeSharedAnalytics) !== null && _a !== void 0 ? _a : new core_1.analytics.NoopAnalytics();
+}
+exports.createAnalytics = createAnalytics;
+function analyticsConfigValueToHumanFormat(value) {
+    if (value === false) {
+        return 'disabled';
     }
-    else if (maybeSharedAnalytics) {
-        return maybeSharedAnalytics;
+    else if (typeof value === 'string' || value === true) {
+        return 'enabled';
     }
     else {
-        return new core_1.analytics.NoopAnalytics();
+        return 'not set';
     }
 }
-exports.createAnalytics = createAnalytics;
+async function getAnalyticsInfoString() {
+    const [globalWorkspace] = (0, config_1.getWorkspaceRaw)('global');
+    const [localWorkspace] = (0, config_1.getWorkspaceRaw)('local');
+    const globalSetting = globalWorkspace === null || globalWorkspace === void 0 ? void 0 : globalWorkspace.get(['cli', 'analytics']);
+    const localSetting = localWorkspace === null || localWorkspace === void 0 ? void 0 : localWorkspace.get(['cli', 'analytics']);
+    const analyticsInstance = await createAnalytics(!!localWorkspace /** workspace */, true /** skipPrompt */);
+    return (core_1.tags.stripIndents `
+    Global setting: ${analyticsConfigValueToHumanFormat(globalSetting)}
+    Local setting: ${localWorkspace
+        ? analyticsConfigValueToHumanFormat(localSetting)
+        : 'No local workspace configuration file.'}
+    Effective status: ${analyticsInstance instanceof core_1.analytics.NoopAnalytics ? 'disabled' : 'enabled'}
+  ` + '\n');
+}
+exports.getAnalyticsInfoString = getAnalyticsInfoString;

package/src/command-builder/architect-base-command-module.d.ts

@@ -9,10 +9,14 @@ import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { CommandModule, CommandModuleImplementation, CommandScope, OtherOptions } from './command-module';
 import { Option } from './utilities/json-schema';
+export interface MissingTargetChoice {
+    name: string;
+    value: string;
+}
 export declare abstract class ArchitectBaseCommandModule<T> extends CommandModule<T> implements CommandModuleImplementation<T> {
     static scope: CommandScope;
     protected shouldReportAnalytics: boolean;
-    protected readonly missingErrorTarget: string | undefined;
+    protected readonly missingTargetChoices: MissingTargetChoice[] | undefined;
     protected runSingleTarget(target: Target, options: OtherOptions): Promise<number>;
     private _architectHost;
     protected getArchitectHost(): WorkspaceNodeModulesArchitectHost;
@@ -20,4 +24,7 @@ export declare abstract class ArchitectBaseCommandModule<T> extends CommandModul
     protected getArchitect(): Architect;
     protected getArchitectTargetOptions(target: Target): Promise<Option[]>;
     private warnOnMissingNodeModules;
+    protected getArchitectTarget(): string;
+    protected onMissingTarget(defaultMessage: string): Promise<1>;
+    private getMissingTargetPackageToInstall;
 }

package/src/command-builder/architect-base-command-module.js

@@ -11,10 +11,12 @@ exports.ArchitectBaseCommandModule = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const node_1 = require("@angular-devkit/architect/node");
 const core_1 = require("@angular-devkit/core");
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const analytics_1 = require("../analytics/analytics");
-const package_manager_1 = require("../utilities/package-manager");
+const prompt_1 = require("../utilities/prompt");
+const tty_1 = require("../utilities/tty");
 const command_module_1 = require("./command-module");
 const json_schema_1 = require("./utilities/json-schema");
 class ArchitectBaseCommandModule extends command_module_1.CommandModule {
@@ -23,14 +25,13 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
         this.shouldReportAnalytics = false;
     }
     async runSingleTarget(target, options) {
-        var _a;
         const architectHost = await this.getArchitectHost();
         let builderName;
         try {
             builderName = await architectHost.getBuilderNameForTarget(target);
         }
         catch (e) {
-            throw new command_module_1.CommandModuleError((_a = this.missingErrorTarget) !== null && _a !== void 0 ? _a : e.message);
+            return this.onMissingTarget(e.message);
         }
         await this.reportAnalytics({
             ...(await architectHost.getOptionsForTarget(target)),
@@ -74,14 +75,14 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
         }
         catch (e) {
             if (e.code === 'MODULE_NOT_FOUND') {
-                await this.warnOnMissingNodeModules();
+                this.warnOnMissingNodeModules();
                 throw new command_module_1.CommandModuleError(`Could not find the '${builderConf}' builder's node package.`);
             }
             throw e;
         }
         return (0, json_schema_1.parseJsonSchemaToOptions)(new core_1.json.schema.CoreSchemaRegistry(), builderDesc.optionSchema, true);
     }
-    async warnOnMissingNodeModules() {
+    warnOnMissingNodeModules() {
         var _a;
         const basePath = (_a = this.context.workspace) === null || _a === void 0 ? void 0 : _a.basePath;
         if (!basePath) {
@@ -97,8 +98,61 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
             (0, fs_1.existsSync)((0, path_1.resolve)(basePath, '.pnp.mjs'))) {
             return;
         }
-        const packageManager = await (0, package_manager_1.getPackageManager)(basePath);
-        this.context.logger.warn(`Node packages may not be installed. Try installing with '${packageManager} install'.`);
+        this.context.logger.warn(`Node packages may not be installed. Try installing with '${this.context.packageManager} install'.`);
+    }
+    getArchitectTarget() {
+        return this.commandName;
+    }
+    async onMissingTarget(defaultMessage) {
+        const { logger } = this.context;
+        const choices = this.missingTargetChoices;
+        if (!(choices === null || choices === void 0 ? void 0 : choices.length)) {
+            logger.error(defaultMessage);
+            return 1;
+        }
+        const missingTargetMessage = `Cannot find "${this.getArchitectTarget()}" target for the specified project.\n` +
+            `You can add a package that implements these capabilities.\n\n` +
+            `For example:\n` +
+            choices.map(({ name, value }) => `  ${name}: ng add ${value}`).join('\n') +
+            '\n';
+        if ((0, tty_1.isTTY)()) {
+            // Use prompts to ask the user if they'd like to install a package.
+            logger.warn(missingTargetMessage);
+            const packageToInstall = await this.getMissingTargetPackageToInstall(choices);
+            if (packageToInstall) {
+                // Example run: `ng add @angular-eslint/schematics`.
+                const binPath = (0, path_1.resolve)(__dirname, '../../bin/ng.js');
+                const { error } = (0, child_process_1.spawnSync)(process.execPath, [binPath, 'add', packageToInstall], {
+                    stdio: 'inherit',
+                });
+                if (error) {
+                    throw error;
+                }
+            }
+        }
+        else {
+            // Non TTY display error message.
+            logger.error(missingTargetMessage);
+        }
+        return 1;
+    }
+    async getMissingTargetPackageToInstall(choices) {
+        if (choices.length === 1) {
+            // Single choice
+            const { name, value } = choices[0];
+            if (await (0, prompt_1.askConfirmation)(`Would you like to add ${name} now?`, true, false)) {
+                return value;
+            }
+            return null;
+        }
+        // Multiple choice
+        return (0, prompt_1.askQuestion)(`Would you like to add a package with "${this.getArchitectTarget()}" capabilities now?`, [
+            {
+                name: 'No',
+                value: null,
+            },
+            ...choices,
+        ], 0, null);
     }
 }
 exports.ArchitectBaseCommandModule = ArchitectBaseCommandModule;

package/src/command-builder/architect-command-module.d.ts

@@ -17,6 +17,5 @@ export declare abstract class ArchitectCommandModule extends ArchitectBaseComman
     builder(argv: Argv): Promise<Argv<ArchitectCommandArgs>>;
     run(options: Options<ArchitectCommandArgs> & OtherOptions): Promise<number | void>;
     private getArchitectProject;
-    private getArchitectTarget;
     private getProjectNamesByTarget;
 }

package/src/command-builder/architect-command-module.js

@@ -6,8 +6,16 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArchitectCommandModule = void 0;
+const config_1 = require("../utilities/config");
+const memoize_1 = require("../utilities/memoize");
 const architect_base_command_module_1 = require("./architect-base-command-module");
 const command_module_1 = require("./command-module");
 class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBaseCommandModule {
@@ -38,7 +46,6 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         return this.addSchemaOptionsToCommand(localYargs, schemaOptions);
     }
     async run(options) {
-        var _a;
         const target = this.getArchitectTarget();
         const { configuration = '', project, ...architectOptions } = options;
         if (!project) {
@@ -47,7 +54,7 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
             let result = 0;
             const projectNames = this.getProjectNamesByTarget(target);
             if (!projectNames) {
-                throw new command_module_1.CommandModuleError((_a = this.missingErrorTarget) !== null && _a !== void 0 ? _a : 'Cannot determine project or target for command.');
+                return this.onMissingTarget('Cannot determine project or target for command.');
             }
             for (const project of projectNames) {
                 result |= await this.runSingleTarget({ configuration, target, project }, architectOptions);
@@ -74,9 +81,6 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
         const projectFromTarget = this.getProjectNamesByTarget(target);
         return (projectFromTarget === null || projectFromTarget === void 0 ? void 0 : projectFromTarget.length) ? projectFromTarget[0] : undefined;
     }
-    getArchitectTarget() {
-        return this.commandName;
-    }
     getProjectNamesByTarget(target) {
         const workspace = this.getWorkspaceOrThrow();
         const allProjectsForTargetName = [];
@@ -93,18 +97,18 @@ class ArchitectCommandModule extends architect_base_command_module_1.ArchitectBa
             return allProjectsForTargetName;
         }
         else {
-            // For single target commands, we try the default project first,
-            // then the full list if it has a single project, then error out.
-            const maybeDefaultProject = workspace.extensions['defaultProject'];
-            if (typeof maybeDefaultProject === 'string' &&
-                allProjectsForTargetName.includes(maybeDefaultProject)) {
-                return [maybeDefaultProject];
-            }
             if (allProjectsForTargetName.length === 1) {
                 return allProjectsForTargetName;
             }
+            const maybeProject = (0, config_1.getProjectByCwd)(workspace);
+            if (maybeProject && allProjectsForTargetName.includes(maybeProject)) {
+                return [maybeProject];
+            }
         }
         return undefined;
     }
 }
+__decorate([
+    memoize_1.memoize
+], ArchitectCommandModule.prototype, "getProjectNamesByTarget", null);
 exports.ArchitectCommandModule = ArchitectCommandModule;

package/src/command-builder/command-module.d.ts

@@ -8,6 +8,7 @@
 import { analytics, logging } from '@angular-devkit/core';
 import { ArgumentsCamelCase, Argv, CamelCaseKey, CommandModule as YargsCommandModule } from 'yargs';
 import { AngularWorkspace } from '../utilities/config';
+import { PackageManagerUtils } from '../utilities/package-manager';
 import { Option } from './utilities/json-schema';
 export declare type Options<T> = {
     [key in keyof T as CamelCaseKey<key>]: T[key];
@@ -24,12 +25,15 @@ export interface CommandContext {
     currentDirectory: string;
     root: string;
     workspace?: AngularWorkspace;
+    globalConfiguration?: AngularWorkspace;
     logger: logging.Logger;
+    packageManager: PackageManagerUtils;
     /** Arguments parsed in free-from without parser configuration. */
     args: {
         positional: string[];
         options: {
             help: boolean;
+            jsonHelp: boolean;
         } & Record<string, unknown>;
     };
 }
@@ -52,7 +56,7 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
     abstract readonly command: string;
     abstract readonly describe: string | false;
     abstract readonly longDescriptionPath?: string;
-    protected shouldReportAnalytics: boolean;
+    protected readonly shouldReportAnalytics: boolean;
     static scope: CommandScope;
     private readonly optionsWithAnalytics;
     constructor(context: CommandContext);
@@ -68,7 +72,6 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
     abstract run(options: Options<T> & OtherOptions): Promise<number | void> | number | void;
     handler(args: ArgumentsCamelCase<T> & OtherOptions): Promise<void>;
     reportAnalytics(options: (Options<T> & OtherOptions) | OtherOptions, paths?: string[], dimensions?: (boolean | number | string)[]): Promise<void>;
-    private _analytics;
     protected getAnalytics(): Promise<analytics.Analytics>;
     /**
      * Adds schema options to a command also this keeps track of options that are required for analytics.