@ama-sdk/schematics 12.3.0-prerelease.6 → 12.3.0-prerelease.60

package/README.md

@@ -119,9 +119,27 @@ For more information, check out OpenAPI's documentation on [parameter serializat
 It is important to note that, as in OpenAPI 3.1, we only support simple arrays and simple non-nested objects in path and query parameters. 
 The parameter types that we support are stored in `SupportedParamType` in the package `@ama-sdk/core`.
 
+To enable the parameter serialization within your API, you can set the option `enableParameterSerialization` to `true` (its current default value is `false`) in the constructor. For example:
+```typescript
+const apiConfig: ApiClient = new ApiFetchClient(
+  {
+    basePath: 'https://petstore3.swagger.io/api/v3',
+    enableParameterSerialization: true
+  }
+);
+```
+
+We provide the methods `serializeQueryParams` and `serializePathParams` to serialize the values of query and path parameters. However, it is also possible to pass
+your own serialization methods if the ones provided do not meet your requirements. These custom methods can be passed as a parameter to the API client constructor.
+
+> [!NOTE]
+> If you have enabled the serialization mechanism and want to update the query parameters within a `RequestPlugin`, these must be serialized before being returned to the
+> API to prepare the URL. You can do so by using the serialization method that we provide (`serializeQueryParams`) or your own serialization method. The value of the query
+> parameters returned by the `RequestPlugin` will be forwarded to the next plugin and the last value will be directly added to the URL.
+
 > [!NOTE]
-> We provide the methods `serializeQueryParams` and `serializePathParams` to serialize the values of query and path parameters. However, it is also possible to pass
-> your own serialization methods if the ones provided do not meet your requirements. These custom methods can be passed as a parameter to the API client constructor.
+> It is important to note that special characters have to be encoded, as required by RFC6570 and RFC3986. Please take this into account if you choose to use your own
+> serialization methods.
 
 #### Light SDK
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "12.3.0-prerelease.6",
+  "version": "12.3.0-prerelease.60",
   "publishConfig": {
     "access": "public"
   },
@@ -62,12 +62,12 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^12.3.0-prerelease.6",
+    "@ama-sdk/core": "^12.3.0-prerelease.60",
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics-cli": "^19.0.0",
     "@angular/cli": "^19.0.0",
-    "@o3r/schematics": "^12.3.0-prerelease.6",
-    "@o3r/telemetry": "^12.3.0-prerelease.6",
+    "@o3r/schematics": "^12.3.0-prerelease.60",
+    "@o3r/telemetry": "^12.3.0-prerelease.60",
     "@openapitools/openapi-generator-cli": "^2.15.0",
     "openapi-types": "^12.0.0",
     "ts-node": "~10.9.2",
@@ -76,6 +76,7 @@
   "dependencies": {
     "@angular-devkit/core": "~19.2.0",
     "@angular-devkit/schematics": "~19.2.0",
+    "@o3r/schematics": "^12.3.0-prerelease.60",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
     "js-yaml": "^4.1.0",
@@ -86,18 +87,17 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^12.3.0-prerelease.6",
+    "@ama-sdk/core": "^12.3.0-prerelease.60",
     "@angular-devkit/schematics-cli": "~19.2.0",
     "@angular/cli": "~19.2.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@nx/eslint-plugin": "~20.7.0",
-    "@nx/jest": "~20.7.0",
-    "@o3r/build-helpers": "^12.3.0-prerelease.6",
-    "@o3r/eslint-plugin": "^12.3.0-prerelease.6",
-    "@o3r/schematics": "^12.3.0-prerelease.6",
-    "@o3r/telemetry": "^12.3.0-prerelease.6",
-    "@o3r/test-helpers": "^12.3.0-prerelease.6",
-    "@openapitools/openapi-generator-cli": "~2.18.0",
+    "@nx/eslint-plugin": "~20.8.0",
+    "@nx/jest": "~20.8.0",
+    "@o3r/build-helpers": "^12.3.0-prerelease.60",
+    "@o3r/eslint-plugin": "^12.3.0-prerelease.60",
+    "@o3r/telemetry": "^12.3.0-prerelease.60",
+    "@o3r/test-helpers": "^12.3.0-prerelease.60",
+    "@openapitools/openapi-generator-cli": "~2.19.0",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/jest": "~29.5.2",
@@ -107,12 +107,12 @@
     "@types/node": "^20.0.0",
     "@types/pid-from-port": "^1.1.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.29.0",
+    "@typescript-eslint/parser": "~8.31.0",
     "angular-eslint": "~19.3.0",
     "commit-and-tag-version": "^12.0.0",
     "copyfiles": "^2.4.1",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.23.0",
+    "eslint": "~9.25.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.0",
     "eslint-plugin-import": "~2.31.0",
@@ -129,7 +129,7 @@
     "jsonc-eslint-parser": "~2.4.0",
     "mem-fs": "^4.0.0",
     "npm-run-all2": "^7.0.0",
-    "nx": "~20.7.0",
+    "nx": "~20.8.0",
     "openapi-types": "^12.0.0",
     "pid-from-port": "^1.1.3",
     "semver": "^7.5.2",
@@ -137,21 +137,22 @@
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.29.0"
+    "typescript-eslint": "~8.31.0"
   },
   "generatorDependencies": {
-    "@swc/cli": "~0.6.0",
-    "@swc/core": "~1.11.0",
-    "@swc/helpers": "~0.5.0",
+    "@angular-eslint/eslint-plugin": "^19.0.0",
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.29.0",
+    "@swc/cli": "~0.7.0",
+    "@swc/core": "~1.11.0",
+    "@swc/helpers": "~0.5.0",
+    "@typescript-eslint/eslint-plugin": "~8.31.0",
     "jest-junit": "~16.0.0",
     "lint-staged": "^15.0.0",
     "minimist": "^1.2.6",
     "rimraf": "^6.0.1",
-    "typedoc": "~0.28.0",
     "tsc-watch": "^6.0.4",
+    "typedoc": "~0.28.0",
     "yaml-eslint-parser": "^1.2.2"
   },
   "openApiSupportedVersion": "^7.11.0",

package/schematics/api-extension/index.d.ts

@@ -4,5 +4,5 @@ import { NgGenerateApiExtensionSchematicsSchema } from './schema';
  * Generate a Extension of a API core definition
  * @param options
  */
-export declare const ngGenerateApiExtension: (options: NgGenerateApiExtensionSchematicsSchema) => () => Promise<Rule>;
+export declare const ngGenerateApiExtension: (options: NgGenerateApiExtensionSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/api-extension/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/api-extension/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,sCAAsC,EACvC,MAAM,UAAU,CAAC;AAiBlB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAAI,SAAS,sCAAsC,wBAKrF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/api-extension/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EACL,sCAAsC,EACvC,MAAM,UAAU,CAAC;AAiBlB;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAAI,SAAS,sCAAsC,SAA4D,CAAC"}

package/schematics/api-extension/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateApiExtension = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 /**
  * Generate a Extension of a API core definition
  * @param options
@@ -20,9 +21,6 @@ function ngGenerateApiExtensionFn(options) {
  * Generate a Extension of a API core definition
  * @param options
  */
-const ngGenerateApiExtension = (options) => async () => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createOtterSchematic(ngGenerateApiExtensionFn)(options);
-};
+const ngGenerateApiExtension = (options) => (0, schematics_2.createOtterSchematic)(ngGenerateApiExtensionFn)(options);
 exports.ngGenerateApiExtension = ngGenerateApiExtension;
 //# sourceMappingURL=index.js.map

package/schematics/migrate/index.d.ts

@@ -4,5 +4,5 @@ import { MigrateSchematicsSchemaOptions } from './schema';
  * Facilitate the migration of a version to another by the run of migration rules
  * @param options
  */
-export declare const migrate: (options: MigrateSchematicsSchemaOptions) => () => Promise<Rule>;
+export declare const migrate: (options: MigrateSchematicsSchemaOptions) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/migrate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAsBpC,OAAO,EACL,8BAA8B,EAC/B,MAAM,UAAU,CAAC;AAgClB;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,SAAS,8BAA8B,wBAK9D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAyBpC,OAAO,EACL,8BAA8B,EAC/B,MAAM,UAAU,CAAC;AAgClB;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,SAAS,8BAA8B,SAA6C,CAAC"}

package/schematics/migrate/index.js

@@ -4,6 +4,7 @@ exports.migrate = void 0;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const schematics_1 = require("@o3r/schematics");
+const schematics_2 = require("@o3r/schematics");
 const semver_1 = require("semver");
 const is_typescript_project_1 = require("../helpers/is-typescript-project");
 const typescript_1 = require("../ng-update/typescript");
@@ -40,9 +41,6 @@ function migrateFn(options) {
  * Facilitate the migration of a version to another by the run of migration rules
  * @param options
  */
-const migrate = (options) => async () => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createOtterSchematic(migrateFn)(options);
-};
+const migrate = (options) => (0, schematics_2.createOtterSchematic)(migrateFn)(options);
 exports.migrate = migrate;
 //# sourceMappingURL=index.js.map

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":"AAOA,OAAO,EAGL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAcpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAOlB;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAwCtC,CAAC;AAuGF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,MAAM,qBAAqB,KAAG,IAKnD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAGL,IAAI,EAGL,MAAM,4BAA4B,CAAC;AAkBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAOlB;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAwCtC,CAAC;AAoGF;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,MAAM,qBAAqB,SAAwC,CAAC"}

package/schematics/ng-add/index.js

@@ -5,6 +5,7 @@ const node_fs_1 = require("node:fs");
 const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const rxjs_1 = require("rxjs");
 const node_install_1 = require("../helpers/node-install");
 const packageJsonPath = '/package.json';
@@ -122,10 +123,7 @@ const registerPackageSchematics = async (tree, context) => {
     }
     return () => (0, schematics_1.chain)([
         ...schematicsDependencies.map((dep) => (0, schematics_1.externalSchematic)(dep, 'ng-add', {})),
-        async (t, c) => {
-            const { registerPackageCollectionSchematics } = await Promise.resolve().then(() => require('@o3r/schematics'));
-            return () => registerPackageCollectionSchematics(amaSdkSchematicsPackageJsonContent)(t, c);
-        }
+        (0, schematics_2.registerPackageCollectionSchematics)(amaSdkSchematicsPackageJsonContent)
     ]);
 };
 /**
@@ -146,9 +144,6 @@ function ngAddFn() {
  * Add Otter ama-sdk-schematics to a Project
  * @param opts
  */
-const ngAdd = (opts) => async () => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createOtterSchematic(ngAddFn)(opts);
-};
+const ngAdd = (opts) => (0, schematics_2.createOtterSchematic)(ngAddFn)(opts);
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/typescript/core/index.d.ts

@@ -4,5 +4,5 @@ import { NgGenerateTypescriptSDKCoreSchematicsSchema } from './schema';
  * Generate a typescript SDK source code base on swagger specification
  * @param options
  */
-export declare const ngGenerateTypescriptSDK: (options: NgGenerateTypescriptSDKCoreSchematicsSchema) => () => Promise<Rule>;
+export declare const ngGenerateTypescriptSDK: (options: NgGenerateTypescriptSDKCoreSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/typescript/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AA8BpC,OAAO,EACL,2CAA2C,EAC5C,MAAM,UAAU,CAAC;AAoQlB;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAI,SAAS,2CAA2C,wBAK3F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAiCpC,OAAO,EACL,2CAA2C,EAC5C,MAAM,UAAU,CAAC;AAoQlB;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAI,SAAS,2CAA2C,SAA6D,CAAC"}

package/schematics/typescript/core/index.js

@@ -5,6 +5,7 @@ const node_fs_1 = require("node:fs");
 const path = require("node:path");
 const node_url_1 = require("node:url");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const semver = require("semver");
 const open_api_cli_generator_1 = require("../../code-generator/open-api-cli-generator/open-api-cli.generator");
 const generators_1 = require("../../helpers/generators");
@@ -245,9 +246,6 @@ function ngGenerateTypescriptSDKFn(options) {
  * Generate a typescript SDK source code base on swagger specification
  * @param options
  */
-const ngGenerateTypescriptSDK = (options) => async () => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createOtterSchematic(ngGenerateTypescriptSDKFn)(options);
-};
+const ngGenerateTypescriptSDK = (options) => (0, schematics_2.createOtterSchematic)(ngGenerateTypescriptSDKFn)(options);
 exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
 //# sourceMappingURL=index.js.map

package/schematics/typescript/mock/index.d.ts

@@ -9,5 +9,5 @@ export declare function getDasherizeModelName(modelName: string): string;
  * Add mock
  * @param options
  */
-export declare const ngGenerateMock: (options: NgGenerateMockSchematicsSchema) => () => Promise<Rule>;
+export declare const ngGenerateMock: (options: NgGenerateMockSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/typescript/mock/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/mock/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EAKL,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,8BAA8B,EAC/B,MAAM,UAAU,CAAC;AAsBlB;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE/D;AA+CD;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,8BAA8B,wBAKrE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/mock/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EACL,8BAA8B,EAC/B,MAAM,UAAU,CAAC;AAsBlB;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE/D;AAgDD;;;GAGG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,8BAA8B,SAAoD,CAAC"}

package/schematics/typescript/mock/index.js

@@ -5,6 +5,7 @@ exports.getDasherizeModelName = getDasherizeModelName;
 const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 function endsWith(singular, matches, excludes = []) {
     return matches.some((match) => singular.endsWith(match)
         && excludes.every((exclude) => !singular.endsWith(exclude)));
@@ -61,6 +62,7 @@ function ngGenerateMockFn(options) {
                 dasherizeModelName,
                 dasherizeAndCapitalizeModelName: dasherizeModelName.toUpperCase()
             }),
+            (0, schematics_1.renameTemplateFiles)(),
             (0, schematics_1.move)(mockDestination)
         ]), schematics_1.MergeStrategy.Overwrite)(tree, context);
     };
@@ -74,9 +76,6 @@ function ngGenerateMockFn(options) {
  * Add mock
  * @param options
  */
-const ngGenerateMock = (options) => async () => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createOtterSchematic(ngGenerateMockFn)(options);
-};
+const ngGenerateMock = (options) => (0, schematics_2.createOtterSchematic)(ngGenerateMockFn)(options);
 exports.ngGenerateMock = ngGenerateMock;
 //# sourceMappingURL=index.js.map

package/schematics/typescript/shell/index.d.ts

@@ -4,5 +4,5 @@ import type { NgGenerateTypescriptSDKShellSchematicsSchema } from './schema';
  * Generate Typescript SDK shell
  * @param options
  */
-export declare const ngGenerateTypescriptSDK: (options: NgGenerateTypescriptSDKShellSchematicsSchema) => () => Promise<Rule>;
+export declare const ngGenerateTypescriptSDK: (options: NgGenerateTypescriptSDKShellSchematicsSchema) => Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/typescript/shell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAYpC,OAAO,KAAK,EACV,4CAA4C,EAC7C,MAAM,UAAU,CAAC;AAoJlB;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAI,SAAS,4CAA4C,wBAK5F,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAgBpC,OAAO,KAAK,EACV,4CAA4C,EAC7C,MAAM,UAAU,CAAC;AAkJlB;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAAI,SAAS,4CAA4C,SAA6D,CAAC"}

package/schematics/typescript/shell/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateTypescriptSDK = void 0;
 const node_path_1 = require("node:path");
 const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const js_yaml_1 = require("js-yaml");
 const node_install_1 = require("../../helpers/node-install");
 const read_package_1 = require("../../helpers/read-package");
@@ -18,7 +19,6 @@ function ngGenerateTypescriptSDKFn(options) {
     };
     const setupRule = async (tree, context) => {
         const amaSdkSchematicsPackageJson = await (0, read_package_1.readPackageJson)();
-        const { enforceTildeRange } = await Promise.resolve().then(() => require('@o3r/schematics'));
         const versions = Object.fromEntries(Object.entries({
             tslib: amaSdkSchematicsPackageJson.dependencies.tslib,
             '@commitlint/cli': amaSdkSchematicsPackageJson.generatorDependencies['@commitlint/cli'],
@@ -53,7 +53,7 @@ function ngGenerateTypescriptSDKFn(options) {
             'tsc-watch': amaSdkSchematicsPackageJson.generatorDependencies['tsc-watch'],
             'yaml-eslint-parser': amaSdkSchematicsPackageJson.generatorDependencies['yaml-eslint-parser'],
             typedoc: amaSdkSchematicsPackageJson.generatorDependencies.typedoc
-        }).map(([key, range]) => ([key, enforceTildeRange(range)])));
+        }).map(([key, range]) => ([key, (0, schematics_2.enforceTildeRange)(range)])));
         const openApiSupportedVersion = typeof amaSdkSchematicsPackageJson.openApiSupportedVersion === 'string'
             && amaSdkSchematicsPackageJson.openApiSupportedVersion.replace(/\^|~/, '');
         context.logger.warn(JSON.stringify(openApiSupportedVersion));
@@ -75,7 +75,7 @@ function ngGenerateTypescriptSDKFn(options) {
             sdkCoreRange: `${options.exactO3rVersion ? '' : '~'}${amaSdkSchematicsPackageJson.version}`,
             sdkCoreVersion: amaSdkSchematicsPackageJson.version,
             angularVersion: amaSdkSchematicsPackageJson.dependencies['@angular-devkit/core'],
-            angularEslintVersion: amaSdkSchematicsPackageJson.devDependencies['@angular-eslint/eslint-plugin'],
+            angularEslintVersion: amaSdkSchematicsPackageJson.generatorDependencies['@angular-eslint/eslint-plugin'],
             versions,
             ...openApiSupportedVersion ? { openApiSupportedVersion } : {},
             engineVersions,
@@ -146,9 +146,6 @@ function ngGenerateTypescriptSDKFn(options) {
  * Generate Typescript SDK shell
  * @param options
  */
-const ngGenerateTypescriptSDK = (options) => async () => {
-    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createOtterSchematic(ngGenerateTypescriptSDKFn)(options);
-};
+const ngGenerateTypescriptSDK = (options) => (0, schematics_2.createOtterSchematic)(ngGenerateTypescriptSDKFn)(options);
 exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
 //# sourceMappingURL=index.js.map

package/schematics/typescript/shell/templates/base/eslint.config.mjs.template

@@ -23,11 +23,7 @@ export default [
       sourceType: 'commonjs',
       parserOptions: {
         tsconfigRootDir: __dirname,
-        project: [
-          'testing/tsconfig.spec.json',
-          'tsconfigs/tsconfig.jest.json',
-          'tsconfigs/tsconfig.source.json'
-        ]
+        projectService: true
       },
       ecmaVersion: 12
     }

package/schematics/typescript/shell/templates/base/src/api/.editorconfig.template

@@ -0,0 +1,2 @@
+# Exclude folder from project EditorConfig rules
+root = true

package/schematics/typescript/shell/templates/base/src/fixtures/jest/package.json

@@ -2,9 +2,7 @@
   "name": "<% if (projectName) { %>@<%=projectName%>/<% } %><%=projectPackageName%>/jest",
   "main": "../../cjs/api/fixtures.jest.js",
   "module": "../../esm2020/api/fixtures.jest.js",
-  "es2020": "../../esm2020/api/fixtures.jest.js",
-  "esm2020": "../../esm2020/api/fixtures.jest.js",
   "node": "../../cjs/api/fixtures.jest.js",
   "default": "../../esm2020/api/fixtures.jest.js",
-  "typings": "./index.d.ts"
+  "types": "./index.d.ts"
 }

package/schematics/typescript/shell/templates/base/src/helpers/package.json

@@ -2,9 +2,7 @@
   "name": "<% if (projectName) { %>@<%=projectName%>/<% } %><%=projectPackageName%>/helpers",
   "main": "../cjs/helpers/index.js",
   "module": "../esm2020/helpers/index.js",
-  "es2020": "../esm2020/helpers/index.js",
-  "esm2020": "../esm2020/helpers/index.js",
   "node": "../cjs/helpers/index.js",
   "default": "../esm2020/helpers/index.js",
-  "typings": "./index.d.ts"
+  "types": "./index.d.ts"
 }

package/schematics/typescript/shell/templates/base/src/models/base/.editorconfig.template

@@ -0,0 +1,2 @@
+# Exclude folder from project EditorConfig rules
+root = true

package/schematics/typescript/shell/templates/base/src/spec/.editorconfig.template

@@ -0,0 +1,2 @@
+# Exclude folder from project EditorConfig rules
+root = true

package/schematics/typescript/shell/templates/base/src/spec/package.json

@@ -2,9 +2,7 @@
   "name": "<% if (projectName) { %>@<%=projectName%>/<% } %><%=projectPackageName%>/spec",
   "main": "../cjs/spec/index.js",
   "module": "../esm2020/spec/index.js",
-  "es2020": "../esm2020/spec/index.js",
-  "esm2020": "../esm2020/spec/index.js",
   "node": "../cjs/spec/index.js",
   "default": "../esm2020/spec/index.js",
-  "typings": "./index.d.ts"
+  "types": "./index.d.ts"
 }

package/schematics/typescript/shell/templates/base/testing/tsconfig.spec.json

@@ -9,7 +9,7 @@
     "strictNullChecks": false,
     "noImplicitAny": false,
     "incremental": false,
-    "composite": false,
+    "composite": true,
     "declaration": false,
     "declarationMap": false,
     "strict": false,

package/schematics/typescript/shell/templates/base/tsconfigs/tsconfig.jest.json

@@ -10,7 +10,7 @@
   "include": [
     "../src/**/*.jest.fixture.ts",
     "../src/api/fixtures.jest.ts",
-    "../src/fixtures/jest/**/*.ts",
+    "../src/fixtures/jest/**/*.ts"
   ],
   "references": [
     {

package/schematics/typescript/shell/templates/base/configs/tsconfig.test.json

@@ -1,21 +0,0 @@
-{
-  "extends": "../tsconfig",
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es6",
-    "noImplicitAny": false,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "strictNullChecks": false,
-    "noEmitHelpers": true,
-    "importHelpers": true,
-    "sourceMap": true,
-    "declaration": true,
-    "outDir": "test",
-    "lib": [ "dom", "es2015", "dom.iterable", "scripthost", "es2017.object" ]
-  },
-  "include": [
-    "../src/**/*.ts"
-  ],
-  "exclude": []
-}