hadars 0.1.23 → 0.1.25

package/dist/slim-react/index.js

@@ -9,6 +9,35 @@ import {
 } from "../chunk-OS3V4CPN.js";
 
 // src/slim-react/renderContext.ts
+var MAP_KEY = "__slimReactContextMap";
+var _g = globalThis;
+if (!("__slimReactContextMap" in _g))
+  _g[MAP_KEY] = null;
+function swapContextMap(map) {
+  const prev = _g[MAP_KEY];
+  _g[MAP_KEY] = map;
+  return prev;
+}
+function captureMap() {
+  return _g[MAP_KEY];
+}
+function getContextValue(context) {
+  const map = _g[MAP_KEY];
+  if (map && map.has(context))
+    return map.get(context);
+  const c = context;
+  return "_defaultValue" in c ? c._defaultValue : c._currentValue;
+}
+function pushContextValue(context, value) {
+  const map = _g[MAP_KEY];
+  const c = context;
+  const prev = map && map.has(context) ? map.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
+  map?.set(context, value);
+  return prev;
+}
+function popContextValue(context, prev) {
+  _g[MAP_KEY]?.set(context, prev);
+}
 var GLOBAL_KEY = "__slimReactRenderState";
 var EMPTY = { id: 0, overflow: "", bits: 0 };
 function s() {
@@ -134,8 +163,8 @@ function useActionState(_action, initialState, _permalink) {
   }, false];
 }
 function use(usable) {
-  if (typeof usable === "object" && usable !== null && "_currentValue" in usable) {
-    return usable._currentValue;
+  if (typeof usable === "object" && usable !== null && ("_currentValue" in usable || "_defaultValue" in usable)) {
+    return getContextValue(usable);
   }
   const promise = usable;
   if (promise.status === "fulfilled")
@@ -151,6 +180,7 @@ function startTransition(callback) {
 // src/slim-react/context.ts
 function createContext(defaultValue) {
   const context = {
+    _defaultValue: defaultValue,
     _currentValue: defaultValue,
     Provider: null,
     Consumer: null
@@ -526,7 +556,7 @@ function renderComponent(type, props, writer, isSvg) {
   }
   if (typeOf === REACT_CONSUMER) {
     const ctx2 = type._context;
-    const value = ctx2?._currentValue;
+    const value = ctx2 ? getContextValue(ctx2) : void 0;
     const result2 = typeof props.children === "function" ? props.children(value) : null;
     const savedScope2 = pushComponentScope();
     const finish2 = () => popComponentScope(savedScope2);
@@ -542,18 +572,28 @@ function renderComponent(type, props, writer, isSvg) {
   let ctx;
   if (isProvider) {
     ctx = type._context ?? type;
-    prevCtxValue = ctx._currentValue;
-    ctx._currentValue = props.value;
+    prevCtxValue = pushContextValue(ctx, props.value);
   }
   const savedScope = pushComponentScope();
   if (isProvider && typeof type !== "function") {
     const finish2 = () => {
       popComponentScope(savedScope);
-      ctx._currentValue = prevCtxValue;
+      popContextValue(ctx, prevCtxValue);
     };
     const r2 = renderChildren(props.children, writer, isSvg);
     if (r2 && typeof r2.then === "function") {
-      return r2.then(finish2);
+      const m = captureMap();
+      return r2.then(
+        () => {
+          swapContextMap(m);
+          finish2();
+        },
+        (e) => {
+          swapContextMap(m);
+          finish2();
+          throw e;
+        }
+      );
     }
     finish2();
     return;
@@ -574,26 +614,54 @@ function renderComponent(type, props, writer, isSvg) {
   } catch (e) {
     popComponentScope(savedScope);
     if (isProvider)
-      ctx._currentValue = prevCtxValue;
+      popContextValue(ctx, prevCtxValue);
     throw e;
   }
   const finish = () => {
     popComponentScope(savedScope);
     if (isProvider)
-      ctx._currentValue = prevCtxValue;
+      popContextValue(ctx, prevCtxValue);
   };
   if (result instanceof Promise) {
+    const m = captureMap();
     return result.then((resolved) => {
+      swapContextMap(m);
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        return r2.then(finish);
+        const m2 = captureMap();
+        return r2.then(
+          () => {
+            swapContextMap(m2);
+            finish();
+          },
+          (e) => {
+            swapContextMap(m2);
+            finish();
+            throw e;
+          }
+        );
       }
       finish();
+    }, (e) => {
+      swapContextMap(m);
+      finish();
+      throw e;
     });
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    return r.then(finish);
+    const m = captureMap();
+    return r.then(
+      () => {
+        swapContextMap(m);
+        finish();
+      },
+      (e) => {
+        swapContextMap(m);
+        finish();
+        throw e;
+      }
+    );
   }
   finish();
 }
@@ -609,7 +677,9 @@ function renderChildArray(children, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -626,7 +696,9 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -653,7 +725,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       const buffer = new BufferWriter();
       const r = renderNode(children, buffer, isSvg);
       if (r && typeof r.then === "function") {
+        const m = captureMap();
         await r;
+        swapContextMap(m);
       }
       writer.write("<!--$-->");
       buffer.flush(writer);
@@ -661,7 +735,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       return;
     } catch (error) {
       if (error && typeof error.then === "function") {
+        const m = captureMap();
         await error;
+        swapContextMap(m);
         attempts++;
       } else {
         throw error;
@@ -672,16 +748,21 @@ async function renderSuspense(props, writer, isSvg = false) {
   writer.write("<!--$?-->");
   if (fallback) {
     const r = renderNode(fallback, writer, isSvg);
-    if (r && typeof r.then === "function")
+    if (r && typeof r.then === "function") {
+      const m = captureMap();
       await r;
+      swapContextMap(m);
+    }
   }
   writer.write("<!--/$-->");
 }
 function renderToStream(element) {
   const encoder = new TextEncoder();
+  const contextMap = /* @__PURE__ */ new Map();
   return new ReadableStream({
     async start(controller) {
       resetRenderState();
+      const prev = swapContextMap(contextMap);
       const writer = {
         lastWasText: false,
         write(chunk) {
@@ -695,49 +776,66 @@ function renderToStream(element) {
       };
       try {
         const r = renderNode(element, writer);
-        if (r && typeof r.then === "function")
+        if (r && typeof r.then === "function") {
+          const m = captureMap();
           await r;
+          swapContextMap(m);
+        }
         controller.close();
       } catch (error) {
         controller.error(error);
+      } finally {
+        swapContextMap(prev);
       }
     }
   });
 }
 async function renderToString(element) {
-  for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
-    resetRenderState();
-    const chunks = [];
-    const writer = {
-      lastWasText: false,
-      write(c) {
-        chunks.push(c);
-        this.lastWasText = false;
-      },
-      text(s2) {
-        chunks.push(s2);
-        this.lastWasText = true;
-      }
-    };
-    try {
-      const r = renderNode(element, writer);
-      if (r && typeof r.then === "function")
-        await r;
-      return chunks.join("");
-    } catch (error) {
-      if (error && typeof error.then === "function") {
-        await error;
-        continue;
+  const contextMap = /* @__PURE__ */ new Map();
+  const prev = swapContextMap(contextMap);
+  try {
+    for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
+      resetRenderState();
+      swapContextMap(contextMap);
+      const chunks = [];
+      const writer = {
+        lastWasText: false,
+        write(c) {
+          chunks.push(c);
+          this.lastWasText = false;
+        },
+        text(s2) {
+          chunks.push(s2);
+          this.lastWasText = true;
+        }
+      };
+      try {
+        const r = renderNode(element, writer);
+        if (r && typeof r.then === "function") {
+          const m = captureMap();
+          await r;
+          swapContextMap(m);
+        }
+        return chunks.join("");
+      } catch (error) {
+        if (error && typeof error.then === "function") {
+          const m = captureMap();
+          await error;
+          swapContextMap(m);
+          continue;
+        }
+        throw error;
       }
-      throw error;
     }
+    throw new Error("[slim-react] renderToString exceeded maximum retries");
+  } finally {
+    swapContextMap(prev);
   }
-  throw new Error("[slim-react] renderToString exceeded maximum retries");
 }
 
 // src/slim-react/index.ts
 function useContext(context) {
-  return context._currentValue;
+  return getContextValue(context);
 }
 var Suspense = SUSPENSE_TYPE;
 function isValidElement(obj) {

package/dist/ssr-render-worker.js

@@ -67,6 +67,35 @@ function createElement(type, props, ...children) {
 }
 
 // src/slim-react/renderContext.ts
+var MAP_KEY = "__slimReactContextMap";
+var _g = globalThis;
+if (!("__slimReactContextMap" in _g))
+  _g[MAP_KEY] = null;
+function swapContextMap(map) {
+  const prev = _g[MAP_KEY];
+  _g[MAP_KEY] = map;
+  return prev;
+}
+function captureMap() {
+  return _g[MAP_KEY];
+}
+function getContextValue(context) {
+  const map = _g[MAP_KEY];
+  if (map && map.has(context))
+    return map.get(context);
+  const c = context;
+  return "_defaultValue" in c ? c._defaultValue : c._currentValue;
+}
+function pushContextValue(context, value) {
+  const map = _g[MAP_KEY];
+  const c = context;
+  const prev = map && map.has(context) ? map.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
+  map?.set(context, value);
+  return prev;
+}
+function popContextValue(context, prev) {
+  _g[MAP_KEY]?.set(context, prev);
+}
 var GLOBAL_KEY = "__slimReactRenderState";
 var EMPTY = { id: 0, overflow: "", bits: 0 };
 function s() {
@@ -479,7 +508,7 @@ function renderComponent(type, props, writer, isSvg) {
   }
   if (typeOf === REACT_CONSUMER) {
     const ctx2 = type._context;
-    const value = ctx2?._currentValue;
+    const value = ctx2 ? getContextValue(ctx2) : void 0;
     const result2 = typeof props.children === "function" ? props.children(value) : null;
     const savedScope2 = pushComponentScope();
     const finish2 = () => popComponentScope(savedScope2);
@@ -495,18 +524,28 @@ function renderComponent(type, props, writer, isSvg) {
   let ctx;
   if (isProvider) {
     ctx = type._context ?? type;
-    prevCtxValue = ctx._currentValue;
-    ctx._currentValue = props.value;
+    prevCtxValue = pushContextValue(ctx, props.value);
   }
   const savedScope = pushComponentScope();
   if (isProvider && typeof type !== "function") {
     const finish2 = () => {
       popComponentScope(savedScope);
-      ctx._currentValue = prevCtxValue;
+      popContextValue(ctx, prevCtxValue);
     };
     const r2 = renderChildren(props.children, writer, isSvg);
     if (r2 && typeof r2.then === "function") {
-      return r2.then(finish2);
+      const m = captureMap();
+      return r2.then(
+        () => {
+          swapContextMap(m);
+          finish2();
+        },
+        (e) => {
+          swapContextMap(m);
+          finish2();
+          throw e;
+        }
+      );
     }
     finish2();
     return;
@@ -527,26 +566,54 @@ function renderComponent(type, props, writer, isSvg) {
   } catch (e) {
     popComponentScope(savedScope);
     if (isProvider)
-      ctx._currentValue = prevCtxValue;
+      popContextValue(ctx, prevCtxValue);
     throw e;
   }
   const finish = () => {
     popComponentScope(savedScope);
     if (isProvider)
-      ctx._currentValue = prevCtxValue;
+      popContextValue(ctx, prevCtxValue);
   };
   if (result instanceof Promise) {
+    const m = captureMap();
     return result.then((resolved) => {
+      swapContextMap(m);
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        return r2.then(finish);
+        const m2 = captureMap();
+        return r2.then(
+          () => {
+            swapContextMap(m2);
+            finish();
+          },
+          (e) => {
+            swapContextMap(m2);
+            finish();
+            throw e;
+          }
+        );
       }
       finish();
+    }, (e) => {
+      swapContextMap(m);
+      finish();
+      throw e;
     });
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    return r.then(finish);
+    const m = captureMap();
+    return r.then(
+      () => {
+        swapContextMap(m);
+        finish();
+      },
+      (e) => {
+        swapContextMap(m);
+        finish();
+        throw e;
+      }
+    );
   }
   finish();
 }
@@ -562,7 +629,9 @@ function renderChildArray(children, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -579,7 +648,9 @@ function renderChildArrayFrom(children, startIndex, writer, isSvg) {
     const savedTree = pushTreeContext(totalChildren, i);
     const r = renderNode(children[i], writer, isSvg);
     if (r && typeof r.then === "function") {
+      const m = captureMap();
       return r.then(() => {
+        swapContextMap(m);
         popTreeContext(savedTree);
         return renderChildArrayFrom(children, i + 1, writer, isSvg);
       });
@@ -606,7 +677,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       const buffer = new BufferWriter();
       const r = renderNode(children, buffer, isSvg);
       if (r && typeof r.then === "function") {
+        const m = captureMap();
         await r;
+        swapContextMap(m);
       }
       writer.write("<!--$-->");
       buffer.flush(writer);
@@ -614,7 +687,9 @@ async function renderSuspense(props, writer, isSvg = false) {
       return;
     } catch (error) {
       if (error && typeof error.then === "function") {
+        const m = captureMap();
         await error;
+        swapContextMap(m);
         attempts++;
       } else {
         throw error;
@@ -625,40 +700,55 @@ async function renderSuspense(props, writer, isSvg = false) {
   writer.write("<!--$?-->");
   if (fallback) {
     const r = renderNode(fallback, writer, isSvg);
-    if (r && typeof r.then === "function")
+    if (r && typeof r.then === "function") {
+      const m = captureMap();
       await r;
+      swapContextMap(m);
+    }
   }
   writer.write("<!--/$-->");
 }
 async function renderToString(element) {
-  for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
-    resetRenderState();
-    const chunks = [];
-    const writer = {
-      lastWasText: false,
-      write(c) {
-        chunks.push(c);
-        this.lastWasText = false;
-      },
-      text(s2) {
-        chunks.push(s2);
-        this.lastWasText = true;
-      }
-    };
-    try {
-      const r = renderNode(element, writer);
-      if (r && typeof r.then === "function")
-        await r;
-      return chunks.join("");
-    } catch (error) {
-      if (error && typeof error.then === "function") {
-        await error;
-        continue;
+  const contextMap = /* @__PURE__ */ new Map();
+  const prev = swapContextMap(contextMap);
+  try {
+    for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
+      resetRenderState();
+      swapContextMap(contextMap);
+      const chunks = [];
+      const writer = {
+        lastWasText: false,
+        write(c) {
+          chunks.push(c);
+          this.lastWasText = false;
+        },
+        text(s2) {
+          chunks.push(s2);
+          this.lastWasText = true;
+        }
+      };
+      try {
+        const r = renderNode(element, writer);
+        if (r && typeof r.then === "function") {
+          const m = captureMap();
+          await r;
+          swapContextMap(m);
+        }
+        return chunks.join("");
+      } catch (error) {
+        if (error && typeof error.then === "function") {
+          const m = captureMap();
+          await error;
+          swapContextMap(m);
+          continue;
+        }
+        throw error;
       }
-      throw error;
     }
+    throw new Error("[slim-react] renderToString exceeded maximum retries");
+  } finally {
+    swapContextMap(prev);
   }
-  throw new Error("[slim-react] renderToString exceeded maximum retries");
 }
 
 // src/ssr-render-worker.ts

package/dist/ssr-watch.js

@@ -179,6 +179,12 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     "@emotion/styled": path.resolve(process.cwd(), "node_modules", "@emotion", "styled")
   } : void 0;
   const externals = isServerBuild ? [
+    // Node.js built-ins — must not be bundled; resolved by the runtime.
+    "node:fs",
+    "node:path",
+    "node:os",
+    "node:stream",
+    "node:util",
     // react / react-dom are replaced by slim-react via alias above — not external.
     // emotion should be external on server builds to avoid client/browser code
     "@emotion/react",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hadars",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Minimal SSR framework for React — rspack, HMR, TypeScript, Bun/Node/Deno",
   "module": "./dist/index.js",
   "type": "module",

package/src/slim-react/context.ts

@@ -9,7 +9,8 @@ import type { SlimNode } from "./types";
  */
 
 export interface Context<T> {
-  _currentValue: T;
+  _defaultValue: T;
+  _currentValue: T; // kept for external compat (real React contexts passed to useContext)
   Provider: ContextProvider<T>;
   Consumer: (props: { children: (value: T) => SlimNode }) => SlimNode;
 }
@@ -23,6 +24,7 @@ export type ContextProvider<T> = ((props: {
 
 export function createContext<T>(defaultValue: T): Context<T> {
   const context: Context<T> = {
+    _defaultValue: defaultValue,
     _currentValue: defaultValue,
     Provider: null!,
     Consumer: null!,

package/src/slim-react/hooks.ts

@@ -6,7 +6,7 @@
  * compatible libraries to work during server-side rendering.
  */
 
-import { makeId } from "./renderContext";
+import { makeId, getContextValue } from "./renderContext";
 
 // ---- useState ----
 export function useState<T>(
@@ -115,9 +115,9 @@ export function use<T>(
   if (
     typeof usable === "object" &&
     usable !== null &&
-    "_currentValue" in usable
+    ("_currentValue" in usable || "_defaultValue" in usable)
   ) {
-    return (usable as { _currentValue: T })._currentValue;
+    return getContextValue<T>(usable as object);
   }
 
   // Promise – Suspense protocol

package/src/slim-react/index.ts

@@ -67,12 +67,10 @@ export {
 import { createContext } from "./context";
 export { createContext, type Context } from "./context";
 
-// Re-export useContext from hooks.ts? No – we have it in context.ts
-// Actually useContext reads from the context object, let's export a
-// single implementation that lives close to createContext:
+import { getContextValue } from "./renderContext";
 import type { Context } from "./context";
 export function useContext<T>(context: Context<T>): T {
-  return context._currentValue;
+  return getContextValue<T>(context);
 }
 
 // ---- Rendering ----