@astrojs/language-server 2.0.14 → 2.0.16

package/dist/check.js

@@ -32,10 +32,10 @@ const fast_glob_1 = __importDefault(require("fast-glob"));
 const node_url_1 = require("node:url");
 const index_js_1 = require("./core/index.js");
 const svelte_js_1 = require("./core/svelte.js");
-const utils_js_1 = require("./core/utils.js");
 const vue_js_1 = require("./core/vue.js");
 const astro_js_1 = __importDefault(require("./plugins/astro.js"));
 const index_js_2 = __importDefault(require("./plugins/typescript/index.js"));
+const utils_js_1 = require("./utils.js");
 // Export those for downstream consumers
 var language_server_1 = require("@volar/language-server");
 Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return language_server_1.DiagnosticSeverity; } });
@@ -54,9 +54,7 @@ class AstroCheck {
     async lint(fileNames = undefined, logErrors = false) {
         const files = fileNames !== undefined
             ? fileNames
-            : this.project.languageServiceHost
-                .getScriptFileNames()
-                .filter((file) => file.endsWith('.astro'));
+            : this.project.languageHost.getScriptFileNames().filter((file) => file.endsWith('.astro'));
         const errors = [];
         for (const file of files) {
             const fileErrors = await this.linter.check(file);
@@ -64,7 +62,7 @@ class AstroCheck {
                 this.linter.logErrors(file, fileErrors);
             }
             if (fileErrors.length > 0) {
-                const fileSnapshot = this.project.languageServiceHost.getScriptSnapshot(file);
+                const fileSnapshot = this.project.languageHost.getScriptSnapshot(file);
                 const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
                 errors.push({
                     errors: fileErrors,
@@ -105,7 +103,7 @@ class AstroCheck {
                 });
             });
         }
-        this.linter = kit.createLinter(config, this.project.languageServiceHost);
+        this.linter = kit.createLinter(config, this.project.languageHost);
     }
     getTsconfig() {
         const tsconfig = this.ts.findConfigFile(this.workspacePath, this.ts.sys.fileExists) ||

package/dist/core/compilerUtils.d.ts

@@ -0,0 +1,11 @@
+import type { AttributeNode, Point } from '@astrojs/compiler';
+import { Position as LSPPosition } from '@volar/language-server';
+/**
+ * Transform a Point from the Astro compiler to an LSP Position
+ */
+export declare function PointToPosition(point: Point): LSPPosition;
+type WithRequired<T, K extends keyof T> = T & {
+    [P in K]-?: T[P];
+};
+export type AttributeNodeWithPosition = WithRequired<AttributeNode, 'position'>;
+export {};

package/dist/core/compilerUtils.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PointToPosition = void 0;
+const language_server_1 = require("@volar/language-server");
+/**
+ * Transform a Point from the Astro compiler to an LSP Position
+ */
+function PointToPosition(point) {
+    // Columns and lines are 0-based in LSP, but the compiler's Point are 1 based.
+    return language_server_1.Position.create(point.line - 1, point.column - 1);
+}
+exports.PointToPosition = PointToPosition;
+//# sourceMappingURL=compilerUtils.js.map

package/dist/core/index.d.ts

@@ -2,8 +2,8 @@ import type { DiagnosticMessage, ParseResult } 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 type { AstroInstall } from './utils';
 export declare function getLanguageModule(astroInstall: AstroInstall | undefined, ts: typeof import('typescript/lib/tsserverlibrary.js')): Language<AstroFile>;
 export declare class AstroFile implements VirtualFile {
     sourceFileName: string;

package/dist/core/parseCSS.d.ts

@@ -2,7 +2,7 @@ import type { ParseResult } from '@astrojs/compiler/types';
 import { VirtualFile } from '@volar/language-core';
 import type ts from 'typescript/lib/tsserverlibrary';
 import type { HTMLDocument } from 'vscode-html-languageservice';
-import type { AttributeNodeWithPosition } from '../utils.js';
+import type { AttributeNodeWithPosition } from './compilerUtils.js';
 export declare function extractStylesheets(fileName: string, snapshot: ts.IScriptSnapshot, htmlDocument: HTMLDocument, ast: ParseResult['ast']): VirtualFile[];
 export declare function collectClassesAndIdsFromDocument(ast: ParseResult['ast']): string[];
 export declare function findInlineStyles(ast: ParseResult['ast']): AttributeNodeWithPosition[];

package/dist/core/parseHTML.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preprocessHTML = exports.parseHTML = void 0;
 const language_core_1 = require("@volar/language-core");
 const html = __importStar(require("vscode-html-languageservice"));
-const utils_1 = require("../utils");
+const utils_1 = require("../plugins/utils");
 const htmlLs = html.getLanguageService();
 function parseHTML(fileName, snapshot, frontmatterEnd) {
     const htmlContent = preprocessHTML(snapshot.getText(0, snapshot.getLength()), frontmatterEnd);

package/dist/core/utils.d.ts

@@ -1,14 +1,4 @@
 import { type VirtualFile } from '@volar/language-core';
-export interface AstroInstall {
-    path: string;
-    version: {
-        full: string;
-        major: number;
-        minor: number;
-        patch: number;
-    };
-}
-export declare function getAstroInstall(basePaths: string[]): AstroInstall | undefined;
 export declare function framework2tsx(fileName: string, filePath: string, sourceCode: string, framework: 'vue' | 'svelte'): VirtualFile;
 export declare function classNameFromFilename(filename: string): string;
 export declare function patchTSX(code: string, fileName: string): string;

package/dist/core/utils.js

@@ -23,52 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchTSX = exports.classNameFromFilename = exports.framework2tsx = exports.getAstroInstall = void 0;
+exports.patchTSX = exports.classNameFromFilename = exports.framework2tsx = void 0;
 const language_core_1 = require("@volar/language-core");
 const path = __importStar(require("node:path"));
 const vscode_uri_1 = require("vscode-uri");
 const importPackage_1 = require("../importPackage");
-function getAstroInstall(basePaths) {
-    let astroPath;
-    let version;
-    try {
-        astroPath = (0, importPackage_1.getPackagePath)('astro', basePaths);
-        if (!astroPath) {
-            throw Error;
-        }
-        version = require(path.resolve(astroPath, 'package.json')).version;
-    }
-    catch {
-        // If we couldn't find it inside the workspace's node_modules, it might means we're in the monorepo
-        try {
-            astroPath = (0, importPackage_1.getPackagePath)('./packages/astro', basePaths);
-            if (!astroPath) {
-                throw Error;
-            }
-            version = require(path.resolve(astroPath, 'package.json')).version;
-        }
-        catch (e) {
-            // If we still couldn't find it, it probably just doesn't exist
-            console.error(`${basePaths[0]} seems to be an Astro project, but we couldn't find Astro or Astro is not installed`);
-            return undefined;
-        }
-    }
-    let [major, minor, patch] = version.split('.');
-    if (patch.includes('-')) {
-        const patchParts = patch.split('-');
-        patch = patchParts[0];
-    }
-    return {
-        path: astroPath,
-        version: {
-            full: version,
-            major: Number(major),
-            minor: Number(minor),
-            patch: Number(patch),
-        },
-    };
-}
-exports.getAstroInstall = getAstroInstall;
 function framework2tsx(fileName, filePath, sourceCode, framework) {
     const integrationEditorEntrypoint = framework === 'vue' ? (0, importPackage_1.importVueIntegration)(filePath) : (0, importPackage_1.importSvelteIntegration)(filePath);
     if (!integrationEditorEntrypoint) {
@@ -134,7 +93,15 @@ exports.classNameFromFilename = classNameFromFilename;
 function patchTSX(code, fileName) {
     const basename = path.basename(fileName, path.extname(fileName));
     const isDynamic = basename.startsWith('[') && basename.endsWith(']');
-    return code.replace(/\b(\S*)__AstroComponent_/, (_, m1) => isDynamic ? `_${m1}_` : m1[0].toUpperCase() + m1.slice(1));
+    return code.replace(/\b(\S*)__AstroComponent_/gm, (fullMatch, m1) => {
+        // If we don't have a match here, it usually means the file has a weird name that couldn't be expressed with valid identifier characters
+        if (!m1) {
+            if (basename === '404')
+                return 'FourOhFour';
+            return fullMatch;
+        }
+        return isDynamic ? `_${m1}_` : m1[0].toUpperCase() + m1.slice(1);
+    });
 }
 exports.patchTSX = patchTSX;
 //# sourceMappingURL=utils.js.map

package/dist/importPackage.d.ts

@@ -7,3 +7,4 @@ export declare function importSvelteIntegration(fromPath: string): typeof svelte
 export declare function importVueIntegration(fromPath: string): typeof vue | undefined;
 export declare function importPrettier(fromPath: string): typeof prettier | undefined;
 export declare function getPrettierPluginPath(fromPath: string): string | undefined;
+export declare function getWorkspacePnpPath(workspacePath: string): string | null;

package/dist/importPackage.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrettierPluginPath = exports.importPrettier = exports.importVueIntegration = exports.importSvelteIntegration = exports.getPackagePath = exports.setIsTrusted = void 0;
+exports.getWorkspacePnpPath = exports.getPrettierPluginPath = exports.importPrettier = exports.importVueIntegration = exports.importSvelteIntegration = exports.getPackagePath = exports.setIsTrusted = void 0;
 const node_path_1 = require("node:path");
 let isTrusted = true;
 function setIsTrusted(_isTrusted) {
@@ -58,4 +58,15 @@ function getPrettierPluginPath(fromPath) {
     return prettierPluginPath;
 }
 exports.getPrettierPluginPath = getPrettierPluginPath;
+function getWorkspacePnpPath(workspacePath) {
+    try {
+        const possiblePath = (0, node_path_1.resolve)(workspacePath, '.pnp.cjs');
+        require.resolve(possiblePath);
+        return possiblePath;
+    }
+    catch {
+        return null;
+    }
+}
+exports.getWorkspacePnpPath = getWorkspacePnpPath;
 //# sourceMappingURL=importPackage.js.map

package/dist/languageServerPlugin.js

@@ -11,12 +11,12 @@ const volar_service_prettier_1 = __importDefault(require("volar-service-prettier
 const volar_service_typescript_twoslash_queries_1 = __importDefault(require("volar-service-typescript-twoslash-queries"));
 const core_1 = require("./core");
 const svelte_js_1 = require("./core/svelte.js");
-const utils_1 = require("./core/utils");
 const vue_js_1 = require("./core/vue.js");
 const importPackage_js_1 = require("./importPackage.js");
 const astro_js_1 = __importDefault(require("./plugins/astro.js"));
 const html_js_1 = __importDefault(require("./plugins/html.js"));
 const index_js_1 = __importDefault(require("./plugins/typescript/index.js"));
+const utils_js_1 = require("./utils.js");
 const plugin = (initOptions, modules) => ({
     extraFileExtensions: [
         { extension: 'astro', isMixedContent: true, scriptKind: 7 },
@@ -40,7 +40,7 @@ const plugin = (initOptions, modules) => ({
     resolveConfig(config, ctx) {
         config.languages ??= {};
         if (ctx) {
-            const astroInstall = (0, utils_1.getAstroInstall)([ctx.project.rootUri.fsPath]);
+            const astroInstall = (0, utils_js_1.getAstroInstall)([ctx.project.rootUri.fsPath]);
             if (!astroInstall) {
                 ctx.server.connection.sendNotification(node_1.ShowMessageNotification.type, {
                     message: `Couldn't find Astro in workspace "${ctx.project.rootUri.fsPath}". Experience might be degraded. For the best experience, please make sure Astro is installed into your project and restart the language server.`,

package/dist/plugins/astro.js

@@ -7,7 +7,7 @@ const language_server_1 = require("@volar/language-server");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const node_path_1 = require("node:path");
 const index_js_1 = require("../core/index.js");
-const utils_js_1 = require("../utils.js");
+const utils_js_1 = require("./utils.js");
 exports.default = () => (context, modules) => {
     return {
         triggerCharacters: ['-'],
@@ -48,10 +48,13 @@ exports.default = () => (context, modules) => {
         provideCodeLenses(document, token) {
             if (token.isCancellationRequested)
                 return;
-            if (!modules?.typescript || !context?.typescript || !(0, utils_js_1.isJSDocument)(document.languageId))
+            if (!context || !modules?.typescript || !(0, utils_js_1.isJSDocument)(document.languageId))
+                return;
+            const languageService = context.inject('typescript/languageService');
+            if (!languageService)
                 return;
             const ts = modules?.typescript;
-            const tsProgram = context.typescript.languageService.getProgram();
+            const tsProgram = languageService.getProgram();
             if (!tsProgram)
                 return;
             const globcodeLens = [];

package/dist/plugins/html.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const language_server_1 = require("@volar/language-server");
 const volar_service_html_1 = __importDefault(require("volar-service-html"));
 const index_js_1 = require("../core/index.js");
-const utils_js_1 = require("../utils.js");
 const html_data_js_1 = require("./html-data.js");
+const utils_js_1 = require("./utils.js");
 exports.default = () => (context, modules) => {
     const htmlPlugin = (0, volar_service_html_1.default)()(context, modules);
     if (!context) {

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

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

package/dist/plugins/typescript/completions.js

@@ -2,8 +2,6 @@
 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;
@@ -21,35 +19,11 @@ function enhancedProvideCompletionItems(completions) {
     return completions;
 }
 exports.enhancedProvideCompletionItems = enhancedProvideCompletionItems;
-function enhancedResolveCompletionItem(resolvedCompletion, originalItem, context) {
+function enhancedResolveCompletionItem(resolvedCompletion) {
     // 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);
     }
-    // Properly handle completions with actions to make sure their edits end up in the frontmatter when needed
-    const [_, source] = context.documents.getVirtualFileByUri(originalItem.data.uri);
-    const file = source?.root;
-    if (!(file instanceof index_js_1.AstroFile) || !context.host)
-        return resolvedCompletion;
-    if (file.scriptFiles.includes(originalItem.data.fileName))
-        return resolvedCompletion;
-    const newLine = context.host.getNewLine ? context.host.getNewLine() : '\n';
-    resolvedCompletion.additionalTextEdits = resolvedCompletion.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 (resolvedCompletion.data.isComponent && edit.newText.includes('import type')) {
-            edit.newText.replace('import type', 'import');
-        }
-        // Return a different edit depending on the state of the formatter
-        if (file.astroMeta.frontmatter.status === 'doesnt-exist') {
-            return (0, utils_js_1.getNewFrontmatterEdit)(edit, newLine);
-        }
-        if (file.astroMeta.frontmatter.status === 'open') {
-            return (0, utils_js_1.getOpenFrontmatterEdit)(edit, newLine);
-        }
-        edit.range = (0, utils_js_1.ensureRangeIsInFrontmatter)(edit.range, file.astroMeta.frontmatter);
-        return edit;
-    });
     return resolvedCompletion;
 }
 exports.enhancedResolveCompletionItem = enhancedResolveCompletionItem;

package/dist/plugins/typescript/diagnostics.js

@@ -13,7 +13,7 @@ var DiagnosticCodes;
     DiagnosticCodes[DiagnosticCodes["TYPE_NOT_ASSIGNABLE"] = 2322] = "TYPE_NOT_ASSIGNABLE";
     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 || (exports.DiagnosticCodes = {}));
+})(DiagnosticCodes || (exports.DiagnosticCodes = DiagnosticCodes = {}));
 function enhancedProvideSemanticDiagnostics(originalDiagnostics, documentLineCount) {
     const diagnostics = originalDiagnostics
         .filter((diagnostic) => diagnostic.range.start.line <= documentLineCount &&

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

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

package/dist/plugins/typescript/index.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+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 codeActions_js_1 = require("./codeActions.js");
+const utils_js_1 = require("../utils.js");
 const completions_js_1 = require("./completions.js");
 const diagnostics_js_1 = require("./diagnostics.js");
 exports.default = () => (context, modules) => {
@@ -19,6 +20,82 @@ exports.default = () => (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)
@@ -29,18 +106,7 @@ exports.default = () => (context, modules) => {
             const resolvedCompletionItem = await typeScriptPlugin.resolveCompletionItem(item, token);
             if (!resolvedCompletionItem)
                 return item;
-            return (0, completions_js_1.enhancedResolveCompletionItem)(resolvedCompletionItem, item, context);
-        },
-        async provideCodeActions(document, range, codeActionContext, token) {
-            const codeActions = await typeScriptPlugin.provideCodeActions(document, range, codeActionContext, token);
-            if (!codeActions)
-                return null;
-            const [_, source] = context.documents.getVirtualFileByUri(document.uri);
-            const file = source?.root;
-            if (!(file instanceof index_js_1.AstroFile) || !context.host)
-                return codeActions;
-            const newLine = context.host.getNewLine ? context.host.getNewLine() : '\n';
-            return (0, codeActions_js_1.enhancedProvideCodeActions)(codeActions, file, context.documents.getDocumentByFileName(file.snapshot, file.sourceFileName), document, newLine);
+            return (0, completions_js_1.enhancedResolveCompletionItem)(resolvedCompletionItem);
         },
         async provideSemanticDiagnostics(document, token) {
             const [_, source] = context.documents.getVirtualFileByUri(document.uri);

package/dist/plugins/utils.d.ts

@@ -0,0 +1,37 @@
+import { HTMLDocument, Node, Range, TextDocument, TextEdit } from 'vscode-html-languageservice';
+import type { FrontmatterStatus } from '../core/parseAstro.js';
+export declare function isJSDocument(languageId: string): boolean;
+/**
+ * Return true if a specific node could be a component.
+ * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
+ */
+export declare function isPossibleComponent(node: Node): boolean;
+/**
+ * Return if a given offset is inside the start tag of a component
+ */
+export declare function isInComponentStartTag(html: HTMLDocument, offset: number): boolean;
+/**
+ * Return if a given position is inside a JSX expression
+ */
+export declare function isInsideExpression(html: string, tagStart: number, position: number): boolean;
+/**
+ * Return if a given offset is inside the frontmatter
+ */
+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;
+/**
+ * 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;
+type FrontmatterEditValidity = {
+    itShould: false;
+    position: undefined;
+} | {
+    itShould: true;
+    position: FrontmatterEditPosition;
+};
+export declare function editShouldBeInFrontmatter(range: Range, astroDocument?: TextDocument): FrontmatterEditValidity;
+export {};

package/dist/plugins/utils.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.editShouldBeInFrontmatter = exports.getOpenFrontmatterEdit = exports.getNewFrontmatterEdit = exports.ensureRangeIsInFrontmatter = exports.ensureProperEditForFrontmatter = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInComponentStartTag = exports.isPossibleComponent = exports.isJSDocument = void 0;
+const vscode_html_languageservice_1 = require("vscode-html-languageservice");
+function isJSDocument(languageId) {
+    return (languageId === 'javascript' ||
+        languageId === 'typescript' ||
+        languageId === 'javascriptreact' ||
+        languageId === 'typescriptreact');
+}
+exports.isJSDocument = isJSDocument;
+/**
+ * Return true if a specific node could be a component.
+ * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
+ */
+function isPossibleComponent(node) {
+    return !!node.tag?.[0].match(/[A-Z]/) || !!node.tag?.match(/.+[.][A-Z]?/);
+}
+exports.isPossibleComponent = isPossibleComponent;
+/**
+ * Return if a given offset is inside the start tag of a component
+ */
+function isInComponentStartTag(html, offset) {
+    const node = html.findNodeAt(offset);
+    return isPossibleComponent(node) && (!node.startTagEnd || offset < node.startTagEnd);
+}
+exports.isInComponentStartTag = isInComponentStartTag;
+/**
+ * Return if a given position is inside a JSX expression
+ */
+function isInsideExpression(html, tagStart, position) {
+    const charactersInNode = html.substring(tagStart, position);
+    return charactersInNode.lastIndexOf('{') > charactersInNode.lastIndexOf('}');
+}
+exports.isInsideExpression = isInsideExpression;
+/**
+ * Return if a given offset is inside the frontmatter
+ */
+function isInsideFrontmatter(offset, frontmatter) {
+    switch (frontmatter.status) {
+        case 'closed':
+            return offset > frontmatter.position.start.offset && offset < frontmatter.position.end.offset;
+        case 'open':
+            return offset > frontmatter.position.start.offset;
+        case 'doesnt-exist':
+            return false;
+    }
+}
+exports.isInsideFrontmatter = isInsideFrontmatter;
+function ensureProperEditForFrontmatter(edit, frontmatter, newLine, position = 'top') {
+    switch (frontmatter.status) {
+        case 'open':
+            return getOpenFrontmatterEdit(edit, newLine);
+        case 'closed':
+            return {
+                newText: edit.newText,
+                range: ensureRangeIsInFrontmatter(edit.range, frontmatter, position),
+            };
+        case 'doesnt-exist':
+            return getNewFrontmatterEdit(edit, 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 }
+            : undefined;
+        // If the range start is outside the frontmatter, return a range at the start of the frontmatter
+        if (range.start.line < frontmatterStartPosition.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 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);
+    return edit;
+}
+exports.getNewFrontmatterEdit = getNewFrontmatterEdit;
+function getOpenFrontmatterEdit(edit, newLine) {
+    edit.newText = edit.newText.startsWith(newLine)
+        ? `${edit.newText}---`
+        : `${newLine}${edit.newText}---`;
+    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;
+    return shouldIt
+        ? { itShould: true, position: isPastFile ? 'bottom' : 'top' }
+        : { itShould: false, position: undefined };
+}
+exports.editShouldBeInFrontmatter = editShouldBeInFrontmatter;
+//# sourceMappingURL=utils.js.map

package/dist/utils.d.ts

@@ -1,39 +1,10 @@
-import type { AttributeNode, Point, Position as CompilerPosition } from '@astrojs/compiler/types';
-import { HTMLDocument, Node, Position as LSPPosition, Range, TextEdit } from 'vscode-html-languageservice';
-import type { FrontmatterStatus } from './core/parseAstro.js';
-export declare function isJSDocument(languageId: string): boolean;
-/**
- * Return true if a specific node could be a component.
- * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
- */
-export declare function isPossibleComponent(node: Node): boolean;
-/**
- * Return if a given offset is inside the start tag of a component
- */
-export declare function isInComponentStartTag(html: HTMLDocument, offset: number): boolean;
-/**
- * Return if a given position is inside a JSX expression
- */
-export declare function isInsideExpression(html: string, tagStart: number, position: number): boolean;
-/**
- * Return if a given offset is inside the frontmatter
- */
-export declare function isInsideFrontmatter(offset: number, frontmatter: FrontmatterStatus): boolean;
-/**
- * Transform a Point from the Astro compiler to an LSP Position
- */
-export declare function PointToPosition(point: Point): LSPPosition;
-export declare function createCompilerPosition(start: Point, end: Point): CompilerPosition;
-export declare function createCompilerPoint(line: number, column: number, offset: number): Point;
-type WithRequired<T, K extends keyof T> = T & {
-    [P in K]-?: T[P];
-};
-export type AttributeNodeWithPosition = WithRequired<AttributeNode, 'position'>;
-/**
- * Force a range to be at the start of the frontmatter if it is outside
- */
-export declare function ensureRangeIsInFrontmatter(range: Range, frontmatter: FrontmatterStatus): Range;
-export declare function getNewFrontmatterEdit(edit: TextEdit, newLine: string): TextEdit;
-export declare function getOpenFrontmatterEdit(edit: TextEdit, newLine: string): TextEdit;
-export declare function getWorkspacePnpPath(workspacePath: string): string | null;
-export {};
+export interface AstroInstall {
+    path: string;
+    version: {
+        full: string;
+        major: number;
+        minor: number;
+        patch: number;
+    };
+}
+export declare function getAstroInstall(basePaths: string[]): AstroInstall | undefined;

package/dist/utils.js

@@ -1,120 +1,70 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspacePnpPath = exports.getOpenFrontmatterEdit = exports.getNewFrontmatterEdit = exports.ensureRangeIsInFrontmatter = exports.createCompilerPoint = exports.createCompilerPosition = exports.PointToPosition = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInComponentStartTag = exports.isPossibleComponent = exports.isJSDocument = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const vscode_html_languageservice_1 = require("vscode-html-languageservice");
-function isJSDocument(languageId) {
-    return (languageId === 'javascript' ||
-        languageId === 'typescript' ||
-        languageId === 'javascriptreact' ||
-        languageId === 'typescriptreact');
-}
-exports.isJSDocument = isJSDocument;
-/**
- * Return true if a specific node could be a component.
- * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
- */
-function isPossibleComponent(node) {
-    return !!node.tag?.[0].match(/[A-Z]/) || !!node.tag?.match(/.+[.][A-Z]?/);
-}
-exports.isPossibleComponent = isPossibleComponent;
-/**
- * Return if a given offset is inside the start tag of a component
- */
-function isInComponentStartTag(html, offset) {
-    const node = html.findNodeAt(offset);
-    return isPossibleComponent(node) && (!node.startTagEnd || offset < node.startTagEnd);
-}
-exports.isInComponentStartTag = isInComponentStartTag;
-/**
- * Return if a given position is inside a JSX expression
- */
-function isInsideExpression(html, tagStart, position) {
-    const charactersInNode = html.substring(tagStart, position);
-    return charactersInNode.lastIndexOf('{') > charactersInNode.lastIndexOf('}');
-}
-exports.isInsideExpression = isInsideExpression;
-/**
- * Return if a given offset is inside the frontmatter
- */
-function isInsideFrontmatter(offset, frontmatter) {
-    switch (frontmatter.status) {
-        case 'closed':
-            return offset > frontmatter.position.start.offset && offset < frontmatter.position.end.offset;
-        case 'open':
-            return offset > frontmatter.position.start.offset;
-        case 'doesnt-exist':
-            return false;
-    }
-}
-exports.isInsideFrontmatter = isInsideFrontmatter;
-/**
- * Transform a Point from the Astro compiler to an LSP Position
- */
-function PointToPosition(point) {
-    // Columns are 0-based in LSP, but the compiler's Point are 1 based.
-    return vscode_html_languageservice_1.Position.create(point.line, point.column - 1);
-}
-exports.PointToPosition = PointToPosition;
-function createCompilerPosition(start, end) {
-    return {
-        start,
-        end,
-    };
-}
-exports.createCompilerPosition = createCompilerPosition;
-function createCompilerPoint(line, column, offset) {
-    return {
-        line,
-        column,
-        offset,
-    };
-}
-exports.createCompilerPoint = createCompilerPoint;
-/**
- * Force a range to be at the start of the frontmatter if it is outside
- */
-function ensureRangeIsInFrontmatter(range, frontmatter) {
-    if (frontmatter.status === 'open' || frontmatter.status === 'closed') {
-        const frontmatterStartPosition = PointToPosition(frontmatter.position.start);
-        const frontmatterEndPosition = frontmatter.position.end
-            ? PointToPosition(frontmatter.position.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 ||
-            (frontmatterEndPosition && range.start.line > frontmatterEndPosition.line)) {
-            return vscode_html_languageservice_1.Range.create(frontmatterStartPosition, frontmatterStartPosition);
-        }
-        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);
-    return edit;
-}
-exports.getNewFrontmatterEdit = getNewFrontmatterEdit;
-function getOpenFrontmatterEdit(edit, newLine) {
-    edit.newText = edit.newText.startsWith(newLine)
-        ? `${edit.newText}---`
-        : `${newLine}${edit.newText}---`;
-    return edit;
-}
-exports.getOpenFrontmatterEdit = getOpenFrontmatterEdit;
-function getWorkspacePnpPath(workspacePath) {
+exports.getAstroInstall = void 0;
+const path = __importStar(require("node:path"));
+const importPackage_js_1 = require("./importPackage.js");
+function getAstroInstall(basePaths) {
+    let astroPath;
+    let version;
     try {
-        const possiblePath = node_path_1.default.resolve(workspacePath, '.pnp.cjs');
-        require.resolve(possiblePath);
-        return possiblePath;
+        astroPath = (0, importPackage_js_1.getPackagePath)('astro', basePaths);
+        if (!astroPath) {
+            throw Error;
+        }
+        version = require(path.resolve(astroPath, 'package.json')).version;
     }
     catch {
-        return null;
+        // If we couldn't find it inside the workspace's node_modules, it might means we're in the monorepo
+        try {
+            astroPath = (0, importPackage_js_1.getPackagePath)('./packages/astro', basePaths);
+            if (!astroPath) {
+                throw Error;
+            }
+            version = require(path.resolve(astroPath, 'package.json')).version;
+        }
+        catch (e) {
+            // If we still couldn't find it, it probably just doesn't exist
+            console.error(`${basePaths[0]} seems to be an Astro project, but we couldn't find Astro or Astro is not installed`);
+            return undefined;
+        }
     }
+    let [major, minor, patch] = version.split('.');
+    if (patch.includes('-')) {
+        const patchParts = patch.split('-');
+        patch = patchParts[0];
+    }
+    return {
+        path: astroPath,
+        version: {
+            full: version,
+            major: Number(major),
+            minor: Number(minor),
+            patch: Number(patch),
+        },
+    };
 }
-exports.getWorkspacePnpPath = getWorkspacePnpPath;
+exports.getAstroInstall = getAstroInstall;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,36 +20,37 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^1.5.0",
+    "@astrojs/compiler": "^1.5.1",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "1.6.9",
-    "@volar/language-core": "1.6.9",
-    "@volar/language-server": "1.6.9",
-    "@volar/language-service": "1.6.9",
-    "@volar/source-map": "1.6.9",
+    "@volar/kit": "1.7.4",
+    "@volar/language-core": "1.7.4",
+    "@volar/language-server": "1.7.4",
+    "@volar/language-service": "1.7.4",
+    "@volar/source-map": "1.7.4",
+    "@volar/typescript": "1.7.4",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
-    "volar-service-css": "0.0.4",
-    "volar-service-emmet": "0.0.4",
-    "volar-service-html": "0.0.4",
-    "volar-service-prettier": "0.0.4",
-    "volar-service-typescript": "0.0.4",
-    "volar-service-typescript-twoslash-queries": "0.0.4",
-    "vscode-html-languageservice": "^5.0.5",
+    "volar-service-css": "0.0.7",
+    "volar-service-emmet": "0.0.7",
+    "volar-service-html": "0.0.7",
+    "volar-service-prettier": "0.0.7",
+    "volar-service-typescript": "0.0.7",
+    "volar-service-typescript-twoslash-queries": "0.0.7",
+    "vscode-html-languageservice": "^5.0.6",
     "vscode-uri": "^3.0.7"
   },
   "devDependencies": {
-    "@astrojs/svelte": "^2.2.0",
-    "@astrojs/vue": "^2.2.0",
+    "@astrojs/svelte": "^3.0.0",
+    "@astrojs/vue": "^2.2.1",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.26",
-    "@types/prettier": "^2.7.2",
-    "astro": "^2.5.4",
+    "@types/prettier": "^2.7.3",
+    "astro": "^2.6.2",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
     "tsx": "^3.12.7",
-    "typescript": "~5.0.4",
+    "typescript": "~5.1.3",
     "vscode-languageserver-protocol": "^3.17.3",
     "vscode-languageserver-textdocument": "^1.0.8"
   },

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

@@ -1,4 +0,0 @@
-import { CodeAction } from '@volar/language-server';
-import type { TextDocument } from 'vscode-html-languageservice';
-import type { AstroFile } from '../../core/index.js';
-export declare function enhancedProvideCodeActions(codeActions: CodeAction[], file: AstroFile, document: TextDocument, originalDocument: TextDocument, newLine: string): CodeAction[];

package/dist/plugins/typescript/codeActions.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.enhancedProvideCodeActions = void 0;
-const language_server_1 = require("@volar/language-server");
-const vscode_uri_1 = require("vscode-uri");
-const utils_js_1 = require("../../utils.js");
-// Q: Why provideCodeActions instead of resolveCodeAction?
-// A: TypeScript actions are already fully resolved in provideCodeActions, so editors won't call resolveCodeAction at all.
-function enhancedProvideCodeActions(codeActions, file, document, originalDocument, newLine) {
-    codeActions = codeActions.map((codeAction) => {
-        if (!codeAction.edit)
-            return codeAction;
-        if (file.scriptFiles.includes(vscode_uri_1.URI.parse(originalDocument.uri).path))
-            return codeAction;
-        codeAction.edit.documentChanges = codeAction.edit.documentChanges?.map((change) => {
-            if (language_server_1.TextDocumentEdit.is(change)) {
-                change.edits = change.edits.map((edit) => {
-                    // Move code actions adding new imports to the frontmatter, as by default they'll be outside of it
-                    // TODO: This is a bit brittle, but we're unfortunately too late into the process to be able to tell the `fixName`
-                    // Maybe contribute upstream to pass the `fixName` through `data`?
-                    if (edit.newText.trim().startsWith('import ')) {
-                        if (file.astroMeta.frontmatter.status === 'doesnt-exist') {
-                            return (0, utils_js_1.getNewFrontmatterEdit)(edit, newLine);
-                        }
-                        if (file.astroMeta.frontmatter.status === 'open') {
-                            return (0, utils_js_1.getOpenFrontmatterEdit)(edit, newLine);
-                        }
-                        edit.range = (0, utils_js_1.ensureRangeIsInFrontmatter)(edit.range, file.astroMeta.frontmatter);
-                    }
-                    // Some code actions will insert code at the end of the generated TSX file, so we'll manually
-                    // redirect it to the end of the frontmatter instead, or create a frontmatter if one doesn't exist
-                    if (edit.range.start.line > document.lineCount) {
-                        switch (file.astroMeta.frontmatter.status) {
-                            case 'open':
-                                return (0, utils_js_1.getOpenFrontmatterEdit)(edit, newLine);
-                            case 'closed':
-                                const position = (0, utils_js_1.PointToPosition)(file.astroMeta.frontmatter.position.end);
-                                edit.range = language_server_1.Range.create(position, position);
-                                return edit;
-                            case 'doesnt-exist':
-                                return (0, utils_js_1.getNewFrontmatterEdit)(edit, newLine);
-                        }
-                    }
-                    return edit;
-                });
-            }
-            return change;
-        });
-        return codeAction;
-    });
-    return codeActions;
-}
-exports.enhancedProvideCodeActions = enhancedProvideCodeActions;
-//# sourceMappingURL=codeActions.js.map