refactor(@angular/cli): remove silent-error dependency

Author: clydin

package-lock.json

@@ -51,7 +51,6 @@
     "resolve": "^1.1.7",
     "rxjs": "^6.0.0",
     "semver": "^5.3.0",
-    "silent-error": "^1.0.0",
     "symbol-observable": "^1.2.0",
     "yargs-parser": "^10.0.0"
   },

package.json

@@ -6,8 +6,6 @@ import { getPackageManager } from '../utilities/config';
 import { SchematicCommand } from '../models/schematic-command';
 import { NpmInstall } from '../tasks/npm-install';
 
-const SilentError = require('silent-error');
-
 
 export default class AddCommand extends SchematicCommand {
   readonly name = 'add';
@@ -33,10 +31,12 @@ export default class AddCommand extends SchematicCommand {
     const collectionName = options._[0];
 
     if (!collectionName) {
-      throw new SilentError(
+      this.logger.fatal(
         `The "ng ${this.name}" command requires a name argument to be specified eg. `
         + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`
       );
+
+      return false;
     }
 
     return true;
@@ -46,10 +46,12 @@ export default class AddCommand extends SchematicCommand {
     const firstArg = options._[0];
 
     if (!firstArg) {
-      throw new SilentError(
+      this.logger.fatal(
         `The "ng ${this.name}" command requires a name argument to be specified eg. `
         + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`
       );
+
+      return 1;
     }
 
     const packageManager = getPackageManager();
@@ -93,10 +95,12 @@ export default class AddCommand extends SchematicCommand {
       return await this.runSchematic(runOptions);
     } catch (e) {
       if (e instanceof NodePackageDoesNotSupportSchematics) {
-        throw new SilentError(tags.oneLine`
+        this.logger.error(tags.oneLine`
           The package that you are trying to add does not support schematics. You can try using
           a different version of the package or contact the package author to add ng-add support.
         `);
+
+        return 1;
       }
 
       throw e;

packages/@angular/cli/commands/add.ts

@@ -16,8 +16,6 @@ import {
   tags,
 } from '@angular-devkit/core';
 
-const SilentError = require('silent-error');
-
 
 export interface ConfigOptions {
   jsonPath: string;
@@ -188,20 +186,24 @@ export default class ConfigCommand extends Command {
 
     if (options.value == undefined) {
       if (!config) {
-        throw new SilentError('No config found.');
+        this.logger.error('No config found.');
+
+        return 1;
       }
 
-      this.get(config._workspace, options);
+      return this.get(config._workspace, options);
     } else {
-      this.set(options);
+      return this.set(options);
     }
   }
 
   private get(config: experimental.workspace.WorkspaceSchema, options: ConfigOptions) {
     const value = options.jsonPath ? getValueFromPath(config as any, options.jsonPath) : config;
 
     if (value === undefined) {
-      throw new SilentError('Value cannot be found.');
+      this.logger.error('Value cannot be found.');
+
+      return 1;
     } else if (typeof value == 'object') {
       this.logger.info(JSON.stringify(value, null, 2));
     } else {
@@ -228,14 +230,17 @@ export default class ConfigCommand extends Command {
     const result = setValueFromPath(configValue, options.jsonPath, value);
 
     if (result === undefined) {
-      throw new SilentError('Value cannot be found.');
+      this.logger.error('Value cannot be found.');
+
+      return 1;
     }
 
     try {
       validateWorkspace(configValue);
     } catch (error) {
-      this.logger.error(error.message);
-      throw new SilentError();
+      this.logger.fatal(error.message);
+
+      return 1;
     }
 
     const output = JSON.stringify(configValue, null, 2);

packages/@angular/cli/commands/config.ts

@@ -1,21 +1,16 @@
 import {
   Option,
   CommandContext,
-  Command,
   CommandConstructor,
   CommandScope,
   ArgumentStrategy
 } from '../models/command';
-import { logging, normalize, tags } from '@angular-devkit/core';
+import { logging, tags } from '@angular-devkit/core';
 import { camelize } from '@angular-devkit/core/src/utils/strings';
-import { findUp } from '../utilities/find-up';
 import { insideProject } from '../utilities/project';
 
 import * as yargsParser from 'yargs-parser';
-import * as fs from 'fs';
-import { join } from 'path';
 
-const SilentError = require('silent-error');
 
 export interface CommandMap {
   [key: string]: CommandConstructor;
@@ -114,18 +109,57 @@ export async function runCommand(commandMap: CommandMap,
   }
 
   if (options.help) {
-    return await runHelp(command, options);
+    return command.printHelp(options);
   } else {
-    verifyCommandInScope(command, executionScope);
-    verifyWorkspace(
-      command,
-      executionScope,
-      context.project.root,
-      command.allowMissingWorkspace ? logger : null,
-    );
+    if (command.scope !== undefined && command.scope !== CommandScope.everywhere) {
+      if (command.scope !== executionScope) {
+        let errorMessage;
+        if (command.scope === CommandScope.inProject) {
+          errorMessage = `This command can only be run inside of a CLI project.`;
+        } else {
+          errorMessage = `This command can not be run inside of a CLI project.`;
+        }
+        logger.fatal(errorMessage);
+
+        return 1;
+      }
+
+      if (command.scope === CommandScope.inProject) {
+        if (!context.project.configFile) {
+          logger.fatal('Invalid project: missing workspace file.');
+
+          return 1;
+        }
+
+        if (['.angular-cli.json', 'angular-cli.json'].includes(context.project.configFile)) {
+          // --------------------------------------------------------------------------------
+          // If changing this message, please update the same message in
+          // `packages/@angular/cli/bin/ng-update-message.js`
+          const message = tags.stripIndent`
+            The Angular CLI configuration format has been changed, and your existing configuration
+            can be updated automatically by running the following command:
+
+              ng update @angular/cli
+          `;
+
+          logger.warn(message);
+
+          return 1;
+        }
+      }
+    }
+
     delete options.h;
     delete options.help;
-    return await validateAndRunCommand(command, options);
+
+    const isValid = await command.validate(options);
+    if (!isValid) {
+      logger.fatal(`Validation error. Invalid command`);
+
+      return 1;
+    }
+
+    return await command.run(options);
   }
 }
 
@@ -258,86 +292,3 @@ function listAllCommandNames(map: CommandMap): string[] {
       }, [] as string[]),
   );
 }
-
-
-function verifyCommandInScope(command: Command, scope = CommandScope.everywhere): void {
-  if (!command) {
-    return;
-  }
-  if (command.scope !== CommandScope.everywhere) {
-    if (command.scope !== scope) {
-      let errorMessage: string;
-      if (command.scope === CommandScope.inProject) {
-        errorMessage = `This command can only be run inside of a CLI project.`;
-      } else {
-        errorMessage = `This command can not be run inside of a CLI project.`;
-      }
-      throw new SilentError(errorMessage);
-    }
-  }
-}
-
-function verifyWorkspace(
-  command: Command,
-  executionScope: CommandScope,
-  root: string,
-  logger: logging.Logger | null = null,
-): void {
-  if (command.scope === CommandScope.everywhere) {
-    return;
-  }
-  if (executionScope === CommandScope.inProject) {
-    if (fs.existsSync(join(root, 'angular.json'))) {
-      return;
-    }
-    if (fs.existsSync(join(root, '.angular.json'))) {
-      return;
-    }
-
-    // Check if there's an old config file meaning that the project has not been updated
-    const oldConfigFileNames = [
-      normalize('.angular-cli.json'),
-      normalize('angular-cli.json'),
-    ];
-    const oldConfigFilePath = (root && findUp(oldConfigFileNames, root))
-      || findUp(oldConfigFileNames, process.cwd())
-      || findUp(oldConfigFileNames, __dirname);
-
-    // If an old configuration file is found, throw an exception.
-    if (oldConfigFilePath) {
-      // ------------------------------------------------------------------------------------------
-      // If changing this message, please update the same message in
-      // `packages/@angular/cli/bin/ng-update-message.js`
-      const message = tags.stripIndent`
-        The Angular CLI configuration format has been changed, and your existing configuration can
-        be updated automatically by running the following command:
-
-          ng update @angular/cli
-      `;
-
-      if (!logger) {
-        throw new SilentError(message);
-      } else {
-        logger.warn(message);
-        return;
-      }
-    }
-
-    // If no configuration file is found (old or new), throw an exception.
-    throw new SilentError('Invalid project: missing workspace file.');
-  }
-}
-
-// Execute a command's `printHelp`.
-async function runHelp<T>(command: Command<T>, options: T): Promise<void> {
-  return await command.printHelp(options);
-}
-
-// Validate and run a command.
-async function validateAndRunCommand<T>(command: Command<T>, options: T): Promise<number | void> {
-  const isValid = await command.validate(options);
-  if (isValid !== undefined && !isValid) {
-    throw new SilentError(`Validation error. Invalid command`);
-  }
-  return await command.run(options);
-}

packages/@angular/cli/models/command-runner.ts

@@ -39,7 +39,6 @@
     "resolve": "^1.1.7",
     "rxjs": "^6.0.0",
     "semver": "^5.1.0",
-    "silent-error": "^1.0.0",
     "symbol-observable": "^1.2.0",
     "yargs-parser": "^10.0.0"
   },

packages/@angular/cli/package.json

@@ -2,8 +2,6 @@ import { ModuleNotFoundException, resolve } from '@angular-devkit/core/node';
 import { spawn } from 'child_process';
 import { logging, terminal } from '@angular-devkit/core';
 
-const SilentError = require('silent-error');
-
 
 export type NpmInstall = (packageName: string,
                           logger: logging.Logger,
@@ -16,12 +14,6 @@ export default async function (packageName: string,
                                packageManager: string,
                                projectRoot: string,
                                save = true) {
-  if (packageManager === 'default') {
-    packageManager = 'npm';
-  }
-
-  logger.info(terminal.green(`Installing packages for tooling via ${packageManager}.`));
-
   const installArgs: string[] = [];
   switch (packageManager) {
     case 'cnpm':
@@ -34,9 +26,13 @@ export default async function (packageName: string,
       break;
 
     default:
-      throw new SilentError(`Invalid package manager: ${JSON.stringify(packageManager)}.`);
+      packageManager = 'npm';
+      installArgs.push('install', '--quiet');
+      break;
   }
 
+  logger.info(terminal.green(`Installing packages for tooling via ${packageManager}.`));
+
   if (packageName) {
     try {
       // Verify if we need to install the package (it might already be there).

packages/@angular/cli/tasks/npm-install.ts

@@ -20,7 +20,11 @@ import {
   validateOptionsWithSchema
 } from '@angular-devkit/schematics/tools';
 
-const SilentError = require('silent-error');
+export class UnknownCollectionError extends Error {
+  constructor(collectionName: string) {
+    super(`Invalid collection (${collectionName}).`);
+  }
+}
 
 const engineHost = new NodeModulesEngineHost();
 const engine: Engine<FileSystemCollectionDesc, FileSystemSchematicDesc>
@@ -43,8 +47,9 @@ export function getCollection(collectionName: string): Collection<any, any> {
   const collection = engine.createCollection(collectionName);
 
   if (collection === null) {
-    throw new SilentError(`Invalid collection (${collectionName}).`);
+    throw new UnknownCollectionError(collectionName);
   }
+
   return collection;
 }