@flexsurfer/reflex 0.1.22 → 0.1.24

package/dist/index.cjs

@@ -127,12 +127,16 @@ function clearHandlers(kind, id) {
     for (const k in kindToIdToHandler) {
       kindToIdToHandler[k] = {};
     }
+    clearRootSubSources();
   } else if (id == null) {
     if (!(kind in kindToIdToHandler)) {
       consoleLog("error", `[reflex] Unknown kind: ${kind}`);
       return;
     }
     kindToIdToHandler[kind] = {};
+    if (kind === "sub") {
+      clearRootSubSources();
+    }
   } else {
     if (kindToIdToHandler[kind][id]) {
       delete kindToIdToHandler[kind][id];
@@ -161,6 +165,16 @@ function clearReactions(id) {
     reactionsRegistry.delete(id);
   }
 }
+var rootSubIdBySource = /* @__PURE__ */ new Map();
+function setRootSubSource(subId, sourceKey) {
+  rootSubIdBySource.set(sourceKey, subId);
+}
+function getRootSubIdBySource(sourceKey) {
+  return rootSubIdBySource.get(sourceKey);
+}
+function clearRootSubSources() {
+  rootSubIdBySource.clear();
+}
 function clearSubs() {
   clearReactions();
   clearHandlers("sub");
@@ -230,7 +244,14 @@ function updateAppDbWithPatches(newDb, patches) {
       const pathSegments = patch.path;
       if (pathSegments.length > 0) {
         const rootKey = pathSegments[0];
-        const subVectorKey = JSON.stringify([rootKey]);
+        if (typeof rootKey !== "string") {
+          continue;
+        }
+        const subId = getRootSubIdBySource(rootKey);
+        if (!subId) {
+          continue;
+        }
+        const subVectorKey = JSON.stringify([subId]);
         const reaction = getReaction(subVectorKey);
         if (reaction) {
           if (!reaction.isRoot) {
@@ -259,6 +280,51 @@ function updateAppDbWithPatches(newDb, patches) {
 
 // src/immer-utils.ts
 var import_immer = require("immer");
+
+// src/settings.ts
+var import_fast_deep_equal = __toESM(require("fast-deep-equal"), 1);
+var store = {
+  globalInterceptors: [],
+  globalEqualityCheck: import_fast_deep_equal.default
+};
+function replaceGlobalInterceptor(globalInterceptors, interceptor) {
+  return globalInterceptors.reduce((ret, existingInterceptor) => {
+    if (interceptor.id === existingInterceptor.id) {
+      return [...ret, interceptor];
+    } else {
+      return [...ret, existingInterceptor];
+    }
+  }, []);
+}
+function regGlobalInterceptor(interceptor) {
+  const { id } = interceptor;
+  const ids = store.globalInterceptors.map((i) => i.id);
+  if (ids.includes(id)) {
+    store.globalInterceptors = replaceGlobalInterceptor(store.globalInterceptors, interceptor);
+  } else {
+    store.globalInterceptors = [...store.globalInterceptors, interceptor];
+  }
+}
+function getGlobalInterceptors() {
+  return [...store.globalInterceptors];
+}
+function clearGlobalInterceptors(id) {
+  if (id === void 0) {
+    store.globalInterceptors = [];
+  } else {
+    store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
+  }
+}
+function setGlobalEqualityCheck(equalityCheck) {
+  store.globalEqualityCheck = equalityCheck;
+}
+function getGlobalEqualityCheck() {
+  return store.globalEqualityCheck;
+}
+
+// src/immer-utils.ts
+var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"), 1);
+var import_es6 = __toESM(require("fast-deep-equal/es6/index.js"), 1);
 function original(value) {
   return (0, import_immer.isDraft)(value) ? (0, import_immer.original)(value) : value;
 }
@@ -267,6 +333,9 @@ function current(value) {
 }
 function enableMapSet() {
   (0, import_immer.enableMapSet)();
+  if (getGlobalEqualityCheck() === import_fast_deep_equal2.default) {
+    setGlobalEqualityCheck(import_es6.default);
+  }
 }
 
 // src/interceptor.ts
@@ -604,47 +673,6 @@ regEffect(DISPATCH, (value) => {
 // src/events.ts
 var import_immer2 = require("immer");
 
-// src/settings.ts
-var import_fast_deep_equal = __toESM(require("fast-deep-equal"), 1);
-var store = {
-  globalInterceptors: [],
-  globalEqualityCheck: import_fast_deep_equal.default
-};
-function replaceGlobalInterceptor(globalInterceptors, interceptor) {
-  return globalInterceptors.reduce((ret, existingInterceptor) => {
-    if (interceptor.id === existingInterceptor.id) {
-      return [...ret, interceptor];
-    } else {
-      return [...ret, existingInterceptor];
-    }
-  }, []);
-}
-function regGlobalInterceptor(interceptor) {
-  const { id } = interceptor;
-  const ids = store.globalInterceptors.map((i) => i.id);
-  if (ids.includes(id)) {
-    store.globalInterceptors = replaceGlobalInterceptor(store.globalInterceptors, interceptor);
-  } else {
-    store.globalInterceptors = [...store.globalInterceptors, interceptor];
-  }
-}
-function getGlobalInterceptors() {
-  return [...store.globalInterceptors];
-}
-function clearGlobalInterceptors(id) {
-  if (id === void 0) {
-    store.globalInterceptors = [];
-  } else {
-    store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
-  }
-}
-function setGlobalEqualityCheck(equalityCheck) {
-  store.globalEqualityCheck = equalityCheck;
-}
-function getGlobalEqualityCheck() {
-  return store.globalEqualityCheck;
-}
-
 // src/trace.ts
 var nextId = 1;
 var traces = [];
@@ -879,7 +907,7 @@ function defaultErrorHandler(originalError, reflexError) {
 regEventErrorHandler(defaultErrorHandler);
 
 // src/reaction.ts
-var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"), 1);
+var import_fast_deep_equal3 = __toESM(require("fast-deep-equal"), 1);
 var Reaction = class _Reaction {
   id = "";
   computeFn;
@@ -896,7 +924,7 @@ var Reaction = class _Reaction {
   constructor(computeFn, deps, equalityCheck) {
     this.computeFn = computeFn;
     this.deps = deps;
-    this.equalityCheck = equalityCheck || import_fast_deep_equal2.default;
+    this.equalityCheck = equalityCheck || import_fast_deep_equal3.default;
   }
   static create(fn, deps, equalityCheck) {
     return new _Reaction(fn, deps, equalityCheck);
@@ -965,7 +993,7 @@ var Reaction = class _Reaction {
             const depValues = this.deps?.map((d) => d.getDepValue(notifyWatchers)) ?? [];
             const values = depValues.map(([value]) => value);
             const currentVersions = depValues.map(([, version]) => version);
-            const versionsChanged = !(0, import_fast_deep_equal2.default)(currentVersions, this.depsVersions);
+            const versionsChanged = !(0, import_fast_deep_equal3.default)(currentVersions, this.depsVersions);
             if (this.value === void 0 || versionsChanged) {
               let newVal = this.computeFn(...values);
               changed = !this.equalityCheck(newVal, this.value);
@@ -1082,16 +1110,23 @@ var Reaction = class _Reaction {
 // src/subs.ts
 var KIND4 = "sub";
 var KIND_DEPS = "subDeps";
+function registerRootSub(id, sourceKey) {
+  const conflictingSubId = getRootSubIdBySource(sourceKey);
+  if (conflictingSubId && conflictingSubId !== id) {
+    consoleLog("error", `[reflex] Subscription with id '${id}' will be overridden. Root key '${sourceKey}' is already used by subscription '${conflictingSubId}'.`);
+  }
+  setRootSubSource(id, sourceKey);
+  registerHandler(KIND4, id, () => getAppDb()[sourceKey]);
+  registerHandler(KIND_DEPS, id, () => []);
+}
 function regSub(id, computeFn, depsFn, config) {
   if (hasHandler(KIND4, id)) {
     consoleLog("warn", `[reflex] Overriding. Subscription '${id}' already registered.`);
   }
   if (!computeFn) {
-    registerHandler(KIND4, id, () => getAppDb()[id]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, id);
   } else if (typeof computeFn === "string") {
-    registerHandler(KIND4, id, () => getAppDb()[computeFn]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, computeFn);
   } else {
     if (!depsFn) {
       consoleLog("error", `[reflex] Subscription '${id}' has computeFn but missing depsFn. Computed subscriptions must specify their dependencies.`);

package/dist/index.d.cts

@@ -65,6 +65,8 @@ declare function current<T>(value: T): T;
 /**
  * Enable Map and Set support in Immer
  * This allows Immer to handle Map and Set objects properly in drafts
+ * Also updates the global equality check to use fast-deep-equal/es6 for proper Map/Set comparison,
+ * but only if the current equality check is still the default isEqual
  */
 declare function enableMapSet(): void;
 

package/dist/index.d.ts

@@ -65,6 +65,8 @@ declare function current<T>(value: T): T;
 /**
  * Enable Map and Set support in Immer
  * This allows Immer to handle Map and Set objects properly in drafts
+ * Also updates the global equality check to use fast-deep-equal/es6 for proper Map/Set comparison,
+ * but only if the current equality check is still the default isEqual
  */
 declare function enableMapSet(): void;
 

package/dist/index.mjs

@@ -49,12 +49,16 @@ function clearHandlers(kind, id) {
     for (const k in kindToIdToHandler) {
       kindToIdToHandler[k] = {};
     }
+    clearRootSubSources();
   } else if (id == null) {
     if (!(kind in kindToIdToHandler)) {
       consoleLog("error", `[reflex] Unknown kind: ${kind}`);
       return;
     }
     kindToIdToHandler[kind] = {};
+    if (kind === "sub") {
+      clearRootSubSources();
+    }
   } else {
     if (kindToIdToHandler[kind][id]) {
       delete kindToIdToHandler[kind][id];
@@ -83,6 +87,16 @@ function clearReactions(id) {
     reactionsRegistry.delete(id);
   }
 }
+var rootSubIdBySource = /* @__PURE__ */ new Map();
+function setRootSubSource(subId, sourceKey) {
+  rootSubIdBySource.set(sourceKey, subId);
+}
+function getRootSubIdBySource(sourceKey) {
+  return rootSubIdBySource.get(sourceKey);
+}
+function clearRootSubSources() {
+  rootSubIdBySource.clear();
+}
 function clearSubs() {
   clearReactions();
   clearHandlers("sub");
@@ -152,7 +166,14 @@ function updateAppDbWithPatches(newDb, patches) {
       const pathSegments = patch.path;
       if (pathSegments.length > 0) {
         const rootKey = pathSegments[0];
-        const subVectorKey = JSON.stringify([rootKey]);
+        if (typeof rootKey !== "string") {
+          continue;
+        }
+        const subId = getRootSubIdBySource(rootKey);
+        if (!subId) {
+          continue;
+        }
+        const subVectorKey = JSON.stringify([subId]);
         const reaction = getReaction(subVectorKey);
         if (reaction) {
           if (!reaction.isRoot) {
@@ -181,6 +202,51 @@ function updateAppDbWithPatches(newDb, patches) {
 
 // src/immer-utils.ts
 import { isDraft, original as immerOriginal, current as immerCurrent, enableMapSet as immerEnableMapSet } from "immer";
+
+// src/settings.ts
+import isEqual from "fast-deep-equal";
+var store = {
+  globalInterceptors: [],
+  globalEqualityCheck: isEqual
+};
+function replaceGlobalInterceptor(globalInterceptors, interceptor) {
+  return globalInterceptors.reduce((ret, existingInterceptor) => {
+    if (interceptor.id === existingInterceptor.id) {
+      return [...ret, interceptor];
+    } else {
+      return [...ret, existingInterceptor];
+    }
+  }, []);
+}
+function regGlobalInterceptor(interceptor) {
+  const { id } = interceptor;
+  const ids = store.globalInterceptors.map((i) => i.id);
+  if (ids.includes(id)) {
+    store.globalInterceptors = replaceGlobalInterceptor(store.globalInterceptors, interceptor);
+  } else {
+    store.globalInterceptors = [...store.globalInterceptors, interceptor];
+  }
+}
+function getGlobalInterceptors() {
+  return [...store.globalInterceptors];
+}
+function clearGlobalInterceptors(id) {
+  if (id === void 0) {
+    store.globalInterceptors = [];
+  } else {
+    store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
+  }
+}
+function setGlobalEqualityCheck(equalityCheck) {
+  store.globalEqualityCheck = equalityCheck;
+}
+function getGlobalEqualityCheck() {
+  return store.globalEqualityCheck;
+}
+
+// src/immer-utils.ts
+import isEqual2 from "fast-deep-equal";
+import isEqualEs6 from "fast-deep-equal/es6/index.js";
 function original(value) {
   return isDraft(value) ? immerOriginal(value) : value;
 }
@@ -189,6 +255,9 @@ function current(value) {
 }
 function enableMapSet() {
   immerEnableMapSet();
+  if (getGlobalEqualityCheck() === isEqual2) {
+    setGlobalEqualityCheck(isEqualEs6);
+  }
 }
 
 // src/interceptor.ts
@@ -526,47 +595,6 @@ regEffect(DISPATCH, (value) => {
 // src/events.ts
 import { enablePatches, produceWithPatches } from "immer";
 
-// src/settings.ts
-import isEqual from "fast-deep-equal";
-var store = {
-  globalInterceptors: [],
-  globalEqualityCheck: isEqual
-};
-function replaceGlobalInterceptor(globalInterceptors, interceptor) {
-  return globalInterceptors.reduce((ret, existingInterceptor) => {
-    if (interceptor.id === existingInterceptor.id) {
-      return [...ret, interceptor];
-    } else {
-      return [...ret, existingInterceptor];
-    }
-  }, []);
-}
-function regGlobalInterceptor(interceptor) {
-  const { id } = interceptor;
-  const ids = store.globalInterceptors.map((i) => i.id);
-  if (ids.includes(id)) {
-    store.globalInterceptors = replaceGlobalInterceptor(store.globalInterceptors, interceptor);
-  } else {
-    store.globalInterceptors = [...store.globalInterceptors, interceptor];
-  }
-}
-function getGlobalInterceptors() {
-  return [...store.globalInterceptors];
-}
-function clearGlobalInterceptors(id) {
-  if (id === void 0) {
-    store.globalInterceptors = [];
-  } else {
-    store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
-  }
-}
-function setGlobalEqualityCheck(equalityCheck) {
-  store.globalEqualityCheck = equalityCheck;
-}
-function getGlobalEqualityCheck() {
-  return store.globalEqualityCheck;
-}
-
 // src/trace.ts
 var nextId = 1;
 var traces = [];
@@ -801,7 +829,7 @@ function defaultErrorHandler(originalError, reflexError) {
 regEventErrorHandler(defaultErrorHandler);
 
 // src/reaction.ts
-import isEqual2 from "fast-deep-equal";
+import isEqual3 from "fast-deep-equal";
 var Reaction = class _Reaction {
   id = "";
   computeFn;
@@ -818,7 +846,7 @@ var Reaction = class _Reaction {
   constructor(computeFn, deps, equalityCheck) {
     this.computeFn = computeFn;
     this.deps = deps;
-    this.equalityCheck = equalityCheck || isEqual2;
+    this.equalityCheck = equalityCheck || isEqual3;
   }
   static create(fn, deps, equalityCheck) {
     return new _Reaction(fn, deps, equalityCheck);
@@ -887,7 +915,7 @@ var Reaction = class _Reaction {
             const depValues = this.deps?.map((d) => d.getDepValue(notifyWatchers)) ?? [];
             const values = depValues.map(([value]) => value);
             const currentVersions = depValues.map(([, version]) => version);
-            const versionsChanged = !isEqual2(currentVersions, this.depsVersions);
+            const versionsChanged = !isEqual3(currentVersions, this.depsVersions);
             if (this.value === void 0 || versionsChanged) {
               let newVal = this.computeFn(...values);
               changed = !this.equalityCheck(newVal, this.value);
@@ -1004,16 +1032,23 @@ var Reaction = class _Reaction {
 // src/subs.ts
 var KIND4 = "sub";
 var KIND_DEPS = "subDeps";
+function registerRootSub(id, sourceKey) {
+  const conflictingSubId = getRootSubIdBySource(sourceKey);
+  if (conflictingSubId && conflictingSubId !== id) {
+    consoleLog("error", `[reflex] Subscription with id '${id}' will be overridden. Root key '${sourceKey}' is already used by subscription '${conflictingSubId}'.`);
+  }
+  setRootSubSource(id, sourceKey);
+  registerHandler(KIND4, id, () => getAppDb()[sourceKey]);
+  registerHandler(KIND_DEPS, id, () => []);
+}
 function regSub(id, computeFn, depsFn, config) {
   if (hasHandler(KIND4, id)) {
     consoleLog("warn", `[reflex] Overriding. Subscription '${id}' already registered.`);
   }
   if (!computeFn) {
-    registerHandler(KIND4, id, () => getAppDb()[id]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, id);
   } else if (typeof computeFn === "string") {
-    registerHandler(KIND4, id, () => getAppDb()[computeFn]);
-    registerHandler(KIND_DEPS, id, () => []);
+    registerRootSub(id, computeFn);
   } else {
     if (!depsFn) {
       consoleLog("error", `[reflex] Subscription '${id}' has computeFn but missing depsFn. Computed subscriptions must specify their dependencies.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flexsurfer/reflex",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "license": "MIT",
   "repository": {
     "type": "git",