Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mocharc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"loader": "ts-node/esm",
"node-option": ["loader=ts-node/esm"],
"extension": ["ts"],
"recursive": true
}
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Removed
- Dropped support for end-of-life Node versions 16, 18 and 20
### Changed
- BREAKING CHANGE: Switch to ESM ([#155](https://github.com/cucumber/language-server/pull/155))

### Fixed
- User's `snippetTemplates` config is ignored
- Default `glue` globs miss `.cjs`, `.mjs`, `.cts` and `.mts` files
- Glue and feature files not found when root is not the current directory

### Removed
- Dropped support for end-of-life Node versions 16, 18 and 20

## [1.7.0] - 2025-05-18
### Changed
- Update dependency @cucumber/language-service to 1.7.0
Expand Down
16 changes: 0 additions & 16 deletions bin/cucumber-language-server.cjs

This file was deleted.

18 changes: 18 additions & 0 deletions bin/cucumber-language-server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env node
import 'source-map-support/register.js'
import path from 'node:path'
import { NodeFiles } from '../dist/node/NodeFiles.js'
import { version } from '../dist/version.js'
import { startStandaloneServer } from '../dist/wasm/startStandaloneServer.js'

const wasmBasePath = path.resolve(
`${import.meta.dirname}/../node_modules/@cucumber/language-service/dist`
)
const { connection } = startStandaloneServer(wasmBasePath, (rootUri) => new NodeFiles(rootUri))

// Don't die on unhandled Promise rejections
process.on('unhandledRejection', (reason, p) => {
connection.console.error(
`Cucumber Language Server ${version}: Unhandled Rejection at promise: ${p}, reason: ${reason}`
)
})
5 changes: 2 additions & 3 deletions node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "wasm",
"description": "Cucumber Language server using tree-sitter node bindings",
"main": "../dist/cjs/src/node/index.js",
"module": "../dist/esm/src/node/index.js",
"types": "../dist/esm/src/node/index.d.ts"
"main": "../dist/node/index.js",
"types": "../dist/node/index.d.ts"
}
1 change: 0 additions & 1 deletion package.cjs.json

This file was deleted.

37 changes: 16 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,40 @@
"node": "^22 || ^24 || >=26"
},
"type": "module",
"main": "dist/cjs/src/index.js",
"module": "dist/esm/src/index.js",
"types": "dist/esm/src/index.d.ts",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"exports": {
".": {
"import": "./dist/esm/src/index.js",
"require": "./dist/cjs/src/index.js"
"types": "./dist/index.d.ts",
"default": "./dist/index.js"
},
"./node": {
"import": "./dist/esm/src/node/index.js",
"require": "./dist/cjs/src/node/index.js"
"types": "./dist/node/index.d.ts",
"default": "./dist/node/index.js"
},
"./wasm": {
"import": "./dist/esm/src/wasm/index.js",
"require": "./dist/cjs/src/wasm/index.js"
"types": "./dist/wasm/index.d.ts",
"default": "./dist/wasm/index.js"
}
},
"files": [
"dist/cjs/src",
"dist/cjs/package.json",
"dist/esm/src",
"dist",
"node",
"wasm"
],
"bin": {
"cucumber-language-server": "bin/cucumber-language-server.cjs"
"cucumber-language-server": "bin/cucumber-language-server.js"
},
"scripts": {
"build:cjs": "tsc --build tsconfig.build-cjs.json && cp package.cjs.json dist/cjs/package.json",
"build:esm": "tsc --build tsconfig.build-esm.json",
"build": "npm run build:version && tsc --project tsconfig.build.json",
"build:version": "node --eval \"console.log('export const version = \\'' + require('./package.json').version + '\\'')\" > src/version.ts",
"build": "npm run build:version && npm run build:cjs && npm run build:esm",
"test": "npm run test:cjs",
"test:cjs": "npm run build:cjs && mocha --no-config --recursive dist/cjs/test",
"pretest": "npm run build:version",
"prepublishOnly": "npm run build",
"fix": "biome check --fix --error-on-warnings",
"lint": "biome check --error-on-warnings",
"prepare": "husky"
"postbuild": "node -e \"require('.')\"",
"prepare": "husky",
"prepublishOnly": "npm run build",
"pretest": "npm run build",
"test": "mocha"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/wasm/startEmbeddedServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { PassThrough } from 'node:stream'
import type { CucumberExpressions, ParserAdapter, Suggestion } from '@cucumber/language-service'
import { WasmParserAdapter } from '@cucumber/language-service/wasm'
import { type Connection, TextDocuments } from 'vscode-languageserver'
import { createConnection } from 'vscode-languageserver/node'
import { createConnection } from 'vscode-languageserver/node.js'
import { TextDocument } from 'vscode-languageserver-textdocument'

import { CucumberLanguageServer } from '../CucumberLanguageServer.js'
Expand Down
6 changes: 3 additions & 3 deletions src/wasm/startStandaloneServer.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { WasmParserAdapter } from '@cucumber/language-service/wasm'
import { TextDocuments } from 'vscode-languageserver'
import { createConnection, ProposedFeatures } from 'vscode-languageserver/node'
import { createConnection, ProposedFeatures } from 'vscode-languageserver/node.js'
import { TextDocument } from 'vscode-languageserver-textdocument'

import { CucumberLanguageServer } from '../CucumberLanguageServer'
import type { Files } from '../Files'
import { CucumberLanguageServer } from '../CucumberLanguageServer.js'
import type { Files } from '../Files.js'

export function startStandaloneServer(wasmBaseUrl: string, makeFiles: (rootUri: string) => Files) {
const adapter = new WasmParserAdapter(wasmBaseUrl)
Expand Down
6 changes: 3 additions & 3 deletions test/CucumberLanguageServer.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from 'node:assert'
import { Duplex } from 'node:stream'
import { WasmParserAdapter } from '@cucumber/language-service/wasm'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node.js'
import {
type Connection,
createProtocolConnection,
Expand All @@ -15,11 +15,11 @@ import {
type ProtocolConnection,
TextDocuments,
} from 'vscode-languageserver'
import { createConnection } from 'vscode-languageserver/node'
import { createConnection } from 'vscode-languageserver/node.js'
import {
type CompletionParams,
CompletionRequest,
} from 'vscode-languageserver-protocol/lib/common/protocol'
} from 'vscode-languageserver-protocol/lib/common/protocol.js'
import { TextDocument } from 'vscode-languageserver-textdocument'
import { type CompletionItem, CompletionItemKind } from 'vscode-languageserver-types'

Expand Down
4 changes: 2 additions & 2 deletions test/standalone.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from 'node:assert'
import { type ChildProcess, fork } from 'node:child_process'
import type { Duplex } from 'node:stream'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node.js'
import {
createProtocolConnection,
DidChangeConfigurationNotification,
Expand All @@ -22,7 +22,7 @@ describe('Standalone', () => {

beforeEach(async () => {
logMessages = []
serverFork = fork('./bin/cucumber-language-server.cjs', ['--stdio'], {
serverFork = fork('./bin/cucumber-language-server.js', ['--stdio'], {
silent: true,
})

Expand Down
8 changes: 0 additions & 8 deletions tsconfig.build-cjs.json

This file was deleted.

8 changes: 0 additions & 8 deletions tsconfig.build-esm.json

This file was deleted.

6 changes: 3 additions & 3 deletions tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"composite": true,
"declaration": true,
"declarationMap": true,
"sourceMap": true,
"rootDir": ".",
"rootDir": "src",
"noEmit": false,
"outDir": "dist",
"lib": ["ES2019"]
},
"include": ["src", "test"]
"include": ["src"]
}
4 changes: 2 additions & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"skipLibCheck": true,
"strictNullChecks": true,
"experimentalDecorators": true,
"module": "ESNext",
"lib": ["ES6", "dom"],
"target": "ES6",
"moduleResolution": "node",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"allowSyntheticDefaultImports": true,
"noEmit": true
}
Expand Down
5 changes: 2 additions & 3 deletions wasm/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "wasm",
"description": "Cucumber Language server using tree-sitter wasm bindings",
"main": "../dist/cjs/src/wasm/index.js",
"module": "../dist/esm/src/wasm/index.js",
"types": "../dist/esm/src/wasm/index.d.ts"
"main": "../dist/wasm/index.js",
"types": "../dist/wasm/index.d.ts"
}
Loading