@astrojs/language-server 2.0.16 → 2.1.0

package/dist/core/astro2tsx.d.ts

@@ -2,5 +2,15 @@ import { VirtualFile } from '@volar/language-core';
 import { HTMLDocument } from 'vscode-html-languageservice';
 export declare function astro2tsx(input: string, fileName: string, ts: typeof import('typescript/lib/tsserverlibrary.js'), htmlDocument: HTMLDocument): {
     virtualFile: VirtualFile;
-    diagnostics: import("@astrojs/compiler").DiagnosticMessage[];
+    diagnostics: import("@astrojs/compiler").DiagnosticMessage[] | {
+        code: 1000;
+        location: {
+            file: string;
+            line: number;
+            column: number;
+            length: number;
+        };
+        severity: 1;
+        text: string;
+    }[];
 };

package/dist/core/astro2tsx.js

@@ -6,8 +6,36 @@ const sourcemap_codec_1 = require("@jridgewell/sourcemap-codec");
 const language_core_1 = require("@volar/language-core");
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 const utils_js_1 = require("./utils.js");
+function safeConvertToTSX(content, options) {
+    try {
+        const tsx = (0, sync_1.convertToTSX)(content, { filename: options.filename });
+        return tsx;
+    }
+    catch (e) {
+        console.error(`There was an error transforming ${options.filename} to TSX. An empty file will be returned instead. Please create an issue: https://github.com/withastro/language-tools/issues\nError: ${e}.`);
+        return {
+            code: '',
+            map: {
+                file: options.filename ?? '',
+                sources: [],
+                sourcesContent: [],
+                names: [],
+                mappings: '',
+                version: 0,
+            },
+            diagnostics: [
+                {
+                    code: 1000,
+                    location: { file: options.filename, line: 1, column: 1, length: content.length },
+                    severity: 1,
+                    text: `The Astro compiler encountered an unknown error while parsing this file. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/language-tools/issues`,
+                },
+            ],
+        };
+    }
+}
 function astro2tsx(input, fileName, ts, htmlDocument) {
-    const tsx = (0, sync_1.convertToTSX)(input, { filename: fileName });
+    const tsx = safeConvertToTSX(input, { filename: fileName });
     return {
         virtualFile: getVirtualFileTSX(input, tsx, fileName, ts, htmlDocument),
         diagnostics: tsx.diagnostics,
@@ -83,18 +111,14 @@ function getVirtualFileTSX(input, tsx, fileName, ts, htmlDocument) {
             }
         }
     }
-    // Ensure that `0:0` is mapped to `0:0` to make sure we properly handle "unmapped" lines
-    mappings.push({
-        sourceRange: [0, 0],
-        generatedRange: [0, 0],
-        data: {},
-    });
     const ast = ts.createSourceFile('/a.tsx', tsx.code, ts.ScriptTarget.ESNext);
-    mappings.push({
-        sourceRange: [0, input.length],
-        generatedRange: [ast.statements[0].getStart(ast), tsx.code.length],
-        data: {},
-    });
+    if (ast.statements[0]) {
+        mappings.push({
+            sourceRange: [0, input.length],
+            generatedRange: [ast.statements[0].getStart(ast), tsx.code.length],
+            data: {},
+        });
+    }
     return {
         fileName: fileName + '.tsx',
         kind: language_core_1.FileKind.TypeScriptHostFile,

package/dist/core/parseAstro.d.ts

@@ -22,5 +22,4 @@ interface FrontmatterNull {
     position: undefined;
 }
 export type FrontmatterStatus = FrontmatterOpen | FrontmatterClosed | FrontmatterNull;
-export declare function getFrontmatterStatus(ast: ParseResult['ast']): FrontmatterStatus;
 export {};

package/dist/core/parseAstro.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFrontmatterStatus = exports.getAstroMetadata = void 0;
+exports.getAstroMetadata = void 0;
 const sync_1 = require("@astrojs/compiler/sync");
 function getAstroMetadata(input, position = true) {
     const parseResult = (0, sync_1.parse)(input, { position: position });
     return {
         ...parseResult,
-        frontmatter: getFrontmatterStatus(parseResult.ast),
+        frontmatter: getFrontmatterStatus(parseResult.ast, input),
     };
 }
 exports.getAstroMetadata = getAstroMetadata;
-function getFrontmatterStatus(ast) {
+function getFrontmatterStatus(ast, text) {
     if (!ast.children || (ast.children && ast.children.length === 0)) {
         return {
             status: 'doesnt-exist',
@@ -21,6 +21,18 @@ function getFrontmatterStatus(ast) {
         const frontmatter = ast.children[0];
         if (frontmatter.position) {
             if (frontmatter.position.end) {
+                // HACK: The compiler as of 1.5.5 always return an ending position, even if there's only a frontmatter opening
+                // This hack checks if the frontmatter's ending is the end of the file, and if so, checks if there's a `---`.
+                // If there's not, it means the compiler returned the EOF with an opened frontmatter
+                if (frontmatter.position.end.offset === text.length && !text.endsWith('---')) {
+                    return {
+                        status: 'open',
+                        position: {
+                            start: frontmatter.position.start,
+                            end: undefined,
+                        },
+                    };
+                }
                 return {
                     status: 'closed',
                     position: {
@@ -43,5 +55,4 @@ function getFrontmatterStatus(ast) {
         position: undefined,
     };
 }
-exports.getFrontmatterStatus = getFrontmatterStatus;
 //# sourceMappingURL=parseAstro.js.map

package/dist/core/parseJS.d.ts

@@ -3,5 +3,5 @@ import { VirtualFile } from '@volar/language-core';
 import type ts from 'typescript/lib/tsserverlibrary';
 import type { HTMLDocument, Node } from 'vscode-html-languageservice';
 export declare function extractScriptTags(fileName: string, snapshot: ts.IScriptSnapshot, htmlDocument: HTMLDocument, ast: ParseResult['ast']): VirtualFile[];
-export declare function getScriptTagLanguage(scriptTag: Node): 'js' | 'ts';
+export declare function isIsolatedScriptTag(scriptTag: Node): boolean;
 export declare const htmlEventAttributes: string[];

package/dist/core/parseJS.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.htmlEventAttributes = exports.getScriptTagLanguage = exports.extractScriptTags = void 0;
+exports.htmlEventAttributes = exports.isIsolatedScriptTag = exports.extractScriptTags = void 0;
 const utils_1 = require("@astrojs/compiler/utils");
 const language_core_1 = require("@volar/language-core");
 const SourceMap = __importStar(require("@volar/source-map"));
@@ -34,7 +34,7 @@ function extractScriptTags(fileName, snapshot, htmlDocument, ast) {
         if (root.tag === 'script' &&
             root.startTagEnd !== undefined &&
             root.endTagStart !== undefined &&
-            getScriptTagLanguage(root) === 'ts') {
+            isIsolatedScriptTag(root)) {
             const scriptText = snapshot.getText(root.startTagEnd, root.endTagStart);
             embeddedJSFiles.push({
                 fileName: fileName + `.${index}.mts`,
@@ -103,7 +103,7 @@ function findInlineScripts(htmlDocument, snapshot) {
         if (root.tag === 'script' &&
             root.startTagEnd !== undefined &&
             root.endTagStart !== undefined &&
-            getScriptTagLanguage(root) === 'js') {
+            !isIsolatedScriptTag(root)) {
             const scriptText = snapshot.getText(root.startTagEnd, root.endTagStart);
             inlineScripts.push({
                 startOffset: root.startTagEnd,
@@ -137,15 +137,16 @@ function findEventAttributes(ast) {
     walkDown(ast);
     return eventAttrs;
 }
-function getScriptTagLanguage(scriptTag) {
-    // Using any kind of attributes on the script tag will disable hoisting, so we can just check if there's any
+function isIsolatedScriptTag(scriptTag) {
+    // Using any kind of attributes on the script tag will disable hoisting
     if (!scriptTag.attributes ||
-        (scriptTag.attributes && Object.entries(scriptTag.attributes).length === 0)) {
-        return 'ts';
+        (scriptTag.attributes && Object.entries(scriptTag.attributes).length === 0) ||
+        scriptTag.attributes['type']?.includes('module')) {
+        return true;
     }
-    return 'js';
+    return false;
 }
-exports.getScriptTagLanguage = getScriptTagLanguage;
+exports.isIsolatedScriptTag = isIsolatedScriptTag;
 exports.htmlEventAttributes = [
     'onabort',
     'onafterprint',

package/dist/index.d.ts

@@ -1,2 +1 @@
-export * as protocol from '@volar/language-server/protocol';
 export { AstroCheck, CheckResult, Diagnostic, DiagnosticSeverity } from './check.js';

package/dist/index.js

@@ -1,30 +1,6 @@
 "use strict";
-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.DiagnosticSeverity = exports.AstroCheck = exports.protocol = void 0;
-exports.protocol = __importStar(require("@volar/language-server/protocol"));
+exports.DiagnosticSeverity = exports.AstroCheck = void 0;
 var check_js_1 = require("./check.js");
 Object.defineProperty(exports, "AstroCheck", { enumerable: true, get: function () { return check_js_1.AstroCheck; } });
 Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return check_js_1.DiagnosticSeverity; } });

package/dist/languageServerPlugin.js

@@ -64,24 +64,28 @@ const plugin = (initOptions, modules) => ({
             const prettierPluginPath = (0, importPackage_js_1.getPrettierPluginPath)(rootDir);
             if (prettier && prettierPluginPath) {
                 config.services.prettier ??= (0, volar_service_prettier_1.default)({
+                    prettier: prettier,
                     languages: ['astro'],
+                    ignoreIdeOptions: true,
                     resolveConfigOptions: {
                         // Prettier's cache is a bit cumbersome, because you need to reload the config yourself on change
                         // TODO: Upstream a fix for this
                         useCache: false,
                     },
-                    additionalOptions: (resolvedConfig) => {
-                        function getAstroPrettierPlugin() {
+                    additionalOptions: async (resolvedConfig) => {
+                        async function getAstroPrettierPlugin() {
                             if (!prettier || !prettierPluginPath) {
                                 return [];
                             }
-                            const hasPluginLoadedAlready = prettier
-                                .getSupportInfo()
-                                .languages.some((l) => l.name === 'astro');
+                            const hasPluginLoadedAlready = (await prettier.getSupportInfo()).languages.some((l) => l.name === 'astro');
                             return hasPluginLoadedAlready ? [] : [prettierPluginPath];
                         }
+                        const plugins = [
+                            ...(await getAstroPrettierPlugin()),
+                            ...(resolvedConfig.plugins ?? []),
+                        ];
                         return {
-                            plugins: [...getAstroPrettierPlugin(), ...(resolvedConfig.plugins ?? [])],
+                            plugins: plugins,
                             parser: 'astro',
                             ...resolvedConfig,
                         };

package/dist/plugins/astro.js

@@ -37,7 +37,7 @@ exports.default = () => (context, modules) => {
             return file.compilerDiagnostics.map(compilerMessageToDiagnostic);
             function compilerMessageToDiagnostic(message) {
                 return {
-                    message: message.text + '\n\n' + message.hint,
+                    message: message.text + (message.hint ? '\n\n' + message.hint : ''),
                     range: language_server_1.Range.create(message.location.line - 1, message.location.column - 1, message.location.line, message.location.length),
                     code: message.code,
                     severity: message.severity,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.0.16",
+  "version": "2.1.0",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,22 +20,22 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^1.5.1",
+    "@astrojs/compiler": "1.5.7",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@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",
+    "@volar/kit": "~1.9.0",
+    "@volar/language-core": "~1.9.0",
+    "@volar/language-server": "~1.9.0",
+    "@volar/language-service": "~1.9.0",
+    "@volar/source-map": "~1.9.0",
+    "@volar/typescript": "~1.9.0",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
-    "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",
+    "volar-service-css": "0.0.10",
+    "volar-service-emmet": "0.0.10",
+    "volar-service-html": "0.0.10",
+    "volar-service-prettier": "0.0.10",
+    "volar-service-typescript": "0.0.10",
+    "volar-service-typescript-twoslash-queries": "0.0.10",
     "vscode-html-languageservice": "^5.0.6",
     "vscode-uri": "^3.0.7"
   },
@@ -45,7 +45,6 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.26",
-    "@types/prettier": "^2.7.3",
     "astro": "^2.6.2",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
@@ -55,8 +54,8 @@
     "vscode-languageserver-textdocument": "^1.0.8"
   },
   "peerDependencies": {
-    "prettier": "^2.8.8",
-    "prettier-plugin-astro": "^0.10.0"
+    "prettier": "^3.0.0",
+    "prettier-plugin-astro": "^0.11.0"
   },
   "peerDependenciesMeta": {
     "prettier": {