@ama-sdk/schematics 9.0.0-alpha.9 → 9.1.0-alpha.0

package/README.md

@@ -4,33 +4,38 @@ This package provides `schematics` generators to create an SDK based on an API s
 
 ## Setup
 
-The Angular schematics package is required to use these generators:
+### Create a new repository
 
-if you are in an Angular project
+Generate a new single SDK repository
 
 ```shell
-yarn ng add @ama-sdk/schematics
-yarn ng add @ama-sdk/core
+npm create @ama-sdk typescript <project-name> -- [--spec-path=./path/to/spec.yaml]
 ```
+
 or
+
 ```shell
-npx -p @angular/cli ng add @ama-sdk/schematics
-npx -p @angular/cli ng add @ama-sdk/core
+yarn create @ama-sdk typescript <project-name> [--spec-path=./path/to/spec.yaml]
 ```
 
-else
+> **Note**: Get more information on the [@ama-sdk/create package](https://www.npmjs.com/package/@ama-sdk/create).
+
+### Create a new Otter workspace package
+
+The Angular schematics package is required to use these generators:
+
+if you are in an [Otter project](https://github.com/AmadeusITGroup/otter):
 
 ```shell
-# Install @angular-devkit/schematics-cli, @ama-sdk/core and the SDK generator
-yarn add --dev @angular-devkit/schematics-cli @ama-sdk/schematics @ama-sdk/core
-yarn schematics @ama-sdk/schematics:install
-yarn schematics @ama-sdk/core:install
+yarn ng add @ama-sdk/schematics
+yarn ng add @ama-sdk/core
 ```
+
 or
+
 ```shell
-npm i -D @angular-devkit/schematics-cli @ama-sdk/schematics @ama-sdk/core
-npx -p @angular-devkit/schematics-cli schematics @ama-sdk/schematics:install
-npx -p @angular-devkit/schematics-cli schematics @ama-sdk/core:install
+npx -p @angular/cli ng add @ama-sdk/schematics
+npx -p @angular/cli ng add @ama-sdk/core
 ```
 
 ## How to use?

package/collection.json

@@ -27,12 +27,6 @@
       "factory": "./schematics/typescript/shell/index#ngGenerateTypescriptSDK",
       "schema": "./schematics/typescript/shell/schema.json"
     },
-    "typescript-sdk": {
-      "alias": ["typescript-create"],
-      "description": "Generate a typescript SDK repository with code based on swagger specification",
-      "factory": "./schematics/typescript/create/index#ngGenerateTypescriptSDK",
-      "schema": "./schematics/typescript/create/schema.json"
-    },
     "java-client-core": {
       "description": "Generate a Java SDK source code based on swagger specification",
       "factory": "./schematics/java/client-core/index#ngGenerateJavaClientCore",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ama-sdk/schematics",
-  "version": "9.0.0-alpha.9",
+  "version": "9.1.0-alpha.0",
   "description": "Swagger specification SDK Generator by schematics",
   "scripts": {
     "nx": "nx",
@@ -33,12 +33,15 @@
     "@angular/compiler": {
       "optional": true
     },
+    "@o3r/schematics": {
+      "optional": true
+    },
     "@openapitools/openapi-generator-cli": {
       "optional": true
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.9",
+    "@ama-sdk/core": "^9.1.0-alpha.0",
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
     "@angular-devkit/schematics-cli": "~16.0.5",
@@ -49,7 +52,8 @@
   "dependencies": {
     "@angular-devkit/core": "~16.0.5",
     "@angular-devkit/schematics": "~16.0.5",
-    "@o3r/dev-tools": "^9.0.0-alpha.9",
+    "@o3r/dev-tools": "^9.1.0-alpha.0",
+    "js-yaml": "^4.1.0",
     "minimatch": "^9.0.0",
     "rxjs": "^7.8.1",
     "semver": "^7.5.2",
@@ -57,16 +61,18 @@
     "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.9",
+    "@ama-sdk/core": "^9.1.0-alpha.0",
     "@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.9",
-    "@o3r/eslint-plugin": "^9.0.0-alpha.9",
+    "@nx/jest": "~16.5.0",
+    "@o3r/build-helpers": "^9.1.0-alpha.0",
+    "@o3r/eslint-plugin": "^9.1.0-alpha.0",
+    "@o3r/schematics": "^9.1.0-alpha.0",
     "@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",
@@ -85,12 +91,12 @@
     "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/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
      */
@@ -42,6 +42,7 @@ export declare class CodeGenerator<T extends CodegenTaskOptions> {
      * Register the task in the rule's {@link SchematicContext}
      *
      * @param factoryOptions execution options (root directory for instance)
+     * @param factoryOptions.rootDirectory
      */
     private registerGeneratorExecutor;
     /**
@@ -52,6 +53,7 @@ export declare class CodeGenerator<T extends CodegenTaskOptions> {
      * Returns the schematic that will run the code generator
      *
      * @param _factoryOptions execution options (root directory for instance)
+     * @param _factoryOptions.rootDirectory
      */
     protected runCodeGeneratorFactory(_factoryOptions?: {
         rootDirectory?: string;

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;AAGxI;;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,EAAE,MAAM,CAAM;IAErC;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAa5B;;;;OAIG;IACH,OAAO,CAAC,yBAAyB;IAcjC;;OAEG;IACH,SAAS,CAAC,iBAAiB,IAAI,CAAC;IAIhC;;;;OAIG;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/code-generator.js

@@ -39,6 +39,7 @@ class CodeGenerator {
      * Register the task in the rule's {@link SchematicContext}
      *
      * @param factoryOptions execution options (root directory for instance)
+     * @param factoryOptions.rootDirectory
      */
     registerGeneratorExecutor(factoryOptions) {
         return (tree, context) => {
@@ -62,6 +63,7 @@ class CodeGenerator {
      * Returns the schematic that will run the code generator
      *
      * @param _factoryOptions execution options (root directory for instance)
+     * @param _factoryOptions.rootDirectory
      */
     runCodeGeneratorFactory(_factoryOptions = {}) {
         return (_options) => {

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

@@ -4,9 +4,13 @@ import { OpenApiCliOptions } from './open-api-cli.options';
  * Manage the schematic to generate a sdk using the @openapitools/openapi-generator-cli
  */
 export declare class OpenApiCliGenerator extends CodeGenerator<OpenApiCliOptions> {
-    private packageManager;
+    protected readonly packageManager: 'npm' | 'yarn';
+    protected get packageManagerRunner(): 'npx' | 'yarn';
     /** @inheritDoc */
-    protected generatorName: string;
+    protected readonly generatorName = "openapi-codegen-npm-cli";
+    constructor(options?: {
+        packageManager?: 'npm' | 'yarn' | '';
+    });
     /**
      * Install the specified java open api generator
      *

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

@@ -1 +1 @@
-{"version":3,"file":"open-api-cli.generator.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAoC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAE5F;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,iBAAiB,CAAC;IACvE,OAAO,CAAC,cAAc,CAA+G;IACrI,kBAAkB;IAClB,SAAS,CAAC,aAAa,SAA6B;IAEpD;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IAelC;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAuBpB,kBAAkB;IAClB,SAAS,CAAC,iBAAiB,0BAA2C;IAEtE,kBAAkB;IAClB,SAAS,CAAC,uBAAuB,oBAAoB;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,yBAE5C,iBAAiB,wBAclD;CACH"}
+{"version":3,"file":"open-api-cli.generator.d.ts","sourceRoot":"","sources":["../../../../schematics/code-generator/open-api-cli-generator/open-api-cli.generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAoC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AAI5F;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,aAAa,CAAC,iBAAiB,CAAC;IAEvE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,KAAK,GAAG,MAAM,CAAC;IAClD,SAAS,KAAK,oBAAoB,IAAI,KAAK,GAAG,MAAM,CAEnD;IAED,kBAAkB;IAClB,SAAS,CAAC,QAAQ,CAAC,aAAa,6BAA6B;gBAEjD,OAAO,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,EAAE,CAAA;KAAE;IAK9D;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IAelC;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAsBpB,kBAAkB;IAClB,SAAS,CAAC,iBAAiB,0BAA2C;IAEtE,kBAAkB;IAClB,SAAS,CAAC,uBAAuB,oBAAoB;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,yBAI5C,iBAAiB,wBAclD;CACH"}

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

@@ -4,20 +4,26 @@ exports.OpenApiCliGenerator = void 0;
 const code_generator_1 = require("../code-generator");
 const node_child_process_1 = require("node:child_process");
 const open_api_cli_options_1 = require("./open-api-cli.options");
+const path = require("node:path");
+const node_install_1 = require("../../helpers/node-install");
 /**
  * Manage the schematic to generate a sdk using the @openapitools/openapi-generator-cli
  */
 class OpenApiCliGenerator extends code_generator_1.CodeGenerator {
-    constructor() {
-        super(...arguments);
-        this.packageManager = process.env && process.env.npm_execpath && process.env.npm_execpath.indexOf('yarn') === -1 ? 'npm' : 'yarn';
+    get packageManagerRunner() {
+        return this.packageManager === 'npm' ? 'npx' : 'yarn';
+    }
+    constructor(options) {
+        super();
         /** @inheritDoc */
         this.generatorName = 'openapi-codegen-npm-cli';
         /** @inheritDoc */
         this.getDefaultOptions = () => open_api_cli_options_1.defaultTypescriptGeneratorOptions;
         /** @inheritDoc */
         this.runCodeGeneratorFactory = (factoryOptions = {}) => {
-            const rootDirectory = factoryOptions.rootDirectory || process.cwd();
+            const rootDirectory = factoryOptions.rootDirectory ?
+                (path.isAbsolute(factoryOptions.rootDirectory) ? factoryOptions.rootDirectory : path.resolve(process.cwd(), factoryOptions.rootDirectory)) :
+                process.cwd();
             return async (generatorOptions) => {
                 if (!generatorOptions) {
                     return Promise.reject('Missing options to run open api generator');
@@ -33,6 +39,7 @@ class OpenApiCliGenerator extends code_generator_1.CodeGenerator {
                 await this.runGenerator(generatorOptions, spawnOptions);
             };
         };
+        this.packageManager = (0, node_install_1.getPackageManagerName)(options?.packageManager);
     }
     /**
      * Install the specified java open api generator
@@ -42,7 +49,7 @@ class OpenApiCliGenerator extends code_generator_1.CodeGenerator {
      */
     runInstallOpenApiGenerator(version, spawnOptions) {
         return new Promise((resolve, reject) => {
-            (0, node_child_process_1.spawn)(this.packageManager, ['run', 'openapi-generator-cli', 'version-manager', 'set', version], spawnOptions).on('close', (code) => {
+            (0, node_child_process_1.spawn)(this.packageManagerRunner, ['openapi-generator-cli', 'version-manager', 'set', version], spawnOptions).on('close', (code) => {
                 if (code === 0) {
                     resolve();
                 }
@@ -60,7 +67,6 @@ class OpenApiCliGenerator extends code_generator_1.CodeGenerator {
      */
     runGenerator(generatorOptions, spawnOptions) {
         const args = [
-            'run',
             'openapi-generator-cli',
             'generate',
             generatorOptions.generatorCustomPath ? `--custom-generator=${generatorOptions.generatorCustomPath}` : '',
@@ -70,7 +76,7 @@ class OpenApiCliGenerator extends code_generator_1.CodeGenerator {
             '-o', generatorOptions.outputPath
         ];
         return new Promise((resolve, reject) => {
-            (0, node_child_process_1.spawn)(this.packageManager === 'npm' ? 'npx' : this.packageManager, args, spawnOptions)
+            (0, node_child_process_1.spawn)(this.packageManagerRunner, args, spawnOptions)
                 .on('close', (code) => {
                 if (code === 0) {
                     resolve();

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/helpers/node-install.d.ts

@@ -0,0 +1,62 @@
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
+import type { SupportedPackageManagers } from '@o3r/schematics';
+/**
+ * Get the Package Manager
+ *
+ * @param enforcedNpmManager package manager to enforce
+ */
+export declare function getPackageManagerName(enforcedNpmManager?: SupportedPackageManagers | '' | undefined | null): SupportedPackageManagers;
+/**
+ * Duplication of the interface not exposed by the @angular-devkit/schematics
+ */
+export interface NodePackageInstallTaskOptions {
+    packageManager?: 'yarn' | 'npm' | '';
+    packageName?: string;
+    workingDirectory?: string;
+    quiet?: boolean;
+    hideOutput?: boolean;
+    allowScripts?: boolean;
+}
+/**
+ * Install dev dependency on your application
+ *
+ * Note: it should not be moved to other packages as it should run before the installation
+ * of peer dependencies
+ */
+export declare class DevInstall extends NodePackageInstallTask {
+    quiet: boolean;
+    constructor(options?: NodePackageInstallTaskOptions);
+    /** @inheritdoc */
+    toConfiguration(): {
+        name: string;
+        options: {
+            command: string;
+            quiet: boolean;
+            workingDirectory: string | undefined;
+            packageName: string;
+            packageManager: string | undefined;
+        };
+    };
+}
+/**
+ * Run NPM Install
+ */
+export declare class NpmInstall extends NodePackageInstallTask {
+    quiet: boolean;
+    constructor(options?: NodePackageInstallTaskOptions);
+    /** @inheritdoc */
+    toConfiguration(): {
+        name: string;
+        options: {
+            command: string;
+            quiet: boolean;
+            packageManager: string | undefined;
+            hideOutput?: boolean | undefined;
+            workingDirectory?: string | undefined;
+            packageName?: string | undefined;
+            allowScripts?: boolean | undefined;
+        };
+        dependencies?: import("@angular-devkit/schematics").TaskId[] | undefined;
+    };
+}
+//# sourceMappingURL=node-install.d.ts.map

package/schematics/helpers/node-install.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-install.d.ts","sourceRoot":"","sources":["../../../schematics/helpers/node-install.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAEhE;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,kBAAkB,CAAC,EAAE,wBAAwB,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,GAAG,wBAAwB,CAErI;AAED;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,EAAE,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IAMnD,kBAAkB;IACX,eAAe;;;;;;;;;;CAYvB;AAED;;GAEG;AACH,qBAAa,UAAW,SAAQ,sBAAsB;IAC7C,KAAK,UAAS;gBAET,OAAO,CAAC,EAAE,6BAA6B;IAMnD,kBAAkB;IACX,eAAe;;;;;;;;;;;;;CAavB"}

package/schematics/helpers/node-install.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NpmInstall = exports.DevInstall = exports.getPackageManagerName = void 0;
+const options_1 = require("@angular-devkit/schematics/tasks/package-manager/options");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
+/**
+ * Get the Package Manager
+ *
+ * @param enforcedNpmManager package manager to enforce
+ */
+function getPackageManagerName(enforcedNpmManager) {
+    return enforcedNpmManager || (process.env?.npm_execpath?.includes('yarn') ? 'yarn' : 'npm');
+}
+exports.getPackageManagerName = getPackageManagerName;
+/**
+ * Install dev dependency on your application
+ *
+ * Note: it should not be moved to other packages as it should run before the installation
+ * of peer dependencies
+ */
+class DevInstall extends tasks_1.NodePackageInstallTask {
+    constructor(options) {
+        super(options);
+        this.quiet = false;
+        this.packageManager = getPackageManagerName(options?.packageManager);
+    }
+    /** @inheritdoc */
+    toConfiguration() {
+        return {
+            name: options_1.NodePackageName,
+            options: {
+                command: 'install',
+                quiet: this.quiet,
+                workingDirectory: this.workingDirectory,
+                packageName: `${this.packageName} ${this.packageManager === 'yarn' ? '--prefer-dev' : '-D'}`,
+                packageManager: this.packageManager
+            }
+        };
+    }
+}
+exports.DevInstall = DevInstall;
+/**
+ * Run NPM Install
+ */
+class NpmInstall extends tasks_1.NodePackageInstallTask {
+    constructor(options) {
+        super(options);
+        this.quiet = false;
+        this.packageManager = getPackageManagerName(options?.packageManager);
+    }
+    /** @inheritdoc */
+    toConfiguration() {
+        const config = super.toConfiguration();
+        return {
+            ...config,
+            name: options_1.NodePackageName,
+            options: {
+                ...config.options,
+                command: 'install',
+                quiet: this.quiet,
+                packageManager: this.packageManager
+            }
+        };
+    }
+}
+exports.NpmInstall = NpmInstall;
+//# sourceMappingURL=node-install.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":"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;AAYpG;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,EAAE,IAkDtC,CAAC;AA8FF;;;;GAIG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAW5B"}