@neo4j-cypher/language-server 2.0.0-next.21 → 2.0.0-next.22

package/package.json

@@ -16,7 +16,7 @@
     "cypher",
     "language server"
   ],
-  "version": "2.0.0-next.21",
+  "version": "2.0.0-next.22",
   "main": "./dist/server.js",
   "types": "src/server.ts",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "engineStrict": true,
   "engines": {
-    "node": ">=18.18.2"
+    "node": ">=22.15.0"
   },
   "bin": {
     "cypher-language-server": "./dist/cypher-language-server"
@@ -39,16 +39,19 @@
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8",
     "workerpool": "^9.0.4",
-    "@neo4j-cypher/language-support": "2.0.0-next.20",
-    "@neo4j-cypher/query-tools": "2.0.0-next.20"
+    "@neo4j-cypher/language-support": "2.0.0-next.21",
+    "@neo4j-cypher/query-tools": "2.0.0-next.21",
+    "@neo4j-cypher/lint-worker": "2025.4.1-next.0"
   },
   "devDependencies": {
-    "@types/lodash.debounce": "^4.0.9"
+    "@types/lodash.debounce": "^4.0.9",
+    "copyfiles": "^2.4.1"
   },
   "scripts": {
-    "build": "tsc -b && pnpm bundle && pnpm make-executable && pnpm bundle-worker",
+    "build": "tsc -b && pnpm bundle && pnpm make-executable && pnpm copy-lint-worker",
+    "copy-lint-worker": "copyfiles -u 4 ../lint-worker/dist/cjs/lintWorker.cjs dist/",
     "bundle": "esbuild ./src/server.ts --bundle --format=cjs --platform=node --outfile=dist/cypher-language-server.js --minify --conditions=require",
-    "bundle-worker": "esbuild ./src/lintWorker.ts --bundle --format=cjs --platform=node --conditions=require --outfile=dist/lintWorker.js --minify",
+    "dev": "tsc --watch",
     "make-executable": "cd dist && echo '#!/usr/bin/env node' > cypher-language-server && cat cypher-language-server.js >> cypher-language-server",
     "clean": "rm -rf {dist,tsconfig.tsbuildinfo}"
   }

package/src/formatting.ts

@@ -16,7 +16,7 @@ export const formatDocument = (
   }
 
   const text = document.getText();
-  const formattedText = formatQuery(text);
+  const formattedText = formatQuery(text).formattedQuery;
 
   if (text === formattedText) {
     return [];

package/src/linting.ts

@@ -5,9 +5,9 @@ import { join } from 'path';
 import { Diagnostic } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import workerpool from 'workerpool';
-import { LinterTask, LintWorker } from './lintWorker';
+import type { LinterTask, LintWorker } from '@neo4j-cypher/lint-worker';
 
-const pool = workerpool.pool(join(__dirname, 'lintWorker.js'), {
+const pool = workerpool.pool(join(__dirname, 'lintWorker.cjs'), {
   minWorkers: 2,
   workerTerminateTimeout: 2000,
 });

package/src/lintWorker.ts

@@ -1,31 +0,0 @@
-import {
-  DbSchema,
-  lintCypherQuery as _lintCypherQuery,
-  _internalFeatureFlags,
-} from '@neo4j-cypher/language-support';
-import workerpool from 'workerpool';
-
-function lintCypherQuery(
-  query: string,
-  dbSchema: DbSchema,
-  featureFlags: { consoleCommands?: boolean; cypher25?: boolean } = {},
-) {
-  // We allow to override the consoleCommands feature flag
-  if (featureFlags.consoleCommands !== undefined) {
-    _internalFeatureFlags.consoleCommands = featureFlags.consoleCommands;
-  }
-  if (featureFlags.cypher25 !== undefined) {
-    _internalFeatureFlags.cypher25 = featureFlags.cypher25;
-  }
-  return _lintCypherQuery(query, dbSchema);
-}
-
-workerpool.worker({ lintCypherQuery });
-
-type LinterArgs = Parameters<typeof lintCypherQuery>;
-
-export type LinterTask = workerpool.Promise<ReturnType<typeof lintCypherQuery>>;
-
-export type LintWorker = {
-  lintCypherQuery: (...args: LinterArgs) => LinterTask;
-};