@exodus/atoms 3.7.0 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/atoms",
-  "version": "3.7.0",
+  "version": "4.0.0",
   "main": "src/index.js",
   "author": "Exodus Movement Inc.",
   "scripts": {
@@ -34,5 +34,5 @@
     "eslint": "^8.33.0",
     "jest": "^29.1.2"
   },
-  "gitHead": "de75a59d866ea737d6d1698c3c1edd7a44af0295"
+  "gitHead": "99487e27398623ebf0588233db4f01443c93102d"
 }

package/src/enforce-rules.js

@@ -1,7 +1,5 @@
 import makeConcurrent from 'make-concurrent'
 import proxyFreeze from 'proxy-freeze'
-import { isEqual } from 'lodash'
-import assert from 'minimalistic-assert'
 
 const withChangeDetection = (listener) => {
   let currentValue
@@ -14,11 +12,7 @@ const withChangeDetection = (listener) => {
       called = true
       currentValue = value
 
-      try {
-        await listener(currentValue)
-      } catch (error) {
-        console.warn('observer failed', error)
-      }
+      await listener(currentValue)
     },
     get called() {
       return called
@@ -26,9 +20,7 @@ const withChangeDetection = (listener) => {
   }
 }
 
-const enforceObservableRules = ({ defaultValue, logger, warnOnSameValueSet = false, ...atom }) => {
-  assert(!warnOnSameValueSet || logger, 'warnOnSameValueSet specified but no logger supplied')
-
+const enforceObservableRules = ({ defaultValue, logger, ...atom }) => {
   // ensure observers get called in series
   const enqueue = makeConcurrent((fn) => fn(), { concurrency: 1 })
 
@@ -51,12 +43,6 @@ const enforceObservableRules = ({ defaultValue, logger, warnOnSameValueSet = fal
     // support a function a la React's setState(oldState => newState)
     if (typeof value === 'function') value = await value(await get())
 
-    if (warnOnSameValueSet && isEqual(value, await get())) {
-      logger.warn(
-        `Atom was called with the same value it currently holds: ${JSON.stringify(value)}`
-      )
-    }
-
     await atom.set(value)
   }
 

package/src/enhancers/swallow-observer-errors.js

@@ -0,0 +1,16 @@
+import enforceObservableRules from '../enforce-rules'
+
+const swallowObserverErrors = ({ atom, logger }) => {
+  const observe = (observer) =>
+    atom.observe(async (...args) => {
+      try {
+        await observer(...args)
+      } catch (err) {
+        logger.error('Observer threw error', err)
+      }
+    })
+
+  return enforceObservableRules({ ...atom, observe })
+}
+
+export default swallowObserverErrors

package/src/enhancers/timeout-observers.js

@@ -0,0 +1,19 @@
+import delay from 'delay'
+import enforceObservableRules from '../enforce-rules'
+
+const timeoutObservers = ({ atom, logger, timeout }) => {
+  const observe = (observer) =>
+    atom.observe(async (...args) =>
+      Promise.race([
+        //
+        observer(...args),
+        delay.reject(timeout, {
+          value: new Error('Observer timed out!'),
+        }),
+      ])
+    )
+
+  return enforceObservableRules({ ...atom, observe })
+}
+
+export default timeoutObservers

package/src/enhancers/warn-on-same-value-set.js

@@ -0,0 +1,18 @@
+import { isEqual as deepEqual } from 'lodash'
+import enforceObservableRules from '../enforce-rules'
+
+const warnOnSameValueSet = ({ atom, isEqual = deepEqual, logger }) => {
+  const set = async (value) => {
+    if (isEqual(value, await atom.get())) {
+      logger.warn(
+        `Atom was called with the same value it currently holds: ${JSON.stringify(value)}`
+      )
+    }
+
+    await atom.set(value)
+  }
+
+  return enforceObservableRules({ ...atom, set })
+}
+
+export default warnOnSameValueSet

package/src/event-emitter.js

@@ -1,14 +1,6 @@
 import enforceObservableRules from './enforce-rules'
 
-const fromEventEmitter = ({
-  emitter,
-  event,
-  get,
-  set,
-  defaultValue,
-  logger,
-  warnOnSameValueSet,
-}) => {
+const fromEventEmitter = ({ emitter, event, get, set, defaultValue, logger }) => {
   const observe = (listener) => {
     emitter.on(event, listener)
     return () => emitter.removeListener(event, listener)
@@ -20,7 +12,6 @@ const fromEventEmitter = ({
     observe,
     defaultValue,
     logger,
-    warnOnSameValueSet,
   })
 }
 

package/src/factories/fusion.js

@@ -3,7 +3,7 @@ import { get as getValueAtPath, set as setValueAtPath } from 'lodash'
 import enforceObservableRules from '../enforce-rules'
 
 const createFusionAtomFactory =
-  ({ fusion, logger, warnOnSameValueSet }) =>
+  ({ fusion, logger }) =>
   ({ path, defaultValue }) => {
     const set = async (value) => {
       await fusion.mergeProfile(setValueAtPath({}, path, value))
@@ -24,7 +24,6 @@ const createFusionAtomFactory =
       observe,
       defaultValue,
       logger,
-      warnOnSameValueSet,
     })
   }
 

package/src/factories/keystore.js

@@ -12,7 +12,6 @@ const createKeystoreAtom = ({
     getOpts,
     setOpts,
     deleteOpts,
-    warnOnSameValueSet,
   },
 }) => {
   const { notify, observe } = createSimpleObserver({ enable: isSoleWriter })
@@ -35,7 +34,6 @@ const createKeystoreAtom = ({
     observe,
     defaultValue,
     logger,
-    warnOnSameValueSet,
   })
 }
 

package/src/factories/storage.js

@@ -2,7 +2,7 @@ import createSimpleObserver from '../simple-observer'
 import enforceObservableRules from '../enforce-rules'
 
 const createStorageAtomFactory =
-  ({ storage, logger, warnOnSameValueSet }) =>
+  ({ storage, logger }) =>
   ({ key, defaultValue, isSoleWriter }) => {
     const { notify, observe } = createSimpleObserver({ enable: isSoleWriter })
 
@@ -40,7 +40,6 @@ const createStorageAtomFactory =
       observe,
       defaultValue,
       logger,
-      warnOnSameValueSet,
     })
   }
 

package/src/index.js

@@ -13,4 +13,7 @@ export { default as difference } from './enhancers/difference'
 export { default as withSerialization } from './enhancers/with-serialization'
 export { default as combine } from './enhancers/combine'
 export { default as readOnly } from './enhancers/read-only'
+export { default as warnOnSameValueSet } from './enhancers/warn-on-same-value-set'
+export { default as swallowObserverErrors } from './enhancers/swallow-observer-errors'
+export { default as timeoutObservers } from './enhancers/timeout-observers'
 export { default as enforceObservableRules } from './enforce-rules'