refactor(@angular/cli): remove parseJsonFile and add options to parseJson instead

Author: hansl

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

@@ -52,15 +52,21 @@ export async function runCommand(
     }
     const cliDir = dirname(commandMapPath);
     const commandsText = readFileSync(commandMapPath).toString('utf-8');
-    const commandJson = json.parseJsonFile(
+    const commandJson = json.parseJson(
       commandsText,
       JsonParseMode.Loose,
-      commandMapPath,
-    ) as { [name: string]: string };
+      { path: commandMapPath },
+    );
+    if (!isJsonObject(commandJson)) {
+      throw Error('Invalid command.json');
+    }
 
     commands = {};
     for (const commandName of Object.keys(commandJson)) {
-      commands[commandName] = resolve(cliDir, commandJson[commandName]);
+      const commandValue = commandJson[commandName];
+      if (typeof commandValue == 'string') {
+        commands[commandName] = resolve(cliDir, commandValue);
+      }
     }
   }
 
@@ -79,7 +85,7 @@ export async function runCommand(
   for (const name of Object.keys(commands)) {
     const schemaPath = commands[name];
     const schemaContent = readFileSync(schemaPath, 'utf-8');
-    const schema = json.parseJsonFile(schemaContent, JsonParseMode.Loose, schemaPath);
+    const schema = json.parseJson(schemaContent, JsonParseMode.Loose, { path: schemaPath });
     if (!isJsonObject(schema)) {
       throw new Error('Invalid command JSON loaded from ' + JSON.stringify(schemaPath));
     }

packages/angular_devkit/core/src/json/parser.ts

@@ -862,40 +862,48 @@ export function parseJsonAst(input: string, mode = JsonParseMode.Default): JsonA
 
 
 /**
- * Parse a JSON string into its value.  This discards the AST and only returns the value itself.
- * @param input The string to parse.
- * @param mode The mode to parse the input with. {@see JsonParseMode}.
- * @returns {JsonValue} The value represented by the JSON string.
+ * Options for the parseJson() function.
  */
-export function parseJson(input: string, mode = JsonParseMode.Default): JsonValue {
-  // Try parsing for the fastest path available, if error, uses our own parser for better errors.
-  if (mode == JsonParseMode.Strict) {
-    try {
-      return JSON.parse(input);
-    } catch (err) {
-      return parseJsonAst(input, mode).value;
-    }
-  }
-
-  return parseJsonAst(input, mode).value;
+interface ParseJsonOptions {
+  /**
+   * If omitted, will only emit errors related to the content of the JSON. If specified, any
+   * JSON errors will also include the path of the file that caused the error.
+   */
+  path?: string;
 }
 
+
 /**
  * Parse a JSON string into its value.  This discards the AST and only returns the value itself.
- * It also absorbs JSON parsing errors and return a new error with the path in it. Useful for
- * showing errors when parsing from a file.
+ *
+ * If a path option is pass, it also absorbs JSON parsing errors and return a new error with the
+ * path in it. Useful for showing errors when parsing from a file.
+ *
  * @param input The string to parse.
  * @param mode The mode to parse the input with. {@see JsonParseMode}.
+ * @param options Additional optinos for parsing.
  * @returns {JsonValue} The value represented by the JSON string.
  */
-export function parseJsonFile(input: string, mode = JsonParseMode.Default, path: string) {
+export function parseJson(
+  input: string,
+  mode = JsonParseMode.Default,
+  options?: ParseJsonOptions,
+): JsonValue {
   try {
-    return parseJson(input, mode);
+    // Try parsing for the fastest path available, if error, uses our own parser for better errors.
+    if (mode == JsonParseMode.Strict) {
+      try {
+        return JSON.parse(input);
+      } catch (err) {
+        return parseJsonAst(input, mode).value;
+      }
+    }
+
+    return parseJsonAst(input, mode).value;
   } catch (e) {
-    if (e instanceof JsonException) {
-      throw new PathSpecificJsonException(path, e);
-    } else {
-      throw e;
+    if (options && options.path && e instanceof JsonException) {
+      throw new PathSpecificJsonException(options.path, e);
     }
+    throw e;
   }
 }