@simplysm/sd-cli 13.0.66 → 13.0.68

package/src/commands/check.ts

@@ -1,5 +1,6 @@
-import { spawn as cpSpawn } from "child_process";
+import { execa } from "execa";
 import { Worker, type WorkerProxy } from "@simplysm/core-node";
+import { errorMessage } from "@simplysm/core-common";
 import { executeTypecheck, type TypecheckResult } from "./typecheck";
 import type { LintResult } from "./lint";
 import type * as LintWorkerModule from "../workers/lint.worker";
@@ -26,49 +27,35 @@ interface CheckResult {
 
 //#region Utilities
 
-function spawnVitest(targets: string[]): Promise<CheckResult> {
-  return new Promise((resolve) => {
+async function spawnVitest(targets: string[]): Promise<CheckResult> {
+  try {
     const args = ["vitest", ...targets, "--run"];
-    const child = cpSpawn("pnpm", args, {
-      cwd: process.cwd(),
-      shell: true,
-      stdio: "pipe",
-    });
-
-    let output = "";
-    child.stdout.on("data", (d: Uint8Array) => {
-      output += new TextDecoder().decode(d);
-    });
-    child.stderr.on("data", (d: Uint8Array) => {
-      output += new TextDecoder().decode(d);
-    });
-
-    child.on("close", (code) => {
-      const failMatch =
-        output.match(/(\d+)\s+tests?\s+failed/i) ??
-        output.match(/Tests\s+(\d+)\s+failed/i) ??
-        output.match(/(\d+)\s+fail/i);
-      const failCount = failMatch ? Number(failMatch[1]) : 0;
-
-      resolve({
-        name: "TEST",
-        success: code === 0,
-        errorCount: failCount,
-        warningCount: 0,
-        formattedOutput: code === 0 ? "" : output,
-      });
-    });
-
-    child.on("error", (err) => {
-      resolve({
-        name: "TEST",
-        success: false,
-        errorCount: 1,
-        warningCount: 0,
-        formattedOutput: err.message,
-      });
-    });
-  });
+    const result = await execa("pnpm", args, { cwd: process.cwd(), reject: false });
+    const output = result.stdout + result.stderr;
+    const code = result.exitCode;
+
+    const failMatch =
+      output.match(/(\d+)\s+tests?\s+failed/i) ??
+      output.match(/Tests\s+(\d+)\s+failed/i) ??
+      output.match(/(\d+)\s+fail/i);
+    const failCount = failMatch ? Number(failMatch[1]) : 0;
+
+    return {
+      name: "TEST",
+      success: code === 0,
+      errorCount: failCount,
+      warningCount: 0,
+      formattedOutput: code === 0 ? "" : output,
+    };
+  } catch (err) {
+    return {
+      name: "TEST",
+      success: false,
+      errorCount: 1,
+      warningCount: 0,
+      formattedOutput: errorMessage(err),
+    };
+  }
 }
 
 function formatSection(result: CheckResult): string {
@@ -154,7 +141,7 @@ export async function runCheck(options: CheckOptions): Promise<void> {
       success: false,
       errorCount: 1,
       warningCount: 0,
-      formattedOutput: r.reason instanceof Error ? r.reason.message : String(r.reason),
+      formattedOutput: errorMessage(r.reason),
     };
   });
 

package/src/commands/dev.ts

@@ -1,14 +1,5 @@
 import { DevOrchestrator, type DevOrchestratorOptions } from "../orchestrators/DevOrchestrator";
 
-/**
- * Dev 명령 옵션 (하위 호환성)
- */
-export interface DevOptions {
-  /** dev할 패키지 필터 (빈 배열이면 모든 패키지) */
-  targets: string[];
-  options: string[];
-}
-
 /**
  * Client 및 Server 패키지를 개발 모드로 실행한다.
  *
@@ -22,13 +13,8 @@ export interface DevOptions {
  * @param options - dev 실행 옵션
  * @returns 종료 시그널 수신 시 resolve
  */
-export async function runDev(options: DevOptions): Promise<void> {
-  const orchestratorOptions: DevOrchestratorOptions = {
-    targets: options.targets,
-    options: options.options,
-  };
-
-  const orchestrator = new DevOrchestrator(orchestratorOptions);
+export async function runDev(options: DevOrchestratorOptions): Promise<void> {
+  const orchestrator = new DevOrchestrator(options);
 
   try {
     await orchestrator.initialize();

package/src/commands/init.ts

@@ -2,7 +2,7 @@ import path from "path";
 import fs from "fs";
 import { consola } from "consola";
 import { renderTemplateDir } from "../utils/template";
-import { spawn } from "../utils/spawn";
+import { execa } from "execa";
 import { findPackageRoot } from "../utils/package-utils";
 
 //#region Types
@@ -69,14 +69,14 @@ export async function runInit(_options: InitOptions): Promise<void> {
 
   // 4. pnpm install
   logger.info("pnpm install 실행 중...");
-  await spawn("pnpm", ["install"], { cwd });
+  await execa("pnpm", ["install"], { cwd });
   logger.success("pnpm install 완료");
 
   // 5. git 초기화
   logger.info("git 저장소 초기화 중...");
-  await spawn("git", ["init"], { cwd });
-  await spawn("git", ["add", "."], { cwd });
-  await spawn("git", ["commit", "-m", "init"], { cwd });
+  await execa("git", ["init"], { cwd });
+  await execa("git", ["add", "."], { cwd });
+  await execa("git", ["commit", "-m", "init"], { cwd });
   logger.success("git 저장소 초기화 완료");
 
   // 6. 완료 메시지

package/src/commands/publish.ts

@@ -7,7 +7,7 @@ import { env, jsonStringify } from "@simplysm/core-common";
 import "@simplysm/core-common";
 import type { SdConfig, SdPublishConfig } from "../sd-config.types";
 import { loadSdConfig } from "../utils/sd-config";
-import { spawn } from "../utils/spawn";
+import { execa } from "execa";
 import { runBuild } from "./build";
 import { parseWorkspaceGlobs } from "../utils/replace-deps";
 import os from "os";
@@ -352,7 +352,7 @@ async function publishPackage(
       logger.debug(`[${pkgName}] pnpm ${args.join(" ")}`);
     }
 
-    await spawn("pnpm", args, { cwd: pkgPath });
+    await execa("pnpm", args, { cwd: pkgPath });
   } else if (publishConfig.type === "local-directory") {
     // 로컬 디렉토리 복사
     const targetPath = replaceEnvVariables(publishConfig.path, version, projectPath);
@@ -558,7 +558,7 @@ export async function runPublish(options: PublishOptions): Promise<void> {
   if (publishPackages.some((p) => p.config === "npm")) {
     logger.debug("npm 인증 확인...");
     try {
-      const whoami = await spawn("npm", ["whoami"]);
+      const { stdout: whoami } = await execa("npm", ["whoami"]);
       if (whoami.trim() === "") {
         throw new Error("npm 로그인 정보가 없습니다.");
       }
@@ -588,13 +588,13 @@ export async function runPublish(options: PublishOptions): Promise<void> {
   if (!noBuild && hasGit) {
     logger.debug("Git 커밋 여부 확인...");
     try {
-      const diff = await spawn("git", ["diff", "--name-only"]);
-      const stagedDiff = await spawn("git", ["diff", "--cached", "--name-only"]);
+      const { stdout: diff } = await execa("git", ["diff", "--name-only"]);
+      const { stdout: stagedDiff } = await execa("git", ["diff", "--cached", "--name-only"]);
 
       if (diff.trim() !== "" || stagedDiff.trim() !== "") {
         logger.info("커밋되지 않은 변경사항 감지. claude 자동 커밋 시도...");
         try {
-          await spawn("claude", [
+          await execa("claude", [
             "-p",
             "/sd-commit all",
             "--dangerously-skip-permissions",
@@ -609,8 +609,8 @@ export async function runPublish(options: PublishOptions): Promise<void> {
         }
 
         // 커밋 후 재확인
-        const recheckDiff = await spawn("git", ["diff", "--name-only"]);
-        const recheckStaged = await spawn("git", ["diff", "--cached", "--name-only"]);
+        const { stdout: recheckDiff } = await execa("git", ["diff", "--name-only"]);
+        const { stdout: recheckStaged } = await execa("git", ["diff", "--cached", "--name-only"]);
         if (recheckDiff.trim() !== "" || recheckStaged.trim() !== "") {
           throw new Error(
             "자동 커밋 후에도 미커밋 변경사항이 남아있습니다.\n" + recheckDiff + recheckStaged,
@@ -687,18 +687,18 @@ export async function runPublish(options: PublishOptions): Promise<void> {
         logger.info(`[DRY-RUN] git commit -m "v${version}"`);
         logger.info(`[DRY-RUN] git tag -a v${version} -m "v${version}"`);
         logger.info("[DRY-RUN] git push --dry-run");
-        await spawn("git", ["push", "--dry-run"]);
+        await execa("git", ["push", "--dry-run"]);
         logger.info("[DRY-RUN] git push --tags --dry-run");
-        await spawn("git", ["push", "--tags", "--dry-run"]);
+        await execa("git", ["push", "--tags", "--dry-run"]);
         logger.info("[DRY-RUN] Git 작업 시뮬레이션 완료");
       } else {
         logger.debug("Git 커밋/태그/푸시...");
         try {
-          await spawn("git", ["add", ..._changedFiles]);
-          await spawn("git", ["commit", "-m", `v${version}`]);
-          await spawn("git", ["tag", "-a", `v${version}`, "-m", `v${version}`]);
-          await spawn("git", ["push"]);
-          await spawn("git", ["push", "--tags"]);
+          await execa("git", ["add", ..._changedFiles]);
+          await execa("git", ["commit", "-m", `v${version}`]);
+          await execa("git", ["tag", "-a", `v${version}`, "-m", `v${version}`]);
+          await execa("git", ["push"]);
+          await execa("git", ["push", "--tags"]);
           logger.debug("Git 작업 완료");
         } catch (err) {
           logger.error(
@@ -812,7 +812,7 @@ export async function runPublish(options: PublishOptions): Promise<void> {
           logger.info(`[DRY-RUN] 실행 예정: ${cmd} ${args.join(" ")}`);
         } else {
           logger.debug(`실행: ${cmd} ${args.join(" ")}`);
-          await spawn(cmd, args, { cwd });
+          await execa(cmd, args, { cwd });
         }
       } catch (err) {
         // postPublish 실패 시 경고만 출력 (배포 롤백 불가)

package/src/commands/typecheck.ts

@@ -2,7 +2,7 @@ import ts from "typescript";
 import path from "path";
 import os from "os";
 import { pathPosix, pathFilterByTargets, Worker, type WorkerProxy } from "@simplysm/core-node";
-import "@simplysm/core-common";
+import { errorMessage } from "@simplysm/core-common";
 import { consola } from "consola";
 import type { SdConfig } from "../sd-config.types";
 import { parseRootTsconfig, type TypecheckEnv } from "../utils/tsconfig";
@@ -202,7 +202,7 @@ export async function executeTypecheck(options: TypecheckOptions): Promise<Typec
   try {
     parsedConfig = parseRootTsconfig(cwd);
   } catch (err) {
-    logger.error(err instanceof Error ? err.message : String(err));
+    logger.error(errorMessage(err));
     return { success: false, errorCount: 1, warningCount: 0, formattedOutput: "" };
   }
 
@@ -274,7 +274,7 @@ export async function executeTypecheck(options: TypecheckOptions): Promise<Typec
 
         logger.debug(`[${task.displayName}] 타입체크 시작`);
         try {
-          const result = await worker.buildDts(task.buildInfo);
+          const result = await worker.build(task.buildInfo);
           allResults.push({ displayName: task.displayName, result });
           if (result.success) {
             logger.debug(`[${task.displayName}] 타입체크 완료`);
@@ -283,13 +283,13 @@ export async function executeTypecheck(options: TypecheckOptions): Promise<Typec
           }
         } catch (err) {
           logger.error(`Worker 오류: ${task.displayName}`, {
-            error: err instanceof Error ? err.message : String(err),
+            error: errorMessage(err),
           });
           allResults.push({
             displayName: task.displayName,
             result: {
               success: false,
-              errors: [err instanceof Error ? err.message : String(err)],
+              errors: [errorMessage(err)],
               diagnostics: [],
               errorCount: 1,
               warningCount: 0,

package/src/commands/watch.ts

@@ -4,14 +4,6 @@ import {
   type WatchOrchestratorOptions,
 } from "../orchestrators/WatchOrchestrator";
 
-/**
- * Watch 명령 옵션 (하위 호환성)
- */
-export interface WatchOptions {
-  targets: string[];
-  options: string[];
-}
-
 /**
  * Library 패키지를 watch 모드로 빌드한다.
  *
@@ -23,13 +15,8 @@ export interface WatchOptions {
  * @param options - watch 실행 옵션
  * @returns 종료 시그널 수신 시 resolve
  */
-export async function runWatch(options: WatchOptions): Promise<void> {
-  const orchestratorOptions: WatchOrchestratorOptions = {
-    targets: options.targets,
-    options: options.options,
-  };
-
-  const orchestrator = new WatchOrchestrator(orchestratorOptions);
+export async function runWatch(options: WatchOrchestratorOptions): Promise<void> {
+  const orchestrator = new WatchOrchestrator(options);
 
   try {
     await orchestrator.initialize();

package/src/electron/electron.ts

@@ -5,7 +5,7 @@ import module from "module";
 import { fsExists, fsMkdir, fsCopy, fsReaddir, fsReadJson, fsWriteJson } from "@simplysm/core-node";
 import { consola } from "consola";
 import type { SdElectronConfig } from "../sd-config.types";
-import { spawn } from "../utils/spawn";
+import { execa } from "execa";
 
 /**
  * package.json 타입
@@ -68,7 +68,7 @@ export class Electron {
     env?: Record<string, string>,
   ): Promise<string> {
     Electron._logger.debug(`실행 명령: ${cmd} ${args.join(" ")}`);
-    const result = await spawn(cmd, args, { cwd, env });
+    const { stdout: result } = await execa(cmd, args, { cwd, env: { ...process.env, ...env } });
     Electron._logger.debug(`실행 결과: ${result}`);
     return result;
   }

package/src/infra/ResultCollector.ts

@@ -36,42 +36,6 @@ export class ResultCollector {
     return this._results.get(key);
   }
 
-  /**
-   * 모든 결과 조회
-   */
-  getAll(): BuildResult[] {
-    return [...this._results.values()];
-  }
-
-  /**
-   * 에러 상태인 결과만 조회
-   */
-  getErrors(): BuildResult[] {
-    return this.getAll().filter((r) => r.status === "error");
-  }
-
-  /**
-   * 서버 상태인 결과만 조회
-   */
-  getServers(): BuildResult[] {
-    return this.getAll().filter((r) => r.type === "server" && r.status === "running");
-  }
-
-  /**
-   * 특정 타입의 결과만 조회
-   * @param type 결과 타입
-   */
-  getByType(type: BuildResult["type"]): BuildResult[] {
-    return this.getAll().filter((r) => r.type === type);
-  }
-
-  /**
-   * 결과 초기화
-   */
-  clear(): void {
-    this._results.clear();
-  }
-
   /**
    * 내부 Map 반환 (하위 호환성)
    */

package/src/orchestrators/BuildOrchestrator.ts

@@ -1,7 +1,7 @@
 import path from "path";
 import ts from "typescript";
 import { Worker, type WorkerProxy, fsRm } from "@simplysm/core-node";
-import "@simplysm/core-common";
+import { errorMessage } from "@simplysm/core-common";
 import { consola } from "consola";
 import type {
   SdConfig,
@@ -22,6 +22,7 @@ import type * as DtsWorkerModule from "../workers/dts.worker";
 import { Capacitor } from "../capacitor/capacitor";
 import { Electron } from "../electron/electron";
 import { copySrcFiles } from "../utils/copy-src";
+import { formatBuildMessages } from "../utils/output-utils";
 
 //#region Types
 
@@ -38,7 +39,7 @@ export interface BuildOrchestratorOptions {
 /**
  * 빌드 결과
  */
-interface BuildResult {
+interface BuildStepResult {
   name: string;
   target: string;
   type: "js" | "dts" | "vite" | "capacitor" | "electron";
@@ -206,7 +207,7 @@ export class BuildOrchestrator {
     const baseEnv = this._baseEnv!;
 
     // 결과 수집
-    const results: BuildResult[] = [];
+    const results: BuildStepResult[] = [];
     // 에러 추적 (객체로 래핑하여 콜백 내 수정 추적 가능하게 함)
     const state = { hasError: false };
 
@@ -263,7 +264,7 @@ export class BuildOrchestrator {
             // JS 빌드
             libraryWorker.build({ name, config, cwd: this._cwd, pkgDir }),
             // DTS 생성
-            dtsWorker.buildDts({ name, cwd: this._cwd, pkgDir, env, emit: true }),
+            dtsWorker.build({ name, cwd: this._cwd, pkgDir, env, emit: true }),
           ]);
 
           // JS 빌드 결과 처리
@@ -321,7 +322,7 @@ export class BuildOrchestrator {
             // Vite production 빌드
             clientWorker.build({ name, config: clientConfig, cwd: this._cwd, pkgDir }),
             // typecheck (dts 없이)
-            dtsWorker.buildDts({
+            dtsWorker.build({
               name,
               cwd: this._cwd,
               pkgDir,
@@ -374,7 +375,7 @@ export class BuildOrchestrator {
               target: "client",
               type: "capacitor",
               success: false,
-              errors: [err instanceof Error ? err.message : String(err)],
+              errors: [errorMessage(err)],
             });
             state.hasError = true;
           }
@@ -399,7 +400,7 @@ export class BuildOrchestrator {
               target: "client",
               type: "electron",
               success: false,
-              errors: [err instanceof Error ? err.message : String(err)],
+              errors: [errorMessage(err)],
             });
             state.hasError = true;
           }
@@ -465,26 +466,16 @@ export class BuildOrchestrator {
 
       // warnings 출력
       if (result.warnings != null) {
-        const warnLines: string[] = [`${result.name} (${typeLabel})`];
-        for (const warning of result.warnings) {
-          for (const line of warning.split("\n")) {
-            warnLines.push(`  → ${line}`);
-          }
-        }
-        this._logger.warn(warnLines.join("\n"));
+        this._logger.warn(formatBuildMessages(result.name, typeLabel, result.warnings));
       }
 
       // errors 출력
       if (!result.success) {
-        const errorLines: string[] = [`${result.name} (${typeLabel})`];
         if (result.errors != null) {
-          for (const error of result.errors) {
-            for (const line of error.split("\n")) {
-              errorLines.push(`  → ${line}`);
-            }
-          }
+          this._logger.error(formatBuildMessages(result.name, typeLabel, result.errors));
+        } else {
+          this._logger.error(`${result.name} (${typeLabel})`);
         }
-        this._logger.error(errorLines.join("\n"));
       }
       if (result.diagnostics != null) {
         allDiagnostics.push(...result.diagnostics);