@fluixi/core 1.0.0-alpha.82 → 1.0.0-alpha.84

package/dist/src/lib/server/hydration.cjs

@@ -1 +1,169 @@
-"use strict";var a=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var g=Object.getOwnPropertyNames;var m=Object.prototype.hasOwnProperty;var w=(t,n)=>{for(var e in n)a(t,e,{get:n[e],enumerable:!0})},x=(t,n,e,r)=>{if(n&&typeof n=="object"||typeof n=="function")for(let o of g(n))!m.call(t,o)&&o!==e&&a(t,o,{get:()=>n[o],enumerable:!(r=l(n,o))||r.enumerable});return t};var h=t=>x(a({},"__esModule",{value:!0}),t);var F={};w(F,{cleanupHydration:()=>y,clearHydrationData:()=>p,clearHydrationDataKey:()=>D,createHydratableResource:()=>M,deserializeHydrationData:()=>b,generateMarkerID:()=>v,getHydrationData:()=>s,hasHydrationData:()=>_,hydrationMarker:()=>E,hydrationMarkerEnd:()=>O,hydrationMarkerStart:()=>N,isClientEnvironment:()=>C,isHydrating:()=>f,isServerEnvironment:()=>k,serializeHydrationData:()=>I,setHydrating:()=>T,setHydrationData:()=>d,useHydrationData:()=>j});module.exports=h(F);var c=!1,i=new Map,H=0;function f(){return c}function T(t){c=t}function d(t,n){i.set(t,n)}function s(t){return i.get(t)}function _(t){return i.has(t)}function p(){i.clear()}function D(t){i.delete(t)}function I(){if(i.size===0)return"";let t=Object.fromEntries(i);return`<script type="application/json" id="__FLUIXI_HYDRATION__">${JSON.stringify(t)}<\/script>`}function b(){if(typeof window>"u")return!1;let t=document.getElementById("__FLUIXI_HYDRATION__");if(!t||t.getAttribute("type")!=="application/json")return!1;try{let n=t.textContent||"{}",e=JSON.parse(n);for(let[r,o]of Object.entries(e))i.set(r,o);return!0}catch(n){return console.error("Failed to deserialize hydration data:",n),!1}}function v(){return`h${H++}`}function E(t){return`<!--#${t}-->`}function N(t){return`<!--#${t}-->`}function O(t){return`<!--/${t}-->`}function M(t,n){return async()=>{if(f()||typeof window<"u"){let r=s(t);if(r!==void 0)return r}let e=await n();return typeof window>"u"&&d(t,e),e}}function j(t,n){let e=s(t);if(e!==void 0)return e;let r=typeof n=="function"?n():n;return typeof window>"u"&&d(t,r),r}function y(){if(typeof window>"u")return;let t=document.getElementById("__FLUIXI_HYDRATION__");t&&t.remove();let n=document.createTreeWalker(document.body,NodeFilter.SHOW_COMMENT,null),e=[],r;for(;r=n.nextNode();){let o=r,u=o.nodeValue||"";(u.startsWith("#")||u.startsWith("/"))&&e.push(o)}e.forEach(o=>o.remove()),p()}typeof window<"u"&&window.addEventListener("load",()=>{setTimeout(y,100)});function k(){return typeof window>"u"}function C(){return typeof window<"u"}
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/lib/server/hydration.ts
+var hydration_exports = {};
+__export(hydration_exports, {
+  cleanupHydration: () => cleanupHydration,
+  clearHydrationData: () => clearHydrationData,
+  clearHydrationDataKey: () => clearHydrationDataKey,
+  createHydratableResource: () => createHydratableResource,
+  deserializeHydrationData: () => deserializeHydrationData,
+  generateMarkerID: () => generateMarkerID,
+  getHydrationData: () => getHydrationData,
+  hasHydrationData: () => hasHydrationData,
+  hydrationMarker: () => hydrationMarker,
+  hydrationMarkerEnd: () => hydrationMarkerEnd,
+  hydrationMarkerStart: () => hydrationMarkerStart,
+  isClientEnvironment: () => isClientEnvironment,
+  isHydrating: () => isHydrating,
+  isServerEnvironment: () => isServerEnvironment,
+  serializeHydrationData: () => serializeHydrationData,
+  setHydrating: () => setHydrating,
+  setHydrationData: () => setHydrationData,
+  useHydrationData: () => useHydrationData
+});
+module.exports = __toCommonJS(hydration_exports);
+var import_dom = require("@fluixi/dom");
+var hydrating = false;
+var hydrationDataMap = /* @__PURE__ */ new Map();
+var markerCounter = 0;
+function isHydrating() {
+  return hydrating;
+}
+function setHydrating(state) {
+  hydrating = state;
+}
+function setHydrationData(key, data) {
+  hydrationDataMap.set(key, data);
+}
+function getHydrationData(key) {
+  return hydrationDataMap.get(key);
+}
+function hasHydrationData(key) {
+  return hydrationDataMap.has(key);
+}
+function clearHydrationData() {
+  hydrationDataMap.clear();
+}
+function clearHydrationDataKey(key) {
+  hydrationDataMap.delete(key);
+}
+function serializeHydrationData() {
+  if (hydrationDataMap.size === 0) {
+    return "";
+  }
+  const data = Object.fromEntries(hydrationDataMap);
+  const json = JSON.stringify(data);
+  return `<script type="application/json" id="__FLUIXI_HYDRATION__">${json}<\/script>`;
+}
+function deserializeHydrationData() {
+  if (typeof window === "undefined") {
+    return false;
+  }
+  const script = document.getElementById("__FLUIXI_HYDRATION__");
+  if (!script || script.getAttribute("type") !== "application/json") {
+    return false;
+  }
+  try {
+    const json = script.textContent || "{}";
+    const data = JSON.parse(json);
+    for (const [key, value] of Object.entries(data)) {
+      hydrationDataMap.set(key, value);
+    }
+    return true;
+  } catch (error) {
+    console.error("Failed to deserialize hydration data:", error);
+    return false;
+  }
+}
+function generateMarkerID() {
+  return `h${markerCounter++}`;
+}
+function hydrationMarker(id) {
+  return `<!--#${id}-->`;
+}
+function hydrationMarkerStart(id) {
+  return `<!--#${id}-->`;
+}
+function hydrationMarkerEnd(id) {
+  return `<!--/${id}-->`;
+}
+function createHydratableResource(key, fetcher) {
+  return async () => {
+    if (isHydrating() || typeof window !== "undefined") {
+      const cached = getHydrationData(key);
+      if (cached !== void 0) {
+        return cached;
+      }
+    }
+    const data = await fetcher();
+    if (typeof window === "undefined") {
+      setHydrationData(key, data);
+    }
+    return data;
+  };
+}
+function useHydrationData(key, value) {
+  const hydrationData = getHydrationData(key);
+  if (hydrationData !== void 0) {
+    return hydrationData;
+  }
+  const computedValue = typeof value === "function" ? value() : value;
+  if (typeof window === "undefined") {
+    setHydrationData(key, computedValue);
+  }
+  return computedValue;
+}
+function cleanupHydration() {
+  if (typeof window === "undefined") {
+    return;
+  }
+  const script = document.getElementById("__FLUIXI_HYDRATION__");
+  if (script) {
+    script.remove();
+  }
+  const walker = document.createTreeWalker(
+    document.body,
+    NodeFilter.SHOW_COMMENT,
+    null
+  );
+  const comments = [];
+  let node;
+  while (node = walker.nextNode()) {
+    const comment = node;
+    const text = comment.nodeValue || "";
+    if (text.startsWith("#") || text.startsWith("/")) {
+      comments.push(comment);
+    }
+  }
+  comments.forEach((comment) => comment.remove());
+  clearHydrationData();
+}
+if (typeof window !== "undefined") {
+  window.addEventListener("load", () => {
+    setTimeout(cleanupHydration, 100);
+  });
+}
+function isServerEnvironment() {
+  return (0, import_dom.isServer)();
+}
+function isClientEnvironment() {
+  return !(0, import_dom.isServer)();
+}

package/dist/src/lib/server/hydration.d.ts

@@ -1,5 +1,4 @@
 /**
- * @fileoverview Hydration utilities for Fluixi
  * @module @fluixi/core/server/hydration
  *
  * Hydration:
@@ -17,9 +16,7 @@ export interface HydrationData {
 /**
  * Check if currently hydrating
  *
- * Section 11: During hydration, DOM is reused, not recreated
- *
- * @returns {boolean} True if hydrating
+ * During hydration, DOM is reused, not recreated
  *
  * @example
  * ```typescript
@@ -34,19 +31,15 @@ export declare function isHydrating(): boolean;
 /**
  * Set hydration state
  *
- * @param {boolean} state - Hydration state
  * @internal
  */
 export declare function setHydrating(state: boolean): void;
 /**
  * Store data for hydration
  *
- * Section 11: On server, store data to serialize into HTML
+ * On server, store data to serialize into HTML
  * On client during hydration, this data is reused
  *
- * @param {string} key - Unique key
- * @param {any} data - Data to store
- *
  * @example
  * ```typescript
  * import { setHydrationData } from '@fluixi/core/server';
@@ -59,10 +52,7 @@ export declare function setHydrationData(key: string, data: any): void;
 /**
  * Get hydration data
  *
- * Section 11: On client, retrieve data stored on server
- *
- * @param {string} key - Unique key
- * @returns {any} Data or undefined
+ * On client, retrieve data stored on server
  *
  * @example
  * ```typescript
@@ -75,9 +65,6 @@ export declare function setHydrationData(key: string, data: any): void;
 export declare function getHydrationData(key: string): any;
 /**
  * Check if hydration data exists
- *
- * @param {string} key - Unique key
- * @returns {boolean} True if exists
  */
 export declare function hasHydrationData(key: string): boolean;
 /**
@@ -88,16 +75,12 @@ export declare function hasHydrationData(key: string): boolean;
 export declare function clearHydrationData(): void;
 /**
  * Clear specific hydration data
- *
- * @param {string} key - Key to clear
  */
 export declare function clearHydrationDataKey(key: string): void;
 /**
  * Serialize hydration data to script tag
  *
- * Section 11: Embed data in HTML for client hydration
- *
- * @returns {string} Script tag with JSON data
+ * Embed data in HTML for client hydration
  *
  * @example
  * ```typescript
@@ -112,9 +95,7 @@ export declare function serializeHydrationData(): string;
 /**
  * Deserialize hydration data from DOM
  *
- * Section 11: On client, load data from script tag
- *
- * @returns {boolean} True if data was loaded
+ * On client, load data from script tag
  *
  * @example
  * ```typescript
@@ -130,17 +111,13 @@ export declare function deserializeHydrationData(): boolean;
 /**
  * Generate unique hydration marker ID
  *
- * @returns {string} Unique marker ID
  * @internal
  */
 export declare function generateMarkerID(): string;
 /**
  * Create hydration marker
  *
- * Section 11: Structural markers required for hydration points
- *
- * @param {string} id - Marker ID
- * @returns {string} HTML comment marker
+ * Structural markers required for hydration points
  *
  * @example
  * ```typescript
@@ -153,29 +130,18 @@ export declare function generateMarkerID(): string;
 export declare function hydrationMarker(id: string): string;
 /**
  * Create start hydration marker
- *
- * @param {string} id - Marker ID
- * @returns {string} Start marker
  */
 export declare function hydrationMarkerStart(id: string): string;
 /**
  * Create end hydration marker
- *
- * @param {string} id - Marker ID
- * @returns {string} End marker
  */
 export declare function hydrationMarkerEnd(id: string): string;
 /**
  * Create hydration-friendly resource
  *
- * Section 11: Resources loaded on server are serialized
+ * Resources loaded on server are serialized
  * On client, reused during hydration (no re-fetch)
  *
- * @template T
- * @param {string} key - Unique resource key
- * @param {() => Promise<T>} fetcher - Resource fetcher
- * @returns {() => Promise<T>} Hydration-aware fetcher
- *
  * @example
  * ```typescript
  * import { createHydratableResource } from '@fluixi/core/server';
@@ -190,14 +156,9 @@ export declare function createHydratableResource<T>(key: string, fetcher: () =>
 /**
  * Use hydration data in component
  *
- * Section 11: Components use hydration data to restore state
+ * Components use hydration data to restore state
  * without re-execution
  *
- * @template T
- * @param {string} key - Data key
- * @param {T | (() => T)} value - Value or getter
- * @returns {T} Value
- *
  * @example
  * ```typescript
  * import { useHydrationData } from '@fluixi/core/server';
@@ -212,7 +173,7 @@ export declare function useHydrationData<T>(key: string, value: T | (() => T)):
 /**
  * Cleanup hydration artifacts from DOM
  *
- * Section 11: After hydration, remove markers and serialized data
+ * After hydration, remove markers and serialized data
  *
  * @example
  * ```typescript
@@ -224,15 +185,14 @@ export declare function useHydrationData<T>(key: string, value: T | (() => T)):
  */
 export declare function cleanupHydration(): void;
 /**
- * Check if on server
+ * Whether this is a server render.
  *
- * @returns {boolean} True if server
+ * Defers to `@fluixi/dom`, which keeps the flag on a realm singleton that
+ * `renderToString` sets. A local `typeof window` test disagrees with it inside a jsdom
+ * process, which is where server rendering is usually tested, and `router/data.ts`
+ * branches on this to decide whether a loader may touch the client.
  */
 export declare function isServerEnvironment(): boolean;
-/**
- * Check if on client
- *
- * @returns {boolean} True if client
- */
+/** Whether this is running in a browser, the negation of a server render. */
 export declare function isClientEnvironment(): boolean;
 //# sourceMappingURL=hydration.d.ts.map

package/dist/src/lib/server/hydration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydration.d.ts","sourceRoot":"","sources":["../../../../src/lib/server/hydration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AA2BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAEjD;AAMD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI,CAE7D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAEjD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAEvD;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAS/C;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,wBAAwB,IAAI,OAAO,CAuBlD;AAMD;;;;;GAKG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAErD;AAMD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACxB,MAAM,OAAO,CAAC,CAAC,CAAC,CAoBlB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAiBxE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAiCvC;AAgBD;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C"}
+{"version":3,"file":"hydration.d.ts","sourceRoot":"","sources":["../../../../src/lib/server/hydration.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AA2BD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAEjD;AAMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI,CAE7D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAEjD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAErD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAEvD;AAMD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAS/C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,IAAI,OAAO,CAuBlD;AAMD;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAElD;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAErD;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EACxC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACxB,MAAM,OAAO,CAAC,CAAC,CAAC,CAoBlB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAiBxE;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAiCvC;AAgBD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C;AAED,6EAA6E;AAC7E,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C"}

package/dist/src/lib/server/hydration.js

@@ -1,5 +1,4 @@
 /**
- * @fileoverview Hydration utilities for Fluixi
  * @module @fluixi/core/server/hydration
  *
  * Hydration:
@@ -8,12 +7,13 @@
  * - Bindings reattached
  * - Structural markers required
  */
+import { isServer as domIsServer } from '@fluixi/dom';
 // ============================================================================
 // STATE
 // ============================================================================
 /**
  * Global hydration flag
- * Section 11: Indicates if we're currently hydrating
+ * Indicates if we're currently hydrating
  */
 let hydrating = false;
 /**
@@ -31,9 +31,7 @@ let markerCounter = 0;
 /**
  * Check if currently hydrating
  *
- * Section 11: During hydration, DOM is reused, not recreated
- *
- * @returns {boolean} True if hydrating
+ * During hydration, DOM is reused, not recreated
  *
  * @example
  * ```typescript
@@ -50,7 +48,6 @@ export function isHydrating() {
 /**
  * Set hydration state
  *
- * @param {boolean} state - Hydration state
  * @internal
  */
 export function setHydrating(state) {
@@ -62,12 +59,9 @@ export function setHydrating(state) {
 /**
  * Store data for hydration
  *
- * Section 11: On server, store data to serialize into HTML
+ * On server, store data to serialize into HTML
  * On client during hydration, this data is reused
  *
- * @param {string} key - Unique key
- * @param {any} data - Data to store
- *
  * @example
  * ```typescript
  * import { setHydrationData } from '@fluixi/core/server';
@@ -82,10 +76,7 @@ export function setHydrationData(key, data) {
 /**
  * Get hydration data
  *
- * Section 11: On client, retrieve data stored on server
- *
- * @param {string} key - Unique key
- * @returns {any} Data or undefined
+ * On client, retrieve data stored on server
  *
  * @example
  * ```typescript
@@ -100,9 +91,6 @@ export function getHydrationData(key) {
 }
 /**
  * Check if hydration data exists
- *
- * @param {string} key - Unique key
- * @returns {boolean} True if exists
  */
 export function hasHydrationData(key) {
     return hydrationDataMap.has(key);
@@ -117,8 +105,6 @@ export function clearHydrationData() {
 }
 /**
  * Clear specific hydration data
- *
- * @param {string} key - Key to clear
  */
 export function clearHydrationDataKey(key) {
     hydrationDataMap.delete(key);
@@ -129,9 +115,7 @@ export function clearHydrationDataKey(key) {
 /**
  * Serialize hydration data to script tag
  *
- * Section 11: Embed data in HTML for client hydration
- *
- * @returns {string} Script tag with JSON data
+ * Embed data in HTML for client hydration
  *
  * @example
  * ```typescript
@@ -153,9 +137,7 @@ export function serializeHydrationData() {
 /**
  * Deserialize hydration data from DOM
  *
- * Section 11: On client, load data from script tag
- *
- * @returns {boolean} True if data was loaded
+ * On client, load data from script tag
  *
  * @example
  * ```typescript
@@ -194,7 +176,6 @@ export function deserializeHydrationData() {
 /**
  * Generate unique hydration marker ID
  *
- * @returns {string} Unique marker ID
  * @internal
  */
 export function generateMarkerID() {
@@ -203,10 +184,7 @@ export function generateMarkerID() {
 /**
  * Create hydration marker
  *
- * Section 11: Structural markers required for hydration points
- *
- * @param {string} id - Marker ID
- * @returns {string} HTML comment marker
+ * Structural markers required for hydration points
  *
  * @example
  * ```typescript
@@ -221,18 +199,12 @@ export function hydrationMarker(id) {
 }
 /**
  * Create start hydration marker
- *
- * @param {string} id - Marker ID
- * @returns {string} Start marker
  */
 export function hydrationMarkerStart(id) {
     return `<!--#${id}-->`;
 }
 /**
  * Create end hydration marker
- *
- * @param {string} id - Marker ID
- * @returns {string} End marker
  */
 export function hydrationMarkerEnd(id) {
     return `<!--/${id}-->`;
@@ -243,14 +215,9 @@ export function hydrationMarkerEnd(id) {
 /**
  * Create hydration-friendly resource
  *
- * Section 11: Resources loaded on server are serialized
+ * Resources loaded on server are serialized
  * On client, reused during hydration (no re-fetch)
  *
- * @template T
- * @param {string} key - Unique resource key
- * @param {() => Promise<T>} fetcher - Resource fetcher
- * @returns {() => Promise<T>} Hydration-aware fetcher
- *
  * @example
  * ```typescript
  * import { createHydratableResource } from '@fluixi/core/server';
@@ -263,7 +230,7 @@ export function hydrationMarkerEnd(id) {
  */
 export function createHydratableResource(key, fetcher) {
     return async () => {
-        // Section 11: During hydration or on client, check for cached data
+        // During hydration or on client, check for cached data
         if (isHydrating() || typeof window !== 'undefined') {
             const cached = getHydrationData(key);
             if (cached !== undefined) {
@@ -272,7 +239,7 @@ export function createHydratableResource(key, fetcher) {
         }
         // Server or no cache: fetch data
         const data = await fetcher();
-        // Section 11: On server, store for serialization
+        // On server, store for serialization
         if (typeof window === 'undefined') {
             setHydrationData(key, data);
         }
@@ -282,14 +249,9 @@ export function createHydratableResource(key, fetcher) {
 /**
  * Use hydration data in component
  *
- * Section 11: Components use hydration data to restore state
+ * Components use hydration data to restore state
  * without re-execution
  *
- * @template T
- * @param {string} key - Data key
- * @param {T | (() => T)} value - Value or getter
- * @returns {T} Value
- *
  * @example
  * ```typescript
  * import { useHydrationData } from '@fluixi/core/server';
@@ -301,14 +263,14 @@ export function createHydratableResource(key, fetcher) {
  * ```
  */
 export function useHydrationData(key, value) {
-    // Section 11: Check for hydration data first
+    // Check for hydration data first
     const hydrationData = getHydrationData(key);
     if (hydrationData !== undefined) {
         return hydrationData;
     }
     // Compute or use provided value
     const computedValue = typeof value === 'function' ? value() : value;
-    // Section 11: On server, store for serialization
+    // On server, store for serialization
     if (typeof window === 'undefined') {
         setHydrationData(key, computedValue);
     }
@@ -320,7 +282,7 @@ export function useHydrationData(key, value) {
 /**
  * Cleanup hydration artifacts from DOM
  *
- * Section 11: After hydration, remove markers and serialized data
+ * After hydration, remove markers and serialized data
  *
  * @example
  * ```typescript
@@ -367,18 +329,17 @@ if (typeof window !== 'undefined') {
 // ENVIRONMENT HELPERS
 // ============================================================================
 /**
- * Check if on server
+ * Whether this is a server render.
  *
- * @returns {boolean} True if server
+ * Defers to `@fluixi/dom`, which keeps the flag on a realm singleton that
+ * `renderToString` sets. A local `typeof window` test disagrees with it inside a jsdom
+ * process, which is where server rendering is usually tested, and `router/data.ts`
+ * branches on this to decide whether a loader may touch the client.
  */
 export function isServerEnvironment() {
-    return typeof window === 'undefined';
+    return domIsServer();
 }
-/**
- * Check if on client
- *
- * @returns {boolean} True if client
- */
+/** Whether this is running in a browser, the negation of a server render. */
 export function isClientEnvironment() {
-    return typeof window !== 'undefined';
+    return !domIsServer();
 }