solid-js 1.4.0-beta.6 → 1.4.2

package/dist/dev.cjs

@@ -441,8 +441,7 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn,
-options) {
+function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;

package/dist/dev.js

@@ -437,8 +437,7 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn,
-options) {
+function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;

package/dist/solid.cjs

@@ -438,8 +438,7 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn,
-options) {
+function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;

package/dist/solid.js

@@ -434,8 +434,7 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn,
-options) {
+function on(deps, fn, options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;

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-beta.6",
+  "version": "1.4.2",
   "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": "dce1c4b0c4d7b47f6f8cb743173da3acfd831419"
+  "gitHead": "f17df5c7042425aa8d363be261bd9a9e5345c188"
 }

package/store/dist/dev.cjs

@@ -227,8 +227,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));
       }
     }

package/store/dist/dev.js

@@ -223,8 +223,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));
       }
     }

package/store/dist/store.cjs

@@ -215,8 +215,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));
       }
     }

package/store/dist/store.js

@@ -211,8 +211,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));
       }
     }

package/types/reactive/signal.d.ts

@@ -72,7 +72,7 @@ export declare type RootFunction<T> = (dispose: () => void) => T;
  */
 export declare function createRoot<T>(fn: RootFunction<T>, detachedOwner?: Owner): T;
 export declare type Accessor<T> = () => T;
-export declare type Setter<T> = (undefined extends T ? () => undefined : {}) & (<U extends T>(value: Exclude<U, Function> | ((prev: T) => U)) => U);
+export declare type Setter<T> = (undefined extends T ? () => undefined : {}) & (<U extends T>(value: (prev: T) => U) => U) & (<U extends T>(value: Exclude<U, Function>) => U) & (<U extends T>(value: Exclude<U, Function> | ((prev: T) => U)) => U);
 export declare type Signal<T> = [get: Accessor<T>, set: Setter<T>];
 export interface SignalOptions<T> extends MemoOptions<T> {
     internal?: boolean;
@@ -314,21 +314,25 @@ export declare function batch<T>(fn: Accessor<T>): T;
  * @description https://www.solidjs.com/docs/latest/api#untrack
  */
 export declare function untrack<T>(fn: Accessor<T>): T;
-export declare type ReturnTypes<T> = T extends (() => any)[] ? {
-    [I in keyof T]: ReturnTypes<T[I]>;
-} : T extends () => any ? ReturnType<T> : never;
-export declare type OnEffectFunction<S, Prev, Next extends Prev = Prev> = (input: ReturnTypes<S>, prevInput: ReturnTypes<S>, v: Prev) => Next;
+/** @deprecated */
+export declare type ReturnTypes<T> = T extends readonly Accessor<unknown>[] ? {
+    [K in keyof T]: T[K] extends Accessor<infer I> ? I : never;
+} : T extends Accessor<infer I> ? I : never;
+export declare type AccessorArray<T> = [...Extract<{
+    [K in keyof T]: Accessor<T[K]>;
+}, readonly unknown[]>];
+export declare type OnEffectFunction<S, Prev, Next extends Prev = Prev> = (input: S, prevInput: S | undefined, prev: Prev) => Next;
 export interface OnOptions {
     defer?: boolean;
 }
 /**
  * on - make dependencies of a computation explicit
  * ```typescript
- * export function on<T extends Array<() => any> | (() => any), U>(
- *   deps: T | T[],
- *   fn: (input: T, prevInput: T, prevValue?: U) => U,
+ * export function on<S, U>(
+ *   deps: Accessor<S> | AccessorArray<S>,
+ *   fn: (input: S, prevInput: S | undefined, prevValue: U | undefined) => U,
  *   options?: { defer?: boolean } = {}
- * ): (prevValue?: U) => U | undefined;
+ * ): (prevValue: U | undefined) => U;
  * ```
  * @param deps list of reactive dependencies or a single reactive dependency
  * @param fn computation on input; the current previous content(s) of input and the previous value are given as arguments and it returns a new value
@@ -347,7 +351,12 @@ export interface OnOptions {
  *
  * @description https://www.solidjs.com/docs/latest/api#on
  */
-export declare function on<S extends Accessor<unknown> | Accessor<unknown>[] | [], Next, Init = unknown>(deps: S, fn: OnEffectFunction<S, Init | Next, Next>, options?: OnOptions): EffectFunction<NoInfer<Init> | NoInfer<Next>, NoInfer<Next>>;
+export declare function on<S, Next extends Prev, Prev = Next>(deps: AccessorArray<S> | Accessor<S>, fn: OnEffectFunction<S, undefined | NoInfer<Prev>, Next>, options?: OnOptions & {
+    defer?: false;
+}): EffectFunction<undefined | NoInfer<Next>, NoInfer<Next>>;
+export declare function on<S, Next extends Prev, Prev = Next>(deps: AccessorArray<S> | Accessor<S>, fn: OnEffectFunction<S, undefined | NoInfer<Prev>, Next>, options: OnOptions & {
+    defer: true;
+}): EffectFunction<undefined | NoInfer<Next>>;
 /**
  * onMount - run an effect only after initial render on mount
  * @param fn an effect that should run only once on mount

package/types/render/component.d.ts

@@ -66,19 +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 UnboxLazy<T> = T extends () => infer U ? U : T;
-declare type BoxedTupleTypes<T extends any[]> = {
-    [P in keyof T]: [UnboxLazy<T[P]>];
-}[Exclude<keyof T, keyof any[]>];
-declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
-declare type UnboxIntersection<T> = T extends {
-    0: infer U;
-} ? U : never;
-declare type MergeProps<T extends any[]> = UnboxIntersection<UnionToIntersection<BoxedTupleTypes<T>>>;
-export declare function mergeProps<T extends any[]>(...sources: T): MergeProps<T>;
-declare type SplitProps<T, K extends (readonly (keyof T)[])[]> = [
+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 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/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}", {});`);
     }
   };