Fixes cypher 25 check for semver servers (#508)

Author: anderson4j

packages/language-support/src/index.ts

@@ -24,14 +24,13 @@ export { lintCypherQuery } from './syntaxValidation/syntaxValidation';
 export type { SyntaxDiagnostic } from './syntaxValidation/syntaxValidation';
 export { testData } from './tests/testData';
 export { textMateGrammar } from './textMateGrammar';
-export { cypherVersions } from './types';
+export { allCypherVersions } from './types';
 export type {
   CompletionItem,
   CypherVersion,
   Neo4jFunction,
   Neo4jProcedure,
 } from './types';
-export { cypher25Supported } from './version';
 export { CypherLexer, CypherParser, CypherParserListener, CypherParserVisitor };
 
 import CypherLexer from './generated-parser/CypherCmdLexer';

packages/language-support/src/parserWrapper.ts

@@ -31,7 +31,11 @@ import {
 } from './helpers';
 import { SyntaxDiagnostic } from './syntaxValidation/syntaxValidation';
 import { SyntaxErrorsListener } from './syntaxValidation/syntaxValidationHelpers';
-import { CypherVersion, cypherVersionNumbers, cypherVersions } from './types';
+import {
+  CypherVersion,
+  cypherVersionNumbers,
+  allCypherVersions,
+} from './types';
 
 export interface ParsedStatement {
   command: ParsedCommand;
@@ -494,7 +498,7 @@ class CypherVersionCollector extends ParseTreeListener {
   exitEveryRule(ctx: unknown) {
     if (ctx instanceof CypherVersionContext) {
       const parsedVersion = 'CYPHER ' + ctx.getText();
-      cypherVersions.forEach((validVersion) => {
+      allCypherVersions.forEach((validVersion) => {
         if (parsedVersion === validVersion) {
           this.cypherVersion = parsedVersion;
         }

packages/language-support/src/tests/version.test.ts

@@ -7,9 +7,9 @@ export type ReturnDescription = {
   isDeprecated: boolean;
 };
 
-export const cypherVersions = ['CYPHER 5', 'CYPHER 25'];
+export const allCypherVersions = ['CYPHER 5', 'CYPHER 25'];
 export const cypherVersionNumbers: string[] = ['5', '25'];
-export type CypherVersion = (typeof cypherVersions)[number];
+export type CypherVersion = (typeof allCypherVersions)[number];
 
 // we could parse this string for better types in the future
 export type Neo4jStringType = string;

packages/language-support/src/types.ts

@@ -1,8 +1,7 @@
 import type { CypherVersion } from '@neo4j-cypher/language-support';
 import {
   _internalFeatureFlags,
-  cypher25Supported,
-  cypherVersions,
+  allCypherVersions,
   DbSchema,
   Neo4jFunction,
   Neo4jProcedure,
@@ -115,14 +114,13 @@ export class ConnectedMetadataPoller extends MetadataPoller {
   constructor(
     databases: Database[],
     parameters: Record<string, unknown>,
-    serverVersion: string | undefined,
+    serverCypherVersions: string[] | undefined,
     private readonly connection: Neo4jConnection,
     private readonly events: EventEmitter,
   ) {
     super();
     const supportsCypherAnnotation =
-      _internalFeatureFlags.cypher25 ||
-      (serverVersion && cypher25Supported(serverVersion));
+      _internalFeatureFlags.cypher25 || serverCypherVersions?.includes('25');
 
     this.dbSchema.parameters = parameters;
 
@@ -183,7 +181,7 @@ export class ConnectedMetadataPoller extends MetadataPoller {
     });
 
     const versions: (CypherVersion | undefined)[] = supportsCypherAnnotation
-      ? cypherVersions
+      ? allCypherVersions
       : [undefined];
 
     versions.forEach((cypherVersion) => {

packages/language-support/src/version.ts

@@ -12,12 +12,46 @@ export function getVersion(): ExecuteQueryArgs<{
   const resultTransformer = resultTransformers.mappedResultTransformer({
     map(record) {
       const obj = record.toObject();
+      const name = obj.name as string;
       const versions = obj.versions as string[];
-      const version = versions?.at(0);
-      return version;
+      return { name, versions };
     },
-    collect(versions, summary) {
-      return { serverVersion: versions.at(0), summary };
+    collect(rows, summary) {
+      rows.forEach((row) => {
+        if (row.name === 'Neo4j Kernel') {
+          return { serverVersion: row.versions, summary };
+        }
+      });
+      //We should not reach this unless the "name" field changes
+      return { serverVersion: undefined, summary };
+    },
+  });
+
+  return {
+    query,
+    queryConfig: { resultTransformer, routing: 'READ', database: 'system' },
+  };
+}
+
+export function getCypherVersions(): ExecuteQueryArgs<{
+  serverCypherVersions: string[] | undefined;
+}> {
+  const query = 'CALL dbms.components() YIELD name, versions';
+
+  const resultTransformer = resultTransformers.mappedResultTransformer({
+    map(record) {
+      const obj = record.toObject();
+      const name = obj.name as string;
+      const versions = obj.versions as string[];
+      return { name, versions };
+    },
+    collect(rows, summary) {
+      rows.forEach((row) => {
+        if (row.name === 'Cypher') {
+          return { serverCypherVersions: row.versions, summary };
+        }
+      });
+      return { serverCypherVersions: ['5'], summary };
     },
   });
 

packages/query-tools/src/metadataPoller.ts

@@ -13,7 +13,7 @@ import {
 } from './metadataPoller';
 import { Neo4jConnection } from './neo4jConnection';
 import { listDatabases } from './queries/databases.js';
-import { getVersion } from './queries/version';
+import { getCypherVersions } from './queries/version';
 
 export type ConnnectionResult = {
   success: boolean;
@@ -180,18 +180,18 @@ export class Neo4jSchemaPoller {
       database,
     );
 
-    const { query: versionQuery, queryConfig: versionQueryConfig } =
-      getVersion();
-    const { serverVersion } = await this.driver.executeQuery(
-      versionQuery,
+    const { query: cypherVersionQuery, queryConfig: cypherVersionQueryConfig } =
+      getCypherVersions();
+    const { serverCypherVersions } = await this.driver.executeQuery(
+      cypherVersionQuery,
       {},
-      versionQueryConfig,
+      cypherVersionQueryConfig,
     );
 
     this.metadata = new ConnectedMetadataPoller(
       databases,
       this.parameters,
-      serverVersion,
+      serverCypherVersions,
       this.connection,
       this.events,
     );