@ama-sdk/schematics 10.5.0-prerelease.1 → 10.5.0-prerelease.3

package/migration.json

@@ -5,6 +5,11 @@
       "version": "10.0.0-alpha.0",
       "description": "Updates of @ama-sdk/schematics to v10.0.*",
       "factory": "./schematics/ng-update/index#updateV10_0"
+    },
+    "migration-v10_3": {
+      "version": "10.3.0-alpha.0",
+      "description": "Updates of @ama-sdk/schematics to v10.3.*",
+      "factory": "./schematics/ng-update/index#updateV10_3"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "10.5.0-prerelease.1",
+  "version": "10.5.0-prerelease.3",
   "publishConfig": {
     "access": "public"
   },
@@ -48,12 +48,12 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^10.5.0-prerelease.1",
+    "@ama-sdk/core": "^10.5.0-prerelease.3",
     "@angular-devkit/core": "~17.3.0",
     "@angular-devkit/schematics": "~17.3.0",
     "@angular-devkit/schematics-cli": "^17.0.1",
     "@angular/cli": "^17.0.1",
-    "@o3r/schematics": "^10.5.0-prerelease.1",
+    "@o3r/schematics": "^10.5.0-prerelease.3",
     "@openapitools/openapi-generator-cli": "~2.13.0",
     "@schematics/angular": "~17.3.0"
   },
@@ -67,16 +67,16 @@
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^10.5.0-prerelease.1",
+    "@ama-sdk/core": "^10.5.0-prerelease.3",
     "@angular-devkit/schematics-cli": "~17.3.0",
     "@angular-eslint/eslint-plugin": "~17.3.0",
     "@angular/cli": "~17.3.0",
     "@nx/eslint-plugin": "~18.3.0",
     "@nx/jest": "~18.3.0",
-    "@o3r/build-helpers": "^10.5.0-prerelease.1",
-    "@o3r/eslint-plugin": "^10.5.0-prerelease.1",
-    "@o3r/schematics": "^10.5.0-prerelease.1",
-    "@o3r/test-helpers": "^10.5.0-prerelease.1",
+    "@o3r/build-helpers": "^10.5.0-prerelease.3",
+    "@o3r/eslint-plugin": "^10.5.0-prerelease.3",
+    "@o3r/schematics": "^10.5.0-prerelease.3",
+    "@o3r/test-helpers": "^10.5.0-prerelease.3",
     "@openapitools/openapi-generator-cli": "~2.13.0",
     "@schematics/angular": "~17.3.0",
     "@stylistic/eslint-plugin-ts": "^1.5.4",

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AA8B1D;;;GAGG;AACH,eAAO,MAAM,OAAO,YAAa,8BAA8B,wBAG9D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAC;AAkC1D;;;GAGG;AACH,eAAO,MAAM,OAAO,YAAa,8BAA8B,wBAG9D,CAAC"}

package/schematics/migrate/index.js

@@ -5,13 +5,18 @@ const schematics_1 = require("@o3r/schematics");
 const node_path_1 = require("node:path");
 const semver_1 = require("semver");
 const is_typescript_project_1 = require("../helpers/is-typescript-project");
-const tsMigrationMap = {};
+const update_openapiversion_1 = require("../ng-update/typescript/v10.3/update-openapiversion");
+/* eslint-disable @typescript-eslint/naming-convention */
+const tsMigrationMap = {
+    '~10.3.2': (0, update_openapiversion_1.updateOpenApiVersionInProject)()
+};
+/* eslint-enable @typescript-eslint/naming-convention */
 /**
  * Facilitate the migration of a version to another by the run of migration rules
  * @param options
  */
 function migrateFn(options) {
-    const currentVersion = JSON.parse(require((0, node_path_1.resolve)(__dirname, '..', '..', 'package.json'))).version;
+    const currentVersion = require((0, node_path_1.resolve)(__dirname, '..', '..', 'package.json')).version;
     const to = options.to || currentVersion;
     const minimumVersion = (0, semver_1.minVersion)(to);
     return (tree, context) => {

package/schematics/migrate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":";;;AAEA,gDAAqG;AACrG,yCAAoC;AACpC,mCAAwC;AACxC,4EAAmE;AAEnE,MAAM,cAAc,GAAsB,EAEzC,CAAC;AACF;;;GAGG;AACH,SAAS,SAAS,CAAC,OAAuC;IAExD,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IACnG,MAAM,EAAE,GAAW,OAAO,CAAC,EAAE,IAAI,cAAc,CAAC;IAChD,MAAM,cAAc,GAAG,IAAA,mBAAU,EAAC,EAAE,CAAC,CAAC;IAEtC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,cAAc,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,6FAA6F,cAAc,IAAI;gBAC7J,yCAAyC,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,IAAI,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,IAAI,GAAG,CAAC;QACtH,MAAM,mBAAmB,GAAG,IAAA,uCAAe,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,mCAAsB,EAAC,cAAc,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrJ,OAAO,mBAAmB,EAAE,CAAC,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,OAAO,GAAG,CAAC,OAAuC,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;IAC7E,MAAM,EAAE,qCAAqC,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;IAClF,OAAO,qCAAqC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;AACnE,CAAC,CAAC;AAHW,QAAA,OAAO,WAGlB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/migrate/index.ts"],"names":[],"mappings":";;;AAEA,gDAAqG;AACrG,yCAAoC;AACpC,mCAAwC;AACxC,4EAAmE;AACnE,+FAAkG;AAElG,yDAAyD;AACzD,MAAM,cAAc,GAAsB;IACxC,SAAS,EAAE,IAAA,qDAA6B,GAAE;CAC3C,CAAC;AACF,wDAAwD;AAExD;;;GAGG;AACH,SAAS,SAAS,CAAC,OAAuC;IAExD,MAAM,cAAc,GAAG,OAAO,CAAC,IAAA,mBAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;IACvF,MAAM,EAAE,GAAW,OAAO,CAAC,EAAE,IAAI,cAAc,CAAC;IAChD,MAAM,cAAc,GAAG,IAAA,mBAAU,EAAC,EAAE,CAAC,CAAC;IAEtC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACvB,IAAI,cAAc,IAAI,IAAA,WAAE,EAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,6FAA6F,cAAc,IAAI;gBAC7J,yCAAyC,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,gBAAgB,GAAG,OAAO,EAAE,WAAW,IAAI,IAAA,+BAAkB,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,IAAI,GAAG,CAAC;QACtH,MAAM,mBAAmB,GAAG,IAAA,uCAAe,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAA,mCAAsB,EAAC,cAAc,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrJ,OAAO,mBAAmB,EAAE,CAAC,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,OAAO,GAAG,CAAC,OAAuC,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;IAC7E,MAAM,EAAE,qCAAqC,EAAE,GAAG,2CAAa,iBAAiB,EAAC,CAAC;IAClF,OAAO,qCAAqC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC;AACnE,CAAC,CAAC;AAHW,QAAA,OAAO,WAGlB"}

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

@@ -7,4 +7,8 @@ export declare function updateV10_0(): Rule;
  * Update of Ama-sdk library V10.1
  */
 export declare function updateV10_1(): Rule;
+/**
+ * Update of Ama-sdk library V10.3
+ */
+export declare function updateV10_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":"AAGA,OAAO,EAAS,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAIzD;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAMlC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-update/typescript/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAS,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAKzD;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAQlC;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAMlC;AAED;;GAEG;AACH,wBAAgB,WAAW,IAAI,IAAI,CAMlC"}

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

@@ -2,10 +2,11 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable camelcase */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateV10_1 = exports.updateV10_0 = void 0;
+exports.updateV10_3 = exports.updateV10_1 = exports.updateV10_0 = void 0;
 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");
+const update_openapiversion_1 = require("./v10.3/update-openapiversion");
 /**
  * update of Otter library V10.0
  */
@@ -28,4 +29,14 @@ function updateV10_1() {
     return (0, schematics_1.chain)(updateRules);
 }
 exports.updateV10_1 = updateV10_1;
+/**
+ * Update of Ama-sdk library V10.3
+ */
+function updateV10_3() {
+    const updateRules = [
+        (0, update_openapiversion_1.updateOpenApiVersionInProject)()
+    ];
+    return (0, schematics_1.chain)(updateRules);
+}
+exports.updateV10_3 = updateV10_3;
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-update/typescript/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAE9B,2DAAyD;AACzD,2DAA6G;AAC7G,uEAAkE;AAElE;;GAEG;AACH,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAW;QAC1B,IAAA,wCAAuB,GAAE;QACzB,IAAA,uCAAsB,GAAE;QACxB,IAAA,mCAAkB,GAAE;KACrB,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AARD,kCAQC;AAED;;GAEG;AACH,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAND,kCAMC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../schematics/ng-update/typescript/index.ts"],"names":[],"mappings":";AAAA,yDAAyD;AACzD,8BAA8B;;;AAE9B,2DAAyD;AACzD,2DAA6G;AAC7G,uEAAkE;AAClE,yEAA4E;AAE5E;;GAEG;AACH,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAW;QAC1B,IAAA,wCAAuB,GAAE;QACzB,IAAA,uCAAsB,GAAE;QACxB,IAAA,mCAAkB,GAAE;KACrB,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AARD,kCAQC;AAED;;GAEG;AACH,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAW;QAC1B,IAAA,yCAAkB,GAAE;KACrB,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAND,kCAMC;AAED;;GAEG;AACH,SAAgB,WAAW;IACzB,MAAM,WAAW,GAAW;QAC1B,IAAA,qDAA6B,GAAE;KAChC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC,WAAW,CAAC,CAAC;AAC5B,CAAC;AAND,kCAMC"}

package/schematics/ng-update/typescript/v10.3/update-openapiversion.d.ts

@@ -0,0 +1,6 @@
+import type { Rule } from '@angular-devkit/schematics';
+/**
+ * Update open api version used in the project to match with the one used in @ama-sdk/schematics:typescript-core
+ */
+export declare const updateOpenApiVersionInProject: () => Rule;
+//# sourceMappingURL=update-openapiversion.d.ts.map

package/schematics/ng-update/typescript/v10.3/update-openapiversion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-openapiversion.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v10.3/update-openapiversion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,4BAA4B,CAAC;AAKrD;;GAEG;AACH,eAAO,MAAM,6BAA6B,QAAO,IAiEhD,CAAC"}

package/schematics/ng-update/typescript/v10.3/update-openapiversion.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateOpenApiVersionInProject = void 0;
+const semver = require("semver");
+const schematics_1 = require("@o3r/schematics");
+const schematics_2 = require("@angular-devkit/schematics");
+/**
+ * Update open api version used in the project to match with the one used in @ama-sdk/schematics:typescript-core
+ */
+const updateOpenApiVersionInProject = () => {
+    const overwriteOpenApiVersion = (pathOfWorkspace) => {
+        return (tree, context) => {
+            const packageJson = tree.readText(`${pathOfWorkspace}/package.json`);
+            const amaSdkTypescriptUsage = packageJson.match(/@ama-sdk\/schematics:typescript-core.*",?$/mg);
+            if (!amaSdkTypescriptUsage) {
+                context.logger.info(`Skipping ng-update for ${pathOfWorkspace} as it does not use @ama-sdk/schematics:typescript-core`);
+                return tree;
+            }
+            const openapitoolsPaths = [];
+            amaSdkTypescriptUsage.forEach((script) => {
+                const openapiToolsPath = new RegExp(/@ama-sdk\/schematics:typescript-core.* --spec-config-path(?:=|\s+)["']?(?:\.\/)?([a-zA-Z-/.0-9_]*\.json)/).exec(script);
+                if (openapiToolsPath?.length === 2) {
+                    openapitoolsPaths.push(`${pathOfWorkspace}/${openapiToolsPath[1]}`);
+                }
+            });
+            if (amaSdkTypescriptUsage.length > openapitoolsPaths.length) {
+                openapitoolsPaths.push(`${pathOfWorkspace}/openapitools.json`);
+            }
+            (openapitoolsPaths || []).forEach((path) => {
+                if (!tree.exists(path)) {
+                    context.logger.warn(`Missing ${path} file described in the package json.`);
+                    return;
+                }
+                const openApiToolsConfig = tree.readJson(path);
+                openApiToolsConfig['generator-cli'] ||= {};
+                if (!openApiToolsConfig['generator-cli'].version || !semver.satisfies(openApiToolsConfig['generator-cli'].version, '~7.4.0')) {
+                    context.logger.info(`The following file will be updated to target open api tools version 7.4: ${path}`);
+                    openApiToolsConfig['generator-cli'].version = '7.4.0';
+                    tree.overwrite(path, JSON.stringify(openApiToolsConfig, null, 2));
+                }
+            });
+            return tree;
+        };
+    };
+    return (tree, context) => {
+        const pathsPackageJson = ['.'];
+        if (!tree.exists('package.json')) {
+            context.logger.error('Could not find a package.json file, make sure to run the ng-update at the root of typescript project');
+        }
+        const cwdPackageJson = tree.readJson('package.json');
+        if (tree.exists('angular.json')) {
+            const workspaceConfig = (0, schematics_1.getWorkspaceConfig)(tree);
+            pathsPackageJson.push(...Object.values(workspaceConfig?.projects || {}).map((project) => project.root));
+        }
+        else if (cwdPackageJson.workspaces) {
+            context.logger.info('Workspaces detected outside an angular project, running the update on the workspaces');
+            pathsPackageJson.push(...cwdPackageJson.workspaces.reduce((paths, workspace) => {
+                if (workspace.includes('*')) {
+                    paths.push(...(0, schematics_1.globInTree)(tree, [`**/${workspace}/package.json`]).map((path) => path.replace('/package.json', '')));
+                }
+                else {
+                    paths.push(workspace);
+                }
+                return paths;
+            }, []));
+        }
+        return (0, schematics_2.chain)(pathsPackageJson.map((pathPackageJson) => overwriteOpenApiVersion(pathPackageJson.at(pathPackageJson.length - 1) === '/' ? pathPackageJson.trim() : pathPackageJson)));
+    };
+};
+exports.updateOpenApiVersionInProject = updateOpenApiVersionInProject;
+//# sourceMappingURL=update-openapiversion.js.map

package/schematics/ng-update/typescript/v10.3/update-openapiversion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-openapiversion.js","sourceRoot":"","sources":["../../../../../schematics/ng-update/typescript/v10.3/update-openapiversion.ts"],"names":[],"mappings":"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"}