@o3r/core 13.0.0-prerelease.2 → 13.0.0-prerelease.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "13.0.0-prerelease.2",
+  "version": "13.0.0-prerelease.4",
   "publishConfig": {
     "access": "public"
   },
@@ -38,7 +38,7 @@
     "@ngrx/entity": "^20.0.0",
     "@ngrx/store": "^20.0.0",
     "@nx/angular": "~21.3.11",
-    "@o3r/telemetry": "^13.0.0-prerelease.2",
+    "@o3r/telemetry": "^13.0.0-prerelease.4",
     "@schematics/angular": "^20.0.0",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
@@ -77,7 +77,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^13.0.0-prerelease.2",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "tslib": "^2.6.2",
     "uuid": "^11.0.5"
   },
@@ -89,7 +89,7 @@
     "@ngrx/store": "~20.0.0",
     "@ngrx/store-devtools": "~20.0.0",
     "@nx/eslint-plugin": "~21.3.11",
-    "@o3r/store-sync": "^13.0.0-prerelease.2",
+    "@o3r/store-sync": "^13.0.0-prerelease.4",
     "@stylistic/eslint-plugin": "~5.2.0",
     "@types/jest": "~29.5.2",
     "@typescript-eslint/eslint-plugin": "~8.41.0",

package/schematics/ng-add/schema.d.ts

@@ -1,16 +1,12 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
+import type { NgAddOptions, SchematicOptionObject } from '@o3r/schematics';
 export type PresetNames = 'basic' | 'recommended' | 'cms' | 'all';
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
     /** Preset of module list to automatically install */
     preset: PresetNames;
     /** Preset of non-official module list to automatically install */
     externalPresets?: string | undefined;
-    /** Project name */
-    projectName?: string | undefined;
     /** Skip the linter process which includes the run of EsLint and EditorConfig rules */
     skipLinter: boolean;
-    /** Skip the install process */
-    skipInstall: boolean;
     /** Initial git repository commit information. */
     commit: boolean | {
         name: string;
@@ -22,7 +18,5 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
     withDevtool: boolean;
     /** Force package installation (in case of unmet peer dependencies) */
     forceInstall: boolean;
-    /** Use a pinned version for otter packages */
-    exactO3rVersion?: boolean;
 }
 //# sourceMappingURL=schema.d.ts.map

package/schematics/ng-add/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,aAAa,GAAG,KAAK,GAAG,KAAK,CAAC;AAElE,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;IAEtB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,aAAa,GAAG,KAAK,GAAG,KAAK,CAAC;AAElE,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,qBAAqB;IAChF,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;IAEpB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;CACvB"}

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

@@ -4,16 +4,13 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import {
   createOtterSchematic,
-  getProjectNewDependenciesTypes,
-  getPackageInstallConfig,
   applyEsLintFix,
-  getWorkspaceConfig,
-  setupDependencies,
+  ngAddDependenciesRule
 } from '@o3r/schematics';
 
 const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 
-const doCustomAction: Rule = (tree) => {
+const doCustomAction = (options: NgAddSchematicsSchema): Rule => (tree) => {
   // your custom code here
   return tree;
 };
@@ -22,8 +19,8 @@ const dependenciesToInstall: string[] = [
   // Add the dependencies to install here
 ];
 
-const dependenciesToNgAdd: string[] = [
-  // Add the dependencies to install with NgAdd here
+const devDependenciesToInstall: string[] = [
+  // Add the devDependencies to install here
 ];
 
 /**
@@ -32,31 +29,12 @@ const dependenciesToNgAdd: string[] = [
  * @param options
  */
 function ngAddFn(options: NgAddSchematicsSchema): Rule {
-  return async (tree) => {
-    // current package version
-    const version = JSON.parse(fs.readFileSync(packageJsonPath, {encoding: 'utf8'})).version;
-    const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
-    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
-      })
-    ]);
-  };
+  return chain([
+    // optional custom action dedicated to this module
+    doCustomAction(options),
+    options.skipLinter ? noop() : applyEsLintFix(),
+    ngAddDependenciesRule(options, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall })
+  ]);
 }
 
 /**

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

@@ -1,12 +1,9 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
-
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
-  /** Project name */
-  projectName: string | undefined;
+import type {
+  NgAddOptions,
+  SchematicOptionObject,
+} from '@o3r/schematics';
 
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
   /** Skip the linter process which includes the run of EsLint and EditorConfig rules */
   skipLinter: boolean;
-
-  /** Skip the install process */
-  skipInstall: boolean;
 }