hadars 0.3.1 → 0.3.2

package/README.md

@@ -2,6 +2,8 @@
 
 A minimal server-side rendering framework for React built on [rspack](https://rspack.dev). Runs on Bun, Node.js, and Deno.
 
+**[hadars.xyz](https://hadars.xyz)** — docs & website
+
 ## Why hadars?
 
 hadars is an alternative to Next.js for apps that just need SSR.

package/dist/{chunk-2KJRDPCN.js → chunk-2J2L2H3H.js}

@@ -1,7 +1,7 @@
 import {
   renderPreflight,
   renderToString
-} from "./chunk-LY5MTHFV.js";
+} from "./chunk-TV37IMRB.js";
 import {
   createElement
 } from "./chunk-OS3V4CPN.js";
@@ -230,18 +230,18 @@ var makePrecontentHtmlGetter = (htmlFilePromise) => {
   let preHead = null;
   let postHead = null;
   let postContent = null;
+  const primed = htmlFilePromise.then((html) => {
+    const headEnd = html.indexOf(HEAD_MARKER);
+    const contentStart = html.indexOf(BODY_MARKER);
+    preHead = html.slice(0, headEnd);
+    postHead = html.slice(headEnd + HEAD_MARKER.length, contentStart);
+    postContent = html.slice(contentStart + BODY_MARKER.length);
+  });
   return (headHtml) => {
     if (preHead !== null) {
       return [preHead + headHtml + postHead, postContent];
     }
-    return htmlFilePromise.then((html) => {
-      const headEnd = html.indexOf(HEAD_MARKER);
-      const contentStart = html.indexOf(BODY_MARKER);
-      preHead = html.slice(0, headEnd);
-      postHead = html.slice(headEnd + HEAD_MARKER.length, contentStart);
-      postContent = html.slice(contentStart + BODY_MARKER.length);
-      return [preHead + headHtml + postHead, postContent];
-    });
+    return primed.then(() => [preHead + headHtml + postHead, postContent]);
   };
 };
 async function transformStream(data, stream) {

package/dist/{chunk-LY5MTHFV.js → chunk-TV37IMRB.js}

@@ -115,7 +115,16 @@ function componentCalledUseId() {
 function snapshotContext() {
   const st = s();
   const ctx = st.currentTreeContext;
-  return { tree: { id: ctx.id, overflow: ctx.overflow }, localId: st.localIdCounter, treeDepth: _treeDepth };
+  const depth = _treeDepth;
+  return {
+    tree: { id: ctx.id, overflow: ctx.overflow },
+    localId: st.localIdCounter,
+    treeDepth: depth,
+    // Snapshot the live stack so that popTreeContext reads correct saved values
+    // even if another concurrent render's resetRenderState stomped the arrays.
+    idStack: _treeIdStack.slice(0, depth),
+    ovStack: _treeOvStack.slice(0, depth)
+  };
 }
 function restoreContext(snap) {
   const st = s();
@@ -124,6 +133,10 @@ function restoreContext(snap) {
   ctx.overflow = snap.tree.overflow;
   st.localIdCounter = snap.localId;
   _treeDepth = snap.treeDepth;
+  for (let i = 0; i < snap.treeDepth; i++) {
+    _treeIdStack[i] = snap.idStack[i];
+    _treeOvStack[i] = snap.ovStack[i];
+  }
 }
 function getTreeId() {
   const { id, overflow } = s().currentTreeContext;
@@ -269,6 +282,14 @@ function restoreDispatcher(prev) {
 }
 
 // src/slim-react/render.ts
+function captureRenderCtx() {
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+}
+function restoreRenderCtx(ctx) {
+  swapContextMap(ctx.m);
+  restoreUnsuspend(ctx.u);
+  restoreContext(ctx.t);
+}
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
   "base",
@@ -712,11 +733,9 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
       if (e && typeof e.then === "function") {
         if (_suspenseRetries + 1 >= MAX_COMPONENT_SUSPENSE_RETRIES) throw SUSPENSE_RETRY_LIMIT;
         patchPromiseStatus(e);
-        const m = captureMap();
-        const u = captureUnsuspend();
+        const rctx = captureRenderCtx();
         return e.then(() => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           return renderComponent(type, props, writer, isSvg, _suspenseRetries + 1);
         });
       }
@@ -753,17 +772,14 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     };
     const r2 = renderChildren(props.children, writer, isSvg);
     if (r2 && typeof r2.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return r2.then(
         () => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           finish();
         },
         (e) => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           finish();
           throw e;
         }
@@ -792,11 +808,9 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     if (e && typeof e.then === "function") {
       if (_suspenseRetries + 1 >= MAX_COMPONENT_SUSPENSE_RETRIES) throw SUSPENSE_RETRY_LIMIT;
       patchPromiseStatus(e);
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return e.then(() => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         return renderComponent(type, props, writer, isSvg, _suspenseRetries + 1);
       });
     }
@@ -808,30 +822,25 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     savedIdTree = pushTreeContext(1, 0);
   }
   if (result instanceof Promise) {
-    const m = captureMap();
-    const u = captureUnsuspend();
+    const rctx = captureRenderCtx();
     return result.then((resolved) => {
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
       let asyncSavedIdTree;
       if (componentCalledUseId()) {
         asyncSavedIdTree = pushTreeContext(1, 0);
       }
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        const m2 = captureMap();
-        const u2 = captureUnsuspend();
+        const rctx2 = captureRenderCtx();
         return r2.then(
           () => {
-            swapContextMap(m2);
-            restoreUnsuspend(u2);
+            restoreRenderCtx(rctx2);
             if (asyncSavedIdTree !== void 0) popTreeContext(asyncSavedIdTree);
             popComponentScope(savedScope);
             if (isProvider) popContextValue(ctx, prevCtxValue);
           },
           (e) => {
-            swapContextMap(m2);
-            restoreUnsuspend(u2);
+            restoreRenderCtx(rctx2);
             if (asyncSavedIdTree !== void 0) popTreeContext(asyncSavedIdTree);
             popComponentScope(savedScope);
             if (isProvider) popContextValue(ctx, prevCtxValue);
@@ -843,8 +852,7 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
       popComponentScope(savedScope);
       if (isProvider) popContextValue(ctx, prevCtxValue);
     }, (e) => {
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
       popComponentScope(savedScope);
       if (isProvider) popContextValue(ctx, prevCtxValue);
       throw e;
@@ -852,19 +860,16 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    const m = captureMap();
-    const u = captureUnsuspend();
+    const rctx = captureRenderCtx();
     return r.then(
       () => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         if (savedIdTree !== void 0) popTreeContext(savedIdTree);
         popComponentScope(savedScope);
         if (isProvider) popContextValue(ctx, prevCtxValue);
       },
       (e) => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         if (savedIdTree !== void 0) popTreeContext(savedIdTree);
         popComponentScope(savedScope);
         if (isProvider) popContextValue(ctx, prevCtxValue);
@@ -889,11 +894,9 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(child, writer, isSvg);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return r.then(() => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -917,11 +920,9 @@ async function renderSuspense(props, writer, isSvg = false) {
   try {
     const r = renderNode(children, buffer, isSvg);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
     }
     writer.write("<!--$-->");
     buffer.flushTo(writer);
@@ -935,11 +936,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       if (fallback) {
         const r = renderNode(fallback, writer, isSvg);
         if (r && typeof r.then === "function") {
-          const m = captureMap();
-          const u = captureUnsuspend();
+          const rctx = captureRenderCtx();
           await r;
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
         }
       }
       writer.write("<!--/$-->");
@@ -976,9 +975,9 @@ function renderToStream(element, options) {
       try {
         const r = renderNode(element, writer);
         if (r && typeof r.then === "function") {
-          const m = captureMap();
+          const rctx = captureRenderCtx();
           await r;
-          swapContextMap(m);
+          restoreRenderCtx(rctx);
         }
         writer.flush();
         controller.close();
@@ -1005,9 +1004,9 @@ async function renderPreflight(element, options) {
     NULL_WRITER.lastWasText = false;
     const r = renderNode(element, NULL_WRITER);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
+      restoreRenderCtx(rctx);
     }
   } finally {
     swapContextMap(prev);
@@ -1032,9 +1031,9 @@ async function renderToString(element, options) {
     resetRenderState(idPrefix);
     const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
+      restoreRenderCtx(rctx);
     }
     return output;
   } finally {

package/dist/cli.js

@@ -271,7 +271,16 @@ function componentCalledUseId() {
 function snapshotContext() {
   const st = s();
   const ctx = st.currentTreeContext;
-  return { tree: { id: ctx.id, overflow: ctx.overflow }, localId: st.localIdCounter, treeDepth: _treeDepth };
+  const depth = _treeDepth;
+  return {
+    tree: { id: ctx.id, overflow: ctx.overflow },
+    localId: st.localIdCounter,
+    treeDepth: depth,
+    // Snapshot the live stack so that popTreeContext reads correct saved values
+    // even if another concurrent render's resetRenderState stomped the arrays.
+    idStack: _treeIdStack.slice(0, depth),
+    ovStack: _treeOvStack.slice(0, depth)
+  };
 }
 function restoreContext(snap) {
   const st = s();
@@ -280,6 +289,10 @@ function restoreContext(snap) {
   ctx.overflow = snap.tree.overflow;
   st.localIdCounter = snap.localId;
   _treeDepth = snap.treeDepth;
+  for (let i = 0; i < snap.treeDepth; i++) {
+    _treeIdStack[i] = snap.idStack[i];
+    _treeOvStack[i] = snap.ovStack[i];
+  }
 }
 function getTreeId() {
   const { id, overflow } = s().currentTreeContext;
@@ -393,6 +406,14 @@ function restoreDispatcher(prev) {
 }
 
 // src/slim-react/render.ts
+function captureRenderCtx() {
+  return { m: captureMap(), u: captureUnsuspend(), t: snapshotContext() };
+}
+function restoreRenderCtx(ctx) {
+  swapContextMap(ctx.m);
+  restoreUnsuspend(ctx.u);
+  restoreContext(ctx.t);
+}
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
   "base",
@@ -836,11 +857,9 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
       if (e && typeof e.then === "function") {
         if (_suspenseRetries + 1 >= MAX_COMPONENT_SUSPENSE_RETRIES) throw SUSPENSE_RETRY_LIMIT;
         patchPromiseStatus(e);
-        const m = captureMap();
-        const u = captureUnsuspend();
+        const rctx = captureRenderCtx();
         return e.then(() => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           return renderComponent(type, props, writer, isSvg, _suspenseRetries + 1);
         });
       }
@@ -877,17 +896,14 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     };
     const r2 = renderChildren(props.children, writer, isSvg);
     if (r2 && typeof r2.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return r2.then(
         () => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           finish();
         },
         (e) => {
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
           finish();
           throw e;
         }
@@ -916,11 +932,9 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     if (e && typeof e.then === "function") {
       if (_suspenseRetries + 1 >= MAX_COMPONENT_SUSPENSE_RETRIES) throw SUSPENSE_RETRY_LIMIT;
       patchPromiseStatus(e);
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return e.then(() => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         return renderComponent(type, props, writer, isSvg, _suspenseRetries + 1);
       });
     }
@@ -932,30 +946,25 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
     savedIdTree = pushTreeContext(1, 0);
   }
   if (result instanceof Promise) {
-    const m = captureMap();
-    const u = captureUnsuspend();
+    const rctx = captureRenderCtx();
     return result.then((resolved) => {
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
       let asyncSavedIdTree;
       if (componentCalledUseId()) {
         asyncSavedIdTree = pushTreeContext(1, 0);
       }
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        const m2 = captureMap();
-        const u2 = captureUnsuspend();
+        const rctx2 = captureRenderCtx();
         return r2.then(
           () => {
-            swapContextMap(m2);
-            restoreUnsuspend(u2);
+            restoreRenderCtx(rctx2);
             if (asyncSavedIdTree !== void 0) popTreeContext(asyncSavedIdTree);
             popComponentScope(savedScope);
             if (isProvider) popContextValue(ctx, prevCtxValue);
           },
           (e) => {
-            swapContextMap(m2);
-            restoreUnsuspend(u2);
+            restoreRenderCtx(rctx2);
             if (asyncSavedIdTree !== void 0) popTreeContext(asyncSavedIdTree);
             popComponentScope(savedScope);
             if (isProvider) popContextValue(ctx, prevCtxValue);
@@ -967,8 +976,7 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
       popComponentScope(savedScope);
       if (isProvider) popContextValue(ctx, prevCtxValue);
     }, (e) => {
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
       popComponentScope(savedScope);
       if (isProvider) popContextValue(ctx, prevCtxValue);
       throw e;
@@ -976,19 +984,16 @@ function renderComponent(type, props, writer, isSvg, _suspenseRetries = 0) {
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    const m = captureMap();
-    const u = captureUnsuspend();
+    const rctx = captureRenderCtx();
     return r.then(
       () => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         if (savedIdTree !== void 0) popTreeContext(savedIdTree);
         popComponentScope(savedScope);
         if (isProvider) popContextValue(ctx, prevCtxValue);
       },
       (e) => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         if (savedIdTree !== void 0) popTreeContext(savedIdTree);
         popComponentScope(savedScope);
         if (isProvider) popContextValue(ctx, prevCtxValue);
@@ -1013,11 +1018,9 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(child, writer, isSvg);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       return r.then(() => {
-        swapContextMap(m);
-        restoreUnsuspend(u);
+        restoreRenderCtx(rctx);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -1041,11 +1044,9 @@ async function renderSuspense(props, writer, isSvg = false) {
   try {
     const r = renderNode(children, buffer, isSvg);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
-      const u = captureUnsuspend();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
-      restoreUnsuspend(u);
+      restoreRenderCtx(rctx);
     }
     writer.write("<!--$-->");
     buffer.flushTo(writer);
@@ -1059,11 +1060,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       if (fallback) {
         const r = renderNode(fallback, writer, isSvg);
         if (r && typeof r.then === "function") {
-          const m = captureMap();
-          const u = captureUnsuspend();
+          const rctx = captureRenderCtx();
           await r;
-          swapContextMap(m);
-          restoreUnsuspend(u);
+          restoreRenderCtx(rctx);
         }
       }
       writer.write("<!--/$-->");
@@ -1088,9 +1087,9 @@ async function renderPreflight(element, options) {
     NULL_WRITER.lastWasText = false;
     const r = renderNode(element, NULL_WRITER);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
+      restoreRenderCtx(rctx);
     }
   } finally {
     swapContextMap(prev);
@@ -1115,9 +1114,9 @@ async function renderToString(element, options) {
     resetRenderState(idPrefix);
     const r = renderNode(element, writer);
     if (r && typeof r.then === "function") {
-      const m = captureMap();
+      const rctx = captureRenderCtx();
       await r;
-      swapContextMap(m);
+      restoreRenderCtx(rctx);
     }
     return output;
   } finally {
@@ -1484,6 +1483,12 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
     // changed files, making repeat dev starts significantly faster.
     cache: true,
     externals,
+    // externalsPresets.node externalises ALL Node.js built-ins (bare names
+    // and the node: prefix) for both static and dynamic imports.  This
+    // complements the explicit `externals` array: the preset handles the
+    // node: URI scheme that rspack cannot resolve as a file, while the
+    // array keeps '@emotion/server' as an explicit external.
+    ...isServerBuild ? { externalsPresets: { node: true } } : {},
     ...optimization !== void 0 ? { optimization } : {},
     plugins: [
       !isServerBuild && new rspack.HtmlRspackPlugin({
@@ -1536,7 +1541,7 @@ var buildCompilerConfig = (entry, opts, includeHotPlugin) => {
     // SSR watcher writing .hadars/index.ssr.js triggers the client compiler
     // and vice versa, causing an infinite rebuild loop.
     watchOptions: {
-      ignored: ["**/node_modules/**", "**/.hadars/**"]
+      ignored: ["**/node_modules/**", "**/.hadars/**", "/tmp/**"]
     }
   };
 };
@@ -1548,7 +1553,7 @@ var compileEntry = async (entry, opts) => {
   if (opts.watch) {
     await new Promise((resolve2, reject) => {
       let first = true;
-      compiler.watch({ ignored: ["**/node_modules/**", "**/.hadars/**"] }, (err, stats) => {
+      compiler.watch({ ignored: ["**/node_modules/**", "**/.hadars/**", "/tmp/**"] }, (err, stats) => {
         if (err) {
           if (first) {
             first = false;
@@ -1581,10 +1586,7 @@ var compileEntry = async (entry, opts) => {
       }
       console.log(stats?.toString({
         colors: true,
-        modules: true,
-        children: true,
-        chunks: true,
-        chunkModules: true
+        preset: "minimal"
       }));
       resolve2(stats);
     });
@@ -1786,18 +1788,18 @@ var makePrecontentHtmlGetter = (htmlFilePromise) => {
   let preHead = null;
   let postHead = null;
   let postContent = null;
+  const primed = htmlFilePromise.then((html) => {
+    const headEnd = html.indexOf(HEAD_MARKER);
+    const contentStart = html.indexOf(BODY_MARKER);
+    preHead = html.slice(0, headEnd);
+    postHead = html.slice(headEnd + HEAD_MARKER.length, contentStart);
+    postContent = html.slice(contentStart + BODY_MARKER.length);
+  });
   return (headHtml) => {
     if (preHead !== null) {
       return [preHead + headHtml + postHead, postContent];
     }
-    return htmlFilePromise.then((html) => {
-      const headEnd = html.indexOf(HEAD_MARKER);
-      const contentStart = html.indexOf(BODY_MARKER);
-      preHead = html.slice(0, headEnd);
-      postHead = html.slice(headEnd + HEAD_MARKER.length, contentStart);
-      postContent = html.slice(contentStart + BODY_MARKER.length);
-      return [preHead + headHtml + postHead, postContent];
-    });
+    return primed.then(() => [preHead + headHtml + postHead, postContent]);
   };
 };
 async function transformStream(data, stream) {
@@ -2833,6 +2835,10 @@ var run = async (options) => {
   const getPrecontentHtml = makePrecontentHtmlGetter(
     fs.readFile(pathMod2.join(__dirname2, StaticPath, "out.html"), "utf-8")
   );
+  const componentPath = pathToFileURL(
+    pathMod2.resolve(__dirname2, HadarsFolder, SSR_FILENAME)
+  ).href;
+  const ssrModulePromise = import(componentPath);
   const runHandler = async (req, ctx) => {
     const request = parseRequest(req);
     if (handler) {
@@ -2856,15 +2862,12 @@ var run = async (options) => {
       );
       if (routeRes) return routeRes;
     }
-    const componentPath = pathToFileURL(
-      pathMod2.resolve(__dirname2, HadarsFolder, SSR_FILENAME)
-    ).href;
     try {
       const {
         default: Component,
         getInitProps,
         getFinalProps
-      } = await import(componentPath);
+      } = await ssrModulePromise;
       if (renderPool && request.headers.get("Accept") !== "application/json") {
         const serialReq = await serializeRequest(request);
         const { html, headHtml: wHead, status: wStatus } = await renderPool.renderFull(serialReq);