@o3r/store-sync 13.0.0-prerelease.2 → 13.0.0-prerelease.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/store-sync",
-  "version": "13.0.0-prerelease.2",
+  "version": "13.0.0-prerelease.4",
   "publishConfig": {
     "access": "public"
   },
@@ -13,14 +13,14 @@
     "otter-module"
   ],
   "peerDependencies": {
-    "@ama-sdk/core": "^13.0.0-prerelease.2",
+    "@ama-sdk/core": "^13.0.0-prerelease.4",
     "@angular-devkit/core": "^20.0.0",
     "@angular-devkit/schematics": "^20.0.0",
     "@ngrx/entity": "^20.0.0",
     "@ngrx/store": "^20.0.0",
-    "@o3r/core": "^13.0.0-prerelease.2",
-    "@o3r/logger": "^13.0.0-prerelease.2",
-    "@o3r/schematics": "^13.0.0-prerelease.2",
+    "@o3r/core": "^13.0.0-prerelease.4",
+    "@o3r/logger": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "@schematics/angular": "^20.0.0",
     "fast-deep-equal": "^3.1.3",
     "rxjs": "^7.8.1",
@@ -45,7 +45,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^13.0.0-prerelease.2",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "tslib": "^2.6.2"
   },
   "schematics": "./collection.json",

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":"AACA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqElB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAMpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+BlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -17,49 +17,16 @@ const dependenciesToInstall = [
  * List of external dependencies to be added to the project as dev dependencies
  */
 const devDependenciesToInstall = [];
+const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
 /**
  * Add Otter store-sync to an Otter Project
  * @param options
  */
 function ngAddFn(options) {
-    return (tree, context) => {
-        // use dynamic import to properly raise an exception if it is not an Otter project.
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const projectDirectory = workspaceProject?.root || '.';
-        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
-        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
-        const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
-            acc[dep] = {
-                inManifest: [{
-                        range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
-                        types: (0, schematics_2.getProjectNewDependenciesTypes)(workspaceProject)
-                    }],
-                ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
-            };
-            return acc;
-        }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
-            devDependenciesToInstall,
-            dependenciesToInstall,
-            projectType: workspaceProject?.projectType,
-            projectPackageJson,
-            o3rPackageJsonPath: packageJsonPath
-        }, context.logger);
-        return (0, schematics_1.chain)([
-            // optional custom action dedicated to this module
-            options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
-            // add the missing Otter modules in the current project
-            (0, schematics_2.setupDependencies)({
-                projectName: options.projectName,
-                dependencies: {
-                    ...dependencies,
-                    ...externalDependenciesInfo
-                },
-                ngAddToRun: depsInfo.o3rPeerDeps
-            })
-        ]);
-    };
+    return (0, schematics_1.chain)([
+        options.skipLinter ? (0, schematics_1.noop)() : (0, schematics_2.applyEsLintFix)(),
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall })
+    ]);
 }
 /**
  * Add Otter store-sync to an Otter Project

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

@@ -1,12 +1,6 @@
-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;
-    /** 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,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,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,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,WAAW,qBAAsB,SAAQ,YAAY,EAAE,qBAAqB;IAChF,sFAAsF;IACtF,UAAU,EAAE,OAAO,CAAC;CACrB"}