signalium 2.2.0 → 2.2.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # signalium
 
+## 2.2.2
+
+### Patch Changes
+
+- 0aedc29: Fix bugs with async reactive functions never resolving
+- 5f0aafc: Add better tests for the hash function, fix some minor edge cases
+
+## 2.2.1
+
+### Patch Changes
+
+- 5378406: Fix async and add chaos tests
+
 ## 2.2.0
 
 ### Minor Changes

package/dist/cjs/development/{core-api-BO_W1aEw.js → core-api-C8J7lYBC.js}

@@ -1,5 +1,5 @@
 "use strict";
-const debug = require("./debug-DW86yXJK.js");
+const debug = require("./debug-DuXQhd5q.js");
 const DERIVED_DEFINITION_MAP = /* @__PURE__ */ new Map();
 function getReactiveFnAndDefinition(fn, opts) {
   let fnAndDef = DERIVED_DEFINITION_MAP.get(fn);
@@ -52,4 +52,4 @@ exports.reactiveSignal = reactiveSignal;
 exports.relay = relay;
 exports.task = task;
 exports.watcher = watcher;
-//# sourceMappingURL=core-api-BO_W1aEw.js.map
+//# sourceMappingURL=core-api-C8J7lYBC.js.map

package/dist/cjs/development/{core-api-BO_W1aEw.js.map → core-api-C8J7lYBC.js.map}

@@ -1 +1 @@
-{"version":3,"file":"core-api-BO_W1aEw.js","sources":["../../../src/internals/core-api.ts"],"sourcesContent":["import {\n  ReactiveTask,\n  ReactiveValue,\n  Watcher,\n  ReactiveOptions,\n  RelayActivate,\n  type DiscriminatedReactivePromise,\n  SignalOptions,\n  ReactiveFn,\n  ReadonlySignal,\n} from '../types.js';\nimport { getCurrentScope, getScopeOwner, SignalScope } from './contexts.js';\nimport {\n  createReactiveDefinition,\n  createReactiveSignal,\n  ReactiveDefinition as ReactiveDefinition,\n} from './reactive.js';\nimport { createRelay, createTask } from './async.js';\nimport { Tracer } from './trace.js';\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const DERIVED_DEFINITION_MAP = new Map<Function, [(...args: any) => any, ReactiveDefinition<any, any>]>();\n\nexport function getReactiveFnAndDefinition<T, Args extends unknown[]>(\n  fn: (...args: Args) => T,\n  opts?: ReactiveOptions<T, Args>,\n): [(...args: Args) => ReactiveValue<T>, ReactiveDefinition<T, Args>] {\n  let fnAndDef = DERIVED_DEFINITION_MAP.get(fn);\n\n  if (!fnAndDef) {\n    const def = createReactiveDefinition(opts?.id, opts?.desc, fn, opts?.equals, false, opts?.paramKey, undefined);\n\n    const defScope = getCurrentScope();\n\n    const reactiveFn: ReactiveFn<T, Args> = (...args) => {\n      const scope = getCurrentScope(defScope);\n      const signal = scope.get(def, args as any);\n\n      return signal.value;\n    };\n\n    fnAndDef = [reactiveFn, def];\n\n    DERIVED_DEFINITION_MAP.set(fn, fnAndDef);\n  }\n\n  return fnAndDef;\n}\n\nexport function reactive<T, Args extends unknown[]>(\n  fn: (...args: Args) => T,\n  opts?: ReactiveOptions<T, Args>,\n): ReactiveFn<T, Args> {\n  return getReactiveFnAndDefinition(fn, opts)[0];\n}\n\nexport const reactiveMethod = <T, Args extends unknown[]>(\n  owner: object,\n  fn: (...args: Args) => T,\n  opts?: ReactiveOptions<T, Args>,\n): ReactiveFn<T, Args> => {\n  const def = createReactiveDefinition(opts?.id, opts?.desc, fn, opts?.equals, false, opts?.paramKey, undefined);\n\n  const reactiveFn: ReactiveFn<T, Args> = (...args) => {\n    return getScopeOwner(owner).get(def, args as any).value;\n  };\n\n  DERIVED_DEFINITION_MAP.set(reactiveFn, [reactiveFn, def]);\n\n  return reactiveFn;\n};\n\nexport function relay<T>(activate: RelayActivate<T>, opts?: SignalOptions<T>): DiscriminatedReactivePromise<T> {\n  const scope = getCurrentScope();\n\n  return createRelay(activate, scope, opts) as DiscriminatedReactivePromise<T>;\n}\n\nexport const task = <T, Args extends unknown[]>(\n  fn: (...args: Args) => Promise<T>,\n  opts?: SignalOptions<T>,\n): ReactiveTask<T, Args> => {\n  const scope = getCurrentScope();\n\n  return createTask(fn, scope, opts);\n};\n\nexport function watcher<T>(fn: () => T, opts?: SignalOptions<T> & { isolate?: boolean; tracer?: Tracer }): Watcher<T> {\n  const def = createReactiveDefinition(opts?.id, opts?.desc, fn, opts?.equals, false, undefined, opts?.tracer);\n\n  const scope = opts?.isolate ? new SignalScope([]) : getCurrentScope();\n\n  return createReactiveSignal(def, undefined, undefined, scope);\n}\n\n/**\n * Creates a reactive signal from a compute function. This is useful for when you\n * want to create a signal that does not receive parameters, but is still reactive.\n *\n * @param compute\n * @param opts\n * @returns\n */\nexport const reactiveSignal = <T>(\n  compute: () => T,\n  opts?: SignalOptions<T> & { isolate?: boolean },\n): ReadonlySignal<T> => {\n  const def = createReactiveDefinition(opts?.id, opts?.desc, compute, opts?.equals, false, undefined, undefined);\n\n  const scope = opts?.isolate ? new SignalScope([]) : getCurrentScope();\n\n  return createReactiveSignal(def, undefined, undefined, scope);\n};\n"],"names":["createReactiveDefinition","getCurrentScope","getScopeOwner","createRelay","createTask","SignalScope","createReactiveSignal"],"mappings":";;AAqBO,MAAM,6CAA6B,IAAA;AAEnC,SAAS,2BACd,IACA,MACoE;AACpE,MAAI,WAAW,uBAAuB,IAAI,EAAE;AAE5C,MAAI,CAAC,UAAU;AACb,UAAM,MAAMA,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,IAAI,MAAM,QAAQ,OAAO,MAAM,UAAU,MAAS;AAE7G,UAAM,WAAWC,MAAAA,gBAAA;AAEjB,UAAM,aAAkC,IAAI,SAAS;AACnD,YAAM,QAAQA,MAAAA,gBAAgB,QAAQ;AACtC,YAAM,SAAS,MAAM,IAAI,KAAK,IAAW;AAEzC,aAAO,OAAO;AAAA,IAChB;AAEA,eAAW,CAAC,YAAY,GAAG;AAE3B,2BAAuB,IAAI,IAAI,QAAQ;AAAA,EACzC;AAEA,SAAO;AACT;AAEO,SAAS,SACd,IACA,MACqB;AACrB,SAAO,2BAA2B,IAAI,IAAI,EAAE,CAAC;AAC/C;AAEO,MAAM,iBAAiB,CAC5B,OACA,IACA,SACwB;AACxB,QAAM,MAAMD,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,IAAI,MAAM,QAAQ,OAAO,MAAM,UAAU,MAAS;AAE7G,QAAM,aAAkC,IAAI,SAAS;AACnD,WAAOE,MAAAA,cAAc,KAAK,EAAE,IAAI,KAAK,IAAW,EAAE;AAAA,EACpD;AAEA,yBAAuB,IAAI,YAAY,CAAC,YAAY,GAAG,CAAC;AAExD,SAAO;AACT;AAEO,SAAS,MAAS,UAA4B,MAA0D;AAC7G,QAAM,QAAQD,MAAAA,gBAAA;AAEd,SAAOE,kBAAY,UAAU,OAAO,IAAI;AAC1C;AAEO,MAAM,OAAO,CAClB,IACA,SAC0B;AAC1B,QAAM,QAAQF,MAAAA,gBAAA;AAEd,SAAOG,iBAAW,IAAI,OAAO,IAAI;AACnC;AAEO,SAAS,QAAW,IAAa,MAA8E;AACpH,QAAM,MAAMJ,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,IAAI,MAAM,QAAQ,OAAO,QAAW,MAAM,MAAM;AAE3G,QAAM,QAAQ,MAAM,UAAU,IAAIK,MAAAA,YAAY,CAAA,CAAE,IAAIJ,sBAAA;AAEpD,SAAOK,MAAAA,qBAAqB,KAAK,QAAW,QAAW,KAAK;AAC9D;AAUO,MAAM,iBAAiB,CAC5B,SACA,SACsB;AACtB,QAAM,MAAMN,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,SAAS,MAAM,QAAQ,OAAO,QAAW,MAAS;AAE7G,QAAM,QAAQ,MAAM,UAAU,IAAIK,MAAAA,YAAY,CAAA,CAAE,IAAIJ,sBAAA;AAEpD,SAAOK,MAAAA,qBAAqB,KAAK,QAAW,QAAW,KAAK;AAC9D;;;;;;;;"}
+{"version":3,"file":"core-api-C8J7lYBC.js","sources":["../../../src/internals/core-api.ts"],"sourcesContent":["import {\n  ReactiveTask,\n  ReactiveValue,\n  Watcher,\n  ReactiveOptions,\n  RelayActivate,\n  type DiscriminatedReactivePromise,\n  SignalOptions,\n  ReactiveFn,\n  ReadonlySignal,\n} from '../types.js';\nimport { getCurrentScope, getScopeOwner, SignalScope } from './contexts.js';\nimport {\n  createReactiveDefinition,\n  createReactiveSignal,\n  ReactiveDefinition as ReactiveDefinition,\n} from './reactive.js';\nimport { createRelay, createTask } from './async.js';\nimport { Tracer } from './trace.js';\n\n// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type\nexport const DERIVED_DEFINITION_MAP = new Map<Function, [(...args: any) => any, ReactiveDefinition<any, any>]>();\n\nexport function getReactiveFnAndDefinition<T, Args extends unknown[]>(\n  fn: (...args: Args) => T,\n  opts?: ReactiveOptions<T, Args>,\n): [(...args: Args) => ReactiveValue<T>, ReactiveDefinition<T, Args>] {\n  let fnAndDef = DERIVED_DEFINITION_MAP.get(fn);\n\n  if (!fnAndDef) {\n    const def = createReactiveDefinition(opts?.id, opts?.desc, fn, opts?.equals, false, opts?.paramKey, undefined);\n\n    const defScope = getCurrentScope();\n\n    const reactiveFn: ReactiveFn<T, Args> = (...args) => {\n      const scope = getCurrentScope(defScope);\n      const signal = scope.get(def, args as any);\n\n      return signal.value;\n    };\n\n    fnAndDef = [reactiveFn, def];\n\n    DERIVED_DEFINITION_MAP.set(fn, fnAndDef);\n  }\n\n  return fnAndDef;\n}\n\nexport function reactive<T, Args extends unknown[]>(\n  fn: (...args: Args) => T,\n  opts?: ReactiveOptions<T, Args>,\n): ReactiveFn<T, Args> {\n  return getReactiveFnAndDefinition(fn, opts)[0];\n}\n\nexport const reactiveMethod = <T, Args extends unknown[]>(\n  owner: object,\n  fn: (...args: Args) => T,\n  opts?: ReactiveOptions<T, Args>,\n): ReactiveFn<T, Args> => {\n  const def = createReactiveDefinition(opts?.id, opts?.desc, fn, opts?.equals, false, opts?.paramKey, undefined);\n\n  const reactiveFn: ReactiveFn<T, Args> = (...args) => {\n    return getScopeOwner(owner).get(def, args as any).value;\n  };\n\n  DERIVED_DEFINITION_MAP.set(reactiveFn, [reactiveFn, def]);\n\n  return reactiveFn;\n};\n\nexport function relay<T>(activate: RelayActivate<T>, opts?: SignalOptions<T>): DiscriminatedReactivePromise<T> {\n  const scope = getCurrentScope();\n\n  return createRelay(activate, scope, opts) as DiscriminatedReactivePromise<T>;\n}\n\nexport const task = <T, Args extends unknown[]>(\n  fn: (...args: Args) => Promise<T>,\n  opts?: SignalOptions<T>,\n): ReactiveTask<T, Args> => {\n  const scope = getCurrentScope();\n\n  return createTask(fn, scope, opts);\n};\n\nexport function watcher<T>(fn: () => T, opts?: SignalOptions<T> & { isolate?: boolean; tracer?: Tracer }): Watcher<T> {\n  const def = createReactiveDefinition(opts?.id, opts?.desc, fn, opts?.equals, false, undefined, opts?.tracer);\n\n  const scope = opts?.isolate ? new SignalScope([]) : getCurrentScope();\n\n  return createReactiveSignal(def, undefined, undefined, scope);\n}\n\n/**\n * Creates a reactive signal from a compute function. This is useful for when you\n * want to create a signal that does not receive parameters, but is still reactive.\n *\n * @param compute\n * @param opts\n * @returns\n */\nexport const reactiveSignal = <T>(\n  compute: () => T,\n  opts?: SignalOptions<T> & { isolate?: boolean },\n): ReadonlySignal<T> => {\n  const def = createReactiveDefinition(opts?.id, opts?.desc, compute, opts?.equals, false, undefined, undefined);\n\n  const scope = opts?.isolate ? new SignalScope([]) : getCurrentScope();\n\n  return createReactiveSignal(def, undefined, undefined, scope);\n};\n"],"names":["createReactiveDefinition","getCurrentScope","getScopeOwner","createRelay","createTask","SignalScope","createReactiveSignal"],"mappings":";;AAqBO,MAAM,6CAA6B,IAAA;AAEnC,SAAS,2BACd,IACA,MACoE;AACpE,MAAI,WAAW,uBAAuB,IAAI,EAAE;AAE5C,MAAI,CAAC,UAAU;AACb,UAAM,MAAMA,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,IAAI,MAAM,QAAQ,OAAO,MAAM,UAAU,MAAS;AAE7G,UAAM,WAAWC,MAAAA,gBAAA;AAEjB,UAAM,aAAkC,IAAI,SAAS;AACnD,YAAM,QAAQA,MAAAA,gBAAgB,QAAQ;AACtC,YAAM,SAAS,MAAM,IAAI,KAAK,IAAW;AAEzC,aAAO,OAAO;AAAA,IAChB;AAEA,eAAW,CAAC,YAAY,GAAG;AAE3B,2BAAuB,IAAI,IAAI,QAAQ;AAAA,EACzC;AAEA,SAAO;AACT;AAEO,SAAS,SACd,IACA,MACqB;AACrB,SAAO,2BAA2B,IAAI,IAAI,EAAE,CAAC;AAC/C;AAEO,MAAM,iBAAiB,CAC5B,OACA,IACA,SACwB;AACxB,QAAM,MAAMD,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,IAAI,MAAM,QAAQ,OAAO,MAAM,UAAU,MAAS;AAE7G,QAAM,aAAkC,IAAI,SAAS;AACnD,WAAOE,MAAAA,cAAc,KAAK,EAAE,IAAI,KAAK,IAAW,EAAE;AAAA,EACpD;AAEA,yBAAuB,IAAI,YAAY,CAAC,YAAY,GAAG,CAAC;AAExD,SAAO;AACT;AAEO,SAAS,MAAS,UAA4B,MAA0D;AAC7G,QAAM,QAAQD,MAAAA,gBAAA;AAEd,SAAOE,kBAAY,UAAU,OAAO,IAAI;AAC1C;AAEO,MAAM,OAAO,CAClB,IACA,SAC0B;AAC1B,QAAM,QAAQF,MAAAA,gBAAA;AAEd,SAAOG,iBAAW,IAAI,OAAO,IAAI;AACnC;AAEO,SAAS,QAAW,IAAa,MAA8E;AACpH,QAAM,MAAMJ,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,IAAI,MAAM,QAAQ,OAAO,QAAW,MAAM,MAAM;AAE3G,QAAM,QAAQ,MAAM,UAAU,IAAIK,MAAAA,YAAY,CAAA,CAAE,IAAIJ,sBAAA;AAEpD,SAAOK,MAAAA,qBAAqB,KAAK,QAAW,QAAW,KAAK;AAC9D;AAUO,MAAM,iBAAiB,CAC5B,SACA,SACsB;AACtB,QAAM,MAAMN,MAAAA,yBAAyB,MAAM,IAAI,MAAM,MAAM,SAAS,MAAM,QAAQ,OAAO,QAAW,MAAS;AAE7G,QAAM,QAAQ,MAAM,UAAU,IAAIK,MAAAA,YAAY,CAAA,CAAE,IAAIJ,sBAAA;AAEpD,SAAOK,MAAAA,qBAAqB,KAAK,QAAW,QAAW,KAAK;AAC9D;;;;;;;;"}

package/dist/cjs/development/{debug-DW86yXJK.js → debug-DuXQhd5q.js}

@@ -432,6 +432,7 @@ function watchActiveSignal(signal2) {
   const { watchCount } = signal2;
   const newWatchCount = watchCount + 1;
   signal2.watchCount = newWatchCount;
+  cancelDeactivate(signal2);
   if (signal2._isActive) {
     return;
   }
@@ -454,7 +455,6 @@ function watchSuspendedSignal(signal2) {
   const newSuspendCount = suspendCount + 1;
   signal2.watchCount = newWatchCount;
   signal2.suspendCount = newSuspendCount;
-  signal2.scope?.removeFromGc(signal2);
   cancelDeactivate(signal2);
   if (watchCount === 0) {
     for (const dep of signal2.deps.keys()) {
@@ -476,6 +476,7 @@ function resumeSignal(signal2) {
   const { watchCount, suspendCount } = signal2;
   const newSuspendCount = Math.max(suspendCount - 1, 0);
   signal2.suspendCount = newSuspendCount;
+  cancelDeactivate(signal2);
   if (watchCount > 0 && !signal2._isActive) {
     for (const dep of signal2.deps.keys()) {
       resumeSignal(dep);
@@ -557,6 +558,7 @@ const scheduleDeactivate = (signal2) => {
   scheduleFlush();
 };
 const cancelDeactivate = (signal2) => {
+  signal2.scope?.removeFromGc(signal2);
   PENDING_DEACTIVE.delete(signal2);
 };
 const scheduleListeners = (signal2) => {
@@ -1120,8 +1122,11 @@ class ReactivePromiseImpl {
       }
     }
   }
+  _getPending() {
+    return (this._flags & 1) !== 0;
+  }
   _setPending() {
-    if ((this._flags & 1) !== 0) {
+    if (this._getPending()) {
       return this._awaitSubs;
     }
     this._setFlags(
@@ -1132,11 +1137,7 @@ class ReactivePromiseImpl {
     return this._awaitSubs = /* @__PURE__ */ new Map();
   }
   _clearPending() {
-    this._setFlags(
-      0,
-      1
-      /* Pending */
-    );
+    this._setValue(this._value);
   }
   async _setPromise(promise) {
     this._promise = promise;
@@ -1491,7 +1492,7 @@ function checkSignal(signal2) {
     while (edge !== void 0) {
       if (edge.type === EdgeType.Promise) {
         const dep2 = edge.dep;
-        if (dep2.isPending) {
+        if (dep2._getPending()) {
           const value = signal2._value;
           dep2["_awaitSubs"].set(ref, edge);
           value._setPending();
@@ -1612,30 +1613,22 @@ function hashStr(key, seed = 0) {
   const c1 = 3432918353;
   const c2 = 461845907;
   let i = 0;
-  while (i + 4 <= key.length) {
-    let k2 = key.charCodeAt(i) & 255 | (key.charCodeAt(i + 1) & 255) << 8 | (key.charCodeAt(i + 2) & 255) << 16 | (key.charCodeAt(i + 3) & 255) << 24;
-    k2 = imul(k2, c1);
-    k2 = k2 << 15 | k2 >>> 17;
-    k2 = imul(k2, c2);
-    h ^= k2;
+  while (i + 2 <= key.length) {
+    let k = key.charCodeAt(i) & 65535 | (key.charCodeAt(i + 1) & 65535) << 16;
+    k = imul(k, c1);
+    k = k << 15 | k >>> 17;
+    k = imul(k, c2);
+    h ^= k;
     h = h << 13 | h >>> 19;
     h = imul(h, 5) + 3864292196;
-    i += 4;
-  }
-  let k = 0;
-  switch (key.length & 3) {
-    case 3:
-      k ^= (key.charCodeAt(i + 2) & 255) << 16;
-    // eslint-disable-next-line no-fallthrough
-    case 2:
-      k ^= (key.charCodeAt(i + 1) & 255) << 8;
-    // eslint-disable-next-line no-fallthrough
-    case 1:
-      k ^= key.charCodeAt(i) & 255;
-      k = imul(k, c1);
-      k = k << 15 | k >>> 17;
-      k = imul(k, c2);
-      h ^= k;
+    i += 2;
+  }
+  if (key.length & 1) {
+    let k = key.charCodeAt(i) & 65535;
+    k = imul(k, c1);
+    k = k << 15 | k >>> 17;
+    k = imul(k, c2);
+    h ^= k;
   }
   h ^= key.length;
   h ^= h >>> 16;
@@ -1646,8 +1639,9 @@ function hashStr(key, seed = 0) {
   return h >>> 0;
 }
 function hashNumber(num, seed = 0) {
+  let h = num < 0 ? seed ^ 2147483648 : seed;
   num = abs(num);
-  let h = seed;
+  const origNum = num;
   const c1 = 3432918353;
   const c2 = 461845907;
   while (num >= 4294967295) {
@@ -1667,7 +1661,7 @@ function hashNumber(num, seed = 0) {
     k = imul(k, c2);
     h ^= k;
   }
-  const numBytes = num === 0 ? 1 : floor(log(num) / log(256)) + 1;
+  const numBytes = origNum === 0 ? 1 : floor(log(origNum) / log(256)) + 1;
   h ^= numBytes;
   h ^= h >>> 16;
   h = imul(h, 2246822507);
@@ -1676,12 +1670,12 @@ function hashNumber(num, seed = 0) {
   h ^= h >>> 16;
   return h >>> 0;
 }
-function hashArray(arr) {
-  let h = 7;
+function hashArray(arr, seen) {
+  let h = ARRAY;
   const c1 = 3432918353;
   const c2 = 461845907;
   for (const item of arr) {
-    let k = hashValue(item);
+    let k = hashValue(item, seen);
     k = imul(k, c1);
     k = k << 15 | k >>> 17;
     k = imul(k, c2);
@@ -1697,36 +1691,36 @@ function hashArray(arr) {
   h ^= h >>> 16;
   return h >>> 0;
 }
-function hashObject(obj) {
+function hashObject(obj, seen) {
   let sum = OBJECT;
   const keys = Object.keys(obj);
   for (const key of keys) {
-    sum += hashValue(key) ^ hashValue(obj[key]);
+    sum += imul(hashValue(key, seen), 2654435769) ^ hashValue(obj[key], seen);
   }
   return sum >>> 0;
 }
-function hashSet(set) {
-  let sum = 13;
+function hashSet(set, seen) {
+  let sum = SET;
   for (const value of set) {
-    sum += hashValue(value);
+    sum += hashValue(value, seen);
   }
   return sum >>> 0;
 }
-function hashMap(map) {
-  let sum = 12;
+function hashMap(map, seen) {
+  let sum = MAP;
   for (const [key, value] of map) {
-    sum += hashValue(key) ^ hashValue(value);
+    sum += imul(hashValue(key, seen), 2654435769) ^ hashValue(value, seen);
   }
   return sum >>> 0;
 }
-function hashDate(date) {
+function hashDate(date, _seen) {
   return hashNumber(
     date.getTime(),
     14
     /* DATE */
   );
 }
-function hashRegExp(regexp) {
+function hashRegExp(regexp, _seen) {
   const h = hashStr(
     regexp.source + regexp.flags,
     15
@@ -1754,7 +1748,7 @@ const FALSE = hashStr(
   3
   /* FALSE */
 );
-hashStr(
+const ARRAY = hashStr(
   "array",
   7
   /* ARRAY */
@@ -1764,6 +1758,16 @@ const OBJECT = hashStr(
   8
   /* OBJECT */
 );
+const SET = hashStr(
+  "set",
+  13
+  /* SET */
+);
+const MAP = hashStr(
+  "map",
+  12
+  /* MAP */
+);
 const getObjectProto = Object.getPrototypeOf;
 const PROTO_TO_HASH = /* @__PURE__ */ new Map([
   [Object.prototype, hashObject],
@@ -1774,7 +1778,7 @@ const PROTO_TO_HASH = /* @__PURE__ */ new Map([
   [RegExp.prototype, hashRegExp]
 ]);
 const registerCustomHash = (ctor, hashFn) => {
-  PROTO_TO_HASH.set(ctor.prototype, hashFn);
+  PROTO_TO_HASH.set(ctor.prototype, (obj, _seen) => hashFn(obj));
 };
 function hashValue(node, seen = []) {
   switch (typeof node) {
@@ -1815,7 +1819,7 @@ function hashValue(node, seen = []) {
       const hashFn = PROTO_TO_HASH.get(getObjectProto(node));
       if (hashFn) {
         seen.push(node);
-        const hash = hashFn(node);
+        const hash = hashFn(node, seen);
         seen.pop();
         return hash;
       }
@@ -1845,9 +1849,16 @@ function getObjectHash(obj) {
   }
   return id;
 }
-const EMPTY_ARRAY_HASH = hashArray([]);
+const EMPTY_ARRAY_HASH = hashArray([], []);
 function hashReactiveFn(fn, args) {
-  return getObjectHash(fn) ^ (args.length > 0 ? hashArray(args) : EMPTY_ARRAY_HASH);
+  const argsHash = args.length > 0 ? hashArray(args, []) : EMPTY_ARRAY_HASH;
+  let k = imul(argsHash, 3432918353);
+  k = k << 15 | k >>> 17;
+  k = imul(k, 461845907);
+  let h = getObjectHash(fn);
+  h ^= k;
+  h = h << 13 | h >>> 19;
+  return imul(h, 5) + 3864292196 >>> 0;
 }
 const objectToIdMap = /* @__PURE__ */ new WeakMap();
 let nextId = 1;
@@ -2260,4 +2271,4 @@ exports.signal = signal;
 exports.unwatchSignal = unwatchSignal;
 exports.watchSignal = watchSignal;
 exports.withContexts = withContexts;
-//# sourceMappingURL=debug-DW86yXJK.js.map
+//# sourceMappingURL=debug-DuXQhd5q.js.map