From 61e33816e44cc1a57857922f16490340368e850b Mon Sep 17 00:00:00 2001 From: Oskar Hane Date: Thu, 27 May 2021 23:18:29 +0200 Subject: [PATCH 1/2] Import only from root package in neo4j-driver + bump drivers in package tests --- .../graphql/src/schema/scalars/DateTime.ts | 6 +++--- .../integration/types/datetime.int.test.ts | 20 +++++++++++++------ packages/package-tests/apollo/package.json | 2 +- packages/package-tests/babel/package.json | 2 +- packages/package-tests/commonjs/package.json | 2 +- .../package-tests/typescript/package.json | 2 +- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/packages/graphql/src/schema/scalars/DateTime.ts b/packages/graphql/src/schema/scalars/DateTime.ts index acdccec834..8695d9f8fc 100644 --- a/packages/graphql/src/schema/scalars/DateTime.ts +++ b/packages/graphql/src/schema/scalars/DateTime.ts @@ -18,15 +18,15 @@ */ import { GraphQLScalarType } from "graphql"; -import { DateTime as Neo4jDateTime } from "neo4j-driver/lib/temporal-types"; +import neo4j from "neo4j-driver"; export default new GraphQLScalarType({ name: "DateTime", description: "A date and time, represented as an ISO-8601 string", - serialize: (value: Neo4jDateTime) => { + serialize: (value: typeof neo4j.types.DateTime) => { return new Date(value.toString()).toISOString(); }, parseValue: (value: string) => { - return Neo4jDateTime.fromStandardDate(new Date(value)); + return neo4j.types.DateTime.fromStandardDate(new Date(value)); }, }); diff --git a/packages/graphql/tests/integration/types/datetime.int.test.ts b/packages/graphql/tests/integration/types/datetime.int.test.ts index be4094ea37..7290312e9b 100644 --- a/packages/graphql/tests/integration/types/datetime.int.test.ts +++ b/packages/graphql/tests/integration/types/datetime.int.test.ts @@ -18,8 +18,7 @@ */ import camelCase from "camelcase"; -import { Driver } from "neo4j-driver"; -import { DateTime } from "neo4j-driver/lib/temporal-types"; +import neo4jDriver, { Driver } from "neo4j-driver"; import { graphql } from "graphql"; import { generate } from "randomstring"; import pluralize from "pluralize"; @@ -82,7 +81,10 @@ describe("DateTime", () => { RETURN m {.id, .datetime} as m `); - const movie: { id: string; datetime: DateTime } = (result.records[0].toObject() as any).m; + const movie: { + id: string; + datetime: typeof neo4jDriver.types.DateTime; + } = (result.records[0].toObject() as any).m; expect(movie.id).toEqual(id); expect(new Date(movie.datetime.toString()).toISOString()).toEqual(date.toISOString()); @@ -135,7 +137,10 @@ describe("DateTime", () => { RETURN m {.id, .datetimes} as m `); - const movie: { id: string; datetimes: DateTime[] } = (result.records[0].toObject() as any).m; + const movie: { + id: string; + datetimes: typeof neo4jDriver.types.DateTime[]; + } = (result.records[0].toObject() as any).m; expect(movie.id).toEqual(id); @@ -178,7 +183,7 @@ describe("DateTime", () => { } `; - const nDateTime = DateTime.fromStandardDate(date); + const nDateTime = neo4jDriver.types.DateTime.fromStandardDate(date); try { await session.run( @@ -303,7 +308,10 @@ describe("DateTime", () => { RETURN m {.id, .datetime} as m `); - const movie: { id: string; datetime: DateTime } = (result.records[0].toObject() as any).m; + const movie: { + id: string; + datetime: typeof neo4jDriver.types.DateTime; + } = (result.records[0].toObject() as any).m; expect(movie.id).toEqual(id); expect(new Date(movie.datetime.toString()).toISOString()).toEqual(date.toISOString()); diff --git a/packages/package-tests/apollo/package.json b/packages/package-tests/apollo/package.json index 27e5e4dc8e..302a875e9f 100644 --- a/packages/package-tests/apollo/package.json +++ b/packages/package-tests/apollo/package.json @@ -14,7 +14,7 @@ "@neo4j/graphql": "file:./package", "apollo-server": "^2.19.0", "graphql": "^15.4.0", - "neo4j-driver": "^4.2.0", + "neo4j-driver": "^4.3.0", "node-fetch": "^2.6.1" } } diff --git a/packages/package-tests/babel/package.json b/packages/package-tests/babel/package.json index 8d3f1ce07c..426080d408 100644 --- a/packages/package-tests/babel/package.json +++ b/packages/package-tests/babel/package.json @@ -10,7 +10,7 @@ "dependencies": { "@neo4j/graphql": "file:./package", "graphql": "^15.4.0", - "neo4j-driver": "^4.2.0" + "neo4j-driver": "^4.3.0" }, "devDependencies": { "@babel/core": "^7.12.3", diff --git a/packages/package-tests/commonjs/package.json b/packages/package-tests/commonjs/package.json index e88f10639d..3e1a48565b 100644 --- a/packages/package-tests/commonjs/package.json +++ b/packages/package-tests/commonjs/package.json @@ -10,6 +10,6 @@ "dependencies": { "@neo4j/graphql": "file:./package", "graphql": "^15.4.0", - "neo4j-driver": "^4.2.0" + "neo4j-driver": "^4.3.0" } } diff --git a/packages/package-tests/typescript/package.json b/packages/package-tests/typescript/package.json index 229ed0e5b9..05264fa146 100644 --- a/packages/package-tests/typescript/package.json +++ b/packages/package-tests/typescript/package.json @@ -10,7 +10,7 @@ "dependencies": { "@neo4j/graphql": "file:./package", "graphql": "^15.4.0", - "neo4j-driver": "^4.2.0" + "neo4j-driver": "^4.3.0" }, "devDependencies": { "typescript": "3.9.7" From b8c82e0eb5094e52f8a57e7bb95d607ee6563ce7 Mon Sep 17 00:00:00 2001 From: Oskar Hane Date: Fri, 28 May 2021 10:18:40 +0200 Subject: [PATCH 2/2] Restore driver version in package-tests --- packages/package-tests/apollo/package.json | 2 +- packages/package-tests/babel/package.json | 2 +- packages/package-tests/commonjs/package.json | 2 +- packages/package-tests/typescript/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/package-tests/apollo/package.json b/packages/package-tests/apollo/package.json index 302a875e9f..27e5e4dc8e 100644 --- a/packages/package-tests/apollo/package.json +++ b/packages/package-tests/apollo/package.json @@ -14,7 +14,7 @@ "@neo4j/graphql": "file:./package", "apollo-server": "^2.19.0", "graphql": "^15.4.0", - "neo4j-driver": "^4.3.0", + "neo4j-driver": "^4.2.0", "node-fetch": "^2.6.1" } } diff --git a/packages/package-tests/babel/package.json b/packages/package-tests/babel/package.json index 426080d408..8d3f1ce07c 100644 --- a/packages/package-tests/babel/package.json +++ b/packages/package-tests/babel/package.json @@ -10,7 +10,7 @@ "dependencies": { "@neo4j/graphql": "file:./package", "graphql": "^15.4.0", - "neo4j-driver": "^4.3.0" + "neo4j-driver": "^4.2.0" }, "devDependencies": { "@babel/core": "^7.12.3", diff --git a/packages/package-tests/commonjs/package.json b/packages/package-tests/commonjs/package.json index 3e1a48565b..e88f10639d 100644 --- a/packages/package-tests/commonjs/package.json +++ b/packages/package-tests/commonjs/package.json @@ -10,6 +10,6 @@ "dependencies": { "@neo4j/graphql": "file:./package", "graphql": "^15.4.0", - "neo4j-driver": "^4.3.0" + "neo4j-driver": "^4.2.0" } } diff --git a/packages/package-tests/typescript/package.json b/packages/package-tests/typescript/package.json index 05264fa146..229ed0e5b9 100644 --- a/packages/package-tests/typescript/package.json +++ b/packages/package-tests/typescript/package.json @@ -10,7 +10,7 @@ "dependencies": { "@neo4j/graphql": "file:./package", "graphql": "^15.4.0", - "neo4j-driver": "^4.3.0" + "neo4j-driver": "^4.2.0" }, "devDependencies": { "typescript": "3.9.7"