Export custom node and wasm entry points

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+- Support for C#
+- Support for PHP
+
+### Changed
+- Remove external dependency on `@cucumber/language-service` - always use tree-sitter wasm
+
 ## [0.6.0] - 2022-04-26
 ### Changed
 - Use tree-sitter Node.js bindings instead of web (WASM) bindings.

bin/cucumber-language-server.cjs

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
 require('source-map-support').install()
-const { startServer } = require('../dist/cjs/src/startServer')
-const { NodeParserAdapter } = require('@cucumber/language-service/node')
-startServer(new NodeParserAdapter())
+const { startNodeServer } = require('../dist/cjs/src/node/startNodeServer')
+startNodeServer()

node/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "wasm",
+  "description": "Cucumber Language server using tree-sitter node bindings",
+  "main": "../dist/cjs/src/node/startNodeServer.js",
+  "module": "../dist/esm/src/node/startNodeServer.js",
+  "types": "../dist/esm/src/node/startNodeServer.d.ts"
+}

package.json

@@ -3,18 +3,25 @@
   "version": "0.6.0",
   "description": "Cucumber Language Server",
   "type": "module",
-  "main": "dist/cjs/src/index.js",
-  "module": "dist/esm/src/index.js",
-  "types": "dist/esm/src/index.d.ts",
+  "main": "dist/cjs/src/node/startNodeServer.js",
+  "module": "dist/esm/src/node/startNodeServer.js",
+  "types": "dist/esm/src/node/startNodeServer.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/esm/src/index.js",
-      "require": "./dist/cjs/src/index.js"
+      "import": "./dist/esm/src/node/startNodeServer.js",
+      "require": "./dist/cjs/src/node/startNodeServer.js"
+    },
+    "./wasm": {
+      "import": "./dist/esm/src/wasm/startWasmServer.js",
+      "require": "./dist/cjs/src/wasm/startWasmServer.js"
     }
   },
   "files": [
     "dist/cjs/src",
-    "dist/esm/src"
+    "dist/cjs/package.json",
+    "dist/esm/src",
+    "node",
+    "wasm"
   ],
   "bin": {
     "cucumber-language-server": "bin/cucumber-language-server.cjs"
@@ -77,7 +84,7 @@
   "dependencies": {
     "@cucumber/cucumber-expressions": "^15.1.1",
     "@cucumber/gherkin-utils": "^7.0.0",
-    "@cucumber/language-service": "^0.14.4",
+    "@cucumber/language-service": "^0.15.0",
     "fast-glob": "3.2.11",
     "source-map-support": "0.5.21",
     "vscode-languageserver": "7.0.0",

src/CucumberLanguageServer.ts

@@ -1,6 +1,7 @@
 import { Expression, ParameterTypeRegistry } from '@cucumber/cucumber-expressions'
 import {
   buildSuggestions,
+  ExpressionBuilder,
   getGherkinCompletionItems,
   getGherkinDiagnostics,
   getGherkinFormattingEdits,
@@ -11,7 +12,6 @@ import {
   semanticTokenTypes,
   Suggestion,
 } from '@cucumber/language-service'
-import { ExpressionBuilder } from '@cucumber/language-service'
 import {
   ConfigurationRequest,
   Connection,
@@ -40,18 +40,20 @@ const defaultSettings: Settings = {
 }
 
 export class CucumberLanguageServer {
-  private readonly expressionBuilder
+  private readonly expressionBuilder: ExpressionBuilder
   private searchIndex: Index
   private expressions: readonly Expression[] = []
   private reindexingTimeout: NodeJS.Timeout
 
   constructor(
-    private parserAdapter: ParserAdapter,
     private readonly connection: Connection,
-    private readonly documents: TextDocuments<TextDocument>
+    private readonly documents: TextDocuments<TextDocument>,
+    parserAdapter: ParserAdapter
   ) {
     this.expressionBuilder = new ExpressionBuilder(parserAdapter)
     connection.onInitialize(async (params) => {
+      await parserAdapter.init()
+
       if (params.capabilities.workspace?.configuration) {
         connection.onDidChangeConfiguration((params) => {
           this.reindex(<Settings>params.settings).catch((err) => {

src/loadAll.ts

@@ -3,11 +3,13 @@ import fg from 'fast-glob'
 import fs from 'fs/promises'
 import path from 'path'
 
-type Extension = '.ts' | '.java'
+type Extension = '.ts' | '.java' | '.cs' | '.php'
 
 export const languageByExt: Record<Extension, LanguageName> = {
   '.ts': 'typescript',
   '.java': 'java',
+  '.cs': 'c_sharp',
+  '.php': 'php',
 }
 
 const extensions = Array.from(Object.keys(languageByExt)).concat('.feature')

src/node/startNodeServer.ts

@@ -0,0 +1,7 @@
+import { NodeParserAdapter } from '@cucumber/language-service/node'
+
+import { startServer } from '../startServer'
+
+export function startNodeServer() {
+  startServer(new NodeParserAdapter())
+}

src/startServer.ts

@@ -8,7 +8,7 @@ import { CucumberLanguageServer } from './CucumberLanguageServer.js'
 export function startServer(adapter: ParserAdapter) {
   const connection = createConnection(ProposedFeatures.all)
   const documents = new TextDocuments(TextDocument)
-  new CucumberLanguageServer(adapter, connection, documents)
+  new CucumberLanguageServer(connection, documents, adapter)
   connection.listen()
 
   // Don't die on unhandled Promise rejections

src/wasm/startWasmServer.ts

@@ -0,0 +1,7 @@
+import { WasmParserAdapter } from '@cucumber/language-service/wasm'
+
+import { startServer } from '../startServer'
+
+export function startWasmServer(wasmBaseUrl: string) {
+  startServer(new WasmParserAdapter(wasmBaseUrl))
+}

test/CucumberLanguageServer.test.ts

@@ -54,7 +54,7 @@ describe('CucumberLanguageServer', () => {
     serverConnection = createConnection(inputStream, outputStream)
     documents = new TextDocuments(TextDocument)
 
-    new CucumberLanguageServer(new NodeParserAdapter(), serverConnection, documents)
+    new CucumberLanguageServer(serverConnection, documents, new NodeParserAdapter())
     serverConnection.listen()
 
     const initializeParams: InitializeParams = {

tsconfig.build-cjs.json

@@ -1,8 +1,8 @@
 {
   "extends": "./tsconfig.build.json",
   "compilerOptions": {
-    "outDir": "dist/cjs",
-    "target": "ES5",
+    "target": "ES6",
     "module": "CommonJS",
-  },
+    "outDir": "dist/cjs"
+  }
 }

wasm/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "wasm",
+  "description": "Cucumber Language server using tree-sitter wasm bindings",
+  "main": "../dist/cjs/src/wasm/startWasmServer.js",
+  "module": "../dist/esm/src/wasm/startWasmServer.js",
+  "types": "../dist/esm/src/wasm/startWasmServer.d.ts"
+}