@astrojs/language-server 2.0.16 → 2.0.17

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,
@@ -90,11 +118,13 @@ function getVirtualFileTSX(input, tsx, fileName, ts, htmlDocument) {
         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/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.0.17",
   "author": "withastro",
   "license": "MIT",
   "repository": {