solid-js 1.6.14 → 1.6.16

package/dist/server.cjs

@@ -586,7 +586,7 @@ function Suspense(props) {
       ...ctx,
       count: 0
     });
-    o && cleanNode(o);
+    cleanNode(o);
     return runWithOwner(o, () => {
       return createComponent(SuspenseContext.Provider, {
         value,
@@ -598,12 +598,14 @@ function Suspense(props) {
   }
   const res = runSuspense();
   if (suspenseComplete(value)) return res;
-  onError(err => {
-    if (!done || !done(undefined, err)) {
-      if (o) runWithOwner(o.owner, () => {
-        throw err;
-      });else throw err;
-    }
+  runWithOwner(o, () => {
+    onError(err => {
+      if (!done || !done(undefined, err)) {
+        runWithOwner(o.owner, () => {
+          throw err;
+        });
+      }
+    });
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {

package/dist/server.js

@@ -584,7 +584,7 @@ function Suspense(props) {
       ...ctx,
       count: 0
     });
-    o && cleanNode(o);
+    cleanNode(o);
     return runWithOwner(o, () => {
       return createComponent(SuspenseContext.Provider, {
         value,
@@ -596,12 +596,14 @@ function Suspense(props) {
   }
   const res = runSuspense();
   if (suspenseComplete(value)) return res;
-  onError(err => {
-    if (!done || !done(undefined, err)) {
-      if (o) runWithOwner(o.owner, () => {
-        throw err;
-      });else throw err;
-    }
+  runWithOwner(o, () => {
+    onError(err => {
+      if (!done || !done(undefined, err)) {
+        runWithOwner(o.owner, () => {
+          throw err;
+        });
+      }
+    });
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {

package/h/jsx-runtime/types/jsx.d.ts

@@ -1209,6 +1209,7 @@ export namespace JSX {
     mask?: FunctionMaybe<string>;
     opacity?: FunctionMaybe<number | string | "inherit">;
     overflow?: FunctionMaybe<"visible" | "hidden" | "scroll" | "auto" | "inherit">;
+    pathLength?: FunctionMaybe<string | number>;
     "pointer-events"?: FunctionMaybe<
       | "bounding-box"
       | "visiblePainted"
@@ -1331,6 +1332,7 @@ export namespace JSX {
         | "stroke-dashoffset"
         | "stroke-opacity"
         | "shape-rendering"
+        | "pathLength"
       > {}
   interface TextContentElementSVGAttributes<T>
     extends CoreSVGAttributes<T>,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.6.14",
+  "version": "1.6.16",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -278,8 +278,8 @@
     "types:universal": "tsc --project ./universal/tsconfig.json && ncp ../../node_modules/dom-expressions/src/universal.d.ts ./universal/types/universal.d.ts",
     "bench": "node --allow-natives-syntax bench/bench.cjs",
     "link": "symlink-dir . node_modules/solid-js",
-    "test": "jest",
-    "coverage": "jest --coverage",
+    "test": "vitest run",
+    "coverage": "vitest run --coverage",
     "test-types": "tsc --project tsconfig.test.json"
   }
 }

package/types/jsx.d.ts

@@ -798,11 +798,13 @@ export namespace JSX {
     accept?: string;
     alt?: string;
     autocomplete?: string;
+    autocorrect?: "on" | "off";
     autofocus?: boolean;
     capture?: boolean | string;
     checked?: boolean;
     crossorigin?: HTMLCrossorigin;
     disabled?: boolean;
+    enterkeyhint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
     form?: string;
     formaction?: string;
     formenctype?: HTMLFormEncType;
@@ -810,6 +812,7 @@ export namespace JSX {
     formnovalidate?: boolean;
     formtarget?: string;
     height?: number | string;
+    incremental?: boolean;
     list?: string;
     max?: number | string;
     maxlength?: number | string;
@@ -820,6 +823,7 @@ export namespace JSX {
     pattern?: string;
     placeholder?: string;
     readonly?: boolean;
+    results?: number;
     required?: boolean;
     size?: number | string;
     src?: string;
@@ -1219,6 +1223,7 @@ export namespace JSX {
     mask?: string;
     opacity?: number | string | "inherit";
     overflow?: "visible" | "hidden" | "scroll" | "auto" | "inherit";
+    pathLength?: string | number;
     "pointer-events"?:
       | "bounding-box"
       | "visiblePainted"
@@ -1341,6 +1346,7 @@ export namespace JSX {
         | "stroke-dashoffset"
         | "stroke-opacity"
         | "shape-rendering"
+        | "pathLength"
       > {}
   interface TextContentElementSVGAttributes<T>
     extends CoreSVGAttributes<T>,

package/universal/types/universal.d.ts

@@ -23,6 +23,7 @@ export interface Renderer<NodeType> {
   spread<T>(node: any, accessor: (() => T) | T, skipChildren?: Boolean): void;
   setProp<T>(node: NodeType, name: string, value: T, prev?: T): T;
   mergeProps(...sources: unknown[]): unknown;
+  use<A, T>(fn: (element: NodeType, arg: A) => T, element: NodeType, arg: A): T;
 }
 
 export function createRenderer<NodeType>(options: RendererOptions<NodeType>): Renderer<NodeType>;

package/web/dist/dev.cjs

@@ -352,17 +352,7 @@ function eventHandler(e) {
       return node || document;
     }
   });
-  if (solidJs.sharedConfig.registry && !solidJs.sharedConfig.done) {
-    solidJs.sharedConfig.done = true;
-    document.querySelectorAll("[id^=pl-]").forEach(elem => {
-      while (elem && elem.nodeType !== 8 && elem.nodeValue !== "pl-" + e) {
-        let x = elem.nextSibling;
-        elem.remove();
-        elem = x;
-      }
-      elem && elem.remove();
-    });
-  }
+  if (solidJs.sharedConfig.registry && !solidJs.sharedConfig.done) solidJs.sharedConfig.done = _$HY.done = true;
   while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
@@ -374,7 +364,15 @@ function eventHandler(e) {
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
-  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
+  if (solidJs.sharedConfig.context) {
+    !current && (current = [...parent.childNodes]);
+    let cleaned = [];
+    for (let i = 0; i < current.length; i++) {
+      const node = current[i];
+      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+    }
+    current = cleaned;
+  }
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -460,9 +458,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (value === "<!>") {
-        if (prev && prev.nodeType === 8) normalized.push(prev);
-      } else if (prev && prev.nodeType === 3) {
+      if (prev && prev.nodeType === 3) {
         prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));

package/web/dist/dev.js

@@ -351,17 +351,7 @@ function eventHandler(e) {
       return node || document;
     }
   });
-  if (sharedConfig.registry && !sharedConfig.done) {
-    sharedConfig.done = true;
-    document.querySelectorAll("[id^=pl-]").forEach(elem => {
-      while (elem && elem.nodeType !== 8 && elem.nodeValue !== "pl-" + e) {
-        let x = elem.nextSibling;
-        elem.remove();
-        elem = x;
-      }
-      elem && elem.remove();
-    });
-  }
+  if (sharedConfig.registry && !sharedConfig.done) sharedConfig.done = _$HY.done = true;
   while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
@@ -373,7 +363,15 @@ function eventHandler(e) {
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
-  if (sharedConfig.context && !current) current = [...parent.childNodes];
+  if (sharedConfig.context) {
+    !current && (current = [...parent.childNodes]);
+    let cleaned = [];
+    for (let i = 0; i < current.length; i++) {
+      const node = current[i];
+      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+    }
+    current = cleaned;
+  }
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -459,9 +457,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (value === "<!>") {
-        if (prev && prev.nodeType === 8) normalized.push(prev);
-      } else if (prev && prev.nodeType === 3) {
+      if (prev && prev.nodeType === 3) {
         prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));

package/web/dist/server.cjs

@@ -262,7 +262,7 @@ function toRefParam(index) {
 }
 
 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,t,n,o,d){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;o.replaceWith(n.content)}n.remove(),_$HY.set(e,t),_$HY.fe(e)}`;
+const REPLACE_SCRIPT = `function $df(e,n,t,o,d){if(t=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;_$HY.done?o.remove():o.replaceWith(t.content)}t.remove(),_$HY.set(e,n),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
   solidJs.sharedConfig.context = {
@@ -279,9 +279,8 @@ function renderToString(code, options = {}) {
     }
   };
   let html = solidJs.createRoot(d => {
-    const r = resolveSSRNode(escape(code()));
-    d();
-    return r;
+    setTimeout(d);
+    return resolveSSRNode(escape(code()));
   });
   solidJs.sharedConfig.context.noHydrate = true;
   html = injectAssets(solidJs.sharedConfig.context.assets, html);
@@ -322,7 +321,7 @@ function renderToStream(code, options = {}) {
       });
       writable && writable.end();
       completed = true;
-      dispose();
+      setTimeout(dispose);
     }
   };
   const pushTask = task => {
@@ -511,7 +510,7 @@ function ssrClassList(value) {
       classValue = !!value[key];
     if (!key || key === "undefined" || !classValue) continue;
     i && (result += " ");
-    result += key;
+    result += escape(key);
   }
   return result;
 }
@@ -548,7 +547,7 @@ function ssrElement(tag, props, children, needsId) {
     } 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="${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;
@@ -561,7 +560,7 @@ function ssrElement(tag, props, children, needsId) {
   }
   if (skipChildren) {
     return {
-      t: result + '/>'
+      t: result + "/>"
     };
   }
   return {
@@ -578,13 +577,10 @@ function ssrHydrationKey() {
 function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
-    if (!attr && t === "function") return escape(s(), attr);
+    if (!attr && t === "function") return escape(s());
     if (!attr && Array.isArray(s)) {
-      let r = "";
-      for (let i = 0; i < s.length; i++) r += resolveSSRNode(escape(s[i], attr));
-      return {
-        t: r
-      };
+      for (let i = 0; i < s.length; i++) s[i] = escape(s[i]);
+      return s;
     }
     if (attr && t === "boolean") return String(s);
     return s;
@@ -629,8 +625,12 @@ function resolveSSRNode(node) {
   if (t === "string") return node;
   if (node == null || t === "boolean") return "";
   if (Array.isArray(node)) {
+    let prev = {};
     let mapped = "";
-    for (let i = 0, len = node.length; i < len; i++) mapped += resolveSSRNode(node[i]);
+    for (let i = 0, len = node.length; i < len; i++) {
+      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!-->`;
+      mapped += resolveSSRNode(prev = node[i]);
+    }
     return mapped;
   }
   if (t === "object") return node.t;

package/web/dist/server.js

@@ -261,7 +261,7 @@ function toRefParam(index) {
 }
 
 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,t,n,o,d){if(n=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;o.replaceWith(n.content)}n.remove(),_$HY.set(e,t),_$HY.fe(e)}`;
+const REPLACE_SCRIPT = `function $df(e,n,t,o,d){if(t=document.getElementById(e),o=document.getElementById("pl-"+e)){for(;o&&8!==o.nodeType&&o.nodeValue!=="pl-"+e;)d=o.nextSibling,o.remove(),o=d;_$HY.done?o.remove():o.replaceWith(t.content)}t.remove(),_$HY.set(e,n),_$HY.fe(e)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
   sharedConfig.context = {
@@ -278,9 +278,8 @@ function renderToString(code, options = {}) {
     }
   };
   let html = createRoot(d => {
-    const r = resolveSSRNode(escape(code()));
-    d();
-    return r;
+    setTimeout(d);
+    return resolveSSRNode(escape(code()));
   });
   sharedConfig.context.noHydrate = true;
   html = injectAssets(sharedConfig.context.assets, html);
@@ -321,7 +320,7 @@ function renderToStream(code, options = {}) {
       });
       writable && writable.end();
       completed = true;
-      dispose();
+      setTimeout(dispose);
     }
   };
   const pushTask = task => {
@@ -510,7 +509,7 @@ function ssrClassList(value) {
       classValue = !!value[key];
     if (!key || key === "undefined" || !classValue) continue;
     i && (result += " ");
-    result += key;
+    result += escape(key);
   }
   return result;
 }
@@ -547,7 +546,7 @@ function ssrElement(tag, props, children, needsId) {
     } 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="${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;
@@ -560,7 +559,7 @@ function ssrElement(tag, props, children, needsId) {
   }
   if (skipChildren) {
     return {
-      t: result + '/>'
+      t: result + "/>"
     };
   }
   return {
@@ -577,13 +576,10 @@ function ssrHydrationKey() {
 function escape(s, attr) {
   const t = typeof s;
   if (t !== "string") {
-    if (!attr && t === "function") return escape(s(), attr);
+    if (!attr && t === "function") return escape(s());
     if (!attr && Array.isArray(s)) {
-      let r = "";
-      for (let i = 0; i < s.length; i++) r += resolveSSRNode(escape(s[i], attr));
-      return {
-        t: r
-      };
+      for (let i = 0; i < s.length; i++) s[i] = escape(s[i]);
+      return s;
     }
     if (attr && t === "boolean") return String(s);
     return s;
@@ -628,8 +624,12 @@ function resolveSSRNode(node) {
   if (t === "string") return node;
   if (node == null || t === "boolean") return "";
   if (Array.isArray(node)) {
+    let prev = {};
     let mapped = "";
-    for (let i = 0, len = node.length; i < len; i++) mapped += resolveSSRNode(node[i]);
+    for (let i = 0, len = node.length; i < len; i++) {
+      if (typeof prev !== "object" && typeof node[i] !== "object") mapped += `<!--!-->`;
+      mapped += resolveSSRNode(prev = node[i]);
+    }
     return mapped;
   }
   if (t === "object") return node.t;

package/web/dist/web.cjs

@@ -352,17 +352,7 @@ function eventHandler(e) {
       return node || document;
     }
   });
-  if (solidJs.sharedConfig.registry && !solidJs.sharedConfig.done) {
-    solidJs.sharedConfig.done = true;
-    document.querySelectorAll("[id^=pl-]").forEach(elem => {
-      while (elem && elem.nodeType !== 8 && elem.nodeValue !== "pl-" + e) {
-        let x = elem.nextSibling;
-        elem.remove();
-        elem = x;
-      }
-      elem && elem.remove();
-    });
-  }
+  if (solidJs.sharedConfig.registry && !solidJs.sharedConfig.done) solidJs.sharedConfig.done = _$HY.done = true;
   while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
@@ -374,7 +364,15 @@ function eventHandler(e) {
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
-  if (solidJs.sharedConfig.context && !current) current = [...parent.childNodes];
+  if (solidJs.sharedConfig.context) {
+    !current && (current = [...parent.childNodes]);
+    let cleaned = [];
+    for (let i = 0; i < current.length; i++) {
+      const node = current[i];
+      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+    }
+    current = cleaned;
+  }
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -460,9 +458,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (value === "<!>") {
-        if (prev && prev.nodeType === 8) normalized.push(prev);
-      } else if (prev && prev.nodeType === 3) {
+      if (prev && prev.nodeType === 3) {
         prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));

package/web/dist/web.js

@@ -351,17 +351,7 @@ function eventHandler(e) {
       return node || document;
     }
   });
-  if (sharedConfig.registry && !sharedConfig.done) {
-    sharedConfig.done = true;
-    document.querySelectorAll("[id^=pl-]").forEach(elem => {
-      while (elem && elem.nodeType !== 8 && elem.nodeValue !== "pl-" + e) {
-        let x = elem.nextSibling;
-        elem.remove();
-        elem = x;
-      }
-      elem && elem.remove();
-    });
-  }
+  if (sharedConfig.registry && !sharedConfig.done) sharedConfig.done = _$HY.done = true;
   while (node) {
     const handler = node[key];
     if (handler && !node.disabled) {
@@ -373,7 +363,15 @@ function eventHandler(e) {
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
-  if (sharedConfig.context && !current) current = [...parent.childNodes];
+  if (sharedConfig.context) {
+    !current && (current = [...parent.childNodes]);
+    let cleaned = [];
+    for (let i = 0; i < current.length; i++) {
+      const node = current[i];
+      if (node.nodeType === 8 && node.data === "!") node.remove();else cleaned.push(node);
+    }
+    current = cleaned;
+  }
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
@@ -459,9 +457,7 @@ function normalizeIncomingArray(normalized, array, current, unwrap) {
       }
     } else {
       const value = String(item);
-      if (value === "<!>") {
-        if (prev && prev.nodeType === 8) normalized.push(prev);
-      } else if (prev && prev.nodeType === 3) {
+      if (prev && prev.nodeType === 3) {
         prev.data = value;
         normalized.push(prev);
       } else normalized.push(document.createTextNode(value));