@simplysm/sd-cli 12.13.20 → 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/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/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/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
|
@@ -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"}
|
|
@@ -93,50 +93,61 @@ const __dirname = __path__.dirname(__filename);`.trim(),
|
|
|
93
93
|
],
|
|
94
94
|
});
|
|
95
95
|
}
|
|
96
|
-
const emitFileSet = new Set();
|
|
97
96
|
let result;
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
97
|
+
result = await this.#context.rebuild();
|
|
98
|
+
if (this._opt.noEmit) {
|
|
99
|
+
return {
|
|
100
|
+
watchFileSet: this.#resultCache.watchFileSet,
|
|
101
|
+
affectedFileSet: this.#resultCache.affectedFileSet,
|
|
102
|
+
results: [],
|
|
103
|
+
emitFileSet: new Set(),
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
const emitFileSet = new Set();
|
|
108
|
+
try {
|
|
109
|
+
const outputFiles = result.outputFiles?.map((file) => convertOutputFile(file, BuildOutputFileType.Root)) ??
|
|
110
|
+
[];
|
|
111
|
+
for (const outputFile of outputFiles) {
|
|
112
|
+
const distFilePath = PathUtils.norm(this._opt.pkgPath, outputFile.path);
|
|
113
|
+
const prevHash = this.#outputHashCache.get(distFilePath);
|
|
114
|
+
const currHash = HashUtils.get(Buffer.from(outputFile.contents));
|
|
115
|
+
if (prevHash !== currHash) {
|
|
116
|
+
FsUtils.writeFile(distFilePath, outputFile.contents);
|
|
117
|
+
this.#outputHashCache.set(distFilePath, currHash);
|
|
118
|
+
emitFileSet.add(distFilePath);
|
|
119
|
+
}
|
|
109
120
|
}
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
121
|
+
//-- copy assets
|
|
122
|
+
const assetFiles = await resolveAssets([
|
|
123
|
+
{ input: "public", glob: "**/*", output: "." },
|
|
124
|
+
...(this._opt.dev ? [{ input: "public-dev", glob: "**/*", output: "." }] : []),
|
|
125
|
+
], this._opt.pkgPath);
|
|
126
|
+
for (const assetFile of assetFiles) {
|
|
127
|
+
const prevHash = this.#outputHashCache.get(PathUtils.norm(assetFile.source));
|
|
128
|
+
const currHash = HashUtils.get(FsUtils.readFileBuffer(assetFile.source));
|
|
129
|
+
if (prevHash !== currHash) {
|
|
130
|
+
FsUtils.copy(assetFile.source, path.resolve(this._opt.pkgPath, "dist", assetFile.destination));
|
|
131
|
+
this.#outputHashCache.set(PathUtils.norm(assetFile.source), currHash);
|
|
132
|
+
emitFileSet.add(PathUtils.norm(this._opt.pkgPath, "dist", assetFile.destination));
|
|
133
|
+
}
|
|
123
134
|
}
|
|
124
135
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
136
|
+
catch (err) {
|
|
137
|
+
result = err;
|
|
138
|
+
for (const e of err.errors) {
|
|
139
|
+
if (e.detail != null) {
|
|
140
|
+
this.#logger.error(e.detail);
|
|
141
|
+
}
|
|
131
142
|
}
|
|
132
143
|
}
|
|
144
|
+
return {
|
|
145
|
+
watchFileSet: this.#resultCache.watchFileSet,
|
|
146
|
+
affectedFileSet: this.#resultCache.affectedFileSet,
|
|
147
|
+
results: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(result, this._opt.pkgPath),
|
|
148
|
+
emitFileSet: emitFileSet,
|
|
149
|
+
};
|
|
133
150
|
}
|
|
134
|
-
return {
|
|
135
|
-
watchFileSet: this.#resultCache.watchFileSet,
|
|
136
|
-
affectedFileSet: this.#resultCache.affectedFileSet,
|
|
137
|
-
results: SdCliConvertMessageUtils.convertToBuildMessagesFromEsbuild(result, this._opt.pkgPath),
|
|
138
|
-
emitFileSet: emitFileSet,
|
|
139
|
-
};
|
|
140
151
|
}
|
|
141
152
|
}
|
|
142
153
|
//# sourceMappingURL=sd-server.bundler.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-server.bundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.bundler.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sd-server.bundler.js","sourceRoot":"","sources":["../../../src/pkg-builders/server/sd-server.bundler.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": "12.13.
|
|
3
|
+
"version": "12.13.21",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"@angular/compiler-cli": "^20.2.3",
|
|
18
18
|
"@anthropic-ai/sdk": "^0.60.0",
|
|
19
19
|
"@electron/rebuild": "^4.0.1",
|
|
20
|
-
"@simplysm/sd-core-common": "12.13.
|
|
21
|
-
"@simplysm/sd-core-node": "12.13.
|
|
22
|
-
"@simplysm/sd-service-server": "12.13.
|
|
23
|
-
"@simplysm/sd-storage": "12.13.
|
|
20
|
+
"@simplysm/sd-core-common": "12.13.21",
|
|
21
|
+
"@simplysm/sd-core-node": "12.13.21",
|
|
22
|
+
"@simplysm/sd-service-server": "12.13.21",
|
|
23
|
+
"@simplysm/sd-storage": "12.13.21",
|
|
24
24
|
"browserslist": "^4.25.4",
|
|
25
25
|
"cordova": "^12.0.0",
|
|
26
26
|
"electron": "^37.4.0",
|
|
@@ -1,22 +1,30 @@
|
|
|
1
1
|
import path from "path";
|
|
2
|
-
import { FsUtils, HashUtils, PathUtils } from "@simplysm/sd-core-node";
|
|
2
|
+
import { FsUtils, HashUtils, PathUtils, SdFsWatcher } from "@simplysm/sd-core-node";
|
|
3
3
|
import { StringUtils } from "@simplysm/sd-core-common";
|
|
4
4
|
|
|
5
5
|
export class SdCliNgRoutesFileGenerator {
|
|
6
6
|
cachedHash?: string;
|
|
7
7
|
|
|
8
|
-
|
|
8
|
+
watch(pkgPath: string, noLazyRoute?: boolean) {
|
|
9
9
|
const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
|
|
10
|
-
this.cachedHash = FsUtils.exists(routesFilePath)
|
|
10
|
+
this.cachedHash = FsUtils.exists(routesFilePath)
|
|
11
|
+
? HashUtils.get(FsUtils.readFile(routesFilePath))
|
|
12
|
+
: undefined;
|
|
11
13
|
|
|
12
|
-
SdFsWatcher.watch([path.resolve(pkgPath, "src")]
|
|
13
|
-
|
|
14
|
+
SdFsWatcher.watch([path.resolve(pkgPath, "src")], {
|
|
15
|
+
ignored: [routesFilePath],
|
|
16
|
+
}).onChange({ delay: 50 }, (changeInfos) => {
|
|
17
|
+
if (changeInfos.some((item) => ["add", "addDir", "unlink", "unlinkDir"].includes(item.event)))
|
|
18
|
+
this.run(pkgPath, noLazyRoute);
|
|
14
19
|
});
|
|
15
20
|
|
|
16
21
|
this.run(pkgPath, noLazyRoute);
|
|
17
|
-
}
|
|
22
|
+
}
|
|
18
23
|
|
|
19
|
-
run(
|
|
24
|
+
run(
|
|
25
|
+
pkgPath: string,
|
|
26
|
+
noLazyRoute?: boolean,
|
|
27
|
+
): { changed: boolean; filePath: string; content: string } {
|
|
20
28
|
const appDirPath = path.resolve(pkgPath, "src/app");
|
|
21
29
|
const routesFilePath = path.resolve(pkgPath, "src/routes.ts");
|
|
22
30
|
|
|
@@ -54,7 +62,9 @@ export class SdCliNgRoutesFileGenerator {
|
|
|
54
62
|
cont += indentStr + ` path: "${key}",\n`;
|
|
55
63
|
if (val.relModulePath != null) {
|
|
56
64
|
if (noLazyRoute) {
|
|
57
|
-
cont +=
|
|
65
|
+
cont +=
|
|
66
|
+
indentStr +
|
|
67
|
+
` component: ${StringUtils.toPascalCase(path.basename(val.relModulePath))},\n`;
|
|
58
68
|
imports.push(
|
|
59
69
|
`import { ${StringUtils.toPascalCase(path.basename(val.relModulePath))} } from "./app/${val.relModulePath}";`,
|
|
60
70
|
);
|
|
@@ -10,12 +10,9 @@ import { INpmConfig } from "../../types/common-configs.types";
|
|
|
10
10
|
export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
11
11
|
protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
|
|
12
12
|
|
|
13
|
-
#routeGenerator = new SdCliNgRoutesFileGenerator();
|
|
14
13
|
#ngBundlers?: SdNgBundler[];
|
|
15
14
|
#cordova?: SdCliCordova;
|
|
16
15
|
|
|
17
|
-
#hasGenRoutesError = false;
|
|
18
|
-
|
|
19
16
|
protected override async _runAsync(
|
|
20
17
|
dev: boolean,
|
|
21
18
|
emitOnly: boolean,
|
|
@@ -24,8 +21,8 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
|
24
21
|
): Promise<IBuildRunnerRunResult> {
|
|
25
22
|
// 최초 한번
|
|
26
23
|
if (!modifiedFileSet) {
|
|
27
|
-
// config
|
|
28
24
|
if (!noEmit) {
|
|
25
|
+
// config
|
|
29
26
|
this._debug("GEN .config...");
|
|
30
27
|
const confDistPath = path.resolve(this._pkgPath, "dist/.config.json");
|
|
31
28
|
FsUtils.writeFile(confDistPath, JSON.stringify(this._pkgConf.configs ?? {}, undefined, 2));
|
|
@@ -39,6 +36,13 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
|
39
36
|
});
|
|
40
37
|
await this.#cordova.initializeAsync();
|
|
41
38
|
}
|
|
39
|
+
|
|
40
|
+
// routes
|
|
41
|
+
const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
|
|
42
|
+
if ("@angular/router" in (npmConf.dependencies ?? {})) {
|
|
43
|
+
this._debug(`GEN routes.ts...`);
|
|
44
|
+
new SdCliNgRoutesFileGenerator().watch(this._pkgPath, this._pkgConf.noLazyRoute);
|
|
45
|
+
}
|
|
42
46
|
}
|
|
43
47
|
|
|
44
48
|
// ng
|
|
@@ -108,18 +112,6 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
|
108
112
|
emitFileSet,
|
|
109
113
|
};
|
|
110
114
|
} else {
|
|
111
|
-
const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
|
|
112
|
-
|
|
113
|
-
let routesFileNPath: TNormPath | undefined;
|
|
114
|
-
if ("@angular/router" in (npmConf.dependencies ?? {})) {
|
|
115
|
-
this._debug(`GEN routes.ts...`);
|
|
116
|
-
const genRoutesResult = this.#routeGenerator.run(this._pkgPath, this._pkgConf.noLazyRoute);
|
|
117
|
-
if (modifiedFileSet && (genRoutesResult.changed || this.#hasGenRoutesError)) {
|
|
118
|
-
modifiedFileSet.add(PathUtils.norm(genRoutesResult.filePath));
|
|
119
|
-
}
|
|
120
|
-
routesFileNPath = PathUtils.norm(genRoutesResult.filePath);
|
|
121
|
-
}
|
|
122
|
-
|
|
123
115
|
if (modifiedFileSet) {
|
|
124
116
|
for (const ngBundler of this.#ngBundlers!) {
|
|
125
117
|
ngBundler.markForChanges(Array.from(modifiedFileSet));
|
|
@@ -150,9 +142,6 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
|
150
142
|
});
|
|
151
143
|
}
|
|
152
144
|
|
|
153
|
-
this.#hasGenRoutesError =
|
|
154
|
-
routesFileNPath != null && results.map((item) => item.filePath).includes(routesFileNPath);
|
|
155
|
-
|
|
156
145
|
this._debug(`빌드 완료`);
|
|
157
146
|
|
|
158
147
|
return {
|