@simplysm/sd-cli 11.0.40 → 11.1.2

package/dist/utils/SdCliBuildResultUtil.js

@@ -1,38 +1,38 @@
-import ts from "typescript";
-import os from "os";
-import path from "path";
-export class SdCliBuildResultUtil {
-    static convertFromTsDiag(diag, type) {
-        const severity = diag.category === ts.DiagnosticCategory.Error ? "error"
-            : diag.category === ts.DiagnosticCategory.Warning ? "warning"
-                : diag.category === ts.DiagnosticCategory.Suggestion ? "suggestion"
-                    : "message";
-        const code = `TS${diag.code}`;
-        const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
-        const filePath = diag.file ? path.resolve(diag.file.fileName) : undefined;
-        const position = diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
-        const line = position ? position.line + 1 : undefined;
-        const char = position ? position.character + 1 : undefined;
-        return {
-            filePath: filePath !== undefined ? path.resolve(filePath) : undefined,
-            line,
-            char,
-            code,
-            severity,
-            message,
-            type: "build"
-        };
-    }
-    static getMessage(result) {
-        let str = "";
-        if (result.filePath !== undefined) {
-            str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
-        }
-        if (result.code !== undefined) {
-            str += `${result.code}: `;
-        }
-        str += `(${result.type}) ${result.severity} ${result.message}`;
-        return str;
-    }
-}
+import ts from "typescript";
+import os from "os";
+import path from "path";
+export class SdCliBuildResultUtil {
+    static convertFromTsDiag(diag, type) {
+        const severity = diag.category === ts.DiagnosticCategory.Error ? "error"
+            : diag.category === ts.DiagnosticCategory.Warning ? "warning"
+                : diag.category === ts.DiagnosticCategory.Suggestion ? "suggestion"
+                    : "message";
+        const code = `TS${diag.code}`;
+        const message = ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
+        const filePath = diag.file ? path.resolve(diag.file.fileName) : undefined;
+        const position = diag.file && diag.start !== undefined ? diag.file.getLineAndCharacterOfPosition(diag.start) : undefined;
+        const line = position ? position.line + 1 : undefined;
+        const char = position ? position.character + 1 : undefined;
+        return {
+            filePath: filePath !== undefined ? path.resolve(filePath) : undefined,
+            line,
+            char,
+            code,
+            severity,
+            message,
+            type: "build"
+        };
+    }
+    static getMessage(result) {
+        let str = "";
+        if (result.filePath !== undefined) {
+            str += `${result.filePath}(${result.line ?? 0}, ${result.char ?? 0}): `;
+        }
+        if (result.code !== undefined) {
+            str += `${result.code}: `;
+        }
+        str += `(${result.type}) ${result.severity} ${result.message}`;
+        return str;
+    }
+}
 //# sourceMappingURL=SdCliBuildResultUtil.js.map

package/dist/utils/SdMemoryLoadResultCache.d.ts

@@ -1,9 +1,10 @@
-import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
-import { OnLoadResult } from 'esbuild';
-export declare class SdMemoryLoadResultCache extends MemoryLoadResultCache {
-    loadResults: Map<string, OnLoadResult>;
-    fileDependencies: Map<string, Set<string>>;
-    get(getPath: string): OnLoadResult | undefined;
-    put(putPath: string, result: OnLoadResult): Promise<void>;
-    invalidate(invalidatePath: string): boolean;
-}
+import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
+import { OnLoadResult } from 'esbuild';
+export declare class SdMemoryLoadResultCache extends MemoryLoadResultCache {
+    loadResults: Map<string, OnLoadResult>;
+    fileDependencies: Map<string, Set<string>>;
+    get(getPath: string): OnLoadResult | undefined;
+    put(putPath: string, result: OnLoadResult): Promise<void>;
+    invalidate(invalidatePath: string): boolean;
+    get watchFiles(): string[];
+}

package/dist/utils/SdMemoryLoadResultCache.js

@@ -1,35 +1,37 @@
-import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
-import path from "path";
-export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
-    constructor() {
-        super(...arguments);
-        this.loadResults = new Map();
-        this.fileDependencies = new Map();
-    }
-    get(getPath) {
-        return this.loadResults.get(getPath);
-    }
-    put(putPath, result) {
-        this.loadResults.set(putPath, result);
-        if (result.watchFiles) {
-            for (const watchFile of result.watchFiles) {
-                // Normalize the watch file path to ensure OS consistent paths
-                const watchFilePath = path.resolve(watchFile);
-                let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
-                affected.add(putPath);
-            }
-        }
-        return Promise.resolve();
-    }
-    invalidate(invalidatePath) {
-        const affected = this.fileDependencies.get(invalidatePath);
-        let found = false;
-        if (affected) {
-            affected.forEach((a) => (found ||= this.loadResults.delete(a)));
-            this.fileDependencies.delete(invalidatePath);
-        }
-        found ||= this.loadResults.delete(invalidatePath);
-        return found;
-    }
-}
+import { MemoryLoadResultCache } from "@angular-devkit/build-angular/src/tools/esbuild/load-result-cache";
+import path from "path";
+export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
+    constructor() {
+        super(...arguments);
+        this.loadResults = new Map();
+        this.fileDependencies = new Map();
+    }
+    get(getPath) {
+        return this.loadResults.get(getPath);
+    }
+    put(putPath, result) {
+        this.loadResults.set(putPath, result);
+        if (result.watchFiles) {
+            for (const watchFile of result.watchFiles) {
+                const watchFilePath = path.resolve(watchFile);
+                let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
+                affected.add(putPath);
+            }
+        }
+        return Promise.resolve();
+    }
+    invalidate(invalidatePath) {
+        const affected = this.fileDependencies.get(invalidatePath);
+        let found = false;
+        if (affected) {
+            affected.forEach((a) => (found ||= this.loadResults.delete(a)));
+            this.fileDependencies.delete(invalidatePath);
+        }
+        found ||= this.loadResults.delete(invalidatePath);
+        return found;
+    }
+    get watchFiles() {
+        return [...this.loadResults.keys(), ...this.fileDependencies.keys()];
+    }
+}
 //# sourceMappingURL=SdMemoryLoadResultCache.js.map

package/dist/utils/SdMemoryLoadResultCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdMemoryLoadResultCache.js","sourceRoot":"","sources":["../../src/utils/SdMemoryLoadResultCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,mEAAmE,CAAC;AAExG,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,uBAAwB,SAAQ,qBAAqB;IAAlE;;QACE,gBAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC9C,qBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAiCpD,CAAC;IA/BU,GAAG,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEQ,GAAG,CAAC,OAAe,EAAE,MAAoB;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;gBACzC,8DAA8D;gBAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBAC3E,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACvB;SACF;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEQ,UAAU,CAAC,cAAsB;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC9C;QAED,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
+{"version":3,"file":"SdMemoryLoadResultCache.js","sourceRoot":"","sources":["../../src/utils/SdMemoryLoadResultCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,mEAAmE,CAAC;AAExG,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,OAAO,uBAAwB,SAAQ,qBAAqB;IAAlE;;QACE,gBAAW,GAAG,IAAI,GAAG,EAAwB,CAAC;QAC9C,qBAAgB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAoCpD,CAAC;IAlCU,GAAG,CAAC,OAAe;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEQ,GAAG,CAAC,OAAe,EAAE,MAAoB;QAChD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,UAAU,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBAC9C,IAAI,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;gBAC3E,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aACvB;SACF;QAED,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAEQ,UAAU,CAAC,cAAsB;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC3D,IAAI,KAAK,GAAG,KAAK,CAAC;QAElB,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SAC9C;QAED,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAa,UAAU;QACrB,OAAO,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;CACF"}

package/dist/utils/SdSourceFileCache.d.ts

@@ -1,6 +1,6 @@
-import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
-import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
-export declare class SdSourceFileCache extends SourceFileCache {
-    readonly loadResultCache: SdMemoryLoadResultCache;
-    invalidate(files: Iterable<string>): void;
-}
+import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
+import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
+export declare class SdSourceFileCache extends SourceFileCache {
+    readonly loadResultCache: SdMemoryLoadResultCache;
+    invalidate(files: Iterable<string>): void;
+}

package/dist/utils/SdSourceFileCache.js

@@ -1,15 +1,22 @@
-import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
-import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
-export class SdSourceFileCache extends SourceFileCache {
-    constructor() {
-        super(...arguments);
-        this.loadResultCache = new SdMemoryLoadResultCache();
-    }
-    invalidate(files) {
-        super.invalidate(files);
-        for (let file of files) {
-            this.loadResultCache.invalidate(file);
-        }
-    }
-}
+import { SdMemoryLoadResultCache } from "./SdMemoryLoadResultCache";
+import { SourceFileCache } from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
+import { pathToFileURL } from "url";
+export class SdSourceFileCache extends SourceFileCache {
+    constructor() {
+        super(...arguments);
+        this.loadResultCache = new SdMemoryLoadResultCache();
+    }
+    invalidate(files) {
+        if (files !== this.modifiedFiles) {
+            this.modifiedFiles.clear();
+        }
+        for (let file of files) {
+            this.babelFileCache.delete(file);
+            this.typeScriptFileCache.delete(pathToFileURL(file).href);
+            this.loadResultCache.invalidate(file);
+            this.delete(file);
+            this.modifiedFiles.add(file);
+        }
+    }
+}
 //# sourceMappingURL=SdSourceFileCache.js.map

package/dist/utils/SdSourceFileCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"SdSourceFileCache.js","sourceRoot":"","sources":["../../src/utils/SdSourceFileCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,yEAAyE,CAAC;AAExG,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAAtD;;QACoB,oBAAe,GAAG,IAAI,uBAAuB,EAAE,CAAC;IASpE,CAAC;IAPU,UAAU,CAAC,KAAuB;QACzC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAExB,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SACvC;IACH,CAAC;CACF"}
+{"version":3,"file":"SdSourceFileCache.js","sourceRoot":"","sources":["../../src/utils/SdSourceFileCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,uBAAuB,EAAC,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,2EAA2E,CAAC;AAC1G,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAElC,MAAM,OAAO,iBAAkB,SAAQ,eAAe;IAAtD;;QACoB,oBAAe,GAAG,IAAI,uBAAuB,EAAE,CAAC;IAepE,CAAC;IAbU,UAAU,CAAC,KAAuB;QACzC,IAAI,KAAK,KAAK,IAAI,CAAC,aAAa,EAAE;YAChC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;SAC5B;QACD,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SAC9B;IACH,CAAC;CACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "11.0.40",
+  "version": "11.1.2",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -17,21 +17,21 @@
     "node": "^18"
   },
   "dependencies": {
-    "@angular-devkit/build-angular": "^16.2.9",
-    "@angular/common": "^16.2.12",
-    "@angular/compiler": "^16.2.12",
-    "@angular/compiler-cli": "^16.2.12",
-    "@angular/core": "^16.2.12",
+    "@angular-devkit/build-angular": "^17.0.0",
+    "@angular/common": "^17.0.1",
+    "@angular/compiler": "^17.0.1",
+    "@angular/compiler-cli": "^17.0.1",
+    "@angular/core": "^17.0.1",
     "@electron/rebuild": "^3.3.0",
-    "@simplysm/sd-core-common": "11.0.40",
-    "@simplysm/sd-core-node": "11.0.40",
-    "@simplysm/sd-service-server": "11.0.40",
-    "@simplysm/sd-storage": "11.0.40",
+    "@simplysm/sd-core-common": "11.1.2",
+    "@simplysm/sd-core-node": "11.1.2",
+    "@simplysm/sd-service-server": "11.1.2",
+    "@simplysm/sd-storage": "11.1.2",
     "browserslist": "^4.22.1",
     "cordova": "^12.0.0",
-    "electron": "^27.0.3",
-    "electron-builder": "^24.8.0",
-    "esbuild": "0.18.17",
+    "electron": "^27.0.4",
+    "electron-builder": "^24.8.1",
+    "esbuild": "^0.19.5",
     "esbuild-plugin-tsc": "^0.4.0",
     "eslint": "^8.53.0",
     "jszip": "^3.10.1",
@@ -41,14 +41,14 @@
     "semver": "^7.5.4",
     "xml2js": "^0.6.2",
     "yargs": "^17.7.2",
-    "zone.js": "~0.13.3"
+    "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@types/eslint": "^8.44.6",
-    "@types/xml2js": "^0.4.13",
-    "@types/yargs": "^17.0.29"
+    "@types/eslint": "^8.44.7",
+    "@types/xml2js": "^0.4.14",
+    "@types/yargs": "^17.0.31"
   },
   "peerDependencies": {
-    "typescript": "^4.9.5"
+    "typescript": "~5.2.2"
   }
 }

package/src/build-tools/SdNgBundler.ts

@@ -1,9 +1,13 @@
 import {createCompilerPlugin} from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
 import path from "path";
-import {InitialFileRecord} from "@angular-devkit/build-angular/src/tools/esbuild/bundler-context";
+import {
+  BuildOutputFile,
+  BuildOutputFileType,
+  InitialFileRecord
+} from "@angular-devkit/build-angular/src/tools/esbuild/bundler-context";
 import esbuild, {Metafile} from "esbuild";
 import {FsUtil, PathUtil} from "@simplysm/sd-core-node";
-import {fileURLToPath, pathToFileURL} from "url";
+import {fileURLToPath} from "url";
 import {createVirtualModulePlugin} from "@angular-devkit/build-angular/src/tools/esbuild/virtual-module-plugin";
 import {
   createSourcemapIgnorelistPlugin
@@ -16,6 +20,7 @@ import {extractLicenses} from "@angular-devkit/build-angular/src/tools/esbuild/l
 import {augmentAppWithServiceWorkerEsbuild} from "@angular-devkit/build-angular/src/utils/service-worker";
 import browserslist from "browserslist";
 import {
+  convertOutputFile,
   createOutputFileFromText,
   transformSupportedBrowsersToTargets
 } from "@angular-devkit/build-angular/src/tools/esbuild/utils";
@@ -45,8 +50,6 @@ export class SdNgBundler {
 
   private readonly _outputCache = new Map<string, string | number>();
 
-  private readonly _customDepsCache = new Map<string, Set<string>>();
-
   private readonly _pkgNpmConf: INpmConfig;
   private readonly _mainFilePath: string;
   private readonly _tsConfigFilePath: string;
@@ -75,17 +78,7 @@ export class SdNgBundler {
   }
 
   public removeCache(filePaths: string[]): void {
-    for (const filePath of filePaths) {
-      const depsSet = this._customDepsCache.get(filePath);
-      if (depsSet) {
-        for (const depFile of depsSet) {
-          this._sourceFileCache.invalidate([depFile]);
-        }
-      }
-      else {
-        this._sourceFileCache.invalidate([filePath]);
-      }
-    }
+    this._sourceFileCache.invalidate(filePaths);
   }
 
   public async bundleAsync(): Promise<{
@@ -105,16 +98,21 @@ export class SdNgBundler {
     const results = bundlingResults.mapMany(bundlingResult => bundlingResult.results);
 
     const watchFilePaths = [
-      ...this._sourceFileCache.keys(),
+      ...Array.from(this._sourceFileCache.typeScriptFileCache.keys()).map(item => fileURLToPath(item)),
+      ...this._sourceFileCache.referencedFiles ?? [],
       ...this._sourceFileCache.babelFileCache.keys(),
-      ...this._sourceFileCache.loadResultCache.fileDependencies.keys(),
-      ...this._customDepsCache.keys()
+      ...this._sourceFileCache.loadResultCache.watchFiles
     ].map((item) => path.resolve(item)).distinct();
 
     let affectedSourceFilePaths = watchFilePaths.filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
 
     if (this._sourceFileCache.modifiedFiles.size > 0) {
-      const depMap = new Map<string, Set<string>>();
+      affectedSourceFilePaths = Array.from(this._sourceFileCache.modifiedFiles)
+        .filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath))
+        .map((item) => path.resolve(item))
+        .distinct();
+
+      /*const depMap = new Map<string, Set<string>>();
       for (const bundlingResult of bundlingResults) {
         for (const [k, v] of bundlingResult.dependencyMap) {
           const currSet = depMap.getOrCreate(k, new Set<string>());
@@ -125,10 +123,6 @@ export class SdNgBundler {
         const currSet = depMap.getOrCreate(k, new Set<string>());
         currSet.adds(...Array.from(v).map((item) => item.startsWith("file:") ? fileURLToPath(item) : undefined).filterExists());
       }
-      for (const [k, v] of this._customDepsCache) {
-        const currSet = depMap.getOrCreate(k, new Set<string>());
-        currSet.adds(...v);
-      }
 
       const searchAffectedFiles = (filePath: string, prev?: Set<string>): Set<string> => {
         const result = new Set<string>(prev);
@@ -150,13 +144,13 @@ export class SdNgBundler {
         affectedFilePathSet.add(path.resolve(modFile));
         affectedFilePathSet.adds(...searchAffectedFiles(path.resolve(modFile)));
       }
-      affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));
+      affectedSourceFilePaths = Array.from(affectedFilePathSet.values()).filter((item) => PathUtil.isChildPath(item, this._opt.pkgPath));*/
     }
 
     /*const executionResult = new ExecutionResult(this._contexts, this._sourceFileCache);
     executionResult.outputFiles.push(...bundlingResult.outputFiles);*/
 
-    const outputFiles = bundlingResults.mapMany(item => item.outputFiles ?? []);
+    const outputFiles: BuildOutputFile[] = bundlingResults.mapMany(item => item.outputFiles?.map(file => convertOutputFile(file, BuildOutputFileType.Root)) ?? []);
     const initialFiles = new Map<string, InitialFileRecord>();
     const metafile: {
       inputs: Metafile["inputs"],
@@ -190,7 +184,7 @@ export class SdNgBundler {
 
     //-- cordova empty
     if (this._opt.cordovaConfig?.plugins) {
-      outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};"));
+      outputFiles.push(createOutputFileFromText("cordova-empty.js", "export default {};", BuildOutputFileType.Root));
     }
 
     //-- index
@@ -218,21 +212,21 @@ export class SdNgBundler {
         type: "build",
       });
     }
-    outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content));
+    outputFiles.push(createOutputFileFromText("index.html", genIndexHtmlResult.content, BuildOutputFileType.Root));
 
     //-- copy assets
     assetFiles.push(...(await this._copyAssetsAsync()));
 
     //-- extract 3rdpartylicenses
     if (!this._opt.dev) {
-      outputFiles.push(createOutputFileFromText('3rdpartylicenses.txt', await extractLicenses(metafile, this._opt.pkgPath)));
+      outputFiles.push(createOutputFileFromText('3rdpartylicenses.txt', await extractLicenses(metafile, this._opt.pkgPath), BuildOutputFileType.Root));
     }
 
     //-- service worker
     if (FsUtil.exists(this._swConfFilePath)) {
       try {
         const serviceWorkerResult = await this._genServiceWorkerAsync(outputFiles, assetFiles);
-        outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest));
+        outputFiles.push(createOutputFileFromText('ngsw.json', serviceWorkerResult.manifest, BuildOutputFileType.Root));
         assetFiles.push(...serviceWorkerResult.assetFiles);
       }
       catch (err) {
@@ -250,8 +244,7 @@ export class SdNgBundler {
 
     //-- write
     for (const outputFile of outputFiles) {
-      const distFilePath = path.resolve(this._opt.outputPath, outputFile.path);
-
+      const distFilePath = path.resolve(this._opt.outputPath, outputFile.fullOutputPath);
       const prev = this._outputCache.get(distFilePath);
       if (prev !== Buffer.from(outputFile.contents).toString("base64")) {
         await FsUtil.writeFileAsync(distFilePath, outputFile.contents);
@@ -395,7 +388,7 @@ export class SdNgBundler {
   }
 
   private async _genServiceWorkerAsync(
-    outputFiles: esbuild.OutputFile[],
+    outputFiles: BuildOutputFile[],
     assetFiles: {
       source: string;
       destination: string;
@@ -494,7 +487,7 @@ export class SdNgBundler {
       },
       inject: [PathUtil.posix(fileURLToPath(await import.meta.resolve!("node-stdlib-browser/helpers/esbuild/shim")))],
       plugins: [
-        {
+        /*{
           name: "sd-worker",
           setup: ({onLoad}) => {
             onLoad({filter: /\.ts$/}, async args => {
@@ -558,7 +551,7 @@ export class SdNgBundler {
               return undefined;
             });
           }
-        },
+        },*/
         ...this._opt.cordovaConfig?.plugins ? [{
           name: "cordova:plugin-empty",
           setup: ({onResolve}) => {
@@ -581,13 +574,14 @@ export class SdNgBundler {
         createSourcemapIgnorelistPlugin(),
         createCompilerPlugin({
           sourcemap: this._opt.dev,
-          thirdPartySourcemaps: false,
           tsconfig: this._tsConfigFilePath,
           jit: false,
           advancedOptimizations: true,
+          thirdPartySourcemaps: false,
           fileReplacements: undefined,
           sourceFileCache: this._sourceFileCache,
-          loadResultCache: this._sourceFileCache.loadResultCache
+          loadResultCache: this._sourceFileCache.loadResultCache,
+          incremental: this._opt.dev
         }, {
           workspaceRoot: this._opt.pkgPath,
           optimization: !this._opt.dev,

package/src/build-tools/SdNgBundlerContext.ts

@@ -53,7 +53,7 @@ export class SdNgBundlerContext {
     const initialFiles = new Map<string, InitialFileRecord>();
 
     for (const outputFile of buildResult.outputFiles ?? []) {
-      const relativeFilePath = path.relative(this._pkgPath, outputFile.path);
+      const relativeFilePath = path.isAbsolute(outputFile.path) ? path.relative(this._pkgPath, outputFile.path) : outputFile.path;
       const entryPoint = buildResult.metafile?.outputs[relativeFilePath]?.entryPoint;
 
       outputFile.path = relativeFilePath;
@@ -95,21 +95,21 @@ export class SdNgBundlerContext {
       }
     }
 
-    const dependencyMap = new Map<string, Set<string>>();
-    if (buildResult.metafile) {
-      for (const [key, val] of Object.entries(buildResult.metafile.inputs)) {
-        for (const imp of val.imports) {
-          const deps = dependencyMap.getOrCreate(path.resolve(this._pkgPath, imp.path), new Set<string>());
-          deps.add(path.resolve(this._pkgPath, key));
-        }
-      }
-    }
+    // const dependencyMap = new Map<string, Set<string>>();
+    // if (buildResult.metafile) {
+    //   for (const [key, val] of Object.entries(buildResult.metafile.inputs)) {
+    //     for (const imp of val.imports) {
+    //       const deps = dependencyMap.getOrCreate(path.resolve(this._pkgPath, imp.path), new Set<string>());
+    //       deps.add(path.resolve(this._pkgPath, key));
+    //     }
+    //   }
+    // }
 
     return {
       results,
       initialFiles,
       outputFiles: buildResult.outputFiles,
-      dependencyMap,
+      // dependencyMap,
       metafile: buildResult.metafile
     };
   }

package/src/utils/SdMemoryLoadResultCache.ts

@@ -14,7 +14,6 @@ export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
     this.loadResults.set(putPath, result);
     if (result.watchFiles) {
       for (const watchFile of result.watchFiles) {
-        // Normalize the watch file path to ensure OS consistent paths
         const watchFilePath = path.resolve(watchFile);
         let affected = this.fileDependencies.getOrCreate(watchFilePath, new Set());
         affected.add(putPath);
@@ -37,4 +36,8 @@ export class SdMemoryLoadResultCache extends MemoryLoadResultCache {
 
     return found;
   }
+
+  override get watchFiles(): string[] {
+    return [...this.loadResults.keys(), ...this.fileDependencies.keys()];
+  }
 }

package/src/utils/SdSourceFileCache.ts

@@ -1,14 +1,21 @@
 import {SdMemoryLoadResultCache} from "./SdMemoryLoadResultCache";
-import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin";
+import {SourceFileCache} from "@angular-devkit/build-angular/src/tools/esbuild/angular/source-file-cache";
+import {pathToFileURL} from "url";
 
 export class SdSourceFileCache extends SourceFileCache {
   override readonly loadResultCache = new SdMemoryLoadResultCache();
 
   override invalidate(files: Iterable<string>): void {
-    super.invalidate(files);
-
+    if (files !== this.modifiedFiles) {
+      this.modifiedFiles.clear();
+    }
     for (let file of files) {
+      this.babelFileCache.delete(file);
+      this.typeScriptFileCache.delete(pathToFileURL(file).href);
       this.loadResultCache.invalidate(file);
+
+      this.delete(file);
+      this.modifiedFiles.add(file);
     }
   }
 }