@solidjs/web 2.0.0-beta.32 → 2.0.0-beta.34

package/dist/web.cjs

@@ -302,6 +302,27 @@ function serializeCookie(name, value, options = {}) {
   }
   return cookie;
 }
+const FLASH_COOKIE = "flash";
+const FLASH_MATCHER = new RegExp(`(?:^|;\\s*)${FLASH_COOKIE}=([^;]+)`);
+function hasFlashCookie(cookieHeader) {
+  return !!cookieHeader && FLASH_MATCHER.test(cookieHeader);
+}
+function clearFlashCookie() {
+  return `${FLASH_COOKIE}=; Max-Age=0; Path=/`;
+}
+
+const SERVER_FUNCTION_METADATA = Symbol.for("solid.ServerFunctionMetadata");
+function getServerFunctionMetadata(fn) {
+  if (typeof fn !== "function") return undefined;
+  return fn[SERVER_FUNCTION_METADATA] || undefined;
+}
+function isServerFunction(fn) {
+  return typeof fn === "function" && !!fn[SERVER_FUNCTION_METADATA];
+}
+const SERVER_FUNCTION_RPC = Symbol.for("solid.ServerFunctionRPC");
+function getServerFunctionRPC() {
+  return globalThis[SERVER_FUNCTION_RPC];
+}
 
 const $$EVENT_OWNER = "_$DX_EVENT_OWNER";
 const INNER_OWNED = {};
@@ -652,8 +673,7 @@ function insert(parent, accessor, marker, initial, options) {
     const value = normalize(accessor(), current, multi, true);
     if (typeof value !== "function") return value;
     effect(() => (hydrationRt !== null && (current = hydrationRt.reclaimRegion(current, parent, marker)), normalize(value, current, multi)), inner => {
-      insertExpression(parent, inner, current, marker);
-      current = inner;
+      current = insertExpression(parent, inner, current, marker);
       host && tagHost(current, host);
     }, prev !== undefined && !(options && options.schedule) ? {
       ...options,
@@ -662,8 +682,7 @@ function insert(parent, accessor, marker, initial, options) {
     return INNER_OWNED;
   }, value => {
     if (value === INNER_OWNED) return;
-    insertExpression(parent, value, current, marker);
-    current = value;
+    current = insertExpression(parent, value, current, marker);
     host && tagHost(current, host);
   },
   accessor.$s ? options ? {
@@ -1139,13 +1158,19 @@ function hydrate$1(code, element, options = {}) {
     });
   };
   solidJs.sharedConfig.hydrating = true;
-  const rootMapping = globalThis._$HY.r && globalThis._$HY.r["_assets"];
+  const hyr = globalThis._$HY.r;
+  const rootMapping = hyr && (hyr[options.renderId + "_assets"] || hyr["_assets"]);
   if (rootMapping && typeof rootMapping === "object") {
     const p = loadModuleAssets(rootMapping);
     if (p) {
       gatherHydratable(element, options.renderId);
+      const registry = solidJs.sharedConfig.registry;
+      const gather = solidJs.sharedConfig.gather;
       let disposer;
       p.then(() => {
+        solidJs.sharedConfig.registry = registry;
+        solidJs.sharedConfig.gather = gather;
+        solidJs.sharedConfig.hydrating = true;
         try {
           disposer = render$1(code, element, [...element.childNodes], options);
         } finally {
@@ -1392,8 +1417,11 @@ function eventHandler(e, container, state) {
   retarget(oriTarget);
 }
 function insertExpression(parent, value, current, marker) {
-  if (hydrationRt !== null && isHydrating(parent)) return;
-  if (value === current) return;
+  if (hydrationRt !== null && isHydrating(parent)) {
+    if (value && value !== current) for (const n of Array.isArray(value) ? value : [value]) if (n && n.nodeType && !isHydrating(n)) return current;
+    return value;
+  }
+  if (value === current) return value;
   const t = typeof value,
     multi = marker !== undefined;
   if (t === "string" || t === "number") {
@@ -1432,6 +1460,7 @@ function insertExpression(parent, value, current, marker) {
       appendNodes(parent, value);
     }
   } else ;
+  return value;
 }
 function normalize(value, current, multi, doNotUnwrap) {
   value = solidJs.flatten(value, {
@@ -1569,13 +1598,17 @@ function resolveSSRNode(node, result, top) {}
 function escape(s, attr) {}
 
 const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
-class ResponseEnvelope {
-  constructor(response, value) {
-    this.response = response;
-    this.value = value;
+// PURE-annotated factory (same convention as solid's MockPromise): the brand
+const ResponseEnvelope = /* @__PURE__ */(() => {
+  class ResponseEnvelope {
+    constructor(response, value) {
+      this.response = response;
+      this.value = value;
+    }
   }
-}
-ResponseEnvelope.prototype[ENVELOPE] = true;
+  ResponseEnvelope.prototype[ENVELOPE] = true;
+  return ResponseEnvelope;
+})();
 function isResponseEnvelope(value) {
   return !!(value && typeof value === "object" && value[ENVELOPE]);
 }
@@ -1691,7 +1724,8 @@ function portalImpl(props) {
     endMarker = document.createTextNode(""),
     mount = () => props.mount || document.body,
     content = solidJs.createMemo(() => [startMarker, props.children], {
-      ssrSource: "client"
+      ssrSource: "client",
+      loadingValue: undefined
     });
   solidJs.createRenderEffect(
   () => [mount(), content(), solidJs.getOwner()], ([, c, owner]) => {
@@ -1728,7 +1762,8 @@ function portalImpl(props) {
     ssrSource: "client"
   });
   if (solidJs.sharedConfig.hydrating) return solidJs.createMemo(() => treeMarker, {
-    ssrSource: "client"
+    ssrSource: "client",
+    loadingValue: undefined
   });
   return treeMarker;
 }
@@ -1812,7 +1847,9 @@ _moduleUrl) {
     if ((Comp = solidJs.untrack(comp)) && !solidJs.sharedConfig.hydrating) return Comp(rest);
     const [mounted, setMounted] = solidJs.createSignal(!solidJs.sharedConfig.hydrating);
     const gate = solidJs.createMemo(() => (Comp = comp(), m = mounted(), solidJs.untrack(() => Comp && m ? Comp(rest) : props.fallback)));
-    solidJs.sharedConfig.onHydrationEnd(() => setMounted(true));
+    const onHydrationEnd = solidJs.sharedConfig.onHydrationEnd;
+    const release = () => setMounted(true);
+    onHydrationEnd ? onHydrationEnd(release) : queueMicrotask(release);
     return gate;
   };
 }
@@ -1895,6 +1932,7 @@ exports.assign = assign;
 exports.claimElement = claimElement;
 exports.claimElementTree = claimElementTree;
 exports.className = className;
+exports.clearFlashCookie = clearFlashCookie;
 exports.clientOnly = clientOnly;
 exports.commitEventResponse = commitEventResponse;
 exports.composeMiddleware = composeMiddleware;
@@ -1916,6 +1954,9 @@ exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.getNextSibling = getNextSibling;
 exports.getRequestEvent = voidFn;
+exports.getServerFunctionMetadata = getServerFunctionMetadata;
+exports.getServerFunctionRPC = getServerFunctionRPC;
+exports.hasFlashCookie = hasFlashCookie;
 exports.httpHeader = httpHeader;
 exports.httpStatus = httpStatus;
 exports.hydrate = hydrate;
@@ -1926,6 +1967,7 @@ exports.isHref = isHref;
 exports.isResponseEnvelope = isResponseEnvelope;
 exports.isSafeError = isSafeError;
 exports.isServer = isServer;
+exports.isServerFunction = isServerFunction;
 exports.markSafeError = markSafeError;
 exports.memo = memo;
 exports.mergeProps = mergeProps;

package/dist/web.js

@@ -301,6 +301,27 @@ function serializeCookie(name, value, options = {}) {
   }
   return cookie;
 }
+const FLASH_COOKIE = "flash";
+const FLASH_MATCHER = new RegExp(`(?:^|;\\s*)${FLASH_COOKIE}=([^;]+)`);
+function hasFlashCookie(cookieHeader) {
+  return !!cookieHeader && FLASH_MATCHER.test(cookieHeader);
+}
+function clearFlashCookie() {
+  return `${FLASH_COOKIE}=; Max-Age=0; Path=/`;
+}
+
+const SERVER_FUNCTION_METADATA = Symbol.for("solid.ServerFunctionMetadata");
+function getServerFunctionMetadata(fn) {
+  if (typeof fn !== "function") return undefined;
+  return fn[SERVER_FUNCTION_METADATA] || undefined;
+}
+function isServerFunction(fn) {
+  return typeof fn === "function" && !!fn[SERVER_FUNCTION_METADATA];
+}
+const SERVER_FUNCTION_RPC = Symbol.for("solid.ServerFunctionRPC");
+function getServerFunctionRPC() {
+  return globalThis[SERVER_FUNCTION_RPC];
+}
 
 const $$EVENT_OWNER = "_$DX_EVENT_OWNER";
 const INNER_OWNED = {};
@@ -651,8 +672,7 @@ function insert(parent, accessor, marker, initial, options) {
     const value = normalize(accessor(), current, multi, true);
     if (typeof value !== "function") return value;
     effect(() => (hydrationRt !== null && (current = hydrationRt.reclaimRegion(current, parent, marker)), normalize(value, current, multi)), inner => {
-      insertExpression(parent, inner, current, marker);
-      current = inner;
+      current = insertExpression(parent, inner, current, marker);
       host && tagHost(current, host);
     }, prev !== undefined && !(options && options.schedule) ? {
       ...options,
@@ -661,8 +681,7 @@ function insert(parent, accessor, marker, initial, options) {
     return INNER_OWNED;
   }, value => {
     if (value === INNER_OWNED) return;
-    insertExpression(parent, value, current, marker);
-    current = value;
+    current = insertExpression(parent, value, current, marker);
     host && tagHost(current, host);
   },
   accessor.$s ? options ? {
@@ -1138,13 +1157,19 @@ function hydrate$1(code, element, options = {}) {
     });
   };
   sharedConfig.hydrating = true;
-  const rootMapping = globalThis._$HY.r && globalThis._$HY.r["_assets"];
+  const hyr = globalThis._$HY.r;
+  const rootMapping = hyr && (hyr[options.renderId + "_assets"] || hyr["_assets"]);
   if (rootMapping && typeof rootMapping === "object") {
     const p = loadModuleAssets(rootMapping);
     if (p) {
       gatherHydratable(element, options.renderId);
+      const registry = sharedConfig.registry;
+      const gather = sharedConfig.gather;
       let disposer;
       p.then(() => {
+        sharedConfig.registry = registry;
+        sharedConfig.gather = gather;
+        sharedConfig.hydrating = true;
         try {
           disposer = render$1(code, element, [...element.childNodes], options);
         } finally {
@@ -1391,8 +1416,11 @@ function eventHandler(e, container, state) {
   retarget(oriTarget);
 }
 function insertExpression(parent, value, current, marker) {
-  if (hydrationRt !== null && isHydrating(parent)) return;
-  if (value === current) return;
+  if (hydrationRt !== null && isHydrating(parent)) {
+    if (value && value !== current) for (const n of Array.isArray(value) ? value : [value]) if (n && n.nodeType && !isHydrating(n)) return current;
+    return value;
+  }
+  if (value === current) return value;
   const t = typeof value,
     multi = marker !== undefined;
   if (t === "string" || t === "number") {
@@ -1431,6 +1459,7 @@ function insertExpression(parent, value, current, marker) {
       appendNodes(parent, value);
     }
   } else ;
+  return value;
 }
 function normalize(value, current, multi, doNotUnwrap) {
   value = flatten(value, {
@@ -1568,13 +1597,17 @@ function resolveSSRNode(node, result, top) {}
 function escape(s, attr) {}
 
 const ENVELOPE = Symbol.for("solid.ResponseEnvelope");
-class ResponseEnvelope {
-  constructor(response, value) {
-    this.response = response;
-    this.value = value;
+// PURE-annotated factory (same convention as solid's MockPromise): the brand
+const ResponseEnvelope = /* @__PURE__ */(() => {
+  class ResponseEnvelope {
+    constructor(response, value) {
+      this.response = response;
+      this.value = value;
+    }
   }
-}
-ResponseEnvelope.prototype[ENVELOPE] = true;
+  ResponseEnvelope.prototype[ENVELOPE] = true;
+  return ResponseEnvelope;
+})();
 function isResponseEnvelope(value) {
   return !!(value && typeof value === "object" && value[ENVELOPE]);
 }
@@ -1690,7 +1723,8 @@ function portalImpl(props) {
     endMarker = document.createTextNode(""),
     mount = () => props.mount || document.body,
     content = createMemo(() => [startMarker, props.children], {
-      ssrSource: "client"
+      ssrSource: "client",
+      loadingValue: undefined
     });
   createRenderEffect(
   () => [mount(), content(), getOwner()], ([, c, owner]) => {
@@ -1727,7 +1761,8 @@ function portalImpl(props) {
     ssrSource: "client"
   });
   if (sharedConfig.hydrating) return createMemo(() => treeMarker, {
-    ssrSource: "client"
+    ssrSource: "client",
+    loadingValue: undefined
   });
   return treeMarker;
 }
@@ -1811,11 +1846,13 @@ _moduleUrl) {
     if ((Comp = untrack(comp)) && !sharedConfig.hydrating) return Comp(rest);
     const [mounted, setMounted] = createSignal(!sharedConfig.hydrating);
     const gate = createMemo(() => (Comp = comp(), m = mounted(), untrack(() => Comp && m ? Comp(rest) : props.fallback)));
-    sharedConfig.onHydrationEnd(() => setMounted(true));
+    const onHydrationEnd = sharedConfig.onHydrationEnd;
+    const release = () => setMounted(true);
+    onHydrationEnd ? onHydrationEnd(release) : queueMicrotask(release);
     return gate;
   };
 }
 function httpStatus(_code, _text) {}
 function httpHeader(_name, _value, _options) {}
 
-export { ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, voidFn as HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, claimElement, claimElementTree, className, clientOnly, commitEventResponse, composeMiddleware, createRequestEvent, createResponseStub, createSSRResponse, delegateEvents, dynamic, dynamicProperty, effect, escape, voidFn as generateHydrationScript, getDelegatedRoot, getExpectedRedirectStatus, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, httpHeader, httpStatus, hydrate, insert, installHydrationRuntime, isDev, isHref, isResponseEnvelope, isSafeError, isServer, markSafeError, memo, mergeProps, parseCookieHeader, redirect, ref, registerDelegatedContainer, registerDelegatedRoot, registerElementClaim, reload, render, renderToStream, renderToString, resolveSSRNode, respond, runHydrationEvents, scope, serializeCookie, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, useHead, warmAsset };
+export { ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, voidFn as HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, acquireAsset, addEvent, applyRef, assign, claimElement, claimElementTree, className, clearFlashCookie, clientOnly, commitEventResponse, composeMiddleware, createRequestEvent, createResponseStub, createSSRResponse, delegateEvents, dynamic, dynamicProperty, effect, escape, voidFn as generateHydrationScript, getDelegatedRoot, getExpectedRedirectStatus, getFirstChild, getHydrationKey, getNextElement, getNextMarker, getNextMatch, getNextSibling, voidFn as getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, hydrate, insert, installHydrationRuntime, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, markSafeError, memo, mergeProps, parseCookieHeader, redirect, ref, registerDelegatedContainer, registerDelegatedRoot, registerElementClaim, reload, render, renderToStream, renderToString, resolveSSRNode, respond, runHydrationEvents, scope, serializeCookie, setAttribute, setAttributeNS, setProperty, setStyleProperty, spread, ssr, ssrAttribute, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrStyle, ssrStyleProperty, style, template, unregisterDelegatedContainer, unregisterDelegatedRoot, useHead, warmAsset };