hadars 0.1.28 → 0.1.30

package/dist/cli.js

@@ -141,7 +141,6 @@ var FRAGMENT_TYPE = Symbol.for("react.fragment");
 var SUSPENSE_TYPE = Symbol.for("react.suspense");
 
 // src/slim-react/jsx.ts
-var Fragment = FRAGMENT_TYPE;
 function createElement(type, props, ...children) {
   const normalizedProps = { ...props || {} };
   if (children.length === 1) {
@@ -198,10 +197,11 @@ function s() {
   }
   return g[GLOBAL_KEY];
 }
-function resetRenderState() {
+function resetRenderState(idPrefix = "") {
   const st = s();
   st.currentTreeContext = { ...EMPTY };
   st.localIdCounter = 0;
+  st.idPrefix = idPrefix;
 }
 function pushTreeContext(totalChildren, index) {
   const st = s();
@@ -242,6 +242,9 @@ function pushComponentScope() {
 function popComponentScope(saved) {
   s().localIdCounter = saved;
 }
+function componentCalledUseId() {
+  return s().localIdCounter > 0;
+}
 function snapshotContext() {
   const st = s();
   return { tree: { ...st.currentTreeContext }, localId: st.localIdCounter };
@@ -251,6 +254,121 @@ function restoreContext(snap) {
   st.currentTreeContext = { ...snap.tree };
   st.localIdCounter = snap.localId;
 }
+function getTreeId() {
+  const { id, overflow } = s().currentTreeContext;
+  if (id === 1)
+    return overflow;
+  const stripped = (id & ~(1 << 31 - Math.clz32(id))).toString(32);
+  return stripped + overflow;
+}
+function makeId() {
+  const st = s();
+  const treeId = getTreeId();
+  const n = st.localIdCounter++;
+  let id = "_R_" + st.idPrefix + treeId;
+  if (n > 0)
+    id += "H" + n.toString(32);
+  return id + "_";
+}
+
+// src/slim-react/hooks.ts
+function useState(initialState) {
+  const value = typeof initialState === "function" ? initialState() : initialState;
+  return [value, () => {
+  }];
+}
+function useReducer(_reducer, initialState) {
+  return [initialState, () => {
+  }];
+}
+function useEffect(_effect, _deps) {
+}
+function useLayoutEffect(_effect, _deps) {
+}
+function useInsertionEffect(_effect, _deps) {
+}
+function useRef(initialValue) {
+  return { current: initialValue };
+}
+function useMemo(factory, _deps) {
+  return factory();
+}
+function useCallback(callback, _deps) {
+  return callback;
+}
+function useDebugValue(_value, _format) {
+}
+function useImperativeHandle(_ref, _createHandle, _deps) {
+}
+function useSyncExternalStore(_subscribe, getSnapshot, getServerSnapshot) {
+  return (getServerSnapshot || getSnapshot)();
+}
+function useTransition() {
+  return [false, (cb) => cb()];
+}
+function useDeferredValue(value) {
+  return value;
+}
+function useOptimistic(passthrough) {
+  return [passthrough, () => {
+  }];
+}
+function useActionState(_action, initialState, _permalink) {
+  return [initialState, () => {
+  }, false];
+}
+function use(usable) {
+  if (typeof usable === "object" && usable !== null && ("_currentValue" in usable || "_defaultValue" in usable)) {
+    return getContextValue(usable);
+  }
+  const promise = usable;
+  if (promise.status === "fulfilled")
+    return promise.value;
+  if (promise.status === "rejected")
+    throw promise.reason;
+  throw promise;
+}
+
+// src/slim-react/dispatcher.ts
+import * as ReactNS from "react";
+var _internals = ReactNS.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
+var slimDispatcher = {
+  useId: makeId,
+  readContext: (ctx) => getContextValue(ctx),
+  useContext: (ctx) => getContextValue(ctx),
+  useState,
+  useReducer,
+  useEffect,
+  useLayoutEffect,
+  useInsertionEffect,
+  useRef,
+  useMemo,
+  useCallback,
+  useDebugValue,
+  useImperativeHandle,
+  useSyncExternalStore,
+  useTransition,
+  useDeferredValue,
+  useOptimistic,
+  useActionState,
+  use,
+  // React internals that compiled output may call
+  useMemoCache: (size) => new Array(size).fill(void 0),
+  useCacheRefresh: () => () => {
+  },
+  useHostTransitionStatus: () => false
+};
+function installDispatcher() {
+  if (!_internals)
+    return null;
+  const prev = _internals.H;
+  _internals.H = slimDispatcher;
+  return prev;
+}
+function restoreDispatcher(prev) {
+  if (_internals)
+    _internals.H = prev;
+}
 
 // src/slim-react/render.ts
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
@@ -655,6 +773,7 @@ function renderComponent(type, props, writer, isSvg) {
     return;
   }
   let result;
+  const prevDispatcher = installDispatcher();
   try {
     if (type.prototype && typeof type.prototype.render === "function") {
       const instance = new type(props);
@@ -668,12 +787,20 @@ function renderComponent(type, props, writer, isSvg) {
       result = type(props);
     }
   } catch (e) {
+    restoreDispatcher(prevDispatcher);
     popComponentScope(savedScope);
     if (isProvider)
       popContextValue(ctx, prevCtxValue);
     throw e;
   }
+  restoreDispatcher(prevDispatcher);
+  let savedIdTree;
+  if (!(result instanceof Promise) && componentCalledUseId()) {
+    savedIdTree = pushTreeContext(1, 0);
+  }
   const finish = () => {
+    if (savedIdTree !== void 0)
+      popTreeContext(savedIdTree);
     popComponentScope(savedScope);
     if (isProvider)
       popContextValue(ctx, prevCtxValue);
@@ -682,22 +809,33 @@ function renderComponent(type, props, writer, isSvg) {
     const m = captureMap();
     return result.then((resolved) => {
       swapContextMap(m);
+      let asyncSavedIdTree;
+      if (componentCalledUseId()) {
+        asyncSavedIdTree = pushTreeContext(1, 0);
+      }
+      const asyncFinish = () => {
+        if (asyncSavedIdTree !== void 0)
+          popTreeContext(asyncSavedIdTree);
+        popComponentScope(savedScope);
+        if (isProvider)
+          popContextValue(ctx, prevCtxValue);
+      };
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
         const m2 = captureMap();
         return r2.then(
           () => {
             swapContextMap(m2);
-            finish();
+            asyncFinish();
           },
           (e) => {
             swapContextMap(m2);
-            finish();
+            asyncFinish();
             throw e;
           }
         );
       }
-      finish();
+      asyncFinish();
     }, (e) => {
       swapContextMap(m);
       finish();
@@ -777,8 +915,8 @@ async function renderSuspense(props, writer, isSvg = false) {
   const snap = snapshotContext();
   while (attempts < MAX_SUSPENSE_RETRIES) {
     restoreContext(snap);
+    let buffer = new BufferWriter();
     try {
-      const buffer = new BufferWriter();
       const r = renderNode(children, buffer, isSvg);
       if (r && typeof r.then === "function") {
         const m = captureMap();
@@ -812,12 +950,13 @@ async function renderSuspense(props, writer, isSvg = false) {
   }
   writer.write("<!--/$-->");
 }
-async function renderToString(element) {
+async function renderToString(element, options) {
+  const idPrefix = options?.identifierPrefix ?? "";
   const contextMap = /* @__PURE__ */ new Map();
   const prev = swapContextMap(contextMap);
   try {
     for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
-      resetRenderState();
+      resetRenderState(idPrefix);
       swapContextMap(contextMap);
       const chunks = [];
       const writer = {
@@ -934,31 +1073,14 @@ var getReactResponse = async (req, opts) => {
     location: req.location,
     ...Object.keys(serverData).length > 0 ? { __serverData: serverData } : {}
   };
-  const ReactPage = createElement(
-    Fragment,
-    null,
-    createElement(
-      "div",
-      { id: "app" },
-      createElement(App, { ...props, location: req.location, context })
-    ),
-    createElement("script", {
-      id: "hadars",
-      type: "application/json",
-      dangerouslySetInnerHTML: {
-        __html: JSON.stringify({ hadars: { props: clientProps } }).replace(/</g, "\\u003c")
-      }
-    })
-  );
+  const appProps = { ...props, location: req.location, context };
   return {
-    ReactPage,
+    App,
+    appProps,
+    clientProps,
     unsuspend,
     status: context.head.status,
-    headHtml: getHeadHtml(context.head),
-    renderPayload: {
-      appProps: { ...props, location: req.location, context },
-      clientProps
-    }
+    headHtml: getHeadHtml(context.head)
   };
 };
 
@@ -1692,7 +1814,7 @@ var RenderWorkerPool = class {
     await Promise.all(this.workers.map((w) => w.terminate()));
   }
 };
-async function buildSsrResponse(ReactPage, headHtml, status, getPrecontentHtml, unsuspendForRender) {
+async function buildSsrResponse(App, appProps, clientProps, headHtml, status, getPrecontentHtml, unsuspendForRender) {
   const responseStream = new ReadableStream({
     async start(controller) {
       const [precontentHtml, postContent] = await getPrecontentHtml(headHtml);
@@ -1700,12 +1822,15 @@ async function buildSsrResponse(ReactPage, headHtml, status, getPrecontentHtml,
       let bodyHtml;
       try {
         globalThis.__hadarsUnsuspend = unsuspendForRender;
-        bodyHtml = await renderToString(ReactPage);
+        bodyHtml = await renderToString(createElement(App, appProps));
       } finally {
         globalThis.__hadarsUnsuspend = null;
       }
       bodyHtml = processSegmentCache(bodyHtml);
-      controller.enqueue(encoder.encode(bodyHtml + postContent));
+      const scriptContent = JSON.stringify({ hadars: { props: clientProps } }).replace(/</g, "\\u003c");
+      controller.enqueue(encoder.encode(
+        `<div id="app">${bodyHtml}</div><script id="hadars" type="application/json">${scriptContent}</script>` + postContent
+      ));
       controller.close();
     }
   });
@@ -2075,7 +2200,7 @@ var dev = async (options) => {
         getAfterRenderProps,
         getFinalProps
       } = await import(importPath);
-      const { ReactPage, unsuspend, status, headHtml } = await getReactResponse(request, {
+      const { App, appProps, clientProps, unsuspend, status, headHtml } = await getReactResponse(request, {
         document: {
           body: Component,
           lang: "en",
@@ -2084,7 +2209,7 @@ var dev = async (options) => {
           getFinalProps
         }
       });
-      return buildSsrResponse(ReactPage, headHtml, status, getPrecontentHtml, unsuspend);
+      return buildSsrResponse(App, appProps, clientProps, headHtml, status, getPrecontentHtml, unsuspend);
     } catch (err) {
       console.error("[hadars] SSR render error:", err);
       const msg = (err?.stack ?? err?.message ?? String(err)).replace(/</g, "&lt;");
@@ -2229,7 +2354,7 @@ var run = async (options) => {
           status: wStatus
         });
       }
-      const { ReactPage, unsuspend, status, headHtml } = await getReactResponse(request, {
+      const { App, appProps, clientProps, unsuspend, status, headHtml } = await getReactResponse(request, {
         document: {
           body: Component,
           lang: "en",
@@ -2238,7 +2363,7 @@ var run = async (options) => {
           getFinalProps
         }
       });
-      return buildSsrResponse(ReactPage, headHtml, status, getPrecontentHtml, unsuspend);
+      return buildSsrResponse(App, appProps, clientProps, headHtml, status, getPrecontentHtml, unsuspend);
     } catch (err) {
       console.error("[hadars] SSR render error:", err);
       return new Response("Internal Server Error", { status: 500 });

package/dist/index.cjs

@@ -183,10 +183,7 @@ function initServerDataCache(data) {
 function useServerData(key, fn) {
   const cacheKey = Array.isArray(key) ? JSON.stringify(key) : key;
   if (typeof window !== "undefined") {
-    if (clientServerDataCache.has(cacheKey)) {
-      return clientServerDataCache.get(cacheKey);
-    }
-    return fn();
+    return clientServerDataCache.get(cacheKey);
   }
   const unsuspend = globalThis.__hadarsUnsuspend;
   if (!unsuspend)

package/dist/index.d.ts

@@ -205,6 +205,9 @@ declare function initServerDataCache(data: Record<string, unknown>): void;
  *   awaited, the cache entry is then cleared so that the next render re-calls
  *   `fn()` — at that point the Suspense hook returns synchronously.
  *
+ * `fn` is **server-only**: it is never called in the browser. The resolved value
+ * is serialised into `__serverData` and returned from cache during hydration.
+ *
  * @example
  * const user = useServerData('current_user', () => db.getUser(id));
  * const post = useServerData(['post', postId], () => db.getPost(postId));

package/dist/index.js

@@ -140,10 +140,7 @@ function initServerDataCache(data) {
 function useServerData(key, fn) {
   const cacheKey = Array.isArray(key) ? JSON.stringify(key) : key;
   if (typeof window !== "undefined") {
-    if (clientServerDataCache.has(cacheKey)) {
-      return clientServerDataCache.get(cacheKey);
-    }
-    return fn();
+    return clientServerDataCache.get(cacheKey);
   }
   const unsuspend = globalThis.__hadarsUnsuspend;
   if (!unsuspend)

package/dist/slim-react/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/slim-react/index.ts
@@ -138,10 +148,11 @@ function s() {
   }
   return g[GLOBAL_KEY];
 }
-function resetRenderState() {
+function resetRenderState(idPrefix = "") {
   const st = s();
   st.currentTreeContext = { ...EMPTY };
   st.localIdCounter = 0;
+  st.idPrefix = idPrefix;
 }
 function pushTreeContext(totalChildren, index) {
   const st = s();
@@ -182,6 +193,9 @@ function pushComponentScope() {
 function popComponentScope(saved) {
   s().localIdCounter = saved;
 }
+function componentCalledUseId() {
+  return s().localIdCounter > 0;
+}
 function snapshotContext() {
   const st = s();
   return { tree: { ...st.currentTreeContext }, localId: st.localIdCounter };
@@ -202,7 +216,7 @@ function makeId() {
   const st = s();
   const treeId = getTreeId();
   const n = st.localIdCounter++;
-  let id = "_" + st.idPrefix + "R_" + treeId;
+  let id = "_R_" + st.idPrefix + treeId;
   if (n > 0)
     id += "H" + n.toString(32);
   return id + "_";
@@ -298,6 +312,47 @@ function createContext(defaultValue) {
   return context;
 }
 
+// src/slim-react/dispatcher.ts
+var ReactNS = __toESM(require("react"), 1);
+var _internals = ReactNS.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
+var slimDispatcher = {
+  useId: makeId,
+  readContext: (ctx) => getContextValue(ctx),
+  useContext: (ctx) => getContextValue(ctx),
+  useState,
+  useReducer,
+  useEffect,
+  useLayoutEffect,
+  useInsertionEffect,
+  useRef,
+  useMemo,
+  useCallback,
+  useDebugValue,
+  useImperativeHandle,
+  useSyncExternalStore,
+  useTransition,
+  useDeferredValue,
+  useOptimistic,
+  useActionState,
+  use,
+  // React internals that compiled output may call
+  useMemoCache: (size) => new Array(size).fill(void 0),
+  useCacheRefresh: () => () => {
+  },
+  useHostTransitionStatus: () => false
+};
+function installDispatcher() {
+  if (!_internals)
+    return null;
+  const prev = _internals.H;
+  _internals.H = slimDispatcher;
+  return prev;
+}
+function restoreDispatcher(prev) {
+  if (_internals)
+    _internals.H = prev;
+}
+
 // src/slim-react/render.ts
 var VOID_ELEMENTS = /* @__PURE__ */ new Set([
   "area",
@@ -701,6 +756,7 @@ function renderComponent(type, props, writer, isSvg) {
     return;
   }
   let result;
+  const prevDispatcher = installDispatcher();
   try {
     if (type.prototype && typeof type.prototype.render === "function") {
       const instance = new type(props);
@@ -714,12 +770,20 @@ function renderComponent(type, props, writer, isSvg) {
       result = type(props);
     }
   } catch (e) {
+    restoreDispatcher(prevDispatcher);
     popComponentScope(savedScope);
     if (isProvider)
       popContextValue(ctx, prevCtxValue);
     throw e;
   }
+  restoreDispatcher(prevDispatcher);
+  let savedIdTree;
+  if (!(result instanceof Promise) && componentCalledUseId()) {
+    savedIdTree = pushTreeContext(1, 0);
+  }
   const finish = () => {
+    if (savedIdTree !== void 0)
+      popTreeContext(savedIdTree);
     popComponentScope(savedScope);
     if (isProvider)
       popContextValue(ctx, prevCtxValue);
@@ -728,22 +792,33 @@ function renderComponent(type, props, writer, isSvg) {
     const m = captureMap();
     return result.then((resolved) => {
       swapContextMap(m);
+      let asyncSavedIdTree;
+      if (componentCalledUseId()) {
+        asyncSavedIdTree = pushTreeContext(1, 0);
+      }
+      const asyncFinish = () => {
+        if (asyncSavedIdTree !== void 0)
+          popTreeContext(asyncSavedIdTree);
+        popComponentScope(savedScope);
+        if (isProvider)
+          popContextValue(ctx, prevCtxValue);
+      };
       const r2 = renderNode(resolved, writer, isSvg);
       if (r2 && typeof r2.then === "function") {
         const m2 = captureMap();
         return r2.then(
           () => {
             swapContextMap(m2);
-            finish();
+            asyncFinish();
           },
           (e) => {
             swapContextMap(m2);
-            finish();
+            asyncFinish();
             throw e;
           }
         );
       }
-      finish();
+      asyncFinish();
     }, (e) => {
       swapContextMap(m);
       finish();
@@ -823,8 +898,8 @@ async function renderSuspense(props, writer, isSvg = false) {
   const snap = snapshotContext();
   while (attempts < MAX_SUSPENSE_RETRIES) {
     restoreContext(snap);
+    let buffer = new BufferWriter();
     try {
-      const buffer = new BufferWriter();
       const r = renderNode(children, buffer, isSvg);
       if (r && typeof r.then === "function") {
         const m = captureMap();
@@ -858,12 +933,13 @@ async function renderSuspense(props, writer, isSvg = false) {
   }
   writer.write("<!--/$-->");
 }
-function renderToStream(element) {
+function renderToStream(element, options) {
   const encoder = new TextEncoder();
+  const idPrefix = options?.identifierPrefix ?? "";
   const contextMap = /* @__PURE__ */ new Map();
   return new ReadableStream({
     async start(controller) {
-      resetRenderState();
+      resetRenderState(idPrefix);
       const prev = swapContextMap(contextMap);
       const writer = {
         lastWasText: false,
@@ -892,12 +968,13 @@ function renderToStream(element) {
     }
   });
 }
-async function renderToString(element) {
+async function renderToString(element, options) {
+  const idPrefix = options?.identifierPrefix ?? "";
   const contextMap = /* @__PURE__ */ new Map();
   const prev = swapContextMap(contextMap);
   try {
     for (let attempt = 0; attempt < MAX_SUSPENSE_RETRIES; attempt++) {
-      resetRenderState();
+      resetRenderState(idPrefix);
       swapContextMap(contextMap);
       const chunks = [];
       const writer = {

package/dist/slim-react/index.d.ts

@@ -80,19 +80,27 @@ declare function createContext<T>(defaultValue: T): Context<T>;
  * until the async data is ready, then continues – exactly as requested.
  */
 
+interface RenderOptions {
+    /**
+     * Must match the `identifierPrefix` option passed to `hydrateRoot` on the
+     * client so that `useId()` generates identical IDs on server and client.
+     * Defaults to `""` (React's default).
+     */
+    identifierPrefix?: string;
+}
 /**
  * Render a component tree to a `ReadableStream<Uint8Array>`.
  *
  * The stream pauses at `<Suspense>` boundaries until the suspended
  * promise resolves, then continues writing HTML.
  */
-declare function renderToStream(element: SlimNode): ReadableStream<Uint8Array>;
+declare function renderToStream(element: SlimNode, options?: RenderOptions): ReadableStream<Uint8Array>;
 /**
  * Convenience: render to a complete HTML string.
  * Retries the full tree when a component throws a Promise (Suspense protocol),
  * so useServerData and similar hooks work without requiring explicit <Suspense>.
  */
-declare function renderToString(element: SlimNode): Promise<string>;
+declare function renderToString(element: SlimNode, options?: RenderOptions): Promise<string>;
 
 /**
  * slim-react – a lightweight, SSR-only React-compatible runtime.
@@ -179,4 +187,4 @@ declare const React: {
     version: string;
 };
 
-export { Children, Component, Context, PureComponent, SlimElement, SlimNode, Suspense, cloneElement, createContext, createElement, React as default, forwardRef, isValidElement, lazy, memo, renderToStream as renderToReadableStream, renderToStream, renderToString, startTransition, use, useActionState, useCallback, useContext, useDebugValue, useDeferredValue, useEffect, useFormStatus, useId, useImperativeHandle, useInsertionEffect, useLayoutEffect, useMemo, useOptimistic, useReducer, useRef, useState, useSyncExternalStore, useTransition, version };
+export { Children, Component, Context, PureComponent, RenderOptions, SlimElement, SlimNode, Suspense, cloneElement, createContext, createElement, React as default, forwardRef, isValidElement, lazy, memo, renderToStream as renderToReadableStream, renderToStream, renderToString, startTransition, use, useActionState, useCallback, useContext, useDebugValue, useDeferredValue, useEffect, useFormStatus, useId, useImperativeHandle, useInsertionEffect, useLayoutEffect, useMemo, useOptimistic, useReducer, useRef, useState, useSyncExternalStore, useTransition, version };