Bug fixed on createStore using function patch

Author: Josema

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dop",
-    "version": "1.5.3",
+    "version": "1.5.4",
     "main": "dist/dop.js",
     "browser": "dist/dop.umd.js",
     "module": "src/index.js",

src/api/createStoreFactory.js

@@ -14,31 +14,33 @@ export default function createStoreFactory(applyPatchFunction) {
             listeners.delete(listener)
         }
 
-        function applyPatch(patch_original) {
-            const { mutations, unpatch } = applyPatchFunction(
-                api.state,
-                patch_original
-            )
+        function applyPatch(patch_or_fn) {
+            const applied = applyPatchFunction(api.state, patch_or_fn)
 
             const outputs = Array.from(listeners.entries()).map(
                 ([listener, filter]) => {
-                    const mts = isFunction(filter)
-                        ? mutations.filter(filter)
-                        : mutations.slice(0)
+                    const mutations = isFunction(filter)
+                        ? applied.mutations.filter(filter)
+                        : applied.mutations.slice(0)
 
                     const { patch, unpatch } =
-                        createPatchAndUnpatchFromMutations(mts, patch_original)
+                        createPatchAndUnpatchFromMutations(
+                            mutations,
+                            applied.patch
+                        )
+
                     return {
                         listener,
                         patch,
                         unpatch,
-                        mutations: mts,
+                        mutations,
                     }
                 }
             )
 
-            outputs.mutations = mutations
-            outputs.unpatch = unpatch
+            outputs.mutations = applied.mutations
+            outputs.patch = applied.patch
+            outputs.unpatch = applied.unpatch
 
             return outputs
         }

src/index.js

@@ -16,7 +16,7 @@ import Swap from './types/Swap.js'
 import Multi from './types/Multi.js'
 
 // Deno does not support json imports: https://stackoverflow.com/questions/61907155/deno-import-json-file-as-module
-const version = '1.5.2'
+const version = '1.5.4'
 
 function factory() {
     const patchers = []

test/create_store.js

@@ -69,10 +69,10 @@ test('applyPatch', function (t) {
     t.deepEqual(outputs[0].unpatch, { prop: false })
     t.true(Array.isArray(outputs[0].mutations))
 
-    const { unpatch, mutations } = outputs
-    t.deepEqual(unpatch, { prop: false })
-    t.true(Array.isArray(mutations))
-    t.deepEqual(mutations, outputs[0].mutations)
+    t.deepEqual(outputs.patch, patch)
+    t.deepEqual(outputs.unpatch, { prop: false })
+    t.deepEqual(outputs.mutations, outputs[0].mutations)
+    t.true(Array.isArray(outputs.mutations))
 })
 
 test('applyPatch with function', function (t) {
@@ -145,3 +145,19 @@ test('filtered patches by createPatchAndUnpatchFromMutations must be the same as
     t.deepEqual(output[0].patch, {})
     t.deepEqual(output[1].patch, patch)
 })
+
+test('Matching subscriber patch and original patch', function (t) {
+    const store = createStore({
+        ['one']: {},
+    })
+    store.subscribe((patch) => {
+        t.deepEqual(patch, { one: { two: TYPE.Replace({ three: true }) } })
+    })
+
+    const listeners = store.applyPatch((d) => {
+        d['one']['two'] = { three: true }
+    })
+
+    t.deepEqual(listeners[0].patch, listeners.patch)
+    t.deepEqual(store.state, { one: { two: { three: true } } })
+})