@astrojs/language-server 0.19.1 → 0.19.4

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @astrojs/language-server
 
+## 0.19.4
+
+### Patch Changes
+
+- 1033856: Enable support for TypeScript inside hoisted script tags
+
+## 0.19.3
+
+### Patch Changes
+
+- 49ff4ef: Fixed more bugs where nonexistent server settings would result in a crash
+- 14cbf05: Fix frontmatter completion not working when three dashes were already present
+
+## 0.19.2
+
+### Patch Changes
+
+- 7de4967: Add better error messages for Vue and Svelte components with syntax errors
+- Updated dependencies [7de4967]
+  - @astrojs/svelte-language-integration@0.1.6
+  - @astrojs/vue-language-integration@0.1.1
+
 ## 0.19.1
 
 ### Patch Changes

package/dist/core/config/ConfigManager.js

@@ -142,8 +142,15 @@ class ConfigManager {
      * Return true if a plugin and an optional feature is enabled
      */
     async isEnabled(document, plugin, feature) {
-        const config = await this.getConfig('astro', document.uri);
-        return feature ? config[plugin].enabled && config[plugin][feature].enabled : config[plugin].enabled;
+        const config = (await this.getConfig('astro', document.uri)) ?? {};
+        if (config[plugin]) {
+            let res = config[plugin].enabled;
+            if (feature && config[plugin][feature]) {
+                res = res && config[plugin][feature].enabled;
+            }
+            return res;
+        }
+        return false;
     }
     /**
      * Updating the global config should only be done in cases where the client doesn't support `workspace/configuration`

package/dist/core/documents/DocumentMapper.js

@@ -89,6 +89,7 @@ class SourceMapDocumentMapper {
             return { line: -1, character: -1 };
         }
         if (mapped.line === 0) {
+            // eslint-disable-next-line no-console
             console.log('Got 0 mapped line from', generatedPosition, 'col was', mapped.column);
         }
         return {

package/dist/plugins/astro/features/CompletionsProvider.js

@@ -23,15 +23,16 @@ class CompletionsProviderImpl {
     }
     async getCompletions(document, position, completionContext) {
         let items = [];
-        if (completionContext?.triggerCharacter === '-') {
+        const html = document.html;
+        const offset = document.offsetAt(position);
+        const node = html.findNodeAt(offset);
+        const insideExpression = (0, utils_1.isInsideExpression)(document.getText(), node.start, offset);
+        if (completionContext?.triggerCharacter === '-' && node.parent === undefined && !insideExpression) {
             const frontmatter = this.getComponentScriptCompletion(document, position);
             if (frontmatter)
                 items.push(frontmatter);
         }
-        const html = document.html;
-        const offset = document.offsetAt(position);
-        const node = html.findNodeAt(offset);
-        if ((0, utils_1.isInComponentStartTag)(html, offset) && !(0, utils_1.isInsideExpression)(document.getText(), node.start, offset)) {
+        if ((0, utils_1.isInComponentStartTag)(html, offset) && !insideExpression) {
             const { completions: props, componentFilePath } = await this.getPropCompletionsAndFilePath(document, position, completionContext);
             if (props.length) {
                 items.push(...props);
@@ -50,7 +51,7 @@ class CompletionsProviderImpl {
             label: '---',
             sortText: '\0',
             preselect: true,
-            detail: 'Component script',
+            detail: 'Create component script block',
             insertTextFormat: vscode_languageserver_1.InsertTextFormat.Snippet,
             commitCharacters: [],
         };
@@ -65,11 +66,18 @@ class CompletionsProviderImpl {
             };
         }
         if (document.astroMeta.frontmatter.state === 'open') {
+            let insertText = '---';
+            // If the current line is a full component script starter/ender, the user expects a full frontmatter
+            // completion and not just a completion for "---"  on the same line (which result in, well, nothing)
+            if (prefix === '---') {
+                insertText = '---\n$0\n---';
+            }
             return {
                 ...base,
-                insertText: '---',
+                insertText,
+                detail: insertText === '---' ? 'Close component script block' : 'Create component script block',
                 textEdit: prefix.match(/^\s*\-+/)
-                    ? vscode_languageserver_1.TextEdit.replace({ start: { ...position, character: 0 }, end: position }, '---')
+                    ? vscode_languageserver_1.TextEdit.replace({ start: { ...position, character: 0 }, end: position }, insertText)
                     : undefined,
             };
         }

package/dist/plugins/html/HTMLPlugin.js

@@ -63,8 +63,8 @@ class HTMLPlugin {
             items: [],
         };
         const emmetConfig = await this.configManager.getEmmetConfig(document);
-        const extensionConfig = await this.configManager.getConfig('astro', document.uri);
-        if (extensionConfig.html.completions.emmet) {
+        const extensionConfig = (await this.configManager.getConfig('astro', document.uri)) ?? {};
+        if (extensionConfig?.html?.completions?.emmet) {
             this.lang.setCompletionParticipants([
                 {
                     onHtmlContent: () => (emmetResults = (0, emmet_helper_1.doComplete)(document, position, 'html', emmetConfig) || emmetResults),

package/dist/plugins/typescript/features/DiagnosticsProvider.d.ts

@@ -7,12 +7,12 @@ export declare enum DiagnosticCodes {
     SPREAD_EXPECTED = 1005,
     DUPLICATED_JSX_ATTRIBUTES = 17001,
     MUST_HAVE_PARENT_ELEMENT = 2657,
-    CANNOT_IMPORT_TS_EXT = 2691,
     CANT_RETURN_OUTSIDE_FUNC = 1108,
     ISOLATED_MODULE_COMPILE_ERR = 1208,
     TYPE_NOT_ASSIGNABLE = 2322,
     JSX_NO_CLOSING_TAG = 17008,
-    NO_DECL_IMPLICIT_ANY_TYPE = 7016
+    NO_DECL_IMPLICIT_ANY_TYPE = 7016,
+    JSX_ELEMENT_NO_CALL = 2604
 }
 export declare class DiagnosticsProviderImpl implements DiagnosticsProvider {
     private readonly languageServiceManager;

package/dist/plugins/typescript/features/DiagnosticsProvider.js

@@ -15,12 +15,12 @@ var DiagnosticCodes;
     DiagnosticCodes[DiagnosticCodes["SPREAD_EXPECTED"] = 1005] = "SPREAD_EXPECTED";
     DiagnosticCodes[DiagnosticCodes["DUPLICATED_JSX_ATTRIBUTES"] = 17001] = "DUPLICATED_JSX_ATTRIBUTES";
     DiagnosticCodes[DiagnosticCodes["MUST_HAVE_PARENT_ELEMENT"] = 2657] = "MUST_HAVE_PARENT_ELEMENT";
-    DiagnosticCodes[DiagnosticCodes["CANNOT_IMPORT_TS_EXT"] = 2691] = "CANNOT_IMPORT_TS_EXT";
     DiagnosticCodes[DiagnosticCodes["CANT_RETURN_OUTSIDE_FUNC"] = 1108] = "CANT_RETURN_OUTSIDE_FUNC";
     DiagnosticCodes[DiagnosticCodes["ISOLATED_MODULE_COMPILE_ERR"] = 1208] = "ISOLATED_MODULE_COMPILE_ERR";
     DiagnosticCodes[DiagnosticCodes["TYPE_NOT_ASSIGNABLE"] = 2322] = "TYPE_NOT_ASSIGNABLE";
     DiagnosticCodes[DiagnosticCodes["JSX_NO_CLOSING_TAG"] = 17008] = "JSX_NO_CLOSING_TAG";
     DiagnosticCodes[DiagnosticCodes["NO_DECL_IMPLICIT_ANY_TYPE"] = 7016] = "NO_DECL_IMPLICIT_ANY_TYPE";
+    DiagnosticCodes[DiagnosticCodes["JSX_ELEMENT_NO_CALL"] = 2604] = "JSX_ELEMENT_NO_CALL";
 })(DiagnosticCodes = exports.DiagnosticCodes || (exports.DiagnosticCodes = {}));
 class DiagnosticsProviderImpl {
     constructor(languageServiceManager) {
@@ -53,7 +53,6 @@ class DiagnosticsProviderImpl {
                 code: diagnostic.code,
                 tags: getDiagnosticTag(diagnostic),
             }))
-                .filter(isNoCantEndWithTS)
                 .map(mapRange(scriptTagSnapshot, document));
             scriptDiagnostics.push(...scriptDiagnostic);
         });
@@ -189,10 +188,6 @@ function isNoSpreadExpected(diagnostic, document) {
     }
     return true;
 }
-/** Inside script tags, Astro currently require the `.ts` file extension for imports */
-function isNoCantEndWithTS(diagnostic) {
-    return diagnostic.code !== DiagnosticCodes.CANNOT_IMPORT_TS_EXT;
-}
 /**
  * Ignore "Can't return outside of function body"
  * Since the frontmatter is at the top level, users trying to return a Response  for SSR mode run into this
@@ -218,6 +213,15 @@ function enhanceIfNecessary(diagnostic) {
             message: diagnostic.message.replace('JSX', 'HTML'),
         };
     }
+    // JSX Element can't be constructed or called. This happens on syntax errors / invalid components
+    if (diagnostic.code === DiagnosticCodes.JSX_ELEMENT_NO_CALL) {
+        return {
+            ...diagnostic,
+            message: diagnostic.message
+                .replace('JSX element type', 'Component')
+                .replace('does not have any construct or call signatures.', 'is not a valid component.\n\nIf this is a Svelte or Vue component, it might have a syntax error that makes it impossible to parse.'),
+        };
+    }
     // For the rare case where an user might try to put a client directive on something that is not a component
     if (diagnostic.code === DiagnosticCodes.TYPE_NOT_ASSIGNABLE) {
         if (diagnostic.message.includes("Property 'client:") && diagnostic.message.includes("to type 'HTMLProps")) {
@@ -227,14 +231,6 @@ function enhanceIfNecessary(diagnostic) {
             };
         }
     }
-    // An import path cannot end with '.ts(x)' consider importing with no extension
-    // TODO: Remove this when https://github.com/withastro/astro/issues/3415 is fixed
-    if (diagnostic.code === DiagnosticCodes.CANNOT_IMPORT_TS_EXT) {
-        return {
-            ...diagnostic,
-            message: diagnostic.message.replace(/\.jsx?/, ''),
-        };
-    }
     return diagnostic;
 }
 function getDiagnosticTag(diagnostic) {

package/dist/plugins/typescript/language-service.js

@@ -141,11 +141,10 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         }
         const newSnapshot = DocumentSnapshotUtils.createFromDocument(document);
         snapshotManager.set(filePath, newSnapshot);
-        document.scriptTags.forEach((scriptTag, index) => {
-            const scriptFilePath = filePath + `.__script${index}.js`;
-            const scriptSnapshot = new DocumentSnapshot_1.ScriptTagDocumentSnapshot(scriptTag, document, scriptFilePath);
-            snapshotManager.set(scriptFilePath, scriptSnapshot);
-            newSnapshot.scriptTagSnapshots?.push(scriptSnapshot);
+        const scriptTagSnapshots = createScriptTagsSnapshots(filePath, document);
+        scriptTagSnapshots.forEach((snapshot) => {
+            snapshotManager.set(snapshot.filePath, snapshot);
+            newSnapshot.scriptTagSnapshots?.push(snapshot);
         });
         if (prevSnapshot && prevSnapshot.scriptKind !== newSnapshot.scriptKind) {
             // Restart language service as it doesn't handle script kind changes.
@@ -176,11 +175,10 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         // If we needed to create an Astro snapshot, also create its script tags snapshots
         if ((0, utils_2.isAstroFilePath)(fileName)) {
             const document = doc.parent;
-            document.scriptTags.forEach((scriptTag, index) => {
-                const scriptFilePath = fileName + `.__script${index}.js`;
-                const scriptSnapshot = new DocumentSnapshot_1.ScriptTagDocumentSnapshot(scriptTag, document, scriptFilePath);
-                snapshotManager.set(scriptFilePath, scriptSnapshot);
-                doc.scriptTagSnapshots?.push(scriptSnapshot);
+            const scriptTagSnapshots = createScriptTagsSnapshots(fileName, document);
+            scriptTagSnapshots.forEach((snapshot) => {
+                snapshotManager.set(snapshot.filePath, snapshot);
+                doc.scriptTagSnapshots?.push(snapshot);
             });
         }
         return doc;
@@ -202,6 +200,14 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         }
         snapshotManager.updateNonAstroFile(fileName, changes);
     }
+    function createScriptTagsSnapshots(fileName, document) {
+        return document.scriptTags.map((scriptTag, index) => {
+            const scriptTagLanguage = (0, utils_2.getScriptTagLanguage)(scriptTag);
+            const scriptFilePath = fileName + `.__script${index}.${scriptTagLanguage}`;
+            const scriptSnapshot = new DocumentSnapshot_1.ScriptTagDocumentSnapshot(scriptTag, document, scriptFilePath);
+            return scriptSnapshot;
+        });
+    }
     function getParsedTSConfig() {
         let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {};
         // If our user has types in their config but it doesn't include the types needed for Astro, add them to the config

package/dist/plugins/typescript/previewer.js

@@ -16,12 +16,12 @@ const utils_1 = require("../../utils");
 function replaceLinks(text) {
     return (text
         // Http(s) links
-        .replace(/\{@(link|linkplain|linkcode) (https?:\/\/[^ |}]+?)(?:[| ]([^{}\n]+?))?\}/gi, (_, tag, link, text) => {
+        .replace(/\{@(link|linkplain|linkcode) (https?:\/\/[^ |}]+?)(?:[| ]([^{}\n]+?))?\}/gi, (_, tag, link, label) => {
         switch (tag) {
             case 'linkcode':
-                return `[\`${text ? text.trim() : link}\`](${link})`;
+                return `[\`${label ? label.trim() : link}\`](${link})`;
             default:
-                return `[${text ? text.trim() : link}](${link})`;
+                return `[${label ? label.trim() : link}](${link})`;
         }
     }));
 }

package/dist/plugins/typescript/utils.d.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 import { CompletionItemKind, DiagnosticSeverity, Position, Range, SymbolKind, SemanticTokensLegend } from 'vscode-languageserver';
-import { AstroDocument } from '../../core/documents';
+import { AstroDocument, TagInformation } from '../../core/documents';
 import { AstroSnapshot, ScriptTagDocumentSnapshot, SnapshotFragment } from './snapshots/DocumentSnapshot';
 import { Node } from 'vscode-html-languageservice';
 export declare const enum TokenType {
@@ -59,6 +59,10 @@ export declare function toVirtualFilePath(filePath: string): string;
 export declare function toRealAstroFilePath(filePath: string): string;
 export declare function ensureRealAstroFilePath(filePath: string): string;
 export declare function ensureRealFilePath(filePath: string): string;
+/**
+ * Return if a script tag is TypeScript or JavaScript
+ */
+export declare function getScriptTagLanguage(scriptTag: TagInformation): 'js' | 'ts';
 export declare function getScriptTagSnapshot(snapshot: AstroSnapshot, document: AstroDocument, tagInfo: Node | {
     start: number;
     end: number;

package/dist/plugins/typescript/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScriptTagSnapshot = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.checkEndOfFileCodeInsert = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
+exports.getScriptTagSnapshot = exports.getScriptTagLanguage = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.checkEndOfFileCodeInsert = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const path_1 = require("path");
 const utils_1 = require("../../utils");
@@ -346,9 +346,21 @@ function ensureRealFilePath(filePath) {
     }
 }
 exports.ensureRealFilePath = ensureRealFilePath;
+/**
+ * Return if a script tag is TypeScript or JavaScript
+ */
+function getScriptTagLanguage(scriptTag) {
+    // Using any kind of attributes on the script tag will disable hoisting, so we can just check if there's any
+    if (Object.entries(scriptTag.attributes).length === 0) {
+        return 'ts';
+    }
+    return 'js';
+}
+exports.getScriptTagLanguage = getScriptTagLanguage;
 function getScriptTagSnapshot(snapshot, document, tagInfo, position) {
     const index = document.scriptTags.findIndex((value) => value.container.start == tagInfo.start);
-    const scriptFilePath = snapshot.filePath + `.__script${index}.js`;
+    const scriptTagLanguage = getScriptTagLanguage(document.scriptTags[index]);
+    const scriptFilePath = snapshot.filePath + `.__script${index}.${scriptTagLanguage}`;
     const scriptTagSnapshot = snapshot.scriptTagSnapshots[index];
     let offset = 0;
     if (position) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.19.1",
+  "version": "0.19.4",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -19,8 +19,8 @@
     "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --timeout 20000 --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
-    "@astrojs/vue-language-integration": "^0.1.0",
-    "@astrojs/svelte-language-integration": "^0.1.5",
+    "@astrojs/vue-language-integration": "^0.1.1",
+    "@astrojs/svelte-language-integration": "^0.1.6",
     "@vscode/emmet-helper": "^2.8.4",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",