@astrojs/language-server 2.5.5 → 2.6.0

package/dist/check.d.ts

@@ -21,7 +21,6 @@ export declare class AstroCheck {
     private ts;
     project: ReturnType<typeof kit.createProject>;
     private linter;
-    private skipJSX;
     constructor(workspacePath: string, typescriptPath: string | undefined, tsconfigPath: string | undefined);
     /**
      * Lint a list of files or the entire project and optionally log the errors found

package/dist/check.js

@@ -45,8 +45,6 @@ class AstroCheck {
         this.workspacePath = workspacePath;
         this.typescriptPath = typescriptPath;
         this.tsconfigPath = tsconfigPath;
-        // TODO: Remove this when the JSX typing issue is fixed
-        this.skipJSX = false;
         this.initialize();
     }
     /**
@@ -57,9 +55,6 @@ class AstroCheck {
      */
     async lint({ fileNames = undefined, cancel = () => false, logErrors = undefined, }) {
         let files = fileNames !== undefined ? fileNames : this.project.languageHost.getScriptFileNames();
-        if (this.skipJSX) {
-            files = files.filter((file) => !file.endsWith('.jsx') && !file.endsWith('.tsx'));
-        }
         const result = {
             status: undefined,
             fileChecked: 0,
@@ -139,11 +134,6 @@ class AstroCheck {
                 });
             });
         }
-        const files = this.project.languageHost.getScriptFileNames();
-        if (files.some((file) => file.endsWith('.jsx') || file.endsWith('.tsx'))) {
-            console.warn('\x1b[33;1mWARNING:\x1b[0m Checking `.jsx` and `.tsx` files is temporarily disabled due to an issue in the Astro language server and TypeScript. See https://github.com/withastro/language-tools/issues/727 for more details. In the meantime, such files can be checked using `tsc --noEmit`.');
-            this.skipJSX = true;
-        }
         this.linter = kit.createLinter(config, this.project.languageHost);
     }
     getTsconfig() {

package/dist/core/astro2tsx.d.ts

@@ -1,8 +1,27 @@
+import type { ConvertToTSXOptions, DiagnosticMessage, TSXResult } from '@astrojs/compiler/types';
 import { VirtualFile } from '@volar/language-core';
+import { Range } from '@volar/language-server';
 import { HTMLDocument } from 'vscode-html-languageservice';
-export declare function astro2tsx(input: string, fileName: string, ts: typeof import('typescript/lib/tsserverlibrary.js'), htmlDocument: HTMLDocument): {
+export interface LSPTSXRanges {
+    frontmatter: Range;
+    body: Range;
+}
+interface Astro2TSXResult {
     virtualFile: VirtualFile;
-    diagnostics: import("@astrojs/compiler").DiagnosticMessage[] | {
+    diagnostics: DiagnosticMessage[];
+    ranges: LSPTSXRanges;
+}
+export declare function safeConvertToTSX(content: string, options: ConvertToTSXOptions): TSXResult | {
+    code: string;
+    map: {
+        file: string;
+        sources: never[];
+        sourcesContent: never[];
+        names: never[];
+        mappings: string;
+        version: number;
+    };
+    diagnostics: {
         code: 1000;
         location: {
             file: string;
@@ -13,4 +32,17 @@ export declare function astro2tsx(input: string, fileName: string, ts: typeof im
         severity: 1;
         text: string;
     }[];
+    metaRanges: {
+        frontmatter: {
+            start: number;
+            end: number;
+        };
+        body: {
+            start: number;
+            end: number;
+        };
+    };
 };
+export declare function getTSXRangesAsLSPRanges(tsx: TSXResult): LSPTSXRanges;
+export declare function astro2tsx(input: string, fileName: string, ts: typeof import('typescript/lib/tsserverlibrary.js'), htmlDocument: HTMLDocument): Astro2TSXResult;
+export {};

package/dist/core/astro2tsx.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astro2tsx = void 0;
+exports.astro2tsx = exports.getTSXRangesAsLSPRanges = exports.safeConvertToTSX = void 0;
 const sync_1 = require("@astrojs/compiler/sync");
 const sourcemap_codec_1 = require("@jridgewell/sourcemap-codec");
 const language_core_1 = require("@volar/language-core");
+const language_server_1 = require("@volar/language-server");
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 const utils_js_1 = require("./utils.js");
 function safeConvertToTSX(content, options) {
@@ -31,14 +32,34 @@ function safeConvertToTSX(content, options) {
                     text: `The Astro compiler encountered an unknown error while transform this file to TSX. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/language-tools/issues`,
                 },
             ],
+            metaRanges: {
+                frontmatter: {
+                    start: 0,
+                    end: 0,
+                },
+                body: {
+                    start: 0,
+                    end: 0,
+                },
+            },
         };
     }
 }
+exports.safeConvertToTSX = safeConvertToTSX;
+function getTSXRangesAsLSPRanges(tsx) {
+    const textDocument = vscode_html_languageservice_1.TextDocument.create('', 'typescriptreact', 0, tsx.code);
+    return {
+        frontmatter: language_server_1.Range.create(textDocument.positionAt(tsx.metaRanges.frontmatter.start), textDocument.positionAt(tsx.metaRanges.frontmatter.end)),
+        body: language_server_1.Range.create(textDocument.positionAt(tsx.metaRanges.body.start), textDocument.positionAt(tsx.metaRanges.body.end)),
+    };
+}
+exports.getTSXRangesAsLSPRanges = getTSXRangesAsLSPRanges;
 function astro2tsx(input, fileName, ts, htmlDocument) {
     const tsx = safeConvertToTSX(input, { filename: fileName });
     return {
         virtualFile: getVirtualFileTSX(input, tsx, fileName, ts, htmlDocument),
         diagnostics: tsx.diagnostics,
+        ranges: getTSXRangesAsLSPRanges(tsx),
     };
 }
 exports.astro2tsx = astro2tsx;

package/dist/core/index.d.ts

@@ -1,9 +1,9 @@
-import type { DiagnosticMessage, ParseResult } from '@astrojs/compiler/types';
+import type { DiagnosticMessage } from '@astrojs/compiler/types';
 import { FileCapabilities, FileKind, type Language, type VirtualFile } from '@volar/language-core';
 import type ts from 'typescript/lib/tsserverlibrary';
 import type { HTMLDocument } from 'vscode-html-languageservice';
 import type { AstroInstall } from '../utils.js';
-import { FrontmatterStatus } from './parseAstro';
+import { AstroMetadata } from './parseAstro';
 export declare function getLanguageModule(astroInstall: AstroInstall | undefined, ts: typeof import('typescript/lib/tsserverlibrary.js')): Language<AstroFile>;
 export declare class AstroFile implements VirtualFile {
     sourceFileName: string;
@@ -14,9 +14,7 @@ export declare class AstroFile implements VirtualFile {
     fileName: string;
     mappings: VirtualFile['mappings'];
     embeddedFiles: VirtualFile['embeddedFiles'];
-    astroMeta: ParseResult & {
-        frontmatter: FrontmatterStatus;
-    };
+    astroMeta: AstroMetadata;
     compilerDiagnostics: DiagnosticMessage[];
     htmlDocument: HTMLDocument;
     scriptFiles: string[];

package/dist/core/index.js

@@ -54,13 +54,34 @@ function getLanguageModule(astroInstall, ts) {
                     return host.resolveModuleName?.(moduleName, impliedNodeFormat) ?? moduleName;
                 },
                 getScriptFileNames() {
+                    let languageServerDirectory;
+                    try {
+                        languageServerDirectory = path.dirname(require.resolve('@astrojs/language-server'));
+                    }
+                    catch (e) {
+                        languageServerDirectory = __dirname;
+                    }
                     const fileNames = host.getScriptFileNames();
-                    return [
-                        ...fileNames,
-                        ...(astroInstall
-                            ? ['./env.d.ts', './astro-jsx.d.ts'].map((filePath) => ts.sys.resolvePath(path.resolve(astroInstall.path, filePath)))
-                            : []),
-                    ];
+                    const addedFileNames = [];
+                    if (astroInstall) {
+                        addedFileNames.push(...['./env.d.ts', './astro-jsx.d.ts'].map((filePath) => ts.sys.resolvePath(path.resolve(astroInstall.path, filePath))));
+                        // If Astro version is < 4.0.8, add jsx-runtime-augment.d.ts to the files to fake `JSX` being available from "astro/jsx-runtime".
+                        // TODO: Remove this once a majority of users are on Astro 4.0.8+, erika - 2023-12-28
+                        if (astroInstall.version.major >= 4 &&
+                            (astroInstall.version.minor > 0 || astroInstall.version.patch >= 8)) {
+                            addedFileNames.push(...['../jsx-runtime-augment.d.ts'].map((filePath) => ts.sys.resolvePath(path.resolve(languageServerDirectory, filePath))));
+                        }
+                    }
+                    else {
+                        // If we don't have an Astro installation, add the fallback types from the language server.
+                        // See the README in packages/language-server/types for more information.
+                        addedFileNames.push(...[
+                            '../types/env.d.ts',
+                            '../types/astro-jsx.d.ts',
+                            '../types/jsx-runtime-fallback.d.ts',
+                        ].map((f) => ts.sys.resolvePath(path.resolve(languageServerDirectory, f))));
+                    }
+                    return [...fileNames, ...addedFileNames];
                 },
                 getCompilationSettings() {
                     const baseCompilationSettings = host.getCompilationSettings();
@@ -69,8 +90,6 @@ function getLanguageModule(astroInstall, ts) {
                         module: ts.ModuleKind.ESNext ?? 99,
                         target: ts.ScriptTarget.ESNext ?? 99,
                         jsx: ts.JsxEmit.Preserve ?? 1,
-                        jsxImportSource: undefined,
-                        jsxFactory: 'astroHTML',
                         resolveJsonModule: true,
                         allowJs: true,
                         isolatedModules: true,
@@ -112,20 +131,21 @@ class AstroFile {
             },
         ];
         this.compilerDiagnostics = [];
-        this.astroMeta = (0, parseAstro_1.getAstroMetadata)(this.fileName, this.snapshot.getText(0, this.snapshot.getLength()));
-        if (this.astroMeta.diagnostics.length > 0) {
-            this.compilerDiagnostics.push(...this.astroMeta.diagnostics);
+        const astroMetadata = (0, parseAstro_1.getAstroMetadata)(this.fileName, this.snapshot.getText(0, this.snapshot.getLength()));
+        if (astroMetadata.diagnostics.length > 0) {
+            this.compilerDiagnostics.push(...astroMetadata.diagnostics);
         }
-        const { htmlDocument, virtualFile: htmlVirtualFile } = (0, parseHTML_1.parseHTML)(this.fileName, this.snapshot, this.astroMeta.frontmatter.status === 'closed'
-            ? this.astroMeta.frontmatter.position.end.offset
+        const { htmlDocument, virtualFile: htmlVirtualFile } = (0, parseHTML_1.parseHTML)(this.fileName, this.snapshot, astroMetadata.frontmatter.status === 'closed'
+            ? astroMetadata.frontmatter.position.end.offset
             : 0);
         this.htmlDocument = htmlDocument;
-        const scriptTags = (0, parseJS_js_1.extractScriptTags)(this.fileName, this.snapshot, htmlDocument, this.astroMeta.ast);
+        const scriptTags = (0, parseJS_js_1.extractScriptTags)(this.fileName, this.snapshot, htmlDocument, astroMetadata.ast);
         this.scriptFiles = scriptTags.map((scriptTag) => scriptTag.fileName);
-        htmlVirtualFile.embeddedFiles.push(...(0, parseCSS_1.extractStylesheets)(this.fileName, this.snapshot, htmlDocument, this.astroMeta.ast), ...scriptTags);
+        htmlVirtualFile.embeddedFiles.push(...(0, parseCSS_1.extractStylesheets)(this.fileName, this.snapshot, htmlDocument, astroMetadata.ast), ...scriptTags);
         this.embeddedFiles = [];
         this.embeddedFiles.push(htmlVirtualFile);
         const tsx = (0, astro2tsx_1.astro2tsx)(this.snapshot.getText(0, this.snapshot.getLength()), this.fileName, this.ts, htmlDocument);
+        this.astroMeta = { ...astroMetadata, tsxRanges: tsx.ranges };
         this.compilerDiagnostics.push(...tsx.diagnostics);
         this.embeddedFiles.push(tsx.virtualFile);
     }

package/dist/core/parseAstro.d.ts

@@ -1,8 +1,10 @@
 import type { ParseOptions, ParseResult, Point } from '@astrojs/compiler/types';
-type AstroMetadata = ParseResult & {
+import type { LSPTSXRanges } from './astro2tsx.js';
+export type AstroMetadata = ParseResult & {
     frontmatter: FrontmatterStatus;
+    tsxRanges: LSPTSXRanges;
 };
-export declare function getAstroMetadata(fileName: string, input: string, options?: ParseOptions): AstroMetadata;
+export declare function getAstroMetadata(fileName: string, input: string, options?: ParseOptions): Omit<AstroMetadata, 'tsxRanges'>;
 interface FrontmatterOpen {
     status: 'open';
     position: {

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

@@ -0,0 +1,3 @@
+import type { CodeAction, ServiceContext } from '@volar/language-service';
+export declare function enhancedProvideCodeActions(codeActions: CodeAction[], context: ServiceContext): CodeAction[];
+export declare function enhancedResolveCodeAction(codeAction: CodeAction, context: ServiceContext): CodeAction;

package/dist/plugins/typescript/codeActions.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enhancedResolveCodeAction = exports.enhancedProvideCodeActions = void 0;
+const language_server_1 = require("@volar/language-server");
+const index_js_1 = require("../../core/index.js");
+const utils_js_1 = require("../utils.js");
+function enhancedProvideCodeActions(codeActions, context) {
+    return codeActions.map((codeAction) => mapCodeAction(codeAction, context));
+}
+exports.enhancedProvideCodeActions = enhancedProvideCodeActions;
+function enhancedResolveCodeAction(codeAction, context) {
+    /**
+     * TypeScript code actions don't come through here, as they're considered to be already fully resolved
+     * A lot of the code actions we'll encounter here are more tricky ones, such as fixAll or refactor
+     * For now, it seems like we don't need to do anything special here, but we'll keep this function around
+     */
+    return mapCodeAction(codeAction, context);
+}
+exports.enhancedResolveCodeAction = enhancedResolveCodeAction;
+function mapCodeAction(codeAction, context) {
+    if (!codeAction.edit || !codeAction.edit.documentChanges)
+        return codeAction;
+    codeAction.edit.documentChanges = codeAction.edit.documentChanges.map((change) => {
+        if (language_server_1.TextDocumentEdit.is(change)) {
+            const [virtualFile, source] = context.documents.getVirtualFileByUri(change.textDocument.uri);
+            const file = source?.root;
+            if (!virtualFile || !(file instanceof index_js_1.AstroFile) || !context.host)
+                return change;
+            change.edits = change.edits.map((edit) => {
+                const shouldModifyEdit = (0, utils_js_1.editShouldBeInFrontmatter)(edit.range, file.astroMeta);
+                if (shouldModifyEdit.itShould) {
+                    edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, file.astroMeta, '\n');
+                }
+                return edit;
+            });
+        }
+        return change;
+    });
+    return codeAction;
+}
+//# sourceMappingURL=codeActions.js.map

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

@@ -1,3 +1,3 @@
-import { CompletionItem, CompletionList } from '@volar/language-server';
+import { CompletionItem, CompletionList, ServiceContext } from '@volar/language-server';
 export declare function enhancedProvideCompletionItems(completions: CompletionList): CompletionList;
-export declare function enhancedResolveCompletionItem(resolvedCompletion: CompletionItem): CompletionItem;
+export declare function enhancedResolveCompletionItem(resolvedCompletion: CompletionItem, context: ServiceContext): CompletionItem;

package/dist/plugins/typescript/completions.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCompletionItem = exports.enhancedProvideCompletionItems = void 0;
 const language_server_1 = require("@volar/language-server");
+const index_js_1 = require("../../core/index.js");
+const utils_js_1 = require("../utils.js");
 function enhancedProvideCompletionItems(completions) {
     completions.items = completions.items.filter(isValidCompletion).map((completion) => {
         const source = completion?.data?.originalItem?.source;
@@ -23,11 +25,23 @@ function enhancedProvideCompletionItems(completions) {
     return completions;
 }
 exports.enhancedProvideCompletionItems = enhancedProvideCompletionItems;
-function enhancedResolveCompletionItem(resolvedCompletion) {
+function enhancedResolveCompletionItem(resolvedCompletion, context) {
     // Make sure we keep our icons even when the completion is resolved
     if (resolvedCompletion.data.isComponent) {
         resolvedCompletion.detail = getDetailForFileCompletion(resolvedCompletion.detail ?? '', resolvedCompletion.data.originalItem.source);
     }
+    if (resolvedCompletion.additionalTextEdits) {
+        const [virtualFile, source] = context.documents.getVirtualFileByUri(resolvedCompletion.data.uri);
+        const file = source?.root;
+        if (!virtualFile || !(file instanceof index_js_1.AstroFile) || !context.host)
+            return resolvedCompletion;
+        resolvedCompletion.additionalTextEdits = resolvedCompletion.additionalTextEdits.map((edit) => {
+            if ((0, utils_js_1.editShouldBeInFrontmatter)(edit.range, file.astroMeta).itShould) {
+                edit = (0, utils_js_1.ensureProperEditForFrontmatter)(edit, file.astroMeta, '\n');
+            }
+            return edit;
+        });
+    }
     return resolvedCompletion;
 }
 exports.enhancedResolveCompletionItem = enhancedResolveCompletionItem;

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

@@ -9,4 +9,4 @@ export declare enum DiagnosticCodes {
     JSX_NO_CLOSING_TAG = 17008,
     JSX_ELEMENT_NO_CALL = 2604
 }
-export declare function enhancedProvideSemanticDiagnostics(originalDiagnostics: Diagnostic[], astroLineCount?: number | undefined): Diagnostic[];
+export declare function enhancedProvideSemanticDiagnostics(originalDiagnostics: Diagnostic[], tsxLineCount?: number | undefined): Diagnostic[];

package/dist/plugins/typescript/diagnostics.js

@@ -14,13 +14,13 @@ var DiagnosticCodes;
     DiagnosticCodes[DiagnosticCodes["JSX_NO_CLOSING_TAG"] = 17008] = "JSX_NO_CLOSING_TAG";
     DiagnosticCodes[DiagnosticCodes["JSX_ELEMENT_NO_CALL"] = 2604] = "JSX_ELEMENT_NO_CALL";
 })(DiagnosticCodes || (exports.DiagnosticCodes = DiagnosticCodes = {}));
-function enhancedProvideSemanticDiagnostics(originalDiagnostics, astroLineCount) {
+function enhancedProvideSemanticDiagnostics(originalDiagnostics, tsxLineCount) {
     const diagnostics = originalDiagnostics
-        .filter((diagnostic) => (astroLineCount ? diagnostic.range.start.line <= astroLineCount : true) &&
+        .filter((diagnostic) => (tsxLineCount ? diagnostic.range.start.line <= tsxLineCount : true) &&
         isNoCantReturnOutsideFunction(diagnostic) &&
         isNoIsolatedModuleError(diagnostic) &&
         isNoJsxCannotHaveMultipleAttrsError(diagnostic))
-        .map((diag) => astroLineCount ? generalEnhancements(astroEnhancements(diag)) : generalEnhancements(diag));
+        .map((diag) => tsxLineCount ? generalEnhancements(astroEnhancements(diag)) : generalEnhancements(diag));
     return diagnostics;
 }
 exports.enhancedProvideSemanticDiagnostics = enhancedProvideSemanticDiagnostics;

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

@@ -1,2 +1,2 @@
-import { Service } from '@volar/language-server';
+import type { Service } from '@volar/language-server';
 export declare const create: () => Service;

package/dist/plugins/typescript/index.js

@@ -4,10 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
-const language_server_1 = require("@volar/language-server");
 const volar_service_typescript_1 = __importDefault(require("volar-service-typescript"));
 const index_js_1 = require("../../core/index.js");
-const utils_js_1 = require("../utils.js");
+const codeActions_js_1 = require("./codeActions.js");
 const completions_js_1 = require("./completions.js");
 const diagnostics_js_1 = require("./diagnostics.js");
 const create = () => (context, modules) => {
@@ -21,82 +20,6 @@ const create = () => (context, modules) => {
     }
     return {
         ...typeScriptPlugin,
-        transformCompletionItem(item) {
-            const [_, source] = context.documents.getVirtualFileByUri(item.data.uri);
-            const file = source?.root;
-            if (!(file instanceof index_js_1.AstroFile) || !context.host)
-                return undefined;
-            if (file.scriptFiles.includes(item.data.fileName))
-                return undefined;
-            const newLine = context.host.getCompilationSettings().newLine?.toString() ?? '\n';
-            if (item.additionalTextEdits) {
-                item.additionalTextEdits = item.additionalTextEdits.map((edit) => {
-                    // HACK: There's a weird situation sometimes where some components (especially Svelte) will get imported as type imports
-                    // for some unknown reason. This work around the problem by always ensuring a normal import for components
-                    if (item.data.isComponent && edit.newText.includes('import type')) {
-                        edit.newText.replace('import type', 'import');
-                    }
-                    if ((0, utils_js_1.editShouldBeInFrontmatter)(edit.range)) {
-                        return (0, utils_js_1.ensureProperEditForFrontmatter)(edit, file.astroMeta.frontmatter, newLine);
-                    }
-                    return edit;
-                });
-            }
-            return item;
-        },
-        transformCodeAction(item) {
-            if (item.kind !== 'quickfix')
-                return undefined;
-            const originalFileName = item.data.uri.replace('.tsx', '');
-            const [_, source] = context.documents.getVirtualFileByUri(originalFileName);
-            const file = source?.root;
-            if (!(file instanceof index_js_1.AstroFile) || !context.host)
-                return undefined;
-            if (file.scriptFiles.includes(item.diagnostics?.[0].data.documentUri.replace('file://', '')))
-                return undefined;
-            const document = context.getTextDocument(originalFileName);
-            if (!document)
-                return undefined;
-            const newLine = context.host.getCompilationSettings().newLine?.toString() ?? '\n';
-            if (!item.edit?.documentChanges)
-                return undefined;
-            item.edit.documentChanges = item.edit.documentChanges.map((change) => {
-                if (language_server_1.TextDocumentEdit.is(change)) {
-                    change.textDocument.uri = originalFileName;
-                    if (change.edits.length === 1) {
-                        change.edits = change.edits.map((edit) => {
-                            const editInFrontmatter = (0, utils_js_1.editShouldBeInFrontmatter)(edit.range, document);
-                            if (editInFrontmatter.itShould) {
-                                return (0, utils_js_1.ensureProperEditForFrontmatter)(edit, file.astroMeta.frontmatter, newLine, editInFrontmatter.position);
-                            }
-                            return edit;
-                        });
-                    }
-                    else {
-                        if (file.astroMeta.frontmatter.status === 'closed') {
-                            change.edits = change.edits.map((edit) => {
-                                const editInFrontmatter = (0, utils_js_1.editShouldBeInFrontmatter)(edit.range, document);
-                                if (editInFrontmatter.itShould) {
-                                    edit.range = (0, utils_js_1.ensureRangeIsInFrontmatter)(edit.range, file.astroMeta.frontmatter, editInFrontmatter.position);
-                                }
-                                return edit;
-                            });
-                        }
-                        else {
-                            // TODO: Handle when there's multiple edits and a new frontmatter is potentially needed
-                            if (change.edits.some((edit) => {
-                                return (0, utils_js_1.editShouldBeInFrontmatter)(edit.range, document).itShould;
-                            })) {
-                                console.error('Code actions with multiple edits that require potentially creating a frontmatter are currently not implemented. In the meantime, please manually insert a frontmatter in your file before using this code action.');
-                                change.edits = [];
-                            }
-                        }
-                    }
-                }
-                return change;
-            });
-            return item;
-        },
         async provideCompletionItems(document, position, completionContext, token) {
             const originalCompletions = await typeScriptPlugin.provideCompletionItems(document, position, completionContext, token);
             if (!originalCompletions)
@@ -107,22 +30,35 @@ const create = () => (context, modules) => {
             const resolvedCompletionItem = await typeScriptPlugin.resolveCompletionItem(item, token);
             if (!resolvedCompletionItem)
                 return item;
-            return (0, completions_js_1.enhancedResolveCompletionItem)(resolvedCompletionItem);
+            return (0, completions_js_1.enhancedResolveCompletionItem)(resolvedCompletionItem, context);
+        },
+        async provideCodeActions(document, range, codeActionContext, token) {
+            const originalCodeActions = await typeScriptPlugin.provideCodeActions(document, range, codeActionContext, token);
+            if (!originalCodeActions)
+                return null;
+            return (0, codeActions_js_1.enhancedProvideCodeActions)(originalCodeActions, context);
+        },
+        async resolveCodeAction(codeAction, token) {
+            const resolvedCodeAction = await typeScriptPlugin.resolveCodeAction(codeAction, token);
+            if (!resolvedCodeAction)
+                return codeAction;
+            return (0, codeActions_js_1.enhancedResolveCodeAction)(resolvedCodeAction, context);
         },
         async provideSemanticDiagnostics(document, token) {
             const [_, source] = context.documents.getVirtualFileByUri(document.uri);
             const file = source?.root;
-            let astroDocument = undefined;
+            let tsxLineCount = undefined;
             if (file instanceof index_js_1.AstroFile) {
                 // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
                 if (file.hasCompilationErrors)
                     return null;
-                astroDocument = context.documents.getDocumentByFileName(file.snapshot, file.sourceFileName);
+                // We'll use this to filter out diagnostics that are outside the mapped range of the TSX
+                tsxLineCount = file.astroMeta.tsxRanges.body.end.line;
             }
             const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
             if (!diagnostics)
                 return null;
-            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, astroDocument?.lineCount);
+            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, tsxLineCount);
         },
     };
 };

package/dist/plugins/utils.d.ts

@@ -1,5 +1,5 @@
-import { HTMLDocument, Node, Range, TextDocument, TextEdit } from 'vscode-html-languageservice';
-import type { FrontmatterStatus } from '../core/parseAstro.js';
+import { HTMLDocument, Node, Range, TextEdit } from 'vscode-html-languageservice';
+import type { AstroMetadata, FrontmatterStatus } from '../core/parseAstro.js';
 export declare function isJSDocument(languageId: string): boolean;
 /**
  * Return true if a specific node could be a component.
@@ -19,13 +19,13 @@ export declare function isInsideExpression(html: string, tagStart: number, posit
  */
 export declare function isInsideFrontmatter(offset: number, frontmatter: FrontmatterStatus): boolean;
 type FrontmatterEditPosition = 'top' | 'bottom';
-export declare function ensureProperEditForFrontmatter(edit: TextEdit, frontmatter: FrontmatterStatus, newLine: string, position?: FrontmatterEditPosition): TextEdit;
+export declare function ensureProperEditForFrontmatter(edit: TextEdit, metadata: AstroMetadata, newLine: string, position?: FrontmatterEditPosition): TextEdit;
 /**
  * Force a range to be at the start of the frontmatter if it is outside
  */
-export declare function ensureRangeIsInFrontmatter(range: Range, frontmatter: FrontmatterStatus, position?: FrontmatterEditPosition): Range;
-export declare function getNewFrontmatterEdit(edit: TextEdit, newLine: string): TextEdit;
-export declare function getOpenFrontmatterEdit(edit: TextEdit, newLine: string): TextEdit;
+export declare function ensureRangeIsInFrontmatter(range: Range, metadata: AstroMetadata, position?: FrontmatterEditPosition): Range;
+export declare function getNewFrontmatterEdit(edit: TextEdit, astroMetadata: AstroMetadata, newLine: string): TextEdit;
+export declare function getOpenFrontmatterEdit(edit: TextEdit, astroMetadata: AstroMetadata, newLine: string): TextEdit;
 type FrontmatterEditValidity = {
     itShould: false;
     position: undefined;
@@ -33,5 +33,5 @@ type FrontmatterEditValidity = {
     itShould: true;
     position: FrontmatterEditPosition;
 };
-export declare function editShouldBeInFrontmatter(range: Range, astroDocument?: TextDocument): FrontmatterEditValidity;
+export declare function editShouldBeInFrontmatter(range: Range, astroMetadata: AstroMetadata): FrontmatterEditValidity;
 export {};

package/dist/plugins/utils.js

@@ -47,66 +47,64 @@ function isInsideFrontmatter(offset, frontmatter) {
     }
 }
 exports.isInsideFrontmatter = isInsideFrontmatter;
-function ensureProperEditForFrontmatter(edit, frontmatter, newLine, position = 'top') {
-    switch (frontmatter.status) {
+function ensureProperEditForFrontmatter(edit, metadata, newLine, position = 'top') {
+    switch (metadata.frontmatter.status) {
         case 'open':
-            return getOpenFrontmatterEdit(edit, newLine);
+            return getOpenFrontmatterEdit(edit, metadata, newLine);
         case 'closed':
+            const newRange = ensureRangeIsInFrontmatter(edit.range, metadata, position);
             return {
-                newText: edit.newText,
-                range: ensureRangeIsInFrontmatter(edit.range, frontmatter, position),
+                newText: newRange.start.line === metadata.frontmatter.position.start.line &&
+                    edit.newText.startsWith(newLine)
+                    ? edit.newText.trimStart()
+                    : edit.newText,
+                range: newRange,
             };
         case 'doesnt-exist':
-            return getNewFrontmatterEdit(edit, newLine);
+            return getNewFrontmatterEdit(edit, metadata, newLine);
     }
 }
 exports.ensureProperEditForFrontmatter = ensureProperEditForFrontmatter;
 /**
  * Force a range to be at the start of the frontmatter if it is outside
  */
-function ensureRangeIsInFrontmatter(range, frontmatter, position = 'top') {
-    if (frontmatter.status === 'open' || frontmatter.status === 'closed') {
-        // Q: Why not use PointToPosition?
-        // A: The Astro compiler returns positions at the exact line where the frontmatter is, which is not adequate for mapping
-        // edits as we want edits *inside* the frontmatter and not on the same line, or you would end up with things like `---import ...`
-        const frontmatterStartPosition = {
-            line: frontmatter.position.start.line,
-            character: frontmatter.position.start.column - 1,
-        };
-        const frontmatterEndPosition = frontmatter.position.end
-            ? { line: frontmatter.position.end.line - 1, character: 0 }
+function ensureRangeIsInFrontmatter(range, metadata, position = 'top') {
+    if (metadata.frontmatter.status === 'open' || metadata.frontmatter.status === 'closed') {
+        const frontmatterEndPosition = metadata.frontmatter.position.end
+            ? metadata.tsxRanges.frontmatter.end
             : undefined;
         // If the range start is outside the frontmatter, return a range at the start of the frontmatter
-        if (range.start.line < frontmatterStartPosition.line ||
+        if (range.start.line < metadata.tsxRanges.frontmatter.start.line ||
             (frontmatterEndPosition && range.start.line > frontmatterEndPosition.line)) {
             if (frontmatterEndPosition && position === 'bottom') {
                 return vscode_html_languageservice_1.Range.create(frontmatterEndPosition, frontmatterEndPosition);
             }
-            return vscode_html_languageservice_1.Range.create(frontmatterStartPosition, frontmatterStartPosition);
+            return vscode_html_languageservice_1.Range.create(metadata.tsxRanges.frontmatter.start, metadata.tsxRanges.frontmatter.start);
         }
         return range;
     }
     return range;
 }
 exports.ensureRangeIsInFrontmatter = ensureRangeIsInFrontmatter;
-function getNewFrontmatterEdit(edit, newLine) {
-    edit.newText = `---${newLine}${edit.newText}---${newLine}${newLine}`;
-    edit.range = vscode_html_languageservice_1.Range.create(0, 0, 0, 0);
+function getNewFrontmatterEdit(edit, astroMetadata, newLine) {
+    edit.newText = `---${edit.newText.startsWith(newLine) ? '' : newLine}${edit.newText}---${newLine}${newLine}`;
+    edit.range = vscode_html_languageservice_1.Range.create(astroMetadata.tsxRanges.frontmatter.start, astroMetadata.tsxRanges.frontmatter.start);
     return edit;
 }
 exports.getNewFrontmatterEdit = getNewFrontmatterEdit;
-function getOpenFrontmatterEdit(edit, newLine) {
+function getOpenFrontmatterEdit(edit, astroMetadata, newLine) {
     edit.newText = edit.newText.startsWith(newLine)
         ? `${edit.newText}---`
         : `${newLine}${edit.newText}---`;
+    edit.range = vscode_html_languageservice_1.Range.create(astroMetadata.tsxRanges.frontmatter.start, astroMetadata.tsxRanges.frontmatter.start);
     return edit;
 }
 exports.getOpenFrontmatterEdit = getOpenFrontmatterEdit;
-// Most edits that are at 0:0, or outside the document are intended for the frontmatter
-function editShouldBeInFrontmatter(range, astroDocument) {
-    const isAtZeroZero = range.start.line === 0 && range.start.character === 0;
-    const isPastFile = astroDocument && range.start.line > astroDocument.lineCount;
-    const shouldIt = isAtZeroZero || isPastFile;
+// Most edits that are at the beginning of the TSX, or outside the document are intended for the frontmatter
+function editShouldBeInFrontmatter(range, astroMetadata) {
+    const isAtTSXStart = range.start.line < astroMetadata.tsxRanges.frontmatter.start.line;
+    const isPastFile = range.start.line > astroMetadata.tsxRanges.body.end.line;
+    const shouldIt = isAtTSXStart || isPastFile;
     return shouldIt
         ? { itShould: true, position: isPastFile ? 'bottom' : 'top' }
         : { itShould: false, position: undefined };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.5.5",
+  "version": "2.6.0",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,22 +20,22 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.2.2",
+    "@astrojs/compiler": "^2.4.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~1.10.9",
-    "@volar/language-core": "~1.10.9",
-    "@volar/language-server": "~1.10.9",
-    "@volar/language-service": "~1.10.9",
-    "@volar/source-map": "~1.10.9",
-    "@volar/typescript": "~1.10.9",
+    "@volar/kit": "~1.11.1",
+    "@volar/language-core": "~1.11.1",
+    "@volar/language-server": "~1.11.1",
+    "@volar/language-service": "~1.11.1",
+    "@volar/source-map": "~1.11.1",
+    "@volar/typescript": "~1.11.1",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
-    "volar-service-css": "0.0.16",
-    "volar-service-emmet": "0.0.16",
-    "volar-service-html": "0.0.16",
-    "volar-service-prettier": "0.0.16",
-    "volar-service-typescript": "0.0.16",
-    "volar-service-typescript-twoslash-queries": "0.0.16",
+    "volar-service-css": "0.0.17",
+    "volar-service-emmet": "0.0.17",
+    "volar-service-html": "0.0.17",
+    "volar-service-prettier": "0.0.17",
+    "volar-service-typescript": "0.0.17",
+    "volar-service-typescript-twoslash-queries": "0.0.17",
     "vscode-html-languageservice": "^5.1.0",
     "vscode-uri": "^3.0.8"
   },
@@ -45,13 +45,13 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "astro": "^3.3.0",
+    "astro": "^4.1.0",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
     "tsx": "^3.12.7",
+    "typescript": "^5.2.2",
     "vscode-languageserver-protocol": "^3.17.5",
-    "vscode-languageserver-textdocument": "^1.0.11",
-    "typescript": "^5.2.2"
+    "vscode-languageserver-textdocument": "^1.0.11"
   },
   "peerDependencies": {
     "prettier": "^3.0.0",

package/types/jsx-runtime-augment.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="astro/astro-jsx" />
+
+declare module 'astro/jsx-runtime' {
+	export import JSX = astroHTML.JSX;
+}

package/types/jsx-runtime-fallback.d.ts

@@ -0,0 +1,5 @@
+/// <reference path="astro-jsx.d.ts" />
+
+declare module 'astro/jsx-runtime' {
+	export import JSX = astroHTML.JSX;
+}

package/types/arbitrary-attrs.d.ts

@@ -1,5 +0,0 @@
-declare namespace astroHTML.JSX {
-	interface HTMLAttributes {
-		[name: string]: any;
-	}
-}