@astrojs/language-server 2.12.8 → 2.13.1

package/dist/core/index.js

@@ -152,7 +152,7 @@ class AstroVirtualCode {
             : 0);
         this.htmlDocument = htmlDocument;
         htmlVirtualCode.embeddedCodes = [
-            (0, parseCSS_1.extractStylesheets)(tsx.ranges.styles),
+            ...(0, parseCSS_1.extractStylesheets)(tsx.ranges.styles),
             ...(0, parseJS_js_1.extractScriptTags)(tsx.ranges.scripts),
         ];
         this.astroMeta = { ...astroMetadata, tsxRanges: tsx.ranges };

package/dist/core/parseCSS.d.ts

@@ -1,3 +1,3 @@
 import type { TSXExtractedStyle } from '@astrojs/compiler/types';
 import type { VirtualCode } from '@volar/language-core';
-export declare function extractStylesheets(styles: TSXExtractedStyle[]): VirtualCode;
+export declare function extractStylesheets(styles: TSXExtractedStyle[]): VirtualCode[];

package/dist/core/parseCSS.js

@@ -3,17 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractStylesheets = void 0;
 const muggle_string_1 = require("muggle-string");
 const buildMappings_js_1 = require("../buildMappings.js");
+const SUPPORTED_LANGUAGES = ['css', 'scss', 'less'];
+function isSupportedLanguage(lang) {
+    return SUPPORTED_LANGUAGES.includes(lang);
+}
 function extractStylesheets(styles) {
-    return mergeCSSContexts(styles);
+    return mergeCSSContextsByLanguage(styles);
 }
 exports.extractStylesheets = extractStylesheets;
-function mergeCSSContexts(inlineStyles) {
-    const codes = [];
+function mergeCSSContextsByLanguage(inlineStyles) {
+    const codes = {
+        css: [],
+        scss: [],
+        less: [],
+    };
     for (const cssContext of inlineStyles) {
+        const currentCode = isSupportedLanguage(cssContext.lang) ? codes[cssContext.lang] : codes.css;
         const isStyleAttribute = cssContext.type === 'style-attribute';
         if (isStyleAttribute)
-            codes.push('__ { ');
-        codes.push([
+            currentCode.push('__ { ');
+        currentCode.push([
             cssContext.content,
             undefined,
             cssContext.position.start,
@@ -27,13 +36,22 @@ function mergeCSSContexts(inlineStyles) {
             },
         ]);
         if (isStyleAttribute)
-            codes.push(' }\n');
+            currentCode.push(' }\n');
     }
-    const mappings = (0, buildMappings_js_1.buildMappings)(codes);
-    const text = (0, muggle_string_1.toString)(codes);
+    let virtualCodes = [];
+    for (const lang of SUPPORTED_LANGUAGES) {
+        if (codes[lang].length) {
+            virtualCodes.push(createVirtualCodeForLanguage(codes[lang], lang));
+        }
+    }
+    return virtualCodes;
+}
+function createVirtualCodeForLanguage(code, lang) {
+    const mappings = (0, buildMappings_js_1.buildMappings)(code);
+    const text = (0, muggle_string_1.toString)(code);
     return {
-        id: 'style.css',
-        languageId: 'css',
+        id: `style.${lang}`,
+        languageId: lang,
         snapshot: {
             getText: (start, end) => text.substring(start, end),
             getLength: () => text.length,

package/dist/core/parseJS.js

@@ -9,13 +9,21 @@ function extractScriptTags(scripts) {
         .filter((script) => script.type === 'module' || script.type === 'processed-module')
         .map(moduleScriptToVirtualCode);
     const inlineScripts = scripts
-        .filter((script) => script.type === 'event-attribute' || script.type === 'inline')
+        .filter((script) => 
+    // TODO: Change this at some point so that unknown scripts are not included
+    // We can't guarantee that they are JavaScript, so we shouldn't treat them as such, even if it might work in some cases
+    // Perhaps we should make it so that the user has to specify the language of the script if it's not a known type (ex: lang="js"), not sure.
+    script.type === 'event-attribute' || script.type === 'inline' || script.type === 'unknown')
         .sort((a, b) => a.position.start - b.position.start);
     embeddedJSCodes.push(...moduleScripts);
     const mergedJSContext = mergeJSContexts(inlineScripts);
     if (mergedJSContext) {
         embeddedJSCodes.push(mergedJSContext);
     }
+    const JSONScripts = scripts
+        .filter((script) => script.type === 'json')
+        .map(jsonScriptToVirtualCode);
+    embeddedJSCodes.push(...JSONScripts);
     return embeddedJSCodes;
 }
 exports.extractScriptTags = extractScriptTags;
@@ -52,6 +60,34 @@ function moduleScriptToVirtualCode(script, index) {
         embeddedCodes: [],
     };
 }
+function jsonScriptToVirtualCode(script, index) {
+    return {
+        id: `${index}.json`,
+        languageId: 'json',
+        snapshot: {
+            getText: (start, end) => script.content.substring(start, end),
+            getLength: () => script.content.length,
+            getChangeRange: () => undefined,
+        },
+        mappings: [
+            {
+                sourceOffsets: [script.position.start],
+                generatedOffsets: [0],
+                lengths: [script.content.length],
+                // TODO: Support JSON features
+                data: {
+                    verification: false,
+                    completion: false,
+                    semantic: false,
+                    navigation: false,
+                    structure: false,
+                    format: false,
+                },
+            },
+        ],
+        embeddedCodes: [],
+    };
+}
 /**
  * Merge all the inline and non-hoisted scripts into a single `.mjs` file
  */

package/dist/plugins/astro.js

@@ -75,14 +75,17 @@ const create = (ts) => {
                     const tsProgram = languageService.getProgram();
                     if (!tsProgram)
                         return;
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
+                    if (!decoded)
+                        return;
                     const globcodeLens = [];
-                    const sourceFile = tsProgram.getSourceFile(document.uri);
+                    const sourceFile = tsProgram.getSourceFile(decoded[0].fsPath);
                     function walk() {
                         return ts.forEachChild(sourceFile, function cb(node) {
                             if (ts.isCallExpression(node) && node.expression.getText() === 'Astro.glob') {
                                 const globArgument = node.arguments.at(0);
-                                if (globArgument) {
-                                    globcodeLens.push(getGlobResultAsCodeLens(globArgument.getText().slice(1, -1), (0, node_path_1.dirname)(uriConverter.asFileName(vscode_uri_1.URI.parse(document.uri))), document.positionAt(node.arguments.pos)));
+                                if (globArgument && decoded) {
+                                    globcodeLens.push(getGlobResultAsCodeLens(globArgument.getText().slice(1, -1), (0, node_path_1.dirname)(uriConverter.asFileName(decoded[0])), document.positionAt(node.arguments.pos)));
                                 }
                             }
                             return ts.forEachChild(node, cb);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.12.8",
+  "version": "2.13.1",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,7 +20,7 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.9.1",
+    "@astrojs/compiler": "^2.10.1",
     "@jridgewell/sourcemap-codec": "^1.4.15",
     "@volar/kit": "~2.4.0-alpha.15",
     "@volar/language-core": "~2.4.0-alpha.15",