@mandujs/core 0.18.3 → 0.18.6

package/src/bundler/dev.ts

@@ -143,6 +143,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 +160,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...`);
@@ -223,13 +247,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 +312,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}`);
     }
@@ -428,6 +454,7 @@ export function generateHMRClientScript(port: number): string {
   let reconnectAttempts = 0;
   const maxReconnectAttempts = ${TIMEOUTS.HMR_MAX_RECONNECT};
   const reconnectDelay = ${TIMEOUTS.HMR_RECONNECT_DELAY};
+  const staleIslands = new Set();
 
   function connect() {
     try {
@@ -464,8 +491,9 @@ export function generateHMRClientScript(port: number): string {
   function scheduleReconnect() {
     if (reconnectAttempts < maxReconnectAttempts) {
       reconnectAttempts++;
-      console.log('[Mandu HMR] Reconnecting... (' + reconnectAttempts + '/' + maxReconnectAttempts + ')');
-      setTimeout(connect, reconnectDelay * reconnectAttempts);
+      var delay = Math.min(reconnectDelay * Math.pow(2, reconnectAttempts - 1), 30000);
+      console.log('[Mandu HMR] Reconnecting in ' + delay + 'ms (' + reconnectAttempts + '/' + maxReconnectAttempts + ')');
+      setTimeout(connect, delay);
     }
   }
 
@@ -483,6 +511,7 @@ export function generateHMRClientScript(port: number): string {
       case 'island-update':
         const routeId = message.data?.routeId;
         console.log('[Mandu HMR] Island updated:', routeId);
+        staleIslands.add(routeId);
 
         // 현재 페이지의 island인지 확인
         const island = document.querySelector('[data-mandu-island="' + routeId + '"]');
@@ -533,7 +562,19 @@ export function generateHMRClientScript(port: number): string {
     const overlay = document.createElement('div');
     overlay.id = 'mandu-hmr-error';
     overlay.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.9);color:#ff6b6b;font-family:monospace;padding:40px;z-index:99999;overflow:auto;';
-    overlay.innerHTML = '<h2 style="color:#ff6b6b;margin:0 0 20px;">🔥 Build Error</h2><pre style="white-space:pre-wrap;word-break:break-all;">' + (message || 'Unknown error') + '</pre><button onclick="this.parentElement.remove()" style="position:fixed;top:20px;right:20px;background:#333;color:#fff;border:none;padding:10px 20px;cursor:pointer;">Close</button>';
+    const h2 = document.createElement('h2');
+    h2.style.cssText = 'color:#ff6b6b;margin:0 0 20px;';
+    h2.textContent = '🔥 Build Error';
+    const pre = document.createElement('pre');
+    pre.style.cssText = 'white-space:pre-wrap;word-break:break-all;';
+    pre.textContent = message || 'Unknown error';
+    const btn = document.createElement('button');
+    btn.style.cssText = 'position:fixed;top:20px;right:20px;background:#333;color:#fff;border:none;padding:10px 20px;cursor:pointer;';
+    btn.textContent = 'Close';
+    btn.onclick = function() { overlay.remove(); };
+    overlay.appendChild(h2);
+    overlay.appendChild(pre);
+    overlay.appendChild(btn);
     document.body.appendChild(overlay);
   }
 
@@ -549,6 +590,22 @@ export function generateHMRClientScript(port: number): string {
     if (ws) ws.close();
   });
 
+  // 페이지 이동 시 stale island 감지 후 리로드 (#115)
+  function checkStaleIslandsOnNavigation() {
+    if (staleIslands.size === 0) return;
+    for (const id of staleIslands) {
+      if (document.querySelector('[data-mandu-island="' + id + '"]')) {
+        console.log('[Mandu HMR] Stale island detected after navigation, reloading...');
+        location.reload();
+        return;
+      }
+    }
+  }
+  window.addEventListener('popstate', checkStaleIslandsOnNavigation);
+  window.addEventListener('pageshow', function(e) {
+    if (e.persisted) checkStaleIslandsOnNavigation();
+  });
+
   // Ping 전송 (연결 유지)
   setInterval(function() {
     if (ws && ws.readyState === WebSocket.OPEN) {

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/config/mandu.ts

@@ -26,7 +26,7 @@ export interface ManduConfig {
         };
   };
   guard?: {
-    preset?: "mandu" | "fsd" | "clean" | "hexagonal" | "atomic";
+    preset?: "mandu" | "fsd" | "clean" | "hexagonal" | "atomic" | "cqrs";
     srcDir?: string;
     exclude?: string[];
     realtime?: boolean;

package/src/config/validate.ts

@@ -71,7 +71,7 @@ const ServerConfigSchema = z
  */
 const GuardConfigSchema = z
   .object({
-    preset: z.enum(["mandu", "fsd", "clean", "hexagonal", "atomic"]).default("mandu"),
+    preset: z.enum(["mandu", "fsd", "clean", "hexagonal", "atomic", "cqrs"]).default("mandu"),
     srcDir: z.string().default("src"),
     exclude: z.array(z.string()).default([]),
     realtime: z.boolean().default(true),