@ama-sdk/schematics 9.0.0-alpha.26 → 9.0.0-alpha.28

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.26",
+  "version": "9.0.0-alpha.28",
   "description": "Swagger specification SDK Generator by schematics",
   "scripts": {
     "nx": "nx",
@@ -41,19 +41,18 @@
     }
   },
   "peerDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.26",
+    "@ama-sdk/core": "^9.0.0-alpha.28",
     "@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.26",
     "@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.26",
+    "@o3r/dev-tools": "^9.0.0-alpha.28",
     "js-yaml": "^4.1.0",
     "minimatch": "^9.0.0",
     "rxjs": "^7.8.1",
@@ -62,13 +61,14 @@
     "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@ama-sdk/core": "^9.0.0-alpha.26",
+    "@ama-sdk/core": "^9.0.0-alpha.28",
     "@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.26",
-    "@o3r/eslint-plugin": "^9.0.0-alpha.26",
+    "@o3r/build-helpers": "^9.0.0-alpha.28",
+    "@o3r/eslint-plugin": "^9.0.0-alpha.28",
+    "@o3r/schematics": "^9.0.0-alpha.28",
     "@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

@@ -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,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"}

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/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/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;AAuCpG;;;;;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,IAiDtC,CAAC;AA6FF;;;;GAIG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAW5B"}

package/schematics/ng-add/index.js

@@ -3,42 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngAdd = exports.updatePackageJsonScripts = void 0;
 const core_1 = require("@angular-devkit/core");
 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 node_fs_1 = require("node:fs");
 const path = require("node:path");
+const node_fs_1 = require("node:fs");
 const rxjs_1 = require("rxjs");
+const node_install_1 = require("../helpers/node-install");
 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
- *
- * 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() {
-        super(...arguments);
-        this.quiet = false;
-    }
-    /** @inheritdoc */
-    toConfiguration() {
-        const installOptions = packageManager;
-        return {
-            name: options_1.NodePackageName,
-            options: {
-                command: 'install',
-                quiet: this.quiet,
-                workingDirectory: this.workingDirectory,
-                packageName: `${this.packageName} ${installOptions === 'yarn' ? '--prefer-dev' : '-D'}`,
-                packageManager: installOptions
-            }
-        };
-    }
-}
 /**
  * Rule to update package.json scripts using yeoman generator from `@ama-sdk/generator-sdk`
  *
@@ -119,7 +91,7 @@ const installOpenApiToolsCli = async (tree, context) => {
     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({
+    context.addTask(new node_install_1.DevInstall({
         packageName: `@openapitools/openapi-generator-cli@${amaSdkSchematicsOpenApiCliVersion}`,
         hideOutput: false,
         quiet: false
@@ -148,7 +120,7 @@ const registerPackageSchematics = async (tree, context) => {
     const amaSdkSchematicsVersion = amaSdkSchematicsPackageJsonContent.version ? `@${amaSdkSchematicsPackageJsonContent.version}` : '';
     const schematicsDependencies = ['@o3r/dev-tools', '@o3r/schematics'];
     for (const dependency of schematicsDependencies) {
-        context.addTask(new DevInstall({
+        context.addTask(new node_install_1.DevInstall({
             packageName: dependency + amaSdkSchematicsVersion,
             hideOutput: false,
             quiet: false

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

package/schematics/typescript/core/index.js

@@ -24,6 +24,7 @@ const getPathObjectTemplate = (pathObj) => {
  */
 function ngGenerateTypescriptSDK(options) {
     const specPath = path.resolve(process.cwd(), options.specPath);
+    const targetPath = options.directory || '/';
     const generateOperationFinder = async () => {
         const swayOptions = {
             definition: path.resolve(options.specPath)
@@ -49,10 +50,10 @@ function ngGenerateTypescriptSDK(options) {
      * @param _context
      */
     const clearGeneratedCode = (tree, _context) => {
-        (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));
+        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'api', '**', '*.ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'models', 'base', '**', '!(index).ts')).forEach((file) => tree.delete(file));
+        (0, tree_glob_1.treeGlob)(tree, path.join(targetPath, 'src', 'spec', '!(operation-adapter|index).ts')).forEach((file) => tree.delete(file));
         return tree;
     };
     /**
@@ -70,7 +71,7 @@ function ngGenerateTypescriptSDK(options) {
                 swayOperationAdapter,
                 empty: ''
             }),
-            (0, schematics_1.move)('/'),
+            (0, schematics_1.move)(targetPath),
             (0, schematics_1.renameTemplateFiles)()
         ]), schematics_1.MergeStrategy.Overwrite);
     };
@@ -81,19 +82,20 @@ function ngGenerateTypescriptSDK(options) {
      * @param _context
      */
     const updateSpec = (tree, _context) => {
+        const readmeFile = path.join(targetPath, 'readme.md');
         const specContent = (0, node_fs_1.readFileSync)(specPath).toString();
-        if (tree.exists('/readme.md')) {
+        if (tree.exists(readmeFile)) {
             const swaggerVersion = /version: ([0-9]+\.[0-9]+\.[0-9]+)/.exec(specContent);
             if (swaggerVersion) {
-                const readmeContent = tree.read('/readme.md').toString('utf8');
-                tree.overwrite('/readme.md', readmeContent.replace(/Based on Swagger spec .*/i, `Based on Swagger spec ${swaggerVersion[1]}`));
+                const readmeContent = tree.read(readmeFile).toString('utf8');
+                tree.overwrite(readmeFile, readmeContent.replace(/Based on Swagger spec .*/i, `Based on Swagger spec ${swaggerVersion[1]}`));
             }
         }
-        if (tree.exists('/swagger-spec.yaml')) {
-            tree.overwrite('/swagger-spec.yaml', specContent);
+        if (tree.exists(path.join(targetPath, 'swagger-spec.yaml'))) {
+            tree.overwrite(path.join(targetPath, 'swagger-spec.yaml'), specContent);
         }
         else {
-            tree.create('/swagger-spec.yaml', specContent);
+            tree.create(path.join(targetPath, 'swagger-spec.yaml'), specContent);
         }
         return () => tree;
     };
@@ -103,7 +105,7 @@ function ngGenerateTypescriptSDK(options) {
         const packageOpenApiSupportedVersion = packageJsonFile.openApiSupportedVersion?.replace(/\^|~/, '');
         let openApiVersion = '';
         try {
-            openApiVersion = tree.readJson('openapitools.json')?.['generator-cli']?.version;
+            openApiVersion = tree.readJson(path.join(targetPath, 'openapitools.json'))?.['generator-cli']?.version;
         }
         catch {
             context.logger.warn('No openapitools.json file found in the project');
@@ -111,7 +113,7 @@ function ngGenerateTypescriptSDK(options) {
         if (!!packageOpenApiSupportedVersion && semver.valid(packageOpenApiSupportedVersion) && (!packageOpenApiSupportedVersion || !semver.satisfies(openApiVersion, packageOpenApiSupportedVersion))) {
             generatorOptions.generatorVersion = packageOpenApiSupportedVersion;
         }
-        return () => (new open_api_cli_generator_1.OpenApiCliGenerator()).getGeneratorRunSchematic(generatorOptions);
+        return () => (new open_api_cli_generator_1.OpenApiCliGenerator(options)).getGeneratorRunSchematic(generatorOptions, { rootDirectory: options.directory || undefined });
     };
     return (0, schematics_1.chain)([
         clearGeneratedCode,

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

@@ -2,5 +2,9 @@ import type { JsonObject } from '@angular-devkit/core';
 export interface NgGenerateTypescriptSDKCoreSchematicsSchema extends JsonObject {
     /** Path to the swagger specification used to generate the SDK */
     specPath: string;
+    /** Directory where to generate the SDK */
+    directory: string;
+    /** Package manager to be used in the generated SDK */
+    packageManager: 'npm' | 'yarn' | '';
 }
 //# 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;CAClB"}
+{"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"}

package/schematics/typescript/core/schema.json

@@ -12,6 +12,21 @@
         "$source": "argv",
         "index": 0
       }
+    },
+    "directory": {
+      "type": "string",
+      "description": "Directory where to generate the SDK",
+      "default": ""
+    },
+    "packageManager": {
+      "type": "string",
+      "enum": [
+        "",
+        "npm",
+        "yarn"
+      ],
+      "description": "Package manager to be used in the generated SDK",
+      "default": ""
     }
   },
   "additionalProperties": true,

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

package/schematics/typescript/shell/index.js

@@ -4,11 +4,18 @@ 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");
+const node_path_1 = require("node:path");
+const node_install_1 = require("../../helpers/node-install");
 /**
  * @param options
  */
 function ngGenerateTypescriptSDK(options) {
-    return async (tree, context) => {
+    const installRule = (_tree, context) => {
+        const workingDirectory = options.directory ? ((0, node_path_1.isAbsolute)(options.directory) ? (0, node_path_1.relative)(process.cwd(), options.directory) : options.directory) : '.';
+        const installTask = new node_install_1.NpmInstall({ workingDirectory, packageManager: options.packageManager, allowScripts: false });
+        context.addTask(installTask);
+    };
+    const setupRule = async (tree, context) => {
         const amaSdkSchematicsPackageJson = await (0, read_package_1.readPackageJson)();
         /* eslint-disable @typescript-eslint/naming-convention */
         const versions = {
@@ -64,13 +71,18 @@ function ngGenerateTypescriptSDK(options) {
         else {
             tree.create(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
         }
+        const targetPath = options.directory || tree.root.path;
         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),
+            (0, schematics_1.move)(targetPath),
             (0, schematics_1.renameTemplateFiles)()
         ]), schematics_1.MergeStrategy.Overwrite);
-        return baseRule;
+        return baseRule(tree, context);
     };
+    return (0, schematics_1.chain)([
+        setupRule,
+        ...(options.skipInstall ? [] : [installRule])
+    ]);
 }
 exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
 //# sourceMappingURL=index.js.map

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

@@ -6,5 +6,11 @@ export interface NgGenerateTypescriptSDKShellSchematicsSchema extends JsonObject
     package: string;
     /** Project description */
     description: string;
+    /** Directory where to generate the SDK */
+    directory: string;
+    /** Package manager to be used in the generated SDK */
+    packageManager: 'npm' | 'yarn' | '';
+    /** Skip NPM install */
+    skipInstall: boolean;
 }
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,4CAA6C,SAAQ,UAAU;IAC9E,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAC;IAEb,mBAAmB;IACnB,OAAO,EAAE,MAAM,CAAC;IAEhB,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/shell/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,WAAW,4CAA6C,SAAQ,UAAU;IAC9E,uCAAuC;IACvC,IAAI,EAAE,MAAM,CAAC;IAEb,mBAAmB;IACnB,OAAO,EAAE,MAAM,CAAC;IAEhB,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;IAEpB,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAElB,sDAAsD;IACtD,cAAc,EAAE,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC;IAEpC,uBAAuB;IACvB,WAAW,EAAE,OAAO,CAAC;CACtB"}

package/schematics/typescript/shell/schema.json

@@ -17,9 +17,28 @@
     },
     "description": {
       "type": "string",
-      "alias": "package",
       "description": "Project description",
       "default": ""
+    },
+    "directory": {
+      "type": "string",
+      "description": "Directory where to generate the SDK",
+      "default": ""
+    },
+    "skipInstall": {
+      "type": "boolean",
+      "description": "Skip NPM install",
+      "default": false
+    },
+    "packageManager": {
+      "type": "string",
+      "enum": [
+        "",
+        "npm",
+        "yarn"
+      ],
+      "description": "Package manager to be used in the generated SDK",
+      "default": ""
     }
   },
   "additionalProperties": true,

package/schematics/typescript/shell/templates/base/.gitignore.template

@@ -0,0 +1,68 @@
+# Build results
+/dist-*
+/dist
+/test-*
+/test
+/generated-*
+/build
+
+# Local configurations
+.custom.yo-rc.json
+
+# Open API
+.openapi-generator
+
+# Optional eslint cache
+.eslintcache
+
+
+### Intellij ###
+.idea/
+
+### VisualStudioCode ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### VisualStudioCode Patch ###
+# Ignore all local history of files
+.history
+.ionide
+
+# Support for Project snippet scope
+
+### yarn ###
+# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+
+.yarn/*
+!.yarn/releases
+!.yarn/patches
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+
+# if you are NOT using Zero-installs, then:
+# comment the following lines
+.yarn/cache
+
+# and uncomment the following lines
+.pnp.*
+
+### Yeoman ###
+node_modules/
+bower_components/
+*.log
+
+build/
+dist/
+
+# End of https://www.toptal.com/developers/gitignore/api/yeoman,visualstudiocode,yarn

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

@@ -0,0 +1,20 @@
+{
+  "typescript.preferences.importModuleSpecifier": "relative",
+  "typescript.preferences.quoteStyle": "single",
+  "jest.jestCommandLine": "yarn jest",
+  "jest.autoRun": {
+    "watch": false,
+    "onSave": "test-file"
+  },
+  "files.readonlyFromPermissions": true,
+  "files.readonlyInclude": {
+    "**/.cache/**": true,
+    "**/.pnp.*": true,
+    "**/.yarn/**": true,
+    "**/node_modules/**": true,
+    "src/base/*/*.ts": true
+  },
+  "files.readonlyExclude": {
+    "src/base/*/index.ts": true
+  }
+}

package/schematics/typescript/shell/templates/base/jest.config.js

@@ -1,4 +1,4 @@
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+/** @type {import('ts-jest/dist/types').JestConfigWithTsJest} */
 module.exports = {
   displayName: require('./package.json').name,
   preset: 'ts-jest',

package/schematics/typescript/create/index.d.ts

@@ -1,9 +0,0 @@
-import { Rule } from '@angular-devkit/schematics';
-import { NgGenerateTypescriptSDKCreateSchematicsSchema } from './schema';
-/**
- * Generate a typescript SDK repository and source code base on swagger specification
- *
- * @param options
- */
-export declare function ngGenerateTypescriptSDK(options: NgGenerateTypescriptSDKCreateSchematicsSchema): Rule;
-//# sourceMappingURL=index.d.ts.map

package/schematics/typescript/create/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/create/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,IAAI,EAAa,MAAM,4BAA4B,CAAC;AAGpE,OAAO,EAAE,6CAA6C,EAAE,MAAM,UAAU,CAAC;AAEzE;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,6CAA6C,GAAG,IAAI,CAKpG"}

package/schematics/typescript/create/index.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ngGenerateTypescriptSDK = void 0;
-const schematics_1 = require("@angular-devkit/schematics");
-/**
- * Generate a typescript SDK repository and source code base on swagger specification
- *
- * @param options
- */
-function ngGenerateTypescriptSDK(options) {
-    return (0, schematics_1.chain)([
-        (0, schematics_1.schematic)('typescript-shell', options),
-        (0, schematics_1.schematic)('typescript-core', options)
-    ]);
-}
-exports.ngGenerateTypescriptSDK = ngGenerateTypescriptSDK;
-//# sourceMappingURL=index.js.map

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

@@ -1,5 +0,0 @@
-import { NgGenerateTypescriptSDKCoreSchematicsSchema } from '../core/schema';
-import { NgGenerateTypescriptSDKShellSchematicsSchema } from '../shell/schema';
-export interface NgGenerateTypescriptSDKCreateSchematicsSchema extends NgGenerateTypescriptSDKCoreSchematicsSchema, NgGenerateTypescriptSDKShellSchematicsSchema {
-}
-//# sourceMappingURL=schema.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../schematics/typescript/create/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2CAA2C,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,4CAA4C,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,WAAW,6CAA8C,SAAQ,2CAA2C,EAAE,4CAA4C;CAE/J"}

package/schematics/typescript/create/schema.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=schema.js.map

package/schematics/typescript/create/schema.json

@@ -1,40 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "$id": "NgGenerateTypescriptSDKCreateSchematicsSchema",
-  "title": "Generate Typescript SDK",
-  "description": "ng generate typescript-sdk",
-  "properties": {
-    "specPath": {
-      "type": "string",
-      "description": "Path to the swagger specification used to generate the SDK",
-      "x-prompt": "Path to the swagger spec",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
-    },
-    "name": {
-      "type": "string",
-      "description": "Project name (NPM package scope)",
-      "x-prompt": "Project name (NPM package scope)?"
-    },
-    "package": {
-      "type": "string",
-      "description": "Package name",
-      "x-prompt": "Package name?",
-      "default": "sdk"
-    },
-    "description": {
-      "type": "string",
-      "alias": "package",
-      "description": "Project description",
-      "default": ""
-    }
-  },
-  "required": [
-    "name",
-    "package",
-    "specPath"
-  ],
-  "additionalProperties": true
-}