@astrojs/language-server 0.9.2 → 0.12.0

package/dist/core/documents/AstroDocument.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AstroDocument = void 0;
+const utils_1 = require("../../utils");
+const DocumentBase_1 = require("./DocumentBase");
+const parseAstro_1 = require("./parseAstro");
+const parseHtml_1 = require("./parseHtml");
+const utils_2 = require("./utils");
+class AstroDocument extends DocumentBase_1.WritableDocument {
+    constructor(url, content) {
+        super();
+        this.url = url;
+        this.content = content;
+        this.languageId = 'astro';
+        this.updateDocInfo();
+    }
+    updateDocInfo() {
+        this.astroMeta = (0, parseAstro_1.parseAstro)(this.content);
+        this.html = (0, parseHtml_1.parseHtml)(this.content);
+        this.styleTags = (0, utils_2.extractStyleTags)(this.content, this.html);
+    }
+    setText(text) {
+        this.content = text;
+        this.version++;
+        this.updateDocInfo();
+    }
+    getText() {
+        return this.content;
+    }
+    getURL() {
+        return this.url;
+    }
+    getFilePath() {
+        return (0, utils_1.urlToPath)(this.url);
+    }
+}
+exports.AstroDocument = AstroDocument;

package/dist/core/documents/DocumentBase.d.ts

@@ -1,4 +1,5 @@
-import { Position, TextDocument } from 'vscode-languageserver';
+import { Position } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 /**
  * Represents a textual document.
  */
@@ -19,6 +20,10 @@ export declare abstract class ReadableDocument implements TextDocument {
      * Current version of the document.
      */
     version: number;
+    /**
+     * Should be cleared when there's an update to the text
+     */
+    protected lineOffsets?: number[];
     /**
      * Get the length of the document's content
      */
@@ -33,11 +38,13 @@ export declare abstract class ReadableDocument implements TextDocument {
      * @param position Line and character position
      */
     offsetAt(position: Position): number;
+    getLineUntilOffset(offset: number): string;
     private getLineOffsets;
     /**
      * Implements TextDocument
      */
     get uri(): string;
+    get lines(): string[];
     get lineCount(): number;
     abstract languageId: string;
 }
@@ -46,7 +53,8 @@ export declare abstract class ReadableDocument implements TextDocument {
  */
 export declare abstract class WritableDocument extends ReadableDocument {
     /**
-     * Set the text content of the document
+     * Set the text content of the document.
+     * Implementers should set `lineOffsets` to `undefined` here.
      * @param text The new text content
      */
     abstract setText(text: string): void;

package/dist/core/documents/DocumentBase.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WritableDocument = exports.ReadableDocument = void 0;
-const utils_1 = require("../../utils");
-const vscode_languageserver_1 = require("vscode-languageserver");
+const utils_1 = require("./utils");
 /**
  * Represents a textual document.
  */
@@ -24,62 +23,24 @@ class ReadableDocument {
      * @param offset The index of the position
      */
     positionAt(offset) {
-        offset = (0, utils_1.clamp)(offset, 0, this.getTextLength());
-        const lineOffsets = this.getLineOffsets();
-        let low = 0;
-        let high = lineOffsets.length;
-        if (high === 0) {
-            return vscode_languageserver_1.Position.create(0, offset);
-        }
-        while (low < high) {
-            const mid = Math.floor((low + high) / 2);
-            if (lineOffsets[mid] > offset) {
-                high = mid;
-            }
-            else {
-                low = mid + 1;
-            }
-        }
-        // low is the least x for which the line offset is larger than the current offset
-        // or array.length if no line offset is larger than the current offset
-        const line = low - 1;
-        return vscode_languageserver_1.Position.create(line, offset - lineOffsets[line]);
+        return (0, utils_1.positionAt)(offset, this.getText(), this.getLineOffsets());
     }
     /**
      * Get the index of the line and character position
      * @param position Line and character position
      */
     offsetAt(position) {
-        const lineOffsets = this.getLineOffsets();
-        if (position.line >= lineOffsets.length) {
-            return this.getTextLength();
-        }
-        else if (position.line < 0) {
-            return 0;
-        }
-        const lineOffset = lineOffsets[position.line];
-        const nextLineOffset = position.line + 1 < lineOffsets.length ? lineOffsets[position.line + 1] : this.getTextLength();
-        return (0, utils_1.clamp)(nextLineOffset, lineOffset, lineOffset + position.character);
+        return (0, utils_1.offsetAt)(position, this.getText(), this.getLineOffsets());
+    }
+    getLineUntilOffset(offset) {
+        const { line, character } = this.positionAt(offset);
+        return this.lines[line].slice(0, character);
     }
     getLineOffsets() {
-        const lineOffsets = [];
-        const text = this.getText();
-        let isLineStart = true;
-        for (let i = 0; i < text.length; i++) {
-            if (isLineStart) {
-                lineOffsets.push(i);
-                isLineStart = false;
-            }
-            const ch = text.charAt(i);
-            isLineStart = ch === '\r' || ch === '\n';
-            if (ch === '\r' && i + 1 < text.length && text.charAt(i + 1) === '\n') {
-                i++;
-            }
-        }
-        if (isLineStart && text.length > 0) {
-            lineOffsets.push(text.length);
+        if (!this.lineOffsets) {
+            this.lineOffsets = (0, utils_1.getLineOffsets)(this.getText());
         }
-        return lineOffsets;
+        return this.lineOffsets;
     }
     /**
      * Implements TextDocument
@@ -87,8 +48,11 @@ class ReadableDocument {
     get uri() {
         return this.getURL();
     }
+    get lines() {
+        return this.getText().split(/\r?\n/);
+    }
     get lineCount() {
-        return this.getText().split(/\r?\n/).length;
+        return this.lines.length;
     }
 }
 exports.ReadableDocument = ReadableDocument;
@@ -103,6 +67,7 @@ class WritableDocument extends ReadableDocument {
      * @param end End offset of the new text
      */
     update(text, start, end) {
+        this.lineOffsets = undefined;
         const content = this.getText();
         this.setText(content.slice(0, start) + text + content.slice(end));
     }

package/dist/core/documents/DocumentManager.d.ts

@@ -1,27 +1,23 @@
-import { TextDocumentContentChangeEvent, TextDocumentItem } from 'vscode-languageserver';
-import { Document } from './Document';
+import { TextDocumentContentChangeEvent, TextDocumentItem, VersionedTextDocumentIdentifier } from 'vscode-languageserver';
+import { AstroDocument } from './AstroDocument';
 export declare type DocumentEvent = 'documentOpen' | 'documentChange' | 'documentClose';
 export declare class DocumentManager {
-    private createDocument;
+    private createDocument?;
     private emitter;
     private openedInClient;
     private documents;
     private locked;
     private deleteCandidates;
-    constructor(createDocument: (textDocument: {
-        uri: string;
-        text: string;
-    }) => Document);
-    get(uri: string): Document | undefined;
-    openDocument(textDocument: TextDocumentItem & {
-        overrideText: boolean;
-    }): Document;
-    closeDocument(uri: string): void;
-    releaseDocument(uri: string): void;
-    updateDocument(uri: string, changes: TextDocumentContentChangeEvent[]): void;
+    constructor(createDocument?: ((textDocument: Pick<TextDocumentItem, 'text' | 'uri'>) => AstroDocument) | undefined);
+    openDocument(textDocument: Pick<TextDocumentItem, 'text' | 'uri'>): AstroDocument;
+    lockDocument(uri: string): void;
     markAsOpenedInClient(uri: string): void;
-    getAllOpenedByClient(): [string, Document][];
-    on(name: DocumentEvent, listener: (document: Document) => void): void;
+    getAllOpenedByClient(): [string, AstroDocument][];
+    releaseDocument(uri: string): void;
+    closeDocument(uri: string): void;
+    updateDocument(textDocument: VersionedTextDocumentIdentifier, changes: TextDocumentContentChangeEvent[]): void;
+    on(name: DocumentEvent, listener: (document: AstroDocument) => void): void;
+    get(uri: string): AstroDocument | undefined;
     private notify;
     static newInstance(): DocumentManager;
 }

package/dist/core/documents/DocumentManager.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentManager = void 0;
 const events_1 = require("events");
-const Document_1 = require("./Document");
+const AstroDocument_1 = require("./AstroDocument");
 const utils_1 = require("../../utils");
 class DocumentManager {
     constructor(createDocument) {
@@ -12,25 +12,43 @@ class DocumentManager {
         this.documents = new Map();
         this.locked = new Set();
         this.deleteCandidates = new Set();
-    }
-    get(uri) {
-        return this.documents.get((0, utils_1.normalizeUri)(uri));
+        if (!createDocument) {
+            this.createDocument = (textDocument) => new AstroDocument_1.AstroDocument(textDocument.uri, textDocument.text);
+        }
     }
     openDocument(textDocument) {
+        textDocument = { ...textDocument, uri: (0, utils_1.normalizeUri)(textDocument.uri) };
         let document;
         if (this.documents.has(textDocument.uri)) {
-            document = this.get(textDocument.uri);
-            if (textDocument.overrideText)
-                document.setText(textDocument.text);
+            document = this.documents.get(textDocument.uri);
+            document.setText(textDocument.text);
         }
         else {
             document = this.createDocument(textDocument);
-            this.documents.set((0, utils_1.normalizeUri)(textDocument.uri), document);
+            this.documents.set(textDocument.uri, document);
             this.notify('documentOpen', document);
         }
         this.notify('documentChange', document);
         return document;
     }
+    lockDocument(uri) {
+        this.locked.add((0, utils_1.normalizeUri)(uri));
+    }
+    markAsOpenedInClient(uri) {
+        this.openedInClient.add((0, utils_1.normalizeUri)(uri));
+    }
+    getAllOpenedByClient() {
+        return Array.from(this.documents.entries()).filter((doc) => this.openedInClient.has(doc[0]));
+    }
+    releaseDocument(uri) {
+        uri = (0, utils_1.normalizeUri)(uri);
+        this.locked.delete(uri);
+        this.openedInClient.delete(uri);
+        if (this.deleteCandidates.has(uri)) {
+            this.deleteCandidates.delete(uri);
+            this.closeDocument(uri);
+        }
+    }
     closeDocument(uri) {
         uri = (0, utils_1.normalizeUri)(uri);
         const document = this.documents.get(uri);
@@ -47,17 +65,8 @@ class DocumentManager {
         }
         this.openedInClient.delete(uri);
     }
-    releaseDocument(uri) {
-        uri = (0, utils_1.normalizeUri)(uri);
-        this.locked.delete(uri);
-        this.openedInClient.delete(uri);
-        if (this.deleteCandidates.has(uri)) {
-            this.deleteCandidates.delete(uri);
-            this.closeDocument(uri);
-        }
-    }
-    updateDocument(uri, changes) {
-        const document = this.documents.get((0, utils_1.normalizeUri)(uri));
+    updateDocument(textDocument, changes) {
+        const document = this.documents.get((0, utils_1.normalizeUri)(textDocument.uri));
         if (!document) {
             throw new Error('Cannot call methods on an unopened document');
         }
@@ -75,20 +84,17 @@ class DocumentManager {
         }
         this.notify('documentChange', document);
     }
-    markAsOpenedInClient(uri) {
-        this.openedInClient.add((0, utils_1.normalizeUri)(uri));
-    }
-    getAllOpenedByClient() {
-        return Array.from(this.documents.entries()).filter((doc) => this.openedInClient.has(doc[0]));
-    }
     on(name, listener) {
         this.emitter.on(name, listener);
     }
+    get(uri) {
+        return this.documents.get((0, utils_1.normalizeUri)(uri));
+    }
     notify(name, document) {
         this.emitter.emit(name, document);
     }
     static newInstance() {
-        return new DocumentManager(({ uri, text }) => new Document_1.Document(uri, text));
+        return new DocumentManager(({ uri, text }) => new AstroDocument_1.AstroDocument(uri, text));
     }
 }
 exports.DocumentManager = DocumentManager;

package/dist/core/documents/DocumentMapper.js

@@ -213,7 +213,9 @@ function mapSymbolInformationToOriginal(fragment, info) {
 }
 exports.mapSymbolInformationToOriginal = mapSymbolInformationToOriginal;
 function mapLocationLinkToOriginal(fragment, def) {
-    return vscode_languageserver_1.LocationLink.create(def.targetUri, fragment.getURL() === def.targetUri ? mapRangeToOriginal(fragment, def.targetRange) : def.targetRange, fragment.getURL() === def.targetUri ? mapRangeToOriginal(fragment, def.targetSelectionRange) : def.targetSelectionRange, def.originSelectionRange ? mapRangeToOriginal(fragment, def.originSelectionRange) : undefined);
+    return vscode_languageserver_1.LocationLink.create(def.targetUri, fragment.getURL() === def.targetUri ? mapRangeToOriginal(fragment, def.targetRange) : def.targetRange, fragment.getURL() === def.targetUri
+        ? mapRangeToOriginal(fragment, def.targetSelectionRange)
+        : def.targetSelectionRange, def.originSelectionRange ? mapRangeToOriginal(fragment, def.originSelectionRange) : undefined);
 }
 exports.mapLocationLinkToOriginal = mapLocationLinkToOriginal;
 function mapTextDocumentEditToOriginal(fragment, edit) {

package/dist/core/documents/index.d.ts

@@ -1,4 +1,4 @@
-export * from './Document';
+export * from './AstroDocument';
 export * from './DocumentBase';
 export * from './DocumentManager';
 export * from './DocumentMapper';

package/dist/core/documents/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Document"), exports);
+__exportStar(require("./AstroDocument"), exports);
 __exportStar(require("./DocumentBase"), exports);
 __exportStar(require("./DocumentManager"), exports);
 __exportStar(require("./DocumentMapper"), exports);

package/dist/core/documents/parseAstro.d.ts

@@ -6,10 +6,10 @@ interface Frontmatter {
 interface Content {
     firstNonWhitespaceOffset: null | number;
 }
-export interface AstroDocument {
+export interface AstroMetadata {
     frontmatter: Frontmatter;
     content: Content;
 }
 /** Parses a document to collect metadata about Astro features */
-export declare function parseAstro(content: string): AstroDocument;
+export declare function parseAstro(content: string): AstroMetadata;
 export {};

package/dist/core/documents/parseHtml.d.ts

@@ -1,5 +1,5 @@
 import { HTMLDocument, Position } from 'vscode-html-languageservice';
-import { Document } from './Document';
+import { AstroDocument } from './AstroDocument';
 /**
  * Parses text as HTML
  */
@@ -9,4 +9,4 @@ export interface AttributeContext {
     inValue: boolean;
     valueRange?: [number, number];
 }
-export declare function getAttributeContextAtPosition(document: Document, position: Position): AttributeContext | null;
+export declare function getAttributeContextAtPosition(document: AstroDocument, position: Position): AttributeContext | null;

package/dist/core/documents/parseHtml.js

@@ -40,7 +40,10 @@ function preprocess(text) {
         }
         // <Foo checked={a < 1}>
         // https://github.com/microsoft/vscode-html-languageservice/blob/71806ef57be07e1068ee40900ef8b0899c80e68a/src/parser/htmlScanner.ts#L327
-        if (token === vscode_html_languageservice_1.TokenType.Unknown && scanner.getScannerState() === vscode_html_languageservice_1.ScannerState.WithinTag && scanner.getTokenText() === '<' && shouldBlankStartOrEndTagLike(offset)) {
+        if (token === vscode_html_languageservice_1.TokenType.Unknown &&
+            scanner.getScannerState() === vscode_html_languageservice_1.ScannerState.WithinTag &&
+            scanner.getTokenText() === '<' &&
+            shouldBlankStartOrEndTagLike(offset)) {
             blankStartOrEndTagLike(offset);
         }
         token = scanner.scan();

package/dist/core/documents/utils.d.ts

@@ -1,4 +1,5 @@
-import { HTMLDocument, Node, Position } from 'vscode-html-languageservice';
+import { Position } from 'vscode-languageserver';
+import { HTMLDocument, Node } from 'vscode-html-languageservice';
 export interface TagInformation {
     content: string;
     attributes: Record<string, string>;
@@ -11,49 +12,44 @@ export interface TagInformation {
         end: number;
     };
 }
+export declare function walk(node: Node): Generator<Node, void, unknown>;
+export declare function extractStyleTags(source: string, html?: HTMLDocument): TagInformation[];
 /**
- * Gets word range at position.
- * Delimiter is by default a whitespace, but can be adjusted.
+ * Return if a Node is a Component
  */
-export declare function getWordRangeAt(str: string, pos: number, delimiterRegex?: {
-    left: RegExp;
-    right: RegExp;
-}): {
-    start: number;
-    end: number;
-};
+export declare function isComponentTag(node: Node): boolean;
 /**
- * Gets word at position.
- * Delimiter is by default a whitespace, but can be adjusted.
+ * Return if a given offset is inside the start tag of a component
  */
-export declare function getWordAt(str: string, pos: number, delimiterRegex?: {
-    left: RegExp;
-    right: RegExp;
-}): string;
+export declare function isInComponentStartTag(html: HTMLDocument, offset: number): boolean;
 /**
- * Gets index of first-non-whitespace character.
+ * Return if the current position is in a specific tag
+ */
+export declare function isInTag(position: Position, tagInfo: TagInformation | null): tagInfo is TagInformation;
+/**
+ * Return if a given position is inside a JSX expression
  */
-export declare function getFirstNonWhitespaceIndex(str: string): number;
-/** checks if a position is currently inside of an expression */
 export declare function isInsideExpression(html: string, tagStart: number, position: number): boolean;
 /**
  * Returns if a given offset is inside of the document frontmatter
  */
 export declare function isInsideFrontmatter(text: string, offset: number): boolean;
-export declare function isInTag(position: Position, tagInfo: TagInformation | null): tagInfo is TagInformation;
-export declare function isComponentTag(node: Node): boolean;
-export declare function isInComponentStartTag(html: HTMLDocument, offset: number): boolean;
 /**
  * Get the line and character based on the offset
  * @param offset The index of the position
  * @param text The text for which the position should be retrived
+ * @param lineOffsets number Array with offsets for each line. Computed if not given
  */
-export declare function positionAt(offset: number, text: string): Position;
+export declare function positionAt(offset: number, text: string, lineOffsets?: number[]): Position;
 /**
  * Get the offset of the line and character position
  * @param position Line and character position
  * @param text The text for which the offset should be retrived
+ * @param lineOffsets number Array with offsets for each line. Computed if not given
  */
-export declare function offsetAt(position: Position, text: string): number;
-export declare function walk(node: Node): Generator<Node, void, unknown>;
-export declare function extractStyleTag(source: string, html?: HTMLDocument): TagInformation | null;
+export declare function offsetAt(position: Position, text: string, lineOffsets?: number[]): number;
+export declare function getLineOffsets(text: string): number[];
+/**
+ * Gets index of first-non-whitespace character.
+ */
+export declare function getFirstNonWhitespaceIndex(str: string): number;