Merge branch 'dev' into schema-generation-refactor

examples/migration/package.json

@@ -7,8 +7,8 @@
     },
     "dependencies": {
         "@apollo/server": "^4.7.0",
-        "@neo4j/graphql": "^4.1.3",
+        "@neo4j/graphql": "^4.2.0",
         "graphql": "16.8.1",
-        "neo4j-driver": "5.12.0"
+        "neo4j-driver": "5.13.0"
     }
 }

package.json

@@ -45,7 +45,7 @@
         "husky": "8.0.3",
         "jest": "29.7.0",
         "lint-staged": "14.0.1",
-        "neo4j-driver": "5.12.0",
+        "neo4j-driver": "5.13.0",
         "npm-run-all": "4.1.5",
         "prettier": "2.8.8",
         "set-tz": "0.2.0",

packages/apollo-federation-subgraph-compatibility/package.json

@@ -10,7 +10,7 @@
     "dependencies": {
         "@apollo/server": "^4.7.0",
         "@graphql-tools/wrap": "^10.0.0",
-        "@neo4j/graphql": "^4.1.3",
+        "@neo4j/graphql": "^4.2.0",
         "graphql": "16.8.1",
         "graphql-tag": "^2.12.6",
         "neo4j-driver": "^5.8.0"

packages/graphql-amqp-subscriptions-engine/package.json

@@ -42,9 +42,9 @@
         "@types/jest": "29.5.5",
         "@types/node": "18.15.1",
         "camelcase": "6.3.0",
-        "graphql-ws": "5.14.0",
+        "graphql-ws": "5.14.1",
         "jest": "29.7.0",
-        "neo4j-driver": "5.12.0",
+        "neo4j-driver": "5.13.0",
         "pluralize": "8.0.0",
         "randomstring": "1.3.0",
         "supertest": "6.3.3",

packages/graphql-toolbox/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @neo4j/graphql-toolbox
 
+## 2.0.11
+
+### Patch Changes
+
+-   Updated dependencies [[`059ea1c83`](https://github.com/neo4j/graphql/commit/059ea1c839516a807921a90a3966547acc4f3d33), [`3602fc466`](https://github.com/neo4j/graphql/commit/3602fc4669ae11ff06e0cd4c431dff8d05cdd6b9), [`ad2fc2aea`](https://github.com/neo4j/graphql/commit/ad2fc2aea3c452d536bba80e0396337db9cecc59), [`ef92e7ba0`](https://github.com/neo4j/graphql/commit/ef92e7ba02fc9ab2e52cb0966748fac7e6f4a846), [`a2933854a`](https://github.com/neo4j/graphql/commit/a2933854a5fe6662e9c01616e31019d7a453c613)]:
+    -   @neo4j/graphql@4.2.0
+
 ## 2.0.10
 
 ### Patch Changes

packages/graphql-toolbox/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@neo4j/graphql-toolbox",
     "private": true,
-    "version": "2.0.10",
+    "version": "2.0.11",
     "description": "Developer UI For Neo4j GraphQL",
     "exports": "./dist/main.js",
     "main": "./dist/main.js",
@@ -52,7 +52,7 @@
         "@graphiql/react": "0.19.4",
         "@neo4j-ndl/base": "1.10.3",
         "@neo4j-ndl/react": "1.10.8",
-        "@neo4j/graphql": "4.1.3",
+        "@neo4j/graphql": "4.2.0",
         "@neo4j/introspector": "2.0.0",
         "classnames": "2.3.2",
         "cm6-graphql": "0.0.10",
@@ -62,7 +62,7 @@
         "graphql": "16.8.1",
         "graphql-query-complexity": "0.12.0",
         "markdown-it": "13.0.2",
-        "neo4j-driver": "5.12.0",
+        "neo4j-driver": "5.13.0",
         "prettier": "3.0.0",
         "process": "0.11.10",
         "react": "18.2.0",
@@ -93,7 +93,7 @@
         "jest-environment-jsdom": "29.7.0",
         "node-polyfill-webpack-plugin": "2.0.1",
         "parse5": "7.1.2",
-        "postcss": "8.4.30",
+        "postcss": "8.4.31",
         "postcss-loader": "7.3.3",
         "randomstring": "1.3.0",
         "style-loader": "3.3.3",

packages/graphql/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @neo4j/graphql
 
+## 4.2.0
+
+### Minor Changes
+
+-   [#4044](https://github.com/neo4j/graphql/pull/4044) [`059ea1c83`](https://github.com/neo4j/graphql/commit/059ea1c839516a807921a90a3966547acc4f3d33) Thanks [@MacondoExpress](https://github.com/MacondoExpress)! - Improved the transpilation implementation.
+
+### Patch Changes
+
+-   [#4011](https://github.com/neo4j/graphql/pull/4011) [`3602fc466`](https://github.com/neo4j/graphql/commit/3602fc4669ae11ff06e0cd4c431dff8d05cdd6b9) Thanks [@angrykoala](https://github.com/angrykoala)! - Fix issue 4015, selecting the node field twice with a different selection set resulted in one selection set being ignored.
+
+-   [#4011](https://github.com/neo4j/graphql/pull/4011) [`ad2fc2aea`](https://github.com/neo4j/graphql/commit/ad2fc2aea3c452d536bba80e0396337db9cecc59) Thanks [@angrykoala](https://github.com/angrykoala)! - Fix issue 3923, applying multiple predicates on different node implementations using a connection filter resulted in some predicates not being applied.
+
+-   [#4011](https://github.com/neo4j/graphql/pull/4011) [`ef92e7ba0`](https://github.com/neo4j/graphql/commit/ef92e7ba02fc9ab2e52cb0966748fac7e6f4a846) Thanks [@angrykoala](https://github.com/angrykoala)! - Fix issue 4007, selecting an edges field using an alias resulted in the node fields not being returned.
+
+-   [#4011](https://github.com/neo4j/graphql/pull/4011) [`a2933854a`](https://github.com/neo4j/graphql/commit/a2933854a5fe6662e9c01616e31019d7a453c613) Thanks [@angrykoala](https://github.com/angrykoala)! - Fix issue 4004, when a user queried a cypher field defined with an argument named "options" produced a runtime error.
+
 ## 4.1.3
 
 ### Patch Changes

packages/graphql/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@neo4j/graphql",
-    "version": "4.1.3",
+    "version": "4.2.0",
     "description": "A GraphQL to Cypher query execution layer for Neo4j and JavaScript GraphQL implementations",
     "keywords": [
         "neo4j",
@@ -65,7 +65,7 @@
         "dedent": "1.5.1",
         "graphql-middleware": "6.1.35",
         "graphql-tag": "2.12.6",
-        "graphql-ws": "5.14.0",
+        "graphql-ws": "5.14.1",
         "is-uuid": "1.0.2",
         "jest": "29.7.0",
         "jest-extended": "4.0.1",

packages/ogm/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @neo4j/graphql-ogm
 
+## 4.2.0
+
+### Patch Changes
+
+-   Updated dependencies [[`059ea1c83`](https://github.com/neo4j/graphql/commit/059ea1c839516a807921a90a3966547acc4f3d33), [`3602fc466`](https://github.com/neo4j/graphql/commit/3602fc4669ae11ff06e0cd4c431dff8d05cdd6b9), [`ad2fc2aea`](https://github.com/neo4j/graphql/commit/ad2fc2aea3c452d536bba80e0396337db9cecc59), [`ef92e7ba0`](https://github.com/neo4j/graphql/commit/ef92e7ba02fc9ab2e52cb0966748fac7e6f4a846), [`a2933854a`](https://github.com/neo4j/graphql/commit/a2933854a5fe6662e9c01616e31019d7a453c613)]:
+    -   @neo4j/graphql@4.2.0
+
 ## 4.1.3
 
 ### Patch Changes

packages/ogm/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@neo4j/graphql-ogm",
-    "version": "4.1.3",
+    "version": "4.2.0",
     "description": "GraphQL powered OGM for Neo4j and Javascript applications",
     "keywords": [
         "neo4j",
@@ -38,7 +38,7 @@
         "@graphql-codegen/plugin-helpers": "^5.0.0",
         "@graphql-codegen/typescript": "^4.0.0",
         "@graphql-tools/merge": "^9.0.0",
-        "@neo4j/graphql": "^4.1.3",
+        "@neo4j/graphql": "^4.2.0",
         "prettier": "^2.7.1"
     },
     "peerDependencies": {

packages/package-tests/babel/package.json

@@ -13,7 +13,7 @@
         "neo4j-driver": "^5.8.0"
     },
     "devDependencies": {
-        "@babel/core": "7.22.20",
+        "@babel/core": "7.23.0",
         "@babel/node": "7.22.19",
         "@babel/preset-env": "7.22.20"
     }

yarn.lock

@@ -3428,9 +3428,9 @@ __metadata:
     body-parser: ^1.20.2
     camelcase: 6.3.0
     cors: ^2.8.5
-    graphql-ws: 5.14.0
+    graphql-ws: 5.14.1
     jest: 29.7.0
-    neo4j-driver: 5.12.0
+    neo4j-driver: 5.13.0
     pluralize: 8.0.0
     randomstring: 1.3.0
     supertest: 6.3.3
@@ -3450,7 +3450,7 @@ __metadata:
     "@graphql-codegen/plugin-helpers": ^5.0.0
     "@graphql-codegen/typescript": ^4.0.0
     "@graphql-tools/merge": ^9.0.0
-    "@neo4j/graphql": ^4.1.3
+    "@neo4j/graphql": ^4.2.0
     "@types/jest": 29.5.5
     "@types/node": 18.15.1
     camelcase: 6.3.0
@@ -3485,7 +3485,7 @@ __metadata:
     "@graphiql/react": 0.19.4
     "@neo4j-ndl/base": 1.10.3
     "@neo4j-ndl/react": 1.10.8
-    "@neo4j/graphql": 4.1.3
+    "@neo4j/graphql": 4.2.0
     "@neo4j/introspector": 2.0.0
     "@playwright/test": 1.38.1
     "@tsconfig/create-react-app": 2.0.1
@@ -3515,10 +3515,10 @@ __metadata:
     jest: 29.7.0
     jest-environment-jsdom: 29.7.0
     markdown-it: 13.0.2
-    neo4j-driver: 5.12.0
+    neo4j-driver: 5.13.0
     node-polyfill-webpack-plugin: 2.0.1
     parse5: 7.1.2
-    postcss: 8.4.30
+    postcss: 8.4.31
     postcss-loader: 7.3.3
     prettier: 3.0.0
     process: 0.11.10
@@ -3542,7 +3542,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@neo4j/graphql@4.1.3, @neo4j/graphql@^4.0.0, @neo4j/graphql@^4.0.0-beta.0, @neo4j/graphql@^4.1.3, @neo4j/graphql@workspace:packages/graphql":
+"@neo4j/graphql@4.2.0, @neo4j/graphql@^4.0.0, @neo4j/graphql@^4.0.0-beta.0, @neo4j/graphql@^4.2.0, @neo4j/graphql@workspace:packages/graphql":
   version: 0.0.0-use.local
   resolution: "@neo4j/graphql@workspace:packages/graphql"
   dependencies:
@@ -3575,7 +3575,7 @@ __metadata:
     graphql-parse-resolve-info: ^4.12.3
     graphql-relay: ^0.10.0
     graphql-tag: 2.12.6
-    graphql-ws: 5.14.0
+    graphql-ws: 5.14.1
     is-uuid: 1.0.2
     jest: 29.7.0
     jest-extended: 4.0.1
@@ -8647,7 +8647,7 @@ __metadata:
     "@apollo/federation-subgraph-compatibility": 2.0.1
     "@apollo/server": ^4.7.0
     "@graphql-tools/wrap": ^10.0.0
-    "@neo4j/graphql": ^4.1.3
+    "@neo4j/graphql": ^4.2.0
     fork-ts-checker-webpack-plugin: 8.0.0
     graphql: 16.8.1
     graphql-tag: ^2.12.6
@@ -14760,7 +14760,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graphql-ws@npm:5.14.0, graphql-ws@npm:^5.11.2, graphql-ws@npm:^5.7.0":
+"graphql-ws@npm:5.14.1":
+  version: 5.14.1
+  resolution: "graphql-ws@npm:5.14.1"
+  peerDependencies:
+    graphql: ">=0.11 <=16"
+  checksum: bf6aa9446496f11e74d5fea17672050fb02f0303c6a7bf1e2692b7ea88059a18837f437e2ec8ba3cf7bb5bc2a18dddeebe9a8c6e6036914c3776297c48c1a398
+  languageName: node
+  linkType: hard
+
+"graphql-ws@npm:^5.11.2, graphql-ws@npm:^5.7.0":
   version: 5.14.0
   resolution: "graphql-ws@npm:5.14.0"
   peerDependencies:
@@ -18728,9 +18737,9 @@ __metadata:
   resolution: "migration@workspace:examples/migration"
   dependencies:
     "@apollo/server": ^4.7.0
-    "@neo4j/graphql": ^4.1.3
+    "@neo4j/graphql": ^4.2.0
     graphql: 16.8.1
-    neo4j-driver: 5.12.0
+    neo4j-driver: 5.13.0
   languageName: unknown
   linkType: soft
 
@@ -19527,14 +19536,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"neo4j-driver-bolt-connection@npm:5.13.0":
+  version: 5.13.0
+  resolution: "neo4j-driver-bolt-connection@npm:5.13.0"
+  dependencies:
+    buffer: ^6.0.3
+    neo4j-driver-core: 5.13.0
+    string_decoder: ^1.3.0
+  checksum: b793acf9f4bf64d185005180586badb1910873f2e6f8aee994d79cd32a09b122e32f02ea04204b021dc045419f5b01cd6a31972236b93b2fbf1dfc5caac3d266
+  languageName: node
+  linkType: hard
+
 "neo4j-driver-core@npm:5.12.0":
   version: 5.12.0
   resolution: "neo4j-driver-core@npm:5.12.0"
   checksum: 1e8f3a0c8c088a953150fbb2c89b6eb601328ee9d5b547e1bf0d29a4bacacc17eb8c2a492ebebffb1fb6563b820550205f18f7bec658feab8ebb5f041d17dd44
   languageName: node
   linkType: hard
 
-"neo4j-driver@npm:5.12.0, neo4j-driver@npm:^5.8.0":
+"neo4j-driver-core@npm:5.13.0":
+  version: 5.13.0
+  resolution: "neo4j-driver-core@npm:5.13.0"
+  checksum: 1b7016664c9e88fe308191b577c5d560009b354156705506d0ecdde7a542add9dfd4291a36223d875216e3bc12f315f8d98f24451d5488e13b325ff1368090d9
+  languageName: node
+  linkType: hard
+
+"neo4j-driver@npm:5.13.0":
+  version: 5.13.0
+  resolution: "neo4j-driver@npm:5.13.0"
+  dependencies:
+    neo4j-driver-bolt-connection: 5.13.0
+    neo4j-driver-core: 5.13.0
+    rxjs: ^7.8.1
+  checksum: 541fe9124f7623ae30c7d69597da962627ecb89fffa5b037f7bb9c7680823126e1e3e334e1314a75a58b3c5d6584c6a96e738570371c20ff29051b8d569637f3
+  languageName: node
+  linkType: hard
+
+"neo4j-driver@npm:^5.8.0":
   version: 5.12.0
   resolution: "neo4j-driver@npm:5.12.0"
   dependencies:
@@ -19570,7 +19608,7 @@ __metadata:
     husky: 8.0.3
     jest: 29.7.0
     lint-staged: 14.0.1
-    neo4j-driver: 5.12.0
+    neo4j-driver: 5.13.0
     npm-run-all: 4.1.5
     prettier: 2.8.8
     set-tz: 0.2.0
@@ -21359,7 +21397,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.30, postcss@npm:^8.1.10, postcss@npm:^8.4.21, postcss@npm:^8.4.23":
+"postcss@npm:8.4.31":
+  version: 8.4.31
+  resolution: "postcss@npm:8.4.31"
+  dependencies:
+    nanoid: ^3.3.6
+    picocolors: ^1.0.0
+    source-map-js: ^1.0.2
+  checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
+  languageName: node
+  linkType: hard
+
+"postcss@npm:^8.1.10, postcss@npm:^8.4.21, postcss@npm:^8.4.23":
   version: 8.4.30
   resolution: "postcss@npm:8.4.30"
   dependencies: