fix(client): date parsing (#4984)

src/packages/client/src/__tests__/dateWhere.test.ts

@@ -48,7 +48,8 @@ describe('date where filter', () => {
       data: {
         status: 'published',
         publishedAt: new Date('2020-11-13T10:36:43.261Z'),
-        updatedAt: new Date('2020-11-13T10:36:43.261Z'),
+        // tests RFC 3339
+        updatedAt: '2021-01-13T12:40:47+01:00',
       },
     }
     const document = makeDocument({
@@ -82,7 +83,7 @@ describe('date where filter', () => {
           data: {
             status: "published"
             publishedAt: "2020-11-13T10:36:43.261Z"
-            updatedAt: "2020-11-13T10:36:43.261Z"
+            updatedAt: "2021-01-13T12:40:47+01:00"
           }
         ) {
           count
@@ -113,7 +114,7 @@ describe('date where filter', () => {
           data: {
             status: "published"
             publishedAt: "2020-11-13T10:36:43.261Z"
-            updatedAt: "2020-11-13T10:36:43.261Z"
+            updatedAt: "2021-01-13T12:40:47+01:00"
           }
         ) {
           count

src/packages/client/src/__tests__/integration/happy/rfc3339/.gitignore

@@ -0,0 +1 @@
+!dev.db

src/packages/client/src/__tests__/integration/happy/rfc3339/schema.prisma

@@ -0,0 +1,31 @@
+datasource db {
+  provider = "sqlite"
+  url      = "file:dev.db"
+  default  = true
+}
+
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["groupBy"]
+}
+
+// / User model comment
+model User {
+  id    String  @id @default(uuid())
+  email String  @unique
+  age   Int
+  // / name comment
+  name  String?
+  posts Post[]
+}
+
+model Post {
+  id        String   @id @default(cuid())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  published Boolean
+  title     String
+  content   String?
+  authorId  String?
+  author    User?    @relation(fields: [authorId], references: [id])
+}

src/packages/client/src/__tests__/integration/happy/rfc3339/test.ts

@@ -0,0 +1,25 @@
+import { getTestClient } from '../../../../utils/getTestClient'
+
+let prisma
+
+beforeAll(async () => {
+  const PrismaClient = await getTestClient()
+  prisma = new PrismaClient()
+})
+
+afterAll(() => {
+  prisma.$disconnect()
+})
+
+test('findMany filter by rfc3339 date string', async () => {
+  console.log('going for it')
+  const user = await prisma.post.findMany({
+    where: {
+      createdAt: {
+        gt: '2019-01-13T12:40:47+01:00',
+      },
+    },
+  })
+
+  expect(user).toMatchInlineSnapshot(`Array []`)
+})

src/packages/client/src/runtime/utils/common.ts

@@ -123,6 +123,11 @@ export function wrapWithList(str: string, isList: boolean) {
   return str
 }
 
+// from https://github.com/excitement-engineer/graphql-iso-date/blob/master/src/utils/validator.js#L121
+const RFC_3339_REGEX = /^(\d{4}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60))(\.\d{1,})?(([Z])|([+|-]([01][0-9]|2[0-3]):[0-5][0-9]))$/
+
+const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
+
 export function getGraphQLType(
   value: any,
   potentialType?: string | DMMF.SchemaEnum | DMMF.InputType,
@@ -172,11 +177,7 @@ export function getGraphQLType(
     return 'DateTime'
   }
   if (jsType === 'string') {
-    if (
-      /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(
-        value,
-      )
-    ) {
+    if (UUID_REGEX.test(value)) {
       return 'UUID'
     }
     const date = new Date(value)
@@ -191,11 +192,7 @@ export function getGraphQLType(
     if (date.toString() === 'Invalid Date') {
       return 'String'
     }
-    if (
-      /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/.test(
-        value,
-      )
-    ) {
+    if (RFC_3339_REGEX.test(value)) {
       return 'DateTime'
     }
   }