@nestia/sdk 3.3.0 → 3.3.1-dev.20240627-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/executable/internal/NestiaConfigLoader.d.ts +2 -2
- package/lib/executable/internal/NestiaConfigLoader.js +7 -18
- package/lib/executable/internal/NestiaConfigLoader.js.map +1 -1
- package/lib/executable/internal/NestiaSdkCommand.js +3 -3
- package/lib/executable/internal/NestiaSdkCommand.js.map +1 -1
- package/package.json +3 -3
- package/src/executable/internal/NestiaConfigLoader.ts +8 -11
- package/src/executable/internal/NestiaSdkCommand.ts +4 -4
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import { INestiaConfig } from "../../INestiaConfig";
|
|
3
3
|
export declare namespace NestiaConfigLoader {
|
|
4
|
-
const
|
|
5
|
-
const config: (file: string,
|
|
4
|
+
const compilerOptionsCommandLine: (project: string) => Promise<ts.ParsedCommandLine>;
|
|
5
|
+
const config: (file: string, rawCompilerOptions: Record<string, any>) => Promise<INestiaConfig>;
|
|
6
6
|
}
|
|
@@ -31,17 +31,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
31
31
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
32
|
});
|
|
33
33
|
};
|
|
34
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
35
|
-
var t = {};
|
|
36
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
37
|
-
t[p] = s[p];
|
|
38
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
39
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
40
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
41
|
-
t[p[i]] = s[p[i]];
|
|
42
|
-
}
|
|
43
|
-
return t;
|
|
44
|
-
};
|
|
45
34
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
46
35
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
47
36
|
};
|
|
@@ -55,24 +44,24 @@ const typescript_1 = __importDefault(require("typescript"));
|
|
|
55
44
|
const typia_1 = __importDefault(require("typia"));
|
|
56
45
|
var NestiaConfigLoader;
|
|
57
46
|
(function (NestiaConfigLoader) {
|
|
58
|
-
NestiaConfigLoader.
|
|
47
|
+
NestiaConfigLoader.compilerOptionsCommandLine = (project) => __awaiter(this, void 0, void 0, function* () {
|
|
59
48
|
const configFileName = typescript_1.default.findConfigFile(process.cwd(), typescript_1.default.sys.fileExists, project);
|
|
60
49
|
if (!configFileName)
|
|
61
50
|
throw new Error(`unable to find "${project}" file.`);
|
|
62
51
|
const { tsconfig } = yield (0, tsconfck_1.parseNative)(configFileName);
|
|
63
52
|
const configFileText = JSON.stringify(tsconfig);
|
|
64
53
|
const { config } = typescript_1.default.parseConfigFileTextToJson(configFileName, configFileText);
|
|
65
|
-
|
|
66
|
-
const _a = configParseResult.raw.compilerOptions, { moduleResolution } = _a, result = __rest(_a, ["moduleResolution"]);
|
|
67
|
-
return result;
|
|
54
|
+
return typescript_1.default.parseJsonConfigFileContent(config, typescript_1.default.sys, path_1.default.dirname(configFileName));
|
|
68
55
|
});
|
|
69
|
-
NestiaConfigLoader.config = (file,
|
|
56
|
+
NestiaConfigLoader.config = (file, rawCompilerOptions) => __awaiter(this, void 0, void 0, function* () {
|
|
70
57
|
if (fs_1.default.existsSync(path_1.default.resolve(file)) === false)
|
|
71
58
|
throw new Error(`Unable to find "${file}" file.`);
|
|
72
59
|
(0, ts_node_1.register)({
|
|
73
60
|
emit: false,
|
|
74
|
-
compilerOptions:
|
|
75
|
-
require:
|
|
61
|
+
compilerOptions: rawCompilerOptions,
|
|
62
|
+
require: rawCompilerOptions.baseUrl
|
|
63
|
+
? ["tsconfig-paths/register"]
|
|
64
|
+
: undefined,
|
|
76
65
|
});
|
|
77
66
|
const loaded = yield Promise.resolve(`${path_1.default.resolve(file)}`).then(s => __importStar(require(s)));
|
|
78
67
|
const config = typeof (loaded === null || loaded === void 0 ? void 0 : loaded.default) === "object" && loaded.default !== null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NestiaConfigLoader.js","sourceRoot":"","sources":["../../../src/executable/internal/NestiaConfigLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NestiaConfigLoader.js","sourceRoot":"","sources":["../../../src/executable/internal/NestiaConfigLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,16 +23,16 @@ var NestiaSdkCommand;
|
|
|
23
23
|
const generate = (task) => __awaiter(this, void 0, void 0, function* () {
|
|
24
24
|
var _a, _b;
|
|
25
25
|
// LOAD CONFIG INFO
|
|
26
|
-
const
|
|
26
|
+
const command = yield NestiaConfigLoader_1.NestiaConfigLoader.compilerOptionsCommandLine((_a = getFileArgument({
|
|
27
27
|
type: "project",
|
|
28
28
|
extension: "json",
|
|
29
29
|
})) !== null && _a !== void 0 ? _a : "tsconfig.json");
|
|
30
30
|
const config = yield NestiaConfigLoader_1.NestiaConfigLoader.config((_b = getFileArgument({
|
|
31
31
|
type: "config",
|
|
32
32
|
extension: "ts",
|
|
33
|
-
})) !== null && _b !== void 0 ? _b : "nestia.config.ts", compilerOptions);
|
|
33
|
+
})) !== null && _b !== void 0 ? _b : "nestia.config.ts", command.raw.compilerOptions);
|
|
34
34
|
// GENERATE
|
|
35
|
-
const app = new NestiaSdkApplication_1.NestiaSdkApplication(config,
|
|
35
|
+
const app = new NestiaSdkApplication_1.NestiaSdkApplication(config, command.options);
|
|
36
36
|
yield task(app);
|
|
37
37
|
});
|
|
38
38
|
const getFileArgument = (props) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NestiaSdkCommand.js","sourceRoot":"","sources":["../../../src/executable/internal/NestiaSdkCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,qEAAkE;AAClE,6DAA0D;AAE1D,IAAiB,gBAAgB,CAqDhC;AArDD,WAAiB,gBAAgB;IAClB,oBAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACrC,wBAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7C,oBAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAElD,MAAM,IAAI,GAAG,CAAO,IAAkD,EAAE,EAAE;QACxE,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAA,CAAC;IAEF,MAAM,QAAQ,GAAG,CACf,IAAkD,EAClD,EAAE;;QACF,mBAAmB;QACnB,MAAM,
|
|
1
|
+
{"version":3,"file":"NestiaSdkCommand.js","sourceRoot":"","sources":["../../../src/executable/internal/NestiaSdkCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,qEAAkE;AAClE,6DAA0D;AAE1D,IAAiB,gBAAgB,CAqDhC;AArDD,WAAiB,gBAAgB;IAClB,oBAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACrC,wBAAO,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7C,oBAAG,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IAElD,MAAM,IAAI,GAAG,CAAO,IAAkD,EAAE,EAAE;QACxE,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAA,CAAC;IAEF,MAAM,QAAQ,GAAG,CACf,IAAkD,EAClD,EAAE;;QACF,mBAAmB;QACnB,MAAM,OAAO,GACX,MAAM,uCAAkB,CAAC,0BAA0B,CACjD,MAAA,eAAe,CAAC;YACd,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,MAAM;SAClB,CAAC,mCAAI,eAAe,CACtB,CAAC;QACJ,MAAM,MAAM,GAAkB,MAAM,uCAAkB,CAAC,MAAM,CAC3D,MAAA,eAAe,CAAC;YACd,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,IAAI;SAChB,CAAC,mCAAI,kBAAkB,EACxB,OAAO,CAAC,GAAG,CAAC,eAAe,CAC5B,CAAC;QAEF,WAAW;QACX,MAAM,GAAG,GAAyB,IAAI,2CAAoB,CACxD,MAAM,EACN,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC,CAAA,CAAC;IAEF,MAAM,eAAe,GAAG,CAAC,KAGxB,EAAiB,EAAE;QAClB,MAAM,IAAI,GAAa,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEnC,MAAM,KAAK,GAAW,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,KAAK,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACzE,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;aACzB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,wBAAwB,CAAC,CAAC;QAEzD,MAAM,IAAI,GAAW,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,KAAK;YAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,IAAI,iBAAiB,KAAK,CAAC,SAAS,OAAO,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC,EArDgB,gBAAgB,gCAAhB,gBAAgB,QAqDhC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nestia/sdk",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.1-dev.20240627-2",
|
|
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": "^3.3.
|
|
35
|
+
"@nestia/fetcher": "^3.3.1-dev.20240627-2",
|
|
36
36
|
"@samchon/openapi": "^0.1.21",
|
|
37
37
|
"cli": "^1.0.1",
|
|
38
38
|
"get-function-location": "^2.0.0",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"typia": "^6.3.1"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
|
-
"@nestia/fetcher": ">=3.3.
|
|
49
|
+
"@nestia/fetcher": ">=3.3.1-dev.20240627-2",
|
|
50
50
|
"@nestjs/common": ">=7.0.1",
|
|
51
51
|
"@nestjs/core": ">=7.0.1",
|
|
52
52
|
"reflect-metadata": ">=0.1.12",
|
|
@@ -8,44 +8,41 @@ import typia from "typia";
|
|
|
8
8
|
import { INestiaConfig } from "../../INestiaConfig";
|
|
9
9
|
|
|
10
10
|
export namespace NestiaConfigLoader {
|
|
11
|
-
export const
|
|
11
|
+
export const compilerOptionsCommandLine = async (
|
|
12
12
|
project: string,
|
|
13
|
-
): Promise<ts.
|
|
13
|
+
): Promise<ts.ParsedCommandLine> => {
|
|
14
14
|
const configFileName = ts.findConfigFile(
|
|
15
15
|
process.cwd(),
|
|
16
16
|
ts.sys.fileExists,
|
|
17
17
|
project,
|
|
18
18
|
);
|
|
19
19
|
if (!configFileName) throw new Error(`unable to find "${project}" file.`);
|
|
20
|
-
|
|
21
20
|
const { tsconfig } = await parseNative(configFileName);
|
|
22
21
|
const configFileText = JSON.stringify(tsconfig);
|
|
23
22
|
const { config } = ts.parseConfigFileTextToJson(
|
|
24
23
|
configFileName,
|
|
25
24
|
configFileText,
|
|
26
25
|
);
|
|
27
|
-
|
|
26
|
+
return ts.parseJsonConfigFileContent(
|
|
28
27
|
config,
|
|
29
28
|
ts.sys,
|
|
30
29
|
path.dirname(configFileName),
|
|
31
30
|
);
|
|
32
|
-
|
|
33
|
-
const { moduleResolution, ...result } =
|
|
34
|
-
configParseResult.raw.compilerOptions;
|
|
35
|
-
return result;
|
|
36
31
|
};
|
|
37
32
|
|
|
38
33
|
export const config = async (
|
|
39
34
|
file: string,
|
|
40
|
-
|
|
35
|
+
rawCompilerOptions: Record<string, any>,
|
|
41
36
|
): Promise<INestiaConfig> => {
|
|
42
37
|
if (fs.existsSync(path.resolve(file)) === false)
|
|
43
38
|
throw new Error(`Unable to find "${file}" file.`);
|
|
44
39
|
|
|
45
40
|
register({
|
|
46
41
|
emit: false,
|
|
47
|
-
compilerOptions:
|
|
48
|
-
require:
|
|
42
|
+
compilerOptions: rawCompilerOptions,
|
|
43
|
+
require: rawCompilerOptions.baseUrl
|
|
44
|
+
? ["tsconfig-paths/register"]
|
|
45
|
+
: undefined,
|
|
49
46
|
});
|
|
50
47
|
|
|
51
48
|
const loaded: INestiaConfig & { default?: INestiaConfig } = await import(
|
|
@@ -17,8 +17,8 @@ export namespace NestiaSdkCommand {
|
|
|
17
17
|
task: (app: NestiaSdkApplication) => Promise<void>,
|
|
18
18
|
) => {
|
|
19
19
|
// LOAD CONFIG INFO
|
|
20
|
-
const
|
|
21
|
-
await NestiaConfigLoader.
|
|
20
|
+
const command: ts.ParsedCommandLine =
|
|
21
|
+
await NestiaConfigLoader.compilerOptionsCommandLine(
|
|
22
22
|
getFileArgument({
|
|
23
23
|
type: "project",
|
|
24
24
|
extension: "json",
|
|
@@ -29,13 +29,13 @@ export namespace NestiaSdkCommand {
|
|
|
29
29
|
type: "config",
|
|
30
30
|
extension: "ts",
|
|
31
31
|
}) ?? "nestia.config.ts",
|
|
32
|
-
compilerOptions,
|
|
32
|
+
command.raw.compilerOptions,
|
|
33
33
|
);
|
|
34
34
|
|
|
35
35
|
// GENERATE
|
|
36
36
|
const app: NestiaSdkApplication = new NestiaSdkApplication(
|
|
37
37
|
config,
|
|
38
|
-
|
|
38
|
+
command.options,
|
|
39
39
|
);
|
|
40
40
|
await task(app);
|
|
41
41
|
};
|