@simplysm/sd-cli 12.12.13 → 12.12.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/pkg-builders/client/sd-client.build-runner.js +6 -1
- package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -1
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js +12 -0
- package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -1
- package/package.json +6 -6
- package/src/pkg-builders/client/sd-client.build-runner.ts +7 -1
- package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts +12 -0
|
@@ -10,10 +10,12 @@ export class SdClientBuildRunner extends BuildRunnerBase {
|
|
|
10
10
|
super(...arguments);
|
|
11
11
|
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdClientBuildRunner"]);
|
|
12
12
|
this.#routeGenerator = new SdCliNgRoutesFileGenerator();
|
|
13
|
+
this.#hasGenRoutesError = false;
|
|
13
14
|
}
|
|
14
15
|
#routeGenerator;
|
|
15
16
|
#ngBundlers;
|
|
16
17
|
#cordova;
|
|
18
|
+
#hasGenRoutesError;
|
|
17
19
|
async _runAsync(dev, modifiedFileSet) {
|
|
18
20
|
// 최초 한번
|
|
19
21
|
if (!modifiedFileSet) {
|
|
@@ -54,12 +56,14 @@ export class SdClientBuildRunner extends BuildRunnerBase {
|
|
|
54
56
|
}));
|
|
55
57
|
}
|
|
56
58
|
const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json"));
|
|
59
|
+
let routesFileNPath;
|
|
57
60
|
if ("@angular/router" in (npmConf.dependencies ?? {})) {
|
|
58
61
|
this._debug(`GEN routes.ts...`);
|
|
59
62
|
const genRoutesResult = this.#routeGenerator.run(this._pkgPath, this._pkgConf.noLazyRoute);
|
|
60
|
-
if (modifiedFileSet && genRoutesResult.changed) {
|
|
63
|
+
if (modifiedFileSet && (genRoutesResult.changed || this.#hasGenRoutesError)) {
|
|
61
64
|
modifiedFileSet.add(PathUtils.norm(genRoutesResult.filePath));
|
|
62
65
|
}
|
|
66
|
+
routesFileNPath = PathUtils.norm(genRoutesResult.filePath);
|
|
63
67
|
}
|
|
64
68
|
if (modifiedFileSet) {
|
|
65
69
|
for (const ngBundler of this.#ngBundlers) {
|
|
@@ -83,6 +87,7 @@ export class SdClientBuildRunner extends BuildRunnerBase {
|
|
|
83
87
|
electronConfig: this._pkgConf.builder.electron,
|
|
84
88
|
});
|
|
85
89
|
}
|
|
90
|
+
this.#hasGenRoutesError = routesFileNPath != null && results.map((item) => item.filePath).includes(routesFileNPath);
|
|
86
91
|
this._debug(`빌드 완료`);
|
|
87
92
|
return {
|
|
88
93
|
watchFileSet,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sd-client.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-client.build-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AACjF,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAyB,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAG/E,MAAM,OAAO,mBAAoB,SAAQ,eAAyB;IAAlE;;QACqB,YAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAEzF,oBAAe,GAAG,IAAI,0BAA0B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"sd-client.build-runner.js","sourceRoot":"","sources":["../../../src/pkg-builders/client/sd-client.build-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,10 +9,14 @@ export class SdTsLibBuildRunner extends BuildRunnerBase {
|
|
|
9
9
|
this._logger = SdLogger.get(["simplysm", "sd-cli", "SdTsLibBuildRunner"]);
|
|
10
10
|
this.#indexFileGenerator = new SdCliIndexFileGenerator();
|
|
11
11
|
this.#dbContextGenerator = new SdCliDbContextFileGenerator();
|
|
12
|
+
this.#hasGenIndexError = false;
|
|
13
|
+
this.#hasGenDbContextError = false;
|
|
12
14
|
}
|
|
13
15
|
#indexFileGenerator;
|
|
14
16
|
#dbContextGenerator;
|
|
15
17
|
#builder;
|
|
18
|
+
#hasGenIndexError;
|
|
19
|
+
#hasGenDbContextError;
|
|
16
20
|
async _runAsync(dev, modifiedFileSet) {
|
|
17
21
|
/*if (!modifiedFileSet) {
|
|
18
22
|
if (!dev) {
|
|
@@ -37,23 +41,31 @@ export class SdTsLibBuildRunner extends BuildRunnerBase {
|
|
|
37
41
|
}
|
|
38
42
|
}
|
|
39
43
|
}*/
|
|
44
|
+
let indexFileNPath;
|
|
40
45
|
if (!this._pkgConf.noGenIndex) {
|
|
41
46
|
this._debug("GEN index.ts...");
|
|
42
47
|
const genIndexResult = this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
43
48
|
if (modifiedFileSet && genIndexResult.changed) {
|
|
44
49
|
modifiedFileSet.add(PathUtils.norm(genIndexResult.filePath));
|
|
45
50
|
}
|
|
51
|
+
indexFileNPath = PathUtils.norm(genIndexResult.filePath);
|
|
46
52
|
}
|
|
53
|
+
let dbContentFileNPath;
|
|
47
54
|
if (this._pkgConf.dbContext != null) {
|
|
48
55
|
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
49
56
|
const genDbContextResult = this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
50
57
|
if (modifiedFileSet && genDbContextResult.changed) {
|
|
51
58
|
modifiedFileSet.add(PathUtils.norm(genDbContextResult.filePath));
|
|
52
59
|
}
|
|
60
|
+
dbContentFileNPath = PathUtils.norm(genDbContextResult.filePath);
|
|
53
61
|
}
|
|
54
62
|
this._debug(`BUILD...`);
|
|
55
63
|
this.#builder ??= new SdTsLibBuilder(PathUtils.norm(this._pkgPath), dev, this._watchScopePathSet);
|
|
56
64
|
const buildResult = await this.#builder.buildAsync(modifiedFileSet ?? new Set());
|
|
65
|
+
this.#hasGenIndexError =
|
|
66
|
+
indexFileNPath != null && buildResult.results.map((item) => item.filePath).includes(indexFileNPath);
|
|
67
|
+
this.#hasGenDbContextError =
|
|
68
|
+
dbContentFileNPath != null && buildResult.results.map((item) => item.filePath).includes(dbContentFileNPath);
|
|
57
69
|
this._debug(`빌드 완료`);
|
|
58
70
|
const watchFileSet = new Set(Array.from(buildResult.watchFileSet).filter((item) => this._watchScopePathSet.inScope(item)));
|
|
59
71
|
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;
|
|
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@simplysm/sd-cli",
|
|
3
|
-
"version": "12.12.
|
|
3
|
+
"version": "12.12.15",
|
|
4
4
|
"description": "심플리즘 패키지 - CLI",
|
|
5
5
|
"author": "김석래",
|
|
6
6
|
"repository": {
|
|
@@ -15,12 +15,12 @@
|
|
|
15
15
|
"@angular/build": "^20.1.1",
|
|
16
16
|
"@angular/compiler": "^20.1.2",
|
|
17
17
|
"@angular/compiler-cli": "^20.1.2",
|
|
18
|
-
"@anthropic-ai/sdk": "^0.
|
|
18
|
+
"@anthropic-ai/sdk": "^0.57.0",
|
|
19
19
|
"@electron/rebuild": "^4.0.1",
|
|
20
|
-
"@simplysm/sd-core-common": "12.12.
|
|
21
|
-
"@simplysm/sd-core-node": "12.12.
|
|
22
|
-
"@simplysm/sd-service-server": "12.12.
|
|
23
|
-
"@simplysm/sd-storage": "12.12.
|
|
20
|
+
"@simplysm/sd-core-common": "12.12.15",
|
|
21
|
+
"@simplysm/sd-core-node": "12.12.15",
|
|
22
|
+
"@simplysm/sd-service-server": "12.12.15",
|
|
23
|
+
"@simplysm/sd-storage": "12.12.15",
|
|
24
24
|
"browserslist": "^4.25.1",
|
|
25
25
|
"cordova": "^12.0.0",
|
|
26
26
|
"css-has-pseudo": "^7.0.2",
|
|
@@ -14,6 +14,8 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
|
14
14
|
#ngBundlers?: SdNgBundler[];
|
|
15
15
|
#cordova?: SdCliCordova;
|
|
16
16
|
|
|
17
|
+
#hasGenRoutesError = false;
|
|
18
|
+
|
|
17
19
|
protected override async _runAsync(dev: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult> {
|
|
18
20
|
// 최초 한번
|
|
19
21
|
if (!modifiedFileSet) {
|
|
@@ -69,12 +71,14 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
|
69
71
|
|
|
70
72
|
const npmConf = FsUtils.readJson(path.resolve(this._pkgPath, "package.json")) as INpmConfig;
|
|
71
73
|
|
|
74
|
+
let routesFileNPath: TNormPath | undefined;
|
|
72
75
|
if ("@angular/router" in (npmConf.dependencies ?? {})) {
|
|
73
76
|
this._debug(`GEN routes.ts...`);
|
|
74
77
|
const genRoutesResult = this.#routeGenerator.run(this._pkgPath, this._pkgConf.noLazyRoute);
|
|
75
|
-
if (modifiedFileSet && genRoutesResult.changed) {
|
|
78
|
+
if (modifiedFileSet && (genRoutesResult.changed || this.#hasGenRoutesError)) {
|
|
76
79
|
modifiedFileSet.add(PathUtils.norm(genRoutesResult.filePath));
|
|
77
80
|
}
|
|
81
|
+
routesFileNPath = PathUtils.norm(genRoutesResult.filePath);
|
|
78
82
|
}
|
|
79
83
|
|
|
80
84
|
if (modifiedFileSet) {
|
|
@@ -103,6 +107,8 @@ export class SdClientBuildRunner extends BuildRunnerBase<"client"> {
|
|
|
103
107
|
});
|
|
104
108
|
}
|
|
105
109
|
|
|
110
|
+
this.#hasGenRoutesError = routesFileNPath != null && results.map((item) => item.filePath).includes(routesFileNPath);
|
|
111
|
+
|
|
106
112
|
this._debug(`빌드 완료`);
|
|
107
113
|
|
|
108
114
|
return {
|
|
@@ -11,6 +11,9 @@ export class SdTsLibBuildRunner extends BuildRunnerBase<"library"> {
|
|
|
11
11
|
#dbContextGenerator = new SdCliDbContextFileGenerator();
|
|
12
12
|
#builder?: SdTsLibBuilder;
|
|
13
13
|
|
|
14
|
+
#hasGenIndexError = false;
|
|
15
|
+
#hasGenDbContextError = false;
|
|
16
|
+
|
|
14
17
|
protected override async _runAsync(dev: boolean, modifiedFileSet?: Set<TNormPath>): Promise<IBuildRunnerRunResult> {
|
|
15
18
|
/*if (!modifiedFileSet) {
|
|
16
19
|
if (!dev) {
|
|
@@ -36,26 +39,35 @@ export class SdTsLibBuildRunner extends BuildRunnerBase<"library"> {
|
|
|
36
39
|
}
|
|
37
40
|
}*/
|
|
38
41
|
|
|
42
|
+
let indexFileNPath: TNormPath | undefined;
|
|
39
43
|
if (!this._pkgConf.noGenIndex) {
|
|
40
44
|
this._debug("GEN index.ts...");
|
|
41
45
|
const genIndexResult = this.#indexFileGenerator.run(this._pkgPath, this._pkgConf.polyfills);
|
|
42
46
|
if (modifiedFileSet && genIndexResult.changed) {
|
|
43
47
|
modifiedFileSet.add(PathUtils.norm(genIndexResult.filePath));
|
|
44
48
|
}
|
|
49
|
+
indexFileNPath = PathUtils.norm(genIndexResult.filePath);
|
|
45
50
|
}
|
|
46
51
|
|
|
52
|
+
let dbContentFileNPath: TNormPath | undefined;
|
|
47
53
|
if (this._pkgConf.dbContext != null) {
|
|
48
54
|
this._debug(`GEN ${this._pkgConf.dbContext}.ts...`);
|
|
49
55
|
const genDbContextResult = this.#dbContextGenerator.run(this._pkgPath, this._pkgConf.dbContext);
|
|
50
56
|
if (modifiedFileSet && genDbContextResult.changed) {
|
|
51
57
|
modifiedFileSet.add(PathUtils.norm(genDbContextResult.filePath));
|
|
52
58
|
}
|
|
59
|
+
dbContentFileNPath = PathUtils.norm(genDbContextResult.filePath);
|
|
53
60
|
}
|
|
54
61
|
|
|
55
62
|
this._debug(`BUILD...`);
|
|
56
63
|
this.#builder ??= new SdTsLibBuilder(PathUtils.norm(this._pkgPath), dev, this._watchScopePathSet);
|
|
57
64
|
const buildResult = await this.#builder.buildAsync(modifiedFileSet ?? new Set());
|
|
58
65
|
|
|
66
|
+
this.#hasGenIndexError =
|
|
67
|
+
indexFileNPath != null && buildResult.results.map((item) => item.filePath).includes(indexFileNPath);
|
|
68
|
+
this.#hasGenDbContextError =
|
|
69
|
+
dbContentFileNPath != null && buildResult.results.map((item) => item.filePath).includes(dbContentFileNPath);
|
|
70
|
+
|
|
59
71
|
this._debug(`빌드 완료`);
|
|
60
72
|
const watchFileSet = new Set(
|
|
61
73
|
Array.from(buildResult.watchFileSet).filter((item) => this._watchScopePathSet.inScope(item)),
|