@astrojs/language-server 0.23.2 → 0.24.1

package/dist/plugins/interfaces.d.ts

@@ -1,5 +1,5 @@
-import { CodeAction, CodeActionContext, Color, Location, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FileChangeType, FoldingRange, FormattingOptions, Hover, InlayHint, LinkedEditingRanges, Position, Range, ReferenceContext, SelectionRange, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, TextDocumentIdentifier, TextEdit, WorkspaceEdit } from 'vscode-languageserver';
-import { TextDocument } from 'vscode-languageserver-textdocument';
+import type { CodeAction, CodeActionContext, Color, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FileChangeType, FoldingRange, FormattingOptions, Hover, InlayHint, LinkedEditingRanges, Location, Position, Range, ReferenceContext, SelectionRange, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, TextDocumentIdentifier, TextEdit, WorkspaceEdit } from 'vscode-languageserver';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export declare type Resolvable<T> = T | Promise<T>;
 export interface AppCompletionItem<T extends TextDocumentIdentifier = any> extends CompletionItem {
     data?: T;

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

@@ -1,16 +1,15 @@
-import ts from 'typescript';
-import { TextDocumentContentChangeEvent } from 'vscode-languageserver';
-import { ConfigManager } from '../../core/config';
-import { AstroDocument, DocumentManager } from '../../core/documents';
-import { LanguageServiceContainer } from './language-service';
-import { DocumentSnapshot } from './snapshots/DocumentSnapshot';
+import type { TextDocumentContentChangeEvent } from 'vscode-languageserver';
+import type { ConfigManager } from '../../core/config';
+import type { AstroDocument, DocumentManager } from '../../core/documents';
+import { LanguageServiceContainer, LanguageServiceDocumentContext } from './language-service';
+import type { DocumentSnapshot } from './snapshots/DocumentSnapshot';
 export declare class LanguageServiceManager {
     private readonly docManager;
     private readonly workspaceUris;
     private readonly configManager;
-    private docContext;
+    docContext: LanguageServiceDocumentContext;
     private globalSnapshotManager;
-    constructor(docManager: DocumentManager, workspaceUris: string[], configManager: ConfigManager);
+    constructor(docManager: DocumentManager, workspaceUris: string[], configManager: ConfigManager, ts: typeof import('typescript/lib/tsserverlibrary'), tsLocalized?: Record<string, string> | undefined);
     /**
      * Create an AstroDocument (only for astro files)
      */
@@ -37,6 +36,6 @@ export declare class LanguageServiceManager {
         tsDoc: DocumentSnapshot;
         lang: ts.LanguageService;
     }>;
-    getLSForPath(path: string): Promise<ts.LanguageService>;
+    getLSForPath(path: string): Promise<import("typescript/lib/tsserverlibrary").LanguageService>;
     getTypeScriptLanguageService(filePath: string): Promise<LanguageServiceContainer>;
 }

package/dist/plugins/typescript/LanguageServiceManager.js

@@ -5,11 +5,10 @@ const utils_1 = require("../../utils");
 const language_service_1 = require("./language-service");
 const SnapshotManager_1 = require("./snapshots/SnapshotManager");
 class LanguageServiceManager {
-    constructor(docManager, workspaceUris, configManager) {
+    constructor(docManager, workspaceUris, configManager, ts, tsLocalized) {
         this.docManager = docManager;
         this.workspaceUris = workspaceUris;
         this.configManager = configManager;
-        this.globalSnapshotManager = new SnapshotManager_1.GlobalSnapshotManager();
         /**
          * Create an AstroDocument (only for astro files)
          */
@@ -22,10 +21,13 @@ class LanguageServiceManager {
             this.docManager.lockDocument(uri);
             return document;
         };
+        this.globalSnapshotManager = new SnapshotManager_1.GlobalSnapshotManager(ts);
         this.docContext = {
             createDocument: this.createDocument,
             globalSnapshotManager: this.globalSnapshotManager,
             configManager: this.configManager,
+            ts,
+            tsLocalized: tsLocalized,
         };
         const handleDocumentChange = (document) => {
             this.getSnapshot(document);
@@ -36,7 +38,7 @@ class LanguageServiceManager {
     async getSnapshot(pathOrDoc) {
         const filePath = typeof pathOrDoc === 'string' ? pathOrDoc : pathOrDoc.getFilePath() || '';
         const tsService = await this.getTypeScriptLanguageService(filePath);
-        return tsService.updateSnapshot(pathOrDoc);
+        return tsService.updateSnapshot(pathOrDoc, this.docContext.ts);
     }
     /**
      * Updates snapshot path in all existing ts services and retrieves snapshot

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

@@ -1,10 +1,10 @@
-import { CancellationToken, CodeAction, CodeActionContext, CompletionContext, DefinitionLink, Location, Diagnostic, FoldingRange, Hover, InlayHint, Position, Range, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, WorkspaceEdit } from 'vscode-languageserver';
-import { ConfigManager } from '../../core/config';
-import { AstroDocument } from '../../core/documents';
-import { AppCompletionItem, AppCompletionList, OnWatchFileChangesParam, Plugin } from '../interfaces';
-import { CompletionItemData } from './features/CompletionsProvider';
-import { LanguageServiceManager } from './LanguageServiceManager';
+import { CancellationToken, CodeAction, CodeActionContext, CompletionContext, DefinitionLink, Diagnostic, FoldingRange, Hover, InlayHint, Location, Position, Range, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, WorkspaceEdit } from 'vscode-languageserver';
+import type { ConfigManager } from '../../core/config';
+import type { AstroDocument } from '../../core/documents';
+import type { AppCompletionItem, AppCompletionList, OnWatchFileChangesParam, Plugin } from '../interfaces';
 import { Astro2TSXResult } from './astro2tsx';
+import { CompletionItemData } from './features/CompletionsProvider';
+import type { LanguageServiceManager } from './LanguageServiceManager';
 export declare class TypeScriptPlugin implements Plugin {
     __name: string;
     private configManager;
@@ -20,6 +20,7 @@ export declare class TypeScriptPlugin implements Plugin {
     private readonly inlayHintsProvider;
     private readonly semanticTokensProvider;
     private readonly foldingRangesProvider;
+    private readonly ts;
     constructor(configManager: ConfigManager, languageServiceManager: LanguageServiceManager);
     doHover(document: AstroDocument, position: Position): Promise<Hover | null>;
     rename(document: AstroDocument, position: Position, newName: string): Promise<WorkspaceEdit | null>;

package/dist/plugins/typescript/TypeScriptPlugin.js

@@ -4,27 +4,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScriptPlugin = void 0;
-const typescript_1 = __importDefault(require("typescript"));
 const vscode_languageserver_1 = require("vscode-languageserver");
+const astro2tsx_1 = __importDefault(require("./astro2tsx"));
+const CodeActionsProvider_1 = require("./features/CodeActionsProvider");
 const CompletionsProvider_1 = require("./features/CompletionsProvider");
+const DefinitionsProvider_1 = require("./features/DefinitionsProvider");
 const DiagnosticsProvider_1 = require("./features/DiagnosticsProvider");
-const HoverProvider_1 = require("./features/HoverProvider");
-const SignatureHelpProvider_1 = require("./features/SignatureHelpProvider");
-const utils_1 = require("./utils");
 const DocumentSymbolsProvider_1 = require("./features/DocumentSymbolsProvider");
-const SemanticTokenProvider_1 = require("./features/SemanticTokenProvider");
 const FoldingRangesProvider_1 = require("./features/FoldingRangesProvider");
-const CodeActionsProvider_1 = require("./features/CodeActionsProvider");
-const DefinitionsProvider_1 = require("./features/DefinitionsProvider");
+const HoverProvider_1 = require("./features/HoverProvider");
 const InlayHintsProvider_1 = require("./features/InlayHintsProvider");
-const astro2tsx_1 = __importDefault(require("./astro2tsx"));
-const utils_2 = require("./snapshots/utils");
+const SemanticTokenProvider_1 = require("./features/SemanticTokenProvider");
+const SignatureHelpProvider_1 = require("./features/SignatureHelpProvider");
 const TypeDefinitionsProvider_1 = require("./features/TypeDefinitionsProvider");
+const utils_1 = require("./snapshots/utils");
+const utils_2 = require("./utils");
 class TypeScriptPlugin {
     constructor(configManager, languageServiceManager) {
         this.__name = 'typescript';
         this.configManager = configManager;
         this.languageServiceManager = languageServiceManager;
+        this.ts = languageServiceManager.docContext.ts;
         this.codeActionsProvider = new CodeActionsProvider_1.CodeActionsProviderImpl(this.languageServiceManager, this.configManager);
         this.completionProvider = new CompletionsProvider_1.CompletionsProviderImpl(this.languageServiceManager, this.configManager);
         this.hoverProvider = new HoverProvider_1.HoverProviderImpl(this.languageServiceManager);
@@ -47,7 +47,7 @@ class TypeScriptPlugin {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const fragment = await tsDoc.createFragment();
         const offset = fragment.offsetAt(fragment.getGeneratedPosition(position));
-        let renames = lang.findRenameLocations((0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath), offset, false, false, true);
+        let renames = lang.findRenameLocations((0, utils_2.toVirtualAstroFilePath)(tsDoc.filePath), offset, false, false, true);
         if (!renames) {
             return null;
         }
@@ -55,13 +55,13 @@ class TypeScriptPlugin {
             changes: {},
         };
         renames.forEach((rename) => {
-            const filePath = (0, utils_1.ensureRealFilePath)(rename.fileName);
+            const filePath = (0, utils_2.ensureRealFilePath)(rename.fileName);
             if (!(filePath in edit.changes)) {
                 edit.changes[filePath] = [];
             }
             edit.changes[filePath].push({
                 newText: newName,
-                range: (0, utils_1.convertToLocationRange)(fragment, rename.textSpan),
+                range: (0, utils_2.convertToLocationRange)(fragment, rename.textSpan),
             });
         });
         return edit;
@@ -116,8 +116,8 @@ class TypeScriptPlugin {
     async onWatchFileChanges(onWatchFileChangesParas) {
         let doneUpdateProjectFiles = false;
         for (const { fileName, changeType } of onWatchFileChangesParas) {
-            const scriptKind = (0, utils_1.getScriptKindFromFileName)(fileName);
-            if (scriptKind === typescript_1.default.ScriptKind.Unknown) {
+            const scriptKind = (0, utils_2.getScriptKindFromFileName)(fileName, this.ts);
+            if (scriptKind === this.ts.ScriptKind.Unknown) {
                 continue;
             }
             if (changeType === vscode_languageserver_1.FileChangeType.Created && !doneUpdateProjectFiles) {
@@ -139,7 +139,7 @@ class TypeScriptPlugin {
         return this.signatureHelpProvider.getSignatureHelp(document, position, context, cancellationToken);
     }
     getTSXForDocument(document) {
-        return (0, astro2tsx_1.default)(document.getText(), (0, utils_2.classNameFromFilename)(document.getURL()));
+        return (0, astro2tsx_1.default)(document.getText(), (0, utils_1.classNameFromFilename)(document.getURL()));
     }
     async featureEnabled(document, feature) {
         return ((await this.configManager.isEnabled(document, 'typescript')) &&

package/dist/plugins/typescript/astro-sys.d.ts

@@ -1,8 +1,7 @@
-import ts from 'typescript';
-import { DocumentSnapshot } from './snapshots/DocumentSnapshot';
+import type { DocumentSnapshot } from './snapshots/DocumentSnapshot';
 /**
  * This should only be accessed by TS Astro module resolution.
  */
-export declare function createAstroSys(getSnapshot: (fileName: string) => DocumentSnapshot): ts.System & {
+export declare function createAstroSys(getSnapshot: (fileName: string) => DocumentSnapshot, ts: typeof import('typescript/lib/tsserverlibrary')): import("typescript/lib/tsserverlibrary").System & {
     deleteFromCache: (path: string) => void;
 };

package/dist/plugins/typescript/astro-sys.js

@@ -1,21 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAstroSys = void 0;
-const typescript_1 = __importDefault(require("typescript"));
 const utils_1 = require("./utils");
 /**
  * This should only be accessed by TS Astro module resolution.
  */
-function createAstroSys(getSnapshot) {
+function createAstroSys(getSnapshot, ts) {
     const fileExistsCache = new Map();
     const AstroSys = {
-        ...typescript_1.default.sys,
+        ...ts.sys,
         fileExists(path) {
             path = (0, utils_1.ensureRealFilePath)(path);
-            const exists = fileExistsCache.get(path) ?? typescript_1.default.sys.fileExists(path);
+            const exists = fileExistsCache.get(path) ?? ts.sys.fileExists(path);
             fileExistsCache.set(path, exists);
             return exists;
         },
@@ -25,19 +21,19 @@ function createAstroSys(getSnapshot) {
         },
         readDirectory(path, extensions, exclude, include, depth) {
             const extensionsWithAstro = (extensions ?? []).concat(...['.astro', '.svelte', '.vue']);
-            const result = typescript_1.default.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
+            const result = ts.sys.readDirectory(path, extensionsWithAstro, exclude, include, depth);
             return result;
         },
         deleteFile(path) {
             fileExistsCache.delete((0, utils_1.ensureRealFilePath)(path));
-            return typescript_1.default.sys.deleteFile?.(path);
+            return ts.sys.deleteFile?.(path);
         },
         deleteFromCache(path) {
             fileExistsCache.delete((0, utils_1.ensureRealFilePath)(path));
         },
     };
-    if (typescript_1.default.sys.realpath) {
-        const realpath = typescript_1.default.sys.realpath;
+    if (ts.sys.realpath) {
+        const realpath = ts.sys.realpath;
         AstroSys.realpath = function (path) {
             if ((0, utils_1.isVirtualFilePath)(path)) {
                 return realpath((0, utils_1.ensureRealFilePath)(path)) + '.tsx';

package/dist/plugins/typescript/astro2tsx.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const os_1 = require("os");
 const parseAstro_1 = require("../../core/documents/parseAstro");
 function addProps(content, className) {
     let defaultExportType = 'Record<string, any>';
@@ -19,8 +18,8 @@ function addProps(content, className) {
         shouldAddGlobal = true;
         astroGlobal += ' & { props: Props }';
     }
-    return (os_1.EOL +
-        (shouldAddGlobal ? astroGlobal + os_1.EOL + astroGlobalConstDef : '') +
+    return ('\n' +
+        (shouldAddGlobal ? astroGlobal + '\n' + astroGlobalConstDef : '') +
         `export default function ${className}__AstroComponent_(_props: ${defaultExportType}): any {}`);
 }
 function escapeTemplateLiteralContent(content) {
@@ -88,7 +87,7 @@ function default_1(content, className) {
     result.code =
         frontMatterRaw +
             htmlRaw +
-            os_1.EOL +
+            '\n' +
             // Add TypeScript definitions
             addProps(frontMatterRaw, className);
     return result;

package/dist/plugins/typescript/features/CodeActionsProvider.d.ts

@@ -1,13 +1,14 @@
-import { CancellationToken } from 'vscode-languageserver';
+import type { CancellationToken } from 'vscode-languageserver';
 import { CodeAction, CodeActionContext, Range } from 'vscode-languageserver-types';
-import { ConfigManager } from '../../../core/config';
+import type { ConfigManager } from '../../../core/config';
 import { AstroDocument } from '../../../core/documents';
-import { CodeActionsProvider } from '../../interfaces';
-import { LanguageServiceManager } from '../LanguageServiceManager';
+import type { CodeActionsProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
 export declare const sortImportKind: string;
 export declare class CodeActionsProviderImpl implements CodeActionsProvider {
     private languageServiceManager;
     private configManager;
+    private ts;
     constructor(languageServiceManager: LanguageServiceManager, configManager: ConfigManager);
     getCodeActions(document: AstroDocument, range: Range, context: CodeActionContext, cancellationToken?: CancellationToken): Promise<CodeAction[]>;
     private getComponentQuickFix;

package/dist/plugins/typescript/features/CodeActionsProvider.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodeActionsProviderImpl = exports.sortImportKind = void 0;
-const typescript_1 = __importDefault(require("typescript"));
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const documents_1 = require("../../../core/documents");
 const utils_1 = require("../../../utils");
@@ -17,6 +13,7 @@ class CodeActionsProviderImpl {
     constructor(languageServiceManager, configManager) {
         this.languageServiceManager = languageServiceManager;
         this.configManager = configManager;
+        this.ts = languageServiceManager.docContext.ts;
     }
     async getCodeActions(document, range, context, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
@@ -71,11 +68,11 @@ class CodeActionsProviderImpl {
                 codeFixes =
                     codeFixes ?? lang.getCodeFixesAtPosition(filePath, start, end, errorCodes, formatOptions, tsPreferences);
             }
-            const codeActions = codeFixes.map((fix) => codeFixToCodeAction(fix, context.diagnostics, context.only ? vscode_languageserver_types_1.CodeActionKind.QuickFix : vscode_languageserver_types_1.CodeActionKind.Empty, isInsideScript));
+            const codeActions = codeFixes.map((fix) => codeFixToCodeAction(fix, context.diagnostics, context.only ? vscode_languageserver_types_1.CodeActionKind.QuickFix : vscode_languageserver_types_1.CodeActionKind.Empty, isInsideScript, this.ts));
             result.push(...codeActions);
         }
         return result;
-        function codeFixToCodeAction(codeFix, diagnostics, kind, isInsideScript) {
+        function codeFixToCodeAction(codeFix, diagnostics, kind, isInsideScript, ts) {
             const documentChanges = codeFix.changes.map((change) => {
                 return vscode_languageserver_types_1.TextDocumentEdit.create(vscode_languageserver_types_1.OptionalVersionedTextDocumentIdentifier.create(document.getURL(), null), change.textChanges.map((edit) => {
                     let originalRange = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, edit.span));
@@ -83,7 +80,7 @@ class CodeActionsProviderImpl {
                     // restricted to the area of the script tag by default
                     if (!isInsideScript) {
                         if (codeFix.fixName === 'import') {
-                            return (0, CompletionsProvider_1.codeActionChangeToTextEdit)(document, fragment, false, edit);
+                            return (0, CompletionsProvider_1.codeActionChangeToTextEdit)(document, fragment, false, edit, ts);
                         }
                         if (codeFix.fixName === 'fixMissingFunctionDeclaration') {
                             originalRange = (0, utils_2.checkEndOfFileCodeInsert)(originalRange, document);
@@ -95,7 +92,7 @@ class CodeActionsProviderImpl {
                             const existingLine = (0, documents_1.getLineAtPosition)(document.positionAt(edit.span.start), document.getText());
                             const isNewImport = !existingLine.trim().startsWith('import');
                             if (!(edit.newText.startsWith('\n') || edit.newText.startsWith('\r\n')) && isNewImport) {
-                                edit.newText = typescript_1.default.sys.newLine + edit.newText;
+                                edit.newText = ts.sys.newLine + edit.newText;
                             }
                         }
                     }
@@ -126,7 +123,7 @@ class CodeActionsProviderImpl {
         const node = (0, utils_3.findContainingNode)(sourceFile, {
             start,
             length: end - start,
-        }, (n) => typescript_1.default.isJsxClosingElement(n) || typescript_1.default.isJsxOpeningLikeElement(n));
+        }, (n) => this.ts.isJsxClosingElement(n) || this.ts.isJsxOpeningLikeElement(n));
         if (!node) {
             return;
         }

package/dist/plugins/typescript/features/CompletionsProvider.d.ts

@@ -1,10 +1,10 @@
-import { CompletionContext, Position, TextDocumentIdentifier, TextEdit, CancellationToken } from 'vscode-languageserver';
-import type { LanguageServiceManager } from '../LanguageServiceManager';
+import type ts from 'typescript/lib/tsserverlibrary';
+import { CancellationToken, CompletionContext, Position, TextDocumentIdentifier, TextEdit } from 'vscode-languageserver';
+import type { ConfigManager } from '../../../core/config';
 import { AstroDocument } from '../../../core/documents';
-import ts from 'typescript';
-import { AppCompletionItem, AppCompletionList, CompletionsProvider } from '../../interfaces';
-import { AstroSnapshotFragment } from '../snapshots/DocumentSnapshot';
-import { ConfigManager } from '../../../core/config';
+import type { AppCompletionItem, AppCompletionList, CompletionsProvider } from '../../interfaces';
+import type { LanguageServiceManager } from '../LanguageServiceManager';
+import type { AstroSnapshotFragment } from '../snapshots/DocumentSnapshot';
 export interface CompletionItemData extends TextDocumentIdentifier {
     filePath: string;
     offset: number;
@@ -14,6 +14,7 @@ export interface CompletionItemData extends TextDocumentIdentifier {
 export declare class CompletionsProviderImpl implements CompletionsProvider<CompletionItemData> {
     private languageServiceManager;
     private configManager;
+    private ts;
     constructor(languageServiceManager: LanguageServiceManager, configManager: ConfigManager);
     private readonly validTriggerCharacters;
     private isValidTriggerCharacter;
@@ -31,5 +32,6 @@ export declare class CompletionsProviderImpl implements CompletionsProvider<Comp
     private canReuseLastCompletion;
     private getExistingImports;
     private isAstroComponentImport;
+    private isValidCompletion;
 }
-export declare function codeActionChangeToTextEdit(document: AstroDocument, fragment: AstroSnapshotFragment, isInsideScriptTag: boolean, change: ts.TextChange): TextEdit;
+export declare function codeActionChangeToTextEdit(document: AstroDocument, fragment: AstroSnapshotFragment, isInsideScriptTag: boolean, change: ts.TextChange, ts: typeof import('typescript/lib/tsserverlibrary')): TextEdit;