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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/forms",
-  "version": "13.0.0-prerelease.2",
+  "version": "13.0.0-prerelease.4",
   "publishConfig": {
     "access": "public"
   },
@@ -11,15 +11,15 @@
     "otter-module"
   ],
   "peerDependencies": {
-    "@ama-sdk/core": "^13.0.0-prerelease.2",
+    "@ama-sdk/core": "^13.0.0-prerelease.4",
     "@angular-devkit/schematics": "^20.0.0",
     "@angular/common": "^20.0.0",
     "@angular/core": "^20.0.0",
     "@angular/forms": "^20.0.0",
     "@ngrx/entity": "^20.0.0",
     "@ngrx/store": "^20.0.0",
-    "@o3r/core": "^13.0.0-prerelease.2",
-    "@o3r/schematics": "^13.0.0-prerelease.2",
+    "@o3r/core": "^13.0.0-prerelease.4",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "@schematics/angular": "^20.0.0",
     "rxjs": "^7.8.1",
     "ts-node": "~10.9.2",
@@ -40,7 +40,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^13.0.0-prerelease.2",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "tslib": "^2.6.2"
   },
   "engines": {

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

@@ -1,4 +1,4 @@
-import type { Rule } from '@angular-devkit/schematics';
+import { type Rule } from '@angular-devkit/schematics';
 import type { NgAddSchematicsSchema } from './schema';
 /**
  * Add Otter forms to an Angular Project

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,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAkDlB;;;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,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAgClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = void 0;
 const path = require("node:path");
-const schematics_1 = require("@o3r/schematics");
+const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * List of external dependencies to be added to the project as peer dependencies
  */
@@ -25,30 +26,14 @@ const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
  */
 function ngAddFn(options) {
     /* ng add rules */
-    return (tree, context) => {
-        const workspaceProject = options.projectName ? (0, schematics_1.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const projectDirectory = workspaceProject?.root || '.';
-        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
-        const externalDependenciesInfo = (0, schematics_1.getExternalDependenciesInfo)({
-            devDependenciesToInstall,
-            dependenciesToInstall,
-            o3rPackageJsonPath: packageJsonPath,
-            projectPackageJson,
-            projectType: workspaceProject?.projectType
-        }, context.logger);
-        return (0, schematics_1.setupDependencies)({
-            projectName: options.projectName,
-            dependencies: {
-                ...(0, schematics_1.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion),
-                ...externalDependenciesInfo
-            }
-        });
-    };
+    return (0, schematics_1.chain)([
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall })
+    ]);
 }
 /**
  * Add Otter forms to an Angular Project
  * @param options
  */
-const ngAdd = (options) => (0, schematics_1.createOtterSchematic)(ngAddFn)(options);
+const ngAdd = (options) => (0, schematics_2.createOtterSchematic)(ngAddFn)(options);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

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

@@ -1,8 +1,4 @@
-import type { SchematicOptionObject } from '@o3r/schematics';
-export interface NgAddSchematicsSchema extends SchematicOptionObject {
-    /** Project name */
-    projectName?: string | undefined;
-    /** Use a pinned version for otter packages */
-    exactO3rVersion?: boolean;
+import type { NgAddOptions, SchematicOptionObject } from '@o3r/schematics';
+export interface NgAddSchematicsSchema extends NgAddOptions, SchematicOptionObject {
 }
 //# 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;IACjC,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;CAAG"}