fix: copiesById should not be on the BaseModel

Author: marshallswain

src/index.ts

@@ -10,7 +10,7 @@ import makeFindMixin from './make-find-mixin'
 import makeGetMixin from './make-get-mixin'
 import { globalModels as models } from './service-module/global-models'
 import { clients, addClient } from './service-module/global-clients'
-import makeModel from './service-module/make-model'
+import makeBaseModel from './service-module/make-base-model'
 import prepareMakeServicePlugin from './service-module/make-service-plugin'
 import prepareMakeAuthPlugin from './auth-module/make-auth-plugin'
 import useFind from './useFind'
@@ -53,7 +53,7 @@ export default function feathersVuex(feathers, options: FeathersVuexOptions) {
 
   addClient({ client: feathers, serverAlias: options.serverAlias })
 
-  const BaseModel = makeModel(options)
+  const BaseModel = makeBaseModel(options)
   const makeServicePlugin = prepareMakeServicePlugin(options)
   const makeAuthPlugin = prepareMakeAuthPlugin(feathers, options)
 

src/service-module/make-model.ts src/service-module/make-base-model.tssrc/service-module/make-model.ts renamed to src/service-module/make-base-model.ts

@@ -34,7 +34,7 @@ const defaultOptions = {
  *
  * @param options
  */
-export default function makeModel(options: FeathersVuexOptions) {
+export default function makeBaseModel(options: FeathersVuexOptions) {
   const addModel = prepareAddModel(options)
   const { serverAlias } = options
 
@@ -70,7 +70,7 @@ export default function makeModel(options: FeathersVuexOptions) {
     public static serverAlias: string = options.serverAlias
 
     public static readonly models = globalModels // Can access other Models here
-    public static readonly copiesById = {}
+    public static copiesById = {}
 
     public __id: string
     public __isClone: boolean
@@ -252,7 +252,7 @@ export default function makeModel(options: FeathersVuexOptions) {
     }
 
     private _clone(id) {
-      const { store, copiesById, namespace, _commit, _getters } = this
+      const { store, namespace, _commit, _getters } = this
         .constructor as typeof BaseModel
       const { keepCopiesInStore } = store.state[namespace]
 
@@ -261,7 +261,8 @@ export default function makeModel(options: FeathersVuexOptions) {
       if (keepCopiesInStore) {
         return _getters.call(this.constructor, 'getCopyById', id)
       } else {
-        return copiesById[id]
+        // const { copiesById } = this.constructor as typeof BaseModel
+        return (this.constructor as typeof BaseModel).copiesById[id]
       }
     }
     /**

src/service-module/service-module.mutations.ts

@@ -263,6 +263,9 @@ export default function makeServiceMutations() {
         if (!item.hasOwnProperty('__ob__')) {
           item = Vue.observable(item)
         }
+        if (!Model.hasOwnProperty('copiesById')) {
+          Object.defineProperty(Model, 'copiesById', { value: {} })
+        }
         Model.copiesById[id] = item
       }
     },

test/service-module/model-instance-defaults.test.ts

@@ -180,6 +180,29 @@ describe('Models - Default Values', function() {
     )
   })
 
+  it('each model has its own Model.copiesById', function() {
+    const { Todo, Person } = makeContext()
+    const todo = new Todo({ id: 1, description: 'This is the original' })
+    const person = new Person({ id: 2, name: 'Xavier' })
+
+    todo.clone()
+    assert(Todo.copiesById[1], 'should have a copy stored on Todo.copiesById')
+    assert(
+      !Person.copiesById[1],
+      'should not have a copy stored on Person.copiesById'
+    )
+
+    person.clone()
+    assert(
+      Person.copiesById[2],
+      'should have a copy stored on Person.copiesById'
+    )
+    assert(
+      !Todo.copiesById[2],
+      'should not have a copy stored on Todo.copiesById'
+    )
+  })
+
   it('allows instance defaults, including getters and setters', function() {
     const { BaseModel } = feathersVuex(feathersClient, {
       serverAlias: 'instance-defaults'