@astrojs/language-server 2.5.2 → 2.5.4

package/dist/check.js

@@ -72,9 +72,9 @@ class AstroCheck {
             // Filter diagnostics based on the logErrors level
             const fileDiagnosticsToPrint = fileDiagnostics.filter((diag) => {
                 const severity = diag.severity ?? language_server_1.DiagnosticSeverity.Error;
-                switch (logErrors?.level ?? 'error') {
+                switch (logErrors?.level ?? 'hint') {
                     case 'error':
-                        return true;
+                        return severity <= language_server_1.DiagnosticSeverity.Error;
                     case 'warning':
                         return severity <= language_server_1.DiagnosticSeverity.Warning;
                     case 'hint':
@@ -106,9 +106,10 @@ class AstroCheck {
     initialize() {
         this.ts = this.typescriptPath ? require(this.typescriptPath) : require('typescript');
         const tsconfigPath = this.getTsconfig();
+        const astroInstall = (0, utils_js_1.getAstroInstall)([this.workspacePath]);
         const config = {
             languages: {
-                astro: (0, index_js_1.getLanguageModule)((0, utils_js_1.getAstroInstall)([this.workspacePath]), this.ts),
+                astro: (0, index_js_1.getLanguageModule)(typeof astroInstall === 'string' ? undefined : astroInstall, this.ts),
                 svelte: (0, svelte_js_1.getSvelteLanguageModule)(),
                 vue: (0, vue_js_1.getVueLanguageModule)(),
             },

package/dist/core/astro2tsx.js

@@ -28,7 +28,7 @@ function safeConvertToTSX(content, options) {
                     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`,
+                    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`,
                 },
             ],
         };

package/dist/core/index.js

@@ -111,7 +111,11 @@ class AstroFile {
                 data: language_core_1.FileRangeCapabilities.full,
             },
         ];
-        this.astroMeta = (0, parseAstro_1.getAstroMetadata)(this.snapshot.getText(0, this.snapshot.getLength()));
+        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 { htmlDocument, virtualFile: htmlVirtualFile } = (0, parseHTML_1.parseHTML)(this.fileName, this.snapshot, this.astroMeta.frontmatter.status === 'closed'
             ? this.astroMeta.frontmatter.position.end.offset
             : 0);
@@ -122,7 +126,7 @@ class AstroFile {
         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.compilerDiagnostics = tsx.diagnostics;
+        this.compilerDiagnostics.push(...tsx.diagnostics);
         this.embeddedFiles.push(tsx.virtualFile);
     }
 }

package/dist/core/parseAstro.d.ts

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

package/dist/core/parseAstro.js

@@ -2,14 +2,37 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 });
+function getAstroMetadata(fileName, input, options = { position: true }) {
+    const parseResult = safeParseAst(fileName, input, options);
     return {
         ...parseResult,
         frontmatter: getFrontmatterStatus(parseResult.ast, input),
     };
 }
 exports.getAstroMetadata = getAstroMetadata;
+function safeParseAst(fileName, input, parseOptions) {
+    try {
+        const parseResult = (0, sync_1.parse)(input, parseOptions);
+        return parseResult;
+    }
+    catch (e) {
+        console.error(`There was an error parsing ${fileName}'s AST. An empty AST will be returned instead to avoid breaking the server. Please create an issue: https://github.com/withastro/language-tools/issues\nError: ${e}.`);
+        return {
+            ast: {
+                type: 'root',
+                children: [],
+            },
+            diagnostics: [
+                {
+                    code: 1000,
+                    location: { file: fileName, line: 1, column: 1, length: input.length },
+                    severity: 1,
+                    text: `The Astro compiler encountered an unknown error while parsing this file's AST. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/language-tools/issues`,
+                },
+            ],
+        };
+    }
+}
 function getFrontmatterStatus(ast, text) {
     if (!ast.children || (ast.children && ast.children.length === 0)) {
         return {

package/dist/core/parseJS.js

@@ -29,32 +29,35 @@ const language_core_1 = require("@volar/language-core");
 const SourceMap = __importStar(require("@volar/source-map"));
 const muggle = __importStar(require("muggle-string"));
 function extractScriptTags(fileName, snapshot, htmlDocument, ast) {
-    const embeddedJSFiles = findIsolatedScripts(fileName, snapshot, htmlDocument.roots);
+    const embeddedJSFiles = findModuleScripts(fileName, snapshot, htmlDocument.roots);
     const javascriptContexts = [
-        ...findInlineScripts(htmlDocument, snapshot),
+        ...findClassicScripts(htmlDocument, snapshot),
         ...findEventAttributes(ast),
     ].sort((a, b) => a.startOffset - b.startOffset);
     if (javascriptContexts.length > 0) {
+        // classic scripts share the same scope
+        // merging them brings about redeclaration errors
         embeddedJSFiles.push(mergeJSContexts(fileName, javascriptContexts));
     }
     return embeddedJSFiles;
 }
 exports.extractScriptTags = extractScriptTags;
-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) ||
-        scriptTag.attributes['type']?.includes('module')) {
-        return true;
-    }
-    return false;
+function getScriptType(scriptTag) {
+    // script tags without attributes are processed and converted into module scripts
+    if (!scriptTag.attributes || Object.entries(scriptTag.attributes).length === 0)
+        return 'processed module';
+    // even when it is not processed by vite, scripts with type=module remain modules
+    if (scriptTag.attributes['type']?.includes('module') === true)
+        return 'module';
+    // whenever there are attributes, is:inline is implied and in the absence of type=module, the script is classic
+    return 'classic';
 }
 /**
  * Get all the isolated scripts in the HTML document
  * Isolated scripts are scripts that are hoisted by Astro and as such, are isolated from the rest of the code because of the implicit `type="module"`
  * All the isolated scripts are passed to the TypeScript language server as separate `.mts` files.
  */
-function findIsolatedScripts(fileName, snapshot, roots) {
+function findModuleScripts(fileName, snapshot, roots) {
     const embeddedScripts = [];
     let scriptIndex = 0;
     getEmbeddedScriptsInNodes(roots);
@@ -63,10 +66,11 @@ function findIsolatedScripts(fileName, snapshot, roots) {
             if (node.tag === 'script' &&
                 node.startTagEnd !== undefined &&
                 node.endTagStart !== undefined &&
-                isIsolatedScriptTag(node)) {
+                getScriptType(node) !== 'classic') {
                 const scriptText = snapshot.getText(node.startTagEnd, node.endTagStart);
+                const extension = getScriptType(node) === 'processed module' ? 'mts' : 'mjs';
                 embeddedScripts.push({
-                    fileName: fileName + `.${scriptIndex}.mts`,
+                    fileName: fileName + `.${scriptIndex}.${extension}`,
                     kind: language_core_1.FileKind.TypeScriptHostFile,
                     snapshot: {
                         getText: (start, end) => scriptText.substring(start, end),
@@ -104,7 +108,7 @@ function findIsolatedScripts(fileName, snapshot, roots) {
  * Inline scripts are scripts that are not hoisted by Astro and as such, are not isolated from the rest of the code.
  * All the inline scripts are concatenated into a single `.mjs` file and passed to the TypeScript language server.
  */
-function findInlineScripts(htmlDocument, snapshot) {
+function findClassicScripts(htmlDocument, snapshot) {
     const inlineScripts = [];
     getInlineScriptsInNodes(htmlDocument.roots);
     function getInlineScriptsInNodes(nodes) {
@@ -113,7 +117,7 @@ function findInlineScripts(htmlDocument, snapshot) {
                 node.startTagEnd !== undefined &&
                 node.endTagStart !== undefined &&
                 !isJSON(node.attributes?.type) &&
-                !isIsolatedScriptTag(node)) {
+                getScriptType(node) === 'classic') {
                 const scriptText = snapshot.getText(node.startTagEnd, node.endTagStart);
                 inlineScripts.push({
                     startOffset: node.startTagEnd,
@@ -153,7 +157,10 @@ function findEventAttributes(ast) {
                 const eventAttribute = child.attributes.find((attr) => htmlEventAttributes.includes(attr.name) && attr.kind === 'quoted');
                 if (eventAttribute && eventAttribute.position) {
                     eventAttrs.push({
-                        content: eventAttribute.value,
+                        // Add a semicolon to the end of the event attribute to attempt to prevent errors from spreading to the rest of the document
+                        // This is not perfect, but it's better than nothing
+                        // See: https://github.com/microsoft/vscode/blob/e8e04769ec817a3374c3eaa26a08d3ae491820d5/extensions/html-language-features/server/src/modes/embeddedSupport.ts#L192
+                        content: eventAttribute.value + ';',
                         startOffset: eventAttribute.position.start.offset + `${eventAttribute.name}="`.length,
                     });
                 }

package/dist/languageServerPlugin.js

@@ -39,14 +39,18 @@ const plugin = (initOptions, modules) => ({
     resolveConfig(config, ctx) {
         config.languages ??= {};
         if (ctx) {
-            const astroInstall = (0, utils_js_1.getAstroInstall)([ctx.project.rootUri.fsPath]);
-            if (!astroInstall) {
+            const nearestPackageJson = modules.typescript?.findConfigFile(ctx.project.rootUri.fsPath, modules.typescript.sys.fileExists, 'package.json');
+            const astroInstall = (0, utils_js_1.getAstroInstall)([ctx.project.rootUri.fsPath], {
+                nearestPackageJson: nearestPackageJson,
+                readDirectory: modules.typescript.sys.readDirectory,
+            });
+            if (astroInstall === 'not-found') {
                 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.`,
                     type: node_1.MessageType.Warning,
                 });
             }
-            config.languages.astro = (0, core_1.getLanguageModule)(astroInstall, modules.typescript);
+            config.languages.astro = (0, core_1.getLanguageModule)(typeof astroInstall === 'string' ? undefined : astroInstall, modules.typescript);
             config.languages.vue = (0, vue_js_1.getVueLanguageModule)();
             config.languages.svelte = (0, svelte_js_1.getSvelteLanguageModule)();
         }

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[], documentLineCount: number): Diagnostic[];
+export declare function enhancedProvideSemanticDiagnostics(originalDiagnostics: Diagnostic[], astroLineCount?: number | undefined): Diagnostic[];

package/dist/plugins/typescript/diagnostics.js

@@ -14,20 +14,31 @@ 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, documentLineCount) {
+function enhancedProvideSemanticDiagnostics(originalDiagnostics, astroLineCount) {
     const diagnostics = originalDiagnostics
-        .filter((diagnostic) => diagnostic.range.start.line <= documentLineCount &&
+        .filter((diagnostic) => (astroLineCount ? diagnostic.range.start.line <= astroLineCount : true) &&
         isNoCantReturnOutsideFunction(diagnostic) &&
         isNoIsolatedModuleError(diagnostic) &&
         isNoJsxCannotHaveMultipleAttrsError(diagnostic))
-        .map(enhanceIfNecessary);
+        .map((diag) => astroLineCount ? generalEnhancements(astroEnhancements(diag)) : generalEnhancements(diag));
     return diagnostics;
 }
 exports.enhancedProvideSemanticDiagnostics = enhancedProvideSemanticDiagnostics;
+// General enhancements that apply to all files
+function generalEnhancements(diagnostic) {
+    if (diagnostic.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
+        diagnostic.message.includes('astro:content')) {
+        diagnostic.message +=
+            "\n\nIf you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the language server might be necessary in order for the change to take effect.";
+        return diagnostic;
+    }
+    return diagnostic;
+}
 /**
- * Some diagnostics have JSX-specific nomenclature or unclear description. Enhance them for more clarity.
+ * Astro-specific enhancements. For instance, when the user tries to import a component from a framework that is not installed
+ * or a difference with JSX needing a different error message
  */
-function enhanceIfNecessary(diagnostic) {
+function astroEnhancements(diagnostic) {
     // When the language integrations are not installed, the content of the imported snapshot is empty
     // As such, it triggers the "is not a module error", which we can enhance with a more helpful message for the related framework
     if (diagnostic.code === DiagnosticCodes.IS_NOT_A_MODULE) {
@@ -41,12 +52,6 @@ function enhanceIfNecessary(diagnostic) {
         }
         return diagnostic;
     }
-    if (diagnostic.code === DiagnosticCodes.CANNOT_FIND_MODULE &&
-        diagnostic.message.includes('astro:content')) {
-        diagnostic.message +=
-            "\n\nIf you're using content collections, make sure to run `astro dev`, `astro build` or `astro sync` to first generate the types so you can import from them. If you already ran one of those commands, restarting the language server might be necessary in order for the change to take effect.";
-        return diagnostic;
-    }
     // JSX element has no closing tag. JSX -> HTML
     if (diagnostic.code === DiagnosticCodes.JSX_NO_CLOSING_TAG) {
         return {

package/dist/plugins/typescript/index.js

@@ -112,16 +112,17 @@ const create = () => (context, modules) => {
         async provideSemanticDiagnostics(document, token) {
             const [_, source] = context.documents.getVirtualFileByUri(document.uri);
             const file = source?.root;
-            if (!(file instanceof index_js_1.AstroFile))
-                return null;
-            // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
-            if (file.hasCompilationErrors)
-                return null;
+            let astroDocument = 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);
+            }
             const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
             if (!diagnostics)
                 return null;
-            const astroDocument = context.documents.getDocumentByFileName(file.snapshot, file.sourceFileName);
-            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, astroDocument.lineCount);
+            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, astroDocument?.lineCount);
         },
     };
 };

package/dist/utils.d.ts

@@ -7,4 +7,7 @@ export interface AstroInstall {
         patch: number;
     };
 }
-export declare function getAstroInstall(basePaths: string[]): AstroInstall | undefined;
+export declare function getAstroInstall(basePaths: string[], checkForAstro?: {
+    nearestPackageJson: string | undefined;
+    readDirectory: typeof import('typescript/lib/tsserverlibrary.js').sys.readDirectory;
+}): AstroInstall | 'not-an-astro-project' | 'not-found';

package/dist/utils.js

@@ -26,9 +26,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAstroInstall = void 0;
 const path = __importStar(require("node:path"));
 const importPackage_js_1 = require("./importPackage.js");
-function getAstroInstall(basePaths) {
+function getAstroInstall(basePaths, checkForAstro) {
     let astroPath;
     let version;
+    if (checkForAstro && checkForAstro.nearestPackageJson) {
+        basePaths.push(path.dirname(checkForAstro.nearestPackageJson));
+        let deps = new Set();
+        try {
+            const packageJSON = require(checkForAstro.nearestPackageJson);
+            [
+                ...Object.keys(packageJSON.dependencies ?? {}),
+                ...Object.keys(packageJSON.devDependencies ?? {}),
+                ...Object.keys(packageJSON.peerDependencies ?? {}),
+            ].forEach((dep) => deps.add(dep));
+        }
+        catch { }
+        if (!deps.has('astro')) {
+            const directoryContent = checkForAstro.readDirectory(path.dirname(checkForAstro.nearestPackageJson), ['.js', '.mjs', '.cjs', '.ts', '.mts', '.cts'], undefined, undefined, 1);
+            if (!directoryContent.some((file) => path.basename(file).startsWith('astro.config'))) {
+                return 'not-an-astro-project';
+            }
+        }
+    }
     try {
         astroPath = (0, importPackage_js_1.getPackagePath)('astro', basePaths);
         if (!astroPath) {
@@ -48,9 +67,12 @@ function getAstroInstall(basePaths) {
         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;
+            return 'not-found';
         }
     }
+    if (!version) {
+        return 'not-found';
+    }
     let [major, minor, patch] = version.split('.');
     if (patch.includes('-')) {
         const patchParts = patch.split('-');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "author": "withastro",
   "license": "MIT",
   "repository": {