@simplysm/sd-cli 12.15.37 → 12.15.39

package/dist/pkg-builders/client/SdNgBundler.js

@@ -21,6 +21,7 @@ import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
 import { createSdNgPlugin } from "./createSdNgPlugin";
 import { SdCliPerformanceTimer } from "../../utils/SdCliPerformanceTimer";
 import nodeModule from "module";
+import { SdWorkerPathPlugin } from "../commons/SdWorkerPathPlugin";
 export class SdNgBundler {
     #logger = SdLogger.get(["simplysm", "sd-cli", "SdNgBundler"]);
     #modifiedFileSet = new Set();
@@ -79,8 +80,8 @@ export class SdNgBundler {
         const perf = new SdCliPerformanceTimer("ng bundle");
         this.#debug(`Preparing build contexts...`);
         if (!this.#contexts) {
-            this.#contexts = await perf.run("Preparing build contexts", async () => [
-                await this.#getAppContextAsync(),
+            this.#contexts = perf.run("Preparing build contexts", () => [
+                this.#getAppContext(),
                 ...(FsUtils.exists(path.resolve(this._opt.pkgPath, "src/styles.scss"))
                     ? [this.#getStyleContext()]
                     : []),
@@ -336,8 +337,10 @@ export class SdNgBundler {
     async #genServiceWorkerAsync(outputFiles, assetFiles) {
         return await augmentAppWithServiceWorkerEsbuild(this._opt.pkgPath, this.#swConfFilePath, this.#baseHref, "index.html", outputFiles, assetFiles);
     }
-    async #getAppContextAsync() {
-        const workerEntries = (await FsUtils.globAsync(path.resolve(this._opt.pkgPath, "src/workers/*.ts"))).toObject((p) => "workers/" + path.basename(p, path.extname(p)));
+    #getAppContext() {
+        /*const workerEntries = (
+          await FsUtils.globAsync(path.resolve(this._opt.pkgPath, "src/workers/!*.ts"))
+        ).toObject((p) => "workers/" + path.basename(p, path.extname(p)));*/
         return new SdNgBundlerContext(this._opt.pkgPath, !!this._opt.watch, {
             absWorkingDir: this._opt.pkgPath,
             bundle: true,
@@ -385,7 +388,7 @@ export class SdNgBundler {
                         "cordova-entry": path.resolve(path.dirname(fileURLToPath(import.meta.url)), `../../../lib/cordova-entry.js`),
                     }
                     : {}),
-                ...workerEntries,
+                // ...workerEntries,
             },
             supported: { "async-await": false, "object-rest-spread": false },
             loader: {
@@ -440,6 +443,7 @@ export class SdNgBundler {
                 ...(this._conf.builderType === "electron"
                     ? []
                     : [nodeStdLibBrowserPlugin(nodeStdLibBrowser)]),
+                SdWorkerPathPlugin(path.resolve(this._opt.pkgPath, "dist")),
                 // {
                 //   name: "log-circular",
                 //   setup(build) {

package/dist/pkg-builders/client/createSdNgPlugin.js

@@ -12,7 +12,7 @@ export function createSdNgPlugin(opt, modifiedFileSet, resultCache) {
         logger.debug(`[${path.basename(opt.pkgPath)}]`, ...msg);
     };
     return {
-        name: "sd-ng-compile",
+        name: "sd-ng-plugin",
         setup: (build) => {
             const tsCompiler = new SdTsCompiler(opt, true);
             let tsCompileResult;

package/dist/pkg-builders/commons/SdWorkerPathPlugin.d.ts

@@ -0,0 +1,2 @@
+import esbuild from "esbuild";
+export declare function SdWorkerPathPlugin(outdir: string): esbuild.Plugin;

package/dist/pkg-builders/commons/SdWorkerPathPlugin.js

@@ -0,0 +1,92 @@
+import esbuild from "esbuild";
+import path from "path";
+import { FsUtils, HashUtils } from "@simplysm/sd-core-node";
+export function SdWorkerPathPlugin(outdir) {
+    return {
+        name: "sd-worker-path-plugin",
+        setup(build) {
+            build.onLoad({ filter: /\.[cm]?[jt]s$/ }, async (args) => {
+                const originalSource = await FsUtils.readFileAsync(args.path);
+                // 정규식: import.meta.resolve('...') 또는 "..." 캡쳐
+                // 워커 파일뿐만 아니라 필요한 모든 리소스를 처리할 수 있지만, 일단 worker만 타겟팅
+                const regex = /import\.meta\.resolve\(\s*(['"])([^'"]+?\.worker)(?:\.[a-z]+)?\1\s*\)/g;
+                if (!regex.test(originalSource)) {
+                    return null;
+                }
+                // 매칭되는 모든 import.meta.resolve를 찾아서 처리
+                const newSource = await replaceAsync(originalSource, regex, async (match, quote, relPath) => {
+                    // 1. 실제 워커 파일 경로 계산
+                    const workerSourcePath = path.resolve(path.dirname(args.path), relPath);
+                    // 확장자가 없을 경우 자동 탐색 (js, ts 등)
+                    const resolvedWorkerPath = resolveFile(workerSourcePath);
+                    if (resolvedWorkerPath == null) {
+                        // 파일이 없으면 건드리지 않음 (런타임 에러로 넘김)
+                        return match;
+                    }
+                    // 2. 출력될 워커 파일명 결정 (캐싱 및 중복 방지를 위해 해시 사용 권장)
+                    // 예: dist/workers/protocol.worker-X7A8B9.js
+                    const fileContent = await FsUtils.readFileBufferAsync(resolvedWorkerPath);
+                    const hash = HashUtils.get(fileContent).substring(0, 8);
+                    const workerBaseName = path.basename(resolvedWorkerPath, path.extname(resolvedWorkerPath));
+                    const outputFileName = `${workerBaseName}-${hash}.js`;
+                    const outputFilePath = path.join(outdir, "workers", outputFileName);
+                    // 3. 워커 파일 빌드 (존재하지 않거나 변경되었을 때만)
+                    // (간단하게 하기 위해 매번 빌드 시도하거나, 해시로 체크 가능. 여기선 esbuild 증분 빌드에 맡김)
+                    // *중요*: 워커도 번들링해야 함.
+                    await esbuild.build({
+                        ...build.initialOptions,
+                        plugins: build.initialOptions.plugins?.filter((item) => item.name !== "sd-worker-path-plugin" &&
+                            item.name !== "sd-ng-plugin" &&
+                            item.name !== "sd-server-plugin") ?? [],
+                        outdir: undefined,
+                        entryPoints: [resolvedWorkerPath],
+                        bundle: true,
+                        write: true,
+                        splitting: false,
+                        outfile: outputFilePath,
+                        // platform: build.initialOptions.platform,
+                        // target: build.initialOptions.target,
+                        // format: build.initialOptions.format,
+                        // minify: build.initialOptions.minify,
+                        // banner: build.initialOptions.banner,
+                        // sourcemap: build.initialOptions.sourcemap,
+                        // external: build.initialOptions.external, // 외부 의존성 설정 상속
+                        // 플러그인 상속 주의: 무한 루프 방지를 위해 이 플러그인은 제외해야 함
+                    });
+                    // 4. 경로 치환
+                    // 번들링된 메인 파일(dist/main.js) 기준으로 workers 폴더는 ./workers/ 임
+                    return `import.meta.resolve(${quote}./workers/${outputFileName}${quote})`;
+                });
+                return {
+                    contents: newSource,
+                    loader: "ts", // 또는 js, 파일 확장자에 따라 다르게 처리 가능하나 보통 ts로 넘겨도 됨
+                    // 워커 파일이 변경되면 이 파일도 다시 빌드되어야 함을 알림
+                    // (정확히 하려면 워커의 의존성까지 다 넣어야 하지만, 최소한 워커 엔트리는 넣음)
+                    // watchFiles: ... (esbuild가 내부적으로 처리해주길 기대)
+                };
+            });
+        },
+    };
+}
+// 정규식 비동기 replace 헬퍼
+async function replaceAsync(str, regex, asyncFn) {
+    const promises = [];
+    str.replace(regex, (match, ...args) => {
+        promises.push(asyncFn(match, ...args));
+        return match;
+    });
+    const data = await Promise.all(promises);
+    return str.replace(regex, () => data.shift());
+}
+// 파일 확장자 찾기 헬퍼
+function resolveFile(filePathWithoutExt) {
+    if (FsUtils.exists(filePathWithoutExt))
+        return filePathWithoutExt;
+    const exts = [".ts", ".js", ".mjs", ".cjs"];
+    for (const ext of exts) {
+        const p = filePathWithoutExt + ext;
+        if (FsUtils.exists(p))
+            return p;
+    }
+    return undefined;
+}

package/dist/pkg-builders/lib/SdCliIndexFileGenerator.js

@@ -69,7 +69,9 @@ export class SdCliIndexFileGenerator {
             indexFilePath,
             path.resolve(pkgPath, "src/**/*.d.ts"),
             path.resolve(pkgPath, "src/index.ts"),
-            /*path.resolve(pkgPath, "src/internal/!**!/!*{.ts,.tsx}"),*/
+            path.resolve(pkgPath, "src/workers/**/*{.ts,.tsx}"),
+            // TODO: index에 없는 파일은 watch가 안됨... 처리 필요함.
+            // path.resolve(pkgPath, "src/internal/**/*{.ts,.tsx}"),
         ].map((item) => item.replace(/\\/g, "/"));
     }
 }

package/dist/pkg-builders/server/SdServerBuildRunner.js

@@ -6,7 +6,7 @@ import { SdServerBundler } from "./SdServerBundler";
 export class SdServerBuildRunner extends SdBuildRunnerBase {
     constructor() {
         super(...arguments);
-        this._logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBuild2Runner"]);
+        this._logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBuildRunner"]);
     }
     #serverBundler;
     async _runAsync(modifiedFileSet) {

package/dist/pkg-builders/server/SdServerBundler.js

@@ -6,6 +6,7 @@ import { createSdServerPlugin } from "./createSdServerPlugin";
 import { BuildOutputFileType, } from "@angular/build/src/tools/esbuild/bundler-context";
 import { convertOutputFile } from "@angular/build/src/tools/esbuild/utils";
 import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
+import { SdWorkerPathPlugin } from "../commons/SdWorkerPathPlugin";
 export class SdServerBundler {
     #logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBundler"]);
     #context;
@@ -19,7 +20,7 @@ export class SdServerBundler {
         this.#esbuildOptions = {
             entryPoints: [
                 path.resolve(this._opt.pkgPath, "src/main.ts"),
-                ...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
+                // ...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
             ],
             keepNames: true,
             bundle: true,
@@ -78,7 +79,10 @@ 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),
+                SdWorkerPathPlugin(path.resolve(this._opt.pkgPath, "dist")),
+            ],
         };
     }
     async bundleAsync(modifiedFileSet) {

package/dist/pkg-builders/server/createSdServerPlugin.js

@@ -3,7 +3,7 @@ import { PathUtils } from "@simplysm/sd-core-node";
 import { SdTsCompiler } from "../../ts-compiler/SdTsCompiler";
 export function createSdServerPlugin(conf, modifiedFileSet, resultCache) {
     return {
-        name: "sd-server-compile",
+        name: "sd-server-plugin",
         setup: (build) => {
             const tsCompiler = new SdTsCompiler(conf, true);
             let tsCompileResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplysm/sd-cli",
-  "version": "12.15.37",
+  "version": "12.15.39",
   "description": "심플리즘 패키지 - CLI",
   "author": "김석래",
   "repository": {
@@ -17,10 +17,10 @@
     "@angular/compiler-cli": "^20.3.15",
     "@anthropic-ai/sdk": "^0.71.0",
     "@electron/rebuild": "^4.0.1",
-    "@simplysm/sd-core-common": "12.15.37",
-    "@simplysm/sd-core-node": "12.15.37",
-    "@simplysm/sd-service-server": "12.15.37",
-    "@simplysm/sd-storage": "12.15.37",
+    "@simplysm/sd-core-common": "12.15.39",
+    "@simplysm/sd-core-node": "12.15.39",
+    "@simplysm/sd-service-server": "12.15.39",
+    "@simplysm/sd-storage": "12.15.39",
     "browserslist": "^4.28.0",
     "cordova": "^13.0.0",
     "electron": "^39.2.4",

package/src/pkg-builders/client/SdNgBundler.ts

@@ -40,6 +40,7 @@ import { ISdCliNgPluginResultCache } from "../../types/plugin/ISdCliNgPluginResu
 import { INpmConfig } from "../../types/common-config/INpmConfig";
 import { ISdBuildResult } from "../../types/build/ISdBuildResult";
 import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
+import { SdWorkerPathPlugin } from "../commons/SdWorkerPathPlugin";
 
 export class SdNgBundler {
   #logger = SdLogger.get(["simplysm", "sd-cli", "SdNgBundler"]);
@@ -109,8 +110,8 @@ export class SdNgBundler {
     this.#debug(`Preparing build contexts...`);
 
     if (!this.#contexts) {
-      this.#contexts = await perf.run("Preparing build contexts", async () => [
-        await this.#getAppContextAsync(),
+      this.#contexts = perf.run("Preparing build contexts", () => [
+        this.#getAppContext(),
         ...(FsUtils.exists(path.resolve(this._opt.pkgPath, "src/styles.scss"))
           ? [this.#getStyleContext()]
           : []),
@@ -440,10 +441,10 @@ export class SdNgBundler {
     );
   }
 
-  async #getAppContextAsync() {
-    const workerEntries = (
-      await FsUtils.globAsync(path.resolve(this._opt.pkgPath, "src/workers/*.ts"))
-    ).toObject((p) => "workers/" + path.basename(p, path.extname(p)));
+  #getAppContext() {
+    /*const workerEntries = (
+      await FsUtils.globAsync(path.resolve(this._opt.pkgPath, "src/workers/!*.ts"))
+    ).toObject((p) => "workers/" + path.basename(p, path.extname(p)));*/
 
     return new SdNgBundlerContext(this._opt.pkgPath, !!this._opt.watch, {
       absWorkingDir: this._opt.pkgPath,
@@ -500,7 +501,7 @@ export class SdNgBundler {
             }
           : {}),
 
-        ...workerEntries,
+        // ...workerEntries,
       },
       supported: { "async-await": false, "object-rest-spread": false },
       loader: {
@@ -557,6 +558,7 @@ export class SdNgBundler {
         ...(this._conf.builderType === "electron"
           ? []
           : [nodeStdLibBrowserPlugin(nodeStdLibBrowser)]),
+        SdWorkerPathPlugin(path.resolve(this._opt.pkgPath, "dist")),
         // {
         //   name: "log-circular",
         //   setup(build) {

package/src/pkg-builders/client/createSdNgPlugin.ts

@@ -23,7 +23,7 @@ export function createSdNgPlugin(
   };
 
   return {
-    name: "sd-ng-compile",
+    name: "sd-ng-plugin",
     setup: (build: esbuild.PluginBuild) => {
       const tsCompiler = new SdTsCompiler(opt, true);
 

package/src/pkg-builders/commons/SdWorkerPathPlugin.ts

@@ -0,0 +1,118 @@
+import esbuild from "esbuild";
+import path from "path";
+import { FsUtils, HashUtils } from "@simplysm/sd-core-node";
+
+export function SdWorkerPathPlugin(outdir: string): esbuild.Plugin {
+  return {
+    name: "sd-worker-path-plugin",
+    setup(build) {
+      build.onLoad({ filter: /\.[cm]?[jt]s$/ }, async (args) => {
+        const originalSource = await FsUtils.readFileAsync(args.path);
+
+        // 정규식: import.meta.resolve('...') 또는 "..." 캡쳐
+        // 워커 파일뿐만 아니라 필요한 모든 리소스를 처리할 수 있지만, 일단 worker만 타겟팅
+        const regex = /import\.meta\.resolve\(\s*(['"])([^'"]+?\.worker)(?:\.[a-z]+)?\1\s*\)/g;
+
+        if (!regex.test(originalSource)) {
+          return null;
+        }
+
+        // 매칭되는 모든 import.meta.resolve를 찾아서 처리
+        const newSource = await replaceAsync(
+          originalSource,
+          regex,
+          async (match, quote, relPath) => {
+            // 1. 실제 워커 파일 경로 계산
+            const workerSourcePath = path.resolve(path.dirname(args.path), relPath);
+
+            // 확장자가 없을 경우 자동 탐색 (js, ts 등)
+            const resolvedWorkerPath = resolveFile(workerSourcePath);
+            if (resolvedWorkerPath == null) {
+              // 파일이 없으면 건드리지 않음 (런타임 에러로 넘김)
+              return match;
+            }
+
+            // 2. 출력될 워커 파일명 결정 (캐싱 및 중복 방지를 위해 해시 사용 권장)
+            // 예: dist/workers/protocol.worker-X7A8B9.js
+            const fileContent = await FsUtils.readFileBufferAsync(resolvedWorkerPath);
+            const hash = HashUtils.get(fileContent).substring(0, 8);
+            const workerBaseName = path.basename(
+              resolvedWorkerPath,
+              path.extname(resolvedWorkerPath),
+            );
+            const outputFileName = `${workerBaseName}-${hash}.js`;
+            const outputFilePath = path.join(outdir, "workers", outputFileName);
+
+            // 3. 워커 파일 빌드 (존재하지 않거나 변경되었을 때만)
+            // (간단하게 하기 위해 매번 빌드 시도하거나, 해시로 체크 가능. 여기선 esbuild 증분 빌드에 맡김)
+            // *중요*: 워커도 번들링해야 함.
+            await esbuild.build({
+              ...build.initialOptions,
+              plugins:
+                build.initialOptions.plugins?.filter(
+                  (item) =>
+                    item.name !== "sd-worker-path-plugin" &&
+                    item.name !== "sd-ng-plugin" &&
+                    item.name !== "sd-server-plugin",
+                ) ?? [],
+              outdir: undefined,
+
+              entryPoints: [resolvedWorkerPath],
+              bundle: true,
+              write: true,
+              splitting: false,
+              outfile: outputFilePath,
+              // platform: build.initialOptions.platform,
+              // target: build.initialOptions.target,
+              // format: build.initialOptions.format,
+              // minify: build.initialOptions.minify,
+              // banner: build.initialOptions.banner,
+              // sourcemap: build.initialOptions.sourcemap,
+              // external: build.initialOptions.external, // 외부 의존성 설정 상속
+              // 플러그인 상속 주의: 무한 루프 방지를 위해 이 플러그인은 제외해야 함
+            });
+
+            // 4. 경로 치환
+            // 번들링된 메인 파일(dist/main.js) 기준으로 workers 폴더는 ./workers/ 임
+            return `import.meta.resolve(${quote}./workers/${outputFileName}${quote})`;
+          },
+        );
+
+        return {
+          contents: newSource,
+          loader: "ts", // 또는 js, 파일 확장자에 따라 다르게 처리 가능하나 보통 ts로 넘겨도 됨
+          // 워커 파일이 변경되면 이 파일도 다시 빌드되어야 함을 알림
+          // (정확히 하려면 워커의 의존성까지 다 넣어야 하지만, 최소한 워커 엔트리는 넣음)
+          // watchFiles: ... (esbuild가 내부적으로 처리해주길 기대)
+        };
+      });
+    },
+  };
+}
+
+// 정규식 비동기 replace 헬퍼
+async function replaceAsync(
+  str: string,
+  regex: RegExp,
+  asyncFn: (match: string, ...args: any[]) => Promise<string>,
+) {
+  const promises: Promise<string>[] = [];
+  str.replace(regex, (match, ...args) => {
+    promises.push(asyncFn(match, ...args));
+    return match;
+  });
+  const data = await Promise.all(promises);
+  return str.replace(regex, () => data.shift()!);
+}
+
+// 파일 확장자 찾기 헬퍼
+function resolveFile(filePathWithoutExt: string): string | undefined {
+  if (FsUtils.exists(filePathWithoutExt)) return filePathWithoutExt;
+
+  const exts = [".ts", ".js", ".mjs", ".cjs"];
+  for (const ext of exts) {
+    const p = filePathWithoutExt + ext;
+    if (FsUtils.exists(p)) return p;
+  }
+  return undefined;
+}

package/src/pkg-builders/lib/SdCliIndexFileGenerator.ts

@@ -83,7 +83,10 @@ export class SdCliIndexFileGenerator {
       indexFilePath,
       path.resolve(pkgPath, "src/**/*.d.ts"),
       path.resolve(pkgPath, "src/index.ts"),
-      /*path.resolve(pkgPath, "src/internal/!**!/!*{.ts,.tsx}"),*/
+      path.resolve(pkgPath, "src/workers/**/*{.ts,.tsx}"),
+
+      // TODO: index에 없는 파일은 watch가 안됨... 처리 필요함.
+      // path.resolve(pkgPath, "src/internal/**/*{.ts,.tsx}"),
     ].map((item) => item.replace(/\\/g, "/"));
   }
 }

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

@@ -7,7 +7,7 @@ import { ISdBuildResult } from "../../types/build/ISdBuildResult";
 import { INpmConfig } from "../../types/common-config/INpmConfig";
 
 export class SdServerBuildRunner extends SdBuildRunnerBase<"server"> {
-  protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBuild2Runner"]);
+  protected override _logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBuildRunner"]);
 
   #serverBundler?: SdServerBundler;
 

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

@@ -12,6 +12,7 @@ import { resolveAssets } from "@angular/build/src/utils/resolve-assets";
 import { ISdCliServerPluginResultCache } from "../../types/plugin/ISdCliServerPluginResultCache";
 import { ISdBuildResult } from "../../types/build/ISdBuildResult";
 import { ISdTsCompilerOptions } from "../../types/build/ISdTsCompilerOptions";
+import { SdWorkerPathPlugin } from "../commons/SdWorkerPathPlugin";
 
 export class SdServerBundler {
   #logger = SdLogger.get(["simplysm", "sd-cli", "SdServerBundler"]);
@@ -32,7 +33,7 @@ export class SdServerBundler {
     this.#esbuildOptions = {
       entryPoints: [
         path.resolve(this._opt.pkgPath, "src/main.ts"),
-        ...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
+        // ...FsUtils.glob(path.resolve(this._opt.pkgPath, "src/workers/*.ts")),
       ],
       keepNames: true,
       bundle: true,
@@ -91,7 +92,10 @@ 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),
+        SdWorkerPathPlugin(path.resolve(this._opt.pkgPath, "dist")),
+      ],
     };
   }
 

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

@@ -12,7 +12,7 @@ export function createSdServerPlugin(
   resultCache: ISdCliServerPluginResultCache,
 ): esbuild.Plugin {
   return {
-    name: "sd-server-compile",
+    name: "sd-server-plugin",
     setup: (build: esbuild.PluginBuild) => {
       const tsCompiler = new SdTsCompiler(conf, true);