Add custom optionMergeStrategies to support mixins (#2)

* Add arrayValueOptionMergeStrategy function

* Add test case of options merge

* Update jest.config.js

* Code cleanup and test improvements

Co-authored-by: Adam Sołtysik <adam27.sol@gmail.com>

Author: hirohe

jest.config.js

@@ -2,7 +2,7 @@
 module.exports = {
     moduleFileExtensions: ['js', 'vue'],
     testEnvironment: 'jsdom',
-    testMatch: ['**/test/**/*.js'],
+    testMatch: ['**/test/**/*.test.js'],
     transform: {
         '^.+\\.js$': 'babel-jest',
         '^.+\\.vue$': 'vue-jest',

src/index.js

@@ -35,5 +35,10 @@ export default {
                 }
             },
         });
+
+        // Custom optionMergeStrategies to support mixins.
+        for (const name of ['provideFields', 'injectFields', 'provideMethods', 'injectMethods']) {
+            Vue.config.optionMergeStrategies[name] = (a, b) => a && b ? a.concat(b) : a || b;
+        }
     },
 };

test/components/GrandChild.vue

@@ -4,7 +4,11 @@
 </template>
 
 <script>
+    import Injector from '../mixins/injector';
+
     export default {
+        mixins: [Injector],
+
         injectFields: ['watch1', 'field2'],
         injectMethods: ['negate3'],
 

test/components/Main.vue

@@ -4,10 +4,12 @@
 </template>
 
 <script>
+    import Provider from '../mixins/provider';
     import Child from './Child';
 
     export default {
         components: { Child },
+        mixins: [Provider],
 
         provideFields: ['field1', 'field2', 'negated3'],
         provideMethods: ['increase2', 'negate3'],

test/index.js test/index.test.jstest/index.js renamed to test/index.test.js

@@ -69,3 +69,14 @@ test('bare provide/inject still works', () => {
     const wrapper = init();
     expect(wrapper.findComponent(GrandChild).vm.field4).toBe(1);
 });
+
+test('new options work with mixins', async () => {
+    const wrapper = init();
+    expect(wrapper.findComponent(GrandChild).vm.field5).toBe(0);
+    expect(wrapper.findComponent(Child).vm.field5).toBeUndefined();
+    expect(wrapper.findComponent(Child).vm.increase5).toBeUndefined();
+
+    await wrapper.findComponent(GrandChild).vm.increase5();
+    expect(wrapper.findComponent(Main).vm.field5).toBe(1);
+    expect(wrapper.findComponent(GrandChild).vm.field5).toBe(1);
+});

test/mixins/injector.js

@@ -0,0 +1,5 @@
+
+export default {
+    injectFields: ['field5'],
+    injectMethods: ['increase5'],
+};

test/mixins/provider.js

@@ -0,0 +1,14 @@
+
+export default {
+    provideFields: ['field5'],
+    provideMethods: ['increase5'],
+
+    data: () => ({
+        field5: 0,
+    }),
+    methods: {
+        increase5(n = 1) {
+            this.field5 += n;
+        },
+    },
+};