solid-js 1.3.6 → 1.3.9

package/dist/dev.cjs

@@ -124,7 +124,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -158,14 +158,13 @@ let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
@@ -405,7 +404,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -1015,7 +1015,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1353,7 +1353,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/dev.js

@@ -120,7 +120,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -154,14 +154,13 @@ let Effects = null;
 let ExecCount = 0;
 let rootCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !"_SOLID_DEV_" ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   if (owner) root.name = `${owner.name}-r${rootCount++}`;
   Owner = root;
@@ -401,7 +400,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -1011,7 +1011,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1349,7 +1349,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/server.cjs

@@ -231,7 +231,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return sharedConfig.context ? { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   } : undefined;
 }

package/dist/server.js

@@ -227,7 +227,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return sharedConfig.context ? { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   } : undefined;
 }

package/dist/solid.cjs

@@ -124,7 +124,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -157,14 +157,13 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   Owner = root;
   Listener = null;
@@ -402,7 +401,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -934,7 +934,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1269,7 +1269,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/dist/solid.js

@@ -120,7 +120,7 @@ function setHydrateContext(context) {
 }
 function nextHydrateContext() {
   return { ...sharedConfig.context,
-    id: `${sharedConfig.context.id}${sharedConfig.context.count++}.`,
+    id: `${sharedConfig.context.id}${sharedConfig.context.count++}-`,
     count: 0
   };
 }
@@ -153,14 +153,13 @@ let Updates = null;
 let Effects = null;
 let ExecCount = 0;
 function createRoot(fn, detachedOwner) {
-  detachedOwner && (Owner = detachedOwner);
   const listener = Listener,
         owner = Owner,
         root = fn.length === 0 && !false ? UNOWNED : {
     owned: null,
     cleanups: null,
     context: null,
-    owner
+    owner: detachedOwner || owner
   };
   Owner = root;
   Listener = null;
@@ -398,7 +397,8 @@ function createSelector(source, fn = equalFn, options) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
-        l.size > 1 ? l.delete(listener) : subs.delete(key);
+        l.delete(listener);
+        !l.size && subs.delete(key);
       });
     }
     return fn(key, Transition && Transition.running && Transition.sources.has(node) ? node.tValue : node.value);
@@ -930,7 +930,7 @@ function observable(input) {
       if (!(observer instanceof Object) || observer == null) {
         throw new TypeError("Expected the observer to be an object.");
       }
-      const handler = "next" in observer ? observer.next : observer;
+      const handler = "next" in observer ? observer.next.bind(observer) : observer;
       let complete = false;
       createComputed(() => {
         if (complete) return;
@@ -1265,7 +1265,7 @@ function lazy(fn) {
 let counter = 0;
 function createUniqueId() {
   const ctx = sharedConfig.context;
-  return ctx ? `${ctx.id}${ctx.count++}` : `cl:${counter++}`;
+  return ctx ? `${ctx.id}${ctx.count++}` : `cl-${counter++}`;
 }
 
 function For(props) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.6",
+  "version": "1.3.9",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "10183a0ee2de5c685e4d4558cbe1b78a6ca4c48e"
+  "gitHead": "939e87af354cdd5f4fcc85d2e1c5df86eecec773"
 }

package/store/dist/dev.cjs

@@ -147,12 +147,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -162,7 +162,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {
@@ -215,7 +215,7 @@ const proxyTraps = {
       node = nodes[property] || (nodes[property] = createDataNode());
       node();
     }
-    return wrappable ? wrap(value, target[$NAME] && `${target[$NAME]}:${property}`) : value;
+    return wrappable ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));

package/store/dist/dev.js

@@ -143,12 +143,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -158,7 +158,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {
@@ -211,7 +211,7 @@ const proxyTraps = {
       node = nodes[property] || (nodes[property] = createDataNode());
       node();
     }
-    return wrappable ? wrap(value, target[$NAME] && `${target[$NAME]}:${property}`) : value;
+    return wrappable ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set(target, property, value) {
     setProperty(target, property, unwrap(value));

package/store/dist/server.cjs

@@ -31,12 +31,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -46,7 +46,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {
@@ -77,7 +77,7 @@ function createMutable(state) {
 }
 function reconcile(value, options = {}) {
   return state => {
-    if (!isWrappable(state)) return value;
+    if (!isWrappable(state) || !isWrappable(value)) return value;
     const targetKeys = Object.keys(value);
     for (let i = 0, len = targetKeys.length; i < len; i++) {
       const key = targetKeys[i];
@@ -87,6 +87,7 @@ function reconcile(value, options = {}) {
     for (let i = 0, len = previousKeys.length; i < len; i++) {
       if (value[previousKeys[i]] === undefined) setProperty(state, previousKeys[i], undefined);
     }
+    return state;
   };
 }
 function produce(fn) {

package/store/dist/server.js

@@ -27,12 +27,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -42,7 +42,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {
@@ -73,7 +73,7 @@ function createMutable(state) {
 }
 function reconcile(value, options = {}) {
   return state => {
-    if (!isWrappable(state)) return value;
+    if (!isWrappable(state) || !isWrappable(value)) return value;
     const targetKeys = Object.keys(value);
     for (let i = 0, len = targetKeys.length; i < len; i++) {
       const key = targetKeys[i];
@@ -83,6 +83,7 @@ function reconcile(value, options = {}) {
     for (let i = 0, len = previousKeys.length; i < len; i++) {
       if (value[previousKeys[i]] === undefined) setProperty(state, previousKeys[i], undefined);
     }
+    return state;
   };
 }
 function produce(fn) {

package/store/dist/store.cjs

@@ -142,12 +142,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -157,7 +157,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/store/dist/store.js

@@ -138,12 +138,12 @@ function updatePath(current, path, traversed = []) {
           isArray = Array.isArray(current);
     if (Array.isArray(part)) {
       for (let i = 0; i < part.length; i++) {
-        updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
+        updatePath(current, [part[i]].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "function") {
       for (let i = 0; i < current.length; i++) {
-        if (part(current[i], i)) updatePath(current, [i].concat(path), [i].concat(traversed));
+        if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (isArray && partType === "object") {
@@ -153,7 +153,7 @@ function updatePath(current, path, traversed = []) {
         by = 1
       } = part;
       for (let i = from; i <= to; i += by) {
-        updatePath(current, [i].concat(path), [i].concat(traversed));
+        updatePath(current, [i].concat(path), traversed);
       }
       return;
     } else if (path.length > 1) {

package/store/types/index.d.ts

@@ -1,4 +1,4 @@
 export { createStore, unwrap, $RAW } from "./store";
-export type { Store, SetStoreFunction, NotWrappable, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, Next, WrappableNext, DeepReadonly } from "./store";
+export type { Store, SetStoreFunction, NotWrappable, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, DeepReadonly, DeepMutable } from "./store";
 export * from "./mutable";
 export * from "./modifiers";

package/store/types/modifiers.d.ts

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

package/store/types/server.d.ts

@@ -1,15 +1,15 @@
-import { SetStoreFunction, Store } from "store";
+import type { DeepMutable, 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 setProperty(state: any, property: string | number, value: any, force?: boolean): void;
-export declare function updatePath(current: any, path: any[], traversed?: (number | string)[]): void;
+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>];
-export declare function createMutable<T>(state: T | Store<T>): Store<T>;
+export declare function createMutable<T>(state: T | Store<T>): T;
 declare type ReconcileOptions = {
     key?: string | null;
     merge?: boolean;
 };
-export declare function reconcile<T>(value: T | Store<T>, options?: ReconcileOptions): (state: Store<T>) => void;
-export declare function produce<T>(fn: (state: T) => void): (state: Store<T>) => Store<T>;
+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 {};

package/store/types/store.d.ts

@@ -1,44 +1,45 @@
 import { Accessor } from "../..";
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-export declare type StoreNode = Record<keyof any, any>;
+export declare type StoreNode = Record<PropertyKey, any>;
 export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined;
 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 proxyDescriptor(target: StoreNode, property: keyof any): PropertyDescriptor | undefined;
+export declare function proxyDescriptor(target: StoreNode, property: PropertyKey): PropertyDescriptor | undefined;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];
 export declare function createDataNode(): Accessor<void> & {
     $: () => void;
 };
-export declare function setProperty(state: StoreNode, property: keyof any, value: any): void;
-export declare function updatePath(current: StoreNode, path: any[], traversed?: (keyof any)[]): void;
-export declare type DeepReadonly<T> = {
+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 : {
     readonly [K in keyof T]: T[K] extends NotWrappable ? T[K] : DeepReadonly<T[K]>;
 };
-export declare type StoreSetter<T> = T | Partial<T> | ((prevState: T, traversed?: (keyof any)[]) => Partial<T> | void);
+export declare type DeepMutable<T> = 0 extends 1 & T ? T : {
+    -readonly [K in keyof T]: T[K] extends NotWrappable ? T[K] : DeepMutable<T[K]>;
+};
 export declare type StorePathRange = {
     from?: number;
     to?: number;
     by?: number;
 };
-export declare type ArrayFilterFn<T> = (item: T, index: number) => boolean;
-export declare type Part<T> = [T] extends [never] ? never : [keyof T] extends [never] ? never : keyof T | (keyof T)[] | (number extends keyof T ? ArrayFilterFn<T[number]> | StorePathRange : never);
-export declare type Next<T, K extends Part<T>> = [K] extends [never] ? never : K extends keyof T ? T[K] : K extends (keyof T)[] ? T[K[number]] : number extends keyof T ? T[number] : never;
-export declare type WrappableNext<T, K extends Part<T>> = Exclude<Next<T, K>, NotWrappable>;
-declare type DistributeRest<T, K extends Part<T>> = K extends K ? [K, ...Rest<Next<T, K>>] : never;
-export declare type Rest<T> = 0 extends 1 & T ? [...(keyof any)[], any] : [StoreSetter<T>] | (T extends NotWrappable ? never : DistributeRest<T, Part<T>>);
-export declare type SetStoreFunction<T> = _SetStoreFunction<Store<T>>;
-interface _SetStoreFunction<T> {
-    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, K6 extends Part<T5>, K7 extends Part<T6>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>, T5 extends WrappableNext<T4, K5>, T6 extends WrappableNext<T5, K6>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6, k7: K7, ...rest: Rest<Next<T6, K7>>): void;
-    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, K6 extends Part<T5>, K7 extends Part<T6>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>, T5 extends WrappableNext<T4, K5>, T6 extends WrappableNext<T5, K6>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6, k7: K7, setter: StoreSetter<Next<T6, K7>>): void;
-    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, K6 extends Part<T5>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>, T5 extends WrappableNext<T4, K5>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, k6: K6, setter: StoreSetter<Next<T5, K6>>): void;
-    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, K5 extends Part<T4>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>, T4 extends WrappableNext<T3, K4>>(k1: K1, k2: K2, k3: K3, k4: K4, k5: K5, setter: StoreSetter<Next<T4, K5>>): void;
-    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, K4 extends Part<T3>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>, T3 extends WrappableNext<T2, K3>>(k1: K1, k2: K2, k3: K3, k4: K4, setter: StoreSetter<Next<T3, K4>>): void;
-    <K1 extends Part<T>, K2 extends Part<T1>, K3 extends Part<T2>, T1 extends WrappableNext<T, K1>, T2 extends WrappableNext<T1, K2>>(k1: K1, k2: K2, k3: K3, setter: StoreSetter<Next<T2, K3>>): void;
-    <K1 extends Part<T>, K2 extends Part<T1>, T1 extends WrappableNext<T, K1>>(k1: K1, k2: K2, setter: StoreSetter<Next<T1, K2>>): void;
-    <K extends Part<T>>(k: K, setter: StoreSetter<Next<T, K>>): void;
-    (setter: StoreSetter<T>): void;
+export declare type ArrayFilterFn<T> = (item: DeepReadonly<T>, index: number) => boolean;
+export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: DeepReadonly<T>, traversed: U) => DeepReadonly<T> | Partial<DeepReadonly<T>> | void) | DeepReadonly<T> | Partial<DeepReadonly<T>>;
+export declare type Part<T, K extends KeyOf<T> = KeyOf<T>> = [K] extends [never] ? never : K | readonly K[] | (number extends K ? 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 [never] ? never : number : keyof T;
+declare type Rest<T, U extends PropertyKey[]> = [StoreSetter<T, U>] | (0 extends 1 & T ? [...Part<any>[], StoreSetter<any, PropertyKey[]>] : DistributeRest<W<T>, KeyOf<W<T>>, U>);
+declare type DistributeRest<T, K, U extends PropertyKey[]> = [T] extends [never] ? never : K extends KeyOf<T> ? [Part<T, K>, ...Rest<T[K], [K, ...U]>] : never;
+export interface SetStoreFunction<T> {
+    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends KeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>, K6 extends KeyOf<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>>, K7 extends KeyOf<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, k6: Part<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>, K6>, k7: Part<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>, K7>, ...rest: Rest<W<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6]>[K7], [K7, K6, K5, K4, K3, K2, K1]>): void;
+    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends KeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>, K6 extends KeyOf<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, k6: Part<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>, K6>, setter: StoreSetter<W<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5]>[K6], [K6, K5, K4, K3, K2, K1]>): void;
+    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>, K5 extends KeyOf<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, k5: Part<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>, K5>, setter: StoreSetter<W<W<W<W<W<T>[K1]>[K2]>[K3]>[K4]>[K5], [K5, K4, K3, K2, K1]>): void;
+    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>, K4 extends KeyOf<W<W<W<W<T>[K1]>[K2]>[K3]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, k4: Part<W<W<W<W<T>[K1]>[K2]>[K3]>, K4>, setter: StoreSetter<W<W<W<W<T>[K1]>[K2]>[K3]>[K4], [K4, K3, K2, K1]>): void;
+    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>, K3 extends KeyOf<W<W<W<T>[K1]>[K2]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, k3: Part<W<W<W<T>[K1]>[K2]>, K3>, setter: StoreSetter<W<W<W<T>[K1]>[K2]>[K3], [K3, K2, K1]>): void;
+    <K1 extends KeyOf<W<T>>, K2 extends KeyOf<W<W<T>[K1]>>>(k1: Part<W<T>, K1>, k2: Part<W<W<T>[K1]>, K2>, setter: StoreSetter<W<W<T>[K1]>[K2], [K2, K1]>): void;
+    <K1 extends KeyOf<W<T>>>(k1: Part<W<T>, K1>, setter: StoreSetter<W<T>[K1], [K1]>): void;
+    (setter: StoreSetter<T, []>): void;
 }
 /**
  * creates a reactive store that can be read through a proxy object and written with a setter function

package/types/reactive/signal.d.ts

@@ -437,6 +437,8 @@ export declare function createContext<T>(defaultValue: T): Context<T>;
  * @description https://www.solidjs.com/docs/latest/api#usecontext
  */
 export declare function useContext<T>(context: Context<T>): T;
+export declare type ResolvedJSXElement = Exclude<JSX.Element, JSX.ArrayElement | JSX.FunctionElement>;
+export declare type ResolvedChildren = ResolvedJSXElement | ResolvedJSXElement[];
 /**
  * Resolves child elements to help interact with children
  *
@@ -445,7 +447,7 @@ export declare function useContext<T>(context: Context<T>): T;
  *
  * @description https://www.solidjs.com/docs/latest/api#children
  */
-export declare function children(fn: Accessor<JSX.Element>): Accessor<JSX.Element>;
+export declare function children(fn: Accessor<JSX.Element>): Accessor<ResolvedChildren>;
 export declare type SuspenseContextType = {
     increment?: () => void;
     decrement?: () => void;

package/web/dist/dev.cjs

@@ -385,14 +385,14 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       solidJs.createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
-    if (solidJs.sharedConfig.context && current && current.length) {
+    if (solidJs.sharedConfig.context) {
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
-      return current;
     }
     if (array.length === 0) {
-      cleanChildren(parent, current, marker);
+      current = cleanChildren(parent, current, marker);
+      if (multi) return current;
     } else if (Array.isArray(current)) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
@@ -403,7 +403,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (solidJs.sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/dev.js

@@ -382,14 +382,14 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
-    if (sharedConfig.context && current && current.length) {
+    if (sharedConfig.context) {
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
-      return current;
     }
     if (array.length === 0) {
-      cleanChildren(parent, current, marker);
+      current = cleanChildren(parent, current, marker);
+      if (multi) return current;
     } else if (Array.isArray(current)) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
@@ -400,7 +400,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/web.cjs

@@ -384,14 +384,14 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       solidJs.createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
-    if (solidJs.sharedConfig.context && current && current.length) {
+    if (solidJs.sharedConfig.context) {
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
-      return current;
     }
     if (array.length === 0) {
-      cleanChildren(parent, current, marker);
+      current = cleanChildren(parent, current, marker);
+      if (multi) return current;
     } else if (Array.isArray(current)) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
@@ -402,7 +402,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (solidJs.sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (solidJs.sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);

package/web/dist/web.js

@@ -381,14 +381,14 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
       createRenderEffect(() => current = insertExpression(parent, array, current, marker, true));
       return () => current;
     }
-    if (sharedConfig.context && current && current.length) {
+    if (sharedConfig.context) {
       for (let i = 0; i < array.length; i++) {
         if (array[i].parentNode) return current = array;
       }
-      return current;
     }
     if (array.length === 0) {
-      cleanChildren(parent, current, marker);
+      current = cleanChildren(parent, current, marker);
+      if (multi) return current;
     } else if (Array.isArray(current)) {
       if (current.length === 0) {
         appendNodes(parent, array, marker);
@@ -399,7 +399,7 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     current = array;
   } else if (value instanceof Node) {
-    if (sharedConfig.context) return current = value.parentNode ? multi ? [value] : value : current;
+    if (sharedConfig.context && value.parentNode) return current = multi ? [value] : value;
     if (Array.isArray(current)) {
       if (multi) return current = cleanChildren(parent, current, marker, value);
       cleanChildren(parent, current, null, value);