@mandujs/core 0.7.3 → 0.7.5

package/package.json

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

package/src/bundler/build.ts

@@ -56,12 +56,11 @@ function generateRuntimeSource(): string {
  */
 
 // 글로벌 레지스트리 사용 (Island 번들과 공유)
+// 주의: 변수로 캐싱하면 번들러가 인라인 시 new Map()으로 대체함
+// 항상 window.__MANDU_ISLANDS__를 직접 참조해야 함
 window.__MANDU_ISLANDS__ = window.__MANDU_ISLANDS__ || new Map();
 window.__MANDU_ROOTS__ = window.__MANDU_ROOTS__ || new Map();
 
-const islandRegistry = window.__MANDU_ISLANDS__;
-const hydratedRoots = window.__MANDU_ROOTS__;
-
 // 서버 데이터
 const serverData = window.__MANDU_DATA__ || {};
 
@@ -130,7 +129,7 @@ function scheduleHydration(element, id, priority, data) {
  * SSR 플레이스홀더를 Island 컴포넌트로 교체
  */
 async function hydrateIsland(element, id, data) {
-  const loader = islandRegistry.get(id);
+  const loader = window.__MANDU_ISLANDS__.get(id);
   if (!loader) {
     console.warn('[Mandu] Island not found:', id);
     return;
@@ -159,7 +158,7 @@ async function hydrateIsland(element, id, data) {
     // hydrateRoot 대신 createRoot 사용: Island는 SSR과 다른 컨텐츠를 렌더링할 수 있음
     const root = createRoot(element);
     root.render(React.createElement(IslandComponent));
-    hydratedRoots.set(id, root);
+    window.__MANDU_ROOTS__.set(id, root);
 
     // 완료 표시
     element.setAttribute('data-mandu-hydrated', 'true');
@@ -206,7 +205,9 @@ if (document.readyState === 'loading') {
   hydrateIslands();
 }
 
-export { islandRegistry, hydratedRoots };
+// 글로벌 레지스트리 접근용 getter
+export const getIslandRegistry = () => window.__MANDU_ISLANDS__;
+export const getHydratedRoots = () => window.__MANDU_ROOTS__;
 `;
 }
 

package/src/client/runtime.ts

@@ -15,14 +15,22 @@ import React from "react";
 export type IslandLoader = () => Promise<CompiledIsland<any, any>> | CompiledIsland<any, any>;
 
 /**
- * Island 레지스트리
+ * Island 레지스트리 (글로벌)
+ * 주의: 로컬 Map 사용 시 번들러 인라인 문제로 별도 인스턴스 생성됨
+ * 항상 window.__MANDU_ISLANDS__를 직접 참조해야 함
  */
-const islandRegistry = new Map<string, IslandLoader>();
+declare global {
+  interface Window {
+    __MANDU_ISLANDS__: Map<string, IslandLoader>;
+    __MANDU_ROOTS__: Map<string, Root>;
+  }
+}
 
-/**
- * Hydrated roots 추적
- */
-const hydratedRoots = new Map<string, Root>();
+// 글로벌 레지스트리 초기화
+if (typeof window !== "undefined") {
+  window.__MANDU_ISLANDS__ = window.__MANDU_ISLANDS__ || new Map<string, IslandLoader>();
+  window.__MANDU_ROOTS__ = window.__MANDU_ROOTS__ || new Map<string, Root>();
+}
 
 /**
  * Hydration 상태 추적
@@ -45,14 +53,14 @@ const hydrationState: HydrationState = {
  * Island 등록
  */
 export function registerIsland(id: string, loader: IslandLoader): void {
-  islandRegistry.set(id, loader);
+  window.__MANDU_ISLANDS__.set(id, loader);
 }
 
 /**
  * 등록된 모든 Island 가져오기
  */
 export function getRegisteredIslands(): string[] {
-  return Array.from(islandRegistry.keys());
+  return Array.from(window.__MANDU_ISLANDS__.keys());
 }
 
 /**
@@ -139,7 +147,7 @@ async function hydrateIsland(
   id: string,
   serverData: unknown
 ): Promise<void> {
-  const loader = islandRegistry.get(id);
+  const loader = window.__MANDU_ISLANDS__.get(id);
   if (!loader) {
     console.warn(`[Mandu] Island not registered: ${id}`);
     hydrationState.failed++;
@@ -179,7 +187,7 @@ async function hydrateIsland(
 
     // Hydrate
     const root = hydrateRoot(element, content);
-    hydratedRoots.set(id, root);
+    window.__MANDU_ROOTS__.set(id, root);
 
     // 상태 업데이트
     element.setAttribute("data-mandu-hydrated", "true");
@@ -252,13 +260,13 @@ export function getHydrationState(): Readonly<HydrationState> {
  * 특정 Island unmount
  */
 export function unmountIsland(id: string): boolean {
-  const root = hydratedRoots.get(id);
+  const root = window.__MANDU_ROOTS__.get(id);
   if (!root) {
     return false;
   }
 
   root.unmount();
-  hydratedRoots.delete(id);
+  window.__MANDU_ROOTS__.delete(id);
   return true;
 }
 
@@ -266,9 +274,9 @@ export function unmountIsland(id: string): boolean {
  * 모든 Island unmount
  */
 export function unmountAllIslands(): void {
-  for (const [id, root] of hydratedRoots) {
+  for (const [id, root] of window.__MANDU_ROOTS__) {
     root.unmount();
-    hydratedRoots.delete(id);
+    window.__MANDU_ROOTS__.delete(id);
   }
 }
 

package/src/filling/filling.ts

@@ -7,6 +7,11 @@ import { ManduContext, ValidationError } from "./context";
 import { AuthenticationError, AuthorizationError } from "./auth";
 import { ErrorClassifier, formatErrorResponse, ErrorCode } from "../error";
 import { createContract, type ContractDefinition, type ContractInstance } from "../contract";
+import {
+  type Middleware as RuntimeMiddleware,
+  type MiddlewareEntry,
+  compose,
+} from "../runtime/compose";
 import {
   type LifecycleStore,
   type OnRequestHandler,
@@ -53,12 +58,14 @@ interface FillingConfig<TLoaderData = unknown> {
   handlers: Map<HttpMethod, Handler>;
   loader?: Loader<TLoaderData>;
   lifecycle: LifecycleStore;
+  middleware: MiddlewareEntry[];
 }
 
 export class ManduFilling<TLoaderData = unknown> {
   private config: FillingConfig<TLoaderData> = {
     handlers: new Map(),
     lifecycle: createLifecycleStore(),
+    middleware: [],
   };
 
   loader(loaderFn: Loader<TLoaderData>): this {
@@ -139,6 +146,19 @@ export class ManduFilling<TLoaderData = unknown> {
     return this;
   }
 
+  /**
+   * Compose-style middleware (Hono/Koa 스타일)
+   * lifecycle의 handler 단계에서 실행됨
+   */
+  middleware(fn: RuntimeMiddleware, name?: string): this {
+    this.config.middleware.push({
+      fn,
+      name: name || fn.name || `middleware_${this.config.middleware.length}`,
+      isAsync: fn.constructor.name === "AsyncFunction",
+    });
+    return this;
+  }
+
   onParse(fn: OnParseHandler): this {
     this.config.lifecycle.onParse.push({ fn, scope: "local" });
     return this;
@@ -197,7 +217,22 @@ export class ManduFilling<TLoaderData = unknown> {
       return ctx.json({ status: "error", message: `Method ${method} not allowed`, allowed: Array.from(this.config.handlers.keys()) }, 405);
     }
     const lifecycleWithDefaults = this.createLifecycleWithDefaults(routeContext);
-    return executeLifecycle(lifecycleWithDefaults, ctx, async () => handler(ctx), options);
+    const runHandler = async () => {
+      if (this.config.middleware.length === 0) {
+        return handler(ctx);
+      }
+      const chain: MiddlewareEntry[] = [
+        ...this.config.middleware,
+        {
+          fn: async (innerCtx) => handler(innerCtx),
+          name: "handler",
+          isAsync: true,
+        },
+      ];
+      const composed = compose(chain);
+      return composed(ctx);
+    };
+    return executeLifecycle(lifecycleWithDefaults, ctx, runHandler, options);
   }
 
   private createLifecycleWithDefaults(routeContext?: { routeId: string; pattern: string }): LifecycleStore {