@simplysm/sd-cli 13.0.11 → 13.0.13

package/src/builders/BaseBuilder.ts

@@ -1,6 +1,7 @@
 import { WorkerManager } from "../infra/WorkerManager";
-import type { ResultCollector } from "../infra/ResultCollector";
-import type { RebuildListrManager } from "../utils/listr-manager";
+import type { BuildResult, ResultCollector } from "../infra/ResultCollector";
+import type { RebuildManager } from "../utils/rebuild-manager";
+import type { BuildEventData, ErrorEventData } from "../utils/worker-events";
 import type { IBuilder, PackageInfo } from "./types";
 
 /**
@@ -12,7 +13,7 @@ import type { IBuilder, PackageInfo } from "./types";
 export abstract class BaseBuilder implements IBuilder {
   protected readonly workerManager: WorkerManager;
   protected readonly resultCollector: ResultCollector;
-  protected readonly rebuildManager: RebuildListrManager | undefined;
+  protected readonly rebuildManager: RebuildManager | undefined;
   protected readonly packages: PackageInfo[];
   protected readonly cwd: string;
   protected isWatchMode = false;
@@ -26,7 +27,7 @@ export abstract class BaseBuilder implements IBuilder {
     cwd: string;
     packages: PackageInfo[];
     resultCollector: ResultCollector;
-    rebuildManager?: RebuildListrManager;
+    rebuildManager?: RebuildManager;
   }) {
     this.cwd = options.cwd;
     this.packages = options.packages;
@@ -114,6 +115,72 @@ export abstract class BaseBuilder implements IBuilder {
     }
   }
 
+  /**
+   * 공통 Worker 이벤트 핸들러 등록 (buildStart, build, error)
+   *
+   * LibraryBuilder와 DtsBuilder에서 동일한 패턴의 이벤트 핸들러를
+   * 중복 없이 등록할 수 있도록 공통 로직을 제공한다.
+   *
+   * @param workerKey Worker 식별자 (예: "core-common:build")
+   * @param resultType BuildResult의 type 필드 값
+   * @param listrTitle 리빌드 시 표시할 제목
+   */
+  protected registerEventHandlersForWorker(
+    pkg: PackageInfo,
+    workerKey: string,
+    resultType: BuildResult["type"],
+    listrTitle: string,
+  ): void {
+    const worker = this.workerManager.get(workerKey)!;
+
+    // 초기 빌드 여부 추적
+    let isInitialBuild = true;
+
+    // 빌드 시작 (리빌드 시)
+    worker.on("buildStart", () => {
+      if (!isInitialBuild && this.rebuildManager != null) {
+        const resolver = this.rebuildManager.registerBuild(workerKey, listrTitle);
+        this.buildResolvers.set(workerKey, resolver);
+      }
+    });
+
+    // 빌드 완료
+    worker.on("build", (data) => {
+      const event = data as BuildEventData;
+      const result: BuildResult = {
+        name: pkg.name,
+        target: pkg.config.target,
+        type: resultType,
+        status: event.success ? "success" : "error",
+        message: event.errors?.join("\n"),
+      };
+      this.resultCollector.add(result);
+
+      if (isInitialBuild) {
+        isInitialBuild = false;
+      }
+      this.completeBuild(pkg);
+    });
+
+    // 에러
+    worker.on("error", (data) => {
+      const event = data as ErrorEventData;
+      const result: BuildResult = {
+        name: pkg.name,
+        target: pkg.config.target,
+        type: resultType,
+        status: "error",
+        message: event.message,
+      };
+      this.resultCollector.add(result);
+
+      if (isInitialBuild) {
+        isInitialBuild = false;
+      }
+      this.completeBuild(pkg);
+    });
+  }
+
   /**
    * Builder 타입 (결과 키 생성용)
    */

package/src/builders/DtsBuilder.ts

@@ -1,7 +1,6 @@
 import type * as DtsWorkerModule from "../workers/dts.worker";
 import type { BuildResult } from "../infra/ResultCollector";
 import type { TypecheckEnv } from "../utils/tsconfig";
-import type { BuildEventData, ErrorEventData } from "../utils/worker-events";
 import { BaseBuilder } from "./BaseBuilder";
 import type { PackageInfo } from "./types";
 
@@ -40,55 +39,9 @@ export class DtsBuilder extends BaseBuilder {
 
   protected registerEventHandlers(): void {
     for (const pkg of this.packages) {
-      const worker = this.workerManager.get<typeof DtsWorkerModule>(`${pkg.name}:dts`)!;
-      const resultKey = `${pkg.name}:dts`;
+      const workerKey = `${pkg.name}:dts`;
       const listrTitle = `${pkg.name} (dts)`;
-
-      let isInitialBuild = true;
-
-      // 빌드 시작 (리빌드 시)
-      worker.on("buildStart", () => {
-        if (!isInitialBuild && this.rebuildManager != null) {
-          const resolver = this.rebuildManager.registerBuild(resultKey, listrTitle);
-          this.buildResolvers.set(resultKey, resolver);
-        }
-      });
-
-      // 빌드 완료
-      worker.on("build", (data) => {
-        const event = data as BuildEventData;
-        const result: BuildResult = {
-          name: pkg.name,
-          target: pkg.config.target,
-          type: "dts",
-          status: event.success ? "success" : "error",
-          message: event.errors?.join("\n"),
-        };
-        this.resultCollector.add(result);
-
-        if (isInitialBuild) {
-          isInitialBuild = false;
-        }
-        this.completeBuild(pkg);
-      });
-
-      // 에러
-      worker.on("error", (data) => {
-        const event = data as ErrorEventData;
-        const result: BuildResult = {
-          name: pkg.name,
-          target: pkg.config.target,
-          type: "dts",
-          status: "error",
-          message: event.message,
-        };
-        this.resultCollector.add(result);
-
-        if (isInitialBuild) {
-          isInitialBuild = false;
-        }
-        this.completeBuild(pkg);
-      });
+      this.registerEventHandlersForWorker(pkg, workerKey, "dts", listrTitle);
     }
   }
 

package/src/builders/LibraryBuilder.ts

@@ -1,7 +1,6 @@
 import type * as LibraryWorkerModule from "../workers/library.worker";
 import type { BuildResult } from "../infra/ResultCollector";
 import type { SdBuildPackageConfig } from "../sd-config.types";
-import type { BuildEventData, ErrorEventData } from "../utils/worker-events";
 import { BaseBuilder } from "./BaseBuilder";
 import type { PackageInfo } from "./types";
 
@@ -31,57 +30,9 @@ export class LibraryBuilder extends BaseBuilder {
 
   protected registerEventHandlers(): void {
     for (const pkg of this.packages) {
-      const worker = this.workerManager.get<typeof LibraryWorkerModule>(`${pkg.name}:build`)!;
-      const resultKey = `${pkg.name}:build`;
+      const workerKey = `${pkg.name}:build`;
       const listrTitle = `${pkg.name} (${pkg.config.target})`;
-
-      // 초기 빌드 여부 추적
-      let isInitialBuild = true;
-
-      // 빌드 시작 (리빌드 시)
-      worker.on("buildStart", () => {
-        if (!isInitialBuild && this.rebuildManager != null) {
-          // 리빌드 시 RebuildListrManager에 등록
-          const resolver = this.rebuildManager.registerBuild(resultKey, listrTitle);
-          this.buildResolvers.set(resultKey, resolver);
-        }
-      });
-
-      // 빌드 완료
-      worker.on("build", (data) => {
-        const event = data as BuildEventData;
-        const result: BuildResult = {
-          name: pkg.name,
-          target: pkg.config.target,
-          type: "build",
-          status: event.success ? "success" : "error",
-          message: event.errors?.join("\n"),
-        };
-        this.resultCollector.add(result);
-
-        if (isInitialBuild) {
-          isInitialBuild = false;
-        }
-        this.completeBuild(pkg);
-      });
-
-      // 에러
-      worker.on("error", (data) => {
-        const event = data as ErrorEventData;
-        const result: BuildResult = {
-          name: pkg.name,
-          target: pkg.config.target,
-          type: "build",
-          status: "error",
-          message: event.message,
-        };
-        this.resultCollector.add(result);
-
-        if (isInitialBuild) {
-          isInitialBuild = false;
-        }
-        this.completeBuild(pkg);
-      });
+      this.registerEventHandlersForWorker(pkg, workerKey, "build", listrTitle);
     }
   }
 

package/src/builders/types.ts

@@ -1,6 +1,6 @@
 import type { SdPackageConfig } from "../sd-config.types";
 import type { ResultCollector } from "../infra/ResultCollector";
-import type { RebuildListrManager } from "../utils/listr-manager";
+import type { RebuildManager } from "../utils/rebuild-manager";
 
 /**
  * 패키지 정보
@@ -18,7 +18,7 @@ export interface BuilderOptions {
   cwd: string;
   packages: PackageInfo[];
   resultCollector: ResultCollector;
-  rebuildManager?: RebuildListrManager;
+  rebuildManager?: RebuildManager;
 }
 
 /**

package/src/capacitor/capacitor.ts

@@ -668,7 +668,8 @@ export default config;
 
     // versionName, versionCode 설정
     const version = this._npmConfig.version;
-    const versionParts = version.split(".");
+    const cleanVersion = version.replace(/-.*$/, "");
+    const versionParts = cleanVersion.split(".");
     const versionCode =
       parseInt(versionParts[0] ?? "0") * 10000 +
       parseInt(versionParts[1] ?? "0") * 100 +

package/src/commands/add-client.ts

@@ -5,6 +5,7 @@ import { consola } from "consola";
 import { renderTemplateDir } from "../utils/template";
 import { addPackageToSdConfig, addTailwindToEslintConfig } from "../utils/config-editor";
 import { spawn } from "../utils/spawn";
+import { findPackageRoot } from "../utils/package-utils";
 
 //#region Types
 
@@ -16,20 +17,6 @@ export interface AddClientOptions {}
 //#endregion
 
 //#region Utilities
-
-/**
- * import.meta.dirname에서 상위로 올라가며 package.json을 찾아 패키지 루트를 반환한다.
- */
-function findPackageRoot(startDir: string): string {
-  let dir = startDir;
-  while (!fs.existsSync(path.join(dir, "package.json"))) {
-    const parent = path.dirname(dir);
-    if (parent === dir) throw new Error("package.json을 찾을 수 없습니다.");
-    dir = parent;
-  }
-  return dir;
-}
-
 //#endregion
 
 //#region Main

package/src/commands/add-server.ts

@@ -5,6 +5,7 @@ import { consola } from "consola";
 import { renderTemplateDir } from "../utils/template";
 import { addPackageToSdConfig, setClientServerInSdConfig } from "../utils/config-editor";
 import { spawn } from "../utils/spawn";
+import { findPackageRoot } from "../utils/package-utils";
 
 //#region Types
 
@@ -17,19 +18,6 @@ export interface AddServerOptions {}
 
 //#region Utilities
 
-/**
- * import.meta.dirname에서 상위로 올라가며 package.json을 찾아 패키지 루트를 반환한다.
- */
-function findPackageRoot(startDir: string): string {
-  let dir = startDir;
-  while (!fs.existsSync(path.join(dir, "package.json"))) {
-    const parent = path.dirname(dir);
-    if (parent === dir) throw new Error("package.json을 찾을 수 없습니다.");
-    dir = parent;
-  }
-  return dir;
-}
-
 /**
  * sd.config.ts를 읽어서 target이 "client"인 패키지명 목록을 반환한다.
  */