@simplysm/sd-cli 12.13.13 → 12.13.15
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/entry/sd-cli-electron.js +1 -1
- package/dist/entry/sd-cli-electron.js.map +1 -1
- package/dist/entry/sd-cli-project.d.ts +2 -0
- package/dist/entry/sd-cli-project.js +11 -3
- package/dist/entry/sd-cli-project.js.map +1 -1
- package/dist/pkg-builders/client/sd-client.build-runner.d.ts +1 -1
- package/dist/pkg-builders/client/sd-client.build-runner.js +74 -50
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -1
- package/dist/pkg-builders/client/sd-ng.bundler.d.ts +2 -0
- package/dist/pkg-builders/client/sd-ng.bundler.js +19 -20
- package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -1
- package/dist/pkg-builders/client/sd-ng.plugin-creator.d.ts +2 -0
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js +94 -33
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -1
- package/dist/pkg-builders/commons/build-runner.base.d.ts +4 -2
- package/dist/pkg-builders/commons/build-runner.base.js +45 -25
- package/dist/pkg-builders/commons/build-runner.base.js.map +1 -1
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.d.ts +1 -1
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.js +14 -4
- package/dist/pkg-builders/lib/sd-js-lib.build-runner.js.map +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.d.ts +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js +21 -40
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.builder.d.ts +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.builder.js +3 -1
- package/dist/pkg-builders/lib/sd-ts-lib.builder.js.map +1 -1
- package/dist/pkg-builders/sd-multi.build-runner.js +116 -86
- package/dist/pkg-builders/sd-multi.build-runner.js.map +1 -1
- package/dist/pkg-builders/server/sd-server.build-runner.d.ts +1 -1
- package/dist/pkg-builders/server/sd-server.build-runner.js +9 -5
- package/dist/pkg-builders/server/sd-server.build-runner.js.map +1 -1
- package/dist/pkg-builders/server/sd-server.bundler.d.ts +2 -0
- package/dist/pkg-builders/server/sd-server.bundler.js +3 -1
- package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -1
- package/dist/pkg-builders/server/sd-server.plugin-creator.d.ts +2 -0
- package/dist/pkg-builders/server/sd-server.plugin-creator.js +4 -1
- package/dist/pkg-builders/server/sd-server.plugin-creator.js.map +1 -1
- package/dist/sd-cli-entry.js +10 -0
- package/dist/sd-cli-entry.js.map +1 -1
- package/dist/sd-cli.js +8 -6
- package/dist/sd-cli.js.map +1 -1
- package/dist/ts-compiler/sd-dependency-analyzer.d.ts +8 -1
- package/dist/ts-compiler/sd-dependency-analyzer.js +128 -63
- package/dist/ts-compiler/sd-dependency-analyzer.js.map +1 -1
- package/dist/ts-compiler/sd-dependency-cache.d.ts +0 -34
- package/dist/ts-compiler/sd-dependency-cache.js +73 -119
- package/dist/ts-compiler/sd-dependency-cache.js.map +1 -1
- package/dist/ts-compiler/sd-style-bundler.d.ts +16 -0
- package/dist/ts-compiler/sd-style-bundler.js +118 -0
- package/dist/ts-compiler/sd-style-bundler.js.map +1 -0
- package/dist/ts-compiler/sd-ts-compiler.js +418 -235
- package/dist/ts-compiler/sd-ts-compiler.js.map +1 -1
- package/dist/types/build-runner.types.d.ts +2 -0
- package/dist/types/config.types.d.ts +2 -0
- package/dist/types/ts-compiler.types.d.ts +2 -0
- package/dist/types/worker.types.d.ts +1 -1
- package/dist/workers/build-runner.worker.js +1 -1
- package/dist/workers/build-runner.worker.js.map +1 -1
- package/dist/workers/server.worker.js +2 -2
- package/dist/workers/server.worker.js.map +1 -1
- package/package.json +13 -12
- package/src/entry/sd-cli-electron.ts +2 -1
- package/src/entry/sd-cli-project.ts +13 -3
- package/src/pkg-builders/client/sd-client.build-runner.ts +93 -54
- package/src/pkg-builders/client/sd-ng.bundler.ts +79 -85
- package/src/pkg-builders/client/sd-ng.plugin-creator.ts +119 -39
- package/src/pkg-builders/commons/build-runner.base.ts +78 -33
- package/src/pkg-builders/lib/sd-js-lib.build-runner.ts +24 -7
- package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts +36 -42
- package/src/pkg-builders/lib/sd-ts-lib.builder.ts +4 -0
- package/src/pkg-builders/sd-multi.build-runner.ts +137 -108
- package/src/pkg-builders/server/sd-server.build-runner.ts +10 -4
- package/src/pkg-builders/server/sd-server.bundler.ts +5 -1
- package/src/pkg-builders/server/sd-server.plugin-creator.ts +10 -5
- package/src/sd-cli-entry.ts +10 -0
- package/src/sd-cli.ts +8 -6
- package/src/ts-compiler/sd-dependency-analyzer.ts +161 -86
- package/src/ts-compiler/sd-dependency-cache.ts +118 -99
- package/src/ts-compiler/sd-style-bundler.ts +150 -0
- package/src/ts-compiler/sd-ts-compiler.ts +559 -296
- package/src/types/build-runner.types.ts +2 -0
- package/src/types/config.types.ts +3 -0
- package/src/types/ts-compiler.types.ts +15 -11
- package/src/types/worker.types.ts +7 -10
- package/src/workers/build-runner.worker.ts +9 -5
- package/src/workers/server.worker.ts +2 -2
- package/tests/deps/sd-dependency-cache.spec.ts +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import path from "path";
|
|
2
2
|
import os from "os";
|
|
3
3
|
import { JavaScriptTransformer } from "@angular/build/src/tools/esbuild/javascript-transformer";
|
|
4
|
-
import { PathUtils, SdLogger } from "@simplysm/sd-core-node";
|
|
4
|
+
import { FsUtils, PathUtils, SdLogger } from "@simplysm/sd-core-node";
|
|
5
5
|
import { SdCliPerformanceTimer } from "../../utils/sd-cli-performance-time";
|
|
6
6
|
import { SdCliConvertMessageUtils } from "../../utils/sd-cli-convert-message.utils";
|
|
7
7
|
import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
|
|
@@ -19,17 +19,20 @@ export function createSdNgPlugin(conf) {
|
|
|
19
19
|
additionalOptions: { declaration: false },
|
|
20
20
|
isDevMode: conf.dev,
|
|
21
21
|
isForBundle: true,
|
|
22
|
+
isEmitOnly: conf.emitOnly,
|
|
23
|
+
isNoEmit: conf.noEmit,
|
|
22
24
|
watchScopePathSet: conf.watchScopePathSet,
|
|
23
25
|
});
|
|
24
26
|
let tsCompileResult;
|
|
25
27
|
const outputContentsCacheMap = new Map();
|
|
26
28
|
//-- js babel transformer
|
|
27
29
|
const javascriptTransformer = new JavaScriptTransformer({
|
|
28
|
-
thirdPartySourcemaps: conf.dev,
|
|
30
|
+
thirdPartySourcemaps: false, //conf.dev,
|
|
29
31
|
sourcemap: conf.dev,
|
|
30
32
|
jit: false,
|
|
31
|
-
advancedOptimizations:
|
|
32
|
-
}, os.cpus().length);
|
|
33
|
+
advancedOptimizations: !conf.dev,
|
|
34
|
+
}, Math.floor((os.cpus().length * 2) / 3));
|
|
35
|
+
let cssStore = new Map();
|
|
33
36
|
//---------------------------
|
|
34
37
|
build.onStart(async () => {
|
|
35
38
|
perf = new SdCliPerformanceTimer("esbuild");
|
|
@@ -38,6 +41,7 @@ export function createSdNgPlugin(conf) {
|
|
|
38
41
|
outputContentsCacheMap.delete(modifiedFile);
|
|
39
42
|
}
|
|
40
43
|
tsCompileResult = await tsCompiler.compileAsync(conf.modifiedFileSet);
|
|
44
|
+
cssStore.clear();
|
|
41
45
|
conf.result.watchFileSet = tsCompileResult.watchFileSet;
|
|
42
46
|
conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
|
|
43
47
|
const tsEsbuildResult = SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
|
|
@@ -57,31 +61,74 @@ export function createSdNgPlugin(conf) {
|
|
|
57
61
|
],
|
|
58
62
|
};
|
|
59
63
|
});
|
|
60
|
-
perf.start("transform & bundling");
|
|
64
|
+
perf.start("esbuild transform & bundling");
|
|
61
65
|
return res;
|
|
62
66
|
});
|
|
67
|
+
build.onResolve({ filter: /\.css$/ }, (args) => {
|
|
68
|
+
if (args.path.startsWith("sd-css-asset:"))
|
|
69
|
+
return;
|
|
70
|
+
return {
|
|
71
|
+
path: path.resolve(args.resolveDir, args.path),
|
|
72
|
+
namespace: "sd-css",
|
|
73
|
+
};
|
|
74
|
+
});
|
|
75
|
+
build.onLoad({ filter: /\.css$/, namespace: "sd-css" }, async (args) => {
|
|
76
|
+
const code = /* language=javascript */ `
|
|
77
|
+
import href from "sd-css-asset:${PathUtils.posix(args.path)}"
|
|
78
|
+
(function __sdEnsureStyle(href) {
|
|
79
|
+
let link = document.querySelector('link[data-sd-style="' + href + '"]');
|
|
80
|
+
if (link) return;
|
|
81
|
+
link = document.createElement('link');
|
|
82
|
+
link.rel = 'stylesheet';
|
|
83
|
+
link.setAttribute('data-sd-style', href);
|
|
84
|
+
link.href = href;
|
|
85
|
+
document.head.appendChild(link);
|
|
86
|
+
})(href);`;
|
|
87
|
+
if (FsUtils.exists(args.path)) {
|
|
88
|
+
const css = await FsUtils.readFileBufferAsync(args.path);
|
|
89
|
+
cssStore.set(PathUtils.norm(args.path), css);
|
|
90
|
+
}
|
|
91
|
+
return { contents: code, loader: "js", resolveDir: path.dirname(args.path) };
|
|
92
|
+
});
|
|
93
|
+
build.onResolve({ filter: /^sd-css-asset:/ }, (args) => {
|
|
94
|
+
const real = args.path.replace(/^sd-css-asset:/, "");
|
|
95
|
+
return { path: real, namespace: "sd-css-asset" };
|
|
96
|
+
});
|
|
97
|
+
build.onLoad({ filter: /\.css$/, namespace: "sd-css-asset" }, (args) => {
|
|
98
|
+
const cssContent = cssStore.get(PathUtils.norm(args.path.replace(/[\\\/]src[\\\/]/, "\\dist\\")));
|
|
99
|
+
if (cssContent == null) {
|
|
100
|
+
return { errors: [{ text: `Missing CSS for ${PathUtils.norm(args.path)}` }] };
|
|
101
|
+
}
|
|
102
|
+
return {
|
|
103
|
+
contents: cssContent,
|
|
104
|
+
loader: "file",
|
|
105
|
+
resolveDir: path.dirname(args.path),
|
|
106
|
+
};
|
|
107
|
+
});
|
|
63
108
|
build.onLoad({ filter: /\.ts$/ }, async (args) => {
|
|
109
|
+
const emittedFiles = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path));
|
|
110
|
+
try {
|
|
111
|
+
const css = emittedFiles?.single((item) => Boolean(item.outAbsPath?.endsWith(".css")));
|
|
112
|
+
if (css) {
|
|
113
|
+
cssStore.set(PathUtils.norm(css.outAbsPath), Buffer.from(css.text));
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
catch (err) {
|
|
117
|
+
console.error(emittedFiles?.map((item) => item.outAbsPath), err);
|
|
118
|
+
return { errors: [{ text: err?.message ?? String(err) }] };
|
|
119
|
+
}
|
|
64
120
|
const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
|
|
65
121
|
if (output != null) {
|
|
66
122
|
return { contents: output, loader: "js" };
|
|
67
123
|
}
|
|
68
|
-
const
|
|
69
|
-
/*if (!emittedJsFile) {
|
|
70
|
-
return {
|
|
71
|
-
errors: [
|
|
72
|
-
{
|
|
73
|
-
text: `ts 빌더 결과 emit 파일이 존재하지 않습니다. ${args.path}`,
|
|
74
|
-
},
|
|
75
|
-
],
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
const contents = emittedJsFile.text;*/
|
|
79
|
-
const contents = emittedJsFile?.text ?? "";
|
|
124
|
+
const contents = emittedFiles?.last()?.text ?? "";
|
|
80
125
|
const { sideEffects } = await build.resolve(args.path, {
|
|
81
126
|
kind: "import-statement",
|
|
82
127
|
resolveDir: build.initialOptions.absWorkingDir ?? "",
|
|
83
128
|
});
|
|
84
|
-
const newContents = await
|
|
129
|
+
const newContents = await perf.run("esbuild transform:js:*.ts", async () => {
|
|
130
|
+
return await javascriptTransformer.transformData(args.path, contents, true, sideEffects);
|
|
131
|
+
});
|
|
85
132
|
outputContentsCacheMap.set(PathUtils.norm(args.path), newContents);
|
|
86
133
|
return { contents: newContents, loader: "js" };
|
|
87
134
|
});
|
|
@@ -96,7 +143,15 @@ export function createSdNgPlugin(conf) {
|
|
|
96
143
|
resolveDir: build.initialOptions.absWorkingDir ?? "",
|
|
97
144
|
});
|
|
98
145
|
try {
|
|
99
|
-
const newContents = await
|
|
146
|
+
const newContents = await perf.run("esbuild transform:js:*.js", async () => {
|
|
147
|
+
/*return /\.min\.[cm]?js$/.test(args.path)
|
|
148
|
+
? await FsUtils.readFileBufferAsync(args.path)
|
|
149
|
+
: await javascriptTransformer.transformFile(args.path, false, sideEffects);*/
|
|
150
|
+
const contents = await FsUtils.readFileBufferAsync(args.path);
|
|
151
|
+
return args.path.includes("node_modules") && !args.path.includes("angular")
|
|
152
|
+
? contents
|
|
153
|
+
: await javascriptTransformer.transformData(args.path, contents.toString(), false, sideEffects);
|
|
154
|
+
});
|
|
100
155
|
outputContentsCacheMap.set(PathUtils.norm(args.path), newContents);
|
|
101
156
|
return {
|
|
102
157
|
contents: newContents,
|
|
@@ -104,32 +159,38 @@ export function createSdNgPlugin(conf) {
|
|
|
104
159
|
};
|
|
105
160
|
}
|
|
106
161
|
catch (err) {
|
|
107
|
-
return {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
162
|
+
return { errors: [{ text: err?.message ?? String(err) }] };
|
|
163
|
+
/*return {
|
|
164
|
+
contents: `console.error(${JSON.stringify(err.message)});`,
|
|
165
|
+
loader: "js",
|
|
166
|
+
};*/
|
|
111
167
|
}
|
|
112
168
|
});
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}, (args) => {
|
|
169
|
+
const otherLoaderFilter = new RegExp("(" +
|
|
170
|
+
Object.keys(build.initialOptions.loader ?? {})
|
|
171
|
+
.map((ext) => "\\" + ext)
|
|
172
|
+
.join("|") +
|
|
173
|
+
")$");
|
|
174
|
+
build.onLoad({ filter: otherLoaderFilter }, (args) => {
|
|
120
175
|
conf.result.watchFileSet.add(PathUtils.norm(args.path));
|
|
121
176
|
return null;
|
|
122
177
|
});
|
|
123
178
|
build.onEnd((result) => {
|
|
124
|
-
perf.end("transform & bundling");
|
|
179
|
+
perf.end("esbuild transform & bundling");
|
|
125
180
|
debug(perf.toString());
|
|
126
181
|
for (const stylesheetBundlingResult of tsCompileResult.stylesheetBundlingResultMap.values()) {
|
|
127
182
|
if ("outputFiles" in stylesheetBundlingResult) {
|
|
128
183
|
result.outputFiles ??= [];
|
|
129
184
|
result.outputFiles.push(...stylesheetBundlingResult.outputFiles);
|
|
130
185
|
if (result.metafile) {
|
|
131
|
-
result.metafile.inputs = {
|
|
132
|
-
|
|
186
|
+
result.metafile.inputs = {
|
|
187
|
+
...result.metafile.inputs,
|
|
188
|
+
...stylesheetBundlingResult.metafile.inputs,
|
|
189
|
+
};
|
|
190
|
+
result.metafile.outputs = {
|
|
191
|
+
...result.metafile.outputs,
|
|
192
|
+
...stylesheetBundlingResult.metafile.outputs,
|
|
193
|
+
};
|
|
133
194
|
}
|
|
134
195
|
}
|
|
135
196
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-ng.plugin-creator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-ng.plugin-creator.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,yDAAyD,CAAC;AAChG,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-ng.plugin-creator.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-ng.plugin-creator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,17 +5,19 @@ import { ISdBuildMessage, ISdBuildRunnerResult } from "../../types/build.types";
|
|
|
5
5
|
import { ScopePathSet } from "./scope-path";
|
|
6
6
|
export declare abstract class BuildRunnerBase<T extends "server" | "library" | "client"> extends EventEmitter {
|
|
7
7
|
protected _pkgPath: TNormPath;
|
|
8
|
+
protected _emitOnly: boolean;
|
|
9
|
+
protected _noEmit: boolean;
|
|
8
10
|
protected abstract _logger: SdLogger;
|
|
9
11
|
protected _pkgName: string;
|
|
10
12
|
protected _pkgConf: TSdPackageConfig<T>;
|
|
11
13
|
protected _watchScopePathSet: ScopePathSet;
|
|
12
14
|
on(event: "change", listener: () => void): this;
|
|
13
15
|
on(event: "complete", listener: (result: ISdBuildRunnerResult) => void): this;
|
|
14
|
-
constructor(projConf: ISdProjectConfig, _pkgPath: TNormPath, workspaceGlobs: string[]);
|
|
16
|
+
constructor(projConf: ISdProjectConfig, _pkgPath: TNormPath, workspaceGlobs: string[], _emitOnly: boolean, _noEmit: boolean);
|
|
15
17
|
buildAsync(): Promise<ISdBuildRunnerResult>;
|
|
16
18
|
watchAsync(): Promise<void>;
|
|
17
19
|
protected _getModifiedFileSet(changeInfos: ISdFsWatcherChangeInfo[], lastWatchFileSet?: Set<TNormPath>): Set<TNormPath>;
|
|
18
|
-
protected abstract _runAsync(dev: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult>;
|
|
20
|
+
protected abstract _runAsync(dev: boolean, emitOnly: boolean, noEmit: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult>;
|
|
19
21
|
protected _debug(msg: string): void;
|
|
20
22
|
}
|
|
21
23
|
export interface IBuildRunnerRunResult {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from "events";
|
|
2
|
-
import { FsUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
2
|
+
import { FsUtils, PathUtils, SdFsWatcher, } from "@simplysm/sd-core-node";
|
|
3
3
|
import path from "path";
|
|
4
4
|
import { ScopePathSet } from "./scope-path";
|
|
5
5
|
export class BuildRunnerBase extends EventEmitter {
|
|
@@ -7,24 +7,31 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
7
7
|
super.on(event, listener);
|
|
8
8
|
return this;
|
|
9
9
|
}
|
|
10
|
-
constructor(projConf, _pkgPath, workspaceGlobs) {
|
|
10
|
+
constructor(projConf, _pkgPath, workspaceGlobs, _emitOnly, _noEmit) {
|
|
11
11
|
super();
|
|
12
12
|
this._pkgPath = _pkgPath;
|
|
13
|
+
this._emitOnly = _emitOnly;
|
|
14
|
+
this._noEmit = _noEmit;
|
|
13
15
|
this._pkgName = path.basename(_pkgPath);
|
|
14
16
|
this._pkgConf = projConf.packages[this._pkgName];
|
|
15
17
|
const workspacePaths = workspaceGlobs
|
|
16
|
-
.map((item) => PathUtils.posix(this._pkgPath, "../../", item))
|
|
18
|
+
.map((item) => PathUtils.posix(this._pkgPath, "../../", item, "src"))
|
|
17
19
|
.mapMany((item) => FsUtils.glob(item));
|
|
18
|
-
const localUpdatePaths = Object.keys(projConf.localUpdates ?? {}).mapMany((key) =>
|
|
20
|
+
const localUpdatePaths = Object.keys(projConf.localUpdates ?? {}).mapMany((key) => [
|
|
21
|
+
...FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key, "dist")),
|
|
22
|
+
...FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key, "src/**/*.scss")),
|
|
23
|
+
]);
|
|
19
24
|
this._watchScopePathSet = new ScopePathSet([...workspacePaths, ...localUpdatePaths].map((item) => PathUtils.norm(item)));
|
|
20
25
|
}
|
|
21
26
|
async buildAsync() {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
27
|
+
if (!this._noEmit) {
|
|
28
|
+
const distPath = path.resolve(this._pkgPath, "dist");
|
|
29
|
+
if (FsUtils.exists(distPath)) {
|
|
30
|
+
this._debug("dist 초기화...");
|
|
31
|
+
FsUtils.remove(distPath);
|
|
32
|
+
}
|
|
26
33
|
}
|
|
27
|
-
const result = await this._runAsync(false);
|
|
34
|
+
const result = await this._runAsync(false, false, false);
|
|
28
35
|
return {
|
|
29
36
|
affectedFilePathSet: result.affectedFileSet,
|
|
30
37
|
buildMessages: result.buildMessages,
|
|
@@ -33,12 +40,14 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
33
40
|
}
|
|
34
41
|
async watchAsync() {
|
|
35
42
|
this.emit("change");
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
43
|
+
if (!this._noEmit) {
|
|
44
|
+
const distPath = path.resolve(this._pkgPath, "dist");
|
|
45
|
+
if (FsUtils.exists(distPath)) {
|
|
46
|
+
this._debug("dist 초기화...");
|
|
47
|
+
FsUtils.remove(distPath);
|
|
48
|
+
}
|
|
40
49
|
}
|
|
41
|
-
const result = await this._runAsync(!this._pkgConf.forceProductionMode);
|
|
50
|
+
const result = await this._runAsync(!this._pkgConf.forceProductionMode, this._emitOnly, this._noEmit);
|
|
42
51
|
const res = {
|
|
43
52
|
affectedFilePathSet: result.affectedFileSet,
|
|
44
53
|
buildMessages: result.buildMessages,
|
|
@@ -48,17 +57,17 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
48
57
|
this._debug("WATCH...");
|
|
49
58
|
let lastWatchFileSet = result.watchFileSet;
|
|
50
59
|
SdFsWatcher.watch(this._watchScopePathSet.toArray(), {
|
|
51
|
-
ignore: (filePath) =>
|
|
52
|
-
|
|
53
|
-
filePath ===
|
|
54
|
-
filePath === path.resolve(this._pkgPath, "dist") ||
|
|
55
|
-
(this._pkgConf.type === "client" && filePath === path.resolve(this._pkgPath, "src", "routes.ts")) ||
|
|
60
|
+
ignore: (filePath) => (this._pkgConf.type === "client" &&
|
|
61
|
+
path.dirname(path.basename(filePath)) === "src" &&
|
|
62
|
+
path.basename(filePath) === `routes.ts`) ||
|
|
56
63
|
(this._pkgConf.type === "library" &&
|
|
57
64
|
this._pkgConf.dbContext != null &&
|
|
58
|
-
|
|
65
|
+
path.dirname(path.basename(filePath)) === "src" &&
|
|
66
|
+
path.basename(filePath) === `${this._pkgConf.dbContext}.ts`) ||
|
|
59
67
|
(this._pkgConf.type === "library" &&
|
|
60
68
|
!this._pkgConf.noGenIndex &&
|
|
61
|
-
|
|
69
|
+
path.dirname(path.basename(filePath)) === "src" &&
|
|
70
|
+
path.basename(filePath) === "index.ts"),
|
|
62
71
|
}).onChange({ delay: 100 }, async (changeInfos) => {
|
|
63
72
|
const modifiedFileSet = this._getModifiedFileSet(changeInfos, lastWatchFileSet);
|
|
64
73
|
if (modifiedFileSet.size < 1)
|
|
@@ -66,7 +75,7 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
66
75
|
this.emit("change");
|
|
67
76
|
let watchResult;
|
|
68
77
|
try {
|
|
69
|
-
watchResult = await this._runAsync(!this._pkgConf.forceProductionMode, modifiedFileSet);
|
|
78
|
+
watchResult = await this._runAsync(!this._pkgConf.forceProductionMode, this._emitOnly, this._noEmit, modifiedFileSet);
|
|
70
79
|
lastWatchFileSet = watchResult.watchFileSet;
|
|
71
80
|
}
|
|
72
81
|
catch (err) {
|
|
@@ -94,9 +103,20 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
94
103
|
});
|
|
95
104
|
}
|
|
96
105
|
_getModifiedFileSet(changeInfos, lastWatchFileSet) {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
106
|
+
if (!lastWatchFileSet) {
|
|
107
|
+
return new Set(changeInfos.map((item) => item.path));
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
return new Set(changeInfos
|
|
111
|
+
.filter((item) => Array.from(lastWatchFileSet).some((item1) => item.path.startsWith(path.dirname(item1))) ||
|
|
112
|
+
((this._pkgConf.type === "client" ||
|
|
113
|
+
(this._pkgConf.type === "library" && this._pkgConf.dbContext != null) ||
|
|
114
|
+
(this._pkgConf.type === "library" && this._pkgConf.noGenIndex)) &&
|
|
115
|
+
item.path.startsWith(path.resolve(this._pkgPath, "src")) &&
|
|
116
|
+
item.path.endsWith(".ts") &&
|
|
117
|
+
item.event === "add"))
|
|
118
|
+
.map((item) => item.path));
|
|
119
|
+
}
|
|
100
120
|
}
|
|
101
121
|
_debug(msg) {
|
|
102
122
|
this._logger.debug(`[${path.basename(this._pkgPath)}] ${msg}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-runner.base.js","sourceRoot":"","sources":["../../../src/pkg-builders/commons/build-runner.base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"build-runner.base.js","sourceRoot":"","sources":["../../../src/pkg-builders/commons/build-runner.base.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,6 @@ import { BuildRunnerBase, IBuildRunnerRunResult } from "../commons/build-runner.
|
|
|
3
3
|
export declare class SdJsLibBuildRunner extends BuildRunnerBase<"library"> {
|
|
4
4
|
#private;
|
|
5
5
|
protected _logger: SdLogger;
|
|
6
|
-
protected _runAsync(dev: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult>;
|
|
6
|
+
protected _runAsync(dev: boolean, emitOnly: boolean, noEmit: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult>;
|
|
7
7
|
protected _getModifiedFileSet(changeInfos: ISdFsWatcherChangeInfo[]): Set<TNormPath>;
|
|
8
8
|
}
|
|
@@ -9,8 +9,16 @@ export class SdJsLibBuildRunner extends BuildRunnerBase {
|
|
|
9
9
|
super(...arguments);
|
|
10
10
|
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdJsLibBuildRunner"]);
|
|
11
11
|
}
|
|
12
|
-
async _runAsync(dev, modifiedFileSet) {
|
|
13
|
-
|
|
12
|
+
async _runAsync(dev, emitOnly, noEmit, modifiedFileSet) {
|
|
13
|
+
if (emitOnly) {
|
|
14
|
+
return {
|
|
15
|
+
affectedFileSet: new Set(),
|
|
16
|
+
buildMessages: [],
|
|
17
|
+
emitFileSet: new Set(),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
const filePathSet = modifiedFileSet ??
|
|
21
|
+
new Set(FsUtils.glob(path.resolve(this._pkgPath, "src/**/*.js")).map((item) => PathUtils.norm(item)));
|
|
14
22
|
this._debug("LINT...");
|
|
15
23
|
const lintResults = await this.#lintAsync(filePathSet);
|
|
16
24
|
const messages = SdCliConvertMessageUtils.convertToBuildMessagesFromEslint(lintResults);
|
|
@@ -22,8 +30,10 @@ export class SdJsLibBuildRunner extends BuildRunnerBase {
|
|
|
22
30
|
};
|
|
23
31
|
}
|
|
24
32
|
_getModifiedFileSet(changeInfos) {
|
|
25
|
-
return new Set(changeInfos
|
|
26
|
-
|
|
33
|
+
return new Set(changeInfos
|
|
34
|
+
.filter((item) => FsUtils.exists(item.path) &&
|
|
35
|
+
PathUtils.isChildPath(item.path, path.resolve(this._pkgPath, "src")))
|
|
36
|
+
.map((item) => item.path));
|
|
27
37
|
}
|
|
28
38
|
async #lintAsync(fileSet) {
|
|
29
39
|
const lintFilePaths = Array.from(fileSet)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-js-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-js-lib.build-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,SAAS,EACT,QAAQ,GAET,MAAM,wBAAwB,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,gEAAgE;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAyB,MAAM,8BAA8B,CAAC;AAEtF,MAAM,OAAO,kBAAmB,SAAQ,eAA0B;IAAlE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-js-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-js-lib.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,5 @@ import { BuildRunnerBase, IBuildRunnerRunResult } from "../commons/build-runner.
|
|
|
3
3
|
export declare class SdTsLibBuildRunner extends BuildRunnerBase<"library"> {
|
|
4
4
|
#private;
|
|
5
5
|
protected _logger: SdLogger;
|
|
6
|
-
protected _runAsync(dev: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult>;
|
|
6
|
+
protected _runAsync(dev: boolean, emitOnly: boolean, noEmit: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult>;
|
|
7
7
|
}
|
|
@@ -17,55 +17,36 @@ export class SdTsLibBuildRunner extends BuildRunnerBase {
|
|
|
17
17
|
#builder;
|
|
18
18
|
#hasGenIndexError;
|
|
19
19
|
#hasGenDbContextError;
|
|
20
|
-
async _runAsync(dev, modifiedFileSet) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
this._debug("GEN index.ts...");
|
|
25
|
-
this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
if (this._pkgConf.dbContext != null) {
|
|
29
|
-
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
30
|
-
this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
31
|
-
}
|
|
32
|
-
} else {
|
|
20
|
+
async _runAsync(dev, emitOnly, noEmit, modifiedFileSet) {
|
|
21
|
+
let indexFileNPath;
|
|
22
|
+
let dbContentFileNPath;
|
|
23
|
+
if (!noEmit) {
|
|
33
24
|
if (!this._pkgConf.noGenIndex) {
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
this._debug("GEN index.ts...");
|
|
26
|
+
const genIndexResult = this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
27
|
+
if (modifiedFileSet && (genIndexResult.changed || this.#hasGenIndexError)) {
|
|
28
|
+
modifiedFileSet.add(PathUtils.norm(genIndexResult.filePath));
|
|
29
|
+
}
|
|
30
|
+
indexFileNPath = PathUtils.norm(genIndexResult.filePath);
|
|
36
31
|
}
|
|
37
|
-
|
|
38
32
|
if (this._pkgConf.dbContext != null) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
if (!this._pkgConf.noGenIndex) {
|
|
46
|
-
this._debug("GEN index.ts...");
|
|
47
|
-
const genIndexResult = this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
48
|
-
if (modifiedFileSet && (genIndexResult.changed || this.#hasGenIndexError)) {
|
|
49
|
-
modifiedFileSet.add(PathUtils.norm(genIndexResult.filePath));
|
|
50
|
-
}
|
|
51
|
-
indexFileNPath = PathUtils.norm(genIndexResult.filePath);
|
|
52
|
-
}
|
|
53
|
-
let dbContentFileNPath;
|
|
54
|
-
if (this._pkgConf.dbContext != null) {
|
|
55
|
-
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
56
|
-
const genDbContextResult = this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
57
|
-
if (modifiedFileSet && (genDbContextResult.changed || this.#hasGenDbContextError)) {
|
|
58
|
-
modifiedFileSet.add(PathUtils.norm(genDbContextResult.filePath));
|
|
33
|
+
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
34
|
+
const genDbContextResult = this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
35
|
+
if (modifiedFileSet && (genDbContextResult.changed || this.#hasGenDbContextError)) {
|
|
36
|
+
modifiedFileSet.add(PathUtils.norm(genDbContextResult.filePath));
|
|
37
|
+
}
|
|
38
|
+
dbContentFileNPath = PathUtils.norm(genDbContextResult.filePath);
|
|
59
39
|
}
|
|
60
|
-
dbContentFileNPath = PathUtils.norm(genDbContextResult.filePath);
|
|
61
40
|
}
|
|
62
41
|
this._debug(`BUILD...`);
|
|
63
|
-
this.#builder ??= new SdTsLibBuilder(PathUtils.norm(this._pkgPath), dev, this._watchScopePathSet);
|
|
42
|
+
this.#builder ??= new SdTsLibBuilder(PathUtils.norm(this._pkgPath), dev, emitOnly, noEmit, this._watchScopePathSet);
|
|
64
43
|
const buildResult = await this.#builder.buildAsync(modifiedFileSet ?? new Set());
|
|
65
44
|
this.#hasGenIndexError =
|
|
66
|
-
indexFileNPath != null &&
|
|
45
|
+
indexFileNPath != null &&
|
|
46
|
+
buildResult.results.map((item) => item.filePath).includes(indexFileNPath);
|
|
67
47
|
this.#hasGenDbContextError =
|
|
68
|
-
dbContentFileNPath != null &&
|
|
48
|
+
dbContentFileNPath != null &&
|
|
49
|
+
buildResult.results.map((item) => item.filePath).includes(dbContentFileNPath);
|
|
69
50
|
this._debug(`빌드 완료`);
|
|
70
51
|
const watchFileSet = new Set(Array.from(buildResult.watchFileSet).filter((item) => this._watchScopePathSet.inScope(item)));
|
|
71
52
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-ts-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.build-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAyB,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEjF,MAAM,OAAO,kBAAmB,SAAQ,eAA0B;IAAlE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC;QAExF,wBAAmB,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACpD,wBAAmB,GAAG,IAAI,2BAA2B,EAAE,CAAC;QAGxD,sBAAiB,GAAG,KAAK,CAAC;QAC1B,0BAAqB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-ts-lib.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { ScopePathSet } from "../commons/scope-path";
|
|
|
4
4
|
export declare class SdTsLibBuilder {
|
|
5
5
|
#private;
|
|
6
6
|
private readonly _pkgPath;
|
|
7
|
-
constructor(_pkgPath: TNormPath, dev: boolean, watchScopePathSet: ScopePathSet);
|
|
7
|
+
constructor(_pkgPath: TNormPath, dev: boolean, emitOnly: boolean, noEmit: boolean, watchScopePathSet: ScopePathSet);
|
|
8
8
|
buildAsync(modifiedFileSet: Set<TNormPath>): Promise<{
|
|
9
9
|
watchFileSet: Set<TNormPath>;
|
|
10
10
|
affectedFileSet: Set<TNormPath>;
|
|
@@ -5,12 +5,14 @@ import { SdTsCompiler } from "../../ts-compiler/sd-ts-compiler";
|
|
|
5
5
|
export class SdTsLibBuilder {
|
|
6
6
|
#tsCompiler;
|
|
7
7
|
#outputHashCache = new Map();
|
|
8
|
-
constructor(_pkgPath, dev, watchScopePathSet) {
|
|
8
|
+
constructor(_pkgPath, dev, emitOnly, noEmit, watchScopePathSet) {
|
|
9
9
|
this._pkgPath = _pkgPath;
|
|
10
10
|
this.#tsCompiler = new SdTsCompiler({
|
|
11
11
|
pkgPath: this._pkgPath,
|
|
12
12
|
additionalOptions: { declaration: true },
|
|
13
13
|
isDevMode: dev,
|
|
14
|
+
isEmitOnly: emitOnly,
|
|
15
|
+
isNoEmit: noEmit,
|
|
14
16
|
globalStyleFilePath: PathUtils.norm(this._pkgPath, "src/styles.scss"),
|
|
15
17
|
isForBundle: false,
|
|
16
18
|
watchScopePathSet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-ts-lib.builder.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.builder.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAa,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,MAAM,OAAO,cAAc;IACzB,WAAW,CAAe;IAC1B,gBAAgB,GAAG,IAAI,GAAG,EAAqB,CAAC;IAEhD,YACmB,QAAmB,EACpC,GAAY,EACZ,iBAA+B;
|
|
1
|
+
{"version":3,"file":"sd-ts-lib.builder.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-ts-lib.builder.ts"],"names":[],"mappings":"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"}
|