solid-js 1.4.1 → 1.4.4

package/dist/dev.cjs

@@ -161,17 +161,21 @@ let rootCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
+  },
+        updateFn = unowned ? () => fn(() => {
+    throw new Error("Dispose method must be an explicit argument to createRoot function");
+  })  : () => fn(() => cleanNode(root));
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -946,6 +950,7 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
   node.context = null;
+  delete node.sourceMap;
 }
 function reset(node, top) {
   if (!top) {
@@ -1415,24 +1420,25 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1527,7 +1533,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1560,7 +1566,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1570,7 +1576,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/dist/dev.js

@@ -157,17 +157,21 @@ let rootCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
+  },
+        updateFn = unowned ? () => fn(() => {
+    throw new Error("Dispose method must be an explicit argument to createRoot function");
+  })  : () => fn(() => cleanNode(root));
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -942,6 +946,7 @@ function cleanNode(node) {
   }
   if (Transition && Transition.running) node.tState = 0;else node.state = 0;
   node.context = null;
+  delete node.sourceMap;
 }
 function reset(node, top) {
   if (!top) {
@@ -1411,24 +1416,25 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
       if ((typeof f !== "function" || f.length == 0)) console.error(e);
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1523,7 +1529,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1556,7 +1562,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1566,7 +1572,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/dist/server.cjs

@@ -258,8 +258,9 @@ function createComponent(Comp, props) {
 function mergeProps(...sources) {
   const target = {};
   for (let i = 0; i < sources.length; i++) {
-    const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-    Object.defineProperties(target, descriptors);
+    let source = sources[i];
+    if (typeof source === "function") source = source();
+    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
   }
   return target;
 }
@@ -314,14 +315,16 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+const NoErrors = {};
 function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
-  let error, res;
+  let error = NoErrors,
+      res;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
   onError(err => error = err);
   createMemo(() => res = props.children);
-  if (error) {
+  if (error !== NoErrors) {
     ctx.writeResource(id, error, true);
     setHydrateContext({ ...ctx,
       count: 0
@@ -360,7 +363,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
+    const resolved = sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -380,7 +383,7 @@ function createResource(source, fetcher, options = {}) {
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
-    if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
+    if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
     }

package/dist/server.js

@@ -254,8 +254,9 @@ function createComponent(Comp, props) {
 function mergeProps(...sources) {
   const target = {};
   for (let i = 0; i < sources.length; i++) {
-    const descriptors = Object.getOwnPropertyDescriptors(sources[i]);
-    Object.defineProperties(target, descriptors);
+    let source = sources[i];
+    if (typeof source === "function") source = source();
+    if (source) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
   }
   return target;
 }
@@ -310,14 +311,16 @@ function Switch(props) {
 function Match(props) {
   return props;
 }
+const NoErrors = {};
 function resetErrorBoundaries() {}
 function ErrorBoundary(props) {
-  let error, res;
+  let error = NoErrors,
+      res;
   const ctx = sharedConfig.context;
   const id = ctx.id + ctx.count;
   onError(err => error = err);
   createMemo(() => res = props.children);
-  if (error) {
+  if (error !== NoErrors) {
     ctx.writeResource(id, error, true);
     setHydrateContext({ ...ctx,
       count: 0
@@ -356,7 +359,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
+    const resolved = sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -376,7 +379,7 @@ function createResource(source, fetcher, options = {}) {
   function load() {
     const ctx = sharedConfig.context;
     if (!ctx.async) return read.loading = !!(typeof source === "function" ? source() : source);
-    if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
+    if (ctx.resources && id in ctx.resources && "data" in ctx.resources[id]) {
       value = ctx.resources[id].data;
       return;
     }

package/dist/solid.cjs

@@ -160,16 +160,18 @@ let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !false ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
+  },
+        updateFn = unowned ? fn : () => fn(() => cleanNode(root));
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -1331,23 +1333,24 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1442,7 +1445,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1475,7 +1478,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1485,7 +1488,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/dist/solid.js

@@ -156,16 +156,18 @@ let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
   const listener = Listener,
         owner = Owner,
-        root = fn.length === 0 && !false ? UNOWNED : {
+        unowned = fn.length === 0,
+        root = unowned && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
     owner: detachedOwner || owner
-  };
+  },
+        updateFn = unowned ? fn : () => fn(() => cleanNode(root));
   Owner = root;
   Listener = null;
   try {
-    return runUpdates(() => fn(() => cleanNode(root)), true);
+    return runUpdates(updateFn, true);
   } finally {
     Listener = listener;
     Owner = owner;
@@ -1327,23 +1329,24 @@ function Match(props) {
   return props;
 }
 let Errors;
+const NoErrors = {};
 function resetErrorBoundaries() {
-  Errors && [...Errors].forEach(fn => fn());
+  Errors && [...Errors].forEach(fn => fn(NoErrors));
 }
 function ErrorBoundary(props) {
-  let err = undefined;
+  let err = NoErrors;
   if (sharedConfig.context && sharedConfig.load) {
-    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count) || NoErrors;
   }
   const [errored, setErrored] = createSignal(err);
   Errors || (Errors = new Set());
   Errors.add(setErrored);
   onCleanup(() => Errors.delete(setErrored));
-  let e;
   return createMemo(() => {
-    if ((e = errored()) != null) {
+    let e;
+    if ((e = errored()) !== NoErrors) {
       const f = props.fallback;
-      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(null))) : f;
+      return typeof f === "function" && f.length ? untrack(() => f(e, () => setErrored(NoErrors))) : f;
     }
     onError(setErrored);
     return props.children;
@@ -1438,7 +1441,7 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
-  if (sharedConfig.context) {
+  if (sharedConfig.context && sharedConfig.load) {
     const key = sharedConfig.context.id + sharedConfig.context.count;
     p = sharedConfig.load(key);
     if (p) {
@@ -1471,7 +1474,7 @@ function Suspense(props) {
           return flicker = undefined;
         }
         if (ctx && p === undefined) setHydrateContext();
-        const rendered = untrack(() => props.children);
+        const rendered = createMemo(() => props.children);
         return createMemo(() => {
           const inFallback = store.inFallback(),
                 visibleContent = showContent ? showContent() : true,
@@ -1481,7 +1484,7 @@ function Suspense(props) {
             store.resolved = true;
             ctx = p = undefined;
             resumeEffects(store.effects);
-            return rendered;
+            return rendered();
           }
           if (!visibleFallback) return;
           return createRoot(disposer => {

package/html/dist/html.cjs

@@ -179,15 +179,15 @@ const attrName = "[ " + spaces + "]+" + almostEverything;
 const tagName = "<([A-Za-z$#]+[A-Za-z0-9:_-]*)((?:";
 const attrPartials = "(?:\\s*=\\s*(?:'[^']*?'|\"[^\"]*?\"|\\([^)]*?\\)|<[^>]*?>|" + almostEverything + "))?)";
 const attrSeeker = new RegExp(tagName + attrName + attrPartials + "+)([ " + spaces + "]*/?>)", "g");
-const findAttributes = new RegExp("(" + attrName + "\\s*=\\s*)(['\"(]?)" + "<!--#-->" + "(['\")]?)", "gi");
+const findAttributes = new RegExp("(" + attrName + "\\s*=\\s*)(<!--#-->|['\"(]([\\w\\s]*<!--#-->[\\w\\s]*)*['\")])", "gi");
 const selfClosing = new RegExp(tagName + attrName + attrPartials + "*)([ " + spaces + "]*/>)", "g");
 const marker = "<!--#-->";
 const reservedNameSpaces = new Set(["class", "on", "oncapture", "style", "use", "prop", "attr"]);
 function attrReplacer($0, $1, $2, $3) {
   return "<" + $1 + $2.replace(findAttributes, replaceAttributes) + $3;
 }
-function replaceAttributes($0, $1, $2, $3) {
-  return $1 + ($2 || '"') + "###" + ($3 || '"');
+function replaceAttributes($0, $1, $2) {
+  return $1 + ($2[0] === '"' || $2[0] === "'" ? $2.replace(/<!--#-->/g, "###") : '"###"');
 }
 function fullClosing($0, $1, $2) {
   return VOID_ELEMENTS.test($1) ? $0 : "<" + $1 + $2 + "></" + $1 + ">";
@@ -236,9 +236,8 @@ function createHTML(r, {
     cache.set(statics, templates);
     return templates;
   }
-  function parseKeyValue(tag, name, isSVG, isCE, options) {
-    let count = options.counter++,
-        expr = `!doNotWrap ? exprs[${count}]() : exprs[${count}]`,
+  function parseKeyValue(tag, name, value, isSVG, isCE, options) {
+    let expr = value === "###" ? `!doNotWrap ? exprs[${options.counter}]() : exprs[${options.counter++}]` : value.split("###").map((v, i) => i ? ` + (typeof exprs[${options.counter}] === "function" ? exprs[${options.counter}]() : exprs[${options.counter++}]) + "${v}"` : `"${v}"`).join(""),
         parts,
         namespace;
     if ((parts = name.split(":")) && parts[1] && reservedNameSpaces.has(parts[0])) {
@@ -263,7 +262,7 @@ function createHTML(r, {
       if (ns) options.exprs.push(`r.setAttributeNS(${tag},"${ns}","${name}",${expr})`);else options.exprs.push(`r.setAttribute(${tag},"${r.Aliases[name] || name}",${expr})`);
     }
   }
-  function parseAttribute(tag, name, isSVG, isCE, options) {
+  function parseAttribute(tag, name, value, isSVG, isCE, options) {
     if (name.slice(0, 2) === "on") {
       if (!name.includes(":")) {
         const lc = name.slice(2).toLowerCase();
@@ -281,9 +280,18 @@ function createHTML(r, {
         exprs: []
       }),
             count = options.counter;
-      parseKeyValue(tag, name, isSVG, isCE, childOptions);
-      options.decl.push(`_fn${count} = doNotWrap => {\n${childOptions.exprs.join(";\n")};\n}`);
-      options.exprs.push(`typeof exprs[${count}] === "function" ? r.effect(_fn${count}) : _fn${count}(true)`);
+      parseKeyValue(tag, name, value, isSVG, isCE, childOptions);
+      options.decl.push(`_fn${count} = (${value === "###" ? "doNotWrap" : ""}) => {\n${childOptions.exprs.join(";\n")};\n}`);
+      if (value === "###") {
+        options.exprs.push(`typeof exprs[${count}] === "function" ? r.effect(_fn${count}) : _fn${count}(true)`);
+      } else {
+        let check = "";
+        for (let i = count; i < childOptions.counter; i++) {
+          i !== count && (check += " || ");
+          check += `typeof exprs[${i}] === "function"`;
+        }
+        options.exprs.push(check + ` ? r.effect(_fn${count}) : _fn${count}()`);
+      }
       options.counter = childOptions.counter;
       options.wrap = false;
     }
@@ -322,6 +330,7 @@ function createHTML(r, {
     }
     options.counter = childOptions.counter;
     options.templateId = childOptions.templateId;
+    options.hasCustomElement = options.hasCustomElement || childOptions.hasCustomElement;
   }
   function processComponentProps(propGroups) {
     let result = [];
@@ -414,16 +423,19 @@ function createHTML(r, {
       options.exprs.push(`return [${parts.join(", \n")}]`);
     } else if (node.type === "tag") {
       const tag = `_$el${uuid++}`;
-      options.decl.push(!options.decl.length ? `const ${tag} = tmpls[${options.templateId}].content.firstChild.cloneNode(true)` : `${tag} = ${options.path}.${options.first ? "firstChild" : "nextSibling"}`);
+      const topDecl = !options.decl.length;
+      const templateId = options.templateId;
+      options.decl.push(topDecl ? "" : `${tag} = ${options.path}.${options.first ? "firstChild" : "nextSibling"}`);
       const keys = Object.keys(node.attrs);
       const isSVG = r.SVGElements.has(node.name);
       const isCE = node.name.includes("-");
+      options.hasCustomElement = isCE;
       for (let i = 0; i < keys.length; i++) {
         const name = keys[i],
               value = node.attrs[name];
-        if (value === "###") {
+        if (value.includes("###")) {
           delete node.attrs[name];
-          parseAttribute(tag, name, isSVG, isCE, options);
+          parseAttribute(tag, name, value, isSVG, isCE, options);
         } else if (name === "###") {
           delete node.attrs[name];
           options.exprs.push(`r.spread(${tag},exprs[${options.counter++}],${isSVG},${!!node.children.length})`);
@@ -432,17 +444,22 @@ function createHTML(r, {
       options.path = tag;
       options.first = false;
       processChildren(node, options);
+      if (topDecl) {
+        options.decl[0] = options.hasCustomElement ? `const ${tag} = document.importNode(tmpls[${templateId}].content.firstChild, true)` : `const ${tag} = tmpls[${templateId}].content.firstChild.cloneNode(true)`;
+      }
     } else if (node.type === "text") {
       const tag = `_$el${uuid++}`;
       options.decl.push(`${tag} = ${options.path}.${options.first ? "firstChild" : "nextSibling"}`);
       options.path = tag;
       options.first = false;
-    } else if (node.type === "comment" && node.content === "#") {
+    } else if (node.type === "comment") {
       const tag = `_$el${uuid++}`;
       options.decl.push(`${tag} = ${options.path}.${options.first ? "firstChild" : "nextSibling"}`);
-      if (options.multi) {
-        options.exprs.push(`r.insert(${options.parent}, exprs[${options.counter++}], ${tag})`);
-      } else options.exprs.push(`r.insert(${options.parent}, exprs[${options.counter++}])`);
+      if (node.content === "#") {
+        if (options.multi) {
+          options.exprs.push(`r.insert(${options.parent}, exprs[${options.counter++}], ${tag})`);
+        } else options.exprs.push(`r.insert(${options.parent}, exprs[${options.counter++}])`);
+      }
       options.path = tag;
       options.first = false;
     }