@o3r/extractors 12.3.0-prerelease.5 → 12.3.0-prerelease.50

package/package.json

@@ -2,7 +2,7 @@
   "name": "@o3r/extractors",
   "main": "./src/public_api.js",
   "types": "./src/public_api.d.ts",
-  "version": "12.3.0-prerelease.5",
+  "version": "12.3.0-prerelease.50",
   "publishConfig": {
     "access": "public"
   },
@@ -24,9 +24,9 @@
     "@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics": "^19.0.0",
-    "@o3r/core": "^12.3.0-prerelease.5",
-    "@o3r/schematics": "^12.3.0-prerelease.5",
-    "@o3r/telemetry": "^12.3.0-prerelease.5",
+    "@o3r/core": "^12.3.0-prerelease.50",
+    "@o3r/schematics": "^12.3.0-prerelease.50",
+    "@o3r/telemetry": "^12.3.0-prerelease.50",
     "@schematics/angular": "^19.0.0",
     "@yarnpkg/cli": "^4.0.0",
     "@yarnpkg/core": "^4.1.1",
@@ -97,24 +97,24 @@
     "@babel/preset-typescript": "~7.27.0",
     "@compodoc/compodoc": "^1.1.19",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@nx/eslint": "~20.7.0",
-    "@nx/eslint-plugin": "~20.7.0",
-    "@nx/jest": "~20.7.0",
-    "@nx/js": "~20.7.0",
-    "@o3r/build-helpers": "^12.3.0-prerelease.5",
-    "@o3r/core": "^12.3.0-prerelease.5",
-    "@o3r/eslint-config": "^12.3.0-prerelease.5",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.5",
-    "@o3r/schematics": "^12.3.0-prerelease.5",
-    "@o3r/telemetry": "^12.3.0-prerelease.5",
-    "@o3r/test-helpers": "^12.3.0-prerelease.5",
+    "@nx/eslint": "~20.8.0",
+    "@nx/eslint-plugin": "~20.8.0",
+    "@nx/jest": "~20.8.0",
+    "@nx/js": "~20.8.0",
+    "@o3r/build-helpers": "^12.3.0-prerelease.50",
+    "@o3r/core": "^12.3.0-prerelease.50",
+    "@o3r/eslint-config": "^12.3.0-prerelease.50",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.50",
+    "@o3r/schematics": "^12.3.0-prerelease.50",
+    "@o3r/telemetry": "^12.3.0-prerelease.50",
+    "@o3r/test-helpers": "^12.3.0-prerelease.50",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@swc/helpers": "~0.5.0",
     "@types/jest": "~29.5.2",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.29.0",
+    "@typescript-eslint/parser": "~8.30.0",
     "@yarnpkg/cli": "^4.5.0",
     "@yarnpkg/core": "^4.1.3",
     "@yarnpkg/fslib": "^3.1.0",
@@ -122,7 +122,7 @@
     "@yarnpkg/plugin-pack": "^4.0.0",
     "angular-eslint": "~19.3.0",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.23.0",
+    "eslint": "~9.25.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
     "eslint-plugin-import": "~2.31.0",
@@ -140,7 +140,7 @@
     "jest-junit": "~16.0.0",
     "jest-preset-angular": "~14.5.0",
     "jsonc-eslint-parser": "~2.4.0",
-    "nx": "~20.7.0",
+    "nx": "~20.8.0",
     "pid-from-port": "^1.1.3",
     "rimraf": "^6.0.1",
     "rxjs": "^7.8.1",
@@ -149,7 +149,7 @@
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.29.0",
+    "typescript-eslint": "~8.30.0",
     "typescript-json-schema": "^0.65.0",
     "zone.js": "~0.15.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;AAOpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA4DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,KAAG,IAKtD,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;AAgBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA6ClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -3,38 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 const dependenciesToInstall = [
     'semver'
 ];
-const reportMissingSchematicsDep = (logger) => (reason) => {
-    logger.error(`[ERROR]: Adding @o3r/extractors has failed.
-If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the localization package. Please run 'ng add @o3r/core' .
-Otherwise, use the error message as guidance.`);
-    throw reason;
-};
 /**
  * Add Otter extractors to an Angular Project
  * @param options
  */
 function ngAddFn(options) {
     return async (tree, context) => {
-        const { getExternalDependenciesVersionRange, getPackageInstallConfig, getProjectNewDependenciesTypes, setupDependencies, getO3rPeerDeps, getWorkspaceConfig } = await Promise.resolve().then(() => require('@o3r/schematics'));
         const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies')).catch(() => ({ NodeDependencyType: { Dev: 'devDependencies' } }));
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const depsInfo = getO3rPeerDeps(packageJsonPath);
-        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
+        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
                         range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: getProjectNewDependenciesTypes(workspaceProject)
+                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
                     }],
                 ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
             };
             return acc;
-        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
-        Object.entries(getExternalDependenciesVersionRange(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
+        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, true, !!options.exactO3rVersion));
+        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(dependenciesToInstall, packageJsonPath, context.logger)).forEach(([dep, range]) => {
             dependencies[dep] = {
                 inManifest: [{
                         range,
@@ -43,7 +37,7 @@ function ngAddFn(options) {
             };
         });
         return (0, schematics_1.chain)([
-            setupDependencies({
+            (0, schematics_2.setupDependencies)({
                 projectName: options.projectName,
                 dependencies,
                 ngAddToRun: depsInfo.o3rPeerDeps
@@ -56,9 +50,6 @@ function ngAddFn(options) {
  * Add Otter extractors to an Angular Project
  * @param options
  */
-const ngAdd = (options) => async (_, { logger }) => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics')).catch(reportMissingSchematicsDep(logger));
-    return createOtterSchematic(ngAddFn)(options);
-};
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map