Use GraphQLDateTimeISO from graphql-scalars

CHANGELOG.md

@@ -15,6 +15,7 @@
 - **Breaking Change**: `validate` option of `buildSchema` doesn't accept anymore a custom validation function - use `validateFn` option instead
 - **Breaking Change**: removed `dateScalarMode` option from `buildSchema`
 - **Breaking Change**: make `graphql-scalars` package a peer dependency and use date scalars from it instead of custom ones
+- **Breaking Change**: exported `GraphQLISODateTime` scalar has now a name `DateTimeISO`
 - support class-based auth checker, which allows for dependency injection
 - allow defining directives for interface types and theirs fields, with inheritance for object types fields (#744)
 - allow deprecating input fields and args (#794)

package.json

@@ -23,7 +23,7 @@
   "peerDependencies": {
     "class-validator": ">=0.14.0",
     "graphql": "^16.6.0",
-    "graphql-scalars": "^1.22.0"
+    "graphql-scalars": "^1.22.1"
   },
   "peerDependenciesMeta": {
     "class-validator": {
@@ -61,7 +61,7 @@
     "dotenv": "^16.0.3",
     "graphql": "^16.6.0",
     "graphql-redis-subscriptions": "^2.6.0",
-    "graphql-scalars": "^1.22.0",
+    "graphql-scalars": "^1.22.1",
     "graphql-tag": "^2.12.6",
     "graphql-ws": "^5.12.1",
     "husky": "^4.3.8",

src/scalars/index.ts

@@ -1,3 +1,2 @@
 export * from "./aliases";
-export { default as GraphQLISODateTime } from "./GraphQLISODateTime";
-export { GraphQLTimestamp } from "graphql-scalars";
+export { GraphQLTimestamp, GraphQLDateTimeISO as GraphQLISODateTime } from "graphql-scalars";

tests/functional/fields.ts

@@ -387,6 +387,6 @@ describe("Fields - schema", () => {
 
     expect(overwrittenArrayScalarFieldType.kind).toEqual(TypeKind.NON_NULL);
     expect(overwrittenArrayScalarFieldInnerType.kind).toEqual(TypeKind.SCALAR);
-    expect(overwrittenArrayScalarFieldInnerType.name).toEqual("DateTime");
+    expect(overwrittenArrayScalarFieldInnerType.name).toEqual("DateTimeISO");
   });
 });

tests/functional/generic-types.ts

@@ -370,7 +370,7 @@ describe("Generic types", () => {
       expect(friendshipEdgeNodeFieldType.kind).toBe(TypeKind.OBJECT);
       expect(friendshipEdgeNodeFieldType.name).toBe("User");
       expect(friendshipEdgeFriendedAtFieldType.kind).toBe(TypeKind.SCALAR);
-      expect(friendshipEdgeFriendedAtFieldType.name).toBe("DateTime");
+      expect(friendshipEdgeFriendedAtFieldType.name).toBe("DateTimeISO");
     });
 
     it("should return child classes data from queries", async () => {

tests/functional/scalars.ts

@@ -187,21 +187,21 @@ describe("Scalars", () => {
       const explicitDateFieldType = getFieldType("explicitDateField");
 
       expect(explicitDateFieldType.kind).toEqual(TypeKind.SCALAR);
-      expect(explicitDateFieldType.name).toEqual("DateTime");
+      expect(explicitDateFieldType.name).toEqual("DateTimeISO");
     });
 
     it("should generate Date scalar field type when prop type is Date", async () => {
       const implicitStringFieldType = getFieldType("implicitDateField");
 
       expect(implicitStringFieldType.kind).toEqual(TypeKind.SCALAR);
-      expect(implicitStringFieldType.name).toEqual("DateTime");
+      expect(implicitStringFieldType.name).toEqual("DateTimeISO");
     });
 
     it("should generate ISODate scalar field type", async () => {
       const ISODateFieldType = getFieldType("ISODateField");
 
       expect(ISODateFieldType.kind).toEqual(TypeKind.SCALAR);
-      expect(ISODateFieldType.name).toEqual("DateTime");
+      expect(ISODateFieldType.name).toEqual("DateTimeISO");
     });
 
     it("should generate Timestamp scalar field type", async () => {
@@ -278,7 +278,7 @@ describe("Scalars", () => {
       const dateFieldType = getSampleObjectFieldType(schemaInfo.schemaIntrospection)("dateField");
 
       expect(dateFieldType.kind).toEqual(TypeKind.SCALAR);
-      expect(dateFieldType.name).toEqual("DateTime");
+      expect(dateFieldType.name).toEqual("DateTimeISO");
     });
 
     it("should generate DateTime scalar field type when scalarsMap is using GraphQLISODateTime", async () => {
@@ -289,7 +289,7 @@ describe("Scalars", () => {
       const dateFieldType = getSampleObjectFieldType(schemaInfo.schemaIntrospection)("dateField");
 
       expect(dateFieldType.kind).toEqual(TypeKind.SCALAR);
-      expect(dateFieldType.name).toEqual("DateTime");
+      expect(dateFieldType.name).toEqual("DateTimeISO");
     });
 
     it("should generate Timestamp scalar field type when scalarsMap is using GraphQLTimestamp", async () => {

tests/functional/typedefs-resolvers.ts

@@ -373,7 +373,7 @@ describe("typeDefs and resolvers", () => {
 
       it("should emit Date scalar", async () => {
         const dateScalar = schemaIntrospection.types.find(
-          it => it.name === "DateTime",
+          it => it.name === "DateTimeISO",
         ) as IntrospectionScalarType;
 
         expect(dateScalar.kind).toBe(TypeKind.SCALAR);