@mapl/web 0.1.17 → 0.2.0-alpha.2

package/README.md

@@ -1,7 +1,8 @@
 A compiled web framework for all runtimes.
 
 ```ts
-import { router, handle, layer, compile } from '@mapl/web';
+import { router, handle, layer } from '@mapl/web';
+import { compileToHandler } from '@mapl/web/compiler/jit';
 
 const api = router.init([], [
   handle.get('/', () => 'Hi')
@@ -19,6 +20,222 @@ const app = router.init(
 );
 
 export default {
-  fetch: compile(app)
+  fetch: compileToHandler(app)
 };
 ```
+
+## AOT compilation (experimental)
+Build `@mapl/web` to improve startup time.
+
+Setup:
+```ts
+// main.ts
+import { handle, layer, router } from '@mapl/web';
+
+export default router(
+  [
+    layer.tap((c) => {
+      console.log(c.req);
+    }),
+    layer.attach('id', () => performance.now()),
+  ],
+  [handle.any('/path', (c) => c.id)],
+  {
+    '/api': router(
+      [layer.parse('body', async (c) => c.req.text())],
+      [handle.post('/body', (c) => c.body)],
+    ),
+  },
+);
+
+// build.ts
+import app from './main.ts';
+import { compileToString } from '@mapl/web/compiler/jit';
+
+import { rolldown } from 'rolldown';
+import { minifySync } from '@swc/core';
+import { writeFileSync } from 'node:fs';
+
+// Output file
+const ENTRY = ...;
+
+writeFileSync(
+  ENTRY,
+  `
+    import { hydrating } from "@mapl/web/compiler/config";
+    hydrating();
+
+    import app from '${import.meta.resolve('./main.js')}';
+    import hydrate from '@mapl/web/compiler/aot';
+
+    export default {
+      fetch: (${compileToString(app)})(...hydrate(app))
+    };
+  `,
+);
+const input = await rolldown({
+  input: ENTRY,
+  treeshake: {
+    propertyReadSideEffects: false,
+    moduleSideEffects: false,
+  },
+  transform: {
+    typescript: {
+      rewriteImportExtensions: true,
+    },
+  },
+});
+const output = await input.generate();
+const code = minifySync(output.output[0].code, {
+  module: true,
+  mangle: false,
+}).code;
+
+writeFileSync(ENTRY, code);
+```
+
+Example output:
+```js
+var core_default = (middlewares, handlers, children) => [
+  middlewares,
+  handlers,
+  ,
+  children,
+];
+let attach = (prop, f) => [1, f, prop],
+  noType = { type: null },
+  mergeData = (...dat) =>
+    0 === dat.length ? noType : Object.assign({ type: null }, ...dat);
+var main_default = core_default(
+  [
+    [
+      0,
+      (c) => {
+        console.log(c.req);
+      },
+    ],
+    attach('id', () => performance.now()),
+  ],
+  [
+    ((path, handler, ...dat) => ['', path, handler, mergeData(...dat)])(
+      '/path',
+      (c) => c.id,
+    ),
+  ],
+  {
+    '/api': core_default(
+      [attach('body', async (c) => c.req.text())],
+      [
+        ((path, handler, ...dat) => ['POST', path, handler, mergeData(...dat)])(
+          '/body',
+          (c) => c.body,
+        ),
+      ],
+    ),
+  },
+);
+let AsyncFunction = (async () => {}).constructor,
+  compilerState = [, , , , ,],
+  compileErrorHandler$1 = (scope) =>
+    (scope[3] ??= compilerState[4](scope[2][0], scope[2][1], scope)),
+  clearErrorHandler = (scope) => {
+    null != scope[2] && (scope[3] = null);
+  },
+  createContext = (scope) =>
+    scope[1]
+      ? ''
+      : ((scope[1] = !0), clearErrorHandler(scope), compilerState[2]),
+  createAsyncScope = (scope) =>
+    scope[0]
+      ? ''
+      : ((scope[0] = !0), clearErrorHandler(scope), 'return (async()=>{'),
+  setTmp = (scope) => (scope[4] ? 't' : ((scope[4] = !0), 'let t')),
+  hydrateDependency = (group, scope, prefix) => {
+    null != group[2] && ((scope[2] = group[2]), (scope[3] = null));
+    for (let i = 0, middlewares = group[0]; i < middlewares.length; i++) {
+      let middleware = middlewares[i],
+        fn = middleware[1],
+        id = middleware[0];
+      -1 === id
+        ? fn(scope)
+        : (compilerState[1].push(fn),
+          fn.length > 0 && createContext(scope),
+          fn instanceof AsyncFunction && createAsyncScope(scope),
+          1 === id
+            ? createContext(scope)
+            : 2 === id
+              ? (setTmp(scope), compileErrorHandler$1(scope))
+              : 3 === id &&
+                (setTmp(scope),
+                compileErrorHandler$1(scope),
+                createContext(scope)));
+    }
+    for (let i = 0, handlers = group[1]; i < handlers.length; i++) {
+      let handler = handlers[i];
+      compilerState[3](
+        handler[2],
+        handler[3],
+        prefix + ('/' === handler[1] || '' !== prefix ? '' : handler[1]),
+        scope,
+      );
+    }
+    let childGroups = group[3];
+    if (null != childGroups)
+      for (let childPrefix in childGroups)
+        hydrateDependency(
+          childGroups[childPrefix],
+          scope.slice(),
+          '/' === childPrefix ? prefix : prefix + childPrefix,
+        );
+  },
+  _ = Symbol.for('@safe-std/error');
+var aot_default = {
+  fetch: ((me, mwc, f1, f2, f3, f4, f5) => {
+    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) => {
+      let u = r.url,
+        s = u.indexOf('/', 12) + 1,
+        e = u.indexOf('?', s),
+        p = -1 === e ? u.slice(s) : u.slice(s, e);
+      if ('POST' === r.method && 'api' === p) {
+        let c = mwc(r);
+        return (
+          f1(c),
+          (c.id = f2()),
+          (async () => ((c.body = await f4(c)), new Response(f5(c), c)))()
+        );
+      }
+      if ('path' === p) {
+        let c = mwc(r);
+        return f1(c), (c.id = f2()), new Response(f3(c), c);
+      }
+      return mwn;
+    };
+  })(
+    ...((compilerState[0] = {}),
+    (compilerState[1] = []),
+    (compilerState[2] = ''),
+    (compilerState[3] = (fn) => (compilerState[1].push(fn), '')),
+    (compilerState[4] = (fn) => (compilerState[1].push(fn), '')),
+    hydrateDependency(main_default, [!1, !1, , '', !1], ''),
+    [
+      (u) => Array.isArray(u) && u[0] === _,
+      (r) => ({ status: 200, req: r, headers: [] }),
+    ].concat(compilerState[1])),
+  ),
+};
+export { aot_default as default };
+```
+
+### Hydration
+```ts
+import { isHydrating } from '@mapl/web/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/aot.d.ts

@@ -0,0 +1,3 @@
+import type { RouterTag } from "../core/index.js";
+declare const _default: (router: RouterTag) => any[];
+export default _default;

package/compiler/aot.js

@@ -0,0 +1 @@
+import{hydrateDependency,externalDependencies,setHooks}from"@mapl/framework";import{isErr}from"@safe-std/error";import createContext from"../core/context.js";export default router=>{externalDependencies.length=0;let hook=fn=>{externalDependencies.push(fn);return``};setHooks({compileHandler:hook,compileErrorHandler:hook});hydrateDependency(router,[false,false,,``,false],``);return[isErr,createContext].concat(externalDependencies)};

package/compiler/config.d.ts

@@ -0,0 +1,5 @@
+export declare const isHydrating: () => boolean;
+/**
+* @private
+*/
+export declare const hydrating: () => void;

package/compiler/config.js

@@ -0,0 +1 @@
+let hydrateDependency=false;export let isHydrating=()=>hydrateDependency;export let hydrating=()=>{hydrateDependency=true};

package/compiler/index.d.ts

@@ -0,0 +1,4 @@
+declare let;
+export declare const injectLocalDependency: (val: string) => number;
+export declare const localDependencies: () => string;
+export declare const stateToArgs: () => string;

package/compiler/index.js

@@ -0,0 +1 @@
+import{externalDependencies}from"@mapl/framework";import{isHydrating}from"./config.js";let localDeps=``,localDepsCnt=0;export let injectLocalDependency=isHydrating()?()=>++localDepsCnt:val=>{localDepsCnt++;localDeps+=`,l`+localDepsCnt+`=`+val;return localDepsCnt};export let localDependencies=()=>localDeps;export let stateToArgs=()=>{let depsString=`me,mwc`;for(let i=0;i<externalDependencies.length;i++)depsString+=`,f`+(i+1);return depsString};

package/compiler/jit.d.ts

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

package/compiler/jit.js

@@ -0,0 +1 @@
+import{compileGroup,createArgSet,AsyncFunction,setHooks,externalDependencies,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{isErr}from"@safe-std/error";import createContext from"../core/context.js";import{localDependencies,stateToArgs}from"./index.js";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?`c.headers.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 compileToState=router=>{urlRouter={};externalDependencies.length=0;setHooks({compileHandler:(fn,dat,path,scope)=>{let call=`f`+externalDependencies.push(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=`f`+externalDependencies.push(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 c=mwc(r);`);compileGroup(router,[false,false,,`return mwb`,false],``,``)};export let stateToString=()=>`"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}))`+localDependencies()+`;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 mwn}`;export let compileToString=router=>{compileToState(router);return`(`+stateToArgs()+`)=>{`+stateToString()+`}`};export let compileToHandler=router=>{compileToState(router);return Function(stateToArgs(),stateToString())(isErr,createContext,...externalDependencies)};

package/constants.d.ts

@@ -1,5 +1,6 @@
 export * from "@mapl/framework/constants";
 export declare const WEB: string;
+export declare const LOCAL_DEP: string;
 export declare const CTX_FN: string;
 export declare const CTX_INIT: string;
 export declare const PARSE_PATH: string;

package/constants.js

@@ -1 +1 @@
-import{MAPL,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 `+CTX+`=`+CTX_FN+`(`+REQ+`);`;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,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 LOCAL_DEP=`l`;export let CTX_FN=WEB+`c`;export let CTX_INIT=`let `+CTX+`=`+CTX_FN+`(`+REQ+`);`;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/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};export let route=(method,path,handler,...dat)=>[method,path,handler,dat.length===0?noType:Object.assign({type:null},...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);
+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)];

package/index.d.ts

@@ -1,7 +1,6 @@
 export { default as router } from "./core/index.js";
 export * as layer from "./core/middleware.js";
 export * as handle from "./core/handler.js";
-export { default as compile } from "./core/compile.js";
 export * as cors from "./utils/cors.js";
 export { default as headers } from "./utils/headers.js";
 export { default as secureHeaders } from "./utils/secure-headers.js";

package/index.js

@@ -1 +1 @@
-export{default as router}from"./core/index.js";export*as layer from"./core/middleware.js";export*as handle from"./core/handler.js";export{default as compile}from"./core/compile.js";export*as cors from"./utils/cors.js";export{default as headers}from"./utils/headers.js";export{default as secureHeaders}from"./utils/secure-headers.js";
+export{default as router}from"./core/index.js";export*as layer from"./core/middleware.js";export*as handle from"./core/handler.js";export*as cors from"./utils/cors.js";export{default as headers}from"./utils/headers.js";export{default as secureHeaders}from"./utils/secure-headers.js";

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.1.17",
+"version": "0.2.0-alpha.2",
 "description": "A compiled web framework for all runtimes",
 "keywords": ["fast", "lightweight", "cross-runtime", "framework", "web", "backend"],
 "repository": {
@@ -12,7 +12,7 @@
 "main": "./index.js",
 "types": "./index.d.ts",
 "dependencies": {
-"@mapl/framework": "^0.2.8",
+"@mapl/framework": "^0.3.7",
 "@mapl/router": "^0.6.2",
 "@safe-std/error": "^1.0.1"
 },
@@ -22,14 +22,17 @@
 "exports": {
 "./constants": "./constants.js",
 ".": "./index.js",
-"./core/compile": "./core/compile.js",
-"./core/middleware": "./core/middleware.js",
+"./core/utils": "./core/utils.js",
 "./core/context": "./core/context.js",
 "./core": "./core/index.js",
 "./core/handler": "./core/handler.js",
 "./utils/cors": "./utils/cors.js",
-"./core/utils": "./core/utils.js",
 "./utils/headers": "./utils/headers.js",
-"./utils/secure-headers": "./utils/secure-headers.js"
+"./utils/secure-headers": "./utils/secure-headers.js",
+"./compiler/aot": "./compiler/aot.js",
+"./compiler/jit": "./compiler/jit.js",
+"./compiler/config": "./compiler/config.js",
+"./core/middleware": "./core/middleware.js",
+"./compiler": "./compiler/index.js"
 }
 }

package/core/compile.d.ts

@@ -1,6 +0,0 @@
-import type { RouterTag } from "./index.js";
-export declare const compileToState: (router: RouterTag) => void;
-export declare const stateToString: () => string;
-export declare const stateToArgs: () => string;
-declare const _default: (router: RouterTag) => ((req: Request) => any);
-export default _default;

package/core/compile.js

@@ -1 +0,0 @@
-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;fnAsync&&(result=`await `+result);let str=typ==null?`return new Response(`+result+(contextCreated?`,c)`:`)`):contextCreated?`c.headers.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);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 compileToState=router=>{state[0]={};state[1]=[];state[2]=`let c=mwc(r);`;state[3]=compileHandler;state[4]=compileErrorHandler;compileGroup(router,[false,false,,`return mwb`,false],``,``)};export let stateToString=()=>`"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 let stateToArgs=()=>{let depsString=`me,mwc`;let deps=state[1];for(let i=0;i<deps.length;i++)depsString+=`,f`+(i+1);return depsString};export default router=>{compileToState(router);return Function(stateToArgs(),stateToString())(isErr,createContext,...state[1])};