chore(language-server): only require for tsdk or tsdkUrl

volarjs · Oct 30, 2023 · 42bed97 · 42bed97
1 parent a9dbc9a
commit 42bed97
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/packages/language-server/src/browser/index.ts b/packages/language-server/src/browser/index.ts
@@ -29,7 +29,9 @@ export function startLanguageServer(connection: vscode.Connection, ...plugins: L
 			},
 		},
 		async loadTypeScript(options) {
-			const tsdkUri = options.typescript?.tsdkUrl;
+			const tsdkUri = options.typescript && 'tsdkUrl' in options.typescript
+				? options.typescript.tsdkUrl
+				: undefined;
 			if (!tsdkUri) {
 				return;
 			}
@@ -41,7 +43,9 @@ export function startLanguageServer(connection: vscode.Connection, ...plugins: L
 			return ts as typeof import('typescript/lib/tsserverlibrary');
 		},
 		async loadTypeScriptLocalized(options, locale) {
-			const tsdkUri = options.typescript?.tsdkUrl;
+			const tsdkUri = options.typescript && 'tsdkUrl' in options.typescript
+				? options.typescript.tsdkUrl
+				: undefined;
 			if (!tsdkUri) {
 				return;
 			}

diff --git a/packages/language-server/src/node/index.ts b/packages/language-server/src/node/index.ts
@@ -93,7 +93,9 @@ export function startLanguageServer(connection: vscode.Connection, ...plugins: L
 			},
 		},
 		loadTypeScript(options) {
-			const tsdk = options.typescript?.tsdk;
+			const tsdk = options.typescript && 'tsdk' in options.typescript
+				? options.typescript.tsdk
+				: undefined;
 			if (!tsdk) {
 				return;
 			}
@@ -113,7 +115,9 @@ export function startLanguageServer(connection: vscode.Connection, ...plugins: L
 			throw new Error(`Can't find typescript.js or tsserverlibrary.js in ${tsdk}`);
 		},
 		async loadTypeScriptLocalized(options, locale) {
-			const tsdk = options.typescript?.tsdk;
+			const tsdk = options.typescript && 'tsdk' in options.typescript
+				? options.typescript.tsdk
+				: undefined;
 			if (!tsdk) {
 				return;
 			}

diff --git a/packages/language-server/src/types.ts b/packages/language-server/src/types.ts
@@ -56,6 +56,7 @@ export interface InitializationOptions {
 		 * Absolute path to node_modules/typescript/lib, available for node
 		 */
 		tsdk: string;
+	} | {
 		/**
 		 * URI to node_modules/typescript/lib, available for web
 		 * @example "https://cdn.jsdelivr.net/npm/typescript"