@mapl/web 0.3.6 → 0.3.11

package/build/rolldown.d.ts

@@ -1,23 +1,20 @@
-import { type BuildOptions, type OutputOptions, type RolldownWatcher } from "rolldown";
-export interface MaplBuildOptions {
+import { type BuildOptions, type OutputOptions, type RolldownWatcher, type RolldownPluginOption } 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,13 +23,14 @@ export interface MaplBuildOptions {
 	* Build target
 	*/
 	target?: "bun";
+	/**
+	* Hydrate specific options
+	*/
+	hydrate?: MaplBuildOptions;
 }
-export interface MaplDevOptions extends Omit<MaplBuildOptions, "finalizeOptions"> {}
-export interface MaplAllOptions {
-	common: MaplDevOptions & MaplBuildOptions;
-	dev?: Partial<MaplDevOptions>;
-	build?: Partial<MaplBuildOptions>;
-}
-declare const _default: (opts: MaplBuildOptions) => Promise<void>;
+export declare const hydrateImportsPlugin: RolldownPluginOption;
+export declare const SERVER_ENTRY = "index.js";
+declare const _default: (options: MaplOptions) => Promise<void>;
 export default _default;
-export declare const dev: (opts: MaplDevOptions) => RolldownWatcher;
+export declare const watcherReady: (watcher: RolldownWatcher) => Promise<void>;
+export declare const dev: (options: MaplOptions) => RolldownWatcher | void;

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{resolve}from"node:path";let EXCLUDE=/^runtime-compiler(?:$|\/.+$)|^@mapl\/(?:framework$|web$)/;export default async opts=>{let output=opts.output;let inputFile=resolve(opts.input);let outputFile=resolve(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},treeshake:false,external:external==null?EXCLUDE:Array.isArray(external)?external.concat(EXCLUDE):typeof external===`function`?(id,parentId,isResolved)=>EXCLUDE.test(id)||external(id,parentId,isResolved):[external,EXCLUDE]});let appMod=(await import(tmpFile)).default;let HANDLER=(opts.target===`bun`?bun:generic)(appMod);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{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 SERVER_ENTRY=`index.js`;let mkdirSafe=dir=>{try{mkdirSync(dir,{recursive:true})}catch{}};export default async options=>{let buildOptions=options.build;let hydrateOptions=options.hydrate;let targetOption=options.target;let asyncOption=options.asynchronous;let inputFile=resolve(options.main);let tmpFile;if(buildOptions==null){tmpFile=inputFile;mkdirSafe(options.outputDir)}else{tmpFile=resolve(options.outputDir,`tmp.js`);let outputOptions=buildOptions?.output;let currentExternals=buildOptions?.external;await build({...buildOptions,input:inputFile,output:{...outputOptions,file:tmpFile},external:currentExternals==null?EXTERNALS:typeof currentExternals===`function`?(id,...args)=>EXTERNALS.includes(id)||currentExternals(id,...args):EXTERNALS.concat(currentExternals)})}let appMod=await import(tmpFile);let HANDLER=(targetOption===`bun`?bun:generic)(appMod.default);let outputFile=resolve(options.outputDir,SERVER_ENTRY);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 inputFile=resolve(opts.input);let outputFile=resolve(output.dir,`server-exports.js`);let compileResult=opts.asynchronous?`await compileToHandler(app)`:`compileToHandlerSync(app)`;try{mkdirSync(output.dir,{recursive:true})}catch{}writeFileSync(tmpFile,`
-      import app from ${JSON.stringify(inputFile)};
-      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})
+      };
+    `);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]})};let jitContent=(inputFile,options)=>{let asyncOption=options.asynchronous===true;let targetOption=options.target;return`
+    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 watch({...opts.buildOptions,input:tmpFile,output:{...output,file:outputFile,dir:void 0},treeshake:false})};
+    export default {
+      ${targetOption===`bun`?`routes`:`fetch`}: ${asyncOption?`await compileToHandler`:`compileToHandlerSync`}(app)
+    };
+  `};export let watcherReady=watcher=>new Promise((res,rej)=>{let listener=e=>{if(e.code===`ERROR`)rej(e.error);else if(e.code===`BUNDLE_END`)res();watcher.off(`event`,listener)};watcher.on(`event`,listener)});export let dev=options=>{let outputFile=resolve(options.outputDir,SERVER_ENTRY);mkdirSafe(options.outputDir);let content=jitContent(resolve(options.main),options);if(options.build!=null){let buildOptions=options.build;let outputOptions=buildOptions?.output;let tmpFile=resolve(options.outputDir,`tmp.js`);mkdirSafe(options.outputDir);writeFileSync(tmpFile,content);return watch({...buildOptions,input:tmpFile,output:{...outputOptions,file:outputFile}})}writeFileSync(outputFile,content)};

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/package.json

@@ -1,6 +1,6 @@
 {
 "name": "@mapl/web",
-"version": "0.3.6",
+"version": "0.3.11",
 "description": "A compiled web framework for all runtimes",
 "keywords": ["fast", "lightweight", "cross-runtime", "framework", "web", "backend"],
 "repository": {
@@ -14,24 +14,26 @@
 "dependencies": {
 "@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": {
-"./core/context": "./core/context.js",
 "./constants": "./constants.js",
-"./core/middleware": "./core/middleware.js",
-"./utils/cors": "./utils/cors.js",
-"./core": "./core/index.js",
 "./core/handler": "./core/handler.js",
-"./compiler/jit": "./compiler/jit.js",
-"./utils/static-headers": "./utils/static-headers.js",
-"./compiler/aot": "./compiler/aot.js",
+"./core": "./core/index.js",
 "./core/utils": "./core/utils.js",
 ".": "./index.js",
+"./core/context": "./core/context.js",
+"./core/middleware": "./core/middleware.js",
+"./build/utils": "./build/utils.js",
+"./utils/static-headers": "./utils/static-headers.js",
+"./compiler/jit": "./compiler/jit.js",
 "./build/rolldown": "./build/rolldown.js",
+"./compiler/bun/jit": "./compiler/bun/jit.js",
 "./compiler/bun/router": "./compiler/bun/router.js",
-"./compiler/bun/aot": "./compiler/bun/aot.js",
-"./compiler/bun/jit": "./compiler/bun/jit.js"
+"./utils/cors": "./utils/cors.js",
+"./compiler/aot": "./compiler/aot.js",
+"./compiler/bun/aot": "./compiler/bun/aot.js"
 }
 }