@ama-sdk/client-fetch 12.5.0-prerelease.8 → 13.0.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/client-fetch",
-  "version": "12.5.0-prerelease.8",
+  "version": "13.0.0-next.0",
   "publishConfig": {
     "access": "public"
   },
@@ -38,20 +38,21 @@
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest"
   },
   "dependencies": {
-    "@o3r/schematics": "^12.5.0-prerelease.8",
+    "@o3r/schematics": "^13.0.0-next.0",
     "@swc/helpers": "~0.5.0",
     "ts-node": "~10.9.2",
     "tslib": "^2.6.2",
     "uuid": "^11.0.5"
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^12.5.0-prerelease.8",
+    "@ama-sdk/core": "^13.0.0-next.0",
     "@angular-devkit/schematics": "^19.0.0",
     "@angular/cli": "^19.0.0",
     "@angular/common": "^19.0.0",
-    "@o3r/schematics": "^12.5.0-prerelease.8",
+    "@o3r/schematics": "^13.0.0-next.0",
     "@schematics/angular": "^19.0.0",
     "isomorphic-fetch": "^3.0.0",
+    "type-fest": "^4.30.1",
     "typescript": "^5.5.4"
   },
   "peerDependenciesMeta": {
@@ -73,12 +74,15 @@
     "isomorphic-fetch": {
       "optional": true
     },
+    "type-fest": {
+      "optional": true
+    },
     "typescript": {
       "optional": true
     }
   },
   "devDependencies": {
-    "@ama-sdk/core": "^12.5.0-prerelease.8",
+    "@ama-sdk/core": "^13.0.0-next.0",
     "@angular-devkit/core": "~19.2.0",
     "@angular-devkit/schematics": "~19.2.0",
     "@angular/common": "~19.2.0",
@@ -86,9 +90,9 @@
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
     "@nx/eslint-plugin": "~20.8.0",
     "@nx/jest": "~20.8.0",
-    "@o3r/build-helpers": "^12.5.0-prerelease.8",
-    "@o3r/eslint-plugin": "^12.5.0-prerelease.8",
-    "@o3r/test-helpers": "^12.5.0-prerelease.8",
+    "@o3r/build-helpers": "^13.0.0-next.0",
+    "@o3r/eslint-plugin": "^13.0.0-next.0",
+    "@o3r/test-helpers": "^13.0.0-next.0",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@stylistic/eslint-plugin-ts": "~3.1.0",
@@ -105,7 +109,7 @@
     "eslint-import-resolver-typescript": "~3.10.0",
     "eslint-plugin-import": "~2.31.0",
     "eslint-plugin-import-newlines": "~1.4.0",
-    "eslint-plugin-jest": "~28.13.0",
+    "eslint-plugin-jest": "~28.14.0",
     "eslint-plugin-jsdoc": "~50.8.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~56.0.0",

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;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAmDlB;;;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;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA2DlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}

package/schematics/ng-add/index.js

@@ -4,9 +4,9 @@ exports.ngAdd = void 0;
 const path = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_2 = require("@o3r/schematics");
-const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const import_map_1 = require("./migration/import-map");
 const devDependenciesToInstall = [];
+const dependenciesToInstall = [];
 /**
  * Add SDk Fetch Client to an Otter Project
  * @param options
@@ -16,6 +16,7 @@ function ngAddFn(options) {
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
         const depsInfo = (0, schematics_2.getO3rPeerDeps)(packageJsonPath);
+        const projectPackageJson = tree.readJson(path.posix.join(workspaceProject?.root || '.', 'package.json'));
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{
@@ -26,22 +27,23 @@ function ngAddFn(options) {
             };
             return acc;
         }, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
-        Object.entries((0, schematics_2.getExternalDependenciesVersionRange)(devDependenciesToInstall, packageJsonPath, context.logger))
-            .forEach(([dep, range]) => {
-            dependencies[dep] = {
-                inManifest: [{
-                        range,
-                        types: [dependencies_1.NodeDependencyType.Dev]
-                    }]
-            };
-        });
+        const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
+            devDependenciesToInstall,
+            dependenciesToInstall,
+            o3rPackageJsonPath: packageJsonPath,
+            projectPackageJson,
+            projectType: workspaceProject?.projectType
+        }, 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: {
+                    ...dependencies,
+                    ...externalDependenciesInfo
+                },
                 ngAddToRun: depsInfo.o3rPeerDeps
             }),
             (0, schematics_2.updateImports)(import_map_1.mapMigrationFromCoreImports)

package/schematics/ng-add/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAClC,2DAIoC;AACpC,gDAUyB;AAIzB,uDAEgC;AAKhC,MAAM,wBAAwB,GAAa,EAE1C,CAAC;AACF,MAAM,qBAAqB,GAAa,EAEvC,CAAC;AAEF;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA8B;IAC7C,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,IAAA,2BAAc,EAAC,eAAe,CAAC,CAAC;QACjD,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,IAAI,GAAG,EAAE,cAAc,CAAC,CAAgB,CAAC;QAExH,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,GAAG,CAAC,GAAG,CAAC,GAAG;gBACT,UAAU,EAAE,CAAC;wBACX,KAAK,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,cAAc,EAAE;wBACxE,KAAK,EAAE,IAAA,2CAA8B,EAAC,gBAAgB,CAAC;qBACxD,CAAC;gBACF,YAAY,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,EAAE;aAC3D,CAAC;YACF,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAA,oCAAuB,EAAC,eAAe,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;QAC1G,MAAM,wBAAwB,GAAG,IAAA,wCAA2B,EAC1D;YACE,wBAAwB;YACxB,qBAAqB;YACrB,kBAAkB,EAAE,eAAe;YACnC,kBAAkB;YAClB,WAAW,EAAE,gBAAgB,EAAE,WAAW;SAC3C,EACD,OAAO,CAAC,MAAM,CACf,CAAC;QAEF,OAAO,IAAA,kBAAK,EAAC;YACX,kDAAkD;YAClD,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAA,iBAAI,GAAE,CAAC,CAAC,CAAC,IAAA,2BAAc,GAAE;YAC9C,uDAAuD;YACvD,IAAA,8BAAiB,EAAC;gBAChB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE;oBACZ,GAAG,YAAY;oBACf,GAAG,wBAAwB;iBAC5B;gBACD,UAAU,EAAE,QAAQ,CAAC,WAAW;aACjC,CAAC;YAEF,IAAA,0BAAa,EAAC,wCAA2B,CAAC;SAC3C,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,KAAK,GAAG,CAAC,OAA8B,EAAE,EAAE,CAAC,IAAA,iCAAoB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AAAnF,QAAA,KAAK,SAA8E"}

package/schematics/ng-add/migration/import-map.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-map.js","sourceRoot":"","sources":["../../../../schematics/ng-add/migration/import-map.ts"],"names":[],"mappings":";;;AAAA,MAAM,cAAc,GAAG;IACrB,UAAU,EAAE,uBAAuB;CACpC,CAAC;AAEW,QAAA,2BAA2B,GAAG;IACzC,eAAe,EAAE;QACf,WAAW;QACX,oBAAoB;QACpB,oBAAoB;QACpB,aAAa;QACb,2BAA2B;QAC3B,+BAA+B;QAC/B,gBAAgB;QAChB,eAAe;QACf,YAAY;QACZ,iBAAiB;QACjB,kBAAkB;QAClB,oBAAoB;QACpB,8BAA8B;QAC9B,MAAM;QACN,0BAA0B;QAC1B,yBAAyB;QACzB,oBAAoB;QACpB,YAAY;QACZ,eAAe;QACf,0BAA0B;QAC1B,iCAAiC;QACjC,mCAAmC;QACnC,cAAc;QACd,kBAAkB;QAClB,yBAAyB;QACzB,2BAA2B;QAC3B,cAAc;KACf,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,EAA2C,CAAC;CAC3G,CAAC"}

package/schematics/ng-add/schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":""}