@nestia/sdk 2.5.11 → 2.5.12
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.
|
@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.ExceptionAnalyzer = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const typescript_1 = __importDefault(require("typescript"));
|
|
9
|
+
const MetadataCollection_1 = require("typia/lib/factories/MetadataCollection");
|
|
10
|
+
const MetadataFactory_1 = require("typia/lib/factories/MetadataFactory");
|
|
9
11
|
const ImportAnalyzer_1 = require("./ImportAnalyzer");
|
|
10
12
|
var ExceptionAnalyzer;
|
|
11
13
|
(function (ExceptionAnalyzer) {
|
|
@@ -18,7 +20,7 @@ var ExceptionAnalyzer;
|
|
|
18
20
|
return output;
|
|
19
21
|
};
|
|
20
22
|
const analyzeTyped = (project) => (genericDict, importDict) => (controller, func) => (output) => (decorator) => {
|
|
21
|
-
var _a;
|
|
23
|
+
var _a, _b;
|
|
22
24
|
// CHECK DECORATOR
|
|
23
25
|
if (!typescript_1.default.isCallExpression(decorator.expression))
|
|
24
26
|
return false;
|
|
@@ -33,6 +35,9 @@ var ExceptionAnalyzer;
|
|
|
33
35
|
.indexOf(TYPED_EXCEPTION_PATH) === -1)
|
|
34
36
|
return false;
|
|
35
37
|
// GET TYPE INFO
|
|
38
|
+
const status = getStatus(project.checker)((_b = decorator.expression.arguments[0]) !== null && _b !== void 0 ? _b : null);
|
|
39
|
+
if (status === null)
|
|
40
|
+
return false;
|
|
36
41
|
const node = decorator.expression.typeArguments[0];
|
|
37
42
|
const type = project.checker.getTypeFromTypeNode(node);
|
|
38
43
|
if (type.isTypeParameter()) {
|
|
@@ -58,10 +63,7 @@ var ExceptionAnalyzer;
|
|
|
58
63
|
}
|
|
59
64
|
// DO ASSIGN
|
|
60
65
|
const matched = Object.entries(func.exceptions)
|
|
61
|
-
.filter(([
|
|
62
|
-
? value.type.split(" | ").sort().join(" | ") ===
|
|
63
|
-
tuple.typeName.split(" | ").sort().join(" | ")
|
|
64
|
-
: value.type === tuple.typeName)
|
|
66
|
+
.filter(([key]) => status === key)
|
|
65
67
|
.map(([_key, value]) => value);
|
|
66
68
|
for (const m of matched)
|
|
67
69
|
output[m.status] = {
|
|
@@ -72,6 +74,31 @@ var ExceptionAnalyzer;
|
|
|
72
74
|
};
|
|
73
75
|
return true;
|
|
74
76
|
};
|
|
77
|
+
const getStatus = (checker) => (expression) => {
|
|
78
|
+
if (expression === null)
|
|
79
|
+
return null;
|
|
80
|
+
const type = checker.getTypeAtLocation(expression);
|
|
81
|
+
const result = MetadataFactory_1.MetadataFactory.analyze(checker)({
|
|
82
|
+
escape: true,
|
|
83
|
+
constant: true,
|
|
84
|
+
absorb: true,
|
|
85
|
+
})(new MetadataCollection_1.MetadataCollection())(type);
|
|
86
|
+
if (false === result.success)
|
|
87
|
+
return null;
|
|
88
|
+
const meta = result.data;
|
|
89
|
+
if (meta.constants.length === 1)
|
|
90
|
+
return meta.constants[0].values[0].toString();
|
|
91
|
+
else if (meta.escaped && meta.escaped.returns.constants.length === 1)
|
|
92
|
+
return meta.escaped.returns.constants[0].values[0].toString();
|
|
93
|
+
else if (typescript_1.default.isStringLiteral(expression))
|
|
94
|
+
return expression.text;
|
|
95
|
+
else if (typescript_1.default.isNumericLiteral(expression)) {
|
|
96
|
+
const value = Number(expression.text.split("_").join(""));
|
|
97
|
+
if (false === isNaN(value))
|
|
98
|
+
return value.toString();
|
|
99
|
+
}
|
|
100
|
+
return null;
|
|
101
|
+
};
|
|
75
102
|
})(ExceptionAnalyzer || (exports.ExceptionAnalyzer = ExceptionAnalyzer = {}));
|
|
76
103
|
const TYPED_EXCEPTION_PATH = path_1.default.join("node_modules", "@nestia", "core", "lib", "decorators", "TypedException.d.ts");
|
|
77
104
|
//# sourceMappingURL=ExceptionAnalyzer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExceptionAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ExceptionAnalyzer.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,4DAA4B;
|
|
1
|
+
{"version":3,"file":"ExceptionAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ExceptionAnalyzer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nestia/sdk",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.12",
|
|
4
4
|
"description": "Nestia SDK and Swagger generator",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
},
|
|
33
33
|
"homepage": "https://nestia.io",
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@nestia/fetcher": "^2.5.
|
|
35
|
+
"@nestia/fetcher": "^2.5.12",
|
|
36
36
|
"cli": "^1.0.1",
|
|
37
37
|
"get-function-location": "^2.0.0",
|
|
38
38
|
"glob": "^7.2.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"typia": "^5.4.12"
|
|
46
46
|
},
|
|
47
47
|
"peerDependencies": {
|
|
48
|
-
"@nestia/fetcher": ">=2.5.
|
|
48
|
+
"@nestia/fetcher": ">=2.5.12",
|
|
49
49
|
"@nestjs/common": ">=7.0.1",
|
|
50
50
|
"@nestjs/core": ">=7.0.1",
|
|
51
51
|
"reflect-metadata": ">=0.1.12",
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import ts from "typescript";
|
|
3
|
+
import { MetadataCollection } from "typia/lib/factories/MetadataCollection";
|
|
4
|
+
import { MetadataFactory } from "typia/lib/factories/MetadataFactory";
|
|
5
|
+
import { Metadata } from "typia/lib/schemas/metadata/Metadata";
|
|
3
6
|
|
|
4
7
|
import { IController } from "../structures/IController";
|
|
5
8
|
import { INestiaProject } from "../structures/INestiaProject";
|
|
@@ -57,6 +60,11 @@ export namespace ExceptionAnalyzer {
|
|
|
57
60
|
return false;
|
|
58
61
|
|
|
59
62
|
// GET TYPE INFO
|
|
63
|
+
const status: string | null = getStatus(project.checker)(
|
|
64
|
+
decorator.expression.arguments[0] ?? null,
|
|
65
|
+
);
|
|
66
|
+
if (status === null) return false;
|
|
67
|
+
|
|
60
68
|
const node: ts.TypeNode = decorator.expression.typeArguments![0];
|
|
61
69
|
const type: ts.Type = project.checker.getTypeFromTypeNode(node);
|
|
62
70
|
if (type.isTypeParameter()) {
|
|
@@ -91,12 +99,7 @@ export namespace ExceptionAnalyzer {
|
|
|
91
99
|
|
|
92
100
|
// DO ASSIGN
|
|
93
101
|
const matched: IController.IException[] = Object.entries(func.exceptions)
|
|
94
|
-
.filter(([
|
|
95
|
-
value.type.includes(" | ") && tuple.typeName.includes(" | ")
|
|
96
|
-
? value.type.split(" | ").sort().join(" | ") ===
|
|
97
|
-
tuple.typeName.split(" | ").sort().join(" | ")
|
|
98
|
-
: value.type === tuple.typeName,
|
|
99
|
-
)
|
|
102
|
+
.filter(([key]) => status === key)
|
|
100
103
|
.map(([_key, value]) => value);
|
|
101
104
|
for (const m of matched)
|
|
102
105
|
output[m.status] = {
|
|
@@ -107,6 +110,32 @@ export namespace ExceptionAnalyzer {
|
|
|
107
110
|
};
|
|
108
111
|
return true;
|
|
109
112
|
};
|
|
113
|
+
|
|
114
|
+
const getStatus =
|
|
115
|
+
(checker: ts.TypeChecker) =>
|
|
116
|
+
(expression: ts.Expression | null): string | null => {
|
|
117
|
+
if (expression === null) return null;
|
|
118
|
+
|
|
119
|
+
const type: ts.Type = checker.getTypeAtLocation(expression);
|
|
120
|
+
const result = MetadataFactory.analyze(checker)({
|
|
121
|
+
escape: true,
|
|
122
|
+
constant: true,
|
|
123
|
+
absorb: true,
|
|
124
|
+
})(new MetadataCollection())(type);
|
|
125
|
+
if (false === result.success) return null;
|
|
126
|
+
|
|
127
|
+
const meta: Metadata = result.data;
|
|
128
|
+
if (meta.constants.length === 1)
|
|
129
|
+
return meta.constants[0].values[0].toString();
|
|
130
|
+
else if (meta.escaped && meta.escaped.returns.constants.length === 1)
|
|
131
|
+
return meta.escaped.returns.constants[0].values[0].toString();
|
|
132
|
+
else if (ts.isStringLiteral(expression)) return expression.text;
|
|
133
|
+
else if (ts.isNumericLiteral(expression)) {
|
|
134
|
+
const value: number = Number(expression.text.split("_").join(""));
|
|
135
|
+
if (false === isNaN(value)) return value.toString();
|
|
136
|
+
}
|
|
137
|
+
return null;
|
|
138
|
+
};
|
|
110
139
|
}
|
|
111
140
|
|
|
112
141
|
const TYPED_EXCEPTION_PATH = path.join(
|