@simplysm/sd-cli 12.13.52 → 12.13.53

package/src/pkg-builders/server/SdServerBundler.ts

@@ -23,72 +23,66 @@ export class SdServerBundler {
 
   #outputHashCache = new Map<TNormPath, string>();
 
+  #esbuildOptions: esbuild.BuildOptions;
+
   constructor(
     private readonly _opt: ISdTsCompilerOptions,
     private readonly _conf: { external: string[] },
-  ) {}
-
-  async bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
-    this.#modifiedFileSet.clear();
-    if (modifiedFileSet) {
-      this.#modifiedFileSet.adds(...modifiedFileSet);
-    }
-
-    if (!this.#context) {
-      this.#context = await esbuild.context({
-        entryPoints: [
-          path.resolve(this._opt.pkgPath, "src/main.ts"),
-          ...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
-        ],
-        keepNames: true,
-        bundle: true,
-        sourcemap: !!this._opt.watch?.dev,
-        target: "node18",
-        mainFields: ["es2020", "es2015", "module", "main"],
-        conditions: ["es2020", "es2015", "module"],
-        tsconfig: path.resolve(this._opt.pkgPath, "tsconfig.json"),
-        write: false,
-        metafile: true,
-        legalComments: this._opt.watch?.dev ? "eof" : "none",
-        minifyIdentifiers: !this._opt.watch?.dev,
-        minifySyntax: !this._opt.watch?.dev,
-        minifyWhitespace: !this._opt.watch?.dev,
-        outdir: path.resolve(this._opt.pkgPath, "dist"),
-        format: "esm",
-        resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
-        preserveSymlinks: false,
-        loader: {
-          ".png": "file",
-          ".jpeg": "file",
-          ".jpg": "file",
-          ".jfif": "file",
-          ".gif": "file",
-          ".svg": "file",
-          ".woff": "file",
-          ".woff2": "file",
-          ".ttf": "file",
-          ".ttc": "file",
-          ".eot": "file",
-          ".ico": "file",
-          ".otf": "file",
-          ".csv": "file",
-          ".xlsx": "file",
-          ".xls": "file",
-          ".pptx": "file",
-          ".ppt": "file",
-          ".docx": "file",
-          ".doc": "file",
-          ".zip": "file",
-          ".pfx": "file",
-          ".pkl": "file",
-          ".mp3": "file",
-          ".ogg": "file",
-        },
-        platform: "node",
-        logLevel: "silent",
-        external: this._conf.external,
-        banner: {
-          js: `
+  ) {
+    this.#esbuildOptions = {
+      entryPoints: [
+        path.resolve(this._opt.pkgPath, "src/main.ts"),
+        ...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
+      ],
+      keepNames: true,
+      bundle: true,
+      sourcemap: !!this._opt.watch?.dev,
+      target: "node18",
+      mainFields: ["es2020", "es2015", "module", "main"],
+      conditions: ["es2020", "es2015", "module"],
+      tsconfig: path.resolve(this._opt.pkgPath, "tsconfig.json"),
+      write: false,
+      metafile: true,
+      legalComments: this._opt.watch?.dev ? "eof" : "none",
+      minifyIdentifiers: !this._opt.watch?.dev,
+      minifySyntax: !this._opt.watch?.dev,
+      minifyWhitespace: !this._opt.watch?.dev,
+      outdir: path.resolve(this._opt.pkgPath, "dist"),
+      format: "esm",
+      resolveExtensions: [".js", ".mjs", ".cjs", ".ts"],
+      preserveSymlinks: false,
+      loader: {
+        ".png": "file",
+        ".jpeg": "file",
+        ".jpg": "file",
+        ".jfif": "file",
+        ".gif": "file",
+        ".svg": "file",
+        ".woff": "file",
+        ".woff2": "file",
+        ".ttf": "file",
+        ".ttc": "file",
+        ".eot": "file",
+        ".ico": "file",
+        ".otf": "file",
+        ".csv": "file",
+        ".xlsx": "file",
+        ".xls": "file",
+        ".pptx": "file",
+        ".ppt": "file",
+        ".docx": "file",
+        ".doc": "file",
+        ".zip": "file",
+        ".pfx": "file",
+        ".pkl": "file",
+        ".mp3": "file",
+        ".ogg": "file",
+      },
+      platform: "node",
+      logLevel: "silent",
+      external: this._conf.external,
+      banner: {
+        js: `
 import __path__ from 'path';
 import { fileURLToPath as __fileURLToPath__ } from 'url';
 import { createRequire as __createRequire__ } from 'module';
@@ -96,13 +90,43 @@ import { createRequire as __createRequire__ } from 'module';
 const require = __createRequire__(import.meta.url);
 const __filename = __fileURLToPath__(import.meta.url);
 const __dirname = __path__.dirname(__filename);`.trim(),
-        },
-        plugins: [createSdServerPlugin(this._opt, this.#modifiedFileSet, this.#resultCache)],
-      });
+      },
+      plugins: [createSdServerPlugin(this._opt, this.#modifiedFileSet, this.#resultCache)],
+    };
+  }
+
+  async bundleAsync(modifiedFileSet?: Set<TNormPath>): Promise<ISdBuildResult> {
+    this.#modifiedFileSet.clear();
+    if (modifiedFileSet) {
+      this.#modifiedFileSet.adds(...modifiedFileSet);
     }
 
-    let esbuildResult: esbuild.BuildResult | esbuild.BuildFailure;
-    esbuildResult = await this.#context.rebuild();
+    let esbuildResult: esbuild.BuildResult;
+    if (this._opt.watch) {
+      if (this.#context == null) {
+        this.#context = await esbuild.context(this.#esbuildOptions);
+      }
+
+      try {
+        esbuildResult = await this.#context.rebuild();
+      } catch (err) {
+        if ("warnings" in err || "errors" in err) {
+          esbuildResult = err;
+        } else {
+          throw err;
+        }
+      }
+    } else {
+      try {
+        esbuildResult = await esbuild.build(this.#esbuildOptions);
+      } catch (err) {
+        if ("warnings" in err || "errors" in err) {
+          esbuildResult = err;
+        } else {
+          throw err;
+        }
+      }
+    }
 
     if (this._opt.watch?.noEmit) {
       return {

package/src/ts-compiler/SdDepCache.ts

@@ -183,14 +183,14 @@ export class SdDepCache {
         }
       };
 
-      for (const path of this.#getRelatedNPaths(modifiedNPath)) {
-        result.add(path);
-        const exportSymbols = this.#getExportSymbols(path);
+      for (const relatedNPath of this.#getRelatedNPaths(modifiedNPath)) {
+        result.add(relatedNPath);
+        const exportSymbols = this.#getExportSymbols(relatedNPath);
         if (exportSymbols.size === 0) {
-          enqueue(path, undefined);
+          enqueue(relatedNPath, undefined);
         } else {
           for (const symbol of exportSymbols) {
-            enqueue(path, symbol);
+            enqueue(relatedNPath, symbol);
           }
         }
       }
@@ -228,7 +228,7 @@ export class SdDepCache {
    * 주어진 파일들 및 그 영향 범위에 해당하는 모든 캐시를 무효화
    */
   invalidates(fileNPathSet: Set<TNormPath>) {
-    const revDepCacheChanged = new Set<TNormPath>();
+    // const revDepCacheChanged = new Set<TNormPath>();
 
     for (const fileNPath of fileNPathSet) {
       this.#exportCache.delete(fileNPath);
@@ -237,17 +237,17 @@ export class SdDepCache {
       this.#exportSymbolCache.delete(fileNPath);
       this.#collectedCache.delete(fileNPath);
 
-      if (this.#revDepCache.has(fileNPath)) {
-        this.#revDepCache.delete(fileNPath); // 자신이 key인 경우
-        revDepCacheChanged.add(fileNPath);
-      }
+      // if (this.#revDepCache.has(fileNPath)) {
+      //   this.#revDepCache.delete(fileNPath); // 자신이 key인 경우
+      // revDepCacheChanged.add(fileNPath);
+      // }
     }
 
     for (const [targetNPath, infoMap] of this.#revDepCache) {
       for (const fileNPath of fileNPathSet) {
         if (infoMap.has(fileNPath)) {
           infoMap.delete(fileNPath);
-          revDepCacheChanged.add(targetNPath);
+          // revDepCacheChanged.add(targetNPath);
         }
       }
       if (infoMap.size === 0) {

package/src/ts-compiler/SdTsCompiler.ts

@@ -53,7 +53,6 @@ export class SdTsCompiler {
     private readonly _forBundle: boolean,
   ) {
     this.#debug("초기화 중...");
-
     const tsconfigPath = path.resolve(this._opt.pkgPath, "tsconfig.json");
     const tsconfig = FsUtils.readJson(tsconfigPath);
     this.#isForAngular = Boolean(tsconfig.angularCompilerOptions);