hadars 0.3.1 → 0.3.2

package/dist/cloudflare.cjs

@@ -283,7 +283,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();
@@ -292,6 +301,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;
@@ -405,6 +418,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",
@@ -848,11 +869,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);
         });
       }
@@ -889,17 +908,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;
         }
@@ -928,11 +944,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);
       });
     }
@@ -944,30 +958,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);
@@ -979,8 +988,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;
@@ -988,19 +996,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);
@@ -1025,11 +1030,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);
       });
@@ -1053,11 +1056,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);
@@ -1071,11 +1072,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("<!--/$-->");
@@ -1100,9 +1099,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);
@@ -1127,9 +1126,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 {
@@ -1245,18 +1244,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/cloudflare.js

@@ -6,8 +6,8 @@ import {
   getReactResponse,
   makePrecontentHtmlGetter,
   parseRequest
-} from "./chunk-2KJRDPCN.js";
-import "./chunk-LY5MTHFV.js";
+} from "./chunk-2J2L2H3H.js";
+import "./chunk-TV37IMRB.js";
 import "./chunk-OS3V4CPN.js";
 
 // src/cloudflare.ts

package/dist/lambda.cjs

@@ -323,7 +323,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();
@@ -332,6 +341,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;
@@ -445,6 +458,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",
@@ -888,11 +909,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);
         });
       }
@@ -929,17 +948,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;
         }
@@ -968,11 +984,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);
       });
     }
@@ -984,30 +998,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);
@@ -1019,8 +1028,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;
@@ -1028,19 +1036,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);
@@ -1065,11 +1070,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);
       });
@@ -1093,11 +1096,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);
@@ -1111,11 +1112,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("<!--/$-->");
@@ -1140,9 +1139,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);
@@ -1167,9 +1166,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 {
@@ -1285,18 +1284,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) {
@@ -1456,14 +1455,8 @@ function createLambdaHandler(options, bundled) {
   const fetchHandler = options.fetch;
   const handleProxy = createProxyHandler(options);
   const getPrecontentHtml = bundled ? makePrecontentHtmlGetter(Promise.resolve(bundled.outHtml)) : makePrecontentHtmlGetter(import_promises2.default.readFile(import_node_path.default.join(cwd, StaticPath, "out.html"), "utf-8"));
-  let ssrModulePromise = null;
-  const getSsrModule = () => {
-    if (bundled) return Promise.resolve(bundled.ssrModule);
-    if (!ssrModulePromise) {
-      ssrModulePromise = import((0, import_node_url.pathToFileURL)(import_node_path.default.resolve(cwd, HadarsFolder, SSR_FILENAME)).href);
-    }
-    return ssrModulePromise;
-  };
+  const ssrModulePromise = bundled ? Promise.resolve(bundled.ssrModule) : import((0, import_node_url.pathToFileURL)(import_node_path.default.resolve(cwd, HadarsFolder, SSR_FILENAME)).href);
+  const getSsrModule = () => ssrModulePromise;
   const runHandler = async (req) => {
     const request = parseRequest(req);
     if (fetchHandler) {

package/dist/lambda.js

@@ -6,8 +6,8 @@ import {
   getReactResponse,
   makePrecontentHtmlGetter,
   parseRequest
-} from "./chunk-2KJRDPCN.js";
-import "./chunk-LY5MTHFV.js";
+} from "./chunk-2J2L2H3H.js";
+import "./chunk-TV37IMRB.js";
 import "./chunk-OS3V4CPN.js";
 
 // src/lambda.ts
@@ -123,14 +123,8 @@ function createLambdaHandler(options, bundled) {
   const fetchHandler = options.fetch;
   const handleProxy = createProxyHandler(options);
   const getPrecontentHtml = bundled ? makePrecontentHtmlGetter(Promise.resolve(bundled.outHtml)) : makePrecontentHtmlGetter(fs.readFile(pathMod.join(cwd, StaticPath, "out.html"), "utf-8"));
-  let ssrModulePromise = null;
-  const getSsrModule = () => {
-    if (bundled) return Promise.resolve(bundled.ssrModule);
-    if (!ssrModulePromise) {
-      ssrModulePromise = import(pathToFileURL(pathMod.resolve(cwd, HadarsFolder, SSR_FILENAME)).href);
-    }
-    return ssrModulePromise;
-  };
+  const ssrModulePromise = bundled ? Promise.resolve(bundled.ssrModule) : import(pathToFileURL(pathMod.resolve(cwd, HadarsFolder, SSR_FILENAME)).href);
+  const getSsrModule = () => ssrModulePromise;
   const runHandler = async (req) => {
     const request = parseRequest(req);
     if (fetchHandler) {