@mapl/web 0.3.5 → 0.3.8

package/build/rolldown.d.ts

@@ -1,23 +1,20 @@
-import { type BuildOptions, type OutputOptions, type RolldownWatcher, type WatcherOptions } from "rolldown";
-export interface MaplBuildOptions {
+import { type BuildOptions, type OutputOptions, type RolldownWatcher, type RolldownPluginOption, type ExternalOption } from "rolldown";
+export interface MaplBuildOptions extends Omit<BuildOptions, "input" | "output"> {
+	output?: Omit<OutputOptions, "file" | "dir">;
+}
+export interface MaplOptions {
 	/**
 	* App entry point
 	*/
-	input: string;
-	/**
-	* Output options
-	*/
-	output: Omit<OutputOptions, "file"> & {
-		dir: string
-	};
+	main: string;
 	/**
-	* App build options
+	* Output directory
 	*/
-	buildOptions?: Omit<BuildOptions, "input" | "output">;
+	outputDir: string;
 	/**
-	* App finalize options
+	* Build options
 	*/
-	finalizeOptions?: Omit<BuildOptions, "input" | "output">;
+	build?: MaplBuildOptions;
 	/**
 	* Whether to emit asynchronous output
 	*/
@@ -26,18 +23,13 @@ export interface MaplBuildOptions {
 	* Build target
 	*/
 	target?: "bun";
-}
-export interface MaplDevOptions extends Omit<MaplBuildOptions, "finalizeOptions"> {
 	/**
-	* File watcher option
+	* Hydrate specific options
 	*/
-	watcherOptions?: WatcherOptions;
-}
-export interface MaplAllOptions {
-	common: MaplDevOptions & MaplBuildOptions;
-	dev?: Partial<MaplDevOptions>;
-	build?: Partial<MaplBuildOptions>;
+	hydrate?: MaplBuildOptions;
 }
-declare const _default: (opts: MaplBuildOptions) => Promise<void>;
+export declare const hydrateImportsPlugin: RolldownPluginOption;
+export declare const loadExternals: (currentExternals: ExternalOption | undefined) => ExternalOption;
+declare const _default: (options: MaplOptions) => Promise<void>;
 export default _default;
-export declare const dev: (opts: MaplDevOptions) => RolldownWatcher;
+export declare const dev: (options: MaplOptions) => RolldownWatcher;

package/build/rolldown.js

@@ -1,18 +1,20 @@
-import{mkdirSync,writeFileSync}from"node:fs";import{build,watch}from"rolldown";import{compileToExportedDependency as generic}from"../compiler/jit.js";import{compileToExportedDependency as bun}from"../compiler/bun/jit.js";import{evaluateToString}from"runtime-compiler/jit";import{clear}from"runtime-compiler";import{join,resolve}from"node:path";export default async opts=>{let output=opts.output;let inputFile=resolve(opts.input);let outputFile=join(output.dir,`server-exports.js`);let tmpFile=resolve(output.dir,`tmp.js`);let external=opts.buildOptions?.external;await build({...opts.buildOptions,input:inputFile,output:{file:tmpFile},external:external==null?`runtime-compiler/config`:Array.isArray(external)?external.concat(`runtime-compiler/config`):typeof external===`function`?(id,parentId,isResolved)=>id===`runtime-compiler/config`||external(id,parentId,isResolved):[external,`runtime-compiler/config`]});let appMod=await import(tmpFile);let HANDLER=(opts.target===`bun`?bun:generic)(appMod.default);try{mkdirSync(output.dir,{recursive:true})}catch{}writeFileSync(outputFile,`
-      import 'runtime-compiler/hydrate-loader';
-
+import{mkdirSync,writeFileSync}from"node:fs";import{build,watch}from"rolldown";import{compileToExportedDependency as generic}from"../compiler/jit.js";import{compileToExportedDependency as bun}from"../compiler/bun/jit.js";import{evaluateToString}from"runtime-compiler/jit";import{clear}from"runtime-compiler";import{resolve}from"node:path";import{EXTERNALS}from"./utils.js";export let hydrateImportsPlugin={name:`mapl-web-hydrate-config-replacer`,resolveId(source){return this.resolve(source===`runtime-compiler/config`?`runtime-compiler/hydrate-config`:source)}};export let loadExternals=currentExternals=>currentExternals==null?EXTERNALS:typeof currentExternals===`function`?(id,...args)=>EXTERNALS.includes(id)||currentExternals(id,...args):EXTERNALS.concat(currentExternals);export default async options=>{let buildOptions=options.build;let hydrateOptions=options.hydrate;let targetOption=options.target;let asyncOption=options.asynchronous;let outputOptions=buildOptions?.output;let inputFile=resolve(options.main);let outputFile=resolve(options.outputDir,`server-exports.js`);let tmpFile=resolve(options.outputDir,`tmp.js`);await build({...buildOptions,input:inputFile,output:{...outputOptions,file:tmpFile},treeshake:false,external:loadExternals(buildOptions?.external)});let appMod=await import(tmpFile);let HANDLER=(targetOption===`bun`?bun:generic)(appMod.default);writeFileSync(outputFile,`
       import app from ${JSON.stringify(tmpFile)};
-      import hydrateRouter from '@mapl/web/compiler/${opts.target===`bun`?`bun/`:``}aot';
+      import hydrateRouter from '@mapl/web/compiler/${targetOption===`bun`?`bun/`:``}aot';
       hydrateRouter(app);
 
       import { hydrate } from 'runtime-compiler/hydrate';
       import { getDependency } from 'runtime-compiler';
 
-      ${opts.asynchronous?`await(async`:`(`}${evaluateToString()})(...hydrate());
-      ${opts.target===`bun`?`export default { routes: getDependency(${HANDLER}) };`:`export default { fetch: getDependency(${HANDLER}) };`}
-    `);clear();await build({...opts.finalizeOptions??opts.buildOptions,input:outputFile,output:{...output,file:outputFile,dir:void 0}})};export let dev=opts=>{let output=opts.output;let tmpFile=resolve(output.dir,`tmp.js`);let watcher=watch({...opts.buildOptions,input:resolve(opts.input),output:{...output,file:tmpFile,dir:void 0},watch:opts.watcherOptions});let compileResult=opts.asynchronous?`await compileToHandler(app)`:`compileToHandlerSync(app)`;try{mkdirSync(output.dir,{recursive:true})}catch{}writeFileSync(join(output.dir,`server-exports.js`),`
-      import app from ${JSON.stringify(tmpFile)};
-      import { compileToHandler${opts.asynchronous?``:`Sync`} } from '@mapl/web/compiler/${opts.target===`bun`?`bun/`:``}jit';
+      ${asyncOption?`await(async`:`(`}${evaluateToString()})(...hydrate());
+      export default {
+        ${targetOption===`bun`?`routes`:`fetch`}: getDependency(${HANDLER})
+      };
+    `);clear();let currentPlugins=hydrateOptions?.plugins;await build({...hydrateOptions,input:outputFile,output:{...hydrateOptions?.output,file:outputFile},plugins:!currentPlugins?hydrateImportsPlugin:Array.isArray(currentPlugins)?[hydrateImportsPlugin].concat(currentPlugins):[hydrateImportsPlugin,currentPlugins]})};export let dev=options=>{let buildOptions=options.build;let targetOption=options.target;let asyncOption=options.asynchronous;let outputOptions=buildOptions?.output;let inputFile=resolve(options.main);let outputFile=resolve(options.outputDir,`server-exports.js`);let tmpFile=resolve(options.outputDir,`tmp.js`);try{mkdirSync(options.outputDir,{recursive:true})}catch{}writeFileSync(tmpFile,`
+      import app from ${JSON.stringify(inputFile)};
+      import { ${asyncOption?`compileToHandler`:`compileToHandlerSync`} } from '@mapl/web/compiler/${targetOption===`bun`?`bun/`:``}jit';
 
-      ${opts.target===`bun`?`export default { routes: ${compileResult} };`:`export default { fetch: ${compileResult} };`}
-    `);return watcher};
+      export default {
+        ${targetOption===`bun`?`routes`:`fetch`}: ${asyncOption?`await compileToHandler`:`compileToHandlerSync`}(app)
+      };
+    `);return watch({input:tmpFile,output:{...outputOptions,file:outputFile},treeshake:false,external:loadExternals(buildOptions?.external)})};

package/build/utils.d.ts

@@ -0,0 +1 @@
+export declare const EXTERNALS: string[];

package/build/utils.js

@@ -0,0 +1 @@
+export let EXTERNALS=[`runtime-compiler`,`runtime-compiler/config`,`@mapl/framework`,`@mapl/web`];

package/compiler/aot.js

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

package/compiler/bun/jit.js

@@ -1 +1 @@
-import{compileGroup,AsyncFunction,contextInit,setContextInit,setCompileErrorHandlerHook,setCompileHandlerHook}from"@mapl/framework";import{countParams}from"@mapl/router/path";import{exportDependency,getDependency,injectDependency,injectExternalDependency}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";import{compileErrorHandler,compileReturn,paramArgs,RES400}from"../jit.js";import{insertRoute,resetRouter,routerToString}from"./router.js";let compileToState=router=>{resetRouter();setCompileHandlerHook((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]){insertRoute(handler[0],path,prevContent+contextInit+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],true,call+`)`)+(scope[0]?`})()`:``));return}}insertRoute(handler[0],path,prevContent+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)+(scope[0]?`})()`:``))});setCompileErrorHandlerHook(compileErrorHandler);setContextInit(`let h=[],c={status:200,req:r,headers:h,server:s};`);compileGroup(router,[false,false,,`return `+RES400,false],``,``)};export let compileToString=router=>{compileToState(router);return routerToString()};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)};
+import{compileGroup,AsyncFunction,contextInit,setContextInit,hooks}from"@mapl/framework";import{countParams}from"@mapl/router/path";import{exportDependency,getDependency,injectDependency,injectExternalDependency}from"runtime-compiler";import{evaluate,evaluateSync}from"runtime-compiler/jit";import{compileErrorHandler,compileReturn,paramArgs,RES400}from"../jit.js";import{insertRoute,resetRouter,routerToString}from"./router.js";let compileToState=router=>{resetRouter();hooks.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]){insertRoute(handler[0],path,prevContent+contextInit+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],true,call+`)`)+(scope[0]?`})()`:``));return}}insertRoute(handler[0],path,prevContent+compileReturn(handler[3],fn instanceof AsyncFunction,scope[0],scope[1],call+`)`)+(scope[0]?`})()`:``))};hooks.compileErrorHandler=compileErrorHandler;setContextInit(`let h=[],c={status:200,req:r,headers:h,server:s};`);compileGroup(router,[false,false,,`return `+RES400,false],``,``)};export let compileToString=router=>{compileToState(router);return routerToString()};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/compiler/jit.js

@@ -1 +1 @@
-import{compileGroup,createArgSet,AsyncFunction,contextInit,setContextInit,setCompileErrorHandlerHook,setCompileHandlerHook}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})`);export let paramArgs=createArgSet(new Array(16).fill(0).map((_1,i)=>`q`+i));export 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};export let 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+`)`)};let compileToState=router=>{URL_ROUTER={};setCompileHandlerHook((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]?`})()`:``))});setCompileErrorHandlerHook(compileErrorHandler);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)};
+import{compileGroup,createArgSet,AsyncFunction,contextInit,setContextInit,hooks}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})`);export let paramArgs=createArgSet(new Array(16).fill(0).map((_1,i)=>`q`+i));export 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};export let 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+`)`)};let compileToState=router=>{URL_ROUTER={};hooks.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]?`})()`:``))};hooks.compileErrorHandler=compileErrorHandler;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/index.d.ts

@@ -3,4 +3,3 @@ export * as layer from "./core/middleware.js";
 export * as handle from "./core/handler.js";
 export * as cors from "./utils/cors.js";
 export { default as staticHeaders } from "./utils/static-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*as cors from"./utils/cors.js";export{default as staticHeaders}from"./utils/static-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 staticHeaders}from"./utils/static-headers.js";

package/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.3.5",
+"version": "0.3.8",
 "description": "A compiled web framework for all runtimes",
 "keywords": ["fast", "lightweight", "cross-runtime", "framework", "web", "backend"],
 "repository": {
@@ -12,27 +12,28 @@
 "main": "./index.js",
 "types": "./index.d.ts",
 "dependencies": {
-"@mapl/framework": "^0.5.2",
+"@mapl/framework": "^0.5.3",
 "@mapl/router": "^0.6.2",
+"@rollup/plugin-terser": "^0.4.4",
 "@safe-std/error": "^1.0.1",
-"runtime-compiler": "^1.2.5"
+"runtime-compiler": "^1.2.6"
 },
 "exports": {
 "./constants": "./constants.js",
 "./core/middleware": "./core/middleware.js",
-"./core/handler": "./core/handler.js",
 ".": "./index.js",
 "./core": "./core/index.js",
-"./core/utils": "./core/utils.js",
-"./utils/cors": "./utils/cors.js",
-"./utils/secure-headers": "./utils/secure-headers.js",
 "./core/context": "./core/context.js",
-"./compiler/aot": "./compiler/aot.js",
-"./compiler/bun/router": "./compiler/bun/router.js",
+"./core/handler": "./core/handler.js",
+"./utils/cors": "./utils/cors.js",
+"./utils/static-headers": "./utils/static-headers.js",
+"./core/utils": "./core/utils.js",
+"./build/utils": "./build/utils.js",
+"./compiler/jit": "./compiler/jit.js",
 "./compiler/bun/jit": "./compiler/bun/jit.js",
+"./compiler/bun/router": "./compiler/bun/router.js",
 "./compiler/bun/aot": "./compiler/bun/aot.js",
-"./utils/static-headers": "./utils/static-headers.js",
-"./build/rolldown": "./build/rolldown.js",
-"./compiler/jit": "./compiler/jit.js"
+"./compiler/aot": "./compiler/aot.js",
+"./build/rolldown": "./build/rolldown.js"
 }
 }

package/utils/secure-headers.d.ts

@@ -1,4 +0,0 @@
-import { type Options } from "secure-headers";
-import type { MiddlewareTypes } from "../core/middleware.js";
-declare const _default: (headers: Options) => MiddlewareTypes<never, {}>;
-export default _default;

package/utils/secure-headers.js

@@ -1 +0,0 @@
-import secureHeaders from"secure-headers";import staticHeaders from"./static-headers.js";export default headers=>staticHeaders(secureHeaders(headers));