@ama-sdk/schematics 12.1.0-prerelease.6 → 12.1.0-prerelease.61

package/cli/update-spec-from-npm.cjs

@@ -9,7 +9,7 @@ const promises_1 = require("node:fs/promises");
 const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const minimist = require("minimist");
-const schematics_1 = require("@ama-sdk/schematics");
+const public_api_1 = require("../src/public_api");
 const argv = minimist(process.argv.slice(2));
 const packageName = argv._[0];
 const { help, output, 'package-path': packagePath, quiet } = argv;
@@ -18,7 +18,7 @@ const noop = () => { };
 const logger = quiet ? { error: noop, warn: noop, log: noop, info: noop, debug: noop } : console;
 const SPEC_YML_EXTENSION = 'yml';
 const DEFAULT_SPEC_EXPORT_PATH_IN_NPM_MODULE = 'openapi';
-const supportedExtensions = [schematics_1.SPEC_JSON_EXTENSION, schematics_1.SPEC_YAML_EXTENSION, SPEC_YML_EXTENSION];
+const supportedExtensions = [public_api_1.SPEC_JSON_EXTENSION, public_api_1.SPEC_YAML_EXTENSION, SPEC_YML_EXTENSION];
 if (help) {
     // eslint-disable-next-line no-console -- even if we call the CLI with `--quiet` we want to log the help information
     console.log(`This script can be used to update your local spec file from a given locally installed npm package.
@@ -26,7 +26,7 @@ if (help) {
 
     package-name      The full identifier of the npm package (e.g. @my-scope/my-package)
     --package-path    The relative path inside the npm package where to find the spec file (default: './openapi.yml')
-    --output          The path where the spec file should be copied (default: './${schematics_1.LOCAL_SPEC_FILENAME}.${schematics_1.SPEC_YAML_EXTENSION}')
+    --output          The path where the spec file should be copied (default: './${public_api_1.LOCAL_SPEC_FILENAME}.${public_api_1.SPEC_YAML_EXTENSION}')
     --quiet           Don't log anything
   `);
     process.exit(0);
@@ -58,9 +58,9 @@ const run = async () => {
     if (!specDestinationPath) {
         let specSourceExtension = (0, node_path_1.extname)(specSourcePath);
         if (specSourceExtension === `.${SPEC_YML_EXTENSION}`) {
-            specSourceExtension = `.${schematics_1.SPEC_YAML_EXTENSION}`;
+            specSourceExtension = `.${public_api_1.SPEC_YAML_EXTENSION}`;
         }
-        specDestinationPath = `./${schematics_1.LOCAL_SPEC_FILENAME}${specSourceExtension}`;
+        specDestinationPath = `./${public_api_1.LOCAL_SPEC_FILENAME}${specSourceExtension}`;
         if ((0, node_fs_1.existsSync)(openApiConfigDefaultPath)) {
             const openApiConfig = JSON.parse(await (0, promises_1.readFile)(openApiConfigDefaultPath, { encoding: 'utf8' }));
             const generators = Object.values(openApiConfig['generator-cli']?.generators ?? {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "12.1.0-prerelease.6",
+  "version": "12.1.0-prerelease.61",
   "publishConfig": {
     "access": "public"
   },
@@ -15,8 +15,7 @@
     "build": "yarn nx build ama-sdk-schematics",
     "postbuild": "patch-package-json-main",
     "build:builders": "tsc -b tsconfig.builders.json --pretty && yarn generate-cjs-manifest",
-    "install-swagger-cli": "mvn install:install-file -DgroupId=io.swagger -DartifactId=swagger-codegen-cli -Dversion=2.4.0-AMADEUS -Dpackaging=jar -Dfile=./schematics/resources/swagger-codegen-cli.jar",
-    "build:swagger": "yarn install-swagger-cli && run-p 'build:openapi-*' && yarn cpy 'schematics/**/*.jar' dist/schematics",
+    "build:swagger": "yarn build:openapi-typescript-gen && yarn cpy 'schematics/**/*.jar' dist/schematics",
     "build:openapi-typescript-gen": "mvn clean package -f ./schematics/typescript/core/openapi-codegen-typescript/pom.xml",
     "build:cli": "tsc -b tsconfig.cli.json --pretty && yarn generate-cjs-manifest",
     "prepare:publish": "prepare-publish ./dist"
@@ -50,6 +49,9 @@
     "@angular/compiler": {
       "optional": true
     },
+    "@o3r/telemetry": {
+      "optional": true
+    },
     "@openapitools/openapi-generator-cli": {
       "optional": true
     },
@@ -61,19 +63,20 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^12.1.0-prerelease.6",
+    "@ama-sdk/core": "^12.1.0-prerelease.61",
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics-cli": "^19.0.0",
     "@angular/cli": "^19.0.0",
-    "@o3r/schematics": "^12.1.0-prerelease.6",
+    "@o3r/schematics": "^12.1.0-prerelease.61",
+    "@o3r/telemetry": "^12.1.0-prerelease.61",
     "@openapitools/openapi-generator-cli": "^2.15.0",
     "openapi-types": "^12.0.0",
     "ts-node": "~10.9.2",
     "type-fest": "^4.10.2"
   },
   "dependencies": {
-    "@angular-devkit/core": "~19.0.0",
-    "@angular-devkit/schematics": "~19.0.0",
+    "@angular-devkit/core": "~19.1.0",
+    "@angular-devkit/schematics": "~19.1.0",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
     "js-yaml": "^4.1.0",
@@ -84,20 +87,20 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^12.1.0-prerelease.6",
-    "@angular-devkit/schematics-cli": "~19.0.0",
-    "@angular/cli": "~19.0.0",
+    "@ama-sdk/core": "^12.1.0-prerelease.61",
+    "@angular-devkit/schematics-cli": "~19.1.0",
+    "@angular/cli": "~19.1.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
-    "@nx/eslint-plugin": "~20.2.0",
-    "@nx/jest": "~20.2.0",
-    "@o3r/build-helpers": "^12.1.0-prerelease.6",
-    "@o3r/eslint-plugin": "^12.1.0-prerelease.6",
-    "@o3r/schematics": "^12.1.0-prerelease.6",
-    "@o3r/telemetry": "^12.1.0-prerelease.6",
-    "@o3r/test-helpers": "^12.1.0-prerelease.6",
+    "@nx/eslint-plugin": "~20.4.0",
+    "@nx/jest": "~20.4.0",
+    "@o3r/build-helpers": "^12.1.0-prerelease.61",
+    "@o3r/eslint-plugin": "^12.1.0-prerelease.61",
+    "@o3r/schematics": "^12.1.0-prerelease.61",
+    "@o3r/telemetry": "^12.1.0-prerelease.61",
+    "@o3r/test-helpers": "^12.1.0-prerelease.61",
     "@openapitools/openapi-generator-cli": "~2.16.0",
-    "@schematics/angular": "~19.0.0",
-    "@stylistic/eslint-plugin": "~3.0.0",
+    "@schematics/angular": "~19.1.0",
+    "@stylistic/eslint-plugin": "~3.1.0",
     "@types/jest": "~29.5.2",
     "@types/js-yaml": "^4.0.5",
     "@types/minimatch": "^5.1.2",
@@ -105,21 +108,21 @@
     "@types/node": "^20.0.0",
     "@types/pid-from-port": "^1.1.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.22.0",
-    "angular-eslint": "~19.0.0",
+    "@typescript-eslint/parser": "~8.25.0",
+    "angular-eslint": "~19.1.0",
     "commit-and-tag-version": "^12.0.0",
     "copyfiles": "^2.4.1",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.19.0",
-    "eslint-import-resolver-node": "^0.3.9",
-    "eslint-import-resolver-typescript": "^3.6.3",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-import-newlines": "^1.4.0",
+    "eslint": "~9.21.0",
+    "eslint-import-resolver-node": "~0.3.9",
+    "eslint-import-resolver-typescript": "~3.8.0",
+    "eslint-plugin-import": "~2.31.0",
+    "eslint-plugin-import-newlines": "~1.4.0",
     "eslint-plugin-jest": "~28.11.0",
     "eslint-plugin-jsdoc": "~50.6.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^56.0.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
+    "eslint-plugin-unicorn": "~56.0.0",
+    "eslint-plugin-unused-imports": "~4.1.4",
     "globals": "^15.9.0",
     "isomorphic-fetch": "~3.0.0",
     "jest": "~29.7.0",
@@ -127,15 +130,15 @@
     "jsonc-eslint-parser": "~2.4.0",
     "mem-fs": "^4.0.0",
     "npm-run-all2": "^7.0.0",
-    "nx": "~20.2.0",
+    "nx": "~20.4.0",
     "openapi-types": "^12.0.0",
     "pid-from-port": "^1.1.3",
     "semver": "^7.5.2",
     "ts-jest": "~29.2.5",
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
-    "typescript": "~5.6.2",
-    "typescript-eslint": "~8.22.0"
+    "typescript": "~5.7.3",
+    "typescript-eslint": "~8.25.0"
   },
   "generatorDependencies": {
     "@swc/cli": "~0.6.0",
@@ -143,7 +146,7 @@
     "@swc/helpers": "~0.5.0",
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.22.0",
+    "@typescript-eslint/eslint-plugin": "~8.25.0",
     "jest-junit": "~16.0.0",
     "lint-staged": "^15.0.0",
     "minimist": "^1.2.6",

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,YAAa,sCAAsC,wBAGrF,CAAC"}
+{"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,YAAa,sCAAsC,wBAKrF,CAAC"}

package/schematics/api-extension/index.js

@@ -21,8 +21,8 @@ function ngGenerateApiExtensionFn(options) {
  * @param options
  */
 const ngGenerateApiExtension = (options) => async () => {
-    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createSchematicWithMetricsIfInstalled(ngGenerateApiExtensionFn)(options);
+    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return createOtterSchematic(ngGenerateApiExtensionFn)(options);
 };
 exports.ngGenerateApiExtension = ngGenerateApiExtension;
 //# sourceMappingURL=index.js.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,YAAa,8BAA8B,wBAG9D,CAAC"}
+{"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,YAAa,8BAA8B,wBAK9D,CAAC"}

package/schematics/migrate/index.js

@@ -41,8 +41,8 @@ function migrateFn(options) {
  * @param options
  */
 const migrate = (options) => async () => {
-    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createSchematicWithMetricsIfInstalled(migrateFn)(options);
+    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return 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,SAAU,qBAAqB,KAAG,IAGnD,CAAC"}
+{"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,SAAU,qBAAqB,KAAG,IAKnD,CAAC"}

package/schematics/ng-add/index.js

@@ -147,8 +147,8 @@ function ngAddFn() {
  * @param opts
  */
 const ngAdd = (opts) => async () => {
-    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createSchematicWithMetricsIfInstalled(ngAddFn)(opts);
+    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return createOtterSchematic(ngAddFn)(opts);
 };
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.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,YAAa,2CAA2C,wBAG3F,CAAC"}
+{"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,YAAa,2CAA2C,wBAK3F,CAAC"}

package/schematics/typescript/core/index.js

@@ -246,8 +246,8 @@ function ngGenerateTypescriptSDKFn(options) {
  * @param options
  */
 const ngGenerateTypescriptSDK = (options) => async () => {
-    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createSchematicWithMetricsIfInstalled(ngGenerateTypescriptSDKFn)(options);
+    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return createOtterSchematic(ngGenerateTypescriptSDKFn)(options);
 };
 exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
 //# sourceMappingURL=index.js.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,YAAa,8BAA8B,wBAGrE,CAAC"}
+{"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,YAAa,8BAA8B,wBAKrE,CAAC"}

package/schematics/typescript/mock/index.js

@@ -75,8 +75,8 @@ function ngGenerateMockFn(options) {
  * @param options
  */
 const ngGenerateMock = (options) => async () => {
-    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createSchematicWithMetricsIfInstalled(ngGenerateMockFn)(options);
+    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return createOtterSchematic(ngGenerateMockFn)(options);
 };
 exports.ngGenerateMock = ngGenerateMock;
 //# sourceMappingURL=index.js.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,YAAa,4CAA4C,wBAG5F,CAAC"}
+{"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,YAAa,4CAA4C,wBAK5F,CAAC"}

package/schematics/typescript/shell/index.js

@@ -147,8 +147,8 @@ function ngGenerateTypescriptSDKFn(options) {
  * @param options
  */
 const ngGenerateTypescriptSDK = (options) => async () => {
-    const { createSchematicWithMetricsIfInstalled } = await Promise.resolve().then(() => require('@o3r/schematics'));
-    return createSchematicWithMetricsIfInstalled(ngGenerateTypescriptSDKFn)(options);
+    const { createOtterSchematic } = await Promise.resolve().then(() => require('@o3r/schematics'));
+    return createOtterSchematic(ngGenerateTypescriptSDKFn)(options);
 };
 exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
 //# sourceMappingURL=index.js.map

package/schematics/typescript/shell/schema.json

@@ -56,8 +56,7 @@
     },
     "exactO3rVersion": {
       "type": "boolean",
-      "description": "Use a pinned version for otter packages",
-      "default": false
+      "description": "Use a pinned version for otter packages"
     }
   },
   "additionalProperties": true,