@webjsdev/server 0.8.78 → 0.8.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webjsdev/server",
-  "version": "0.8.78",
+  "version": "0.8.79",
   "type": "module",
   "description": "The server for WebJs, a full-stack JavaScript framework built on web components with server-side rendering and no build step. Provides the file-based router, SSR, server actions, route handlers, middleware, and live reload on Node 24+ or Bun.",
   "main": "index.js",

package/src/actions.js

@@ -1,5 +1,4 @@
 import { digestHex } from './crypto-utils.js';
-import { pathToFileURL } from 'node:url';
 import { readFile } from 'node:fs/promises';
 import { join, sep } from 'node:path';
 import { walk } from './fs-walk.js';
@@ -21,6 +20,7 @@ import { getBodyLimits } from './context.js';
 import { basePath } from './importmap.js';
 import { withBasePath } from './base-path.js';
 import { FORM_ACTION_ID_KEY } from '@webjsdev/core';
+import { devImportSpecifier } from './dev-import.js';
 
 /**
  * The JSON / RPC body cap in effect for the current request: the per-request
@@ -638,7 +638,5 @@ async function actionErrorResponse(err, dev) {
  * @param {boolean} dev
  */
 async function loadModule(file, dev) {
-  const url = pathToFileURL(file).toString();
-  const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-  return import(url + bust);
+  return import(devImportSpecifier(file, dev));
 }

package/src/api.js

@@ -1,5 +1,5 @@
-import { pathToFileURL } from 'node:url';
 import { makeThenable } from './thenable-params.js';
+import { devImportSpecifier } from './dev-import.js';
 
 /**
  * Dispatch an incoming request to a matched API route.
@@ -14,9 +14,7 @@ import { makeThenable } from './thenable-params.js';
  * @returns {Promise<Response>}
  */
 export async function handleApi(route, params, webRequest, dev) {
-  const url = pathToFileURL(route.file).toString();
-  const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-  const mod = await import(url + bust);
+  const mod = await import(devImportSpecifier(route.file, dev));
   const method = webRequest.method.toUpperCase();
   const handler = mod[method];
   if (!handler) {

package/src/dev/handler.js

@@ -2,7 +2,6 @@ import { readFile } from 'node:fs/promises';
 import { existsSync, readFileSync, realpathSync } from 'node:fs';
 import { createHash } from 'node:crypto';
 import { join, resolve, sep } from 'node:path';
-import { pathToFileURL } from 'node:url';
 
 // Server-side `.ts` imports are handled natively by Node 24+'s default
 // type-stripping (`process.features.typescript === 'strip'`) or by Bun. The
@@ -73,6 +72,7 @@ import {
 import {
   handleCore, loadMiddleware, tryServeFrameworkStatic, tryServePublicAsset,
 } from './serve.js';
+import { devImportSpecifier } from '../dev-import.js';
 
 /**
  * A short content digest of a single file's bytes for the app-source deploy
@@ -858,9 +858,7 @@ export async function createRequestHandler(opts) {
     }
     if (!file) { readinessFn = null; return null; }
     try {
-      const url = pathToFileURL(file).toString();
-      const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-      const mod = await import(url + bust);
+      const mod = await import(devImportSpecifier(file, dev));
       readinessFn = typeof mod.default === 'function' ? mod.default : null;
     } catch (e) {
       logger.error?.(`[webjs] failed to load readiness.{js,ts}`, { err: String(e) });

package/src/dev/serve.js

@@ -9,7 +9,6 @@
  */
 import { stat, readFile } from 'node:fs/promises';
 import { join, extname, resolve, relative, sep } from 'node:path';
-import { pathToFileURL } from 'node:url';
 
 import { matchPage, matchApi } from '../router.js';
 import { ssrPage, ssrNotFound } from '../ssr.js';
@@ -35,6 +34,7 @@ import { versionModuleImports, withAssetHash } from '../asset-hash.js';
 import { toUrlPath } from '../ssr/preloads.js';
 import { BUFFERED_MARKER } from '../conditional-get.js';
 import { MIME, TS_CACHE_MAX, exists, reloadClientJs, reloadWorkerJs } from './helpers.js';
+import { devImportSpecifier } from '../dev-import.js';
 
 /**
  * Serve framework-internal static assets that depend on NEITHER the whole-app
@@ -363,7 +363,7 @@ export async function handleCore(req, ctx) {
     const meta = state.routeTable.metadataRoutes.find((r) => r.urlPath === path);
     if (meta) {
       try {
-        const mod = await import(pathToFileURL(meta.file).toString() + (dev ? `?t=${Date.now()}` : ''));
+        const mod = await import(devImportSpecifier(meta.file, dev));
         if (mod.default) {
           const result = await mod.default();
           // If the function returns a Response, use it directly.
@@ -582,9 +582,7 @@ export async function runWithSegmentMiddleware(req, files, terminal, dev) {
   const handlers = [];
   for (const f of files) {
     try {
-      const url = pathToFileURL(f).toString();
-      const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-      const mod = await import(url + bust);
+      const mod = await import(devImportSpecifier(f, dev));
       if (typeof mod.default === 'function') handlers.push(mod.default);
     } catch {
       // Bad middleware file: skip; top-level error handler will catch real problems.
@@ -627,10 +625,8 @@ export async function loadMiddleware(appDir, dev, logger) {
     if (await exists(candidate)) { file = candidate; break; }
   }
   if (!file) return null;
-  const url = pathToFileURL(file).toString();
-  const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
   try {
-    const mod = await import(url + bust);
+    const mod = await import(devImportSpecifier(file, dev));
     return typeof mod.default === 'function' ? mod.default : null;
   } catch (e) {
     logger.error('failed to load root middleware', { file, err: String(e) });

package/src/dev-import.js

@@ -0,0 +1,34 @@
+/**
+ * The import specifier for a module the dev server re-imports on every request
+ * (#1550): a page, layout, route handler, action module, middleware, and so on.
+ *
+ * In dev the specifier carries a fresh `?t=` query, so each request gets a new
+ * module instance and a just-edited top-level file is served without waiting
+ * for a restart. Node keys its ESM cache by the full file URL, query included.
+ * Bun keys its cache by path and DROPS the query of a `file://` specifier, so
+ * the same URL-plus-query is a silent no-op there: on Bun the query must ride a
+ * plain absolute path, which Bun loads fresh (and hands to a `Bun.plugin`
+ * `onLoad` with the query intact).
+ *
+ * A path that already contains `?` or `#` cannot carry a query unambiguously as
+ * a plain path, so on Bun it falls back to the file URL (no fresh import; the
+ * dev supervisor's restart still picks the edit up).
+ *
+ * Outside dev the specifier is the plain file URL, exactly as before.
+ */
+import { pathToFileURL } from 'node:url';
+
+/**
+ * @param {string} file absolute file path
+ * @param {boolean} dev whether to cache-bust
+ * @param {{ bun?: boolean, now?: () => number }} [opts] test seams: the runtime (default: detected) and the clock
+ * @returns {string}
+ */
+export function devImportSpecifier(file, dev, opts = {}) {
+  const url = pathToFileURL(file).toString();
+  if (!dev) return url;
+  const bun = opts.bun ?? Boolean(typeof process !== 'undefined' && process.versions && process.versions.bun);
+  const bust = `?t=${(opts.now ?? Date.now)()}-${Math.random().toString(36).slice(2)}`;
+  if (bun && !/[?#]/.test(file)) return file + bust;
+  return url + bust;
+}

package/src/env-schema.js

@@ -32,8 +32,8 @@
  * the Node-version preflight).
  */
 import { join } from 'node:path';
-import { pathToFileURL } from 'node:url';
 import { stat } from 'node:fs/promises';
+import { devImportSpecifier } from './dev-import.js';
 
 /** Field type names a schema may declare. */
 const KNOWN_TYPES = new Set(['string', 'number', 'boolean', 'url', 'enum']);
@@ -223,9 +223,7 @@ export async function loadEnvSchema(appDir, opts = {}) {
     }
   }
   if (!file) return null;
-  const url = pathToFileURL(file).toString();
-  const bust = opts.dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-  const mod = await import(url + bust);
+  const mod = await import(devImportSpecifier(file, Boolean(opts.dev)));
   return mod.default ?? null;
 }
 

package/src/form-action-identity.js

@@ -16,6 +16,7 @@
 
 import { actionIdentitiesOf, identityHookInstalled } from './action-seed.js';
 import { pathToFileURL } from 'node:url';
+import { devImportSpecifier } from './dev-import.js';
 
 /**
  * Resolved identities for functions the hook never registered. Only ever
@@ -282,7 +283,7 @@ export async function lookupActionIdentity(idx, id) {
   if (!file) return { ok: false, reason: 'skew' };
   let module;
   try {
-    module = await import(pathToFileURL(file).toString() + (idx.dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : ''));
+    module = await import(devImportSpecifier(file, Boolean(idx.dev)));
   } catch (error) {
     return { ok: false, reason: 'load-failed', error };
   }

package/src/instrumentation.js

@@ -16,9 +16,9 @@
  */
 
 import { join } from 'node:path';
-import { pathToFileURL } from 'node:url';
 import { stat } from 'node:fs/promises';
 import { AsyncLocalStorage } from 'node:async_hooks';
+import { devImportSpecifier } from './dev-import.js';
 
 /**
  * Per-boot handoff channel for a `register()`-registered error sink. An
@@ -86,9 +86,7 @@ export async function runInstrumentation(appDir, opts = {}) {
   const store = { onError: null };
   await _als.run(store, async () => {
     try {
-      const url = pathToFileURL(file).toString();
-      const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-      const mod = await import(url + bust);
+      const mod = await import(devImportSpecifier(file, dev));
       const register = typeof mod.default === 'function'
         ? mod.default
         : (typeof mod.register === 'function' ? mod.register : null);

package/src/listener-core.js

@@ -15,7 +15,6 @@
  * supplies its own client wrapper to `SseHub`, its own socket-to-`Request` bridge,
  * and its own `closeServer` thunk, and reuses everything else verbatim.
  */
-import { pathToFileURL } from 'node:url';
 import {
   createBrotliCompress, createGzip, createDeflate,
   brotliCompressSync, gzipSync, deflateSync,
@@ -24,6 +23,7 @@ import {
 import { stripBasePath } from './base-path.js';
 import { randomUUID } from 'node:crypto';
 import { isWatchError } from './dev/watch-tree.js';
+import { devImportSpecifier } from './dev-import.js';
 
 /** The dev live-reload SSE path (matched after base-path stripping). */
 export const EVENTS_PATH = '/__webjs/events';
@@ -329,9 +329,7 @@ export async function readBufferedOrStream(web, maxBytes) {
  * @param {boolean} dev
  */
 export function loadWsModule(file, dev) {
-  const url = pathToFileURL(file).toString();
-  const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-  return import(url + bust);
+  return import(devImportSpecifier(file, dev));
 }
 
 /**

package/src/ssr/render.js

@@ -1,4 +1,3 @@
-import { pathToFileURL } from 'node:url';
 import { resolve } from 'node:path';
 import { renderToString, isNotFound, isRedirect, isForbidden, isUnauthorized } from '@webjsdev/core';
 import { vendorPreloadTargets } from '../importmap.js';
@@ -18,6 +17,7 @@ import { escapeHtml } from './escape.js';
 import {
   cachedHtmlResponse, getNonce, htmlResponse, streamingHtmlResponse,
 } from './responses.js';
+import { devImportSpecifier } from '../dev-import.js';
 
 
 /**
@@ -107,9 +107,7 @@ export function privateFragment(res) {
  * @param {boolean} dev
  */
 async function loadModule(file, dev) {
-  const url = pathToFileURL(file).toString();
-  const bust = dev ? `?t=${Date.now()}-${Math.random().toString(36).slice(2)}` : '';
-  return import(url + bust);
+  return import(devImportSpecifier(file, dev));
 }
 
 /**