hadars 0.1.22 → 0.1.24

package/dist/slim-react/index.js

@@ -7,8 +7,45 @@ import {
   createElement,
   jsx
 } from "../chunk-OS3V4CPN.js";
+import {
+  __require
+} from "../chunk-EZUCZHGV.js";
 
 // src/slim-react/renderContext.ts
+var CONTEXT_STORE_KEY = "__slimReactContextStore";
+var _g = globalThis;
+if (!_g[CONTEXT_STORE_KEY]) {
+  try {
+    const { AsyncLocalStorage } = __require("node:async_hooks");
+    _g[CONTEXT_STORE_KEY] = new AsyncLocalStorage();
+  } catch {
+    _g[CONTEXT_STORE_KEY] = null;
+  }
+}
+var _contextStore = _g[CONTEXT_STORE_KEY];
+function runWithContextStore(fn) {
+  return _contextStore ? _contextStore.run(/* @__PURE__ */ new Map(), fn) : fn();
+}
+function getContextValue(context) {
+  const store = _contextStore?.getStore();
+  if (store && store.has(context))
+    return store.get(context);
+  const c = context;
+  return "_defaultValue" in c ? c._defaultValue : c._currentValue;
+}
+function pushContextValue(context, value) {
+  const store = _contextStore?.getStore();
+  const c = context;
+  const prev = store && store.has(context) ? store.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
+  if (store)
+    store.set(context, value);
+  return prev;
+}
+function popContextValue(context, prev) {
+  const store = _contextStore?.getStore();
+  if (store)
+    store.set(context, prev);
+}
 var GLOBAL_KEY = "__slimReactRenderState";
 var EMPTY = { id: 0, overflow: "", bits: 0 };
 function s() {
@@ -134,8 +171,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 +188,7 @@ function startTransition(callback) {
 // src/slim-react/context.ts
 function createContext(defaultValue) {
   const context = {
+    _defaultValue: defaultValue,
     _currentValue: defaultValue,
     Provider: null,
     Consumer: null
@@ -526,7 +564,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 +580,20 @@ 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);
+      return r2.then(finish2, (e) => {
+        finish2();
+        throw e;
+      });
     }
     finish2();
     return;
@@ -574,26 +614,35 @@ 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) {
     return result.then((resolved) => {
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        return r2.then(finish);
+        return r2.then(finish, (e) => {
+          finish();
+          throw e;
+        });
       }
       finish();
+    }, (e) => {
+      finish();
+      throw e;
     });
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    return r.then(finish);
+    return r.then(finish, (e) => {
+      finish();
+      throw e;
+    });
   }
   finish();
 }
@@ -679,7 +728,7 @@ async function renderSuspense(props, writer, isSvg = false) {
 }
 function renderToStream(element) {
   const encoder = new TextEncoder();
-  return new ReadableStream({
+  return runWithContextStore(() => new ReadableStream({
     async start(controller) {
       resetRenderState();
       const writer = {
@@ -702,42 +751,44 @@ function renderToStream(element) {
         controller.error(error);
       }
     }
-  });
+  }));
 }
-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;
+function renderToString(element) {
+  return runWithContextStore(async () => {
+    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;
+        }
+        throw error;
       }
-      throw error;
     }
-  }
-  throw new Error("[slim-react] renderToString exceeded maximum retries");
+    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/slim-react/jsx-runtime.js

@@ -2,6 +2,7 @@ import {
   Fragment,
   jsx
 } from "../chunk-OS3V4CPN.js";
+import "../chunk-EZUCZHGV.js";
 export {
   Fragment,
   jsx,

package/dist/ssr-render-worker.js

@@ -1,3 +1,11 @@
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
+
 // src/ssr-render-worker.ts
 import { workerData, parentPort } from "node:worker_threads";
 import { pathToFileURL } from "node:url";
@@ -67,6 +75,40 @@ function createElement(type, props, ...children) {
 }
 
 // src/slim-react/renderContext.ts
+var CONTEXT_STORE_KEY = "__slimReactContextStore";
+var _g = globalThis;
+if (!_g[CONTEXT_STORE_KEY]) {
+  try {
+    const { AsyncLocalStorage } = __require("node:async_hooks");
+    _g[CONTEXT_STORE_KEY] = new AsyncLocalStorage();
+  } catch {
+    _g[CONTEXT_STORE_KEY] = null;
+  }
+}
+var _contextStore = _g[CONTEXT_STORE_KEY];
+function runWithContextStore(fn) {
+  return _contextStore ? _contextStore.run(/* @__PURE__ */ new Map(), fn) : fn();
+}
+function getContextValue(context) {
+  const store = _contextStore?.getStore();
+  if (store && store.has(context))
+    return store.get(context);
+  const c = context;
+  return "_defaultValue" in c ? c._defaultValue : c._currentValue;
+}
+function pushContextValue(context, value) {
+  const store = _contextStore?.getStore();
+  const c = context;
+  const prev = store && store.has(context) ? store.get(context) : "_defaultValue" in c ? c._defaultValue : c._currentValue;
+  if (store)
+    store.set(context, value);
+  return prev;
+}
+function popContextValue(context, prev) {
+  const store = _contextStore?.getStore();
+  if (store)
+    store.set(context, prev);
+}
 var GLOBAL_KEY = "__slimReactRenderState";
 var EMPTY = { id: 0, overflow: "", bits: 0 };
 function s() {
@@ -479,7 +521,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 +537,20 @@ 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);
+      return r2.then(finish2, (e) => {
+        finish2();
+        throw e;
+      });
     }
     finish2();
     return;
@@ -527,26 +571,35 @@ 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) {
     return result.then((resolved) => {
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
-        return r2.then(finish);
+        return r2.then(finish, (e) => {
+          finish();
+          throw e;
+        });
       }
       finish();
+    }, (e) => {
+      finish();
+      throw e;
     });
   }
   const r = renderNode(result, writer, isSvg);
   if (r && typeof r.then === "function") {
-    return r.then(finish);
+    return r.then(finish, (e) => {
+      finish();
+      throw e;
+    });
   }
   finish();
 }
@@ -630,35 +683,37 @@ async function renderSuspense(props, writer, isSvg = false) {
   }
   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;
+function renderToString(element) {
+  return runWithContextStore(async () => {
+    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;
+        }
+        throw error;
       }
-      throw error;
     }
-  }
-  throw new Error("[slim-react] renderToString exceeded maximum retries");
+    throw new Error("[slim-react] renderToString exceeded maximum retries");
+  });
 }
 
 // src/ssr-render-worker.ts

package/dist/ssr-watch.js

@@ -12,7 +12,7 @@ var __dirname = process.cwd();
 var packageDir = pathMod.dirname(fileURLToPath(import.meta.url));
 var clientScriptPath = pathMod.resolve(packageDir, "template.html");
 var loaderPath = existsSync(pathMod.resolve(packageDir, "loader.cjs")) ? pathMod.resolve(packageDir, "loader.cjs") : pathMod.resolve(packageDir, "loader.ts");
-var getConfigBase = (mode) => {
+var getConfigBase = (mode, isServerBuild = false) => {
   const isDev = mode === "development";
   return {
     experiments: {
@@ -111,9 +111,12 @@ var getConfigBase = (mode) => {
   };
 };
 var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
-  const Config = getConfigBase(opts.mode);
   const { base: base2 } = opts;
   const isDev = opts.mode === "development";
+  const isServerBuild = Boolean(
+    opts.output && typeof opts.output === "object" && (opts.output.library || String(opts.output.filename || "").includes("ssr"))
+  );
+  const Config = getConfigBase(opts.mode, isServerBuild);
   const localConfig = {
     ...Config,
     module: {
@@ -162,12 +165,9 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
   if (opts.moduleRules && opts.moduleRules.length > 0) {
     localConfig.module.rules.push(...opts.moduleRules);
   }
-  const isServerBuild2 = Boolean(
-    opts.output && typeof opts.output === "object" && (opts.output.library || String(opts.output.filename || "").includes("ssr"))
-  );
   const slimReactIndex = pathMod.resolve(packageDir, "slim-react", "index.js");
   const slimReactJsx = pathMod.resolve(packageDir, "slim-react", "jsx-runtime.js");
-  const resolveAliases = isServerBuild2 ? {
+  const resolveAliases = isServerBuild ? {
     // Route all React imports to slim-react for SSR.
     react: slimReactIndex,
     "react/jsx-runtime": slimReactJsx,
@@ -178,7 +178,17 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     "@emotion/cache": path.resolve(process.cwd(), "node_modules", "@emotion", "cache"),
     "@emotion/styled": path.resolve(process.cwd(), "node_modules", "@emotion", "styled")
   } : void 0;
-  const externals = isServerBuild2 ? [
+  const externals = isServerBuild ? [
+    // Node.js built-ins — must not be bundled; resolved by the runtime.
+    // Both the bare name and the node: prefix are listed because rspack
+    // may encounter either form depending on how the import is written.
+    "node:async_hooks",
+    "async_hooks",
+    "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",
@@ -199,9 +209,9 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     extensions: [".tsx", ".ts", ".js", ".jsx"],
     alias: resolveAliases,
     // for server builds prefer the package "main"/"module" fields and avoid "browser" so we don't pick browser-specific entrypoints
-    mainFields: isServerBuild2 ? ["main", "module"] : ["browser", "module", "main"]
+    mainFields: isServerBuild ? ["main", "module"] : ["browser", "module", "main"]
   };
-  const optimization = !isServerBuild2 && !isDev ? {
+  const optimization = !isServerBuild && !isDev ? {
     moduleIds: "deterministic",
     splitChunks: {
       chunks: "all",
@@ -229,7 +239,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     externals,
     ...optimization !== void 0 ? { optimization } : {},
     plugins: [
-      new rspack.HtmlRspackPlugin({
+      !isServerBuild && new rspack.HtmlRspackPlugin({
         publicPath: base2 || "/",
         template: opts.htmlTemplate ? pathMod.resolve(process.cwd(), opts.htmlTemplate) : clientScriptPath,
         scriptLoading: "module",
@@ -237,12 +247,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
         inject: "head",
         minify: opts.mode === "production"
       }),
-      // Add `async` to the emitted module script so DOMContentLoaded fires
-      // as soon as HTML is parsed — without waiting for the bundle to execute.
-      // `<script type="module" async>` is valid: it downloads in parallel and
-      // executes without blocking DOMContentLoaded, while retaining module
-      // semantics (strict mode, ES imports, etc.).
-      {
+      !isServerBuild && {
         apply(compiler) {
           compiler.hooks.emit.tapAsync("HadarsAsyncModuleScript", (compilation, cb) => {
             const asset = compilation.assets["out.html"];
@@ -261,8 +266,8 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
           });
         }
       },
-      isDev && !isServerBuild2 && new ReactRefreshPlugin(),
-      includeHotPlugin && isDev && new rspack.HotModuleReplacementPlugin(),
+      isDev && !isServerBuild && new ReactRefreshPlugin(),
+      includeHotPlugin && isDev && !isServerBuild && new rspack.HotModuleReplacementPlugin(),
       ...extraPlugins
     ],
     ...localConfig,
@@ -277,7 +282,7 @@ var buildCompilerConfig = (entry2, opts, includeHotPlugin) => {
     // for client builds. SSR builds still need it for dynamic import() of exports.
     experiments: {
       ...localConfig.experiments || {},
-      outputModule: isServerBuild2
+      outputModule: isServerBuild
     },
     // Prevent rspack from watching its own build output — without this the
     // SSR watcher writing .hadars/index.ssr.js triggers the client compiler

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hadars",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "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 ----