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

package/schematics/ng-add/index.js

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

package/schematics/typescript/core/index.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,CA+GlG"}

package/schematics/typescript/core/index.js

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

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

@@ -2,5 +2,11 @@ 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' | '';
+    /** 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;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;IAEpC,gDAAgD;IAChD,cAAc,EAAE,MAAM,CAAC;CACxB"}

package/schematics/typescript/core/schema.json

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

@@ -2,12 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngGenerateTypescriptSDK = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
+const js_yaml_1 = require("js-yaml");
 const read_package_1 = require("../../helpers/read-package");
+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 = {
@@ -48,13 +56,33 @@ function ngGenerateTypescriptSDK(options) {
             engineVersions,
             empty: ''
         };
+        const yarnrcPath = '.yarnrc.yml';
+        const yarnrc = ((0, js_yaml_1.load)(tree.exists(yarnrcPath) ? tree.readText(yarnrcPath) : '') || {});
+        yarnrc.nodeLinker ||= 'pnp';
+        yarnrc.packageExtensions ||= {};
+        yarnrc.packageExtensions['@ama-sdk/schematics@*'] = {
+            dependencies: {
+                'isomorphic-fetch': '~2.2.1'
+            }
+        };
+        if (tree.exists(yarnrcPath)) {
+            tree.overwrite(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
+        }
+        else {
+            tree.create(yarnrcPath, (0, js_yaml_1.dump)(yarnrc, { indent: 2 }));
+        }
+        const 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/shell/templates/base/openapitools.json

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

package/schematics/typescript/shell/templates/base/{package.json → package.json.template}

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

package/schematics/typescript/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