@mapl/web 0.3.18 → 0.4.1

package/README.md

@@ -1,34 +1,5 @@
 A compiled web framework for all runtimes.
 
-```ts
-import { router, handle, layer } from '@mapl/web';
-import { compileToHandler } from '@mapl/web/compiler/jit';
-
-const api = router([], [
-  handle.get('/', () => 'Hi')
-]);
-
-const app = router(
-  // Middlewares
-  [ layer.attach('id', () => performance.now()) ],
-
-  // Routes
-  [
-    handle.get('/path', (c) => '' + c.id, {
-      // Response wrapper
-      type: handle.text
-    })
-  ],
-
-  // Subrouters
-  { '/api': api }
-);
-
-export default {
-  fetch: await compileToHandler(app)
-};
-```
-
 ## AOT compilation (experimental)
 Build `@mapl/web` to improve startup time.
 

package/build/rolldown.d.ts

@@ -28,6 +28,7 @@ export interface MaplOptions {
 	*/
 	hydrate?: MaplBuildOptions;
 }
+// Plugins to manipulate imports
 export declare const hydrateImportsPlugin: RolldownPluginOption;
 export declare const SERVER_ENTRY = "index.js";
 export declare const hydrate: (options: MaplOptions) => Promise<void>;

package/build/utils.d.ts

@@ -1 +1,2 @@
+// Packages that can be affected by compiling app first
 export declare const EXTERNALS: string[];

package/bun/compiler/jit.d.ts

@@ -1,9 +1,8 @@
 import type { RouterTag } from "../../core/index.js";
 import { type CompiledDependency } from "runtime-compiler";
 import type { BunContext } from "../index.js";
-import type { RouterTypes } from "bun";
-export type BunRoutes<T extends string = string> = Record<T, RouterTypes.RouteValue<T>>;
+import type { Serve } from "bun";
 export declare const compileToString: (router: RouterTag<BunContext>) => string;
-export declare const compileToExportedDependency: (router: RouterTag<BunContext>) => CompiledDependency<BunRoutes>;
-export declare const compileToHandler: (router: RouterTag<BunContext>) => Promise<BunRoutes>;
-export declare const compileToHandlerSync: (router: RouterTag<BunContext>) => BunRoutes;
+export declare const compileToExportedDependency: (router: RouterTag<BunContext>) => CompiledDependency<Serve.Routes<any, any>>;
+export declare const compileToHandler: (router: RouterTag<BunContext>) => Promise<Serve.Routes<any, any>>;
+export declare const compileToHandlerSync: (router: RouterTag<BunContext>) => Serve.Routes<any, any>;

package/bun/compiler/jit.js

@@ -1 +1 @@
-import{compileGroup,AsyncFunction,contextInit,setContextInit,hooks}from"@mapl/framework";import{countParams}from"@mapl/router/path";import{exportDependency,getDependency,injectDependency,injectExternalDependency}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";import{compileErrorHandler,compileReturn,paramArgs,RES400}from"../../compiler/jit.js";import{insertRoute,resetRouter,routerToString}from"./router.js";let compileToState=router=>{resetRouter();hooks.compileHandler=(handler,prevContent,path,scope)=>{let fn=handler[2];let call=injectExternalDependency(fn)+`(`;let paramCount=countParams(handler[1]);paramCount>0&&(call+=paramArgs[paramCount]);if(fn.length>paramCount){call+=paramCount===0?`c`:`,c`;if(!scope[1]){insertRoute(handler[0],path,prevContent+contextInit+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],true,call+`)`)+(scope[0]?`})()`:``));return}}insertRoute(handler[0],path,prevContent+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)+(scope[0]?`})()`:``))};hooks.compileErrorHandler=compileErrorHandler;setContextInit(`let h=[],c={status:200,req:r,headers:h,server:s};`);compileGroup(router,[false,false,,`return `+RES400,false],``,``)};export let compileToString=router=>{compileToState(router);return routerToString()};export let compileToExportedDependency=router=>exportDependency(injectDependency(compileToString(router)));export let compileToHandler=async router=>{let id=compileToExportedDependency(router);await evaluate();return getDependency(id)};export let compileToHandlerSync=router=>{let id=compileToExportedDependency(router);evaluateSync();return getDependency(id)};
+import{compileGroup,contextInit,setContextInit,hooks,getParamArgs}from"@mapl/framework";import{countParams}from"@mapl/router/path";import{AsyncFunction,exportDependency,getDependency,injectDependency,injectExternalDependency}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";import{compileErrorHandler,compileReturn,RES400}from"../../compiler/jit.js";import{insertRoute,resetRouter,routerToString}from"./router.js";let compileToState=router=>{resetRouter();hooks.compileHandler=(handler,prevContent,path,scope)=>{let fn=handler[2];let paramCount=countParams(handler[1]);let call=injectExternalDependency(fn)+`(`+getParamArgs(paramCount);if(fn.length>paramCount){call+=`c`;if(!scope[1]){insertRoute(handler[0],path,prevContent+contextInit+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],true,call+`)`)+(scope[0]?`})()`:``));return}}insertRoute(handler[0],path,prevContent+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)+(scope[0]?`})()`:``))};hooks.compileErrorHandler=compileErrorHandler;setContextInit(`let h=[],c={status:200,req:r,headers:h,server:s};`);compileGroup(router,[false,false,,`return `+RES400(),false],``,``)};export let compileToString=router=>{compileToState(router);return routerToString()};export let compileToExportedDependency=router=>exportDependency(injectDependency(compileToString(router)));export let compileToHandler=async router=>{let id=compileToExportedDependency(router);await evaluate();return getDependency(id)};export let compileToHandlerSync=router=>{let id=compileToExportedDependency(router);evaluateSync();return getDependency(id)};

package/bun/compiler/router.js

@@ -1 +1 @@
-import{injectDependency}from"runtime-compiler";import{RES404}from"../../compiler/jit.js";let ROUTES;export let resetRouter=()=>{ROUTES={}};export let insertRoute=(method,path,content)=>{let isWildcard=path.endsWith(`**`);let i=0;let bunPattern=isWildcard?path.slice(-2).replace(/\*/g,()=>`:q`+ i++)+`*`:path.replace(/\*/g,()=>`:q`+ i++);let str=`(r,s)=>{`;if(i>0){str+=`let {q0`;for(let j=1,l=i-(isWildcard?1:0);j<l;j++)str+=`q,`+j;str+=`}=r.params`+(isWildcard?`,q`+i+`=r.params["*"];`:`;`)}(ROUTES[bunPattern]??={})[method]=str+content+`}`;if(method!==``&&method!==`GET`&&method!==`HEAD`&&method!==`OPTIONS`&&method!==`DELETE`&&method!==`PATCH`&&method!==`POST`&&method!==`PUT`)ROUTES[bunPattern][``]??=RES404;if(isWildcard)(ROUTES[bunPattern===`/*`?`/`:bunPattern.slice(0,-3)]??={})[method]??=RES404};export let routerToString=()=>{let str=`{`;for(let pattern in ROUTES){str+=`"`+pattern+`":`;let methods=ROUTES[pattern];let allMethods=methods[``];if(allMethods==null){str+=`{`;for(let method in methods)str+=method+`:`+methods[method]+`,`;str+=`},`}else if(Object.keys(methods).length===1)str+=methods[``]+`,`;else{str+=`(r,s)=>`;for(let method in methods)if(method!==``){let fn=methods[method];str+=`r.method==="`+method+`"?`+(fn.startsWith(`(r,s)=>`)?injectDependency(fn)+`(r,s)`:fn)+`:`}str+=(allMethods.startsWith(`(r,s)=>`)?injectDependency(allMethods)+`(r,s)`:allMethods)+`,`}}return str+`}`};
+import{injectDependency}from"runtime-compiler";import{RES404}from"../../compiler/jit.js";let ROUTES;export let resetRouter=()=>{ROUTES={}};export let insertRoute=(method,path,content)=>{let isWildcard=path.endsWith(`**`);let i=0;let bunPattern=isWildcard?path.slice(-2).replace(/\*/g,()=>`:q`+ i++)+`*`:path.replace(/\*/g,()=>`:q`+ i++);let str=`(r,s)=>{`;if(i>0){str+=`let {q0`;for(let j=1,l=i-(isWildcard?1:0);j<l;j++)str+=`q,`+j;str+=`}=r.params`+(isWildcard?`,q`+i+`=r.params["*"];`:`;`)}(ROUTES[bunPattern]??={})[method]=str+content+`}`;if(method!==``&&method!==`GET`&&method!==`HEAD`&&method!==`OPTIONS`&&method!==`DELETE`&&method!==`PATCH`&&method!==`POST`&&method!==`PUT`)ROUTES[bunPattern][``]??=RES404();if(isWildcard)(ROUTES[bunPattern===`/*`?`/`:bunPattern.slice(0,-3)]??={})[method]??=RES404()};export let routerToString=()=>{let str=`{`;for(let pattern in ROUTES){str+=`"`+pattern+`":`;let methods=ROUTES[pattern];let allMethods=methods[``];if(allMethods==null){str+=`{`;for(let method in methods)str+=method+`:`+methods[method]+`,`;str+=`},`}else if(Object.keys(methods).length===1)str+=methods[``]+`,`;else{str+=`(r,s)=>`;for(let method in methods)if(method!==``){let fn=methods[method];str+=`r.method==="`+method+`"?`+(fn.startsWith(`(r,s)=>`)?injectDependency(fn)+`(r,s)`:fn)+`:`}str+=(allMethods.startsWith(`(r,s)=>`)?injectDependency(allMethods)+`(r,s)`:allMethods)+`,`}}return str+`}`};

package/bun/index.d.ts

@@ -3,7 +3,7 @@ import { type ChildRouters, type InferHandlers, type InferRouter } from "../core
 import type { MiddlewareTypes } from "../core/middleware.js";
 export interface BunContext {
 	readonly req: BunRequest;
-	readonly server: Server;
+	readonly server: Server<any>;
 }
 export declare const router: <
 	const T extends MiddlewareTypes<BunContext, any, any>[],

package/compiler/aot.d.ts

@@ -1,7 +1,6 @@
 import type { RouterTag } from "../core/index.js";
 import "../core/context.js";
 import type { GenericContext } from "../index.js";
-import type { BunContext } from "../bun/index.js";
-export declare const hydrateRouter: (router: RouterTag<GenericContext> | RouterTag<BunContext>) => void;
-declare const _default: (router: RouterTag<GenericContext> | RouterTag<BunContext>) => void;
+export declare const hydrateRouter: (router: RouterTag<GenericContext>) => void;
+declare const _default: (router: RouterTag<GenericContext>) => void;
 export default _default;

package/compiler/aot.js

@@ -1 +1 @@
-import{hydrateDependency,hooks}from"@mapl/framework";import{injectExternalDependency,markExported}from"runtime-compiler";import"../core/context.js";import{countParams}from"@mapl/router/path";export let hydrateRouter=router=>{hooks.compileHandler=(handler,_,_1,scope)=>{let fn=handler[2];injectExternalDependency(fn);handler[3]?.type?.(``,scope[1]||fn.length>countParams(handler[1]))};hooks.compileErrorHandler=(_,fn,dat,scope)=>{injectExternalDependency(fn);dat?.type?.(``,scope[1]||fn.length>1);return``};hydrateDependency(router,[false,false,,``,false],``)};export default router=>{hydrateRouter(router);markExported()};
+import{hydrateDependency,hooks}from"@mapl/framework";import{countParams}from"@mapl/router/path";import{injectExternalDependency,markExported}from"runtime-compiler";import"../core/context.js";export let hydrateRouter=router=>{hooks.compileHandler=(handler,_,_1,scope)=>{let fn=handler[2];injectExternalDependency(fn);handler[3]?.handler?.(``,scope[1]||fn.length>countParams(handler[1]))};hooks.compileErrorHandler=(_,fn,dat,scope)=>{injectExternalDependency(fn);dat?.handler?.(``,scope[1]||fn.length>1);return``};hydrateDependency(router,[false,false,,``,false],``)};export default router=>{hydrateRouter(router);markExported()};

package/compiler/jit.d.ts

@@ -4,7 +4,6 @@ import type { FetchFn } from "../core/utils.js";
 import type { GenericContext } from "../index.js";
 export declare const RES404: () => string;
 export declare const RES400: () => string;
-export declare const paramArgs: string[];
 export declare const compileToString: (router: RouterTag<GenericContext>) => string;
 export declare const compileToExportedDependency: (router: RouterTag<GenericContext>) => CompiledDependency<FetchFn>;
 export declare const compileToHandler: (router: RouterTag<GenericContext>) => Promise<FetchFn>;

package/compiler/jit.js

@@ -1 +1 @@
-import{compileGroup,createArgSet,contextInit,setContextInit,hooks}from"@mapl/framework";import compile from"@mapl/router/method/compiler";import{countParams}from"@mapl/router/path";import{insertItem}from"@mapl/router/method";import{AsyncFunction,exportDependency,getDependency,injectDependency,injectExternalDependency,lazyDependency,noOp}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";import{isHydrating}from"runtime-compiler/config";let URL_ROUTER;export let RES404=isHydrating?noOp:lazyDependency(injectDependency,`new Response(null,{status:404})`);export let RES400=isHydrating?noOp:lazyDependency(injectDependency,`new Response(null,{status:400})`);export let paramArgs=createArgSet(new Array(16).fill(0).map((_1,i)=>`q`+i));export let compileReturn=(dat,fnAsync,scopeAsync,contextCreated,result)=>{let res=dat?.type;if(res==null)return`return `+result;let str=res(fnAsync?`await `+result:result,contextCreated);return fnAsync&&!scopeAsync?`return (async()=>{`+str+`})()`:str};export let compileErrorHandler=(input,fn,dat,scope)=>{let call=injectExternalDependency(fn)+`(`+input;if(fn.length>1){call+=`,c`;if(!scope[1])return contextInit+compileReturn(dat,fn instanceof AsyncFunction,scope[0],true,call+`)`)}return compileReturn(dat,fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)};let compileToState=router=>{URL_ROUTER={};hooks.compileHandler=(handler,prevContent,path,scope)=>{let fn=handler[2];let call=injectExternalDependency(fn)+`(`;let paramCount=countParams(handler[1]);paramCount>0&&(call+=paramArgs[paramCount]);if(fn.length>paramCount){call+=paramCount===0?`c`:`,c`;if(!scope[1]){insertItem(URL_ROUTER,handler[0],path,prevContent+contextInit+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],true,call+`)`)+(scope[0]?`})()`:``));return}}insertItem(URL_ROUTER,handler[0],path,prevContent+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)+(scope[0]?`})()`:``))};hooks.compileErrorHandler=compileErrorHandler;setContextInit(`let h=[],c={status:200,req:r,headers:h};`);compileGroup(router,[false,false,,`return `+RES400,false],``,``)};export let compileToString=router=>{compileToState(router);return`(r)=>{`+compile(URL_ROUTER,`r.method`,`let u=r.url,s=u.indexOf("/",12)+1,e=u.indexOf("?",s),p=e===-1?u.slice(s):u.slice(s,e);`,1)+`return `+RES404+`}`};export let compileToExportedDependency=router=>exportDependency(injectDependency(compileToString(router)));export let compileToHandler=async router=>{let id=compileToExportedDependency(router);await evaluate();return getDependency(id)};export let compileToHandlerSync=router=>{let id=compileToExportedDependency(router);evaluateSync();return getDependency(id)};
+import{compileGroup,contextInit,setContextInit,hooks,getParamArgs}from"@mapl/framework";import compile from"@mapl/router/method/compiler";import{countParams}from"@mapl/router/path";import{insertItem}from"@mapl/router/method";import{AsyncFunction,exportDependency,getDependency,injectDependency,injectExternalDependency,lazyDependency,noOp}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";import{isHydrating}from"runtime-compiler/config";let URL_ROUTER;export let RES404=isHydrating?noOp:lazyDependency(injectDependency,`new Response(null,{status:404})`);export let RES400=isHydrating?noOp:lazyDependency(injectDependency,`new Response(null,{status:400})`);export let compileReturn=(dat,fnAsync,scopeAsync,contextCreated,result)=>{let res=dat?.handler;if(res==null)return`return `+result;let str=res(fnAsync?`await `+result:result,contextCreated);return fnAsync&&!scopeAsync?`return (async()=>{`+str+`})()`:str};export let compileErrorHandler=(input,fn,dat,scope)=>{let call=injectExternalDependency(fn)+`(`+input;if(fn.length>1){call+=`,c`;if(!scope[1])return contextInit+compileReturn(dat,fn instanceof AsyncFunction,scope[0],true,call+`)`)}return compileReturn(dat,fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)};let compileToState=router=>{URL_ROUTER={};hooks.compileHandler=(handler,prevContent,path,scope)=>{let fn=handler[2];let paramCount=countParams(handler[1]);let call=injectExternalDependency(fn)+`(`+getParamArgs(paramCount);if(fn.length>paramCount){call+=`c`;if(!scope[1]){insertItem(URL_ROUTER,handler[0],path,prevContent+contextInit+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],true,call+`)`)+(scope[0]?`})()`:``));return}}insertItem(URL_ROUTER,handler[0],path,prevContent+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)+(scope[0]?`})()`:``))};hooks.compileErrorHandler=compileErrorHandler;setContextInit(`let h=[],c={status:200,req:r,headers:h};`);compileGroup(router,[false,false,,`return `+RES400(),false],``,``)};export let compileToString=router=>{compileToState(router);return`(r)=>{`+compile(URL_ROUTER,`r.method`,`let u=r.url,s=u.indexOf("/",12)+1,e=u.indexOf("?",s),p=e===-1?u.slice(s):u.slice(s,e);`,1)+`return `+RES404()+`}`};export let compileToExportedDependency=router=>exportDependency(injectDependency(compileToString(router)));export let compileToHandler=async router=>{let id=compileToExportedDependency(router);await evaluate();return getDependency(id)};export let compileToHandlerSync=router=>{let id=compileToExportedDependency(router);evaluateSync();return getDependency(id)};

package/constants.js

@@ -1 +1 @@
-import{PATH,REQ,URL,PATH_START,PATH_END}from"@mapl/framework/constants";export*from"@mapl/framework/constants";export let HEADERS=`h`;export let SERVER_INFO=`s`;export let BUN_FN_ARGS=`(`+REQ+`,`+SERVER_INFO+`)`;export let BUN_FN_START=BUN_FN_ARGS+`=>`;export let PARSE_PATH=`let `+URL+`=`+REQ+`.url,`+PATH_START+`=`+URL+`.indexOf("/",12)+1,`+PATH_END+`=`+URL+`.indexOf("?",`+PATH_START+`),`+PATH+`=`+PATH_END+`===-1?`+URL+`.slice(`+PATH_START+`):`+URL+`.slice(`+PATH_START+`,`+PATH_END+`);`;
+import{PATH,REQ,URL,PATH_START,PATH_END}from"@mapl/framework/constants";export*from"@mapl/framework/constants";export let HEADERS=`h`;export let SERVER_INFO=`s`;export let BUN_FN_ARGS=`(`+REQ+`,s)`;export let BUN_FN_START=BUN_FN_ARGS+`=>`;export let PARSE_PATH=`let `+URL+`=`+REQ+`.url,`+PATH_START+`=`+URL+`.indexOf("/",12)+1,`+PATH_END+`=`+URL+`.indexOf("?",`+PATH_START+`),`+PATH+`=`+PATH_END+`===-1?`+URL+`.slice(`+PATH_START+`):`+URL+`.slice(`+PATH_START+`,`+PATH_END+`);`;

package/core/handler.d.ts

@@ -1,13 +1,13 @@
 import type { AnyErr } from "@safe-std/error";
 import type { Context } from "./context.js";
 import type { RouterTag } from "./index.js";
-import type { RequestMethod } from "./utils.js";
+import type { MaybePromise, RequestMethod } from "./utils.js";
 export interface HandlerResponse<I = any> {
 	(response: string, hasContext: boolean): string;
 	(response: string, hasContext: boolean, _: I): string;
 }
 export interface HandlerData extends Record<symbol, any> {
-	type?: HandlerResponse;
+	handler?: HandlerResponse;
 }
 export type Handler<
 	Params extends string[] = string[],
@@ -15,7 +15,8 @@ export type Handler<
 	R = any
 > = (...args: [...params: Params, c: Context & T]) => R;
 export type InferPath<T extends string> = T extends `${string}*${infer Next}` ? Next extends "*" ? [string] : [string, ...InferPath<Next>] : [];
-export type InferReturn<D extends HandlerData | undefined> = D extends HandlerData ? D["type"] extends HandlerResponse<infer I> ? I : Response : Response;
+// toResponse macro
+export type InferReturn<D extends HandlerData | undefined> = MaybePromise<D extends HandlerData ? D["handler"] extends HandlerResponse<infer I> ? I : Response : Response>;
 export type InferHandler<
 	P extends string,
 	D extends HandlerData | undefined,
@@ -32,8 +33,9 @@ export interface DefineHandler {
 		C
 	>(path: P, handler: NoInfer<InferHandler<P, undefined, C>>): HandlerTag<C>;
 }
+// Unique tags
 declare const handlerTag: unique symbol;
-export interface HandlerTag<T> {
+export interface HandlerTag<out T> {
 	[handlerTag]: T;
 }
 export declare const JSON_HEADER: () => string;
@@ -73,12 +75,20 @@ export declare const route: <
 	const D extends HandlerData | undefined = undefined,
 	C = {}
 >(method: RequestMethod, path: P, handler: NoInfer<InferHandler<P, D, C>>, dat?: D) => HandlerTag<C>;
+// @ts-ignore
 export declare const any: DefineHandler;
+// @ts-ignore
 export declare const get: DefineHandler;
+// @ts-ignore
 export declare const post: DefineHandler;
+// @ts-ignore
 export declare const put: DefineHandler;
+// @ts-ignore
 export declare const del: DefineHandler;
+// @ts-ignore
 export declare const patch: DefineHandler;
+// @ts-ignore
 export declare const options: DefineHandler;
+// @ts-ignore
 export declare const trace: DefineHandler;
 export {};

package/core/index.d.ts

@@ -3,8 +3,8 @@ import type { AnyMiddlewareTypes, InferMiddlewareState, InferMiddlewareErr } fro
 import type { UnionToIntersection } from "./utils.js";
 declare const _: unique symbol;
 export interface RouterTag<
-	C,
-	E = any
+	out C,
+	out E = any
 > {
 	[_]: [E, C];
 }

package/core/middleware.d.ts

@@ -4,9 +4,9 @@ import type { Context } from "./context.js";
 import type { InferErr, InferResult } from "@safe-std/error";
 declare const _: unique symbol;
 export interface MiddlewareTypes<
-	Context,
-	Err,
-	State
+	out Context,
+	out Err,
+	in out State
 > {
 	[_]: [Context, Err, State];
 }

package/core/utils.d.ts

@@ -1,4 +1,5 @@
 export type UnionToIntersection<U> = (U extends any ? (x: U) => void : never) extends (x: infer I) => void ? I : never;
 export type AwaitedReturn<U extends (...a: any[]) => any> = Awaited<ReturnType<U>>;
+export type MaybePromise<T> = Promise<T> | T;
 export type RequestMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "TRACE" | (string & {});
 export type FetchFn = (req: Request) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.3.18",
+"version": "0.4.1",
 "description": "A compiled web framework for all runtimes",
 "keywords": ["fast", "lightweight", "cross-runtime", "framework", "web", "backend"],
 "repository": {
@@ -12,32 +12,32 @@
 "main": "./index.js",
 "types": "./index.d.ts",
 "dependencies": {
-"@mapl/framework": "^0.6.2",
+"@mapl/framework": "^0.6.3",
 "@mapl/router": "^0.6.4",
 "@safe-std/error": "^2.0.4",
-"runtime-compiler": "^1.2.6"
+"runtime-compiler": "^1.2.7"
 },
 "exports": {
+".": "./index.js",
 "./constants": "./constants.js",
-"./utils/static-headers": "./utils/static-headers.js",
-"./utils/bearer-auth": "./utils/bearer-auth.js",
-"./compiler/aot": "./compiler/aot.js",
-"./utils/body-limit": "./utils/body-limit.js",
-"./compiler/jit": "./compiler/jit.js",
+"./core/utils": "./core/utils.js",
+"./core/middleware": "./core/middleware.js",
+"./core/context": "./core/context.js",
+"./utils/cors": "./utils/cors.js",
+"./core/handler": "./core/handler.js",
 "./utils/redirect": "./utils/redirect.js",
-"./build/rolldown": "./build/rolldown.js",
-"./build/utils": "./build/utils.js",
+"./utils/body-limit": "./utils/body-limit.js",
+"./utils/bearer-auth": "./utils/bearer-auth.js",
+"./utils/static-headers": "./utils/static-headers.js",
+"./utils/basic-auth": "./utils/basic-auth.js",
 "./bun/compiler/router": "./bun/compiler/router.js",
-"./utils/cors": "./utils/cors.js",
-"./core/context": "./core/context.js",
+"./compiler/aot": "./compiler/aot.js",
 "./bun/compiler/aot": "./bun/compiler/aot.js",
-"./core/middleware": "./core/middleware.js",
+"./compiler/jit": "./compiler/jit.js",
+"./bun": "./bun/index.js",
 "./bun/compiler/jit": "./bun/compiler/jit.js",
+"./build/rolldown": "./build/rolldown.js",
 "./core": "./core/index.js",
-"./core/handler": "./core/handler.js",
-"./bun": "./bun/index.js",
-"./core/utils": "./core/utils.js",
-".": "./index.js",
-"./utils/basic-auth": "./utils/basic-auth.js"
+"./build/utils": "./build/utils.js"
 }
 }

package/utils/basic-auth.d.ts

@@ -1,7 +1,7 @@
 import type { Header } from "../core/context.js";
 export declare const extract: (req: Request) => {
-	name: string
-	pwd: string
+	name: string;
+	pwd: string;
 } | undefined;
 export declare const realm: (val: string) => Header;
 export declare const error: (val: string) => Header;

package/utils/body-limit.js

@@ -1 +1 @@
-import{macro}from"../core/middleware.js";import{isHydrating}from"runtime-compiler/config";import{createAsyncScope}from"@mapl/framework";import{injectDependency,lazyDependency,noOp}from"runtime-compiler";export let RES413=isHydrating?noOp:lazyDependency(injectDependency,`new Response(null,{status:413})`);export let size=isHydrating?()=>macro(createAsyncScope):bytes=>macro(scope=>createAsyncScope(scope)+`if(r.body!==null){let l=r.headers.get("content-length");if(l===null||r.headers.has("transfer-encoding")){let g=r.clone().body.getReader(),i=await g.read(),s=0;while(!i.done){s+=i.value.byteLength;if(s>`+bytes+`)return `+RES413()+`;i=await g.read()}}else if(l>`+bytes+`)return `+RES413()+`}`);
+import{macro}from"../core/middleware.js";import{injectDependency,lazyDependency,noOp}from"runtime-compiler";import{isHydrating}from"runtime-compiler/config";import{createAsyncScope}from"@mapl/framework";export let RES413=isHydrating?noOp:lazyDependency(injectDependency,`new Response(null,{status:413})`);export let size=isHydrating?()=>macro(createAsyncScope):bytes=>macro(scope=>createAsyncScope(scope)+`if(await `+injectDependency(`async(r)=>{if(r.body!==null){let l=r.headers.get("content-length");if(l===null||r.headers.has("transfer-encoding")){let g=r.clone().body.getReader(),i=await g.read(),s=0;while(!i.done){s+=i.value.byteLength;if(s>`+bytes+`)return true;i=await g.read()}}else if(+l>`+bytes+`)return true}return false}`)+`(r))return `+RES413()+`;`);

package/utils/cors.d.ts

@@ -1,12 +1,13 @@
 import { type MiddlewareTypes } from "../core/middleware.js";
 import type { RequestMethod } from "../core/utils.js";
 import type { Header } from "../core/context.js";
+// Ensure people don't make mistake categorizing headers
 declare const _: unique symbol;
 export type CORSHeader = Header & {
-	[_]: 0
+	[_]: 0;
 };
 export type CORSPreflightHeader = Header & {
-	[_]: 1
+	[_]: 1;
 };
 export declare const allowMethods: (v: [RequestMethod, RequestMethod, ...RequestMethod[]] | RequestMethod | "*") => CORSPreflightHeader;
 export declare const allowHeaders: (v: string[] | string) => CORSPreflightHeader;

package/utils/cors.js

@@ -1 +1 @@
-import{injectDependency}from"runtime-compiler";import{isHydrating}from"runtime-compiler/config";import{createContext}from"@mapl/framework";import{macro}from"../core/middleware.js";import{injectList}from"./static-headers.js";export let allowMethods=v=>[`access-control-allow-methods`,``+v];export let allowHeaders=v=>[`access-control-allow-headers`,``+v];export let maxAge=v=>[`access-control-max-age`,``+v];export let allowCredentials=[`access-control-allow-credentials`,`true`];export let exposeHeaders=v=>[`access-control-expose-headers`,``+v];let createContextMacro=macro(createContext);export let init=isHydrating?()=>createContextMacro:(origins,preflightHeaders=[],headers=[])=>{if(origins!==`*`){headers.push([`vary`,`origin`]);if(Array.isArray(origins))return macro(scope=>{let originList=injectDependency(JSON.stringify(origins));return createContext(scope)+(injectDependency(`(r,h)=>{let o=r.headers.get("origin");h.push(["access-control-allow-origin",typeof o==="string"&&`+originList+`.includes(o)?o:`+originList+`[0]]);`+(headers.length>0?`h.push(`+injectList(headers)+`);`:``)+(preflightHeaders.length>0?`r.method==="OPTIONS"&&h.push(`+injectList(preflightHeaders)+`)}`:`}`))+`(r,h);`)})}headers.push([`access-control-allow-origin`,origins]);return macro(scope=>{let pushHeaders=headers.length>0?`h.push(`+injectList(headers)+`);`:``;return createContext(scope)+(preflightHeaders.length>0?injectDependency(`(r,h)=>{`+pushHeaders+`r.method==="OPTIONS"&&h.push(`+injectList(preflightHeaders)+`)}`)+`(r,h);`:pushHeaders)})};
+import{injectDependency}from"runtime-compiler";import{isHydrating}from"runtime-compiler/config";import{createContext}from"@mapl/framework";import{macro}from"../core/middleware.js";import{injectList}from"./static-headers.js";export let allowMethods=v=>[`access-control-allow-methods`,``+v];export let allowHeaders=v=>[`access-control-allow-headers`,``+v];export let maxAge=v=>[`access-control-max-age`,``+v];export let allowCredentials=[`access-control-allow-credentials`,`true`];export let exposeHeaders=v=>[`access-control-expose-headers`,``+v];let createContextMacro=macro(createContext);export let init=isHydrating?()=>createContextMacro:(origins,preflightHeaders=[],headers=[])=>{if(origins!==`*`){headers.push([`vary`,`origin`]);if(Array.isArray(origins))return macro(scope=>{let str=`(r,h)=>{let o=r.headers.get("origin");h.push(["access-control-allow-origin",typeof o==="string"&&o===`+JSON.stringify(origins[1]);for(let i=2;i<origins.length;i++)str+=`||o===`+JSON.stringify(origins[i]);return createContext(scope)+(injectDependency(str+`?o:`+JSON.stringify(origins[0])+`]);`+(headers.length>0?`h.push(`+injectList(headers)+`);`:``)+(preflightHeaders.length>0?`r.method==="OPTIONS"&&h.push(`+injectList(preflightHeaders)+`)}`:`}`))+`(r,h);`)})}headers.push([`access-control-allow-origin`,origins]);return macro(scope=>{let pushHeaders=headers.length>0?`h.push(`+injectList(headers)+`);`:``;return createContext(scope)+(preflightHeaders.length>0?injectDependency(`(r,h)=>{`+pushHeaders+`r.method==="OPTIONS"&&h.push(`+injectList(preflightHeaders)+`)}`)+`(r,h);`:pushHeaders)})};

package/utils/static-headers.js

@@ -1 +1 @@
-import{isHydrating}from"runtime-compiler/config";import{macro,noOpMacro}from"../core/middleware.js";import{injectDependency}from"runtime-compiler";export let injectList=list=>list.length!==1?`...`+injectDependency(JSON.stringify(list)):injectDependency(JSON.stringify(list[0]));export default isHydrating?()=>noOpMacro:headers=>macro(()=>`h.push(`+injectList(Array.isArray(headers)?headers:headers instanceof Headers?headers.entries().toArray():Object.entries(headers))+`);`);
+import{isHydrating}from"runtime-compiler/config";import{injectDependency}from"runtime-compiler";import{macro,noOpMacro}from"../core/middleware.js";export let injectList=list=>list.length!==1?`...`+injectDependency(JSON.stringify(list)):injectDependency(JSON.stringify(list[0]));export default isHydrating?()=>noOpMacro:headers=>macro(()=>`h.push(`+injectList(Array.isArray(headers)?headers:headers instanceof Headers?headers.entries().toArray():Object.entries(headers))+`);`);