@ama-sdk/schematics 9.0.0-alpha.2 → 9.0.0-alpha.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "9.0.0-alpha.2",
+  "version": "9.0.0-alpha.24",
   "description": "Swagger specification SDK Generator by schematics",
   "scripts": {
     "nx": "nx",
@@ -33,23 +33,28 @@
     "@angular/compiler": {
       "optional": true
     },
+    "@o3r/schematics": {
+      "optional": true
+    },
     "@openapitools/openapi-generator-cli": {
       "optional": true
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.2",
+    "@ama-sdk/core": "^9.0.0-alpha.24",
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
     "@angular-devkit/schematics-cli": "~16.0.5",
     "@angular/cli": "~16.0.5",
+    "@o3r/schematics": "^9.0.0-alpha.24",
     "@openapitools/openapi-generator-cli": "~2.6.0",
     "@schematics/angular": "~16.0.5"
   },
   "dependencies": {
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
-    "@o3r/dev-tools": "^9.0.0-alpha.2",
+    "@o3r/dev-tools": "^9.0.0-alpha.24",
+    "js-yaml": "^4.1.0",
     "minimatch": "^9.0.0",
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
@@ -57,16 +62,17 @@
     "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.2",
+    "@ama-sdk/core": "^9.0.0-alpha.24",
     "@angular-devkit/schematics-cli": "~16.0.5",
     "@angular-eslint/eslint-plugin": "~16.0.3",
     "@angular/cli": "~16.0.5",
-    "@nx/jest": "~16.3.2",
-    "@o3r/build-helpers": "^9.0.0-alpha.2",
-    "@o3r/eslint-plugin": "^9.0.0-alpha.2",
+    "@nx/jest": "~16.5.0",
+    "@o3r/build-helpers": "^9.0.0-alpha.24",
+    "@o3r/eslint-plugin": "^9.0.0-alpha.24",
     "@openapitools/openapi-generator-cli": "~2.6.0",
     "@schematics/angular": "~16.0.5",
     "@types/jest": "~29.5.2",
+    "@types/js-yaml": "^4.0.5",
     "@types/minimatch": "^5.1.2",
     "@types/node": "^18.0.0",
     "@types/pid-from-port": "^1.1.0",
@@ -82,15 +88,15 @@
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-unicorn": "^47.0.0",
     "isomorphic-fetch": "~3.0.0",
-    "jest": "~29.5.0",
+    "jest": "~29.6.0",
     "mem-fs": "^2.2.1",
     "npm-run-all": "^4.1.5",
-    "nx": "~16.3.2",
+    "nx": "~16.5.0",
     "onchange": "^7.0.2",
     "pid-from-port": "^1.1.3",
     "semver": "^7.5.2",
     "ts-jest": "^29.1.0",
-    "type-fest": "^3.6.1",
+    "type-fest": "^3.12.0",
     "typescript": "~5.0.2"
   },
   "openApiSupportedVersion": "~6.6.0",

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":"AAEA,OAAO,EAA4B,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAkCpG;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAiDtC,CAAC;AACF;;;;GAIG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAuB5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAuCpG;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAiDtC,CAAC;AA6FF;;;;GAIG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAW5B"}

package/schematics/ng-add/index.js

@@ -2,13 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = exports.updatePackageJsonScripts = void 0;
 const core_1 = require("@angular-devkit/core");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const schematics_1 = require("@angular-devkit/schematics");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
 const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
-const path = require("node:path");
 const node_fs_1 = require("node:fs");
+const path = require("node:path");
 const rxjs_1 = require("rxjs");
 const packageJsonPath = '/package.json';
+const swaggerIgnorePath = '/.swagger-codegen-ignore';
+const openApiIgnorePath = '/.openapi-generator-ignore';
+const openApiConfigPath = 'openapitools.json';
+const packageManager = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
 /**
  * Install dev dependency on your application
  *
@@ -22,7 +26,7 @@ class DevInstall extends tasks_1.NodePackageInstallTask {
     }
     /** @inheritdoc */
     toConfiguration() {
-        const installOptions = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
+        const installOptions = packageManager;
         return {
             name: options_1.NodePackageName,
             options: {
@@ -74,33 +78,109 @@ const updatePackageJsonScripts = (tree, context) => {
     return tree;
 };
 exports.updatePackageJsonScripts = updatePackageJsonScripts;
+/**
+ * Create or udpate the OpenApi configuration with the version supported by the application
+ * Set a storage directory for the generator jar to avoid any issue with pnp setups as it would try to install it directly in the node_module
+ *
+ * @param tree
+ */
+const createOpenApiToolsConfig = (tree) => {
+    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
+    const openApiGeneratorVersion = amaSdkSchematicsPackageJsonContent.openApiSupportedVersion.replace(/\^|~/, '');
+    const openApiDefaultStorageDir = '.openapi-generator';
+    if (tree.exists(openApiConfigPath)) {
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        const openapitoolsConfig = tree.readJson(openApiConfigPath) || {};
+        openapitoolsConfig['generator-cli'] = { storageDir: openApiDefaultStorageDir, ...openapitoolsConfig['generator-cli'], version: openApiGeneratorVersion };
+        tree.overwrite(openApiConfigPath, JSON.stringify(openapitoolsConfig));
+    }
+    else {
+        tree.create(openApiConfigPath, JSON.stringify({
+            $schema: 'https://raw.githubusercontent.com/OpenAPITools/openapi-generator-cli/master/apps/generator-cli/src/config.schema.json',
+            spaces: 2,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            'generator-cli': {
+                version: openApiGeneratorVersion,
+                storageDir: openApiDefaultStorageDir
+            }
+        }));
+    }
+    return tree;
+};
+/**
+ * Install the npm open api generator cli package
+ *
+ * @param tree
+ * @param context
+ */
+const installOpenApiToolsCli = async (tree, context) => {
+    const packageJsonContent = tree.readJson(packageJsonPath);
+    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
+    const amaSdkSchematicsOpenApiCliVersion = amaSdkSchematicsPackageJsonContent.peerDependencies?.['@openapitools/openapi-generator-cli'] || '';
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    packageJsonContent.devDependencies = { ...packageJsonContent.devDependencies, '@openapitools/openapi-generator-cli': amaSdkSchematicsOpenApiCliVersion };
+    context.addTask(new DevInstall({
+        packageName: `@openapitools/openapi-generator-cli@${amaSdkSchematicsOpenApiCliVersion}`,
+        hideOutput: false,
+        quiet: false
+    }));
+    await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
+    return () => tree;
+};
+/**
+ * Replace the swagger ignore file with an openapi one
+ *
+ * @param tree
+ */
+const replaceSwaggerIgnore = (tree) => {
+    const swaggerIgnoreContent = tree.exists(swaggerIgnorePath) && tree.readText(swaggerIgnorePath);
+    if (swaggerIgnoreContent && !tree.exists(openApiIgnorePath)) {
+        tree.create(openApiIgnorePath, swaggerIgnoreContent);
+        tree.delete(swaggerIgnorePath);
+    }
+    return tree;
+};
+const registerPackageSchematics = async (tree, context) => {
+    if (!tree.exists('angular.json')) {
+        return () => tree;
+    }
+    const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
+    const amaSdkSchematicsVersion = amaSdkSchematicsPackageJsonContent.version ? `@${amaSdkSchematicsPackageJsonContent.version}` : '';
+    const schematicsDependencies = ['@o3r/dev-tools', '@o3r/schematics'];
+    for (const dependency of schematicsDependencies) {
+        context.addTask(new DevInstall({
+            packageName: dependency + amaSdkSchematicsVersion,
+            hideOutput: false,
+            quiet: false
+        }));
+        const packageJsonContent = tree.readJson('package.json');
+        packageJsonContent.devDependencies = { ...packageJsonContent.devDependencies, [dependency]: amaSdkSchematicsVersion };
+        tree.overwrite('package.json', JSON.stringify(packageJsonContent));
+        await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
+    }
+    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);
+        }
+    ]);
+};
 /**
  * Add Otter ama-sdk-schematics to a Project
  *
  * @param options
  */
 function ngAdd() {
-    return async (tree, context) => {
-        const amaSdkSchematicsPackageJsonContent = JSON.parse((0, node_fs_1.readFileSync)(path.resolve(__dirname, '..', '..', 'package.json'), { encoding: 'utf-8' }));
-        const amaSdkSchematicsVersion = amaSdkSchematicsPackageJsonContent.version ? `@${amaSdkSchematicsPackageJsonContent.version}` : '';
-        const schematicsDependencies = ['@o3r/dev-tools', '@o3r/schematics'];
-        for (const dependency of schematicsDependencies) {
-            context.addTask(new DevInstall({
-                packageName: dependency + amaSdkSchematicsVersion,
-                hideOutput: false,
-                quiet: false
-            }));
-            await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
+    return (tree, context) => (0, schematics_1.chain)([
+        registerPackageSchematics,
+        exports.updatePackageJsonScripts,
+        (t) => {
+            const packageJson = tree.readText(packageJsonPath);
+            const needsToInstallOpenApiGeneratorCli = packageJson.match(/@ama-sdk\/schematics:typescript-.*--spec-path ([.\\/a-zA-Z-]+) /)?.[1];
+            return needsToInstallOpenApiGeneratorCli ? (0, schematics_1.chain)([replaceSwaggerIgnore, installOpenApiToolsCli, createOpenApiToolsConfig]) : t;
         }
-        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);
-            },
-            exports.updatePackageJsonScripts
-        ])(tree, context);
-    };
+    ])(tree, context);
 }
 exports.ngAdd = ngAdd;
 //# sourceMappingURL=index.js.map

package/schematics/typescript/core/index.js

@@ -12,7 +12,7 @@ const getRegexpTemplate = (regexp) => `new RegExp('${regexp.toString().replace(/
 const getPathObjectTemplate = (pathObj) => {
     return `{
       ${Object.keys(pathObj).map((propName) => {
-        const value = propName === 'regexp' ? getRegexpTemplate(pathObj[propName]) : JSON.stringify(pathObj[propName]);
+        const value = (propName) === 'regexp' ? getRegexpTemplate(pathObj[propName]) : JSON.stringify(pathObj[propName]);
         return `${propName}: ${value}`;
     }).join(',')}
     }`;

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":"AAAA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAE7E;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CAsDnG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAIL,MAAM,4BAA4B,CAAC;AAGpC,OAAO,KAAK,EAAE,4CAA4C,EAAE,MAAM,UAAU,CAAC;AAE7E;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,4CAA4C,GAAG,IAAI,CAqEnG"}

package/schematics/typescript/shell/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateTypescriptSDK = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const js_yaml_1 = require("js-yaml");
 const read_package_1 = require("../../helpers/read-package");
 /**
  * @param options
@@ -48,6 +49,21 @@ function ngGenerateTypescriptSDK(options) {
             engineVersions,
             empty: ''
         };
+        const yarnrcPath = '.yarnrc.yml';
+        const yarnrc = ((0, js_yaml_1.load)(tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : '') || {});
+        yarnrc.nodeLinker ||= 'pnp';
+        yarnrc.packageExtensions ||= {};
+        yarnrc.packageExtensions['@ama-sdk/schematics@*'] = {
+            dependencies: {
+                'isomorphic-fetch': '~2.2.1'
+            }
+        };
+        if (tree.exists(yarnrcPath)) {
+            tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
+        }
+        else {
+            tree.create(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
+        }
         const baseRule = (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates/base'), [
             (0, schematics_1.template)(properties),
             (0, schematics_1.move)(tree.root.path),

package/schematics/typescript/shell/templates/base/openapitools.json

@@ -2,6 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/OpenAPITools/openapi-generator-cli/master/apps/generator-cli/src/config.schema.json",
   "spaces": 2,
   "generator-cli": {
-    "version": "<%= openApiSupportedVersion %>"
+    "version": "<%= openApiSupportedVersion %>",
+    "storageDir": ".openapi-generator"
   }
 }

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

@@ -82,7 +82,7 @@
     "@o3r/eslint-plugin": "^<%= sdkCoreVersion %>",
     "@openapitools/openapi-generator-cli": "<%= versions['@openapitools/openapi-generator-cli'] %>",
     "@swc/cli": "^0.1.57",
-    "@swc/core": "^1.2.249",
+    "@swc/core": "^1.3.66",
     "@types/jest": "<%= versions['@types/jest'] %>",
     "@types/node": "<%= versions['@types/node'] %>",
     "@typescript-eslint/eslint-plugin": "<%= versions['@typescript-eslint/eslint-plugin'] %>",
@@ -116,5 +116,5 @@
     "npm": "<%= engineVersions['npm'] %>",
     "yarn": "<%= engineVersions['yarn'] %>"
   },
-  "packageManager": "yarn@3.6.0"
+  "packageManager": "yarn@3.6.1"
 }

package/schematics/typescript/shell/templates/base/.yarnrc.yml

@@ -1,6 +0,0 @@
-nodeLinker: pnp
-
-packageExtensions:
-  "@ama-sdk/schematics@*":
-    dependencies:
-      isomorphic-fetch: ~2.2.1