@mapl/web 0.1.6 → 0.1.8

package/README.md

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

package/constants.d.ts

@@ -1,4 +1,4 @@
-export * from "@mapl/framework/constants.js";
+export * from "@mapl/framework/constants";
 export declare const WEB: string;
 export declare const CTX_FN: string;
 export declare const CTX_INIT: string;

package/constants.js

@@ -1 +1 @@
-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+`.slice(`+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=`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{MAPL,HEADERS,CTX,PATH,REQ,URL,PATH_START,PATH_END,TMP}from"@mapl/framework/constants";export*from"@mapl/framework/constants";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+`.slice(`+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=`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}))`;

package/core/compile.d.ts

@@ -1,3 +1,4 @@
 import type { RouterTag } from "./index.js";
+export declare const compileToString: (router: RouterTag) => string;
 declare const _default: (router: RouterTag) => ((req: Request) => any);
 export default _default;

package/core/compile.js

@@ -1 +1 @@
-import{compileGroup,createArgSet,isFuncAsync}from"@mapl/framework";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=(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(dat,isFuncAsync(fn),scope[0],true,call+`)`)}return compileReturn(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(dat,isFuncAsync(fn),scope[0],true,call+`)`)}return compileReturn(dat,isFuncAsync(fn),scope[0],scope[1],call+`)`)}],[false,false,null,`return mwb`],``,``);return Function(`me`,`mwc`,...dependencies.map((_,i)=>`f`+(i+1)),`"use strict";var 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,`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 mwn}`)(isErr,createContext,...dependencies)};
+import{compileGroup,createArgSet,AsyncFunction,compilerState as state}from"@mapl/framework";import compile from"@mapl/router/method/compiler";import{countParams}from"@mapl/router/path";import{isErr}from"@safe-std/error";import createContext from"./context.js";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;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 fnAsync&&!scopeAsync?`return (async()=>{`+str+`})()`:str};let compileHandler=(fn,dat,path,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(dat,fn instanceof AsyncFunction,scope[0],true,call+`)`)}return compileReturn(dat,fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)};let compileErrorHandler=(fn,dat,scope)=>{let call=`f`+state[1].push(fn)+`(t`;if(fn.length>1){call+=`,c`;if(!scope[1])return state[2]+compileReturn(dat,fn instanceof AsyncFunction,scope[0],true,call+`)`)}return compileReturn(dat,fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)};export let compileToString=router=>{state[0]={};state[1]=[];state[2]=`let mh=[],c=mwc(r,mh);`;state[3]=compileHandler;state[4]=compileErrorHandler;compileGroup(router,[false,false,null,`return mwb`,false],``,``);return`"use strict";var 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(state[0],`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 mwn}`};export default router=>{let debug=compileToString(router);return Function(`me`,`mwc`,...state[1].map((_,i)=>`f`+(i+1)),debug)(isErr,createContext,...state[1])};

package/core/handler.d.ts

@@ -1,6 +1,5 @@
-import type { Err } from "safe-throw";
+import type { Err } from "@safe-std/error";
 import type { Context } from "./context.js";
-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<
@@ -16,7 +15,9 @@ export interface HandlerData extends Record<symbol, any> {
 }
 export type InferPath<T extends string> = T extends `${string}*${infer Next}` ? Next extends "*" ? [string] : [string, ...InferPath<Next>] : [];
 declare const handlerTag: unique symbol;
-export type HandlerTag<T> = Tag<T, typeof handlerTag>;
+export interface HandlerTag<T> {
+	[handlerTag]: T;
+}
 /**
 * Return JSON
 */

package/core/handler.js

@@ -1 +1 @@
-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(``,...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);
+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,dat.length===0?{}:proto(...dat)];export let any=(...a)=>route(``,...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,12 +1,14 @@
 import type { HandlerTag } from "./handler.js";
 import type { AnyMiddlewareTypes } from "./middleware.js";
-import type { Tag, ToNever, UnionToIntersection } from "./utils.js";
+import type { UnionToIntersection } from "./utils.js";
 declare const routerTag: unique symbol;
-export type RouterTag<E = any> = Tag<E, typeof routerTag>;
+export interface RouterTag<E = any> {
+	[routerTag]: E;
+}
 export type InferError<
 	T extends AnyMiddlewareTypes[],
 	S extends Record<string, RouterTag>
-> = ToNever<S[keyof S][typeof routerTag] | T[number][0]>;
+> = 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[],

package/core/middleware.d.ts

@@ -1,4 +1,4 @@
-import type { InferErr } from "safe-throw";
+import type { InferErr } from "@safe-std/error";
 import type { AwaitedReturn } from "./utils.js";
 import type { Context } from "./context.js";
 export type MiddlewareHandler = (c: Context) => any;

package/core/utils.d.ts

@@ -1,8 +1,6 @@
 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]>;
+export declare const proto: <
+	A extends {},
+	T extends any[]
+>(a: A, ...f: T) => A & UnionToIntersection<T[number]>;

package/core/utils.js

@@ -1 +1 @@
-export let proto=(...f)=>Object.assign(Object.create(null),...f);
+export let proto=(a,...f)=>Object.assign({...a},...f);

package/index.d.ts

@@ -1,7 +1,6 @@
 export { default as router } from "./core/index.js";
+export type * 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 * as cors from "./utils/cors.js";
-export * as bodyParser from "./utils/body.js";
-export * as st from "safe-throw/error";

package/index.js

@@ -1 +1 @@
-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*as cors from"./utils/cors.js";export*as bodyParser from"./utils/body.js";export*as st from"safe-throw/error";
+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*as cors from"./utils/cors.js";

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.1.6",
+"version": "0.1.8",
 "description": "A compiled web framework for all runtimes",
 "keywords": [],
 "repository": {
@@ -12,20 +12,19 @@
 "main": "./index.js",
 "types": "./index.d.ts",
 "dependencies": {
-"@mapl/framework": "^0.1.3",
-"@mapl/router": "^0.5.1",
-"safe-throw": "^0.5.2"
+"@mapl/framework": "^0.2.4",
+"@mapl/router": "^0.6.0",
+"@safe-std/error": "^1.0.0"
 },
 "exports": {
 "./constants": "./constants.js",
 ".": "./index.js",
-"./core/compile": "./core/compile.js",
-"./utils/body": "./utils/body.js",
-"./core/handler": "./core/handler.js",
 "./core": "./core/index.js",
-"./core/middleware": "./core/middleware.js",
+"./core/compile": "./core/compile.js",
 "./core/utils": "./core/utils.js",
+"./core/middleware": "./core/middleware.js",
 "./core/context": "./core/context.js",
+"./core/handler": "./core/handler.js",
 "./utils/cors": "./utils/cors.js"
 }
 }

package/utils/body.d.ts

@@ -1,17 +0,0 @@
-import { type MiddlewareTypes } from "../core/middleware.js";
-interface TBody<T> {
-	body: T;
-}
-/**
-* Parse body to text
-*/
-export declare const text: MiddlewareTypes<never, TBody<string>>;
-/**
-* Parse body to a blob
-*/
-export declare const blob: MiddlewareTypes<never, TBody<Blob>>;
-/**
-* Parse body to a byte array
-*/
-export declare const bytes: MiddlewareTypes<never, TBody<Uint8Array>>;
-export {};

package/utils/body.js

@@ -1 +0,0 @@
-import{attach}from"../core/middleware.js";export let text=attach(`body`,async c=>c.req.text());export let blob=attach(`body`,async c=>c.req.blob());export let bytes=attach(`body`,async c=>c.req.bytes());