Merge branch '6.x' into breaking/remove-create-indexes

.changeset/blue-sloths-enjoy.md

@@ -1,6 +1,5 @@
 ---
 "@neo4j/graphql": major
-"@neo4j/graphql-ogm": major
 "@neo4j/introspector": major
 ---
 

.changeset/calm-garlics-smash.md

@@ -1,6 +1,5 @@
 ---
 "@neo4j/graphql": major
-"@neo4j/graphql-ogm": major
 ---
 
 Remove aggregation filters which are not actually aggregation filters, which were deprecated in 5.x.

.changeset/clever-mice-pay.md

@@ -1,6 +1,5 @@
 ---
 "@neo4j/graphql": major
-"@neo4j/graphql-ogm": major
 ---
 
 Remove deprecated relationship filters without suffix. Queries which previously used these should migrate over to `_SOME` filters.

.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",

.changeset/fast-timers-remain.md

@@ -1,6 +1,5 @@
 ---
 "@neo4j/graphql": major
-"@neo4j/graphql-ogm": major
 ---
 
 The deprecated `bookmark` field has been removed due to bookmarks now be handled internally by the database driver.

.changeset/lovely-toys-tan.md

@@ -1,6 +1,5 @@
 ---
 "@neo4j/graphql": major
-"@neo4j/graphql-ogm": 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.

.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.

.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/.*

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

@@ -56,8 +56,6 @@ jobs:
       matrix:
         package:
           - graphql
-          # - introspector  # Skipped as all tests require CREATE DATABASE at the moment
-          - ogm
 
     runs-on: ubuntu-latest
 

.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 },

.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 },

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

@@ -15,7 +15,6 @@ jobs:
       matrix:
         package:
           - graphql
-          - ogm
           - introspector
           - graphql-amqp-subscriptions-engine
 

.github/workflows/sonarcloud.yml

@@ -14,7 +14,6 @@ jobs:
         package:
           - graphql
           - introspector
-          - ogm
 
     runs-on: ubuntu-latest
 

Dockerfile

@@ -7,7 +7,6 @@ COPY yarn.lock .
 COPY .yarnrc.yml .
 COPY ./.yarn/ /app/.yarn/
 COPY packages/graphql/package.json /app/packages/graphql/
-COPY packages/ogm/package.json /app/packages/ogm/
 COPY packages/package-tests/package.json /app/packages/package-tests/
 
 RUN yarn

README.md

@@ -54,8 +54,6 @@ visit the [Contributing Guide](./CONTRIBUTING.md).
 
 * [`@neo4j/graphql`](./packages/graphql) - Familiar GraphQL generation, for usage
    with an API such as [Apollo Server](https://www.apollographql.com/docs/apollo-server/)
-* [`@neo4j/graphql-ogm`](./packages/ogm) - Use GraphQL Type Definitions to drive
-   interactions with the database
 * [`@neo4j/introspector`](./packages/introspector) - Introspect schema from an existing Neo4j database
 * [`@neo4j/graphql-toolbox`](https://www.github.com/neo4j/graphql-toolbox) - Experiment with your Neo4j GraphQL API on Neo4j Desktop.
 

docs/contributing/DEVELOPING.md

@@ -56,9 +56,9 @@ yarn install
 [Visual Studio Code](https://code.visualstudio.com/) comes highly recommended
 for working in this repository, and we additionally recommend the following extensions:
 
--   [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
--   [Jest](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest)
--   [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+* [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+* [Jest](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest)
+* [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
 
 The Jest extension should automatically detect the tests for this repository and
 watch them in the Status Bar.
@@ -69,16 +69,16 @@ In some cases, it may be worth testing `@neo4j/graphql` with a local version of
 
 In the Cypher Builder folder run:
 
--   `yarn link`
--   `yarn build` - This step needs to be done each time a change is done in the Cypher Builder
+* `yarn link`
+* `yarn build` - This step needs to be done each time a change is done in the Cypher Builder
 
 In the root of the `neo4j/graphql` monorepo run:
 
--   `yarn link -p [path-to-local-cypher-builder]
+* `yarn link -p [path-to-local-cypher-builder]
 
 To unlink, in the graphql project:
 
--   `yarn unlink @neo4j/cypher-builder`
+* `yarn unlink @neo4j/cypher-builder`
 
 ## Testing
 
@@ -107,7 +107,7 @@ following command:
 NEO_URL=neo4j://localhost:7687 NEO_USER=neo4j NEO_PASSWORD=password yarn test
 ```
 
-The above command can additionally be run from `packages/graphql`, `packages/ogm`,
+The above command can additionally be run from `packages/graphql`,
 or any directory where there is a `jest.config.js` file!
 
 Alternatively, you can put these environment variables in a `.env` file in the
@@ -119,7 +119,7 @@ NEO_USER=neo4j
 NEO_PASSWORD=password
 ```
 
-The above command can additionally be run from `packages/graphql`, `packages/ogm`,
+The above command can additionally be run from `packages/graphql`,
 or any directory where there is a `jest.config.js` file!
 
 Additionally, for projects which have the appropriate Yarn scripts setup, you can
@@ -228,8 +228,8 @@ adhere to our linting and formatting rules.
 For the sake of completeness, add an entry for the new project into the following
 files in the root of the repository:
 
--   `tsconfig.json` (`references` entry)
--   `jest.config.base.js` (`moduleNameMapper` entry)
+* `tsconfig.json` (`references` entry)
+* `jest.config.base.js` (`moduleNameMapper` entry)
 
 ### Dependencies within the monorepo
 
@@ -268,10 +268,10 @@ like:
 
 The real key entries here are:
 
--   `baseUrl` - for all of the relative references in this file, this will tell
+* `baseUrl` - for all of the relative references in this file, this will tell
     `tsc` where to start from
--   `paths` - this will translate `import` statements in code to the relative dependency
--   `references` - gives TypeScript "permission" to accesss the projects at these paths
+* `paths` - this will translate `import` statements in code to the relative dependency
+* `references` - gives TypeScript "permission" to accesss the projects at these paths
 
 Finally, it is highly likely that Jest will also need access to this internal
 dependency, so `packages/project/jest.config.js` will need to look like:

jest.config.base.js

@@ -17,9 +17,7 @@ module.exports = {
     moduleNameMapper: {
         "@neo4j/graphql/dist/types": "<rootDir>/packages/graphql/src/types",
         "@neo4j/introspector(.*)$": "<rootDir>/packages/introspector/src/$1",
-        "@neo4j/graphql-ogm(.*)$": "<rootDir>/packages/ogm/src/$1",
-        "@neo4j/graphql-amqp-subscriptions-engine(.*)$":
-            "<rootDir>/packages/graphql-amqp-subscriptions-engine/src/$1",
+        "@neo4j/graphql-amqp-subscriptions-engine(.*)$": "<rootDir>/packages/graphql-amqp-subscriptions-engine/src/$1",
         "@neo4j/graphql(.*)$": "<rootDir>/packages/graphql/src/$1",
     },
     snapshotFormat: {

jest.config.js

@@ -5,7 +5,6 @@ module.exports = {
     projects: [
         "<rootDir>/packages/graphql/jest.config.js",
         "<rootDir>/packages/introspector/jest.config.js",
-        "<rootDir>/packages/ogm/jest.config.js",
         "<rootDir>/packages/graphql-amqp-subscriptions-engine/jest.config.js",
     ],
     coverageDirectory: "<rootDir>/coverage/",

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.8.0",
+        "@neo4j/graphql": "^5.9.0",
         "graphql": "16.9.0",
         "graphql-tag": "^2.12.6",
         "neo4j-driver": "^5.8.0"

packages/graphql/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @neo4j/graphql
 
+## 5.9.0
+
+### Minor Changes
+
+-   [#5633](https://github.com/neo4j/graphql/pull/5633) [`cfa296b`](https://github.com/neo4j/graphql/commit/cfa296babdee3e8bcdb3f6a4eb2250bedc6debc4) Thanks [@angrykoala](https://github.com/angrykoala)! - 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.
+
+### Patch Changes
+
+-   [#5647](https://github.com/neo4j/graphql/pull/5647) [`9feeda9`](https://github.com/neo4j/graphql/commit/9feeda99961292537096fb30e76871a3d27e1d6d) Thanks [@MacondoExpress](https://github.com/MacondoExpress)! - Fix a bug that causes an invalid Cypher generated for authorization filters in the connectOrCreate operation.
+
 ## 5.8.0
 
 ### Minor Changes

packages/graphql/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@neo4j/graphql",
-    "version": "5.8.0",
+    "version": "5.9.0",
     "description": "A GraphQL to Cypher query execution layer for Neo4j and JavaScript GraphQL implementations",
     "keywords": [
         "neo4j",