@nestia/sdk 2.5.0-dev.20240128 → 2.5.0-dev.20240129-2
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/lib/NestiaSdkApplication.js +1 -1
- package/lib/NestiaSdkApplication.js.map +1 -1
- package/lib/generates/CloneGenerator.d.ts +6 -0
- package/lib/generates/CloneGenerator.js +60 -0
- package/lib/generates/CloneGenerator.js.map +1 -0
- package/lib/generates/E2eGenerator.d.ts +2 -1
- package/lib/generates/E2eGenerator.js +2 -2
- package/lib/generates/E2eGenerator.js.map +1 -1
- package/lib/generates/SdkGenerator.js +3 -3
- package/lib/generates/SdkGenerator.js.map +1 -1
- package/lib/generates/internal/E2eFileProgrammer.d.ts +2 -1
- package/lib/generates/internal/E2eFileProgrammer.js +45 -51
- package/lib/generates/internal/E2eFileProgrammer.js.map +1 -1
- package/lib/generates/internal/SdkAliasCollection.d.ts +12 -0
- package/lib/generates/internal/SdkAliasCollection.js +89 -0
- package/lib/generates/internal/SdkAliasCollection.js.map +1 -0
- package/lib/generates/internal/SdkFileProgrammer.d.ts +2 -1
- package/lib/generates/internal/SdkFileProgrammer.js +12 -19
- package/lib/generates/internal/SdkFileProgrammer.js.map +1 -1
- package/lib/generates/internal/SdkFunctionProgrammer.js +6 -6
- package/lib/generates/internal/SdkFunctionProgrammer.js.map +1 -1
- package/lib/generates/internal/SdkInterfaceProgrammer.d.ts +12 -0
- package/lib/generates/internal/SdkInterfaceProgrammer.js +112 -0
- package/lib/generates/internal/SdkInterfaceProgrammer.js.map +1 -0
- package/lib/generates/internal/SdkNamespaceProgrammer.d.ts +1 -1
- package/lib/generates/internal/SdkNamespaceProgrammer.js +24 -23
- package/lib/generates/internal/SdkNamespaceProgrammer.js.map +1 -1
- package/lib/generates/internal/SdkRouteProgrammer.d.ts +1 -1
- package/lib/generates/internal/SdkRouteProgrammer.js +4 -4
- package/lib/generates/internal/SdkRouteProgrammer.js.map +1 -1
- package/lib/generates/internal/SdkSimulationProgrammer.d.ts +1 -1
- package/lib/generates/internal/SdkSimulationProgrammer.js +11 -12
- package/lib/generates/internal/SdkSimulationProgrammer.js.map +1 -1
- package/lib/generates/internal/{SdkDtoGenerator.d.ts → SdkTypeProgrammer.d.ts} +2 -4
- package/lib/generates/internal/SdkTypeProgrammer.js +160 -0
- package/lib/generates/internal/SdkTypeProgrammer.js.map +1 -0
- package/lib/utils/{NodeUtil.d.ts → FormatUtil.d.ts} +2 -1
- package/lib/utils/FormatUtil.js +38 -0
- package/lib/utils/FormatUtil.js.map +1 -0
- package/lib/utils/ImportDictionary.js +2 -2
- package/lib/utils/ImportDictionary.js.map +1 -1
- package/package.json +3 -3
- package/src/NestiaSdkApplication.ts +1 -1
- package/src/generates/CloneGenerator.ts +75 -0
- package/src/generates/E2eGenerator.ts +3 -1
- package/src/generates/SdkGenerator.ts +3 -3
- package/src/generates/internal/E2eFileProgrammer.ts +145 -77
- package/src/generates/internal/SdkAliasCollection.ts +145 -0
- package/src/generates/internal/SdkFileProgrammer.ts +16 -16
- package/src/generates/internal/SdkFunctionProgrammer.ts +9 -9
- package/src/generates/internal/SdkInterfaceProgrammer.ts +211 -0
- package/src/generates/internal/SdkNamespaceProgrammer.ts +36 -24
- package/src/generates/internal/SdkRouteProgrammer.ts +7 -3
- package/src/generates/internal/SdkSimulationProgrammer.ts +14 -16
- package/src/generates/internal/SdkTypeProgrammer.ts +252 -0
- package/src/utils/{NodeUtil.ts → FormatUtil.ts} +13 -1
- package/src/utils/ImportDictionary.ts +2 -2
- package/lib/generates/internal/SdkDtoGenerator.js +0 -294
- package/lib/generates/internal/SdkDtoGenerator.js.map +0 -1
- package/lib/generates/internal/SdkTypeDefiner.d.ts +0 -11
- package/lib/generates/internal/SdkTypeDefiner.js +0 -82
- package/lib/generates/internal/SdkTypeDefiner.js.map +0 -1
- package/lib/utils/NodeUtil.js +0 -16
- package/lib/utils/NodeUtil.js.map +0 -1
- package/src/generates/internal/SdkDtoGenerator.ts +0 -424
- package/src/generates/internal/SdkTypeDefiner.ts +0 -119
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.SdkTypeProgrammer = void 0;
|
|
7
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
8
|
+
const ExpressionFactory_1 = require("typia/lib/factories/ExpressionFactory");
|
|
9
|
+
const TypeFactory_1 = require("typia/lib/factories/TypeFactory");
|
|
10
|
+
var SdkTypeProgrammer;
|
|
11
|
+
(function (SdkTypeProgrammer) {
|
|
12
|
+
SdkTypeProgrammer.decode = (config) => (importer) => (meta, parentEscaped = false) => {
|
|
13
|
+
const union = [];
|
|
14
|
+
// COALESCES
|
|
15
|
+
if (meta.any)
|
|
16
|
+
union.push(TypeFactory_1.TypeFactory.keyword("any"));
|
|
17
|
+
if (meta.nullable)
|
|
18
|
+
union.push(node("null"));
|
|
19
|
+
if (meta.isRequired() === false)
|
|
20
|
+
union.push(node("undefined"));
|
|
21
|
+
if (parentEscaped === false && meta.escaped)
|
|
22
|
+
union.push(decode_escaped(config)(importer)(meta.escaped));
|
|
23
|
+
// ATOMIC TYPES
|
|
24
|
+
for (const c of meta.constants)
|
|
25
|
+
for (const value of c.values)
|
|
26
|
+
union.push(decode_constant(value));
|
|
27
|
+
for (const tpl of meta.templates)
|
|
28
|
+
union.push(decode_template(config)(importer)(tpl));
|
|
29
|
+
for (const atom of meta.atomics)
|
|
30
|
+
union.push(decode_atomic(importer)(atom));
|
|
31
|
+
// OBJECT TYPES
|
|
32
|
+
for (const tuple of meta.tuples)
|
|
33
|
+
union.push(decode_tuple(config)(importer)(tuple));
|
|
34
|
+
for (const array of meta.arrays)
|
|
35
|
+
union.push(decode_array(config)(importer)(array));
|
|
36
|
+
for (const object of meta.objects)
|
|
37
|
+
union.push(decode_alias(config)(importer)(object));
|
|
38
|
+
for (const alias of meta.aliases)
|
|
39
|
+
union.push(decode_alias(config)(importer)(alias));
|
|
40
|
+
return union.length === 1
|
|
41
|
+
? union[0]
|
|
42
|
+
: typescript_1.default.factory.createUnionTypeNode(union);
|
|
43
|
+
};
|
|
44
|
+
const decode_escaped = (config) => (importer) => (meta) => {
|
|
45
|
+
if (meta.original.size() === 1 &&
|
|
46
|
+
meta.original.natives.length === 1 &&
|
|
47
|
+
meta.original.natives[0] === "Date")
|
|
48
|
+
return typescript_1.default.factory.createIntersectionTypeNode([
|
|
49
|
+
TypeFactory_1.TypeFactory.keyword("string"),
|
|
50
|
+
decodeTag(importer)({
|
|
51
|
+
name: "Format",
|
|
52
|
+
value: "date-time",
|
|
53
|
+
}),
|
|
54
|
+
]);
|
|
55
|
+
return SdkTypeProgrammer.decode(config)(importer)(meta.returns, true);
|
|
56
|
+
};
|
|
57
|
+
const decode_constant = (value) => {
|
|
58
|
+
if (typeof value === "boolean")
|
|
59
|
+
return typescript_1.default.factory.createLiteralTypeNode(value ? typescript_1.default.factory.createTrue() : typescript_1.default.factory.createFalse());
|
|
60
|
+
else if (typeof value === "bigint")
|
|
61
|
+
return typescript_1.default.factory.createLiteralTypeNode(value < BigInt(0)
|
|
62
|
+
? typescript_1.default.factory.createPrefixUnaryExpression(typescript_1.default.SyntaxKind.MinusToken, typescript_1.default.factory.createBigIntLiteral((-value).toString()))
|
|
63
|
+
: typescript_1.default.factory.createBigIntLiteral(value.toString()));
|
|
64
|
+
else if (typeof value === "number")
|
|
65
|
+
return typescript_1.default.factory.createLiteralTypeNode(ExpressionFactory_1.ExpressionFactory.number(value));
|
|
66
|
+
return typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createStringLiteral(value));
|
|
67
|
+
};
|
|
68
|
+
const decode_template = (config) => (importer) => (meta) => {
|
|
69
|
+
var _a;
|
|
70
|
+
const head = meta[0].isSoleLiteral();
|
|
71
|
+
const spans = [];
|
|
72
|
+
for (const elem of meta.slice(head ? 1 : 0)) {
|
|
73
|
+
const last = (_a = spans.at(-1)) !== null && _a !== void 0 ? _a : (() => {
|
|
74
|
+
const tuple = [null, null];
|
|
75
|
+
spans.push(tuple);
|
|
76
|
+
return tuple;
|
|
77
|
+
})();
|
|
78
|
+
if (elem.isSoleLiteral())
|
|
79
|
+
if (last[1] === null)
|
|
80
|
+
last[1] = String(elem.constants[0].values[0]);
|
|
81
|
+
else
|
|
82
|
+
spans.push([
|
|
83
|
+
typescript_1.default.factory.createLiteralTypeNode(typescript_1.default.factory.createStringLiteral(String(elem.constants[0].values[0]))),
|
|
84
|
+
null,
|
|
85
|
+
]);
|
|
86
|
+
else if (last[0] === null)
|
|
87
|
+
last[0] = SdkTypeProgrammer.decode(config)(importer)(elem);
|
|
88
|
+
else
|
|
89
|
+
spans.push([SdkTypeProgrammer.decode(config)(importer)(elem), null]);
|
|
90
|
+
}
|
|
91
|
+
return typescript_1.default.factory.createTemplateLiteralType(typescript_1.default.factory.createTemplateHead(head ? meta[0].constants[0].values[0] : ""), spans
|
|
92
|
+
.filter(([node]) => node !== null)
|
|
93
|
+
.map(([node, str], i, array) => typescript_1.default.factory.createTemplateLiteralTypeSpan(node, (i !== array.length - 1
|
|
94
|
+
? typescript_1.default.factory.createTemplateMiddle
|
|
95
|
+
: typescript_1.default.factory.createTemplateTail)(str !== null && str !== void 0 ? str : ""))));
|
|
96
|
+
};
|
|
97
|
+
const decode_atomic = (importer) => (meta) => decode_type_tag_matrix(importer)(typescript_1.default.factory.createKeywordTypeNode(meta.type === "boolean"
|
|
98
|
+
? typescript_1.default.SyntaxKind.BooleanKeyword
|
|
99
|
+
: meta.type === "bigint"
|
|
100
|
+
? typescript_1.default.SyntaxKind.BigIntKeyword
|
|
101
|
+
: meta.type === "number"
|
|
102
|
+
? typescript_1.default.SyntaxKind.NumberKeyword
|
|
103
|
+
: typescript_1.default.SyntaxKind.StringKeyword), meta.tags);
|
|
104
|
+
const decode_array = (config) => (importer) => (meta) => decode_type_tag_matrix(importer)(typescript_1.default.factory.createArrayTypeNode(SdkTypeProgrammer.decode(config)(importer)(meta.type.value)), meta.tags);
|
|
105
|
+
const decode_tuple = (config) => (importer) => (meta) => typescript_1.default.factory.createTupleTypeNode(meta.type.elements.map((elem) => elem.rest
|
|
106
|
+
? typescript_1.default.factory.createRestTypeNode(typescript_1.default.factory.createArrayTypeNode(SdkTypeProgrammer.decode(config)(importer)(elem.rest)))
|
|
107
|
+
: SdkTypeProgrammer.decode(config)(importer)(elem)));
|
|
108
|
+
const decode_alias = (config) => (importer) => (meta) => {
|
|
109
|
+
importInternalFile(config)(importer)(meta.name);
|
|
110
|
+
return typescript_1.default.factory.createTypeReferenceNode(meta.name);
|
|
111
|
+
};
|
|
112
|
+
const decode_type_tag_matrix = (importer) => (base, matrix) => {
|
|
113
|
+
matrix = matrix.filter((row) => row.length !== 0);
|
|
114
|
+
if (matrix.length === 0)
|
|
115
|
+
return base;
|
|
116
|
+
else if (matrix.length === 1)
|
|
117
|
+
return typescript_1.default.factory.createIntersectionTypeNode([
|
|
118
|
+
base,
|
|
119
|
+
...matrix[0].map((tag) => decodeTag(importer)(tag)),
|
|
120
|
+
]);
|
|
121
|
+
return typescript_1.default.factory.createIntersectionTypeNode([
|
|
122
|
+
base,
|
|
123
|
+
typescript_1.default.factory.createUnionTypeNode(matrix.map((row) => row.length === 1
|
|
124
|
+
? decodeTag(importer)(row[0])
|
|
125
|
+
: typescript_1.default.factory.createIntersectionTypeNode(row.map((tag) => decodeTag(importer)(tag))))),
|
|
126
|
+
]);
|
|
127
|
+
};
|
|
128
|
+
})(SdkTypeProgrammer || (exports.SdkTypeProgrammer = SdkTypeProgrammer = {}));
|
|
129
|
+
const node = (text) => typescript_1.default.factory.createTypeReferenceNode(text);
|
|
130
|
+
const decodeTag = (importer) => (tag) => {
|
|
131
|
+
const instance = tag.name.split("<")[0];
|
|
132
|
+
return typescript_1.default.factory.createTypeReferenceNode(importer.external({
|
|
133
|
+
type: true,
|
|
134
|
+
library: `typia/lib/tags/${instance}`,
|
|
135
|
+
instance,
|
|
136
|
+
}), [
|
|
137
|
+
typescript_1.default.factory.createLiteralTypeNode(typeof tag.value === "boolean"
|
|
138
|
+
? tag.value
|
|
139
|
+
? typescript_1.default.factory.createTrue()
|
|
140
|
+
: typescript_1.default.factory.createFalse()
|
|
141
|
+
: typeof tag.value === "bigint"
|
|
142
|
+
? tag.value < BigInt(0)
|
|
143
|
+
? typescript_1.default.factory.createPrefixUnaryExpression(typescript_1.default.SyntaxKind.MinusToken, typescript_1.default.factory.createBigIntLiteral((-tag.value).toString()))
|
|
144
|
+
: typescript_1.default.factory.createBigIntLiteral(tag.value.toString())
|
|
145
|
+
: typeof tag.value === "number"
|
|
146
|
+
? ExpressionFactory_1.ExpressionFactory.number(tag.value)
|
|
147
|
+
: typescript_1.default.factory.createStringLiteral(tag.value)),
|
|
148
|
+
]);
|
|
149
|
+
};
|
|
150
|
+
const importInternalFile = (config) => (importer) => (name) => {
|
|
151
|
+
const top = name.split(".")[0];
|
|
152
|
+
if (importer.file === `${config.output}/structures/${top}.ts`)
|
|
153
|
+
return;
|
|
154
|
+
importer.internal({
|
|
155
|
+
type: true,
|
|
156
|
+
file: `${config.output}/structures/${name.split(".")[0]}`,
|
|
157
|
+
instance: top,
|
|
158
|
+
});
|
|
159
|
+
};
|
|
160
|
+
//# sourceMappingURL=SdkTypeProgrammer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SdkTypeProgrammer.js","sourceRoot":"","sources":["../../../src/generates/internal/SdkTypeProgrammer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
|
-
export declare namespace
|
|
2
|
+
export declare namespace FormatUtil {
|
|
3
3
|
const description: <Node_1 extends ts.Node>(node: Node_1, comment: string) => Node_1;
|
|
4
4
|
const enter: () => ts.ExpressionStatement;
|
|
5
|
+
const beautify: (script: string) => Promise<string>;
|
|
5
6
|
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.FormatUtil = void 0;
|
|
16
|
+
const prettier_1 = require("prettier");
|
|
17
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
18
|
+
var FormatUtil;
|
|
19
|
+
(function (FormatUtil) {
|
|
20
|
+
FormatUtil.description = (node, comment) => {
|
|
21
|
+
if (comment.length === 0)
|
|
22
|
+
return node;
|
|
23
|
+
typescript_1.default.addSyntheticLeadingComment(node, typescript_1.default.SyntaxKind.MultiLineCommentTrivia, ["*", ...comment.split("\n").map((str) => ` * ${str}`), ""].join("\n"), true);
|
|
24
|
+
return node;
|
|
25
|
+
};
|
|
26
|
+
FormatUtil.enter = () => typescript_1.default.factory.createExpressionStatement(typescript_1.default.factory.createIdentifier("\n"));
|
|
27
|
+
FormatUtil.beautify = (script) => __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
try {
|
|
29
|
+
return yield (0, prettier_1.format)(script, {
|
|
30
|
+
parser: "typescript",
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
catch (_a) {
|
|
34
|
+
return script;
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
})(FormatUtil || (exports.FormatUtil = FormatUtil = {}));
|
|
38
|
+
//# sourceMappingURL=FormatUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FormatUtil.js","sourceRoot":"","sources":["../../src/utils/FormatUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAAkC;AAClC,4DAA4B;AAE5B,IAAiB,UAAU,CA2B1B;AA3BD,WAAiB,UAAU;IACZ,sBAAW,GAAG,CACzB,IAAU,EACV,OAAe,EACT,EAAE;QACR,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACtC,oBAAE,CAAC,0BAA0B,CAC3B,IAAI,EACJ,oBAAE,CAAC,UAAU,CAAC,sBAAsB,EACpC,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EACtE,IAAI,CACL,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEW,gBAAK,GAAG,GAAG,EAAE,CACxB,oBAAE,CAAC,OAAO,CAAC,yBAAyB,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAE7D,mBAAQ,GAAG,CAAO,MAAc,EAAmB,EAAE;QAChE,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,iBAAM,EAAC,MAAM,EAAE;gBAC1B,MAAM,EAAE,YAAY;aACrB,CAAC,CAAC;QACL,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC,CAAA,CAAC;AACJ,CAAC,EA3BgB,UAAU,0BAAV,UAAU,QA2B1B"}
|
|
@@ -9,7 +9,7 @@ const HashMap_1 = require("tstl/container/HashMap");
|
|
|
9
9
|
const HashSet_1 = require("tstl/container/HashSet");
|
|
10
10
|
const Pair_1 = require("tstl/utility/Pair");
|
|
11
11
|
const typescript_1 = __importDefault(require("typescript"));
|
|
12
|
-
const
|
|
12
|
+
const FormatUtil_1 = require("./FormatUtil");
|
|
13
13
|
class ImportDictionary {
|
|
14
14
|
constructor(file) {
|
|
15
15
|
this.file = file;
|
|
@@ -95,7 +95,7 @@ class ImportDictionary {
|
|
|
95
95
|
enroll((str) => str.indexOf(NODE_MODULES) === -1)(internal);
|
|
96
96
|
return [
|
|
97
97
|
...external,
|
|
98
|
-
...(external.length && internal.length ? [
|
|
98
|
+
...(external.length && internal.length ? [FormatUtil_1.FormatUtil.enter()] : []),
|
|
99
99
|
...internal,
|
|
100
100
|
];
|
|
101
101
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImportDictionary.js","sourceRoot":"","sources":["../../src/utils/ImportDictionary.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,oDAAiD;AACjD,oDAAiD;AACjD,4CAAyC;AACzC,4DAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"ImportDictionary.js","sourceRoot":"","sources":["../../src/utils/ImportDictionary.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,oDAAiD;AACjD,oDAAiD;AACjD,4CAAyC;AACzC,4DAA4B;AAE5B,6CAA0C;AAE1C,MAAa,gBAAgB;IAI3B,YAAmC,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAH9B,gBAAW,GAC1B,IAAI,iBAAO,EAAE,CAAC;IAEkC,CAAC;IAE5C,KAAK;QACV,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAClC,CAAC;IAEM,QAAQ,CAAC,KAAsC;;QACpD,MAAM,WAAW,GAAiB,IAAI,CAAC,WAAW,CAAC,IAAI,CACrD,IAAI,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EACnC,GAAG,EAAE,CAAC,CAAC;YACL,QAAQ,EAAE,gBAAgB,KAAK,CAAC,OAAO,EAAE;YACzC,QAAQ,EAAE,IAAI,iBAAO,EAAE;YACvB,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CACH,CAAC;QACF,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI;YAAE,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;;YACnD,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACjD,OAAO,MAAA,KAAK,CAAC,QAAQ,mCAAI,KAAK,CAAC,OAAO,CAAC;IACzC,CAAC;IAEM,QAAQ,CAAC,KAAsC;;QACpD,MAAM,IAAI,GAAW,CAAC,GAAG,EAAE;YACzB,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,OAAO;gBACzD,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;iBACnD,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,KAAK;gBAC5D,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YACxD,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB,CAAC,CAAC,EAAE,CAAC;QACL,MAAM,WAAW,GAAiB,IAAI,CAAC,WAAW,CAAC,IAAI,CACrD,IAAI,WAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,EAC1B,GAAG,EAAE,CAAC,CAAC;YACL,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,IAAI,iBAAO,EAAE;YACvB,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CACH,CAAC;QACF,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC5B,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC;YAC3B,IAAI,KAAK,CAAC,IAAI;gBAAE,WAAW,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAChD,CAAC;;YAAM,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnD,OAAO,MAAA,KAAK,CAAC,QAAQ,mCAAI,IAAI,CAAC;IAChC,CAAC;IAEM,YAAY,CAAC,MAAc;QAChC,MAAM,QAAQ,GAA2B,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAA2B,EAAE,CAAC;QAE5C,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;YAC9B,MAAM,QAAQ,GAAW,cAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1E,MAAM,KAAK,GAAW,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACzD,OAAO,KAAK,KAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzB,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,KAAK,QAAQ,EAAE;gBACnB,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC,CAAC;QACF,MAAM,MAAM,GACV,CAAC,MAAgC,EAAE,EAAE,CACrC,CAAC,SAAiC,EAAE,EAAE;;YACpC,MAAM,YAAY,GAAmB,IAAI,CAAC,WAAW;iBAClD,MAAM,EAAE;iBACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;iBACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCACP,CAAC,CAAC,MAAM,KACX,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IACpC,CAAC;iBACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxD,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;gBAC9B,IAAI,CAAC,CAAC,OAAO;oBAAE,QAAQ,CAAC,IAAI,CAAC,MAAA,CAAC,CAAC,IAAI,mCAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACnD,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,KAAK;oBAC9B,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,CAAC,QAAQ;yBACZ,MAAM,EAAE;yBACR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;yBAClC,IAAI,CAAC,IAAI,CAAC,IAAI,CAClB,CAAC;gBACJ,SAAS,CAAC,IAAI,CACZ,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAChC,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,kBAAkB,CAC3B,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,OAAO;oBACP,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAA,CAAC,CAAC,IAAI,mCAAI,CAAC,CAAC,QAAQ,CAAC;oBACnD,CAAC,CAAC,SAAS,EACb,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,KAAK;oBAC1B,CAAC,CAAC,oBAAE,CAAC,OAAO,CAAC,kBAAkB,CAC3B,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,oBAAE,CAAC,OAAO,CAAC,qBAAqB,CAC9B,KAAK,EACL,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAClC,CACF,CACF;oBACH,CAAC,CAAC,SAAS,CACd,EACD,oBAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAC3C,CACF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEJ,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC5D,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC5D,OAAO;YACL,GAAG,QAAQ;YACX,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,uBAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,GAAG,QAAQ;SACZ,CAAC;IACJ,CAAC;IAEM,QAAQ,CAAC,MAAc;QAC5B,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,MAAM,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;YAC9B,MAAM,QAAQ,GAAW,cAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1E,MAAM,KAAK,GAAW,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;YACzD,OAAO,KAAK,KAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC;oBACzB,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,KAAK,QAAQ,EAAE;gBACnB,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC,CAAC;QACF,MAAM,MAAM,GACV,CAAC,MAAgC,EAAE,EAAE,CAAC,CAAC,SAAmB,EAAE,EAAE;;YAC5D,MAAM,YAAY,GAAmB,IAAI,CAAC,WAAW;iBAClD,MAAM,EAAE;iBACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;iBACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCACP,CAAC,CAAC,MAAM,KACX,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IACpC,CAAC;iBACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxD,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;gBAC9B,IAAI,CAAC,CAAC,OAAO;oBAAE,QAAQ,CAAC,IAAI,CAAC,MAAA,CAAC,CAAC,IAAI,mCAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACnD,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,KAAK;oBAC9B,QAAQ,CAAC,IAAI,CACX,KAAK,CAAC,CAAC,QAAQ;yBACZ,MAAM,EAAE;yBACR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;yBAClC,IAAI,CAAC,IAAI,CAAC,IAAI,CAClB,CAAC;gBACJ,SAAS,CAAC,IAAI,CACZ,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UACnD,CAAC,CAAC,QACJ,IAAI,CACL,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QAEJ,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC5D,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAE5D,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM;YAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1D,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;CACF;AArKD,4CAqKC;AAuBD,MAAM,YAAY,GAAG,eAAe,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nestia/sdk",
|
|
3
|
-
"version": "2.5.0-dev.
|
|
3
|
+
"version": "2.5.0-dev.20240129-2",
|
|
4
4
|
"description": "Nestia SDK and Swagger generator",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"typings": "lib/index.d.ts",
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
},
|
|
35
35
|
"homepage": "https://nestia.io",
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@nestia/fetcher": "^2.5.0-dev.
|
|
37
|
+
"@nestia/fetcher": "^2.5.0-dev.20240129-2",
|
|
38
38
|
"cli": "^1.0.1",
|
|
39
39
|
"get-function-location": "^2.0.0",
|
|
40
40
|
"glob": "^7.2.0",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"typia": "^5.4.1"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
|
-
"@nestia/fetcher": ">=2.5.0-dev.
|
|
49
|
+
"@nestia/fetcher": ">=2.5.0-dev.20240129-2",
|
|
50
50
|
"@nestjs/common": ">=7.0.1",
|
|
51
51
|
"@nestjs/core": ">=7.0.1",
|
|
52
52
|
"prettier": ">=2.0.0",
|
|
@@ -51,7 +51,7 @@ export class NestiaSdkApplication {
|
|
|
51
51
|
(config) => config,
|
|
52
52
|
(checker) => (config) => async (routes) => {
|
|
53
53
|
await SdkGenerator.generate(checker)(config)(routes);
|
|
54
|
-
await E2eGenerator.generate(config)(routes);
|
|
54
|
+
await E2eGenerator.generate(checker)(config)(routes);
|
|
55
55
|
},
|
|
56
56
|
);
|
|
57
57
|
}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import fs from "fs";
|
|
2
|
+
import ts from "typescript";
|
|
3
|
+
|
|
4
|
+
import { INestiaConfig } from "../INestiaConfig";
|
|
5
|
+
import { IRoute } from "../structures/IRoute";
|
|
6
|
+
import { FormatUtil } from "../utils/FormatUtil";
|
|
7
|
+
import { ImportDictionary } from "../utils/ImportDictionary";
|
|
8
|
+
import { SdkInterfaceProgrammer } from "./internal/SdkInterfaceProgrammer";
|
|
9
|
+
|
|
10
|
+
export namespace CloneGenerator {
|
|
11
|
+
export const generate =
|
|
12
|
+
(checker: ts.TypeChecker) =>
|
|
13
|
+
(config: INestiaConfig) =>
|
|
14
|
+
async (routes: IRoute[]): Promise<void> => {
|
|
15
|
+
const dict: Map<string, SdkInterfaceProgrammer.IModule> =
|
|
16
|
+
SdkInterfaceProgrammer.generate(checker)(config)(routes);
|
|
17
|
+
|
|
18
|
+
try {
|
|
19
|
+
await fs.promises.mkdir(`${config.output}/structures`);
|
|
20
|
+
} catch {}
|
|
21
|
+
for (const [key, value] of dict) await writeDtoFile(config)(key, value);
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
const writeDtoFile =
|
|
25
|
+
(config: INestiaConfig) =>
|
|
26
|
+
async (
|
|
27
|
+
key: string,
|
|
28
|
+
value: SdkInterfaceProgrammer.IModule,
|
|
29
|
+
): Promise<void> => {
|
|
30
|
+
const location: string = `${config.output}/structures/${key}.ts`;
|
|
31
|
+
const importer: ImportDictionary = new ImportDictionary(location);
|
|
32
|
+
const statements: ts.Statement[] = iterate(importer)(value);
|
|
33
|
+
if (statements.length === 0) return;
|
|
34
|
+
|
|
35
|
+
const script: string = ts
|
|
36
|
+
.createPrinter()
|
|
37
|
+
.printFile(
|
|
38
|
+
ts.factory.createSourceFile(
|
|
39
|
+
[
|
|
40
|
+
...importer.toStatements(`${config.output}/structures`),
|
|
41
|
+
...(importer.empty() ? [] : [FormatUtil.enter()]),
|
|
42
|
+
...statements,
|
|
43
|
+
],
|
|
44
|
+
ts.factory.createToken(ts.SyntaxKind.EndOfFileToken),
|
|
45
|
+
ts.NodeFlags.None,
|
|
46
|
+
),
|
|
47
|
+
);
|
|
48
|
+
await fs.promises.writeFile(
|
|
49
|
+
location,
|
|
50
|
+
await FormatUtil.beautify(script),
|
|
51
|
+
"utf8",
|
|
52
|
+
);
|
|
53
|
+
};
|
|
54
|
+
|
|
55
|
+
const iterate =
|
|
56
|
+
(importer: ImportDictionary) =>
|
|
57
|
+
(modulo: SdkInterfaceProgrammer.IModule): ts.Statement[] => {
|
|
58
|
+
const output: ts.Statement[] = [];
|
|
59
|
+
if (modulo.programmer !== null) output.push(modulo.programmer(importer));
|
|
60
|
+
if (modulo.children.size) {
|
|
61
|
+
const internal: ts.Statement[] = [];
|
|
62
|
+
for (const child of modulo.children.values())
|
|
63
|
+
internal.push(...iterate(importer)(child));
|
|
64
|
+
output.push(
|
|
65
|
+
ts.factory.createModuleDeclaration(
|
|
66
|
+
[ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
|
|
67
|
+
ts.factory.createIdentifier(modulo.name),
|
|
68
|
+
ts.factory.createModuleBlock(internal),
|
|
69
|
+
ts.NodeFlags.Namespace,
|
|
70
|
+
),
|
|
71
|
+
);
|
|
72
|
+
}
|
|
73
|
+
return output;
|
|
74
|
+
};
|
|
75
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from "fs";
|
|
2
2
|
import path from "path";
|
|
3
|
+
import ts from "typescript";
|
|
3
4
|
|
|
4
5
|
import { INestiaConfig } from "../INestiaConfig";
|
|
5
6
|
import { ConfigAnalyzer } from "../analyses/ConfigAnalyzer";
|
|
@@ -8,6 +9,7 @@ import { E2eFileProgrammer } from "./internal/E2eFileProgrammer";
|
|
|
8
9
|
|
|
9
10
|
export namespace E2eGenerator {
|
|
10
11
|
export const generate =
|
|
12
|
+
(checker: ts.TypeChecker) =>
|
|
11
13
|
(config: INestiaConfig) =>
|
|
12
14
|
async (routeList: IRoute[]): Promise<void> => {
|
|
13
15
|
console.log("Generating E2E Test Functions");
|
|
@@ -24,7 +26,7 @@ export namespace E2eGenerator {
|
|
|
24
26
|
|
|
25
27
|
// GENERATE EACH TEST FILES
|
|
26
28
|
for (const route of routeList)
|
|
27
|
-
await E2eFileProgrammer.generate(config)({
|
|
29
|
+
await E2eFileProgrammer.generate(checker)(config)({
|
|
28
30
|
api: path.resolve(config.output!),
|
|
29
31
|
current: path.join(output, "features", "api", "automated"),
|
|
30
32
|
})(route);
|
|
@@ -5,8 +5,8 @@ import ts from "typescript";
|
|
|
5
5
|
|
|
6
6
|
import { INestiaConfig } from "../INestiaConfig";
|
|
7
7
|
import { IRoute } from "../structures/IRoute";
|
|
8
|
+
import { CloneGenerator } from "./CloneGenerator";
|
|
8
9
|
import { SdkDistributionComposer } from "./internal/SdkDistributionComposer";
|
|
9
|
-
import { SdkDtoGenerator } from "./internal/SdkDtoGenerator";
|
|
10
10
|
import { SdkFileProgrammer } from "./internal/SdkFileProgrammer";
|
|
11
11
|
|
|
12
12
|
export namespace SdkGenerator {
|
|
@@ -56,10 +56,10 @@ export namespace SdkGenerator {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
// STRUCTURES
|
|
59
|
-
if (config.clone) await
|
|
59
|
+
if (config.clone) await CloneGenerator.generate(checker)(config)(routes);
|
|
60
60
|
|
|
61
61
|
// FUNCTIONAL
|
|
62
|
-
await SdkFileProgrammer.generate(config)(routes);
|
|
62
|
+
await SdkFileProgrammer.generate(checker)(config)(routes);
|
|
63
63
|
|
|
64
64
|
// DISTRIBUTION
|
|
65
65
|
if (config.distribute !== undefined)
|