codemirror-languageserver 1.7.0 → 1.9.0

package/README.md

@@ -15,14 +15,16 @@ npm i codemirror-languageserver
 ``` js
 import { languageServer } from 'codemirror-languageserver';
 
+const transport = new WebSocketTransport(serverUri)
+
 var ls = languageServer({
-	// WebSocket server URI and other client options.
-	serverUri: serverUri,
+	// WebSocket server uri and other client options.
+	serverUri,
 	rootUri: 'file:///',
 
 	// Alternatively, to share the same client across multiple instances of this plugin.
 	client: new LanguageServerClient({
-		serverUri: serverUri,
+		serverUri,
 		rootUri: 'file:///'
 	}),
 

package/dist/index.d.ts

@@ -1,8 +1,8 @@
-import { EditorView, ViewUpdate, PluginValue } from '@codemirror/view';
+import { EditorView, Tooltip, ViewUpdate, PluginValue } from '@codemirror/view';
 import * as LSP from 'vscode-languageserver-protocol';
 import { CompletionTriggerKind, PublishDiagnosticsParams } from "vscode-languageserver-protocol";
 import { CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import { Tooltip } from '@codemirror/tooltip';
+import { Transport } from '@open-rpc/client-js/build/transports/Transport';
 interface LSPEventMap {
     'textDocument/publishDiagnostics': LSP.PublishDiagnosticsParams;
 }
@@ -15,7 +15,6 @@ type Notification = {
     };
 }[keyof LSPEventMap];
 declare class LanguageServerClient {
-    private serverUri;
     private rootUri;
     private workspaceFolders;
     private autoClose?;
@@ -36,7 +35,6 @@ declare class LanguageServerClient {
     detachPlugin(plugin: LanguageServerPlugin): void;
     private request;
     private notify;
-    private processRequest;
     private processNotification;
 }
 declare class LanguageServerPlugin implements PluginValue {
@@ -70,19 +68,22 @@ declare class LanguageServerPlugin implements PluginValue {
     processNotification(notification: Notification): void;
     processDiagnostics(params: PublishDiagnosticsParams): void;
 }
-interface LanguageServerClientOptions {
-    serverUri: `ws://${string}` | `wss://${string}`;
+interface LanguageServerBaseOptions {
     rootUri: string | null;
     workspaceFolders: LSP.WorkspaceFolder[] | null;
+    documentUri: string;
+    languageId: string;
+}
+interface LanguageServerClientOptions extends LanguageServerBaseOptions {
+    transport: Transport;
     autoClose?: boolean;
 }
-interface LanguageServerOptions {
+interface LanguageServerOptions extends LanguageServerClientOptions {
     client?: LanguageServerClient;
+}
+interface LanguageServerWebsocketOptions extends LanguageServerBaseOptions {
     serverUri: `ws://${string}` | `wss://${string}`;
-    rootUri: string | null;
-    workspaceFolders: LSP.WorkspaceFolder[] | null;
-    documentUri: string;
-    languageId: string;
 }
-declare function languageServer(options: LanguageServerOptions): import("@codemirror/state").Extension[];
-export { LanguageServerClient, languageServer };
+declare function languageServer(options: LanguageServerWebsocketOptions): import("@codemirror/state").Extension[];
+declare function languageServerWithTransport(options: LanguageServerOptions): import("@codemirror/state").Extension[];
+export { LanguageServerClient, languageServer, languageServerWithTransport };

package/dist/index.js

@@ -1,9 +1,8 @@
 import { autocompletion } from '@codemirror/autocomplete';
 import { setDiagnostics } from '@codemirror/lint';
 import { Facet } from '@codemirror/state';
-import { hoverTooltip } from '@codemirror/tooltip';
-import { ViewPlugin, EditorView } from '@codemirror/view';
-import { WebSocketTransport, RequestManager, Client } from '@open-rpc/client-js';
+import { EditorView, ViewPlugin, hoverTooltip } from '@codemirror/view';
+import { RequestManager, Client, WebSocketTransport } from '@open-rpc/client-js';
 import { CompletionItemKind, CompletionTriggerKind, DiagnosticSeverity } from 'vscode-languageserver-protocol';
 
 const timeout = 10000;
@@ -15,22 +14,31 @@ const documentUri = Facet.define({ combine: useLast });
 const languageId = Facet.define({ combine: useLast });
 class LanguageServerClient {
     constructor(options) {
-        this.serverUri = options.serverUri;
         this.rootUri = options.rootUri;
         this.workspaceFolders = options.workspaceFolders;
         this.autoClose = options.autoClose;
         this.plugins = [];
-        this.transport = new WebSocketTransport(this.serverUri);
+        this.transport = options.transport;
         this.requestManager = new RequestManager([this.transport]);
         this.client = new Client(this.requestManager);
         this.client.onNotification((data) => {
             this.processNotification(data);
         });
-        this.transport.connection.addEventListener('message', (message) => {
-            const data = JSON.parse(message.data);
-            if (data.method && data.id)
-                this.processRequest(data);
-        });
+        const webSocketTransport = this.transport;
+        if (webSocketTransport && webSocketTransport.connection) {
+            // XXX(hjr265): Need a better way to do this. Relevant issue:
+            // https://github.com/FurqanSoftware/codemirror-languageserver/issues/9
+            webSocketTransport.connection.addEventListener('message', (message) => {
+                const data = JSON.parse(message.data);
+                if (data.method && data.id) {
+                    webSocketTransport.connection.send(JSON.stringify({
+                        jsonrpc: '2.0',
+                        id: data.id,
+                        result: null
+                    }));
+                }
+            });
+        }
         this.initialize();
     }
     async initialize() {
@@ -129,13 +137,6 @@ class LanguageServerClient {
     notify(method, params) {
         return this.client.notify({ method, params });
     }
-    processRequest({ id }) {
-        this.transport.connection.send(JSON.stringify({
-            jsonrpc: '2.0',
-            id,
-            result: null
-        }));
-    }
     processNotification(notification) {
         for (const plugin of this.plugins)
             plugin.processNotification(notification);
@@ -320,6 +321,14 @@ class LanguageServerPlugin {
     }
 }
 function languageServer(options) {
+    const serverUri = options.serverUri;
+    delete options.serverUri;
+    return languageServerWithTransport({
+        ...options,
+        transport: new WebSocketTransport(serverUri)
+    });
+}
+function languageServerWithTransport(options) {
     let plugin = null;
     return [
         client.of(options.client || new LanguageServerClient({ ...options, autoClose: true })),
@@ -421,4 +430,4 @@ const baseTheme = EditorView.baseTheme({
     },
 });
 
-export { LanguageServerClient, languageServer };
+export { LanguageServerClient, languageServer, languageServerWithTransport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemirror-languageserver",
-  "version": "1.7.0",
+  "version": "1.9.0",
   "description": "Language Server Plugin for CodeMirror 6",
   "main": "dist/index.js",
   "scripts": {
@@ -21,20 +21,19 @@
   },
   "license": "BSD-3-Clause",
   "devDependencies": {
-    "@babel/core": "^7.13.8",
-    "@babel/preset-env": "^7.13.8",
-    "@rollup/plugin-babel": "^5.3.0",
+    "@babel/core": "^7.18.6",
+    "@babel/preset-env": "^7.18.6",
+    "@rollup/plugin-babel": "^5.3.1",
     "prettier": "^2.2.1",
-    "rollup": "^2.40.0",
-    "rollup-plugin-ts": "^1.3.12",
-    "typescript": "^4.2.4"
+    "rollup": "^2.75.7",
+    "rollup-plugin-ts": "^3.0.2",
+    "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@codemirror/autocomplete": "^0.19.8",
-    "@codemirror/lint": "^0.19.3",
-    "@codemirror/state": "^0.19.8",
-    "@codemirror/tooltip": "^0.19.14",
-    "@codemirror/view": "^0.19.43",
+    "@codemirror/autocomplete": "^6.0.2",
+    "@codemirror/lint": "^6.0.0",
+    "@codemirror/state": "^6.1.0",
+    "@codemirror/view": "^6.0.2",
     "@open-rpc/client-js": "^1.7.1",
     "vscode-languageserver-protocol": "^3.16.0"
   },