Merge remote-tracking branch 'origin/6.x' into remove-deprecated-upda…

…te-input
neo4j · Oct 10, 2024 · 7b9fa90 · 7b9fa90
2 parents 27ccc71 + 8206edd
commit 7b9fa90
Show file tree

Hide file tree

Showing 348 changed files with 5,568 additions and 36,620 deletions.
diff --git a/.changeset/blue-sloths-enjoy.md b/.changeset/blue-sloths-enjoy.md
@@ -1,6 +1,5 @@
 ---
 "@neo4j/graphql": major
-"@neo4j/graphql-ogm": major
 "@neo4j/introspector": major
 ---
 

diff --git a/.changeset/calm-garlics-smash.md b/.changeset/calm-garlics-smash.md
@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": major
+---
+
+Remove aggregation filters which are not actually aggregation filters, which were deprecated in 5.x.
diff --git a/.changeset/clever-mice-pay.md b/.changeset/clever-mice-pay.md
@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": major
+---
+
+Remove deprecated relationship filters without suffix. Queries which previously used these should migrate over to `_SOME` filters.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -2,7 +2,7 @@
     "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
     "changelog": ["@changesets/changelog-github", { "repo": "neo4j/graphql" }],
     "commit": false,
-    "fixed": [["@neo4j/graphql", "@neo4j/graphql-ogm"]],
+    "fixed": [["@neo4j/graphql"]],
     "linked": [],
     "access": "public",
     "baseBranch": "dev",

diff --git a/.changeset/dry-dots-scream.md b/.changeset/dry-dots-scream.md
@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": major
+---
+
+Remove no-op option to remove `stringAggregation` deprecated fields.
diff --git a/.changeset/fair-eagles-shave.md b/.changeset/fair-eagles-shave.md
diff --git a/.changeset/fast-timers-remain.md b/.changeset/fast-timers-remain.md
@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": major
+---
+
+The deprecated `bookmark` field has been removed due to bookmarks now be handled internally by the database driver.
diff --git a/.changeset/lovely-toys-tan.md b/.changeset/lovely-toys-tan.md
@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": major
+---
+
+The deprecated `options` argument of `assertIndexesAndConstraints` has been removed. Database migrations are outside of the scope of the Neo4j GraphQL Library, and all indexes and constraints will have to be managed manually.
diff --git a/.changeset/lucky-icons-marry.md b/.changeset/lucky-icons-marry.md
diff --git a/.changeset/wild-boar-pay.md b/.changeset/wild-boar-pay.md
@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": major
+---
+
+Removed deprecated string aggregation filters as `name_SHORTEST_GT` in favor of the `_LENGTH` version: `name_SHORTEST_LENGTH_GT`.
diff --git a/.changeset/wild-knives-yawn.md b/.changeset/wild-knives-yawn.md
@@ -1,6 +1,5 @@
 ---
 "@neo4j/graphql": major
-"@neo4j/graphql-ogm": major
 ---
 
 The Neo4j GraphQL Library now requires Node.js 20 or greater.
diff --git a/.changeset/wild-terms-pay.md b/.changeset/wild-terms-pay.md
@@ -0,0 +1,5 @@
+---
+"@neo4j/graphql": major
+---
+
+Removed `aggregationFilters` from  `excludeDeprecatedFields` settings. 
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -17,9 +17,6 @@ labels:
   - label: graphql
     files:
       - packages/graphql/src/.*
-  - label: ogm
-    files:
-      - packages/ogm/src/.*
   - label: introspector
     files:
       - packages/introspector/src/.*
diff --git a/.github/workflows/changesets.yml b/.github/workflows/changesets.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           fetch-depth: 0
           persist-credentials: false

diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           repository: neo-technology/whitelist-check
           token: ${{ secrets.NEO4J_TEAM_GRAPHQL_PERSONAL_ACCESS_TOKEN }}

diff --git a/.github/workflows/lint-github-actions.yml b/.github/workflows/lint-github-actions.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: reviewdog/action-actionlint@7eeec1dd160c2301eb28e1568721837d084558ad # v1.57.0
         with:
           reporter: github-check

diff --git a/.github/workflows/lint-markdown.yml b/.github/workflows/lint-markdown.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*

diff --git a/.github/workflows/performance-tests.yml b/.github/workflows/performance-tests.yml
@@ -29,7 +29,7 @@ jobs:
           node-version: lts/*
 
       - name: Target Branch - Check out
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           ref: ${{ github.base_ref }}
           fetch-depth: 0
@@ -71,7 +71,7 @@ jobs:
           NEO_URL: bolt://localhost:7687
 
       - name: PR Branch - Check out
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           ref: ${{ github.ref }}
           clean: false
@@ -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/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: 18.13.0
@@ -45,7 +45,7 @@ jobs:
       typescript_files: ${{ steps.filter.outputs.typescript_files }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: filter
         with:
@@ -61,7 +61,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
         with:
           go-version: "^1.17.0"

diff --git a/.github/workflows/reusable-api-library-tests.yml b/.github/workflows/reusable-api-library-tests.yml
@@ -38,7 +38,7 @@ jobs:
           - 7687:7687
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*
@@ -67,7 +67,7 @@ jobs:
           - 7687:7687
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*
@@ -81,7 +81,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*
@@ -92,7 +92,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-aura-tests.yml b/.github/workflows/reusable-aura-tests.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
         with:
           ref: ${{ inputs.BRANCH || github.ref }}
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
@@ -56,14 +56,12 @@ jobs:
       matrix:
         package:
           - graphql
-          # - introspector  # Skipped as all tests require CREATE DATABASE at the moment
-          - ogm
 
     runs-on: ubuntu-latest
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*

diff --git a/.github/workflows/reusable-codeql-analysis.yml b/.github/workflows/reusable-codeql-analysis.yml
@@ -9,14 +9,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         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
@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*
@@ -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
@@ -45,7 +45,6 @@ jobs:
         ]
         packages:
           [
-            { package: "ogm", shard: 1/1, coverage_name: 1 },
             { package: "introspector", shard: 1/1, coverage_name: 2 },
             { package: "graphql", shard: 1/4, coverage_name: 3 },
             { package: "graphql", shard: 2/4, coverage_name: 4 },
@@ -74,7 +73,7 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - name: Setting up Node.js with version ${{ matrix.node.name }}
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
@@ -114,7 +113,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 +129,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
@@ -15,7 +15,6 @@ jobs:
       matrix:
         packages:
           [
-            { package: "ogm", shard: 1/1, coverage_name: 1 },
             { package: "introspector", shard: 1/1, coverage_name: 2 },
             { package: "graphql", shard: 1/4, coverage_name: 3 }, 
             { package: "graphql", shard: 2/4, coverage_name: 4 },
@@ -50,7 +49,7 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*
@@ -70,7 +69,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 }}/
@@ -81,7 +80,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-package-tests.yml b/.github/workflows/reusable-package-tests.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: 18.13.0

diff --git a/.github/workflows/reusable-subscriptions-plugin-amqp-e2e-test.yml b/.github/workflows/reusable-subscriptions-plugin-amqp-e2e-test.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
         with:
           node-version: lts/*
@@ -54,7 +54,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/
@@ -64,7 +64,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-*