@o3r/extractors 13.0.0-prerelease.3 → 13.0.0-prerelease.4

package/package.json

@@ -2,7 +2,7 @@
   "name": "@o3r/extractors",
   "main": "./src/public_api.js",
   "types": "./src/public_api.d.ts",
-  "version": "13.0.0-prerelease.3",
+  "version": "13.0.0-prerelease.4",
   "publishConfig": {
     "access": "public"
   },
@@ -24,9 +24,9 @@
     "@angular-devkit/architect": ">=0.2000.0 <0.2100.0-0",
     "@angular-devkit/core": "^20.0.0",
     "@angular-devkit/schematics": "^20.0.0",
-    "@o3r/core": "^13.0.0-prerelease.3",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
-    "@o3r/telemetry": "^13.0.0-prerelease.3",
+    "@o3r/core": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
+    "@o3r/telemetry": "^13.0.0-prerelease.4",
     "@schematics/angular": "^20.0.0",
     "@yarnpkg/cli": "^4.0.0",
     "@yarnpkg/core": "^4.1.1",
@@ -98,13 +98,13 @@
     "@nx/eslint-plugin": "~21.3.11",
     "@nx/jest": "~21.3.11",
     "@nx/js": "~21.3.11",
-    "@o3r/build-helpers": "^13.0.0-prerelease.3",
-    "@o3r/core": "^13.0.0-prerelease.3",
-    "@o3r/eslint-config": "^13.0.0-prerelease.3",
-    "@o3r/eslint-plugin": "^13.0.0-prerelease.3",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
-    "@o3r/telemetry": "^13.0.0-prerelease.3",
-    "@o3r/test-helpers": "^13.0.0-prerelease.3",
+    "@o3r/build-helpers": "^13.0.0-prerelease.4",
+    "@o3r/core": "^13.0.0-prerelease.4",
+    "@o3r/eslint-config": "^13.0.0-prerelease.4",
+    "@o3r/eslint-plugin": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
+    "@o3r/telemetry": "^13.0.0-prerelease.4",
+    "@o3r/test-helpers": "^13.0.0-prerelease.4",
     "@schematics/angular": "~20.0.0",
     "@stylistic/eslint-plugin": "~5.2.0",
     "@swc/helpers": "~0.5.0",

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":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAQpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA8BlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -17,46 +17,16 @@ const devDependenciesToInstall = [
     '@angular-devkit/core',
     'semver'
 ];
+const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 /**
  * Add Otter extractors to an Angular Project
  * @param options
  */
 function ngAddFn(options) {
-    return (tree, context) => {
-        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const projectDirectory = workspaceProject?.root || '.';
-        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
-        const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
-            acc[dep] = {
-                inManifest: [{
-                        range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }],
-                ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
-            };
-            return acc;
-        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
-            devDependenciesToInstall,
-            dependenciesToInstall,
-            projectPackageJson,
-            o3rPackageJsonPath: packageJsonPath,
-            projectType: workspaceProject?.projectType
-        }, context.logger);
-        return (0, schematics_1.chain)([
-            (0, schematics_2.setupDependencies)({
-                projectName: options.projectName,
-                dependencies: {
-                    ...dependencies,
-                    ...externalDependenciesInfo
-                },
-                ngAddToRun: depsInfo.o3rPeerDeps
-            }),
-            (0, cms_adapter_1.updateCmsAdapter)(options, __dirname)
-        ]);
-    };
+    return (0, schematics_1.chain)([
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall }),
+        (0, cms_adapter_1.updateCmsAdapter)(options, __dirname)
+    ]);
 }
 /**
  * Add Otter extractors to an Angular Project

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

@@ -1,8 +1,4 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
-    /** Project name */
-    projectName?: string | undefined;
-    /** Use a pinned version for otter packages */
-    exactO3rVersion?: boolean;
+import type { NgAddOptions, SchematicOptionObject } from '@o3r/schematics';
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
 }
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,qBAAqB;CAAG"}