@ama-sdk/schematics 12.4.0-prerelease.4 → 12.4.0-prerelease.41

package/collection.json

@@ -8,29 +8,44 @@
       "aliases": ["install", "i"]
     },
     "migrate": {
-      "description": "Execute migration scripts between 2 versions.",
+      "description": "[ama-sdk] Execute migration scripts between 2 versions.",
       "factory": "./schematics/migrate/index#migrate",
-      "schema": "./schematics/migrate/schema.json"
+      "schema": "./schematics/migrate/schema.json",
+      "aliases": [
+        "ama-migrate"
+      ]
     },
     "typescript-mock": {
-      "description": "Generate an api mock into the project.",
+      "description": "[ama-sdk] Generate an api mock into the project.",
       "factory": "./schematics/typescript/mock/index#ngGenerateMock",
-      "schema": "./schematics/typescript/mock/schema.json"
+      "schema": "./schematics/typescript/mock/schema.json",
+      "aliases": [
+        "ama-typescript-mock"
+      ]
     },
     "api-extension": {
-      "description": "Generate a api specification extension.",
+      "description": "[ama-sdk] Generate a api specification extension.",
       "factory": "./schematics/api-extension/index#ngGenerateApiExtension",
-      "schema": "./schematics/api-extension/schema.json"
+      "schema": "./schematics/api-extension/schema.json",
+      "aliases": [
+        "ama-api-extension"
+      ]
     },
     "typescript-core": {
-      "description": "Generate a typescript SDK source code based on swagger specification",
+      "description": "[ama-sdk] Generate a typescript SDK source code based on swagger specification",
       "factory": "./schematics/typescript/core/index#ngGenerateTypescriptSDK",
-      "schema": "./schematics/typescript/core/schema.json"
+      "schema": "./schematics/typescript/core/schema.json",
+      "aliases": [
+        "ama-typescript-core"
+      ]
     },
     "typescript-shell": {
-      "description": "Generate a typescript SDK repository shell",
+      "description": "[ama-sdk] Generate a typescript SDK repository shell",
       "factory": "./schematics/typescript/shell/index#ngGenerateTypescriptSDK",
-      "schema": "./schematics/typescript/shell/schema.json"
+      "schema": "./schematics/typescript/shell/schema.json",
+      "aliases": [
+        "ama-typescript-shell"
+      ]
     }
   }
 }

package/migration.json

@@ -30,6 +30,11 @@
       "version": "12.1.3",
       "description": "Updates of @ama-sdk/schematics to v12.1.3",
       "factory": "./schematics/ng-update/index#updateV12_1_3"
+    },
+    "migration-v12_3": {
+      "version": "12.3.0-prerelease.0",
+      "description": "Updates of @ama-sdk/schematics to v12.3.*",
+      "factory": "./schematics/ng-update/index#updateV12_3"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "12.4.0-prerelease.4",
+  "version": "12.4.0-prerelease.41",
   "publishConfig": {
     "access": "public"
   },
@@ -59,24 +59,28 @@
     },
     "type-fest": {
       "optional": true
+    },
+    "typescript": {
+      "optional": true
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^12.4.0-prerelease.4",
+    "@ama-sdk/core": "^12.4.0-prerelease.41",
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics-cli": "^19.0.0",
     "@angular/cli": "^19.0.0",
-    "@o3r/schematics": "^12.4.0-prerelease.4",
-    "@o3r/telemetry": "^12.4.0-prerelease.4",
+    "@o3r/schematics": "^12.4.0-prerelease.41",
+    "@o3r/telemetry": "^12.4.0-prerelease.41",
     "@openapitools/openapi-generator-cli": "^2.15.0",
     "openapi-types": "^12.0.0",
     "ts-node": "~10.9.2",
-    "type-fest": "^4.30.1"
+    "type-fest": "^4.30.1",
+    "typescript": "^5.5.4"
   },
   "dependencies": {
     "@angular-devkit/core": "~19.2.0",
     "@angular-devkit/schematics": "~19.2.0",
-    "@o3r/schematics": "^12.4.0-prerelease.4",
+    "@o3r/schematics": "^12.4.0-prerelease.41",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
     "js-yaml": "^4.1.0",
@@ -87,16 +91,16 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^12.4.0-prerelease.4",
+    "@ama-sdk/core": "^12.4.0-prerelease.41",
     "@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.8.0",
     "@nx/jest": "~20.8.0",
-    "@o3r/build-helpers": "^12.4.0-prerelease.4",
-    "@o3r/eslint-plugin": "^12.4.0-prerelease.4",
-    "@o3r/telemetry": "^12.4.0-prerelease.4",
-    "@o3r/test-helpers": "^12.4.0-prerelease.4",
+    "@o3r/build-helpers": "^12.4.0-prerelease.41",
+    "@o3r/eslint-plugin": "^12.4.0-prerelease.41",
+    "@o3r/telemetry": "^12.4.0-prerelease.41",
+    "@o3r/test-helpers": "^12.4.0-prerelease.41",
     "@openapitools/openapi-generator-cli": "~2.20.0",
     "@schematics/angular": "~19.2.0",
     "@stylistic/eslint-plugin": "~3.1.0",
@@ -107,18 +111,18 @@
     "@types/node": "^20.0.0",
     "@types/pid-from-port": "^1.1.0",
     "@types/semver": "^7.3.13",
-    "@typescript-eslint/parser": "~8.32.0",
+    "@typescript-eslint/parser": "~8.34.0",
     "angular-eslint": "~19.4.0",
     "commit-and-tag-version": "^12.0.0",
     "copyfiles": "^2.4.1",
     "cpy-cli": "^5.0.0",
-    "eslint": "~9.26.0",
+    "eslint": "~9.28.0",
     "eslint-import-resolver-node": "~0.3.9",
     "eslint-import-resolver-typescript": "~3.10.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-jest": "~28.13.0",
+    "eslint-plugin-jsdoc": "~50.7.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
     "eslint-plugin-unicorn": "~56.0.0",
     "eslint-plugin-unused-imports": "~4.1.4",
@@ -137,16 +141,16 @@
     "ts-node": "~10.9.2",
     "type-fest": "^4.30.1",
     "typescript": "~5.8.2",
-    "typescript-eslint": "~8.32.0"
+    "typescript-eslint": "~8.34.0"
   },
   "generatorDependencies": {
     "@angular-eslint/eslint-plugin": "^19.0.0",
     "@commitlint/cli": "^19.0.0",
     "@commitlint/config-conventional": "^19.0.0",
     "@swc/cli": "~0.7.7",
-    "@swc/core": "~1.11.0",
+    "@swc/core": "~1.12.0",
     "@swc/helpers": "~0.5.0",
-    "@typescript-eslint/eslint-plugin": "~8.32.0",
+    "@typescript-eslint/eslint-plugin": "~8.34.0",
     "jest-junit": "~16.0.0",
     "lint-staged": "^15.0.0",
     "minimist": "^1.2.6",

package/schematics/ng-update/index.d.ts

@@ -23,4 +23,8 @@ export declare function updateV11_4(): Rule;
  * Update of Ama-sdk library V12.1.3
  */
 export declare function updateV12_1_3(): Rule;
+/**
+ * update of Otter library V12.3
+ */
+export declare function updateV12_3(): Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-update/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAapC;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,aAAa,IAAI,IAAI,CAQpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-update/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAcpC;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,aAAa,IAAI,IAAI,CAQpC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC"}

package/schematics/ng-update/index.js

@@ -6,6 +6,7 @@ exports.updateV10_3 = updateV10_3;
 exports.updateV11_0 = updateV11_0;
 exports.updateV11_4 = updateV11_4;
 exports.updateV12_1_3 = updateV12_1_3;
+exports.updateV12_3 = updateV12_3;
 const is_typescript_project_1 = require("../helpers/is-typescript-project");
 const typescript_1 = require("./typescript");
 /**
@@ -80,4 +81,16 @@ function updateV12_1_3() {
         return tree;
     };
 }
+/**
+ * update of Otter library V12.3
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version
+function updateV12_3() {
+    return (tree, context) => {
+        if ((0, is_typescript_project_1.isTypescriptSdk)(tree)) {
+            return (0, typescript_1.updateV12_3)()(tree, context);
+        }
+        return tree;
+    };
+}
 //# sourceMappingURL=index.js.map

package/schematics/ng-update/typescript/index.d.ts

@@ -23,4 +23,8 @@ export declare function updateV11_4(): Rule;
  * Update of Ama-sdk library V12.1.3
  */
 export declare function updateV12_1_3(): Rule;
+/**
+ * Update of Ama-sdk library V12.3
+ */
+export declare function updateV12_3(): Rule;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-update/typescript/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/typescript/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAyBpC;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAOlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AAEH,wBAAgB,aAAa,IAAI,IAAI,CAMpC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/typescript/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EACL,MAAM,4BAA4B,CAAC;AA4BpC;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAOlC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AAEH,wBAAgB,aAAa,IAAI,IAAI,CAMpC;AAED;;GAEG;AAEH,wBAAgB,WAAW,IAAI,IAAI,CAMlC"}

package/schematics/ng-update/typescript/index.js

@@ -6,6 +6,7 @@ exports.updateV10_3 = updateV10_3;
 exports.updateV11_0 = updateV11_0;
 exports.updateV11_4 = updateV11_4;
 exports.updateV12_1_3 = updateV12_1_3;
+exports.updateV12_3 = updateV12_3;
 const schematics_1 = require("@angular-devkit/schematics");
 const script_removal_1 = require("./v10.0/script-removal");
 const add_presets_renovate_1 = require("./v10.1/add-presets-renovate");
@@ -14,6 +15,7 @@ const update_openapitools_1 = require("./v11.0/update-openapitools");
 const update_regen_script_1 = require("./v11.0/update-regen-script");
 const create_gitattributes_1 = require("./v11.4/create-gitattributes");
 const clean_packagejson_exports_1 = require("./v12.1/clean-packagejson-exports");
+const coverage_ignore_1 = require("./v12.3/coverage-ignore");
 /**
  * update of Otter library V10.0
  */
@@ -77,4 +79,14 @@ function updateV12_1_3() {
     ];
     return (0, schematics_1.chain)(updateRules);
 }
+/**
+ * Update of Ama-sdk library V12.3
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention -- function name contains the version
+function updateV12_3() {
+    const updateRules = [
+        coverage_ignore_1.updateJestConfigCoveragePathIgnorePatterns
+    ];
+    return (0, schematics_1.chain)(updateRules);
+}
 //# sourceMappingURL=index.js.map

package/schematics/ng-update/typescript/v12.3/coverage-ignore.d.ts

@@ -0,0 +1,8 @@
+import type { Rule } from '@angular-devkit/schematics';
+/**
+ * Update Jest config to ignore coverage of generated path
+ * @param tree
+ * @param context
+ */
+export declare const updateJestConfigCoveragePathIgnorePatterns: Rule;
+//# sourceMappingURL=coverage-ignore.d.ts.map

package/schematics/ng-update/typescript/v12.3/coverage-ignore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"coverage-ignore.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v12.3/coverage-ignore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAUpC;;;;GAIG;AACH,eAAO,MAAM,0CAA0C,EAAE,IAiExD,CAAC"}

package/schematics/ng-update/typescript/v12.3/coverage-ignore.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateJestConfigCoveragePathIgnorePatterns = void 0;
+const ts = require("typescript");
+const coveragePathIgnorePatterns = [
+    '<rootDir>/src/api/**/*.ts',
+    '<rootDir>/src/models/base/**/*.ts',
+    '<rootDir>/src/spec/api-mock.ts',
+    '<rootDir>/src/spec/operation-adapter.ts'
+];
+/**
+ * Update Jest config to ignore coverage of generated path
+ * @param tree
+ * @param context
+ */
+const updateJestConfigCoveragePathIgnorePatterns = (tree, context) => {
+    const filePath = 'jest.config.js';
+    if (!tree.exists(filePath)) {
+        context.logger.info(`No ${filePath} found, the coverage ignore pattern won't be added.`);
+        return;
+    }
+    const tsSourceFile = ts.createSourceFile(filePath, tree.readText(filePath), ts.ScriptTarget.Latest, true);
+    const result = ts.transform(tsSourceFile, [
+        (ctx) => (rootNode) => {
+            const { factory } = ctx;
+            return ts.visitNode(rootNode, (node) => {
+                return ts.visitEachChild(node, (statement) => {
+                    if (ts.isExpressionStatement(statement)
+                        && ts.isBinaryExpression(statement.expression)
+                        && /module\.exports/.test(statement.expression.left.getText(rootNode))
+                        && ts.isObjectLiteralExpression(statement.expression.right)
+                        && !statement.expression.right.properties.some((prop) => ts.isPropertyAssignment(prop) && prop.name.getText(rootNode) === 'coveragePathIgnorePatterns')) {
+                        return factory.updateExpressionStatement(statement, factory.updateBinaryExpression(statement.expression, statement.expression.left, statement.expression.operatorToken, factory.updateObjectLiteralExpression(statement.expression.right, [
+                            ...statement.expression.right.properties,
+                            factory.createPropertyAssignment('coveragePathIgnorePatterns', factory.createArrayLiteralExpression(coveragePathIgnorePatterns.map((pattern) => factory.createStringLiteral(pattern, true)), true))
+                        ])));
+                    }
+                }, ctx);
+            });
+        }
+    ]);
+    const transformedSourceFile = result.transformed[0];
+    const printer = ts.createPrinter({
+        removeComments: false,
+        newLine: ts.NewLineKind.LineFeed
+    });
+    const content = printer.printFile(transformedSourceFile)
+        .split('\n')
+        // migrate from 4 spaces to 2 spaces indent
+        .map((line) => {
+        const match = line.match(/^ */);
+        const numberSpaces = match ? match[0].length : 0;
+        const newNumber = (numberSpaces - numberSpaces % 2) / 2;
+        return line.replace(/^ */, Array.from({ length: newNumber }).fill(' ').join(''));
+    })
+        .join('\n');
+    tree.overwrite(filePath, content);
+    return tree;
+};
+exports.updateJestConfigCoveragePathIgnorePatterns = updateJestConfigCoveragePathIgnorePatterns;
+//# sourceMappingURL=coverage-ignore.js.map

package/schematics/typescript/shell/templates/base/jest.config.js.template

@@ -22,5 +22,11 @@ module.exports = {
         stringifyContentPathRegex: '\\.html$',
       }
     ]
-  }
+  },
+  coveragePathIgnorePatterns: [
+    '<rootDir>/src/api/**/*.ts',
+    '<rootDir>/src/models/base/**/*.ts',
+    '<rootDir>/src/spec/api-mock.ts',
+    '<rootDir>/src/spec/operation-adapter.ts'
+  ]
 };