solid-js 1.8.3 → 1.8.5

package/web/dist/server.cjs

@@ -18,14 +18,16 @@ const GLOBAL_IDENTIFIER = '_$HY.r';
 function createSerializer({
   onData,
   onDone,
-  scopeId
+  scopeId,
+  onError
 }) {
   return new seroval.Serializer({
     scopeId,
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
-    onDone
+    onDone,
+    onError
   });
 }
 function getGlobalHeaderScript() {
@@ -49,7 +51,8 @@ function renderToString(code, options = {}) {
         scripts = getLocalHeaderScript(renderId);
       }
       scripts += script;
-    }
+    },
+    onError: options.onError
   });
   solidJs.sharedConfig.context = {
     id: renderId || "",
@@ -90,11 +93,13 @@ function renderToStream(code, options = {}) {
     nonce,
     onCompleteShell,
     onCompleteAll,
-    renderId
+    renderId,
+    noScripts
   } = options;
   let dispose;
   const blockingPromises = [];
   const pushTask = task => {
+    if (noScripts) return;
     if (!tasks && !firstFlushed) {
       tasks = getLocalHeaderScript(renderId);
     }
@@ -119,7 +124,8 @@ function renderToStream(code, options = {}) {
   const serializer = createSerializer({
     scopeId: options.renderId,
     onData: pushTask,
-    onDone: checkEnd
+    onDone: checkEnd,
+    onError: options.onError
   });
   const flushEnd = () => {
     if (!registry.size) {
@@ -507,6 +513,10 @@ function replacePlaceholder(html, key, value) {
   const last = html.indexOf(close, first + marker.length);
   return html.slice(0, first) + value + html.slice(last + close.length);
 }
+const RequestContext = Symbol();
+function getRequestEvent() {
+  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() : undefined;
+}
 function Assets(props) {
   useAssets(() => props.children);
 }
@@ -643,12 +653,14 @@ exports.Hydration = Hydration;
 exports.HydrationScript = HydrationScript;
 exports.NoHydration = NoHydration;
 exports.Portal = Portal;
+exports.RequestContext = RequestContext;
 exports.addEventListener = addEventListener;
 exports.delegateEvents = delegateEvents;
 exports.escape = escape;
 exports.generateHydrationScript = generateHydrationScript;
 exports.getAssets = getAssets;
 exports.getHydrationKey = getHydrationKey;
+exports.getRequestEvent = getRequestEvent;
 exports.hydrate = hydrate;
 exports.insert = insert;
 exports.isDev = isDev;

package/web/dist/server.js

@@ -1,65 +1,32 @@
-import { sharedConfig, createRoot, splitProps } from "solid-js";
-export {
-  ErrorBoundary,
-  For,
-  Index,
-  Match,
-  Show,
-  Suspense,
-  SuspenseList,
-  Switch,
-  createComponent,
-  mergeProps
-} from "solid-js";
-import { Feature, Serializer, GLOBAL_CONTEXT_API_SCRIPT, getCrossReferenceHeader } from "seroval";
+import { sharedConfig, createRoot, splitProps } from 'solid-js';
+export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, mergeProps } from 'solid-js';
+import { Feature, Serializer, GLOBAL_CONTEXT_API_SCRIPT, getCrossReferenceHeader } from 'seroval';
 
-const booleans = [
-  "allowfullscreen",
-  "async",
-  "autofocus",
-  "autoplay",
-  "checked",
-  "controls",
-  "default",
-  "disabled",
-  "formnovalidate",
-  "hidden",
-  "indeterminate",
-  "ismap",
-  "loop",
-  "multiple",
-  "muted",
-  "nomodule",
-  "novalidate",
-  "open",
-  "playsinline",
-  "readonly",
-  "required",
-  "reversed",
-  "seamless",
-  "selected"
-];
-const BooleanAttributes = /*#__PURE__*/ new Set(booleans);
-const ChildProperties = /*#__PURE__*/ new Set([
-  "innerHTML",
-  "textContent",
-  "innerText",
-  "children"
-]);
-const Aliases = /*#__PURE__*/ Object.assign(Object.create(null), {
+const booleans = ["allowfullscreen", "async", "autofocus", "autoplay", "checked", "controls", "default", "disabled", "formnovalidate", "hidden", "indeterminate", "ismap", "loop", "multiple", "muted", "nomodule", "novalidate", "open", "playsinline", "readonly", "required", "reversed", "seamless", "selected"];
+const BooleanAttributes = /*#__PURE__*/new Set(booleans);
+const ChildProperties = /*#__PURE__*/new Set(["innerHTML", "textContent", "innerText", "children"]);
+const Aliases = /*#__PURE__*/Object.assign(Object.create(null), {
   className: "class",
   htmlFor: "for"
 });
 
-const ES2017FLAG = Feature.AggregateError | Feature.BigInt | Feature.BigIntTypedArray;
-const GLOBAL_IDENTIFIER = "_$HY.r";
-function createSerializer({ onData, onDone, scopeId }) {
+const ES2017FLAG = Feature.AggregateError
+| Feature.BigInt
+| Feature.BigIntTypedArray;
+const GLOBAL_IDENTIFIER = '_$HY.r';
+function createSerializer({
+  onData,
+  onDone,
+  scopeId,
+  onError
+}) {
   return new Serializer({
     scopeId,
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
-    onDone
+    onDone,
+    onError
   });
 }
 function getGlobalHeaderScript() {
@@ -69,11 +36,12 @@ function getLocalHeaderScript(id) {
   return getCrossReferenceHeader(id);
 }
 
-const VOID_ELEMENTS =
-  /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
+const VOID_ELEMENTS = /^(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)$/i;
 const REPLACE_SCRIPT = `function $df(e,n,o,t){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)t=o.nextSibling,o.remove(),o=t;_$HY.done?o.remove():o.replaceWith(n.content)}n.remove(),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
-  const { renderId } = options;
+  const {
+    renderId
+  } = options;
   let scripts = "";
   const serializer = createSerializer({
     scopeId: renderId,
@@ -82,7 +50,8 @@ function renderToString(code, options = {}) {
         scripts = getLocalHeaderScript(renderId);
       }
       scripts += script;
-    }
+    },
+    onError: options.onError
   });
   sharedConfig.context = {
     id: renderId || "",
@@ -106,7 +75,9 @@ function renderToString(code, options = {}) {
   return html;
 }
 function renderToStringAsync(code, options = {}) {
-  const { timeoutMs = 30000 } = options;
+  const {
+    timeoutMs = 30000
+  } = options;
   let timeoutHandle;
   const timeout = new Promise((_, reject) => {
     timeoutHandle = setTimeout(() => reject("renderToString timed out"), timeoutMs);
@@ -117,10 +88,17 @@ function renderToStringAsync(code, options = {}) {
   });
 }
 function renderToStream(code, options = {}) {
-  let { nonce, onCompleteShell, onCompleteAll, renderId } = options;
+  let {
+    nonce,
+    onCompleteShell,
+    onCompleteAll,
+    renderId,
+    noScripts
+  } = options;
   let dispose;
   const blockingPromises = [];
   const pushTask = task => {
+    if (noScripts) return;
     if (!tasks && !firstFlushed) {
       tasks = getLocalHeaderScript(renderId);
     }
@@ -132,12 +110,11 @@ function renderToStream(code, options = {}) {
   const checkEnd = () => {
     if (!registry.size && !completed) {
       writeTasks();
-      onCompleteAll &&
-        onCompleteAll({
-          write(v) {
-            !completed && buffer.write(v);
-          }
-        });
+      onCompleteAll && onCompleteAll({
+        write(v) {
+          !completed && buffer.write(v);
+        }
+      });
       writable && writable.end();
       completed = true;
       setTimeout(dispose);
@@ -146,7 +123,8 @@ function renderToStream(code, options = {}) {
   const serializer = createSerializer({
     scopeId: options.renderId,
     onData: pushTask,
-    onDone: checkEnd
+    onDone: checkEnd,
+    onError: options.onError
   });
   const flushEnd = () => {
     if (!registry.size) {
@@ -193,29 +171,23 @@ function renderToStream(code, options = {}) {
       const first = html.indexOf(placeholder);
       if (first === -1) return;
       const last = html.indexOf(`<!--!$/${id}-->`, first + placeholder.length);
-      html = html.replace(
-        html.slice(first, last + placeholder.length + 1),
-        resolveSSRNode(payloadFn())
-      );
+      html = html.replace(html.slice(first, last + placeholder.length + 1), resolveSSRNode(payloadFn()));
     },
     serialize(id, p, wait) {
       const serverOnly = sharedConfig.context.noHydrate;
       if (!firstFlushed && wait && typeof p === "object" && "then" in p) {
         blockingPromises.push(p);
-        !serverOnly &&
-          p
-            .then(d => {
-              serializer.write(id, d);
-            })
-            .catch(e => {
-              serializer.write(id, e);
-            });
+        !serverOnly && p.then(d => {
+          serializer.write(id, d);
+        }).catch(e => {
+          serializer.write(id, e);
+        });
       } else if (!serverOnly) serializer.write(id, p);
     },
     registerFragment(key) {
       if (!registry.has(key)) {
         let resolve, reject;
-        const p = new Promise((r, rej) => ((resolve = r), (reject = rej)));
+        const p = new Promise((r, rej) => (resolve = r, reject = rej));
         registry.set(key, {
           resolve,
           reject
@@ -224,7 +196,10 @@ function renderToStream(code, options = {}) {
       }
       return (value, error) => {
         if (registry.has(key)) {
-          const { resolve, reject } = registry.get(key);
+          const {
+            resolve,
+            reject
+          } = registry.get(key);
           registry.delete(key);
           if (waitForFragments(registry, key)) {
             resolve(true);
@@ -232,9 +207,7 @@ function renderToStream(code, options = {}) {
           }
           if ((value !== undefined || error) && !completed) {
             if (!firstFlushed) {
-              Promise.resolve().then(
-                () => (html = replacePlaceholder(html, key, value !== undefined ? value : ""))
-              );
+              Promise.resolve().then(() => html = replacePlaceholder(html, key, value !== undefined ? value : ""));
               error ? reject(error) : resolve(true);
             } else {
               buffer.write(`<template id="${key}">${value !== undefined ? value : " "}</template>`);
@@ -260,12 +233,11 @@ function renderToStream(code, options = {}) {
     if (tasks.length) html = injectScripts(html, tasks, nonce);
     buffer.write(html);
     tasks = "";
-    onCompleteShell &&
-      onCompleteShell({
-        write(v) {
-          !completed && buffer.write(v);
-        }
-      });
+    onCompleteShell && onCompleteShell({
+      write(v) {
+        !completed && buffer.write(v);
+      }
+    });
   }
   return {
     then(fn) {
@@ -288,8 +260,7 @@ function renderToStream(code, options = {}) {
         buffer = writable = w;
         buffer.write(tmp);
         firstFlushed = true;
-        if (completed) writable.end();
-        else setTimeout(flushEnd);
+        if (completed) writable.end();else setTimeout(flushEnd);
       });
     },
     pipeTo(w) {
@@ -298,7 +269,7 @@ function renderToStream(code, options = {}) {
         const encoder = new TextEncoder();
         const writer = w.getWriter();
         let resolve;
-        const p = new Promise(r => (resolve = r));
+        const p = new Promise(r => resolve = r);
         writable = {
           end() {
             writer.releaseLock();
@@ -313,21 +284,20 @@ function renderToStream(code, options = {}) {
         };
         buffer.write(tmp);
         firstFlushed = true;
-        if (completed) writable.end();
-        else setTimeout(flushEnd);
+        if (completed) writable.end();else setTimeout(flushEnd);
         return p;
       });
     }
   };
 }
 function HydrationScript(props) {
-  const { nonce } = sharedConfig.context;
-  return ssr(
-    generateHydrationScript({
-      nonce,
-      ...props
-    })
-  );
+  const {
+    nonce
+  } = sharedConfig.context;
+  return ssr(generateHydrationScript({
+    nonce,
+    ...props
+  }));
 }
 function ssr(t, ...nodes) {
   if (nodes.length) {
@@ -372,8 +342,7 @@ function ssrStyle(value) {
   return result;
 }
 function ssrElement(tag, props, children, needsId) {
-  if (props == null) props = {};
-  else if (typeof props === "function") props = props();
+  if (props == null) props = {};else if (typeof props === "function") props = props();
   const skipChildren = VOID_ELEMENTS.test(tag);
   const keys = Object.keys(props);
   let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
@@ -381,8 +350,7 @@ function ssrElement(tag, props, children, needsId) {
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
     if (ChildProperties.has(prop)) {
-      if (children === undefined && !skipChildren)
-        children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
+      if (children === undefined && !skipChildren) children = prop === "innerHTML" ? props[prop] : escape(props[prop]);
       continue;
     }
     const value = props[prop];
@@ -391,14 +359,10 @@ function ssrElement(tag, props, children, needsId) {
     } else if (prop === "class" || prop === "className" || prop === "classList") {
       if (classResolved) continue;
       let n;
-      result += `class="${
-        escape(((n = props.class) ? n + " " : "") + ((n = props.className) ? n + " " : ""), true) +
-        ssrClassList(props.classList)
-      }"`;
+      result += `class="${escape(((n = props.class) ? n + " " : "") + ((n = props.className) ? n + " " : ""), true) + ssrClassList(props.classList)}"`;
       classResolved = true;
     } else if (BooleanAttributes.has(prop)) {
-      if (value) result += prop;
-      else continue;
+      if (value) result += prop;else continue;
     } else if (value == undefined || prop === "ref" || prop.slice(0, 2) === "on") {
       continue;
     } else {
@@ -406,17 +370,16 @@ function ssrElement(tag, props, children, needsId) {
     }
     if (i !== keys.length - 1) result += " ";
   }
-  if (skipChildren)
-    return {
-      t: result + "/>"
-    };
+  if (skipChildren) return {
+    t: result + "/>"
+  };
   if (typeof children === "function") children = children();
   return {
     t: result + `>${resolveSSRNode(children, true)}</${tag}>`
   };
 }
 function ssrAttribute(key, value, isBoolean) {
-  return isBoolean ? (value ? " " + key : "") : value != null ? ` ${key}="${value}"` : "";
+  return isBoolean ? value ? " " + key : "" : value != null ? ` ${key}="${value}"` : "";
 }
 function ssrHydrationKey() {
   const hk = getHydrationKey();
@@ -460,13 +423,12 @@ function escape(s, attr) {
       left = iDelim + 1;
       iDelim = s.indexOf(delim, left);
     } while (iDelim >= 0);
-  } else
-    while (iAmp >= 0) {
-      if (left < iAmp) out += s.substring(left, iAmp);
-      out += "&amp;";
-      left = iAmp + 1;
-      iAmp = s.indexOf("&", left);
-    }
+  } else while (iAmp >= 0) {
+    if (left < iAmp) out += s.substring(left, iAmp);
+    out += "&amp;";
+    left = iAmp + 1;
+    iAmp = s.indexOf("&", left);
+  }
   return left < s.length ? out + s.substring(left) : out;
 }
 function resolveSSRNode(node, top) {
@@ -478,7 +440,7 @@ function resolveSSRNode(node, top) {
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
       if (!top && typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
-      mapped += resolveSSRNode((prev = node[i]));
+      mapped += resolveSSRNode(prev = node[i]);
     }
     return mapped;
   }
@@ -499,12 +461,11 @@ function getAssets() {
   for (let i = 0, len = assets.length; i < len; i++) out += assets[i]();
   return out;
 }
-function generateHydrationScript({ eventNames = ["click", "input"], nonce } = {}) {
-  return `<script${
-    nonce ? ` nonce="${nonce}"` : ""
-  }>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join(
-    '", "'
-  )}"].forEach((o=>document.addEventListener(o,(o=>{let a=o.composedPath&&o.composedPath()[0]||o.target,s=t(a);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});${getGlobalHeaderScript()}</script><!--xs-->`;
+function generateHydrationScript({
+  eventNames = ["click", "input"],
+  nonce
+} = {}) {
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>window._$HY||(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host.nodeType?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let a=o.composedPath&&o.composedPath()[0]||o.target,s=t(a);s&&!e.completed.has(s)&&e.events.push([s,o])}))))})(_$HY={events:[],completed:new WeakSet,r:{},fe(){}});${getGlobalHeaderScript()}</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!sharedConfig.context.noHydrate) return props.children;
@@ -551,12 +512,18 @@ function replacePlaceholder(html, key, value) {
   const last = html.indexOf(close, first + marker.length);
   return html.slice(0, first) + value + html.slice(last + close.length);
 }
+const RequestContext = Symbol();
+function getRequestEvent() {
+  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() : undefined;
+}
 function Assets(props) {
   useAssets(() => props.children);
 }
 function pipeToNodeWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = ({ write }) => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
         write,
         startWriting() {
@@ -570,7 +537,9 @@ function pipeToNodeWritable(code, writable, options = {}) {
 }
 function pipeToWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = ({ write }) => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
         write,
         startWriting() {
@@ -600,19 +569,11 @@ function ssrSpread(props, isSVG, skipChildren) {
     } else if (prop === "class" || prop === "className" || prop === "classList") {
       if (classResolved) continue;
       let n;
-      result += `class="${(n = props.class) ? n + " " : ""}${
-        (n = props.className) ? n + " " : ""
-      }${ssrClassList(props.classList)}"`;
+      result += `class="${(n = props.class) ? n + " " : ""}${(n = props.className) ? n + " " : ""}${ssrClassList(props.classList)}"`;
       classResolved = true;
     } else if (BooleanAttributes.has(prop)) {
-      if (value) result += prop;
-      else continue;
-    } else if (
-      value == undefined ||
-      prop === "ref" ||
-      prop.slice(0, 2) === "on" ||
-      prop.slice(0, 5) === "prop:"
-    ) {
+      if (value) result += prop;else continue;
+    } else if (value == undefined || prop === "ref" || prop.slice(0, 2) === "on" || prop.slice(0, 5) === "prop:") {
       continue;
     } else {
       if (prop.slice(0, 5) === "attr:") prop = prop.slice(5);
@@ -636,8 +597,7 @@ function Dynamic(props) {
   const comp = p.component,
     t = typeof comp;
   if (comp) {
-    if (t === "function") return comp(others);
-    else if (t === "string") {
+    if (t === "function") return comp(others);else if (t === "string") {
       return ssrElement(comp, others, undefined, true);
     }
   }
@@ -646,37 +606,4 @@ function Portal(props) {
   return "";
 }
 
-export {
-  Assets,
-  Dynamic,
-  Hydration,
-  HydrationScript,
-  NoHydration,
-  Portal,
-  addEventListener,
-  delegateEvents,
-  escape,
-  generateHydrationScript,
-  getAssets,
-  getHydrationKey,
-  hydrate,
-  insert,
-  isDev,
-  isServer,
-  pipeToNodeWritable,
-  pipeToWritable,
-  render,
-  renderToStream,
-  renderToString,
-  renderToStringAsync,
-  resolveSSRNode,
-  spread,
-  ssr,
-  ssrAttribute,
-  ssrClassList,
-  ssrElement,
-  ssrHydrationKey,
-  ssrSpread,
-  ssrStyle,
-  useAssets
-};
+export { Assets, Dynamic, Hydration, HydrationScript, NoHydration, Portal, RequestContext, addEventListener, delegateEvents, escape, generateHydrationScript, getAssets, getHydrationKey, getRequestEvent, hydrate, insert, isDev, isServer, pipeToNodeWritable, pipeToWritable, render, renderToStream, renderToString, renderToStringAsync, resolveSSRNode, spread, ssr, ssrAttribute, ssrClassList, ssrElement, ssrHydrationKey, ssrSpread, ssrStyle, useAssets };

package/web/dist/storage.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+var node_async_hooks = require('node:async_hooks');
+var web = require('solid-js/web');
+
+function provideRequestEvent(init, cb) {
+  if (!web.isServer) throw new Error("Attempting to use server context in non-server build");
+  const ctx = globalThis[web.RequestContext] = globalThis[web.RequestContext] || new node_async_hooks.AsyncLocalStorage();
+  return ctx.run(init, cb);
+}
+
+exports.provideRequestEvent = provideRequestEvent;

package/web/dist/storage.js

@@ -0,0 +1,10 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { isServer, RequestContext } from 'solid-js/web';
+
+function provideRequestEvent(init, cb) {
+  if (!isServer) throw new Error("Attempting to use server context in non-server build");
+  const ctx = globalThis[RequestContext] = globalThis[RequestContext] || new AsyncLocalStorage();
+  return ctx.run(init, cb);
+}
+
+export { provideRequestEvent };

package/web/dist/web.cjs

@@ -535,6 +535,7 @@ function Hydration(props) {
   return props.children;
 }
 function voidFn() {}
+const RequestContext = Symbol();
 function innerHTML(parent, content) {
   !solidJs.sharedConfig.context && (parent.innerHTML = content);
 }
@@ -695,6 +696,7 @@ exports.HydrationScript = voidFn;
 exports.NoHydration = NoHydration;
 exports.Portal = Portal;
 exports.Properties = Properties;
+exports.RequestContext = RequestContext;
 exports.SVGElements = SVGElements;
 exports.SVGNamespace = SVGNamespace;
 exports.addEventListener = addEventListener;
@@ -712,6 +714,7 @@ exports.getNextElement = getNextElement;
 exports.getNextMarker = getNextMarker;
 exports.getNextMatch = getNextMatch;
 exports.getPropAlias = getPropAlias;
+exports.getRequestEvent = voidFn;
 exports.hydrate = hydrate;
 exports.innerHTML = innerHTML;
 exports.insert = insert;