@astrojs/language-server 2.4.0 → 2.5.0

package/dist/core/parseJS.js

@@ -101,7 +101,7 @@ function findIsolatedScripts(fileName, snapshot, roots) {
 }
 /**
  * Get all the inline scripts in the HTML document
- * Inline scripts are scripts that are not hoisted by Astro and as such, are isolated from the rest of the code.
+ * 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) {
@@ -112,6 +112,7 @@ function findInlineScripts(htmlDocument, snapshot) {
             if (node.tag === 'script' &&
                 node.startTagEnd !== undefined &&
                 node.endTagStart !== undefined &&
+                !isJSON(node.attributes?.type) &&
                 !isIsolatedScriptTag(node)) {
                 const scriptText = snapshot.getText(node.startTagEnd, node.endTagStart);
                 inlineScripts.push({
@@ -125,6 +126,22 @@ function findInlineScripts(htmlDocument, snapshot) {
     }
     return inlineScripts;
 }
+/**
+ * Include both MIME JSON types and `importmap` and `speculationrules` script types
+ * See MIME Types -> https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+ * See Script Types -> https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script/type
+ */
+const JSON_TYPES = ['application/json', 'application/ld+json', 'importmap', 'speculationrules'];
+/**
+ * Check if the script has a type, and if it's included in JSON_TYPES above.
+ * @param type Found in the `type` attribute of the script tag
+ */
+function isJSON(type) {
+    if (!type)
+        return false;
+    // HTML attributes are quoted, slice " and ' at the start and end of the string
+    return JSON_TYPES.includes(type.slice(1, -1));
+}
 function findEventAttributes(ast) {
     const eventAttrs = [];
     // `@astrojs/compiler`'s `walk` method is async, so we can't use it here. Arf

package/dist/languageServerPlugin.js

@@ -86,9 +86,9 @@ const plugin = (initOptions, modules) => ({
                             ...(resolvedConfig.plugins ?? []),
                         ];
                         return {
+                            ...resolvedConfig,
                             plugins: plugins,
                             parser: 'astro',
-                            ...resolvedConfig,
                         };
                     },
                 });

package/package.json

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