refactor(@angular/cli): use isJsonObject helper in to read config

Author: alan-agius4

packages/angular/cli/utilities/config.ts

@@ -11,6 +11,7 @@ import {
   JsonObject,
   JsonParseMode,
   experimental,
+  isJsonObject,
   normalize,
   parseJson,
   parseJsonAst,
@@ -197,7 +198,7 @@ export function migrateLegacyGlobalConfig(): boolean {
     if (existsSync(legacyGlobalConfigPath)) {
       const content = readFileSync(legacyGlobalConfigPath, 'utf-8');
       const legacy = parseJson(content, JsonParseMode.Loose);
-      if (!legacy || typeof legacy != 'object' || Array.isArray(legacy)) {
+      if (!isJsonObject(legacy)) {
         return false;
       }
 
@@ -208,16 +209,13 @@ export function migrateLegacyGlobalConfig(): boolean {
         cli['packageManager'] = legacy.packageManager;
       }
 
-      if (legacy.defaults && typeof legacy.defaults == 'object' && !Array.isArray(legacy.defaults)
-          && legacy.defaults.schematics && typeof legacy.defaults.schematics == 'object'
-          && !Array.isArray(legacy.defaults.schematics)
-          && typeof legacy.defaults.schematics.collection == 'string') {
+      if (isJsonObject(legacy.defaults)
+        && isJsonObject(legacy.defaults.schematics)
+        && typeof legacy.defaults.schematics.collection == 'string') {
         cli['defaultCollection'] = legacy.defaults.schematics.collection;
       }
 
-      if (legacy.warnings && typeof legacy.warnings == 'object'
-          && !Array.isArray(legacy.warnings)) {
-
+      if (isJsonObject(legacy.warnings)) {
         const warnings: JsonObject = {};
         if (typeof legacy.warnings.versionMismatch == 'boolean') {
           warnings['versionMismatch'] = legacy.warnings.versionMismatch;
@@ -249,7 +247,7 @@ function getLegacyPackageManager(): string | null {
       const content = readFileSync(legacyGlobalConfigPath, 'utf-8');
 
       const legacy = parseJson(content, JsonParseMode.Loose);
-      if (!legacy || typeof legacy != 'object' || Array.isArray(legacy)) {
+      if (!isJsonObject(legacy)) {
         return null;
       }
 
@@ -278,7 +276,7 @@ export async function getSchematicDefaults(
       result = { ...result, ...(schematicObject as {}) };
     }
     const collectionObject = workspace.getSchematics()[collection];
-    if (typeof collectionObject == 'object' && !Array.isArray(collectionObject)) {
+    if (isJsonObject(collectionObject)) {
       result = { ...result, ...(collectionObject[schematic] as {}) };
     }
 
@@ -293,7 +291,7 @@ export async function getSchematicDefaults(
         result = { ...result, ...(schematicObject as {}) };
       }
       const collectionObject = workspace.getSchematics()[collection];
-      if (typeof collectionObject == 'object' && !Array.isArray(collectionObject)) {
+      if (isJsonObject(collectionObject)) {
         result = { ...result, ...(collectionObject[schematic] as {}) };
       }
     }
@@ -305,7 +303,7 @@ export async function getSchematicDefaults(
         result = { ...result, ...(schematicObject as {}) };
       }
       const collectionObject = workspace.getProjectSchematics(project)[collection];
-      if (typeof collectionObject == 'object' && !Array.isArray(collectionObject)) {
+      if (isJsonObject(collectionObject)) {
         result = { ...result, ...(collectionObject[schematic] as {}) };
       }
     }
@@ -321,7 +319,7 @@ export async function isWarningEnabled(warning: string): Promise<boolean> {
     const project = getProjectByCwd(workspace);
     if (project && workspace.getProjectCli(project)) {
       const warnings = workspace.getProjectCli(project)['warnings'];
-      if (typeof warnings == 'object' && !Array.isArray(warnings)) {
+      if (isJsonObject(warnings)) {
         const value = warnings[warning];
         if (typeof value == 'boolean') {
           return value;
@@ -330,7 +328,7 @@ export async function isWarningEnabled(warning: string): Promise<boolean> {
     }
     if (workspace.getCli()) {
       const warnings = workspace.getCli()['warnings'];
-      if (typeof warnings == 'object' && !Array.isArray(warnings)) {
+      if (isJsonObject(warnings)) {
         const value = warnings[warning];
         if (typeof value == 'boolean') {
           return value;
@@ -342,7 +340,7 @@ export async function isWarningEnabled(warning: string): Promise<boolean> {
   workspace = await getWorkspace('global');
   if (workspace && workspace.getCli()) {
     const warnings = workspace.getCli()['warnings'];
-    if (typeof warnings == 'object' && !Array.isArray(warnings)) {
+    if (isJsonObject(warnings)) {
       const value = warnings[warning];
       if (typeof value == 'boolean') {
         return value;