feat: extend Vue interface type and simplify internal type definitions

src/index.ts

@@ -4,19 +4,16 @@ import {
 } from 'vue'
 import { Vue } from 'vue/types/vue'
 import Registry from './registry'
-import {
-  ModelInstallOptions,
-  VueModelProvided,
-} from './types'
+import { ModelInstallOptions } from './types'
 
 export { Registry }
 
-function resolveInjection(this: VueModelProvided, key: string) {
+function resolveInjection(this: Vue, key: string) {
   // tslint:disable-next-line no-this-assignment
   let source = this
-  let ressource: VueModelProvided | null = null
+  let ressource: Vue | null = null
 
-  while (source = (source.$parent as VueModelProvided)) {
+  while (source = source.$parent) {
     if (source.$modelsProvidedKeys && source.$modelsProvidedKeys.includes(key)) {
       ressource = source
       break
@@ -37,7 +34,7 @@ function resolveInjection(this: VueModelProvided, key: string) {
 }
 
 function createModelOptions(
-  vmHost: VueModelProvided,
+  vmHost: Vue,
   name: string,
   options: ComponentOptions<Vue>,
   mergeMixins: Required<ComponentOptions<Vue>>['mixins'],
@@ -107,19 +104,19 @@ export default {
     const installOptions: ModelInstallOptions = Object.assign({}, OPTIONS_DEFAULTS, rawInstallOptions)
 
     vue.mixin({
-      beforeCreate(this: VueModelProvided) {
+      beforeCreate(this: Vue) {
         const { modelRegistry, injectModels } = this.$options
         this.$modelRegistry = this === this.$root
           ? (modelRegistry || new Registry(installOptions.restoreOnReplace))
-          : (<VueModelProvided>this.$root).$modelRegistry
+          : this.$root.$modelRegistry
 
         if (injectModels) {
           injectModels.forEach((inject) => {
             resolveInjection.call(this, inject)
           })
         }
       },
-      created(this: VueModelProvided) {
+      created(this: Vue) {
         createModels.call(this, vue, installOptions)
       },
     })

src/types.ts

@@ -1,5 +1,8 @@
 import { ComponentOptions } from 'vue/types/options'
-import { Vue } from 'vue/types/vue'
+import {
+  Vue,
+  VueConstructor,
+} from 'vue/types/vue'
 import Registry from './registry'
 
 declare module 'vue/types/options' {
@@ -12,20 +15,26 @@ declare module 'vue/types/options' {
   }
 }
 
-export interface VueModelMap {
-  [key: string]: ComponentOptions<Vue>,
+declare module 'vue/types/vue' {
+  // Global properties can be declared
+  // on the `VueConstructor` interface
+  interface Vue {
+    $modelsProvidedKeys?: string[],
+    $modelsProvided: { [key: string]: Vue },
+    $modelRegistry: Registry,
+  }
 }
 
-export interface VueModelProvided extends Vue {
-  $modelsProvidedKeys: string[],
-  $modelsProvided: { [key: string]: Vue },
-  $modelRegistry: Registry,
+export interface VueModelMap {
+  [key: string]: ComponentOptions<Vue> | VueConstructor,
 }
 
 export interface ModelInstallOptions {
   mixins: Required<ComponentOptions<Vue>>['mixins'],
   restoreOnReplace: boolean,
-  globalModels: VueModelMap,
+  globalModels: {
+    [key: string]: ComponentOptions<Vue>,
+  },
 }
 
 export interface Export {