refactor(@angular/cli): improve analytics handling

packages/angular/cli/src/command-builder/command-module.ts

@@ -89,7 +89,10 @@ export abstract class CommandModule<T extends {} = {}> implements CommandModuleI
   protected readonly shouldReportAnalytics: boolean = true;
   readonly scope: CommandScope = CommandScope.Both;
 
-  private readonly optionsWithAnalytics = new Map<string, string>();
+  private readonly optionsWithAnalytics = new Map<
+    string,
+    EventCustomDimension | EventCustomMetric
+  >();
 
   constructor(protected readonly context: CommandContext) {}
 
@@ -236,12 +239,16 @@ export abstract class CommandModule<T extends {} = {}> implements CommandModuleI
     ]);
 
     for (const [name, ua] of this.optionsWithAnalytics) {
+      if (!validEventCustomDimensionAndMetrics.has(ua)) {
+        continue;
+      }
+
       const value = options[name];
-      if (
-        (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') &&
-        validEventCustomDimensionAndMetrics.has(ua as EventCustomDimension | EventCustomMetric)
-      ) {
-        parameters[ua as EventCustomDimension | EventCustomMetric] = value;
+      if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+        parameters[ua] = value;
+      } else if (Array.isArray(value)) {
+        // GA doesn't allow array as values.
+        parameters[ua] = value.sort().join(', ');
       }
     }
 

packages/angular/cli/src/command-builder/schematics-command-module.ts

@@ -204,11 +204,13 @@ export abstract class SchematicsCommandModule
                     ? {
                         name: item,
                         value: item,
+                        checked: item === definition.default,
                       }
                     : {
                         ...item,
                         name: item.label,
                         value: item.value,
+                        checked: item.value === definition.default,
                       },
                 ),
               });

packages/angular/cli/src/command-builder/utilities/json-schema.ts

@@ -8,6 +8,7 @@
 
 import { json, strings } from '@angular-devkit/core';
 import type { Arguments, Argv, PositionalOptions, Options as YargsOptions } from 'yargs';
+import { EventCustomDimension } from '../../analytics/analytics-parameters';
 
 /**
  * An option description.
@@ -280,10 +281,10 @@ export function addSchemaOptionsToCommand<T>(
   localYargs: Argv<T>,
   options: Option[],
   includeDefaultValues: boolean,
-): Map<string, string> {
+): Map<string, EventCustomDimension> {
   const booleanOptionsWithNoPrefix = new Set<string>();
   const keyValuePairOptions = new Set<string>();
-  const optionsWithAnalytics = new Map<string, string>();
+  const optionsWithAnalytics = new Map<string, EventCustomDimension>();
 
   for (const option of options) {
     const {
@@ -338,7 +339,7 @@ export function addSchemaOptionsToCommand<T>(
 
     // Record option of analytics.
     if (userAnalytics !== undefined) {
-      optionsWithAnalytics.set(name, userAnalytics);
+      optionsWithAnalytics.set(name, userAnalytics as EventCustomDimension);
     }
   }