@ama-sdk/schematics 9.0.0-alpha.32 → 9.0.0-alpha.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "9.0.0-alpha.32",
+  "version": "9.0.0-alpha.34",
   "description": "Swagger specification SDK Generator by schematics",
   "scripts": {
     "nx": "nx",
@@ -41,7 +41,7 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.32",
+    "@ama-sdk/core": "^9.0.0-alpha.34",
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
     "@angular-devkit/schematics-cli": "~16.0.5",
@@ -52,7 +52,7 @@
   "dependencies": {
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
-    "@o3r/dev-tools": "^9.0.0-alpha.32",
+    "@o3r/dev-tools": "^9.0.0-alpha.34",
     "js-yaml": "^4.1.0",
     "minimatch": "^9.0.0",
     "rxjs": "^7.8.1",
@@ -61,14 +61,14 @@
     "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.32",
+    "@ama-sdk/core": "^9.0.0-alpha.34",
     "@angular-devkit/schematics-cli": "~16.0.5",
     "@angular-eslint/eslint-plugin": "~16.0.3",
     "@angular/cli": "~16.0.5",
     "@nx/jest": "~16.5.0",
-    "@o3r/build-helpers": "^9.0.0-alpha.32",
-    "@o3r/eslint-plugin": "^9.0.0-alpha.32",
-    "@o3r/schematics": "^9.0.0-alpha.32",
+    "@o3r/build-helpers": "^9.0.0-alpha.34",
+    "@o3r/eslint-plugin": "^9.0.0-alpha.34",
+    "@o3r/schematics": "^9.0.0-alpha.34",
     "@openapitools/openapi-generator-cli": "~2.6.0",
     "@schematics/angular": "~16.0.5",
     "@types/jest": "~29.5.2",

package/schematics/code-generator/code-generator.d.ts

@@ -12,7 +12,7 @@ export type CodegenTaskOptions = {
     /**
      * Path to the swagger configuration
      */
-    specConfigPath: string | null;
+    specConfigPath: string;
     /**
      * Output path for the generated sdk
      */

package/schematics/code-generator/code-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-generator.d.ts","sourceRoot":"","sources":["../../../schematics/code-generator/code-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0E,YAAY,EAAQ,MAAM,4BAA4B,CAAC;AAKxI;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,aAAa,CAAC,CAAC,SAAS,kBAAkB;IACrD;;OAEG;IACH,SAAS,CAAC,aAAa,SAAM;IAE7B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAa5B;;;;;OAKG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;OAEG;IACH,SAAS,CAAC,iBAAiB,IAAI,CAAC;IAIhC;;;;;OAKG;IACH,SAAS,CAAC,uBAAuB,CAAC,eAAe,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,YAAY,CAAC,CAAC,CAAC;IAMpG;;;;;;OAMG;IACI,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,cAAc,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAO;CAU9G"}
+{"version":3,"file":"code-generator.d.ts","sourceRoot":"","sources":["../../../schematics/code-generator/code-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0E,YAAY,EAAQ,MAAM,4BAA4B,CAAC;AAKxI;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,aAAa,CAAC,CAAC,SAAS,kBAAkB;IACrD;;OAEG;IACH,SAAS,CAAC,aAAa,SAAM;IAE7B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAa5B;;;;;OAKG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;OAEG;IACH,SAAS,CAAC,iBAAiB,IAAI,CAAC;IAIhC;;;;;OAKG;IACH,SAAS,CAAC,uBAAuB,CAAC,eAAe,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,YAAY,CAAC,CAAC,CAAC;IAMpG;;;;;;OAMG;IACI,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,cAAc,GAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAO;CAU9G"}

package/schematics/code-generator/open-api-cli-generator/open-api-cli.options.d.ts

@@ -12,7 +12,7 @@ export type OpenApiCliOptions = CodegenTaskOptions & {
      *
      *  @default null
      */
-    generatorVersion: string | null;
+    generatorVersion: string;
     /**
      * The Open Api Generator to run
      *
@@ -24,7 +24,7 @@ export type OpenApiCliOptions = CodegenTaskOptions & {
      *
      * @default path to our own custom typescript generator
      */
-    generatorCustomPath: string | null;
+    generatorCustomPath: string;
 };
 /**
  * Default options to run our custom typescript generator

package/schematics/code-generator/open-api-cli-generator/open-api-cli.options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-api-cli.options.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAGrD;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,GAAG;IACnD;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,EAAE,iBAO/C,CAAC"}
+{"version":3,"file":"open-api-cli.options.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAGrD;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,GAAG;IACnD;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;;OAIG;IACH,mBAAmB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,EAAE,iBAO/C,CAAC"}

package/schematics/code-generator/open-api-cli-generator/open-api-cli.options.js

@@ -6,11 +6,11 @@ const path = require("node:path");
  * Default options to run our custom typescript generator
  */
 exports.defaultTypescriptGeneratorOptions = {
-    generatorVersion: null,
+    generatorVersion: '',
     generatorName: 'typescriptFetch',
     generatorCustomPath: path.join(__dirname, '..', '..', 'typescript', 'core', 'openapi-codegen-typescript', 'target', 'typescriptFetch-openapi-generator.jar'),
     specPath: 'swagger-spec.yaml',
     outputPath: '.',
-    specConfigPath: null
+    specConfigPath: ''
 };
 //# sourceMappingURL=open-api-cli.options.js.map

package/schematics/code-generator/swagger-java-generator/swagger-java.options.js

@@ -12,6 +12,6 @@ exports.defaultOptions = {
     codegenLanguage: 'default',
     specPath: 'swagger-spec.yaml',
     outputPath: '.',
-    specConfigPath: null
+    specConfigPath: ''
 };
 //# sourceMappingURL=swagger-java.options.js.map

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

@@ -22,7 +22,7 @@ function ngGenerateJavaClientCore(options) {
      * @param context
      */
     const clearGeneratedCode = async (tree, context) => {
-        const swaggerConfig = options.swaggerConfigPath ? JSON.parse(await node_fs_1.promises.readFile(options.swaggerConfigPath, { encoding: 'utf8' })) : undefined;
+        const swaggerConfig = options.specConfigPath ? JSON.parse(await node_fs_1.promises.readFile(options.specConfigPath, { encoding: 'utf8' })) : undefined;
         if (swaggerConfig?.additionalProperties) {
             const modelPackage = swaggerConfig.additionalProperties?.basePackage;
             if (modelPackage) {
@@ -72,7 +72,7 @@ function ngGenerateJavaClientCore(options) {
             specPath,
             codegenLanguage: 'javaClient',
             apiTests: false,
-            specConfigPath: options.swaggerConfigPath
+            specConfigPath: options.specConfigPath
         })
     ]);
 }

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

@@ -3,6 +3,6 @@ export interface NgGenerateJavaClientCoreSchematicsSchema extends JsonObject {
     /** Path to the swagger specification used to generate the SDK */
     specPath: string;
     /** Swagger config file */
-    swaggerConfigPath: string | null;
+    specConfigPath: string;
 }
 //# sourceMappingURL=schema.d.ts.map

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,QAAQ,EAAE,MAAM,CAAC;IAEjB,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,cAAc,EAAE,MAAM,CAAC;CACxB"}

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

@@ -13,10 +13,10 @@
         "index": 0
       }
     },
-    "swaggerConfigPath": {
+    "specConfigPath": {
       "type": "string",
       "description": "Swagger config file\nMore info: https://openapi-generator.tech/docs/generators/java/#config-options",
-      "default": null
+      "default": ""
     }
   },
   "additionalProperties": true,

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

package/schematics/ng-add/index.js

@@ -30,18 +30,19 @@ const updatePackageJsonScripts = (tree, context) => {
     const scripts = Object.entries(packageJson.scripts).reduce((acc, [scriptName, cmd]) => {
         if (typeof cmd === 'string') {
             acc[scriptName] = cmd
+                .replace(
+            // Remove swagger config path if it is the default value
+            // eslint-disable-next-line max-len
+            / --(swagger-config-path|swaggerConfigPath)[= ]?(\.\/)?node_modules\/@ama-sdk\/generator-sdk\/src\/generators\/java-client-core\/templates\/swagger-codegen-java-client\/config\/swagger-codegen-config.json/, '')
                 .replace(/\byo\b/g, 'schematics') // Migrate from yeoman to schematics
                 .replace(
             // Change generator path to schematics collection:name
-            /(\$\(yarn resolve |\.?\/?node_modules\/)@ama-sdk\/generator-sdk\/(src\/)?generators\/([\w-]+)\)?\s/g, '@ama-sdk/schematics:$3 ')
+            /(\$\(yarn resolve )?(\.?\/?node_modules\/)?@ama-sdk\/generator-sdk\/(src\/)?generators\/([\w-]+)\)?(\s)?/g, '@ama-sdk/schematics:$4$5')
                 .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', '--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
-            / --swagger-config-path[= ]?(\.\/)?node_modules\/@ama-sdk\/schematics\/schematics\/java\/client-core\/templates\/swagger-codegen-java-client\/config\/swagger-codegen-config.json/, '');
+                .replaceAll(/--(swaggerSpecPath|swagger-spec-path)/g, '--spec-path') // Schematics arguments should be kebab-case
+                .replaceAll('--swaggerConfigPath', '--spec-config-path'); // Schematics arguments should be kebab-case
         }
         return acc;
     }, packageJson.scripts);
@@ -97,6 +98,7 @@ const installOpenApiToolsCli = async (tree, context) => {
         quiet: false
     }));
     await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
+    tree.overwrite(packageJsonPath, JSON.stringify(packageJsonContent, null, 2));
     return () => tree;
 };
 /**
@@ -117,17 +119,17 @@ const registerPackageSchematics = async (tree, context) => {
         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 amaSdkSchematicsVersion = amaSdkSchematicsPackageJsonContent.version?.replace(/^v/, '');
     const schematicsDependencies = ['@o3r/dev-tools', '@o3r/schematics'];
     for (const dependency of schematicsDependencies) {
         context.addTask(new node_install_1.DevInstall({
-            packageName: dependency + amaSdkSchematicsVersion,
+            packageName: dependency + (amaSdkSchematicsVersion ? `@${amaSdkSchematicsVersion}` : ''),
             hideOutput: false,
             quiet: false
         }));
         const packageJsonContent = tree.readJson('package.json');
         packageJsonContent.devDependencies = { ...packageJsonContent.devDependencies, [dependency]: amaSdkSchematicsVersion };
-        tree.overwrite('package.json', JSON.stringify(packageJsonContent));
+        tree.overwrite('package.json', JSON.stringify(packageJsonContent, null, 2));
         await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
     }
     return () => (0, schematics_1.chain)([
@@ -149,7 +151,7 @@ function ngAdd() {
         exports.updatePackageJsonScripts,
         (t) => {
             const packageJson = tree.readText(packageJsonPath);
-            const needsToInstallOpenApiGeneratorCli = packageJson.match(/@ama-sdk\/schematics:typescript-.*--spec-path ([.\\/a-zA-Z-]+) /)?.[1];
+            const needsToInstallOpenApiGeneratorCli = /@ama-sdk\/schematics:typescript-/.test(packageJson);
             return needsToInstallOpenApiGeneratorCli ? (0, schematics_1.chain)([replaceSwaggerIgnore, installOpenApiToolsCli, createOpenApiToolsConfig]) : t;
         }
     ])(tree, context);

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;AASpC,OAAO,EAAE,2CAA2C,EAAE,MAAM,UAAU,CAAC;AAgBvE;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,2CAA2C,GAAG,IAAI,CA4GlG"}
+{"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,CA+GlG"}

package/schematics/typescript/core/index.js

@@ -113,6 +113,9 @@ function ngGenerateTypescriptSDK(options) {
         if (!!packageOpenApiSupportedVersion && semver.valid(packageOpenApiSupportedVersion) && (!packageOpenApiSupportedVersion || !semver.satisfies(openApiVersion, packageOpenApiSupportedVersion))) {
             generatorOptions.generatorVersion = packageOpenApiSupportedVersion;
         }
+        if (options.specConfigPath) {
+            generatorOptions.specConfigPath = options.specConfigPath;
+        }
         return () => (new open_api_cli_generator_1.OpenApiCliGenerator(options)).getGeneratorRunSchematic(generatorOptions, { rootDirectory: options.directory || undefined });
     };
     return (0, schematics_1.chain)([

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

@@ -6,5 +6,7 @@ export interface NgGenerateTypescriptSDKCoreSchematicsSchema extends JsonObject
     directory: string;
     /** Package manager to be used in the generated SDK */
     packageManager: 'npm' | 'yarn' | '';
+    /** Path to the spec generation configuration */
+    specConfigPath: 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,QAAQ,EAAE,MAAM,CAAC;IAEjB,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAElB,sDAAsD;IACtD,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC;CACrC"}
+{"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;IAEjB,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAElB,sDAAsD;IACtD,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC;IAEpC,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC;CACxB"}

package/schematics/typescript/core/schema.json

@@ -13,6 +13,11 @@
         "index": 0
       }
     },
+    "specConfigPath": {
+      "type": "string",
+      "description": "Spec config file\nMore info: https://openapi-generator.tech/docs/generators/typescript/#config-options",
+      "default": ""
+    },
     "directory": {
       "type": "string",
       "description": "Directory where to generate the SDK",