@neo4j-cypher/query-tools 2.0.0-next.29 → 2.0.0-next.31

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@neo4j-cypher/query-tools",
+  "version": "2.0.0-next.31",
   "description": "",
-  "author": "Neo4j Inc.",
+  "bugs": {
+    "url": "https://github.com/neo4j/cypher-language-support/issues"
+  },
   "license": "Apache-2.0",
-  "version": "2.0.0-next.29",
+  "author": "Neo4j Inc.",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/neo4j/cypher-language-support.git"
+  },
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",
   "types": "./dist/types/src/index.d.ts",
@@ -15,29 +22,22 @@
       "default": "./dist/cjs/src/index.js"
     }
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/neo4j/cypher-language-support.git"
-  },
-  "bugs": {
-    "url": "https://github.com/neo4j/cypher-language-support/issues"
-  },
-  "engineStrict": true,
-  "engines": {
-    "node": ">=24.11.1"
-  },
   "dependencies": {
     "ajv": "^8.12.0",
     "neo4j-driver": "6.0.1",
-    "@neo4j-cypher/language-support": "2.0.0-next.29"
+    "@neo4j-cypher/language-support": "2.0.0-next.31"
   },
   "devDependencies": {
     "@testcontainers/neo4j": "^11.5.1"
   },
+  "engines": {
+    "node": ">=24.11.1"
+  },
+  "engineStrict": true,
   "scripts": {
     "build": "concurrently 'npm:build-esm' 'npm:build-commonjs' 'npm:build-types'",
     "build-esm": "tsc --module esnext --outDir dist/esm",
-    "build-commonjs": "tsc --module commonjs --outDir dist/cjs",
+    "build-commonjs": "tsc --module commonjs --moduleResolution node --outDir dist/cjs",
     "build-types": "tsc --emitDeclarationOnly --outDir dist/types",
     "dev": "concurrently 'npm:build-esm -- --watch' 'npm:build-commonjs -- --watch'",
     "clean": "rm -rf {dist,tsconfig.tsbuildinfo}",

package/src/cypher-execution/extract-unique-nodes-and-relationships.test.ts

@@ -2,7 +2,7 @@ import type { Record } from 'neo4j-driver';
 import { Node, Path, PathSegment, Relationship } from 'neo4j-driver';
 
 import { describe, expect, test } from 'vitest';
-import { extractUniqueNodesAndRels } from './extract-unique-nodes-and-relationships';
+import { extractUniqueNodesAndRels } from './extract-unique-nodes-and-relationships.js';
 
 describe('extractNodesAndRels', () => {
   test('should map bolt records with a path to nodes and relationships', () => {
@@ -156,7 +156,9 @@ describe('extractNodesAndRels', () => {
 
     const { nodes, relationships, limitHit } = extractUniqueNodesAndRels(
       [boltRecord],
-      { nodeLimit: 1 },
+      {
+        nodeLimit: 1,
+      },
     );
     expect(limitHit).toBe(true);
     expect(nodes.length).toBe(1);

package/src/cypher-execution/extract-unique-nodes-and-relationships.ts

@@ -7,7 +7,7 @@ import type {
   Relationship,
 } from 'neo4j-driver';
 import { isNode, isPath, isRelationship } from 'neo4j-driver';
-import { CypherProperty } from '../types/cypher-data-types';
+import { CypherProperty } from '../types/cypher-data-types.js';
 
 export type Properties = RecordShape<string, CypherProperty>;
 

package/src/data-transforms/cypher-type-names.ts

@@ -16,11 +16,11 @@ import {
 import type {
   CypherDataType,
   CypherProperty,
-} from '../types/cypher-data-types';
+} from '../types/cypher-data-types.js';
 import {
   isCypherBasicPropertyType,
   isInt8Array,
-} from '../types/cypher-data-types';
+} from '../types/cypher-data-types.js';
 
 type CypherPropertyName =
   | 'Float'

package/src/data-transforms/record-to-string.ts

@@ -13,13 +13,13 @@ import {
 import type {
   CypherDataType,
   CypherProperty,
-} from '../types/cypher-data-types';
+} from '../types/cypher-data-types.js';
 import {
   isCypherPropertyType,
   isCypherTemporalType,
   isInt8Array,
-} from '../types/cypher-data-types';
-import { formatFloat } from './format-float';
+} from '../types/cypher-data-types.js';
+import { formatFloat } from './format-float.js';
 
 export const spacialFormat = (p: Point): string => {
   const zString = p.z !== undefined ? `, z:${formatFloat(p.z)}` : '';
@@ -34,9 +34,7 @@ export function propertyToString(
   localeFormattedDates = false,
 ): string {
   if (Array.isArray(property)) {
-    return `[${property
-      .map((p) => propertyToString(p, quoteStrings))
-      .join(', ')}]`;
+    return `[${property.map((p) => propertyToString(p, quoteStrings)).join(', ')}]`;
   }
 
   if (property === null) {
@@ -72,6 +70,7 @@ export function propertyToString(
 
   if (typeof property === 'string') {
     if (quoteStrings) {
+      // oxlint-disable-next-line typescript-eslint/restrict-template-expressions
       return `"${property}"`;
     }
     return property;

package/src/index.ts

@@ -1,24 +1,27 @@
-export { FRIENDLY_ERROR_MESSAGES } from './connectionErrorHandler';
-export type { ConnectionError } from './connectionErrorHandler';
-export * from './cypher-execution/extract-unique-nodes-and-relationships';
-export * from './cypher-execution/query-result';
-export type { Neo4jType } from './cypher-execution/query-result';
+export { FRIENDLY_ERROR_MESSAGES } from './connectionErrorHandler.js';
+export type { ConnectionError } from './connectionErrorHandler.js';
+export * from './cypher-execution/extract-unique-nodes-and-relationships.js';
+export * from './cypher-execution/query-result.js';
+export type { Neo4jType } from './cypher-execution/query-result.js';
 export {
   getCypherTypeName,
   getPropertyTypeDisplayName,
-} from './data-transforms/cypher-type-names';
-export type { CypherDataTypeName } from './data-transforms/cypher-type-names';
-export * from './data-transforms/record-to-string';
-export * from './types/cypher-data-types';
+} from './data-transforms/cypher-type-names.js';
+export type { CypherDataTypeName } from './data-transforms/cypher-type-names.js';
+export * from './data-transforms/record-to-string.js';
+export * from './types/cypher-data-types.js';
 export type {
   ConnectedMetadataPoller as CypherMetadataPoller,
   DisconnectedMetadataPoller as EmptyMetadataPoller,
   MetadataPoller,
-} from './metadataPoller';
-export type { Neo4jConnection, QueryResultWithLimit } from './neo4jConnection';
-export type { Database } from './queries/databases';
-export { graphResultTransformer } from './result-transformers/graph-result-transformer';
-export { Neo4jSchemaPoller } from './schemaPoller';
-export type { ConnnectionResult } from './schemaPoller';
-export type { CypherDataType } from './types/cypher-data-types';
-export { getVersion } from './queries/version';
+} from './metadataPoller.js';
+export type {
+  Neo4jConnection,
+  QueryResultWithLimit,
+} from './neo4jConnection.js';
+export type { Database } from './queries/databases.js';
+export { graphResultTransformer } from './result-transformers/graph-result-transformer.js';
+export { Neo4jSchemaPoller } from './schemaPoller.js';
+export type { ConnnectionResult } from './schemaPoller.js';
+export type { CypherDataType } from './types/cypher-data-types.js';
+export { getVersion } from './queries/version.js';

package/src/integration-tests/pollingIntegrationTests.test.ts

@@ -1,11 +1,11 @@
 import { auth, Driver, driver, Session } from 'neo4j-driver';
-import { createAndStartTestContainer } from './setupTestContainer';
+import { createAndStartTestContainer } from './setupTestContainer.js';
 import { StartedNeo4jContainer } from '@testcontainers/neo4j';
 import {
   extractRelationshipsWithNamedNodes,
   GraphSchema,
   validateGraphSchema,
-} from '../queries/graphSchema';
+} from '../queries/graphSchema.js';
 
 describe('Polling integration', () => {
   let session: Session;

package/src/metadataPoller.ts

@@ -250,10 +250,18 @@ export class ConnectedMetadataPoller extends MetadataPoller {
     await Promise.allSettled([
       this.databases.refetch(),
       this.dataSummary.refetch(),
-      this.graphSchema.refetch(),
       ...Object.values(this.procedures).map((version) => version?.refetch()),
       ...Object.values(this.functions).map((version) => version?.refetch()),
     ]);
+    if (
+      this.dbSchema.labels &&
+      this.dbSchema.relationshipTypes &&
+      this.dbSchema.labels.length + this.dbSchema.relationshipTypes.length < 200
+    ) {
+      await this.graphSchema.refetch();
+    } else {
+      this.dbSchema.graphSchema = undefined;
+    }
     this.events.emit('schemaFetched');
   }
 

package/src/neo4jConnection.ts

@@ -8,7 +8,7 @@ import {
 } from 'neo4j-driver';
 import { version } from '../package.json';
 import { Database } from './queries/databases.js';
-import { ExecuteQueryArgs, QueryType } from './types/sdkTypes';
+import { ExecuteQueryArgs, QueryType } from './types/sdkTypes.js';
 
 const METADATA_BASE = {
   app: 'neo4j-sdk',
@@ -167,7 +167,7 @@ export class Neo4jConnection {
           const result = tx.run(query, {});
           return await queryConfig.resultTransformer(result);
         },
-        { metadata: { ...METADATA_BASE, type: queryType } },
+        { timeout: 500, metadata: { ...METADATA_BASE, type: queryType } },
       );
     } finally {
       await session.close();

package/src/queries/dataSummary.ts

@@ -1,5 +1,5 @@
 import { resultTransformers } from 'neo4j-driver';
-import { ExecuteQueryArgs } from '../types/sdkTypes';
+import { ExecuteQueryArgs } from '../types/sdkTypes.js';
 
 export type DataSummary = {
   labels: string[];

package/src/queries/databases.ts

@@ -1,6 +1,6 @@
 import type { CypherVersion } from '@neo4j-cypher/language-support';
 import { resultTransformers } from 'neo4j-driver';
-import { ExecuteQueryArgs, DbType } from '../types/sdkTypes';
+import { ExecuteQueryArgs, DbType } from '../types/sdkTypes.js';
 
 export type DatabaseStatus =
   | 'online'

package/src/queries/functions.ts

@@ -1,7 +1,10 @@
 import { CypherVersion, Neo4jFunction } from '@neo4j-cypher/language-support';
 import Ajv, { JSONSchemaType } from 'ajv';
 import { resultTransformers } from 'neo4j-driver';
-import { cleanType, cleanTypeDescription } from '../data-transforms/clean-type';
+import {
+  cleanType,
+  cleanTypeDescription,
+} from '../data-transforms/clean-type.js';
 import type { ExecuteQueryArgs } from '../types/sdkTypes.js';
 
 type ListFunctionArgs = {

package/src/queries/graphSchema.ts

@@ -1,5 +1,5 @@
 import { resultTransformers } from 'neo4j-driver';
-import { ExecuteQueryArgs } from '../types/sdkTypes';
+import { ExecuteQueryArgs } from '../types/sdkTypes.js';
 import Ajv, { JSONSchemaType } from 'ajv';
 
 export type NeoNode = {

package/src/queries/procedures.ts

@@ -1,8 +1,8 @@
 import { CypherVersion, Neo4jProcedure } from '@neo4j-cypher/language-support';
 import Ajv, { JSONSchemaType } from 'ajv';
 import { resultTransformers } from 'neo4j-driver';
-import { cleanTypeDescription } from '../data-transforms/clean-type';
-import type { ExecuteQueryArgs } from '../types/sdkTypes';
+import { cleanTypeDescription } from '../data-transforms/clean-type.js';
+import type { ExecuteQueryArgs } from '../types/sdkTypes.js';
 
 type ListProcedureArgs = {
   executableByMe: boolean;

package/src/queries/version.ts

@@ -1,5 +1,5 @@
 import { resultTransformers } from 'neo4j-driver';
-import { ExecuteQueryArgs } from '../types/sdkTypes';
+import { ExecuteQueryArgs } from '../types/sdkTypes.js';
 
 /**
  * Get dbms version

package/src/result-transformers/graph-result-transformer.ts

@@ -8,7 +8,7 @@ import {
 import {
   DeduplicatedNodesAndRels,
   extractUniqueNodesAndRels,
-} from '../cypher-execution/extract-unique-nodes-and-relationships';
+} from '../cypher-execution/extract-unique-nodes-and-relationships.js';
 
 /**
  * Result type for graph queries that includes deduplicated nodes and relationships

package/src/schemaPoller.ts

@@ -5,15 +5,15 @@ import {
   FRIENDLY_ERROR_MESSAGES,
   getConnectionError,
   isRetriableNeo4jError,
-} from './connectionErrorHandler';
+} from './connectionErrorHandler.js';
 import {
   ConnectedMetadataPoller,
   DisconnectedMetadataPoller,
   MetadataPoller,
-} from './metadataPoller';
-import { Neo4jConnection } from './neo4jConnection';
+} from './metadataPoller.js';
+import { Neo4jConnection } from './neo4jConnection.js';
 import { listDatabases } from './queries/databases.js';
-import { getVersion } from './queries/version';
+import { getVersion } from './queries/version.js';
 
 export type ConnnectionResult = {
   success: boolean;
@@ -168,7 +168,7 @@ export class Neo4jSchemaPoller {
         );
         return ['5', '25'];
       }
-    } catch (e) {
+    } catch {
       return ['5'];
     }
 
@@ -247,7 +247,10 @@ export class Neo4jSchemaPoller {
     const driver = neo4j.driver(
       url,
       neo4j.auth.basic(credentials.username, credentials.password),
-      { userAgent: config.appName, ...config.driverConfig },
+      {
+        userAgent: config.appName,
+        ...config.driverConfig,
+      },
     );
 
     await driver.verifyConnectivity({ database: database });
@@ -323,9 +326,7 @@ export class Neo4jSchemaPoller {
     retriable: boolean,
   ): ConnectionError {
     const friendlyMessage = retriable
-      ? `${connectionError.friendlyMessage}. Retrying in ${
-          RETRY_INTERVAL_MS / 1000
-        } seconds`
+      ? `${connectionError.friendlyMessage}. Retrying in ${RETRY_INTERVAL_MS / 1000} seconds`
       : connectionError.friendlyMessage;
 
     return {

package/src/types/cypher-data-types.ts

@@ -25,7 +25,7 @@ import {
 } from 'neo4j-driver';
 type NumberOrInteger = number | Integer | bigint;
 
-/** 
+/**
       The neo4j driver type mapping - https://neo4j.com/docs/javascript-manual/current/cypher-workflow/#js-driver-type-mapping
       
       Star denotes custom driver class.

package/tsconfig.json

@@ -3,6 +3,8 @@
   "include": ["src", "package.json", "vitest.config.mts"],
   "compilerOptions": {
     "strict": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
     "resolveJsonModule": true,
     "types": ["vitest/globals"]
   }