@astrojs/language-server 0.11.0 → 0.12.0

package/dist/utils.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debounceThrottle = exports.debounceSameArg = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleClientComponent = exports.isPossibleComponent = exports.pathToUrl = exports.urlToPath = exports.normalizeUri = void 0;
+exports.debounceThrottle = exports.debounceSameArg = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleClientComponent = exports.isPossibleComponent = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
 const vscode_uri_1 = require("vscode-uri");
 /** Normalizes a document URI */
 function normalizeUri(uri) {
     return vscode_uri_1.URI.parse(uri).toString();
 }
 exports.normalizeUri = normalizeUri;
+/**
+ * Some paths (on windows) start with a upper case driver letter, some don't.
+ * This is normalized here.
+ */
+function normalizePath(path) {
+    return vscode_uri_1.URI.file(path).fsPath.replace(/\\/g, '/');
+}
+exports.normalizePath = normalizePath;
 /** Turns a URL into a normalized FS Path */
 function urlToPath(stringUrl) {
     const url = vscode_uri_1.URI.parse(stringUrl);
@@ -21,6 +29,14 @@ function pathToUrl(path) {
     return vscode_uri_1.URI.file(path).toString();
 }
 exports.pathToUrl = pathToUrl;
+/**
+ * Given a path like foo/bar or foo/bar.astro , returns its last path
+ * (bar or bar.astro in this example).
+ */
+function getLastPartOfPath(path) {
+    return path.replace(/\\/g, '/').split('/').pop() || '';
+}
+exports.getLastPartOfPath = getLastPartOfPath;
 /**
  *
  * The language service is case insensitive, and would provide
@@ -63,14 +79,13 @@ function isNotNullOrUndefined(val) {
     return val !== undefined && val !== null;
 }
 exports.isNotNullOrUndefined = isNotNullOrUndefined;
-/** Checks if a position is inside range */
-function isInRange(positionToTest, range) {
+function isInRange(range, positionToTest) {
     return isBeforeOrEqualToPosition(range.end, positionToTest) && isBeforeOrEqualToPosition(positionToTest, range.start);
 }
 exports.isInRange = isInRange;
-/**  */
 function isBeforeOrEqualToPosition(position, positionToTest) {
-    return positionToTest.line < position.line || (positionToTest.line === position.line && positionToTest.character <= position.character);
+    return (positionToTest.line < position.line ||
+        (positionToTest.line === position.line && positionToTest.character <= position.character));
 }
 exports.isBeforeOrEqualToPosition = isBeforeOrEqualToPosition;
 /**
@@ -79,9 +94,9 @@ exports.isBeforeOrEqualToPosition = isBeforeOrEqualToPosition;
  *
  * @param fn The function with it's argument
  * @param determineIfSame The function which determines if the previous invocation should be canceld or not
- * @param miliseconds Number of miliseconds to debounce
+ * @param milliseconds Number of miliseconds to debounce
  */
-function debounceSameArg(fn, shouldCancelPrevious, miliseconds) {
+function debounceSameArg(fn, shouldCancelPrevious, milliseconds) {
     let timeout;
     let prevArg;
     return (arg) => {
@@ -92,31 +107,31 @@ function debounceSameArg(fn, shouldCancelPrevious, miliseconds) {
         timeout = setTimeout(() => {
             fn(arg);
             prevArg = undefined;
-        }, miliseconds);
+        }, milliseconds);
     };
 }
 exports.debounceSameArg = debounceSameArg;
 /**
- * Debounces a function but also waits at minimum the specified number of miliseconds until
+ * Debounces a function but also waits at minimum the specified number of milliseconds until
  * the next invocation. This avoids needless calls when a synchronous call (like diagnostics)
  * took too long and the whole timeout of the next call was eaten up already.
  *
  * @param fn The function with it's argument
- * @param miliseconds Number of miliseconds to debounce/throttle
+ * @param milliseconds Number of milliseconds to debounce/throttle
  */
-function debounceThrottle(fn, miliseconds) {
+function debounceThrottle(fn, milliseconds) {
     let timeout;
-    let lastInvocation = Date.now() - miliseconds;
+    let lastInvocation = Date.now() - milliseconds;
     function maybeCall(...args) {
         clearTimeout(timeout);
         timeout = setTimeout(() => {
-            if (Date.now() - lastInvocation < miliseconds) {
+            if (Date.now() - lastInvocation < milliseconds) {
                 maybeCall(...args);
                 return;
             }
             fn(...args);
             lastInvocation = Date.now();
-        }, miliseconds);
+        }, milliseconds);
     }
     return maybeCall;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
   "main": "dist/index.js",
   "bin": {
-    "astro-ls": "./bin/server.js"
+    "astro-ls": "./bin/nodeServer.js"
   },
   "files": [
     "dist",
@@ -16,27 +16,33 @@
   "scripts": {
     "build": "tsc",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "tap --no-coverage test/**"
+    "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
     "@astrojs/svelte-language-integration": "^0.1.0",
+    "@vscode/emmet-helper": "^2.8.4",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",
-    "ts-morph": "^12.0.0",
-    "typescript": "^4.5.4",
-    "vscode-css-languageservice": "^5.1.1",
-    "@vscode/emmet-helper": "^2.8.4",
-    "vscode-html-languageservice": "^3.0.3",
-    "vscode-languageserver": "6.1.1",
+    "typescript": "~4.6.2",
+    "vscode-css-languageservice": "^5.1.13",
+    "vscode-html-languageservice": "^4.2.2",
+    "vscode-languageserver": "7.0.0",
     "vscode-languageserver-protocol": "^3.16.0",
     "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-languageserver-types": "^3.16.0",
     "vscode-uri": "^3.0.2"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.116",
-    "astro": "^0.23.5",
+    "@types/chai": "^4.3.0",
+    "@types/lodash": "^4.14.179",
+    "@types/mocha": "^9.1.0",
+    "@types/sinon": "^10.0.11",
+    "astro": "^0.23.7",
     "astro-scripts": "0.0.1",
-    "tap": "^15.0.9"
+    "chai": "^4.3.6",
+    "cross-env": "^7.0.3",
+    "mocha": "^9.2.2",
+    "sinon": "^13.0.1",
+    "ts-node": "^10.7.0"
   }
 }

package/bin/server.js

@@ -1,7 +0,0 @@
-#! /usr/bin/env node
-
-// @ts-ignore
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { startServer } = require('@astrojs/language-server/dist/index.js');
-
-startServer();

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

@@ -1,51 +0,0 @@
-import type { TagInformation } from './utils';
-import { Position } from 'vscode-languageserver';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import { HTMLDocument } from 'vscode-html-languageservice';
-import { AstroDocument } from './parseAstro';
-export declare class Document implements TextDocument {
-    uri: string;
-    private content;
-    languageId: string;
-    version: number;
-    html: HTMLDocument;
-    astro: AstroDocument;
-    styleInfo: TagInformation | null;
-    constructor(uri: string, text: string);
-    private updateDocInfo;
-    setText(text: string): void;
-    /**
-     * Update the text between two positions.
-     * @param text The new text slice
-     * @param start Start offset of the new text
-     * @param end End offset of the new text
-     */
-    update(text: string, start: number, end: number): void;
-    getText(): string;
-    /**
-     * Get the line and character based on the offset
-     * @param offset The index of the position
-     */
-    positionAt(offset: number): Position;
-    /**
-     * Get the index of the line and character position
-     * @param position Line and character position
-     */
-    offsetAt(position: Position): number;
-    getLineUntilOffset(offset: number): string;
-    private getLineOffsets;
-    /**
-     * Get the length of the document's content
-     */
-    getTextLength(): number;
-    /**
-     * Returns the file path if the url scheme is file
-     */
-    getFilePath(): string | null;
-    /**
-     * Get URL file path.
-     */
-    getURL(): string;
-    get lines(): string[];
-    get lineCount(): number;
-}

package/dist/core/documents/Document.js

@@ -1,135 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Document = void 0;
-const vscode_languageserver_1 = require("vscode-languageserver");
-const utils_1 = require("../../utils");
-const parseHtml_1 = require("./parseHtml");
-const parseAstro_1 = require("./parseAstro");
-const utils_2 = require("./utils");
-class Document {
-    constructor(uri, text) {
-        this.uri = uri;
-        this.languageId = 'astro';
-        this.version = 0;
-        this.styleInfo = null;
-        this.content = text;
-        this.updateDocInfo();
-    }
-    updateDocInfo() {
-        this.html = (0, parseHtml_1.parseHtml)(this.content);
-        this.astro = (0, parseAstro_1.parseAstro)(this.content);
-        this.styleInfo = (0, utils_2.extractStyleTag)(this.content, this.html);
-        if (this.styleInfo) {
-            this.styleInfo.attributes.lang = 'css';
-        }
-    }
-    setText(text) {
-        this.content = text;
-        this.version++;
-        this.updateDocInfo();
-    }
-    /**
-     * Update the text between two positions.
-     * @param text The new text slice
-     * @param start Start offset of the new text
-     * @param end End offset of the new text
-     */
-    update(text, start, end) {
-        const content = this.getText();
-        this.setText(content.slice(0, start) + text + content.slice(end));
-    }
-    getText() {
-        return this.content;
-    }
-    /**
-     * Get the line and character based on the offset
-     * @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]);
-    }
-    /**
-     * 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);
-    }
-    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);
-        }
-        return lineOffsets;
-    }
-    /**
-     * Get the length of the document's content
-     */
-    getTextLength() {
-        return this.getText().length;
-    }
-    /**
-     * Returns the file path if the url scheme is file
-     */
-    getFilePath() {
-        return (0, utils_1.urlToPath)(this.uri);
-    }
-    /**
-     * Get URL file path.
-     */
-    getURL() {
-        return this.uri;
-    }
-    get lines() {
-        return this.getText().split(/\r?\n/);
-    }
-    get lineCount() {
-        return this.lines.length;
-    }
-}
-exports.Document = Document;

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

@@ -1,99 +0,0 @@
-import * as ts from 'typescript';
-import { TextDocumentContentChangeEvent, Position, Range } from 'vscode-languageserver';
-import { Document, DocumentMapper, IdentityMapper } from '../../core/documents';
-/**
- * The mapper to get from original snapshot positions to generated and vice versa.
- */
-export interface SnapshotFragment extends DocumentMapper {
-    positionAt(offset: number): Position;
-    offsetAt(position: Position): number;
-}
-/**
- * An error which occured while trying to parse/preprocess the Astro file contents.
- */
-export interface ParserError {
-    message: string;
-    range: Range;
-    code: number;
-}
-export interface DocumentSnapshot extends ts.IScriptSnapshot {
-    version: number;
-    filePath: string;
-    scriptKind: ts.ScriptKind;
-    parserError: ParserError | null;
-    positionAt(offset: number): Position;
-    /**
-     * Instantiates a source mapper.
-     * `destroyFragment` needs to be called when
-     * it's no longer needed / the class should be cleaned up
-     * in order to prevent memory leaks.
-     */
-    getFragment(): Promise<DocumentFragmentSnapshot>;
-    /**
-     * Needs to be called when source mapper
-     * is no longer needed / the class should be cleaned up
-     * in order to prevent memory leaks.
-     */
-    destroyFragment(): void;
-    /**
-     * Convenience function for getText(0, getLength())
-     */
-    getFullText(): string;
-    createFragment(mapper: IdentityMapper): DocumentFragmentSnapshot;
-    toTSX(code: string, filePath: string): string;
-}
-export declare abstract class DocumentFragmentSnapshot implements Omit<DocumentSnapshot, 'createFragment' | 'getFragment' | 'destroyFragment' | 'toTSX'>, SnapshotFragment {
-    private mapper;
-    private parent;
-    version: number;
-    filePath: string;
-    url: string;
-    text: string;
-    parserError: null;
-    scriptKind: ts.ScriptKind;
-    scriptInfo: null;
-    constructor(mapper: any, parent: Document, toTSX: (code: string, filePath: string) => string);
-    abstract toVirtualFilePath(filePath: string): string;
-    getText(start: number, end: number): string;
-    getLength(): number;
-    getFullText(): string;
-    getChangeRange(): undefined;
-    positionAt(offset: number): import("vscode-html-languageservice").Position;
-    getLineContainingOffset(offset: number): string;
-    offsetAt(position: Position): number;
-    getOriginalPosition(pos: Position): Position;
-    getGeneratedPosition(pos: Position): Position;
-    isInGenerated(pos: Position): boolean;
-    getURL(): string;
-}
-declare class FrameworkDocumentFragmentSnapshot extends DocumentFragmentSnapshot {
-    toVirtualFilePath(filePath: string): string;
-}
-export declare class AstroDocumentFragmentSnapshot extends DocumentFragmentSnapshot {
-    toVirtualFilePath(filePath: string): string;
-}
-export declare class TypeScriptDocumentSnapshot implements DocumentSnapshot {
-    version: number;
-    readonly filePath: string;
-    private text;
-    scriptKind: ts.ScriptKind;
-    scriptInfo: null;
-    parserError: null;
-    url: string;
-    constructor(version: number, filePath: string, text: string);
-    toTSX(): any;
-    createFragment(): any;
-    destroyFragment(): void;
-    getText(start: number, end: number): string;
-    getLength(): number;
-    getFullText(): string;
-    getChangeRange(): undefined;
-    positionAt(offset: number): import("vscode-html-languageservice").Position;
-    offsetAt(position: Position): number;
-    getFragment(): Promise<FrameworkDocumentFragmentSnapshot>;
-    getOriginalPosition(pos: Position): Position;
-    getLineContainingOffset(offset: number): string;
-    update(changes: TextDocumentContentChangeEvent[]): void;
-}
-export declare const createDocumentSnapshot: (filePath: string, currentText: string | null, createDocument?: ((_filePath: string, text: string, overrideText: boolean) => Document) | undefined) => DocumentSnapshot;
-export {};