fix: type asign (#442)

react-component · May 25, 2023 · 6da9531 · 6da9531 · vercel · May 25, 2023
1 parent 8a24d1a
commit 6da9531
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/utils/set.ts b/src/utils/set.ts
@@ -82,7 +82,8 @@ export function merge<T extends object>(...sources: T[]) {
           loopSet.add(value);
 
           // Init container if not exist
-          if (!get(clone, path)) {
+          const originValue = get(clone, path);
+          if (!originValue || typeof originValue !== 'object') {
             clone = set(clone, path, createEmpty(value));
           }
 

diff --git a/tests/utils.test.js b/tests/utils.test.js
@@ -179,6 +179,14 @@ describe('utils', () => {
           },
         });
       });
+
+      it('different type', () => {
+        const merged = merge({ selector: 'K1' }, { selector: ['K1', 'K2'] });
+
+        expect(merged).toEqual({
+          selector: ['K1', 'K2'],
+        });
+      });
     });
   });