@openapitools/openapi-generator-cli 2.5.1 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -1
- package/main.js +90 -93
- package/package.json +8 -7
package/README.md
CHANGED
|
@@ -8,7 +8,9 @@
|
|
|
8
8
|
|
|
9
9
|
OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs, documentation and
|
|
10
10
|
configuration automatically given an OpenAPI Spec (both 2.0 and 3.0 are supported). Please see
|
|
11
|
-
[OpenAPITools/openapi-generator](https://github.com/OpenAPITools/openapi-generator)
|
|
11
|
+
[OpenAPITools/openapi-generator](https://github.com/OpenAPITools/openapi-generator).
|
|
12
|
+
|
|
13
|
+
The OpenAPI Generator is a Java project. `openapi-generator-cli` will download the approprate JAR file and invoke the `java` executable to run the OpenAPI Generator. You must have the `java` binary executable available on your `PATH` for this to work.
|
|
12
14
|
|
|
13
15
|
---
|
|
14
16
|
|
|
@@ -239,3 +241,4 @@ yarn add @openapitools/openapi-generator-cli@1.0.18-4.3.1
|
|
|
239
241
|
|
|
240
242
|
Please leave a star.
|
|
241
243
|
|
|
244
|
+
|
package/main.js
CHANGED
|
@@ -101,10 +101,10 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
101
101
|
/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(tslib__WEBPACK_IMPORTED_MODULE_0__);
|
|
102
102
|
/* harmony import */ var _nestjs_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @nestjs/common */ "@nestjs/common");
|
|
103
103
|
/* harmony import */ var _nestjs_common__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__);
|
|
104
|
-
/* harmony import */ var
|
|
105
|
-
/* harmony import */ var
|
|
106
|
-
/* harmony import */ var
|
|
107
|
-
/* harmony import */ var
|
|
104
|
+
/* harmony import */ var _nestjs_axios__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @nestjs/axios */ "@nestjs/axios");
|
|
105
|
+
/* harmony import */ var _nestjs_axios__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_nestjs_axios__WEBPACK_IMPORTED_MODULE_2__);
|
|
106
|
+
/* harmony import */ var commander__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! commander */ "commander");
|
|
107
|
+
/* harmony import */ var commander__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(commander__WEBPACK_IMPORTED_MODULE_3__);
|
|
108
108
|
/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./constants */ "./apps/generator-cli/src/app/constants/index.ts");
|
|
109
109
|
/* harmony import */ var _controllers_version_manager_controller__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./controllers/version-manager.controller */ "./apps/generator-cli/src/app/controllers/version-manager.controller.ts");
|
|
110
110
|
/* harmony import */ var _services__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./services */ "./apps/generator-cli/src/app/services/index.ts");
|
|
@@ -116,18 +116,6 @@ var _a, _b, _c;
|
|
|
116
116
|
|
|
117
117
|
|
|
118
118
|
|
|
119
|
-
let proxyConfig;
|
|
120
|
-
const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
|
|
121
|
-
if (proxyUrl) {
|
|
122
|
-
const proxy = url__WEBPACK_IMPORTED_MODULE_3__["parse"](proxyUrl);
|
|
123
|
-
const proxyAuth = proxy.auth && proxy.auth.split(':');
|
|
124
|
-
proxyConfig = {
|
|
125
|
-
host: proxy.hostname,
|
|
126
|
-
port: parseInt(proxy.port, 10),
|
|
127
|
-
auth: proxyAuth && { username: proxyAuth[0], password: proxyAuth[1] },
|
|
128
|
-
protocol: proxy.protocol.replace(':', '')
|
|
129
|
-
};
|
|
130
|
-
}
|
|
131
119
|
let AppModule = class AppModule {
|
|
132
120
|
constructor(program, versionManager, passThroughService) {
|
|
133
121
|
this.program = program;
|
|
@@ -148,7 +136,7 @@ let AppModule = class AppModule {
|
|
|
148
136
|
};
|
|
149
137
|
AppModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
|
150
138
|
Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Module"])({
|
|
151
|
-
imports: [
|
|
139
|
+
imports: [_nestjs_axios__WEBPACK_IMPORTED_MODULE_2__["HttpModule"]],
|
|
152
140
|
controllers: [
|
|
153
141
|
_controllers_version_manager_controller__WEBPACK_IMPORTED_MODULE_5__["VersionManagerController"]
|
|
154
142
|
],
|
|
@@ -160,13 +148,13 @@ AppModule = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
|
|
160
148
|
_services__WEBPACK_IMPORTED_MODULE_6__["VersionManagerService"],
|
|
161
149
|
{
|
|
162
150
|
provide: _constants__WEBPACK_IMPORTED_MODULE_4__["COMMANDER_PROGRAM"],
|
|
163
|
-
useValue: new
|
|
151
|
+
useValue: new commander__WEBPACK_IMPORTED_MODULE_3__["Command"]('openapi-generator-cli').helpOption(false).usage('<command> [<args>]')
|
|
164
152
|
},
|
|
165
153
|
{ provide: _constants__WEBPACK_IMPORTED_MODULE_4__["LOGGER"], useValue: console }
|
|
166
154
|
]
|
|
167
155
|
}),
|
|
168
156
|
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__param"])(0, Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Inject"])(_constants__WEBPACK_IMPORTED_MODULE_4__["COMMANDER_PROGRAM"])),
|
|
169
|
-
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__metadata"])("design:paramtypes", [typeof (_a = typeof
|
|
157
|
+
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__metadata"])("design:paramtypes", [typeof (_a = typeof commander__WEBPACK_IMPORTED_MODULE_3__["Command"] !== "undefined" && commander__WEBPACK_IMPORTED_MODULE_3__["Command"]) === "function" ? _a : Object, typeof (_b = typeof _services__WEBPACK_IMPORTED_MODULE_6__["VersionManagerService"] !== "undefined" && _services__WEBPACK_IMPORTED_MODULE_6__["VersionManagerService"]) === "function" ? _b : Object, typeof (_c = typeof _services__WEBPACK_IMPORTED_MODULE_6__["PassThroughService"] !== "undefined" && _services__WEBPACK_IMPORTED_MODULE_6__["PassThroughService"]) === "function" ? _c : Object])
|
|
170
158
|
], AppModule);
|
|
171
159
|
|
|
172
160
|
|
|
@@ -331,6 +319,12 @@ var _a;
|
|
|
331
319
|
|
|
332
320
|
|
|
333
321
|
let ConfigService = class ConfigService {
|
|
322
|
+
get useDocker() {
|
|
323
|
+
return this.get('generator-cli.useDocker', false);
|
|
324
|
+
}
|
|
325
|
+
get dockerImageName() {
|
|
326
|
+
return this.get('generator-cli.dockerImageName', 'openapitools/openapi-generator-cli');
|
|
327
|
+
}
|
|
334
328
|
constructor(logger) {
|
|
335
329
|
this.logger = logger;
|
|
336
330
|
this.cwd = process.env.PWD || process.env.INIT_CWD || process.cwd();
|
|
@@ -343,12 +337,6 @@ let ConfigService = class ConfigService {
|
|
|
343
337
|
},
|
|
344
338
|
};
|
|
345
339
|
}
|
|
346
|
-
get useDocker() {
|
|
347
|
-
return this.get('generator-cli.useDocker', false);
|
|
348
|
-
}
|
|
349
|
-
get dockerImageName() {
|
|
350
|
-
return this.get('generator-cli.dockerImageName', 'openapitools/openapi-generator-cli');
|
|
351
|
-
}
|
|
352
340
|
get(path, defaultValue) {
|
|
353
341
|
return Object(lodash__WEBPACK_IMPORTED_MODULE_4__["get"])(this.read(), path, defaultValue);
|
|
354
342
|
}
|
|
@@ -403,9 +391,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
403
391
|
/* harmony import */ var glob__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(glob__WEBPACK_IMPORTED_MODULE_6__);
|
|
404
392
|
/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! chalk */ "chalk");
|
|
405
393
|
/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_7__);
|
|
406
|
-
/* harmony import */ var
|
|
407
|
-
/* harmony import */ var
|
|
408
|
-
/* harmony import */ var
|
|
394
|
+
/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! os */ "os");
|
|
395
|
+
/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(os__WEBPACK_IMPORTED_MODULE_8__);
|
|
396
|
+
/* harmony import */ var _version_manager_service__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./version-manager.service */ "./apps/generator-cli/src/app/services/version-manager.service.ts");
|
|
397
|
+
/* harmony import */ var _config_service__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./config.service */ "./apps/generator-cli/src/app/services/config.service.ts");
|
|
398
|
+
/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../constants */ "./apps/generator-cli/src/app/constants/index.ts");
|
|
409
399
|
var _a, _b, _c;
|
|
410
400
|
|
|
411
401
|
|
|
@@ -418,6 +408,7 @@ var _a, _b, _c;
|
|
|
418
408
|
|
|
419
409
|
|
|
420
410
|
|
|
411
|
+
|
|
421
412
|
let GeneratorService = class GeneratorService {
|
|
422
413
|
constructor(logger, configService, versionManager) {
|
|
423
414
|
this.logger = logger;
|
|
@@ -428,8 +419,11 @@ let GeneratorService = class GeneratorService {
|
|
|
428
419
|
this.cmd = (customGenerator, appendix, dockerVolumes = {}) => {
|
|
429
420
|
if (this.configService.useDocker) {
|
|
430
421
|
const volumes = Object.entries(dockerVolumes).map(([k, v]) => `-v "${v}:${k}"`).join(' ');
|
|
422
|
+
const userInfo = os__WEBPACK_IMPORTED_MODULE_8__["userInfo"]();
|
|
423
|
+
const userArg = userInfo.uid !== -1 ? `--user ${userInfo.uid}:${userInfo.gid}` : ``;
|
|
431
424
|
return [
|
|
432
425
|
`docker run --rm`,
|
|
426
|
+
userArg,
|
|
433
427
|
volumes,
|
|
434
428
|
this.versionManager.getDockerImageName(),
|
|
435
429
|
'generate',
|
|
@@ -564,8 +558,8 @@ let GeneratorService = class GeneratorService {
|
|
|
564
558
|
};
|
|
565
559
|
GeneratorService = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
|
566
560
|
Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Injectable"])(),
|
|
567
|
-
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__param"])(0, Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Inject"])(
|
|
568
|
-
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__metadata"])("design:paramtypes", [typeof (_a = typeof
|
|
561
|
+
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__param"])(0, Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Inject"])(_constants__WEBPACK_IMPORTED_MODULE_11__["LOGGER"])),
|
|
562
|
+
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__metadata"])("design:paramtypes", [typeof (_a = typeof _constants__WEBPACK_IMPORTED_MODULE_11__["LOGGER"] !== "undefined" && _constants__WEBPACK_IMPORTED_MODULE_11__["LOGGER"]) === "function" ? _a : Object, typeof (_b = typeof _config_service__WEBPACK_IMPORTED_MODULE_10__["ConfigService"] !== "undefined" && _config_service__WEBPACK_IMPORTED_MODULE_10__["ConfigService"]) === "function" ? _b : Object, typeof (_c = typeof _version_manager_service__WEBPACK_IMPORTED_MODULE_9__["VersionManagerService"] !== "undefined" && _version_manager_service__WEBPACK_IMPORTED_MODULE_9__["VersionManagerService"]) === "function" ? _c : Object])
|
|
569
563
|
], GeneratorService);
|
|
570
564
|
|
|
571
565
|
|
|
@@ -846,26 +840,28 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
846
840
|
/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(tslib__WEBPACK_IMPORTED_MODULE_0__);
|
|
847
841
|
/* harmony import */ var _nestjs_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @nestjs/common */ "@nestjs/common");
|
|
848
842
|
/* harmony import */ var _nestjs_common__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__);
|
|
849
|
-
/* harmony import */ var
|
|
850
|
-
/* harmony import */ var
|
|
851
|
-
/* harmony import */ var
|
|
852
|
-
/* harmony import */ var
|
|
853
|
-
/* harmony import */ var
|
|
854
|
-
/* harmony import */ var
|
|
855
|
-
/* harmony import */ var
|
|
856
|
-
/* harmony import */ var
|
|
857
|
-
/* harmony import */ var
|
|
858
|
-
/* harmony import */ var
|
|
859
|
-
/* harmony import */ var
|
|
860
|
-
/* harmony import */ var
|
|
861
|
-
/* harmony import */ var
|
|
862
|
-
/* harmony import */ var
|
|
863
|
-
/* harmony import */ var
|
|
864
|
-
/* harmony import */ var
|
|
865
|
-
/* harmony import */ var
|
|
866
|
-
var
|
|
867
|
-
/* harmony import */ var
|
|
868
|
-
|
|
843
|
+
/* harmony import */ var _nestjs_axios__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @nestjs/axios */ "@nestjs/axios");
|
|
844
|
+
/* harmony import */ var _nestjs_axios__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_nestjs_axios__WEBPACK_IMPORTED_MODULE_2__);
|
|
845
|
+
/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! rxjs/operators */ "rxjs/operators");
|
|
846
|
+
/* harmony import */ var rxjs_operators__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__);
|
|
847
|
+
/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! lodash */ "lodash");
|
|
848
|
+
/* harmony import */ var lodash__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(lodash__WEBPACK_IMPORTED_MODULE_4__);
|
|
849
|
+
/* harmony import */ var fs_extra__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! fs-extra */ "fs-extra");
|
|
850
|
+
/* harmony import */ var fs_extra__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(fs_extra__WEBPACK_IMPORTED_MODULE_5__);
|
|
851
|
+
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! path */ "path");
|
|
852
|
+
/* harmony import */ var path__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_6__);
|
|
853
|
+
/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! os */ "os");
|
|
854
|
+
/* harmony import */ var os__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(os__WEBPACK_IMPORTED_MODULE_7__);
|
|
855
|
+
/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! chalk */ "chalk");
|
|
856
|
+
/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_8__);
|
|
857
|
+
/* harmony import */ var compare_versions__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! compare-versions */ "compare-versions");
|
|
858
|
+
/* harmony import */ var compare_versions__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(compare_versions__WEBPACK_IMPORTED_MODULE_9__);
|
|
859
|
+
/* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../constants */ "./apps/generator-cli/src/app/constants/index.ts");
|
|
860
|
+
/* harmony import */ var _config_service__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./config.service */ "./apps/generator-cli/src/app/services/config.service.ts");
|
|
861
|
+
/* harmony import */ var _config_schema_json__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../config.schema.json */ "./apps/generator-cli/src/config.schema.json");
|
|
862
|
+
var _config_schema_json__WEBPACK_IMPORTED_MODULE_12___namespace = /*#__PURE__*/__webpack_require__.t(/*! ../../config.schema.json */ "./apps/generator-cli/src/config.schema.json", 1);
|
|
863
|
+
/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! child_process */ "child_process");
|
|
864
|
+
/* harmony import */ var child_process__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(child_process__WEBPACK_IMPORTED_MODULE_13__);
|
|
869
865
|
var _a, _b, _c;
|
|
870
866
|
|
|
871
867
|
|
|
@@ -880,6 +876,7 @@ var _a, _b, _c;
|
|
|
880
876
|
|
|
881
877
|
|
|
882
878
|
|
|
879
|
+
|
|
883
880
|
const mvn = {
|
|
884
881
|
repo: 'https://search.maven.org',
|
|
885
882
|
groupId: 'org.openapitools',
|
|
@@ -891,12 +888,12 @@ let VersionManagerService = class VersionManagerService {
|
|
|
891
888
|
this.httpService = httpService;
|
|
892
889
|
this.configService = configService;
|
|
893
890
|
this.customStorageDir = this.configService.get('generator-cli.storageDir');
|
|
894
|
-
this.storage = this.customStorageDir ?
|
|
891
|
+
this.storage = this.customStorageDir ? path__WEBPACK_IMPORTED_MODULE_6__["resolve"](this.configService.cwd, this.customStorageDir.replace('~', os__WEBPACK_IMPORTED_MODULE_7__["homedir"]())) : path__WEBPACK_IMPORTED_MODULE_6__["resolve"](__dirname, './versions');
|
|
895
892
|
}
|
|
896
893
|
getAll() {
|
|
897
894
|
const queryUrl = this.replacePlaceholders(this.configService.get('generator-cli.repository.queryUrl') ||
|
|
898
|
-
|
|
899
|
-
return this.httpService.get(queryUrl).pipe(Object(
|
|
895
|
+
_config_schema_json__WEBPACK_IMPORTED_MODULE_12__["properties"]['generator-cli'].properties.repository.queryUrl.default);
|
|
896
|
+
return this.httpService.get(queryUrl).pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["map"])(({ data }) => data.response.docs), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["map"])(docs => docs.map((doc) => {
|
|
900
897
|
var _a;
|
|
901
898
|
return ({
|
|
902
899
|
version: doc.v,
|
|
@@ -908,19 +905,19 @@ let VersionManagerService = class VersionManagerService {
|
|
|
908
905
|
installed: this.isDownloaded(doc.v),
|
|
909
906
|
downloadLink: this.createDownloadLink(doc.v)
|
|
910
907
|
});
|
|
911
|
-
})), Object(
|
|
908
|
+
})), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["map"])(versions => {
|
|
912
909
|
const latestVersion = this.filterVersionsByTags(versions, ['stable'])
|
|
913
|
-
.sort((l, r) =>
|
|
910
|
+
.sort((l, r) => compare_versions__WEBPACK_IMPORTED_MODULE_9__(l.version, r.version)).pop();
|
|
914
911
|
latestVersion.versionTags.push('latest'); // works, because it's a reference
|
|
915
912
|
return versions;
|
|
916
|
-
}), Object(
|
|
917
|
-
this.logger.log(
|
|
913
|
+
}), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["catchError"])((e) => {
|
|
914
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["red"](`Unable to query repository, because of: "${e.message}"`));
|
|
918
915
|
this.printResponseError(e);
|
|
919
916
|
return [];
|
|
920
917
|
}));
|
|
921
918
|
}
|
|
922
919
|
search(tags) {
|
|
923
|
-
return this.getAll().pipe(Object(
|
|
920
|
+
return this.getAll().pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["map"])(versions => this.filterVersionsByTags(versions, tags)));
|
|
924
921
|
}
|
|
925
922
|
isSelectedVersion(versionName) {
|
|
926
923
|
return versionName === this.getSelectedVersion();
|
|
@@ -936,7 +933,7 @@ let VersionManagerService = class VersionManagerService {
|
|
|
936
933
|
const downloaded = yield this.downloadIfNeeded(versionName);
|
|
937
934
|
if (downloaded) {
|
|
938
935
|
this.configService.set('generator-cli.version', versionName);
|
|
939
|
-
this.logger.log(
|
|
936
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Did set selected version to ${versionName}`));
|
|
940
937
|
}
|
|
941
938
|
});
|
|
942
939
|
}
|
|
@@ -944,29 +941,29 @@ let VersionManagerService = class VersionManagerService {
|
|
|
944
941
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
|
945
942
|
if (this.configService.useDocker) {
|
|
946
943
|
yield new Promise(resolve => {
|
|
947
|
-
Object(
|
|
944
|
+
Object(child_process__WEBPACK_IMPORTED_MODULE_13__["spawn"])('docker', ['rmi', this.getDockerImageName(versionName)], {
|
|
948
945
|
stdio: 'inherit',
|
|
949
946
|
shell: true
|
|
950
947
|
}).on('exit', () => resolve());
|
|
951
948
|
});
|
|
952
949
|
}
|
|
953
950
|
else {
|
|
954
|
-
|
|
951
|
+
fs_extra__WEBPACK_IMPORTED_MODULE_5__["removeSync"](this.filePath(versionName));
|
|
955
952
|
}
|
|
956
|
-
this.logger.log(
|
|
953
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Removed ${versionName}`));
|
|
957
954
|
});
|
|
958
955
|
}
|
|
959
956
|
download(versionName) {
|
|
960
957
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
|
961
|
-
this.logger.log(
|
|
958
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["yellow"](`Download ${versionName} ...`));
|
|
962
959
|
if (this.configService.useDocker) {
|
|
963
960
|
yield new Promise(resolve => {
|
|
964
|
-
Object(
|
|
961
|
+
Object(child_process__WEBPACK_IMPORTED_MODULE_13__["spawn"])('docker', ['pull', this.getDockerImageName(versionName)], {
|
|
965
962
|
stdio: 'inherit',
|
|
966
963
|
shell: true
|
|
967
964
|
}).on('exit', () => resolve());
|
|
968
965
|
});
|
|
969
|
-
this.logger.log(
|
|
966
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Downloaded ${versionName}`));
|
|
970
967
|
return;
|
|
971
968
|
}
|
|
972
969
|
const downloadLink = this.createDownloadLink(versionName);
|
|
@@ -974,27 +971,27 @@ let VersionManagerService = class VersionManagerService {
|
|
|
974
971
|
try {
|
|
975
972
|
yield this.httpService
|
|
976
973
|
.get(downloadLink, { responseType: 'stream' })
|
|
977
|
-
.pipe(Object(
|
|
978
|
-
|
|
979
|
-
const temporaryDirectory =
|
|
980
|
-
const temporaryFilePath =
|
|
981
|
-
const file =
|
|
974
|
+
.pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["switchMap"])(res => new Promise(resolve => {
|
|
975
|
+
fs_extra__WEBPACK_IMPORTED_MODULE_5__["ensureDirSync"](this.storage);
|
|
976
|
+
const temporaryDirectory = fs_extra__WEBPACK_IMPORTED_MODULE_5__["mkdtempSync"](path__WEBPACK_IMPORTED_MODULE_6__["join"](os__WEBPACK_IMPORTED_MODULE_7__["tmpdir"](), 'generator-cli-'));
|
|
977
|
+
const temporaryFilePath = path__WEBPACK_IMPORTED_MODULE_6__["join"](temporaryDirectory, versionName);
|
|
978
|
+
const file = fs_extra__WEBPACK_IMPORTED_MODULE_5__["createWriteStream"](temporaryFilePath);
|
|
982
979
|
res.data.pipe(file);
|
|
983
980
|
file.on('finish', content => {
|
|
984
|
-
|
|
981
|
+
fs_extra__WEBPACK_IMPORTED_MODULE_5__["moveSync"](temporaryFilePath, filePath, { overwrite: true });
|
|
985
982
|
resolve(content);
|
|
986
983
|
});
|
|
987
984
|
}))).toPromise();
|
|
988
985
|
if (this.customStorageDir) {
|
|
989
|
-
this.logger.log(
|
|
986
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Downloaded ${versionName} to custom storage location ${this.storage}`));
|
|
990
987
|
}
|
|
991
988
|
else {
|
|
992
|
-
this.logger.log(
|
|
989
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Downloaded ${versionName}`));
|
|
993
990
|
}
|
|
994
991
|
return true;
|
|
995
992
|
}
|
|
996
993
|
catch (e) {
|
|
997
|
-
this.logger.log(
|
|
994
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["red"](`Download failed, because of: "${e.message}"`));
|
|
998
995
|
this.printResponseError(e);
|
|
999
996
|
return false;
|
|
1000
997
|
}
|
|
@@ -1007,10 +1004,10 @@ let VersionManagerService = class VersionManagerService {
|
|
|
1007
1004
|
}
|
|
1008
1005
|
isDownloaded(versionName) {
|
|
1009
1006
|
if (this.configService.useDocker) {
|
|
1010
|
-
const { status } = Object(
|
|
1007
|
+
const { status } = Object(child_process__WEBPACK_IMPORTED_MODULE_13__["spawnSync"])('docker', ['image', 'inspect', this.getDockerImageName(versionName)]);
|
|
1011
1008
|
return status === 0;
|
|
1012
1009
|
}
|
|
1013
|
-
return
|
|
1010
|
+
return fs_extra__WEBPACK_IMPORTED_MODULE_5__["existsSync"](path__WEBPACK_IMPORTED_MODULE_6__["resolve"](this.storage, `${versionName}.jar`));
|
|
1014
1011
|
}
|
|
1015
1012
|
filterVersionsByTags(versions, tags) {
|
|
1016
1013
|
if (tags.length < 1) {
|
|
@@ -1022,10 +1019,10 @@ let VersionManagerService = class VersionManagerService {
|
|
|
1022
1019
|
}
|
|
1023
1020
|
createDownloadLink(versionName) {
|
|
1024
1021
|
return this.replacePlaceholders((this.configService.get('generator-cli.repository.downloadUrl') ||
|
|
1025
|
-
|
|
1022
|
+
_config_schema_json__WEBPACK_IMPORTED_MODULE_12__["properties"]['generator-cli'].properties.repository.downloadUrl.default), { versionName });
|
|
1026
1023
|
}
|
|
1027
1024
|
replacePlaceholders(str, additionalPlaceholders = {}) {
|
|
1028
|
-
const placeholders = Object.assign(Object.assign({}, additionalPlaceholders), { groupId: Object(
|
|
1025
|
+
const placeholders = Object.assign(Object.assign({}, additionalPlaceholders), { groupId: Object(lodash__WEBPACK_IMPORTED_MODULE_4__["replace"])(mvn.groupId, '.', '/'), artifactId: Object(lodash__WEBPACK_IMPORTED_MODULE_4__["replace"])(mvn.artifactId, '.', '/'), 'group.id': mvn.groupId, 'artifact.id': mvn.artifactId });
|
|
1029
1026
|
for (const [k, v] of Object.entries(placeholders)) {
|
|
1030
1027
|
str = str.split(`$\{${k}}`).join(v);
|
|
1031
1028
|
}
|
|
@@ -1033,20 +1030,20 @@ let VersionManagerService = class VersionManagerService {
|
|
|
1033
1030
|
}
|
|
1034
1031
|
printResponseError(error) {
|
|
1035
1032
|
if (error.isAxiosError) {
|
|
1036
|
-
this.logger.log(
|
|
1033
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["red"]('\nResponse:'));
|
|
1037
1034
|
Object.entries(error.response.headers).forEach(a => this.logger.log(...a));
|
|
1038
1035
|
this.logger.log();
|
|
1039
1036
|
error.response.data.on('data', data => this.logger.log(data.toString('utf8')));
|
|
1040
1037
|
}
|
|
1041
1038
|
}
|
|
1042
1039
|
filePath(versionName = this.getSelectedVersion()) {
|
|
1043
|
-
return
|
|
1040
|
+
return path__WEBPACK_IMPORTED_MODULE_6__["resolve"](this.storage, `${versionName}.jar`);
|
|
1044
1041
|
}
|
|
1045
1042
|
};
|
|
1046
1043
|
VersionManagerService = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
|
1047
1044
|
Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Injectable"])(),
|
|
1048
|
-
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__param"])(0, Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Inject"])(
|
|
1049
|
-
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__metadata"])("design:paramtypes", [typeof (_a = typeof
|
|
1045
|
+
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__param"])(0, Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Inject"])(_constants__WEBPACK_IMPORTED_MODULE_10__["LOGGER"])),
|
|
1046
|
+
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__metadata"])("design:paramtypes", [typeof (_a = typeof _constants__WEBPACK_IMPORTED_MODULE_10__["LOGGER"] !== "undefined" && _constants__WEBPACK_IMPORTED_MODULE_10__["LOGGER"]) === "function" ? _a : Object, typeof (_b = typeof _nestjs_axios__WEBPACK_IMPORTED_MODULE_2__["HttpService"] !== "undefined" && _nestjs_axios__WEBPACK_IMPORTED_MODULE_2__["HttpService"]) === "function" ? _b : Object, typeof (_c = typeof _config_service__WEBPACK_IMPORTED_MODULE_11__["ConfigService"] !== "undefined" && _config_service__WEBPACK_IMPORTED_MODULE_11__["ConfigService"]) === "function" ? _c : Object])
|
|
1050
1047
|
], VersionManagerService);
|
|
1051
1048
|
|
|
1052
1049
|
|
|
@@ -1105,6 +1102,17 @@ bootstrap();
|
|
|
1105
1102
|
module.exports = __webpack_require__(/*! /home/runner/work/openapi-generator-cli/openapi-generator-cli/apps/generator-cli/src/main.ts */"./apps/generator-cli/src/main.ts");
|
|
1106
1103
|
|
|
1107
1104
|
|
|
1105
|
+
/***/ }),
|
|
1106
|
+
|
|
1107
|
+
/***/ "@nestjs/axios":
|
|
1108
|
+
/*!********************************!*\
|
|
1109
|
+
!*** external "@nestjs/axios" ***!
|
|
1110
|
+
\********************************/
|
|
1111
|
+
/*! no static exports found */
|
|
1112
|
+
/***/ (function(module, exports) {
|
|
1113
|
+
|
|
1114
|
+
module.exports = require("@nestjs/axios");
|
|
1115
|
+
|
|
1108
1116
|
/***/ }),
|
|
1109
1117
|
|
|
1110
1118
|
/***/ "@nestjs/common":
|
|
@@ -1281,17 +1289,6 @@ module.exports = require("rxjs/operators");
|
|
|
1281
1289
|
|
|
1282
1290
|
module.exports = require("tslib");
|
|
1283
1291
|
|
|
1284
|
-
/***/ }),
|
|
1285
|
-
|
|
1286
|
-
/***/ "url":
|
|
1287
|
-
/*!**********************!*\
|
|
1288
|
-
!*** external "url" ***!
|
|
1289
|
-
\**********************/
|
|
1290
|
-
/*! no static exports found */
|
|
1291
|
-
/***/ (function(module, exports) {
|
|
1292
|
-
|
|
1293
|
-
module.exports = require("url");
|
|
1294
|
-
|
|
1295
1292
|
/***/ })
|
|
1296
1293
|
|
|
1297
1294
|
/******/ })));
|
package/package.json
CHANGED
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"text": "Please sponsor OpenAPI Generator."
|
|
52
52
|
}
|
|
53
53
|
},
|
|
54
|
-
"version": "2.
|
|
54
|
+
"version": "2.6.0",
|
|
55
55
|
"name": "@openapitools/openapi-generator-cli",
|
|
56
56
|
"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)",
|
|
57
57
|
"scripts": {
|
|
@@ -66,20 +66,21 @@
|
|
|
66
66
|
"main.js"
|
|
67
67
|
],
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@nestjs/
|
|
70
|
-
"@nestjs/
|
|
69
|
+
"@nestjs/axios": "0.0.8",
|
|
70
|
+
"@nestjs/common": "9.3.11",
|
|
71
|
+
"@nestjs/core": "9.3.11",
|
|
71
72
|
"@nuxtjs/opencollective": "0.3.2",
|
|
72
73
|
"chalk": "4.1.2",
|
|
73
74
|
"commander": "8.3.0",
|
|
74
|
-
"compare-versions": "4.1.
|
|
75
|
+
"compare-versions": "4.1.4",
|
|
75
76
|
"concurrently": "6.5.1",
|
|
76
77
|
"console.table": "0.10.0",
|
|
77
|
-
"fs-extra": "10.0
|
|
78
|
+
"fs-extra": "10.1.0",
|
|
78
79
|
"glob": "7.1.6",
|
|
79
|
-
"inquirer": "8.2.
|
|
80
|
+
"inquirer": "8.2.5",
|
|
80
81
|
"lodash": "4.17.21",
|
|
81
82
|
"reflect-metadata": "0.1.13",
|
|
82
|
-
"rxjs": "7.
|
|
83
|
+
"rxjs": "7.8.0",
|
|
83
84
|
"tslib": "2.0.3"
|
|
84
85
|
}
|
|
85
86
|
}
|