@o3r/apis-manager 11.3.0-prerelease.4 → 11.3.0-prerelease.41

package/README.md

@@ -42,6 +42,7 @@ The plugins and fetch client come from the ``@ama-sdk/core`` module, but custom
 
 ```typescript
 import { ApiFetchClient, ApiKeyRequest, JsonTokenReply, JsonTokenRequest, ReviverReply, ExceptionReply } from '@ama-sdk/core';
+import { ApiFetchClient } from '@ama-sdk/client-fetch';
 import { ApiManager, ApiManagerModule } from '@o3r/apis-manager';
 
 const PROXY_SERVER = "https://your-enpoint-base-path";
@@ -72,6 +73,7 @@ The **ApiManager** instance can be customized via a *factory* function provided
 
 ```typescript
 import { ApiClient, ApiFetchClient, ApiKeyRequest, Mark, PerformanceMetricPlugin } from '@ama-sdk/core';
+import { ApiFetchClient } from '@ama-sdk/client-fetch';
 import { ApiManager, ApiManagerModule, API_TOKEN } from '@o3r/apis-manager';
 import { EventTrackService } from '@o3r/analytics';
 
@@ -173,7 +175,7 @@ The configuration can be overridden after the instantiation of the API.
 ```typescript
 import { ExampleApi } from '@shared/sdk';
 import { ApiFactoryService } from '@o3r/apis-manager';
-import { ApiFetchClient } from '@ama-sdk/core';
+import { ApiFetchClient } from '@ama-sdk/client-fetch';
 
 @Injectable()
 class MyClass {

package/esm2022/apis-manager/api-factory.service.mjs

@@ -78,10 +78,10 @@ export class ApiFactoryService {
     getConfigFor(apiClass) {
         return this.apiManager.getConfiguration(apiClass.apiName);
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiFactoryService, deps: [{ token: API_TOKEN }, { token: INITIAL_APIS_TOKEN, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    /** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiFactoryService }); }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiFactoryService, deps: [{ token: API_TOKEN }, { token: INITIAL_APIS_TOKEN, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    /** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiFactoryService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiFactoryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiFactoryService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.ApiManager, decorators: [{
                     type: Inject,

package/esm2022/apis-manager/api-manager.module.mjs

@@ -17,13 +17,13 @@ export class ApiManagerModule {
             ]
         };
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    /** @nocollapse */ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule }); }
-    /** @nocollapse */ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule, providers: [
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    /** @nocollapse */ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule }); }
+    /** @nocollapse */ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule, providers: [
             ApiFactoryService
         ] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule, decorators: [{
             type: NgModule,
             args: [{
                     providers: [

package/fesm2022/o3r-apis-manager.mjs

@@ -125,10 +125,10 @@ class ApiFactoryService {
     getConfigFor(apiClass) {
         return this.apiManager.getConfiguration(apiClass.apiName);
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiFactoryService, deps: [{ token: API_TOKEN }, { token: INITIAL_APIS_TOKEN, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    /** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiFactoryService }); }
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiFactoryService, deps: [{ token: API_TOKEN }, { token: INITIAL_APIS_TOKEN, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    /** @nocollapse */ static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiFactoryService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiFactoryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiFactoryService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: ApiManager, decorators: [{
                     type: Inject,
@@ -155,13 +155,13 @@ class ApiManagerModule {
             ]
         };
     }
-    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    /** @nocollapse */ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule }); }
-    /** @nocollapse */ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule, providers: [
+    /** @nocollapse */ static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    /** @nocollapse */ static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule }); }
+    /** @nocollapse */ static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule, providers: [
             ApiFactoryService
         ] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.2", ngImport: i0, type: ApiManagerModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.3", ngImport: i0, type: ApiManagerModule, decorators: [{
             type: NgModule,
             args: [{
                     providers: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/apis-manager",
-  "version": "11.3.0-prerelease.4",
+  "version": "11.3.0-prerelease.41",
   "publishConfig": {
     "access": "public"
   },
@@ -11,16 +11,20 @@
     "otter-module"
   ],
   "peerDependencies": {
-    "@ama-sdk/core": "^11.3.0-prerelease.4",
+    "@ama-sdk/client-fetch": "^11.3.0-prerelease.41",
+    "@ama-sdk/core": "^11.3.0-prerelease.41",
     "@angular-devkit/schematics": "~18.2.0",
     "@angular/common": "~18.2.0",
     "@angular/core": "~18.2.0",
-    "@o3r/schematics": "^11.3.0-prerelease.4",
+    "@o3r/schematics": "^11.3.0-prerelease.41",
     "@schematics/angular": "~18.2.0",
     "rxjs": "^7.8.1",
     "typescript": "~5.5.4"
   },
   "peerDependenciesMeta": {
+    "@ama-sdk/client-fetch": {
+      "optional": true
+    },
     "@angular-devkit/schematics": {
       "optional": true
     },

package/schematics/helpers/update-api-deps/index.d.ts

@@ -1,10 +1,8 @@
 import { Rule } from '@angular-devkit/schematics';
+import type { NgAddSchematicsSchema } from '../../ng-add/schema';
 /**
  * Update app.module file with api manager, if needed
  * @param options
- * @param options.projectName
  */
-export declare function updateApiDependencies(options: {
-    projectName?: string | undefined;
-}): Rule;
+export declare function updateApiDependencies(options: NgAddSchematicsSchema): Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/helpers/update-api-deps/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/helpers/update-api-deps/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAYjF;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAC,GAAG,IAAI,CA0GvF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/helpers/update-api-deps/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAWjF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAEjE;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CA4G1E"}

package/schematics/helpers/update-api-deps/index.js

@@ -9,7 +9,6 @@ const ts = require("typescript");
 /**
  * Update app.module file with api manager, if needed
  * @param options
- * @param options.projectName
  */
 function updateApiDependencies(options) {
     const updateAppModule = (tree, context) => {
@@ -33,7 +32,8 @@ function updateApiDependencies(options) {
         insertBeforeModule('const PROXY_SERVER = \'https://YOUR_API_ENDPOINT\';');
         insertBeforeModule('appendPreconnect(PROXY_SERVER);');
         addImportToModuleFile('ApiManagerModule', '@o3r/apis-manager');
-        insertBeforeModule(`
+        if (!options.skipCodeSample) {
+            insertBeforeModule(`
 export function apiManagerFactory(): ApiManager {
   const apiClient = new ApiFetchClient({
     basePath: PROXY_SERVER,
@@ -42,9 +42,10 @@ export function apiManagerFactory(): ApiManager {
 
   return new ApiManager(apiClient);
 }`);
-        addProviderToModuleFile('API_TOKEN', '@o3r/apis-manager', 'useFactory: apiManagerFactory');
+            addProviderToModuleFile('API_TOKEN', '@o3r/apis-manager', 'useFactory: apiManagerFactory');
+            insertImportToModuleFile('ApiFetchClient', '@ama-sdk/client-fetch', false);
+        }
         insertImportToModuleFile('ApiManager', '@o3r/apis-manager', false);
-        insertImportToModuleFile('ApiFetchClient', '@ama-sdk/core', false);
         insertImportToModuleFile('ApiKeyRequest', '@ama-sdk/core', false);
         tree.commitUpdate(recorder);
         context.logger.info('Please update by hand the placeholders for YOUR_API_ENDPOINT and YOUR_API_KEY!');

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":"AAAA,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAiDtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAEpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAqDtD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}

package/schematics/ng-add/index.js

@@ -25,6 +25,9 @@ function ngAddFn(options) {
         if (projectType === 'application') {
             rulesToExecute.push(updateApiDependencies(options));
         }
+        if (!options.skipCodeSample) {
+            depsInfo.o3rPeerDeps.push('@ama-sdk/client-fetch');
+        }
         const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
             acc[dep] = {
                 inManifest: [{

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

@@ -8,5 +8,10 @@ export interface NgAddSchematicsSchema extends SchematicOptionObject {
     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
+     */
+    skipCodeSample?: 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,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,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,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAE7D,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,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"}

package/schematics/ng-add/schema.json

@@ -25,6 +25,11 @@
       "type": "boolean",
       "description": "Use a pinned version for otter packages",
       "default": false
+    },
+    "skipCodeSample": {
+      "type": "boolean",
+      "description": "Skip the code sample generated in application to register the ApiManager (which is relying on FetchApiClient)",
+      "default": false
     }
   },
   "required": [