solid-js 1.4.0 → 1.4.3

package/dist/dev.cjs

@@ -1415,24 +1415,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;

package/dist/dev.js

@@ -1411,24 +1411,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;

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

@@ -1331,23 +1331,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;

package/dist/solid.js

@@ -1327,23 +1327,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;

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;
     }

package/html/dist/html.js

@@ -177,15 +177,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 + ">";
@@ -234,9 +234,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])) {
@@ -261,7 +260,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();
@@ -279,9 +278,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;
     }
@@ -320,6 +328,7 @@ function createHTML(r, {
     }
     options.counter = childOptions.counter;
     options.templateId = childOptions.templateId;
+    options.hasCustomElement = options.hasCustomElement || childOptions.hasCustomElement;
   }
   function processComponentProps(propGroups) {
     let result = [];
@@ -412,16 +421,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})`);
@@ -430,17 +442,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;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.0",
+  "version": "1.4.3",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -114,8 +114,8 @@
       "require": "./h/dist/h.cjs"
     },
     "./h/jsx-runtime": {
-      "import": "./h/dist/jsx.js",
-      "require": "./h/dist/jsx.cjs"
+      "import": "./h/jsx-runtime/dist/jsx.js",
+      "require": "./h/jsx-runtime/dist/jsx.cjs"
     },
     "./h/dist/*": "./h/dist/*",
     "./html": {
@@ -151,5 +151,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "6c9e976c002d3ae327ff509213a091ce79f7582a"
+  "gitHead": "44197a3f304400b055baef40da9ac661c0585b85"
 }

package/store/README.md

@@ -2,7 +2,7 @@
 
 This submodules contains the means for handling deeps nested reactivity. It provides 2 main primitives `createStore` and `createMutable` which leverage proxies to create dynamic nested reactive structures.
 
-This also contains helper methods `produce` and `reconcile` which augment the behavior of the store setter method to allow for localized mutationa and data diffing.
+This also contains helper methods `produce` and `reconcile` which augment the behavior of the store setter method to allow for localized mutation and data diffing.
 
 For full documentation, check out the [website](https://www.solidjs.com/docs/latest/api).
 
@@ -20,4 +20,4 @@ const [store, setStore] = createStore({
 
 // update store.user.firstName
 setStore("user", "firstName", "Will");
-```
+```

package/store/dist/dev.cjs

@@ -143,14 +143,16 @@ function mergeStoreNode(state, value) {
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
-  if (current === next) return;
-  let i = 0,
-      len = next.length;
-  for (; i < len; i++) {
-    const value = next[i];
-    if (current[i] !== value) setProperty(current, i, value);
-  }
-  setProperty(current, "length", len);
+  if (Array.isArray(next)) {
+    if (current === next) return;
+    let i = 0,
+        len = next.length;
+    for (; i < len; i++) {
+      const value = next[i];
+      if (current[i] !== value) setProperty(current, i, value);
+    }
+    setProperty(current, "length", len);
+  } else mergeStoreNode(current, next);
 }
 function updatePath(current, path, traversed = []) {
   let part,
@@ -227,8 +229,8 @@ const proxyTraps = {
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
       const desc = Object.getOwnPropertyDescriptor(target, property);
-      const isFunction = typeof value !== "function";
-      if (solidJs.getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+      const isFunction = typeof value === "function";
+      if (solidJs.getListener() && (!isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
         return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
@@ -373,11 +375,13 @@ function reconcile(value, options = {}) {
     return state;
   };
 }
+const producers = new WeakMap();
 const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
-    return isWrappable(value) ? new Proxy(value, setterTraps) : value;
+    let proxy;
+    return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));
@@ -390,7 +394,13 @@ const setterTraps = {
 };
 function produce(fn) {
   return state => {
-    if (isWrappable(state)) fn(new Proxy(state, setterTraps));
+    if (isWrappable(state)) {
+      let proxy;
+      if (!(proxy = producers.get(state))) {
+        producers.set(state, proxy = new Proxy(state, setterTraps));
+      }
+      fn(proxy);
+    }
     return state;
   };
 }

package/store/dist/dev.js

@@ -139,14 +139,16 @@ function mergeStoreNode(state, value) {
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
-  if (current === next) return;
-  let i = 0,
-      len = next.length;
-  for (; i < len; i++) {
-    const value = next[i];
-    if (current[i] !== value) setProperty(current, i, value);
-  }
-  setProperty(current, "length", len);
+  if (Array.isArray(next)) {
+    if (current === next) return;
+    let i = 0,
+        len = next.length;
+    for (; i < len; i++) {
+      const value = next[i];
+      if (current[i] !== value) setProperty(current, i, value);
+    }
+    setProperty(current, "length", len);
+  } else mergeStoreNode(current, next);
 }
 function updatePath(current, path, traversed = []) {
   let part,
@@ -223,8 +225,8 @@ const proxyTraps = {
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
       const desc = Object.getOwnPropertyDescriptor(target, property);
-      const isFunction = typeof value !== "function";
-      if (getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+      const isFunction = typeof value === "function";
+      if (getListener() && (!isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
         return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
@@ -369,11 +371,13 @@ function reconcile(value, options = {}) {
     return state;
   };
 }
+const producers = new WeakMap();
 const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
-    return isWrappable(value) ? new Proxy(value, setterTraps) : value;
+    let proxy;
+    return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));
@@ -386,7 +390,13 @@ const setterTraps = {
 };
 function produce(fn) {
   return state => {
-    if (isWrappable(state)) fn(new Proxy(state, setterTraps));
+    if (isWrappable(state)) {
+      let proxy;
+      if (!(proxy = producers.get(state))) {
+        producers.set(state, proxy = new Proxy(state, setterTraps));
+      }
+      fn(proxy);
+    }
     return state;
   };
 }

package/store/dist/store.cjs

@@ -138,14 +138,16 @@ function mergeStoreNode(state, value) {
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
-  if (current === next) return;
-  let i = 0,
-      len = next.length;
-  for (; i < len; i++) {
-    const value = next[i];
-    if (current[i] !== value) setProperty(current, i, value);
-  }
-  setProperty(current, "length", len);
+  if (Array.isArray(next)) {
+    if (current === next) return;
+    let i = 0,
+        len = next.length;
+    for (; i < len; i++) {
+      const value = next[i];
+      if (current[i] !== value) setProperty(current, i, value);
+    }
+    setProperty(current, "length", len);
+  } else mergeStoreNode(current, next);
 }
 function updatePath(current, path, traversed = []) {
   let part,
@@ -215,8 +217,8 @@ const proxyTraps = {
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
       const desc = Object.getOwnPropertyDescriptor(target, property);
-      const isFunction = typeof value !== "function";
-      if (solidJs.getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+      const isFunction = typeof value === "function";
+      if (solidJs.getListener() && (!isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
         return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
@@ -351,11 +353,13 @@ function reconcile(value, options = {}) {
     return state;
   };
 }
+const producers = new WeakMap();
 const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
-    return isWrappable(value) ? new Proxy(value, setterTraps) : value;
+    let proxy;
+    return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));
@@ -368,7 +372,13 @@ const setterTraps = {
 };
 function produce(fn) {
   return state => {
-    if (isWrappable(state)) fn(new Proxy(state, setterTraps));
+    if (isWrappable(state)) {
+      let proxy;
+      if (!(proxy = producers.get(state))) {
+        producers.set(state, proxy = new Proxy(state, setterTraps));
+      }
+      fn(proxy);
+    }
     return state;
   };
 }

package/store/dist/store.js

@@ -134,14 +134,16 @@ function mergeStoreNode(state, value) {
 function updateArray(current, next) {
   if (typeof next === "function") next = next(current);
   next = unwrap(next);
-  if (current === next) return;
-  let i = 0,
-      len = next.length;
-  for (; i < len; i++) {
-    const value = next[i];
-    if (current[i] !== value) setProperty(current, i, value);
-  }
-  setProperty(current, "length", len);
+  if (Array.isArray(next)) {
+    if (current === next) return;
+    let i = 0,
+        len = next.length;
+    for (; i < len; i++) {
+      const value = next[i];
+      if (current[i] !== value) setProperty(current, i, value);
+    }
+    setProperty(current, "length", len);
+  } else mergeStoreNode(current, next);
 }
 function updatePath(current, path, traversed = []) {
   let part,
@@ -211,8 +213,8 @@ const proxyTraps = {
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
       const desc = Object.getOwnPropertyDescriptor(target, property);
-      const isFunction = typeof value !== "function";
-      if (getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+      const isFunction = typeof value === "function";
+      if (getListener() && (!isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
         return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
       }
     }
@@ -347,11 +349,13 @@ function reconcile(value, options = {}) {
     return state;
   };
 }
+const producers = new WeakMap();
 const setterTraps = {
   get(target, property) {
     if (property === $RAW) return target;
     const value = target[property];
-    return isWrappable(value) ? new Proxy(value, setterTraps) : value;
+    let proxy;
+    return isWrappable(value) ? producers.get(value) || (producers.set(value, proxy = new Proxy(value, setterTraps)), proxy) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));
@@ -364,7 +368,13 @@ const setterTraps = {
 };
 function produce(fn) {
   return state => {
-    if (isWrappable(state)) fn(new Proxy(state, setterTraps));
+    if (isWrappable(state)) {
+      let proxy;
+      if (!(proxy = producers.get(state))) {
+        producers.set(state, proxy = new Proxy(state, setterTraps));
+      }
+      fn(proxy);
+    }
     return state;
   };
 }

package/store/types/modifiers.d.ts

@@ -1,7 +1,6 @@
-import { DeepMutable } from "./store";
 export declare type ReconcileOptions = {
     key?: string | null;
     merge?: boolean;
 };
 export declare function reconcile<T extends U, U>(value: T, options?: ReconcileOptions): (state: U) => T;
-export declare function produce<T>(fn: (state: DeepMutable<T>) => void): (state: T) => T;
+export declare function produce<T>(fn: (state: T) => void): (state: T) => T;

package/store/types/server.d.ts

@@ -1,7 +1,7 @@
-import type { DeepMutable, SetStoreFunction, Store } from "store";
+import type { SetStoreFunction, Store } from "store";
 export declare const $RAW: unique symbol;
 export declare function isWrappable(obj: any): boolean;
-export declare function unwrap<T>(item: any): T;
+export declare function unwrap<T>(item: T): T;
 export declare function setProperty(state: any, property: PropertyKey, value: any, force?: boolean): void;
 export declare function updatePath(current: any, path: any[], traversed?: PropertyKey[]): void;
 export declare function createStore<T>(state: T | Store<T>): [Store<T>, SetStoreFunction<T>];
@@ -11,5 +11,5 @@ declare type ReconcileOptions = {
     merge?: boolean;
 };
 export declare function reconcile<T extends U, U>(value: T, options?: ReconcileOptions): (state: U) => T;
-export declare function produce<T>(fn: (state: DeepMutable<T>) => void): (state: T) => T;
+export declare function produce<T>(fn: (state: T) => void): (state: T) => T;
 export {};

package/store/types/store.d.ts

@@ -5,9 +5,9 @@ export declare namespace SolidStore {
     }
 }
 export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined | SolidStore.Unwrappable[keyof SolidStore.Unwrappable];
-export declare type Store<T> = DeepReadonly<T>;
-export declare function isWrappable(obj: any): any;
-export declare function unwrap<T extends StoreNode>(item: any, set?: Set<unknown>): T;
+export declare type Store<T> = T;
+export declare function isWrappable<T>(obj: T | NotWrappable): obj is T;
+export declare function unwrap<T>(item: T, set?: Set<unknown>): T;
 export declare function getDataNodes(target: StoreNode): any;
 export declare function getDataNode(nodes: Record<string, any>, property: string | symbol, value: any): any;
 export declare function proxyDescriptor(target: StoreNode, property: PropertyKey): PropertyDescriptor | undefined;
@@ -15,19 +15,26 @@ export declare function trackSelf(target: StoreNode): void;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];
 export declare function setProperty(state: StoreNode, property: PropertyKey, value: any): void;
 export declare function updatePath(current: StoreNode, path: any[], traversed?: PropertyKey[]): void;
+/** @deprecated */
 export declare type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
     readonly [K in keyof T]: DeepReadonly<T[K]>;
 };
+/** @deprecated */
 export declare type DeepMutable<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
     -readonly [K in keyof T]: DeepMutable<T[K]>;
 };
+export declare type CustomPartial<T> = T extends readonly unknown[] ? "0" extends keyof T ? {
+    [K in Extract<keyof T, `${number}`>]?: T[K];
+} : {
+    [x: number]: T[number];
+} : Partial<T>;
 export declare type StorePathRange = {
     from?: number;
     to?: number;
     by?: number;
 };
-export declare type ArrayFilterFn<T> = (item: DeepReadonly<T>, index: number) => boolean;
-export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: DeepReadonly<T>, traversed: U) => T | Partial<T> | DeepReadonly<T> | Partial<DeepReadonly<T>> | void) | T | Partial<T> | DeepReadonly<T> | Partial<DeepReadonly<T>>;
+export declare type ArrayFilterFn<T> = (item: T, index: number) => boolean;
+export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: T, traversed: U) => T | CustomPartial<T> | void) | T | CustomPartial<T>;
 export declare type Part<T, K extends KeyOf<T> = KeyOf<T>> = [K] extends [never] ? never : K | readonly K[] | ([T] extends [readonly unknown[]] ? ArrayFilterFn<T[number]> | StorePathRange : never);
 declare type W<T> = Exclude<T, NotWrappable>;
 declare type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [readonly unknown[]] ? number : [T] extends [never] ? never : keyof T : keyof T;

package/types/reactive/signal.d.ts

@@ -200,13 +200,12 @@ export declare function createMemo<Next extends Prev, Init = Next, Prev = Next>(
 export interface Resource<T> extends Accessor<T> {
     loading: boolean;
     error: any;
-    latest: T | undefined;
+    latest: T;
 }
 export declare type ResourceActions<T> = {
     mutate: Setter<T>;
     refetch: (info?: unknown) => T | Promise<T> | undefined | null;
 };
-export declare type ResourceReturn<T> = [Resource<T>, ResourceActions<T>];
 export declare type ResourceSource<S> = S | false | null | undefined | (() => S | false | null | undefined);
 export declare type ResourceFetcher<S, T> = (k: S, info: ResourceFetcherInfo<T>) => T | Promise<T>;
 export declare type ResourceFetcherInfo<T> = {
@@ -224,6 +223,10 @@ export declare type ResourceOptions<T> = undefined extends T ? {
     deferStream?: boolean;
     onHydrated?: <S, T>(k: S, info: ResourceFetcherInfo<T>) => void;
 };
+export declare type ResourceReturn<T, O extends ResourceOptions<T | undefined> | undefined, K = T> = [
+    Resource<O extends undefined | null ? T | undefined : NonNullable<O>["initialValue"] extends undefined ? T | undefined : T>,
+    ResourceActions<K>
+];
 /**
  * Creates a resource that wraps a repeated promise in a reactive pattern:
  * ```typescript
@@ -249,10 +252,10 @@ export declare type ResourceOptions<T> = undefined extends T ? {
  *
  * @description https://www.solidjs.com/docs/latest/api#createresource
  */
-export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
-export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
-export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined>;
-export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T>;
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined, typeof options>;
+export declare function createResource<T, S = true>(fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T, typeof options>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options?: ResourceOptions<undefined>): ResourceReturn<T | undefined, typeof options>;
+export declare function createResource<T, S>(source: ResourceSource<S>, fetcher: ResourceFetcher<S, T>, options: ResourceOptions<T>): ResourceReturn<T, typeof options>;
 export interface DeferredOptions<T> {
     equals?: false | ((prev: T, next: T) => boolean);
     name?: string;

package/types/render/component.d.ts

@@ -66,25 +66,19 @@ export declare type ComponentProps<T extends keyof JSX.IntrinsicElements | Compo
  */
 export declare type Ref<T> = T | ((val: T) => void);
 export declare function createComponent<T>(Comp: Component<T>, props: T): JSX.Element;
-declare type Simplify<T> = T extends object ? {
-    [K in keyof T]: T[K];
-} : T;
-declare type UnboxLazy<T> = T extends () => infer U ? U : T;
-declare type RequiredKeys<T> = keyof {
-    [K in keyof T as T extends {
-        [_ in K]: unknown;
-    } ? K : never]: 0;
-};
-declare type Override<T, U> = {
-    [K in keyof Omit<T, RequiredKeys<U>>]: T[K] | Exclude<U[K & keyof U], undefined>;
+declare type Override<T, U> = T extends any ? U extends any ? {
+    [K in keyof T]: K extends keyof U ? undefined extends U[K] ? Exclude<U[K], undefined> | T[K] : U[K] : T[K];
 } & {
-    [K in keyof Omit<U, Exclude<keyof T, RequiredKeys<U>>>]: Exclude<U[K], undefined> | (undefined extends U[K] ? (K extends keyof T ? T[K] : undefined) : never);
-};
-export declare type MergeProps<T extends unknown[], Curr = {}> = T extends [infer Next, ...infer Rest] ? MergeProps<Rest, Next extends object ? (Next extends Function ? Curr : Override<Curr, UnboxLazy<Next>>) : Curr> : Simplify<Curr>;
+    [K in keyof U]: K extends keyof T ? undefined extends U[K] ? Exclude<U[K], undefined> | T[K] : U[K] : U[K];
+} : T & U : T & U;
+export declare type MergeProps<T extends unknown[], Curr = {}> = T extends [
+    infer Next | (() => infer Next),
+    ...infer Rest
+] ? MergeProps<Rest, Override<Curr, Next>> : Curr;
 export declare function mergeProps<T extends [unknown, ...unknown[]]>(...sources: T): MergeProps<T>;
 export declare type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
     ...{
-        [P in keyof K]: P extends `${number}` ? Pick<T, Extract<K[P], readonly (keyof T)[]>[number]> : K[P];
+        [P in keyof K]: P extends `${number}` ? Pick<T, Extract<K[P], readonly (keyof T)[]>[number]> : never;
     },
     Omit<T, K[number][number]>
 ];

package/types/render/hydration.d.ts

@@ -7,7 +7,7 @@ declare type SharedConfig = {
     resources?: {
         [key: string]: any;
     };
-    load?: (id: string) => Promise<any> | undefined;
+    load?: (id: string) => Promise<any> | any | undefined;
     gather?: (key: string) => void;
     registry?: Map<string, Element>;
     done?: boolean;

package/web/dist/server.cjs

@@ -269,7 +269,7 @@ function renderToStringAsync(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-      if (!p || typeof p !== "object" || !("then" in p)) return (scripts += serializeSet(dedupe, id, p)) + ";";
+      if (!p || typeof p !== "object" || !("then" in p)) return scripts += serializeSet(dedupe, id, p) + ";";
       p.then(d => scripts += serializeSet(dedupe, id, d) + ";").catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };

package/web/dist/server.js

@@ -266,7 +266,7 @@ function renderToStringAsync(code, options = {}) {
     nonce,
     writeResource(id, p, error) {
       if (error) return scripts += `_$HY.set("${id}", ${serializeError(p)});`;
-      if (!p || typeof p !== "object" || !("then" in p)) return (scripts += serializeSet(dedupe, id, p)) + ";";
+      if (!p || typeof p !== "object" || !("then" in p)) return scripts += serializeSet(dedupe, id, p) + ";";
       p.then(d => scripts += serializeSet(dedupe, id, d) + ";").catch(() => scripts += `_$HY.set("${id}", {});`);
     }
   };