astro-vscode 2.0.16 → 2.0.18

package/dist/node/client.js

@@ -218751,8 +218751,36 @@ var require_astro2tsx = __commonJS({
     var language_core_1 = require_out3();
     var vscode_html_languageservice_1 = (init_htmlLanguageService(), __toCommonJS(htmlLanguageService_exports));
     var utils_js_1 = require_utils6();
+    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
+Error: ${e}.`);
+        return {
+          code: "",
+          map: {
+            file: options.filename ?? "",
+            sources: [],
+            sourcesContent: [],
+            names: [],
+            mappings: "",
+            version: 0
+          },
+          diagnostics: [
+            {
+              code: 1e3,
+              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
@@ -218826,11 +218854,13 @@ var require_astro2tsx = __commonJS({
         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,
@@ -222374,7 +222404,7 @@ var require_astro = __commonJS({
           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/dist/node/server.js

@@ -38,7 +38,7 @@ var require_package = __commonJS({
   "../language-server/package.json"(exports2, module2) {
     module2.exports = {
       name: "@astrojs/language-server",
-      version: "2.0.16",
+      version: "2.0.17",
       author: "withastro",
       license: "MIT",
       repository: {
@@ -236913,8 +236913,36 @@ var require_astro2tsx = __commonJS({
     var language_core_1 = require_out3();
     var vscode_html_languageservice_1 = (init_htmlLanguageService(), __toCommonJS(htmlLanguageService_exports));
     var utils_js_1 = require_utils();
+    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
+Error: ${e}.`);
+        return {
+          code: "",
+          map: {
+            file: options.filename ?? "",
+            sources: [],
+            sourcesContent: [],
+            names: [],
+            mappings: "",
+            version: 0
+          },
+          diagnostics: [
+            {
+              code: 1e3,
+              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
@@ -236988,11 +237016,13 @@ var require_astro2tsx = __commonJS({
         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,
@@ -243448,7 +243478,7 @@ var require_astro = __commonJS({
           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

@@ -24,7 +24,7 @@
     "color": "#17191E",
     "theme": "dark"
   },
-  "version": "2.0.16",
+  "version": "2.0.18",
   "author": "withastro",
   "license": "MIT",
   "publisher": "astro-build",
@@ -208,7 +208,7 @@
     ]
   },
   "devDependencies": {
-    "@astrojs/language-server": "^2.0.16",
+    "@astrojs/language-server": "^2.0.17",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.26",
@@ -228,7 +228,7 @@
     "vscode-tmgrammar-test": "^0.1.1"
   },
   "dependencies": {
-    "@astrojs/ts-plugin": "^1.0.8",
+    "@astrojs/ts-plugin": "^1.0.10",
     "prettier": "^2.8.8",
     "prettier-plugin-astro": "^0.10.0"
   },