clean up

Author: hamiltoes

src/index.ts

@@ -82,7 +82,7 @@ export default function feathersVuex(feathers, options: FeathersVuexOptions) {
 
   return {
     makeServicePlugin,
-    BaseModel: BaseModel as ModelStatic,
+    BaseModel,
     makeAuthPlugin,
     FeathersVuex,
     models: models as GlobalModels,

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

@@ -11,7 +11,8 @@ import {
   ModelStatic,
   GlobalModels,
   StoreState,
-  AnyData
+  AnyData,
+  PatchParams
 } from './types'
 import { globalModels, prepareAddModel } from './global-models'
 import { mergeWithAccessors, checkNamespace, getId, Params } from '../utils'
@@ -93,8 +94,8 @@ export default function makeBaseModel(options: FeathersVuexOptions) {
     } = {}
 
     public __id: string
-    public __isClone: true
-    public data: Record<string, any>
+    public __isClone: boolean
+    public __isTemp: boolean
 
     public static merge = mergeWithAccessors
     public static modelName = 'BaseModel'
@@ -365,7 +366,7 @@ export default function makeBaseModel(options: FeathersVuexOptions) {
      * Calls service patch with the current instance data
      * @param params
      */
-    public patch(params?: Params): Promise<this> {
+    public patch<D extends {} = AnyData>(params?: PatchParams<D>): Promise<this> {
       const { idField, _dispatch } = this.constructor as typeof BaseModel
       const id = getId(this, idField)
 

src/service-module/types.ts

@@ -78,8 +78,8 @@ export interface FeathersVuexGlobalModels {
 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>
+export interface PatchParams<D extends {} = AnyData> extends Params {
+  data?: Partial<D>
 }
 
 export interface ModelSetupContext {

src/useFind.ts

@@ -45,7 +45,7 @@ interface UseFindData<M> {
   latestQuery: Ref<object>
   paginationData: Ref<object>
   error: Ref<Error>
-  find(params: Params | Ref<Params>): Promise<M[] | Paginated<M>>
+  find(params?: Params | Ref<Params>): Promise<M[] | Paginated<M>>
 }
 
 const unwrapParams = (params: Params | Ref<Params>): Params =>
@@ -123,7 +123,7 @@ export default function find<M extends Model = Model>(options: UseFindOptions):
     servicePath: computed<string>(() => model.servicePath)
   }
 
-  function find(params: Params | Ref<Params>): Promise<M[] | Paginated<M>> {
+  function find(params?: Params | Ref<Params>): Promise<M[] | Paginated<M>> {
     params = unwrapParams(params)
     if (queryWhen.value && !state.isLocal) {
       state.isPending = true

src/useGet.ts

@@ -36,7 +36,7 @@ interface UseGetData<M> {
   hasLoaded: Ref<boolean>
   isLocal: Ref<boolean>
   error: Ref<Error>
-  get(id, params?: Params): Promise<M | undefined>
+  get(id: Id, params?: Params): Promise<M | undefined>
 }
 
 export default function get<M extends Model = Model>(options: UseGetOptions): UseGetData<M> {
@@ -84,8 +84,8 @@ export default function get<M extends Model = Model>(options: UseGetOptions): Us
 
 
 
-  function get(id, params?: Params): Promise<M | undefined> {
-    const idToUse = isRef(id) ? id.value : id
+  function get(id: Id, params?: Params): Promise<M | undefined> {
+    const idToUse = isRef<Id>(id) ? id.value : id
     const paramsToUse = isRef(params) ? params.value : params
 
     if (idToUse != null && queryWhen.value && !state.isLocal) {

test/use/get.test.ts

@@ -148,7 +148,7 @@ describe('use/get', function() {
     assert(isRef(hasBeenRequested))
     assert(hasBeenRequested.value === false, 'no request during init')
 
-    get()
+    get(id)
 
     assert(hasBeenRequested.value === false, 'no request after get')
   })