pinia-orm-edge 1.9.0-28580088.76eb4a5 → 1.9.0-28580847.34348a5

package/dist/casts.cjs

@@ -113,7 +113,13 @@ class DateCast extends CastAttribute.CastAttribute {
     if (value === null) {
       return null;
     }
-    return (typeof value === "string" ? new Date(Date.parse(value)) : value).toISOString();
+    if (typeof value === "number") {
+      return new Date(value).toISOString();
+    }
+    if (typeof value === "string") {
+      return new Date(Date.parse(value)).toISOString();
+    }
+    return value.toISOString();
   }
 }
 

package/dist/casts.d.cts

@@ -60,7 +60,7 @@ declare class DateCast extends CastAttribute {
     /**
      * Make the value for the attribute.
      */
-    set(value: string | Date | null): string | null;
+    set(value: string | number | Date | null): string | null;
 }
 
 export { ArrayCast, BooleanCast, DateCast, NumberCast, StringCast };

package/dist/casts.d.mts

@@ -60,7 +60,7 @@ declare class DateCast extends CastAttribute {
     /**
      * Make the value for the attribute.
      */
-    set(value: string | Date | null): string | null;
+    set(value: string | number | Date | null): string | null;
 }
 
 export { ArrayCast, BooleanCast, DateCast, NumberCast, StringCast };

package/dist/casts.d.ts

@@ -60,7 +60,7 @@ declare class DateCast extends CastAttribute {
     /**
      * Make the value for the attribute.
      */
-    set(value: string | Date | null): string | null;
+    set(value: string | number | Date | null): string | null;
 }
 
 export { ArrayCast, BooleanCast, DateCast, NumberCast, StringCast };

package/dist/casts.mjs

@@ -111,7 +111,13 @@ class DateCast extends CastAttribute {
     if (value === null) {
       return null;
     }
-    return (typeof value === "string" ? new Date(Date.parse(value)) : value).toISOString();
+    if (typeof value === "number") {
+      return new Date(value).toISOString();
+    }
+    if (typeof value === "string") {
+      return new Date(Date.parse(value)).toISOString();
+    }
+    return value.toISOString();
   }
 }
 

package/dist/helpers.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const Utils = require('./shared/pinia-orm.9bb2aea1.cjs');
+const Utils = require('./shared/pinia-orm.a88d8365.cjs');
 
 function useSum(models, field) {
   return models.reduce((sum, item) => {

package/dist/helpers.mjs

@@ -1,4 +1,4 @@
-import { k as getValue, o as orderBy } from './shared/pinia-orm.07af123e.mjs';
+import { l as getValue, o as orderBy } from './shared/pinia-orm.f3905af9.mjs';
 
 function useSum(models, field) {
   return models.reduce((sum, item) => {

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const Utils = require('./shared/pinia-orm.9bb2aea1.cjs');
+const Utils = require('./shared/pinia-orm.a88d8365.cjs');
 const pinia = require('pinia');
 const normalizr = require('@pinia-orm/normalizr');
 const CastAttribute = require('./shared/pinia-orm.a7e3e0f3.cjs');
@@ -1484,7 +1484,7 @@ 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 });
@@ -2023,7 +2023,7 @@ let String$1 = class String extends Type {
   }
 };
 
-let Number$1 = class Number extends Type {
+class Number extends Type {
   /**
    * Create a new Number attribute instance.
    */
@@ -2036,7 +2036,7 @@ let Number$1 = class Number extends Type {
   make(value) {
     return this.makeReturn("number", value);
   }
-};
+}
 
 class Boolean extends Type {
   /**
@@ -2915,7 +2915,7 @@ class Model {
    * Create a new Number attribute instance.
    */
   static number(value) {
-    return new Number$1(this.newRawInstance(), value);
+    return new Number(this.newRawInstance(), value);
   }
   /**
    * Create a new Boolean attribute instance.
@@ -3184,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);
@@ -3203,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());
@@ -3421,7 +3445,7 @@ class Model {
       return this.serializeArray(value);
     }
     if (typeof value === "object") {
-      if (value instanceof Date && !Number.isNaN(value.getTime()) && typeof value.toISOString === "function") {
+      if (Utils.isDate(value)) {
         return value.toISOString();
       } else {
         return this.serializeObject(value);

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as isArray, t as throwError, a as assert, g as generateId, b as isNullish, c as compareWithOperator, d as generateKey, e as isEmpty, f as isFunction, h as groupBy, o as orderBy, j as equals } from './shared/pinia-orm.07af123e.mjs';
+import { i as isArray, t as throwError, a as assert, g as generateId, b as isNullish, c as compareWithOperator, d as generateKey, e as isEmpty, f as isFunction, h as groupBy, o as orderBy, j as equals, k as isDate } from './shared/pinia-orm.f3905af9.mjs';
 import { defineStore, acceptHMRUpdate } from 'pinia';
 import { schema, normalize } from '@pinia-orm/normalizr';
 export { C as CastAttribute } from './shared/pinia-orm.4ff2e12f.mjs';
@@ -1482,7 +1482,7 @@ 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 });
@@ -2021,7 +2021,7 @@ let String$1 = class String extends Type {
   }
 };
 
-let Number$1 = class Number extends Type {
+class Number extends Type {
   /**
    * Create a new Number attribute instance.
    */
@@ -2034,7 +2034,7 @@ let Number$1 = class Number extends Type {
   make(value) {
     return this.makeReturn("number", value);
   }
-};
+}
 
 class Boolean extends Type {
   /**
@@ -2913,7 +2913,7 @@ class Model {
    * Create a new Number attribute instance.
    */
   static number(value) {
-    return new Number$1(this.newRawInstance(), value);
+    return new Number(this.newRawInstance(), value);
   }
   /**
    * Create a new Boolean attribute instance.
@@ -3182,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);
@@ -3201,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());
@@ -3419,7 +3443,7 @@ class Model {
       return this.serializeArray(value);
     }
     if (typeof value === "object") {
-      if (value instanceof Date && !Number.isNaN(value.getTime()) && typeof value.toISOString === "function") {
+      if (isDate(value)) {
         return value.toISOString();
       } else {
         return this.serializeObject(value);

package/dist/shared/{pinia-orm.9bb2aea1.cjs → pinia-orm.a88d8365.cjs}

@@ -21,6 +21,9 @@ function compareWithOperator(leftValue, rightValue, operator) {
 function isNullish(value) {
   return value === void 0 || value === null;
 }
+function isDate(value) {
+  return value instanceof Date && !Number.isNaN(value.getTime()) && typeof value.toISOString === "function";
+}
 function isArray(value) {
   return Array.isArray(value);
 }
@@ -37,7 +40,11 @@ function orderBy(collection, iteratees, directions, flags = "SORT_REGULAR") {
   let index = -1;
   const result = collection.map((value) => {
     const criteria = iteratees.map((iteratee) => {
-      return typeof iteratee === "function" ? iteratee(value) : getValue(value, iteratee, false);
+      if (typeof iteratee === "function") {
+        return iteratee(value);
+      }
+      const newValue = getValue(value, iteratee, false);
+      return isDate(newValue) ? new Date(newValue).getTime() : newValue;
     });
     return { criteria, index: ++index, value };
   });
@@ -160,6 +167,7 @@ exports.generateKey = generateKey;
 exports.getValue = getValue;
 exports.groupBy = groupBy;
 exports.isArray = isArray;
+exports.isDate = isDate;
 exports.isEmpty = isEmpty;
 exports.isFunction = isFunction;
 exports.isNullish = isNullish;

package/dist/shared/{pinia-orm.07af123e.mjs → pinia-orm.f3905af9.mjs}

@@ -19,6 +19,9 @@ function compareWithOperator(leftValue, rightValue, operator) {
 function isNullish(value) {
   return value === void 0 || value === null;
 }
+function isDate(value) {
+  return value instanceof Date && !Number.isNaN(value.getTime()) && typeof value.toISOString === "function";
+}
 function isArray(value) {
   return Array.isArray(value);
 }
@@ -35,7 +38,11 @@ function orderBy(collection, iteratees, directions, flags = "SORT_REGULAR") {
   let index = -1;
   const result = collection.map((value) => {
     const criteria = iteratees.map((iteratee) => {
-      return typeof iteratee === "function" ? iteratee(value) : getValue(value, iteratee, false);
+      if (typeof iteratee === "function") {
+        return iteratee(value);
+      }
+      const newValue = getValue(value, iteratee, false);
+      return isDate(newValue) ? new Date(newValue).getTime() : newValue;
     });
     return { criteria, index: ++index, value };
   });
@@ -150,4 +157,4 @@ function equals(a, b) {
   return keys.every((k) => equals(a[k], b[k]));
 }
 
-export { assert as a, isNullish as b, compareWithOperator as c, generateKey as d, isEmpty as e, isFunction as f, generateId as g, groupBy as h, isArray as i, equals as j, getValue as k, orderBy as o, throwError as t };
+export { assert as a, isNullish as b, compareWithOperator as c, generateKey as d, isEmpty as e, isFunction as f, generateId as g, groupBy as h, isArray as i, equals as j, isDate as k, getValue as l, orderBy as o, throwError as t };

package/package.json

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