@openapitools/openapi-generator-cli 2.5.2 → 2.7.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 +5 -1
- package/main.js +79 -88
- package/package.json +8 -7
package/README.md
CHANGED
|
@@ -10,7 +10,9 @@ OpenAPI Generator allows generation of API client libraries (SDK generation), se
|
|
|
10
10
|
configuration automatically given an OpenAPI Spec (both 2.0 and 3.0 are supported). Please see
|
|
11
11
|
[OpenAPITools/openapi-generator](https://github.com/OpenAPITools/openapi-generator).
|
|
12
12
|
|
|
13
|
-
The OpenAPI Generator is a Java project. `openapi-generator-cli` will download the
|
|
13
|
+
The OpenAPI Generator is a Java project. `openapi-generator-cli` will download the appropriate 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.
|
|
14
|
+
|
|
15
|
+
If you find this tool useful, please consider sponsoring this project financially via https://opencollective.com/openapi_generator or directly to [Kay Schecker](https://github.com/sponsors/kay-schecker) (the author of this tool) :pray:
|
|
14
16
|
|
|
15
17
|
---
|
|
16
18
|
|
|
@@ -213,6 +215,8 @@ If the `version` property param is set it is not necessary to configure the `que
|
|
|
213
215
|
}
|
|
214
216
|
}
|
|
215
217
|
```
|
|
218
|
+
If `useDocker` option is used, the spec file gets mounted to path `/local/<your-spec-file-location>` within container. So, if you would configure spec file as
|
|
219
|
+
`-i openapi/my-api.yml` if running locally, with useDocker option set, you would have to configure it like this: `-i /local/openapi/my-api.yml`.
|
|
216
220
|
|
|
217
221
|
## Custom Generators
|
|
218
222
|
|
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
|
}
|
|
@@ -852,26 +840,28 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
852
840
|
/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(tslib__WEBPACK_IMPORTED_MODULE_0__);
|
|
853
841
|
/* harmony import */ var _nestjs_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @nestjs/common */ "@nestjs/common");
|
|
854
842
|
/* harmony import */ var _nestjs_common__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__);
|
|
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
|
-
/* harmony import */ var
|
|
867
|
-
/* harmony import */ var
|
|
868
|
-
/* harmony import */ var
|
|
869
|
-
/* harmony import */ var
|
|
870
|
-
/* harmony import */ var
|
|
871
|
-
/* harmony import */ var
|
|
872
|
-
var
|
|
873
|
-
/* harmony import */ var
|
|
874
|
-
|
|
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__);
|
|
875
865
|
var _a, _b, _c;
|
|
876
866
|
|
|
877
867
|
|
|
@@ -886,6 +876,7 @@ var _a, _b, _c;
|
|
|
886
876
|
|
|
887
877
|
|
|
888
878
|
|
|
879
|
+
|
|
889
880
|
const mvn = {
|
|
890
881
|
repo: 'https://search.maven.org',
|
|
891
882
|
groupId: 'org.openapitools',
|
|
@@ -897,12 +888,12 @@ let VersionManagerService = class VersionManagerService {
|
|
|
897
888
|
this.httpService = httpService;
|
|
898
889
|
this.configService = configService;
|
|
899
890
|
this.customStorageDir = this.configService.get('generator-cli.storageDir');
|
|
900
|
-
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');
|
|
901
892
|
}
|
|
902
893
|
getAll() {
|
|
903
894
|
const queryUrl = this.replacePlaceholders(this.configService.get('generator-cli.repository.queryUrl') ||
|
|
904
|
-
|
|
905
|
-
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) => {
|
|
906
897
|
var _a;
|
|
907
898
|
return ({
|
|
908
899
|
version: doc.v,
|
|
@@ -914,19 +905,19 @@ let VersionManagerService = class VersionManagerService {
|
|
|
914
905
|
installed: this.isDownloaded(doc.v),
|
|
915
906
|
downloadLink: this.createDownloadLink(doc.v)
|
|
916
907
|
});
|
|
917
|
-
})), Object(
|
|
908
|
+
})), Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["map"])(versions => {
|
|
918
909
|
const latestVersion = this.filterVersionsByTags(versions, ['stable'])
|
|
919
|
-
.sort((l, r) =>
|
|
910
|
+
.sort((l, r) => compare_versions__WEBPACK_IMPORTED_MODULE_9__(l.version, r.version)).pop();
|
|
920
911
|
latestVersion.versionTags.push('latest'); // works, because it's a reference
|
|
921
912
|
return versions;
|
|
922
|
-
}), Object(
|
|
923
|
-
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}"`));
|
|
924
915
|
this.printResponseError(e);
|
|
925
916
|
return [];
|
|
926
917
|
}));
|
|
927
918
|
}
|
|
928
919
|
search(tags) {
|
|
929
|
-
return this.getAll().pipe(Object(
|
|
920
|
+
return this.getAll().pipe(Object(rxjs_operators__WEBPACK_IMPORTED_MODULE_3__["map"])(versions => this.filterVersionsByTags(versions, tags)));
|
|
930
921
|
}
|
|
931
922
|
isSelectedVersion(versionName) {
|
|
932
923
|
return versionName === this.getSelectedVersion();
|
|
@@ -942,7 +933,7 @@ let VersionManagerService = class VersionManagerService {
|
|
|
942
933
|
const downloaded = yield this.downloadIfNeeded(versionName);
|
|
943
934
|
if (downloaded) {
|
|
944
935
|
this.configService.set('generator-cli.version', versionName);
|
|
945
|
-
this.logger.log(
|
|
936
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Did set selected version to ${versionName}`));
|
|
946
937
|
}
|
|
947
938
|
});
|
|
948
939
|
}
|
|
@@ -950,29 +941,29 @@ let VersionManagerService = class VersionManagerService {
|
|
|
950
941
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
|
951
942
|
if (this.configService.useDocker) {
|
|
952
943
|
yield new Promise(resolve => {
|
|
953
|
-
Object(
|
|
944
|
+
Object(child_process__WEBPACK_IMPORTED_MODULE_13__["spawn"])('docker', ['rmi', this.getDockerImageName(versionName)], {
|
|
954
945
|
stdio: 'inherit',
|
|
955
946
|
shell: true
|
|
956
947
|
}).on('exit', () => resolve());
|
|
957
948
|
});
|
|
958
949
|
}
|
|
959
950
|
else {
|
|
960
|
-
|
|
951
|
+
fs_extra__WEBPACK_IMPORTED_MODULE_5__["removeSync"](this.filePath(versionName));
|
|
961
952
|
}
|
|
962
|
-
this.logger.log(
|
|
953
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Removed ${versionName}`));
|
|
963
954
|
});
|
|
964
955
|
}
|
|
965
956
|
download(versionName) {
|
|
966
957
|
return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function* () {
|
|
967
|
-
this.logger.log(
|
|
958
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["yellow"](`Download ${versionName} ...`));
|
|
968
959
|
if (this.configService.useDocker) {
|
|
969
960
|
yield new Promise(resolve => {
|
|
970
|
-
Object(
|
|
961
|
+
Object(child_process__WEBPACK_IMPORTED_MODULE_13__["spawn"])('docker', ['pull', this.getDockerImageName(versionName)], {
|
|
971
962
|
stdio: 'inherit',
|
|
972
963
|
shell: true
|
|
973
964
|
}).on('exit', () => resolve());
|
|
974
965
|
});
|
|
975
|
-
this.logger.log(
|
|
966
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Downloaded ${versionName}`));
|
|
976
967
|
return;
|
|
977
968
|
}
|
|
978
969
|
const downloadLink = this.createDownloadLink(versionName);
|
|
@@ -980,27 +971,27 @@ let VersionManagerService = class VersionManagerService {
|
|
|
980
971
|
try {
|
|
981
972
|
yield this.httpService
|
|
982
973
|
.get(downloadLink, { responseType: 'stream' })
|
|
983
|
-
.pipe(Object(
|
|
984
|
-
|
|
985
|
-
const temporaryDirectory =
|
|
986
|
-
const temporaryFilePath =
|
|
987
|
-
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);
|
|
988
979
|
res.data.pipe(file);
|
|
989
980
|
file.on('finish', content => {
|
|
990
|
-
|
|
981
|
+
fs_extra__WEBPACK_IMPORTED_MODULE_5__["moveSync"](temporaryFilePath, filePath, { overwrite: true });
|
|
991
982
|
resolve(content);
|
|
992
983
|
});
|
|
993
984
|
}))).toPromise();
|
|
994
985
|
if (this.customStorageDir) {
|
|
995
|
-
this.logger.log(
|
|
986
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Downloaded ${versionName} to custom storage location ${this.storage}`));
|
|
996
987
|
}
|
|
997
988
|
else {
|
|
998
|
-
this.logger.log(
|
|
989
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["green"](`Downloaded ${versionName}`));
|
|
999
990
|
}
|
|
1000
991
|
return true;
|
|
1001
992
|
}
|
|
1002
993
|
catch (e) {
|
|
1003
|
-
this.logger.log(
|
|
994
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["red"](`Download failed, because of: "${e.message}"`));
|
|
1004
995
|
this.printResponseError(e);
|
|
1005
996
|
return false;
|
|
1006
997
|
}
|
|
@@ -1013,10 +1004,10 @@ let VersionManagerService = class VersionManagerService {
|
|
|
1013
1004
|
}
|
|
1014
1005
|
isDownloaded(versionName) {
|
|
1015
1006
|
if (this.configService.useDocker) {
|
|
1016
|
-
const { status } = Object(
|
|
1007
|
+
const { status } = Object(child_process__WEBPACK_IMPORTED_MODULE_13__["spawnSync"])('docker', ['image', 'inspect', this.getDockerImageName(versionName)]);
|
|
1017
1008
|
return status === 0;
|
|
1018
1009
|
}
|
|
1019
|
-
return
|
|
1010
|
+
return fs_extra__WEBPACK_IMPORTED_MODULE_5__["existsSync"](path__WEBPACK_IMPORTED_MODULE_6__["resolve"](this.storage, `${versionName}.jar`));
|
|
1020
1011
|
}
|
|
1021
1012
|
filterVersionsByTags(versions, tags) {
|
|
1022
1013
|
if (tags.length < 1) {
|
|
@@ -1028,10 +1019,10 @@ let VersionManagerService = class VersionManagerService {
|
|
|
1028
1019
|
}
|
|
1029
1020
|
createDownloadLink(versionName) {
|
|
1030
1021
|
return this.replacePlaceholders((this.configService.get('generator-cli.repository.downloadUrl') ||
|
|
1031
|
-
|
|
1022
|
+
_config_schema_json__WEBPACK_IMPORTED_MODULE_12__["properties"]['generator-cli'].properties.repository.downloadUrl.default), { versionName });
|
|
1032
1023
|
}
|
|
1033
1024
|
replacePlaceholders(str, additionalPlaceholders = {}) {
|
|
1034
|
-
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 });
|
|
1035
1026
|
for (const [k, v] of Object.entries(placeholders)) {
|
|
1036
1027
|
str = str.split(`$\{${k}}`).join(v);
|
|
1037
1028
|
}
|
|
@@ -1039,20 +1030,20 @@ let VersionManagerService = class VersionManagerService {
|
|
|
1039
1030
|
}
|
|
1040
1031
|
printResponseError(error) {
|
|
1041
1032
|
if (error.isAxiosError) {
|
|
1042
|
-
this.logger.log(
|
|
1033
|
+
this.logger.log(chalk__WEBPACK_IMPORTED_MODULE_8__["red"]('\nResponse:'));
|
|
1043
1034
|
Object.entries(error.response.headers).forEach(a => this.logger.log(...a));
|
|
1044
1035
|
this.logger.log();
|
|
1045
1036
|
error.response.data.on('data', data => this.logger.log(data.toString('utf8')));
|
|
1046
1037
|
}
|
|
1047
1038
|
}
|
|
1048
1039
|
filePath(versionName = this.getSelectedVersion()) {
|
|
1049
|
-
return
|
|
1040
|
+
return path__WEBPACK_IMPORTED_MODULE_6__["resolve"](this.storage, `${versionName}.jar`);
|
|
1050
1041
|
}
|
|
1051
1042
|
};
|
|
1052
1043
|
VersionManagerService = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__decorate"])([
|
|
1053
1044
|
Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Injectable"])(),
|
|
1054
|
-
Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__param"])(0, Object(_nestjs_common__WEBPACK_IMPORTED_MODULE_1__["Inject"])(
|
|
1055
|
-
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])
|
|
1056
1047
|
], VersionManagerService);
|
|
1057
1048
|
|
|
1058
1049
|
|
|
@@ -1111,6 +1102,17 @@ bootstrap();
|
|
|
1111
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");
|
|
1112
1103
|
|
|
1113
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
|
+
|
|
1114
1116
|
/***/ }),
|
|
1115
1117
|
|
|
1116
1118
|
/***/ "@nestjs/common":
|
|
@@ -1287,17 +1289,6 @@ module.exports = require("rxjs/operators");
|
|
|
1287
1289
|
|
|
1288
1290
|
module.exports = require("tslib");
|
|
1289
1291
|
|
|
1290
|
-
/***/ }),
|
|
1291
|
-
|
|
1292
|
-
/***/ "url":
|
|
1293
|
-
/*!**********************!*\
|
|
1294
|
-
!*** external "url" ***!
|
|
1295
|
-
\**********************/
|
|
1296
|
-
/*! no static exports found */
|
|
1297
|
-
/***/ (function(module, exports) {
|
|
1298
|
-
|
|
1299
|
-
module.exports = require("url");
|
|
1300
|
-
|
|
1301
1292
|
/***/ })
|
|
1302
1293
|
|
|
1303
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.7.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.1.0",
|
|
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
|
}
|