@angular/cli 14.0.0-rc.0 → 14.0.0-rc.1

package/lib/cli/index.js

@@ -73,7 +73,7 @@ async function default_1(options) {
             // Log nothing.
         }
         else {
-            logger.fatal('An unexpected error occurred: ' + JSON.stringify(err));
+            logger.fatal(`An unexpected error occurred: ${'toString' in err ? err.toString() : JSON.stringify(err)}`);
         }
         return 1;
     }

package/lib/init.js

@@ -120,7 +120,7 @@ const version_1 = require("../src/utilities/version");
     });
 })
     .then((exitCode) => {
-    process.exit(exitCode);
+    process.exitCode = exitCode;
 })
     .catch((err) => {
     // eslint-disable-next-line  no-console

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.0.0-rc.0",
+  "version": "14.0.0-rc.1",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,10 +25,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1400.0-rc.0",
-    "@angular-devkit/core": "14.0.0-rc.0",
-    "@angular-devkit/schematics": "14.0.0-rc.0",
-    "@schematics/angular": "14.0.0-rc.0",
+    "@angular-devkit/architect": "0.1400.0-rc.1",
+    "@angular-devkit/core": "14.0.0-rc.1",
+    "@angular-devkit/schematics": "14.0.0-rc.1",
+    "@schematics/angular": "14.0.0-rc.1",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
     "debug": "4.3.4",
@@ -49,12 +49,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.0.0-rc.0",
-      "@angular-devkit/architect": "0.1400.0-rc.0",
-      "@angular-devkit/build-angular": "14.0.0-rc.0",
-      "@angular-devkit/build-webpack": "0.1400.0-rc.0",
-      "@angular-devkit/core": "14.0.0-rc.0",
-      "@angular-devkit/schematics": "14.0.0-rc.0"
+      "@angular/cli": "14.0.0-rc.1",
+      "@angular-devkit/architect": "0.1400.0-rc.1",
+      "@angular-devkit/build-angular": "14.0.0-rc.1",
+      "@angular-devkit/build-webpack": "0.1400.0-rc.1",
+      "@angular-devkit/core": "14.0.0-rc.1",
+      "@angular-devkit/schematics": "14.0.0-rc.1"
     }
   },
   "engines": {

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

@@ -40,6 +40,7 @@ exports.SchematicsCommandModule = exports.DEFAULT_SCHEMATICS_COLLECTION = void 0
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
+const path_1 = require("path");
 const config_1 = require("../utilities/config");
 const memoize_1 = require("../utilities/memoize");
 const tty_1 = require("../utilities/tty");
@@ -209,16 +210,20 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
     }
     async getSchematicCollections() {
         var _a;
+        // Resolve relative collections from the location of `angular.json`
+        const resolveRelativeCollection = (collectionName) => collectionName.charAt(0) === '.'
+            ? (0, path_1.resolve)(this.context.root, collectionName)
+            : collectionName;
         const getSchematicCollections = (configSection) => {
             if (!configSection) {
                 return undefined;
             }
             const { schematicCollections, defaultCollection } = configSection;
             if (Array.isArray(schematicCollections)) {
-                return new Set(schematicCollections);
+                return new Set(schematicCollections.map((c) => resolveRelativeCollection(c)));
             }
             else if (typeof defaultCollection === 'string') {
-                return new Set([defaultCollection]);
+                return new Set([resolveRelativeCollection(defaultCollection)]);
             }
             return undefined;
         };
@@ -275,11 +280,11 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
             if (err instanceof schematics_1.UnsuccessfulWorkflowExecution) {
                 // "See above" because we already printed the error.
                 logger.fatal('The Schematic workflow failed. See above.');
-                return 1;
             }
             else {
-                throw err;
+                logger.fatal(err.message);
             }
+            return 1;
         }
         finally {
             unsubscribe();

package/src/commands/completion/cli.js

@@ -41,6 +41,13 @@ Appended \`source <(ng completion script)\` to \`${rcFile}\`. Restart your termi
 
     ${color_1.colors.yellow('source <(ng completion script)')}
       `.trim());
+        if ((await (0, completion_1.hasGlobalCliInstall)()) === false) {
+            this.context.logger.warn('Setup completed successfully, but there does not seem to be a global install of the' +
+                ' Angular CLI. For autocompletion to work, the CLI will need to be on your `$PATH`, which' +
+                ' is typically done with the `-g` flag in `npm install -g @angular/cli`.' +
+                '\n\n' +
+                'For more information, see https://angular.io/cli/completion#global-install');
+        }
         return 0;
     }
 }

package/src/commands/completion/long-description.md

@@ -1,5 +1,73 @@
-To enable Bash and Zsh real-time type-ahead autocompletion, run
-`ng completion` and restart your terminal.
+Setting up autocompletion configures your terminal, so pressing the `<TAB>` key while in the middle
+of typing will display various commands and options available to you. This makes it very easy to
+discover and use CLI commands without lots of memorization.
 
-Alternatively, append `source <(ng completion script)` to the appropriate `.bashrc`,
-`.bash_profile`, `.zshrc`, `.zsh_profile`, or `.profile` file.
+![A demo of Angular CLI autocompletion in a terminal. The user types several partial `ng` commands,
+using autocompletion to finish several arguments and list contextual options.
+](/generated/images/guide/cli/completion.gif)
+
+## Automated setup
+
+The CLI should prompt and ask to set up autocompletion for you the first time you use it (v14+).
+Simply answer "Yes" and the CLI will take care of the rest.
+
+```
+$ ng serve
+? Would you like to enable autocompletion? This will set up your terminal so pressing TAB while
+typing Angular CLI commands will show possible options and autocomplete arguments. (Enabling
+autocompletion will modify configuration files in your home directory.) Yes
+Appended `source <(ng completion script)` to `/home/my-username/.bashrc`. Restart your terminal or
+run:
+
+source <(ng completion script)
+
+to autocomplete `ng` commands.
+
+# Serve output...
+```
+
+If you already refused the prompt, it won't ask again. But you can run `ng completion` to
+do the same thing automatically.
+
+This modifies your terminal environment to load Angular CLI autocompletion, but can't update your
+current terminal session. Either restart it or run `source <(ng completion script)` directly to
+enable autocompletion in your current session.
+
+Test it out by typing `ng ser<TAB>` and it should autocomplete to `ng serve`. Ambiguous arguments
+will show all possible options and their documentation, such as `ng generate <TAB>`.
+
+## Manual setup
+
+Some users may have highly customized terminal setups, possibly with configuration files checked
+into source control with an opinionated structure. `ng completion` only ever appends Angular's setup
+to an existing configuration file for your current shell, or creates one if none exists. If you want
+more control over exactly where this configuration lives, you can manually set it up by having your
+shell run at startup:
+
+```bash
+source <(ng completion script)
+```
+
+This is equivalent to what `ng completion` will automatically set up, and gives power users more
+flexibility in their environments when desired.
+
+## Platform support
+
+Angular CLI supports autocompletion for the Bash and Zsh shells on MacOS and Linux operating
+systems.
+
+Windows does not support autocompletion in native shells, such as Cmd and Powershell. However,
+the Angular CLI supports Git Bash and
+[Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/) using Bash or Zsh.
+
+## Global install
+
+Autocompletion works by configuring your terminal to invoke the Angular CLI on startup to load the
+setup script. This means the terminal must be able to find and execute the Angular CLI, typically
+through a global install that places the binary on the user's `$PATH`. If you get
+`command not found: ng`, make sure the CLI is installed globally which you can do with the `-g`
+flag:
+
+```bash
+npm install -g @angular/cli
+```

package/src/commands/doc/cli.js

@@ -93,8 +93,8 @@ class DocCommandModule extends command_module_1.CommandModule {
             catch { }
         }
         await (0, open_1.default)(options.search
-            ? `https://${domain}/api?query=${options.keyword}`
-            : `https://${domain}/docs?search=${options.keyword}`);
+            ? `https://${domain}/docs?search=${options.keyword}`
+            : `https://${domain}/api?query=${options.keyword}`);
     }
 }
 exports.DocCommandModule = DocCommandModule;

package/src/commands/update/cli.js

@@ -584,8 +584,9 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                     }
                 }
                 const result = await this.executeMigrations(workflow, migration.package, migrations, migration.from, migration.to, options.createCommits);
-                if (!result) {
-                    return 0;
+                // A non-zero value is a failure for the package's migrations
+                if (result !== 0) {
+                    return result;
                 }
             }
         }

package/src/utilities/completion.d.ts

@@ -20,3 +20,11 @@ export declare function considerSettingUpAutocompletion(command: string, logger:
  * @return The full path of the configuration file modified.
  */
 export declare function initializeAutocomplete(): Promise<string>;
+/**
+ * Returns whether the user has a global CLI install or `undefined` if this can't be determined.
+ * Execution from `npx` is *not* considered a global CLI install.
+ *
+ * This does *not* mean the current execution is from a global CLI install, only that a global
+ * install exists on the system.
+ */
+export declare function hasGlobalCliInstall(): Promise<boolean | undefined>;

package/src/utilities/completion.js

@@ -30,8 +30,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initializeAutocomplete = exports.considerSettingUpAutocompletion = void 0;
+exports.hasGlobalCliInstall = exports.initializeAutocomplete = exports.considerSettingUpAutocompletion = void 0;
 const core_1 = require("@angular-devkit/core");
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const process_1 = require("process");
@@ -80,6 +81,13 @@ Appended \`source <(ng completion script)\` to \`${rcFile}\`. Restart your termi
 
     ${color_1.colors.yellow(`source <(ng completion script)`)}
     `.trim());
+    if ((await hasGlobalCliInstall()) === false) {
+        logger.warn('Setup completed successfully, but there does not seem to be a global install of the' +
+            ' Angular CLI. For autocompletion to work, the CLI will need to be on your `$PATH`, which' +
+            ' is typically done with the `-g` flag in `npm install -g @angular/cli`.' +
+            '\n\n' +
+            'For more information, see https://angular.io/cli/completion#global-install');
+    }
     // Save configuration to remember that the user was prompted.
     await setCompletionConfig({ ...completionConfig, prompted: true });
     return undefined;
@@ -136,6 +144,11 @@ async function shouldPromptForAutocompletionSetup(command, config) {
     if (!rcFiles) {
         return false; // Unknown shell.
     }
+    // Don't prompt if the user is missing a global CLI install. Autocompletion won't work after setup
+    // anyway and could be annoying for users running one-off commands via `npx` or using `npm start`.
+    if ((await hasGlobalCliInstall()) === false) {
+        return false;
+    }
     // Check each RC file if they already use `ng completion script` in any capacity and don't prompt.
     for (const rcFile of rcFiles) {
         const contents = await fs_1.promises.readFile(rcFile, 'utf-8').catch(() => undefined);
@@ -217,3 +230,53 @@ function getShellRunCommandCandidates(shell, home) {
         return undefined;
     }
 }
+/**
+ * Returns whether the user has a global CLI install or `undefined` if this can't be determined.
+ * Execution from `npx` is *not* considered a global CLI install.
+ *
+ * This does *not* mean the current execution is from a global CLI install, only that a global
+ * install exists on the system.
+ */
+async function hasGlobalCliInstall() {
+    var _a;
+    // List all binaries with the `ng` name on the user's `$PATH`.
+    const proc = (0, child_process_1.execFile)('which', ['-a', 'ng']);
+    let stdout = '';
+    (_a = proc.stdout) === null || _a === void 0 ? void 0 : _a.addListener('data', (content) => {
+        stdout += content;
+    });
+    const exitCode = await new Promise((resolve) => {
+        proc.addListener('exit', (exitCode) => {
+            resolve(exitCode);
+        });
+    });
+    switch (exitCode) {
+        case 0:
+            // Successfully listed all `ng` binaries on the `$PATH`. Look for at least one line which is a
+            // global install. We can't easily identify global installs, but local installs are typically
+            // placed in `node_modules/.bin` by NPM / Yarn. `npx` also currently caches files at
+            // `~/.npm/_npx/*/node_modules/.bin/`, so the same logic applies.
+            const lines = stdout.split('\n').filter((line) => line !== '');
+            const hasGlobalInstall = lines.some((line) => {
+                // A binary is a local install if it is a direct child of a `node_modules/.bin/` directory.
+                const parent = path.parse(path.parse(line).dir);
+                const grandparent = path.parse(parent.dir);
+                const localInstall = grandparent.base === 'node_modules' && parent.base === '.bin';
+                return !localInstall;
+            });
+            return hasGlobalInstall;
+        case 1:
+            // No instances of `ng` on the user's `$PATH`.
+            return false;
+        case null:
+            // `which` was killed by a signal and did not exit gracefully. Maybe it hung or something else
+            // went very wrong, so treat this as inconclusive.
+            return undefined;
+        default:
+            // `which` returns exit code 2 if an invalid option is specified and `-a` doesn't appear to be
+            // supported on all systems. Other exit codes mean unknown errors occurred. Can't tell whether
+            // CLI is globally installed, so treat this as inconclusive.
+            return undefined;
+    }
+}
+exports.hasGlobalCliInstall = hasGlobalCliInstall;