fix(client): support all iso strings

Closes prisma/prisma-client-js#658
prisma · May 5, 2020 · 61044f6 · 61044f6
1 parent faa6756
commit 61044f6
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 5 deletions.
diff --git a/src/packages/client/src/__tests__/__snapshots__/select.test.ts.snap b/src/packages/client/src/__tests__/__snapshots__/select.test.ts.snap
@@ -22,6 +22,63 @@ exports[`select validation Allow deep select query 1`] = `
 }"
 `;
 
+exports[`select validation Allow different iso strings 1 1`] = `
+"mutation {
+  createOnePost(data: {
+    title: \\"Some title\\"
+    content: null
+    published: false
+    createdAt: \\"2020-05-05T16:28:33.983Z\\"
+  }) {
+    id
+    createdAt
+    updatedAt
+    published
+    title
+    content
+    authorId
+  }
+}"
+`;
+
+exports[`select validation Allow different iso strings 2 1`] = `
+"mutation {
+  createOnePost(data: {
+    title: \\"Some title\\"
+    content: null
+    published: false
+    createdAt: \\"2020-05-05T16:28:33.983+03:00\\"
+  }) {
+    id
+    createdAt
+    updatedAt
+    published
+    title
+    content
+    authorId
+  }
+}"
+`;
+
+exports[`select validation Allow different iso strings 2 2`] = `
+"mutation {
+  createOnePost(data: {
+    title: \\"Some title\\"
+    content: null
+    published: false
+    createdAt: \\"2020-05-05T16:28:33.983-02:00\\"
+  }) {
+    id
+    createdAt
+    updatedAt
+    published
+    title
+    content
+    authorId
+  }
+}"
+`;
+
 exports[`select validation Allow empty input array 1`] = `
 "query {
   findManyPost(where: {

diff --git a/src/packages/client/src/__tests__/select.test.ts b/src/packages/client/src/__tests__/select.test.ts
@@ -661,6 +661,69 @@ describe('select validation', () => {
     expect(() => document.validate(ast)).not.toThrow()
   })
 
+  test('Allow different iso strings 1', () => {
+    const ast = {
+      data: {
+        title: 'Some title',
+        content: null,
+        published: false,
+        createdAt: '2020-05-05T16:28:33.983Z',
+      },
+    }
+
+    const document = makeDocument({
+      dmmf,
+      select: ast,
+      rootTypeName: 'mutation',
+      rootField: 'createOnePost',
+    })
+
+    expect(String(document)).toMatchSnapshot()
+    expect(() => document.validate(ast)).not.toThrow()
+  })
+
+  test('Allow different iso strings 2', () => {
+    const ast = {
+      data: {
+        title: 'Some title',
+        content: null,
+        published: false,
+        createdAt: '2020-05-05T16:28:33.983+03:00',
+      },
+    }
+
+    const document = makeDocument({
+      dmmf,
+      select: ast,
+      rootTypeName: 'mutation',
+      rootField: 'createOnePost',
+    })
+
+    expect(String(document)).toMatchSnapshot()
+    expect(() => document.validate(ast)).not.toThrow()
+  })
+
+  test('Allow different iso strings 2', () => {
+    const ast = {
+      data: {
+        title: 'Some title',
+        content: null,
+        published: false,
+        createdAt: '2020-05-05T16:28:33.983-02:00',
+      },
+    }
+
+    const document = makeDocument({
+      dmmf,
+      select: ast,
+      rootTypeName: 'mutation',
+      rootField: 'createOnePost',
+    })
+
+    expect(String(document)).toMatchSnapshot()
+    expect(() => document.validate(ast)).not.toThrow()
+  })
+
   test('Allow uuid for string input', () => {
     const ast = {
       data: {

diff --git a/src/packages/client/src/runtime/utils/common.ts b/src/packages/client/src/runtime/utils/common.ts
@@ -125,7 +125,11 @@ export function getGraphQLType(
     if (date.toString() === 'Invalid Date') {
       return 'String'
     }
-    if (date.toISOString() === value) {
+    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,
+      )
+    ) {
       return 'DateTime'
     }
   }
@@ -159,7 +163,7 @@ export function getSuggestion(
       // heuristic to be not too strict, but allow some big mistakes (<= ~ 5)
       distance: Math.min(
         Math.floor(str.length) * 1.1,
-        ...possibilities.map(p => p.length * 3),
+        ...possibilities.map((p) => p.length * 3),
       ),
       str: null,
     },
@@ -183,14 +187,14 @@ export function stringifyInputType(
   } else {
     const body = indent(
       (input as DMMF.InputType).fields // TS doesn't discriminate based on existence of fields properly
-        .map(arg => {
+        .map((arg) => {
           const argInputType = arg.inputType[0]
           const key = `${arg.name}`
           const str = `${greenKeys ? chalk.green(key) : key}${
             argInputType.isRequired ? '' : '?'
           }: ${chalk.white(
             arg.inputType
-              .map(argType =>
+              .map((argType) =>
                 argIsInputType(argType.type)
                   ? argType.type.name
                   : wrapWithList(
@@ -262,7 +266,7 @@ export function inputTypeToJson(
   // it's very useful to show to the user, which options they actually have
   const showDeepType =
     isRequired &&
-    inputType.fields.every(arg => arg.inputType[0].kind === 'object') &&
+    inputType.fields.every((arg) => arg.inputType[0].kind === 'object') &&
     !inputType.isWhereType &&
     !inputType.atLeastOne
   if (nameOnly) {