@astrojs/language-server 0.16.1 → 0.18.1

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

@@ -0,0 +1,132 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormattingProviderImpl = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const utils_1 = require("../utils");
+class FormattingProviderImpl {
+    constructor(languageServiceManager, configManager) {
+        this.languageServiceManager = languageServiceManager;
+        this.configManager = configManager;
+    }
+    async formatDocument(document, options) {
+        const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
+        const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);
+        const formatConfig = await this.configManager.getTSFormatConfig(document, options);
+        let frontmatterEdits = [];
+        let scriptTagsEdits = [];
+        if (document.astroMeta.frontmatter.state === 'closed') {
+            const start = document.positionAt(document.astroMeta.frontmatter.startOffset + 3);
+            start.line += 1;
+            start.character = 0;
+            const startOffset = document.offsetAt(start);
+            const endOffset = document.astroMeta.frontmatter.endOffset;
+            const astroFormatConfig = await this.configManager.getAstroFormatConfig(document);
+            const settings = {
+                ...formatConfig,
+                baseIndentSize: astroFormatConfig.indentFrontmatter ? formatConfig.tabSize ?? 0 : undefined,
+            };
+            frontmatterEdits = lang.getFormattingEditsForRange(filePath, startOffset, endOffset, settings);
+            if (astroFormatConfig.newLineAfterFrontmatter) {
+                const templateStart = document.positionAt(endOffset + 3);
+                templateStart.line += 1;
+                templateStart.character = 0;
+                frontmatterEdits.push({
+                    span: { start: document.offsetAt(templateStart), length: 0 },
+                    newText: '\n',
+                });
+            }
+        }
+        document.scriptTags.forEach((scriptTag) => {
+            const { filePath: scriptFilePath, snapshot: scriptTagSnapshot } = (0, utils_1.getScriptTagSnapshot)(tsDoc, document, scriptTag.container);
+            const startLine = document.offsetAt(vscode_languageserver_types_1.Position.create(scriptTag.startPos.line, 0));
+            const initialIndentLevel = computeInitialIndent(document, startLine, options);
+            const baseIndent = (formatConfig.tabSize ?? 0) * (initialIndentLevel + 1);
+            const formatSettings = {
+                baseIndentSize: baseIndent,
+                indentStyle: typescript_1.default.IndentStyle.Smart,
+                ...formatConfig,
+            };
+            let edits = lang.getFormattingEditsForDocument(scriptFilePath, formatSettings);
+            if (edits) {
+                edits = edits
+                    .map((edit) => {
+                    edit.span.start = document.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(edit.span.start)));
+                    return edit;
+                })
+                    .filter((edit) => {
+                    return (scriptTagSnapshot.isInGenerated(document.positionAt(edit.span.start)) &&
+                        scriptTag.end !== edit.span.start &&
+                        // Don't format the last line of the file as it's in most case the indentation
+                        scriptTag.endPos.line !== document.positionAt(edit.span.start).line);
+                });
+                const endLine = document.getLineUntilOffset(document.offsetAt(scriptTag.endPos));
+                if (isWhitespaceOnly(endLine)) {
+                    const endLineStartOffset = document.offsetAt(vscode_languageserver_types_1.Position.create(scriptTag.endPos.line, 0));
+                    const lastLineIndentRange = vscode_languageserver_types_1.Range.create(vscode_languageserver_types_1.Position.create(scriptTag.endPos.line, 0), scriptTag.endPos);
+                    const newText = generateIndent(initialIndentLevel, options);
+                    if (endLine !== newText) {
+                        edits.push({
+                            span: {
+                                start: endLineStartOffset,
+                                length: lastLineIndentRange.end.character,
+                            },
+                            newText,
+                        });
+                    }
+                }
+            }
+            scriptTagsEdits.push(...edits);
+        });
+        return [...frontmatterEdits, ...scriptTagsEdits].map((edit) => ({
+            range: (0, utils_1.convertRange)(document, edit.span),
+            newText: edit.newText,
+        }));
+    }
+}
+exports.FormattingProviderImpl = FormattingProviderImpl;
+function computeInitialIndent(document, lineStart, options) {
+    let content = document.getText();
+    let i = lineStart;
+    let nChars = 0;
+    let tabSize = options.tabSize || 4;
+    while (i < content.length) {
+        let ch = content.charAt(i);
+        if (ch === ' ') {
+            nChars++;
+        }
+        else if (ch === '\t') {
+            nChars += tabSize;
+        }
+        else {
+            break;
+        }
+        i++;
+    }
+    return Math.floor(nChars / tabSize);
+}
+function generateIndent(level, options) {
+    if (options.insertSpaces) {
+        return repeat(' ', level * options.tabSize);
+    }
+    else {
+        return repeat('\t', level);
+    }
+}
+function repeat(value, count) {
+    let s = '';
+    while (count > 0) {
+        if ((count & 1) === 1) {
+            s += value;
+        }
+        value += value;
+        count = count >>> 1;
+    }
+    return s;
+}
+function isWhitespaceOnly(str) {
+    return /^\s*$/.test(str);
+}

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

@@ -18,7 +18,20 @@ class HoverProviderImpl {
         const fragment = await tsDoc.createFragment();
         const offset = fragment.offsetAt(fragment.getGeneratedPosition(position));
         const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);
-        let info = lang.getQuickInfoAtPosition(filePath, offset);
+        const html = document.html;
+        const documentOffset = document.offsetAt(position);
+        const node = html.findNodeAt(documentOffset);
+        let info;
+        if (node.tag === 'script') {
+            const { snapshot: scriptTagSnapshot, filePath: scriptFilePath, offset: scriptOffset, } = (0, utils_1.getScriptTagSnapshot)(tsDoc, document, node, position);
+            info = lang.getQuickInfoAtPosition(scriptFilePath, scriptOffset);
+            if (info) {
+                info.textSpan.start = fragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(info.textSpan.start)));
+            }
+        }
+        else {
+            info = lang.getQuickInfoAtPosition(filePath, offset);
+        }
         if (!info) {
             return null;
         }

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

@@ -20,8 +20,16 @@ class SignatureHelpProviderImpl {
         }
         const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);
         const offset = fragment.offsetAt(fragment.getGeneratedPosition(position));
+        const node = document.html.findNodeAt(offset);
+        let info;
         const triggerReason = this.toTsTriggerReason(context);
-        const info = lang.getSignatureHelpItems(filePath, offset, triggerReason ? { triggerReason } : undefined);
+        if (node.tag === 'script') {
+            const { filePath: scriptFilePath, offset: scriptOffset } = (0, utils_1.getScriptTagSnapshot)(tsDoc, document, node, position);
+            info = lang.getSignatureHelpItems(scriptFilePath, scriptOffset, triggerReason ? { triggerReason } : undefined);
+        }
+        else {
+            info = lang.getSignatureHelpItems(filePath, offset, triggerReason ? { triggerReason } : undefined);
+        }
         if (!info) {
             return null;
         }

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

@@ -33,6 +33,7 @@ const utils_1 = require("../../utils");
 const module_loader_1 = require("./module-loader");
 const SnapshotManager_1 = require("./snapshots/SnapshotManager");
 const utils_2 = require("./utils");
+const DocumentSnapshot_1 = require("./snapshots/DocumentSnapshot");
 const DocumentSnapshotUtils = __importStar(require("./snapshots/utils"));
 const services = new Map();
 async function getLanguageService(path, workspaceUris, docContext) {
@@ -140,6 +141,12 @@ 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);
+        });
         if (prevSnapshot && prevSnapshot.scriptKind !== newSnapshot.scriptKind) {
             // Restart language service as it doesn't handle script kind changes.
             languageService.dispose();
@@ -166,6 +173,16 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         astroModuleLoader.deleteUnresolvedResolutionsFromCache(fileName);
         doc = DocumentSnapshotUtils.createFromFilePath(fileName, docContext.createDocument);
         snapshotManager.set(fileName, doc);
+        // 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);
+            });
+        }
         return doc;
     }
     function updateProjectFiles() {
@@ -214,6 +231,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
             jsxFactory: 'astroHTML',
             module: typescript_1.default.ModuleKind.ESNext,
             target: typescript_1.default.ScriptTarget.ESNext,
+            isolatedModules: true,
             moduleResolution: typescript_1.default.ModuleResolutionKind.NodeJs,
         };
         const project = typescript_1.default.parseJsonConfigFileContent(configJson, typescript_1.default.sys, tsconfigRoot, forcedCompilerOptions, tsconfigPath, undefined, [

package/dist/plugins/typescript/snapshots/DocumentSnapshot.d.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 import { Position, TextDocumentContentChangeEvent } from 'vscode-languageserver';
-import { AstroDocument, DocumentMapper, IdentityMapper } from '../../../core/documents';
+import { AstroDocument, DocumentMapper, IdentityMapper, FragmentMapper, TagInformation } from '../../../core/documents';
 import { FrameworkExt } from '../utils';
 export interface DocumentSnapshot extends ts.IScriptSnapshot {
     version: number;
@@ -36,11 +36,12 @@ export interface SnapshotFragment extends DocumentMapper {
  * Snapshots used for Astro files
  */
 export declare class AstroSnapshot implements DocumentSnapshot {
-    private readonly parent;
+    readonly parent: AstroDocument;
     private readonly text;
     readonly scriptKind: ts.ScriptKind;
     private fragment?;
     version: number;
+    scriptTagSnapshots: ScriptTagDocumentSnapshot[];
     constructor(parent: AstroDocument, text: string, scriptKind: ts.ScriptKind);
     createFragment(): Promise<AstroSnapshotFragment>;
     destroyFragment(): null;
@@ -65,6 +66,25 @@ export declare class AstroSnapshotFragment implements SnapshotFragment {
     isInGenerated(pos: Position): boolean;
     getURL(): string;
 }
+export declare class ScriptTagDocumentSnapshot extends FragmentMapper implements DocumentSnapshot, SnapshotFragment {
+    scriptTag: TagInformation;
+    private readonly parent;
+    filePath: string;
+    readonly version: number;
+    private text;
+    scriptKind: ts.ScriptKind;
+    private lineOffsets?;
+    constructor(scriptTag: TagInformation, parent: AstroDocument, filePath: string);
+    positionAt(offset: number): Position;
+    offsetAt(position: Position): number;
+    createFragment(): Promise<SnapshotFragment>;
+    destroyFragment(): void;
+    getText(start: number, end: number): string;
+    getLength(): number;
+    getFullText(): string;
+    getChangeRange(): undefined;
+    private getLineOffsets;
+}
 /**
  * Snapshot used for anything that is not an Astro file
  * It's both used for .js(x)/.ts(x) files and .svelte/.vue files

package/dist/plugins/typescript/snapshots/DocumentSnapshot.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptDocumentSnapshot = exports.AstroSnapshotFragment = exports.AstroSnapshot = void 0;
+exports.TypeScriptDocumentSnapshot = exports.ScriptTagDocumentSnapshot = exports.AstroSnapshotFragment = exports.AstroSnapshot = void 0;
+const typescript_1 = __importDefault(require("typescript"));
 const documents_1 = require("../../../core/documents");
 const utils_1 = require("../../../utils");
 const utils_2 = require("../utils");
@@ -13,6 +17,7 @@ class AstroSnapshot {
         this.text = text;
         this.scriptKind = scriptKind;
         this.version = this.parent.version;
+        this.scriptTagSnapshots = [];
     }
     async createFragment() {
         if (!this.fragment) {
@@ -72,6 +77,48 @@ class AstroSnapshotFragment {
     }
 }
 exports.AstroSnapshotFragment = AstroSnapshotFragment;
+class ScriptTagDocumentSnapshot extends documents_1.FragmentMapper {
+    constructor(scriptTag, parent, filePath) {
+        super(parent.getText(), scriptTag, filePath);
+        this.scriptTag = scriptTag;
+        this.parent = parent;
+        this.filePath = filePath;
+        this.version = this.parent.version;
+        this.text = this.parent.getText().slice(this.scriptTag.start, this.scriptTag.end) + '\nexport {}';
+        this.scriptKind = typescript_1.default.ScriptKind.JS;
+    }
+    positionAt(offset) {
+        return (0, documents_1.positionAt)(offset, this.text, this.getLineOffsets());
+    }
+    offsetAt(position) {
+        return (0, documents_1.offsetAt)(position, this.text, this.getLineOffsets());
+    }
+    async createFragment() {
+        return this;
+    }
+    destroyFragment() {
+        //
+    }
+    getText(start, end) {
+        return this.text.substring(start, end);
+    }
+    getLength() {
+        return this.text.length;
+    }
+    getFullText() {
+        return this.text;
+    }
+    getChangeRange() {
+        return undefined;
+    }
+    getLineOffsets() {
+        if (!this.lineOffsets) {
+            this.lineOffsets = (0, documents_1.getLineOffsets)(this.text);
+        }
+        return this.lineOffsets;
+    }
+}
+exports.ScriptTagDocumentSnapshot = ScriptTagDocumentSnapshot;
 /**
  * Snapshot used for anything that is not an Astro file
  * It's both used for .js(x)/.ts(x) files and .svelte/.vue files

package/dist/plugins/typescript/snapshots/SnapshotManager.js

@@ -187,6 +187,7 @@ class SnapshotManager {
             const projectFiles = this.getProjectFileNames();
             let allFiles = Array.from(new Set([...projectFiles, ...this.getFileNames()]));
             allFiles = allFiles.map((file) => (0, utils_2.ensureRealFilePath)(file));
+            // eslint-disable-next-line no-console
             console.log('SnapshotManager File Statistics:\n' +
                 `Project files: ${projectFiles.length}\n` +
                 `Astro files: ${allFiles.filter((name) => name.endsWith('.astro')).length}\n` +

package/dist/plugins/typescript/snapshots/utils.js

@@ -10,6 +10,7 @@ const vscode_uri_1 = require("vscode-uri");
 const utils_1 = require("../utils");
 const DocumentSnapshot_1 = require("./DocumentSnapshot");
 const svelte_language_integration_1 = require("@astrojs/svelte-language-integration");
+const vue_language_integration_1 = require("@astrojs/vue-language-integration");
 const utils_2 = require("../../../utils");
 // Utilities to create Snapshots from different contexts
 function createFromDocument(document) {
@@ -76,8 +77,8 @@ function createFromFrameworkFilePath(filePath, framework) {
     if (framework === 'svelte') {
         code = (0, svelte_language_integration_1.toTSX)(originalText, className);
     }
-    else {
-        code = `export default function ${className}__AstroComponent_(props: Record<string, any>): any {}`;
+    else if (framework === 'vue') {
+        code = (0, vue_language_integration_1.toTSX)(originalText, className);
     }
     return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, code, typescript_1.default.ScriptKind.TSX);
 }

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

@@ -1,7 +1,8 @@
 import ts from 'typescript';
 import { CompletionItemKind, DiagnosticSeverity, Position, Range, SymbolKind, SemanticTokensLegend } from 'vscode-languageserver';
 import { AstroDocument } from '../../core/documents';
-import { SnapshotFragment } from './snapshots/DocumentSnapshot';
+import { AstroSnapshot, ScriptTagDocumentSnapshot, SnapshotFragment } from './snapshots/DocumentSnapshot';
+import { Node } from 'vscode-html-languageservice';
 export declare const enum TokenType {
     class = 0,
     enum = 1,
@@ -58,4 +59,13 @@ 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;
+export declare function getScriptTagSnapshot(snapshot: AstroSnapshot, document: AstroDocument, tagInfo: Node | {
+    start: number;
+    end: number;
+}, position?: Position): {
+    snapshot: ScriptTagDocumentSnapshot;
+    filePath: string;
+    index: number;
+    offset: number;
+};
 export {};

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.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.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,3 +346,19 @@ function ensureRealFilePath(filePath) {
     }
 }
 exports.ensureRealFilePath = ensureRealFilePath;
+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 scriptTagSnapshot = snapshot.scriptTagSnapshots[index];
+    let offset = 0;
+    if (position) {
+        offset = scriptTagSnapshot.offsetAt(scriptTagSnapshot.getGeneratedPosition(position));
+    }
+    return {
+        snapshot: scriptTagSnapshot,
+        filePath: scriptFilePath,
+        index,
+        offset,
+    };
+}
+exports.getScriptTagSnapshot = getScriptTagSnapshot;

package/dist/server.js

@@ -88,6 +88,7 @@ function startLanguageServer(connection) {
                 foldingRangeProvider: true,
                 definitionProvider: true,
                 renameProvider: true,
+                documentFormattingProvider: true,
                 codeActionProvider: {
                     codeActionKinds: [
                         vscode_languageserver_1.CodeActionKind.QuickFix,
@@ -193,6 +194,7 @@ function startLanguageServer(connection) {
     connection.onDocumentSymbol((params, cancellationToken) => pluginHost.getDocumentSymbols(params.textDocument, cancellationToken));
     connection.onRequest(vscode_languageserver_1.SemanticTokensRequest.type, (evt, cancellationToken) => pluginHost.getSemanticTokens(evt.textDocument, undefined, cancellationToken));
     connection.onRequest(vscode_languageserver_1.SemanticTokensRangeRequest.type, (evt, cancellationToken) => pluginHost.getSemanticTokens(evt.textDocument, evt.range, cancellationToken));
+    connection.onDocumentFormatting((params) => pluginHost.formatDocument(params.textDocument, params.options));
     connection.onDocumentColor((params) => pluginHost.getDocumentColors(params.textDocument));
     connection.onColorPresentation((params) => pluginHost.getColorPresentations(params.textDocument, params.range, params.color));
     connection.onRequest(TagCloseRequest, (evt) => pluginHost.doTagComplete(evt.textDocument, evt.position));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.16.1",
+  "version": "0.18.1",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -19,13 +19,14 @@
     "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.4",
     "@vscode/emmet-helper": "^2.8.4",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",
     "typescript": "~4.6.2",
     "vscode-css-languageservice": "^5.1.13",
-    "vscode-html-languageservice": "^4.2.2",
+    "vscode-html-languageservice": "^4.2.5",
     "vscode-languageserver": "7.0.0",
     "vscode-languageserver-protocol": "^3.16.0",
     "vscode-languageserver-textdocument": "^1.0.1",