@flexsurfer/reflex 0.1.21 → 0.1.23

package/dist/index.cjs

@@ -45,6 +45,7 @@ __export(src_exports, {
   defaultErrorHandler: () => defaultErrorHandler,
   disableTracing: () => disableTracing,
   dispatch: () => dispatch,
+  enableMapSet: () => enableMapSet,
   enableTracePrint: () => enableTracePrint,
   enableTracing: () => enableTracing,
   getAppDb: () => getAppDb,
@@ -258,12 +259,63 @@ 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;
 }
 function current(value) {
   return (0, import_immer.isDraft)(value) ? (0, import_immer.current)(value) : value;
 }
+function enableMapSet() {
+  (0, import_immer.enableMapSet)();
+  if (getGlobalEqualityCheck() === import_fast_deep_equal2.default) {
+    setGlobalEqualityCheck(import_es6.default);
+  }
+}
 
 // src/interceptor.ts
 function isInterceptor(m) {
@@ -600,47 +652,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 = [];
@@ -875,7 +886,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;
@@ -892,7 +903,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);
@@ -961,7 +972,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);
@@ -1279,6 +1290,7 @@ function HotReloadWrapper({ children }) {
   defaultErrorHandler,
   disableTracing,
   dispatch,
+  enableMapSet,
   enableTracePrint,
   enableTracing,
   getAppDb,

package/dist/index.d.cts

@@ -62,6 +62,13 @@ declare function original<T>(value: T): T;
  * otherwise returns the value as-is
  */
 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;
 
 /** Register an event handler with only a handler function (db event) */
 declare function regEvent<T = Record<string, any>>(id: Id, handler: EventHandler<T>): void;
@@ -268,4 +275,4 @@ declare function registerTraceCb(key: string, cb: TraceCallback): void;
 declare function removeTraceCb(key: string): void;
 declare function enableTracePrint(): void;
 
-export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, EqualityCheckFn, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, SubConfig, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, current, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getAppDb, getGlobalEqualityCheck, getGlobalInterceptors, getHandler, getHandlers, getReactions, getSubscriptionValue, initAppDb, original, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, removeTraceCb, setGlobalEqualityCheck, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };
+export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, EqualityCheckFn, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, SubConfig, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, current, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableMapSet, enableTracePrint, enableTracing, getAppDb, getGlobalEqualityCheck, getGlobalInterceptors, getHandler, getHandlers, getReactions, getSubscriptionValue, initAppDb, original, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, removeTraceCb, setGlobalEqualityCheck, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };

package/dist/index.d.ts

@@ -62,6 +62,13 @@ declare function original<T>(value: T): T;
  * otherwise returns the value as-is
  */
 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;
 
 /** Register an event handler with only a handler function (db event) */
 declare function regEvent<T = Record<string, any>>(id: Id, handler: EventHandler<T>): void;
@@ -268,4 +275,4 @@ declare function registerTraceCb(key: string, cb: TraceCallback): void;
 declare function removeTraceCb(key: string): void;
 declare function enableTracePrint(): void;
 
-export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, EqualityCheckFn, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, SubConfig, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, current, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getAppDb, getGlobalEqualityCheck, getGlobalInterceptors, getHandler, getHandlers, getReactions, getSubscriptionValue, initAppDb, original, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, removeTraceCb, setGlobalEqualityCheck, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };
+export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, EqualityCheckFn, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, SubConfig, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, current, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableMapSet, enableTracePrint, enableTracing, getAppDb, getGlobalEqualityCheck, getGlobalInterceptors, getHandler, getHandlers, getReactions, getSubscriptionValue, initAppDb, original, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, removeTraceCb, setGlobalEqualityCheck, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };

package/dist/index.mjs

@@ -180,13 +180,64 @@ function updateAppDbWithPatches(newDb, patches) {
 }
 
 // src/immer-utils.ts
-import { isDraft, original as immerOriginal, current as immerCurrent } from "immer";
+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;
 }
 function current(value) {
   return isDraft(value) ? immerCurrent(value) : value;
 }
+function enableMapSet() {
+  immerEnableMapSet();
+  if (getGlobalEqualityCheck() === isEqual2) {
+    setGlobalEqualityCheck(isEqualEs6);
+  }
+}
 
 // src/interceptor.ts
 function isInterceptor(m) {
@@ -523,47 +574,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 = [];
@@ -798,7 +808,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;
@@ -815,7 +825,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);
@@ -884,7 +894,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);
@@ -1201,6 +1211,7 @@ export {
   defaultErrorHandler,
   disableTracing,
   dispatch,
+  enableMapSet,
   enableTracePrint,
   enableTracing,
   getAppDb,

package/package.json

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