@real-router/ssr-data-plugin 0.2.0 → 0.3.0

package/README.md

@@ -15,7 +15,7 @@ const data = await loadRouteData(state.name, state.params); // manual
 // With plugin:
 router.usePlugin(ssrDataPluginFactory(loaders));
 const state = await router.start(url);
-const data = router.getRouteData(); // loaded automatically
+const data = state.context.data; // loaded automatically
 ```
 
 ## Installation
@@ -24,7 +24,7 @@ const data = router.getRouteData(); // loaded automatically
 npm install @real-router/ssr-data-plugin
 ```
 
-**Peer dependency:** `@real-router/core`
+**Peer dependencies:** `@real-router/core`, `@real-router/types`
 
 ## Quick Start
 
@@ -32,10 +32,11 @@ npm install @real-router/ssr-data-plugin
 import { createRouter } from "@real-router/core";
 import { cloneRouter } from "@real-router/core/api";
 import { ssrDataPluginFactory } from "@real-router/ssr-data-plugin";
+import type { DataLoaderFactoryMap } from "@real-router/ssr-data-plugin";
 
-const loaders = {
-  "users.profile": async (params) => fetchUser(params.id),
-  "users.list": async () => fetchUsers(),
+const loaders: DataLoaderFactoryMap = {
+  "users.profile": () => async (params) => fetchUser(params.id),
+  "users.list": () => async () => fetchUsers(),
 };
 
 // Base router — created once
@@ -46,7 +47,7 @@ const router = cloneRouter(baseRouter, { isAuthenticated: true });
 router.usePlugin(ssrDataPluginFactory(loaders));
 
 const state = await router.start(url);
-const data = router.getRouteData(); // data loaded by matching loader
+const data = state.context.data; // data loaded by matching loader
 
 const html = renderToString(<App />);
 router.dispose();
@@ -54,39 +55,37 @@ router.dispose();
 
 ## Configuration
 
-Loaders are keyed by **route name** (not path). Each loader receives route `params` and returns a `Promise`:
+Loaders are keyed by **route name** (not path). Each value is a **factory function** `(router, getDependency) => loaderFn` that receives the router instance and a dependency getter. The factory runs once at plugin registration; the returned loader is cached. Each loader receives route `params` and returns a `Promise`:
 
 ```typescript
-import type { DataLoaderMap } from "@real-router/ssr-data-plugin";
+import type { DataLoaderFactoryMap } from "@real-router/ssr-data-plugin";
 
-const loaders: DataLoaderMap = {
-  home: async () => ({ featured: await fetchFeatured() }),
-  "users.profile": async (params) => ({ user: await fetchUser(params.id) }),
-  "users.list": async () => ({ users: await fetchUsers() }),
+const loaders: DataLoaderFactoryMap = {
+  home: () => async () => ({ featured: await fetchFeatured() }),
+  "users.profile": () => async (params) => ({ user: await fetchUser(params.id) }),
+  "users.list": () => async () => ({ users: await fetchUsers() }),
 };
 ```
 
-Routes without a matching loader produce no data — `getRouteData()` returns `null`.
+Routes without a matching loader produce no data — `state.context.data` is `undefined`.
 
-## Router Extension
+## Accessing Data
 
-The plugin extends the router instance with one method via [`extendRouter()`](https://github.com/greydragon888/real-router/wiki/plugin-architecture):
-
-| Method                 | Returns   | Description                                |
-| ---------------------- | --------- | ------------------------------------------ |
-| `getRouteData(state?)` | `unknown` | Get loaded data for current or given state |
+After `await router.start(url)`, data is available on the returned state's context:
 
 ```typescript
-router.getRouteData(); // data for current state
-router.getRouteData(state); // data for a specific state
+const state = await router.start(url);
+const data = state.context.data; // loaded data, or undefined if no loader matched
 ```
 
+The plugin claims the `"data"` namespace on `state.context` via the [claim-based API](https://github.com/greydragon888/real-router/wiki/plugin-architecture). Module augmentation on `@real-router/types` provides type safety for `state.context.data`.
+
 ## SSR-Only by Design
 
 This plugin intercepts `start()` only — not `navigate()`. In SSR, the flow is:
 
 ```
-cloneRouter → usePlugin → start(url) → data loaded → renderToString → getRouteData()
+cloneRouter → usePlugin → start(url) → data loaded → state.context.data → renderToString
 ```
 
 Client-side navigation and data fetching is the application's responsibility (React Query, Suspense, `useEffect`, etc.).
@@ -96,7 +95,7 @@ Client-side navigation and data fetching is the application's responsibility (Re
 ```typescript
 const unsubscribe = router.usePlugin(ssrDataPluginFactory(loaders));
 
-// Later — removes getRouteData and stops data loading
+// Later — releases "data" namespace claim and stops data loading
 unsubscribe();
 ```
 

package/dist/cjs/index.d.ts

@@ -1,18 +1,29 @@
-import { Params, PluginFactory, State } from "@real-router/core";
+import { DefaultDependencies, Params, Router } from "@real-router/types";
+import { PluginFactory } from "@real-router/core";
 
 //#region src/types.d.ts
 type DataLoaderFn = (params: Params) => Promise<unknown>;
-type DataLoaderMap = Record<string, DataLoaderFn>;
+/**
+ * Factory function for creating data loaders.
+ * Receives the router instance and a dependency getter (same pattern as GuardFnFactory).
+ * Factory runs once when the plugin starts; the returned loader is cached.
+ *
+ * @template Dependencies - Router dependency map for typed `getDependency()` access.
+ *   Defaults to `DefaultDependencies`. Pass your app's dependency interface for
+ *   type-safe DI: `DataLoaderFnFactory<AppDependencies>`.
+ */
+type DataLoaderFnFactory<Dependencies extends DefaultDependencies = DefaultDependencies> = (router: Router<Dependencies>, getDependency: <K extends keyof Dependencies>(key: K) => Dependencies[K]) => DataLoaderFn;
+type DataLoaderFactoryMap<Dependencies extends DefaultDependencies = DefaultDependencies> = Record<string, DataLoaderFnFactory<Dependencies>>;
 //#endregion
 //#region src/factory.d.ts
-declare function ssrDataPluginFactory(loaders: DataLoaderMap): PluginFactory;
+declare function ssrDataPluginFactory(loaders: DataLoaderFactoryMap): PluginFactory;
 //#endregion
 //#region src/index.d.ts
-declare module "@real-router/core" {
-  interface Router {
-    getRouteData: (state?: State) => unknown;
+declare module "@real-router/types" {
+  interface StateContext {
+    data?: unknown;
   }
 } //# sourceMappingURL=index.d.ts.map
 //#endregion
-export { type DataLoaderFn, type DataLoaderMap, ssrDataPluginFactory };
+export { type DataLoaderFactoryMap, type DataLoaderFn, type DataLoaderFnFactory, ssrDataPluginFactory };
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/types.ts","../../src/factory.ts","../../src/index.ts"],"mappings":";;;KAEY,YAAA,IAAgB,MAAA,EAAQ,MAAA,KAAW,OAAA;AAAA,KAEnC,aAAA,GAAgB,MAAA,SAAe,YAAA;;;iBCG3B,oBAAA,CAAqB,OAAA,EAAS,aAAA,GAAgB,aAAA;;;;YCAlD,MAAA;IACR,YAAA,GAAe,KAAA,GAAQ,KAAA;EAAA;AAAA"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/types.ts","../../src/factory.ts","../../src/index.ts"],"mappings":";;;;KAEY,YAAA,IAAgB,MAAA,EAAQ,MAAA,KAAW,OAAA;;;AAA/C;;;;;;;KAWY,mBAAA,sBACW,mBAAA,GAAsB,mBAAA,KAE3C,MAAA,EAAQ,MAAA,CAAO,YAAA,GACf,aAAA,mBAAgC,YAAA,EAAc,GAAA,EAAK,CAAA,KAAM,YAAA,CAAa,CAAA,MACnE,YAAA;AAAA,KAEO,oBAAA,sBACW,mBAAA,GAAsB,mBAAA,IACzC,MAAA,SAAe,mBAAA,CAAoB,YAAA;;;iBCdvB,oBAAA,CACd,OAAA,EAAS,oBAAA,GACR,aAAA;;;;YCDS,YAAA;IACR,IAAA;EAAA;AAAA"}

package/dist/cjs/index.js

@@ -1,2 +1,2 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});let e=require(`@real-router/core/api`);const t=`[@real-router/ssr-data-plugin]`;function n(e){if(typeof e!=`object`||!e)throw TypeError(`${t} loaders must be a non-null object`);for(let[n,r]of Object.entries(e))if(typeof r!=`function`)throw TypeError(`${t} loader for route "${n}" must be a function`)}function r(t){return n(t),n=>{let r=(0,e.getPluginApi)(n),i=new WeakMap,a=r.addInterceptor(`start`,async(e,n)=>{let r=await e(n);return Object.hasOwn(t,r.name)&&i.set(r,await t[r.name](r.params)),r}),o=r.extendRouter({getRouteData(e){let t=e??n.getState();return t?i.get(t)??null:null}});return{teardown(){a(),o()}}}}exports.ssrDataPluginFactory=r;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});let e=require(`@real-router/core/api`);const t=`[@real-router/ssr-data-plugin]`;function n(e){if(typeof e!=`object`||!e||Array.isArray(e))throw TypeError(`${t} loaders must be a non-null object`);for(let[n,r]of Object.entries(e))if(typeof r!=`function`)throw TypeError(`${t} loader for route "${n}" must be a function`)}function r(r){return n(r),(n,i)=>{let a=(0,e.getPluginApi)(n),o=a.claimContextNamespace(`data`),s=new Map;try{for(let[e,a]of Object.entries(r)){let r=a(n,i);if(typeof r!=`function`)throw TypeError(`${t} factory for route "${e}" must return a function`);s.set(e,r)}}catch(e){throw o.release(),e}let c=a.addInterceptor(`start`,async(e,t)=>{let n=await e(t),r=s.get(n.name);return r&&o.write(n,await r(n.params)),n});return{teardown(){c(),o.release()}}}}exports.ssrDataPluginFactory=r;
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/constants.ts","../../src/validation.ts","../../src/factory.ts"],"sourcesContent":["export const LOGGER_CONTEXT = \"ssr-data-plugin\";\n\nexport const ERROR_PREFIX = `[@real-router/${LOGGER_CONTEXT}]`;\n","import { ERROR_PREFIX } from \"./constants\";\n\nimport type { DataLoaderMap } from \"./types\";\n\nexport function validateLoaders(\n  loaders: unknown,\n): asserts loaders is DataLoaderMap {\n  if (loaders === null || typeof loaders !== \"object\") {\n    throw new TypeError(`${ERROR_PREFIX} loaders must be a non-null object`);\n  }\n\n  for (const [key, value] of Object.entries(\n    loaders as Record<string, unknown>,\n  )) {\n    if (typeof value !== \"function\") {\n      throw new TypeError(\n        `${ERROR_PREFIX} loader for route \"${key}\" must be a function`,\n      );\n    }\n  }\n}\n","import { getPluginApi } from \"@real-router/core/api\";\n\nimport { validateLoaders } from \"./validation\";\n\nimport type { DataLoaderMap } from \"./types\";\nimport type { State, PluginFactory, Plugin } from \"@real-router/core\";\n\nexport function ssrDataPluginFactory(loaders: DataLoaderMap): PluginFactory {\n  validateLoaders(loaders);\n\n  return (router): Plugin => {\n    const api = getPluginApi(router);\n    const dataStore = new WeakMap<State, unknown>();\n\n    const removeStartInterceptor = api.addInterceptor(\n      \"start\",\n      async (next, path) => {\n        const state = await next(path);\n\n        if (Object.hasOwn(loaders, state.name)) {\n          dataStore.set(state, await loaders[state.name](state.params));\n        }\n\n        return state;\n      },\n    );\n\n    const removeExtensions = api.extendRouter({\n      getRouteData(state?: State): unknown {\n        const routeState = state ?? router.getState();\n\n        return routeState ? (dataStore.get(routeState) ?? null) : null;\n      },\n    });\n\n    return {\n      teardown() {\n        removeStartInterceptor();\n        removeExtensions();\n      },\n    };\n  };\n}\n"],"mappings":"0GAAA,MAEa,EAAe,iCCE5B,SAAgB,EACd,EACkC,CAClC,GAAwB,OAAO,GAAY,WAAvC,EACF,MAAU,UAAU,GAAG,EAAa,oCAAoC,CAG1E,IAAK,GAAM,CAAC,EAAK,KAAU,OAAO,QAChC,EACD,CACC,GAAI,OAAO,GAAU,WACnB,MAAU,UACR,GAAG,EAAa,qBAAqB,EAAI,sBAC1C,CCVP,SAAgB,EAAqB,EAAuC,CAG1E,OAFA,EAAgB,EAAQ,CAEhB,GAAmB,CACzB,IAAM,GAAA,EAAA,EAAA,cAAmB,EAAO,CAC1B,EAAY,IAAI,QAEhB,EAAyB,EAAI,eACjC,QACA,MAAO,EAAM,IAAS,CACpB,IAAM,EAAQ,MAAM,EAAK,EAAK,CAM9B,OAJI,OAAO,OAAO,EAAS,EAAM,KAAK,EACpC,EAAU,IAAI,EAAO,MAAM,EAAQ,EAAM,MAAM,EAAM,OAAO,CAAC,CAGxD,GAEV,CAEK,EAAmB,EAAI,aAAa,CACxC,aAAa,EAAwB,CACnC,IAAM,EAAa,GAAS,EAAO,UAAU,CAE7C,OAAO,EAAc,EAAU,IAAI,EAAW,EAAI,KAAQ,MAE7D,CAAC,CAEF,MAAO,CACL,UAAW,CACT,GAAwB,CACxB,GAAkB,EAErB"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/constants.ts","../../src/validation.ts","../../src/factory.ts"],"sourcesContent":["const LOGGER_CONTEXT = \"ssr-data-plugin\";\n\nexport const ERROR_PREFIX = `[@real-router/${LOGGER_CONTEXT}]`;\n","import { ERROR_PREFIX } from \"./constants\";\n\nimport type { DataLoaderFactoryMap } from \"./types\";\n\nexport function validateLoaders(\n  loaders: unknown,\n): asserts loaders is DataLoaderFactoryMap {\n  if (\n    loaders === null ||\n    typeof loaders !== \"object\" ||\n    Array.isArray(loaders)\n  ) {\n    throw new TypeError(`${ERROR_PREFIX} loaders must be a non-null object`);\n  }\n\n  for (const [key, value] of Object.entries(\n    loaders as Record<string, unknown>,\n  )) {\n    if (typeof value !== \"function\") {\n      throw new TypeError(\n        `${ERROR_PREFIX} loader for route \"${key}\" must be a function`,\n      );\n    }\n  }\n}\n","import { getPluginApi } from \"@real-router/core/api\";\n\nimport { ERROR_PREFIX } from \"./constants\";\nimport { validateLoaders } from \"./validation\";\n\nimport type { DataLoaderFn, DataLoaderFactoryMap } from \"./types\";\nimport type { PluginFactory, Plugin } from \"@real-router/core\";\n\nexport function ssrDataPluginFactory(\n  loaders: DataLoaderFactoryMap,\n): PluginFactory {\n  validateLoaders(loaders);\n\n  return (router, getDependency): Plugin => {\n    const api = getPluginApi(router);\n    const claim = api.claimContextNamespace(\"data\");\n\n    const compiledLoaders = new Map<string, DataLoaderFn>();\n\n    try {\n      for (const [name, factory] of Object.entries(loaders)) {\n        const loader = factory(router, getDependency);\n\n        if (typeof loader !== \"function\") {\n          throw new TypeError(\n            `${ERROR_PREFIX} factory for route \"${name}\" must return a function`,\n          );\n        }\n\n        compiledLoaders.set(name, loader);\n      }\n    } catch (error) {\n      claim.release();\n\n      throw error;\n    }\n\n    const removeStartInterceptor = api.addInterceptor(\n      \"start\",\n      async (next, path) => {\n        const state = await next(path);\n        const loader = compiledLoaders.get(state.name);\n\n        if (loader) {\n          claim.write(state, await loader(state.params));\n        }\n\n        return state;\n      },\n    );\n\n    return {\n      teardown() {\n        removeStartInterceptor();\n        claim.release();\n      },\n    };\n  };\n}\n"],"mappings":"0GAAA,MAEa,EAAe,iCCE5B,SAAgB,EACd,EACyC,CACzC,GAEE,OAAO,GAAY,WADnB,GAEA,MAAM,QAAQ,EAAQ,CAEtB,MAAU,UAAU,GAAG,EAAa,oCAAoC,CAG1E,IAAK,GAAM,CAAC,EAAK,KAAU,OAAO,QAChC,EACD,CACC,GAAI,OAAO,GAAU,WACnB,MAAU,UACR,GAAG,EAAa,qBAAqB,EAAI,sBAC1C,CCbP,SAAgB,EACd,EACe,CAGf,OAFA,EAAgB,EAAQ,EAEhB,EAAQ,IAA0B,CACxC,IAAM,GAAA,EAAA,EAAA,cAAmB,EAAO,CAC1B,EAAQ,EAAI,sBAAsB,OAAO,CAEzC,EAAkB,IAAI,IAE5B,GAAI,CACF,IAAK,GAAM,CAAC,EAAM,KAAY,OAAO,QAAQ,EAAQ,CAAE,CACrD,IAAM,EAAS,EAAQ,EAAQ,EAAc,CAE7C,GAAI,OAAO,GAAW,WACpB,MAAU,UACR,GAAG,EAAa,sBAAsB,EAAK,0BAC5C,CAGH,EAAgB,IAAI,EAAM,EAAO,QAE5B,EAAO,CAGd,MAFA,EAAM,SAAS,CAET,EAGR,IAAM,EAAyB,EAAI,eACjC,QACA,MAAO,EAAM,IAAS,CACpB,IAAM,EAAQ,MAAM,EAAK,EAAK,CACxB,EAAS,EAAgB,IAAI,EAAM,KAAK,CAM9C,OAJI,GACF,EAAM,MAAM,EAAO,MAAM,EAAO,EAAM,OAAO,CAAC,CAGzC,GAEV,CAED,MAAO,CACL,UAAW,CACT,GAAwB,CACxB,EAAM,SAAS,EAElB"}

package/dist/esm/index.d.mts

@@ -1,18 +1,29 @@
-import { Params, PluginFactory, State } from "@real-router/core";
+import { DefaultDependencies, Params, Router } from "@real-router/types";
+import { PluginFactory } from "@real-router/core";
 
 //#region src/types.d.ts
 type DataLoaderFn = (params: Params) => Promise<unknown>;
-type DataLoaderMap = Record<string, DataLoaderFn>;
+/**
+ * Factory function for creating data loaders.
+ * Receives the router instance and a dependency getter (same pattern as GuardFnFactory).
+ * Factory runs once when the plugin starts; the returned loader is cached.
+ *
+ * @template Dependencies - Router dependency map for typed `getDependency()` access.
+ *   Defaults to `DefaultDependencies`. Pass your app's dependency interface for
+ *   type-safe DI: `DataLoaderFnFactory<AppDependencies>`.
+ */
+type DataLoaderFnFactory<Dependencies extends DefaultDependencies = DefaultDependencies> = (router: Router<Dependencies>, getDependency: <K extends keyof Dependencies>(key: K) => Dependencies[K]) => DataLoaderFn;
+type DataLoaderFactoryMap<Dependencies extends DefaultDependencies = DefaultDependencies> = Record<string, DataLoaderFnFactory<Dependencies>>;
 //#endregion
 //#region src/factory.d.ts
-declare function ssrDataPluginFactory(loaders: DataLoaderMap): PluginFactory;
+declare function ssrDataPluginFactory(loaders: DataLoaderFactoryMap): PluginFactory;
 //#endregion
 //#region src/index.d.ts
-declare module "@real-router/core" {
-  interface Router {
-    getRouteData: (state?: State) => unknown;
+declare module "@real-router/types" {
+  interface StateContext {
+    data?: unknown;
   }
 } //# sourceMappingURL=index.d.ts.map
 //#endregion
-export { type DataLoaderFn, type DataLoaderMap, ssrDataPluginFactory };
+export { type DataLoaderFactoryMap, type DataLoaderFn, type DataLoaderFnFactory, ssrDataPluginFactory };
 //# sourceMappingURL=index.d.mts.map

package/dist/esm/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/types.ts","../../src/factory.ts","../../src/index.ts"],"mappings":";;;KAEY,YAAA,IAAgB,MAAA,EAAQ,MAAA,KAAW,OAAA;AAAA,KAEnC,aAAA,GAAgB,MAAA,SAAe,YAAA;;;iBCG3B,oBAAA,CAAqB,OAAA,EAAS,aAAA,GAAgB,aAAA;;;;YCAlD,MAAA;IACR,YAAA,GAAe,KAAA,GAAQ,KAAA;EAAA;AAAA"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../../src/types.ts","../../src/factory.ts","../../src/index.ts"],"mappings":";;;;KAEY,YAAA,IAAgB,MAAA,EAAQ,MAAA,KAAW,OAAA;;;AAA/C;;;;;;;KAWY,mBAAA,sBACW,mBAAA,GAAsB,mBAAA,KAE3C,MAAA,EAAQ,MAAA,CAAO,YAAA,GACf,aAAA,mBAAgC,YAAA,EAAc,GAAA,EAAK,CAAA,KAAM,YAAA,CAAa,CAAA,MACnE,YAAA;AAAA,KAEO,oBAAA,sBACW,mBAAA,GAAsB,mBAAA,IACzC,MAAA,SAAe,mBAAA,CAAoB,YAAA;;;iBCdvB,oBAAA,CACd,OAAA,EAAS,oBAAA,GACR,aAAA;;;;YCDS,YAAA;IACR,IAAA;EAAA;AAAA"}

package/dist/esm/index.mjs

@@ -1,2 +1,2 @@
-import{getPluginApi as e}from"@real-router/core/api";const t=`[@real-router/ssr-data-plugin]`;function n(e){if(typeof e!=`object`||!e)throw TypeError(`${t} loaders must be a non-null object`);for(let[n,r]of Object.entries(e))if(typeof r!=`function`)throw TypeError(`${t} loader for route "${n}" must be a function`)}function r(t){return n(t),n=>{let r=e(n),i=new WeakMap,a=r.addInterceptor(`start`,async(e,n)=>{let r=await e(n);return Object.hasOwn(t,r.name)&&i.set(r,await t[r.name](r.params)),r}),o=r.extendRouter({getRouteData(e){let t=e??n.getState();return t?i.get(t)??null:null}});return{teardown(){a(),o()}}}}export{r as ssrDataPluginFactory};
+import{getPluginApi as e}from"@real-router/core/api";const t=`[@real-router/ssr-data-plugin]`;function n(e){if(typeof e!=`object`||!e||Array.isArray(e))throw TypeError(`${t} loaders must be a non-null object`);for(let[n,r]of Object.entries(e))if(typeof r!=`function`)throw TypeError(`${t} loader for route "${n}" must be a function`)}function r(r){return n(r),(n,i)=>{let a=e(n),o=a.claimContextNamespace(`data`),s=new Map;try{for(let[e,a]of Object.entries(r)){let r=a(n,i);if(typeof r!=`function`)throw TypeError(`${t} factory for route "${e}" must return a function`);s.set(e,r)}}catch(e){throw o.release(),e}let c=a.addInterceptor(`start`,async(e,t)=>{let n=await e(t),r=s.get(n.name);return r&&o.write(n,await r(n.params)),n});return{teardown(){c(),o.release()}}}}export{r as ssrDataPluginFactory};
 //# sourceMappingURL=index.mjs.map

package/dist/esm/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../../src/constants.ts","../../src/validation.ts","../../src/factory.ts"],"sourcesContent":["export const LOGGER_CONTEXT = \"ssr-data-plugin\";\n\nexport const ERROR_PREFIX = `[@real-router/${LOGGER_CONTEXT}]`;\n","import { ERROR_PREFIX } from \"./constants\";\n\nimport type { DataLoaderMap } from \"./types\";\n\nexport function validateLoaders(\n  loaders: unknown,\n): asserts loaders is DataLoaderMap {\n  if (loaders === null || typeof loaders !== \"object\") {\n    throw new TypeError(`${ERROR_PREFIX} loaders must be a non-null object`);\n  }\n\n  for (const [key, value] of Object.entries(\n    loaders as Record<string, unknown>,\n  )) {\n    if (typeof value !== \"function\") {\n      throw new TypeError(\n        `${ERROR_PREFIX} loader for route \"${key}\" must be a function`,\n      );\n    }\n  }\n}\n","import { getPluginApi } from \"@real-router/core/api\";\n\nimport { validateLoaders } from \"./validation\";\n\nimport type { DataLoaderMap } from \"./types\";\nimport type { State, PluginFactory, Plugin } from \"@real-router/core\";\n\nexport function ssrDataPluginFactory(loaders: DataLoaderMap): PluginFactory {\n  validateLoaders(loaders);\n\n  return (router): Plugin => {\n    const api = getPluginApi(router);\n    const dataStore = new WeakMap<State, unknown>();\n\n    const removeStartInterceptor = api.addInterceptor(\n      \"start\",\n      async (next, path) => {\n        const state = await next(path);\n\n        if (Object.hasOwn(loaders, state.name)) {\n          dataStore.set(state, await loaders[state.name](state.params));\n        }\n\n        return state;\n      },\n    );\n\n    const removeExtensions = api.extendRouter({\n      getRouteData(state?: State): unknown {\n        const routeState = state ?? router.getState();\n\n        return routeState ? (dataStore.get(routeState) ?? null) : null;\n      },\n    });\n\n    return {\n      teardown() {\n        removeStartInterceptor();\n        removeExtensions();\n      },\n    };\n  };\n}\n"],"mappings":"qDAAA,MAEa,EAAe,iCCE5B,SAAgB,EACd,EACkC,CAClC,GAAwB,OAAO,GAAY,WAAvC,EACF,MAAU,UAAU,GAAG,EAAa,oCAAoC,CAG1E,IAAK,GAAM,CAAC,EAAK,KAAU,OAAO,QAChC,EACD,CACC,GAAI,OAAO,GAAU,WACnB,MAAU,UACR,GAAG,EAAa,qBAAqB,EAAI,sBAC1C,CCVP,SAAgB,EAAqB,EAAuC,CAG1E,OAFA,EAAgB,EAAQ,CAEhB,GAAmB,CACzB,IAAM,EAAM,EAAa,EAAO,CAC1B,EAAY,IAAI,QAEhB,EAAyB,EAAI,eACjC,QACA,MAAO,EAAM,IAAS,CACpB,IAAM,EAAQ,MAAM,EAAK,EAAK,CAM9B,OAJI,OAAO,OAAO,EAAS,EAAM,KAAK,EACpC,EAAU,IAAI,EAAO,MAAM,EAAQ,EAAM,MAAM,EAAM,OAAO,CAAC,CAGxD,GAEV,CAEK,EAAmB,EAAI,aAAa,CACxC,aAAa,EAAwB,CACnC,IAAM,EAAa,GAAS,EAAO,UAAU,CAE7C,OAAO,EAAc,EAAU,IAAI,EAAW,EAAI,KAAQ,MAE7D,CAAC,CAEF,MAAO,CACL,UAAW,CACT,GAAwB,CACxB,GAAkB,EAErB"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../../src/constants.ts","../../src/validation.ts","../../src/factory.ts"],"sourcesContent":["const LOGGER_CONTEXT = \"ssr-data-plugin\";\n\nexport const ERROR_PREFIX = `[@real-router/${LOGGER_CONTEXT}]`;\n","import { ERROR_PREFIX } from \"./constants\";\n\nimport type { DataLoaderFactoryMap } from \"./types\";\n\nexport function validateLoaders(\n  loaders: unknown,\n): asserts loaders is DataLoaderFactoryMap {\n  if (\n    loaders === null ||\n    typeof loaders !== \"object\" ||\n    Array.isArray(loaders)\n  ) {\n    throw new TypeError(`${ERROR_PREFIX} loaders must be a non-null object`);\n  }\n\n  for (const [key, value] of Object.entries(\n    loaders as Record<string, unknown>,\n  )) {\n    if (typeof value !== \"function\") {\n      throw new TypeError(\n        `${ERROR_PREFIX} loader for route \"${key}\" must be a function`,\n      );\n    }\n  }\n}\n","import { getPluginApi } from \"@real-router/core/api\";\n\nimport { ERROR_PREFIX } from \"./constants\";\nimport { validateLoaders } from \"./validation\";\n\nimport type { DataLoaderFn, DataLoaderFactoryMap } from \"./types\";\nimport type { PluginFactory, Plugin } from \"@real-router/core\";\n\nexport function ssrDataPluginFactory(\n  loaders: DataLoaderFactoryMap,\n): PluginFactory {\n  validateLoaders(loaders);\n\n  return (router, getDependency): Plugin => {\n    const api = getPluginApi(router);\n    const claim = api.claimContextNamespace(\"data\");\n\n    const compiledLoaders = new Map<string, DataLoaderFn>();\n\n    try {\n      for (const [name, factory] of Object.entries(loaders)) {\n        const loader = factory(router, getDependency);\n\n        if (typeof loader !== \"function\") {\n          throw new TypeError(\n            `${ERROR_PREFIX} factory for route \"${name}\" must return a function`,\n          );\n        }\n\n        compiledLoaders.set(name, loader);\n      }\n    } catch (error) {\n      claim.release();\n\n      throw error;\n    }\n\n    const removeStartInterceptor = api.addInterceptor(\n      \"start\",\n      async (next, path) => {\n        const state = await next(path);\n        const loader = compiledLoaders.get(state.name);\n\n        if (loader) {\n          claim.write(state, await loader(state.params));\n        }\n\n        return state;\n      },\n    );\n\n    return {\n      teardown() {\n        removeStartInterceptor();\n        claim.release();\n      },\n    };\n  };\n}\n"],"mappings":"qDAAA,MAEa,EAAe,iCCE5B,SAAgB,EACd,EACyC,CACzC,GAEE,OAAO,GAAY,WADnB,GAEA,MAAM,QAAQ,EAAQ,CAEtB,MAAU,UAAU,GAAG,EAAa,oCAAoC,CAG1E,IAAK,GAAM,CAAC,EAAK,KAAU,OAAO,QAChC,EACD,CACC,GAAI,OAAO,GAAU,WACnB,MAAU,UACR,GAAG,EAAa,qBAAqB,EAAI,sBAC1C,CCbP,SAAgB,EACd,EACe,CAGf,OAFA,EAAgB,EAAQ,EAEhB,EAAQ,IAA0B,CACxC,IAAM,EAAM,EAAa,EAAO,CAC1B,EAAQ,EAAI,sBAAsB,OAAO,CAEzC,EAAkB,IAAI,IAE5B,GAAI,CACF,IAAK,GAAM,CAAC,EAAM,KAAY,OAAO,QAAQ,EAAQ,CAAE,CACrD,IAAM,EAAS,EAAQ,EAAQ,EAAc,CAE7C,GAAI,OAAO,GAAW,WACpB,MAAU,UACR,GAAG,EAAa,sBAAsB,EAAK,0BAC5C,CAGH,EAAgB,IAAI,EAAM,EAAO,QAE5B,EAAO,CAGd,MAFA,EAAM,SAAS,CAET,EAGR,IAAM,EAAyB,EAAI,eACjC,QACA,MAAO,EAAM,IAAS,CACpB,IAAM,EAAQ,MAAM,EAAK,EAAK,CACxB,EAAS,EAAgB,IAAI,EAAM,KAAK,CAM9C,OAJI,GACF,EAAM,MAAM,EAAO,MAAM,EAAO,EAAM,OAAO,CAAC,CAGzC,GAEV,CAED,MAAO,CACL,UAAW,CACT,GAAwB,CACxB,EAAM,SAAS,EAElB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@real-router/ssr-data-plugin",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "commonjs",
   "description": "SSR per-route data loading plugin for Real-Router",
   "main": "./dist/cjs/index.js",
@@ -36,17 +36,20 @@
   },
   "homepage": "https://github.com/greydragon888/real-router",
   "sideEffects": false,
+  "dependencies": {
+    "@real-router/types": "^0.34.0"
+  },
   "peerDependencies": {
-    "@real-router/core": "^0.47.0"
+    "@real-router/core": "^0.48.0"
   },
   "scripts": {
     "test": "vitest",
     "test:properties": "vitest run --config vitest.config.properties.mts",
     "test:stress": "vitest --config vitest.config.stress.mts --run",
-    "build": "tsdown --config-loader unrun",
     "type-check": "tsc --noEmit",
     "lint": "eslint --cache --ext .ts src/ tests/ --fix --max-warnings 0",
     "lint:package": "publint",
-    "lint:types": "attw --pack ."
+    "lint:types": "attw --pack .",
+    "bundle": "tsdown --config-loader unrun"
   }
 }

package/src/constants.ts

@@ -1,3 +1,3 @@
-export const LOGGER_CONTEXT = "ssr-data-plugin";
+const LOGGER_CONTEXT = "ssr-data-plugin";
 
 export const ERROR_PREFIX = `[@real-router/${LOGGER_CONTEXT}]`;

package/src/factory.ts

@@ -1,42 +1,58 @@
 import { getPluginApi } from "@real-router/core/api";
 
+import { ERROR_PREFIX } from "./constants";
 import { validateLoaders } from "./validation";
 
-import type { DataLoaderMap } from "./types";
-import type { State, PluginFactory, Plugin } from "@real-router/core";
+import type { DataLoaderFn, DataLoaderFactoryMap } from "./types";
+import type { PluginFactory, Plugin } from "@real-router/core";
 
-export function ssrDataPluginFactory(loaders: DataLoaderMap): PluginFactory {
+export function ssrDataPluginFactory(
+  loaders: DataLoaderFactoryMap,
+): PluginFactory {
   validateLoaders(loaders);
 
-  return (router): Plugin => {
+  return (router, getDependency): Plugin => {
     const api = getPluginApi(router);
-    const dataStore = new WeakMap<State, unknown>();
+    const claim = api.claimContextNamespace("data");
+
+    const compiledLoaders = new Map<string, DataLoaderFn>();
+
+    try {
+      for (const [name, factory] of Object.entries(loaders)) {
+        const loader = factory(router, getDependency);
+
+        if (typeof loader !== "function") {
+          throw new TypeError(
+            `${ERROR_PREFIX} factory for route "${name}" must return a function`,
+          );
+        }
+
+        compiledLoaders.set(name, loader);
+      }
+    } catch (error) {
+      claim.release();
+
+      throw error;
+    }
 
     const removeStartInterceptor = api.addInterceptor(
       "start",
       async (next, path) => {
         const state = await next(path);
+        const loader = compiledLoaders.get(state.name);
 
-        if (Object.hasOwn(loaders, state.name)) {
-          dataStore.set(state, await loaders[state.name](state.params));
+        if (loader) {
+          claim.write(state, await loader(state.params));
         }
 
         return state;
       },
     );
 
-    const removeExtensions = api.extendRouter({
-      getRouteData(state?: State): unknown {
-        const routeState = state ?? router.getState();
-
-        return routeState ? (dataStore.get(routeState) ?? null) : null;
-      },
-    });
-
     return {
       teardown() {
         removeStartInterceptor();
-        removeExtensions();
+        claim.release();
       },
     };
   };

package/src/index.ts

@@ -1,11 +1,13 @@
-import type { State } from "@real-router/core";
-
-export type { DataLoaderMap, DataLoaderFn } from "./types";
+export type {
+  DataLoaderFn,
+  DataLoaderFactoryMap,
+  DataLoaderFnFactory,
+} from "./types";
 
 export { ssrDataPluginFactory } from "./factory";
 
-declare module "@real-router/core" {
-  interface Router {
-    getRouteData: (state?: State) => unknown;
+declare module "@real-router/types" {
+  interface StateContext {
+    data?: unknown;
   }
 }

package/src/types.ts

@@ -1,5 +1,23 @@
-import type { Params } from "@real-router/core";
+import type { DefaultDependencies, Params, Router } from "@real-router/types";
 
 export type DataLoaderFn = (params: Params) => Promise<unknown>;
 
-export type DataLoaderMap = Record<string, DataLoaderFn>;
+/**
+ * Factory function for creating data loaders.
+ * Receives the router instance and a dependency getter (same pattern as GuardFnFactory).
+ * Factory runs once when the plugin starts; the returned loader is cached.
+ *
+ * @template Dependencies - Router dependency map for typed `getDependency()` access.
+ *   Defaults to `DefaultDependencies`. Pass your app's dependency interface for
+ *   type-safe DI: `DataLoaderFnFactory<AppDependencies>`.
+ */
+export type DataLoaderFnFactory<
+  Dependencies extends DefaultDependencies = DefaultDependencies,
+> = (
+  router: Router<Dependencies>,
+  getDependency: <K extends keyof Dependencies>(key: K) => Dependencies[K],
+) => DataLoaderFn;
+
+export type DataLoaderFactoryMap<
+  Dependencies extends DefaultDependencies = DefaultDependencies,
+> = Record<string, DataLoaderFnFactory<Dependencies>>;

package/src/validation.ts

@@ -1,11 +1,15 @@
 import { ERROR_PREFIX } from "./constants";
 
-import type { DataLoaderMap } from "./types";
+import type { DataLoaderFactoryMap } from "./types";
 
 export function validateLoaders(
   loaders: unknown,
-): asserts loaders is DataLoaderMap {
-  if (loaders === null || typeof loaders !== "object") {
+): asserts loaders is DataLoaderFactoryMap {
+  if (
+    loaders === null ||
+    typeof loaders !== "object" ||
+    Array.isArray(loaders)
+  ) {
     throw new TypeError(`${ERROR_PREFIX} loaders must be a non-null object`);
   }