@simplysm/sd-cli 12.12.14 → 12.12.16

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.
Files changed (13) hide show
  1. package/dist/entry/sd-cli-cordova.js +1 -1
  2. package/dist/entry/sd-cli-cordova.js.map +1 -1
  3. package/dist/pkg-builders/client/sd-client.build-runner.js +6 -1
  4. package/dist/pkg-builders/client/sd-client.build-runner.js.map +1 -1
  5. package/dist/pkg-builders/commons/build-runner.base.js +2 -2
  6. package/dist/pkg-builders/commons/build-runner.base.js.map +1 -1
  7. package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js +14 -2
  8. package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map +1 -1
  9. package/package.json +11 -11
  10. package/src/entry/sd-cli-cordova.ts +11 -44
  11. package/src/pkg-builders/client/sd-client.build-runner.ts +7 -1
  12. package/src/pkg-builders/commons/build-runner.base.ts +2 -2
  13. package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts +14 -2
package/dist/entry/sd-cli-cordova.js CHANGED
@@ -9,7 +9,7 @@ export class SdCliCordova {
9
9
  #WWW_DIR_NAME = "www";
10
10
  #PLUGINS_DIR_NAME = "plugins";
11
11
  #PLUGINS_FETCH_FILE = "fetch.json";
12
- #ANDROID_SDK_VERSION = "33";
12
+ #ANDROID_SDK_VERSION = "35"; //cordova-android@14
13
13
  #KEYSTORE_FILE_NAME = "android.keystore";
14
14
  #CONFIG_XML_FILE_NAME = "config.xml";
15
15
  #CONFIG_XML_BACKUP_FILE_NAME = "config.xml.bak";
package/dist/entry/sd-cli-cordova.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sd-cli-cordova.js","sourceRoot":"","sources":["../../src/entry/sd-cli-cordova.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sd-cli-cordova.js","sourceRoot":"","sources":["../../src/entry/sd-cli-cordova.ts"],"names":[],"mappings":"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"}
package/dist/pkg-builders/client/sd-client.build-runner.js CHANGED
@@ -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,
package/dist/pkg-builders/client/sd-client.build-runner.js.map CHANGED
@@ -1 +1 @@
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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"}
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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"}
package/dist/pkg-builders/commons/build-runner.base.js CHANGED
@@ -53,10 +53,10 @@ export class BuildRunnerBase extends EventEmitter {
53
53
  filePath === path.resolve(this._pkgPath, ".electron") ||
54
54
  filePath === path.resolve(this._pkgPath, "dist") ||
55
55
  (this._pkgConf.type === "client" && filePath === path.resolve(this._pkgPath, "src", "routes.ts")) ||
56
- ("dbContext" in this._pkgConf &&
56
+ (this._pkgConf.type === "library" &&
57
57
  this._pkgConf.dbContext != null &&
58
58
  filePath === path.resolve(this._pkgPath, "src", `${this._pkgConf.dbContext}.ts`)) ||
59
- ("noGenIndex" in this._pkgConf &&
59
+ (this._pkgConf.type === "library" &&
60
60
  !this._pkgConf.noGenIndex &&
61
61
  filePath === path.resolve(this._pkgPath, "src", "index.ts")),
62
62
  }).onChange({ delay: 100 }, async (changeInfos) => {
package/dist/pkg-builders/commons/build-runner.base.js.map CHANGED
@@ -1 +1 @@
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
+ {"version":3,"file":"build-runner.base.js","sourceRoot":"","sources":["../../../src/pkg-builders/commons/build-runner.base.ts"],"names":[],"mappings":"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"}
package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js CHANGED
@@ -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
- if (modifiedFileSet && genIndexResult.changed) {
48
+ if (modifiedFileSet && (genIndexResult.changed || this.#hasGenIndexError)) {
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
- if (modifiedFileSet && genDbContextResult.changed) {
57
+ if (modifiedFileSet && (genDbContextResult.changed || this.#hasGenDbContextError)) {
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 {
package/dist/pkg-builders/lib/sd-ts-lib.build-runner.js.map CHANGED
@@ -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;IA4D1D,CAAC;IA7DC,mBAAmB,CAAiC;IACpD,mBAAmB,CAAqC;IACxD,QAAQ,CAAkB;IAEP,KAAK,CAAC,SAAS,CAAC,GAAY,EAAE,eAAgC;QAC/E;;;;;;;;;;;;;;;;;;;;;;WAsBG;QAEH,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC/B,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC5F,IAAI,eAAe,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC9C,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC/D,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,QAAQ,CAAC,CAAC;YACpD,MAAM,kBAAkB,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAChG,IAAI,eAAe,IAAI,kBAAkB,CAAC,OAAO,EAAE,CAAC;gBAClD,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxB,IAAI,CAAC,QAAQ,KAAK,IAAI,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAClG,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"}
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.14",
3
+ "version": "12.12.16",
4
4
  "description": "심플리즘 패키지 - CLI",
5
5
  "author": "김석래",
6
6
  "repository": {
@@ -12,22 +12,22 @@
12
12
  "bin": "./dist/sd-cli.js",
13
13
  "type": "module",
14
14
  "dependencies": {
15
- "@angular/build": "^20.1.1",
16
- "@angular/compiler": "^20.1.2",
17
- "@angular/compiler-cli": "^20.1.2",
18
- "@anthropic-ai/sdk": "^0.56.0",
15
+ "@angular/build": "^20.1.3",
16
+ "@angular/compiler": "^20.1.3",
17
+ "@angular/compiler-cli": "^20.1.3",
18
+ "@anthropic-ai/sdk": "^0.57.0",
19
19
  "@electron/rebuild": "^4.0.1",
20
- "@simplysm/sd-core-common": "12.12.14",
21
- "@simplysm/sd-core-node": "12.12.14",
22
- "@simplysm/sd-service-server": "12.12.14",
23
- "@simplysm/sd-storage": "12.12.14",
20
+ "@simplysm/sd-core-common": "12.12.16",
21
+ "@simplysm/sd-core-node": "12.12.16",
22
+ "@simplysm/sd-service-server": "12.12.16",
23
+ "@simplysm/sd-storage": "12.12.16",
24
24
  "browserslist": "^4.25.1",
25
25
  "cordova": "^12.0.0",
26
26
  "css-has-pseudo": "^7.0.2",
27
- "electron": "^37.2.3",
27
+ "electron": "^37.2.4",
28
28
  "electron-builder": "26.0.12",
29
29
  "esbuild": "0.25.5",
30
- "eslint": "^9.31.0",
30
+ "eslint": "^9.32.0",
31
31
  "glob": "^11.0.3",
32
32
  "node-stdlib-browser": "^1.3.1",
33
33
  "postcss": "^8.5.6",
package/src/entry/sd-cli-cordova.ts CHANGED
@@ -12,7 +12,7 @@ export class SdCliCordova {
12
12
 
13
13
  #PLUGINS_DIR_NAME = "plugins";
14
14
  #PLUGINS_FETCH_FILE = "fetch.json";
15
- #ANDROID_SDK_VERSION = "33";
15
+ #ANDROID_SDK_VERSION = "35"; //cordova-android@14
16
16
  #KEYSTORE_FILE_NAME = "android.keystore";
17
17
  #CONFIG_XML_FILE_NAME = "config.xml";
18
18
  #CONFIG_XML_BACKUP_FILE_NAME = "config.xml.bak";
@@ -112,11 +112,7 @@ export class SdCliCordova {
112
112
 
113
113
  // 3. 플러그인 관리
114
114
  async #managePluginsAsync(cordovaPath: string): Promise<void> {
115
- const pluginsFetchPath = path.resolve(
116
- cordovaPath,
117
- this.#PLUGINS_DIR_NAME,
118
- this.#PLUGINS_FETCH_FILE,
119
- );
115
+ const pluginsFetchPath = path.resolve(cordovaPath, this.#PLUGINS_DIR_NAME, this.#PLUGINS_FETCH_FILE);
120
116
  const pluginsFetch = FsUtils.exists(pluginsFetchPath) ? FsUtils.readJson(pluginsFetchPath) : {};
121
117
 
122
118
  const alreadyPlugins: Array<{
@@ -144,10 +140,7 @@ export class SdCliCordova {
144
140
  for (const alreadyPlugin of alreadyPlugins) {
145
141
  if (!usePlugins.includes(alreadyPlugin.id) && !usePlugins.includes(alreadyPlugin.name)) {
146
142
  try {
147
- await SdCliCordova.#execAsync(
148
- `npx cordova plugin remove ${alreadyPlugin.name}`,
149
- cordovaPath,
150
- );
143
+ await SdCliCordova.#execAsync(`npx cordova plugin remove ${alreadyPlugin.name}`, cordovaPath);
151
144
  } catch (err) {
152
145
  // 의존성으로 인한 skip 메시지는 무시 (로그 생략)
153
146
  const msg = err instanceof Error ? err.message : String(err);
@@ -182,10 +175,7 @@ export class SdCliCordova {
182
175
  const signingPropsPath = path.resolve(cordovaPath, this.#ANDROID_SIGNING_PROP_PATH);
183
176
 
184
177
  if (this._opt.config.platform?.android?.sign) {
185
- FsUtils.copy(
186
- path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore),
187
- keystorePath,
188
- );
178
+ FsUtils.copy(path.resolve(this._opt.pkgPath, this._opt.config.platform.android.sign.keystore), keystorePath);
189
179
  } else {
190
180
  FsUtils.remove(keystorePath);
191
181
  // SIGN을 안쓸경우 아래 파일이 생성되어 있으면 오류남
@@ -468,9 +458,7 @@ export class SdCliCordova {
468
458
  : `app-${buildType}-unsigned.apk`;
469
459
 
470
460
  const latestDistApkFileName = path.basename(
471
- `${this._opt.config.appName}${
472
- this._opt.config.platform!.android!.sign ? "" : "-unsigned"
473
- }-latest.apk`,
461
+ `${this._opt.config.appName}${this._opt.config.platform!.android!.sign ? "" : "-unsigned"}-latest.apk`,
474
462
  );
475
463
 
476
464
  FsUtils.mkdirs(targetOutPath);
@@ -486,19 +474,10 @@ export class SdCliCordova {
486
474
  );
487
475
  }
488
476
 
489
- async #createUpdateZipAsync(
490
- cordovaPath: string,
491
- outPath: string,
492
- platform: string,
493
- ): Promise<void> {
477
+ async #createUpdateZipAsync(cordovaPath: string, outPath: string, platform: string): Promise<void> {
494
478
  const zip = new SdZip();
495
479
  const wwwPath = path.resolve(cordovaPath, this.#WWW_DIR_NAME);
496
- const platformWwwPath = path.resolve(
497
- cordovaPath,
498
- this.#PLATFORMS_DIR_NAME,
499
- platform,
500
- "platform_www",
501
- );
480
+ const platformWwwPath = path.resolve(cordovaPath, this.#PLATFORMS_DIR_NAME, platform, "platform_www");
502
481
 
503
482
  this.#addFilesToZip(zip, wwwPath);
504
483
  this.#addFilesToZip(zip, platformWwwPath);
@@ -506,10 +485,7 @@ export class SdCliCordova {
506
485
  // ZIP 파일 생성
507
486
  const updateDirPath = path.resolve(outPath, platform, "updates");
508
487
  FsUtils.mkdirs(updateDirPath);
509
- FsUtils.writeFile(
510
- path.resolve(updateDirPath, this.#npmConfig.version + ".zip"),
511
- await zip.compressAsync(),
512
- );
488
+ FsUtils.writeFile(path.resolve(updateDirPath, this.#npmConfig.version + ".zip"), await zip.compressAsync());
513
489
  }
514
490
 
515
491
  #addFilesToZip(zip: SdZip, dirPath: string) {
@@ -521,20 +497,11 @@ export class SdCliCordova {
521
497
  }
522
498
  }
523
499
 
524
- static async runWebviewOnDeviceAsync(opt: {
525
- platform: string;
526
- package: string;
527
- url?: string;
528
- }): Promise<void> {
500
+ static async runWebviewOnDeviceAsync(opt: { platform: string; package: string; url?: string }): Promise<void> {
529
501
  const projNpmConf = FsUtils.readJson(path.resolve(process.cwd(), "package.json")) as INpmConfig;
530
- const allPkgPaths = projNpmConf.workspaces!.mapMany((item) =>
531
- FsUtils.glob(PathUtils.posix(process.cwd(), item)),
532
- );
502
+ const allPkgPaths = projNpmConf.workspaces!.mapMany((item) => FsUtils.glob(PathUtils.posix(process.cwd(), item)));
533
503
 
534
- const cordovaPath = path.resolve(
535
- allPkgPaths.single((item) => item.endsWith(opt.package))!,
536
- ".cordova",
537
- );
504
+ const cordovaPath = path.resolve(allPkgPaths.single((item) => item.endsWith(opt.package))!, ".cordova");
538
505
 
539
506
  if (opt.url !== undefined) {
540
507
  FsUtils.remove(path.resolve(cordovaPath, "www"));
package/src/pkg-builders/client/sd-client.build-runner.ts CHANGED
@@ -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 {
package/src/pkg-builders/commons/build-runner.base.ts CHANGED
@@ -82,10 +82,10 @@ export abstract class BuildRunnerBase<T extends "server" | "library" | "client">
82
82
  filePath === path.resolve(this._pkgPath, ".electron") ||
83
83
  filePath === path.resolve(this._pkgPath, "dist") ||
84
84
  (this._pkgConf.type === "client" && filePath === path.resolve(this._pkgPath, "src", "routes.ts")) ||
85
- ("dbContext" in this._pkgConf &&
85
+ (this._pkgConf.type === "library" &&
86
86
  this._pkgConf.dbContext != null &&
87
87
  filePath === path.resolve(this._pkgPath, "src", `${this._pkgConf.dbContext}.ts`)) ||
88
- ("noGenIndex" in this._pkgConf &&
88
+ (this._pkgConf.type === "library" &&
89
89
  !this._pkgConf.noGenIndex &&
90
90
  filePath === path.resolve(this._pkgPath, "src", "index.ts")),
91
91
  }).onChange({ delay: 100 }, async (changeInfos) => {
package/src/pkg-builders/lib/sd-ts-lib.build-runner.ts CHANGED
@@ -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
- if (modifiedFileSet && genIndexResult.changed) {
46
+ if (modifiedFileSet && (genIndexResult.changed || this.#hasGenIndexError)) {
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
- if (modifiedFileSet && genDbContextResult.changed) {
56
+ if (modifiedFileSet && (genDbContextResult.changed || this.#hasGenDbContextError)) {
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)),