@astrojs/language-server 0.23.2 → 0.24.1

package/dist/plugins/typescript/snapshots/SnapshotManager.js

@@ -22,24 +22,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapshotManager = exports.GlobalSnapshotManager = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-const DocumentSnapshot_1 = require("./DocumentSnapshot");
-const utils_1 = require("../../../utils");
 const events_1 = require("events");
-const DocumentSnapshotUtils = __importStar(require("./utils"));
+const utils_1 = require("../../../utils");
 const utils_2 = require("../utils");
+const DocumentSnapshot_1 = require("./DocumentSnapshot");
+const DocumentSnapshotUtils = __importStar(require("./utils"));
 /**
  * Every snapshot corresponds to a unique file on disk.
  * A snapshot can be part of multiple projects, but for a given file path
  * there can be only one snapshot.
  */
 class GlobalSnapshotManager {
-    constructor() {
+    constructor(ts) {
+        this.ts = ts;
         this.emitter = new events_1.EventEmitter();
         this.documents = new Map();
     }
@@ -74,7 +71,7 @@ class GlobalSnapshotManager {
             return previousSnapshot;
         }
         else {
-            const newSnapshot = DocumentSnapshotUtils.createFromNonAstroFilePath(fileName);
+            const newSnapshot = DocumentSnapshotUtils.createFromNonAstroFilePath(fileName, this.ts);
             if (previousSnapshot) {
                 newSnapshot.version = previousSnapshot.version + 1;
             }
@@ -96,20 +93,21 @@ exports.GlobalSnapshotManager = GlobalSnapshotManager;
  * Should only be used by `language-service.ts`
  */
 class SnapshotManager {
-    constructor(globalSnapshotsManager, projectFiles, fileSpec, workspaceRoot) {
+    constructor(globalSnapshotsManager, projectFiles, fileSpec, workspaceRoot, ts) {
         this.globalSnapshotsManager = globalSnapshotsManager;
         this.projectFiles = projectFiles;
         this.fileSpec = fileSpec;
         this.workspaceRoot = workspaceRoot;
+        this.ts = ts;
         this.documents = new Map();
         this.lastLogged = new Date(new Date().getTime() - 60001);
         this.watchExtensions = [
-            typescript_1.default.Extension.Dts,
-            typescript_1.default.Extension.Js,
-            typescript_1.default.Extension.Jsx,
-            typescript_1.default.Extension.Ts,
-            typescript_1.default.Extension.Tsx,
-            typescript_1.default.Extension.Json,
+            this.ts.Extension.Dts,
+            this.ts.Extension.Js,
+            this.ts.Extension.Jsx,
+            this.ts.Extension.Ts,
+            this.ts.Extension.Tsx,
+            this.ts.Extension.Json,
         ];
         this.globalSnapshotsManager.onChange((fileName, document) => {
             // Only delete/update snapshots, don't add new ones,
@@ -132,7 +130,7 @@ class SnapshotManager {
         if (include?.length === 0) {
             return;
         }
-        const projectFiles = typescript_1.default.sys
+        const projectFiles = this.ts.sys
             .readDirectory(this.workspaceRoot, this.watchExtensions, exclude, include)
             .map(utils_1.normalizePath);
         this.projectFiles = Array.from(new Set([...this.projectFiles, ...projectFiles]));

package/dist/plugins/typescript/snapshots/utils.d.ts

@@ -1,29 +1,29 @@
-import { AstroDocument } from '../../../core/documents';
+import type { AstroDocument } from '../../../core/documents';
 import { FrameworkExt } from '../utils';
 import { AstroSnapshot, TypeScriptDocumentSnapshot } from './DocumentSnapshot';
-export declare function createFromDocument(document: AstroDocument): AstroSnapshot;
+export declare function createFromDocument(document: AstroDocument, ts: typeof import('typescript/lib/tsserverlibrary')): AstroSnapshot;
 /**
  * Returns an Astro or Framework or a ts/js snapshot from a file path, depending on the file contents.
  * @param filePath path to the file
  * @param createDocument function that is used to create a document in case it's an Astro file
  */
-export declare function createFromFilePath(filePath: string, createDocument: (filePath: string, text: string) => AstroDocument): AstroSnapshot | TypeScriptDocumentSnapshot;
+export declare function createFromFilePath(filePath: string, createDocument: (filePath: string, text: string) => AstroDocument, ts: typeof import('typescript/lib/tsserverlibrary')): AstroSnapshot | TypeScriptDocumentSnapshot;
 /**
  * Return a Framework or a TS snapshot from a file path, depending on the file contents
  * Unlike createFromFilePath, this does not support creating an Astro snapshot
  */
-export declare function createFromNonAstroFilePath(filePath: string): TypeScriptDocumentSnapshot;
+export declare function createFromNonAstroFilePath(filePath: string, ts: typeof import('typescript/lib/tsserverlibrary')): TypeScriptDocumentSnapshot;
 /**
  * Returns a ts/js snapshot from a file path.
  * @param filePath path to the js/ts file
  * @param options options that apply in case it's a svelte file
  */
-export declare function createFromTSFilePath(filePath: string): TypeScriptDocumentSnapshot;
+export declare function createFromTSFilePath(filePath: string, ts: typeof import('typescript/lib/tsserverlibrary')): TypeScriptDocumentSnapshot;
 /**
  * Returns an Astro snapshot from a file path.
  * @param filePath path to the Astro file
  * @param createDocument function that is used to create a document
  */
-export declare function createFromAstroFilePath(filePath: string, createDocument: (filePath: string, text: string) => AstroDocument): AstroSnapshot;
-export declare function createFromFrameworkFilePath(filePath: string, framework: FrameworkExt): TypeScriptDocumentSnapshot;
+export declare function createFromAstroFilePath(filePath: string, createDocument: (filePath: string, text: string) => AstroDocument, ts: typeof import('typescript/lib/tsserverlibrary')): AstroSnapshot;
+export declare function createFromFrameworkFilePath(filePath: string, framework: FrameworkExt, ts: typeof import('typescript/lib/tsserverlibrary')): TypeScriptDocumentSnapshot;
 export declare function classNameFromFilename(filename: string): string;

package/dist/plugins/typescript/snapshots/utils.js

@@ -4,17 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.classNameFromFilename = exports.createFromFrameworkFilePath = exports.createFromAstroFilePath = exports.createFromTSFilePath = exports.createFromNonAstroFilePath = exports.createFromFilePath = exports.createFromDocument = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-const astro2tsx_1 = __importDefault(require("../astro2tsx"));
 const vscode_uri_1 = require("vscode-uri");
-const utils_1 = require("../utils");
-const DocumentSnapshot_1 = require("./DocumentSnapshot");
-const utils_2 = require("../../../utils");
 const importPackage_1 = require("../../../importPackage");
+const utils_1 = require("../../../utils");
+const astro2tsx_1 = __importDefault(require("../astro2tsx"));
+const utils_2 = require("../utils");
+const DocumentSnapshot_1 = require("./DocumentSnapshot");
 // Utilities to create Snapshots from different contexts
-function createFromDocument(document) {
+function createFromDocument(document, ts) {
     const { code } = (0, astro2tsx_1.default)(document.getText(), classNameFromFilename(document.getURL()));
-    return new DocumentSnapshot_1.AstroSnapshot(document, code, typescript_1.default.ScriptKind.TSX);
+    return new DocumentSnapshot_1.AstroSnapshot(document, code, ts.ScriptKind.TSX);
 }
 exports.createFromDocument = createFromDocument;
 /**
@@ -22,16 +21,16 @@ exports.createFromDocument = createFromDocument;
  * @param filePath path to the file
  * @param createDocument function that is used to create a document in case it's an Astro file
  */
-function createFromFilePath(filePath, createDocument) {
-    if ((0, utils_1.isAstroFilePath)(filePath)) {
-        return createFromAstroFilePath(filePath, createDocument);
+function createFromFilePath(filePath, createDocument, ts) {
+    if ((0, utils_2.isAstroFilePath)(filePath)) {
+        return createFromAstroFilePath(filePath, createDocument, ts);
     }
-    else if ((0, utils_1.isFrameworkFilePath)(filePath)) {
-        const framework = (0, utils_1.getFrameworkFromFilePath)(filePath);
-        return createFromFrameworkFilePath(filePath, framework);
+    else if ((0, utils_2.isFrameworkFilePath)(filePath)) {
+        const framework = (0, utils_2.getFrameworkFromFilePath)(filePath);
+        return createFromFrameworkFilePath(filePath, framework, ts);
     }
     else {
-        return createFromTSFilePath(filePath);
+        return createFromTSFilePath(filePath, ts);
     }
 }
 exports.createFromFilePath = createFromFilePath;
@@ -39,13 +38,13 @@ exports.createFromFilePath = createFromFilePath;
  * Return a Framework or a TS snapshot from a file path, depending on the file contents
  * Unlike createFromFilePath, this does not support creating an Astro snapshot
  */
-function createFromNonAstroFilePath(filePath) {
-    if ((0, utils_1.isFrameworkFilePath)(filePath)) {
-        const framework = (0, utils_1.getFrameworkFromFilePath)(filePath);
-        return createFromFrameworkFilePath(filePath, framework);
+function createFromNonAstroFilePath(filePath, ts) {
+    if ((0, utils_2.isFrameworkFilePath)(filePath)) {
+        const framework = (0, utils_2.getFrameworkFromFilePath)(filePath);
+        return createFromFrameworkFilePath(filePath, framework, ts);
     }
     else {
-        return createFromTSFilePath(filePath);
+        return createFromTSFilePath(filePath, ts);
     }
 }
 exports.createFromNonAstroFilePath = createFromNonAstroFilePath;
@@ -54,9 +53,9 @@ exports.createFromNonAstroFilePath = createFromNonAstroFilePath;
  * @param filePath path to the js/ts file
  * @param options options that apply in case it's a svelte file
  */
-function createFromTSFilePath(filePath) {
-    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
-    return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, originalText);
+function createFromTSFilePath(filePath, ts) {
+    const originalText = ts.sys.readFile(filePath) ?? '';
+    return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, originalText, (0, utils_2.getScriptKindFromFileName)(filePath, ts));
 }
 exports.createFromTSFilePath = createFromTSFilePath;
 /**
@@ -64,14 +63,14 @@ exports.createFromTSFilePath = createFromTSFilePath;
  * @param filePath path to the Astro file
  * @param createDocument function that is used to create a document
  */
-function createFromAstroFilePath(filePath, createDocument) {
-    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
-    return createFromDocument(createDocument(filePath, originalText));
+function createFromAstroFilePath(filePath, createDocument, ts) {
+    const originalText = ts.sys.readFile(filePath) ?? '';
+    return createFromDocument(createDocument(filePath, originalText), ts);
 }
 exports.createFromAstroFilePath = createFromAstroFilePath;
-function createFromFrameworkFilePath(filePath, framework) {
+function createFromFrameworkFilePath(filePath, framework, ts) {
     const className = classNameFromFilename(filePath);
-    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
+    const originalText = ts.sys.readFile(filePath) ?? '';
     let code = '';
     if (framework === 'svelte') {
         const svelteIntegration = (0, importPackage_1.importSvelteIntegration)(filePath);
@@ -85,7 +84,7 @@ function createFromFrameworkFilePath(filePath, framework) {
             code = vueIntegration.toTSX(originalText, className);
         }
     }
-    return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, code, typescript_1.default.ScriptKind.TSX);
+    return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, code, ts.ScriptKind.TSX);
 }
 exports.createFromFrameworkFilePath = createFromFrameworkFilePath;
 function classNameFromFilename(filename) {
@@ -102,7 +101,7 @@ function classNameFromFilename(filename) {
         // for tag names. For a better import autocompletion experience, we therefore throw them out.
         .findIndex((char) => /[A-Za-z]/.test(char));
     const withoutLeadingInvalidCharacters = withoutInvalidCharacters.substr(firstValidCharIdx);
-    const inPascalCase = (0, utils_2.toPascalCase)(withoutLeadingInvalidCharacters);
+    const inPascalCase = (0, utils_1.toPascalCase)(withoutLeadingInvalidCharacters);
     const finalName = firstValidCharIdx === -1 ? `A${inPascalCase}` : inPascalCase;
     return finalName;
 }

package/dist/plugins/typescript/utils.d.ts

@@ -1,8 +1,7 @@
-import ts from 'typescript';
-import { CompletionItemKind, DiagnosticSeverity, Position, Range, SymbolKind, SemanticTokensLegend } from 'vscode-languageserver';
+import type { Node } from 'vscode-html-languageservice';
+import { CompletionItemKind, Position, Range, SemanticTokensLegend, SymbolKind } from 'vscode-languageserver';
 import { AstroDocument, TagInformation } from '../../core/documents';
-import { AstroSnapshot, ScriptTagDocumentSnapshot, SnapshotFragment } from './snapshots/DocumentSnapshot';
-import { Node } from 'vscode-html-languageservice';
+import type { AstroSnapshot, ScriptTagDocumentSnapshot, SnapshotFragment } from './snapshots/DocumentSnapshot';
 export declare const enum TokenType {
     class = 0,
     enum = 1,
@@ -27,13 +26,12 @@ export declare const enum TokenModifier {
 }
 export declare function getSemanticTokenLegend(): SemanticTokensLegend;
 export declare function symbolKindFromString(kind: string): SymbolKind;
-export declare function scriptElementKindToCompletionItemKind(kind: ts.ScriptElementKind): CompletionItemKind;
-export declare function getCommitCharactersForScriptElement(kind: ts.ScriptElementKind): string[] | undefined;
-export declare function getExtensionFromScriptKind(kind: ts.ScriptKind | undefined): ts.Extension;
-export declare function findTsConfigPath(fileName: string, rootUris: string[]): string;
+export declare function scriptElementKindToCompletionItemKind(kind: ts.ScriptElementKind, ts: typeof import('typescript/lib/tsserverlibrary')): CompletionItemKind;
+export declare function getCommitCharactersForScriptElement(kind: ts.ScriptElementKind, ts: typeof import('typescript/lib/tsserverlibrary')): string[] | undefined;
+export declare function getExtensionFromScriptKind(kind: ts.ScriptKind | undefined, ts: typeof import('typescript/lib/tsserverlibrary')): ts.Extension;
+export declare function findTsConfigPath(fileName: string, rootUris: string[], ts: typeof import('typescript/lib/tsserverlibrary')): string;
 export declare function isSubPath(uri: string, possibleSubPath: string): boolean;
-export declare function getScriptKindFromFileName(fileName: string): ts.ScriptKind;
-export declare function mapSeverity(category: ts.DiagnosticCategory): DiagnosticSeverity;
+export declare function getScriptKindFromFileName(fileName: string, ts: typeof import('typescript/lib/tsserverlibrary')): ts.ScriptKind;
 export declare function convertRange(document: {
     positionAt: (offset: number) => Position;
 }, range: {

package/dist/plugins/typescript/utils.js

@@ -1,38 +1,34 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScriptTagSnapshot = exports.getScriptTagLanguage = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.checkEndOfFileCodeInsert = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
-const typescript_1 = __importDefault(require("typescript"));
+exports.getScriptTagSnapshot = exports.getScriptTagLanguage = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.checkEndOfFileCodeInsert = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
 const path_1 = require("path");
-const utils_1 = require("../../utils");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const documents_1 = require("../../core/documents");
+const utils_1 = require("../../utils");
 function getSemanticTokenLegend() {
     const tokenModifiers = [];
     [
-        [0 /* declaration */, vscode_languageserver_1.SemanticTokenModifiers.declaration],
-        [1 /* static */, vscode_languageserver_1.SemanticTokenModifiers.static],
-        [2 /* async */, vscode_languageserver_1.SemanticTokenModifiers.async],
-        [3 /* readonly */, vscode_languageserver_1.SemanticTokenModifiers.readonly],
-        [4 /* defaultLibrary */, vscode_languageserver_1.SemanticTokenModifiers.defaultLibrary],
-        [5 /* local */, 'local'],
+        [0 /* TokenModifier.declaration */, vscode_languageserver_1.SemanticTokenModifiers.declaration],
+        [1 /* TokenModifier.static */, vscode_languageserver_1.SemanticTokenModifiers.static],
+        [2 /* TokenModifier.async */, vscode_languageserver_1.SemanticTokenModifiers.async],
+        [3 /* TokenModifier.readonly */, vscode_languageserver_1.SemanticTokenModifiers.readonly],
+        [4 /* TokenModifier.defaultLibrary */, vscode_languageserver_1.SemanticTokenModifiers.defaultLibrary],
+        [5 /* TokenModifier.local */, 'local'],
     ].forEach(([tsModifier, legend]) => (tokenModifiers[tsModifier] = legend));
     const tokenTypes = [];
     [
-        [0 /* class */, vscode_languageserver_1.SemanticTokenTypes.class],
-        [1 /* enum */, vscode_languageserver_1.SemanticTokenTypes.enum],
-        [2 /* interface */, vscode_languageserver_1.SemanticTokenTypes.interface],
-        [3 /* namespace */, vscode_languageserver_1.SemanticTokenTypes.namespace],
-        [4 /* typeParameter */, vscode_languageserver_1.SemanticTokenTypes.typeParameter],
-        [5 /* type */, vscode_languageserver_1.SemanticTokenTypes.type],
-        [6 /* parameter */, vscode_languageserver_1.SemanticTokenTypes.parameter],
-        [7 /* variable */, vscode_languageserver_1.SemanticTokenTypes.variable],
-        [8 /* enumMember */, vscode_languageserver_1.SemanticTokenTypes.enumMember],
-        [9 /* property */, vscode_languageserver_1.SemanticTokenTypes.property],
-        [10 /* function */, vscode_languageserver_1.SemanticTokenTypes.function],
-        [11 /* method */, vscode_languageserver_1.SemanticTokenTypes.method],
+        [0 /* TokenType.class */, vscode_languageserver_1.SemanticTokenTypes.class],
+        [1 /* TokenType.enum */, vscode_languageserver_1.SemanticTokenTypes.enum],
+        [2 /* TokenType.interface */, vscode_languageserver_1.SemanticTokenTypes.interface],
+        [3 /* TokenType.namespace */, vscode_languageserver_1.SemanticTokenTypes.namespace],
+        [4 /* TokenType.typeParameter */, vscode_languageserver_1.SemanticTokenTypes.typeParameter],
+        [5 /* TokenType.type */, vscode_languageserver_1.SemanticTokenTypes.type],
+        [6 /* TokenType.parameter */, vscode_languageserver_1.SemanticTokenTypes.parameter],
+        [7 /* TokenType.variable */, vscode_languageserver_1.SemanticTokenTypes.variable],
+        [8 /* TokenType.enumMember */, vscode_languageserver_1.SemanticTokenTypes.enumMember],
+        [9 /* TokenType.property */, vscode_languageserver_1.SemanticTokenTypes.property],
+        [10 /* TokenType.function */, vscode_languageserver_1.SemanticTokenTypes.function],
+        [11 /* TokenType.method */, vscode_languageserver_1.SemanticTokenTypes.method],
     ].forEach(([tokenType, legend]) => (tokenTypes[tokenType] = legend));
     return {
         tokenModifiers,
@@ -89,72 +85,72 @@ function symbolKindFromString(kind) {
     }
 }
 exports.symbolKindFromString = symbolKindFromString;
-function scriptElementKindToCompletionItemKind(kind) {
+function scriptElementKindToCompletionItemKind(kind, ts) {
     switch (kind) {
-        case typescript_1.default.ScriptElementKind.primitiveType:
-        case typescript_1.default.ScriptElementKind.keyword:
+        case ts.ScriptElementKind.primitiveType:
+        case ts.ScriptElementKind.keyword:
             return vscode_languageserver_1.CompletionItemKind.Keyword;
-        case typescript_1.default.ScriptElementKind.constElement:
+        case ts.ScriptElementKind.constElement:
             return vscode_languageserver_1.CompletionItemKind.Constant;
-        case typescript_1.default.ScriptElementKind.letElement:
-        case typescript_1.default.ScriptElementKind.variableElement:
-        case typescript_1.default.ScriptElementKind.localVariableElement:
-        case typescript_1.default.ScriptElementKind.alias:
+        case ts.ScriptElementKind.letElement:
+        case ts.ScriptElementKind.variableElement:
+        case ts.ScriptElementKind.localVariableElement:
+        case ts.ScriptElementKind.alias:
             return vscode_languageserver_1.CompletionItemKind.Variable;
-        case typescript_1.default.ScriptElementKind.memberVariableElement:
-        case typescript_1.default.ScriptElementKind.memberGetAccessorElement:
-        case typescript_1.default.ScriptElementKind.memberSetAccessorElement:
+        case ts.ScriptElementKind.memberVariableElement:
+        case ts.ScriptElementKind.memberGetAccessorElement:
+        case ts.ScriptElementKind.memberSetAccessorElement:
             return vscode_languageserver_1.CompletionItemKind.Field;
-        case typescript_1.default.ScriptElementKind.functionElement:
+        case ts.ScriptElementKind.functionElement:
             return vscode_languageserver_1.CompletionItemKind.Function;
-        case typescript_1.default.ScriptElementKind.memberFunctionElement:
-        case typescript_1.default.ScriptElementKind.constructSignatureElement:
-        case typescript_1.default.ScriptElementKind.callSignatureElement:
-        case typescript_1.default.ScriptElementKind.indexSignatureElement:
+        case ts.ScriptElementKind.memberFunctionElement:
+        case ts.ScriptElementKind.constructSignatureElement:
+        case ts.ScriptElementKind.callSignatureElement:
+        case ts.ScriptElementKind.indexSignatureElement:
             return vscode_languageserver_1.CompletionItemKind.Method;
-        case typescript_1.default.ScriptElementKind.enumElement:
+        case ts.ScriptElementKind.enumElement:
             return vscode_languageserver_1.CompletionItemKind.Enum;
-        case typescript_1.default.ScriptElementKind.moduleElement:
-        case typescript_1.default.ScriptElementKind.externalModuleName:
+        case ts.ScriptElementKind.moduleElement:
+        case ts.ScriptElementKind.externalModuleName:
             return vscode_languageserver_1.CompletionItemKind.Module;
-        case typescript_1.default.ScriptElementKind.classElement:
-        case typescript_1.default.ScriptElementKind.typeElement:
+        case ts.ScriptElementKind.classElement:
+        case ts.ScriptElementKind.typeElement:
             return vscode_languageserver_1.CompletionItemKind.Class;
-        case typescript_1.default.ScriptElementKind.interfaceElement:
+        case ts.ScriptElementKind.interfaceElement:
             return vscode_languageserver_1.CompletionItemKind.Interface;
-        case typescript_1.default.ScriptElementKind.warning:
-        case typescript_1.default.ScriptElementKind.scriptElement:
+        case ts.ScriptElementKind.warning:
+        case ts.ScriptElementKind.scriptElement:
             return vscode_languageserver_1.CompletionItemKind.File;
-        case typescript_1.default.ScriptElementKind.directory:
+        case ts.ScriptElementKind.directory:
             return vscode_languageserver_1.CompletionItemKind.Folder;
-        case typescript_1.default.ScriptElementKind.string:
+        case ts.ScriptElementKind.string:
             return vscode_languageserver_1.CompletionItemKind.Constant;
     }
     return vscode_languageserver_1.CompletionItemKind.Property;
 }
 exports.scriptElementKindToCompletionItemKind = scriptElementKindToCompletionItemKind;
-function getCommitCharactersForScriptElement(kind) {
+function getCommitCharactersForScriptElement(kind, ts) {
     const commitCharacters = [];
     switch (kind) {
-        case typescript_1.default.ScriptElementKind.memberGetAccessorElement:
-        case typescript_1.default.ScriptElementKind.memberSetAccessorElement:
-        case typescript_1.default.ScriptElementKind.constructSignatureElement:
-        case typescript_1.default.ScriptElementKind.callSignatureElement:
-        case typescript_1.default.ScriptElementKind.indexSignatureElement:
-        case typescript_1.default.ScriptElementKind.enumElement:
-        case typescript_1.default.ScriptElementKind.interfaceElement:
+        case ts.ScriptElementKind.memberGetAccessorElement:
+        case ts.ScriptElementKind.memberSetAccessorElement:
+        case ts.ScriptElementKind.constructSignatureElement:
+        case ts.ScriptElementKind.callSignatureElement:
+        case ts.ScriptElementKind.indexSignatureElement:
+        case ts.ScriptElementKind.enumElement:
+        case ts.ScriptElementKind.interfaceElement:
             commitCharacters.push('.');
             break;
-        case typescript_1.default.ScriptElementKind.moduleElement:
-        case typescript_1.default.ScriptElementKind.alias:
-        case typescript_1.default.ScriptElementKind.constElement:
-        case typescript_1.default.ScriptElementKind.letElement:
-        case typescript_1.default.ScriptElementKind.variableElement:
-        case typescript_1.default.ScriptElementKind.localVariableElement:
-        case typescript_1.default.ScriptElementKind.memberVariableElement:
-        case typescript_1.default.ScriptElementKind.classElement:
-        case typescript_1.default.ScriptElementKind.functionElement:
-        case typescript_1.default.ScriptElementKind.memberFunctionElement:
+        case ts.ScriptElementKind.moduleElement:
+        case ts.ScriptElementKind.alias:
+        case ts.ScriptElementKind.constElement:
+        case ts.ScriptElementKind.letElement:
+        case ts.ScriptElementKind.variableElement:
+        case ts.ScriptElementKind.localVariableElement:
+        case ts.ScriptElementKind.memberVariableElement:
+        case ts.ScriptElementKind.classElement:
+        case ts.ScriptElementKind.functionElement:
+        case ts.ScriptElementKind.memberFunctionElement:
             commitCharacters.push('.', ',');
             commitCharacters.push('(');
             break;
@@ -162,26 +158,26 @@ function getCommitCharactersForScriptElement(kind) {
     return commitCharacters.length === 0 ? undefined : commitCharacters;
 }
 exports.getCommitCharactersForScriptElement = getCommitCharactersForScriptElement;
-function getExtensionFromScriptKind(kind) {
+function getExtensionFromScriptKind(kind, ts) {
     switch (kind) {
-        case typescript_1.default.ScriptKind.JSX:
-            return typescript_1.default.Extension.Jsx;
-        case typescript_1.default.ScriptKind.TS:
-            return typescript_1.default.Extension.Ts;
-        case typescript_1.default.ScriptKind.TSX:
-            return typescript_1.default.Extension.Tsx;
-        case typescript_1.default.ScriptKind.JSON:
-            return typescript_1.default.Extension.Json;
-        case typescript_1.default.ScriptKind.JS:
+        case ts.ScriptKind.JSX:
+            return ts.Extension.Jsx;
+        case ts.ScriptKind.TS:
+            return ts.Extension.Ts;
+        case ts.ScriptKind.TSX:
+            return ts.Extension.Tsx;
+        case ts.ScriptKind.JSON:
+            return ts.Extension.Json;
+        case ts.ScriptKind.JS:
         default:
-            return typescript_1.default.Extension.Js;
+            return ts.Extension.Js;
     }
 }
 exports.getExtensionFromScriptKind = getExtensionFromScriptKind;
-function findTsConfigPath(fileName, rootUris) {
+function findTsConfigPath(fileName, rootUris, ts) {
     const searchDir = (0, path_1.dirname)(fileName);
-    const path = typescript_1.default.findConfigFile(searchDir, typescript_1.default.sys.fileExists, 'tsconfig.json') ||
-        typescript_1.default.findConfigFile(searchDir, typescript_1.default.sys.fileExists, 'jsconfig.json') ||
+    const path = ts.findConfigFile(searchDir, ts.sys.fileExists, 'tsconfig.json') ||
+        ts.findConfigFile(searchDir, ts.sys.fileExists, 'jsconfig.json') ||
         '';
     // Don't return config files that exceed the current workspace context.
     return !!path && rootUris.some((rootUri) => isSubPath(rootUri, path)) ? path : '';
@@ -191,37 +187,24 @@ function isSubPath(uri, possibleSubPath) {
     return (0, utils_1.pathToUrl)(possibleSubPath).startsWith(uri);
 }
 exports.isSubPath = isSubPath;
-function getScriptKindFromFileName(fileName) {
+function getScriptKindFromFileName(fileName, ts) {
     const ext = fileName.substring(fileName.lastIndexOf('.'));
     switch (ext.toLowerCase()) {
-        case typescript_1.default.Extension.Js:
-            return typescript_1.default.ScriptKind.JS;
-        case typescript_1.default.Extension.Jsx:
-            return typescript_1.default.ScriptKind.JSX;
-        case typescript_1.default.Extension.Ts:
-            return typescript_1.default.ScriptKind.TS;
-        case typescript_1.default.Extension.Tsx:
-            return typescript_1.default.ScriptKind.TSX;
-        case typescript_1.default.Extension.Json:
-            return typescript_1.default.ScriptKind.JSON;
+        case ts.Extension.Js:
+            return ts.ScriptKind.JS;
+        case ts.Extension.Jsx:
+            return ts.ScriptKind.JSX;
+        case ts.Extension.Ts:
+            return ts.ScriptKind.TS;
+        case ts.Extension.Tsx:
+            return ts.ScriptKind.TSX;
+        case ts.Extension.Json:
+            return ts.ScriptKind.JSON;
         default:
-            return typescript_1.default.ScriptKind.Unknown;
+            return ts.ScriptKind.Unknown;
     }
 }
 exports.getScriptKindFromFileName = getScriptKindFromFileName;
-function mapSeverity(category) {
-    switch (category) {
-        case typescript_1.default.DiagnosticCategory.Error:
-            return vscode_languageserver_1.DiagnosticSeverity.Error;
-        case typescript_1.default.DiagnosticCategory.Warning:
-            return vscode_languageserver_1.DiagnosticSeverity.Warning;
-        case typescript_1.default.DiagnosticCategory.Suggestion:
-            return vscode_languageserver_1.DiagnosticSeverity.Hint;
-        case typescript_1.default.DiagnosticCategory.Message:
-            return vscode_languageserver_1.DiagnosticSeverity.Information;
-    }
-}
-exports.mapSeverity = mapSeverity;
 function convertRange(document, range) {
     return vscode_languageserver_1.Range.create(document.positionAt(range.start || 0), document.positionAt((range.start || 0) + (range.length || 0)));
 }

package/dist/server.d.ts

@@ -1,2 +1,6 @@
 import * as vscode from 'vscode-languageserver';
-export declare function startLanguageServer(connection: vscode.Connection): void;
+export interface RuntimeEnvironment {
+    loadTypescript: (initOptions: any) => typeof import('typescript/lib/tsserverlibrary');
+    loadTypescriptLocalized: (initOptions: any) => Record<string, string> | undefined;
+}
+export declare function startLanguageServer(connection: vscode.Connection, env: RuntimeEnvironment): void;