@mandujs/core 0.9.6 → 0.9.8

package/package.json

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

package/src/bundler/build.ts

@@ -427,19 +427,22 @@ function generateRouterRuntimeSource(): string {
  */
 
 // 전역 상태 초기화 (Island와 공유)
+(function initGlobalState() {
+  if (window.__MANDU_ROUTER_STATE__) return;
+  var route = window.__MANDU_ROUTE__;
+  window.__MANDU_ROUTER_STATE__ = {
+    currentRoute: route ? {
+      id: route.id,
+      pattern: route.pattern,
+      params: route.params || {}
+    } : null,
+    loaderData: window.__MANDU_DATA__ && window.__MANDU_DATA__[route && route.id] ? window.__MANDU_DATA__[route.id].serverData : undefined,
+    navigation: { state: 'idle' }
+  };
+  window.__MANDU_ROUTER_LISTENERS__ = window.__MANDU_ROUTER_LISTENERS__ || new Set();
+})();
+
 function getGlobalState() {
-  if (!window.__MANDU_ROUTER_STATE__) {
-    const route = window.__MANDU_ROUTE__;
-    window.__MANDU_ROUTER_STATE__ = {
-      currentRoute: route ? {
-        id: route.id,
-        pattern: route.pattern,
-        params: route.params || {}
-      } : null,
-      loaderData: window.__MANDU_DATA__?.[route?.id]?.serverData,
-      navigation: { state: 'idle' }
-    };
-  }
   return window.__MANDU_ROUTER_STATE__;
 }
 
@@ -447,16 +450,12 @@ function setGlobalState(state) {
   window.__MANDU_ROUTER_STATE__ = state;
 }
 
-// 전역 listeners
 function getListeners() {
-  if (!window.__MANDU_ROUTER_LISTENERS__) {
-    window.__MANDU_ROUTER_LISTENERS__ = new Set();
-  }
   return window.__MANDU_ROUTER_LISTENERS__;
 }
 
 // 패턴 매칭 캐시
-const patternCache = new Map();
+var patternCache = new Map();
 
 function compilePattern(pattern) {
   if (patternCache.has(pattern)) return patternCache.get(pattern);
@@ -583,8 +582,10 @@ function handlePopState(e) {
 
 // 초기화
 function init() {
-  if (currentRoute) {
-    currentRoute.params = extractParams(currentRoute.pattern, location.pathname);
+  var state = getGlobalState();
+  if (state.currentRoute) {
+    state.currentRoute.params = extractParams(state.currentRoute.pattern, location.pathname);
+    setGlobalState(state);
   }
 
   window.addEventListener('popstate', handlePopState);
@@ -597,8 +598,6 @@ if (document.readyState === 'loading') {
 } else {
   init();
 }
-
-export { currentRoute, currentLoaderData, navigationState };
 `;
 }
 

package/src/client/router.ts

@@ -47,9 +47,17 @@ function getGlobalRouterState(): RouterState {
     return { currentRoute: null, loaderData: undefined, navigation: { state: "idle" } };
   }
   if (!window.__MANDU_ROUTER_STATE__) {
+    // SSR에서 주입된 __MANDU_ROUTE__에서 초기화
+    const route = (window as any).__MANDU_ROUTE__;
+    const data = (window as any).__MANDU_DATA__;
+
     window.__MANDU_ROUTER_STATE__ = {
-      currentRoute: null,
-      loaderData: undefined,
+      currentRoute: route ? {
+        id: route.id,
+        pattern: route.pattern,
+        params: route.params || {},
+      } : null,
+      loaderData: route && data?.[route.id]?.serverData,
       navigation: { state: "idle" },
     };
   }