solid-js 1.4.0-beta.4 → 1.4.0

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;
@@ -516,6 +515,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

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;
@@ -512,6 +511,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

package/dist/server.cjs

@@ -398,7 +398,7 @@ function createResource(source, fetcher, options = {}) {
         value
       });
     }
-    if (p && "then" in p) {
+    if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
@@ -415,6 +415,7 @@ function createResource(source, fetcher, options = {}) {
       });
     }
     ctx.resources[id].data = p;
+    if (ctx.writeResource) ctx.writeResource(id, p);
     p = null;
     return ctx.resources[id].data;
   }

package/dist/server.js

@@ -394,7 +394,7 @@ function createResource(source, fetcher, options = {}) {
         value
       });
     }
-    if (p && "then" in p) {
+    if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
@@ -411,6 +411,7 @@ function createResource(source, fetcher, options = {}) {
       });
     }
     ctx.resources[id].data = p;
+    if (ctx.writeResource) ctx.writeResource(id, p);
     p = null;
     return ctx.resources[id].data;
   }

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;
@@ -513,6 +512,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

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;
@@ -509,6 +508,7 @@ function startTransition(fn) {
       t.running = true;
     }
     batch(fn);
+    Listener = Owner = null;
     return t ? t.done : undefined;
   });
 }

package/h/dist/h.cjs

@@ -46,7 +46,16 @@ function createHyperScript(r) {
           }
           const d = Object.getOwnPropertyDescriptors(props);
           for (const k in d) {
-            if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
+            if (Array.isArray(d[k].value)) {
+              const list = d[k].value;
+              props[k] = () => {
+                for (let i = 0; i < list.length; i++) {
+                  while (list[i][$ELEMENT]) list[i] = list[i]();
+                }
+                return list;
+              };
+              r.dynamicProperty(props, k);
+            } else if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
           }
           e = r.createComponent(l, props);
           args = [];

package/h/dist/h.js

@@ -44,7 +44,16 @@ function createHyperScript(r) {
           }
           const d = Object.getOwnPropertyDescriptors(props);
           for (const k in d) {
-            if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
+            if (Array.isArray(d[k].value)) {
+              const list = d[k].value;
+              props[k] = () => {
+                for (let i = 0; i < list.length; i++) {
+                  while (list[i][$ELEMENT]) list[i] = list[i]();
+                }
+                return list;
+              };
+              r.dynamicProperty(props, k);
+            } else if (typeof d[k].value === "function" && !d[k].value.length) r.dynamicProperty(props, k);
           }
           e = r.createComponent(l, props);
           args = [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.0-beta.4",
+  "version": "1.4.0",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -129,7 +129,7 @@
     "clean": "rimraf dist/ types/ coverage/ store/dist/ store/types/ web/dist/ web/types/ h/dist/ h/types/ h/jsx-runtime/dist h/jsx-runtime/types html/dist/ html/types/",
     "build": "npm-run-all -cnl build:*",
     "build:link": "symlink-dir . node_modules/solid-js",
-    "build:js": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-standard.d.ts ./h/jsx-runtime/src/jsx.d.ts && rollup -c",
+    "build:js": "ncp ../../node_modules/dom-expressions/src/jsx.d.ts ./src/jsx.d.ts && ncp ../../node_modules/dom-expressions/src/jsx-h.d.ts ./h/jsx-runtime/src/jsx.d.ts && rollup -c",
     "build:types": "tsc --project ./tsconfig.build.json",
     "build:types-store": "tsc --project ./store/tsconfig.build.json && tsconfig-replace-paths --project ./store/tsconfig.types.json",
     "build:types-web": "tsc --project ./web/tsconfig.build.json && tsconfig-replace-paths --project ./web/tsconfig.types.json",
@@ -151,5 +151,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "c569a8d57962e99a906ed170716055ac6fe929ef"
+  "gitHead": "6c9e976c002d3ae327ff509213a091ce79f7582a"
 }

package/store/dist/dev.cjs

@@ -63,6 +63,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
@@ -81,8 +84,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = solidJs.createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = solidJs.createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -93,12 +98,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
@@ -115,15 +122,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -213,14 +220,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    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]) {
+        return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },

package/store/dist/dev.js

@@ -59,6 +59,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
@@ -77,8 +80,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -89,12 +94,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
@@ -111,15 +118,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -209,14 +216,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    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]) {
+        return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },

package/store/dist/store.cjs

@@ -60,6 +60,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
@@ -78,8 +81,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = solidJs.createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = solidJs.createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -90,12 +95,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value) : value;
   },
@@ -110,15 +117,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -201,14 +208,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    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]) {
+        return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value) : value;
   },

package/store/dist/store.js

@@ -56,6 +56,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
@@ -74,8 +77,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -86,12 +91,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value) : value;
   },
@@ -106,15 +113,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -197,14 +204,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    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]) {
+        return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value) : value;
   },

package/store/types/store.d.ts

@@ -1,4 +1,3 @@
-import { Accessor } from "../..";
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
 export declare type StoreNode = Record<PropertyKey, any>;
 export declare namespace SolidStore {
@@ -10,12 +9,10 @@ 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 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;
 export declare function trackSelf(target: StoreNode): void;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];
-export declare function createDataNode(): Accessor<void> & {
-    $: () => void;
-};
 export declare function setProperty(state: StoreNode, property: PropertyKey, value: any): void;
 export declare function updatePath(current: StoreNode, path: any[], traversed?: PropertyKey[]): void;
 export declare type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {

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,17 +66,23 @@ 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 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 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>;
+} & {
+    [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>;
+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];
     },