diff --git a/packages/lint-worker/package.json b/packages/lint-worker/package.json index 86bb3178d..9c4ed4fab 100644 --- a/packages/lint-worker/package.json +++ b/packages/lint-worker/package.json @@ -18,7 +18,7 @@ "cypher", "lint worker" ], - "version": "0.1.0-next.0", + "version": "1.9.0", "repository": { "type": "git", "url": "git://github.com/neo4j/cypher-language-support.git" @@ -34,7 +34,7 @@ "@neo4j-cypher/language-support": "workspace:*", "@neo4j-cypher/query-tools": "workspace:*", "languageSupport-next.13": "npm:@neo4j-cypher/language-support@2.0.0-next.13", - "languageSupport-next.8": "npm:@neo4j-cypher/language-support@2.0.0-next.8", + "languageSupport-next.22": "npm:@neo4j-cypher/language-support@2.0.0-next.22", "vscode-languageserver": "^8.1.0", "vscode-languageserver-types": "^3.17.3", "workerpool": "^9.0.4", diff --git a/packages/lint-worker/src/lintWorker.ts b/packages/lint-worker/src/lintWorker.ts index 970de4a2f..58597d976 100644 --- a/packages/lint-worker/src/lintWorker.ts +++ b/packages/lint-worker/src/lintWorker.ts @@ -6,20 +6,20 @@ import { DbSchema, lintCypherQuery as _lintCypherQuery, _internalFeatureFlags, -} from '@neo4j-cypher/language-support'; +} from 'languageSupport-next.22'; import workerpool from 'workerpool'; function lintCypherQuery( query: string, dbSchema, featureFlags: { consoleCommands?: boolean } = {}, -): { diagnostics: SyntaxDiagnostic[]; symbolTables: SymbolTable[] } { +): { diagnostics: SyntaxDiagnostic[]; symbolTables?: SymbolTable[] } { // We allow to override the consoleCommands feature flag if (featureFlags.consoleCommands !== undefined) { _internalFeatureFlags.consoleCommands = featureFlags.consoleCommands; } //cast to appease git lint check - return _lintCypherQuery(query, dbSchema as DbSchema); + return { diagnostics: _lintCypherQuery(query, dbSchema as DbSchema) }; } workerpool.worker({ lintCypherQuery }); diff --git a/packages/vscode-extension/syntaxes/cypher.json b/packages/vscode-extension/syntaxes/cypher.json index 301982a54..17b77cf5b 100644 --- a/packages/vscode-extension/syntaxes/cypher.json +++ b/packages/vscode-extension/syntaxes/cypher.json @@ -38,7 +38,7 @@ "name": "keyword.operator" }, { - "match": "(?i)\\b(ACCESS|ACTIVE|ADD|ADMIN|ADMINISTRATOR|ALIAS|ALIASES|ALL|ALLREDUCE|allShortestPaths|ALTER|AND|ANY|ARRAY|AS|ASC|ASCENDING|ASSIGN|AT|AUTH|BINDINGS|BOOL|BOOLEAN|BOOSTED|BOTH|BREAK|BUILT|BY|CALL|CASCADE|CASE|CIDR|CHANGE|COLLECT|COMMAND|COMMANDS|COMPOSITE|CONSTRAINT|CONSTRAINTS|CONTAINS|CONTINUE|COPY|COUNT|CREATE|CSV|CONCURRENT|CURRENT|DATA|DATABASE|DATABASES|DATE|DATETIME|DBMS|DEALLOCATE|DEFAULT|DEFINED|DELETE|DENY|DESC|DESCENDING|DESTROY|DETACH|DIFFERENT|DISTINCT|DRIVER|DROP|DRYRUN|DUMP|DURATION|EACH|EDGE|ELEMENT|ELEMENTS|ELSE|ENABLE|ENCRYPTED|END|ENDS|ERROR|EXECUTABLE|EXECUTE|EXIST|EXISTENCE|EXISTS|EXTENDED_IDENTIFIER|FAIL|FALSE|FIELDTERMINATOR|FILTER|FINISH|FLOAT|FLOAT32|FLOAT64|FOR|FOREACH|FROM|FULLTEXT|FUNCTION|FUNCTIONS|GRANT|GRAPH|GRAPHS|GROUP|GROUPS|HEADERS|HOME|ID|IF|IMMUTABLE|IMPERSONATE|IMPLIES|IN|INDEX|INDEXES|INF|INFINITY|INSERT|INT|INT8|INT16|INT32|INT64|INTEGER|INTEGER8|INTEGER16|INTEGER32|INTEGER64|IS|JOIN|KEY|LABEL|LABELS|LANGUAGE|LEADING|LET|LIMIT|LIST|LOAD|LOCAL|LOOKUP|MANAGEMENT|MAP|MATCH|MERGE|NAME|NAMES|NAN|NEW|NEXT|NFC|NFD|NFKC|NFKD|NODE|NODETACH|NODES|NONE|NORMALIZE|NORMALIZED|NOT|NOTHING|NOWAIT|NULL|OF|OFFSET|ON|ONLY|OPTION|OPTIONAL|OPTIONS|OR|ORDER|PASSWORD|PASSWORDS|PATH|PATHS|PLAINTEXT|POINT|POPULATED|PRIMARY|PRIMARIES|PRIVILEGE|PRIVILEGES|PROCEDURE|PROCEDURES|PROPERTIES|PROPERTY|PROVIDER|PROVIDERS|RANGE|READ|REALLOCATE|REDUCE|REL|RELATIONSHIP|RELATIONSHIPS|REMOVE|RENAME|REPEATABLE|REPLACE|REPLICA|REPLICAS|REPORT|REQUIRE|REQUIRED|RESTRICT|RETRY|RETURN|REVOKE|ROLE|ROLES|ROW|ROWS|SCAN|SECONDARY|SECONDARIES|SEC|SECOND|SECONDS|SEEK|SERVER|SERVERS|SET|SETTING|SETTINGS|SHARD|SHARDS|SHORTEST|shortestPath|SHOW|SIGNED|SINGLE|SKIP|START|STARTS|STATUS|STOP|VARCHAR|STRING|SUPPORTED|SUSPENDED|TARGET|TERMINATE|TEXT|THEN|TIME|TIMESTAMP|TIMEZONE|TO|TOPOLOGY|TRAILING|TRANSACTION|TRANSACTIONS|TRAVERSE|TRIM|TRUE|TYPE|TYPED|TYPES|UNION|UNIQUE|UNIQUENESS|UNWIND|URL|USE|USER|USERS|USING|VALUE|VECTOR|VERTEX|WAIT|WHEN|WHERE|WITH|WITHOUT|WRITE|XOR|YIELD|ZONE|ZONED|EXPLAIN|PROFILE|CYPHER)\\b", + "match": "(?i)\\b(ACCESS|ACTIVE|ADD|ADMIN|ADMINISTRATOR|ALIAS|ALIASES|ALL|ALLREDUCE|allShortestPaths|ALTER|AND|ANY|ARRAY|AS|ASC|ASCENDING|ASSIGN|AT|AUTH|BINDINGS|BOOL|BOOLEAN|BOOSTED|BOTH|BREAK|BUILT|BY|CALL|CASCADE|CASE|CIDR|CHANGE|COLLECT|COMMAND|COMMANDS|COMPOSITE|CONSTRAINT|CONSTRAINTS|CONTAINS|CONTINUE|COPY|COSINE|COUNT|CREATE|CSV|CONCURRENT|CURRENT|DATA|DATABASE|DATABASES|DATE|DATETIME|DBMS|DEALLOCATE|DEFAULT|DEFINED|DELETE|DENY|DESC|DESCENDING|DESTROY|DETACH|DIFFERENT|DISTINCT|DOT|DRIVER|DROP|DRYRUN|DUMP|DURATION|EACH|EDGE|ELEMENT|ELEMENTS|ELSE|ENABLE|ENCRYPTED|END|ENDS|ERROR|EUCLIDEAN|EUCLIDEAN_SQUARED|EXECUTABLE|EXECUTE|EXIST|EXISTENCE|EXISTS|EXTENDED_IDENTIFIER|FAIL|FALSE|FIELDTERMINATOR|FILTER|FINISH|FLOAT|FLOAT32|FLOAT64|FOR|FOREACH|FROM|FULLTEXT|FUNCTION|FUNCTIONS|GRANT|GRAPH|GRAPHS|GROUP|GROUPS|HAMMING|HEADERS|HOME|ID|IF|IMMUTABLE|IMPERSONATE|IMPLIES|IN|INDEX|INDEXES|INF|INFINITY|INSERT|INT|INT8|INT16|INT32|INT64|INTEGER|INTEGER8|INTEGER16|INTEGER32|INTEGER64|IS|JOIN|KEY|LABEL|LABELS|LANGUAGE|LEADING|LET|LIMIT|LIST|LOAD|LOCAL|LOOKUP|MANAGEMENT|MANHATTAN|MAP|MATCH|MERGE|NAME|NAMES|NAN|NEW|NEXT|NFC|NFD|NFKC|NFKD|NODE|NODETACH|NODES|NONE|NORMALIZE|NORMALIZED|NOT|NOTHING|NOWAIT|NULL|OF|OFFSET|ON|ONLY|OPTION|OPTIONAL|OPTIONS|OR|ORDER|PASSWORD|PASSWORDS|PATH|PATHS|PLAINTEXT|POINT|POPULATED|PRIMARY|PRIMARIES|PRIVILEGE|PRIVILEGES|PROCEDURE|PROCEDURES|PROPERTIES|PROPERTY|PROVIDER|PROVIDERS|RANGE|READ|REALLOCATE|REDUCE|REL|RELATIONSHIP|RELATIONSHIPS|REMOVE|RENAME|REPEATABLE|REPLACE|REPLICA|REPLICAS|REPORT|REQUIRE|REQUIRED|RESTRICT|RETRY|RETURN|REVOKE|ROLE|ROLES|ROW|ROWS|SCAN|SECONDARY|SECONDARIES|SEC|SECOND|SECONDS|SEEK|SERVER|SERVERS|SET|SETTING|SETTINGS|SHARD|SHARDS|SHORTEST|shortestPath|SHOW|SIGNED|SINGLE|SKIP|START|STARTS|STATUS|STOP|VARCHAR|STRING|SUPPORTED|SUSPENDED|TARGET|TERMINATE|TEXT|THEN|TIME|TIMESTAMP|TIMEZONE|TO|TOPOLOGY|TRAILING|TRANSACTION|TRANSACTIONS|TRAVERSE|TRIM|TRUE|TYPE|TYPED|TYPES|UNION|UNIQUE|UNIQUENESS|UNWIND|URL|USE|USER|USERS|USING|VALUE|VECTOR|VECTOR_DISTANCE|VECTOR_NORM|VERTEX|WAIT|WHEN|WHERE|WITH|WITHOUT|WRITE|XOR|YIELD|ZONE|ZONED|EXPLAIN|PROFILE|CYPHER)\\b", "name": "keyword" } ] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a05a8ebb7..c2c29bf05 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -142,9 +142,9 @@ importers: languageSupport-next.13: specifier: npm:@neo4j-cypher/language-support@2.0.0-next.13 version: '@neo4j-cypher/language-support@2.0.0-next.13' - languageSupport-next.8: - specifier: npm:@neo4j-cypher/language-support@2.0.0-next.8 - version: '@neo4j-cypher/language-support@2.0.0-next.8' + languageSupport-next.22: + specifier: npm:@neo4j-cypher/language-support@2.0.0-next.22 + version: '@neo4j-cypher/language-support@2.0.0-next.22' vscode-languageserver: specifier: ^8.1.0 version: 8.1.0 @@ -1410,9 +1410,10 @@ packages: resolution: {integrity: sha512-csi1nmY3PfEJEpGrxALmSi6LU8fewgTCMRHYk5yGWT5IFUh2q/b2Q3XqAIblbgAkRoggzkA/9dRoiGq76Ug6eA==} engines: {node: '>=18.18.2'} - '@neo4j-cypher/language-support@2.0.0-next.8': - resolution: {integrity: sha512-dl4kNU+i8hbMgKSIGWX/Lzeg5vEst9wDPz172OA3XQ3HNGkwlSBxAqauVgA9EUIX+7Ujhgptzz49cZMuAe5KtQ==} - engines: {node: '>=18.18.2'} + '@neo4j-cypher/language-support@2.0.0-next.22': + resolution: {integrity: sha512-Hy95tLzD7euHFScUvEMnDg5dwGhW19oU137VVTowmczUawjr6v4fF/abD0oyVdXYnffzV7Zx+MSMy2Qm6FyuVQ==} + engines: {node: '>=22.15.0'} + hasBin: true '@neo4j-devtools/word-color@0.0.8': resolution: {integrity: sha512-0fC2PXU1M0wL72lVil/2JnUccpEoPaiNJsNAc8fgRUysVeZ/OLKFvZAeOnufJ4X5OKkImaL1lvoGyhfKfOKfzw==} @@ -8533,10 +8534,9 @@ snapshots: fastest-levenshtein: 1.0.16 vscode-languageserver-types: 3.17.5 - '@neo4j-cypher/language-support@2.0.0-next.8': + '@neo4j-cypher/language-support@2.0.0-next.22': dependencies: antlr4: 4.13.2 - antlr4-c3: 3.4.4 fastest-levenshtein: 1.0.16 vscode-languageserver-types: 3.17.5 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index d18c80f7a..cec54d564 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,4 +3,4 @@ packages: - vendor/* catalog: neo4j-driver: 5.12.0 - +registry: http://localhost:4873/