refactor(@angular-devkit/schematics-cli): remove usage of removed json parser

Author: alan-agius4

packages/angular_devkit/schematics_cli/blank/factory.ts

@@ -6,21 +6,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {
-  JsonAstObject,
-  JsonObject,
-  JsonValue,
-  Path,
-  normalize,
-  parseJsonAst,
-  strings,
-} from '@angular-devkit/core';
+import { JsonObject, Path, isJsonObject, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
   SchematicsException,
   Tree,
-  UpdateRecorder,
   apply,
   chain,
   mergeWith,
@@ -31,29 +22,6 @@ import {
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema } from './schema';
 
-function appendPropertyInAstObject(
-  recorder: UpdateRecorder,
-  node: JsonAstObject,
-  propertyName: string,
-  value: JsonValue,
-  indent = 4,
-) {
-  const indentStr = '\n' + new Array(indent + 1).join(' ');
-
-  if (node.properties.length > 0) {
-    // Insert comma.
-    const last = node.properties[node.properties.length - 1];
-    recorder.insertRight(last.start.offset + last.text.replace(/\s+$/, '').length, ',');
-  }
-
-  recorder.insertLeft(
-    node.end.offset - 1,
-    '  ' +
-      `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}` +
-      indentStr.slice(0, -2),
-  );
-}
-
 function addSchematicToCollectionJson(
   collectionPath: Path,
   schematicName: string,
@@ -64,26 +32,14 @@ function addSchematicToCollectionJson(
     if (!collectionJsonContent) {
       throw new Error('Invalid collection path: ' + collectionPath);
     }
-    const collectionJsonAst = parseJsonAst(collectionJsonContent.toString('utf-8'));
-    if (collectionJsonAst.kind !== 'object') {
-      throw new Error('Invalid collection content.');
-    }
-
-    for (const property of collectionJsonAst.properties) {
-      if (property.key.value == 'schematics') {
-        if (property.value.kind !== 'object') {
-          throw new Error('Invalid collection.json; schematics needs to be an object.');
-        }
 
-        const recorder = tree.beginUpdate(collectionPath);
-        appendPropertyInAstObject(recorder, property.value, schematicName, description);
-        tree.commitUpdate(recorder);
-
-        return tree;
-      }
+    const collectionJson = JSON.parse(collectionJsonContent.toString());
+    if (!isJsonObject(collectionJson.schematics)) {
+      throw new Error('Invalid collection.json; schematics needs to be an object.');
     }
 
-    throw new Error('Could not find the "schematics" property in collection.json.');
+    collectionJson['schematics'][schematicName] = description;
+    tree.overwrite(collectionPath, JSON.stringify(collectionJson, undefined, 2));
   };
 }
 
@@ -101,9 +57,7 @@ export default function (options: Schema): Rule {
     try {
       const packageJsonContent = tree.read('/package.json');
       if (packageJsonContent) {
-        // In google3 the return value of JSON.parse() must be immediately typed,
-        // otherwise it defaults to `any`, which is prohibited.
-        const packageJson = JSON.parse(packageJsonContent.toString('utf-8')) as {
+        const packageJson = JSON.parse(packageJsonContent.toString()) as {
           schematics: unknown;
         };
         if (typeof packageJson.schematics === 'string') {