@mapl/web 0.2.0-alpha.8 → 0.2.1

package/README.md

@@ -97,13 +97,3 @@ await input.write({
 });
 ```
 As of rn only `terser` can DCE `@mapl/web` well.
-
-### Hydration
-```ts
-import { isHydrating } from 'runtime-compiler/config';
-
-// false while building the output string
-// true while only building dependencies
-// Use this to for minifiedrs to eliminate unused code path in final output
-isHydrating;
-```

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 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)};

package/core/handler.d.ts

@@ -10,7 +10,7 @@ export type Handler<
 export type DefineHandler = <
 	P extends string,
 	S = {}
->(path: P, handler: Handler<InferPath<P>, Required<S>>, ...dat: HandlerData[]) => HandlerTag<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;
 }
@@ -41,7 +41,7 @@ export declare const 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>;
+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
@@ -52,7 +52,7 @@ 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>;
+>(method: RequestMethod, 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;

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)];
+export let json={type:`json`};export let html={type:`html`};export let raw={type:`raw`};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/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.2.0-alpha.8",
+"version": "0.2.1",
 "description": "A compiled web framework for all runtimes",
 "keywords": ["fast", "lightweight", "cross-runtime", "framework", "web", "backend"],
 "repository": {
@@ -22,16 +22,16 @@
 },
 "exports": {
 "./constants": "./constants.js",
-"./core/middleware": "./core/middleware.js",
+"./core/utils": "./core/utils.js",
+".": "./index.js",
+"./core/handler": "./core/handler.js",
+"./core/context": "./core/context.js",
 "./core": "./core/index.js",
 "./utils/static-headers": "./utils/static-headers.js",
 "./utils/cors": "./utils/cors.js",
-"./core/handler": "./core/handler.js",
+"./core/middleware": "./core/middleware.js",
 "./utils/secure-headers": "./utils/secure-headers.js",
-"./compiler/aot": "./compiler/aot.js",
-"./core/utils": "./core/utils.js",
-"./core/context": "./core/context.js",
-".": "./index.js",
-"./compiler/jit": "./compiler/jit.js"
+"./compiler/jit": "./compiler/jit.js",
+"./compiler/aot": "./compiler/aot.js"
 }
 }

package/utils/cors.js

@@ -1 +1 @@
-import{injectDependency}from"runtime-compiler";import{macro}from"../core/middleware.js";import{pushHeaders}from"./static-headers.js";import{isHydrating}from"runtime-compiler/config";import{createContext}from"@mapl/framework";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 pushPreflights=pushHeaders(preflightHeaders);let originList=injectDependency(JSON.stringify(origins));return createContext(scope)+(injectDependency(`(r,hd)=>{let o=r.headers.get("origin");h.push(["access-control-allow-origin",typeof o==="string"&&`+originList+`.includes(o)?o:`+originList+`[0]]);`+pushHeaders(headers)+(pushPreflights===``?`r.method==="OPTIONS"&&`+pushPreflights+`}`:`}`))+`(r,hd);`)})}headers.push([`access-control-allow-origin`,origins]);return macro(scope=>{let pushPreflights=pushHeaders(preflightHeaders);return createContext(scope)+(pushPreflights===``?pushHeaders(headers):injectDependency(`(r,hd)=>{`+pushHeaders(headers)+`r.method==="OPTIONS"&&`+pushPreflights+`}`)+`(r,hd);`)})};
+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)})};

package/utils/static-headers.d.ts

@@ -1,5 +1,5 @@
 import type { Header } from "../core/context.js";
 import { type MiddlewareTypes } from "../core/middleware.js";
-export declare const pushHeaders: (list: any[]) => string;
+export declare const injectList: (list: any[]) => string;
 declare const _default: (headers: Headers | Header[] | Record<string, any>) => MiddlewareTypes<never, {}>;
 export default _default;

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 pushHeaders=list=>list.length===0?``:`hd.push(`+(list.length>1?`...`+injectDependency(JSON.stringify(list)):injectDependency(JSON.stringify(list[0])))+`);`;export default isHydrating?()=>noOpMacro:headers=>macro(()=>pushHeaders(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(()=>`hd.push(`+injectList(Array.isArray(headers)?headers:headers instanceof Headers?headers.entries().toArray():Object.entries(headers))+`);`);