Merge branch 'dev' into feature/sortable-directive

.github/workflows/changesets.yml

@@ -31,7 +31,7 @@ jobs:
           persist-credentials: false
 
       - name: Setup Node.js
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
 

.github/workflows/cla-check.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           repository: neo-technology/whitelist-check
           token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}
-      - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5
+      - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
         with:
           python-version: 3
       - name: Install dependencies

.github/workflows/lint-markdown.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
       - name: Install markdownlint

.github/workflows/performance-tests.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Setup Node.js
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
 

.github/workflows/pull-requests.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: 18.13.0
           cache: yarn

.github/workflows/reusable-api-library-tests.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn
@@ -68,7 +68,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn
@@ -82,7 +82,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/reusable-aura-tests.yml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           ref: ${{ inputs.BRANCH || github.ref }}
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn
@@ -62,7 +62,7 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/reusable-codeql-analysis.yml

@@ -10,13 +10,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3
+        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3
         with:
           config-file: ./.github/codeql/codeql-config.yml
           languages: javascript
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3
+        uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3

.github/workflows/reusable-federation-tests.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/reusable-integration-tests-on-prem-nightly.yml

@@ -69,7 +69,7 @@ jobs:
       - name: Check out repository code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Setting up Node.js with version ${{ matrix.node.name }}
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: ${{ matrix.node.name }}
           cache: yarn

.github/workflows/reusable-integration-tests-on-prem.yml

@@ -50,7 +50,7 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn

.github/workflows/reusable-package-tests.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: 18.13.0
           cache: yarn

.github/workflows/reusable-unit-tests.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: lts/*
           cache: yarn

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": "^6.3.0",
+        "@neo4j/graphql": "^6.3.1",
         "graphql": "16.10.0",
         "graphql-tag": "^2.12.6",
         "neo4j-driver": "^5.8.0"

packages/graphql/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @neo4j/graphql
 
+## 6.3.1
+
+### Patch Changes
+
+- [#5952](https://github.com/neo4j/graphql/pull/5952) [`4e14680`](https://github.com/neo4j/graphql/commit/4e1468076bbd23cdd9156b039de1d03bbc68942c) Thanks [@angrykoala](https://github.com/angrykoala)! - Add `addVersionPrefix` to `cypherQueryOptions` in context to add a Cypher version with `CYPHER` before each query:
+
+    ```js
+    {
+        cypherQueryOptions: {
+            addVersionPrefix: true,
+        },
+    }
+    ```
+
+    This prepends all Cypher queries with a `CYPHER [version]` statement:
+
+    ```cypher
+    CYPHER 5
+    MATCH (this:Movie)
+    WHERE this.title = $param0
+    RETURN this { .title } AS this
+    ```
+
 ## 6.3.0
 
 ### Minor Changes

packages/graphql/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@neo4j/graphql",
-    "version": "6.3.0",
+    "version": "6.3.1",
     "description": "A GraphQL to Cypher query execution layer for Neo4j and JavaScript GraphQL implementations",
     "keywords": [
         "neo4j",
@@ -60,11 +60,11 @@
         "jest": "29.7.0",
         "jest-extended": "4.0.2",
         "jwks-rsa": "3.1.0",
-        "koa": "2.15.3",
+        "koa": "2.15.4",
         "koa-jwt": "4.0.4",
         "koa-router": "13.0.1",
         "mock-jwks": "1.0.10",
-        "nock": "13.5.6",
+        "nock": "14.0.0",
         "randomstring": "1.3.1",
         "rimraf": "6.0.1",
         "supertest": "7.0.0",
@@ -79,7 +79,7 @@
         "@graphql-tools/resolvers-composition": "^7.0.0",
         "@graphql-tools/schema": "^10.0.0",
         "@graphql-tools/utils": "10.6.1",
-        "@neo4j/cypher-builder": "2.2.1",
+        "@neo4j/cypher-builder": "2.3.0",
         "camelcase": "^6.3.0",
         "debug": "^4.3.4",
         "dot-prop": "^6.0.1",

packages/graphql/src/classes/Executor.ts

@@ -40,6 +40,7 @@ import {
 } from "../constants";
 import { debugCypherAndParams } from "../debug/debug-cypher-and-params";
 import type { CypherQueryOptions } from "../types";
+import { isInArray } from "../utils/is-in-array";
 import {
     Neo4jGraphQLAuthenticationError,
     Neo4jGraphQLConstraintValidationError,
@@ -49,6 +50,8 @@ import {
 
 const debug = Debug(DEBUG_EXECUTE);
 
+const SUPPORTED_CYPHER_VERSION = "5";
+
 interface DriverLike {
     session(config);
 }
@@ -107,7 +110,6 @@ export class Executor {
     }: ExecutorConstructorParam) {
         this.executionContext = executionContext;
         this.cypherQueryOptions = cypherQueryOptions;
-        this.cypherQueryOptions = cypherQueryOptions;
         this.sessionConfig = sessionConfig;
         this.cypherParams = cypherParams;
         this.transactionMetadata = transactionMetadata;
@@ -173,16 +175,34 @@ export class Executor {
         return error;
     }
 
-    private generateQuery(query: string): string {
-        if (this.cypherQueryOptions && Object.keys(this.cypherQueryOptions).length) {
-            const cypherQueryOptions = `CYPHER ${Object.entries(this.cypherQueryOptions)
-                .map(([key, value]) => `${key}=${value}`)
-                .join(" ")}`;
+    private addCypherOptionsToQuery(query: string): string {
+        const cypherVersion = this.getCypherVersionStatement();
+
+        const cypherQueryOptions = this.getCypherQueryOptionsStatement();
+
+        return `${cypherVersion}${cypherQueryOptions}${query}`;
+    }
 
-            return `${cypherQueryOptions}\n${query}`;
+    private getCypherVersionStatement(): string {
+        if (this.cypherQueryOptions?.addVersionPrefix) {
+            return `CYPHER ${SUPPORTED_CYPHER_VERSION}\n`;
         }
+        return "";
+    }
 
-        return query;
+    private getCypherQueryOptionsStatement(): string {
+        const ignoredCypherQueryOptions: Array<keyof CypherQueryOptions> = ["addVersionPrefix"];
+        const cypherQueryOptions = Object.entries(this.cypherQueryOptions ?? []).filter(([key, _value]) => {
+            return !isInArray(ignoredCypherQueryOptions, key);
+        });
+        if (cypherQueryOptions.length) {
+            return `CYPHER ${cypherQueryOptions
+                .map(([key, value]) => {
+                    return `${key}=${value}`;
+                })
+                .join(" ")}\n`;
+        }
+        return "";
     }
 
     private getTransactionConfig(info?: GraphQLResolveInfo): TransactionConfig {
@@ -276,7 +296,7 @@ export class Executor {
         parameters: Record<string, any>,
         transaction: Transaction | ManagedTransaction
     ): Result {
-        const queryToRun = this.generateQuery(query);
+        const queryToRun = this.addCypherOptionsToQuery(query);
 
         debugCypherAndParams(debug, queryToRun, parameters);
 

packages/graphql/src/translate/translate-resolve-reference.ts

@@ -18,11 +18,11 @@
  */
 
 import type Cypher from "@neo4j/cypher-builder";
-import type { Neo4jGraphQLTranslationContext } from "../types/neo4j-graphql-translation-context";
 import Debug from "debug";
-import { QueryASTFactory } from "./queryAST/factory/QueryASTFactory";
-import type { EntityAdapter } from "../schema-model/entity/EntityAdapter";
 import { DEBUG_TRANSLATE } from "../constants";
+import type { EntityAdapter } from "../schema-model/entity/EntityAdapter";
+import type { Neo4jGraphQLTranslationContext } from "../types/neo4j-graphql-translation-context";
+import { QueryASTFactory } from "./queryAST/factory/QueryASTFactory";
 
 const debug = Debug(DEBUG_TRANSLATE);
 

packages/graphql/src/types/index.ts

@@ -276,6 +276,7 @@ export interface CypherQueryOptions {
     operatorEngine?: "default" | "interpreted" | "compiled";
     interpretedPipesFallback?: "default" | "disabled" | "whitelisted_plans_only" | "all";
     replan?: "default" | "force" | "skip";
+    addVersionPrefix?: boolean;
 }
 
 /** Input field for graphql-compose */

packages/graphql/tests/e2e/subscriptions/authorization/global-authentication.e2e.test.ts

@@ -48,7 +48,7 @@ describe("Subscription global authentication", () => {
         let server: TestGraphQLServer;
         let wsClient: WebSocketTestClient;
 
-        beforeAll(async () => {
+        beforeEach(async () => {
             const neoSchema = await testHelper.initNeo4jGraphQL({
                 typeDefs,
                 features: {
@@ -71,9 +71,6 @@ describe("Subscription global authentication", () => {
 
         afterEach(async () => {
             await wsClient.close();
-        });
-
-        afterAll(async () => {
             await testHelper.close();
             await server.close();
         });
@@ -123,7 +120,7 @@ describe("Subscription global authentication", () => {
         let server: TestGraphQLServer;
         let wsClient: WebSocketTestClient;
 
-        beforeAll(async () => {
+        beforeEach(async () => {
             const neoSchema = await testHelper.initNeo4jGraphQL({
                 typeDefs,
                 features: {
@@ -146,9 +143,6 @@ describe("Subscription global authentication", () => {
 
         afterEach(async () => {
             await wsClient.close();
-        });
-
-        afterAll(async () => {
             await testHelper.close();
             await server.close();
         });
@@ -198,7 +192,7 @@ describe("Subscription global authentication", () => {
         let server: TestGraphQLServer;
         let wsClient: WebSocketTestClient;
 
-        beforeAll(async () => {
+        beforeEach(async () => {
             const neoSchema = await testHelper.initNeo4jGraphQL({
                 typeDefs,
                 features: {
@@ -221,9 +215,6 @@ describe("Subscription global authentication", () => {
 
         afterEach(async () => {
             await wsClient.close();
-        });
-
-        afterAll(async () => {
             await testHelper.close();
             await server.close();
         });