@simplysm/sd-cli 14.0.36 → 14.0.38

package/src/dev-server/hmr-service.ts

@@ -1,5 +1,8 @@
 import type http from "node:http";
 import type { IncomingMessage, ServerResponse } from "node:http";
+import fs from "node:fs";
+import path from "path";
+import crypto from "crypto";
 import type esbuild from "esbuild";
 import { WebSocketServer, type WebSocket } from "ws";
 
@@ -10,6 +13,8 @@ export interface HmrServiceOptions {
   basePath: string;
   /** templateUpdates Map (createCompilerPlugin과 공유) */
   templateUpdates: Map<string, string>;
+  /** 빌드 출력 디렉토리 경로. 설정 시 파일 내용 hash로 변경 감지 (bytes 대신) */
+  outDir?: string;
 }
 
 export interface HmrService {
@@ -24,7 +29,7 @@ export interface HmrService {
 }
 
 export function createHmrService(options: HmrServiceOptions): HmrService {
-  const { httpServer, basePath, templateUpdates } = options;
+  const { httpServer, basePath, templateUpdates, outDir } = options;
   const clients = new Set<WebSocket>();
 
   const wss = new WebSocketServer({ server: httpServer });
@@ -36,7 +41,7 @@ export function createHmrService(options: HmrServiceOptions): HmrService {
     });
   });
 
-  let prevOutputs: Map<string, number> | undefined;
+  let prevOutputs: Map<string, string> | undefined;
   let debounceTimer: ReturnType<typeof setTimeout> | undefined;
   let pendingMetafile: esbuild.Metafile | undefined;
 
@@ -49,12 +54,22 @@ export function createHmrService(options: HmrServiceOptions): HmrService {
     }, 100);
   }
 
-  function collectOutputs(metafile: esbuild.Metafile): Map<string, number> {
-    const outputs = new Map<string, number>();
+  function collectOutputs(metafile: esbuild.Metafile): Map<string, string> {
+    const outputs = new Map<string, string>();
     for (const [outputPath, output] of Object.entries(metafile.outputs)) {
       const normalizedPath = outputPath.replace(/\\/g, "/");
       if (normalizedPath.endsWith(".js") || normalizedPath.endsWith(".css")) {
-        outputs.set(normalizedPath, output.bytes);
+        let fingerprint = String(output.bytes);
+        if (outDir != null) {
+          try {
+            const filePath = path.resolve(outDir, normalizedPath);
+            const content = fs.readFileSync(filePath);
+            fingerprint = crypto.createHash("md5").update(content).digest("hex");
+          } catch {
+            // 파일 읽기 실패 시 bytes 폴백
+          }
+        }
+        outputs.set(normalizedPath, fingerprint);
       }
     }
     return outputs;
@@ -91,12 +106,12 @@ export function createHmrService(options: HmrServiceOptions): HmrService {
     let cssChanged = false;
     const changedCssFiles: string[] = [];
 
-    for (const [path, bytes] of currentOutputs) {
-      const prevBytes = prevOutputs.get(path);
-      if (prevBytes !== bytes) {
-        if (path.endsWith(".css")) {
+    for (const [outputPath, fingerprint] of currentOutputs) {
+      const prevFingerprint = prevOutputs.get(outputPath);
+      if (prevFingerprint !== fingerprint) {
+        if (outputPath.endsWith(".css")) {
           cssChanged = true;
-          changedCssFiles.push(path.split("/").pop() ?? path);
+          changedCssFiles.push(outputPath.split("/").pop() ?? outputPath);
         } else {
           jsChanged = true;
         }
@@ -104,9 +119,9 @@ export function createHmrService(options: HmrServiceOptions): HmrService {
     }
 
     // 삭제된 파일 체크
-    for (const [path] of prevOutputs) {
-      if (!currentOutputs.has(path)) {
-        if (path.endsWith(".css")) {
+    for (const [outputPath] of prevOutputs) {
+      if (!currentOutputs.has(outputPath)) {
+        if (outputPath.endsWith(".css")) {
           cssChanged = true;
         } else {
           jsChanged = true;

package/src/electron/electron.ts

@@ -97,7 +97,7 @@ export class Electron {
 
     let currentElectron: cpx.SpawnProcess | null = null;
     let isRestarting = false;
-    let resolveTermination: (() => void) | null = null;
+    let resolveTermination: (() => void | Promise<void>) | null = null;
 
     const spawnElectron = () => {
       Electron._logger.debug("Electron 프로세스 시작");
@@ -112,7 +112,7 @@ export class Electron {
         currentElectron = null;
         if (!isRestarting && resolveTermination != null) {
           Electron._logger.info("Electron이 종료되었습니다.");
-          resolveTermination();
+          void resolveTermination();
         }
       });
     };
@@ -160,13 +160,13 @@ export class Electron {
     await new Promise<void>((resolve) => {
       let disposed = false;
 
-      const cleanup = () => {
+      const cleanup = async () => {
         if (disposed) return;
         disposed = true;
         Electron._logger.debug("cleanup 시작");
         process.removeListener("SIGINT", signalHandler);
         process.removeListener("SIGTERM", signalHandler);
-        void ctx.dispose();
+        await ctx.dispose();
         resolve();
       };
 
@@ -175,7 +175,7 @@ export class Electron {
       const signalHandler = () => {
         Electron._logger.debug("시그널 수신, Electron 종료 중");
         if (currentElectron != null) currentElectron.kill();
-        cleanup();
+        void cleanup();
       };
 
       process.once("SIGINT", signalHandler);

package/src/engines/BaseEngine.ts

@@ -1,4 +1,5 @@
 import { Worker, type WorkerProxy } from "@simplysm/core-node";
+import { err as errNs } from "@simplysm/core-common";
 import { consola } from "consola";
 import type { BuildResult, ResultCollector } from "../runtime/ResultCollector";
 import { stopEngineWorker } from "../runtime/engine-stop";
@@ -182,7 +183,15 @@ export abstract class BaseEngine<
       }
     });
 
-    this._callStartWatch(output).catch(() => {
+    this._callStartWatch(output).catch((err: unknown) => {
+      logger.error(`[${this._pkg.name}] startWatch 실패:`, errNs.message(err));
+      this._resultCollector?.add({
+        name: this._pkg.name,
+        target: this._getTarget(),
+        type: "build",
+        status: "error",
+        message: errNs.message(err),
+      });
       resolveInitialBuild();
     });
 

package/src/engines/EsbuildClientEngine.ts

@@ -121,7 +121,7 @@ export class EsbuildClientEngine implements BuildEngine {
         ? this._pkg.config.server
         : undefined;
 
-    await this._worker!.startWatch({
+    const result = await this._worker!.startWatch({
       name: this._pkg.name,
       cwd: this._cwd,
       pkgDir: this._pkg.dir,
@@ -131,6 +131,18 @@ export class EsbuildClientEngine implements BuildEngine {
       pwa: this._pkg.config.pwa,
       browserSupport: this._pkg.config.browserSupport,
     });
+
+    if (!result.success) {
+      const errorDetail = result.errors?.join("; ") ?? "unknown error";
+      logger.error(`[${this._pkg.name}] 초기 빌드 실패: ${errorDetail}`);
+      this._resultCollector?.add({
+        name: this._pkg.name,
+        target: "client",
+        type: "build",
+        status: "error",
+        message: errorDetail,
+      });
+    }
   }
 
   /**

package/src/engines/engine-factory.ts

@@ -24,7 +24,6 @@ export function createBuildEngine(
   options: {
     cwd: string;
     replaceDeps?: Record<string, string>;
-    resolvedReplaceDeps?: Array<{ packageName: string; sourcePath: string }>;
     resultCollector?: ResultCollector;
     rebuildManager?: RebuildManager;
     /** 클라이언트 빌드 출력 경로 (EsbuildClientEngine에만 적용) */

package/src/esbuild/esbuild-client-config.ts

@@ -65,16 +65,16 @@ export async function createClientEsbuildContext(
   const sourceFileCache = new SourceFileCache(cachePath);
 
   // CompilerPluginOptions
-  const pluginOptions: CompilerPluginOptions & { browserOnlyBuild?: boolean } = {
+  const pluginOptions: CompilerPluginOptions = {
     tsconfig: options.tsconfig ?? path.join(options.pkgDir, "tsconfig.json"),
     sourcemap: isDev,
     advancedOptimizations: !isDev,
     thirdPartySourcemaps: isDev,
-    incremental: true,
+    incremental: isDev,
     sourceFileCache,
     loadResultCache: sourceFileCache.loadResultCache,
     templateUpdates: options.templateUpdates,
-    browserOnlyBuild: true,
+    includeTestMetadata: isDev,
   };
 
   // BundleStylesheetOptions
@@ -106,7 +106,7 @@ export async function createClientEsbuildContext(
   // SCSS side-effect import 처리 플러그인
   const scssPlugin = createScssPlugin({
     loadPaths: [
-      path.join(options.pkgDir, "scss"),
+      path.join(options.pkgDir, "node_modules"),
       path.join(options.cwd, "node_modules"),
     ],
   });
@@ -156,7 +156,7 @@ export async function createClientEsbuildContext(
     ],
     target: esbuildTarget,
     entryNames: isDev ? "[name]" : "[name]-[hash]",
-    chunkNames: isDev ? "[name]" : "[name]-[hash]",
+    chunkNames: "[name]-[hash]",
     assetNames: isDev ? "[name]" : "[name]-[hash]",
     bundle: true,
     splitting: options.legacyModule !== true,
@@ -166,7 +166,7 @@ export async function createClientEsbuildContext(
     metafile: true,
     write: true,
     sourcemap: isDev ? "linked" : false,
-    logLevel: "silent",
+    logLevel: isDev ? "warning" : "silent",
     tsconfig: options.tsconfig ?? path.join(options.pkgDir, "tsconfig.json"),
     define,
     banner: hmrBanner != null ? { js: hmrBanner } : undefined,

package/src/orchestrators/DevOrchestrator.ts

@@ -97,11 +97,6 @@ export class DevOrchestrator extends BaseOrchestrator implements OrchestratorLif
     }
 
     // 클라이언트 패키지용 BuildEngine 생성
-    const resolvedReplaceDeps = this._replaceDepWatcher?.entries.map((e) => ({
-      packageName: e.targetName,
-      sourcePath: e.resolvedSourcePath,
-    }));
-
     for (const { name, dir, config } of this._clientPackages) {
       const engineConfig = { ...config, env: { ...this._baseEnv, ...config.env } };
       const engine = createBuildEngine(
@@ -109,7 +104,6 @@ export class DevOrchestrator extends BaseOrchestrator implements OrchestratorLif
         {
           cwd: this._cwd,
           replaceDeps: this._replaceDeps,
-          resolvedReplaceDeps,
           resultCollector: this._resultCollector,
           rebuildManager: this._rebuildManager,
         },

package/src/orchestrators/TypecheckOrchestrator.ts

@@ -262,8 +262,8 @@ export class TypecheckOrchestrator implements OrchestratorLifecycle<TypecheckRes
         deserializeDiagnostic(d, fileCache),
       );
       allDiagnostics.push(...buildDiags);
-      totalErrorCount += buildDiags.filter((d) => d.category === 1).length;
-      totalWarningCount += buildDiags.filter((d) => d.category === 0).length;
+      totalErrorCount += buildDiags.filter((d) => d.category === ts.DiagnosticCategory.Error).length;
+      totalWarningCount += buildDiags.filter((d) => d.category === ts.DiagnosticCategory.Warning).length;
       if (!engineResult.build.success && buildDiags.length === 0) {
         for (const errMsg of engineResult.build.errors) {
           allDiagnostics.push({

package/src/sd-cli.ts

@@ -7,7 +7,7 @@
  * .js 실행 (프로덕션): replaceDeps 실행 후 새 프로세스에서 sd-cli-entry 실행
  */
 
-import { cpx } from "@simplysm/core-node";
+import { cpx, setupConsola } from "@simplysm/core-node";
 import { consola } from "consola";
 import os from "os";
 import path from "path";
@@ -26,6 +26,7 @@ if (isDev) {
   await createCliParser(process.argv.slice(2)).parse();
 } else {
   // Production mode (.js): two-stage execution
+  setupConsola({ cli: true });
 
   // Phase 1: replaceDeps (인라인 — 설치된 버전으로 복사)
   try {

package/src/utils/output-utils.ts

@@ -50,8 +50,9 @@ export function printServers(
       if (server.target === "server") {
         // 서버에 연결된 클라이언트가 있으면 클라이언트 URL만 출력
         const clients = serverClientsMap?.get(server.name) ?? [];
-        if (clients.length > 0) {
-          for (const clientName of clients) {
+        const activeClients = clients.filter((c) => results.get(`${c}:build`)?.status !== "error");
+        if (activeClients.length > 0) {
+          for (const clientName of activeClients) {
             consola.info(`[server] http://localhost:${server.port}/${clientName}/`);
           }
         } else {

package/src/workers/client.worker.ts

@@ -282,7 +282,13 @@ async function startWatch(info: ClientBuildInfo): Promise<ClientBuildResult> {
           // 초기 빌드 완료 시 resolve
           if (isInitialBuild) {
             isInitialBuild = false;
-            initialBuildResolve?.({ success });
+            initialBuildResolve?.({
+              success,
+              errors:
+                result.errors.length > 0
+                  ? result.errors.map((e) => e.text)
+                  : undefined,
+            });
           }
         } catch (err) {
           const message = errNs.message(err);
@@ -309,6 +315,7 @@ async function startWatch(info: ClientBuildInfo): Promise<ClientBuildResult> {
       httpServer: httpDevServer.httpServer,
       basePath,
       templateUpdates,
+      outDir: outdir,
     });
 
     // 7. esbuild watch 시작 + 초기 빌드 대기

package/tests/angular/_vite-angular-plugin-test-setup.ts

@@ -1,37 +1,10 @@
-import { vi } from "vitest";
 import path from "path";
-import type { SdConfig, SdClientPackageConfig } from "../../src/sd-config.types";
 
 export const FIXTURE_DIR = path.resolve(import.meta.dirname, "fixtures");
 export const PKG_DIR = path.resolve(FIXTURE_DIR, "packages/basic-app");
 
-export function createTestSdConfig(
-  overrides?: Partial<SdClientPackageConfig>,
-): SdConfig {
-  return {
-    packages: {
-      "basic-app": { target: "client", server: 3000, ...overrides },
-    },
-  };
-}
-
-/** Vite lifecycle 시뮬레이션: config → configResolved → [configureServer] → buildStart */
-export async function initPlugin(
-  plugin: any,
-  options?: { mode?: string; command?: string; sourcemap?: boolean; withServer?: boolean },
-): Promise<void> {
-  const mode = options?.mode ?? "development";
-  const command = options?.command ?? "serve";
-  const sourcemap = options?.sourcemap ?? false;
-  await plugin.config?.({}, { mode, command });
-  plugin.configResolved?.({ build: { sourcemap } });
-  if (options?.withServer === true) {
-    plugin.configureServer?.({
-      middlewares: { use: vi.fn() },
-      httpServer: { on: vi.fn() },
-      config: { base: "/" },
-      hot: { send: vi.fn() },
-    });
-  }
+/** Vite lifecycle 시뮬레이션: config → buildStart */
+export async function initPlugin(plugin: any): Promise<void> {
+  await plugin.config?.({}, { mode: "development", command: "serve" });
   await plugin.buildStart?.call({});
 }

package/tests/angular/vite-angular-plugin-legacy-watch.spec.ts

@@ -1,35 +1,22 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import path from "path";
-import type { SdConfig } from "../../src/sd-config.types";
 import {
   FIXTURE_DIR,
   PKG_DIR,
-  createTestSdConfig,
   initPlugin,
 } from "./_vite-angular-plugin-test-setup";
 
-const mockLoadSdConfig = vi.fn<(...args: unknown[]) => Promise<SdConfig>>();
-
-vi.mock("../../src/utils/sd-config", () => ({
-  loadSdConfig: (...args: unknown[]) => mockLoadSdConfig(...args),
-}));
-
 const { sdAngularPlugin } = await import("../../src/angular/vite-angular-plugin.js");
 
-describe("sdAngularPlugin legacy watch rebuild", () => {
+describe("sdAngularPlugin watch rebuild", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.spyOn(process, "cwd").mockReturnValue(FIXTURE_DIR);
-    mockLoadSdConfig.mockResolvedValue(
-      createTestSdConfig({ browserSupport: { legacyModule: true } }),
-    );
   });
 
   // Acceptance: 재빌드 시 변경 파일의 캐시가 무효화되고 증분 컴파일된다
   it("invalidates cache and produces updated output on watch rebuild", async () => {
-    const plugin = sdAngularPlugin({
-      pkg: "basic-app",
-    });
+    const plugin = sdAngularPlugin({ pkg: "basic-app" });
 
     // 초기 빌드
     await initPlugin(plugin);
@@ -39,31 +26,29 @@ describe("sdAngularPlugin legacy watch rebuild", () => {
       .replace(/\\/g, "/");
 
     // 초기 transform 결과 캡처
-    const initialResult = await (plugin as any).transform?.call({}, "", appComponentPath);
+    const initialResult = (plugin as any).transform?.call({}, "", appComponentPath);
     expect(initialResult).toBeDefined();
     expect(initialResult.code.length).toBeGreaterThan(0);
 
     // watchChange 호출 (파일 변경 알림)
     expect((plugin as any).watchChange).toBeDefined();
-    await (plugin as any).watchChange?.call({}, appComponentPath, { event: "update" });
+    (plugin as any).watchChange?.call({}, appComponentPath, { event: "update" });
 
     // 재빌드 (buildStart 재호출)
     await (plugin as any).buildStart?.call({});
 
     // 재빌드 후 transform — 컴파일러가 재실행되어 결과를 반환해야 한다
-    const rebuiltResult = await (plugin as any).transform?.call({}, "", appComponentPath);
+    const rebuiltResult = (plugin as any).transform?.call({}, "", appComponentPath);
     expect(rebuiltResult).toBeDefined();
     expect(rebuiltResult.code).toBeDefined();
     expect(rebuiltResult.code.length).toBeGreaterThan(0);
 
-    await (plugin as any).buildEnd?.call({});
+    (plugin as any).buildEnd?.call({});
   });
 
-  // Acceptance: 첫 buildStart는 기존 로직으로 전체 컴파일한다
+  // Acceptance: 첫 buildStart는 전체 컴파일한다
   it("performs full compilation on first buildStart", async () => {
-    const plugin = sdAngularPlugin({
-      pkg: "basic-app",
-    });
+    const plugin = sdAngularPlugin({ pkg: "basic-app" });
 
     // watchChange 없이 첫 buildStart
     await initPlugin(plugin);
@@ -72,33 +57,31 @@ describe("sdAngularPlugin legacy watch rebuild", () => {
       .join(PKG_DIR, "src/app.component.ts")
       .replace(/\\/g, "/");
 
-    const result = await (plugin as any).transform?.call({}, "", appComponentPath);
+    const result = (plugin as any).transform?.call({}, "", appComponentPath);
     expect(result).toBeDefined();
     expect(result.code.length).toBeGreaterThan(0);
 
-    await (plugin as any).buildEnd?.call({});
+    (plugin as any).buildEnd?.call({});
   });
 
   // Acceptance: watchChange 없이 buildStart 재호출 시에도 정상 동작
   it("handles buildStart re-invocation without watchChange gracefully", async () => {
-    const plugin = sdAngularPlugin({
-      pkg: "basic-app",
-    });
+    const plugin = sdAngularPlugin({ pkg: "basic-app" });
 
     // 초기 빌드
     await initPlugin(plugin);
 
-    // watchChange 없이 재빌드 (예: Rolldown이 변경 없이 재빌드 트리거)
+    // watchChange 없이 재빌드
     await (plugin as any).buildStart?.call({});
 
     const appComponentPath = path
       .join(PKG_DIR, "src/app.component.ts")
       .replace(/\\/g, "/");
 
-    const result = await (plugin as any).transform?.call({}, "", appComponentPath);
+    const result = (plugin as any).transform?.call({}, "", appComponentPath);
     expect(result).toBeDefined();
     expect(result.code.length).toBeGreaterThan(0);
 
-    await (plugin as any).buildEnd?.call({});
+    (plugin as any).buildEnd?.call({});
   });
 });

package/tests/angular/vite-angular-plugin-vitest.spec.ts

@@ -1,19 +1,11 @@
 import { describe, it, expect, vi, beforeAll } from "vitest";
 import type { Plugin } from "vite";
 import { resolve } from "node:path";
-import type { SdConfig } from "../../src/sd-config.types";
 import {
   FIXTURE_DIR,
   PKG_DIR,
-  createTestSdConfig,
 } from "./_vite-angular-plugin-test-setup";
 
-const mockLoadSdConfig = vi.fn<(...args: unknown[]) => Promise<SdConfig>>();
-
-vi.mock("../../src/utils/sd-config", () => ({
-  loadSdConfig: (...args: unknown[]) => mockLoadSdConfig(...args),
-}));
-
 const { sdAngularPlugin } = await import("../../src/angular/vite-angular-plugin");
 
 describe("sdAngularPlugin Vitest 지원", () => {
@@ -21,18 +13,16 @@ describe("sdAngularPlugin Vitest 지원", () => {
 
   beforeAll(async () => {
     vi.spyOn(process, "cwd").mockReturnValue(FIXTURE_DIR);
-    mockLoadSdConfig.mockResolvedValue(createTestSdConfig());
 
     plugin = sdAngularPlugin({ pkg: "basic-app" });
     await (plugin as any).config?.({}, { mode: "development", command: "serve" });
-    (plugin as any).configResolved?.({ build: { sourcemap: false } });
     await (plugin as any).buildStart?.call({});
   }, 60_000);
 
   // Scenario: @Component 소스 컴파일 및 ɵcmp 런타임 코드 서빙
-  it("compiles @Component source and serves ɵcmp runtime code", async () => {
+  it("compiles @Component source and serves ɵcmp runtime code", () => {
     const filePath = resolve(PKG_DIR, "src/app.component.ts");
-    const result = await (plugin as any).transform?.call({}, "", filePath);
+    const result = (plugin as any).transform?.call({}, "", filePath);
 
     expect(result).toBeDefined();
     expect(result!.code).toContain("ɵcmp");
@@ -40,32 +30,12 @@ describe("sdAngularPlugin Vitest 지원", () => {
   });
 
   // Scenario: node_modules .ts 파일은 AOT 대상이 아니므로 undefined 반환
-  it("returns undefined for node_modules .ts path", async () => {
-    const result = await (plugin as any).transform?.call(
+  it("returns undefined for node_modules .ts path", () => {
+    const result = (plugin as any).transform?.call(
       {},
       "",
       resolve(FIXTURE_DIR, "node_modules/@angular/core/index.ts"),
     );
     expect(result).toBeUndefined();
   });
-
-  // Scenario: browser target 패키지에서 플러그인 초기화
-  it("initializes successfully with non-client (browser target) package", async () => {
-    mockLoadSdConfig.mockResolvedValue(
-      createTestSdConfig({ target: "browser" } as any),
-    );
-
-    const browserPlugin = sdAngularPlugin({ pkg: "basic-app" });
-
-    await (browserPlugin as any).config?.({}, { mode: "development", command: "serve" });
-    (browserPlugin as any).configResolved?.({ build: { sourcemap: false } });
-    await (browserPlugin as any).buildStart?.call({});
-
-    const appComponentPath = resolve(PKG_DIR, "src/app.component.ts");
-    const result = await (browserPlugin as any).transform?.call({}, "", appComponentPath);
-    expect(result).toBeDefined();
-    expect(result.code.length).toBeGreaterThan(0);
-
-    await (browserPlugin as any).buildEnd?.call({});
-  });
 });