pinia-orm-edge 1.9.0-28579698.2e55b90 → 1.9.0-28580767.64b3b57

package/dist/index.cjs

@@ -1484,17 +1484,14 @@ class Query {
     const id = this.model.$getKey(record, true);
     const savedHydratedModel = id && this.hydratedDataCache.get(this.model.$entity() + id);
     if (!this.getNewHydrated && options?.operation !== "set" && savedHydratedModel) {
-      return savedHydratedModel;
+      return savedHydratedModel.$fill(record, options);
     }
     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") {
+    if (id && (!this.getNewHydrated && options?.operation !== "set" || options?.action === "update")) {
       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;
   }
 }
@@ -3187,18 +3184,12 @@ class Model {
         continue;
       }
       const attr = fields[key];
-      let value = attributes[key];
+      const value = attributes[key];
       if (attr instanceof Relation && !fillRelation) {
         continue;
       }
       const mutator = mutators?.[key];
       const cast = this.$casts()[key]?.newRawInstance(fields);
-      if (mutator && operation === "get") {
-        value = typeof mutator === "function" ? mutator(value) : typeof mutator.get === "function" ? mutator.get(value) : value;
-      }
-      if (cast && operation === "get") {
-        value = cast.get(value);
-      }
       let keyValue = this.$fillField(key, attr, value);
       if (mutator && typeof mutator !== "function" && operation === "set" && mutator.set) {
         keyValue = mutator.set(keyValue);
@@ -3206,6 +3197,36 @@ class Model {
       if (cast && operation === "set") {
         keyValue = cast.set(keyValue);
       }
+      if (cast || mutator) {
+        Object.defineProperty(this, "_" + key, {
+          configurable: true,
+          writable: true,
+          enumerable: false
+        });
+        Object.defineProperty(this, key, {
+          configurable: true,
+          enumerable: true,
+          get() {
+            let scopeValue = this["_" + key];
+            if (scopeValue === void 0) {
+              return keyValue;
+            }
+            if (operation === "set") {
+              return scopeValue;
+            }
+            if (mutator) {
+              scopeValue = typeof mutator === "function" ? mutator(scopeValue) : typeof mutator.get === "function" ? mutator.get(scopeValue) : scopeValue;
+            }
+            if (cast) {
+              scopeValue = cast.get(scopeValue);
+            }
+            return scopeValue;
+          },
+          set(value2) {
+            this["_" + key] = value2;
+          }
+        });
+      }
       this[key] = this[key] ?? keyValue;
     }
     operation === "set" && (this.$self().original[this.$getKey(this, true)] = this.$getAttributes());

package/dist/index.mjs

@@ -1482,17 +1482,14 @@ class Query {
     const id = this.model.$getKey(record, true);
     const savedHydratedModel = id && this.hydratedDataCache.get(this.model.$entity() + id);
     if (!this.getNewHydrated && options?.operation !== "set" && savedHydratedModel) {
-      return savedHydratedModel;
+      return savedHydratedModel.$fill(record, options);
     }
     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") {
+    if (id && (!this.getNewHydrated && options?.operation !== "set" || options?.action === "update")) {
       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;
   }
 }
@@ -3185,18 +3182,12 @@ class Model {
         continue;
       }
       const attr = fields[key];
-      let value = attributes[key];
+      const value = attributes[key];
       if (attr instanceof Relation && !fillRelation) {
         continue;
       }
       const mutator = mutators?.[key];
       const cast = this.$casts()[key]?.newRawInstance(fields);
-      if (mutator && operation === "get") {
-        value = typeof mutator === "function" ? mutator(value) : typeof mutator.get === "function" ? mutator.get(value) : value;
-      }
-      if (cast && operation === "get") {
-        value = cast.get(value);
-      }
       let keyValue = this.$fillField(key, attr, value);
       if (mutator && typeof mutator !== "function" && operation === "set" && mutator.set) {
         keyValue = mutator.set(keyValue);
@@ -3204,6 +3195,36 @@ class Model {
       if (cast && operation === "set") {
         keyValue = cast.set(keyValue);
       }
+      if (cast || mutator) {
+        Object.defineProperty(this, "_" + key, {
+          configurable: true,
+          writable: true,
+          enumerable: false
+        });
+        Object.defineProperty(this, key, {
+          configurable: true,
+          enumerable: true,
+          get() {
+            let scopeValue = this["_" + key];
+            if (scopeValue === void 0) {
+              return keyValue;
+            }
+            if (operation === "set") {
+              return scopeValue;
+            }
+            if (mutator) {
+              scopeValue = typeof mutator === "function" ? mutator(scopeValue) : typeof mutator.get === "function" ? mutator.get(scopeValue) : scopeValue;
+            }
+            if (cast) {
+              scopeValue = cast.get(scopeValue);
+            }
+            return scopeValue;
+          },
+          set(value2) {
+            this["_" + key] = value2;
+          }
+        });
+      }
       this[key] = this[key] ?? keyValue;
     }
     operation === "set" && (this.$self().original[this.$getKey(this, true)] = this.$getAttributes());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinia-orm-edge",
-  "version": "1.9.0-28579698.2e55b90",
+  "version": "1.9.0-28580767.64b3b57",
   "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-28579698.2e55b90"
+    "@pinia-orm/normalizr": "npm:@pinia-orm/normalizr-edge@1.9.0-28580767.64b3b57"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.3.10",