fix(@angular/cli): on error finding files, show warning

This should not prevent execution, but is useful to know.

Author: hansl

packages/angular/cli/commands/generate-impl.ts

@@ -36,6 +36,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
           schematic.description.path,
           this._workflow.registry,
           schematic.description.schemaJson,
+          this.logger,
         );
       } else {
         continue;

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

@@ -92,12 +92,8 @@ export async function runCommand(
       throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
     }
 
-    commandMap[name] = await parseJsonSchemaToCommandDescription(
-      name,
-      schemaPath,
-      registry,
-      schema,
-    );
+    commandMap[name] =
+      await parseJsonSchemaToCommandDescription(name, schemaPath, registry, schema, logger);
   }
 
   let commandName: string | undefined = undefined;

packages/angular/cli/utilities/json-schema.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import { json } from '@angular-devkit/core';
+import { json, logging } from '@angular-devkit/core';
 import { ExportStringRef } from '@angular-devkit/schematics/tools';
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
@@ -36,6 +36,7 @@ export async function parseJsonSchemaToSubCommandDescription(
   jsonPath: string,
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
+  logger: logging.Logger,
 ): Promise<SubCommandDescription> {
   const options = await parseJsonSchemaToOptions(registry, schema);
 
@@ -61,12 +62,20 @@ export async function parseJsonSchemaToSubCommandDescription(
   let longDescription = '';
   if (typeof schema.$longDescription == 'string' && schema.$longDescription) {
     const ldPath = resolve(dirname(jsonPath), schema.$longDescription);
-    longDescription = readFileSync(ldPath, 'utf-8');
+    try {
+      longDescription = readFileSync(ldPath, 'utf-8');
+    } catch (e) {
+      logger.warn(`File ${ldPath} was not found while constructing the subcommand ${name}.`);
+    }
   }
   let usageNotes = '';
   if (typeof schema.$usageNotes == 'string' && schema.$usageNotes) {
     const unPath = resolve(dirname(jsonPath), schema.$usageNotes);
-    usageNotes = readFileSync(unPath, 'utf-8');
+    try {
+      usageNotes = readFileSync(unPath, 'utf-8');
+    } catch (e) {
+      logger.warn(`File ${unPath} was not found while constructing the subcommand ${name}.`);
+    }
   }
 
   const description = '' + (schema.description === undefined ? '' : schema.description);
@@ -86,8 +95,10 @@ export async function parseJsonSchemaToCommandDescription(
   jsonPath: string,
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
+  logger: logging.Logger,
 ): Promise<CommandDescription> {
-  const subcommand = await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema);
+  const subcommand =
+    await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema, logger);
 
   // Before doing any work, let's validate the implementation.
   if (typeof schema.$impl != 'string') {