@o3r/core 10.2.0-prerelease.9 → 10.3.0-prerelease.0

package/README.md

@@ -5,6 +5,9 @@
 
 ## Description
 
+[![Stable Version](https://img.shields.io/npm/v/@o3r/core?style=for-the-badge)](https://www.npmjs.com/package/@o3r/core)
+[![Bundle Size](https://img.shields.io/bundlephobia/min/@o3r/core?color=green&style=for-the-badge)](https://www.npmjs.com/package/@o3r/core)
+
 This module gathers the core of the [Otter Framework](https://github.com/AmadeusITGroup/otter).
 It is the foundation for all the packages (interfaces, core helpers) and contains schematics to generate your components/services etc.
 

package/core/metadata/component.decorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.decorator.d.ts","sourceRoot":"","sources":["../../../src/core/metadata/component.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE/C,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,kBAAkB,GAAG,WAAW,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,wBAAwB;IACxB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,2BAA2B;IACrE,uBAAuB;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB;IACvB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,qBAAqB;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D;;;;GAIG;AAEH,wBAAgB,YAAY,CAAC,IAAI,EAAE,2BAA2B,4BAC5B,GAAG,EAAE,KAAK,MAAM,uBAKjD"}
+{"version":3,"file":"component.decorator.d.ts","sourceRoot":"","sources":["../../../src/core/metadata/component.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE/C,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,kBAAkB,GAAG,WAAW,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,wBAAwB;IACxB,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,2BAA2B;IACrE,uBAAuB;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uBAAuB;IACvB,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,qBAAqB;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,eAAO,MAAM,8BAA8B,mBAAmB,CAAC;AAE/D;;;;GAIG;AAEH,wBAAgB,YAAY,CAAC,IAAI,EAAE,2BAA2B,4BAC5B,GAAG,EAAE,KAAK,MAAM,eAAe,CAAC,OAKjE"}

package/messages/message.helpers.d.ts

@@ -4,7 +4,7 @@ import { ContentMessageData, FilterMessageToApplication, OtterMessage, OtterMess
  * Determine if a message should be handle by the application
  * @param message Message to analyze
  */
-export declare const isToAppOtterMessage: <T extends OtterMessage<OtterMessageContent<string>, string | undefined>>(message?: T | undefined) => message is FilterMessageToApplication<T & {
+export declare const isToAppOtterMessage: <T extends OtterMessage<OtterMessageContent<string>, string | undefined>>(message?: T) => message is FilterMessageToApplication<T & {
     to: 'app';
 }>;
 /**
@@ -18,7 +18,7 @@ export declare const isOtterMessage: <T extends OtterMessageContent<string>>(mes
  * @param content content of the message
  * @param preStringify determine if the message should JSON.stringify before being send (will use the default mechanism otherwise)
  */
-export declare const sendOtterMessage: <T extends OtterMessageContent<string>>(dataType: T["dataType"], content: ContentMessageData<T>, preStringify?: boolean) => void;
+export declare const sendOtterMessage: <T extends OtterMessageContent<string>>(dataType: T['dataType'], content: ContentMessageData<T>, preStringify?: boolean) => void;
 export declare function filterMessageContent<T extends Event | MessageEvent>(): (source$: Observable<T>) => Observable<OtterMessageContent<string>>;
 export declare function filterMessageContent<T extends Event | MessageEvent, S extends OtterMessageContent>(predicate: (message: any) => message is S): (source$: Observable<T>) => Observable<S>;
 //# sourceMappingURL=message.helpers.d.ts.map

package/messages/message.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message.helpers.d.ts","sourceRoot":"","sources":["../../src/messages/message.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,UAAU,EAAE,MAAM,MAAM,CAAC;AAC/C,OAAO,EAA4B,kBAAkB,EAAE,0BAA0B,EAAE,YAAY,EAAE,mBAAmB,EAAoB,MAAM,sBAAsB,CAAC;AAErK;;;GAGG;AACH,eAAO,MAAM,mBAAmB;QAAyF,KAAK;EAE7H,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,mDAA4C,GAAG,mDAEzE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,kIAS5B,CAAC;AAGF,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,KAAK,GAAG,YAAY,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5I,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,KAAK,GAAG,YAAY,EAAE,CAAC,SAAS,mBAAmB,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"message.helpers.d.ts","sourceRoot":"","sources":["../../src/messages/message.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,UAAU,EAAE,MAAM,MAAM,CAAC;AAC/C,OAAO,EAA4B,kBAAkB,EAAE,0BAA0B,EAAE,YAAY,EAAE,mBAAmB,EAAoB,MAAM,sBAAsB,CAAC;AAErK;;;GAGG;AACH,eAAO,MAAM,mBAAmB,sFAAsC,CAAC;QAAkD,KAAK;EAE7H,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,cAAc,mDAA4C,GAAG,mDAEzE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,oDAA6C,CAAC,CAAC,UAAU,CAAC,WAAW,mBAAmB,CAAC,CAAC,iCAStH,CAAC;AAGF,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,KAAK,GAAG,YAAY,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5I,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,KAAK,GAAG,YAAY,EAAE,CAAC,SAAS,mBAAmB,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "10.2.0-prerelease.9",
+  "version": "10.3.0-prerelease.0",
   "publishConfig": {
     "access": "public"
   },
@@ -12,27 +12,27 @@
   "default": "./src/public_api.js",
   "types": "./src/public_api.d.ts",
   "peerDependencies": {
-    "@angular-devkit/architect": "~0.1702.0",
-    "@angular-devkit/core": "~17.2.0",
-    "@angular-devkit/schematics": "~17.2.0",
-    "@angular/cli": "~17.2.0",
-    "@angular/common": "~17.2.0",
-    "@angular/compiler-cli": "~17.2.0",
-    "@angular/core": "~17.2.0",
-    "@angular/forms": "~17.2.0",
-    "@angular/platform-browser-dynamic": "~17.2.0",
-    "@angular/router": "~17.2.0",
+    "@angular-devkit/architect": "~0.1703.0",
+    "@angular-devkit/core": "~17.3.0",
+    "@angular-devkit/schematics": "~17.3.0",
+    "@angular/cli": "~17.3.0",
+    "@angular/common": "~17.3.0",
+    "@angular/compiler-cli": "~17.3.0",
+    "@angular/core": "~17.3.0",
+    "@angular/forms": "~17.3.0",
+    "@angular/platform-browser-dynamic": "~17.3.0",
+    "@angular/router": "~17.3.0",
     "@ngrx/entity": "~17.1.0",
     "@ngrx/store": "~17.1.0",
-    "@nrwl/devkit": "~18.0.2",
-    "@nx/angular": "~18.0.2",
-    "@o3r/telemetry": "^10.2.0-prerelease.9",
-    "@schematics/angular": "~17.2.0",
+    "@nrwl/devkit": "~18.2.0",
+    "@nx/angular": "~18.2.0",
+    "@o3r/telemetry": "^10.3.0-prerelease.0",
+    "@schematics/angular": "~17.3.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
-    "typescript": "~5.3.3"
+    "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
     "@angular/cli": {
@@ -64,33 +64,33 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^10.2.0-prerelease.9",
-    "tslib": "^2.5.3",
+    "@o3r/schematics": "^10.3.0-prerelease.0",
+    "tslib": "^2.6.2",
     "uuid": "^9.0.0"
   },
   "generatorDependencies": {
-    "@angular-eslint/eslint-plugin": "~17.2.0",
-    "@angular/material": "~17.2.0",
+    "@angular-eslint/eslint-plugin": "~17.3.0",
+    "@angular/material": "~17.3.0",
     "@ngrx/router-store": "~17.1.0",
     "@ngrx/effects": "~17.1.0",
     "@ngrx/store-devtools": "~17.1.0",
-    "@o3r/store-sync": "^10.2.0-prerelease.9",
+    "@o3r/store-sync": "^10.3.0-prerelease.0",
     "@types/jest": "~29.5.2",
-    "nx": "~18.0.2",
-    "@typescript-eslint/parser": "^7.0.1",
+    "nx": "~18.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",
     "cpy-cli": "^5.0.0",
-    "eslint": "^8.42.0",
-    "@nx/eslint-plugin": "~18.0.2",
+    "eslint": "^8.57.0",
+    "@nx/eslint-plugin": "~18.2.0",
     "jsonc-eslint-parser": "~2.4.0",
-    "eslint-import-resolver-node": "^0.3.4",
+    "eslint-import-resolver-node": "^0.3.9",
     "eslint-plugin-jest": "~27.9.0",
-    "eslint-plugin-jsdoc": "~48.2.0",
+    "eslint-plugin-jsdoc": "~48.2.1",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^51.0.0",
+    "eslint-plugin-unicorn": "^51.0.1",
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
-    "jest-preset-angular": "~14.0.0",
+    "jest-preset-angular": "~14.0.3",
     "zone.js": "~0.14.2"
   },
   "engines": {

package/schematics/ng-add/component-decorator/index.d.ts

@@ -1,7 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
  * Update component file with new decorators for otter devtools
- *
  * @param tree Tree
  */
 export declare const updateComponentDecorators: Rule;

package/schematics/ng-add/component-decorator/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/component-decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,4BAA4B,CAAC;AA0BxD;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,EAAE,IA6DvC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/component-decorator/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,4BAA4B,CAAC;AAyBxD;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,IA8DvC,CAAC"}

package/schematics/ng-add/component-decorator/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateComponentDecorators = void 0;
-const schematics_1 = require("@o3r/schematics");
 const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
 const change_1 = require("@schematics/angular/utility/change");
 const ts = require("typescript");
@@ -16,11 +15,11 @@ const removeImport = (source, symbolName, fileName) => {
 };
 /**
  * Update component file with new decorators for otter devtools
- *
  * @param tree Tree
  */
-const updateComponentDecorators = (tree) => {
-    const componentFiles = new Set((0, schematics_1.getFilesInFolderFromWorkspaceProjectsInTree)(tree, '', 'component.ts'));
+const updateComponentDecorators = async (tree) => {
+    const { getFilesInFolderFromWorkspaceProjectsInTree } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    const componentFiles = new Set(getFilesInFolderFromWorkspaceProjectsInTree(tree, '', 'component.ts'));
     componentFiles.forEach((filePath) => {
         const source = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.ES2015, true);
         const recorder = tree.beginUpdate(filePath);

package/schematics/ng-add-create/templates/schematics/ng-add/index.ts.template

@@ -1,7 +1,7 @@
 import { chain, noop, Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from './schema';
 import * as path from 'node:path';
-import { type DependencyToAdd } from '@o3r/schematics';
+import type { DependencyToAdd } from '@o3r/schematics';
 
 const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 
@@ -18,6 +18,13 @@ const dependenciesToNgAdd = [
   // Add the dependencies to install with NgAdd here
 ];
 
+const reportMissingSchematicsDep = (logger: { error: (message: string) => any }) => (reason: any) => {
+  logger.error(`[ERROR]: Adding <%= featureName %> has failed.
+If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the <%= featureName %> package. Please run 'ng add @o3r/core' .
+Otherwise, use the error message as guidance.`);
+  throw reason;
+};
+
 /**
  * Add Otter <%= featureName %> to an Otter Project
  *
@@ -25,37 +32,38 @@ const dependenciesToNgAdd = [
  */
 function ngAddFn(options: NgAddSchematicsSchema): Rule {
   return async (tree, context) => {
-    try {
-      // use dynamic import to properly raise an exception if it is not an Otter project.
-      const { getProjectNewDependenciesTypes, getPackageInstallConfig, applyEsLintFix, install } = await import('@o3r/schematics');
-      // current package version
-      const version = JSON.stringify(fs.readFileSync(packageJsonPath)).version;
-      const dependencies = [...dependenciesToInstall, ...dependenciesToNgAdd].reduce((acc, dep) => {
-        acc[dep] = {
-          inManifest: [{
-            range: `~${version}`,
-            types: getProjectNewDependenciesTypes(workspaceProject)
-          }]
-        };
-        return acc;
-      }, getPackageInstallConfig(packageJsonPath, tree, options.projectName));
-      return chain([
-        // optional custom action dedicated to this module
-        doCustomAction,
-        options.skipLinter ? noop() : applyEsLintFix(),
-        setupDependencies({
-          projectName: options.projectName,
-          dependencies,
-          ngAddToRun: dependenciesToNgAdd,
-          skipInstall: options.skipInstall
-        })
-      ]);
-    } catch (e) {
-      // If the installation is initialized in a non-Otter application, mandatory packages will be missing. We need to notify the user
-      context.logger.error(`[ERROR]: Adding <%= featureName %> has failed.
-      If the error is related to missing @o3r dependencies you need to install '@o3r/core' to be able to use the <%= featureName %> package. Please run 'ng add @o3r/core' .
-      Otherwise, use the error message as guidance.`);
-      throw (e);
-    }
+    // use dynamic import to properly raise an exception if it is not an Otter project.
+    const { getProjectNewDependenciesTypes, getPackageInstallConfig, applyEsLintFix, install } = await import('@o3r/schematics');
+    // current package version
+    const version = JSON.stringify(fs.readFileSync(packageJsonPath)).version;
+    const dependencies = [...dependenciesToInstall, ...dependenciesToNgAdd].reduce((acc, dep) => {
+      acc[dep] = {
+        inManifest: [{
+          range: `~${version}`,
+          types: getProjectNewDependenciesTypes(workspaceProject)
+        }]
+      };
+      return acc;
+    }, getPackageInstallConfig(packageJsonPath, tree, options.projectName));
+    return chain([
+      // optional custom action dedicated to this module
+      doCustomAction,
+      options.skipLinter ? noop() : applyEsLintFix(),
+      setupDependencies({
+        projectName: options.projectName,
+        dependencies,
+        ngAddToRun: dependenciesToNgAdd,
+        skipInstall: options.skipInstall
+      })
+    ]);
   };
 }
+
+/**
+ * Add module to an Angular Project
+ * @param options ng add options
+ */
+export const ngAdd = (options: NgAddSchematicsSchema): Rule => async (_, { logger }) => {
+  const { createSchematicWithMetricsIfInstalled } = await import('@o3r/schematics').catch(reportMissingSchematicsDep(logger));
+  return createSchematicWithMetricsIfInstalled(ngAddFn)(options);
+};

package/store/async/async.props.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"async.props.d.ts","sourceRoot":"","sources":["../../../src/store/async/async.props.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAIhD;;;GAGG;AAEH,eAAO,MAAM,UAAU,wDAEtB,CAAC"}
+{"version":3,"file":"async.props.d.ts","sourceRoot":"","sources":["../../../src/store/async/async.props.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAIhD;;;GAGG;AAEH,eAAO,MAAM,UAAU,0BAAyB,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,YAEjE,CAAC"}