fix(pinia-orm): DateCast still causing unexpected result

CodeDredd · CodeDredd · commit 519681c25888 · 2023-03-24T17:28:54.000+01:00
diff --git a/packages/pinia-orm/src/model/Model.ts b/packages/pinia-orm/src/model/Model.ts
@@ -998,8 +998,12 @@ export class Model {
     if (isArray(value))
       return this.serializeArray(value)
 
-    if (typeof value === 'object')
-      return this.serializeObject(value)
+    if (typeof value === 'object') {
+      if ('toISOString' in value)
+        return value.toISOString()
+      else
+        return this.serializeObject(value)
+    }
 
     return value
   }
diff --git a/packages/pinia-orm/src/model/casts/DateCast.ts b/packages/pinia-orm/src/model/casts/DateCast.ts
@@ -21,8 +21,6 @@ export class DateCast extends CastAttribute {
     if (value === null)
       return null
 
-    const newDate = ((typeof value === 'string') ? new Date(Date.parse(value)) : value)
-
-    return 'toISOString' in newDate ? newDate.toISOString() : null
+    return ((typeof value === 'string') ? new Date(Date.parse(value)) : value).toISOString()
   }
 }
diff --git a/packages/pinia-orm/tests/unit/model/Model_Casts_Date.spec.ts b/packages/pinia-orm/tests/unit/model/Model_Casts_Date.spec.ts
@@ -60,6 +60,8 @@ describe('unit/model/Model_Casts_Date', () => {
   })
 
   it('should cast before saved into store', () => {
+    const exspectedIsoDate = new Date('2023-01-26')
+
     class User extends Model {
       static entity = 'users'
 
@@ -70,7 +72,8 @@ describe('unit/model/Model_Casts_Date', () => {
       @Cast(() => DateCast) @Attr(null) declare updatedAt: Date
 
       static saving(model: Model) {
-        model.updatedAt = new Date()
+        console.log('saving')
+        model.updatedAt = exspectedIsoDate
       }
 
       static casts() {
@@ -88,7 +91,7 @@ describe('unit/model/Model_Casts_Date', () => {
 
     assertState({
       users: {
-        1: { id: 1, updated: exspectedISODate, createdAt: null, updatedAt: null },
+        1: { id: 1, updated: exspectedISODate, createdAt: null, updatedAt: exspectedIsoDate.toISOString() },
       },
     })
 

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ export class DateCast extends CastAttribute {`
`21`	`21`	`if (value === null)`
`22`	`22`	`return null`
`23`	`23`
`24`		`- const newDate = ((typeof value === 'string') ? new Date(Date.parse(value)) : value)`
`25`		`-`
`26`		`- return 'toISOString' in newDate ? newDate.toISOString() : null`
	`24`	`+ return ((typeof value === 'string') ? new Date(Date.parse(value)) : value).toISOString()`
`27`	`25`	`}`
`28`	`26`	`}`