nestia 2.1.0-dev.20220430 → 2.1.0-dev.20220501
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 +1 -1
- package/lib/IConfiguration.d.ts +2 -2
- package/lib/IConfiguration.d.ts.map +1 -1
- package/lib/NestiaApplication.js +18 -15
- package/lib/analyses/ControllerAnalyzer.d.ts +2 -2
- package/lib/analyses/ControllerAnalyzer.d.ts.map +1 -1
- package/lib/analyses/ControllerAnalyzer.js +10 -30
- package/lib/analyses/GenericAnalyzer.d.ts +3 -3
- package/lib/analyses/GenericAnalyzer.d.ts.map +1 -1
- package/lib/analyses/GenericAnalyzer.js +7 -30
- package/lib/analyses/ImportAnalyzer.d.ts +2 -2
- package/lib/analyses/ImportAnalyzer.d.ts.map +1 -1
- package/lib/analyses/ImportAnalyzer.js +4 -5
- package/lib/analyses/ReflectAnalyzer.js +5 -2
- package/lib/analyses/SourceFinder.js +8 -31
- package/lib/executable/internal/CompilerOptions.d.ts +2 -2
- package/lib/executable/internal/CompilerOptions.d.ts.map +1 -1
- package/lib/executable/internal/NestiaConfig.js +7 -4
- package/lib/executable/nestia.js +12 -32
- package/lib/generates/FileGenerator.js +6 -26
- package/lib/generates/SwaggerGenerator.d.ts.map +1 -1
- package/lib/generates/SwaggerGenerator.js +2 -1
- package/lib/structures/IRoute.d.ts +3 -3
- package/lib/structures/IRoute.d.ts.map +1 -1
- package/lib/utils/DirectoryUtil.js +7 -30
- package/lib/utils/ImportDictionary.js +5 -25
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -127,7 +127,7 @@ export interface IConfiguration
|
|
|
127
127
|
*
|
|
128
128
|
* If omitted, the configuration would follow the `tsconfig.json`.
|
|
129
129
|
*/
|
|
130
|
-
compilerOptions?:
|
|
130
|
+
compilerOptions?: ts.CompilerOptions;
|
|
131
131
|
|
|
132
132
|
/**
|
|
133
133
|
* Whether to assert parameter types or not.
|
package/lib/IConfiguration.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import ts from "typescript";
|
|
2
2
|
/**
|
|
3
3
|
* Definition for the `nestia.config.ts` file.
|
|
4
4
|
*
|
|
@@ -18,7 +18,7 @@ export interface IConfiguration {
|
|
|
18
18
|
*
|
|
19
19
|
* If omitted, the configuration would follow the `tsconfig.json`.
|
|
20
20
|
*/
|
|
21
|
-
compilerOptions?:
|
|
21
|
+
compilerOptions?: ts.CompilerOptions;
|
|
22
22
|
/**
|
|
23
23
|
* Whether to assert parameter types or not.
|
|
24
24
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IConfiguration.d.ts","sourceRoot":"","sources":["../src/IConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"IConfiguration.d.ts","sourceRoot":"","sources":["../src/IConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAE3B;;OAEG;IACH,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC;IAEjD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;IAErC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC;CACrC;AACD,yBAAiB,cAAc,CAC/B;IACI;;;OAGG;IACH,UAAiB,MAAM;QAEnB;;WAEG;QACH,OAAO,EAAE,MAAM,EAAE,CAAC;QAElB;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;KACtB;IAED;;OAEG;IACH,UAAiB,QAAQ;QAErB;;;;;;WAMG;QACH,MAAM,EAAE,MAAM,CAAC;KAClB;CACJ"}
|
package/lib/NestiaApplication.js
CHANGED
|
@@ -94,12 +94,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
94
94
|
}
|
|
95
95
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
96
96
|
};
|
|
97
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
98
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
99
|
+
};
|
|
97
100
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
98
101
|
exports.NestiaApplication = void 0;
|
|
99
|
-
var
|
|
100
|
-
var
|
|
102
|
+
var fs_1 = __importDefault(require("fs"));
|
|
103
|
+
var path_1 = __importDefault(require("path"));
|
|
101
104
|
var runner = __importStar(require("ts-node"));
|
|
102
|
-
var
|
|
105
|
+
var typescript_1 = __importDefault(require("typescript"));
|
|
103
106
|
var Pair_1 = require("tstl/utility/Pair");
|
|
104
107
|
var Singleton_1 = require("tstl/thread/Singleton");
|
|
105
108
|
var ControllerAnalyzer_1 = require("./analyses/ControllerAnalyzer");
|
|
@@ -121,7 +124,7 @@ var NestiaApplication = /** @class */ (function () {
|
|
|
121
124
|
case 0:
|
|
122
125
|
if (!this.config_.output)
|
|
123
126
|
return [2 /*return*/, function () { return false; }];
|
|
124
|
-
return [4 /*yield*/,
|
|
127
|
+
return [4 /*yield*/, fs_1.default.promises.readdir(SdkGenerator_1.SdkGenerator.BUNDLE_PATH)];
|
|
125
128
|
case 1:
|
|
126
129
|
bundles = _a.sent();
|
|
127
130
|
return [4 /*yield*/, ArrayUtil_1.ArrayUtil.asyncMap(bundles, function (file) { return __awaiter(_this, void 0, void 0, function () {
|
|
@@ -129,9 +132,9 @@ var NestiaApplication = /** @class */ (function () {
|
|
|
129
132
|
return __generator(this, function (_a) {
|
|
130
133
|
switch (_a.label) {
|
|
131
134
|
case 0:
|
|
132
|
-
relative =
|
|
133
|
-
location =
|
|
134
|
-
return [4 /*yield*/,
|
|
135
|
+
relative = path_1.default.join(this.config_.output, file);
|
|
136
|
+
location = path_1.default.join(SdkGenerator_1.SdkGenerator.BUNDLE_PATH, file);
|
|
137
|
+
return [4 /*yield*/, fs_1.default.promises.stat(location)];
|
|
135
138
|
case 1:
|
|
136
139
|
stats = _a.sent();
|
|
137
140
|
return [2 /*return*/, new Pair_1.Pair(relative, stats.isDirectory())];
|
|
@@ -172,8 +175,8 @@ var NestiaApplication = /** @class */ (function () {
|
|
|
172
175
|
case 0:
|
|
173
176
|
if (!this.config_.output)
|
|
174
177
|
throw new Error("Error on NestiaApplication.sdk(): output path is not specified.");
|
|
175
|
-
parent =
|
|
176
|
-
return [4 /*yield*/,
|
|
178
|
+
parent = path_1.default.resolve(this.config_.output + "/..");
|
|
179
|
+
return [4 /*yield*/, fs_1.default.promises.lstat(parent)];
|
|
177
180
|
case 1:
|
|
178
181
|
stats = _a.sent();
|
|
179
182
|
if (stats.isDirectory() === false)
|
|
@@ -194,11 +197,11 @@ var NestiaApplication = /** @class */ (function () {
|
|
|
194
197
|
case 0:
|
|
195
198
|
if (!this.config_.swagger || !this.config_.swagger.output)
|
|
196
199
|
throw new Error("Error on NestiaApplication.swagger(): output path of the \"swagger.json\" is not specified.");
|
|
197
|
-
parsed =
|
|
200
|
+
parsed = path_1.default.parse(this.config_.swagger.output);
|
|
198
201
|
directory = !!parsed.ext
|
|
199
|
-
?
|
|
202
|
+
? path_1.default.resolve(parsed.dir)
|
|
200
203
|
: this.config_.swagger.output;
|
|
201
|
-
return [4 /*yield*/,
|
|
204
|
+
return [4 /*yield*/, fs_1.default.promises.lstat(directory)];
|
|
202
205
|
case 1:
|
|
203
206
|
stats = _a.sent();
|
|
204
207
|
if (stats.isDirectory() === false)
|
|
@@ -263,7 +266,7 @@ var NestiaApplication = /** @class */ (function () {
|
|
|
263
266
|
finally { if (e_2) throw e_2.error; }
|
|
264
267
|
return [7 /*endfinally*/];
|
|
265
268
|
case 10:
|
|
266
|
-
program =
|
|
269
|
+
program = typescript_1.default.createProgram(controllerList.map(function (c) { return c.file; }), this.config_.compilerOptions || { noEmit: true });
|
|
267
270
|
checker = program.getTypeChecker();
|
|
268
271
|
routeList = [];
|
|
269
272
|
try {
|
|
@@ -319,14 +322,14 @@ var NestiaApplication = /** @class */ (function () {
|
|
|
319
322
|
switch (_b.label) {
|
|
320
323
|
case 0:
|
|
321
324
|
if (!this.config_.output) return [3 /*break*/, 3];
|
|
322
|
-
_a = file.indexOf(
|
|
325
|
+
_a = file.indexOf(path_1.default.join(this.config_.output, "functional")) === -1;
|
|
323
326
|
if (!_a) return [3 /*break*/, 2];
|
|
324
327
|
return [4 /*yield*/, this.bundle_checker_.get()];
|
|
325
328
|
case 1:
|
|
326
329
|
_a = (_b.sent())(file) === false;
|
|
327
330
|
_b.label = 2;
|
|
328
331
|
case 2: return [2 /*return*/, _a];
|
|
329
|
-
case 3: return [4 /*yield*/,
|
|
332
|
+
case 3: return [4 /*yield*/, fs_1.default.promises.readFile(file, "utf8")];
|
|
330
333
|
case 4:
|
|
331
334
|
content = _b.sent();
|
|
332
335
|
return [2 /*return*/, content.indexOf(" * @nestia Generated by Nestia - https://github.com/samchon/nestia") === -1];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import
|
|
1
|
+
import ts from "typescript";
|
|
2
2
|
import { IController } from "../structures/IController";
|
|
3
3
|
import { IRoute } from "../structures/IRoute";
|
|
4
4
|
export declare namespace ControllerAnalyzer {
|
|
5
|
-
function analyze(checker:
|
|
5
|
+
function analyze(checker: ts.TypeChecker, sourceFile: ts.SourceFile, controller: IController): IRoute[];
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=ControllerAnalyzer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ControllerAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ControllerAnalyzer.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"ControllerAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ControllerAnalyzer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAG5B,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAM9C,yBAAiB,kBAAkB,CACnC;IACI,SAAgB,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,GAAG,MAAM,EAAE,CAc7G;CAyIJ"}
|
|
@@ -10,29 +10,6 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
14
|
-
if (k2 === undefined) k2 = k;
|
|
15
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
16
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
17
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
18
|
-
}
|
|
19
|
-
Object.defineProperty(o, k2, desc);
|
|
20
|
-
}) : (function(o, m, k, k2) {
|
|
21
|
-
if (k2 === undefined) k2 = k;
|
|
22
|
-
o[k2] = m[k];
|
|
23
|
-
}));
|
|
24
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
25
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
26
|
-
}) : function(o, v) {
|
|
27
|
-
o["default"] = v;
|
|
28
|
-
});
|
|
29
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
30
|
-
if (mod && mod.__esModule) return mod;
|
|
31
|
-
var result = {};
|
|
32
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
33
|
-
__setModuleDefault(result, mod);
|
|
34
|
-
return result;
|
|
35
|
-
};
|
|
36
13
|
var __read = (this && this.__read) || function (o, n) {
|
|
37
14
|
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
38
15
|
if (!m) return o;
|
|
@@ -69,10 +46,13 @@ var __values = (this && this.__values) || function(o) {
|
|
|
69
46
|
};
|
|
70
47
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
71
48
|
};
|
|
49
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
+
};
|
|
72
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
73
53
|
exports.ControllerAnalyzer = void 0;
|
|
74
|
-
var
|
|
75
|
-
var
|
|
54
|
+
var path_1 = __importDefault(require("path"));
|
|
55
|
+
var typescript_1 = __importDefault(require("typescript"));
|
|
76
56
|
var HashMap_1 = require("tstl/container/HashMap");
|
|
77
57
|
var GenericAnalyzer_1 = require("./GenericAnalyzer");
|
|
78
58
|
var ImportAnalyzer_1 = require("./ImportAnalyzer");
|
|
@@ -81,9 +61,9 @@ var ControllerAnalyzer;
|
|
|
81
61
|
function analyze(checker, sourceFile, controller) {
|
|
82
62
|
// FIND CONTROLLER CLASS
|
|
83
63
|
var ret = [];
|
|
84
|
-
|
|
64
|
+
typescript_1.default.forEachChild(sourceFile, function (node) {
|
|
85
65
|
var _a;
|
|
86
|
-
if (
|
|
66
|
+
if (typescript_1.default.isClassDeclaration(node) && ((_a = node.name) === null || _a === void 0 ? void 0 : _a.escapedText) === controller.name) {
|
|
87
67
|
// ANALYZE THE CONTROLLER
|
|
88
68
|
ret.push.apply(ret, __spreadArray([], __read(_Analyze_controller(checker, controller, node)), false));
|
|
89
69
|
return;
|
|
@@ -106,11 +86,11 @@ var ControllerAnalyzer;
|
|
|
106
86
|
if (property.declarations) {
|
|
107
87
|
var _loop_1 = function (declaration) {
|
|
108
88
|
// TARGET ONLY METHOD
|
|
109
|
-
if (!
|
|
89
|
+
if (!typescript_1.default.isMethodDeclaration(declaration))
|
|
110
90
|
return "continue";
|
|
111
91
|
// IT MUST BE
|
|
112
92
|
var identifier = declaration.name;
|
|
113
|
-
if (!
|
|
93
|
+
if (!typescript_1.default.isIdentifier(identifier))
|
|
114
94
|
return "continue";
|
|
115
95
|
// ANALYZED WITH THE REFLECTED-FUNCTION
|
|
116
96
|
var func = controller.functions.find(function (f) { return f.name === identifier.escapedText; });
|
|
@@ -156,7 +136,7 @@ var ControllerAnalyzer;
|
|
|
156
136
|
var output = ImportAnalyzer_1.ImportAnalyzer.analyze(checker, genericDict, importDict, checker.getReturnTypeOfSignature(signature));
|
|
157
137
|
var imports = importDict.toJSON().map(function (pair) { return [pair.first, pair.second.toJSON()]; });
|
|
158
138
|
// CONFIGURE PATH
|
|
159
|
-
var path = _Normalize_path(
|
|
139
|
+
var path = _Normalize_path(path_1.default.join(controller.path, func.path)
|
|
160
140
|
.split("\\")
|
|
161
141
|
.join("/"));
|
|
162
142
|
// RETURNS
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import ts from "typescript";
|
|
2
2
|
export declare namespace GenericAnalyzer {
|
|
3
|
-
type Dictionary = WeakMap<
|
|
4
|
-
function analyze(checker:
|
|
3
|
+
type Dictionary = WeakMap<ts.Type, ts.Type>;
|
|
4
|
+
function analyze(checker: ts.TypeChecker, classNode: ts.ClassDeclaration): Dictionary;
|
|
5
5
|
}
|
|
6
6
|
//# sourceMappingURL=GenericAnalyzer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenericAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/GenericAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"GenericAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/GenericAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,yBAAiB,eAAe,CAChC;IACI,KAAY,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAEnD,SAAgB,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,gBAAgB,GAAG,UAAU,CAK3F;CAmCJ"}
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __values = (this && this.__values) || function(o) {
|
|
26
3
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
27
4
|
if (m) return m.call(o);
|
|
@@ -33,9 +10,12 @@ var __values = (this && this.__values) || function(o) {
|
|
|
33
10
|
};
|
|
34
11
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
35
12
|
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
36
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
17
|
exports.GenericAnalyzer = void 0;
|
|
38
|
-
var
|
|
18
|
+
var typescript_1 = __importDefault(require("typescript"));
|
|
39
19
|
var GenericAnalyzer;
|
|
40
20
|
(function (GenericAnalyzer) {
|
|
41
21
|
function analyze(checker, classNode) {
|
|
@@ -55,11 +35,11 @@ var GenericAnalyzer;
|
|
|
55
35
|
// MUST BE CLASS
|
|
56
36
|
var expression = checker.getTypeAtLocation(hType.expression);
|
|
57
37
|
var superNode = expression.symbol.getDeclarations()[0];
|
|
58
|
-
if (!
|
|
38
|
+
if (!typescript_1.default.isClassDeclaration(superNode))
|
|
59
39
|
return "continue";
|
|
60
40
|
// SPECIFY GENERICS
|
|
61
|
-
var usages =
|
|
62
|
-
var parameters =
|
|
41
|
+
var usages = hType.typeArguments || [];
|
|
42
|
+
var parameters = superNode.typeParameters || [];
|
|
63
43
|
parameters.forEach(function (param, index) {
|
|
64
44
|
var paramType = checker.getTypeAtLocation(param);
|
|
65
45
|
var usageType = (usages[index] !== undefined)
|
|
@@ -93,8 +73,5 @@ var GenericAnalyzer;
|
|
|
93
73
|
finally { if (e_1) throw e_1.error; }
|
|
94
74
|
}
|
|
95
75
|
}
|
|
96
|
-
function if_undefined_array(array) {
|
|
97
|
-
return array !== undefined ? array : [];
|
|
98
|
-
}
|
|
99
76
|
})(GenericAnalyzer = exports.GenericAnalyzer || (exports.GenericAnalyzer = {}));
|
|
100
77
|
//# sourceMappingURL=GenericAnalyzer.js.map
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import ts from "typescript";
|
|
2
2
|
import { HashMap } from "tstl/container/HashMap";
|
|
3
3
|
import { HashSet } from "tstl/container/HashSet";
|
|
4
4
|
import { GenericAnalyzer } from "./GenericAnalyzer";
|
|
@@ -9,6 +9,6 @@ export declare namespace ImportAnalyzer {
|
|
|
9
9
|
alias: string;
|
|
10
10
|
}
|
|
11
11
|
type Dictionary = HashMap<string, HashSet<string>>;
|
|
12
|
-
function analyze(checker:
|
|
12
|
+
function analyze(checker: ts.TypeChecker, genericDict: GenericAnalyzer.Dictionary, importDict: Dictionary, type: ts.Type): IType;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=ImportAnalyzer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImportAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ImportAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ImportAnalyzer.d.ts","sourceRoot":"","sources":["../../src/analyses/ImportAnalyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,yBAAiB,cAAc,CAC/B;IACI,UAAiB,OAAO;QAEpB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QAC/B,KAAK,EAAE,MAAM,CAAC;KACjB;IAED,KAAY,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,SAAgB,OAAO,CAEf,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,WAAW,EAAE,eAAe,CAAC,UAAU,EACvC,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,EAAE,CAAC,IAAI,GACd,KAAK,CAMX;CAiHJ"}
|
|
@@ -63,12 +63,11 @@ var ImportAnalyzer;
|
|
|
63
63
|
}
|
|
64
64
|
// CHECK GENERIC
|
|
65
65
|
var generic = checker.getTypeArguments(type);
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
return generic.length
|
|
67
|
+
? name === "Promise"
|
|
68
68
|
? explore_escaped_name(checker, genericDict, importDict, generic[0])
|
|
69
|
-
: "".concat(name, "<").concat(generic.map(function (child) { return explore_escaped_name(checker, genericDict, importDict, child); }).join(", "), ">")
|
|
70
|
-
|
|
71
|
-
return name;
|
|
69
|
+
: "".concat(name, "<").concat(generic.map(function (child) { return explore_escaped_name(checker, genericDict, importDict, child); }).join(", "), ">")
|
|
70
|
+
: name;
|
|
72
71
|
}
|
|
73
72
|
function explore_name(name, decl) {
|
|
74
73
|
return typescript_1.default.isModuleBlock(decl)
|
|
@@ -94,9 +94,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
94
94
|
}
|
|
95
95
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
96
96
|
};
|
|
97
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
98
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
99
|
+
};
|
|
97
100
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
98
101
|
exports.ReflectAnalyzer = void 0;
|
|
99
|
-
var
|
|
102
|
+
var path_1 = __importDefault(require("path"));
|
|
100
103
|
var module_1 = require("tstl/ranges/module");
|
|
101
104
|
var ArrayUtil_1 = require("../utils/ArrayUtil");
|
|
102
105
|
var StringUtil_1 = require("../utils/StringUtil");
|
|
@@ -238,7 +241,7 @@ var ReflectAnalyzer;
|
|
|
238
241
|
meta.parameters = meta.parameters.sort(function (x, y) { return x.index - y.index; });
|
|
239
242
|
}
|
|
240
243
|
// VALIDATE PATH ARGUMENTS
|
|
241
|
-
var funcPathArguments = StringUtil_1.StringUtil.betweens(
|
|
244
|
+
var funcPathArguments = StringUtil_1.StringUtil.betweens(path_1.default.join(controller.path, meta.path)
|
|
242
245
|
.split("\\")
|
|
243
246
|
.join("/"), ":", "/").sort();
|
|
244
247
|
var paramPathArguments = meta.parameters
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -99,9 +76,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
99
76
|
};
|
|
100
77
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
101
78
|
exports.SourceFinder = void 0;
|
|
102
|
-
var
|
|
79
|
+
var fs_1 = __importDefault(require("fs"));
|
|
103
80
|
var glob_1 = __importDefault(require("glob"));
|
|
104
|
-
var
|
|
81
|
+
var path_1 = __importDefault(require("path"));
|
|
105
82
|
var SourceFinder;
|
|
106
83
|
(function (SourceFinder) {
|
|
107
84
|
function find(input) {
|
|
@@ -142,14 +119,14 @@ var SourceFinder;
|
|
|
142
119
|
case 2:
|
|
143
120
|
_e.trys.push([2, 10, 11, 12]);
|
|
144
121
|
e_1 = void 0;
|
|
145
|
-
return [4 /*yield*/, _Glob(
|
|
122
|
+
return [4 /*yield*/, _Glob(path_1.default.resolve(pattern))];
|
|
146
123
|
case 3:
|
|
147
124
|
_a = (__values.apply(void 0, [_e.sent()])), _b = _a.next();
|
|
148
125
|
_e.label = 4;
|
|
149
126
|
case 4:
|
|
150
127
|
if (!!_b.done) return [3 /*break*/, 9];
|
|
151
128
|
location_1 = _b.value;
|
|
152
|
-
return [4 /*yield*/,
|
|
129
|
+
return [4 /*yield*/, fs_1.default.promises.stat(location_1)];
|
|
153
130
|
case 5:
|
|
154
131
|
stats = _e.sent();
|
|
155
132
|
if (!(stats.isDirectory() === true)) return [3 /*break*/, 7];
|
|
@@ -200,7 +177,7 @@ var SourceFinder;
|
|
|
200
177
|
var e_3, _a;
|
|
201
178
|
return __generator(this, function (_b) {
|
|
202
179
|
switch (_b.label) {
|
|
203
|
-
case 0: return [4 /*yield*/,
|
|
180
|
+
case 0: return [4 /*yield*/, fs_1.default.promises.readdir(location)];
|
|
204
181
|
case 1:
|
|
205
182
|
directory = _b.sent();
|
|
206
183
|
_b.label = 2;
|
|
@@ -211,8 +188,8 @@ var SourceFinder;
|
|
|
211
188
|
case 3:
|
|
212
189
|
if (!!directory_1_1.done) return [3 /*break*/, 8];
|
|
213
190
|
file = directory_1_1.value;
|
|
214
|
-
next =
|
|
215
|
-
return [4 /*yield*/,
|
|
191
|
+
next = path_1.default.resolve("".concat(location, "/").concat(file));
|
|
192
|
+
return [4 /*yield*/, fs_1.default.promises.stat(next)];
|
|
216
193
|
case 4:
|
|
217
194
|
stats = _b.sent();
|
|
218
195
|
if (!(stats.isDirectory() === true)) return [3 /*break*/, 6];
|
|
@@ -249,7 +226,7 @@ var SourceFinder;
|
|
|
249
226
|
if (err)
|
|
250
227
|
reject(err);
|
|
251
228
|
else
|
|
252
|
-
resolve(matches.map(function (str) { return
|
|
229
|
+
resolve(matches.map(function (str) { return path_1.default.resolve(str); }));
|
|
253
230
|
});
|
|
254
231
|
});
|
|
255
232
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import ts from "typescript";
|
|
2
2
|
export declare namespace CompilerOptions {
|
|
3
3
|
const DEFAULT_OPTIONS: {
|
|
4
4
|
target: string;
|
|
@@ -9,6 +9,6 @@ export declare namespace CompilerOptions {
|
|
|
9
9
|
experimentalDecorators: boolean;
|
|
10
10
|
emitDecoratorMetadata: boolean;
|
|
11
11
|
};
|
|
12
|
-
function emend(options:
|
|
12
|
+
function emend(options: ts.CompilerOptions, assert: boolean): [boolean, boolean];
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=CompilerOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompilerOptions.d.ts","sourceRoot":"","sources":["../../../src/executable/internal/CompilerOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CompilerOptions.d.ts","sourceRoot":"","sources":["../../../src/executable/internal/CompilerOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAG5B,yBAAiB,eAAe,CAChC;IAeW,MAAM,eAAe;;;;;;;;KAI3B,CAAC;IAEF,SAAgB,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAoCtF;CAaJ"}
|
|
@@ -69,10 +69,13 @@ var __values = (this && this.__values) || function(o) {
|
|
|
69
69
|
};
|
|
70
70
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
71
71
|
};
|
|
72
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
73
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
74
|
+
};
|
|
72
75
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
73
76
|
exports.NestiaConfig = void 0;
|
|
74
|
-
var
|
|
75
|
-
var
|
|
77
|
+
var fs_1 = __importDefault(require("fs"));
|
|
78
|
+
var path_1 = __importDefault(require("path"));
|
|
76
79
|
var runner = __importStar(require("ts-node"));
|
|
77
80
|
var InvalidArgument_1 = require("tstl/exception/InvalidArgument");
|
|
78
81
|
var nestia_fetcher_1 = require("nestia-fetcher");
|
|
@@ -248,7 +251,7 @@ var NestiaConfig;
|
|
|
248
251
|
return __generator(this, function (_a) {
|
|
249
252
|
switch (_a.label) {
|
|
250
253
|
case 0:
|
|
251
|
-
if (
|
|
254
|
+
if (fs_1.default.existsSync("nestia.config.ts") === false)
|
|
252
255
|
return [2 /*return*/, null];
|
|
253
256
|
runner.register({
|
|
254
257
|
emit: false,
|
|
@@ -256,7 +259,7 @@ var NestiaConfig;
|
|
|
256
259
|
noEmit: true
|
|
257
260
|
}
|
|
258
261
|
});
|
|
259
|
-
return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require(
|
|
262
|
+
return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require(path_1.default.resolve("nestia.config.ts"))); })];
|
|
260
263
|
case 1:
|
|
261
264
|
config = _a.sent();
|
|
262
265
|
try {
|
package/lib/executable/nestia.js
CHANGED
|
@@ -1,28 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
"use strict";
|
|
3
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
4
|
-
if (k2 === undefined) k2 = k;
|
|
5
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
-
}
|
|
9
|
-
Object.defineProperty(o, k2, desc);
|
|
10
|
-
}) : (function(o, m, k, k2) {
|
|
11
|
-
if (k2 === undefined) k2 = k;
|
|
12
|
-
o[k2] = m[k];
|
|
13
|
-
}));
|
|
14
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
15
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
16
|
-
}) : function(o, v) {
|
|
17
|
-
o["default"] = v;
|
|
18
|
-
});
|
|
19
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
20
|
-
if (mod && mod.__esModule) return mod;
|
|
21
|
-
var result = {};
|
|
22
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
23
|
-
__setModuleDefault(result, mod);
|
|
24
|
-
return result;
|
|
25
|
-
};
|
|
26
3
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
27
4
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
28
5
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -70,9 +47,12 @@ var __values = (this && this.__values) || function(o) {
|
|
|
70
47
|
};
|
|
71
48
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
72
49
|
};
|
|
50
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
51
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
52
|
+
};
|
|
73
53
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
74
|
-
var
|
|
75
|
-
var
|
|
54
|
+
var child_process_1 = __importDefault(require("child_process"));
|
|
55
|
+
var process_1 = __importDefault(require("process"));
|
|
76
56
|
var NestiaCommand_1 = require("./internal/NestiaCommand");
|
|
77
57
|
function install() {
|
|
78
58
|
var e_1, _a;
|
|
@@ -81,7 +61,7 @@ function install() {
|
|
|
81
61
|
for (var _b = __values(["nestia-fetcher", "typescript-is", "typescript-json"]), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
82
62
|
var lib = _c.value;
|
|
83
63
|
var command = "npm install ".concat(lib);
|
|
84
|
-
|
|
64
|
+
child_process_1.default.execSync(command, { stdio: "inherit" });
|
|
85
65
|
}
|
|
86
66
|
}
|
|
87
67
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
@@ -98,25 +78,25 @@ function main() {
|
|
|
98
78
|
return __generator(this, function (_a) {
|
|
99
79
|
switch (_a.label) {
|
|
100
80
|
case 0:
|
|
101
|
-
argv =
|
|
102
|
-
if (!(
|
|
81
|
+
argv = process_1.default.argv.slice(3);
|
|
82
|
+
if (!(process_1.default.argv[2] === "install")) return [3 /*break*/, 2];
|
|
103
83
|
return [4 /*yield*/, install()];
|
|
104
84
|
case 1:
|
|
105
85
|
_a.sent();
|
|
106
86
|
return [3 /*break*/, 7];
|
|
107
87
|
case 2:
|
|
108
|
-
if (!(
|
|
88
|
+
if (!(process_1.default.argv[2] === "sdk")) return [3 /*break*/, 4];
|
|
109
89
|
return [4 /*yield*/, NestiaCommand_1.NestiaCommand.sdk(argv)];
|
|
110
90
|
case 3:
|
|
111
91
|
_a.sent();
|
|
112
92
|
return [3 /*break*/, 7];
|
|
113
93
|
case 4:
|
|
114
|
-
if (!(
|
|
94
|
+
if (!(process_1.default.argv[2] === "swagger")) return [3 /*break*/, 6];
|
|
115
95
|
return [4 /*yield*/, NestiaCommand_1.NestiaCommand.swagger(argv)];
|
|
116
96
|
case 5:
|
|
117
97
|
_a.sent();
|
|
118
98
|
return [3 /*break*/, 7];
|
|
119
|
-
case 6: throw new Error("nestia supports only three commands; (install, sdk, swagger), however you've typed the \"".concat(
|
|
99
|
+
case 6: throw new Error("nestia supports only three commands; (install, sdk, swagger), however you've typed the \"".concat(process_1.default.argv[2], "\""));
|
|
120
100
|
case 7: return [2 /*return*/];
|
|
121
101
|
}
|
|
122
102
|
});
|
|
@@ -124,6 +104,6 @@ function main() {
|
|
|
124
104
|
}
|
|
125
105
|
main().catch(function (exp) {
|
|
126
106
|
console.log(exp.message);
|
|
127
|
-
|
|
107
|
+
process_1.default.exit(-1);
|
|
128
108
|
});
|
|
129
109
|
//# sourceMappingURL=nestia.js.map
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -94,9 +71,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
94
71
|
}
|
|
95
72
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
96
73
|
};
|
|
74
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
75
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
76
|
+
};
|
|
97
77
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
98
78
|
exports.FileGenerator = void 0;
|
|
99
|
-
var
|
|
79
|
+
var fs_1 = __importDefault(require("fs"));
|
|
100
80
|
var HashMap_1 = require("tstl/container/HashMap");
|
|
101
81
|
var ImportDictionary_1 = require("../utils/ImportDictionary");
|
|
102
82
|
var FunctionGenerator_1 = require("./FunctionGenerator");
|
|
@@ -201,7 +181,7 @@ var FileGenerator;
|
|
|
201
181
|
switch (_e.label) {
|
|
202
182
|
case 0:
|
|
203
183
|
_e.trys.push([0, 2, , 3]);
|
|
204
|
-
return [4 /*yield*/,
|
|
184
|
+
return [4 /*yield*/, fs_1.default.promises.mkdir(outDir)];
|
|
205
185
|
case 1:
|
|
206
186
|
_e.sent();
|
|
207
187
|
return [3 /*break*/, 3];
|
|
@@ -302,7 +282,7 @@ var FileGenerator;
|
|
|
302
282
|
+ " */\n"
|
|
303
283
|
+ "//================================================================\n"
|
|
304
284
|
+ content.join("\n");
|
|
305
|
-
return [4 /*yield*/,
|
|
285
|
+
return [4 /*yield*/, fs_1.default.promises.writeFile("".concat(outDir, "/index.ts"), script, "utf8")];
|
|
306
286
|
case 12:
|
|
307
287
|
_e.sent();
|
|
308
288
|
return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SwaggerGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/SwaggerGenerator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAK5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAK9C,yBAAiB,gBAAgB,CACjC;IACI,SAAsB,QAAQ,CAEtB,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,MAAM,EAAE,cAAc,CAAC,QAAQ,EAC/B,SAAS,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CAyCnB;
|
|
1
|
+
{"version":3,"file":"SwaggerGenerator.d.ts","sourceRoot":"","sources":["../../src/generates/SwaggerGenerator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAK5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAK9C,yBAAiB,gBAAgB,CACjC;IACI,SAAsB,QAAQ,CAEtB,OAAO,EAAE,EAAE,CAAC,WAAW,EACvB,MAAM,EAAE,cAAc,CAAC,QAAQ,EAC/B,SAAS,EAAE,MAAM,EAAE,GACpB,OAAO,CAAC,IAAI,CAAC,CAyCnB;CA2JJ"}
|
|
@@ -227,6 +227,7 @@ var SwaggerGenerator;
|
|
|
227
227
|
var status = route.method === "GET" || route.method === "DELETE"
|
|
228
228
|
? "200"
|
|
229
229
|
: "201";
|
|
230
|
+
var schema = generate_schema(checker, collection, route.output.metadata);
|
|
230
231
|
return _a = {},
|
|
231
232
|
_a[status] = {
|
|
232
233
|
description: get_parametric_description(route.comments, "return")
|
|
@@ -234,7 +235,7 @@ var SwaggerGenerator;
|
|
|
234
235
|
content: route.output.escapedText === "void" ? undefined :
|
|
235
236
|
{
|
|
236
237
|
"application/json": {
|
|
237
|
-
schema:
|
|
238
|
+
schema: schema
|
|
238
239
|
}
|
|
239
240
|
}
|
|
240
241
|
},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import ts from "typescript";
|
|
2
2
|
import { IType } from "./IType";
|
|
3
3
|
import { ParamCategory } from "./ParamCategory";
|
|
4
4
|
export interface IRoute {
|
|
@@ -10,8 +10,8 @@ export interface IRoute {
|
|
|
10
10
|
imports: [string, string[]][];
|
|
11
11
|
output: IType;
|
|
12
12
|
symbol: string;
|
|
13
|
-
comments:
|
|
14
|
-
tags:
|
|
13
|
+
comments: ts.SymbolDisplayPart[];
|
|
14
|
+
tags: ts.JSDocTagInfo[];
|
|
15
15
|
}
|
|
16
16
|
export declare namespace IRoute {
|
|
17
17
|
interface IParameter {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IRoute.d.ts","sourceRoot":"","sources":["../../src/structures/IRoute.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"IRoute.d.ts","sourceRoot":"","sources":["../../src/structures/IRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,WAAW,MAAM;IAEnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IAEnB,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;IAChC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC9B,MAAM,EAAE,KAAK,CAAC;IAEd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,EAAE,CAAC,iBAAiB,EAAE,CAAC;IACjC,IAAI,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC;CAC3B;AAED,yBAAiB,MAAM,CACvB;IACI,UAAiB,UAAU;QAEvB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1B,QAAQ,EAAE,aAAa,CAAC;QACxB,SAAS,EAAE,OAAO,CAAC;QACnB,IAAI,EAAE,KAAK,CAAC;KACf;CACJ"}
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -75,7 +52,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
75
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
76
53
|
exports.DirectoryUtil = void 0;
|
|
77
54
|
var del_1 = __importDefault(require("del"));
|
|
78
|
-
var
|
|
55
|
+
var fs_1 = __importDefault(require("fs"));
|
|
79
56
|
var DirectoryUtil;
|
|
80
57
|
(function (DirectoryUtil) {
|
|
81
58
|
function remove(path) {
|
|
@@ -105,7 +82,7 @@ var DirectoryUtil;
|
|
|
105
82
|
case 0: return [4 /*yield*/, remove(path)];
|
|
106
83
|
case 1:
|
|
107
84
|
_a.sent();
|
|
108
|
-
return [4 /*yield*/,
|
|
85
|
+
return [4 /*yield*/, fs_1.default.promises.mkdir(path)];
|
|
109
86
|
case 2:
|
|
110
87
|
_a.sent();
|
|
111
88
|
return [2 /*return*/];
|
|
@@ -136,7 +113,7 @@ var DirectoryUtil;
|
|
|
136
113
|
var e_1, _a;
|
|
137
114
|
return __generator(this, function (_b) {
|
|
138
115
|
switch (_b.label) {
|
|
139
|
-
case 0: return [4 /*yield*/,
|
|
116
|
+
case 0: return [4 /*yield*/, fs_1.default.promises.readdir(from)];
|
|
140
117
|
case 1:
|
|
141
118
|
directory = _b.sent();
|
|
142
119
|
_b.label = 2;
|
|
@@ -149,21 +126,21 @@ var DirectoryUtil;
|
|
|
149
126
|
file = directory_1_1.value;
|
|
150
127
|
fromPath = "".concat(from, "/").concat(file);
|
|
151
128
|
toPath = "".concat(to, "/").concat(file);
|
|
152
|
-
return [4 /*yield*/,
|
|
129
|
+
return [4 /*yield*/, fs_1.default.promises.stat(fromPath)];
|
|
153
130
|
case 4:
|
|
154
131
|
stats = _b.sent();
|
|
155
132
|
if (!(stats.isDirectory() === true)) return [3 /*break*/, 7];
|
|
156
|
-
return [4 /*yield*/,
|
|
133
|
+
return [4 /*yield*/, fs_1.default.promises.mkdir(toPath)];
|
|
157
134
|
case 5:
|
|
158
135
|
_b.sent();
|
|
159
136
|
return [4 /*yield*/, _Copy(fromPath, toPath)];
|
|
160
137
|
case 6:
|
|
161
138
|
_b.sent();
|
|
162
139
|
return [3 /*break*/, 10];
|
|
163
|
-
case 7: return [4 /*yield*/,
|
|
140
|
+
case 7: return [4 /*yield*/, fs_1.default.promises.readFile(fromPath, "utf8")];
|
|
164
141
|
case 8:
|
|
165
142
|
content = _b.sent();
|
|
166
|
-
return [4 /*yield*/,
|
|
143
|
+
return [4 /*yield*/, fs_1.default.promises.writeFile(toPath, content.split("\r\n").join("\n"), "utf8")];
|
|
167
144
|
case 9:
|
|
168
145
|
_b.sent();
|
|
169
146
|
_b.label = 10;
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __values = (this && this.__values) || function(o) {
|
|
26
3
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
27
4
|
if (m) return m.call(o);
|
|
@@ -33,9 +10,12 @@ var __values = (this && this.__values) || function(o) {
|
|
|
33
10
|
};
|
|
34
11
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
35
12
|
};
|
|
13
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
+
};
|
|
36
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
17
|
exports.ImportDictionary = void 0;
|
|
38
|
-
var
|
|
18
|
+
var path_1 = __importDefault(require("path"));
|
|
39
19
|
var HashMap_1 = require("tstl/container/HashMap");
|
|
40
20
|
var HashSet_1 = require("tstl/container/HashSet");
|
|
41
21
|
var Pair_1 = require("tstl/utility/Pair");
|
|
@@ -62,7 +42,7 @@ var ImportDictionary = /** @class */ (function () {
|
|
|
62
42
|
try {
|
|
63
43
|
for (var _b = __values(this.dict_), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
64
44
|
var it = _c.value;
|
|
65
|
-
var file =
|
|
45
|
+
var file = path_1.default.relative(outDir, it.first).split("\\").join("/");
|
|
66
46
|
var realistic = it.second.first;
|
|
67
47
|
var instances = it.second.second.toJSON();
|
|
68
48
|
statements.push("import ".concat(!realistic ? "type " : "", "{ ").concat(instances.join(", "), " } from \"./").concat(file, "\";"));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nestia",
|
|
3
|
-
"version": "2.1.0-dev.
|
|
3
|
+
"version": "2.1.0-dev.20220501",
|
|
4
4
|
"description": "Automatic SDK and Document generator for the NestJS",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -38,11 +38,11 @@
|
|
|
38
38
|
"tgrid": "^0.8.6",
|
|
39
39
|
"ts-node": "^10.7.0",
|
|
40
40
|
"tsconfig-paths": "^3.14.1",
|
|
41
|
-
"tstl": "^2.5.
|
|
41
|
+
"tstl": "^2.5.6",
|
|
42
42
|
"ttypescript": "^1.5.13",
|
|
43
43
|
"typescript": "^4.6.3",
|
|
44
44
|
"typescript-is": "^0.19.0",
|
|
45
|
-
"typescript-json": "^2.0.
|
|
45
|
+
"typescript-json": "^2.0.7",
|
|
46
46
|
"typescript-transform-paths": "^3.3.1"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|