@mandujs/core 0.9.5 → 0.9.6

package/package.json

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

package/src/bundler/build.ts

@@ -423,13 +423,37 @@ function generateRouterRuntimeSource(): string {
 /**
  * Mandu Client Router Runtime (Generated)
  * Client-side Routing을 위한 런타임
+ * 전역 상태를 사용하여 모든 모듈에서 동일 인스턴스 공유
  */
 
-// 라우트 정보
-let currentRoute = window.__MANDU_ROUTE__ || null;
-let currentLoaderData = window.__MANDU_DATA__?.[currentRoute?.id]?.serverData;
-let navigationState = { state: 'idle' };
-const listeners = new Set();
+// 전역 상태 초기화 (Island와 공유)
+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__;
+}
+
+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();
@@ -468,25 +492,17 @@ function extractParams(pattern, pathname) {
 }
 
 function notifyListeners() {
-  const state = {
-    currentRoute,
-    loaderData: currentLoaderData,
-    navigation: navigationState
-  };
-  listeners.forEach(fn => { try { fn(state); } catch(e) {} });
+  const state = getGlobalState();
+  getListeners().forEach(fn => { try { fn(state); } catch(e) {} });
 }
 
 export function subscribe(listener) {
-  listeners.add(listener);
-  return () => listeners.delete(listener);
+  getListeners().add(listener);
+  return () => getListeners().delete(listener);
 }
 
 export function getRouterState() {
-  return {
-    currentRoute,
-    loaderData: currentLoaderData,
-    navigation: navigationState
-  };
+  return getGlobalState();
 }
 
 export async function navigate(to, options = {}) {
@@ -499,7 +515,9 @@ export async function navigate(to, options = {}) {
       return;
     }
 
-    navigationState = { state: 'loading', location: to };
+    // 로딩 상태로 전환
+    const state = getGlobalState();
+    setGlobalState({ ...state, navigation: { state: 'loading', location: to } });
     notifyListeners();
 
     const dataUrl = url.pathname + (url.search ? url.search + '&' : '?') + '_data=1';
@@ -518,9 +536,12 @@ export async function navigate(to, options = {}) {
       history.pushState({ routeId: data.routeId }, '', to);
     }
 
-    currentRoute = { id: data.routeId, pattern: data.pattern, params: data.params };
-    currentLoaderData = data.loaderData;
-    navigationState = { state: 'idle' };
+    // 전역 상태 업데이트
+    setGlobalState({
+      currentRoute: { id: data.routeId, pattern: data.pattern, params: data.params },
+      loaderData: data.loaderData,
+      navigation: { state: 'idle' }
+    });
 
     window.__MANDU_DATA__ = window.__MANDU_DATA__ || {};
     window.__MANDU_DATA__[data.routeId] = { serverData: data.loaderData };