@astrojs/language-server 2.5.1 → 2.5.3

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,
@@ -189,7 +193,14 @@ function mergeJSContexts(fileName, javascriptContexts) {
             getLength: () => text.length,
             getChangeRange: () => undefined,
         },
-        capabilities: language_core_1.FileCapabilities.full,
+        capabilities: {
+            codeAction: true,
+            diagnostic: true,
+            documentFormatting: false,
+            documentSymbol: true,
+            foldingRange: true,
+            inlayHint: true,
+        },
         embeddedFiles: [],
         kind: language_core_1.FileKind.TypeScriptHostFile,
         mappings,

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/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.1",
+  "version": "2.5.3",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,22 +20,22 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.2.1",
+    "@astrojs/compiler": "^2.2.2",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~1.10.3",
-    "@volar/language-core": "~1.10.3",
-    "@volar/language-server": "~1.10.3",
-    "@volar/language-service": "~1.10.3",
-    "@volar/source-map": "~1.10.3",
-    "@volar/typescript": "~1.10.3",
+    "@volar/kit": "~1.10.9",
+    "@volar/language-core": "~1.10.9",
+    "@volar/language-server": "~1.10.9",
+    "@volar/language-service": "~1.10.9",
+    "@volar/source-map": "~1.10.9",
+    "@volar/typescript": "~1.10.9",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
-    "volar-service-css": "0.0.14",
-    "volar-service-emmet": "0.0.14",
-    "volar-service-html": "0.0.14",
-    "volar-service-prettier": "0.0.14",
-    "volar-service-typescript": "0.0.14",
-    "volar-service-typescript-twoslash-queries": "0.0.14",
+    "volar-service-css": "0.0.16",
+    "volar-service-emmet": "0.0.16",
+    "volar-service-html": "0.0.16",
+    "volar-service-prettier": "0.0.16",
+    "volar-service-typescript": "0.0.16",
+    "volar-service-typescript-twoslash-queries": "0.0.16",
     "vscode-html-languageservice": "^5.1.0",
     "vscode-uri": "^3.0.8"
   },
@@ -44,14 +44,14 @@
     "@astrojs/vue": "^3.0.1",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^16.18.26",
+    "@types/node": "^18.17.8",
     "astro": "^3.3.0",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
     "tsx": "^3.12.7",
-    "typescript": "~5.1.3",
     "vscode-languageserver-protocol": "^3.17.5",
-    "vscode-languageserver-textdocument": "^1.0.11"
+    "vscode-languageserver-textdocument": "^1.0.11",
+    "typescript": "^5.2.2"
   },
   "peerDependencies": {
     "prettier": "^3.0.0",