pinia-orm-edge 1.9.0-28580890.9c8ee0d → 1.9.0-28581629.9ed41d3

package/dist/index.cjs

@@ -1449,7 +1449,8 @@ class Query {
       if (isDeleting === false) {
         notDeletableIds.push(currentModel.$getIndexId());
       } else {
-        this.hydratedDataCache.delete(this.model.$entity() + currentModel.$getIndexId());
+        this.hydratedDataCache.delete("set" + this.model.$entity() + currentModel.$getIndexId());
+        this.hydratedDataCache.delete("get" + this.model.$entity() + currentModel.$getIndexId());
         afterHooks.push(() => currentModel.$self().deleted(currentModel));
         this.checkAndDeleteRelations(currentModel);
       }
@@ -1481,16 +1482,21 @@ class Query {
    * an update event trigger in vue if the object is used.
    */
   getHydratedModel(record, options) {
-    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.$fill(record, options);
+    const id = this.model.$entity() + this.model.$getKey(record, true);
+    const operationId = options?.operation + id;
+    let savedHydratedModel = this.hydratedDataCache.get(operationId);
+    if (options?.action === "update") {
+      this.hydratedDataCache.delete("get" + id);
+      savedHydratedModel = void 0;
+    }
+    if (!this.getNewHydrated && savedHydratedModel) {
+      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")) {
-      this.hydratedDataCache.set(this.model.$entity() + id, hydratedModel);
+    if (Utils.isEmpty(this.eagerLoad) && options?.operation !== "set") {
+      this.hydratedDataCache.set(operationId, hydratedModel);
     }
     return hydratedModel;
   }
@@ -3184,12 +3190,18 @@ class Model {
         continue;
       }
       const attr = fields[key];
-      const value = attributes[key];
+      let 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);
@@ -3197,36 +3209,6 @@ 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

@@ -1447,7 +1447,8 @@ class Query {
       if (isDeleting === false) {
         notDeletableIds.push(currentModel.$getIndexId());
       } else {
-        this.hydratedDataCache.delete(this.model.$entity() + currentModel.$getIndexId());
+        this.hydratedDataCache.delete("set" + this.model.$entity() + currentModel.$getIndexId());
+        this.hydratedDataCache.delete("get" + this.model.$entity() + currentModel.$getIndexId());
         afterHooks.push(() => currentModel.$self().deleted(currentModel));
         this.checkAndDeleteRelations(currentModel);
       }
@@ -1479,16 +1480,21 @@ class Query {
    * an update event trigger in vue if the object is used.
    */
   getHydratedModel(record, options) {
-    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.$fill(record, options);
+    const id = this.model.$entity() + this.model.$getKey(record, true);
+    const operationId = options?.operation + id;
+    let savedHydratedModel = this.hydratedDataCache.get(operationId);
+    if (options?.action === "update") {
+      this.hydratedDataCache.delete("get" + id);
+      savedHydratedModel = void 0;
+    }
+    if (!this.getNewHydrated && savedHydratedModel) {
+      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")) {
-      this.hydratedDataCache.set(this.model.$entity() + id, hydratedModel);
+    if (isEmpty(this.eagerLoad) && options?.operation !== "set") {
+      this.hydratedDataCache.set(operationId, hydratedModel);
     }
     return hydratedModel;
   }
@@ -3182,12 +3188,18 @@ class Model {
         continue;
       }
       const attr = fields[key];
-      const value = attributes[key];
+      let 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);
@@ -3195,36 +3207,6 @@ 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-28580890.9c8ee0d",
+  "version": "1.9.0-28581629.9ed41d3",
   "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-28580890.9c8ee0d"
+    "@pinia-orm/normalizr": "npm:@pinia-orm/normalizr-edge@1.9.0-28581629.9ed41d3"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.3.10",