@mapl/web 0.2.0 → 0.3.0-alpha.1

package/compiler/aot.js

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

package/compiler/jit.d.ts

@@ -1,6 +1,8 @@
 import type { RouterTag } from "../core/index.js";
 import { type CompiledDependency } from "runtime-compiler";
+export declare const RES404: string;
+export declare const RES400: string;
 export declare const compileToString: (router: RouterTag) => string;
-export declare const compileToDependency: (router: RouterTag) => CompiledDependency<(req: Request) => any>;
+export declare const compileToExportedDependency: (router: RouterTag) => CompiledDependency<(req: Request) => any>;
 export declare const compileToHandler: (router: RouterTag) => Promise<(req: Request) => any>;
 export declare const compileToHandlerSync: (router: RouterTag) => ((req: Request) => any);

package/compiler/jit.js

@@ -1 +1 @@
-import{compileGroup,createArgSet,AsyncFunction,setHooks,contextInit,setContextInit}from"@mapl/framework";import compile from"@mapl/router/method/compiler";import{countParams}from"@mapl/router/path";import{insertItem}from"@mapl/router/method";import{exportDependency,getDependency,injectDependency,injectExternalDependency}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";let urlRouter;let paramArgs=createArgSet(new Array(16).fill(0).map((_1,i)=>`q`+i));let compileReturn=(dat,fnAsync,scopeAsync,contextCreated,result)=>{let typ=dat.type;if(typ===`raw`)return`return `+result;fnAsync&&(result=`await `+result);let str=typ==null?`return new Response(`+result+(contextCreated?`,c)`:`)`):contextCreated?`hd.push(`+(typ===`json`?`j`:`h`)+`);return new Response(`+(typ===`json`?`JSON.stringify(`+result+`)`:result)+`,c)`:`return new Response(`+(typ===`json`?`JSON.stringify(`+result+`),oj`:result+`,oh`)+`)`;return fnAsync&&!scopeAsync?`return (async()=>{`+str+`})()`:str};let compileToState=router=>{urlRouter={};setHooks({compileHandler:(fn,dat,path,scope)=>{let call=injectExternalDependency(fn)+`(`;let paramCount=countParams(path);paramCount>0&&(call+=paramArgs[paramCount]);if(fn.length>paramCount){call+=paramCount===0?`c`:`,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+`)`)},compileErrorHandler:(fn,dat,scope)=>{let call=injectExternalDependency(fn)+`(t`;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+`)`)},registerCompiled:(method,path,content)=>insertItem(urlRouter,method,path,content)});setContextInit(`let hd=[],c={status:200,req:r,headers:hd};`);compileGroup(router,[false,false,,`return b`,false],``,``)};export let compileToString=router=>{compileToState(router);return`()=>{var t=["text/html","application/json"].map(c=>["Content-Type",c]),[h,j]=t,[oh,oj]=t.map(c=>({headers:[c]})),[n,b]=[404,400].map(s=>new Response(null,{status:s}));return(r)=>{`+compile(urlRouter,`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 n}}`};export let compileToDependency=router=>exportDependency(injectDependency(`(`+compileToString(router)+`)()`));export let compileToHandler=async router=>{let id=compileToDependency(router);await evaluate();return getDependency(id)};export let compileToHandlerSync=router=>{let id=compileToDependency(router);evaluateSync();return getDependency(id)};
+import{compileGroup,createArgSet,AsyncFunction,setHooks,contextInit,setContextInit}from"@mapl/framework";import compile from"@mapl/router/method/compiler";import{countParams}from"@mapl/router/path";import{insertItem}from"@mapl/router/method";import{exportDependency,getDependency,injectDependency,injectExternalDependency}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";let URL_ROUTER;export let RES404=injectDependency(`new Response(null,{status:404})`);export let RES400=injectDependency(`new Response(null,{status:400})`);let paramArgs=createArgSet(new Array(16).fill(0).map((_1,i)=>`q`+i));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};let compileToState=router=>{URL_ROUTER={};setHooks({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]?`})()`:``))},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+`)`)}});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.d.ts

@@ -2,10 +2,3 @@ export * from "@mapl/framework/constants";
 export declare const HEADERS: string;
 export declare const CTX_INIT: string;
 export declare const PARSE_PATH: string;
-export declare const CHTML: string;
-export declare const CJSON: string;
-export declare const OHTML: string;
-export declare const OJSON: string;
-export declare const R404: string;
-export declare const R400: string;
-export declare const GLOBALS: string;

package/constants.js

@@ -1 +1 @@
-import{CTX,PATH,REQ,URL,PATH_START,PATH_END,TMP}from"@mapl/framework/constants";export*from"@mapl/framework/constants";export let HEADERS=`hd`;export let CTX_INIT=`let `+HEADERS+`=[],`+CTX+`={status:200,req:`+REQ+`,headers:`+HEADERS+`};`;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+`);`;export let CHTML=`h`;export let CJSON=`j`;export let OHTML=`oh`;export let OJSON=`oj`;export let R404=`n`;export let R400=`b`;export let GLOBALS=`var `+TMP+`=["text/html","application/json"].map(c=>["Content-Type",c]),[`+CHTML+`,`+CJSON+`]=`+TMP+`,[`+OHTML+`,`+OJSON+`]=`+TMP+`.map(c=>({headers:[c]})),[`+R404+`,`+R400+`]=[404,400].map(s=>new Response(null,{status:s}));`;
+import{CTX,PATH,REQ,URL,PATH_START,PATH_END}from"@mapl/framework/constants";export*from"@mapl/framework/constants";export let HEADERS=`h`;export let CTX_INIT=`let `+HEADERS+`=[],`+CTX+`={status:200,req:`+REQ+`,headers:`+HEADERS+`};`;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,20 +1,30 @@
 import type { Err } from "@safe-std/error";
 import type { Context } from "./context.js";
 import type { RouterTag } from "./index.js";
-import type { RequestMethod } from "./utils.js";
-export type ErrorHandler<E extends Err = Err> = (err: E, c: Context) => any;
+import { type RequestMethod } from "./utils.js";
+export type HandlerResponse<I = any> = (response: string, hasContext: boolean, _?: I) => string;
+export interface HandlerData extends Record<symbol, any> {
+	type?: HandlerResponse;
+}
 export type Handler<
 	Params extends string[] = string[],
-	T extends {} = Record<string, any>
-> = (...args: [...params: Params, c: Context & T]) => any;
-export type DefineHandler = <
+	T extends {} = Record<string, any>,
+	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;
+export type InferHandler<
 	P extends string,
-	S = {}
->(path: P, handler: Handler<InferPath<P>, Required<S>>, ...dat: HandlerData[]) => HandlerTag<S>;
-export interface HandlerData extends Record<symbol, any> {
-	type?: "json" | "html" | "raw" | null;
+	D extends HandlerData | undefined,
+	C
+> = Handler<InferPath<P>, Required<C>, InferReturn<D>>;
+export interface DefineHandler {
+	<
+		P extends string,
+		const D extends HandlerData | undefined = undefined,
+		C = {}
+	>(path: P, handler: NoInfer<InferHandler<P, D, C>>, dat?: D): HandlerTag<C>;
 }
-export type InferPath<T extends string> = T extends `${string}*${infer Next}` ? Next extends "*" ? [string] : [string, ...InferPath<Next>] : [];
 declare const handlerTag: unique symbol;
 export interface HandlerTag<T> {
 	[handlerTag]: T;
@@ -22,26 +32,23 @@ export interface HandlerTag<T> {
 /**
 * Return JSON
 */
-export declare const json: {
-	readonly type: "json"
-};
+export declare const json: HandlerResponse;
 /**
 * Return HTML
 */
-export declare const html: {
-	readonly type: "html"
-};
+export declare const html: HandlerResponse<BodyInit>;
 /**
-* Return raw Response
+* Return a body init
 */
-export declare const raw: {
-	readonly type: "raw"
-};
+export declare const text: HandlerResponse<BodyInit>;
 /**
 * Handle errors of a router
 * @param f
 */
-export declare const error: <const E extends Err>(r: RouterTag<E>, f: ErrorHandler<E>, ...dat: HandlerData[]) => RouterTag<never>;
+export declare const error: <
+	const E extends Err,
+	const D extends HandlerData | undefined = undefined
+>(r: RouterTag<E>, f: NoInfer<(err: E, c: Context) => InferReturn<D>>, dat?: D) => RouterTag<never>;
 /**
 * Handle requests to a path with a specific method
 * @param method
@@ -51,8 +58,9 @@ export declare const error: <const E extends Err>(r: RouterTag<E>, f: ErrorHandl
 */
 export declare const route: <
 	P extends string,
-	S = {}
->(method: RequestMethod, path: P, handler: Handler<InferPath<P>, Required<S>>, ...dat: HandlerData[]) => HandlerTag<S>;
+	const D extends HandlerData | undefined = undefined,
+	C = {}
+>(method: RequestMethod, path: P, handler: NoInfer<InferHandler<P, D, C>>, dat?: D) => HandlerTag<C>;
 export declare const any: DefineHandler;
 export declare const get: DefineHandler;
 export declare const post: DefineHandler;

package/core/handler.js

@@ -1 +1 @@
-export let json={type:`json`};export let html={type:`html`};export let raw={type:`raw`};let noType={type:null};export let error=(r,f,...dat)=>{r[2]=[f,dat.length===0?noType:Object.assign({type:null},...dat)];return r};let mergeData=(...dat)=>dat.length===0?noType:Object.assign({type:null},...dat);export let route=(method,path,handler,...dat)=>[method,path,handler,mergeData(...dat)];export let any=(path,handler,...dat)=>[``,path,handler,mergeData(...dat)];export let get=(path,handler,...dat)=>[`GET`,path,handler,mergeData(...dat)];export let post=(path,handler,...dat)=>[`POST`,path,handler,mergeData(...dat)];export let put=(path,handler,...dat)=>[`PUT`,path,handler,mergeData(...dat)];export let del=(path,handler,...dat)=>[`DELETE`,path,handler,mergeData(...dat)];export let patch=(path,handler,...dat)=>[`PATCH`,path,handler,mergeData(...dat)];export let options=(path,handler,...dat)=>[`OPTIONS`,path,handler,mergeData(...dat)];export let trace=(path,handler,...dat)=>[`TRACE`,path,handler,mergeData(...dat)];
+import{noOp}from"./utils.js";import{isHydrating}from"runtime-compiler/config";import{injectDependency}from"runtime-compiler";export let json=isHydrating?noOp:(()=>{let jsonHeader=injectDependency(`["content-type","application/json"]`);let jsonOptions=injectDependency(`{headers:[`+jsonHeader+`]}`);return(res,hasContext)=>hasContext?`h.push(`+jsonHeader+`);return new Response(JSON.stringify(`+res+`),c)`:`return new Response(JSON.stringify(`+res+`),`+jsonOptions+`)`})();export let html=isHydrating?noOp:(()=>{let htmlHeader=injectDependency(`["content-type","text/html"]`);let htmlOptions=injectDependency(`{headers:[`+htmlHeader+`]}`);return(res,hasContext)=>hasContext?`h.push(`+htmlHeader+`);return new Response(`+res+`,c)`:`return new Response(`+res+`,`+htmlOptions+`)`})();export let text=isHydrating?noOp:(res,hasContext)=>`return new Response(`+res+(hasContext?`,c)`:`)`);export let error=(r,f,dat)=>{r[2]=[f,dat];return r};export let route=(method,path,handler,dat)=>[method,path,handler,dat];export let any=(path,handler,dat)=>[``,path,handler,dat];export let get=(path,handler,dat)=>[`GET`,path,handler,dat];export let post=(path,handler,dat)=>[`POST`,path,handler,dat];export let put=(path,handler,dat)=>[`PUT`,path,handler,dat];export let del=(path,handler,dat)=>[`DELETE`,path,handler,dat];export let patch=(path,handler,dat)=>[`PATCH`,path,handler,dat];export let options=(path,handler,dat)=>[`OPTIONS`,path,handler,dat];export let trace=(path,handler,dat)=>[`TRACE`,path,handler,dat];

package/core/middleware.d.ts

@@ -1,6 +1,6 @@
 import type { ScopeState } from "@mapl/framework";
 import type { InferErr, InferResult } from "@safe-std/error";
-import type { AwaitedReturn } from "./utils.js";
+import { type AwaitedReturn } from "./utils.js";
 import type { Context } from "./context.js";
 export type MiddlewareHandler = (c: Context) => any;
 export type MiddlewareTypes<

package/core/middleware.js

@@ -1 +1 @@
-export let macro=f=>[-1,f];export let noOpMacro=macro(()=>``);export let tap=f=>[0,f];export let attach=(prop,f)=>[1,f,prop];export let validate=f=>[2,f];export let parse=(prop,f)=>[3,f,prop];
+import{noOp}from"./utils.js";export let macro=f=>[-1,f];export let noOpMacro=macro(noOp);export let tap=f=>[0,f];export let attach=(prop,f)=>[1,f,prop];export let validate=f=>[2,f];export let parse=(prop,f)=>[3,f,prop];

package/core/utils.d.ts

@@ -1,3 +1,4 @@
 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 RequestMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "TRACE" | (string & {});
+export declare const noOp: () => string;

package/core/utils.js

@@ -1 +1 @@
-export{};
+export let noOp=()=>``;

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.2.0",
+"version": "0.3.0-alpha.1",
 "description": "A compiled web framework for all runtimes",
 "keywords": ["fast", "lightweight", "cross-runtime", "framework", "web", "backend"],
 "repository": {
@@ -12,26 +12,26 @@
 "main": "./index.js",
 "types": "./index.d.ts",
 "dependencies": {
-"@mapl/framework": "^0.4.4",
+"@mapl/framework": "^0.4.7",
 "@mapl/router": "^0.6.2",
 "@safe-std/error": "^1.0.1",
-"runtime-compiler": "^1.0.8"
+"runtime-compiler": "^1.0.11"
 },
 "optionalDependencies": {
 "secure-headers": "^0.0.6"
 },
 "exports": {
-"./core/middleware": "./core/middleware.js",
-"./core/context": "./core/context.js",
 "./constants": "./constants.js",
-"./utils/static-headers": "./utils/static-headers.js",
+".": "./index.js",
+"./utils/secure-headers": "./utils/secure-headers.js",
+"./core/context": "./core/context.js",
 "./utils/cors": "./utils/cors.js",
+"./core/middleware": "./core/middleware.js",
+"./compiler/jit": "./compiler/jit.js",
 "./core": "./core/index.js",
+"./utils/static-headers": "./utils/static-headers.js",
 "./compiler/aot": "./compiler/aot.js",
 "./core/handler": "./core/handler.js",
-"./core/utils": "./core/utils.js",
-".": "./index.js",
-"./utils/secure-headers": "./utils/secure-headers.js",
-"./compiler/jit": "./compiler/jit.js"
+"./core/utils": "./core/utils.js"
 }
 }

package/utils/cors.js

@@ -1 +1 @@
-import{injectDependency}from"runtime-compiler";import{macro}from"../core/middleware.js";import{isHydrating}from"runtime-compiler/config";import{createContext}from"@mapl/framework";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,hd);`)})}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,hd);`:pushHeaders)})};
+import{injectDependency}from"runtime-compiler";import{macro}from"../core/middleware.js";import{isHydrating}from"runtime-compiler/config";import{createContext}from"@mapl/framework";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)})};

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(()=>`hd.push(`+injectList(Array.isArray(headers)?headers:headers instanceof Headers?headers.entries().toArray():Object.entries(headers))+`);`);
+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))+`);`);