@mandujs/core 0.9.4 → 0.9.6

package/package.json

@@ -1,52 +1,52 @@
-{
-  "name": "@mandujs/core",
-  "version": "0.9.4",
-  "description": "Mandu Framework Core - Spec, Generator, Guard, Runtime",
-  "type": "module",
-  "main": "./src/index.ts",
-  "types": "./src/index.ts",
-  "exports": {
-    ".": "./src/index.ts",
-    "./client": "./src/client/index.ts",
-    "./*": "./src/*"
-  },
-  "files": [
-    "src/**/*"
-  ],
-  "scripts": {
-    "test": "bun test",
-    "test:hydration": "bun test tests/hydration",
-    "test:watch": "bun test --watch"
-  },
-  "devDependencies": {
-    "@happy-dom/global-registrator": "^15.0.0"
-  },
-  "keywords": [
-    "mandu",
-    "framework",
-    "agent",
-    "ai",
-    "code-generation"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/konamgil/mandu.git",
-    "directory": "packages/core"
-  },
-  "author": "konamgil",
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "engines": {
-    "bun": ">=1.0.0"
-  },
-  "peerDependencies": {
-    "react": ">=18.0.0",
-    "react-dom": ">=18.0.0",
-    "zod": ">=3.0.0"
-  },
-  "dependencies": {
-    "ollama": "^0.6.3"
-  }
-}
+{
+  "name": "@mandujs/core",
+  "version": "0.9.6",
+  "description": "Mandu Framework Core - Spec, Generator, Guard, Runtime",
+  "type": "module",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "exports": {
+    ".": "./src/index.ts",
+    "./client": "./src/client/index.ts",
+    "./*": "./src/*"
+  },
+  "files": [
+    "src/**/*"
+  ],
+  "scripts": {
+    "test": "bun test",
+    "test:hydration": "bun test tests/hydration",
+    "test:watch": "bun test --watch"
+  },
+  "devDependencies": {
+    "@happy-dom/global-registrator": "^15.0.0"
+  },
+  "keywords": [
+    "mandu",
+    "framework",
+    "agent",
+    "ai",
+    "code-generation"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/konamgil/mandu.git",
+    "directory": "packages/core"
+  },
+  "author": "konamgil",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "bun": ">=1.0.0"
+  },
+  "peerDependencies": {
+    "react": ">=18.0.0",
+    "react-dom": ">=18.0.0",
+    "zod": ">=3.0.0"
+  },
+  "dependencies": {
+    "ollama": "^0.6.3"
+  }
+}

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 };

package/src/client/router.ts

@@ -33,15 +33,49 @@ export interface NavigateOptions {
 
 type RouterListener = (state: RouterState) => void;
 
-// ========== Router State ==========
+// ========== Global Router State (모든 모듈에서 동일 인스턴스 공유) ==========
 
-let routerState: RouterState = {
-  currentRoute: null,
-  loaderData: undefined,
-  navigation: { state: "idle" },
-};
+declare global {
+  interface Window {
+    __MANDU_ROUTER_STATE__?: RouterState;
+    __MANDU_ROUTER_LISTENERS__?: Set<RouterListener>;
+  }
+}
 
-const listeners = new Set<RouterListener>();
+function getGlobalRouterState(): RouterState {
+  if (typeof window === "undefined") {
+    return { currentRoute: null, loaderData: undefined, navigation: { state: "idle" } };
+  }
+  if (!window.__MANDU_ROUTER_STATE__) {
+    window.__MANDU_ROUTER_STATE__ = {
+      currentRoute: null,
+      loaderData: undefined,
+      navigation: { state: "idle" },
+    };
+  }
+  return window.__MANDU_ROUTER_STATE__;
+}
+
+function setGlobalRouterState(state: RouterState): void {
+  if (typeof window !== "undefined") {
+    window.__MANDU_ROUTER_STATE__ = state;
+  }
+}
+
+function getGlobalListeners(): Set<RouterListener> {
+  if (typeof window === "undefined") {
+    return new Set();
+  }
+  if (!window.__MANDU_ROUTER_LISTENERS__) {
+    window.__MANDU_ROUTER_LISTENERS__ = new Set();
+  }
+  return window.__MANDU_ROUTER_LISTENERS__;
+}
+
+// Getter for routerState (전역 상태 참조)
+const getRouterStateInternal = () => getGlobalRouterState();
+const setRouterStateInternal = (state: RouterState) => setGlobalRouterState(state);
+const listeners = { get current() { return getGlobalListeners(); } };
 
 /**
  * 초기화: 서버에서 전달된 라우트 정보로 상태 설정
@@ -56,7 +90,7 @@ function initializeFromServer(): void {
     // URL에서 실제 params 추출
     const params = extractParamsFromPath(route.pattern, window.location.pathname);
 
-    routerState = {
+    setRouterStateInternal({
       currentRoute: {
         id: route.id,
         pattern: route.pattern,
@@ -64,7 +98,7 @@ function initializeFromServer(): void {
       },
       loaderData: data?.[route.id]?.serverData,
       navigation: { state: "idle" },
-    };
+    });
   }
 }
 
@@ -157,10 +191,10 @@ export async function navigate(
     }
 
     // 로딩 상태 시작
-    routerState = {
-      ...routerState,
+    setRouterStateInternal({
+      ...getRouterStateInternal(),
       navigation: { state: "loading", location: to },
-    };
+    });
     notifyListeners();
 
     // 데이터 fetch
@@ -184,7 +218,7 @@ export async function navigate(
     }
 
     // 상태 업데이트
-    routerState = {
+    setRouterStateInternal({
       currentRoute: {
         id: data.routeId,
         pattern: data.pattern,
@@ -192,7 +226,7 @@ export async function navigate(
       },
       loaderData: data.loaderData,
       navigation: { state: "idle" },
-    };
+    });
 
     // __MANDU_DATA__ 업데이트
     if (typeof window !== "undefined") {
@@ -236,9 +270,10 @@ function handlePopState(event: PopStateEvent): void {
  * 리스너에게 상태 변경 알림
  */
 function notifyListeners(): void {
-  for (const listener of listeners) {
+  const state = getRouterStateInternal();
+  for (const listener of listeners.current) {
     try {
-      listener(routerState);
+      listener(state);
     } catch (error) {
       console.error("[Mandu Router] Listener error:", error);
     }
@@ -249,36 +284,36 @@ function notifyListeners(): void {
  * 상태 변경 구독
  */
 export function subscribe(listener: RouterListener): () => void {
-  listeners.add(listener);
-  return () => listeners.delete(listener);
+  listeners.current.add(listener);
+  return () => listeners.current.delete(listener);
 }
 
 /**
  * 현재 라우터 상태 가져오기
  */
 export function getRouterState(): RouterState {
-  return routerState;
+  return getRouterStateInternal();
 }
 
 /**
  * 현재 라우트 정보 가져오기
  */
 export function getCurrentRoute(): RouteInfo | null {
-  return routerState.currentRoute;
+  return getRouterStateInternal().currentRoute;
 }
 
 /**
  * 현재 loader 데이터 가져오기
  */
 export function getLoaderData<T = unknown>(): T | undefined {
-  return routerState.loaderData as T | undefined;
+  return getRouterStateInternal().loaderData as T | undefined;
 }
 
 /**
  * 네비게이션 상태 가져오기
  */
 export function getNavigationState(): NavigationState {
-  return routerState.navigation;
+  return getRouterStateInternal().navigation;
 }
 
 // ========== Link Click Handler ==========