@o3r/apis-manager 13.0.0-prerelease.3 → 13.0.0-prerelease.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/apis-manager",
-  "version": "13.0.0-prerelease.3",
+  "version": "13.0.0-prerelease.4",
   "publishConfig": {
     "access": "public"
   },
@@ -11,12 +11,12 @@
     "otter-module"
   ],
   "peerDependencies": {
-    "@ama-sdk/client-fetch": "^13.0.0-prerelease.3",
-    "@ama-sdk/core": "^13.0.0-prerelease.3",
+    "@ama-sdk/client-fetch": "^13.0.0-prerelease.4",
+    "@ama-sdk/core": "^13.0.0-prerelease.4",
     "@angular-devkit/schematics": "^20.0.0",
     "@angular/common": "^20.0.0",
     "@angular/core": "^20.0.0",
-    "@o3r/schematics": "^13.0.0-prerelease.3",
+    "@o3r/schematics": "^13.0.0-prerelease.4",
     "@schematics/angular": "^20.0.0",
     "rxjs": "^7.8.1",
     "ts-node": "~10.9.2",
@@ -41,7 +41,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^13.0.0-prerelease.3",
+    "@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,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAwElB;;;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,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAwClB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -4,6 +4,7 @@ exports.ngAdd = void 0;
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
+const update_api_deps_1 = require("../helpers/update-api-deps");
 /**
  * List of external dependencies to be added to the project as peer dependencies
  */
@@ -21,48 +22,21 @@ const devDependenciesToInstall = [];
  * @param options
  */
 function ngAddFn(options) {
-    return async (tree, context) => {
-        const { updateApiDependencies } = await Promise.resolve().then(() => require('../helpers/update-api-deps'));
-        const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
-        const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
-        const rulesToExecute = [];
-        const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
-        const projectType = workspaceProject?.projectType || 'application';
-        if (projectType === 'application') {
-            rulesToExecute.push(updateApiDependencies(options));
-        }
-        if (!options.skipCodeSample) {
-            depsInfo.o3rPeerDeps.push('@ama-sdk/client-fetch');
-        }
-        const projectDirectory = workspaceProject?.root || '.';
-        const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
-        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
-            dependenciesToInstall,
-            devDependenciesToInstall,
-            projectType: workspaceProject?.projectType,
-            o3rPackageJsonPath: packageJsonPath,
-            projectPackageJson
-        }, context.logger);
-        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));
-        return () => (0, schematics_1.chain)([
-            ...rulesToExecute,
-            options.skipLinter ? schematics_1.noop : (0, schematics_2.applyEsLintFix)(),
-            (0, schematics_2.setupDependencies)({
-                projectName: options.projectName,
-                dependencies: { ...dependencies, ...externalDependenciesInfo },
-                ngAddToRun: depsInfo.o3rPeerDeps
-            })
-        ]);
-    };
+    const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
+    return (0, schematics_1.chain)([
+        (tree) => {
+            const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
+            const projectType = workspaceProject?.projectType || 'application';
+            if (projectType === 'application') {
+                return (0, update_api_deps_1.updateApiDependencies)(options);
+            }
+        },
+        options.skipLinter ? schematics_1.noop : (0, schematics_2.applyEsLintFix)(),
+        (0, schematics_2.ngAddDependenciesRule)(options, packageJsonPath, {
+            dependenciesToInstall: dependenciesToInstall.concat(options.skipCodeSample ? [] : ['@ama-sdk/client-fetch']),
+            devDependenciesToInstall
+        })
+    ]);
 }
 /**
  * Add Otter apis manager to an Angular Project

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

@@ -1,13 +1,7 @@
-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;
     /**
      * Skip the code sample generated in application to register the ApiManager
      * If `false`, a dependency to @ama-sdk/client-fetch will be added

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;IAE1B;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B"}
+{"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;IAEpB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B"}