Merge branch 'dev' into addCypherVersion

neo4j · Jan 24, 2025 · 04ed78a · 04ed78a
2 parents 4e14680 + fc7d823
commit 04ed78a
Show file tree

Hide file tree

Showing 11 changed files with 513 additions and 515 deletions.
diff --git a/.changeset/beige-beds-push.md b/.changeset/beige-beds-push.md
diff --git a/.changeset/fluffy-schools-promise.md b/.changeset/fluffy-schools-promise.md
diff --git a/.changeset/friendly-pigs-wait.md b/.changeset/friendly-pigs-wait.md
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -36,16 +36,6 @@ module.exports = {
                 project: "./**/tsconfig.json",
             },
             rules: {
-                "comma-dangle": "off",
-                "@typescript-eslint/comma-dangle": [
-                    "error",
-                    {
-                        ...commaDangle,
-                        enums: "always-multiline",
-                        generics: "always-multiline",
-                        tuples: "never", // Removed due to conflict with prettier
-                    },
-                ],
                 "@typescript-eslint/ban-ts-comment": ["error", { "ts-ignore": "allow-with-description" }],
                 "@typescript-eslint/restrict-template-expressions": "off",
                 "@typescript-eslint/no-explicit-any": "off",

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

diff --git a/packages/graphql/CHANGELOG.md b/packages/graphql/CHANGELOG.md
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@neo4j/graphql",
-    "version": "6.2.3",
+    "version": "6.3.0",
     "description": "A GraphQL to Cypher query execution layer for Neo4j and JavaScript GraphQL implementations",
     "keywords": [
         "neo4j",

diff --git a/packages/graphql/src/classes/Neo4jDatabaseInfo.test.ts b/packages/graphql/src/classes/Neo4jDatabaseInfo.test.ts
@@ -29,4 +29,9 @@ describe("Neo4jDatabaseInfo", () => {
             return new Neo4jDatabaseInfo("this_seems_not_valid", "enterprise");
         }).toThrow();
     });
+
+    test("should accept CalVar", () => {
+        const dbInfo = new Neo4jDatabaseInfo("2025.01.0-aura", "enterprise");
+        expect(dbInfo).toBeInstanceOf(Neo4jDatabaseInfo);
+    });
 });
diff --git a/packages/graphql/src/classes/Neo4jDatabaseInfo.ts b/packages/graphql/src/classes/Neo4jDatabaseInfo.ts
@@ -29,6 +29,8 @@ export class Neo4jDatabaseInfo {
     public edition: Neo4jEdition | undefined;
 
     constructor(version: string, edition?: Neo4jEdition) {
+        // Quick hack to support CalVar
+        version = version.replace(/\.0([0-9]+)/, ".$1");
         this.version = this.toSemVer(version);
         this.rawVersion = version;
         this.edition = edition;

diff --git a/packages/graphql/src/schema-model/attribute/model-adapters/MathAdapter.ts b/packages/graphql/src/schema-model/attribute/model-adapters/MathAdapter.ts
@@ -31,8 +31,10 @@ export class MathAdapter {
 
     getMathOperations(): string[] {
         const operations = [this.getAdd(), this.getSubtract()];
-        this.AttributeAdapter.typeHelper.isFloat() && operations.push(this.getMultiply());
-        this.AttributeAdapter.typeHelper.isFloat() && operations.push(this.getDivide());
+        if (this.AttributeAdapter.typeHelper.isFloat()) {
+            operations.push(this.getMultiply());
+            operations.push(this.getDivide());
+        }
         return operations;
     }
 

diff --git a/yarn.lock b/yarn.lock
@@ -2095,7 +2095,7 @@ __metadata:
   languageName: node
   linkType: soft
 
-"@neo4j/graphql@npm:^6.2.2, @neo4j/graphql@npm:^6.2.3, @neo4j/graphql@workspace:packages/graphql":
+"@neo4j/graphql@npm:^6.2.2, @neo4j/graphql@npm:^6.3.0, @neo4j/graphql@workspace:packages/graphql":
   version: 0.0.0-use.local
   resolution: "@neo4j/graphql@workspace:packages/graphql"
   dependencies:
@@ -3822,7 +3822,7 @@ __metadata:
     "@apollo/federation-subgraph-compatibility": "npm:2.2.0"
     "@apollo/server": "npm:^4.7.0"
     "@graphql-tools/wrap": "npm:^10.0.0"
-    "@neo4j/graphql": "npm:^6.2.3"
+    "@neo4j/graphql": "npm:^6.3.0"
     fork-ts-checker-webpack-plugin: "npm:9.0.2"
     graphql: "npm:16.10.0"
     graphql-tag: "npm:^2.12.6"