feat: add mixins helper (vuejs#224)

ktsn · web-flow · commit cdcbfe5bb1a4 · 2018-02-16T13:54:28.000+09:00
* feat: add mixins helper

* docs: add a guide for mixins

* docs: fix typos
diff --git a/README.md b/README.md
@@ -76,6 +76,40 @@ export default class App extends Vue {
 
 You may also want to check out the `@prop` and `@watch` decorators provided by [vue-property-decorators](https://github.com/kaorun343/vue-property-decorator).
 
+### Using Mixins
+
+vue-class-component provides `mixins` helper function to use [mixins](https://vuejs.org/v2/guide/mixins.html) in class style manner. By using `mixins` helper, TypeScript can infer mixin types and inherit them on the component type.
+
+Example of declaring a mixin:
+
+``` js
+// mixin.js
+import Vue from 'vue'
+import Component from 'vue-class-component'
+
+// You can declare a mixin as the same style as components.
+@Component
+export class MyMixin extends Vue {
+  mixinValue = 'Hello'
+}
+```
+
+Example of using a mixin:
+
+``` js
+import Component, { mixins } from 'vue-class-component'
+import MyMixin from './mixin.js'
+
+// Use `mixins` helper function instead of `Vue`.
+// `mixins` can receive any number of arguments.
+@Component
+export class MyComp extends mixins(MyMixin) {
+  created () {
+    console.log(this.mixinValue) // -> Hello
+  }
+}
+```
+
 ### Create Custom Decorators
 
 You can extend the functionality of this library by creating your own decorators. vue-class-component provides `createDecorator` helper to create custom decorators. `createDecorator` expects a callback function as the 1st argument and the callback will receive following arguments:
diff --git a/src/declarations.ts b/src/declarations.ts
@@ -1,6 +1,6 @@
 import Vue, { ComponentOptions } from 'vue'
 
-export type VueClass<V extends Vue> = { new (...args: any[]): V } & typeof Vue
+export type VueClass<V> = { new (...args: any[]): V & Vue } & typeof Vue
 
 export type DecoratedClass = VueClass<Vue> & {
   // Property, method and parameter decorators created by `createDecorator` helper
diff --git a/src/index.ts b/src/index.ts
@@ -2,7 +2,7 @@ import Vue, { ComponentOptions } from 'vue'
 import { VueClass } from './declarations'
 import { componentFactory, $internalHooks } from './component'
 
-export { createDecorator, VueDecorator } from './util'
+export { createDecorator, VueDecorator, mixins } from './util'
 
 function Component <V extends Vue>(options: ComponentOptions<V> & ThisType<V>): <VC extends VueClass<V>>(target: VC) => VC
 function Component <VC extends VueClass<Vue>>(target: VC): VC
diff --git a/src/util.ts b/src/util.ts
@@ -1,5 +1,5 @@
 import Vue, { ComponentOptions } from 'vue'
-import { DecoratedClass } from './declarations'
+import { VueClass, DecoratedClass } from './declarations'
 
 export const noop = () => {}
 
@@ -31,6 +31,16 @@ export function createDecorator (factory: (options: ComponentOptions<Vue>, key:
   }
 }
 
+export function mixins <A> (CtorA: VueClass<A>): VueClass<A>
+export function mixins <A, B> (CtorA: VueClass<A>, CtorB: VueClass<B>): VueClass<A & B>
+export function mixins <A, B, C> (CtorA: VueClass<A>, CtorB: VueClass<B>, CtorC: VueClass<C>): VueClass<A & B & C>
+export function mixins <A, B, C, D> (CtorA: VueClass<A>, CtorB: VueClass<B>, CtorC: VueClass<C>, CtorD: VueClass<D>): VueClass<A & B & C & D>
+export function mixins <A, B, C, D, E> (CtorA: VueClass<A>, CtorB: VueClass<B>, CtorC: VueClass<C>, CtorD: VueClass<D>, CtorE: VueClass<E>): VueClass<A & B & C & D & E>
+export function mixins <T> (...Ctors: VueClass<Vue>[]): VueClass<T>
+export function mixins (...Ctors: VueClass<Vue>[]): VueClass<Vue> {
+  return Vue.extend({ mixins: Ctors })
+}
+
 export function isPrimitive (value: any): boolean {
   const type = typeof value
   return value == null || (type !== "object" && type !== "function")
diff --git a/test/test-babel.js b/test/test-babel.js
@@ -1,4 +1,4 @@
-import Component, { createDecorator } from '../lib'
+import Component, { createDecorator, mixins } from '../lib'
 import { expect } from 'chai'
 import * as td from 'testdouble'
 import Vue from 'vue'
@@ -121,4 +121,31 @@ describe('vue-class-component with Babel', () => {
     expect(MyComp.foo).to.equal('foo')
     expect(MyComp.bar()).to.equal('bar')
   })
+
+  it('mixin helper', function () {
+    @Component
+    class MixinA extends Vue {
+      valueA = 'hello'
+    }
+
+    @Component
+    class MixinB extends Vue {
+      valueB = 123
+    }
+
+    @Component
+    class MyComp extends mixins(MixinA, MixinB) {
+      test () {
+        this.valueA = 'hi'
+        this.valueB = 456
+      }
+    }
+
+    const vm = new MyComp()
+    expect(vm.valueA).to.equal('hello')
+    expect(vm.valueB).to.equal(123)
+    vm.test()
+    expect(vm.valueA).to.equal('hi')
+    expect(vm.valueB).to.equal(456)
+  })
 })
diff --git a/test/test.ts b/test/test.ts
@@ -1,4 +1,4 @@
-import Component, { createDecorator } from '../lib'
+import Component, { createDecorator, mixins } from '../lib'
 import { expect } from 'chai'
 import * as td from 'testdouble'
 import Vue, { ComputedOptions } from 'vue'
@@ -342,4 +342,31 @@ describe('vue-class-component', () => {
       console.warn = originalWarn
     }
   })
+
+  it('mixin helper', function () {
+    @Component
+    class MixinA extends Vue {
+      valueA = 'hello'
+    }
+
+    @Component
+    class MixinB extends Vue {
+      valueB = 123
+    }
+
+    @Component
+    class MyComp extends mixins(MixinA, MixinB) {
+      test () {
+        this.valueA = 'hi'
+        this.valueB = 456
+      }
+    }
+
+    const vm = new MyComp()
+    expect(vm.valueA).to.equal('hello')
+    expect(vm.valueB).to.equal(123)
+    vm.test()
+    expect(vm.valueA).to.equal('hi')
+    expect(vm.valueB).to.equal(456)
+  })
 })
