@flexsurfer/reflex 0.1.18 → 0.1.20

package/dist/index.cjs

@@ -162,6 +162,7 @@ function clearSubs() {
   clearReactions();
   clearHandlers("sub");
   clearHandlers("subDeps");
+  clearSubConfigs();
 }
 var interceptorsRegistry = /* @__PURE__ */ new Map();
 function getInterceptors(eventId) {
@@ -170,6 +171,20 @@ function getInterceptors(eventId) {
 function setInterceptors(eventId, interceptors) {
   interceptorsRegistry.set(eventId, interceptors);
 }
+var subConfigRegistry = /* @__PURE__ */ new Map();
+function getSubConfig(subId) {
+  return subConfigRegistry.get(subId);
+}
+function setSubConfig(subId, config) {
+  subConfigRegistry.set(subId, config);
+}
+function clearSubConfigs(subId) {
+  if (subId == null) {
+    subConfigRegistry.clear();
+  } else {
+    subConfigRegistry.delete(subId);
+  }
+}
 
 // src/schedule.ts
 function scheduleAfterRender(f) {
@@ -584,8 +599,10 @@ regEffect(DISPATCH, (value) => {
 var import_immer2 = require("immer");
 
 // src/settings.ts
+var import_fast_deep_equal = __toESM(require("fast-deep-equal"), 1);
 var store = {
-  globalInterceptors: []
+  globalInterceptors: [],
+  globalEqualityCheck: import_fast_deep_equal.default
 };
 function replaceGlobalInterceptor(globalInterceptors, interceptor) {
   return globalInterceptors.reduce((ret, existingInterceptor) => {
@@ -615,6 +632,9 @@ function clearGlobalInterceptors(id) {
     store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
   }
 }
+function getGlobalEqualityCheck() {
+  return store.globalEqualityCheck;
+}
 
 // src/trace.ts
 var nextId = 1;
@@ -850,7 +870,7 @@ function defaultErrorHandler(originalError, reflexError) {
 regEventErrorHandler(defaultErrorHandler);
 
 // src/reaction.ts
-var import_fast_deep_equal = __toESM(require("fast-deep-equal"), 1);
+var import_fast_deep_equal2 = __toESM(require("fast-deep-equal"), 1);
 var Reaction = class _Reaction {
   id = "";
   computeFn;
@@ -863,12 +883,14 @@ var Reaction = class _Reaction {
   version = 0;
   depsVersions = [];
   subVector;
-  constructor(computeFn, deps) {
+  equalityCheck;
+  constructor(computeFn, deps, equalityCheck) {
     this.computeFn = computeFn;
     this.deps = deps;
+    this.equalityCheck = equalityCheck || import_fast_deep_equal2.default;
   }
-  static create(fn, deps) {
-    return new _Reaction(fn, deps);
+  static create(fn, deps, equalityCheck) {
+    return new _Reaction(fn, deps, equalityCheck);
   }
   computeValue() {
     this.ensureDirty();
@@ -925,7 +947,7 @@ var Reaction = class _Reaction {
     try {
       let changed = false;
       withTrace(
-        { operation: this.subVector?.[0] ?? "", opType: "sub/run", tags: { queryV: this.subVector, reaction: this.id } },
+        { operation: this.subVector?.[0] ?? "", opType: "sub/run", tags: { queryV: this.subVector, reaction: this.id, deps: this.deps?.map((d) => d.getId()) ?? [] } },
         () => {
           if (this.isRoot) {
             changed = true;
@@ -934,10 +956,10 @@ 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_equal.default)(currentVersions, this.depsVersions);
+            const versionsChanged = !(0, import_fast_deep_equal2.default)(currentVersions, this.depsVersions);
             if (this.value === void 0 || versionsChanged) {
               let newVal = this.computeFn(...values);
-              changed = !(0, import_fast_deep_equal.default)(newVal, this.value);
+              changed = !this.equalityCheck(newVal, this.value);
               if (changed) {
                 this.value = newVal;
               }
@@ -957,7 +979,8 @@ var Reaction = class _Reaction {
             withTrace(
               {
                 opType: "render",
-                operation: w.componentName
+                operation: w.componentName,
+                tags: { reaction: this.id }
               },
               () => {
                 w.callback(this.value);
@@ -1050,13 +1073,16 @@ var Reaction = class _Reaction {
 // src/subs.ts
 var KIND4 = "sub";
 var KIND_DEPS = "subDeps";
-function regSub(id, computeFn, depsFn) {
+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, () => []);
+  } else if (typeof computeFn === "string") {
+    registerHandler(KIND4, id, () => getAppDb()[computeFn]);
+    registerHandler(KIND_DEPS, id, () => []);
   } else {
     if (!depsFn) {
       consoleLog("error", `[reflex] Subscription '${id}' has computeFn but missing depsFn. Computed subscriptions must specify their dependencies.`);
@@ -1065,6 +1091,9 @@ function regSub(id, computeFn, depsFn) {
     registerHandler(KIND4, id, computeFn);
     registerHandler(KIND_DEPS, id, depsFn);
   }
+  if (config) {
+    setSubConfig(id, config);
+  }
 }
 function getOrCreateReaction(subVector) {
   const subId = subVector[0];
@@ -1087,6 +1116,8 @@ function getOrCreateReaction(subVector) {
   const depsReactions = depsVectors.map((depVector) => {
     return getOrCreateReaction(depVector);
   });
+  const subConfig = getSubConfig(subId);
+  const equalityCheck = subConfig?.equalityCheck || getGlobalEqualityCheck();
   const reaction = Reaction.create(
     (...depValues) => {
       if (params.length > 0) {
@@ -1095,7 +1126,8 @@ function getOrCreateReaction(subVector) {
         return computeFn(...depValues);
       }
     },
-    depsReactions
+    depsReactions,
+    equalityCheck
   );
   reaction.setId(subVectorKey);
   reaction.setSubVector(subVector);

package/dist/index.d.cts

@@ -13,6 +13,9 @@ type ErrorHandler = (originalError: Error, reflexError: Error & {
 type SubVector = [Id, ...any[]];
 type SubHandler = (...values: any[]) => any;
 type SubDepsHandler = (...params: any[]) => SubVector[];
+interface SubConfig {
+    equalityCheck?: EqualityCheckFn;
+}
 type Effects = [string, any?][];
 interface DispatchLaterEffect {
     ms: number;
@@ -38,6 +41,7 @@ interface Interceptor<T = Record<string, any>> {
     after?: (context: Context<T>) => Context<T>;
     comment?: string;
 }
+type EqualityCheckFn = (a: any, b: any) => boolean;
 
 declare function initAppDb<T = Record<string, any>>(value: Db<T>): void;
 declare function getAppDb<T = Record<string, any>>(): Db<T>;
@@ -110,8 +114,9 @@ declare class Reaction<T> {
     private version;
     private depsVersions;
     private subVector;
-    constructor(computeFn: (...depValues: any[]) => T, deps?: Reaction<any>[]);
-    static create<R>(fn: (...values: any[]) => R, deps?: Reaction<any>[]): Reaction<R>;
+    private equalityCheck;
+    constructor(computeFn: (...depValues: any[]) => T, deps?: Reaction<any>[], equalityCheck?: EqualityCheckFn);
+    static create<R>(fn: (...values: any[]) => R, deps?: Reaction<any>[], equalityCheck?: EqualityCheckFn): Reaction<R>;
     computeValue(): T;
     getValue(): T;
     getDepValue(notifyWatchers?: boolean): [T, number];
@@ -135,7 +140,7 @@ declare class Reaction<T> {
     get isRoot(): boolean;
 }
 
-declare function regSub<R>(id: Id, computeFn?: (...values: any[]) => R, depsFn?: (...params: any[]) => SubVector[]): void;
+declare function regSub<R>(id: Id, computeFn?: ((...values: any[]) => R) | string, depsFn?: (...params: any[]) => SubVector[], config?: SubConfig): void;
 declare function getSubscriptionValue<T>(subVector: SubVector): T;
 
 declare function regEffect(id: string, handler: EffectHandler): void;

package/dist/index.d.ts

@@ -13,6 +13,9 @@ type ErrorHandler = (originalError: Error, reflexError: Error & {
 type SubVector = [Id, ...any[]];
 type SubHandler = (...values: any[]) => any;
 type SubDepsHandler = (...params: any[]) => SubVector[];
+interface SubConfig {
+    equalityCheck?: EqualityCheckFn;
+}
 type Effects = [string, any?][];
 interface DispatchLaterEffect {
     ms: number;
@@ -38,6 +41,7 @@ interface Interceptor<T = Record<string, any>> {
     after?: (context: Context<T>) => Context<T>;
     comment?: string;
 }
+type EqualityCheckFn = (a: any, b: any) => boolean;
 
 declare function initAppDb<T = Record<string, any>>(value: Db<T>): void;
 declare function getAppDb<T = Record<string, any>>(): Db<T>;
@@ -110,8 +114,9 @@ declare class Reaction<T> {
     private version;
     private depsVersions;
     private subVector;
-    constructor(computeFn: (...depValues: any[]) => T, deps?: Reaction<any>[]);
-    static create<R>(fn: (...values: any[]) => R, deps?: Reaction<any>[]): Reaction<R>;
+    private equalityCheck;
+    constructor(computeFn: (...depValues: any[]) => T, deps?: Reaction<any>[], equalityCheck?: EqualityCheckFn);
+    static create<R>(fn: (...values: any[]) => R, deps?: Reaction<any>[], equalityCheck?: EqualityCheckFn): Reaction<R>;
     computeValue(): T;
     getValue(): T;
     getDepValue(notifyWatchers?: boolean): [T, number];
@@ -135,7 +140,7 @@ declare class Reaction<T> {
     get isRoot(): boolean;
 }
 
-declare function regSub<R>(id: Id, computeFn?: (...values: any[]) => R, depsFn?: (...params: any[]) => SubVector[]): void;
+declare function regSub<R>(id: Id, computeFn?: ((...values: any[]) => R) | string, depsFn?: (...params: any[]) => SubVector[], config?: SubConfig): void;
 declare function getSubscriptionValue<T>(subVector: SubVector): T;
 
 declare function regEffect(id: string, handler: EffectHandler): void;

package/dist/index.mjs

@@ -87,6 +87,7 @@ function clearSubs() {
   clearReactions();
   clearHandlers("sub");
   clearHandlers("subDeps");
+  clearSubConfigs();
 }
 var interceptorsRegistry = /* @__PURE__ */ new Map();
 function getInterceptors(eventId) {
@@ -95,6 +96,20 @@ function getInterceptors(eventId) {
 function setInterceptors(eventId, interceptors) {
   interceptorsRegistry.set(eventId, interceptors);
 }
+var subConfigRegistry = /* @__PURE__ */ new Map();
+function getSubConfig(subId) {
+  return subConfigRegistry.get(subId);
+}
+function setSubConfig(subId, config) {
+  subConfigRegistry.set(subId, config);
+}
+function clearSubConfigs(subId) {
+  if (subId == null) {
+    subConfigRegistry.clear();
+  } else {
+    subConfigRegistry.delete(subId);
+  }
+}
 
 // src/schedule.ts
 function scheduleAfterRender(f) {
@@ -509,8 +524,10 @@ regEffect(DISPATCH, (value) => {
 import { enablePatches, produceWithPatches } from "immer";
 
 // src/settings.ts
+import isEqual from "fast-deep-equal";
 var store = {
-  globalInterceptors: []
+  globalInterceptors: [],
+  globalEqualityCheck: isEqual
 };
 function replaceGlobalInterceptor(globalInterceptors, interceptor) {
   return globalInterceptors.reduce((ret, existingInterceptor) => {
@@ -540,6 +557,9 @@ function clearGlobalInterceptors(id) {
     store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
   }
 }
+function getGlobalEqualityCheck() {
+  return store.globalEqualityCheck;
+}
 
 // src/trace.ts
 var nextId = 1;
@@ -775,7 +795,7 @@ function defaultErrorHandler(originalError, reflexError) {
 regEventErrorHandler(defaultErrorHandler);
 
 // src/reaction.ts
-import isEqual from "fast-deep-equal";
+import isEqual2 from "fast-deep-equal";
 var Reaction = class _Reaction {
   id = "";
   computeFn;
@@ -788,12 +808,14 @@ var Reaction = class _Reaction {
   version = 0;
   depsVersions = [];
   subVector;
-  constructor(computeFn, deps) {
+  equalityCheck;
+  constructor(computeFn, deps, equalityCheck) {
     this.computeFn = computeFn;
     this.deps = deps;
+    this.equalityCheck = equalityCheck || isEqual2;
   }
-  static create(fn, deps) {
-    return new _Reaction(fn, deps);
+  static create(fn, deps, equalityCheck) {
+    return new _Reaction(fn, deps, equalityCheck);
   }
   computeValue() {
     this.ensureDirty();
@@ -850,7 +872,7 @@ var Reaction = class _Reaction {
     try {
       let changed = false;
       withTrace(
-        { operation: this.subVector?.[0] ?? "", opType: "sub/run", tags: { queryV: this.subVector, reaction: this.id } },
+        { operation: this.subVector?.[0] ?? "", opType: "sub/run", tags: { queryV: this.subVector, reaction: this.id, deps: this.deps?.map((d) => d.getId()) ?? [] } },
         () => {
           if (this.isRoot) {
             changed = true;
@@ -859,10 +881,10 @@ 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 = !isEqual(currentVersions, this.depsVersions);
+            const versionsChanged = !isEqual2(currentVersions, this.depsVersions);
             if (this.value === void 0 || versionsChanged) {
               let newVal = this.computeFn(...values);
-              changed = !isEqual(newVal, this.value);
+              changed = !this.equalityCheck(newVal, this.value);
               if (changed) {
                 this.value = newVal;
               }
@@ -882,7 +904,8 @@ var Reaction = class _Reaction {
             withTrace(
               {
                 opType: "render",
-                operation: w.componentName
+                operation: w.componentName,
+                tags: { reaction: this.id }
               },
               () => {
                 w.callback(this.value);
@@ -975,13 +998,16 @@ var Reaction = class _Reaction {
 // src/subs.ts
 var KIND4 = "sub";
 var KIND_DEPS = "subDeps";
-function regSub(id, computeFn, depsFn) {
+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, () => []);
+  } else if (typeof computeFn === "string") {
+    registerHandler(KIND4, id, () => getAppDb()[computeFn]);
+    registerHandler(KIND_DEPS, id, () => []);
   } else {
     if (!depsFn) {
       consoleLog("error", `[reflex] Subscription '${id}' has computeFn but missing depsFn. Computed subscriptions must specify their dependencies.`);
@@ -990,6 +1016,9 @@ function regSub(id, computeFn, depsFn) {
     registerHandler(KIND4, id, computeFn);
     registerHandler(KIND_DEPS, id, depsFn);
   }
+  if (config) {
+    setSubConfig(id, config);
+  }
 }
 function getOrCreateReaction(subVector) {
   const subId = subVector[0];
@@ -1012,6 +1041,8 @@ function getOrCreateReaction(subVector) {
   const depsReactions = depsVectors.map((depVector) => {
     return getOrCreateReaction(depVector);
   });
+  const subConfig = getSubConfig(subId);
+  const equalityCheck = subConfig?.equalityCheck || getGlobalEqualityCheck();
   const reaction = Reaction.create(
     (...depValues) => {
       if (params.length > 0) {
@@ -1020,7 +1051,8 @@ function getOrCreateReaction(subVector) {
         return computeFn(...depValues);
       }
     },
-    depsReactions
+    depsReactions,
+    equalityCheck
   );
   reaction.setId(subVectorKey);
   reaction.setSubVector(subVector);

package/package.json

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