@wren-js/core 0.12.0 → 0.13.0

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import{_ as e,b as t,d as n,f as r,g as i,h as a,l as o,m as s,t as c,u as l,v as u,y as d}from"./constants-B3ndZB9W.mjs";import{c as f,d as p,f as m,l as h,n as g,p as _}from"./constants-CB936btA.mjs";import{CONFIG_VALID_EXTENSIONS as v,DEFAULTS as y}from"./config.mjs";import{t as b}from"./utils-li1KYQ1O.mjs";import{existsSync as ee}from"node:fs";import{basename as te,dirname as x,extname as ne,isAbsolute as re,join as ie,relative as S,resolve as C}from"node:path";import w from"node:process";import{parseArgs as ae}from"node:util";import{Visitor as T,createBuilder as oe,createServer as se,defineConfig as ce,isCSSRequest as le,loadConfigFromFile as ue,loadEnv as de,mergeConfig as E,normalizePath as D,parseSync as O,perEnvironmentState as fe,resolveEnvPrefix as pe,transformWithOxc as me}from"vite";import{mkdir as he,readFile as k,readdir as ge,rm as A,writeFile as j}from"node:fs/promises";import{pathToFileURL as _e}from"node:url";const M=e=>w.platform===`win32`?e.toUpperCase():e,ve=()=>{let e=/* @__PURE__ */ new Map;return(t,n)=>{for(let[t,n]of e)w.env[t]===n&&delete w.env[t];e.clear();let r=new Set(Object.keys(w.env).map(M)),i=de(t,n,``);for(let[t,n]of Object.entries(i)){let i=M(t);r.has(i)||(w.env[t]=n,e.set(i,n))}}},ye=(e,t)=>{let n=n=>typeof n==`string`&&!Object.hasOwn(e,n)&&!t.some(e=>n.startsWith(e)),r=e=>n(e)&&Object.hasOwn(globalThis.process.env,e);return new Proxy(e,{get(e,t,n){return r(t)?globalThis.process.env[t]:Reflect.get(e,t,n)},getOwnPropertyDescriptor(e,t){return Reflect.getOwnPropertyDescriptor(r(t)?globalThis.process.env:e,t)},has(e,t){return Reflect.has(e,t)||r(t)},ownKeys(e){return[...Reflect.ownKeys(e),...Object.keys(globalThis.process.env).filter(n)]}})},N=`virtual:${d}-server-env`,P=`\0${N}`,F=`import.meta.env.`,be=()=>{let e=fe(({config:e})=>{let t=Object.fromEntries(Object.entries(e.env).map(([e,t])=>[F+e,JSON.stringify(t)]));for(let[n,r]of Object.entries(e.define??{}))n.startsWith(F)&&(t[n]=typeof r==`string`?r:JSON.stringify(r)??`undefined`);return t[`${F}SSR`]=`true`,t});return{applyToEnvironment:e=>e.config.consumer===`server`,load:{filter:{id:RegExp(`^${P}$`)},handler(){let t=Object.entries(e(this)).map(([e,t])=>`${JSON.stringify(e.slice(16))}: ${t}`),n=pe({envPrefix:this.environment.config.envPrefix});return`export default (${ye.toString()})({${t.join(`,`)}}, ${JSON.stringify(n)});`}},name:`${d}-server-env`,resolveId:{filter:{id:RegExp(`^${N}$`)},handler:()=>P},transform:{filter:{code:/\bmeta\b/,id:/\.[cm]?[jt]sx?(?:$|\?)/},handler(t,n){if(n===P)return null;let r=`__wrenServerEnv`;if(t.includes(r)||t.includes(`\\u`)){let{errors:e,program:i}=O(n.split(`?`)[0],t);if(e.length>0)return this.error(e[0].message);let a=/* @__PURE__ */ new Set;for(new T({Identifier:e=>void a.add(e.name)}).visit(i);a.has(r);)r+=`_`}return me(t,n,{define:{...e(this),"import.meta.env":r},inject:{[r]:[N,`default`]},jsx:`preserve`,tsconfig:!1})}}}},I=e=>{let t=0;for(let n=e.indexOf(`
+import{_ as e,b as t,d as n,f as r,g as i,h as a,l as o,m as s,t as c,u as l,v as u,y as d}from"./constants-DEZyjgyc.mjs";import{c as f,d as p,f as m,l as h,n as g,p as _}from"./constants-CB936btA.mjs";import{CONFIG_VALID_EXTENSIONS as v,DEFAULTS as y}from"./config.mjs";import{t as b}from"./utils-li1KYQ1O.mjs";import{existsSync as ee}from"node:fs";import{basename as te,dirname as x,extname as ne,isAbsolute as re,join as ie,relative as S,resolve as C}from"node:path";import w from"node:process";import{parseArgs as ae}from"node:util";import{Visitor as T,createBuilder as oe,createServer as se,defineConfig as ce,isCSSRequest as le,loadConfigFromFile as ue,loadEnv as de,mergeConfig as E,normalizePath as D,parseSync as O,perEnvironmentState as fe,resolveEnvPrefix as pe,transformWithOxc as me}from"vite";import{mkdir as he,readFile as k,readdir as ge,rm as A,writeFile as j}from"node:fs/promises";import{pathToFileURL as _e}from"node:url";const M=e=>w.platform===`win32`?e.toUpperCase():e,ve=()=>{let e=/* @__PURE__ */ new Map;return(t,n)=>{for(let[t,n]of e)w.env[t]===n&&delete w.env[t];e.clear();let r=new Set(Object.keys(w.env).map(M)),i=de(t,n,``);for(let[t,n]of Object.entries(i)){let i=M(t);r.has(i)||(w.env[t]=n,e.set(i,n))}}},ye=(e,t)=>{let n=n=>typeof n==`string`&&!Object.hasOwn(e,n)&&!t.some(e=>n.startsWith(e)),r=e=>n(e)&&Object.hasOwn(globalThis.process.env,e);return new Proxy(e,{get(e,t,n){return r(t)?globalThis.process.env[t]:Reflect.get(e,t,n)},getOwnPropertyDescriptor(e,t){return Reflect.getOwnPropertyDescriptor(r(t)?globalThis.process.env:e,t)},has(e,t){return Reflect.has(e,t)||r(t)},ownKeys(e){return[...Reflect.ownKeys(e),...Object.keys(globalThis.process.env).filter(n)]}})},N=`virtual:${d}-server-env`,P=`\0${N}`,F=`import.meta.env.`,be=()=>{let e=fe(({config:e})=>{let t=Object.fromEntries(Object.entries(e.env).map(([e,t])=>[F+e,JSON.stringify(t)]));for(let[n,r]of Object.entries(e.define??{}))n.startsWith(F)&&(t[n]=typeof r==`string`?r:JSON.stringify(r)??`undefined`);return t[`${F}SSR`]=`true`,t});return{applyToEnvironment:e=>e.config.consumer===`server`,load:{filter:{id:RegExp(`^${P}$`)},handler(){let t=Object.entries(e(this)).map(([e,t])=>`${JSON.stringify(e.slice(16))}: ${t}`),n=pe({envPrefix:this.environment.config.envPrefix});return`export default (${ye.toString()})({${t.join(`,`)}}, ${JSON.stringify(n)});`}},name:`${d}-server-env`,resolveId:{filter:{id:RegExp(`^${N}$`)},handler:()=>P},transform:{filter:{code:/\bmeta\b/,id:/\.[cm]?[jt]sx?(?:$|\?)/},handler(t,n){if(n===P)return null;let r=`__wrenServerEnv`;if(t.includes(r)||t.includes(`\\u`)){let{errors:e,program:i}=O(n.split(`?`)[0],t);if(e.length>0)return this.error(e[0].message);let a=/* @__PURE__ */ new Set;for(new T({Identifier:e=>void a.add(e.name)}).visit(i);a.has(r);)r+=`_`}return me(t,n,{define:{...e(this),"import.meta.env":r},inject:{[r]:[N,`default`]},jsx:`preserve`,tsconfig:!1})}}}},I=e=>{let t=0;for(let n=e.indexOf(`
 `);n!==-1;n=e.indexOf(`
 `,n+1))t++;return t},xe=(e,t,n,r)=>{let i=I(e.slice(t,n))-I(r);return{end:n,start:t,text:i>0?r+`
 `.repeat(i):r}},Se=(e,t)=>{let n=``,r=0;for(let{end:i,start:a,text:o}of t.toSorted((e,t)=>e.start-t.start))n+=e.slice(r,a)+o,r=i;return n+e.slice(r)},L=e=>te(e,ne(e)),Ce=e=>Object.fromEntries(e.toSorted(([e],[t])=>e<t?-1:1)),we=e=>{let t=[];for(let{entries:n}of e)for(let{exportName:e,isType:r}of n){if(r)continue;let n=e.kind===`Default`?`default`:e.name;n!==null&&t.push(n)}return t},Te=/^(?:[a-z][a-z\d+.-]*:|\/\/)/i,R=e=>{if(e.type===`Literal`&&typeof e.value==`string`)return e.value;if(e.type===`TemplateLiteral`&&e.expressions.length===0)return e.quasis[0]?.value.cooked??void 0},z=({value:e})=>{if(e?.type===`Literal`)return e.value;if(e?.type===`JSXExpressionContainer`)return R(e.expression)},Ee=(e,t)=>{let n={kept:[]};for(let r of t.attributes){let t=e.slice(r.start,r.end);if(r.type!==`JSXAttribute`||r.name.type!==`JSXIdentifier`){n.kept.push(t);continue}let{name:i}=r.name;i===`src`?n.src=r:i===`dangerouslySetInnerHTML`?n.html=r:(i===`type`&&(n.type=z(r)),n.kept.push(t))}return n},De=({key:e})=>e.type===`Identifier`?e.name:e.type===`Literal`?e.value:null,Oe=({value:e})=>{let t=e?.type===`JSXExpressionContainer`?e.expression:void 0;if(t?.type===`ObjectExpression`)for(let e of t.properties){if(e.type!==`Property`||e.computed||De(e)!==`__html`)continue;let t=R(e.value);return t===void 0?void 0:[t,e.value.start+1]}},ke=(e,t)=>{if(t)return Oe(t);let n=e.children.filter(e=>e.type!==`JSXText`||e.value.trim()!==``);if(n.length===0)return[``,e.start];if(n.length!==1)return;let[r]=n;if(r.type===`JSXText`)return[r.value,r.start];if(r.type!==`JSXExpressionContainer`)return;let i=R(r.expression);return i===void 0?void 0:[i,r.expression.start+1]},Ae=({name:e})=>e.type===`JSXIdentifier`&&e.name===`script`,B=(e,t)=>{let n=[],r=[],{errors:i,program:a}=O(t,e);if(i.length>0)return{scripts:n,warnings:r};let o=0,s=/* @__PURE__ */ new Set,c=e=>{for(let t of e.children)s.add(t.start)},l=t=>{let{html:i,kept:a,src:c,type:l}=Ee(e,t.openingElement),u=c&&z(c),d=u!==void 0&&!Te.test(u);if(l!==`module`){d&&_.test(u)&&r.push(`<script src="${u}"> is not bundled; add type="module" to make it a page script.`);return}let f={attributes:a,end:t.end,replacement:s.has(t.start)?``:`<></>`,start:t.start};if(c){d&&n.push({...f,kind:`src`,src:u});return}let p=ke(t,i);if(!p){r.push(`<script type="module"> content must be a static string to be bundled.`);return}let[m,h]=p;m.trim()!==``&&n.push({...f,code:m,codeStart:h,index:o++,kind:`inline`})};return new T({JSXElement(e){c(e),Ae(e.openingElement)&&l(e)},JSXFragment:c}).visit(a),{scripts:n,warnings:r}},V=`virtual:${d}-page-scripts`,H=`__wrenPageScripts`,U=`${V}:route:`,W=`\0${U}`,G=`\0${f}`,K=/\?wren-script=(\d+)\.ts$/,q=`__wren-page-scripts.mjs`,J=`\0${h}`,Y=(e,t)=>{let n=D(S(e,t));return n.startsWith(`../`)||re(n)?`@fs/${D(t).replace(/^\//,``)}`:n},je=async(e,t,n)=>{let r=t.attributes.filter(e=>!/^type\b/.test(e));if(r.length>0&&e.warn(`Page script attributes are dropped when hoisted: ${r.join(` `)}`),t.kind===`inline`)return{id:`${n}?wren-script=${t.index}.ts`,name:`${L(n)}-${t.index}`};let i=await e.resolve(t.src,n);if(!i||i.external||i.id.includes(`/node_modules/`))e.warn(`Page script "${t.src}" must resolve to a project file; left as is.`);else return{id:i.id,name:L(i.id)}},Me=async(e,t,n)=>{let r=await k(t,`utf8`),i=B(r,t).scripts.find(e=>e.kind===`inline`&&e.index===n);return i?.kind===`inline`?{code:`

package/dist/{constants-B3ndZB9W.mjs → constants-DEZyjgyc.mjs}

@@ -1 +1 @@
-var e=`0.12.0`;const t=`wrenjs`,n=e,r=`ROOT`,i=`PAGE`,a=`API`,o=`NOT_FOUND`,s=`LAYOUT`,c=`PROXY`,l=`___root`,u=`__layout`,d=`__not-found`,f=`__proxy`,p=`GET`,m=`DELETE`,h=`HEAD`,g=`OPTIONS`,_=`PATCH`,v=`POST`,y=`PUT`,b=[`GET`,m,h,g,_,v,`PUT`];export{c as _,g as a,n as b,y as c,f as d,l as f,i as g,o as h,h as i,u as l,s as m,m as n,_ as o,a as p,p as r,v as s,b as t,d as u,r as v,t as y};
+var e=`0.13.0`;const t=`wrenjs`,n=e,r=`ROOT`,i=`PAGE`,a=`API`,o=`NOT_FOUND`,s=`LAYOUT`,c=`PROXY`,l=`___root`,u=`__layout`,d=`__not-found`,f=`__proxy`,p=`GET`,m=`DELETE`,h=`HEAD`,g=`OPTIONS`,_=`PATCH`,v=`POST`,y=`PUT`,b=[`GET`,m,h,g,_,v,`PUT`];export{c as _,g as a,n as b,y as c,f as d,l as f,i as g,o as h,h as i,u as l,s as m,m as n,_ as o,a as p,p as r,v as s,b as t,d as u,r as v,t as y};

package/dist/constants.mjs

@@ -1 +1 @@
-import{_ as e,a as t,b as n,c as r,d as i,f as a,g as o,h as s,i as c,l,m as u,n as d,o as f,p,r as m,s as h,t as g,u as _,v,y}from"./constants-B3ndZB9W.mjs";import{f as b}from"./constants-CB936btA.mjs";export{g as ENTRY_API_EXPORTS,d as ENTRY_FILEROUTE_API_EXPORT_DELETE,m as ENTRY_FILEROUTE_API_EXPORT_GET,c as ENTRY_FILEROUTE_API_EXPORT_HEAD,t as ENTRY_FILEROUTE_API_EXPORT_OPTIONS,f as ENTRY_FILEROUTE_API_EXPORT_PATCH,h as ENTRY_FILEROUTE_API_EXPORT_POST,r as ENTRY_FILEROUTE_API_EXPORT_PUT,l as ENTRY_FILEROUTE_LAYOUT,_ as ENTRY_FILEROUTE_NOT_FOUND,i as ENTRY_FILEROUTE_PROXY,a as ENTRY_FILEROUTE_ROOT,p as ENTRY_KIND_API,u as ENTRY_KIND_LAYOUT,s as ENTRY_KIND_NOT_FOUND,o as ENTRY_KIND_PAGE,e as ENTRY_KIND_PROXY,v as ENTRY_KIND_ROOT,b as ROUTE_MODULE_RE,y as WREN_NAME,n as WREN_VERSION};
+import{_ as e,a as t,b as n,c as r,d as i,f as a,g as o,h as s,i as c,l,m as u,n as d,o as f,p,r as m,s as h,t as g,u as _,v,y}from"./constants-DEZyjgyc.mjs";import{f as b}from"./constants-CB936btA.mjs";export{g as ENTRY_API_EXPORTS,d as ENTRY_FILEROUTE_API_EXPORT_DELETE,m as ENTRY_FILEROUTE_API_EXPORT_GET,c as ENTRY_FILEROUTE_API_EXPORT_HEAD,t as ENTRY_FILEROUTE_API_EXPORT_OPTIONS,f as ENTRY_FILEROUTE_API_EXPORT_PATCH,h as ENTRY_FILEROUTE_API_EXPORT_POST,r as ENTRY_FILEROUTE_API_EXPORT_PUT,l as ENTRY_FILEROUTE_LAYOUT,_ as ENTRY_FILEROUTE_NOT_FOUND,i as ENTRY_FILEROUTE_PROXY,a as ENTRY_FILEROUTE_ROOT,p as ENTRY_KIND_API,u as ENTRY_KIND_LAYOUT,s as ENTRY_KIND_NOT_FOUND,o as ENTRY_KIND_PAGE,e as ENTRY_KIND_PROXY,v as ENTRY_KIND_ROOT,b as ROUTE_MODULE_RE,y as WREN_NAME,n as WREN_VERSION};

package/dist/runtime/prerender.d.mts

@@ -1,4 +1,4 @@
-import { n as RouteEntry, t as RadixTrie } from "../types-B5lgdAKl.mjs";
+import { n as RouteEntry, t as RadixTrie } from "../types-BMcFdUPW.mjs";
 //#region src/runtime/prerender/index.d.ts
 export declare const getPrerenderPaths: (manifest: {
   dynamicRoutes: RadixTrie<RouteEntry>;

package/dist/runtime/prerender.mjs

@@ -1 +1 @@
-import"../constants-B3ndZB9W.mjs";import{t as e}from"../utils-li1KYQ1O.mjs";function*t(e){e.e&&(yield e.e),e.w&&(yield e.w);for(let n of Object.values(e.s))yield*t(n);e.p&&(yield*t(e.p));for(let n of e.m??[])yield*t(n.node)}const n=async(e,t,n)=>{if(e.kind!==`PAGE`)return[];let r=await Promise.all([e.module(),...e.layouts?.map(e=>e())??[]]);if(!n&&!r.some(e=>e.config?.prerender===!0))return[];if(!e.params?.length){if(!t)throw Error(`A static prerender route must have a pathname.`);return[t]}let[i]=r;if(!i.getStaticPaths)throw Error(`Prerendered route ${t} must export getStaticPaths().`);return i.getStaticPaths()},r=async(r,i=!1)=>{let{dynamicRoutes:a,staticRoutes:o={}}=r,s=await Promise.all([...Object.entries(o).map(([e,t])=>n(t,e,i)),...Array.from(t(a),e=>n(e,e.pattern,i))]);return[...new Set(s.flat().map(t=>e(t)))]};export{r as getPrerenderPaths};
+import"../constants-DEZyjgyc.mjs";import{t as e}from"../utils-li1KYQ1O.mjs";function*t(e){e.e&&(yield e.e),e.w&&(yield e.w);for(let n of Object.values(e.s))yield*t(n);e.p&&(yield*t(e.p));for(let n of e.m??[])yield*t(n.node)}const n=async(e,t,n)=>{if(e.kind!==`PAGE`)return[];let r=await Promise.all([e.module(),...e.layouts?.map(e=>e())??[]]);if(!n&&!r.some(e=>e.config?.prerender===!0))return[];if(!e.params?.length){if(!t)throw Error(`A static prerender route must have a pathname.`);return[t]}let[i]=r;if(!i.getStaticPaths)throw Error(`Prerendered route ${t} must export getStaticPaths().`);return i.getStaticPaths()},r=async(r,i=!1)=>{let{dynamicRoutes:a,staticRoutes:o={}}=r,s=await Promise.all([...Object.entries(o).map(([e,t])=>n(t,e,i)),...Array.from(t(a),e=>n(e,e.pattern,i))]);return[...new Set(s.flat().map(t=>e(t)))]};export{r as getPrerenderPaths};

package/dist/runtime/router.d.mts

@@ -1,4 +1,4 @@
-import { a as WrenContext, i as RouteStack, r as RouteModule } from "../types-B5lgdAKl.mjs";
+import { a as WrenContext, i as RouteStack, r as RouteModule } from "../types-BMcFdUPW.mjs";
 //#region src/runtime/router/index.d.ts
 export declare function matchRouteToStack<T extends RouteStack = RouteStack>(path?: string, context?: WrenContext): Promise<T | undefined> | T | undefined;
 //#endregion

package/dist/{types-B5lgdAKl.d.mts → types-BMcFdUPW.d.mts}

@@ -51,7 +51,23 @@ declare module "virtual:wrenjs-routes" {
 //#region src/types.d.ts
 declare global {
   namespace Wren {
+    type ApiHandler<TParams extends RouteParams = RouteParams> = RouteApiHandler<TParams>;
+    type ApiParams<TParams extends RouteParams = RouteParams> = RouteApiParams<TParams>;
+    type Config = RouteConfig;
     interface Context {}
+    type GetStaticPaths = () => Promise<string[]> | string[];
+    type Head<TParams extends RouteParams = RouteParams, TData = unknown> = RouteHead<IntegrationHead, TParams, TData>;
+    type HeadProps<TParams extends RouteParams = RouteParams, TData = unknown> = RouteHeadParams<TParams, TData>;
+    interface Integration {}
+    type Layout<TData = unknown> = RouteComponent<LayoutProps<TData>, IntegrationNode>;
+    type LayoutProps<TData = unknown> = RouteLayoutProps<IntegrationNode, TData>;
+    type Loader<TReturn = unknown, TParams extends RouteParams = RouteParams> = RouteLoader<TReturn, TParams>;
+    type LoaderProps<TParams extends RouteParams = RouteParams> = RouteLoaderParams<TParams>;
+    type Page<TParams extends RouteParams = RouteParams, TData = unknown> = RouteComponent<PageProps<TParams, TData>, IntegrationNode>;
+    type PageProps<TParams extends RouteParams = RouteParams, TData = unknown> = RoutePageProps<TParams, TData>;
+    type Proxy<TParams extends RouteParams = RouteParams> = RouteProxy<TParams>;
+    type ProxyContext<TParams extends RouteParams = RouteParams> = RouteProxyContext<TParams>;
+    type ProxyNext = () => Promise<Response>;
   }
 }
 interface Entry$1 {
@@ -74,6 +90,12 @@ interface RadixTrie$1<Route = Entry$1> {
   w?: Route;
 }
 type RedirectStatus = 301 | 302 | 303 | 307 | 308;
+type RouteApiHandler<TParams extends RouteParams = RouteParams> = (request: Request, route: RouteApiParams<TParams>) => Promise<Response> | Response;
+interface RouteApiParams<TParams extends RouteParams = RouteParams> {
+  context: WrenContext;
+  params: TParams;
+}
+type RouteComponent<TProps, TNode> = (props: TProps) => Promise<TNode> | TNode;
 interface RouteConfig {
   headers?: Readonly<Record<string, string>>;
   prerender?: boolean;
@@ -87,14 +109,20 @@ interface RouteEntry {
   proxies?: (() => Promise<RouteModule>)[];
   stack: () => Promise<RouteStackModules> | RouteStackModules;
 }
-type RouteHead<TElement = unknown> = ({ data, params, request }: RouteHeadParams) => Promise<TElement> | TElement;
-interface RouteHeadParams extends RouteLoaderParams {
-  data?: ReturnType<RouteLoader>;
+type RouteHead<TElement = unknown, TParams extends RouteParams = RouteParams, TData = unknown> = ({ data, params, request }: RouteHeadParams<TParams, TData>) => Promise<TElement> | TElement;
+interface RouteHeadParams<TParams extends RouteParams = RouteParams, TData = unknown> extends RouteLoaderParams<TParams> {
+  data?: Promise<TData>;
+}
+interface RouteLayoutProps<TChildren = unknown, TData = unknown> {
+  children?: TChildren;
+  context?: WrenContext;
+  data?: Promise<TData>;
+  request?: Request;
 }
-type RouteLoader<TDefault = unknown> = ({ params, request }: RouteLoaderParams) => Promise<TDefault>;
-interface RouteLoaderParams {
+type RouteLoader<TReturn = unknown, TParams extends RouteParams = RouteParams> = ({ params, request }: RouteLoaderParams<TParams>) => Promise<TReturn>;
+interface RouteLoaderParams<TParams extends RouteParams = RouteParams> {
   context: WrenContext;
-  params?: Record<string, string>;
+  params?: TParams;
   request: Request;
 }
 interface RouteModule<TDefault = unknown, THandler = unknown, THead = unknown> {
@@ -102,7 +130,7 @@ interface RouteModule<TDefault = unknown, THandler = unknown, THead = unknown> {
   default: TDefault;
   DELETE?: THandler;
   GET?: THandler;
-  getStaticPaths?: () => Promise<string[]> | string[];
+  getStaticPaths?: Wren.GetStaticPaths;
   HEAD?: THandler;
   head?: RouteHead<THead>;
   loader?: RouteLoader<TDefault>;
@@ -111,18 +139,25 @@ interface RouteModule<TDefault = unknown, THandler = unknown, THead = unknown> {
   POST?: THandler;
   PUT?: THandler;
 }
+interface RoutePageProps<TParams extends RouteParams = RouteParams, TData = unknown> {
+  context?: WrenContext;
+  data?: Promise<TData>;
+  params?: TParams;
+  request?: Request;
+}
+type RouteParams = Record<string, string>;
 /** A `__proxy` default export. Return a `Response` to short-circuit, or nothing to continue. */
-type RouteProxy = (context: RouteProxyContext, next: RouteProxyNext) => Promise<Response | void> | Response | void;
-interface RouteProxyContext {
+type RouteProxy<TParams extends RouteParams = RouteParams> = (context: RouteProxyContext<TParams>, next: RouteProxyNext) => Promise<Response | void> | Response | void;
+interface RouteProxyContext<TParams extends RouteParams = RouteParams> {
   context: WrenContext;
-  params: Record<string, string>;
+  params: TParams;
   redirect: (location: string | URL, status?: RedirectStatus) => Response;
   request: Request;
   /** The page URL, without the Flight request suffix. */
   url: URL;
 }
 /** Runs the inner proxies and the route handler; may be called once. */
-type RouteProxyNext = () => Promise<Response>;
+type RouteProxyNext = Wren.ProxyNext;
 interface RouteStack<TModule extends RouteModule = RouteModule, TLayout extends RouteModule = RouteModule, TProxy extends RouteModule = RouteModule<RouteProxy>> {
   context: WrenContext;
   kind: "API" | "NOT_FOUND" | "PAGE";
@@ -133,5 +168,11 @@ interface RouteStack<TModule extends RouteModule = RouteModule, TLayout extends
 }
 type RouteStackModules = Pick<Required<RouteStack>, "layouts" | "module" | "proxies">;
 type WrenContext = Wren.Context;
+type IntegrationHead = Wren.Integration extends {
+  head: infer THead;
+} ? THead : IntegrationNode;
+type IntegrationNode = Wren.Integration extends {
+  node: infer TNode;
+} ? TNode : unknown;
 //#endregion
 export { WrenContext as a, RouteStack as i, RouteEntry as n, RouteModule as r, RadixTrie$1 as t };

package/dist/types.d.ts

@@ -8,7 +8,39 @@ import "./virtual-wrenjs-routes.d.ts";
 
 declare global {
   namespace Wren {
+    type ApiHandler<TParams extends RouteParams = RouteParams> = RouteApiHandler<TParams>;
+    type ApiParams<TParams extends RouteParams = RouteParams> = RouteApiParams<TParams>;
+    type Config = RouteConfig;
     interface Context {}
+    type GetStaticPaths = () => Promise<string[]> | string[];
+    type Head<TParams extends RouteParams = RouteParams, TData = unknown> = RouteHead<
+      IntegrationHead,
+      TParams,
+      TData
+    >;
+    type HeadProps<TParams extends RouteParams = RouteParams, TData = unknown> = RouteHeadParams<
+      TParams,
+      TData
+    >;
+    interface Integration {}
+    type Layout<TData = unknown> = RouteComponent<LayoutProps<TData>, IntegrationNode>;
+    type LayoutProps<TData = unknown> = RouteLayoutProps<IntegrationNode, TData>;
+    type Loader<TReturn = unknown, TParams extends RouteParams = RouteParams> = RouteLoader<
+      TReturn,
+      TParams
+    >;
+    type LoaderProps<TParams extends RouteParams = RouteParams> = RouteLoaderParams<TParams>;
+    type Page<TParams extends RouteParams = RouteParams, TData = unknown> = RouteComponent<
+      PageProps<TParams, TData>,
+      IntegrationNode
+    >;
+    type PageProps<TParams extends RouteParams = RouteParams, TData = unknown> = RoutePageProps<
+      TParams,
+      TData
+    >;
+    type Proxy<TParams extends RouteParams = RouteParams> = RouteProxy<TParams>;
+    type ProxyContext<TParams extends RouteParams = RouteParams> = RouteProxyContext<TParams>;
+    type ProxyNext = () => Promise<Response>;
   }
 }
 
@@ -72,7 +104,17 @@ export interface RoutableEntry {
   routes: Entry[];
 }
 
-export type RouteApiParams = Pick<RouteStack, "context" | "params">;
+export type RouteApiHandler<TParams extends RouteParams = RouteParams> = (
+  request: Request,
+  route: RouteApiParams<TParams>,
+) => Promise<Response> | Response;
+
+export interface RouteApiParams<TParams extends RouteParams = RouteParams> {
+  context: WrenContext;
+  params: TParams;
+}
+
+export type RouteComponent<TProps, TNode> = (props: TProps) => Promise<TNode> | TNode;
 
 export interface RouteConfig {
   headers?: Readonly<Record<string, string>>;
@@ -90,24 +132,34 @@ export interface RouteEntry {
   stack: () => Promise<RouteStackModules> | RouteStackModules;
 }
 
-export type RouteHead<TElement = unknown> = ({
-  data,
-  params,
-  request,
-}: RouteHeadParams) => Promise<TElement> | TElement;
+export type RouteHead<
+  TElement = unknown,
+  TParams extends RouteParams = RouteParams,
+  TData = unknown,
+> = ({ data, params, request }: RouteHeadParams<TParams, TData>) => Promise<TElement> | TElement;
+
+export interface RouteHeadParams<
+  TParams extends RouteParams = RouteParams,
+  TData = unknown,
+> extends RouteLoaderParams<TParams> {
+  data?: Promise<TData>;
+}
 
-export interface RouteHeadParams extends RouteLoaderParams {
-  data?: ReturnType<RouteLoader>;
+export interface RouteLayoutProps<TChildren = unknown, TData = unknown> {
+  children?: TChildren;
+  context?: WrenContext;
+  data?: Promise<TData>;
+  request?: Request;
 }
 
-export type RouteLoader<TDefault = unknown> = ({
+export type RouteLoader<TReturn = unknown, TParams extends RouteParams = RouteParams> = ({
   params,
   request,
-}: RouteLoaderParams) => Promise<TDefault>;
+}: RouteLoaderParams<TParams>) => Promise<TReturn>;
 
-export interface RouteLoaderParams {
+export interface RouteLoaderParams<TParams extends RouteParams = RouteParams> {
   context: WrenContext;
-  params?: Record<string, string>;
+  params?: TParams;
   request: Request;
 }
 
@@ -117,7 +169,7 @@ export interface RouteModule<TDefault = unknown, THandler = unknown, THead = unk
   DELETE?: THandler;
   GET?: THandler;
 
-  getStaticPaths?: () => Promise<string[]> | string[];
+  getStaticPaths?: Wren.GetStaticPaths;
   HEAD?: THandler;
   head?: RouteHead<THead>;
   loader?: RouteLoader<TDefault>;
@@ -127,15 +179,24 @@ export interface RouteModule<TDefault = unknown, THandler = unknown, THead = unk
   PUT?: THandler;
 }
 
+export interface RoutePageProps<TParams extends RouteParams = RouteParams, TData = unknown> {
+  context?: WrenContext;
+  data?: Promise<TData>;
+  params?: TParams;
+  request?: Request;
+}
+
+export type RouteParams = Record<string, string>;
+
 /** A `__proxy` default export. Return a `Response` to short-circuit, or nothing to continue. */
-export type RouteProxy = (
-  context: RouteProxyContext,
+export type RouteProxy<TParams extends RouteParams = RouteParams> = (
+  context: RouteProxyContext<TParams>,
   next: RouteProxyNext,
 ) => Promise<Response | void> | Response | void;
 
-export interface RouteProxyContext {
+export interface RouteProxyContext<TParams extends RouteParams = RouteParams> {
   context: WrenContext;
-  params: Record<string, string>;
+  params: TParams;
   redirect: (location: string | URL, status?: RedirectStatus) => Response;
   request: Request;
   /** The page URL, without the Flight request suffix. */
@@ -143,7 +204,7 @@ export interface RouteProxyContext {
 }
 
 /** Runs the inner proxies and the route handler; may be called once. */
-export type RouteProxyNext = () => Promise<Response>;
+export type RouteProxyNext = Wren.ProxyNext;
 
 export interface RouteStack<
   TModule extends RouteModule = RouteModule,
@@ -162,4 +223,8 @@ export type RouteStackModules = Pick<Required<RouteStack>, "layouts" | "module"
 
 export type WrenContext = Wren.Context;
 
+type IntegrationHead = Wren.Integration extends { head: infer THead } ? THead : IntegrationNode;
+
+type IntegrationNode = Wren.Integration extends { node: infer TNode } ? TNode : unknown;
+
 export type { fetch } from "virtual:wrenjs-fetch";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wren-js/core",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Framework agnostic utilities for the wrenjs meta-framework",
   "keywords": [
     "@wren-js/core",