@o3r/localization 10.0.0-prerelease.103 → 10.0.0-prerelease.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/localization",
-  "version": "10.0.0-prerelease.103",
+  "version": "10.0.0-prerelease.104",
   "publishConfig": {
     "access": "public"
   },
@@ -43,13 +43,14 @@
     "@formatjs/intl-numberformat": "^8.0.2",
     "@ngrx/store": "~17.1.0",
     "@ngx-translate/core": "~15.0.0",
-    "@o3r/core": "^10.0.0-prerelease.103",
-    "@o3r/dynamic-content": "^10.0.0-prerelease.103",
-    "@o3r/extractors": "^10.0.0-prerelease.103",
-    "@o3r/logger": "^10.0.0-prerelease.103",
-    "@o3r/schematics": "^10.0.0-prerelease.103",
+    "@o3r/core": "^10.0.0-prerelease.104",
+    "@o3r/dynamic-content": "^10.0.0-prerelease.104",
+    "@o3r/extractors": "^10.0.0-prerelease.104",
+    "@o3r/logger": "^10.0.0-prerelease.104",
+    "@o3r/schematics": "^10.0.0-prerelease.104",
     "@schematics/angular": "~17.2.0",
     "chokidar": "^3.5.2",
+    "globby": "^11.1.0",
     "intl-messageformat": "~10.5.0",
     "rxjs": "^7.8.1",
     "typescript": "~5.2.2"
@@ -76,6 +77,9 @@
     "chokidar": {
       "optional": true
     },
+    "globby": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }

package/schematics/localization-base/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAgC7I;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAgb/G;AAiDD,eAAO,MAAM,UAAU;kBA1CuB,MAAM,GAAG,SAAS;UA0Ca,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/localization-base/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,IAAI,EAAyC,MAAM,4BAA4B,CAAC;AAgC7I;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAob/G;AAiDD,eAAO,MAAM,UAAU;kBA1CuB,MAAM,GAAG,SAAS;UA0Ca,CAAC"}

package/schematics/localization-base/index.js

@@ -7,12 +7,10 @@ const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const utility_1 = require("@schematics/angular/utility");
 const change_1 = require("@schematics/angular/utility/change");
 const path = require("node:path");
+const fs = require("node:fs");
 const ts = require("typescript");
 const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-const ngxTranslateCoreDep = '@ngx-translate/core';
-const intlMessageFormatDep = 'intl-messageformat';
-const formatjsIntlNumberformatDep = '@formatjs/intl-numberformat';
-const angularCdkDep = '@angular/cdk';
+const ownPackageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
 /**
  * Add Otter localization support
  * @param options @see RuleFactory.options
@@ -330,21 +328,24 @@ function updateLocalization(options, rootPath) {
     /**
      * Add location required dependencies
      * @param tree
-     * @param _context
-     * @param context
      */
-    const addDependencies = (tree, context) => {
+    const addDependencies = (tree) => {
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const workingDirectory = workspaceProject?.root || '.';
-        const type = (0, schematics_2.getProjectNewDependenciesType)(workspaceProject);
-        const generatorDependencies = [ngxTranslateCoreDep, intlMessageFormatDep, formatjsIntlNumberformatDep, angularCdkDep];
-        try {
-            return (0, schematics_2.ngAddPeerDependencyPackages)(generatorDependencies, packageJsonPath, type, { ...options, workingDirectory, skipNgAddSchematicRun: true })(tree, context);
-        }
-        catch (e) {
-            context.logger.warn(`Could not find generatorDependencies ${generatorDependencies.join(', ')} in file ${packageJsonPath}`);
-            return tree;
-        }
+        const types = (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject);
+        const generatorDependencies = ['@ngx-translate/core', 'intl-messageformat', '@formatjs/intl-numberformat', '@angular/cdk'];
+        const dependencies = generatorDependencies.reduce((acc, dep) => {
+            acc[dep] = {
+                inManifest: [{
+                        range: ownPackageJson.peerDependencies[dep],
+                        types
+                    }]
+            };
+            return acc;
+        }, {});
+        return (0, schematics_2.setupDependencies)({
+            projectName: options.projectName || undefined,
+            dependencies
+        });
     };
     // Ignore generated CMS metadata
     const ignoreDevResourcesFiles = (tree, _context) => {

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,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AA+DtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAKvF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAgFtD;;;GAGG;AACH,eAAO,MAAM,KAAK,0CAAiD,CAAC"}

package/schematics/ng-add/index.js

@@ -7,6 +7,10 @@ const path = require("node:path");
 const schematics_2 = require("@o3r/schematics");
 const cms_adapter_1 = require("../cms-adapter");
 const devtools_registration_1 = require("./helpers/devtools-registration");
+const dependenciesToInstall = [
+    'chokidar',
+    'globby'
+];
 /**
  * Add Otter localization to an Angular Project
  * @param options for the dependencies installations
@@ -14,7 +18,7 @@ const devtools_registration_1 = require("./helpers/devtools-registration");
 function ngAddFn(options) {
     return async (tree, context) => {
         try {
-            const { applyEsLintFix, install, getProjectNewDependenciesType, getWorkspaceConfig, ngAddPackages, ngAddPeerDependencyPackages, getO3rPeerDeps } = await Promise.resolve().then(() => require('@o3r/schematics'));
+            const { applyEsLintFix, getPackageInstallConfig, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, getO3rPeerDeps, getExternalDependenciesVersionRange } = await Promise.resolve().then(() => require('@o3r/schematics'));
             const { updateI18n, updateLocalization } = await Promise.resolve().then(() => require('../localization-base'));
             const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
             const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
@@ -24,34 +28,39 @@ function ngAddFn(options) {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             const { NodeDependencyType } = await Promise.resolve().then(() => require('@schematics/angular/utility/dependencies'));
             const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
-            const workingDirectory = workspaceProject?.root || '.';
-            const dependencyType = getProjectNewDependenciesType(workspaceProject);
+            const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
+                acc[dep] = {
+                    inManifest: [{
+                            range: `~${depsInfo.packageVersion}`,
+                            types: getProjectNewDependenciesTypes(workspaceProject)
+                        }]
+                };
+                return acc;
+            }, getPackageInstallConfig(packageJsonPath, tree, options.projectName));
+            Object.entries(getExternalDependenciesVersionRange(dependenciesToInstall, packageJsonPath)).forEach(([dep, range]) => {
+                dependencies[dep] = {
+                    inManifest: [{
+                            range,
+                            types: [NodeDependencyType.Dev]
+                        }]
+                };
+            });
             const registerDevtoolRule = await (0, devtools_registration_1.registerDevtools)(options);
             return () => (0, schematics_1.chain)([
                 updateLocalization(options, __dirname),
                 updateI18n(options),
                 options.skipLinter ? (0, schematics_1.noop)() : applyEsLintFix(),
-                // install ngx-translate and message format dependencies
-                options.skipInstall ? schematics_1.noop : install,
-                (t, c) => ngAddPackages(depsInfo.o3rPeerDeps, {
-                    skipConfirmation: true,
-                    version: depsInfo.packageVersion,
-                    parentPackageInfo: `${depsInfo.packageName} - setup`,
+                setupDependencies({
                     projectName: options.projectName,
-                    dependencyType,
-                    workingDirectory
-                })(t, c),
-                ngAddPeerDependencyPackages(['chokidar'], packageJsonPath, NodeDependencyType.Dev, { ...options, workingDirectory, skipNgAddSchematicRun: true }, '@o3r/localization - install builder dependency'),
+                    dependencies,
+                    ngAddToRun: depsInfo.o3rPeerDeps
+                }),
                 (0, cms_adapter_1.updateCmsAdapter)(options),
                 (0, schematics_2.registerPackageCollectionSchematics)(packageJson),
                 (0, schematics_2.setupSchematicsDefaultParams)({
                     // eslint-disable-next-line @typescript-eslint/naming-convention
-                    '@o3r/core:component': {
-                        useLocalization: undefined
-                    },
-                    // eslint-disable-next-line @typescript-eslint/naming-convention
-                    '@o3r/core:component-presenter': {
-                        useLocalization: undefined
+                    '@o3r/core:component*': {
+                        useLocalization: true
                     }
                 }),
                 registerDevtoolRule