@mapl/web 0.1.0 → 0.1.1

package/README.md

@@ -2,15 +2,20 @@
 A compiled web framework for all runtimes.
 
 ```ts
-import { router, layer, compile } from '@mapl/web';
+import { router, handle, layer, compile } from '@mapl/web';
 
-const app = router.init([
-  layer.attach('id', () => performance.now())
-], [
-  router.on('GET', '/path', (c) => c.id)
-]);
+const api = router.init(
+  [],
+  [ handle.get('/', () => 'Hi') ]
+);
+
+const app = router.init(
+  [ layer.attach('id', () => performance.now()) ],
+  [ handle.get('/path', (c) => c.id) ],
+  { '/api': api }
+);
 
 export default {
-  fetch: compile(app)
+  fetch: router.compile(app)
 };
 ```

package/constants.d.ts

@@ -5,6 +5,8 @@ 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{MAPL,HEADERS,CTX,PATH,REQ,URL,PATH_START,PATH_END}from"@mapl/framework/constants.js";export*from"@mapl/framework/constants.js";export let WEB=MAPL+`w`;export let CTX_FN=WEB+`c`;export let CTX_INIT=`let `+HEADERS+`=[],`+CTX+`=`+CTX_FN+`(`+REQ+`,`+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+`.substring(`+PATH_START+`,`+PATH_END+`);`;export let CHTML=WEB+`h`;export let CJSON=WEB+`j`;export let R404=WEB+`n`;export let R400=WEB+`b`;export let GLOBALS=`let [`+CHTML+`,`+CJSON+`]=["text/html","application/json"].map(c=>["content-type",c]),[`+R404+`,`+R400+`]=[404,400].map(s=>new Response(null,{status:s}));`;
+import{MAPL,HEADERS,CTX,PATH,REQ,URL,PATH_START,PATH_END,TMP}from"@mapl/framework/constants.js";export*from"@mapl/framework/constants.js";export let WEB=MAPL+`w`;export let CTX_FN=WEB+`c`;export let CTX_INIT=`let `+HEADERS+`=[],`+CTX+`=`+CTX_FN+`(`+REQ+`,`+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+`.substring(`+PATH_START+`,`+PATH_END+`);`;export let CHTML=WEB+`h`;export let CJSON=WEB+`j`;export let OHTML=WEB+`oh`;export let OJSON=WEB+`oj`;export let R404=WEB+`n`;export let R400=WEB+`b`;export let GLOBALS=`let `+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}));`;

package/core/compile.js

@@ -1 +1 @@
-import{compileGroup,createArgSet,isFuncAsync}from"@mapl/framework";import{o2}from"@mapl/router/tree/compiler.js";import compile from"@mapl/router/method/compiler.js";import{countParams}from"@mapl/router/path/index.js";import{isErr}from"safe-throw";import createContext from"./context.js";let paramArgs=createArgSet(new Array(16).fill(0).map((_1,i)=>`q`+i));let compileReturn=(state,dat,fnAsync,scopeAsync,contextCreated,result)=>{let typ=dat.type;if(typ===`raw`)return`return `+result;if(fnAsync)result=`await `+result;let str=typ==null?`return new Response(`+result+(contextCreated?`,c)`:`)`):(contextCreated?``:state[2])+`mh.push(`+(typ===`json`?`mwj`:`mwh`)+`);return new Response(`+(typ===`json`?`JSON.stringify(`+result+`)`:result)+`,c)`;return fnAsync&&!scopeAsync?`return (async()=>{`+str+`})()`:scopeAsync?str+`})()`:str};export default router=>{let baseRouter={};let dependencies=[];compileGroup(router,[baseRouter,dependencies,`let mh=[],c=mwc(r,mh);`,(fn,dat,path,state,scope)=>{let call=`f`+state[1].push(fn)+`(`;let paramCount=countParams(path);if(paramCount>0)call+=paramArgs[paramCount];if(fn.length>paramCount){call+=paramCount===0?`c`:`,c`;if(!scope[1])return state[2]+compileReturn(state,dat,isFuncAsync(fn),scope[0],true,call+`)`)}return compileReturn(state,dat,isFuncAsync(fn),scope[0],scope[1],call+`)`)},(fn,dat,state,scope)=>{let call=`f`+state[1].push(fn)+`(t`;if(fn.length>1){call+=`,c`;if(!scope[1])return state[2]+compileReturn(state,dat,isFuncAsync(fn),scope[0],true,call+`)`)}return compileReturn(state,dat,isFuncAsync(fn),scope[0],scope[1],call+`)`)}],[false,false,null,`return mwb`],``,``);return Function(`me`,`mwc`,...dependencies.map((_,i)=>`f`+(i+1)),`let [mwh,mwj]=["text/html","application/json"].map(c=>["content-type",c]),[mwn,mwb]=[404,400].map(s=>new Response(null,{status:s}));return(r)=>{`+compile(baseRouter,o2,`r.method`,`let u=r.url,s=u.indexOf("/",12)+1,e=u.indexOf("?",s),p=e===-1?u.slice(s):u.substring(s,e);`,1)+`return mwn}`)(isErr,createContext,...dependencies)};
+import{compileGroup,createArgSet,isFuncAsync}from"@mapl/framework";import{o2}from"@mapl/router/tree/compiler.js";import compile from"@mapl/router/method/compiler.js";import{countParams}from"@mapl/router/path/index.js";import{isErr}from"safe-throw";import createContext from"./context.js";let paramArgs=createArgSet(new Array(16).fill(0).map((_1,i)=>`q`+i));let compileReturn=(state,dat,fnAsync,scopeAsync,contextCreated,result)=>{let typ=dat.type;if(typ===`raw`)return`return `+result;if(fnAsync)result=`await `+result;let str=typ==null?`return new Response(`+result+(contextCreated?`,c)`:`)`):contextCreated?`mh.push(`+(typ===`json`?`mwj`:`mwh`)+`);return new Response(`+(typ===`json`?`JSON.stringify(`+result+`)`:result)+`,c)`:`return new Response(`+(typ===`json`?`JSON.stringify(`+result+`),mwoj`:result+`,mwoh`)+`)`;return scopeAsync?str+`})()`:fnAsync?`return (async()=>{`+str+`})()`:str};export default router=>{let baseRouter={};let dependencies=[];compileGroup(router,[baseRouter,dependencies,`let mh=[],c=mwc(r,mh);`,(fn,dat,path,state,scope)=>{let call=`f`+state[1].push(fn)+`(`;let paramCount=countParams(path);if(paramCount>0)call+=paramArgs[paramCount];if(fn.length>paramCount){call+=paramCount===0?`c`:`,c`;if(!scope[1])return state[2]+compileReturn(state,dat,isFuncAsync(fn),scope[0],true,call+`)`)}return compileReturn(state,dat,isFuncAsync(fn),scope[0],scope[1],call+`)`)},(fn,dat,state,scope)=>{let call=`f`+state[1].push(fn)+`(t`;if(fn.length>1){call+=`,c`;if(!scope[1])return state[2]+compileReturn(state,dat,isFuncAsync(fn),scope[0],true,call+`)`)}return compileReturn(state,dat,isFuncAsync(fn),scope[0],scope[1],call+`)`)}],[false,false,null,`return mwb`],``,``);return Function(`me`,`mwc`,...dependencies.map((_,i)=>`f`+(i+1)),`let t=["text/html","application/json"].map(c=>["Content-Type",c]),[mwh,mwj]=t,[mwoh,mwoj]=t.map(c=>({headers:[c]})),[mwn,mwb]=[404,400].map(s=>new Response(null,{status:s}));return(r)=>{`+compile(baseRouter,o2,`r.method`,`let u=r.url,s=u.indexOf("/",12)+1,e=u.indexOf("?",s),p=e===-1?u.slice(s):u.substring(s,e);`,1)+`return mwn}`)(isErr,createContext,...dependencies)};

package/core/context.d.ts

@@ -6,5 +6,5 @@ export interface Context {
 	status?: number;
 	statusText?: string;
 }
-declare const _default: (req: Request) => Context;
+declare const _default: (req: Request, headers: Headers) => Context;
 export default _default;

package/core/context.js

@@ -1 +1 @@
-import{proto}from"./utils.js";let ctxProto=proto({req:void 0,headers:void 0,status:200});export default req=>{let obj=Object.create(ctxProto);obj.headers=[];obj.req=req;return obj};
+import{proto}from"./utils.js";let ctxProto=proto({req:void 0,headers:void 0,status:200});export default (req,headers)=>{let obj=Object.create(ctxProto);obj.headers=headers;obj.req=req;return obj};

package/core/handler.d.ts

@@ -1,22 +1,62 @@
 import type { Err } from "safe-throw";
 import type { Context } from "./context.js";
-export type ErrorHandler<
-	E extends Err = Err,
-	T extends {} = Record<string, any>
-> = (err: E, c: Context & T) => any;
+import { type Tag } from "./utils.js";
+import type { RouterTag } from "./index.js";
+export type ErrorHandler<E extends Err = Err> = (err: E, c: Context) => any;
 export type Handler<
 	Params extends string[] = string[],
 	T extends {} = Record<string, any>
 > = (...args: [...params: Params, c: Context & T]) => any;
-export type MiddlewareHandler = (c: Context) => any;
-export type MiddlewareTypes<
-	E = never,
+export type DefineHandler = <
+	P extends string,
 	S = {}
-> = [err: E, state: S];
-export type AnyMiddlewareTypes = MiddlewareTypes<any, any>;
-export type MergeMiddlewareTypes<T extends AnyMiddlewareTypes[]> = T extends [infer First extends AnyMiddlewareTypes, ...infer Rest extends AnyMiddlewareTypes[]] ? [First[0] | MergeMiddlewareTypes<Rest>[0], First[1] & MergeMiddlewareTypes<Rest>[1]] : [never, {}];
+>(path: P, handler: Handler<InferPath<P>, Required<S>>, ...dat: HandlerData[]) => HandlerTag<S>;
 export interface HandlerData extends Record<symbol, any> {
 	type?: "json" | "html" | "raw";
 }
 export type InferPath<T extends string> = T extends `${string}*${infer Next}` ? Next extends "*" ? [string] : [string, ...InferPath<Next>] : [];
-export type RequestMethod = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "TRACE";
+declare const handlerTag: unique symbol;
+export type HandlerTag<T> = Tag<T, typeof handlerTag>;
+/**
+* Return JSON
+*/
+export declare const json: {
+	readonly type: "json"
+};
+/**
+* Return HTML
+*/
+export declare const html: {
+	readonly type: "html"
+};
+/**
+* Return raw Response
+*/
+export declare const raw: {
+	readonly type: "raw"
+};
+/**
+* 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>;
+/**
+* Handle requests to a path with a specific method
+* @param method
+* @param path
+* @param handler
+* @param dat
+*/
+export declare const route: <
+	P extends string,
+	S = {}
+>(method: string, path: P, handler: Handler<InferPath<P>, Required<S>>, ...dat: HandlerData[]) => HandlerTag<S>;
+export declare const any: DefineHandler;
+export declare const get: DefineHandler;
+export declare const post: DefineHandler;
+export declare const put: DefineHandler;
+export declare const del: DefineHandler;
+export declare const patch: DefineHandler;
+export declare const options: DefineHandler;
+export declare const trace: DefineHandler;
+export {};

package/core/handler.js

@@ -1 +1 @@
-export{};
+import{ALL}from"@mapl/router/method/index.js";import{proto}from"./utils.js";export let json={type:`json`};export let html={type:`html`};export let raw={type:`raw`};export let error=(r,f,...dat)=>{r[2]=[f,proto(...dat)];return r};export let route=(method,path,handler,...dat)=>[method,path,handler,proto(...dat)];export let any=(...a)=>route(ALL,...a);export let get=(...a)=>route(`GET`,...a);export let post=(...a)=>route(`POST`,...a);export let put=(...a)=>route(`PUT`,...a);export let del=(...a)=>route(`DELETE`,...a);export let patch=(...a)=>route(`PATCH`,...a);export let options=(...a)=>route(`OPTIONS`,...a);export let trace=(...a)=>route(`TRACE`,...a);

package/core/index.d.ts

@@ -1,46 +1,15 @@
-import type { Err } from "safe-throw";
-import type { MiddlewareTypes, AnyMiddlewareTypes, MergeMiddlewareTypes, ErrorHandler, Handler, HandlerData, InferPath, RequestMethod } from "./handler.js";
-declare const tag: unique symbol;
-export interface RouteHandler<S> {
-	readonly [tag]: S;
-}
-export type RouterTag = RouteHandler<typeof tag>;
-export type AnyRouter = AnyMiddlewareTypes & RouterTag;
-/**
-* Create a router
-* @param middlewares
-* @param handlers
-* @param children
-*/
-export declare const init: <const T extends AnyMiddlewareTypes[]>(middlewares: T, handlers: RouteHandler<MergeMiddlewareTypes<T>[1]>[], children?: Record<string, AnyRouter>) => MergeMiddlewareTypes<T> & RouterTag;
-/**
-* Handle requests to a path with a specific method
-* @param method
-* @param path
-* @param handler
-* @param dat
-*/
-export declare const on: <
-	S,
-	P extends string
->(method: RequestMethod | (string & {}), path: P, handler: Handler<InferPath<P>, S & {}>, ...dat: HandlerData[]) => RouteHandler<S>;
-/**
-* Handle any request method
-* @param path
-* @param handler
-* @param dat
-*/
-export declare const any: <
-	S,
-	P extends string
->(path: P, handler: Handler<InferPath<P>, S & {}>, ...dat: HandlerData[]) => RouteHandler<S>;
-/**
-* Handle router error
-* @param router
-* @param f
-*/
-export declare const onErr: <
-	E extends Err,
-	S extends {}
->(router: MiddlewareTypes<E, S> & RouterTag, f: ErrorHandler<E, S>) => void;
-export {};
+import type { HandlerTag } from "./handler.js";
+import type { AnyMiddlewareTypes } from "./middleware.js";
+import type { Tag, ToNever, UnionToIntersection } from "./utils.js";
+declare const routerTag: unique symbol;
+export type RouterTag<E = any> = Tag<E, typeof routerTag>;
+export type InferError<
+	T extends AnyMiddlewareTypes[],
+	S extends Record<string, RouterTag>
+> = ToNever<S[keyof S][typeof routerTag] | T[number][0]>;
+export type InferHandler<T extends AnyMiddlewareTypes[]> = HandlerTag<T extends [] ? {} : UnionToIntersection<T[number][1]>>;
+declare const _default: <
+	const T extends AnyMiddlewareTypes[],
+	const S extends Record<string, RouterTag> = {}
+>(middlewares: T, handlers: InferHandler<T>[], children?: S) => RouterTag<InferError<T, S>>;
+export default _default;

package/core/index.js

@@ -1 +1 @@
-import{proto}from"./utils.js";import{ALL}from"@mapl/router/method/index.js";export let init=(middlewares,handlers,children={})=>[middlewares,handlers,null,Object.entries(children)];export let on=(method,path,handler,...dat)=>[method,path,handler,proto(...dat)];export let any=(path,handler,...dat)=>[ALL,path,handler,proto(...dat)];export let onErr=(router,f)=>{router[2]=f};
+export default (middlewares,handlers,children)=>[middlewares,handlers,null,children==null?[]:Object.entries(children)];

package/core/middleware.d.ts

@@ -1,12 +1,18 @@
-import type { MiddlewareHandler, MiddlewareTypes } from "./handler.js";
 import type { InferErr } from "safe-throw";
 import type { AwaitedReturn } from "./utils.js";
-export declare const run: (f: MiddlewareHandler) => MiddlewareTypes;
+import type { Context } from "./context.js";
+export type MiddlewareHandler = (c: Context) => any;
+export type MiddlewareTypes<
+	E,
+	S
+> = [err: E, state: S];
+export type AnyMiddlewareTypes = MiddlewareTypes<any, any>;
+export declare const tap: (f: MiddlewareHandler) => MiddlewareTypes<never, {}>;
 export declare const attach: <
 	Prop extends string,
 	const T extends MiddlewareHandler
 >(prop: Prop, f: T) => MiddlewareTypes<never, Record<Prop, AwaitedReturn<T>>>;
-export declare const validate: <const T extends MiddlewareHandler>(f: T) => MiddlewareTypes<InferErr<AwaitedReturn<T>>>;
+export declare const validate: <const T extends MiddlewareHandler>(f: T) => MiddlewareTypes<InferErr<AwaitedReturn<T>>, {}>;
 export declare const parse: <
 	Prop extends string,
 	const T extends MiddlewareHandler

package/core/middleware.js

@@ -1 +1 @@
-export let run=f=>[0,f];export let attach=(prop,f)=>[1,f,prop];export let validate=f=>[2,f];export let parse=(prop,f)=>[3,f];
+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,8 @@
 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 ToNever<T> = unknown extends T ? never : T;
+export type Tag<
+	S,
+	T extends symbol
+> = Record<T, S>;
 export declare const proto: <T extends any[]>(...f: T) => UnionToIntersection<T[number]>;

package/index.d.ts

@@ -1,3 +1,5 @@
-export * as router from "./core/index.js";
+export { default as router } from "./core/index.js";
+export * as handle from "./core/handler.js";
 export * as layer from "./core/middleware.js";
 export { default as compile } from "./core/compile.js";
+export { st } from "safe-throw";

package/index.js

@@ -1 +1 @@
-export*as router from"./core/index.js";export*as layer from"./core/middleware.js";export{default as compile}from"./core/compile.js";
+export{default as router}from"./core/index.js";export*as handle from"./core/handler.js";export*as layer from"./core/middleware.js";export{default as compile}from"./core/compile.js";export{st}from"safe-throw";

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.1.0",
+"version": "0.1.1",
 "description": "A compiled web framework for all runtimes",
 "keywords": [],
 "license": "MIT",
@@ -15,11 +15,11 @@
 "exports": {
 "./constants": "./constants.js",
 "./core/compile": "./core/compile.js",
-"./core/utils": "./core/utils.js",
 "./core/context": "./core/context.js",
-"./core/middleware": "./core/middleware.js",
 ".": "./index.js",
-"./core/handler": "./core/handler.js",
-"./core": "./core/index.js"
+"./core/utils": "./core/utils.js",
+"./core/middleware": "./core/middleware.js",
+"./core": "./core/index.js",
+"./core/handler": "./core/handler.js"
 }
 }