@mandujs/core 0.18.3 → 0.18.6

package/src/resource/generator.ts

@@ -4,6 +4,7 @@
  */
 
 import type { ParsedResource } from "./parser";
+import type { ResourceDefinition } from "./schema";
 import { generateResourceContract } from "./generators/contract";
 import { generateResourceTypes } from "./generators/types";
 import { generateResourceSlot } from "./generators/slot";
@@ -129,7 +130,7 @@ export async function generateResourceArtifacts(
  * Generate contract file
  */
 async function generateContract(
-  definition: any,
+  definition: ResourceDefinition,
   resourceName: string,
   contractsDir: string,
   result: GeneratorResult
@@ -147,7 +148,7 @@ async function generateContract(
  * Generate types file
  */
 async function generateTypes(
-  definition: any,
+  definition: ResourceDefinition,
   resourceName: string,
   typesDir: string,
   result: GeneratorResult
@@ -165,7 +166,7 @@ async function generateTypes(
  * Generate slot file (PRESERVE if exists!)
  */
 async function generateSlot(
-  definition: any,
+  definition: ResourceDefinition,
   resourceName: string,
   slotsDir: string,
   force: boolean,
@@ -195,7 +196,7 @@ async function generateSlot(
  * Generate client file
  */
 async function generateClient(
-  definition: any,
+  definition: ResourceDefinition,
   resourceName: string,
   clientDir: string,
   result: GeneratorResult

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/escape.ts

@@ -1,3 +1,15 @@
+/**
+ * HTML 텍스트 콘텐츠 이스케이프
+ * <title>, <p> 등 텍스트 노드에 들어갈 문자열을 안전하게 처리.
+ * 속성값과 달리 " ' 는 이스케이프 불필요.
+ */
+export function escapeHtmlText(value: string): string {
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;");
+}
+
 /**
  * HTML 속성값 이스케이프
  * XSS 방지를 위해 HTML 속성값에 들어갈 문자열을 안전하게 처리

package/src/runtime/server.ts

@@ -5,7 +5,7 @@ import type { ManduFilling } from "../filling/filling";
 import { ManduContext } from "../filling/context";
 import { Router } from "./router";
 import { renderSSR, renderStreamingResponse } from "./ssr";
-import { PageBoundary, DefaultLoading, DefaultError, type ErrorFallbackProps } from "./boundary";
+import { type ErrorFallbackProps } from "./boundary";
 import React, { type ReactNode } from "react";
 import path from "path";
 import fs from "fs/promises";

package/src/runtime/ssr.ts

@@ -5,7 +5,7 @@ import type { ReactElement } from "react";
 import type { BundleManifest } from "../bundler/types";
 import type { HydrationConfig, HydrationPriority } from "../spec/schema";
 import { PORTS, TIMEOUTS } from "../constants";
-import { escapeHtmlAttr, escapeJsonForInlineScript } from "./escape";
+import { escapeHtmlAttr, escapeHtmlText, escapeJsonForInlineScript } from "./escape";
 import { REACT_INTERNALS_SHIM_SCRIPT } from "./shims";
 
 // Re-export streaming SSR utilities
@@ -243,7 +243,7 @@ export function renderToHTML(element: ReactElement, options: SSROptions = {}): s
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>${escapeHtmlAttr(title)}</title>
+  <title>${escapeHtmlText(title)}</title>
   ${cssLinkTag}
   ${headTags}
 </head>
@@ -313,6 +313,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 {
@@ -327,19 +336,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?.message);
+            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();

package/src/runtime/streaming-ssr.ts

@@ -158,6 +158,7 @@ export interface StreamingLoaderResult<T = unknown> {
  */
 function isJSONSerializable(value: unknown, path: string = "root", isDev: boolean = false): { valid: boolean; issues: string[] } {
   const issues: string[] = [];
+  const seen = new WeakSet<object>();
 
   function check(val: unknown, currentPath: string): void {
     if (val === undefined) {
@@ -198,6 +199,12 @@ function isJSONSerializable(value: unknown, path: string = "root", isDev: boolea
     }
 
     if (type === "object") {
+      // 순환 참조 감지 — 무한 재귀 방지
+      if (seen.has(val as object)) {
+        issues.push(`${currentPath}: 순환 참조가 감지되었습니다 (JSON 직렬화 불가)`);
+        return;
+      }
+      seen.add(val as object);
       for (const [key, v] of Object.entries(val as Record<string, unknown>)) {
         check(v, `${currentPath}.${key}`);
       }
@@ -570,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;
@@ -578,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 {
@@ -592,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();