@exodus/atoms 3.4.0 → 3.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/atoms",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "main": "src/index.js",
   "author": "Exodus Movement Inc.",
   "scripts": {
@@ -33,5 +33,5 @@
     "eslint": "^8.33.0",
     "jest": "^29.1.2"
   },
-  "gitHead": "16e977048c07d7dd898ce0555895c43eb0a5402a"
+  "gitHead": "0c9ed53bfe02b1d0dc0666bc83c0bd1dcd8f5e36"
 }

package/src/countdown-lock.js

@@ -1,15 +1,22 @@
 import pDefer from 'p-defer'
 
-const createCountdownLock = (n) => {
-  if (typeof n !== 'number' || n <= 0) throw new Error('lock number must be positive')
+const createCountdownLock = (keys) => {
+  if (!Array.isArray(keys)) throw new Error('lock keys must be an array')
+
+  for (const key of keys) {
+    if (typeof key !== 'string') throw new Error(`lock keys must be all strings. Invalid ${key}`)
+  }
 
   const deferred = pDefer()
+
+  const unlockedKeys = []
+
   return {
     promise: deferred.promise,
-    unlock: () => {
-      if (n > 0) n--
+    unlock: (key) => {
+      if (!unlockedKeys.includes(key)) unlockedKeys.push(key)
 
-      if (n <= 0) {
+      if (unlockedKeys.length === keys.length) {
         deferred.resolve()
         return true
       }

package/src/enhancers/combine.js

@@ -4,7 +4,7 @@ import createSimpleObserver from '../simple-observer'
 
 const combine = (atoms) => {
   const { notify, observe } = createSimpleObserver()
-  const countdownLock = createCountdownLock(Object.keys(atoms).length)
+  const countdownLock = createCountdownLock(Object.keys(atoms))
 
   let values = {}
 
@@ -14,7 +14,7 @@ const combine = (atoms) => {
         ...values,
         [name]: value,
       }
-      if (countdownLock.unlock()) await notify(values)
+      if (countdownLock.unlock(name)) await notify(values)
     })
   }