@openapitools/openapi-generator-cli 2.5.0 → 2.5.1

package/main.js

@@ -512,6 +512,19 @@ let GeneratorService = class GeneratorService {
     buildCommand(cwd, params, customGenerator, specFile) {
         const dockerVolumes = {};
         const absoluteSpecPath = specFile ? path__WEBPACK_IMPORTED_MODULE_4__["resolve"](cwd, specFile) : String(params.inputSpec);
+        const ext = path__WEBPACK_IMPORTED_MODULE_4__["extname"](absoluteSpecPath);
+        const name = path__WEBPACK_IMPORTED_MODULE_4__["basename"](absoluteSpecPath, ext);
+        const placeholders = {
+            name,
+            Name: Object(lodash__WEBPACK_IMPORTED_MODULE_2__["upperFirst"])(name),
+            cwd,
+            base: path__WEBPACK_IMPORTED_MODULE_4__["basename"](absoluteSpecPath),
+            dir: specFile && path__WEBPACK_IMPORTED_MODULE_4__["dirname"](absoluteSpecPath),
+            path: absoluteSpecPath,
+            relDir: specFile && path__WEBPACK_IMPORTED_MODULE_4__["dirname"](specFile),
+            relPath: specFile,
+            ext: ext.split('.').slice(-1).pop()
+        };
         const command = Object.entries(Object.assign({ inputSpec: absoluteSpecPath }, params)).map(([k, v]) => {
             const key = Object(lodash__WEBPACK_IMPORTED_MODULE_2__["kebabCase"])(k);
             const value = (() => {
@@ -525,6 +538,7 @@ let GeneratorService = class GeneratorService {
                         return undefined;
                     default:
                         if (this.configService.useDocker) {
+                            v = this.replacePlaceholders(placeholders, v);
                             if (key === 'output') {
                                 fs_extra__WEBPACK_IMPORTED_MODULE_5__["ensureDirSync"](v);
                             }
@@ -538,24 +552,14 @@ let GeneratorService = class GeneratorService {
             })();
             return value === undefined ? `--${key}` : `--${key}=${value}`;
         }).join(' ');
-        const ext = path__WEBPACK_IMPORTED_MODULE_4__["extname"](absoluteSpecPath);
-        const name = path__WEBPACK_IMPORTED_MODULE_4__["basename"](absoluteSpecPath, ext);
-        const placeholders = {
-            name,
-            Name: Object(lodash__WEBPACK_IMPORTED_MODULE_2__["upperFirst"])(name),
-            cwd,
-            base: path__WEBPACK_IMPORTED_MODULE_4__["basename"](absoluteSpecPath),
-            dir: specFile && path__WEBPACK_IMPORTED_MODULE_4__["dirname"](absoluteSpecPath),
-            path: absoluteSpecPath,
-            relDir: specFile && path__WEBPACK_IMPORTED_MODULE_4__["dirname"](specFile),
-            relPath: specFile,
-            ext: ext.split('.').slice(-1).pop()
-        };
-        return this.cmd(customGenerator, Object.entries(placeholders)
+        return this.cmd(customGenerator, this.replacePlaceholders(placeholders, command), dockerVolumes);
+    }
+    replacePlaceholders(placeholders, input) {
+        return Object.entries(placeholders)
             .filter(([, replacement]) => !!replacement)
-            .reduce((cmd, [search, replacement]) => {
-            return cmd.split(`#{${search}}`).join(replacement);
-        }, command), dockerVolumes);
+            .reduce((acc, [search, replacement]) => {
+            return acc.split(`#{${search}}`).join(replacement);
+        }, input);
     }
 };
 GeneratorService = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([

package/package.json

@@ -51,7 +51,7 @@
       "text": "Please sponsor OpenAPI Generator."
     }
   },
-  "version": "2.5.0",
+  "version": "2.5.1",
   "name": "@openapitools/openapi-generator-cli",
   "description": "A npm package wrapper for OpenAPI Generator (https://github.com/OpenAPITools/openapi-generator), generates which API client libraries (SDK generation), server stubs, documentation and configuration automatically given an OpenAPI Spec (v2, v3)",
   "scripts": {