@simplysm/sd-cli 12.13.19 → 12.13.21
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/pkg-builders/client/sd-cli-ng-routes.file-generator.d.ts +1 -0
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js +16 -11
- package/dist/pkg-builders/client/sd-cli-ng-routes.file-generator.js.map +1 -1
- package/dist/pkg-builders/client/sd-client.build-runner.js +7 -17
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -1
- package/dist/pkg-builders/client/sd-ng.bundler.js +105 -95
- package/dist/pkg-builders/client/sd-ng.bundler.js.map +1 -1
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js +68 -57
- package/dist/pkg-builders/client/sd-ng.plugin-creator.js.map +1 -1
- package/dist/pkg-builders/commons/build-runner.base.d.ts +2 -1
- package/dist/pkg-builders/commons/build-runner.base.js +16 -27
- package/dist/pkg-builders/commons/build-runner.base.js.map +1 -1
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.d.ts +1 -0
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.js +21 -11
- package/dist/pkg-builders/lib/sd-cli-db-context.file-generator.js.map +1 -1
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.d.ts +1 -0
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js +13 -10
- package/dist/pkg-builders/lib/sd-cli-index.file-generator.js.map +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js +11 -30
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -1
- package/dist/pkg-builders/server/sd-server.bundler.js +48 -37
- package/dist/pkg-builders/server/sd-server.bundler.js.map +1 -1
- package/dist/ts-compiler/sd-ts-compiler.js +116 -222
- package/dist/ts-compiler/sd-ts-compiler.js.map +1 -1
- package/package.json +5 -5
- package/src/pkg-builders/client/sd-cli-ng-routes.file-generator.ts +18 -8
- package/src/pkg-builders/client/sd-client.build-runner.ts +8 -19
- package/src/pkg-builders/client/sd-ng.bundler.ts +139 -121
- package/src/pkg-builders/client/sd-ng.plugin-creator.ts +22 -17
- package/src/pkg-builders/commons/build-runner.base.ts +62 -75
- package/src/pkg-builders/lib/sd-cli-db-context.file-generator.ts +20 -8
- package/src/pkg-builders/lib/sd-cli-index.file-generator.ts +20 -9
- package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts +11 -31
- package/src/pkg-builders/server/sd-server.bundler.ts +59 -48
- package/src/ts-compiler/sd-ts-compiler.ts +19 -160
|
@@ -32,7 +32,7 @@ export function createSdNgPlugin(conf) {
|
|
|
32
32
|
jit: false,
|
|
33
33
|
advancedOptimizations: !conf.dev,
|
|
34
34
|
}, Math.floor((os.cpus().length * 2) / 3));
|
|
35
|
-
let cssStore = new Map();
|
|
35
|
+
// let cssStore = new Map<TNormPath, Buffer>();
|
|
36
36
|
//---------------------------
|
|
37
37
|
build.onStart(async () => {
|
|
38
38
|
perf = new SdCliPerformanceTimer("esbuild");
|
|
@@ -41,7 +41,7 @@ export function createSdNgPlugin(conf) {
|
|
|
41
41
|
outputContentsCacheMap.delete(modifiedFile);
|
|
42
42
|
}
|
|
43
43
|
tsCompileResult = await tsCompiler.compileAsync(conf.modifiedFileSet);
|
|
44
|
-
cssStore.clear();
|
|
44
|
+
// cssStore.clear();
|
|
45
45
|
conf.result.watchFileSet = tsCompileResult.watchFileSet;
|
|
46
46
|
conf.result.affectedFileSet = tsCompileResult.affectedFileSet;
|
|
47
47
|
const tsEsbuildResult = SdCliConvertMessageUtils.convertToEsbuildFromBuildMessages(tsCompileResult.messages, conf.pkgPath);
|
|
@@ -64,67 +64,80 @@ export function createSdNgPlugin(conf) {
|
|
|
64
64
|
perf.start("esbuild transform & bundling");
|
|
65
65
|
return res;
|
|
66
66
|
});
|
|
67
|
-
build.onResolve({ filter: /\.css$/ }, (args) => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
};
|
|
67
|
+
/*build.onResolve({ filter: /\.css$/ }, (args) => {
|
|
68
|
+
if (args.path.startsWith("sd-css-asset:")) return;
|
|
69
|
+
return {
|
|
70
|
+
path: path.resolve(args.resolveDir, args.path),
|
|
71
|
+
namespace: "sd-css",
|
|
72
|
+
};
|
|
74
73
|
});
|
|
74
|
+
|
|
75
75
|
build.onLoad({ filter: /\.css$/, namespace: "sd-css" }, async (args) => {
|
|
76
|
-
|
|
77
|
-
import href from "sd-css-asset:${PathUtils.posix(args.path)}"
|
|
78
|
-
(function __sdEnsureStyle(href) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
})(href);`;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
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
|
+
|
|
88
|
+
if (FsUtils.exists(args.path)) {
|
|
89
|
+
const css = await FsUtils.readFileBufferAsync(args.path);
|
|
90
|
+
cssStore.set(PathUtils.norm(args.path), css);
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
return { contents: code, loader: "js", resolveDir: path.dirname(args.path) };
|
|
92
94
|
});
|
|
95
|
+
|
|
93
96
|
build.onResolve({ filter: /^sd-css-asset:/ }, (args) => {
|
|
94
|
-
|
|
95
|
-
|
|
97
|
+
const real = args.path.replace(/^sd-css-asset:/, "");
|
|
98
|
+
return { path: real, namespace: "sd-css-asset" };
|
|
96
99
|
});
|
|
100
|
+
|
|
97
101
|
build.onLoad({ filter: /\.css$/, namespace: "sd-css-asset" }, (args) => {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
102
|
+
const cssContent =
|
|
103
|
+
cssStore.get(PathUtils.norm(args.path)) ??
|
|
104
|
+
cssStore.get(PathUtils.norm(args.path.replace(/[\\\/]src[\\\/]/, "\\dist\\")));
|
|
105
|
+
if (cssContent == null) {
|
|
103
106
|
return {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
+
errors: [
|
|
108
|
+
{
|
|
109
|
+
location: null,
|
|
110
|
+
text: `Missing CSS for ${PathUtils.norm(args.path)}`,
|
|
111
|
+
},
|
|
112
|
+
],
|
|
107
113
|
};
|
|
108
|
-
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
return {
|
|
117
|
+
contents: cssContent,
|
|
118
|
+
loader: "file",
|
|
119
|
+
resolveDir: path.dirname(args.path),
|
|
120
|
+
};
|
|
121
|
+
});*/
|
|
109
122
|
build.onLoad({ filter: /\.ts$/ }, async (args) => {
|
|
110
123
|
const emittedFiles = tsCompileResult.emittedFilesCacheMap.get(PathUtils.norm(args.path));
|
|
111
|
-
try {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
}
|
|
124
|
+
/*try {
|
|
125
|
+
const css = emittedFiles?.single((item) => Boolean(item.outAbsPath?.endsWith(".css")));
|
|
126
|
+
if (css) {
|
|
127
|
+
cssStore.set(PathUtils.norm(css.outAbsPath!), Buffer.from(css.text));
|
|
128
|
+
}
|
|
129
|
+
} catch (err) {
|
|
130
|
+
return {
|
|
131
|
+
errors: [
|
|
132
|
+
{
|
|
133
|
+
text:
|
|
134
|
+
(err?.message ?? String(err)) +
|
|
135
|
+
"\n" +
|
|
136
|
+
emittedFiles?.map((item) => "- " + item.outAbsPath).join("\n"),
|
|
137
|
+
},
|
|
138
|
+
],
|
|
139
|
+
};
|
|
140
|
+
}*/
|
|
128
141
|
const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
|
|
129
142
|
if (output != null) {
|
|
130
143
|
return { contents: output, loader: "js" };
|
|
@@ -140,7 +153,7 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
|
|
|
140
153
|
outputContentsCacheMap.set(PathUtils.norm(args.path), newContents);
|
|
141
154
|
return { contents: newContents, loader: "js" };
|
|
142
155
|
});
|
|
143
|
-
build.onLoad({ filter: /\.
|
|
156
|
+
build.onLoad({ filter: /\.mjs$/ }, async (args) => {
|
|
144
157
|
conf.result.watchFileSet.add(PathUtils.norm(args.path));
|
|
145
158
|
const output = outputContentsCacheMap.get(PathUtils.norm(args.path));
|
|
146
159
|
if (output != null) {
|
|
@@ -156,9 +169,7 @@ import href from "sd-css-asset:${PathUtils.posix(args.path)}"
|
|
|
156
169
|
? await FsUtils.readFileBufferAsync(args.path)
|
|
157
170
|
: await javascriptTransformer.transformFile(args.path, false, sideEffects);*/
|
|
158
171
|
const contents = await FsUtils.readFileBufferAsync(args.path);
|
|
159
|
-
return args.path.
|
|
160
|
-
? contents
|
|
161
|
-
: await javascriptTransformer.transformData(args.path, contents.toString(), false, sideEffects);
|
|
172
|
+
return await javascriptTransformer.transformData(args.path, contents.toString(), false, sideEffects);
|
|
162
173
|
});
|
|
163
174
|
outputContentsCacheMap.set(PathUtils.norm(args.path), newContents);
|
|
164
175
|
return {
|
|
@@ -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,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AAGpF,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,MAAM,UAAU,gBAAgB,CAAC,IAQhC;IACC,IAAI,IAA2B,CAAC;IAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAExE,MAAM,KAAK,GAAG,CAAC,GAAG,GAAU,EAAE,EAAE;QAC9B,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,CAAC;IAC3D,CAAC,CAAC;IAEF,OAAO;QACL,IAAI,EAAE,eAAe;QACrB,KAAK,EAAE,CAAC,KAA0B,EAAE,EAAE;YACpC,MAAM,UAAU,GAAG,IAAI,YAAY,CAAC;gBAClC,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,iBAAiB,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE;gBACzC,SAAS,EAAE,IAAI,CAAC,GAAG;gBACnB,WAAW,EAAE,IAAI;gBACjB,UAAU,EAAE,IAAI,CAAC,QAAQ;gBACzB,QAAQ,EAAE,IAAI,CAAC,MAAM;gBACrB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;aAC1C,CAAC,CAAC;YAEH,IAAI,eAAoC,CAAC;YACzC,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAyB,CAAC;YAEhE,yBAAyB;YACzB,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CACrD;gBACE,oBAAoB,EAAE,IAAI,CAAC,GAAG;gBAC9B,SAAS,EAAE,IAAI,CAAC,GAAG;gBACnB,GAAG,EAAE,KAAK;gBACV,qBAAqB,EAAE,CAAC,IAAI,CAAC,GAAG;aACjC,EACD,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CACvC,CAAC;YAEF
|
|
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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"}
|
|
@@ -4,6 +4,7 @@ import { ISdProjectConfig, TSdPackageConfig } from "../../types/config.types";
|
|
|
4
4
|
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
|
+
protected _projConf: ISdProjectConfig;
|
|
7
8
|
protected _pkgPath: TNormPath;
|
|
8
9
|
protected _emitOnly: boolean;
|
|
9
10
|
protected _noEmit: boolean;
|
|
@@ -13,7 +14,7 @@ export declare abstract class BuildRunnerBase<T extends "server" | "library" | "
|
|
|
13
14
|
protected _watchScopePathSet: ScopePathSet;
|
|
14
15
|
on(event: "change", listener: () => void): this;
|
|
15
16
|
on(event: "complete", listener: (result: ISdBuildRunnerResult) => void): this;
|
|
16
|
-
constructor(
|
|
17
|
+
constructor(_projConf: ISdProjectConfig, _pkgPath: TNormPath, workspaceGlobs: string[], _emitOnly: boolean, _noEmit: boolean);
|
|
17
18
|
buildAsync(): Promise<ISdBuildRunnerResult>;
|
|
18
19
|
watchAsync(): Promise<void>;
|
|
19
20
|
protected _getModifiedFileSet(changeInfos: ISdFsWatcherChangeInfo[], lastWatchFileSet?: Set<TNormPath>): Set<TNormPath>;
|
|
@@ -7,17 +7,22 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
7
7
|
super.on(event, listener);
|
|
8
8
|
return this;
|
|
9
9
|
}
|
|
10
|
-
constructor(
|
|
10
|
+
constructor(_projConf, _pkgPath, workspaceGlobs, _emitOnly, _noEmit) {
|
|
11
11
|
super();
|
|
12
|
+
this._projConf = _projConf;
|
|
12
13
|
this._pkgPath = _pkgPath;
|
|
13
14
|
this._emitOnly = _emitOnly;
|
|
14
15
|
this._noEmit = _noEmit;
|
|
15
16
|
this._pkgName = path.basename(_pkgPath);
|
|
16
|
-
this._pkgConf =
|
|
17
|
+
this._pkgConf = _projConf.packages[this._pkgName];
|
|
17
18
|
const workspacePaths = workspaceGlobs
|
|
18
|
-
.
|
|
19
|
+
.mapMany((item) => [
|
|
20
|
+
PathUtils.posix(this._pkgPath, "../../", item, "src"),
|
|
21
|
+
PathUtils.posix(this._pkgPath, "../../", item, "public"),
|
|
22
|
+
PathUtils.posix(this._pkgPath, "../../", item, "public-dev"),
|
|
23
|
+
])
|
|
19
24
|
.mapMany((item) => FsUtils.glob(item));
|
|
20
|
-
const localUpdatePaths = Object.keys(
|
|
25
|
+
const localUpdatePaths = Object.keys(_projConf.localUpdates ?? {}).mapMany((key) => [
|
|
21
26
|
...FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key, "dist")),
|
|
22
27
|
...FsUtils.glob(path.resolve(this._pkgPath, "../../node_modules", key, "src/**/*.scss")),
|
|
23
28
|
]);
|
|
@@ -56,19 +61,7 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
56
61
|
this.emit("complete", res);
|
|
57
62
|
this._debug("WATCH...");
|
|
58
63
|
let lastWatchFileSet = result.watchFileSet;
|
|
59
|
-
SdFsWatcher.watch(this._watchScopePathSet.toArray(), {
|
|
60
|
-
ignore: (filePath) => (this._pkgConf.type === "client" &&
|
|
61
|
-
path.dirname(path.basename(filePath)) === "src" &&
|
|
62
|
-
path.basename(filePath) === `routes.ts`) ||
|
|
63
|
-
(this._pkgConf.type === "library" &&
|
|
64
|
-
this._pkgConf.dbContext != null &&
|
|
65
|
-
path.dirname(path.basename(filePath)) === "src" &&
|
|
66
|
-
path.basename(filePath) === `${this._pkgConf.dbContext}.ts`) ||
|
|
67
|
-
(this._pkgConf.type === "library" &&
|
|
68
|
-
!this._pkgConf.noGenIndex &&
|
|
69
|
-
path.dirname(path.basename(filePath)) === "src" &&
|
|
70
|
-
path.basename(filePath) === "index.ts"),
|
|
71
|
-
}).onChange({ delay: 100 }, async (changeInfos) => {
|
|
64
|
+
SdFsWatcher.watch(this._watchScopePathSet.toArray()).onChange({ delay: 300 }, async (changeInfos) => {
|
|
72
65
|
const modifiedFileSet = this._getModifiedFileSet(changeInfos, lastWatchFileSet);
|
|
73
66
|
if (modifiedFileSet.size < 1)
|
|
74
67
|
return;
|
|
@@ -103,20 +96,16 @@ export class BuildRunnerBase extends EventEmitter {
|
|
|
103
96
|
});
|
|
104
97
|
}
|
|
105
98
|
_getModifiedFileSet(changeInfos, lastWatchFileSet) {
|
|
99
|
+
let arr;
|
|
106
100
|
if (!lastWatchFileSet) {
|
|
107
|
-
|
|
101
|
+
arr = changeInfos.map((item) => item.path);
|
|
108
102
|
}
|
|
109
103
|
else {
|
|
110
|
-
|
|
111
|
-
.filter((item) => Array.from(lastWatchFileSet).some((item1) => item.path.startsWith(path.dirname(item1)))
|
|
112
|
-
((
|
|
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));
|
|
104
|
+
arr = changeInfos
|
|
105
|
+
.filter((item) => Array.from(lastWatchFileSet).some((item1) => item.path.startsWith(path.dirname(item1))))
|
|
106
|
+
.map((item) => item.path);
|
|
119
107
|
}
|
|
108
|
+
return new Set(arr);
|
|
120
109
|
}
|
|
121
110
|
_debug(msg) {
|
|
122
111
|
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,EACL,OAAO,EAEP,SAAS,EACT,WAAW,GAGZ,MAAM,wBAAwB,CAAC;AAGhC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,OAAgB,eAEpB,SAAQ,YAAY;IAUX,EAAE,CAAC,KAAsB,EAAE,QAAkC;QACpE,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"build-runner.base.js","sourceRoot":"","sources":["../../../src/pkg-builders/commons/build-runner.base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,20 @@
|
|
|
1
|
-
import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
|
|
1
|
+
import { FsUtils, HashUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
import { StringUtils } from "@simplysm/sd-core-common";
|
|
4
4
|
export class SdCliDbContextFileGenerator {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
watch(pkgPath, kebabName) {
|
|
6
|
+
const targetFilePath = path.resolve(pkgPath, `src/${kebabName}.ts`);
|
|
7
|
+
this.cachedHash = FsUtils.exists(targetFilePath)
|
|
8
|
+
? HashUtils.get(FsUtils.readFile(targetFilePath))
|
|
9
|
+
: undefined;
|
|
10
|
+
SdFsWatcher.watch([path.resolve(pkgPath, "src")], {
|
|
11
|
+
ignored: [targetFilePath],
|
|
12
|
+
}).onChange({ delay: 50 }, (changeInfos) => {
|
|
13
|
+
if (changeInfos.some((item) => ["add", "addDir", "unlink", "unlinkDir"].includes(item.event)))
|
|
14
|
+
this.run(pkgPath, kebabName);
|
|
15
|
+
});
|
|
10
16
|
this.run(pkgPath, kebabName);
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
this.run(pkgPath, kebabName);
|
|
14
|
-
}*/
|
|
17
|
+
}
|
|
15
18
|
run(pkgPath, kebabName) {
|
|
16
19
|
const npmConfig = FsUtils.readJson(path.resolve(pkgPath, "package.json"));
|
|
17
20
|
const useExt = npmConfig.dependencies?.["@simplysm/sd-orm-common-ext"] != null;
|
|
@@ -52,7 +55,14 @@ export class SdCliDbContextFileGenerator {
|
|
|
52
55
|
const className = fileName.includes("_") ? fileName : StringUtils.toPascalCase(fileName);
|
|
53
56
|
importTexts.push(`import { ${className} } from "./${requirePath}";`);
|
|
54
57
|
if (useExt &&
|
|
55
|
-
[
|
|
58
|
+
[
|
|
59
|
+
"systemDataLog",
|
|
60
|
+
"systemLog",
|
|
61
|
+
"authentication",
|
|
62
|
+
"user",
|
|
63
|
+
"userConfig",
|
|
64
|
+
"userPermission",
|
|
65
|
+
].includes(varName)) {
|
|
56
66
|
modelTexts.push(`override ${varName} = new Queryable(this, ${className})`);
|
|
57
67
|
}
|
|
58
68
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-db-context.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-db-context.file-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-cli-db-context.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-db-context.file-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
|
-
import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
|
|
1
|
+
import { FsUtils, HashUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
2
2
|
import path from "path";
|
|
3
3
|
export class SdCliIndexFileGenerator {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
watch(pkgPath, polyfills) {
|
|
5
|
+
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
6
|
+
this.cachedHash = FsUtils.exists(indexFilePath)
|
|
7
|
+
? HashUtils.get(FsUtils.readFile(indexFilePath))
|
|
8
|
+
: undefined;
|
|
9
|
+
SdFsWatcher.watch([path.resolve(pkgPath, "src")], {
|
|
10
|
+
ignored: [indexFilePath],
|
|
11
|
+
}).onChange({ delay: 50 }, (changeInfos) => {
|
|
12
|
+
if (changeInfos.some((item) => ["add", "addDir", "unlink", "unlinkDir"].includes(item.event)))
|
|
13
|
+
this.run(pkgPath, polyfills);
|
|
14
|
+
});
|
|
9
15
|
this.run(pkgPath, polyfills);
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
this.run(pkgPath, polyfills);
|
|
13
|
-
}*/
|
|
16
|
+
}
|
|
14
17
|
run(pkgPath, polyfills) {
|
|
15
18
|
const indexFilePath = path.resolve(pkgPath, "src/index.ts");
|
|
16
19
|
const importTexts = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-cli-index.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-index.file-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-cli-index.file-generator.js","sourceRoot":"","sources":["../../../src/pkg-builders/lib/sd-cli-index.file-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,46 +7,27 @@ export class SdTsLibBuildRunner extends BuildRunnerBase {
|
|
|
7
7
|
constructor() {
|
|
8
8
|
super(...arguments);
|
|
9
9
|
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdTsLibBuildRunner"]);
|
|
10
|
-
this.#indexFileGenerator = new SdCliIndexFileGenerator();
|
|
11
|
-
this.#dbContextGenerator = new SdCliDbContextFileGenerator();
|
|
12
|
-
this.#hasGenIndexError = false;
|
|
13
|
-
this.#hasGenDbContextError = false;
|
|
14
10
|
}
|
|
15
|
-
#indexFileGenerator;
|
|
16
|
-
#dbContextGenerator;
|
|
17
11
|
#builder;
|
|
18
|
-
#hasGenIndexError;
|
|
19
|
-
#hasGenDbContextError;
|
|
20
12
|
async _runAsync(dev, emitOnly, noEmit, modifiedFileSet) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
this.
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
modifiedFileSet.add(PathUtils.norm(genIndexResult.filePath));
|
|
13
|
+
// 최초한번
|
|
14
|
+
if (!modifiedFileSet) {
|
|
15
|
+
if (!noEmit) {
|
|
16
|
+
// index
|
|
17
|
+
if (!this._pkgConf.noGenIndex) {
|
|
18
|
+
this._debug("GEN index.ts...");
|
|
19
|
+
new SdCliIndexFileGenerator().watch(this._pkgPath, this._pkgConf.polyfills);
|
|
29
20
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
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));
|
|
21
|
+
// db-context
|
|
22
|
+
if (this._pkgConf.dbContext != null) {
|
|
23
|
+
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
24
|
+
new SdCliDbContextFileGenerator().watch(this._pkgPath, this._pkgConf.dbContext);
|
|
37
25
|
}
|
|
38
|
-
dbContentFileNPath = PathUtils.norm(genDbContextResult.filePath);
|
|
39
26
|
}
|
|
40
27
|
}
|
|
41
28
|
this._debug(`BUILD...`);
|
|
42
29
|
this.#builder ??= new SdTsLibBuilder(PathUtils.norm(this._pkgPath), dev, emitOnly, noEmit, this._watchScopePathSet);
|
|
43
30
|
const buildResult = await this.#builder.buildAsync(modifiedFileSet ?? new Set());
|
|
44
|
-
this.#hasGenIndexError =
|
|
45
|
-
indexFileNPath != null &&
|
|
46
|
-
buildResult.results.map((item) => item.filePath).includes(indexFileNPath);
|
|
47
|
-
this.#hasGenDbContextError =
|
|
48
|
-
dbContentFileNPath != null &&
|
|
49
|
-
buildResult.results.map((item) => item.filePath).includes(dbContentFileNPath);
|
|
50
31
|
this._debug(`빌드 완료`);
|
|
51
32
|
const watchFileSet = new Set(Array.from(buildResult.watchFileSet).filter((item) => this._watchScopePathSet.inScope(item)));
|
|
52
33
|
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;
|
|
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;IAiD1F,CAAC;IA/CC,QAAQ,CAAkB;IAEP,KAAK,CAAC,SAAS,CAChC,GAAY,EACZ,QAAiB,EACjB,MAAe,EACf,eAAgC;QAEhC,OAAO;QACP,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,QAAQ;gBACR,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;oBAC9B,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;oBAC/B,IAAI,uBAAuB,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAC9E,CAAC;gBAED,aAAa;gBACb,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;oBACpC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,QAAQ,CAAC,CAAC;oBACpD,IAAI,2BAA2B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAClF,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,QAAQ,KAAK,IAAI,cAAc,CAClC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC7B,GAAG,EACH,QAAQ,EACR,MAAM,EACN,IAAI,CAAC,kBAAkB,CACxB,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;QAEjF,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,MAAM,YAAY,GAAG,IAAI,GAAG,CAC1B,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAC7F,CAAC;QAEF,OAAO;YACL,YAAY;YACZ,eAAe,EAAE,WAAW,CAAC,eAAe;YAC5C,aAAa,EAAE,WAAW,CAAC,OAAO;YAClC,WAAW,EAAE,WAAW,CAAC,WAAW;SACrC,CAAC;IACJ,CAAC;CACF"}
|