solid-js 1.3.0 → 1.3.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -124,9 +124,9 @@
     "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 && rollup -c",
-    "build:types": "tsc",
-    "build:types-store": "tsc --project ./store/tsconfig.json && tsconfig-replace-paths --project ./store/tsconfig.types.json",
-    "build:types-web": "tsc --project ./web/tsconfig.json && tsconfig-replace-paths --project ./web/tsconfig.types.json",
+    "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",
     "build:types-html": "tsc --project ./html/tsconfig.json",
     "build:types-h": "tsc --project ./h/tsconfig.json",
     "build:types-universal": "tsc --project ./universal/tsconfig.json",
@@ -144,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "9525e859cc86e444e2c8f043af218043e719b964"
+  "gitHead": "9198a44115b8450b0ae61355008a490c4e25007f"
 }

package/store/dist/dev.cjs

@@ -103,7 +103,7 @@ const proxyTraps$1 = {
       node = nodes[property] || (nodes[property] = createDataNode());
       node();
     }
-    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property}`) : value;
+    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set() {
     console.warn("Cannot mutate a Store directly");
@@ -344,8 +344,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -369,8 +368,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

package/store/dist/dev.js

@@ -99,7 +99,7 @@ const proxyTraps$1 = {
       node = nodes[property] || (nodes[property] = createDataNode());
       node();
     }
-    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property}`) : value;
+    return wrappable ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
   set() {
     console.warn("Cannot mutate a Store directly");
@@ -340,8 +340,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -365,8 +364,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

package/store/dist/store.cjs

@@ -324,8 +324,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -349,8 +348,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

package/store/dist/store.js

@@ -320,8 +320,7 @@ function reconcile(value, options = {}) {
     key = "id"
   } = options,
         v = unwrap(value);
-  return s => {
-    const state = s;
+  return state => {
     if (!isWrappable(state) || !isWrappable(v)) return v;
     applyState(v, {
       state
@@ -345,8 +344,7 @@ const setterTraps = {
   }
 };
 function produce(fn) {
-  return s => {
-    const state = s;
+  return state => {
     if (isWrappable(state)) fn(new Proxy(state, setterTraps));
     return state;
   };

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, Readonly, DeepReadonly } from "./store";
+export type { Store, SetStoreFunction, NotWrappable, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, Part, Next, WrappableNext, DeepReadonly } from "./store";
 export * from "./mutable";
 export * from "./modifiers";

package/store/types/modifiers.d.ts

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

package/store/types/mutable.d.ts

@@ -1,4 +1,4 @@
-import { StoreNode, Store } from "./store";
-export declare function createMutable<T extends StoreNode>(state: T | Store<T>, options?: {
+import { StoreNode } from "./store";
+export declare function createMutable<T extends StoreNode>(state: T, options?: {
     name?: string;
-}): Store<T>;
+}): T;

package/store/types/server.d.ts

@@ -1,50 +1,15 @@
+import { SetStoreFunction, Store } from "store";
 export declare const $RAW: unique symbol;
-declare type AddSymbolToPrimitive<T> = T extends {
-    [Symbol.toPrimitive]: infer V;
-} ? {
-    [Symbol.toPrimitive]: V;
-} : {};
-declare type AddCallable<T> = T extends {
-    (...x: any[]): infer V;
-} ? {
-    (...x: Parameters<T>): V;
-} : {};
-declare type NotWrappable = string | number | boolean | Function | null;
-export declare type Store<T> = {
-    [P in keyof T]: T[P] extends object ? Store<T[P]> : T[P];
-} & {
-    [$RAW]?: T;
-} & AddSymbolToPrimitive<T> & AddCallable<T>;
 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;
-declare type StoreSetter<T> = Partial<T> | ((prevState: T extends NotWrappable ? T : Store<T>, traversed?: (string | number)[]) => Partial<T> | void);
-declare type StorePathRange = {
-    from?: number;
-    to?: number;
-    by?: number;
-};
-declare type ArrayFilterFn<T> = (item: T extends any[] ? T[number] : never, index: number) => boolean;
-declare type Part<T> = keyof T | Array<keyof T> | StorePathRange | ArrayFilterFn<T>;
-declare type Next<T, K> = K extends keyof T ? T[K] : K extends Array<keyof T> ? T[K[number]] : T extends any[] ? K extends StorePathRange ? T[number] : K extends ArrayFilterFn<T> ? T[number] : never : never;
-export interface SetStoreFunction<T> {
-    <Setter extends StoreSetter<T>>(...args: [Setter]): void;
-    <K1 extends Part<T>, Setter extends StoreSetter<Next<T, K1>>>(...args: [K1, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, Setter extends StoreSetter<Next<Next<T, K1>, K2>>>(...args: [K1, K2, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, Setter extends StoreSetter<Next<Next<Next<T, K1>, K2>, K3>>>(...args: [K1, K2, K3, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, Setter extends StoreSetter<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>>(...args: [K1, K2, K3, K4, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, Setter extends StoreSetter<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>>(...args: [K1, K2, K3, K4, K5, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, Setter extends StoreSetter<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>>(...args: [K1, K2, K3, K4, K5, K6, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, Setter extends StoreSetter<Next<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, K8 extends Part<Next<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, K8, ...(Part<any> | StoreSetter<any>)[]]): 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>;
 declare type ReconcileOptions = {
     key?: string | null;
     merge?: boolean;
 };
-export declare function reconcile<T>(value: T | Store<T>, options?: ReconcileOptions): (state: T extends NotWrappable ? T : Store<T>) => void;
-export declare function produce<T>(fn: (state: T) => void): (state: T extends NotWrappable ? T : Store<T>) => T extends NotWrappable ? T : Store<T>;
+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 {};

package/store/types/store.d.ts

@@ -1,72 +1,44 @@
-import { $PROXY, Accessor } from "../..";
+import { Accessor } from "../..";
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
-export declare type StoreNode = {
-    [$NODE]?: any;
-    [$PROXY]?: any;
-    [$NAME]?: string;
-    [k: string]: any;
-    [k: number]: any;
-};
-declare type AddSymbolToPrimitive<T> = T extends {
-    [Symbol.toPrimitive]: infer V;
-} ? {
-    [Symbol.toPrimitive]: V;
-} : {};
-declare type AddSymbolIterator<T> = T extends {
-    [Symbol.iterator]: infer V;
-} ? {
-    [Symbol.iterator]: V;
-} : {};
-declare type AddSymbolToStringTag<T> = T extends {
-    [Symbol.toStringTag]: infer V;
-} ? {
-    [Symbol.toStringTag]: V;
-} : {};
-declare type AddCallable<T> = T extends {
-    (...x: any[]): infer V;
-} ? {
-    (...x: Parameters<T>): V;
-} : {};
-export declare type NotWrappable = string | number | boolean | Function | null;
-export declare type Store<T> = {
-    [P in keyof T]: T[P] extends object ? Store<T[P]> & T[P] : T[P];
-} & {
-    [$RAW]?: T;
-} & AddSymbolToPrimitive<T> & AddSymbolIterator<T> & AddSymbolToStringTag<T> & AddCallable<T>;
+export declare type StoreNode = Record<keyof any, 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: string | number | symbol): PropertyDescriptor | undefined;
+export declare function proxyDescriptor(target: StoreNode, property: keyof any): PropertyDescriptor | undefined;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];
 export declare function createDataNode(): Accessor<void> & {
     $: () => void;
 };
-export declare function setProperty(state: StoreNode, property: string | number, value: any): void;
-export declare function updatePath(current: StoreNode, path: any[], traversed?: (number | string)[]): void;
-export declare type Readonly<T> = {
-    readonly [K in keyof T]: DeepReadonly<T[K]>;
+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> = {
+    readonly [K in keyof T]: T[K] extends NotWrappable ? T[K] : DeepReadonly<T[K]>;
 };
-export declare type DeepReadonly<T> = T extends [infer A] ? Readonly<[A]> : T extends [infer A, infer B] ? Readonly<[A, B]> : T extends [infer A, infer B, infer C] ? Readonly<[A, B, C]> : T extends [infer A, infer B, infer C, infer D] ? Readonly<[A, B, C, D]> : T extends [infer A, infer B, infer C, infer D, infer E] ? Readonly<[A, B, C, D, E]> : T extends [infer A, infer B, infer C, infer D, infer E, infer F] ? Readonly<[A, B, C, D, E, F]> : T extends [infer A, infer B, infer C, infer D, infer E, infer F, infer G] ? Readonly<[A, B, C, D, E, F, G]> : T extends [infer A, infer B, infer C, infer D, infer E, infer F, infer G, infer H] ? Readonly<[A, B, C, D, E, F, G, H]> : T extends object ? Readonly<T> : T;
-export declare type StoreSetter<T> = Partial<T> | ((prevState: T extends NotWrappable ? T : Store<DeepReadonly<T>>, traversed?: (string | number)[]) => Partial<T | DeepReadonly<T>> | void);
+export declare type StoreSetter<T> = T | Partial<T> | ((prevState: T, traversed?: (keyof any)[]) => Partial<T> | void);
 export declare type StorePathRange = {
     from?: number;
     to?: number;
     by?: number;
 };
-export declare type ArrayFilterFn<T> = (item: T extends any[] ? T[number] : never, index: number) => boolean;
-export declare type Part<T> = T extends any[] ? keyof T | Array<keyof T> | ArrayFilterFn<T> | StorePathRange : T extends object ? keyof T | Array<keyof T> : never;
-export declare type NullableNext<T, K> = K extends keyof T ? T[K] : K extends Array<keyof T> ? T[K[number]] : T extends any[] ? K extends StorePathRange ? T[number] : K extends ArrayFilterFn<T> ? T[number] : never : never;
-export declare type Next<T, K> = NonNullable<NullableNext<T, K>>;
-export interface SetStoreFunction<T> {
-    <Setter extends StoreSetter<T>>(...args: [Setter]): void;
-    <K1 extends Part<T>, Setter extends StoreSetter<NullableNext<T, K1>>>(...args: [K1, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, Setter extends StoreSetter<NullableNext<Next<T, K1>, K2>>>(...args: [K1, K2, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, Setter extends StoreSetter<NullableNext<Next<Next<T, K1>, K2>, K3>>>(...args: [K1, K2, K3, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<T, K1>, K2>, K3>, K4>>>(...args: [K1, K2, K3, K4, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>>(...args: [K1, K2, K3, K4, K5, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>>(...args: [K1, K2, K3, K4, K5, K6, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, Setter extends StoreSetter<NullableNext<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, Setter]): void;
-    <K1 extends Part<T>, K2 extends Part<Next<T, K1>>, K3 extends Part<Next<Next<T, K1>, K2>>, K4 extends Part<Next<Next<Next<T, K1>, K2>, K3>>, K5 extends Part<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>>, K6 extends Part<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>>, K7 extends Part<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>>, K8 extends Part<Next<Next<Next<Next<Next<Next<Next<T, K1>, K2>, K3>, K4>, K5>, K6>, K7>>>(...args: [K1, K2, K3, K4, K5, K6, K7, K8, ...(Part<any> | StoreSetter<any>)[]]): void;
+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;
 }
 /**
  * creates a reactive store that can be read through a proxy object and written with a setter function

package/web/dist/dev.cjs

@@ -452,7 +452,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
       } else inserted = true;
     }
-  } else parent.insertBefore(node, marker);
+  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {

package/web/dist/dev.js

@@ -449,7 +449,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
       } else inserted = true;
     }
-  } else parent.insertBefore(node, marker);
+  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {

package/web/dist/server.cjs

@@ -607,7 +607,7 @@ function waitForFragments(registry, key) {
 function serializeSet(registry, key, value) {
   const exist = registry.get(value);
   if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
-  registry.set(value, key);
+  value !== null && typeof value === "object" && registry.set(value, key);
   return `_$HY.set("${key}", ${devalue(value)});`;
 }
 function pipeToNodeWritable(code, writable, options = {}) {

package/web/dist/server.js

@@ -604,7 +604,7 @@ function waitForFragments(registry, key) {
 function serializeSet(registry, key, value) {
   const exist = registry.get(value);
   if (exist) return `_$HY.set("${key}", _$HY.r["${exist}"][0]);`;
-  registry.set(value, key);
+  value !== null && typeof value === "object" && registry.set(value, key);
   return `_$HY.set("${key}", ${devalue(value)});`;
 }
 function pipeToNodeWritable(code, writable, options = {}) {

package/web/dist/web.cjs

@@ -451,7 +451,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
       } else inserted = true;
     }
-  } else parent.insertBefore(node, marker);
+  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {

package/web/dist/web.js

@@ -448,7 +448,7 @@ function cleanChildren(parent, current, marker, replacement) {
         if (!inserted && !i) isParent ? parent.replaceChild(node, el) : parent.insertBefore(node, marker);else isParent && parent.removeChild(el);
       } else inserted = true;
     }
-  } else parent.insertBefore(node, marker);
+  } else if (current instanceof Node) parent.replaceChild(node, current);else parent.insertBefore(node, marker);
   return [node];
 }
 function gatherHydratable(element, root) {

package/web/types/client.d.ts

@@ -53,7 +53,7 @@ export function dynamicProperty(props: unknown, key: string): unknown;
 export function hydrate(
   fn: () => JSX.Element,
   node: MountableElement,
-  options: { renderId?: string }
+  options?: { renderId?: string }
 ): () => void;
 export function getHydrationKey(): string;
 export function getNextElement(template?: HTMLTemplateElement): Element;