@mandujs/core 0.18.5 → 0.18.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mandujs/core",
-  "version": "0.18.5",
+  "version": "0.18.7",
   "description": "Mandu Framework Core - Spec, Generator, Guard, Runtime",
   "type": "module",
   "main": "./src/index.ts",

package/src/bundler/build.ts

@@ -1205,6 +1205,52 @@ export async function buildClientBundles(
     };
   }
 
+  // 부분 빌드 모드: targetRouteIds가 지정되면 해당 Island만 재빌드 (#122)
+  if (options.targetRouteIds && options.targetRouteIds.length > 0) {
+    const targetRoutes = hydratedRoutes.filter((r) => options.targetRouteIds!.includes(r.id));
+
+    for (const route of targetRoutes) {
+      try {
+        const result = await buildIsland(route, rootDir, outDir, options);
+        outputs.push(result);
+      } catch (error) {
+        errors.push(`[${route.id}] ${String(error)}`);
+      }
+    }
+
+    // 기존 매니페스트를 읽어 변경된 Island만 갱신
+    let existingManifest: BundleManifest;
+    try {
+      const manifestData = await fs.readFile(path.join(rootDir, ".mandu/manifest.json"), "utf-8");
+      existingManifest = JSON.parse(manifestData) as BundleManifest;
+    } catch {
+      // 기존 매니페스트 없으면 전체 빌드로 재시도 (targetRouteIds 제거)
+      return buildClientBundles(manifest, rootDir, { ...options, targetRouteIds: undefined });
+    }
+
+    for (const output of outputs) {
+      if (existingManifest.bundles[output.routeId]) {
+        existingManifest.bundles[output.routeId].js = output.outputPath;
+      } else {
+        const route = targetRoutes.find((r) => r.id === output.routeId);
+        const hydration = route ? getRouteHydration(route) : null;
+        existingManifest.bundles[output.routeId] = {
+          js: output.outputPath,
+          dependencies: ["_runtime", "_react"],
+          priority: hydration?.priority || HYDRATION.DEFAULT_PRIORITY,
+        };
+      }
+    }
+
+    await fs.writeFile(
+      path.join(rootDir, ".mandu/manifest.json"),
+      JSON.stringify(existingManifest, null, 2)
+    );
+
+    const stats = calculateStats(outputs, startTime);
+    return { success: errors.length === 0, outputs, errors, manifest: existingManifest, stats };
+  }
+
   // 3-4. Runtime, Router, Vendor 번들 병렬 빌드 (서로 독립적)
   const [runtimeResult, routerResult, vendorResult] = await Promise.all([
     buildRuntime(outDir, options),

package/src/bundler/css.ts

@@ -311,7 +311,12 @@ export async function startCSSWatch(options: CSSBuildOptions): Promise<CSSWatche
     serverPath: SERVER_CSS_PATH,
     close: () => {
       fsWatcher?.close();
-      proc.kill();
+      // Windows에서는 SIGTERM이 무시될 수 있으므로 SIGKILL 사용 (#117)
+      if (process.platform === "win32") {
+        proc.kill("SIGKILL");
+      } else {
+        proc.kill();
+      }
     },
   };
 }

package/src/bundler/dev.ts

@@ -103,8 +103,18 @@ export async function startDevBundler(options: DevBundlerOptions): Promise<DevBu
       const normalizedPath = absPath.replace(/\\/g, "/");
       clientModuleToRoute.set(normalizedPath, route.id);
 
-      // 감시할 디렉토리 추가
+      // Also register *.client.tsx/ts files in the same directory (#140)
+      // e.g. if clientModule is app/page.island.tsx, also map app/page.client.tsx → same routeId
       const dir = path.dirname(absPath);
+      const baseStem = path.basename(absPath).replace(/\.(island|client)\.(tsx?|jsx?)$/, "");
+      for (const ext of [".client.tsx", ".client.ts", ".client.jsx", ".client.js"]) {
+        const clientPath = path.join(dir, baseStem + ext).replace(/\\/g, "/");
+        if (clientPath !== normalizedPath) {
+          clientModuleToRoute.set(clientPath, route.id);
+        }
+      }
+
+      // 감시할 디렉토리 추가
       watchDirs.add(dir);
     }
   }
@@ -143,6 +153,9 @@ export async function startDevBundler(options: DevBundlerOptions): Promise<DevBu
   // 파일 감시 설정
   const watchers: fs.FSWatcher[] = [];
   let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+  // 동시 빌드 방지 (#121): 빌드 중에 변경 발생 시 다음 빌드 대기
+  let isBuilding = false;
+  let pendingBuildFile: string | null = null;
 
   // 파일이 공통 디렉토리에 있는지 확인
   const isInCommonDir = (filePath: string): boolean => {
@@ -157,9 +170,30 @@ export async function startDevBundler(options: DevBundlerOptions): Promise<DevBu
   };
 
   const handleFileChange = async (changedFile: string) => {
+    // 동시 빌드 방지 (#121): 빌드 중이면 대기 큐에 저장
+    if (isBuilding) {
+      pendingBuildFile = changedFile;
+      return;
+    }
+
+    isBuilding = true;
+    try {
+      await _doBuild(changedFile);
+    } finally {
+      isBuilding = false;
+      // 빌드 중 대기 중인 파일이 있으면 즉시 처리
+      if (pendingBuildFile) {
+        const next = pendingBuildFile;
+        pendingBuildFile = null;
+        await handleFileChange(next);
+      }
+    }
+  };
+
+  const _doBuild = async (changedFile: string) => {
     const normalizedPath = changedFile.replace(/\\/g, "/");
 
-    // 공통 컴포넌트 디렉토리 변경 → 전체 재빌드
+    // 공통 컴포넌트 디렉토리 변경 → 전체 재빌드 (targetRouteIds 없이)
     if (isInCommonDir(changedFile)) {
       console.log(`\n🔄 Common file changed: ${path.basename(changedFile)}`);
       console.log(`   Rebuilding all islands...`);
@@ -200,21 +234,17 @@ export async function startDevBundler(options: DevBundlerOptions): Promise<DevBu
     // clientModule 매핑에서 routeId 찾기
     let routeId = clientModuleToRoute.get(normalizedPath);
 
-    // .client.ts 또는 .client.tsx 파일인 경우 파일명에서 routeId 추출
-    if (!routeId) {
-      let basename: string | null = null;
-
-      if (changedFile.endsWith(".client.ts")) {
-        basename = path.basename(changedFile, ".client.ts");
-      } else if (changedFile.endsWith(".client.tsx")) {
-        basename = path.basename(changedFile, ".client.tsx");
-      }
-
-      if (basename) {
-        const route = manifest.routes.find((r) => r.id === basename);
-        if (route) {
-          routeId = route.id;
-        }
+    // Fallback for *.client.tsx/ts: find route whose clientModule is in the same directory (#140)
+    // basename matching (e.g. "page" !== "index") is unreliable — use directory-based matching instead
+    if (!routeId && (changedFile.endsWith(".client.ts") || changedFile.endsWith(".client.tsx"))) {
+      const changedDir = path.dirname(path.resolve(rootDir, changedFile)).replace(/\\/g, "/");
+      const matchedRoute = manifest.routes.find((r) => {
+        if (!r.clientModule) return false;
+        const routeDir = path.dirname(path.resolve(rootDir, r.clientModule)).replace(/\\/g, "/");
+        return routeDir === changedDir;
+      });
+      if (matchedRoute) {
+        routeId = matchedRoute.id;
       }
     }
 
@@ -223,13 +253,15 @@ export async function startDevBundler(options: DevBundlerOptions): Promise<DevBu
     const route = manifest.routes.find((r) => r.id === routeId);
     if (!route || !route.clientModule) return;
 
-    console.log(`\n🔄 Rebuilding: ${routeId}`);
+    console.log(`\n🔄 Rebuilding island: ${routeId}`);
     const startTime = performance.now();
 
     try {
+      // 단일 island만 재빌드 (Runtime/Router/Vendor 스킵, #122)
       const result = await buildClientBundles(manifest, rootDir, {
         minify: false,
         sourcemap: true,
+        targetRouteIds: [routeId],
       });
 
       const buildTime = performance.now() - startTime;
@@ -286,7 +318,7 @@ export async function startDevBundler(options: DevBundlerOptions): Promise<DevBu
     console.log(`👀 Watching ${watchers.length} directories for changes...`);
     if (commonWatchDirs.size > 0) {
       const commonDirNames = Array.from(commonWatchDirs)
-        .map(d => path.relative(rootDir, d) || ".")
+        .map(d => (path.relative(rootDir, d) || ".").replace(/\\/g, "/"))
         .join(", ");
       console.log(`📦 Common dirs (full rebuild): ${commonDirNames}`);
     }

package/src/bundler/types.ts

@@ -111,4 +111,10 @@ export interface BundlerOptions {
    * 주의: splitting=true인 경우 청크 파일 관리가 필요합니다.
    */
   splitting?: boolean;
+  /**
+   * 빌드할 Island routeId 목록 (부분 빌드용, #122)
+   * - 지정 시 해당 Island만 재빌드 (Runtime/Router/Vendor 스킵)
+   * - 미지정 시 전체 빌드 (기본값)
+   */
+  targetRouteIds?: string[];
 }

package/src/router/fs-scanner.ts

@@ -335,7 +335,7 @@ export class FSScanner {
     // 루트 레이아웃
     const rootLayout = layoutMap.get(".");
     if (rootLayout) {
-      chain.push(join(this.config.routesDir, rootLayout.relativePath));
+      chain.push(join(this.config.routesDir, rootLayout.relativePath).replace(/\\/g, "/"));
     }
 
     // 중첩 레이아웃
@@ -344,7 +344,7 @@ export class FSScanner {
       currentPath = currentPath ? `${currentPath}/${segment.raw}` : segment.raw;
       const layout = layoutMap.get(currentPath);
       if (layout) {
-        chain.push(join(this.config.routesDir, layout.relativePath));
+        chain.push(join(this.config.routesDir, layout.relativePath).replace(/\\/g, "/"));
       }
     }
 
@@ -364,7 +364,7 @@ export class FSScanner {
     while (currentPath) {
       const file = fileMap.get(currentPath);
       if (file) {
-        return join(this.config.routesDir, file.relativePath);
+        return join(this.config.routesDir, file.relativePath).replace(/\\/g, "/");
       }
       // 상위 디렉토리로
       const lastSlash = currentPath.lastIndexOf("/");
@@ -373,7 +373,7 @@ export class FSScanner {
 
     // 루트 체크
     const rootFile = fileMap.get(".");
-    return rootFile ? join(this.config.routesDir, rootFile.relativePath) : undefined;
+    return rootFile ? join(this.config.routesDir, rootFile.relativePath).replace(/\\/g, "/") : undefined;
   }
 
   /**

package/src/runtime/streaming-ssr.ts

@@ -577,6 +577,7 @@ function generateDeferredDataScript(routeId: string, key: string, data: unknown)
 
 /**
  * HMR 스크립트 생성
+ * ssr.ts의 generateHMRScript와 동일한 구현을 유지해야 함 (#114)
  */
 function generateHMRScript(port: number): string {
   const hmrPort = port + PORTS.HMR_OFFSET;
@@ -585,6 +586,15 @@ function generateHMRScript(port: number): string {
   var ws = null;
   var reconnectAttempts = 0;
   var maxReconnectAttempts = ${TIMEOUTS.HMR_MAX_RECONNECT};
+  var baseDelay = ${TIMEOUTS.HMR_RECONNECT_DELAY};
+
+  function scheduleReconnect() {
+    if (reconnectAttempts < maxReconnectAttempts) {
+      reconnectAttempts++;
+      var delay = Math.min(baseDelay * Math.pow(2, reconnectAttempts - 1), 30000);
+      setTimeout(connect, delay);
+    }
+  }
 
   function connect() {
     try {
@@ -599,17 +609,27 @@ function generateHMRScript(port: number): string {
           if (msg.type === 'reload' || msg.type === 'island-update') {
             console.log('[Mandu HMR] Reloading...');
             location.reload();
+          } else if (msg.type === 'css-update') {
+            var cssPath = (msg.data && msg.data.cssPath) || '/.mandu/client/globals.css';
+            var links = document.querySelectorAll('link[rel="stylesheet"]');
+            var updated = false;
+            for (var i = 0; i < links.length; i++) {
+              var href = links[i].getAttribute('href') || '';
+              var base = href.split('?')[0];
+              if (base === cssPath || href.includes('globals.css') || href.includes('.mandu/client')) {
+                links[i].setAttribute('href', base + '?t=' + Date.now());
+                updated = true;
+              }
+            }
+            if (!updated) location.reload();
+          } else if (msg.type === 'error') {
+            console.error('[Mandu HMR] Build error:', msg.data && msg.data.message);
           }
         } catch(err) {}
       };
-      ws.onclose = function() {
-        if (reconnectAttempts < maxReconnectAttempts) {
-          reconnectAttempts++;
-          setTimeout(connect, ${TIMEOUTS.HMR_RECONNECT_DELAY} * reconnectAttempts);
-        }
-      };
+      ws.onclose = function() { scheduleReconnect(); };
     } catch(err) {
-      setTimeout(connect, ${TIMEOUTS.HMR_RECONNECT_DELAY});
+      scheduleReconnect();
     }
   }
   connect();