diff --git a/package.json b/package.json index 40c69c185f8..f1547760a99 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,7 @@ "memoize-one": "^5.2.1", "monaco-editor": "0.23.0", "neo4j-client-sso": "1.2.2", - "neo4j-driver": "5.3.1", + "neo4j-driver": "5.9.2", "re-resizable": "^6.9.9", "react": "^17.0.2", "react-dnd": "^11.1.3", diff --git a/src/neo4j-arc/common/types/cypherDataTypes.ts b/src/neo4j-arc/common/types/cypherDataTypes.ts index 9ce0c2cb884..2145c8a1037 100644 --- a/src/neo4j-arc/common/types/cypherDataTypes.ts +++ b/src/neo4j-arc/common/types/cypherDataTypes.ts @@ -141,8 +141,14 @@ export const isCypherPropertyType = (value: any): value is CypherProperty => { } export const isCypherTemporalType = ( - anything: object -): anything is CypherTemporalType => - [isDate, isTime, isDateTime, isLocalTime, isLocalDateTime, isDuration].some( - tester => tester(anything) + anything: unknown +): anything is CypherTemporalType => { + return ( + isDate(anything) || + isTime(anything) || + isDateTime(anything) || + isLocalTime(anything) || + isLocalDateTime(anything) || + isDuration(anything) ) +} diff --git a/src/neo4j-arc/package.json b/src/neo4j-arc/package.json index 298579dc72b..205b8232367 100644 --- a/src/neo4j-arc/package.json +++ b/src/neo4j-arc/package.json @@ -24,7 +24,7 @@ "@rollup/plugin-alias": "^3.1.9", "@types/react": "^17.0.40", "esbuild": "^0.14.26", - "neo4j-driver-core": "^5.3.0", + "neo4j-driver-core": "5.9.2", "react": "^17.0.2", "react-dom": "^17.0.2", "rollup": "^2.70.1", @@ -67,7 +67,7 @@ "styled-components": "^5.3.5" }, "peerDependencies": { - "neo4j-driver-core": "^5.3.0", + "neo4j-driver-core": "5.9.2", "react": "^17.0.2", "react-dom": "^17.0.2" } diff --git a/src/neo4j-arc/yarn.lock b/src/neo4j-arc/yarn.lock index bbc5005f7e2..24569a19ca7 100644 --- a/src/neo4j-arc/yarn.lock +++ b/src/neo4j-arc/yarn.lock @@ -805,10 +805,10 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -neo4j-driver-core@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-5.3.0.tgz#c3bf55a5d36565ea76bab7673e0c579af4387011" - integrity sha512-MGxHCU0Pt13ElxYZkObWoxZ8O5y0Guf/R3rcogDUktG6cp69rc+lWxZAR7HbsL+gc8NrdJlIxR7dIud7B3bhAA== +neo4j-driver-core@5.9.2: + version "5.9.2" + resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-5.9.2.tgz#354a2a4cb967c3202acb4e7a2d2335d3d609cb3b" + integrity sha512-z8ZsEEH8e86RsbFUbIrz+YOU/38D316C1b6OqSOoT93IhSzRNQNnrI0pKYKUDKPvI8Ud9acmhQvtIlisZ1gQkA== object-assign@^4.1.1: version "4.1.1" diff --git a/src/shared/services/bolt/boltMappings.ts b/src/shared/services/bolt/boltMappings.ts index 84d50780023..58e471eb03c 100644 --- a/src/shared/services/bolt/boltMappings.ts +++ b/src/shared/services/bolt/boltMappings.ts @@ -18,7 +18,7 @@ * along with this program. If not, see . */ import { flatten, map, take } from 'lodash-es' -import neo4j from 'neo4j-driver' +import neo4j, { Record as Neo4jRecord, Path as Neo4jPath } from 'neo4j-driver' import { upperFirst, BasicNodesAndRels } from 'neo4j-arc/common' @@ -39,10 +39,7 @@ interface Converters { objectConverter?: (item: {}, converters: Converters) => any } -export function toObjects( - records: typeof neo4j.Record[], - converters: Converters -) { +export function toObjects(records: Neo4jRecord[], converters: Converters) { const recordValues = records.map(record => { const out: string[] = [] record.forEach((val: {}) => out.push(itemIntToString(val, converters))) @@ -52,7 +49,7 @@ export function toObjects( } export function recordsToTableArray( - records: typeof neo4j.Record[], + records: Neo4jRecord[], converters: Converters ) { const recordValues = toObjects(records, converters) @@ -103,10 +100,7 @@ export function extractFromNeoObjects(obj: any, converters: Converters) { return obj } -const extractPathForRows = ( - path: typeof neo4j.Path, - converters: Converters -) => { +const extractPathForRows = (path: Neo4jPath, converters: Converters) => { let segments = path.segments // Zero length path. No relationship, end === start if (!Array.isArray(path.segments) || path.segments.length < 1) { diff --git a/yarn.lock b/yarn.lock index e7242458d8a..dfae151246b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1082,13 +1082,6 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.17.8": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.0.tgz#22b11c037b094d27a8a2504ea4dcff00f50e2259" - integrity sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA== - dependencies: - regenerator-runtime "^0.13.4" - "@babel/runtime@^7.5.5": version "7.20.1" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.1.tgz#1148bb33ab252b165a06698fde7576092a78b4a9" @@ -10516,29 +10509,28 @@ neo4j-client-sso@1.2.2: jwt-decode "^3.1.2" lodash.pick "^4.4.0" -neo4j-driver-bolt-connection@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/neo4j-driver-bolt-connection/-/neo4j-driver-bolt-connection-5.3.1.tgz#d99065b7d0f51769a918e6c3aa22268982eae58a" - integrity sha512-pKDGd7bKUoZavf7Rc3Y45a2BVVuRjZpVSkkUHeGvSRMFdTU02w3+wB4tykSGj1w7+Hx7lYCBBbXtqfnx1g9GeQ== +neo4j-driver-bolt-connection@5.9.2: + version "5.9.2" + resolved "https://registry.yarnpkg.com/neo4j-driver-bolt-connection/-/neo4j-driver-bolt-connection-5.9.2.tgz#608cc8e768454a6fd25430303465a44820fabffd" + integrity sha512-P73QJ6zba9TCVHfdJi82fZUUK3xqdnXbr2eyL7cQmfaKyTAExpUnYSmQL7Iy5XBoHjmrpY888Tor8KXRXgirPg== dependencies: buffer "^6.0.3" - neo4j-driver-core "5.3.1" + neo4j-driver-core "5.9.2" string_decoder "^1.3.0" -neo4j-driver-core@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-5.3.1.tgz#658c1756ffdbc0256e4fbf9969f572ea6c46ca26" - integrity sha512-wGhZOM9TzoO71TCtwB7qYHF19kJ6XttCtQbeXHxclVHPXD5XPYJ24FUvkjpAHFZYrQC4L+44VqbFWhMETRfoSw== +neo4j-driver-core@5.9.2: + version "5.9.2" + resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-5.9.2.tgz#354a2a4cb967c3202acb4e7a2d2335d3d609cb3b" + integrity sha512-z8ZsEEH8e86RsbFUbIrz+YOU/38D316C1b6OqSOoT93IhSzRNQNnrI0pKYKUDKPvI8Ud9acmhQvtIlisZ1gQkA== -neo4j-driver@5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-5.3.1.tgz#114c068933b89c9e111f1fac2bdf7ca61209287d" - integrity sha512-nhcxPN4puNyYriXAIdU4WTZWhxnn2jl0sHpElifgnrW1gLuBMn5ysWRv1nNZICx+eowbyO9ztnarbsS4GimdXg== +neo4j-driver@5.9.2: + version "5.9.2" + resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-5.9.2.tgz#9c5972ab073d16367e24f6134c3c09af99deb4d6" + integrity sha512-yuoqA3TmR5zLky0wRSLJqLIiSglBOvc1f1sbQwgJwoLVC7AP5ucjrqs27qcAAxduolaTj2KQeLFqY3UQMYiTuA== dependencies: - "@babel/runtime" "^7.17.8" - neo4j-driver-bolt-connection "5.3.1" - neo4j-driver-core "5.3.1" - rxjs "^7.5.5" + neo4j-driver-bolt-connection "5.9.2" + neo4j-driver-core "5.9.2" + rxjs "^7.8.0" nice-try@^1.0.4: version "1.0.5" @@ -13044,10 +13036,10 @@ rxjs@^6.5.2: dependencies: tslib "^1.9.0" -rxjs@^7.5.5: - version "7.5.6" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc" - integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw== +rxjs@^7.8.0: + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0"