@simplysm/sd-cli 14.0.39 → 14.0.41

package/tests/workers/server-esbuild-context.acc.spec.ts

@@ -236,6 +236,38 @@ describe("server-esbuild-context tsc integration lifecycle", () => {
     });
   });
 
+  // Acceptance: rebuild() reject 시 tsc 에러와 병합하여 정상 결과 반환
+  it("merges tsc errors when context.rebuild() rejects instead of propagating throw", async () => {
+    mockRebuild.mockResolvedValueOnce({
+      errors: [],
+      warnings: [],
+      outputFiles: [],
+      metafile: { inputs: { "src/main.ts": {} }, outputs: {} },
+    });
+    mockTscPlugin.getErrors.mockReturnValue(["TS2322: type mismatch"]);
+
+    await createContext({ ...baseOptions, tsc: baseTscOptions });
+
+    // 첫 빌드 성공 (metafile 설정)
+    await rebuild();
+    const savedMetafile = getMetafile();
+    expect(savedMetafile).toBeDefined();
+
+    // 두 번째 빌드 실패 — reject
+    mockRebuild.mockRejectedValueOnce(new Error("Build failed with 1 error"));
+
+    const result = await rebuild();
+
+    // throw 전파 대신 정상 결과 반환 — esbuild + tsc 에러 병합
+    expect(result).toEqual({
+      success: false,
+      errors: ["Build failed with 1 error", "TS2322: type mismatch"],
+      warnings: undefined,
+    });
+    // 이전 metafile 유지
+    expect(getMetafile()).toBe(savedMetafile);
+  });
+
   // Acceptance: LOGIC-001 — recreateContext failure preserves tsc plugin reset
   it("resets tsc and disposes old context even when recreateContext fails (LOGIC-001)", async () => {
     await createContext({ ...baseOptions, tsc: baseTscOptions });

package/tests/workers/server-esbuild-context.spec.ts

@@ -152,6 +152,87 @@ describe("rebuild", () => {
   });
 });
 
+describe("rebuild — error handling on reject", () => {
+  afterEach(async () => {
+    mockRebuild.mockReset();
+    mockDispose.mockReset();
+    mockTscPlugin.getProgram.mockReset();
+    mockTscPlugin.getAffectedFiles.mockReset();
+    mockTscPlugin.getDiagnostics.mockReset().mockReturnValue([]);
+    mockTscPlugin.getErrors.mockReset();
+    mockTscPlugin.resetBuilderProgram.mockReset();
+    vi.mocked(esbuild.context).mockClear();
+    vi.mocked(writeChangedOutputFiles).mockClear();
+    vi.mocked(createTscPlugin).mockClear();
+    await dispose();
+  });
+
+  it("catches reject and returns merged esbuild + tsc errors", async () => {
+    mockRebuild.mockRejectedValue(new Error("Build failed"));
+    mockTscPlugin.getErrors.mockReturnValue(["type error"]);
+
+    await createContext({ ...baseOptions, tsc: { cwd: "/workspace", output: { dts: true } } });
+    const result = await rebuild();
+
+    expect(result).toEqual({
+      success: false,
+      errors: ["Build failed", "type error"],
+      warnings: undefined,
+    });
+  });
+
+  it("returns esbuild error only when tsc has no errors", async () => {
+    mockRebuild.mockRejectedValue(new Error("Build failed"));
+    mockTscPlugin.getErrors.mockReturnValue(undefined);
+
+    await createContext({ ...baseOptions, tsc: { cwd: "/workspace", output: { dts: true } } });
+    const result = await rebuild();
+
+    expect(result).toEqual({
+      success: false,
+      errors: ["Build failed"],
+      warnings: undefined,
+    });
+  });
+
+  it("returns esbuild error when no tsc plugin exists", async () => {
+    mockRebuild.mockRejectedValue(new Error("Build failed"));
+
+    await createContext(baseOptions);
+    const result = await rebuild();
+
+    expect(result).toEqual({
+      success: false,
+      errors: ["Build failed"],
+      warnings: undefined,
+    });
+  });
+
+  it("preserves previous metafile when rebuild rejects", async () => {
+    const mockMetafile = { inputs: { "src/main.ts": {} }, outputs: {} };
+    mockRebuild.mockResolvedValueOnce({
+      errors: [],
+      warnings: [],
+      outputFiles: [],
+      metafile: mockMetafile,
+    });
+
+    await createContext(baseOptions);
+    await rebuild();
+    expect(getMetafile()).toBe(mockMetafile);
+
+    mockRebuild.mockRejectedValueOnce(new Error("Build failed"));
+    const result = await rebuild();
+
+    expect(result).toEqual({
+      success: false,
+      errors: ["Build failed"],
+      warnings: undefined,
+    });
+    expect(getMetafile()).toBe(mockMetafile);
+  });
+});
+
 describe("recreateContext", () => {
   afterEach(async () => {
     mockRebuild.mockReset();