@ama-sdk/schematics 8.3.0-alpha.40 → 8.4.0-alpha.20

package/schematics/java/client-core/index.js

@@ -4,8 +4,8 @@ exports.ngGenerateJavaClientCore = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const node_fs_1 = require("node:fs");
 const path = require("node:path");
-const execute_jars_1 = require("../../helpers/execute-jars");
 const tree_glob_1 = require("../../helpers/tree-glob");
+const swagger_java_generator_1 = require("../../code-generator/swagger-java-generator/swagger-java.generator");
 /** Base path where to find codegen jars */
 const jarBasePath = path.resolve(__dirname, 'swagger-codegen-java-client', 'target');
 /**
@@ -14,7 +14,7 @@ const jarBasePath = path.resolve(__dirname, 'swagger-codegen-java-client', 'targ
  * @param options
  */
 function ngGenerateJavaClientCore(options) {
-    const specPath = path.resolve(process.cwd(), options.swaggerSpecPath);
+    const specPath = path.resolve(process.cwd(), options.specPath);
     /**
      * rule to clear previous SDK generation
      *
@@ -27,21 +27,21 @@ function ngGenerateJavaClientCore(options) {
             const modelPackage = swaggerConfig.additionalProperties?.basePackage;
             if (modelPackage) {
                 context.logger.info('Remove previously generated base models');
-                (0, tree_glob_1.treeGlob)(tree, path.posix.join('src', 'main', 'java', ...modelPackage.split('.'), '**', '*.java')).forEach((file) => tree.delete(file));
+                (0, tree_glob_1.treeGlob)(tree, path.join('src', 'main', 'java', ...modelPackage.split('.'), '**', '*.java')).forEach((file) => tree.delete(file));
             }
             const apiInterfacesPackage = swaggerConfig.additionalProperties.endpointsPackage;
             if (apiInterfacesPackage) {
                 context.logger.info('Remove previously generated API interfaces');
-                (0, tree_glob_1.treeGlob)(tree, path.posix.join('src', 'main', 'java', ...apiInterfacesPackage.split('.'), '**', '*.java')).forEach((file) => tree.delete(file));
+                (0, tree_glob_1.treeGlob)(tree, path.join('src', 'main', 'java', ...apiInterfacesPackage.split('.'), '**', '*.java')).forEach((file) => tree.delete(file));
             }
             const apiImplPackage = swaggerConfig.additionalProperties.endpointsImplPackage;
             if (apiImplPackage) {
                 context.logger.info('Remove previously generated API implementations');
-                (0, tree_glob_1.treeGlob)(tree, path.posix.join('src', 'main', 'java', ...apiImplPackage.split('.'), '**', '*.java')).forEach((file) => tree.delete(file));
+                (0, tree_glob_1.treeGlob)(tree, path.join('src', 'main', 'java', ...apiImplPackage.split('.'), '**', '*.java')).forEach((file) => tree.delete(file));
             }
         }
         context.logger.info('Remove previously generated doc');
-        (0, tree_glob_1.treeGlob)(tree, path.posix.join('docs', '**')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join('docs', '**')).forEach((file) => tree.delete(file));
         if (tree.exists('/README.md')) {
             context.logger.info('Remove previously generated readme');
             tree.delete('/README.md');
@@ -55,7 +55,7 @@ function ngGenerateJavaClientCore(options) {
      * @param _context
      */
     const generateSource = async (tree) => {
-        const specContent = await node_fs_1.promises.readFile(path.resolve(process.cwd(), options.swaggerSpecPath), { encoding: 'utf8' });
+        const specContent = await node_fs_1.promises.readFile(path.resolve(process.cwd(), options.specPath), { encoding: 'utf8' });
         if (tree.exists('/swagger-spec.yaml')) {
             tree.overwrite('/swagger-spec.yaml', specContent);
         }
@@ -67,7 +67,13 @@ function ngGenerateJavaClientCore(options) {
     return (0, schematics_1.chain)([
         clearGeneratedCode,
         generateSource,
-        (0, execute_jars_1.executeSwaggerJarsRuleFactory)(jarBasePath, specPath, 'javaClient', false, options.swaggerConfigPath)
+        (new swagger_java_generator_1.SwaggerJavaGenerator()).getGeneratorRunSchematic({
+            targetFolder: jarBasePath,
+            specPath,
+            codegenLanguage: 'javaClient',
+            apiTests: false,
+            specConfigPath: options.swaggerConfigPath
+        })
     ]);
 }
 exports.ngGenerateJavaClientCore = ngGenerateJavaClientCore;

package/schematics/java/client-core/schema.d.ts

@@ -1,7 +1,7 @@
 import { JsonObject } from '@angular-devkit/core';
 export interface NgGenerateJavaClientCoreSchematicsSchema extends JsonObject {
     /** Path to the swagger specification used to generate the SDK */
-    swaggerSpecPath: string;
+    specPath: string;
     /** Swagger config file */
     swaggerConfigPath: string | null;
 }

package/schematics/java/client-core/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/java/client-core/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,WAAW,wCAAyC,SAAQ,UAAU;IAC1E,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC;IAExB,0BAA0B;IAC1B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/java/client-core/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,MAAM,WAAW,wCAAyC,SAAQ,UAAU;IAC1E,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC;IAEjB,0BAA0B;IAC1B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC"}

package/schematics/java/client-core/schema.json

@@ -4,7 +4,7 @@
   "title": "Generate Java Client",
   "description": "ng generate java-client-core",
   "properties": {
-    "swaggerSpecPath": {
+    "specPath": {
       "type": "string",
       "description": "Path to the swagger specification used to generate the SDK",
       "x-prompt": "Swagger Spec file to generate the SDK",
@@ -21,6 +21,6 @@
   },
   "additionalProperties": true,
   "required": [
-    "swaggerSpecPath"
+    "specPath"
   ]
 }

package/schematics/ng-add/index.js

@@ -61,7 +61,7 @@ const updatePackageJsonScripts = (tree, context) => {
                 .replace(/@ama-sdk\/generator-sdk\/(src\/)?generators/g, '@ama-sdk/schematics/schematics') // Change relative path for swaggerConfigPath
                 .replace(/(@ama-sdk\/schematics\/schematics\/)java-client-core/g, '$1java/client-core') // Change java client core path
                 .replace(/@ama-sdk\/(schematics|generator-sdk):(core|shell|create|mock)/g, '@ama-sdk/schematics:typescript-$2') // Change typescript schematics name
-                .replaceAll('--swaggerSpecPath', '--swagger-spec-path') // Schematics arguments should be kebab-case
+                .replaceAll('--swaggerSpecPath', '--spec-path') // Schematics arguments should be kebab-case
                 .replaceAll('--swaggerConfigPath', '--swagger-config-path') // Schematics arguments should be kebab-case
                 .replace(
             // Remove swagger config path if it is the default value

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":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AAOpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAkBvE;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,2CAA2C,GAAG,IAAI,CA0FlG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,IAAI,EAKL,MAAM,4BAA4B,CAAC;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAgBvE;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,2CAA2C,GAAG,IAAI,CA0GlG"}

package/schematics/typescript/core/index.js

@@ -4,9 +4,10 @@ exports.ngGenerateTypescriptSDK = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const node_fs_1 = require("node:fs");
 const path = require("node:path");
+const semver = require("semver");
 const sway = require("sway");
-const execute_jars_1 = require("../../helpers/execute-jars");
 const tree_glob_1 = require("../../helpers/tree-glob");
+const open_api_cli_generator_1 = require("../../code-generator/open-api-cli-generator/open-api-cli.generator");
 const getRegexpTemplate = (regexp) => `new RegExp('${regexp.toString().replace(/\/(.*)\//, '$1').replace(/\\\//g, '/')}')`;
 const getPathObjectTemplate = (pathObj) => {
     return `{
@@ -16,18 +17,16 @@ const getPathObjectTemplate = (pathObj) => {
     }).join(',')}
     }`;
 };
-/** Base path where to find codegen jars */
-const jarBasePath = path.resolve(__dirname, 'swagger-codegen-typescript', 'target');
 /**
  * Generate a typescript SDK source code base on swagger specification
  *
  * @param options
  */
 function ngGenerateTypescriptSDK(options) {
-    const specPath = path.resolve(process.cwd(), options.swaggerSpecPath);
+    const specPath = path.resolve(process.cwd(), options.specPath);
     const generateOperationFinder = async () => {
         const swayOptions = {
-            definition: path.resolve(options.swaggerSpecPath)
+            definition: path.resolve(options.specPath)
         };
         const swayApi = await sway.create(swayOptions);
         const extraction = swayApi.getPaths().map((obj) => ({
@@ -50,10 +49,10 @@ function ngGenerateTypescriptSDK(options) {
      * @param _context
      */
     const clearGeneratedCode = (tree, _context) => {
-        (0, tree_glob_1.treeGlob)(tree, path.posix.join('src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
-        (0, tree_glob_1.treeGlob)(tree, path.posix.join('src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
-        (0, tree_glob_1.treeGlob)(tree, path.posix.join('src', 'models', 'base', '**', '!(index).ts')).forEach((file) => tree.delete(file));
-        (0, tree_glob_1.treeGlob)(tree, path.posix.join('src', 'spec', '!(operation-adapter|index).ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join('src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join('src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join('src', 'models', 'base', '**', '!(index).ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join('src', 'spec', '!(operation-adapter|index).ts')).forEach((file) => tree.delete(file));
         return tree;
     };
     /**
@@ -81,8 +80,8 @@ function ngGenerateTypescriptSDK(options) {
      * @param tree
      * @param _context
      */
-    const updateSpec = async (tree, _context) => {
-        const specContent = await node_fs_1.promises.readFile(specPath, { encoding: 'utf8' });
+    const updateSpec = (tree, _context) => {
+        const specContent = (0, node_fs_1.readFileSync)(specPath).toString();
         if (tree.exists('/readme.md')) {
             const swaggerVersion = /version: ([0-9]+\.[0-9]+\.[0-9]+)/.exec(specContent);
             if (swaggerVersion) {
@@ -98,11 +97,27 @@ function ngGenerateTypescriptSDK(options) {
         }
         return () => tree;
     };
+    const runGeneratorRule = (tree, context) => {
+        const generatorOptions = { specPath };
+        const packageJsonFile = JSON.parse(((0, node_fs_1.readFileSync)(path.join(__dirname, '..', '..', '..', 'package.json'))).toString());
+        const packageOpenApiSupportedVersion = packageJsonFile.openApiSupportedVersion?.replace(/\^|~/, '');
+        let openApiVersion = '';
+        try {
+            openApiVersion = tree.readJson('openapitools.json')?.['generator-cli']?.version;
+        }
+        catch {
+            context.logger.warn('No openapitools.json file found in the project');
+        }
+        if (!!packageOpenApiSupportedVersion && semver.valid(packageOpenApiSupportedVersion) && (!packageOpenApiSupportedVersion || !semver.satisfies(openApiVersion, packageOpenApiSupportedVersion))) {
+            generatorOptions.generatorVersion = packageOpenApiSupportedVersion;
+        }
+        return () => (new open_api_cli_generator_1.OpenApiCliGenerator()).getGeneratorRunSchematic(generatorOptions);
+    };
     return (0, schematics_1.chain)([
         clearGeneratedCode,
         generateSource,
         updateSpec,
-        (0, execute_jars_1.executeSwaggerJarsRuleFactory)(jarBasePath, specPath, 'typescriptFetch')
+        runGeneratorRule
     ]);
 }
 exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;

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

@@ -1,6 +1,6 @@
 import type { JsonObject } from '@angular-devkit/core';
 export interface NgGenerateTypescriptSDKCoreSchematicsSchema extends JsonObject {
     /** Path to the swagger specification used to generate the SDK */
-    swaggerSpecPath: string;
+    specPath: string;
 }
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,2CAA4C,SAAQ,UAAU;IAC7E,iEAAiE;IACjE,eAAe,EAAE,MAAM,CAAC;CACzB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/core/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,2CAA4C,SAAQ,UAAU;IAC7E,iEAAiE;IACjE,QAAQ,EAAE,MAAM,CAAC;CAClB"}

package/schematics/typescript/core/schema.json

@@ -4,10 +4,10 @@
   "title": "Generate Typescript SDK",
   "description": "ng generate typescript-core",
   "properties": {
-    "swaggerSpecPath": {
+    "specPath": {
       "type": "string",
-      "description": "Path to the swagger specification used to generate the SDK",
-      "x-prompt": "Path to the swagger spec",
+      "description": "Path to the swagger/open-api specification used to generate the SDK",
+      "x-prompt": "Path to the swagger / open-api spec",
       "$default": {
         "$source": "argv",
         "index": 0
@@ -16,6 +16,6 @@
   },
   "additionalProperties": true,
   "required": [
-    "swaggerSpecPath"
+    "specPath"
   ]
 }

package/schematics/typescript/create/schema.json

@@ -4,7 +4,7 @@
   "title": "Generate Typescript SDK",
   "description": "ng generate typescript-sdk",
   "properties": {
-    "swaggerSpecPath": {
+    "specPath": {
       "type": "string",
       "description": "Path to the swagger specification used to generate the SDK",
       "x-prompt": "Path to the swagger spec",
@@ -34,7 +34,7 @@
   "required": [
     "name",
     "package",
-    "swaggerSpecPath"
+    "specPath"
   ],
   "additionalProperties": true
 }

package/schematics/typescript/mock/index.js

@@ -49,7 +49,7 @@ function ngGenerateMock(options) {
     const dasherizeModelName = getDasherizeModelName(options.apiModel);
     const generateRootBarrel = (tree) => {
         let currentComponentIndex = '';
-        const barrelPath = path.posix.join(options.path, 'index.ts');
+        const barrelPath = path.join(options.path, 'index.ts');
         if (tree.exists(barrelPath)) {
             const currentServiceIndexBuffer = tree.read(barrelPath);
             currentComponentIndex = currentServiceIndexBuffer ? currentServiceIndexBuffer.toString() : '';
@@ -62,7 +62,7 @@ function ngGenerateMock(options) {
         return tree;
     };
     const generateFiles = (tree, context) => {
-        const mockDestination = path.posix.join(options.path, dasherizeModelName);
+        const mockDestination = path.join(options.path, dasherizeModelName);
         return (0, schematics_1.mergeWith)((0, schematics_1.apply)((0, schematics_1.url)('./templates'), [
             (0, schematics_1.template)({
                 ...options,

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,CAgDnG"}
+{"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,CAqDnG"}

package/schematics/typescript/shell/index.js

@@ -7,7 +7,7 @@ const read_package_1 = require("../../helpers/read-package");
  * @param options
  */
 function ngGenerateTypescriptSDK(options) {
-    return async (tree) => {
+    return async (tree, context) => {
         const amaSdkSchematicsPackageJson = await (0, read_package_1.readPackageJson)();
         /* eslint-disable @typescript-eslint/naming-convention */
         const versions = {
@@ -24,8 +24,12 @@ function ngGenerateTypescriptSDK(options) {
             'isomorphic-fetch': amaSdkSchematicsPackageJson.devDependencies['isomorphic-fetch'],
             'jest': amaSdkSchematicsPackageJson.devDependencies.jest,
             'ts-jest': amaSdkSchematicsPackageJson.devDependencies['ts-jest'],
-            'typescript': amaSdkSchematicsPackageJson.devDependencies.typescript
+            'typescript': amaSdkSchematicsPackageJson.devDependencies.typescript,
+            '@openapitools/openapi-generator-cli': amaSdkSchematicsPackageJson.devDependencies['@openapitools/openapi-generator-cli']
         };
+        const openApiSupportedVersion = typeof amaSdkSchematicsPackageJson.openApiSupportedVersion === 'string' &&
+            amaSdkSchematicsPackageJson.openApiSupportedVersion.replace(/\^|~/, '');
+        context.logger.warn(JSON.stringify(openApiSupportedVersion));
         const engineVersions = {
             'node': amaSdkSchematicsPackageJson.engines.node,
             'npm': amaSdkSchematicsPackageJson.engines.npm,
@@ -39,6 +43,7 @@ function ngGenerateTypescriptSDK(options) {
             sdkCoreVersion: amaSdkSchematicsPackageJson.version,
             angularVersion: amaSdkSchematicsPackageJson.dependencies['@angular-devkit/core'],
             versions,
+            ...openApiSupportedVersion ? { openApiSupportedVersion } : {},
             engineVersions,
             empty: ''
         };

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

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

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

@@ -39,8 +39,8 @@
     "build:esm2020": "tsc -b tsconfigs/esm2020",
     "set:version": "set-version --placeholder 0.0.0",
     "resolve": "node -e 'process.stdout.write(require.resolve(process.argv[1]));'",
-    "generate": "schematics @ama-sdk/schematics:typescript-core --swagger-spec-path ./swagger-spec.yaml",
-    "swagger:regen": "schematics @ama-sdk/schematics:typescript-core --swagger-spec-path ./swagger-spec.yaml && yarn clear-index",
+    "generate": "schematics @ama-sdk/schematics:typescript-core --spec-path ./swagger-spec.yaml",
+    "spec:regen": "schematics @ama-sdk/schematics:typescript-core --spec-path ./swagger-spec.yaml && yarn clear-index",
     "clear-index": "node scripts/clear-index.js",
     "files:pack": "node scripts/files-pack.js",
     "test": "jest --passWithNoTests",
@@ -80,6 +80,7 @@
     "@ama-sdk/core": "~<%= sdkCoreVersion %>",
     "@o3r/eslint-config-otter": "^<%= sdkCoreVersion %>",
     "@o3r/eslint-plugin": "^<%= sdkCoreVersion %>",
+    "@openapitools/openapi-generator-cli": "<%= versions['@openapitools/openapi-generator-cli'] %>",
     "@swc/cli": "^0.1.57",
     "@swc/core": "^1.2.249",
     "@types/jest": "<%= versions['@types/jest'] %>",

package/schematics/typescript/shell/templates/base/readme.md

@@ -20,7 +20,7 @@ The following folders contain the generated code:
 The Code can be regenerated by running the following command:
 
 ```shell
-yarn schematics @ama-sdk/sdk:typescript-core --swagger-spec-path [path to your swagger file]
+yarn schematics @ama-sdk/sdk:typescript-core --spec-path [path to your swagger file]
 ```
 
 ***
@@ -98,7 +98,7 @@ Some commands are provided to keep your SDK up-to-date.
 ### Generate SDK from a Swagger specification
 
 ```shell
-yarn swagger:regen
+yarn spec:regen
 ```
 
 ### Run Unit Tests

package/schematics/typescript/shell/templates/base/scripts/files-pack.js

@@ -20,19 +20,19 @@ const files = [
 
 /**  Update package.json exports */
 const updateExports = async () => {
-  const packageJson = JSON.parse(await fs.readFile(path.posix.join(baseDir, 'package.json'), { encoding: 'utf8' }));
-  const packageJsonFiles = sync(path.posix.join(baseDir, distFolder, '*', '**', 'package.json'), {absolute: true});
+  const packageJson = JSON.parse(await fs.readFile(path.join(baseDir, 'package.json'), { encoding: 'utf8' }));
+  const packageJsonFiles = sync(path.join(baseDir, distFolder, '*', '**', 'package.json'), {absolute: true});
   packageJson.exports = packageJson.exports || {};
   for (const packageJsonFile of packageJsonFiles) {
     try {
       const subPackageJson = JSON.parse(await fs.readFile(packageJsonFile, { encoding: 'utf8' }));
-      const folder = './' + path.relative(path.posix.join(baseDir, distFolder), path.dirname(packageJsonFile)).replace(/[/\\]+/g, '/');
+      const folder = './' + path.relative(path.join(baseDir, distFolder), path.dirname(packageJsonFile)).replace(/[/\\]+/g, '/');
       packageJson.exports[folder] = packageJson.exports[folder] || {};
       Object.entries(subPackageJson).forEach(([key, value]) => {
         if (['name', 'sideEffects'].includes(key)) {
           return;
         }
-        packageJson.exports[folder][key] = './' + path.relative(path.posix.join(baseDir, distFolder), path.resolve(path.dirname(packageJsonFile), value)).replace(/[/\\]+/g, '/');
+        packageJson.exports[folder][key] = './' + path.relative(path.join(baseDir, distFolder), path.resolve(path.dirname(packageJsonFile), value)).replace(/[/\\]+/g, '/');
       });
       packageJson.exports[folder].import = packageJson.exports[folder].module || packageJson.exports[folder].esm2020 || packageJson.exports[folder].esm2015 || packageJson.exports[folder].node;
       packageJson.exports[folder].require = packageJson.exports[folder].node;
@@ -46,7 +46,7 @@ const updateExports = async () => {
     }
   }
   delete packageJson.scripts;
-  await fs.writeFile(path.posix.join(baseDir, distFolder, 'package.json'), JSON.stringify(packageJson, null, 2));
+  await fs.writeFile(path.join(baseDir, distFolder, 'package.json'), JSON.stringify(packageJson, null, 2));
 };
 
 (async () => {
@@ -56,13 +56,13 @@ const updateExports = async () => {
     acc.push(
       watch ?
         // eslint-disable-next-line no-console
-        cpx.watch(path.posix.join(baseDir, glob), distFolder).on('copy', (e) => {
+        cpx.watch(path.join(baseDir, glob), distFolder).on('copy', (e) => {
           console.log(`${e.srcPath} copied to ${e.dstPath}`);
           if (!noExports) {
             void updateExports()
           }
         }) :
-        promisify(cpx.copy)(path.posix.join(baseDir, glob), distFolder));
+        promisify(cpx.copy)(path.join(baseDir, glob), distFolder));
     return acc;
   }, []);
   await Promise.all(copies);

package/schematics/typescript/shell/templates/base/scripts/override-readme.js

@@ -10,6 +10,6 @@ const argv = minimist(process.argv.slice(2));
 const folderName = argv.folderName || '@<%=projectName%>/<%=projectPackageName%>';
 
 (async () => {
-  await copyFile(path.posix.join(root, 'readme.md'), path.posix.join(root, '.readme-backup'));
-  await copyFile(path.posix.join(root, 'packages', folderName, 'readme.md'), root);
+  await copyFile(path.join(root, 'readme.md'), path.join(root, '.readme-backup'));
+  await copyFile(path.join(root, 'packages', folderName, 'readme.md'), root);
 })();

package/schematics/typescript/shell/templates/base/scripts/restore-readme.js

@@ -9,6 +9,6 @@ const rimrafDir = util.promisify(rimraf);
 const root = path.resolve(__dirname, '..');
 
 (async () => {
-  await copyFile(path.posix.join(root, '.readme-backup', 'readme.md'), root);
-  await rimrafDir(path.posix.join(root, '.readme-backup'));
+  await copyFile(path.join(root, '.readme-backup', 'readme.md'), root);
+  await rimrafDir(path.join(root, '.readme-backup'));
 })();

package/schematics/api-extension/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/api-extension/index.ts"],"names":[],"mappings":";;;AAAA,2DASoC;AAGpC;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,OAA+C;IAEpF,OAAO,CAAC,IAAU,EAAE,EAAE,CAAC,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,aAAa,CAAC,EAAE;QACzD,IAAA,qBAAQ,EAAC;YACP,GAAG,OAAO;YACV,KAAK,EAAE,EAAE;SACV,CAAC;QACF,IAAA,iBAAI,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACpB,IAAA,gCAAmB,GAAE;KACtB,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC,CAAC;AAE/B,CAAC;AAXD,wDAWC"}

package/schematics/api-extension/schema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../schematics/api-extension/schema.ts"],"names":[],"mappings":""}

package/schematics/helpers/execute-jars.d.ts

@@ -1,14 +0,0 @@
-import { Rule } from '@angular-devkit/schematics';
-/**
- * Execute the Swagger CLI and codeGen rule factory
- *
- * @param targetFolder folder where to download the jars
- * @param swaggerSpecPath path to the swagger specification
- * @param codegenLanguage codegen template language
- * @param apiTests
- * @param codegenFileName Name of the codeGen jar
- * @param cliFilename Name of the codeGen CLI jar
- * @param swaggerConfigPath path to the swagger configuration
- */
-export declare const executeSwaggerJarsRuleFactory: (targetFolder: string, swaggerSpecPath: string, codegenLanguage: string, apiTests?: boolean, swaggerConfigPath?: string | null, codegenFileName?: string, cliFilename?: string) => Rule;
-//# sourceMappingURL=execute-jars.d.ts.map

package/schematics/helpers/execute-jars.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"execute-jars.d.ts","sourceRoot":"","sources":["../../../schematics/helpers/execute-jars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAAyE,MAAM,4BAA4B,CAAC;AA8ChI;;;;;;;;;;GAUG;AACH,eAAO,MAAM,6BAA6B,iBAC1B,MAAM,mBACH,MAAM,mBACN,MAAM,0CAEH,MAAM,GAAG,IAAI,qDAGhC,IAUF,CAAC"}

package/schematics/helpers/execute-jars.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeSwaggerJarsRuleFactory = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-const path = require("node:path");
-const generator_java_task_1 = require("./generator-java.task");
-class JavaGeneratorTask {
-    /**
-     * @param targetFolder folder where to download the jars
-     * @param swaggerSpecPath
-     * @param codegenLanguage
-     * @param apiTests
-     * @param cliFilename
-     * @param codegenFileName Name of the codeGen jar
-     * @param workingDirectory
-     */
-    constructor(targetFolder, swaggerSpecPath, codegenLanguage, apiTests = true, swaggerConfigPath, cliFilename = 'swagger-codegen-cli.jar', codegenFileName = 'swagger-codegen.jar', workingDirectory) {
-        this.swaggerSpecPath = swaggerSpecPath;
-        this.codegenLanguage = codegenLanguage;
-        this.apiTests = apiTests;
-        this.swaggerConfigPath = swaggerConfigPath;
-        this.workingDirectory = workingDirectory;
-        this.codegenPath = path.posix.join(targetFolder, `${codegenLanguage}-${codegenFileName}`);
-        this.cliPath = path.resolve(__dirname, '..', 'resources', cliFilename);
-    }
-    toConfiguration() {
-        return {
-            name: generator_java_task_1.javaGeneratorName,
-            options: {
-                codegenPath: this.codegenPath,
-                codegenLanguage: this.codegenLanguage,
-                cliPath: this.cliPath,
-                apiTests: this.apiTests,
-                swaggerSpecPath: this.swaggerSpecPath,
-                swaggerConfigPath: this.swaggerConfigPath
-            }
-        };
-    }
-}
-/**
- * Execute the Swagger CLI and codeGen rule factory
- *
- * @param targetFolder folder where to download the jars
- * @param swaggerSpecPath path to the swagger specification
- * @param codegenLanguage codegen template language
- * @param apiTests
- * @param codegenFileName Name of the codeGen jar
- * @param cliFilename Name of the codeGen CLI jar
- * @param swaggerConfigPath path to the swagger configuration
- */
-const executeSwaggerJarsRuleFactory = (targetFolder, swaggerSpecPath, codegenLanguage, apiTests = true, swaggerConfigPath, codegenFileName = 'swagger-codegen.jar', cliFilename = 'swagger-codegen-cli.jar') => {
-    const scheduleTask = (tree, context) => {
-        context.addTask(new JavaGeneratorTask(targetFolder, swaggerSpecPath, codegenLanguage, apiTests, swaggerConfigPath, cliFilename, codegenFileName));
-        return tree;
-    };
-    return (0, schematics_1.chain)([
-        generator_java_task_1.registerJavaGeneratorExecutor,
-        scheduleTask
-    ]);
-};
-exports.executeSwaggerJarsRuleFactory = executeSwaggerJarsRuleFactory;
-//# sourceMappingURL=execute-jars.js.map

package/schematics/helpers/execute-jars.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"execute-jars.js","sourceRoot":"","sources":["../../../schematics/helpers/execute-jars.ts"],"names":[],"mappings":";;;AAAA,2DAAgI;AAChI,kCAAkC;AAClC,+DAAmH;AAGnH,MAAM,iBAAiB;IAKrB;;;;;;;;OAQG;IACH,YAAY,YAAoB,EACrB,eAAuB,EACvB,eAAuB,EACvB,WAAW,IAAI,EACf,iBAAiC,EACxC,WAAW,GAAG,yBAAyB,EACvC,eAAe,GAAG,qBAAqB,EAChC,gBAAyB;QANzB,oBAAe,GAAf,eAAe,CAAQ;QACvB,oBAAe,GAAf,eAAe,CAAQ;QACvB,aAAQ,GAAR,QAAQ,CAAO;QACf,sBAAiB,GAAjB,iBAAiB,CAAgB;QAGjC,qBAAgB,GAAhB,gBAAgB,CAAS;QAClC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,eAAe,IAAI,eAAe,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;IACzE,CAAC;IAEM,eAAe;QACpB,OAAO;YACL,IAAI,EAAE,uCAAiB;YACvB,OAAO,EAAE;gBACP,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,eAAe,EAAE,IAAI,CAAC,eAAe;gBACrC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;aAC1C;SACF,CAAC;IACJ,CAAC;CACF;AAED;;;;;;;;;;GAUG;AACI,MAAM,6BAA6B,GAAG,CAC3C,YAAoB,EACpB,eAAuB,EACvB,eAAuB,EACvB,QAAQ,GAAG,IAAI,EACf,iBAAiC,EACjC,eAAe,GAAG,qBAAqB,EACvC,WAAW,GAAG,yBAAyB,EACjC,EAAE;IACR,MAAM,YAAY,GAAG,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAC7D,OAAO,CAAC,OAAO,CAAC,IAAI,iBAAiB,CAAC,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,EAAE,iBAAiB,EAAE,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC;QAClJ,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,OAAO,IAAA,kBAAK,EAAC;QACX,mDAA6B;QAC7B,YAAY;KACb,CAAC,CAAC;AACL,CAAC,CAAC;AAlBW,QAAA,6BAA6B,iCAkBxC"}

package/schematics/helpers/generator-java.task.d.ts

@@ -1,59 +0,0 @@
-import { SchematicContext, TaskExecutor, Tree } from '@angular-devkit/schematics';
-/**
- * Options for the generator-java task.
- */
-export interface JavaGeneratorTaskOptions {
-    /**
-     * Enable API testing in Swagger Codegen
-     *
-     * @default true
-     */
-    apiTests: boolean;
-    /**
-     * Path to the Swagger CLI
-     *
-     * @default 'swagger-codegen-cli.jar'
-     */
-    cliPath: string;
-    /**
-     * Path to the Swagger Codegen
-     *
-     * @default 'swagger-codegen.jar'
-     */
-    codegenPath: string;
-    /**
-     * Template language use for the codegen
-     *
-     * @default 'default'
-     */
-    codegenLanguage: string;
-    /**
-     * Path to the Swagger specification
-     *
-     * @default 'swagger-spec.yaml'
-     */
-    swaggerSpecPath: string;
-    /**
-     * Path to the swagger configuration
-     */
-    swaggerConfigPath?: string | null;
-}
-/**
- * Java swagger generator task factory
- *
- * @param factoryOptions.rootDirectory The root directory of the process execution
- * @param factoryOptions
- */
-export declare const javaGeneratorFactory: (factoryOptions?: {
-    rootDirectory?: string;
-}) => TaskExecutor<Partial<JavaGeneratorTaskOptions>>;
-/** Name of the Java codegen task */
-export declare const javaGeneratorName = "java-generator";
-/**
- * Rule to register the Java generator task
- *
- * @param tree
- * @param context
- */
-export declare const registerJavaGeneratorExecutor: (tree: Tree, context: SchematicContext) => import("@angular-devkit/schematics/src/tree/interface").Tree;
-//# sourceMappingURL=generator-java.task.d.ts.map

package/schematics/helpers/generator-java.task.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"generator-java.task.d.ts","sourceRoot":"","sources":["../../../schematics/helpers/generator-java.task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAKlF;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;;;OAIG;IACH,eAAe,EAAE,MAAM,CAAC;IACxB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAUD;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,oBAAoB;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAC,KAAQ,aAAa,QAAQ,wBAAwB,CAAC,CAgDlI,CAAC;AAEF,oCAAoC;AACpC,eAAO,MAAM,iBAAiB,mBAAmB,CAAC;AAElD;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,SAAU,IAAI,4FAUvD,CAAC"}