solid-js 1.8.10 → 1.8.11

package/web/dist/server.js

@@ -1,86 +1,31 @@
-import { sharedConfig, createRoot, splitProps } from "solid-js";
-export {
-  ErrorBoundary,
-  For,
-  Index,
-  Match,
-  Show,
-  Suspense,
-  SuspenseList,
-  Switch,
-  createComponent,
-  mergeProps
-} from "solid-js";
-import { Feature, Serializer, getCrossReferenceHeader } from "seroval";
-import {
-  CustomEventPlugin,
-  DOMExceptionPlugin,
-  EventPlugin,
-  FormDataPlugin,
-  HeadersPlugin,
-  ReadableStreamPlugin,
-  RequestPlugin,
-  ResponsePlugin,
-  URLSearchParamsPlugin,
-  URLPlugin
-} from "seroval-plugins/web";
+import { sharedConfig, createRoot, splitProps } from 'solid-js';
+export { ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, createComponent, mergeProps } from 'solid-js';
+import { Feature, Serializer, getCrossReferenceHeader } from 'seroval';
+import { CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin } from 'seroval-plugins/web';
 
-const booleans = [
-  "allowfullscreen",
-  "async",
-  "autofocus",
-  "autoplay",
-  "checked",
-  "controls",
-  "default",
-  "disabled",
-  "formnovalidate",
-  "hidden",
-  "indeterminate",
-  "inert",
-  "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", "inert", "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, onError }) {
+const ES2017FLAG = Feature.AggregateError
+| Feature.BigInt
+| Feature.BigIntTypedArray;
+const GLOBAL_IDENTIFIER = '_$HY.r';
+function createSerializer({
+  onData,
+  onDone,
+  scopeId,
+  onError
+}) {
   return new Serializer({
     scopeId,
     plugins: [
-      CustomEventPlugin,
-      DOMExceptionPlugin,
-      EventPlugin,
-      FormDataPlugin,
-      HeadersPlugin,
-      ReadableStreamPlugin,
-      RequestPlugin,
-      ResponsePlugin,
-      URLSearchParamsPlugin,
-      URLPlugin
-    ],
+    CustomEventPlugin, DOMExceptionPlugin, EventPlugin,
+    FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLSearchParamsPlugin, URLPlugin],
     globalIdentifier: GLOBAL_IDENTIFIER,
     disabledFeatures: ES2017FLAG,
     onData,
@@ -89,14 +34,15 @@ function createSerializer({ onData, onDone, scopeId, onError }) {
   });
 }
 function getLocalHeaderScript(id) {
-  return getCrossReferenceHeader(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,
@@ -134,7 +80,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);
@@ -145,7 +93,13 @@ function renderToStringAsync(code, options = {}) {
   });
 }
 function renderToStream(code, options = {}) {
-  let { nonce, onCompleteShell, onCompleteAll, renderId, noScripts } = options;
+  let {
+    nonce,
+    onCompleteShell,
+    onCompleteAll,
+    renderId,
+    noScripts
+  } = options;
   let dispose;
   const blockingPromises = [];
   const pushTask = task => {
@@ -161,12 +115,11 @@ function renderToStream(code, options = {}) {
   const onDone = () => {
     writeTasks();
     doShell();
-    onCompleteAll &&
-      onCompleteAll({
-        write(v) {
-          !completed && buffer.write(v);
-        }
-      });
+    onCompleteAll && onCompleteAll({
+      write(v) {
+        !completed && buffer.write(v);
+      }
+    });
     writable && writable.end();
     completed = true;
     if (firstFlushed) dispose();
@@ -223,23 +176,17 @@ 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);
     },
     roots: 0,
@@ -249,7 +196,7 @@ function renderToStream(code, options = {}) {
     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: v => queue(() => queue(() => resolve(v))),
           reject: e => queue(() => queue(() => reject(e)))
@@ -258,7 +205,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);
@@ -266,7 +216,7 @@ function renderToStream(code, options = {}) {
           }
           if ((value !== undefined || error) && !completed) {
             if (!firstFlushed) {
-              queue(() => (html = replacePlaceholder(html, key, value !== undefined ? value : "")));
+              queue(() => html = replacePlaceholder(html, key, value !== undefined ? value : ""));
               error ? reject(error) : resolve(true);
             } else {
               buffer.write(`<template id="${key}">${value !== undefined ? value : " "}</template>`);
@@ -293,12 +243,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);
+      }
+    });
     shellCompleted = true;
   }
   return {
@@ -333,7 +282,7 @@ function renderToStream(code, options = {}) {
     pipeTo(w) {
       return allSettled(blockingPromises).then(() => {
         let resolve;
-        const p = new Promise(r => (resolve = r));
+        const p = new Promise(r => resolve = r);
         setTimeout(() => {
           doShell();
           const encoder = new TextEncoder();
@@ -363,13 +312,13 @@ function renderToStream(code, options = {}) {
   };
 }
 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) {
@@ -414,8 +363,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() : ""} `;
@@ -423,8 +371,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];
@@ -433,14 +380,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 {
@@ -448,17 +391,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();
@@ -502,13 +444,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) {
@@ -520,7 +461,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;
   }
@@ -541,12 +482,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(){}});</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(){}});</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!sharedConfig.context.noHydrate) return props.children;
@@ -605,20 +545,16 @@ function replacePlaceholder(html, key, value) {
 }
 const RequestContext = Symbol();
 function getRequestEvent() {
-  return globalThis[RequestContext]
-    ? globalThis[RequestContext].getStore() ||
-        (sharedConfig.context && sharedConfig.context.event) ||
-        console.log(
-          "RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls."
-        )
-    : undefined;
+  return globalThis[RequestContext] ? globalThis[RequestContext].getStore() || sharedConfig.context && sharedConfig.context.event || console.log("RequestEvent is missing. This is most likely due to accessing `getRequestEvent` non-managed async scope in a partially polyfilled environment. Try moving it above all `await` calls.") : 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() {
@@ -632,7 +568,9 @@ function pipeToNodeWritable(code, writable, options = {}) {
 }
 function pipeToWritable(code, writable, options = {}) {
   if (options.onReady) {
-    options.onCompleteShell = ({ write }) => {
+    options.onCompleteShell = ({
+      write
+    }) => {
       options.onReady({
         write,
         startWriting() {
@@ -662,19 +600,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);
@@ -698,8 +628,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);
     }
   }
@@ -708,39 +637,4 @@ function Portal(props) {
   return "";
 }
 
-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
-};
+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.js

@@ -1,9 +1,9 @@
-import { AsyncLocalStorage } from "node:async_hooks";
-import { isServer, RequestContext } from "solid-js/web";
+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());
+  const ctx = globalThis[RequestContext] = globalThis[RequestContext] || new AsyncLocalStorage();
   return ctx.run(init, cb);
 }
 

package/web/dist/web.cjs

@@ -333,7 +333,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   let isCE, isProp, isChildProp, propAlias, forceProp;
   if (prop === "style") return style(node, value, prev);
   if (prop === "classList") return classList(node, value, prev);
-  if (value === prev && prop !== "value" && prop !== "checked") return prev;
+  if (value === prev) return prev;
   if (prop === "ref") {
     if (!skipRef) value(node);
   } else if (prop.slice(0, 3) === "on:") {
@@ -416,7 +416,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     if (multi) {
       let node = current[0];
       if (node && node.nodeType === 3) {
-        node.data = value;
+        node.data !== value && (node.data = value);
       } else node = document.createTextNode(value);
       current = cleanChildren(parent, current, marker, node);
     } else {
@@ -534,7 +534,7 @@ function NoHydration(props) {
 function Hydration(props) {
   return props.children;
 }
-function voidFn() {}
+const voidFn = () => undefined;
 const RequestContext = Symbol();
 function innerHTML(parent, content) {
   !solidJs.sharedConfig.context && (parent.innerHTML = content);