Fix API bundler. Use new esbuild context builder for it.

src/data/app-data.ts

@@ -4,4 +4,5 @@ export const AppData = {
     BunextStaticFilesCacheExpiry: 60 * 60 * 24 * 7,
     ClientHMRPath: "__bunext_client_hmr__",
     BunextClientHydrationScriptID: "bunext-client-hydration-script",
+    BunextTmpFileExt: ".bunext_tmp.tsx",
 } as const;

src/functions/bundler/api-routes-bundler.ts

@@ -0,0 +1,44 @@
+import grabAllPages from "../../utils/grab-all-pages";
+import grabDirNames from "../../utils/grab-dir-names";
+import isDevelopment from "../../utils/is-development";
+import tailwindcss from "bun-plugin-tailwind";
+
+const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
+
+export default async function apiRoutesBundler() {
+    const api_routes = grabAllPages({ api_only: true });
+    const dev = isDevelopment();
+
+    try {
+        const build = await Bun.build({
+            entrypoints: api_routes.map((r) => r.local_path),
+            target: "bun",
+            format: "esm",
+            jsx: {
+                runtime: "automatic",
+                development: dev,
+            },
+            minify: !dev,
+            define: {
+                "process.env.NODE_ENV": JSON.stringify(
+                    dev ? "development" : "production",
+                ),
+            },
+            outdir: BUNX_CWD_MODULE_CACHE_DIR,
+            plugins: [tailwindcss],
+            naming: {
+                entry: "api/[dir]/[name].[ext]",
+                chunk: "api/[dir]/chunks/[hash].[ext]",
+            },
+            // external: [
+            //     "react",
+            //     "react-dom",
+            //     "react-dom/client",
+            //     "react/jsx-runtime",
+            // ],
+            splitting: true,
+        });
+    } catch (error) {
+        console.log(`API paths build ERROR:`, error);
+    }
+}

src/functions/bundler/api-routes-context-bundler.ts

@@ -0,0 +1,49 @@
+import * as esbuild from "esbuild";
+import grabAllPages from "../../utils/grab-all-pages";
+import grabDirNames from "../../utils/grab-dir-names";
+import isDevelopment from "../../utils/is-development";
+import tailwindEsbuildPlugin from "../server/web-pages/tailwind-esbuild-plugin";
+import apiRoutesCTXArtifactTracker from "./plugins/api-routes-ctx-artifact-tracker";
+
+const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
+
+export default async function apiRoutesContextBundler() {
+    const pages = grabAllPages({ api_only: true });
+    const dev = isDevelopment();
+
+    if (global.API_ROUTES_BUNDLER_CTX) {
+        await global.API_ROUTES_BUNDLER_CTX.dispose();
+        global.API_ROUTES_BUNDLER_CTX = undefined;
+    }
+
+    global.API_ROUTES_BUNDLER_CTX = await esbuild.context({
+        entryPoints: pages.map((p) => p.local_path),
+        outdir: BUNX_CWD_MODULE_CACHE_DIR,
+        bundle: true,
+        minify: !dev,
+        format: "esm",
+        target: "esnext",
+        platform: "node",
+        define: {
+            "process.env.NODE_ENV": JSON.stringify(
+                dev ? "development" : "production",
+            ),
+        },
+        entryNames: "api/[dir]/[hash]",
+        metafile: true,
+        plugins: [
+            tailwindEsbuildPlugin,
+            apiRoutesCTXArtifactTracker({ pages }),
+        ],
+        jsx: "automatic",
+        external: [
+            "react",
+            "react-dom",
+            "react/jsx-runtime",
+            "react/jsx-dev-runtime",
+            "bun:*",
+        ],
+    });
+
+    await global.API_ROUTES_BUNDLER_CTX.rebuild();
+}

src/functions/bundler/pages-ssr-context-bundler.ts

@@ -16,7 +16,7 @@ type Params = {
 };
 
 export default async function pagesSSRContextBundler(params?: Params) {
-    const pages = grabAllPages();
+    const pages = grabAllPages({ exclude_api: true });
     const dev = isDevelopment();
 
     if (global.SSR_BUNDLER_CTX) {
@@ -52,7 +52,7 @@ export default async function pagesSSRContextBundler(params?: Params) {
         bundle: true,
         minify: !dev,
         format: "esm",
-        target: "es2020",
+        target: "esnext",
         platform: "node",
         define: {
             "process.env.NODE_ENV": JSON.stringify(

src/functions/bundler/plugins/api-routes-ctx-artifact-tracker.ts

@@ -0,0 +1,90 @@
+import { type Plugin } from "esbuild";
+import type { BundlerCTXMap, PageFiles } from "../../../types";
+import buildOnstartErrorHandler from "../build-on-start-error-handler";
+import path from "path";
+import grabDirNames from "../../../utils/grab-dir-names";
+import { log } from "../../../utils/log";
+
+let build_start = 0;
+let build_starts = 0;
+const MAX_BUILD_STARTS = 2;
+
+const { ROOT_DIR } = grabDirNames();
+
+type Params = {
+    pages: PageFiles[];
+};
+
+export default function apiRoutesCTXArtifactTracker({ pages }: Params) {
+    const artifactTracker: Plugin = {
+        name: "ssr-artifact-tracker",
+        setup(build) {
+            build.onStart(async () => {
+                build_starts++;
+                build_start = performance.now();
+                if (build_starts == MAX_BUILD_STARTS) {
+                    await buildOnstartErrorHandler();
+                }
+            });
+
+            build.onEnd((result) => {
+                if (result.errors.length > 0) {
+                    console.log("result.errors", result.errors);
+                    return;
+                }
+
+                const artifacts: (BundlerCTXMap | undefined)[] = Object.entries(
+                    result.metafile!.outputs,
+                )
+                    .filter(([, meta]) => meta.entryPoint)
+                    .map(([outputPath, meta]) => {
+                        const entrypoint = meta.entryPoint
+                            ? path.join(ROOT_DIR, meta.entryPoint)
+                            : undefined;
+
+                        const target_page = pages.find(
+                            (p) => p.local_path == entrypoint,
+                        );
+
+                        if (!target_page || !meta.entryPoint) {
+                            return undefined;
+                        }
+
+                        const { file_name, local_path, url_path } = target_page;
+
+                        return {
+                            path: outputPath,
+                            hash: path.basename(
+                                outputPath,
+                                path.extname(outputPath),
+                            ),
+                            type: "text/javascript",
+                            entrypoint: meta.entryPoint,
+                            file_name,
+                            local_path,
+                            url_path,
+                        };
+                    });
+
+                if (artifacts?.[0] && artifacts.length > 0) {
+                    for (let i = 0; i < artifacts.length; i++) {
+                        const artifact = artifacts[i];
+                        if (
+                            artifact?.local_path &&
+                            global.API_ROUTES_BUNDLER_CTX_MAP
+                        ) {
+                            global.API_ROUTES_BUNDLER_CTX_MAP[
+                                artifact.local_path
+                            ] = artifact;
+                        }
+                    }
+                }
+
+                // const elapsed = (performance.now() - build_start).toFixed(0);
+                // log.success(`API Routes [Built] in ${elapsed}ms`);
+            });
+        },
+    };
+
+    return artifactTracker;
+}

src/functions/bundler/plugins/esbuild-ctx-artifact-tracker.ts

@@ -4,6 +4,7 @@ import { log } from "../../../utils/log";
 import grabArtifactsFromBundledResults from "../grab-artifacts-from-bundled-result";
 import pagesSSRContextBundler from "../pages-ssr-context-bundler";
 import buildOnstartErrorHandler from "../build-on-start-error-handler";
+import apiRoutesContextBundler from "../api-routes-context-bundler";
 
 let build_start = 0;
 let build_starts = 0;
@@ -69,6 +70,12 @@ export default function esbuildCTXArtifactTracker({
                 } else {
                     pagesSSRContextBundler();
                 }
+
+                if (global.API_ROUTES_BUNDLER_CTX) {
+                    global.API_ROUTES_BUNDLER_CTX.rebuild();
+                } else {
+                    apiRoutesContextBundler();
+                }
             });
         },
     };

src/functions/bunext-init.ts

@@ -33,6 +33,7 @@ declare global {
     var LAST_BUILD_TIME: number;
     var BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
     var SSR_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
+    var API_ROUTES_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
     var BUNDLER_REBUILDS: 0;
     var PAGES_SRC_WATCHER: FSWatcher | undefined;
     var CURRENT_VERSION: string | undefined;
@@ -41,6 +42,7 @@ declare global {
     var SKIPPED_BROWSER_MODULES: Set<string>;
     var BUNDLER_CTX: BuildContext | undefined;
     var SSR_BUNDLER_CTX: BuildContext | undefined;
+    var API_ROUTES_BUNDLER_CTX: BuildContext | undefined;
     var DIR_NAMES: ReturnType<typeof grabDirNames>;
     var REACT_IMPORTS_MAP: { imports: Record<string, string> };
     var REACT_DOM_SERVER: any;
@@ -57,6 +59,7 @@ export default async function bunextInit() {
     global.HMR_CONTROLLERS = [];
     global.BUNDLER_CTX_MAP = {};
     global.SSR_BUNDLER_CTX_MAP = {};
+    global.API_ROUTES_BUNDLER_CTX_MAP = {};
     global.BUNDLER_REBUILDS = 0;
     global.REBUILD_RETRIES = 0;
     global.PAGE_FILES = [];

src/functions/server/handle-routes.ts

@@ -44,15 +44,18 @@ export default async function ({ req }: Params): Promise<Response | undefined> {
         );
     }
 
-    const routeParams: BunxRouteParams = await grabRouteParams({ req });
+    const routeParams: BunxRouteParams = await grabRouteParams({
+        req,
+        query: match.query,
+    });
 
     let module: any;
     const now = Date.now();
 
-    if (global.SSR_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
+    if (is_dev && global.API_ROUTES_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
         const target_import = path.join(
             ROOT_DIR,
-            global.SSR_BUNDLER_CTX_MAP[match.filePath].path,
+            global.API_ROUTES_BUNDLER_CTX_MAP[match.filePath].path,
         );
 
         module = await import(`${target_import}?t=${now}`);
@@ -127,3 +130,35 @@ export default async function ({ req }: Params): Promise<Response | undefined> {
 
     return undefined;
 }
+
+// const relative_path = match.filePath.replace(API_DIR, "");
+// const relative_module_js_file = relative_path.replace(/\.tsx?$/, ".js");
+// const bun_module_file = path.join(
+//     BUNX_CWD_MODULE_CACHE_DIR,
+//     "api",
+//     relative_module_js_file,
+// );
+
+// if (existsSync(bun_module_file)) {
+//     module = await import(`${bun_module_file}?t=${now}`);
+// } else {
+//     const import_path = is_dev
+//         ? `${match.filePath}?t=${now}`
+//         : match.filePath;
+//     module = await import(import_path);
+// }
+
+// if (is_dev) {
+//     const tmp_path = `${match.filePath}.${now}${AppData["BunextTmpFileExt"]}`;
+//     cpSync(match.filePath, tmp_path);
+//     module = await import(`${tmp_path}?t=${now}`);
+//     try {
+//         unlinkSync(tmp_path);
+//     } catch (error) {}
+// } else {
+//     // const import_path = is_dev ? `${match.filePath}?t=${now}` : match.filePath;
+//     module = await import(match.filePath);
+// }
+
+// const import_path = is_dev ? `${match.filePath}?t=${now}` : match.filePath;
+// module = await import(import_path);

src/functions/server/watcher-esbuild-ctx.ts

@@ -5,6 +5,7 @@ import { log } from "../../utils/log";
 import allPagesESBuildContextBundler from "../bundler/all-pages-esbuild-context-bundler";
 import serverPostBuildFn from "./server-post-build-fn";
 import fullRebuild from "./full-rebuild";
+import { AppData } from "../../data/app-data";
 
 const { ROOT_DIR } = grabDirNames();
 
@@ -22,6 +23,10 @@ export default async function watcherEsbuildCTX() {
                 return;
             }
 
+            if (filename.endsWith(AppData["BunextTmpFileExt"])) {
+                return;
+            }
+
             const full_file_path = path.join(ROOT_DIR, filename);
             const does_file_exist = existsSync(full_file_path);
             const file_stat = does_file_exist

src/utils/grab-all-pages.ts

@@ -7,6 +7,7 @@ import pagePathTransform from "./page-path-transform";
 
 type Params = {
     exclude_api?: boolean;
+    api_only?: boolean;
 };
 
 export default function grabAllPages(params?: Params) {
@@ -18,6 +19,10 @@ export default function grabAllPages(params?: Params) {
         return pages.filter((p) => !Boolean(p.url_path.startsWith("/api/")));
     }
 
+    if (params?.api_only) {
+        return pages.filter((p) => Boolean(p.url_path.startsWith("/api/")));
+    }
+
     return pages;
 }
 

src/utils/grab-route-params.ts

@@ -1,12 +1,15 @@
+import _ from "lodash";
 import type { BunxRouteParams } from "../types";
 import deserializeQuery from "./deserialize-query";
 
 type Params = {
     req: Request;
+    query?: any;
 };
 
 export default async function grabRouteParams({
     req,
+    query: passed_query,
 }: Params): Promise<BunxRouteParams> {
     const url = new URL(req.url);
 
@@ -23,7 +26,7 @@ export default async function grabRouteParams({
     const routeParams: BunxRouteParams = {
         req,
         url,
-        query,
+        query: _.merge(query, passed_query),
         body,
         server: global.SERVER,
     };