solid-js 1.7.3 → 1.7.4

package/dist/dev.cjs

@@ -1314,7 +1314,7 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
-  const blocked = new Set(keys.flat());
+  const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
   if ($PROXY in props) {
     const res = keys.map(k => {
       return new Proxy({

package/dist/dev.js

@@ -1312,7 +1312,7 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
-  const blocked = new Set(keys.flat());
+  const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
   if ($PROXY in props) {
     const res = keys.map(k => {
       return new Proxy({

package/dist/solid.cjs

@@ -1269,7 +1269,7 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
-  const blocked = new Set(keys.flat());
+  const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
   if ($PROXY in props) {
     const res = keys.map(k => {
       return new Proxy({

package/dist/solid.js

@@ -1267,7 +1267,7 @@ function mergeProps(...sources) {
   return target;
 }
 function splitProps(props, ...keys) {
-  const blocked = new Set(keys.flat());
+  const blocked = new Set(keys.length > 1 ? keys.flat() : keys[0]);
   if ($PROXY in props) {
     const res = keys.map(k => {
       return new Proxy({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",

package/store/dist/dev.cjs

@@ -135,7 +135,10 @@ function setProperty(state, property, value, deleting = false) {
   let nodes = getDataNodes(state),
     node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
-  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  if (Array.isArray(state) && state.length !== len) {
+    for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
+    (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  }
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {

package/store/dist/dev.js

@@ -133,7 +133,10 @@ function setProperty(state, property, value, deleting = false) {
   let nodes = getDataNodes(state),
     node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
-  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  if (Array.isArray(state) && state.length !== len) {
+    for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
+    (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  }
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {

package/store/dist/store.cjs

@@ -129,7 +129,10 @@ function setProperty(state, property, value, deleting = false) {
   let nodes = getDataNodes(state),
     node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
-  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  if (Array.isArray(state) && state.length !== len) {
+    for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
+    (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  }
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {

package/store/dist/store.js

@@ -127,7 +127,10 @@ function setProperty(state, property, value, deleting = false) {
   let nodes = getDataNodes(state),
     node;
   if (node = getDataNode(nodes, property, prev)) node.$(() => value);
-  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  if (Array.isArray(state) && state.length !== len) {
+    for (let i = state.length; i < len; i++) (node = nodes[i]) && node.$();
+    (node = getDataNode(nodes, "length", len)) && node.$(state.length);
+  }
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {

package/types/jsx.d.ts

@@ -405,7 +405,8 @@ export namespace JSX {
     | "allow-scripts"
     | "allow-storage-access-by-user-activation"
     | "allow-top-navigation"
-    | "allow-top-navigation-by-user-activation";
+    | "allow-top-navigation-by-user-activation"
+    | "allow-top-navigation-to-custom-protocols";
   type HTMLLinkAs =
     | "audio"
     | "document"
@@ -705,8 +706,9 @@ export namespace JSX {
     contextmenu?: string;
     dir?: HTMLDir;
     draggable?: boolean;
-    hidden?: boolean;
+    hidden?: boolean | "hidden" | "until-found";
     id?: string;
+    inert?: boolean;
     lang?: string;
     spellcheck?: boolean;
     style?: CSSProperties | string;
@@ -874,6 +876,8 @@ export namespace JSX {
     useMap?: string;
     width?: number | string;
     crossOrigin?: HTMLCrossorigin;
+    elementtiming: string;
+    fetchpriority: "high" | "low" | "auto";
   }
   interface InputHTMLAttributes<T> extends HTMLAttributes<T> {
     accept?: string;

package/web/dist/dev.cjs

@@ -457,7 +457,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       appendNodes(parent, array);
     }
     current = array;
-  } else if (value instanceof Node) {
+  } else if (value.nodeType) {
     if (solidJs.sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
@@ -473,12 +473,13 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
-      prev = current && current[i];
-    if (item instanceof Node) {
+      prev = current && current[i],
+      t;
+    if (item == null || item === true || item === false) ; else if ((t = typeof item) === "object" && item.nodeType) {
       normalized.push(item);
-    } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
+    } else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((typeof item) === "function") {
+    } else if (t === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
@@ -488,10 +489,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3) {
-        prev.data = value;
-        normalized.push(prev);
-      } else normalized.push(document.createTextNode(value));
+      if (prev && prev.nodeType === 3 && prev.data === value) normalized.push(prev);else normalized.push(document.createTextNode(value));
     }
   }
   return dynamic;

package/web/dist/dev.js

@@ -456,7 +456,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       appendNodes(parent, array);
     }
     current = array;
-  } else if (value instanceof Node) {
+  } else if (value.nodeType) {
     if (sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
@@ -472,12 +472,13 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
-      prev = current && current[i];
-    if (item instanceof Node) {
+      prev = current && current[i],
+      t;
+    if (item == null || item === true || item === false) ; else if ((t = typeof item) === "object" && item.nodeType) {
       normalized.push(item);
-    } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
+    } else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((typeof item) === "function") {
+    } else if (t === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
@@ -487,10 +488,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3) {
-        prev.data = value;
-        normalized.push(prev);
-      } else normalized.push(document.createTextNode(value));
+      if (prev && prev.nodeType === 3 && prev.data === value) normalized.push(prev);else normalized.push(document.createTextNode(value));
     }
   }
   return dynamic;

package/web/dist/server.cjs

@@ -290,10 +290,10 @@ function ssrStyle(value) {
   return result;
 }
 function ssrElement(tag, props, children, needsId) {
-  let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
-  const skipChildren = VOID_ELEMENTS.test(tag);
   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() : ""} `;
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
@@ -318,13 +318,12 @@ 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)}</${tag}>`
+    t: result + `>${resolveSSRNode(children, true)}</${tag}>`
   };
 }
 function ssrAttribute(key, value, isBoolean) {
@@ -380,7 +379,7 @@ function escape(s, attr) {
   }
   return left < s.length ? out + s.substring(left) : out;
 }
-function resolveSSRNode(node) {
+function resolveSSRNode(node, top) {
   const t = typeof node;
   if (t === "string") return node;
   if (node == null || t === "boolean") return "";
@@ -388,7 +387,7 @@ function resolveSSRNode(node) {
     let prev = {};
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
-      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
+      if (!top && typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
       mapped += resolveSSRNode(prev = node[i]);
     }
     return mapped;
@@ -414,7 +413,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(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 s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!solidJs.sharedConfig.context.noHydrate) return props.children;

package/web/dist/server.js

@@ -289,10 +289,10 @@ function ssrStyle(value) {
   return result;
 }
 function ssrElement(tag, props, children, needsId) {
-  let result = `<${tag}${needsId ? ssrHydrationKey() : ""} `;
-  const skipChildren = VOID_ELEMENTS.test(tag);
   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() : ""} `;
   let classResolved;
   for (let i = 0; i < keys.length; i++) {
     const prop = keys[i];
@@ -317,13 +317,12 @@ 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)}</${tag}>`
+    t: result + `>${resolveSSRNode(children, true)}</${tag}>`
   };
 }
 function ssrAttribute(key, value, isBoolean) {
@@ -379,7 +378,7 @@ function escape(s, attr) {
   }
   return left < s.length ? out + s.substring(left) : out;
 }
-function resolveSSRNode(node) {
+function resolveSSRNode(node, top) {
   const t = typeof node;
   if (t === "string") return node;
   if (node == null || t === "boolean") return "";
@@ -387,7 +386,7 @@ function resolveSSRNode(node) {
     let prev = {};
     let mapped = "";
     for (let i = 0, len = node.length; i < len; i++) {
-      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
+      if (!top && typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!$-->`;
       mapped += resolveSSRNode(prev = node[i]);
     }
     return mapped;
@@ -413,7 +412,7 @@ function generateHydrationScript({
   eventNames = ["click", "input"],
   nonce
 } = {}) {
-  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(e=>{let t=e=>e&&e.hasAttribute&&(e.hasAttribute("data-hk")?e:t(e.host&&e.host instanceof Node?e.host:e.parentNode));["${eventNames.join('", "')}"].forEach((o=>document.addEventListener(o,(o=>{let s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
+  return `<script${nonce ? ` nonce="${nonce}"` : ""}>(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 s=o.composedPath&&o.composedPath()[0]||o.target,a=t(s);a&&!e.completed.has(a)&&e.events.push([a,o])}))))})(window._$HY||(_$HY={events:[],completed:new WeakSet,r:{},fe(){},init(e,t){_$HY.r[e]=[new Promise((e=>t=e)),t]},set(e,t,o){(o=_$HY.r[e])&&o[1](t),_$HY.r[e]=[t]},unset(e){delete _$HY.r[e]},load:e=>_$HY.r[e]}));</script><!--xs-->`;
 }
 function Hydration(props) {
   if (!sharedConfig.context.noHydrate) return props.children;

package/web/dist/web.cjs

@@ -457,7 +457,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       appendNodes(parent, array);
     }
     current = array;
-  } else if (value instanceof Node) {
+  } else if (value.nodeType) {
     if (solidJs.sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
@@ -473,12 +473,13 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
-      prev = current && current[i];
-    if (item instanceof Node) {
+      prev = current && current[i],
+      t;
+    if (item == null || item === true || item === false) ; else if ((t = typeof item) === "object" && item.nodeType) {
       normalized.push(item);
-    } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
+    } else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((typeof item) === "function") {
+    } else if (t === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
@@ -488,10 +489,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3) {
-        prev.data = value;
-        normalized.push(prev);
-      } else normalized.push(document.createTextNode(value));
+      if (prev && prev.nodeType === 3 && prev.data === value) normalized.push(prev);else normalized.push(document.createTextNode(value));
     }
   }
   return dynamic;

package/web/dist/web.js

@@ -456,7 +456,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       appendNodes(parent, array);
     }
     current = array;
-  } else if (value instanceof Node) {
+  } else if (value.nodeType) {
     if (sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
@@ -472,12 +472,13 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
   let dynamic = false;
   for (let i = 0, len = array.length; i < len; i++) {
     let item = array[i],
-      prev = current && current[i];
-    if (item instanceof Node) {
+      prev = current && current[i],
+      t;
+    if (item == null || item === true || item === false) ; else if ((t = typeof item) === "object" && item.nodeType) {
       normalized.push(item);
-    } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
+    } else if (Array.isArray(item)) {
       dynamic = normalizeIncomingArray(normalized, item, prev) || dynamic;
-    } else if ((typeof item) === "function") {
+    } else if (t === "function") {
       if (unwrap) {
         while (typeof item === "function") item = item();
         dynamic = normalizeIncomingArray(normalized, Array.isArray(item) ? item : [item], Array.isArray(prev) ? prev : [prev]) || dynamic;
@@ -487,10 +488,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (prev && prev.nodeType === 3) {
-        prev.data = value;
-        normalized.push(prev);
-      } else normalized.push(document.createTextNode(value));
+      if (prev && prev.nodeType === 3 && prev.data === value) normalized.push(prev);else normalized.push(document.createTextNode(value));
     }
   }
   return dynamic;