declare FVStore and FVGlobalModels interfaces in types, import and export in index.ts

Author: hamiltoes

src/index.ts

@@ -25,7 +25,9 @@ import {
   ModelSetupContext,
   Model,
   ModelClone,
-  Id
+  Id,
+  FeathersVuexStoreState,
+  FeathersVuexGlobalModels
 } from './service-module/types'
 import { initAuth, hydrateApi } from './utils'
 import { FeathersVuex } from './vue-plugin/vue-plugin'
@@ -90,7 +92,7 @@ export default function feathersVuex(feathers, options: FeathersVuexOptions) {
     castBaseModel: <T extends {} = {}>() => BaseModel as ModelStatic<T>,
     makeAuthPlugin,
     FeathersVuex,
-    models,
+    models: models as FeathersVuexGlobalModels,
     clients
   }
 }
@@ -115,5 +117,7 @@ export {
   ModelClone,
   ModelStatic,
   ModelSetupContext,
-  ServiceState
+  ServiceState,
+  FeathersVuexGlobalModels,
+  FeathersVuexStoreState
 }

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

@@ -10,14 +10,15 @@ import {
   Model,
   ModelStatic,
   ModelInstanceClone,
-  ModelClone
+  ModelClone,
+  FeathersVuexGlobalModels,
+  FeathersVuexStoreState
 } from './types'
 import { globalModels, prepareAddModel } from './global-models'
 import { mergeWithAccessors, checkNamespace, getId, Params } from '../utils'
 import _merge from 'lodash/merge'
 import _get from 'lodash/get'
 import { EventEmitter } from 'events'
-import { FeathersVuexStoreState, FeathersVuexGlobalModels } from '..'
 import { ModelSetupContext } from './types'
 import { Store } from 'vuex'
 
@@ -56,7 +57,7 @@ export default function makeBaseModel(options: Required<FeathersVuexOptions>) {
   const { serverAlias } = options
   type D = {}
 
-  // If this serverAlias already has a BaseModel, nreturn it
+  // If this serverAlias already has a BaseModel, return it
   const ExistingBaseModel = _get(globalModels, `[${serverAlias}].BaseModel`)
   if (ExistingBaseModel) {
     return ExistingBaseModel as ModelStatic<D>

src/service-module/types.ts

@@ -1,7 +1,6 @@
 import { Service } from '@feathersjs/feathers'
 import { Params, Paginated } from '../utils'
 import { EventEmitter } from 'events'
-import { FeathersVuexStoreState, FeathersVuexGlobalModels } from '..'
 import { Store } from 'vuex'
 
 export type Id = number | string
@@ -66,19 +65,17 @@ export interface MakeServicePluginOptions {
   actions?: {}
 }
 
-interface PatchParams<D> extends Params {
-  data: Partial<D>
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface FeathersVuexStoreState {
+  /** Allow clients to augment store state */
+}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface FeathersVuexGlobalModels {
+  /** Allow clients to augment Global models */
 }
 
-declare module '..' {
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  interface FeathersVuexStoreState {
-    /** Allow clients to augment store state */
-  }
-  // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  interface FeathersVuexGlobalModels {
-    /** Allow clients to augment Global models */
-  }
+interface PatchParams<D> extends Params {
+  data: Partial<D>
 }
 
 export interface ModelSetupContext {