solid-js 1.6.8 → 1.6.10

package/web/dist/server.js

@@ -260,7 +260,7 @@ function toRefParam(index) {
   return ref;
 }
 
-const REPLACE_SCRIPT = `function $df(e,t,d,l){d=document.getElementById(e),(l=document.getElementById("pl-"+e))&&l.replaceWith(...d.childNodes),d.remove(),_$HY.set(e,t),_$HY.fe(e)}`;
+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)}`;
 function renderToString(code, options = {}) {
   let scripts = "";
   sharedConfig.context = {
@@ -391,7 +391,7 @@ function renderToStream(code, options = {}) {
               Promise.resolve().then(() => html = replacePlaceholder(html, key, value !== undefined ? value : ""));
               error && pushTask(serializeSet(dedupe, key, error, serializeError));
             } else {
-              buffer.write(`<div hidden id="${key}">${value !== undefined ? value : " "}</div>`);
+              buffer.write(`<template id="${key}">${value !== undefined ? value : " "}</template>`);
               pushTask(`${keys.length ? keys.map(k => `_$HY.unset("${k}")`).join(";") + ";" : ""}$df("${key}"${error ? "," + serializeError(error) : ""})${!scriptFlushed ? ";" + REPLACE_SCRIPT : ""}`);
               scriptFlushed = true;
             }
@@ -494,10 +494,10 @@ function ssr(t, ...nodes) {
 function ssrClassList(value) {
   if (!value) return "";
   let classKeys = Object.keys(value),
-      result = "";
+    result = "";
   for (let i = 0, len = classKeys.length; i < len; i++) {
     const key = classKeys[i],
-          classValue = !!value[key];
+      classValue = !!value[key];
     if (!key || key === "undefined" || !classValue) continue;
     i && (result += " ");
     result += key;
@@ -578,7 +578,7 @@ function escape(s, attr) {
   let iAmp = s.indexOf("&");
   if (iDelim < 0 && iAmp < 0) return s;
   let left = 0,
-      out = "";
+    out = "";
   while (iDelim >= 0 && iAmp >= 0) {
     if (iDelim < iAmp) {
       if (left < iDelim) out += s.substring(left, iDelim);
@@ -642,7 +642,8 @@ function generateHydrationScript({
 function Hydration(props) {
   if (!sharedConfig.context.noHydrate) return props.children;
   const context = sharedConfig.context;
-  sharedConfig.context = { ...context,
+  sharedConfig.context = {
+    ...context,
     count: 0,
     id: `${context.id}${context.count++}-`,
     noHydrate: false
@@ -700,21 +701,12 @@ function serializeSet(registry, key, value, serializer = stringify) {
   return `_$HY.set("${key}", ${serializer(value)})`;
 }
 function replacePlaceholder(html, key, value) {
-  const nextRegex = /(<[/]?span[^>]*>)/g;
-  const marker = `<span id="pl-${key}">`;
+  const marker = `<template id="pl-${key}">`;
+  const close = `<!pl-${key}>`;
   const first = html.indexOf(marker);
   if (first === -1) return html;
-  nextRegex.lastIndex = first + marker.length;
-  let match;
-  let open = 0,
-      close = 0;
-  while (match = nextRegex.exec(html)) {
-    if (match[0][1] === "/") {
-      close++;
-      if (close > open) break;
-    } else open++;
-  }
-  return html.slice(0, first) + value + html.slice(nextRegex.lastIndex);
+  const last = html.indexOf(close, first + marker.length);
+  return html.slice(0, first) + value + html.slice(last + close.length);
 }
 function Assets(props) {
   useAssets(() => props.children);
@@ -793,7 +785,7 @@ function delegateEvents() {}
 function Dynamic(props) {
   const [p, others] = splitProps(props, ["component"]);
   const comp = p.component,
-        t = typeof comp;
+    t = typeof comp;
   if (comp) {
     if (t === "function") return comp(others);else if (t === "string") {
       return ssrElement(comp, others, undefined, true);

package/web/dist/web.cjs

@@ -31,12 +31,12 @@ const DOMElements = /*#__PURE__*/new Set(["html", "base", "head", "link", "meta"
 
 function reconcileArrays(parentNode, a, b) {
   let bLength = b.length,
-      aEnd = a.length,
-      bEnd = bLength,
-      aStart = 0,
-      bStart = 0,
-      after = a[aEnd - 1].nextSibling,
-      map = null;
+    aEnd = a.length,
+    bEnd = bLength,
+    aStart = 0,
+    bStart = 0,
+    after = a[aEnd - 1].nextSibling,
+    map = null;
   while (aStart < aEnd || bStart < bEnd) {
     if (a[aStart] === b[bStart]) {
       aStart++;
@@ -70,8 +70,8 @@ function reconcileArrays(parentNode, a, b) {
       if (index != null) {
         if (bStart < index && index < bEnd) {
           let i = aStart,
-              sequence = 1,
-              t;
+            sequence = 1,
+            t;
           while (++i < aEnd && i < bEnd) {
             if ((t = map.get(a[i])) == null || t !== index + sequence) break;
             sequence++;
@@ -143,7 +143,7 @@ function addEventListener(node, name, handler, delegate) {
 }
 function classList(node, value, prev = {}) {
   const classKeys = Object.keys(value || {}),
-        prevKeys = Object.keys(prev);
+    prevKeys = Object.keys(prev);
   let i, len;
   for (i = 0, len = prevKeys.length; i < len; i++) {
     const key = prevKeys[i];
@@ -153,7 +153,7 @@ function classList(node, value, prev = {}) {
   }
   for (i = 0, len = classKeys.length; i < len; i++) {
     const key = classKeys[i],
-          classValue = !!value[key];
+      classValue = !!value[key];
     if (!key || key === "undefined" || prev[key] === classValue || !classValue) continue;
     toggleClassKey(node, key, true);
     prev[key] = classValue;
@@ -258,8 +258,8 @@ function getNextMatch(el, nodeName) {
 }
 function getNextMarker(start) {
   let end = start,
-      count = 0,
-      current = [];
+    count = 0,
+    current = [];
   if (solidJs.sharedConfig.context) {
     while (end) {
       if (end.nodeType === 8) {
@@ -351,7 +351,14 @@ function eventHandler(e) {
   });
   if (solidJs.sharedConfig.registry && !solidJs.sharedConfig.done) {
     solidJs.sharedConfig.done = true;
-    document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
+    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();
+    });
   }
   while (node) {
     const handler = node[key];
@@ -368,7 +375,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
-        multi = marker !== undefined;
+    multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
     if (solidJs.sharedConfig.context) return current;
@@ -435,7 +442,7 @@ 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];
+      prev = current && current[i];
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
@@ -529,10 +536,10 @@ const hydrate = (...args) => {
 };
 function Portal(props) {
   const {
-    useShadow
-  } = props,
-        marker = document.createTextNode(""),
-        mount = props.mount || document.body;
+      useShadow
+    } = props,
+    marker = document.createTextNode(""),
+    mount = props.mount || document.body;
   function renderPortal() {
     if (solidJs.sharedConfig.context) {
       const [s, set] = solidJs.createSignal(false);
@@ -549,9 +556,9 @@ function Portal(props) {
     });
   } else {
     const container = createElement(props.isSVG ? "g" : "div", props.isSVG),
-          renderRoot = useShadow && container.attachShadow ? container.attachShadow({
-      mode: "open"
-    }) : container;
+      renderRoot = useShadow && container.attachShadow ? container.attachShadow({
+        mode: "open"
+      }) : container;
     Object.defineProperty(container, "_$host", {
       get() {
         return marker.parentNode;

package/web/dist/web.js

@@ -30,12 +30,12 @@ const DOMElements = /*#__PURE__*/new Set(["html", "base", "head", "link", "meta"
 
 function reconcileArrays(parentNode, a, b) {
   let bLength = b.length,
-      aEnd = a.length,
-      bEnd = bLength,
-      aStart = 0,
-      bStart = 0,
-      after = a[aEnd - 1].nextSibling,
-      map = null;
+    aEnd = a.length,
+    bEnd = bLength,
+    aStart = 0,
+    bStart = 0,
+    after = a[aEnd - 1].nextSibling,
+    map = null;
   while (aStart < aEnd || bStart < bEnd) {
     if (a[aStart] === b[bStart]) {
       aStart++;
@@ -69,8 +69,8 @@ function reconcileArrays(parentNode, a, b) {
       if (index != null) {
         if (bStart < index && index < bEnd) {
           let i = aStart,
-              sequence = 1,
-              t;
+            sequence = 1,
+            t;
           while (++i < aEnd && i < bEnd) {
             if ((t = map.get(a[i])) == null || t !== index + sequence) break;
             sequence++;
@@ -142,7 +142,7 @@ function addEventListener(node, name, handler, delegate) {
 }
 function classList(node, value, prev = {}) {
   const classKeys = Object.keys(value || {}),
-        prevKeys = Object.keys(prev);
+    prevKeys = Object.keys(prev);
   let i, len;
   for (i = 0, len = prevKeys.length; i < len; i++) {
     const key = prevKeys[i];
@@ -152,7 +152,7 @@ function classList(node, value, prev = {}) {
   }
   for (i = 0, len = classKeys.length; i < len; i++) {
     const key = classKeys[i],
-          classValue = !!value[key];
+      classValue = !!value[key];
     if (!key || key === "undefined" || prev[key] === classValue || !classValue) continue;
     toggleClassKey(node, key, true);
     prev[key] = classValue;
@@ -257,8 +257,8 @@ function getNextMatch(el, nodeName) {
 }
 function getNextMarker(start) {
   let end = start,
-      count = 0,
-      current = [];
+    count = 0,
+    current = [];
   if (sharedConfig.context) {
     while (end) {
       if (end.nodeType === 8) {
@@ -350,7 +350,14 @@ function eventHandler(e) {
   });
   if (sharedConfig.registry && !sharedConfig.done) {
     sharedConfig.done = true;
-    document.querySelectorAll("[id^=pl-]").forEach(elem => elem.remove());
+    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();
+    });
   }
   while (node) {
     const handler = node[key];
@@ -367,7 +374,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
   while (typeof current === "function") current = current();
   if (value === current) return current;
   const t = typeof value,
-        multi = marker !== undefined;
+    multi = marker !== undefined;
   parent = multi && current[0] && current[0].parentNode || parent;
   if (t === "string" || t === "number") {
     if (sharedConfig.context) return current;
@@ -434,7 +441,7 @@ 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];
+      prev = current && current[i];
     if (item instanceof Node) {
       normalized.push(item);
     } else if (item == null || item === true || item === false) ; else if (Array.isArray(item)) {
@@ -528,10 +535,10 @@ const hydrate = (...args) => {
 };
 function Portal(props) {
   const {
-    useShadow
-  } = props,
-        marker = document.createTextNode(""),
-        mount = props.mount || document.body;
+      useShadow
+    } = props,
+    marker = document.createTextNode(""),
+    mount = props.mount || document.body;
   function renderPortal() {
     if (sharedConfig.context) {
       const [s, set] = createSignal(false);
@@ -548,9 +555,9 @@ function Portal(props) {
     });
   } else {
     const container = createElement(props.isSVG ? "g" : "div", props.isSVG),
-          renderRoot = useShadow && container.attachShadow ? container.attachShadow({
-      mode: "open"
-    }) : container;
+      renderRoot = useShadow && container.attachShadow ? container.attachShadow({
+        mode: "open"
+      }) : container;
     Object.defineProperty(container, "_$host", {
       get() {
         return marker.parentNode;

package/web/types/index.d.ts

@@ -10,7 +10,7 @@ export declare const hydrate: typeof hydrateCore;
  *
  * Useful for inserting modals and tooltips outside of an cropping layout. If no mount point is given, the portal is inserted in document.body; it is wrapped in a `<div>` unless the target is document.head or `isSVG` is true. setting `useShadow` to true places the element in a shadow root to isolate styles.
  *
- * @description https://www.solidjs.com/docs/latest/api#%3Cportal%3E
+ * @description https://www.solidjs.com/docs/latest/api#portal
  */
 export declare function Portal<T extends boolean = false, S extends boolean = false>(props: {
     mount?: Node;
@@ -21,7 +21,7 @@ export declare function Portal<T extends boolean = false, S extends boolean = fa
     } : {}) & (S extends true ? SVGGElement : HTMLDivElement)) => void);
     children: JSX.Element;
 }): Text;
-declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
+export declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
     [K in keyof P]: P[K];
 } & {
     component: T | undefined;
@@ -31,6 +31,6 @@ declare type DynamicProps<T extends ValidComponent, P = ComponentProps<T>> = {
  * ```typescript
  * <Dynamic component={multiline() ? 'textarea' : 'input'} value={value()} />
  * ```
- * @description https://www.solidjs.com/docs/latest/api#%3Cdynamic%3E
+ * @description https://www.solidjs.com/docs/latest/api#dynamic
  */
 export declare function Dynamic<T extends ValidComponent>(props: DynamicProps<T>): Accessor<JSX.Element>;