@o3r/components 10.2.0-prerelease.8 → 10.2.0-prerelease.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/components",
-  "version": "10.2.0-prerelease.8",
+  "version": "10.2.0-prerelease.80",
   "publishConfig": {
     "access": "public"
   },
@@ -12,12 +12,13 @@
     "otter-cms"
   ],
   "exports": {
-    "./schemas/*.json": {
-      "default": "./schemas/*.json"
-    },
     "./package.json": {
+      "node": "./package.json",
       "default": "./package.json"
     },
+    "./schemas/*.json": {
+      "default": "./schemas/*.json"
+    },
     ".": {
       "types": "./index.d.ts",
       "esm2022": "./esm2022/o3r-components.mjs",
@@ -32,33 +33,33 @@
     }
   },
   "peerDependencies": {
-    "@angular-devkit/architect": "~0.1702.0",
-    "@angular-devkit/schematics": "~17.2.0",
-    "@angular/cdk": "~17.2.0",
-    "@angular/common": "~17.2.0",
-    "@angular/core": "~17.2.0",
-    "@angular/forms": "~17.2.0",
-    "@angular/platform-browser": "~17.2.0",
-    "@angular/platform-browser-dynamic": "~17.2.0",
+    "@angular-devkit/architect": "~0.1703.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular/cdk": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@angular/core": "~17.3.0",
+    "@angular/forms": "~17.3.0",
+    "@angular/platform-browser": "~17.3.0",
+    "@angular/platform-browser-dynamic": "~17.3.0",
     "@ngrx/effects": "~17.1.0",
     "@ngrx/entity": "~17.1.0",
     "@ngrx/store": "~17.1.0",
-    "@o3r/analytics": "^10.2.0-prerelease.8",
-    "@o3r/configuration": "^10.2.0-prerelease.8",
-    "@o3r/core": "^10.2.0-prerelease.8",
-    "@o3r/dynamic-content": "^10.2.0-prerelease.8",
-    "@o3r/extractors": "^10.2.0-prerelease.8",
-    "@o3r/localization": "^10.2.0-prerelease.8",
-    "@o3r/logger": "^10.2.0-prerelease.8",
-    "@o3r/rules-engine": "^10.2.0-prerelease.8",
-    "@o3r/schematics": "^10.2.0-prerelease.8",
-    "@o3r/testing": "^10.2.0-prerelease.8",
-    "@schematics/angular": "~17.2.0",
+    "@o3r/analytics": "^10.2.0-prerelease.80",
+    "@o3r/configuration": "^10.2.0-prerelease.80",
+    "@o3r/core": "^10.2.0-prerelease.80",
+    "@o3r/dynamic-content": "^10.2.0-prerelease.80",
+    "@o3r/extractors": "^10.2.0-prerelease.80",
+    "@o3r/localization": "^10.2.0-prerelease.80",
+    "@o3r/logger": "^10.2.0-prerelease.80",
+    "@o3r/rules-engine": "^10.2.0-prerelease.80",
+    "@o3r/schematics": "^10.2.0-prerelease.80",
+    "@o3r/testing": "^10.2.0-prerelease.80",
+    "@schematics/angular": "~17.3.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
     "jsonpath-plus": "^8.0.0",
     "rxjs": "^7.8.1",
-    "typescript": "~5.3.3"
+    "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
     "@angular-devkit/schematics": {
@@ -105,7 +106,7 @@
     }
   },
   "dependencies": {
-    "tslib": "^2.5.3"
+    "tslib": "^2.6.2"
   },
   "engines": {
     "node": ">=18.0.0"

package/rules-engine/placeholder.rules-engine.effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placeholder.rules-engine.effect.d.ts","sourceRoot":"","sources":["../../src/rules-engine/placeholder.rules-engine.effect.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAuB,MAAM,eAAe,CAAC;AAC5D,OAAO,EAGL,uBAAuB,EAKxB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAuB,UAAU,EAAK,MAAM,MAAM,CAAC;AAE1D,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAC;;AAGlC;;GAEG;AACH,qBACa,iCAAiC;IAoD1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACV,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAvDjD;;;;OAIG;IACI,mCAAmC;;6IA2CxC;gBAGiB,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACzB,kBAAkB,EAAE,wBAAwB,GAAG,IAAI,EACnD,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,EACnD,kBAAkB,EAAE,mBAAmB,GAAG,IAAI;IAG7E;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;yCAjEb,iCAAiC;6CAAjC,iCAAiC;CAgI7C"}
+{"version":3,"file":"placeholder.rules-engine.effect.d.ts","sourceRoot":"","sources":["../../src/rules-engine/placeholder.rules-engine.effect.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAuB,MAAM,eAAe,CAAC;AAC5D,OAAO,EAGL,uBAAuB,EAKxB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAuB,UAAU,EAAK,MAAM,MAAM,CAAC;AAE1D,OAAO,EAAC,KAAK,EAAC,MAAM,aAAa,CAAC;;AAGlC;;GAEG;AACH,qBACa,iCAAiC;IAqD1C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACV,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAxDjD;;;;OAIG;IACI,mCAAmC;;6IA4CxC;gBAGiB,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,KAAK,CAAC,uBAAuB,CAAC,EACzB,kBAAkB,EAAE,wBAAwB,GAAG,IAAI,EACnD,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,EACnD,kBAAkB,EAAE,mBAAmB,GAAG,IAAI;IAG7E;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;yCAlEb,iCAAiC;6CAAjC,iCAAiC;CA0I7C"}

package/schemas/placeholder-template.schema.json

@@ -41,10 +41,18 @@
               "type": "string"
             },
             "vars": {
+              "deprecated": true,
+              "description": "Deprecated: will be removed in V12. List of variables that can be used in the localization string",
               "type": "array",
               "items": {
                 "type": "string"
               }
+            },
+            "parameters": {
+              "type": "object",
+              "additionalProperties": {
+                "type":  "string"
+              }
             }
           }
         },

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

package/schematics/ng-add/index.js

@@ -3,12 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const tslib_1 = require("tslib");
 const schematics_1 = require("@angular-devkit/schematics");
-const schematics_2 = require("@o3r/schematics");
 const path = tslib_1.__importStar(require("node:path"));
 const fs = tslib_1.__importStar(require("node:fs"));
 const cms_adapter_1 = require("../cms-adapter");
 const devtools_registration_1 = require("./helpers/devtools-registration");
-const schematics_3 = require("@o3r/schematics");
+const reportMissingSchematicsDep = (logger) => (reason) => {
+    logger.error(`[ERROR]: Adding @o3r/components has failed.
+If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the components package. Please run 'ng add @o3r/core' .
+Otherwise, use the error message as guidance.`);
+    throw reason;
+};
 /**
  * Add Otter components to an Angular Project
  * @param options
@@ -16,66 +20,61 @@ const schematics_3 = require("@o3r/schematics");
 function ngAddFn(options) {
     /* ng add rules */
     return async (tree, context) => {
-        try {
-            const { getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, removePackages, registerPackageCollectionSchematics } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            const { NodeDependencyType } = await Promise.resolve().then(() => tslib_1.__importStar(require('@schematics/angular/utility/dependencies')));
-            options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/components', 'ng-add', options), ...options };
-            const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-            const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
-            const depsInfo = getO3rPeerDeps(packageJsonPath);
-            if (options.enableMetadataExtract) {
-                depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
-            }
-            const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
-            const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
-                acc[dep] = {
-                    inManifest: [{
-                            range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                            types: getProjectNewDependenciesTypes(workspaceProject)
-                        }],
-                    ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
-                };
-                return acc;
-            }, (0, schematics_3.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-            const devDependencies = {
-                chokidar: {
-                    inManifest: [{
-                            range: packageJson.peerDependencies.chokidar,
-                            types: [NodeDependencyType.Dev]
-                        }]
-                }
-            };
-            const rule = (0, schematics_1.chain)([
-                removePackages(['@otter/components']),
-                setupDependencies({
-                    projectName: options.projectName,
-                    dependencies: {
-                        ...dependencies,
-                        ...devDependencies
-                    },
-                    ngAddToRun: depsInfo.o3rPeerDeps
-                }),
-                registerPackageCollectionSchematics(packageJson),
-                ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
-                await (0, devtools_registration_1.registerDevtools)(options)
-            ]);
-            context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
-            context.logger.info('Get more information on the following page: https://github.com/AmadeusITGroup/otter/tree/main/docs/components/COMPONENT_STRUCTURE.md#Runtime-debugging');
-            return () => rule(tree, context);
-        }
-        catch (e) {
-            // components needs o3r/core as peer dep. o3r/core will install o3r/schematics
-            context.logger.error(`[ERROR]: Adding @o3r/components has failed.
-      If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the components package. Please run 'ng add @o3r/core' .
-      Otherwise, use the error message as guidance.`);
-            throw (e);
+        const { getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, setupDependencies, removePackages, registerPackageCollectionSchematics, getPackageInstallConfig } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        const { NodeDependencyType } = await Promise.resolve().then(() => tslib_1.__importStar(require('@schematics/angular/utility/dependencies')));
+        options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/components', 'ng-add', options), ...options };
+        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
+        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }));
+        const depsInfo = getO3rPeerDeps(packageJsonPath);
+        if (options.enableMetadataExtract) {
+            depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
         }
+        const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
+        const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
+            acc[dep] = {
+                inManifest: [{
+                        range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
+                        types: getProjectNewDependenciesTypes(workspaceProject)
+                    }],
+                ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
+            };
+            return acc;
+        }, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
+        const devDependencies = {
+            chokidar: {
+                inManifest: [{
+                        range: packageJson.peerDependencies.chokidar,
+                        types: [NodeDependencyType.Dev]
+                    }]
+            }
+        };
+        const rule = (0, schematics_1.chain)([
+            removePackages(['@otter/components']),
+            setupDependencies({
+                projectName: options.projectName,
+                dependencies: {
+                    ...dependencies,
+                    ...devDependencies
+                },
+                ngAddToRun: depsInfo.o3rPeerDeps
+            }),
+            registerPackageCollectionSchematics(packageJson),
+            ...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
+            await (0, devtools_registration_1.registerDevtools)(options)
+        ]);
+        context.logger.info(`The package ${depsInfo.packageName} comes with a debug mechanism`);
+        context.logger.info('Get more information on the following page: https://github.com/AmadeusITGroup/otter/tree/main/docs/components/COMPONENT_STRUCTURE.md#Runtime-debugging');
+        return () => rule(tree, context);
     };
 }
 /**
  * Add Otter components to an Angular Project
  * @param options
  */
-exports.ngAdd = (0, schematics_2.createSchematicWithMetricsIfInstalled)(ngAddFn);
+const ngAdd = (options) => async (_, { logger }) => {
+    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics'))).catch(reportMissingSchematicsDep(logger));
+    return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
+};
+exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/stores/placeholder-request/placeholder-request.state.d.ts

@@ -7,6 +7,7 @@ export interface PlaceholderVariable {
     type: 'fact' | 'fullUrl' | 'relativeUrl' | 'localisation';
     value: string;
     vars?: string[];
+    parameters?: Record<string, string>;
     path?: string;
 }
 /**

package/stores/placeholder-request/placeholder-request.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"placeholder-request.state.d.ts","sourceRoot":"","sources":["../../../src/stores/placeholder-request/placeholder-request.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,cAAc,CAAC;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,cAAc,EAAE,uBAAuB;IACtF,+EAA+E;IAC/E,EAAE,EAAE,MAAM,CAAC;IACX,4EAA4E;IAC5E,WAAW,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sCAAsC;IACtC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,8IAA8I;IAC9I,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,8BAA+B,SAAQ,cAAc;CAAG;AAEzE;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,WAAW,CAAC,uBAAuB,CAAC,EAAE,8BAA8B;CACpH;AAED;;GAEG;AACH,eAAO,MAAM,8BAA8B,uBAAuB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,+BAA+B;IAC/B,CAAC,8BAA8B,CAAC,EAAE,uBAAuB,CAAC;CAC3D"}
+{"version":3,"file":"placeholder-request.state.d.ts","sourceRoot":"","sources":["../../../src/stores/placeholder-request/placeholder-request.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa,GAAG,cAAc,CAAC;IAC1D,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,cAAc,EAAE,uBAAuB;IACtF,+EAA+E;IAC/E,EAAE,EAAE,MAAM,CAAC;IACX,4EAA4E;IAC5E,WAAW,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,sCAAsC;IACtC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,8IAA8I;IAC9I,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,8BAA+B,SAAQ,cAAc;CAAG;AAEzE;;GAEG;AACH,MAAM,WAAW,uBAAwB,SAAQ,WAAW,CAAC,uBAAuB,CAAC,EAAE,8BAA8B;CACpH;AAED;;GAEG;AACH,eAAO,MAAM,8BAA8B,uBAAuB,CAAC;AAEnE;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,+BAA+B;IAC/B,CAAC,8BAA8B,CAAC,EAAE,uBAAuB,CAAC;CAC3D"}