@flexsurfer/reflex 0.1.13 → 0.1.15

package/README.md

@@ -4,7 +4,7 @@
 
 **re-frame for the JavaScript world**
 
-A reactive, functional state management library that brings the elegance and power of ClojureScript's re-frame to JavaScript and React/ReactNative applications.
+A reactive, functional state management library that brings the elegance and power of ClojureScript's re-frame to JavaScript/TypeScript and React/ReactNative applications.
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![NPM Version](https://img.shields.io/npm/v/%40flexsurfer%2Freflex)](https://www.npmjs.com/package/@flexsurfer/reflex)
@@ -26,259 +26,17 @@ After many years of building applications with re-frame in the ClojureScript wor
 🛡️ **Type Safety** - Full TypeScript support with excellent IDE experience  
 🧪 **Testability** - Pure functions make testing straightforward and reliable  
 
-## 🚀 Quick Start
-
-```bash
-npm install @flexsurfer/reflex
-npm install --save-dev @flexsurfer/reflex-devtools
-
-npx reflex-devtools
-```
-
-### Basic Example
-
-```typescript
-import { 
-  initAppDb, 
-  regEvent, 
-  regSub, 
-  dispatch, 
-  useSubscription,
-  enableTracing
-} from '@flexsurfer/reflex';
-import { enableDevtools } from '@flexsurfer/reflex-devtools'
-
-enableTracing()
-enableDevtools();
-
-// Initialize your app database
-initAppDb({ counter: 0 });
-
-// Register events (state transitions)
-regEvent('increment', ({ draftDb }) => {
-  draftDb.counter += 1; 
-});
-
-regEvent('decrement', ({ draftDb }) => {
-   draftDb.counter -= 1; 
-});
-
-// Register subscriptions (reactive queries)
-regSub('counter');
-
-// React component
-const Counter = () => {
-  const counter = useSubscription<number>(['counter']);
-  
-  return (
-    <div>
-      <h1>Count: {counter}</h1>
-      <button onClick={() => dispatch(['increment'])}>+</button>
-      <button onClick={() => dispatch(['decrement'])}>-</button>
-    </div>
-  );
-}
-```
-
-## 🏗️ Core Concepts
-
-### Events & Effects
-
-Events define state transitions and may declare side effects:
-
-```typescript
-// Simple state update
-regEvent('set-name', ({ draftDb }, name) => {
-   draftDb.user.name = name;
-});
-
-// Dispatch with parameters
-dispatch(['set-name', 'John Doe']);
-
-// Event with side effects
-regEvent('save-user', ({ draftDb }, user) => {
-  draftDb.saving = true; 
-  return [
-    ['http', {
-      method: 'POST',
-      url: '/api/users',
-      body: user,
-      onSuccess: ['save-user-success'],
-      onFailure: ['save-user-error']
-    }]
-  ]
-});
-
-// Dispatch with parameters
-dispatch(['save-user', { id: 1, name: 'John', email: 'john@example.com' }]);
-```
-
-### Subscriptions
-
-Create reactive queries that automatically update your UI:
-
-```typescript
-regSub('user');
-regSub('display-prefix');
-regSub('user-name', (user) => user.name, () => [['user']]);
-
-// Computed subscription with dependencies
-regSub('user-display-name',
-  (name, prefix) => `${prefix}: ${name}`,
-  () => [['user-name'], ['display-prefix']]
-);
-
-// Parameterized subscription
-regSub(
-  'todo-by-id',
-  (todos, id) => todos.find(todo => todo.id === id),
-  () => [['todos']]
-);
-
-regSub(
-  'todo-text-by-id',
-  (todo, _id) => todo.text,
-  (id) => [['todo-by-id' id]]
-);
-
-// Use in React components
-function UserProfile() {
-  const name = useSubscription<string>(['user-display-name']);
-  const todo = useSubscription(['todo-by-id', 123])
-  const todoText = useSubscription(['todo-text-by-id', 123]);
-  
-  return <div>{name}</div>;
-}
-```
-
-### Effects & Co-effects
-
-Handle side effects in a controlled, testable way:
-
-```typescript
-import { 
-  regEffect,
-  regCoeffect
-} from '@flexsurfer/reflex';
-
-// Register custom effects
-regEffect('local-storage', (payload) => {
-  localStorage.setItem(payload.key, JSON.stringify(payload.value));
-});
-
-// Use in events
-regEvent('save-to-storage', (_coeffects, data) => {
-  return [['local-storage', { key: 'app-data', value: data }]]
-});
-
-// Dispatch with data parameter
-dispatch(['save-to-storage', { user: 'John', preferences: { theme: 'dark' } }]);
-
-// Register co-effects
-regCoeffect('timestamp', (coeffects) => {
-  coeffects.timestamp = Date.now();
-  return coeffects;
-});
-
-regCoeffect('random', (coeffects) => {
-  coeffects.random = Math.random();
-  return coeffects;
-});
-
-// Use co-effect in events
-regEvent('log-action', 
-  ({ draftDb, timestamp, random }, action) => {
-    draftDb.actionLog.push({
-      action,
-      timestamp: timestamp,
-      id: random.toString(36)
-    });
-  },
-  [['timestamp'], ['random']] 
-);
-
-// Dispatch with action parameter
-dispatch(['log-action', 'some-action']);
-```
-
-### Interceptors
-
-Compose functionality with interceptors:
-
-```typescript
-const loggingInterceptor = {
-  id: 'logging',
-  before: (context) => {
-    console.log('Event:', context.coeffects.event);
-    return context;
-  },
-  after: (context) => {
-    console.log('Updated DB:', context.coeffects.newDb);
-    return context;
-  }
-};
-
-regEvent('my-event', handler, [loggingInterceptor]);
-```
-
-## 🎯 Why Re-frame Pattern?
-
-The re-frame pattern has proven itself in production applications over many years:
-
-- **Separation of Concerns**: Clear boundaries between events, effects, and subscriptions
-- **Time Travel Debugging**: Every state change is an event that can be replayed
-- **Testability**: Pure functions make unit testing straightforward
-- **Composability**: Build complex features from simple, reusable parts
-- **Maintainability**: Code becomes self-documenting and easy to reason about
-
-## 🔄 Migration from Other Libraries
-
-### From Redux
-
-```typescript
-// Redux style
-const counterSlice = createSlice({
-  name: 'count',
-  initialState: { value: 0 },
-  reducers: {
-    increment: (state) => { state.value += 1; }
-  }
-});
-
-// Reflex style
-initAppDb({ count: 0 });
-regEvent('increment', ({ draftDb }) => {
-   draftDb.count += 1; 
-});
-regSub('count');
-```
-
-### From Zustand
-
-```typescript
-// Zustand style
-const useStore = create((set) => ({
-  count: 0,
-  increment: () => set((state) => ({ count: state.count + 1 }))
-}));
-
-// Reflex style
-initAppDb({ count: 0 });
-regEvent('increment', ({ draftDb }) => {
-   draftDb.count += 1; 
-});
-regSub('count');
-```
-
 ## 📚 Learn More
 
+- [Documentation](https://reflex.js.org/docs/)
+- [Step-by-Step Tutorial](https://reflex.js.org/docs/quick-start.html)
+- [Best Practices](https://reflex.js.org/docs/api-reference.html)
+- [API Reference](https://reflex.js.org/docs/best-practices.html)
 - [re-frame Documentation](https://day8.github.io/re-frame/re-frame/) - The original and comprehensive guide to understanding the philosophy and patterns
-- Step-by-Step Tutorial - TBD
-- API Reference - TBD
+
 - Examples
   - [TodoMVC](https://github.com/flexsurfer/reflex/tree/main/examples/todomvc) - Classic todo app implementation showcasing core reflex patterns
   - [Einbürgerungstest](https://github.com/flexsurfer/einburgerungstest/) - German citizenship test app built with reflex ([Live Demo](https://www.ebtest.org/))
-- Best Practices - TBD
 
 ## 🤝 Contributing
 

package/dist/index.cjs

@@ -40,6 +40,7 @@ __export(src_exports, {
   clearHotReloadCallbacks: () => clearHotReloadCallbacks,
   clearReactions: () => clearReactions,
   clearSubs: () => clearSubs,
+  current: () => current,
   debounceAndDispatch: () => debounceAndDispatch,
   defaultErrorHandler: () => defaultErrorHandler,
   disableTracing: () => disableTracing,
@@ -51,7 +52,7 @@ __export(src_exports, {
   getHandler: () => getHandler,
   getSubscriptionValue: () => getSubscriptionValue,
   initAppDb: () => initAppDb,
-  isDebugEnabled: () => isDebugEnabled,
+  original: () => original,
   regCoeffect: () => regCoeffect,
   regEffect: () => regEffect,
   regEvent: () => regEvent,
@@ -60,7 +61,6 @@ __export(src_exports, {
   regSub: () => regSub,
   registerHotReloadCallback: () => registerHotReloadCallback,
   registerTraceCb: () => registerTraceCb,
-  setDebugEnabled: () => setDebugEnabled,
   setupSubsHotReload: () => setupSubsHotReload,
   throttleAndDispatch: () => throttleAndDispatch,
   triggerHotReload: () => triggerHotReload,
@@ -230,6 +230,15 @@ function updateAppDbWithPatches(newDb, patches) {
   }
 }
 
+// src/immer-utils.ts
+var import_immer = require("immer");
+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;
+}
+
 // src/interceptor.ts
 function isInterceptor(m) {
   if (typeof m !== "object" || m === null)
@@ -563,20 +572,15 @@ regEffect(DISPATCH, (value) => {
 });
 
 // src/events.ts
-var import_immer = require("immer");
+var import_immer2 = require("immer");
 
 // src/settings.ts
 var store = {
-  globalInterceptors: [],
-  debugEnabled: true
-  // Default to true, can be configured via setDebugEnabled
+  globalInterceptors: []
 };
 function replaceGlobalInterceptor(globalInterceptors, interceptor) {
   return globalInterceptors.reduce((ret, existingInterceptor) => {
     if (interceptor.id === existingInterceptor.id) {
-      if (store.debugEnabled) {
-        consoleLog("warn", "[reflex] replacing duplicate global interceptor id:", interceptor.id);
-      }
       return [...ret, interceptor];
     } else {
       return [...ret, existingInterceptor];
@@ -602,12 +606,6 @@ function clearGlobalInterceptors(id) {
     store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
   }
 }
-function setDebugEnabled(enabled) {
-  store.debugEnabled = enabled;
-}
-function isDebugEnabled() {
-  return store.debugEnabled;
-}
 
 // src/trace.ts
 var nextId = 1;
@@ -708,6 +706,13 @@ function enableTracePrint() {
   });
 }
 
+// src/env.ts
+var IS_DEV = (
+  // Node.js check
+  typeof process !== "undefined" && process.env?.NODE_ENV === "development" || // React Native / bundler check
+  typeof __DEV__ !== "undefined" && __DEV__
+);
+
 // src/events.ts
 var KIND3 = "event";
 function regEvent(id, handler, cofxOrInterceptors, interceptors) {
@@ -756,25 +761,31 @@ function registerInterceptors(id, cofxOrInterceptors, interceptors) {
     setInterceptors(id, allInterceptors);
   }
 }
-(0, import_immer.enablePatches)();
+(0, import_immer2.enablePatches)();
 function eventHandlerInterceptor(handler) {
   return {
     id: "fx-handler",
     before(context) {
-      const coeffects = context.coeffects;
-      const event = coeffects.event;
+      const event = context.coeffects.event;
       const params = event.slice(1);
       let effects = [];
-      const [newDb, patches] = (0, import_immer.produceWithPatches)(
+      const [newDb, patches, reversePatches] = (0, import_immer2.produceWithPatches)(
         getAppDb(),
         (draftDb) => {
-          coeffects.draftDb = draftDb;
-          effects = handler({ ...coeffects }, ...params) || [];
+          const coeffectsWithDb = { ...context.coeffects, draftDb };
+          effects = handler(coeffectsWithDb, ...params) || [];
         }
       );
+      if (IS_DEV) {
+        try {
+          JSON.stringify(effects);
+        } catch (e) {
+          consoleLog("warn", `[reflex] Effects ${effects} contain Proxy (probably an Immer draft). Use current() for draftDb values.`);
+        }
+      }
       context.newDb = newDb;
       context.patches = patches;
-      mergeTrace({ tags: { "patches": patches, "effects": effects } });
+      mergeTrace({ tags: { "patches": patches, "reversePatches": reversePatches, "effects": effects } });
       if (!Array.isArray(effects)) {
         consoleLog("warn", `[reflex] effects expects a vector, but was given ${typeof effects}`);
       } else {
@@ -1195,12 +1206,8 @@ function setupSubsHotReload() {
   return { dispose, accept };
 }
 function HotReloadWrapper({ children }) {
-  if (isDebugEnabled()) {
-    const key = useHotReloadKey();
-    return import_react2.default.createElement(import_react2.default.Fragment, { key }, children);
-  } else {
-    return children;
-  }
+  const key = useHotReloadKey();
+  return import_react2.default.createElement(import_react2.default.Fragment, { key }, children);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -1214,6 +1221,7 @@ function HotReloadWrapper({ children }) {
   clearHotReloadCallbacks,
   clearReactions,
   clearSubs,
+  current,
   debounceAndDispatch,
   defaultErrorHandler,
   disableTracing,
@@ -1225,7 +1233,7 @@ function HotReloadWrapper({ children }) {
   getHandler,
   getSubscriptionValue,
   initAppDb,
-  isDebugEnabled,
+  original,
   regCoeffect,
   regEffect,
   regEvent,
@@ -1234,7 +1242,6 @@ function HotReloadWrapper({ children }) {
   regSub,
   registerHotReloadCallback,
   registerTraceCb,
-  setDebugEnabled,
   setupSubsHotReload,
   throttleAndDispatch,
   triggerHotReload,

package/dist/index.d.cts

@@ -42,6 +42,23 @@ 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>;
 
+/**
+ * Safe versions of immer's original and current functions
+ * These check if the value is actually a draft before calling the immer functions
+ */
+/**
+ * Safe version of immer's original function
+ * Returns the original (frozen) version of a draft if the value is a draft,
+ * otherwise returns the value as-is
+ */
+declare function original<T>(value: T): T;
+/**
+ * Safe version of immer's current function
+ * Returns the current draft state as a plain object if the value is a draft,
+ * otherwise returns the value as-is
+ */
+declare function current<T>(value: T): 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;
 /** Register an event handler with interceptors and handler function (backward compatibility) */
@@ -105,14 +122,6 @@ declare function getGlobalInterceptors(): Interceptor[];
  */
 declare function clearGlobalInterceptors(): void;
 declare function clearGlobalInterceptors(id: string): void;
-/**
- * Enable or disable debug mode
- */
-declare function setDebugEnabled(enabled: boolean): void;
-/**
- * Check if debug mode is enabled
- */
-declare function isDebugEnabled(): boolean;
 
 type Kind = 'event' | 'fx' | 'cofx' | 'sub' | 'subDeps' | 'error';
 type RegistryHandler = EventHandler | EffectHandler | CoEffectHandler | ErrorHandler | SubHandler | SubDepsHandler;
@@ -183,9 +192,9 @@ declare function setupSubsHotReload(): {
  */
 declare function HotReloadWrapper({ children }: {
     children: React.ReactNode;
-}): string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | React.FunctionComponentElement<{
+}): React.FunctionComponentElement<{
     children?: React.ReactNode | undefined;
-}> | null | undefined;
+}>;
 
 type TraceID = number;
 interface TraceOpts {
@@ -206,4 +215,4 @@ declare function disableTracing(): void;
 declare function registerTraceCb(key: string, cb: TraceCallback): void;
 declare function enableTracePrint(): void;
 
-export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, 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 };
+export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, current, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getAppDb, getGlobalInterceptors, getHandler, getSubscriptionValue, initAppDb, original, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };

package/dist/index.d.ts

@@ -42,6 +42,23 @@ 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>;
 
+/**
+ * Safe versions of immer's original and current functions
+ * These check if the value is actually a draft before calling the immer functions
+ */
+/**
+ * Safe version of immer's original function
+ * Returns the original (frozen) version of a draft if the value is a draft,
+ * otherwise returns the value as-is
+ */
+declare function original<T>(value: T): T;
+/**
+ * Safe version of immer's current function
+ * Returns the current draft state as a plain object if the value is a draft,
+ * otherwise returns the value as-is
+ */
+declare function current<T>(value: T): 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;
 /** Register an event handler with interceptors and handler function (backward compatibility) */
@@ -105,14 +122,6 @@ declare function getGlobalInterceptors(): Interceptor[];
  */
 declare function clearGlobalInterceptors(): void;
 declare function clearGlobalInterceptors(id: string): void;
-/**
- * Enable or disable debug mode
- */
-declare function setDebugEnabled(enabled: boolean): void;
-/**
- * Check if debug mode is enabled
- */
-declare function isDebugEnabled(): boolean;
 
 type Kind = 'event' | 'fx' | 'cofx' | 'sub' | 'subDeps' | 'error';
 type RegistryHandler = EventHandler | EffectHandler | CoEffectHandler | ErrorHandler | SubHandler | SubDepsHandler;
@@ -183,9 +192,9 @@ declare function setupSubsHotReload(): {
  */
 declare function HotReloadWrapper({ children }: {
     children: React.ReactNode;
-}): string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | React.FunctionComponentElement<{
+}): React.FunctionComponentElement<{
     children?: React.ReactNode | undefined;
-}> | null | undefined;
+}>;
 
 type TraceID = number;
 interface TraceOpts {
@@ -206,4 +215,4 @@ declare function disableTracing(): void;
 declare function registerTraceCb(key: string, cb: TraceCallback): void;
 declare function enableTracePrint(): void;
 
-export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, 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 };
+export { CoEffectHandler, CoEffects, Context, DISPATCH, DISPATCH_LATER, Db, DispatchLaterEffect, EffectHandler, Effects, ErrorHandler, EventHandler, EventVector, HotReloadWrapper, Id, Interceptor, NOW, RANDOM, SubVector, clearGlobalInterceptors, clearHandlers, clearHotReloadCallbacks, clearReactions, clearSubs, current, debounceAndDispatch, defaultErrorHandler, disableTracing, dispatch, enableTracePrint, enableTracing, getAppDb, getGlobalInterceptors, getHandler, getSubscriptionValue, initAppDb, original, regCoeffect, regEffect, regEvent, regEventErrorHandler, regGlobalInterceptor, regSub, registerHotReloadCallback, registerTraceCb, setupSubsHotReload, throttleAndDispatch, triggerHotReload, useHotReload, useHotReloadKey, useSubscription };

package/dist/index.mjs

@@ -158,6 +158,15 @@ function updateAppDbWithPatches(newDb, patches) {
   }
 }
 
+// src/immer-utils.ts
+import { isDraft, original as immerOriginal, current as immerCurrent } from "immer";
+function original(value) {
+  return isDraft(value) ? immerOriginal(value) : value;
+}
+function current(value) {
+  return isDraft(value) ? immerCurrent(value) : value;
+}
+
 // src/interceptor.ts
 function isInterceptor(m) {
   if (typeof m !== "object" || m === null)
@@ -495,16 +504,11 @@ import { enablePatches, produceWithPatches } from "immer";
 
 // src/settings.ts
 var store = {
-  globalInterceptors: [],
-  debugEnabled: true
-  // Default to true, can be configured via setDebugEnabled
+  globalInterceptors: []
 };
 function replaceGlobalInterceptor(globalInterceptors, interceptor) {
   return globalInterceptors.reduce((ret, existingInterceptor) => {
     if (interceptor.id === existingInterceptor.id) {
-      if (store.debugEnabled) {
-        consoleLog("warn", "[reflex] replacing duplicate global interceptor id:", interceptor.id);
-      }
       return [...ret, interceptor];
     } else {
       return [...ret, existingInterceptor];
@@ -530,12 +534,6 @@ function clearGlobalInterceptors(id) {
     store.globalInterceptors = store.globalInterceptors.filter((interceptor) => interceptor.id !== id);
   }
 }
-function setDebugEnabled(enabled) {
-  store.debugEnabled = enabled;
-}
-function isDebugEnabled() {
-  return store.debugEnabled;
-}
 
 // src/trace.ts
 var nextId = 1;
@@ -636,6 +634,13 @@ function enableTracePrint() {
   });
 }
 
+// src/env.ts
+var IS_DEV = (
+  // Node.js check
+  typeof process !== "undefined" && process.env?.NODE_ENV === "development" || // React Native / bundler check
+  typeof __DEV__ !== "undefined" && __DEV__
+);
+
 // src/events.ts
 var KIND3 = "event";
 function regEvent(id, handler, cofxOrInterceptors, interceptors) {
@@ -689,20 +694,26 @@ function eventHandlerInterceptor(handler) {
   return {
     id: "fx-handler",
     before(context) {
-      const coeffects = context.coeffects;
-      const event = coeffects.event;
+      const event = context.coeffects.event;
       const params = event.slice(1);
       let effects = [];
-      const [newDb, patches] = produceWithPatches(
+      const [newDb, patches, reversePatches] = produceWithPatches(
         getAppDb(),
         (draftDb) => {
-          coeffects.draftDb = draftDb;
-          effects = handler({ ...coeffects }, ...params) || [];
+          const coeffectsWithDb = { ...context.coeffects, draftDb };
+          effects = handler(coeffectsWithDb, ...params) || [];
         }
       );
+      if (IS_DEV) {
+        try {
+          JSON.stringify(effects);
+        } catch (e) {
+          consoleLog("warn", `[reflex] Effects ${effects} contain Proxy (probably an Immer draft). Use current() for draftDb values.`);
+        }
+      }
       context.newDb = newDb;
       context.patches = patches;
-      mergeTrace({ tags: { "patches": patches, "effects": effects } });
+      mergeTrace({ tags: { "patches": patches, "reversePatches": reversePatches, "effects": effects } });
       if (!Array.isArray(effects)) {
         consoleLog("warn", `[reflex] effects expects a vector, but was given ${typeof effects}`);
       } else {
@@ -1123,12 +1134,8 @@ function setupSubsHotReload() {
   return { dispose, accept };
 }
 function HotReloadWrapper({ children }) {
-  if (isDebugEnabled()) {
-    const key = useHotReloadKey();
-    return React.createElement(React.Fragment, { key }, children);
-  } else {
-    return children;
-  }
+  const key = useHotReloadKey();
+  return React.createElement(React.Fragment, { key }, children);
 }
 export {
   DISPATCH,
@@ -1141,6 +1148,7 @@ export {
   clearHotReloadCallbacks,
   clearReactions,
   clearSubs,
+  current,
   debounceAndDispatch,
   defaultErrorHandler,
   disableTracing,
@@ -1152,7 +1160,7 @@ export {
   getHandler,
   getSubscriptionValue,
   initAppDb,
-  isDebugEnabled,
+  original,
   regCoeffect,
   regEffect,
   regEvent,
@@ -1161,7 +1169,6 @@ export {
   regSub,
   registerHotReloadCallback,
   registerTraceCb,
-  setDebugEnabled,
   setupSubsHotReload,
   throttleAndDispatch,
   triggerHotReload,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flexsurfer/reflex",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -30,7 +30,9 @@
     "dev": "tsup --watch",
     "test": "jest --passWithNoTests",
     "test:clean": "jest --passWithNoTests --silent",
-    "test:watch": "jest --passWithNoTests --watch"
+    "test:watch": "jest --passWithNoTests --watch",
+    "test:ci": "jest --passWithNoTests --coverage --silent",
+    "prepublishOnly": "npm run test:ci && npm run build"
   },
   "devDependencies": {
     "@testing-library/dom": "^10.4.0",