@o3r/schematics 10.0.0-prerelease.14 → 10.0.0-prerelease.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/schematics",
-  "version": "10.0.0-prerelease.14",
+  "version": "10.0.0-prerelease.16",
   "description": "Schematics module of the Otter framework",
   "main": "./src/public_api.js",
   "typings": "./src/public_api.d.ts",
@@ -25,7 +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.14",
+    "@o3r/telemetry": "^10.0.0-prerelease.16",
     "@schematics/angular": "~17.0.0",
     "eslint": "^8.42.0",
     "rxjs": "^7.8.1",
@@ -71,9 +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.14",
-    "@o3r/eslint-plugin": "^10.0.0-prerelease.14",
-    "@o3r/telemetry": "^10.0.0-prerelease.14",
+    "@o3r/build-helpers": "^10.0.0-prerelease.16",
+    "@o3r/eslint-plugin": "^10.0.0-prerelease.16",
+    "@o3r/telemetry": "^10.0.0-prerelease.16",
     "@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 const ngAdd: (opts: unknown) => 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;AAsC/E;;GAEG;AACH,eAAO,MAAM,KAAK,yBAAiD,CAAC"}
+{"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

@@ -7,17 +7,20 @@ const rxjs_1 = require("rxjs");
 const schematics_1 = require("@o3r/schematics");
 /**
  * Add Otter schematics to an Angular Project
+ * @param options schematics options
  */
-function ngAddFn() {
+function ngAddFn(options) {
     const schematicsDependencies = ['@angular-devkit/architect', '@angular-devkit/schematics', '@angular-devkit/core', '@schematics/angular', 'globby'];
     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);
@@ -28,6 +31,7 @@ function ngAddFn() {
         context.addTask(new AddDevInstall({
             hideOutput: false,
             packageName,
+            workingDirectory,
             quiet: false
         }));
         await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());