@o3r/core 10.2.0-prerelease.2 → 10.2.0-prerelease.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "10.2.0-prerelease.2",
+  "version": "10.2.0-prerelease.21",
   "publishConfig": {
     "access": "public"
   },
@@ -26,7 +26,7 @@
     "@ngrx/store": "~17.1.0",
     "@nrwl/devkit": "~18.0.2",
     "@nx/angular": "~18.0.2",
-    "@o3r/telemetry": "^10.2.0-prerelease.2",
+    "@o3r/telemetry": "^10.2.0-prerelease.21",
     "@schematics/angular": "~17.2.0",
     "chokidar": "^3.5.2",
     "globby": "^11.1.0",
@@ -64,7 +64,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^10.2.0-prerelease.2",
+    "@o3r/schematics": "^10.2.0-prerelease.21",
     "tslib": "^2.5.3",
     "uuid": "^9.0.0"
   },
@@ -74,7 +74,7 @@
     "@ngrx/router-store": "~17.1.0",
     "@ngrx/effects": "~17.1.0",
     "@ngrx/store-devtools": "~17.1.0",
-    "@o3r/store-sync": "^10.2.0-prerelease.2",
+    "@o3r/store-sync": "^10.2.0-prerelease.21",
     "@types/jest": "~29.5.2",
     "nx": "~18.0.2",
     "@typescript-eslint/parser": "^7.0.1",

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);
+};