Merge branch 'dev' into reproduce-bug-5635

neo4j · Oct 9, 2024 · 9be3a96 · 9be3a96
2 parents 8a33784 + 59ccc39
commit 9be3a96
Show file tree

Hide file tree

Showing 39 changed files with 444 additions and 444 deletions.
diff --git a/.changeset/fair-eagles-shave.md b/.changeset/fair-eagles-shave.md
diff --git a/.changeset/lucky-icons-marry.md b/.changeset/lucky-icons-marry.md
diff --git a/.changeset/modern-pugs-film.md b/.changeset/modern-pugs-film.md
@@ -0,0 +1,41 @@
+---
+"@neo4j/graphql": minor
+---
+
+Remove connection wrapper on vector queries.
+
+_Previous:_
+
+```graphql
+query MovieVectorQuery($vector: [Float!]!) {
+    myVectorQuery(vector: $vector) {
+        moviesConnection {
+            edges {
+                cursor
+                score
+                node {
+                    title
+                }
+            }
+        }
+    }
+}
+```
+
+_Now:_
+
+```graphql
+query MovieVectorQuery($vector: [Float!]!) {
+    myVectorQuery(vector: $vector) {
+        edges {
+            cursor
+            score
+            node {
+                title
+            }
+        }
+    }
+}
+```
+
+Vector index is now a stable feature.
diff --git a/.changeset/olive-phones-speak.md b/.changeset/olive-phones-speak.md
diff --git a/.github/workflows/performance-tests.yml b/.github/workflows/performance-tests.yml
@@ -119,7 +119,7 @@ jobs:
         working-directory: packages/graphql
 
       - name: Archive performance test results
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: performance
           path: packages/graphql/performance/
diff --git a/.github/workflows/reusable-api-library-tests.yml b/.github/workflows/reusable-api-library-tests.yml
@@ -94,7 +94,7 @@ jobs:
         run: yarn --cwd packages/graphql run test:schema --coverage
       - if: ${{ !inputs.disable-coverage-archival }}
         name: Archive coverage report
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: api-library-coverage-graphql
           path: packages/graphql/coverage/
diff --git a/.github/workflows/reusable-codeql-analysis.yml b/.github/workflows/reusable-codeql-analysis.yml
@@ -14,9 +14,9 @@ jobs:
         with:
           node-version: lts/*
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3
+        uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
         with:
           config-file: ./.github/codeql/codeql-config.yml
           languages: javascript
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3
+        uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
diff --git a/.github/workflows/reusable-federation-tests.yml b/.github/workflows/reusable-federation-tests.yml
@@ -39,7 +39,7 @@ jobs:
           mkdir prnumber
           echo "$PULL_REQUEST_NUMBER" > ./prnumber/prnumber
       - name: Archive PR number
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: prnumber
           path: prnumber/
diff --git a/.github/workflows/reusable-integration-tests-on-prem-nightly.yml b/.github/workflows/reusable-integration-tests-on-prem-nightly.yml
@@ -114,7 +114,7 @@ jobs:
           NEO_URL: neo4j://localhost:7687
       - if: ${{ !inputs.disable-coverage-archival && matrix.packages.package == 'graphql' }}
         name: Archive coverage report
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: integration-nightly-coverage-${{ matrix.packages.package }}-${{ matrix.graphql-version.coverage_path }}-${{ matrix.packages.coverage_name }}-${{ matrix.node.coverage_name }}
           path: packages/${{ matrix.packages.package }}/coverage-nightly-${{ matrix.graphql-version.coverage_path }}/
@@ -130,7 +130,7 @@ jobs:
     steps:
       - if: ${{ !inputs.disable-coverage-archival }}
         name: Merge Artifacts
-        uses: actions/upload-artifact/merge@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact/merge@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: integration-nightly-coverage
           pattern: integration-nightly-coverage-*
diff --git a/.github/workflows/reusable-integration-tests-on-prem.yml b/.github/workflows/reusable-integration-tests-on-prem.yml
@@ -72,7 +72,7 @@ jobs:
           NEO_URL: bolt://localhost:7687
       - if: ${{ !inputs.disable-coverage-archival && matrix.packages.package == 'graphql' }}
         name: Archive coverage report
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: integration-coverage-${{ matrix.packages.package }}-${{ matrix.neo4j-version }}-${{ matrix.graphql-version.coverage_path }}-${{ matrix.packages.coverage_name }}
           path: packages/${{ matrix.packages.package }}/coverage-${{ matrix.neo4j-version }}-${{ matrix.graphql-version.coverage_path }}/
@@ -83,7 +83,7 @@ jobs:
     steps:
       - if: ${{ !inputs.disable-coverage-archival }}
         name: Merge Artifacts
-        uses: actions/upload-artifact/merge@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact/merge@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: integration-coverage
           pattern: integration-coverage-*
diff --git a/.github/workflows/reusable-subscriptions-plugin-amqp-e2e-test.yml b/.github/workflows/reusable-subscriptions-plugin-amqp-e2e-test.yml
@@ -56,7 +56,7 @@ jobs:
           RABBITMQ_USER: guest
           RABBITMQ_PASSWORD: guest
       - name: Archive coverage report
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: e2e-coverage-graphql-amqp-subscriptions-engine-${{ matrix.graphql-version }}-${{ matrix.neo4j-version }}
           path: packages/graphql-amqp-subscriptions-engine/coverage/
@@ -66,7 +66,7 @@ jobs:
     needs: e2e-tests
     steps:
       - name: Merge Artifacts
-        uses: actions/upload-artifact/merge@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact/merge@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: e2e-coverage-graphql-amqp-subscriptions-engine
           pattern: e2e-coverage-graphql-amqp-subscriptions-engine-*
diff --git a/.github/workflows/reusable-unit-tests.yml b/.github/workflows/reusable-unit-tests.yml
@@ -34,7 +34,7 @@ jobs:
         working-directory: packages/${{ matrix.package }}
       - if: ${{ !inputs.disable-coverage-archival && matrix.package == 'graphql' }}
         name: Archive coverage report
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
         with:
           name: unit-coverage-${{ matrix.package }}
           path: packages/${{ matrix.package }}/coverage/
diff --git a/packages/apollo-federation-subgraph-compatibility/package.json b/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": "^5.7.1",
+        "@neo4j/graphql": "^5.8.0",
         "graphql": "16.9.0",
         "graphql-tag": "^2.12.6",
         "neo4j-driver": "^5.8.0"

diff --git a/packages/graphql-amqp-subscriptions-engine/package.json b/packages/graphql-amqp-subscriptions-engine/package.json
@@ -40,7 +40,7 @@
         "@types/cors": "2.8.17",
         "@types/debug": "4.1.12",
         "@types/jest": "29.5.13",
-        "@types/node": "20.16.10",
+        "@types/node": "20.16.11",
         "camelcase": "6.3.0",
         "graphql-ws": "5.16.0",
         "jest": "29.7.0",

diff --git a/packages/graphql/CHANGELOG.md b/packages/graphql/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @neo4j/graphql
 
+## 5.8.0
+
+### Minor Changes
+
+-   [#5619](https://github.com/neo4j/graphql/pull/5619) [`142bc0a`](https://github.com/neo4j/graphql/commit/142bc0af7c36e0190d42710d3d4f0f480602672f) Thanks [@mjfwebb](https://github.com/mjfwebb)! - Add cypher filtering on lists of scalars
+
+### Patch Changes
+
+-   [#5632](https://github.com/neo4j/graphql/pull/5632) [`3c69066`](https://github.com/neo4j/graphql/commit/3c690668e6cab959b6af598c29477dd77f8807cc) Thanks [@darrellwarde](https://github.com/darrellwarde)! - The `options` argument of `assertIndexesAndConstraints` has been deprecated and the creation of indexes and constraints will no longer be support in the next major version of the library.
+
+-   [#5606](https://github.com/neo4j/graphql/pull/5606) [`e4ac1d8`](https://github.com/neo4j/graphql/commit/e4ac1d86009f520eacce26f83585e3fb57cb01ac) Thanks [@angrykoala](https://github.com/angrykoala)! - Fix delete operations inside updates for unions
+
+-   [#5616](https://github.com/neo4j/graphql/pull/5616) [`b7552f8`](https://github.com/neo4j/graphql/commit/b7552f8151d22ae3e4b4e04f4d168128600ebfa8) Thanks [@angrykoala](https://github.com/angrykoala)! - Fix cardinality validation on nested unions
+
 ## 5.7.1
 
 ### Patch Changes

diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@neo4j/graphql",
-    "version": "5.7.1",
+    "version": "5.8.0",
     "description": "A GraphQL to Cypher query execution layer for Neo4j and JavaScript GraphQL implementations",
     "keywords": [
         "neo4j",
@@ -47,7 +47,7 @@
         "@types/is-uuid": "1.0.2",
         "@types/jest": "29.5.13",
         "@types/jsonwebtoken": "9.0.7",
-        "@types/node": "20.16.10",
+        "@types/node": "20.16.11",
         "@types/pluralize": "0.0.33",
         "@types/randomstring": "1.3.0",
         "@types/semver": "7.5.8",

diff --git a/packages/graphql/src/classes/Neo4jGraphQL.ts b/packages/graphql/src/classes/Neo4jGraphQL.ts
@@ -166,6 +166,9 @@ class Neo4jGraphQL {
     }: {
         driver?: Driver;
         sessionConfig?: Neo4jGraphQLSessionConfig;
+        /**
+         * @deprecated The ability to create indexes and constraints will be removed in version 6.0.0
+         */
         options?: AssertIndexesAndConstraintsOptions;
     } = {}): Promise<void> {
         if (!(this.executableSchema || this.subgraphSchema)) {

diff --git a/packages/graphql/src/schema-model/entity/model-adapters/ConcreteEntityOperations.ts b/packages/graphql/src/schema-model/entity/model-adapters/ConcreteEntityOperations.ts
@@ -40,7 +40,6 @@ type FulltextTypeNames = {
 };
 
 type VectorTypeNames = {
-    result: string;
     connection: string;
     edge: string;
     where: string;
@@ -107,7 +106,6 @@ export class ConcreteEntityOperations extends ImplementingEntityOperations<Concr
 
     public get vectorTypeNames(): VectorTypeNames {
         return {
-            result: `${this.pascalCaseSingular}VectorResult`,
             connection: `${this.pascalCasePlural}VectorConnection`,
             edge: `${this.pascalCaseSingular}VectorEdge`,
             where: `${this.pascalCaseSingular}VectorWhere`,

diff --git a/packages/graphql/src/schema/generation/vector-input.ts b/packages/graphql/src/schema/generation/vector-input.ts
@@ -76,7 +76,7 @@ export function withVectorResultTypeConnection({
     composer: SchemaComposer;
     concreteEntityAdapter: ConcreteEntityAdapter;
 }): ObjectTypeComposer {
-    const typeName = concreteEntityAdapter.operations.vectorTypeNames.result;
+    const typeName = concreteEntityAdapter.operations.vectorTypeNames.connection;
     if (composer.has(typeName)) {
         return composer.getOTC(typeName);
     }
@@ -91,19 +91,13 @@ export function withVectorResultTypeConnection({
     });
 
     const connection = composer.createObjectTC({
-        name: concreteEntityAdapter.operations.vectorTypeNames.connection,
+        name: typeName,
         fields: {
             totalCount: new GraphQLNonNull(GraphQLInt),
             pageInfo: new GraphQLNonNull(PageInfo),
             edges: edge.NonNull.List.NonNull,
         },
     });
 
-    const result = composer.createObjectTC({
-        name: typeName,
-        fields: {
-            [concreteEntityAdapter.operations.rootTypeFieldNames.connection]: connection.NonNull,
-        },
-    });
-    return result;
+    return connection;
 }
diff --git a/packages/graphql/src/schema/resolvers/query/vector.ts b/packages/graphql/src/schema/resolvers/query/vector.ts
@@ -78,11 +78,9 @@ export function vectorResolver({
         });
 
         return {
-            [entityAdapter.operations.rootTypeFieldNames.connection]: {
-                totalCount,
-                edges: connection.edges,
-                pageInfo: connection.pageInfo,
-            },
+            totalCount,
+            edges: connection.edges,
+            pageInfo: connection.pageInfo,
         };
     };
 }
diff --git a/packages/graphql/src/translate/queryAST/factory/Operations/VectorFactory.ts b/packages/graphql/src/translate/queryAST/factory/Operations/VectorFactory.ts
@@ -55,20 +55,13 @@ export class VectorFactory {
         });
 
         let scoreField: ScoreField | undefined;
-        const vectorResultField = resolveTree.fieldsByTypeName[entity.operations.vectorTypeNames.result];
-        if (!vectorResultField) {
+        const vectorConnectionFields = resolveTree.fieldsByTypeName[entity.operations.vectorTypeNames.connection];
+
+        if (!vectorConnectionFields) {
             throw new Error("Vector result field not found");
         }
 
-        const filteredResolveTree = findFieldsByNameInFieldsByTypeNameField(
-            vectorResultField,
-            entity.operations.rootTypeFieldNames.connection
-        )[0]!;
-        // Adds the args to the nested resolve tree for vector
-        filteredResolveTree.args = resolveTree.args;
-
-        const connectionFields = getFieldsByTypeName(filteredResolveTree, entity.operations.vectorTypeNames.connection);
-        const filteredResolveTreeEdges = findFieldsByNameInFieldsByTypeNameField(connectionFields, "edges");
+        const filteredResolveTreeEdges = findFieldsByNameInFieldsByTypeNameField(vectorConnectionFields, "edges");
         const edgeFields = getFieldsByTypeName(filteredResolveTreeEdges, entity.operations.vectorTypeNames.edge);
         const scoreFields = findFieldsByNameInFieldsByTypeNameField(edgeFields, "score");
 
@@ -97,11 +90,11 @@ export class VectorFactory {
             whereArgs: resolveTreeWhere,
         });
 
-        this.addScoreSort(operation, filteredResolveTree, context);
+        this.addScoreSort(operation, resolveTree, context);
 
         this.queryASTFactory.operationsFactory.hydrateConnectionOperation({
             target: entity,
-            resolveTree: filteredResolveTree,
+            resolveTree: resolveTree,
             context,
             operation,
             whereArgs: resolveTreeWhere,

diff --git a/...phql/tests/integration/directives/cypher/filtering/cypher-filtering-list-auth.int.test.ts b/...phql/tests/integration/directives/cypher/filtering/cypher-filtering-list-auth.int.test.ts
@@ -161,14 +161,14 @@ describe("cypher directive filtering - List Auth", () => {
 
         expect(gqlResult.errors).toBeFalsy();
         expect(gqlResult?.data).toEqual({
-            [Movie.plural]: [
+            [Movie.plural]: expect.toIncludeSameMembers([
                 {
                     custom_field: ["a", "b", "c"],
                 },
                 {
                     custom_field: ["bbb", "a", "bbb"],
                 },
-            ],
+            ]),
         });
     });