@o3r/schematics 10.0.0-prerelease.104 → 10.0.0-prerelease.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "10.0.0-prerelease.104",
+  "version": "10.0.0-prerelease.105",
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +30,7 @@
     "@angular-devkit/core": "~17.2.0",
     "@angular-devkit/schematics": "~17.2.0",
     "@angular/cli": "~17.2.0",
-    "@o3r/telemetry": "^10.0.0-prerelease.104",
+    "@o3r/telemetry": "^10.0.0-prerelease.105",
     "@schematics/angular": "~17.2.0",
     "eslint": "^8.42.0",
     "rxjs": "^7.8.1",
@@ -78,9 +78,9 @@
     "@nx/eslint-plugin": "~18.0.2",
     "@nx/jest": "~18.0.2",
     "@nx/js": "~18.0.2",
-    "@o3r/build-helpers": "^10.0.0-prerelease.104",
-    "@o3r/eslint-plugin": "^10.0.0-prerelease.104",
-    "@o3r/telemetry": "^10.0.0-prerelease.104",
+    "@o3r/build-helpers": "^10.0.0-prerelease.105",
+    "@o3r/eslint-plugin": "^10.0.0-prerelease.105",
+    "@o3r/telemetry": "^10.0.0-prerelease.105",
     "@schematics/angular": "~17.2.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "@types/jest": "~29.5.2",

package/src/utility/wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIvD;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,EAAE,gBAUnD,CAAC"}
+{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AASvD;;;;GAIG;AACH,eAAO,MAAM,qCAAqC,EAAE,gBA4DnD,CAAC"}

package/src/utility/wrapper.js

@@ -1,21 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSchematicWithMetricsIfInstalled = void 0;
+const prompt_1 = require("@angular/cli/src/utilities/prompt");
+const dependencies_1 = require("@schematics/angular/utility/dependencies");
+const node_fs_1 = require("node:fs");
+const path = require("node:path");
+const rxjs_1 = require("rxjs");
+const index_1 = require("../tasks/index");
 const noopSchematicWrapper = (fn) => fn;
 /**
  * Wrapper method of a schematic to retrieve some metrics around the schematic run
  * if @o3r/telemetry is installed
  * @param schematicFn
  */
-const createSchematicWithMetricsIfInstalled = (schematicFn) => (opts) => async (_, context) => {
+const createSchematicWithMetricsIfInstalled = (schematicFn) => (opts) => async (tree, context) => {
     let wrapper = noopSchematicWrapper;
+    const packageJsonPath = 'package.json';
+    const packageJson = tree.exists(packageJsonPath) ? tree.readJson(packageJsonPath) : {};
     try {
         const { createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/telemetry'));
-        wrapper = createSchematicWithMetrics;
+        if (packageJson.config?.o3rMetrics) {
+            wrapper = createSchematicWithMetrics;
+        }
     }
     catch (e) {
         // Do not throw if `@o3r/telemetry is not installed
-        context.logger.debug('`@o3r/telemetry` is not available\n' + e.toString());
+        if (packageJson.config?.o3rMetrics) {
+            context.logger.warn('`config.o3rMetrics` is set to true in your package.json, please install the telemetry package with `ng add @o3r/telemetry` to enable the collection of metrics.');
+        }
+        else if (context.interactive && packageJson.config?.o3rMetrics !== false) {
+            context.logger.debug('`@o3r/telemetry` is not available.\nAsking to add the dependency\n' + e.toString());
+            const isReplyPositive = await (0, prompt_1.askConfirmation)(`
+Would you like to share anonymous data about the usage of Otter builders and schematics with the Otter Team at Amadeus ?
+It will help us to improve our tools.
+For more details and instructions on how to change these settings, see https://github.com/AmadeusITGroup/otter/blob/main/docs/telemetry/README.md.
+        `, false);
+            if (isReplyPositive) {
+                const version = JSON.parse((0, node_fs_1.readFileSync)(path.join(__dirname, '..', '..', 'package.json'), 'utf-8')).version;
+                context.addTask(new index_1.NodePackageNgAddTask('@o3r/telemetry', {
+                    dependencyType: dependencies_1.NodeDependencyType.Dev,
+                    version
+                }));
+                await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
+                try {
+                    const { createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/telemetry'));
+                    wrapper = createSchematicWithMetrics;
+                }
+                catch {
+                    // If pnp context package installed in the same process will not be available
+                }
+            }
+            else {
+                context.logger.info('You can activate it at any time by running `ng add @o3r/telemetry`.');
+                packageJson.config ||= {};
+                packageJson.config.o3rMetrics = false;
+                if (tree.exists(packageJsonPath)) {
+                    tree.overwrite(packageJsonPath, JSON.stringify(packageJson, null, 2));
+                }
+            }
+        }
     }
     return wrapper(schematicFn)(opts);
 };

package/src/utility/wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":";;;AAEA,MAAM,oBAAoB,GAAqB,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;AAE1D;;;;GAIG;AACI,MAAM,qCAAqC,GAAqB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;IACrH,IAAI,OAAO,GAAqB,oBAAoB,CAAC;IACrD,IAAI;QACF,MAAM,EAAE,0BAA0B,EAAE,GAAG,2CAAa,gBAAgB,EAAC,CAAC;QACtE,OAAO,GAAG,0BAA0B,CAAC;KACtC;IAAC,OAAO,CAAM,EAAE;QACf,mDAAmD;QACnD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC5E;IACD,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC;AAVW,QAAA,qCAAqC,yCAUhD"}
+{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../../src/utility/wrapper.ts"],"names":[],"mappings":";;;AACA,8DAAoE;AAEpE,2EAA8E;AAC9E,qCAAuC;AACvC,kCAAkC;AAClC,+BAAqC;AACrC,0CAAsD;AAEtD,MAAM,oBAAoB,GAAqB,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;AAE1D;;;;GAIG;AACI,MAAM,qCAAqC,GAAqB,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IACxH,IAAI,OAAO,GAAqB,oBAAoB,CAAC;IACrD,MAAM,eAAe,GAAG,cAAc,CAAC;IACvC,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAe,CAAC,CAAC,CAAC,EAAE,CAAC;IACrG,IAAI;QACF,MAAM,EAAE,0BAA0B,EAAE,GAAG,2CAAa,gBAAgB,EAAC,CAAC;QACtE,IAAK,WAAW,CAAC,MAAqB,EAAE,UAAU,EAAE;YAClD,OAAO,GAAG,0BAA0B,CAAC;SACtC;KACF;IAAC,OAAO,CAAM,EAAE;QACf,mDAAmD;QACnD,IAAK,WAAW,CAAC,MAAqB,EAAE,UAAU,EAAE;YAClD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iKAAiK,CAAC,CAAC;SACxL;aAAM,IAAI,OAAO,CAAC,WAAW,IAAK,WAAW,CAAC,MAAqB,EAAE,UAAU,KAAK,KAAK,EAAE;YAC1F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YAE1G,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAe,EAC3C;;;;SAIC,EACD,KAAK,CACN,CAAC;YAEF,IAAI,eAAe,EAAE;gBACnB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC5G,OAAO,CAAC,OAAO,CACb,IAAI,4BAAoB,CACtB,gBAAgB,EAChB;oBACE,cAAc,EAAE,iCAAkB,CAAC,GAAG;oBACtC,OAAO;iBACR,CACF,CACF,CAAC;gBACF,MAAM,IAAA,oBAAa,EAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC;gBAEvD,IAAI;oBACF,MAAM,EAAE,0BAA0B,EAAE,GAAG,2CAAa,gBAAgB,EAAC,CAAC;oBACtE,OAAO,GAAG,0BAA0B,CAAC;iBACtC;gBAAC,MAAM;oBACN,6EAA6E;iBAC9E;aACF;iBAAM;gBACL,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;gBAE3F,WAAW,CAAC,MAAM,KAAK,EAAE,CAAC;gBACzB,WAAW,CAAC,MAAqB,CAAC,UAAU,GAAG,KAAK,CAAC;gBAEtD,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;oBAChC,IAAI,CAAC,SAAS,CACZ,eAAe,EACf,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CACrC,CAAC;iBACH;aACF;SACF;KACF;IACD,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC;AA5DW,QAAA,qCAAqC,yCA4DhD"}