Enable constructor function for patch props

Author: alexcode

lib/ApiStore.ts

@@ -193,37 +193,31 @@ export default class ApiStore<S> implements StoreOptions<S> {
         });
       }
 
+      const entityAfter = await applyModifier(
+        "afterGet",
+        model.name.toLowerCase(),
+        this.models,
+        entity
+      );
+
       const store = state[model.plural];
 
       if (has(store.items, entity.id)) {
-        forEach(entity, (value, name: string) => {
+        const storeEntity = store.items[entity.id];
+        forEach(entityAfter, (value, name: string) => {
           if (!isFunction(value) && !has(model.references, name)) {
-            const storeEntity = store.items[entity.id];
-            if (
-              has(storeEntity, name) &&
-              !isEqual(value, get(storeEntity, name))
-            ) {
+            if (has(entity, name) && !isEqual(value, get(storeEntity, name))) {
               Vue.set(storeEntity, name, value);
             }
           }
         });
 
         return store.items[entity.id];
       } else {
-        const toStoreEntity = await applyModifier(
-          "afterGet",
-          model.name.toLowerCase(),
-          this.models,
-          entity
-        );
-        store.items = { ...store.items, [entity.id]: toStoreEntity };
-        this.storeOriginItem(
-          store.originItems,
-          toStoreEntity,
-          model.beforeQueue
-        );
+        store.items = { ...store.items, [entity.id]: entityAfter };
+        this.storeOriginItem(store.originItems, entityAfter, model.beforeQueue);
 
-        return toStoreEntity;
+        return entityAfter;
       }
     }
   }

tests/unit/apistoreCustomModel.spec.ts

@@ -466,4 +466,50 @@ describe("ApiStore custom model", function() {
     await flushPromises();
     expect(store.getters["api/users"].items[user.id].localProp).toBe(true);
   });
+
+  it("test class with constructor", async () => {
+    class CustomUser {
+      id: string;
+      name: string;
+      constructor(o: any) {
+        this.id = o.id;
+        this.name = "test_constructor";
+      }
+    }
+
+    const store = new Vuex.Store({
+      plugins: [
+        ApiStorePlugin({
+          axios: axiosInstance,
+          models: {
+            user: {
+              name: "USER",
+              plural: "USERS",
+              type: new ApiState(),
+              afterGet: (v: any) => new CustomUser(v)
+            }
+          }
+        })
+      ]
+    });
+    const user = data[0].user;
+    mock.onGet(`/user/${user.id}`).reply(200, user);
+    store.dispatch("api/get", {
+      id: user.id,
+      type: "user"
+    });
+    await flushPromises();
+
+    mock.onGet(`/user/${user.id}`).reply(200, user);
+    store.dispatch("api/get", {
+      id: user.id,
+      type: "user",
+      forceFetch: true,
+      clear: false
+    });
+    await flushPromises();
+    expect(store.getters["api/users"].items[user.id].name).toBe(
+      "test_constructor"
+    );
+  });
 });