@flexsurfer/reflex 0.1.8 → 0.1.10

package/dist/index.cjs

@@ -42,6 +42,7 @@ __export(src_exports, {
   dispatch: () => dispatch,
   enableTracePrint: () => enableTracePrint,
   enableTracing: () => enableTracing,
+  getAppDb: () => getAppDb,
   getGlobalInterceptors: () => getGlobalInterceptors,
   getHandler: () => getHandler,
   getSubscriptionValue: () => getSubscriptionValue,
@@ -767,6 +768,7 @@ function eventHandlerInterceptor(handler) {
       );
       context.newDb = newDb;
       context.patches = patches;
+      mergeTrace({ tags: { "patches": patches, "effects": effects } });
       if (!Array.isArray(effects)) {
         consoleLog("warn", `[reflex] effects expects a vector, but was given ${typeof effects}`);
       } else {
@@ -801,9 +803,7 @@ function handle(eventV) {
   withTrace(
     { operation: eventId, opType: KIND3, tags: { event: eventV } },
     () => {
-      mergeTrace({ tags: { "app-db-before": getAppDb() } });
       execute(eventV, interceptors);
-      mergeTrace({ tags: { "app-db-after": getAppDb() } });
     }
   );
 }
@@ -834,7 +834,6 @@ var Reaction = class _Reaction {
   version = 0;
   depsVersions = [];
   subVector;
-  componentName;
   constructor(computeFn, deps) {
     this.computeFn = computeFn;
     this.deps = deps;
@@ -851,10 +850,10 @@ var Reaction = class _Reaction {
     this.recomputeIfNeeded(notifyWatchers);
     return [this.value, this.version];
   }
-  watch(callback) {
-    const idx = this.watchers.indexOf(callback);
+  watch(callback, componentName = "react component") {
+    const idx = this.watchers.findIndex((w) => w.callback === callback);
     if (idx === -1) {
-      this.watchers.push(callback);
+      this.watchers.push({ callback, componentName });
       if (this.deps) {
         for (const d of this.deps)
           d.ensureAliveWith(this);
@@ -862,7 +861,7 @@ var Reaction = class _Reaction {
     }
   }
   unwatch(fn) {
-    const idx = this.watchers.indexOf(fn);
+    const idx = this.watchers.findIndex((w) => w.callback === fn);
     if (idx !== -1) {
       this.watchers.splice(idx, 1);
       if (this.watchers.length === 0) {
@@ -926,11 +925,10 @@ var Reaction = class _Reaction {
             withTrace(
               {
                 opType: "render",
-                operation: this.componentName ?? "component",
-                tags: this.componentName ? { componentName: this.componentName } : {}
+                operation: w.componentName
               },
               () => {
-                w(this.value);
+                w.callback(this.value);
               }
             );
           } catch (error) {
@@ -1014,9 +1012,6 @@ var Reaction = class _Reaction {
   get isRoot() {
     return this.deps === void 0 || this.deps.length === 0;
   }
-  setComponentName(componentName) {
-    this.componentName = componentName;
-  }
 };
 
 // src/subs.ts
@@ -1121,8 +1116,7 @@ function useSubscription(subVector, componentName = "react component") {
     const reaction = getOrCreateReaction(subVector);
     if (!reaction)
       return;
-    reaction.setComponentName(componentName);
-    reaction.watch(setVal);
+    reaction.watch(setVal, componentName);
     return () => {
       reaction.unwatch(setVal);
     };
@@ -1218,6 +1212,7 @@ function HotReloadWrapper({ children }) {
   dispatch,
   enableTracePrint,
   enableTracing,
+  getAppDb,
   getGlobalInterceptors,
   getHandler,
   getSubscriptionValue,

package/dist/index.d.cts

@@ -40,6 +40,7 @@ interface Interceptor<T = Record<string, any>> {
 }
 
 declare function initAppDb<T = Record<string, any>>(value: Db<T>): void;
+declare function getAppDb<T = Record<string, any>>(): Db<T>;
 
 /** Register an event handler with only a handler function (db event) */
 declare function regEvent<T = Record<string, any>>(id: Id, handler: EventHandler<T>): void;
@@ -201,4 +202,4 @@ declare function disableTracing(): void;
 declare function registerTraceCb(key: string, cb: TraceCallback): void;
 declare function enableTracePrint(): void;
 
-export { CoEffectHandler, CoEffects, Context, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getGlobalInterceptors, getHandler, getSubscriptionValue, initAppDb, isDebugEnabled, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, setDebugEnabled, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };
+export { CoEffectHandler, CoEffects, Context, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getAppDb, getGlobalInterceptors, getHandler, getSubscriptionValue, initAppDb, isDebugEnabled, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, setDebugEnabled, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };

package/dist/index.d.ts

@@ -40,6 +40,7 @@ interface Interceptor<T = Record<string, any>> {
 }
 
 declare function initAppDb<T = Record<string, any>>(value: Db<T>): void;
+declare function getAppDb<T = Record<string, any>>(): Db<T>;
 
 /** Register an event handler with only a handler function (db event) */
 declare function regEvent<T = Record<string, any>>(id: Id, handler: EventHandler<T>): void;
@@ -201,4 +202,4 @@ declare function disableTracing(): void;
 declare function registerTraceCb(key: string, cb: TraceCallback): void;
 declare function enableTracePrint(): void;
 
-export { CoEffectHandler, CoEffects, Context, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getGlobalInterceptors, getHandler, getSubscriptionValue, initAppDb, isDebugEnabled, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, setDebugEnabled, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };
+export { CoEffectHandler, CoEffects, Context, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getAppDb, getGlobalInterceptors, getHandler, getSubscriptionValue, initAppDb, isDebugEnabled, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, setDebugEnabled, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };

package/dist/index.mjs

@@ -700,6 +700,7 @@ function eventHandlerInterceptor(handler) {
       );
       context.newDb = newDb;
       context.patches = patches;
+      mergeTrace({ tags: { "patches": patches, "effects": effects } });
       if (!Array.isArray(effects)) {
         consoleLog("warn", `[reflex] effects expects a vector, but was given ${typeof effects}`);
       } else {
@@ -734,9 +735,7 @@ function handle(eventV) {
   withTrace(
     { operation: eventId, opType: KIND3, tags: { event: eventV } },
     () => {
-      mergeTrace({ tags: { "app-db-before": getAppDb() } });
       execute(eventV, interceptors);
-      mergeTrace({ tags: { "app-db-after": getAppDb() } });
     }
   );
 }
@@ -767,7 +766,6 @@ var Reaction = class _Reaction {
   version = 0;
   depsVersions = [];
   subVector;
-  componentName;
   constructor(computeFn, deps) {
     this.computeFn = computeFn;
     this.deps = deps;
@@ -784,10 +782,10 @@ var Reaction = class _Reaction {
     this.recomputeIfNeeded(notifyWatchers);
     return [this.value, this.version];
   }
-  watch(callback) {
-    const idx = this.watchers.indexOf(callback);
+  watch(callback, componentName = "react component") {
+    const idx = this.watchers.findIndex((w) => w.callback === callback);
     if (idx === -1) {
-      this.watchers.push(callback);
+      this.watchers.push({ callback, componentName });
       if (this.deps) {
         for (const d of this.deps)
           d.ensureAliveWith(this);
@@ -795,7 +793,7 @@ var Reaction = class _Reaction {
     }
   }
   unwatch(fn) {
-    const idx = this.watchers.indexOf(fn);
+    const idx = this.watchers.findIndex((w) => w.callback === fn);
     if (idx !== -1) {
       this.watchers.splice(idx, 1);
       if (this.watchers.length === 0) {
@@ -859,11 +857,10 @@ var Reaction = class _Reaction {
             withTrace(
               {
                 opType: "render",
-                operation: this.componentName ?? "component",
-                tags: this.componentName ? { componentName: this.componentName } : {}
+                operation: w.componentName
               },
               () => {
-                w(this.value);
+                w.callback(this.value);
               }
             );
           } catch (error) {
@@ -947,9 +944,6 @@ var Reaction = class _Reaction {
   get isRoot() {
     return this.deps === void 0 || this.deps.length === 0;
   }
-  setComponentName(componentName) {
-    this.componentName = componentName;
-  }
 };
 
 // src/subs.ts
@@ -1054,8 +1048,7 @@ function useSubscription(subVector, componentName = "react component") {
     const reaction = getOrCreateReaction(subVector);
     if (!reaction)
       return;
-    reaction.setComponentName(componentName);
-    reaction.watch(setVal);
+    reaction.watch(setVal, componentName);
     return () => {
       reaction.unwatch(setVal);
     };
@@ -1150,6 +1143,7 @@ export {
   dispatch,
   enableTracePrint,
   enableTracing,
+  getAppDb,
   getGlobalInterceptors,
   getHandler,
   getSubscriptionValue,

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@flexsurfer/reflex",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/flexsurfer/reflex.git"
+    "url": "git+https://github.com/flexsurfer/reflex.git"
   },
   "type": "module",
   "main": "dist/index.cjs",
@@ -68,4 +68,4 @@
     "pubsub",
     "handler"
   ]
-}
+}