@simplysm/sd-cli 10.0.31 → 10.0.33
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/dist/SdTsIncrementalBuilder.js.map +1 -1
- package/dist/SdTsIncrementalBuilder.mjs +5 -3
- package/dist/builders/SdCliClientBuilder.js.map +1 -1
- package/dist/builders/SdCliClientBuilder.mjs +2 -1
- package/dist/builders/SdCliServerBuilder.d.ts +1 -0
- package/dist/builders/SdCliServerBuilder.js.map +1 -1
- package/dist/builders/SdCliServerBuilder.mjs +59 -6
- package/dist/builders/SdCliTsLibBuilder.js.map +1 -1
- package/package.json +8 -8
- package/src/SdTsIncrementalBuilder.ts +6 -3
- package/src/builders/SdCliClientBuilder.ts +2 -1
- package/src/builders/SdCliServerBuilder.ts +74 -7
- package/src/builders/SdCliTsLibBuilder.ts +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdTsIncrementalBuilder.js","sourceRoot":"","sources":["../../../src/SdTsIncrementalBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"SdTsIncrementalBuilder.js","sourceRoot":"","sources":["../../../src/SdTsIncrementalBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import ts from "typescript";
|
|
3
3
|
import { SdCliBuildResultUtil } from "./utils/SdCliBuildResultUtil";
|
|
4
|
-
import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
|
|
4
|
+
import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
|
|
5
5
|
export class SdTsIncrementalBuilder {
|
|
6
6
|
constructor(_pkgPath, _options, _host, _emitJs) {
|
|
7
7
|
this._pkgPath = _pkgPath;
|
|
@@ -17,12 +17,14 @@ export class SdTsIncrementalBuilder {
|
|
|
17
17
|
return new SdTsIncrementalBuilder(pkgPath, parsedTsConfig.options, host, emitJs);
|
|
18
18
|
}
|
|
19
19
|
async buildAsync() {
|
|
20
|
+
const logger = Logger.get(["simplysm", "sd-cli", "SdTsIncrementalBuilder", "buildAsync"]);
|
|
20
21
|
const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.{ts,tsx}");
|
|
21
22
|
const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
|
|
22
23
|
this.builderProgram = ts.createSemanticDiagnosticsBuilderProgram(srcFilePaths, this._options, this._host, this.builderProgram);
|
|
23
24
|
const diagnostics = [];
|
|
24
25
|
const affectedFilePaths = [];
|
|
25
26
|
diagnostics.push(...this.builderProgram.getOptionsDiagnostics(), ...this.builderProgram.getGlobalDiagnostics());
|
|
27
|
+
logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리중...`);
|
|
26
28
|
const srcFilePathSet = new Set(srcFilePaths);
|
|
27
29
|
while (true) {
|
|
28
30
|
const semanticResult = this.builderProgram.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
|
|
@@ -38,7 +40,7 @@ export class SdTsIncrementalBuilder {
|
|
|
38
40
|
realFilePath = path.resolve(this._pkgPath, "dist", path.relative(path.resolve(this._pkgPath, "dist", path.basename(this._pkgPath), "src"), realFilePath));
|
|
39
41
|
}
|
|
40
42
|
if (this._writeFileCache.get(realFilePath) !== data) {
|
|
41
|
-
|
|
43
|
+
this._host.writeFile(realFilePath, data, writeByteOrderMark);
|
|
42
44
|
}
|
|
43
45
|
this._writeFileCache.set(realFilePath, data);
|
|
44
46
|
}, undefined, !this._emitJs);
|
|
@@ -66,7 +68,7 @@ export class SdTsIncrementalBuilder {
|
|
|
66
68
|
affectedFilePaths.push(path.resolve(result.affected.fileName));
|
|
67
69
|
}*/
|
|
68
70
|
}
|
|
69
|
-
|
|
71
|
+
logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리 완료`, affectedFilePaths);
|
|
70
72
|
const buildResults = diagnostics.map((item) => SdCliBuildResultUtil.convertFromTsDiag(item));
|
|
71
73
|
return {
|
|
72
74
|
affectedFilePaths,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../../../src/builders/SdCliClientBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SdCliClientBuilder.js","sourceRoot":"","sources":["../../../../src/builders/SdCliClientBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,eAAe,MAAM,sBAAsB,CAAC;AACnD,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAClD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAGlD,YAAoC,QAAgB;QAClD,KAAK,EAAE,CAAC;QAD0B,aAAQ,GAAR,QAAQ,CAAQ;QAFnC,YAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAIpF,CAAC;IAIe,EAAE,CAAC,KAAsB,EAAE,QAAkC;QAC3E,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAEnF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEpB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,cAAc,GAAG,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACzC,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC;YACxC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;YACvD,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG;YAC9C,MAAM,EAAE;gBACN,IAAI,EAAE,cAAc;gBACpB,GAAG,EAAE;oBACH,IAAI,EAAE,cAAc;iBACrB;aACF;YACD,YAAY,EAAE;gBACZ,GAAG,YAAY,EAAE;gBACjB,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;oBACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;gBACjE,CAAC;gBACD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;oBACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;gBAChE,CAAC;gBACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;oBACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;gBACjE,CAAC;aACF;YACD,OAAO,EAAE;gBACP,eAAe,EAAE;gBACjB,eAAe,EAAE;gBACjB;oBACE,IAAI,EAAE,UAAU;oBAChB,eAAe,EAAE,CAAC,MAA0B,EAAE,EAAE;wBAC7C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;oBAC5E,CAAC;iBACF;aACF;SACF,CAAC,CAAC;QACH,MAAM,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAExC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;QAEnD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,cAAe,CAAC,UAAU,EAAE,CAAC,CAAC;QAEtH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,GAAG,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,WAAW;aACR,KAAK,CAAC;YACL,GAAG,WAAW,CAAC,cAAe,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC5E,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC;SACjD,CAAC;aACD,QAAQ,CAAC;YACR,KAAK,EAAE,GAAG;SACX,EAAE,GAAG,EAAE;YACN,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;gBACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAEpB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBACxB,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;gBAExD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACvB,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,WAAW,CAAC,cAAe,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEhI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACrB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBACpB,IAAI,EAAE,cAAc;oBACpB,iBAAiB,EAAE,gBAAgB,CAAC,iBAAiB;oBACrD,YAAY,EAAE,CAAC,GAAG,gBAAgB,CAAC,OAAO,EAAE,GAAG,gBAAgB,CAAC;iBACjE,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,EAAE,cAAc;YACpB,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,YAAY,EAAE,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC;SACvD,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAEnF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC3B,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,YAAY,GAA+B,EAAE,CAAC;QACpD,IAAI;YACF,MAAM,IAAI,CAAC,KAAK,CAAC;gBACf,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC;gBACxC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;gBACvD,IAAI,EAAE,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,GAAG;gBAC9C,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;iBAC5C;gBACD,YAAY,EAAE;oBACZ,GAAG,YAAY,EAAE;oBACjB,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;wBACZ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;oBACjE,CAAC;oBACD,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;wBACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;oBAChE,CAAC;oBACD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;wBACb,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;oBACjE,CAAC;iBACF;gBACD,OAAO,EAAE;oBACP,eAAe,EAAE;oBACjB,eAAe,EAAE;iBAClB;aACF,CAAC,CAAC;SACJ;QACD,OAAO,GAAG,EAAE;YACV,IAAI,QAAQ,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,YAAY,KAAK,EAAE;gBAClD,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC7C,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;oBAC5B,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;oBACxB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;oBAC1B,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,OAAgB;oBAC1B,OAAO,EAAE,IAAI,CAAC,IAAI;iBACnB,CAAC,CAAC,CAAC,CAAC;aACN;YACD,IAAI,UAAU,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,YAAY,KAAK,EAAE;gBACtD,YAAY,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC/C,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;oBAC5B,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI;oBACxB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;oBAC1B,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,SAAkB;oBAC5B,OAAO,EAAE,IAAI,CAAC,IAAI;iBACnB,CAAC,CAAC,CAAC,CAAC;aACN;SACF;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;QAEnD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,cAAe,CAAC,UAAU,EAAE,CAAC,CAAC;QAEtH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO;YACL,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,YAAY,EAAE,CAAC,GAAG,YAAY,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC;SACxE,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,GAAW;QACxB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;IACjE,CAAC;CACF"}
|
|
@@ -30,9 +30,10 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
30
30
|
cacheDir: path.resolve(this._pkgPath, ".cache", "vite"),
|
|
31
31
|
base: "/" + path.basename(this._pkgPath) + "/",
|
|
32
32
|
server: {
|
|
33
|
+
port: viteServerPort,
|
|
33
34
|
hmr: {
|
|
34
35
|
port: viteServerPort
|
|
35
|
-
}
|
|
36
|
+
},
|
|
36
37
|
},
|
|
37
38
|
customLogger: {
|
|
38
39
|
...createLogger(),
|
|
@@ -10,5 +10,6 @@ export declare class SdCliServerBuilder extends EventEmitter {
|
|
|
10
10
|
on(event: "complete", listener: (result: ISdCliBuilderResult) => void): this;
|
|
11
11
|
watchAsync(): Promise<void>;
|
|
12
12
|
buildAsync(): Promise<ISdCliBuilderResult>;
|
|
13
|
+
private _getExternalModulesAsync;
|
|
13
14
|
private _debug;
|
|
14
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdCliServerBuilder.js","sourceRoot":"","sources":["../../../../src/builders/SdCliServerBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"SdCliServerBuilder.js","sourceRoot":"","sources":["../../../../src/builders/SdCliServerBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import esbuild from "esbuild";
|
|
|
4
4
|
import path from "path";
|
|
5
5
|
import { SdTsIncrementalBuilder } from "../SdTsIncrementalBuilder";
|
|
6
6
|
import { SdLinter } from "../SdLinter";
|
|
7
|
+
import { StringUtil } from "@simplysm/sd-core-common";
|
|
7
8
|
export class SdCliServerBuilder extends EventEmitter {
|
|
8
9
|
constructor(_pkgPath, _pkgConf) {
|
|
9
10
|
super();
|
|
@@ -22,6 +23,7 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
22
23
|
await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
|
|
23
24
|
this.emit("change");
|
|
24
25
|
this._debug(`BUILD...`);
|
|
26
|
+
const extModules = await this._getExternalModulesAsync();
|
|
25
27
|
let isFirst = true;
|
|
26
28
|
const ctx = await esbuild.context({
|
|
27
29
|
entryPoints: {
|
|
@@ -35,12 +37,11 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
35
37
|
write: true,
|
|
36
38
|
format: "esm",
|
|
37
39
|
outExtension: { ".js": ".mjs" },
|
|
40
|
+
resolveExtensions: [".js", ".mjs", ".cjs", ".jsx", ".ts", ".tsx"],
|
|
38
41
|
platform: "node",
|
|
39
42
|
logLevel: "silent",
|
|
40
43
|
outfile: path.resolve(this._pkgPath, "dist", "main.mjs"),
|
|
41
|
-
external:
|
|
42
|
-
...this._pkgConf.externals ?? []
|
|
43
|
-
],
|
|
44
|
+
external: extModules.map((item) => item.name),
|
|
44
45
|
banner: {
|
|
45
46
|
js: `
|
|
46
47
|
import __path__ from 'path';
|
|
@@ -108,6 +109,7 @@ const __dirname = __path__.dirname(__filename);`.trim()
|
|
|
108
109
|
this._debug("dist 초기화...");
|
|
109
110
|
await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
|
|
110
111
|
this._debug("BUILD...");
|
|
112
|
+
const extModules = await this._getExternalModulesAsync();
|
|
111
113
|
const esbuildResult = await esbuild.build({
|
|
112
114
|
entryPoints: {
|
|
113
115
|
index: path.resolve(this._pkgPath, "src", "main.ts")
|
|
@@ -123,9 +125,7 @@ const __dirname = __path__.dirname(__filename);`.trim()
|
|
|
123
125
|
platform: "node",
|
|
124
126
|
logLevel: "silent",
|
|
125
127
|
outfile: path.resolve(this._pkgPath, "dist", "main.mjs"),
|
|
126
|
-
external:
|
|
127
|
-
...this._pkgConf.externals ?? []
|
|
128
|
-
],
|
|
128
|
+
external: extModules.map((item) => item.name),
|
|
129
129
|
banner: {
|
|
130
130
|
js: `
|
|
131
131
|
import __path__ from 'path';
|
|
@@ -165,6 +165,59 @@ const __dirname = __path__.dirname(__filename);`.trim()
|
|
|
165
165
|
buildResults: [...buildResults, ...checkResult.results, ...lintResults]
|
|
166
166
|
};
|
|
167
167
|
}
|
|
168
|
+
async _getExternalModulesAsync() {
|
|
169
|
+
const loadedModuleNames = [];
|
|
170
|
+
const results = [];
|
|
171
|
+
const npmConfigMap = new Map();
|
|
172
|
+
const fn = async (currPath) => {
|
|
173
|
+
const npmConfig = npmConfigMap.getOrCreate(currPath, await FsUtil.readJsonAsync(path.resolve(currPath, "package.json")));
|
|
174
|
+
const deps = {
|
|
175
|
+
defaults: [
|
|
176
|
+
...Object.keys(npmConfig.dependencies ?? {}),
|
|
177
|
+
...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item]?.optional)
|
|
178
|
+
].distinct(),
|
|
179
|
+
optionals: [
|
|
180
|
+
...Object.keys(npmConfig.optionalDependencies ?? {}),
|
|
181
|
+
...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item]?.optional)
|
|
182
|
+
].distinct()
|
|
183
|
+
};
|
|
184
|
+
for (const moduleName of deps.defaults) {
|
|
185
|
+
if (loadedModuleNames.includes(moduleName))
|
|
186
|
+
continue;
|
|
187
|
+
loadedModuleNames.push(moduleName);
|
|
188
|
+
const modulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + moduleName, currPath, path.resolve(this._pkgPath, "../../")).first();
|
|
189
|
+
if (StringUtil.isNullOrEmpty(modulePath)) {
|
|
190
|
+
continue;
|
|
191
|
+
}
|
|
192
|
+
if (FsUtil.glob(path.resolve(modulePath, "**/binding.gyp")).length > 0) {
|
|
193
|
+
results.push({ name: moduleName, exists: true });
|
|
194
|
+
}
|
|
195
|
+
if (this._pkgConf.externals?.includes(moduleName)) {
|
|
196
|
+
results.push({ name: moduleName, exists: true });
|
|
197
|
+
}
|
|
198
|
+
await fn(modulePath);
|
|
199
|
+
}
|
|
200
|
+
for (const optModuleName of deps.optionals) {
|
|
201
|
+
if (loadedModuleNames.includes(optModuleName))
|
|
202
|
+
continue;
|
|
203
|
+
loadedModuleNames.push(optModuleName);
|
|
204
|
+
const optModulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + optModuleName, currPath, path.resolve(this._pkgPath, "../../")).first();
|
|
205
|
+
if (StringUtil.isNullOrEmpty(optModulePath)) {
|
|
206
|
+
results.push({ name: optModuleName, exists: false });
|
|
207
|
+
continue;
|
|
208
|
+
}
|
|
209
|
+
if (FsUtil.glob(path.resolve(optModulePath, "**/binding.gyp")).length > 0) {
|
|
210
|
+
results.push({ name: optModuleName, exists: true });
|
|
211
|
+
}
|
|
212
|
+
if (this._pkgConf.externals?.includes(optModuleName)) {
|
|
213
|
+
results.push({ name: optModuleName, exists: true });
|
|
214
|
+
}
|
|
215
|
+
await fn(optModulePath);
|
|
216
|
+
}
|
|
217
|
+
};
|
|
218
|
+
await fn(this._pkgPath);
|
|
219
|
+
return results;
|
|
220
|
+
}
|
|
168
221
|
_debug(msg) {
|
|
169
222
|
this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
|
|
170
223
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../../../src/builders/SdCliTsLibBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,MAAM,OAAO,iBAAkB,SAAQ,YAAY;IAGjD,YAAoC,QAAgB;QAClD,KAAK,EAAE,CAAC;QAD0B,aAAQ,GAAR,QAAQ,CAAQ;QAFnC,YAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAInF,CAAC;IAIe,EAAE,CAAC,KAAsB,EAAE,QAAkC;QAC3E,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAElF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC3B,MAAM,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"SdCliTsLibBuilder.js","sourceRoot":"","sources":["../../../../src/builders/SdCliTsLibBuilder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "10.0.
|
|
3
|
+
"version": "10.0.33",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -15,22 +15,22 @@
|
|
|
15
15
|
"node": "^18"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@simplysm/sd-core-common": "10.0.
|
|
19
|
-
"@simplysm/sd-core-node": "10.0.
|
|
20
|
-
"@simplysm/sd-service-server": "10.0.
|
|
21
|
-
"@vitejs/plugin-react": "^4.0.
|
|
18
|
+
"@simplysm/sd-core-common": "10.0.33",
|
|
19
|
+
"@simplysm/sd-core-node": "10.0.33",
|
|
20
|
+
"@simplysm/sd-service-server": "10.0.33",
|
|
21
|
+
"@vitejs/plugin-react": "^4.0.3",
|
|
22
22
|
"esbuild": "^0.18.11",
|
|
23
23
|
"eslint": "^8.44.0",
|
|
24
24
|
"rollup": "^3.26.2",
|
|
25
25
|
"sass": "^1.63.6",
|
|
26
|
-
"semver": "^7.5.
|
|
26
|
+
"semver": "^7.5.4",
|
|
27
27
|
"typescript": "^4.9.5",
|
|
28
|
-
"vite": "^4.4.
|
|
28
|
+
"vite": "^4.4.2",
|
|
29
29
|
"vite-tsconfig-paths": "^4.2.0",
|
|
30
30
|
"yargs": "^17.7.2"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
|
-
"@types/eslint": "^8.
|
|
33
|
+
"@types/eslint": "^8.44.0",
|
|
34
34
|
"@types/yargs": "^17.0.24"
|
|
35
35
|
}
|
|
36
36
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import ts from "typescript";
|
|
3
3
|
import { SdCliBuildResultUtil } from "./utils/SdCliBuildResultUtil";
|
|
4
|
-
import { FsUtil, PathUtil } from "@simplysm/sd-core-node";
|
|
4
|
+
import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
|
|
5
5
|
import { ISdCliPackageBuildResult } from "./commons";
|
|
6
6
|
|
|
7
7
|
export class SdTsIncrementalBuilder {
|
|
@@ -25,6 +25,8 @@ export class SdTsIncrementalBuilder {
|
|
|
25
25
|
affectedFilePaths: string[];
|
|
26
26
|
results: ISdCliPackageBuildResult[];
|
|
27
27
|
}> {
|
|
28
|
+
const logger = Logger.get(["simplysm", "sd-cli", "SdTsIncrementalBuilder", "buildAsync"]);
|
|
29
|
+
|
|
28
30
|
const srcGlobPath = path.resolve(this._pkgPath, "src/**/*.{ts,tsx}");
|
|
29
31
|
const srcFilePaths = await FsUtil.globAsync(srcGlobPath);
|
|
30
32
|
this.builderProgram = ts.createSemanticDiagnosticsBuilderProgram(
|
|
@@ -42,6 +44,7 @@ export class SdTsIncrementalBuilder {
|
|
|
42
44
|
...this.builderProgram.getGlobalDiagnostics(),
|
|
43
45
|
);
|
|
44
46
|
|
|
47
|
+
logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리중...`);
|
|
45
48
|
const srcFilePathSet = new Set<string>(srcFilePaths);
|
|
46
49
|
while (true) {
|
|
47
50
|
const semanticResult = this.builderProgram.getSemanticDiagnosticsOfNextAffectedFile(undefined, (sourceFile) => {
|
|
@@ -58,7 +61,7 @@ export class SdTsIncrementalBuilder {
|
|
|
58
61
|
}
|
|
59
62
|
|
|
60
63
|
if (this._writeFileCache.get(realFilePath) !== data) {
|
|
61
|
-
|
|
64
|
+
this._host.writeFile(realFilePath, data, writeByteOrderMark);
|
|
62
65
|
}
|
|
63
66
|
this._writeFileCache.set(realFilePath, data);
|
|
64
67
|
}, undefined, !this._emitJs);
|
|
@@ -88,7 +91,7 @@ export class SdTsIncrementalBuilder {
|
|
|
88
91
|
affectedFilePaths.push(path.resolve(result.affected.fileName));
|
|
89
92
|
}*/
|
|
90
93
|
}
|
|
91
|
-
|
|
94
|
+
logger.debug(`[${path.basename(this._pkgPath)}] 영향받는 파일 확인 및 처리 완료`, affectedFilePaths);
|
|
92
95
|
|
|
93
96
|
const buildResults = diagnostics.map((item) => SdCliBuildResultUtil.convertFromTsDiag(item));
|
|
94
97
|
|
|
@@ -38,9 +38,10 @@ export class SdCliClientBuilder extends EventEmitter {
|
|
|
38
38
|
cacheDir: path.resolve(this._pkgPath, ".cache", "vite"),
|
|
39
39
|
base: "/" + path.basename(this._pkgPath) + "/",
|
|
40
40
|
server: {
|
|
41
|
+
port: viteServerPort,
|
|
41
42
|
hmr: {
|
|
42
43
|
port: viteServerPort
|
|
43
|
-
}
|
|
44
|
+
},
|
|
44
45
|
},
|
|
45
46
|
customLogger: {
|
|
46
47
|
...createLogger(),
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
2
|
import { FsUtil, Logger } from "@simplysm/sd-core-node";
|
|
3
|
-
import { ISdCliBuilderResult, ISdCliServerPackageConfig } from "../commons";
|
|
3
|
+
import { INpmConfig, ISdCliBuilderResult, ISdCliServerPackageConfig } from "../commons";
|
|
4
4
|
import esbuild from "esbuild";
|
|
5
5
|
import path from "path";
|
|
6
6
|
import { SdTsIncrementalBuilder } from "../SdTsIncrementalBuilder";
|
|
7
7
|
import { SdLinter } from "../SdLinter";
|
|
8
|
+
import { StringUtil } from "@simplysm/sd-core-common";
|
|
8
9
|
|
|
9
10
|
export class SdCliServerBuilder extends EventEmitter {
|
|
10
11
|
private readonly _logger = Logger.get(["simplysm", "sd-cli", "SdCliServerBuilder"]);
|
|
@@ -31,6 +32,7 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
31
32
|
this.emit("change");
|
|
32
33
|
|
|
33
34
|
this._debug(`BUILD...`);
|
|
35
|
+
const extModules = await this._getExternalModulesAsync();
|
|
34
36
|
let isFirst = true;
|
|
35
37
|
const ctx = await esbuild.context({
|
|
36
38
|
entryPoints: {
|
|
@@ -44,12 +46,11 @@ export class SdCliServerBuilder extends EventEmitter {
|
|
|
44
46
|
write: true,
|
|
45
47
|
format: "esm",
|
|
46
48
|
outExtension: { ".js": ".mjs" },
|
|
49
|
+
resolveExtensions: [".js", ".mjs", ".cjs", ".jsx", ".ts", ".tsx"],
|
|
47
50
|
platform: "node",
|
|
48
51
|
logLevel: "silent",
|
|
49
52
|
outfile: path.resolve(this._pkgPath, "dist", "main.mjs"),
|
|
50
|
-
external:
|
|
51
|
-
...this._pkgConf.externals ?? []
|
|
52
|
-
],
|
|
53
|
+
external: extModules.map((item) => item.name),
|
|
53
54
|
banner: {
|
|
54
55
|
js: `
|
|
55
56
|
import __path__ from 'path';
|
|
@@ -124,6 +125,7 @@ const __dirname = __path__.dirname(__filename);`.trim()
|
|
|
124
125
|
await FsUtil.removeAsync(path.resolve(this._pkgPath, "dist"));
|
|
125
126
|
|
|
126
127
|
this._debug("BUILD...");
|
|
128
|
+
const extModules = await this._getExternalModulesAsync();
|
|
127
129
|
const esbuildResult = await esbuild.build({
|
|
128
130
|
entryPoints: {
|
|
129
131
|
index: path.resolve(this._pkgPath, "src", "main.ts")
|
|
@@ -139,9 +141,7 @@ const __dirname = __path__.dirname(__filename);`.trim()
|
|
|
139
141
|
platform: "node",
|
|
140
142
|
logLevel: "silent",
|
|
141
143
|
outfile: path.resolve(this._pkgPath, "dist", "main.mjs"),
|
|
142
|
-
external:
|
|
143
|
-
...this._pkgConf.externals ?? []
|
|
144
|
-
],
|
|
144
|
+
external: extModules.map((item) => item.name),
|
|
145
145
|
banner: {
|
|
146
146
|
js: `
|
|
147
147
|
import __path__ from 'path';
|
|
@@ -186,6 +186,73 @@ const __dirname = __path__.dirname(__filename);`.trim()
|
|
|
186
186
|
};
|
|
187
187
|
}
|
|
188
188
|
|
|
189
|
+
private async _getExternalModulesAsync(): Promise<{ name: string; exists: boolean }[]> {
|
|
190
|
+
const loadedModuleNames: string[] = [];
|
|
191
|
+
const results: { name: string; exists: boolean }[] = [];
|
|
192
|
+
|
|
193
|
+
const npmConfigMap = new Map<string, INpmConfig>();
|
|
194
|
+
|
|
195
|
+
const fn = async (currPath: string): Promise<void> => {
|
|
196
|
+
const npmConfig = npmConfigMap.getOrCreate(currPath, await FsUtil.readJsonAsync(path.resolve(currPath, "package.json")));
|
|
197
|
+
|
|
198
|
+
const deps = {
|
|
199
|
+
defaults: [
|
|
200
|
+
...Object.keys(npmConfig.dependencies ?? {}),
|
|
201
|
+
...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => !npmConfig.peerDependenciesMeta?.[item]?.optional)
|
|
202
|
+
].distinct(),
|
|
203
|
+
optionals: [
|
|
204
|
+
...Object.keys(npmConfig.optionalDependencies ?? {}),
|
|
205
|
+
...Object.keys(npmConfig.peerDependencies ?? {}).filter((item) => npmConfig.peerDependenciesMeta?.[item]?.optional)
|
|
206
|
+
].distinct()
|
|
207
|
+
};
|
|
208
|
+
|
|
209
|
+
for (const moduleName of deps.defaults) {
|
|
210
|
+
if (loadedModuleNames.includes(moduleName)) continue;
|
|
211
|
+
loadedModuleNames.push(moduleName);
|
|
212
|
+
|
|
213
|
+
const modulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + moduleName, currPath, path.resolve(this._pkgPath, "../../")).first();
|
|
214
|
+
if (StringUtil.isNullOrEmpty(modulePath)) {
|
|
215
|
+
continue;
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
if (FsUtil.glob(path.resolve(modulePath, "**/binding.gyp")).length > 0) {
|
|
219
|
+
results.push({ name: moduleName, exists: true });
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
if (this._pkgConf.externals?.includes(moduleName)) {
|
|
223
|
+
results.push({ name: moduleName, exists: true });
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
await fn(modulePath);
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
for (const optModuleName of deps.optionals) {
|
|
230
|
+
if (loadedModuleNames.includes(optModuleName)) continue;
|
|
231
|
+
loadedModuleNames.push(optModuleName);
|
|
232
|
+
|
|
233
|
+
const optModulePath = FsUtil.findAllParentChildDirPaths("node_modules/" + optModuleName, currPath, path.resolve(this._pkgPath, "../../")).first();
|
|
234
|
+
if (StringUtil.isNullOrEmpty(optModulePath)) {
|
|
235
|
+
results.push({ name: optModuleName, exists: false });
|
|
236
|
+
continue;
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
if (FsUtil.glob(path.resolve(optModulePath, "**/binding.gyp")).length > 0) {
|
|
240
|
+
results.push({ name: optModuleName, exists: true });
|
|
241
|
+
}
|
|
242
|
+
|
|
243
|
+
if (this._pkgConf.externals?.includes(optModuleName)) {
|
|
244
|
+
results.push({ name: optModuleName, exists: true });
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
await fn(optModulePath);
|
|
248
|
+
}
|
|
249
|
+
};
|
|
250
|
+
|
|
251
|
+
await fn(this._pkgPath);
|
|
252
|
+
|
|
253
|
+
return results;
|
|
254
|
+
}
|
|
255
|
+
|
|
189
256
|
private _debug(msg: string): void {
|
|
190
257
|
this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
|
|
191
258
|
}
|
|
@@ -30,7 +30,6 @@ export class SdCliTsLibBuilder extends EventEmitter {
|
|
|
30
30
|
this._debug("BUILD...");
|
|
31
31
|
const buildResult = await sdTsProgram.buildAsync();
|
|
32
32
|
|
|
33
|
-
|
|
34
33
|
this._debug("LINT...");
|
|
35
34
|
const lintResults = await SdLinter.lintAsync(buildResult.affectedFilePaths, sdTsProgram.builderProgram!.getProgram());
|
|
36
35
|
|