fix(plugin-workflow): deep merge queries into unit

critocrito · Nov 11, 2019 · 56f5cbf · 56f5cbf
1 parent 08b816c
commit 56f5cbf
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/plugin-workflow/lib/plugins/merge-query.js b/packages/plugin-workflow/lib/plugins/merge-query.js
@@ -1,4 +1,5 @@
-import {get, set, merge} from "lodash/fp";
+import {get, set} from "lodash/fp";
+import deepmerge from "deepmerge";
 import {envelope as env, utils} from "@sugarcube/core";
 
 const plugin = (envelope, {cfg, log}) => {
@@ -40,9 +41,10 @@ const plugin = (envelope, {cfg, log}) => {
             );
           }
 
-          return Object.assign(acc, set(field, newValue, {}));
+          return deepmerge(acc, set(field, newValue, {}));
         }, {});
-        return merge(memo, toMerge);
+
+        return deepmerge(memo, toMerge);
       }, unit),
     envelope,
   );

diff --git a/packages/plugin-workflow/package.json b/packages/plugin-workflow/package.json
@@ -10,6 +10,7 @@
   "main": "_dist/index.js",
   "dependencies": {
     "@sugarcube/core": "^0.32.0",
+    "deepmerge": "^4.2.2",
     "lodash": "^4.17.5"
   },
   "keywords": [

diff --git a/yarn.lock b/yarn.lock
@@ -2921,6 +2921,11 @@ deepmerge@^2.1.0:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
   integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
 
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"