diff --git a/package-lock.json b/package-lock.json index 7e4fee9d..becad495 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,19 +18,20 @@ "vscode-languageserver-types": "3.18.5" }, "bin": { - "cucumber-language-server": "bin/cucumber-language-server.cjs" + "cucumber-language-server": "bin/cucumber-language-server.js" }, "devDependencies": { "@biomejs/biome": "2.6.4", "@cucumber/biome-config": "github:cucumber/biome-config#v0.6.0", "@cucumber/cucumber": "13.3.0", + "@tsconfig/recommended": "^1.0.13", "@types/mocha": "10.0.10", - "@types/node": "26.6.6", + "@types/node": "^22.20.5", "husky": "9.1.7", "lint-staged": "^17.0.0", "mocha": "12.0.3", "ts-node": "10.9.2", - "typescript": "5.9.3", + "typescript": "^6.0.3", "vscode-jsonrpc": "8.2.1", "vscode-languageserver-protocol": "3.17.2" }, @@ -719,6 +720,13 @@ "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", "dev": true }, + "node_modules/@tsconfig/recommended": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.13.tgz", + "integrity": "sha512-sySRuBfMKyKO/j2ZAhR8kSembhjuPEV4Ra3AHtmWLq51+iGaudr45crPSzNC5b7/Ctrh9dfUpBuTlYrH6rM58Q==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/js-search": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/@types/js-search/-/js-search-1.4.4.tgz", @@ -736,13 +744,13 @@ "integrity": "sha512-t+8/QWTAhOFlrF1IVZqKnMRJi84EgkIK5Kh0p2JV4OLywUvCwJPFxbJAl7XAow7DVIHsF+xW9f1MVzg0L6Szjw==" }, "node_modules/@types/node": { - "version": "26.6.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.6.tgz", - "integrity": "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==", + "version": "22.20.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.5.tgz", + "integrity": "sha512-U2+DNr+wSjpsTS/wZGYHq7GcwfuSmKiKvoPvK22zwTlRhU91yOniN4qRR5KhIjvif7ysw/dz/hKmfDH0Ris4aA==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~8.9.0" + "undici-types": "~6.21.0" } }, "node_modules/@types/normalize-package-data": { @@ -2200,10 +2208,11 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -2213,10 +2222,11 @@ } }, "node_modules/undici-types": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz", - "integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==", - "dev": true + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" }, "node_modules/unicorn-magic": { "version": "0.3.0", @@ -2876,6 +2886,12 @@ "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", "dev": true }, + "@tsconfig/recommended": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/@tsconfig/recommended/-/recommended-1.0.13.tgz", + "integrity": "sha512-sySRuBfMKyKO/j2ZAhR8kSembhjuPEV4Ra3AHtmWLq51+iGaudr45crPSzNC5b7/Ctrh9dfUpBuTlYrH6rM58Q==", + "dev": true + }, "@types/js-search": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/@types/js-search/-/js-search-1.4.4.tgz", @@ -2893,12 +2909,12 @@ "integrity": "sha512-t+8/QWTAhOFlrF1IVZqKnMRJi84EgkIK5Kh0p2JV4OLywUvCwJPFxbJAl7XAow7DVIHsF+xW9f1MVzg0L6Szjw==" }, "@types/node": { - "version": "26.6.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-26.6.6.tgz", - "integrity": "sha512-MzQj+8Kx3XI40OmUAE6Qoh58ZMNstNNMwn2nfd3qWsfe7nDNSqJNzes4njhz6AHwrSHOffSLwXU6yb474Q4aog==", + "version": "22.20.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.5.tgz", + "integrity": "sha512-U2+DNr+wSjpsTS/wZGYHq7GcwfuSmKiKvoPvK22zwTlRhU91yOniN4qRR5KhIjvif7ysw/dz/hKmfDH0Ris4aA==", "dev": true, "requires": { - "undici-types": "~8.9.0" + "undici-types": "~6.21.0" } }, "@types/normalize-package-data": { @@ -3855,15 +3871,15 @@ } }, "typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true }, "undici-types": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.9.0.tgz", - "integrity": "sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "dev": true }, "unicorn-magic": { diff --git a/package.json b/package.json index 05e08d6c..82f6f995 100644 --- a/package.json +++ b/package.json @@ -70,13 +70,14 @@ "@biomejs/biome": "2.6.4", "@cucumber/biome-config": "github:cucumber/biome-config#v0.6.0", "@cucumber/cucumber": "13.3.0", + "@tsconfig/recommended": "^1.0.13", "@types/mocha": "10.0.10", - "@types/node": "26.6.6", + "@types/node": "^22.20.5", "husky": "9.1.7", "lint-staged": "^17.0.0", "mocha": "12.0.3", "ts-node": "10.9.2", - "typescript": "5.9.3", + "typescript": "^6.0.3", "vscode-jsonrpc": "8.2.1", "vscode-languageserver-protocol": "3.17.2" }, diff --git a/src/CucumberLanguageServer.ts b/src/CucumberLanguageServer.ts index 0c8831b2..c9a3e01b 100644 --- a/src/CucumberLanguageServer.ts +++ b/src/CucumberLanguageServer.ts @@ -90,12 +90,12 @@ const defaultSettings: Settings = { export class CucumberLanguageServer { private readonly expressionBuilder: ExpressionBuilder - private searchIndex: Index + private searchIndex!: Index private expressionBuilderResult: ExpressionBuilderResult | undefined = undefined - private reindexingTimeout: NodeJS.Timeout - private rootUri: string - private files: Files - public registry: CucumberExpressions.ParameterTypeRegistry + private reindexingTimeout!: NodeJS.Timeout + private rootUri!: string + private files!: Files + public registry!: CucumberExpressions.ParameterTypeRegistry public expressions: readonly CucumberExpressions.Expression[] = [] public suggestions: readonly Suggestion[] = [] @@ -411,7 +411,7 @@ export class CucumberLanguageServer { return defaultSettings } } catch (err) { - this.connection.console.error(`Failed to request configuration: ${err.message}`) + this.connection.console.error(`Failed to request configuration: ${(err as Error).message}`) this.connection.console.error(`Using default settings`) return defaultSettings } @@ -484,7 +484,7 @@ export class CucumberLanguageServer { this.suggestions = suggestions this.onReindexed(registry, expressions, suggestions) } catch (err) { - this.connection.console.error(err.stack) + this.connection.console.error((err as Error).stack as string) this.connection.console.error( 'Please report an issue at https://github.com/cucumber/language-service/issues with the above stack trace' ) diff --git a/tsconfig.build.json b/tsconfig.build.json index 855b717c..20eb686d 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -1,13 +1,8 @@ { "extends": "./tsconfig.json", + "include": ["src"], "compilerOptions": { - "declaration": true, - "declarationMap": true, - "sourceMap": true, "rootDir": "src", - "noEmit": false, - "outDir": "dist", - "lib": ["ES2019"] - }, - "include": ["src"] + "outDir": "dist" + } } diff --git a/tsconfig.json b/tsconfig.json index 2d884b35..b05bb38f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,21 +1,14 @@ { + "extends": "@tsconfig/recommended/tsconfig.json", + "include": ["src"], "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "sourceMap": true, - "allowJs": false, - "resolveJsonModule": true, - "esModuleInterop": true, - "noImplicitAny": true, - "downlevelIteration": true, - "skipLibCheck": true, - "strictNullChecks": true, - "experimentalDecorators": true, - "lib": ["ES6", "dom"], - "target": "ES6", + "lib": ["es2024"], + "target": "es2024", "module": "NodeNext", "moduleResolution": "NodeNext", - "allowSyntheticDefaultImports": true, - "noEmit": true + "types": ["node", "mocha"], + "declaration": true, + "inlineSourceMap": true, + "inlineSources": true } }