@angular/cli 14.2.3 → 14.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "14.2.3",
+  "version": "14.2.4",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,10 +25,10 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1402.3",
-    "@angular-devkit/core": "14.2.3",
-    "@angular-devkit/schematics": "14.2.3",
-    "@schematics/angular": "14.2.3",
+    "@angular-devkit/architect": "0.1402.4",
+    "@angular-devkit/core": "14.2.4",
+    "@angular-devkit/schematics": "14.2.4",
+    "@schematics/angular": "14.2.4",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.3",
     "debug": "4.3.4",
@@ -49,12 +49,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "14.2.3",
-      "@angular-devkit/architect": "0.1402.3",
-      "@angular-devkit/build-angular": "14.2.3",
-      "@angular-devkit/build-webpack": "0.1402.3",
-      "@angular-devkit/core": "14.2.3",
-      "@angular-devkit/schematics": "14.2.3"
+      "@angular/cli": "14.2.4",
+      "@angular-devkit/architect": "0.1402.4",
+      "@angular-devkit/build-angular": "14.2.4",
+      "@angular-devkit/build-webpack": "0.1402.4",
+      "@angular-devkit/core": "14.2.4",
+      "@angular-devkit/schematics": "14.2.4"
     }
   },
   "engines": {

package/src/command-builder/architect-base-command-module.js

@@ -39,7 +39,7 @@ class ArchitectBaseCommandModule extends command_module_1.CommandModule {
         await this.reportAnalytics({
             ...(await architectHost.getOptionsForTarget(target)),
             ...options,
-        });
+        }, undefined /** paths */, undefined /** dimensions */, builderName);
         const { logger } = this.context;
         const run = await this.getArchitect().scheduleTarget(target, options, {
             logger,

package/src/command-builder/command-module.d.ts

@@ -74,7 +74,7 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
     abstract builder(argv: Argv): Promise<Argv<T>> | Argv<T>;
     abstract run(options: Options<T> & OtherOptions): Promise<number | void> | number | void;
     handler(args: ArgumentsCamelCase<T> & OtherOptions): Promise<void>;
-    reportAnalytics(options: (Options<T> & OtherOptions) | OtherOptions, paths?: string[], dimensions?: (boolean | number | string)[]): Promise<void>;
+    reportAnalytics(options: (Options<T> & OtherOptions) | OtherOptions, paths?: string[], dimensions?: (boolean | number | string)[], title?: string): Promise<void>;
     protected getAnalytics(): Promise<analytics.Analytics>;
     /**
      * Adds schema options to a command also this keeps track of options that are required for analytics.
@@ -82,6 +82,13 @@ export declare abstract class CommandModule<T extends {} = {}> implements Comman
      */
     protected addSchemaOptionsToCommand<T>(localYargs: Argv<T>, options: Option[]): Argv<T>;
     protected getWorkspaceOrThrow(): AngularWorkspace;
+    /**
+     * Flush on an interval (if the event loop is waiting).
+     *
+     * @returns a method that when called will terminate the periodic
+     * flush and call flush one last time.
+     */
+    private periodicAnalyticsFlush;
 }
 /**
  * Creates an known command module error.

package/src/command-builder/command-module.js

@@ -99,8 +99,10 @@ class CommandModule {
         }
         // Gather and report analytics.
         const analytics = await this.getAnalytics();
+        let stopPeriodicFlushes;
         if (this.shouldReportAnalytics) {
             await this.reportAnalytics(camelCasedOptions);
+            stopPeriodicFlushes = this.periodicAnalyticsFlush(analytics);
         }
         let exitCode;
         try {
@@ -109,7 +111,6 @@ class CommandModule {
             exitCode = await this.run(camelCasedOptions);
             const endTime = Date.now();
             analytics.timing(this.commandName, 'duration', endTime - startTime);
-            await analytics.flush();
         }
         catch (e) {
             if (e instanceof core_1.schema.SchemaValidationException) {
@@ -121,12 +122,13 @@ class CommandModule {
             }
         }
         finally {
+            await (stopPeriodicFlushes === null || stopPeriodicFlushes === void 0 ? void 0 : stopPeriodicFlushes());
             if (typeof exitCode === 'number' && exitCode > 0) {
                 process.exitCode = exitCode;
             }
         }
     }
-    async reportAnalytics(options, paths = [], dimensions = []) {
+    async reportAnalytics(options, paths = [], dimensions = [], title) {
         for (const [name, ua] of this.optionsWithAnalytics) {
             const value = options[name];
             if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
@@ -137,6 +139,7 @@ class CommandModule {
         analytics.pageview('/command/' + [this.commandName, ...paths].join('/'), {
             dimensions,
             metrics: [],
+            title,
         });
     }
     getAnalytics() {
@@ -204,6 +207,23 @@ class CommandModule {
         }
         return workspace;
     }
+    /**
+     * Flush on an interval (if the event loop is waiting).
+     *
+     * @returns a method that when called will terminate the periodic
+     * flush and call flush one last time.
+     */
+    periodicAnalyticsFlush(analytics) {
+        let analyticsFlushPromise = Promise.resolve();
+        const analyticsFlushInterval = setInterval(() => {
+            analyticsFlushPromise = analyticsFlushPromise.then(() => analytics.flush());
+        }, 2000);
+        return () => {
+            clearInterval(analyticsFlushInterval);
+            // Flush one last time.
+            return analyticsFlushPromise.then(() => analytics.flush());
+        };
+    }
 }
 __decorate([
     memoize_1.memoize

package/src/command-builder/schematics-command-module.js

@@ -128,16 +128,9 @@ class SchematicsCommandModule extends command_module_1.CommandModule {
         workflow.registry.addSmartDefaultProvider('workingDirectory', () => workingDir === '' ? undefined : workingDir);
         let shouldReportAnalytics = true;
         workflow.engineHost.registerOptionsTransform(async (schematic, options) => {
-            var _a;
             if (shouldReportAnalytics) {
                 shouldReportAnalytics = false;
-                // ng generate lib -> ng generate
-                const commandName = (_a = this.command) === null || _a === void 0 ? void 0 : _a.split(' ', 1)[0];
-                await this.reportAnalytics(options, [
-                    commandName,
-                    schematic.collection.name.replace(/\//g, '_'),
-                    schematic.name.replace(/\//g, '_'),
-                ]);
+                await this.reportAnalytics(options, undefined /** paths */, undefined /** dimensions */, schematic.collection.name + ':' + schematic.name);
             }
             // TODO: The below should be removed in version 15 when we change 1P schematics to use the `workingDirectory smart default`.
             // Handle `"format": "path"` options.