pinia-orm-edge 1.9.0-28580847.34348a5 → 1.9.0-28580959.70a2cd0

package/dist/index.cjs

@@ -1307,16 +1307,16 @@ class Query {
       const record = elements[id];
       const existing = currentData[id];
       let model = existing ? this.hydrate({ ...existing, ...record }, { operation: "set", action: "update" }) : this.hydrate(record, { operation: "set", action: "save" });
-      const isSaving = model.$self().saving(model, record);
-      const isUpdatingOrCreating = existing ? model.$self().updating(model, record) : model.$self().creating(model, record);
+      const isSaving = model.$self().saving(model, existing ?? {});
+      const isUpdatingOrCreating = existing ? model.$self().updating(model, existing ?? {}) : model.$self().creating(model, existing ?? {});
       if (isSaving === false || isUpdatingOrCreating === false) {
         continue;
       }
       if (model.$isDirty()) {
         model = this.hydrate(model.$getAttributes(), { operation: "set", action: existing ? "update" : "save" });
       }
-      afterSavingHooks.push(() => model.$self().saved(model, record));
-      afterSavingHooks.push(() => existing ? model.$self().updated(model, record) : model.$self().created(model, record));
+      afterSavingHooks.push(() => model.$self().saved(model, existing ?? {}));
+      afterSavingHooks.push(() => existing ? model.$self().updated(model, existing ?? {}) : model.$self().created(model, existing ?? {}));
       newData[id] = model.$getAttributes();
       if (Object.values(model.$types()).length > 0 && !newData[id][model.$typeKey()]) {
         newData[id][model.$typeKey()] = record[model.$typeKey()];
@@ -1482,16 +1482,19 @@ class Query {
    */
   getHydratedModel(record, options) {
     const id = this.model.$getKey(record, true);
-    const savedHydratedModel = id && this.hydratedDataCache.get(this.model.$entity() + id);
+    const savedHydratedModel = id && options?.operation !== "set" && this.hydratedDataCache.get(this.model.$entity() + id);
     if (!this.getNewHydrated && options?.operation !== "set" && savedHydratedModel) {
-      return savedHydratedModel.$fill(record, options);
+      return savedHydratedModel;
     }
     const modelByType = this.model.$types()[record[this.model.$typeKey()]];
     const getNewInsance = (newOptions) => (modelByType ? modelByType.newRawInstance() : this.model).$newInstance(record, { relations: false, ...options || {}, ...newOptions });
     const hydratedModel = getNewInsance();
-    if (id && (!this.getNewHydrated && options?.operation !== "set" || options?.action === "update")) {
+    if (id && !this.getNewHydrated && options?.operation !== "set") {
       this.hydratedDataCache.set(this.model.$entity() + id, hydratedModel);
     }
+    if (id && options?.action === "update") {
+      this.hydratedDataCache.set(this.model.$entity() + id, getNewInsance({ operation: "get" }));
+    }
     return hydratedModel;
   }
 }

package/dist/index.mjs

@@ -1305,16 +1305,16 @@ class Query {
       const record = elements[id];
       const existing = currentData[id];
       let model = existing ? this.hydrate({ ...existing, ...record }, { operation: "set", action: "update" }) : this.hydrate(record, { operation: "set", action: "save" });
-      const isSaving = model.$self().saving(model, record);
-      const isUpdatingOrCreating = existing ? model.$self().updating(model, record) : model.$self().creating(model, record);
+      const isSaving = model.$self().saving(model, existing ?? {});
+      const isUpdatingOrCreating = existing ? model.$self().updating(model, existing ?? {}) : model.$self().creating(model, existing ?? {});
       if (isSaving === false || isUpdatingOrCreating === false) {
         continue;
       }
       if (model.$isDirty()) {
         model = this.hydrate(model.$getAttributes(), { operation: "set", action: existing ? "update" : "save" });
       }
-      afterSavingHooks.push(() => model.$self().saved(model, record));
-      afterSavingHooks.push(() => existing ? model.$self().updated(model, record) : model.$self().created(model, record));
+      afterSavingHooks.push(() => model.$self().saved(model, existing ?? {}));
+      afterSavingHooks.push(() => existing ? model.$self().updated(model, existing ?? {}) : model.$self().created(model, existing ?? {}));
       newData[id] = model.$getAttributes();
       if (Object.values(model.$types()).length > 0 && !newData[id][model.$typeKey()]) {
         newData[id][model.$typeKey()] = record[model.$typeKey()];
@@ -1480,16 +1480,19 @@ class Query {
    */
   getHydratedModel(record, options) {
     const id = this.model.$getKey(record, true);
-    const savedHydratedModel = id && this.hydratedDataCache.get(this.model.$entity() + id);
+    const savedHydratedModel = id && options?.operation !== "set" && this.hydratedDataCache.get(this.model.$entity() + id);
     if (!this.getNewHydrated && options?.operation !== "set" && savedHydratedModel) {
-      return savedHydratedModel.$fill(record, options);
+      return savedHydratedModel;
     }
     const modelByType = this.model.$types()[record[this.model.$typeKey()]];
     const getNewInsance = (newOptions) => (modelByType ? modelByType.newRawInstance() : this.model).$newInstance(record, { relations: false, ...options || {}, ...newOptions });
     const hydratedModel = getNewInsance();
-    if (id && (!this.getNewHydrated && options?.operation !== "set" || options?.action === "update")) {
+    if (id && !this.getNewHydrated && options?.operation !== "set") {
       this.hydratedDataCache.set(this.model.$entity() + id, hydratedModel);
     }
+    if (id && options?.action === "update") {
+      this.hydratedDataCache.set(this.model.$entity() + id, getNewInsance({ operation: "get" }));
+    }
     return hydratedModel;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinia-orm-edge",
-  "version": "1.9.0-28580847.34348a5",
+  "version": "1.9.0-28580959.70a2cd0",
   "description": "The Pinia plugin to enable Object-Relational Mapping access to the Pinia Store.",
   "keywords": [
     "vue",
@@ -46,7 +46,7 @@
     "pinia": "^2.1.7"
   },
   "dependencies": {
-    "@pinia-orm/normalizr": "npm:@pinia-orm/normalizr-edge@1.9.0-28580847.34348a5"
+    "@pinia-orm/normalizr": "npm:@pinia-orm/normalizr-edge@1.9.0-28580959.70a2cd0"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.3.10",