solid-js 1.3.12 → 1.3.13

package/dist/dev.cjs

@@ -645,16 +645,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;

package/dist/dev.js

@@ -641,16 +641,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;

package/dist/solid.cjs

@@ -589,16 +589,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;

package/dist/solid.js

@@ -585,16 +585,16 @@ function readSignal() {
   return this.value;
 }
 function writeSignal(node, value, isComp) {
-  if (node.comparator) {
-    if (Transition && Transition.running && Transition.sources.has(node)) {
-      if (node.comparator(node.tValue, value)) return value;
-    } else if (node.comparator(node.value, value)) return value;
-  }
   if (Pending) {
     if (node.pending === NOTPENDING) Pending.push(node);
     node.pending = value;
     return value;
   }
+  if (node.comparator) {
+    if (Transition && Transition.running && Transition.sources.has(node)) {
+      if (node.comparator(node.tValue, value)) return value;
+    } else if (node.comparator(node.value, value)) return value;
+  }
   let TransitionRunning = false;
   if (Transition) {
     TransitionRunning = Transition.running;

package/package.json

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

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

package/store/types/store.d.ts

@@ -1,7 +1,11 @@
 import { Accessor } from "../..";
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
 export declare type StoreNode = Record<PropertyKey, any>;
-export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined;
+export declare namespace SolidStore {
+    interface Unwrappable {
+    }
+}
+export declare type NotWrappable = string | number | bigint | symbol | boolean | Function | null | undefined | SolidStore.Unwrappable[keyof SolidStore.Unwrappable];
 export declare type Store<T> = DeepReadonly<T>;
 export declare function isWrappable(obj: any): any;
 export declare function unwrap<T extends StoreNode>(item: any, set?: Set<unknown>): T;
@@ -13,11 +17,11 @@ export declare function createDataNode(): Accessor<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 : {
-    readonly [K in keyof T]: T[K] extends NotWrappable ? T[K] : DeepReadonly<T[K]>;
+export declare type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
+    readonly [K in keyof T]: T[K];
 };
-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 DeepMutable<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {
+    -readonly [K in keyof T]: T[K];
 };
 export declare type StorePathRange = {
     from?: number;
@@ -25,10 +29,10 @@ export declare type StorePathRange = {
     by?: number;
 };
 export declare type ArrayFilterFn<T> = (item: DeepReadonly<T>, index: number) => boolean;
-export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: DeepReadonly<T>, traversed: U) => 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);
+export declare type StoreSetter<T, U extends PropertyKey[] = []> = ((prevState: DeepReadonly<T>, traversed: U) => T | Partial<T> | DeepReadonly<T> | Partial<DeepReadonly<T>> | void) | T | Partial<T> | DeepReadonly<T> | Partial<DeepReadonly<T>>;
+export declare type Part<T, K extends KeyOf<T> = KeyOf<T>> = [K] extends [never] ? never : K | readonly K[] | ([T] extends [readonly unknown[]] ? ArrayFilterFn<T[number]> | StorePathRange : never);
 declare type W<T> = Exclude<T, NotWrappable>;
-declare type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [never] ? never : number : keyof T;
+declare type KeyOf<T> = number extends keyof T ? 0 extends 1 & T ? keyof T : [T] extends [readonly unknown[]] ? number : [T] extends [never] ? never : keyof T : keyof T;
 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> {

package/types/reactive/signal.d.ts

@@ -70,7 +70,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 ? <U extends T>(value?: (U extends Function ? never : U) | ((prev?: T) => U)) => U : <U extends T>(value: (U extends Function ? never : U) | ((prev: T) => U)) => U;
+export declare type Setter<T> = (undefined extends T ? (value?: undefined) => undefined : {}) & (<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;

package/web/dist/server.cjs

@@ -604,7 +604,19 @@ function injectScripts(html, scripts, nonce) {
   return html + tag;
 }
 function serializeError(error) {
-  return error.message ? `new Error(${devalue(error.message)})` : devalue(error);
+  if (error.message) {
+    const fields = {};
+    const keys = Object.getOwnPropertyNames(error);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const value = error[key];
+      if (!value || key !== "message" && typeof value !== "function") {
+        fields[key] = value;
+      }
+    }
+    return `Object.assign(new Error(${devalue(error.message)}), ${devalue(fields)})`;
+  }
+  return devalue(error);
 }
 function waitForFragments(registry, key) {
   for (const k of [...registry.keys()].reverse()) {

package/web/dist/server.js

@@ -601,7 +601,19 @@ function injectScripts(html, scripts, nonce) {
   return html + tag;
 }
 function serializeError(error) {
-  return error.message ? `new Error(${devalue(error.message)})` : devalue(error);
+  if (error.message) {
+    const fields = {};
+    const keys = Object.getOwnPropertyNames(error);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const value = error[key];
+      if (!value || key !== "message" && typeof value !== "function") {
+        fields[key] = value;
+      }
+    }
+    return `Object.assign(new Error(${devalue(error.message)}), ${devalue(fields)})`;
+  }
+  return devalue(error);
 }
 function waitForFragments(registry, key) {
   for (const k of [...registry.keys()].reverse()) {