@o3r/schematics 10.0.0-prerelease.2 → 10.0.0-prerelease.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "10.0.0-prerelease.2",
+  "version": "10.0.0-prerelease.21",
   "description": "Schematics module of the Otter framework",
   "main": "./src/public_api.js",
   "typings": "./src/public_api.d.ts",
@@ -25,6 +25,7 @@
     "@angular-devkit/core": "~17.0.0",
     "@angular-devkit/schematics": "~17.0.0",
     "@angular/cli": "~17.0.0",
+    "@o3r/telemetry": "^10.0.0-prerelease.21",
     "@schematics/angular": "~17.0.0",
     "eslint": "^8.42.0",
     "rxjs": "^7.8.1",
@@ -37,6 +38,9 @@
     "@angular-devkit/core": {
       "optional": true
     },
+    "@o3r/telemetry": {
+      "optional": true
+    },
     "eslint": {
       "optional": true
     }
@@ -67,8 +71,9 @@
     "@nx/eslint-plugin": "~17.2.0",
     "@nx/jest": "~17.2.0",
     "@nx/js": "~17.2.0",
-    "@o3r/build-helpers": "^10.0.0-prerelease.2",
-    "@o3r/eslint-plugin": "^10.0.0-prerelease.2",
+    "@o3r/build-helpers": "^10.0.0-prerelease.21",
+    "@o3r/eslint-plugin": "^10.0.0-prerelease.21",
+    "@o3r/telemetry": "^10.0.0-prerelease.21",
     "@schematics/angular": "~17.0.3",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",

package/schematics/ng-add/index.d.ts

@@ -1,6 +1,7 @@
 import type { Rule } from '@angular-devkit/schematics';
+import type { NgAddSchematicsSchema } from './schema';
 /**
  * Add Otter schematics to an Angular Project
  */
-export declare function ngAdd(): Rule;
+export declare const ngAdd: (opts: NgAddSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAM/E;;GAEG;AACH,wBAAgB,KAAK,IAAI,IAAI,CA0B5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAM/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqCtD;;GAEG;AACH,eAAO,MAAM,KAAK,uCAAiD,CAAC"}

package/schematics/ng-add/index.js

@@ -4,19 +4,23 @@ exports.ngAdd = void 0;
 const fs = require("node:fs");
 const path = require("node:path");
 const rxjs_1 = require("rxjs");
+const schematics_1 = require("@o3r/schematics");
 /**
  * Add Otter schematics to an Angular Project
+ * @param options schematics options
  */
-function ngAdd() {
+function ngAddFn(options) {
     const schematicsDependencies = ['@angular-devkit/architect', '@angular-devkit/schematics', '@angular-devkit/core', '@schematics/angular', 'globby'];
-    return async (tree, context) => {
+    return () => async (tree, context) => {
         // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { AddDevInstall } = await Promise.resolve().then(() => require('@o3r/schematics'));
+        const { AddDevInstall, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
         context.logger.info('Running ng add for schematics');
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         const treePackageJson = tree.readJson('./package.json');
         const packageJsonContent = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
         const getDependencyVersion = (dependency) => packageJsonContent?.dependencies?.[dependency] || packageJsonContent?.peerDependencies?.[dependency];
+        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const workingDirectory = workspaceProject?.root || '.';
         let packageName = '';
         for (const dependency of schematicsDependencies) {
             const version = getDependencyVersion(dependency);
@@ -27,6 +31,7 @@ function ngAdd() {
         context.addTask(new AddDevInstall({
             hideOutput: false,
             packageName,
+            workingDirectory,
             quiet: false
         }));
         await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
@@ -34,5 +39,8 @@ function ngAdd() {
         return () => tree;
     };
 }
-exports.ngAdd = ngAdd;
+/**
+ * Add Otter schematics to an Angular Project
+ */
+exports.ngAdd = (0, schematics_1.createSchematicWithMetricsIfInstalled)(ngAddFn);
 //# sourceMappingURL=index.js.map

package/src/utility/index.d.ts

@@ -20,4 +20,5 @@ export * from './sub-entry';
 export * from './template-property.helper';
 export * from './update-imports';
 export * from './builder';
+export * from './wrapper';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC"}

package/src/utility/index.js

@@ -23,4 +23,5 @@ tslib_1.__exportStar(require("./sub-entry"), exports);
 tslib_1.__exportStar(require("./template-property.helper"), exports);
 tslib_1.__exportStar(require("./update-imports"), exports);
 tslib_1.__exportStar(require("./builder"), exports);
+tslib_1.__exportStar(require("./wrapper"), exports);
 //# sourceMappingURL=index.js.map

package/src/utility/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,uDAA6B;AAC7B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,kDAAwB;AACxB,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,2DAAiC;AACjC,oDAA0B;AAC1B,qDAA2B;AAC3B,mEAAyC;AACzC,4DAAkC;AAClC,qDAA2B;AAC3B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,oDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utility/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,uDAA6B;AAC7B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,kDAAwB;AACxB,sDAA4B;AAC5B,uDAA6B;AAC7B,sDAA4B;AAC5B,oDAA0B;AAC1B,iDAAuB;AACvB,2DAAiC;AACjC,oDAA0B;AAC1B,qDAA2B;AAC3B,mEAAyC;AACzC,4DAAkC;AAClC,qDAA2B;AAC3B,mDAAyB;AACzB,sDAA4B;AAC5B,qEAA2C;AAC3C,2DAAiC;AACjC,oDAA0B;AAC1B,oDAA0B"}

package/src/utility/wrapper.d.ts

@@ -0,0 +1,8 @@
+import type { SchematicWrapper } from '@o3r/telemetry';
+/**
+ * Wrapper method of a schematic to retrieve some metrics around the schematic run
+ * if @o3r/telemetry is installed
+ * @param schematicFn
+ */
+export declare const createSchematicWithMetricsIfInstalled: SchematicWrapper;
+//# sourceMappingURL=wrapper.d.ts.map

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

@@ -0,0 +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"}

package/src/utility/wrapper.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSchematicWithMetricsIfInstalled = void 0;
+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) => {
+    let wrapper = noopSchematicWrapper;
+    try {
+        const { createSchematicWithMetrics } = await Promise.resolve().then(() => require('@o3r/telemetry'));
+        wrapper = createSchematicWithMetrics;
+    }
+    catch (e) {
+        // Do not throw if `@o3r/telemetry is not installed
+        context.logger.debug('`@o3r/telemetry` is not available\n' + e.toString());
+    }
+    return wrapper(schematicFn)(opts);
+};
+exports.createSchematicWithMetricsIfInstalled = createSchematicWithMetricsIfInstalled;
+//# sourceMappingURL=wrapper.js.map

package/src/utility/wrapper.js.map

@@ -0,0 +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"}