@solidjs/web 2.0.0-rc.2 → 2.0.0-rc.4

package/dist/server.cjs

@@ -57,14 +57,18 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => solidJs.createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => solidJs.createMemo(() => fn(), syncOptions);
+function effect(fn, effectFn, options) {
+  solidJs.createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return solidJs.createMemo(() => fn(), syncOptions);
+}
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()
@@ -75,7 +79,7 @@ function setContainerTraceResolver(fn) {
 function setContainerTraceStreamMint(fn) {
   state.streamOf = fn;
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+const TRACE = Symbol.for("solid.container-trace");
 function materialize(marker) {
   let value = state.materialized.get(marker.$tr);
   if (value === undefined) {
@@ -94,7 +98,7 @@ function parseTrace(value, ctx) {
   };
 }
 const ContainerTracePlugin = {
-  tag: "dom-expressions/container-trace",
+  tag: "solid/container-trace",
   test(value) {
     return value != null && typeof value === "object" && TRACE in value;
   },
@@ -210,11 +214,14 @@ function isSafeError(value) {
   return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
 }
 const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
+function initWithRevalidate(init = {}) {
+  const resolved = typeof init === "number" ? {
+    status: init
+  } : init;
   const {
     revalidate,
     ...responseInit
-  } = init;
+  } = resolved;
   let headers;
   if (responseInit.headers && responseInit.headers.getSetCookie) {
     headers = new Headers();
@@ -240,13 +247,12 @@ function redirect(url, init = 302) {
   const {
     responseInit,
     headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
+  } = initWithRevalidate(init);
   if (responseInit.status === undefined) {
     responseInit.status = 302;
   }
-  headers.set("Location", String(url));
+  const target = typeof url === "string" ? url : url[HREF];
+  headers.set("Location", typeof target === "string" ? target : String(url));
   return new Response(null, {
     ...responseInit,
     headers
@@ -1877,6 +1883,15 @@ function createLiveHoles(sink, scoped) {
   const stamp = typeof solidJs.creationStamp === "function" ? solidJs.creationStamp : () => 0;
   const inScope = scoped && typeof solidJs.inServerComponentScope === "function" ? solidJs.inServerComponentScope : null;
   const stripMarkers = html => html.replace(/<!--lh:\/?\d+-->/g, "");
+  const swept = (owner, ctx, fn) => {
+    const prev = solidJs.sharedConfig.context;
+    solidJs.sharedConfig.context = ctx;
+    try {
+      return owner ? solidJs.runWithOwner(owner, fn) : fn();
+    } finally {
+      solidJs.sharedConfig.context = prev;
+    }
+  };
   function resolveHoleValue(hole) {
     const result = {
       t: [""],
@@ -1942,6 +1957,7 @@ function createLiveHoles(sink, scoped) {
       const recordsBefore = engine.recordStamp;
       const ownersBefore = stamp();
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: null,
         children: [],
@@ -1955,7 +1971,7 @@ function createLiveHoles(sink, scoped) {
           const sweepOwnersBefore = stamp();
           let res;
           try {
-            res = owner ? solidJs.runWithOwner(owner, () => resolveHoleValue(hole)) : resolveHoleValue(hole);
+            res = swept(owner, holeCtx, () => resolveHoleValue(hole));
           } catch (err) {
             b.closed = true;
             sink.closeBinding(b.key);
@@ -2063,6 +2079,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = solidJs.getOwner();
+      const holeCtx = solidJs.sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -2098,7 +2115,7 @@ function createLiveHoles(sink, scoped) {
                 if (vt === "string" || vt === "number") html += v;
               }
             };
-            owner ? solidJs.runWithOwner(owner, run) : run();
+            swept(owner, holeCtx, run);
           } catch (err) {
             if (solidJs.ssrHandleError(err, true)) return;
             b.closed = true;
@@ -2434,7 +2451,7 @@ function ssrHydrationKey() {
   const hk = getHydrationKey();
   return hk ? ` _hk=${hk}` : "";
 }
-const CLAIM_PROP = /*#__PURE__*/Symbol.for("dom-expressions.claim-prop");
+const CLAIM_PROP = /*#__PURE__*/Symbol.for("solid.claim-prop");
 const CLAIMS_STREAM = 1;
 const CLAIMS_DOCUMENT = 2;
 const CLAIM_UNSAFE = /[^A-Za-z0-9_.!~*'()-]/g;
@@ -2463,7 +2480,7 @@ function ssrClaim(map) {
 function decodeSSREntities(s) {
   return s.indexOf("&") < 0 ? s : s.replace(/&quot;/g, '"').replace(/&lt;/g, "<").replace(/&amp;/g, "&");
 }
-const SELECT_VALUE_ATTR = /\svalue="([^"]*)"/;
+const SELECT_VALUE_ATTR = /\svalue(?:="([^"]*)")?(?=[\s>]|$)/;
 function tagEnd(html, i) {
   for (let j = i + 1; j < html.length; j++) {
     const c = html.charCodeAt(j);
@@ -2515,7 +2532,7 @@ function resolveSSRSelectValues(html) {
       cand = html.indexOf("<select", e0 + 1);
       continue;
     }
-    const bound = decodeSSREntities(m[1]);
+    const bound = decodeSSREntities(m[1] ?? "");
     const sel = {
       values: /\smultiple(?=[\s>=])/.test(open) ? bound.split(",") : [bound],
       strip: cand + m.index,
@@ -2552,7 +2569,7 @@ function resolveSSRSelectValues(html) {
           const attrs = html.slice(i + 7, e);
           if (/\sselected(?=[\s=]|$)/.test(attrs)) sel.defaulted = true;else {
             const vm = SELECT_VALUE_ATTR.exec(attrs);
-            const value = vm ? decodeSSREntities(vm[1]) : decodeSSREntities(optionText(html, e + 1)).replace(/\s+/g, " ").trim();
+            const value = vm ? decodeSSREntities(vm[1] ?? "") : decodeSSREntities(optionText(html, e + 1)).replace(/\s+/g, " ").trim();
             if (sel.values.includes(value)) sel.marks.push(e);
           }
         }
@@ -3451,6 +3468,7 @@ exports.reload = reload;
 exports.render = notSup;
 exports.renderToStream = renderToStream;
 exports.renderToString = renderToString;
+exports.resolveSSRNode = resolveSSRNode;
 exports.resolveSSRSelectValues = resolveSSRSelectValues;
 exports.respond = respond;
 exports.runHydrationEvents = notSup;

package/dist/server.js

@@ -1,4 +1,4 @@
-import { createRenderEffect, createMemo, sharedConfig, createRoot, inServerComponentScope, getOwner, ssrHandleError, runWithOwner, creationStamp, createComponent, omit, getNextChildId, onCleanup, getProjectionTrace } from 'solid-js';
+import { createRenderEffect, createMemo, sharedConfig, createRoot, inServerComponentScope, getOwner, ssrHandleError, creationStamp, runWithOwner, createComponent, omit, getNextChildId, onCleanup, getProjectionTrace } from 'solid-js';
 export { Errored, For, Hydration, Loading, Match, NoHydration, Repeat, Reveal, Show, Switch, createComponent, getOwner, merge as mergeProps, ssrScope as scope, sharedConfig, untrack } from 'solid-js';
 import { Feature, createStream, Serializer, getCrossReferenceHeader } from 'seroval';
 import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
@@ -56,14 +56,18 @@ const transparentOptions = {
 const syncOptions = {
   sync: true
 };
-const effect = (fn, effectFn, options) => createRenderEffect(fn, effectFn, options ? {
-  sync: true,
-  ...options,
-  transparent: !options.scope
-} : transparentOptions);
-const memo = fn => createMemo(() => fn(), syncOptions);
+function effect(fn, effectFn, options) {
+  createRenderEffect(fn, effectFn, options ? {
+    sync: true,
+    ...options,
+    transparent: !options.scope
+  } : transparentOptions);
+}
+function memo(fn) {
+  return createMemo(() => fn(), syncOptions);
+}
 
-const STATE = Symbol.for("dom-expressions.container-trace-state");
+const STATE = Symbol.for("solid.container-trace-state");
 const state = globalThis[STATE] || (globalThis[STATE] = {
   materialized: new WeakMap(),
   materializedValues: new WeakSet()
@@ -74,7 +78,7 @@ function setContainerTraceResolver(fn) {
 function setContainerTraceStreamMint(fn) {
   state.streamOf = fn;
 }
-const TRACE = Symbol.for("dom-expressions.container-trace");
+const TRACE = Symbol.for("solid.container-trace");
 function materialize(marker) {
   let value = state.materialized.get(marker.$tr);
   if (value === undefined) {
@@ -93,7 +97,7 @@ function parseTrace(value, ctx) {
   };
 }
 const ContainerTracePlugin = {
-  tag: "dom-expressions/container-trace",
+  tag: "solid/container-trace",
   test(value) {
     return value != null && typeof value === "object" && TRACE in value;
   },
@@ -209,11 +213,14 @@ function isSafeError(value) {
   return !!(value && (typeof value === "object" || typeof value === "function") && value[SAFE_ERROR]);
 }
 const REVALIDATE_HEADER = "X-Revalidate";
-function initWithRevalidate(init) {
+function initWithRevalidate(init = {}) {
+  const resolved = typeof init === "number" ? {
+    status: init
+  } : init;
   const {
     revalidate,
     ...responseInit
-  } = init;
+  } = resolved;
   let headers;
   if (responseInit.headers && responseInit.headers.getSetCookie) {
     headers = new Headers();
@@ -239,13 +246,12 @@ function redirect(url, init = 302) {
   const {
     responseInit,
     headers
-  } = initWithRevalidate(typeof init === "number" ? {
-    status: init
-  } : init);
+  } = initWithRevalidate(init);
   if (responseInit.status === undefined) {
     responseInit.status = 302;
   }
-  headers.set("Location", String(url));
+  const target = typeof url === "string" ? url : url[HREF];
+  headers.set("Location", typeof target === "string" ? target : String(url));
   return new Response(null, {
     ...responseInit,
     headers
@@ -1876,6 +1882,15 @@ function createLiveHoles(sink, scoped) {
   const stamp = typeof creationStamp === "function" ? creationStamp : () => 0;
   const inScope = scoped && typeof inServerComponentScope === "function" ? inServerComponentScope : null;
   const stripMarkers = html => html.replace(/<!--lh:\/?\d+-->/g, "");
+  const swept = (owner, ctx, fn) => {
+    const prev = sharedConfig.context;
+    sharedConfig.context = ctx;
+    try {
+      return owner ? runWithOwner(owner, fn) : fn();
+    } finally {
+      sharedConfig.context = prev;
+    }
+  };
   function resolveHoleValue(hole) {
     const result = {
       t: [""],
@@ -1941,6 +1956,7 @@ function createLiveHoles(sink, scoped) {
       const recordsBefore = engine.recordStamp;
       const ownersBefore = stamp();
       const owner = getOwner();
+      const holeCtx = sharedConfig.context;
       const b = {
         key: null,
         children: [],
@@ -1954,7 +1970,7 @@ function createLiveHoles(sink, scoped) {
           const sweepOwnersBefore = stamp();
           let res;
           try {
-            res = owner ? runWithOwner(owner, () => resolveHoleValue(hole)) : resolveHoleValue(hole);
+            res = swept(owner, holeCtx, () => resolveHoleValue(hole));
           } catch (err) {
             b.closed = true;
             sink.closeBinding(b.key);
@@ -2062,6 +2078,7 @@ function createLiveHoles(sink, scoped) {
     },
     attr(cap) {
       const owner = getOwner();
+      const holeCtx = sharedConfig.context;
       const b = {
         key: "lha:" + cap.id,
         children: [],
@@ -2097,7 +2114,7 @@ function createLiveHoles(sink, scoped) {
                 if (vt === "string" || vt === "number") html += v;
               }
             };
-            owner ? runWithOwner(owner, run) : run();
+            swept(owner, holeCtx, run);
           } catch (err) {
             if (ssrHandleError(err, true)) return;
             b.closed = true;
@@ -2433,7 +2450,7 @@ function ssrHydrationKey() {
   const hk = getHydrationKey();
   return hk ? ` _hk=${hk}` : "";
 }
-const CLAIM_PROP = /*#__PURE__*/Symbol.for("dom-expressions.claim-prop");
+const CLAIM_PROP = /*#__PURE__*/Symbol.for("solid.claim-prop");
 const CLAIMS_STREAM = 1;
 const CLAIMS_DOCUMENT = 2;
 const CLAIM_UNSAFE = /[^A-Za-z0-9_.!~*'()-]/g;
@@ -2462,7 +2479,7 @@ function ssrClaim(map) {
 function decodeSSREntities(s) {
   return s.indexOf("&") < 0 ? s : s.replace(/&quot;/g, '"').replace(/&lt;/g, "<").replace(/&amp;/g, "&");
 }
-const SELECT_VALUE_ATTR = /\svalue="([^"]*)"/;
+const SELECT_VALUE_ATTR = /\svalue(?:="([^"]*)")?(?=[\s>]|$)/;
 function tagEnd(html, i) {
   for (let j = i + 1; j < html.length; j++) {
     const c = html.charCodeAt(j);
@@ -2514,7 +2531,7 @@ function resolveSSRSelectValues(html) {
       cand = html.indexOf("<select", e0 + 1);
       continue;
     }
-    const bound = decodeSSREntities(m[1]);
+    const bound = decodeSSREntities(m[1] ?? "");
     const sel = {
       values: /\smultiple(?=[\s>=])/.test(open) ? bound.split(",") : [bound],
       strip: cand + m.index,
@@ -2551,7 +2568,7 @@ function resolveSSRSelectValues(html) {
           const attrs = html.slice(i + 7, e);
           if (/\sselected(?=[\s=]|$)/.test(attrs)) sel.defaulted = true;else {
             const vm = SELECT_VALUE_ATTR.exec(attrs);
-            const value = vm ? decodeSSREntities(vm[1]) : decodeSSREntities(optionText(html, e + 1)).replace(/\s+/g, " ").trim();
+            const value = vm ? decodeSSREntities(vm[1] ?? "") : decodeSSREntities(optionText(html, e + 1)).replace(/\s+/g, " ").trim();
             if (sel.values.includes(value)) sel.marks.push(e);
           }
         }
@@ -3312,4 +3329,4 @@ function httpHeader(name, value, options) {
   }
 }
 
-export { CLAIMS_DOCUMENT, CLAIMS_STREAM, CLAIM_PROP, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, notSup as acquireAsset, notSup as addEvent, applyRef, notSup as assign, claimElement, claimElementTree, notSup as className, clearFlashCookie, clientOnly, commitEventResponse, commitResponseStub, composeMiddleware, createLiveHoles, createRequestEvent, createResponseStub, createSSRResponse, notSup as delegateEvents, dynamic, notSup as dynamicProperty, effect, escape, generateHydrationScript, notSup as getDelegatedRoot, getExpectedRedirectStatus, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, notSup as hydrate, notSup as insert, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, markSafeError, memo, parseCookieHeader, redirect, notSup as ref, notSup as registerDelegatedContainer, notSup as registerDelegatedRoot, registerElementClaim, reload, notSup as render, renderToStream, renderToString, resolveSSRSelectValues, respond, notSup as runHydrationEvents, scriptNonce, serializeCookie, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClaim, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrSelectValues, ssrStyle, ssrStyleProperty, notSup as style, styleNonce, notSup as template, notSup as unregisterDelegatedContainer, notSup as unregisterDelegatedRoot, useHead };
+export { CLAIMS_DOCUMENT, CLAIMS_STREAM, CLAIM_PROP, ChildProperties, DOMElements, DOMWithState, DelegatedEvents, Dynamic, HREF, HydrationScript, MathMLElements, Namespaces, Portal, REVALIDATE_HEADER, RawTextElements, RequestContext, ResponseEnvelope, SAFE_ERROR, SVGElements, VoidElements, notSup as acquireAsset, notSup as addEvent, applyRef, notSup as assign, claimElement, claimElementTree, notSup as className, clearFlashCookie, clientOnly, commitEventResponse, commitResponseStub, composeMiddleware, createLiveHoles, createRequestEvent, createResponseStub, createSSRResponse, notSup as delegateEvents, dynamic, notSup as dynamicProperty, effect, escape, generateHydrationScript, notSup as getDelegatedRoot, getExpectedRedirectStatus, getHydrationKey, notSup as getNextElement, notSup as getNextMarker, notSup as getNextMatch, getRequestEvent, getServerFunctionMetadata, getServerFunctionRPC, hasFlashCookie, httpHeader, httpStatus, notSup as hydrate, notSup as insert, isDev, isHref, isResponseEnvelope, isSafeError, isServer, isServerFunction, markSafeError, memo, parseCookieHeader, redirect, notSup as ref, notSup as registerDelegatedContainer, notSup as registerDelegatedRoot, registerElementClaim, reload, notSup as render, renderToStream, renderToString, resolveSSRNode, resolveSSRSelectValues, respond, notSup as runHydrationEvents, scriptNonce, serializeCookie, notSup as setAttribute, notSup as setAttributeNS, notSup as setProperty, notSup as setStyleProperty, notSup as spread, ssr, ssrAttribute, ssrClaim, ssrClassName, ssrElement, ssrGroup, ssrHydrationKey, ssrSelectValues, ssrStyle, ssrStyleProperty, notSup as style, styleNonce, notSup as template, notSup as unregisterDelegatedContainer, notSup as unregisterDelegatedRoot, useHead };