new: if user does not augment Store or GlobalModels, use any

Author: hamiltoes

src/index.ts

@@ -28,7 +28,8 @@ import {
   Id,
   FeathersVuexStoreState,
   FeathersVuexGlobalModels,
-  FeathersVuexTypeOptions
+  FeathersVuexTypeOptions,
+  GlobalModels
 } from './service-module/types'
 import { initAuth, hydrateApi } from './utils'
 import { FeathersVuex } from './vue-plugin/vue-plugin'
@@ -86,7 +87,7 @@ export default function feathersVuex(feathers, options: FeathersVuexOptions) {
     castBaseModel: <T extends {} = {}>() => BaseModel as ModelStatic<T>,
     makeAuthPlugin,
     FeathersVuex,
-    models: models as FeathersVuexGlobalModels,
+    models: models as GlobalModels,
     clients
   }
 }

src/service-module/make-base-model.ts

@@ -11,8 +11,8 @@ import {
   ModelStatic,
   ModelInstanceClone,
   ModelClone,
-  FeathersVuexGlobalModels,
-  FeathersVuexStoreState
+  GlobalModels,
+  StoreState
 } from './types'
 import { globalModels, prepareAddModel } from './global-models'
 import { mergeWithAccessors, checkNamespace, getId, Params } from '../utils'
@@ -81,14 +81,14 @@ export default function makeBaseModel(options: FeathersVuexOptions) {
     }
 
     // Monkey patched onto the Model class in `makeServicePlugin()`
-    public static store: Store<FeathersVuexStoreState>
+    public static store: Store<StoreState>
 
     public static idField: string = options.idField
     public static tempIdField: string = options.tempIdField
     public static preferUpdate: boolean = options.preferUpdate
     public static serverAlias: string = options.serverAlias
 
-    public static readonly models = globalModels as FeathersVuexGlobalModels // Can access other Models here
+    public static readonly models = globalModels as GlobalModels // Can access other Models here
     public static copiesById: {
       [key: string]: ModelClone<D> | undefined
       [key: number]: ModelClone<D> | undefined

src/service-module/types.ts

@@ -74,6 +74,10 @@ export interface FeathersVuexGlobalModels {
   /** Allow clients to augment Global models */
 }
 
+// Alias and default to any if user doesn't augment interfaces
+export type StoreState = keyof FeathersVuexStoreState extends never ? any : FeathersVuexStoreState
+export type GlobalModels = keyof FeathersVuexGlobalModels extends never ? any : FeathersVuexGlobalModels
+
 interface PatchParams<D> extends Params {
   data: Partial<D>
 }
@@ -82,11 +86,11 @@ export interface ModelSetupContext {
   /**
    * The global Vuex store
    */
-  store: FeathersVuexStoreState
+  store: StoreState
   /**
    * The global `models` object
    */
-  models: FeathersVuexGlobalModels
+  models: GlobalModels
 }
 
 export interface ModelInstanceOptions {
@@ -153,7 +157,7 @@ export interface ModelStatic<D extends {} = AnyData> extends EventEmitter {
   /**
    * The global Vuex store
    */
-  readonly store: Store<FeathersVuexStoreState>
+  readonly store: Store<StoreState>
   /**
    * The field in each record that will contain the ID
    */
@@ -177,7 +181,7 @@ export interface ModelStatic<D extends {} = AnyData> extends EventEmitter {
   /**
    * The global `models` object
    */
-  readonly models: FeathersVuexGlobalModels
+  readonly models: GlobalModels
   /**
    * All model copies created using `model.clone()`
    */

src/vue-plugin/vue-plugin.ts

@@ -9,15 +9,15 @@ import FeathersVuexFormWrapper from '../FeathersVuexFormWrapper'
 import FeathersVuexInputWrapper from '../FeathersVuexInputWrapper'
 import FeathersVuexPagination from '../FeathersVuexPagination'
 import { globalModels } from '../service-module/global-models'
-import { FeathersVuexGlobalModels } from '../service-module/types'
+import { GlobalModels } from '../service-module/types'
 
 // Augment global models onto VueConstructor and instance
 declare module 'vue/types/vue' {
   interface VueConstructor {
-    $FeathersVuex: FeathersVuexGlobalModels
+    $FeathersVuex: GlobalModels
   }
   interface Vue {
-    $FeathersVuex: FeathersVuexGlobalModels
+    $FeathersVuex: GlobalModels
   }
 }