@astrojs/language-server 0.28.3 → 0.29.0

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

@@ -1,41 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findContainingNode = exports.SnapshotFragmentMap = exports.isPartOfImportStatement = void 0;
+exports.findContainingNode = exports.SnapshotMap = exports.isPartOfImportStatement = void 0;
 const documents_1 = require("../../../core/documents");
 function isPartOfImportStatement(text, position) {
     const line = (0, documents_1.getLineAtPosition)(position, text);
     return /\s*from\s+["'][^"']*/.test(line.slice(0, position.character));
 }
 exports.isPartOfImportStatement = isPartOfImportStatement;
-class SnapshotFragmentMap {
+class SnapshotMap {
     constructor(languageServiceManager) {
         this.languageServiceManager = languageServiceManager;
         this.map = new Map();
     }
-    set(fileName, content) {
-        this.map.set(fileName, content);
+    set(fileName, snapshot) {
+        this.map.set(fileName, snapshot);
     }
     get(fileName) {
         return this.map.get(fileName);
     }
-    getFragment(fileName) {
-        return this.map.get(fileName)?.fragment;
-    }
     async retrieve(fileName) {
-        let snapshotFragment = this.get(fileName);
-        if (!snapshotFragment) {
-            const snapshot = await this.languageServiceManager.getSnapshot(fileName);
-            const fragment = await snapshot.createFragment();
-            snapshotFragment = { fragment, snapshot };
-            this.set(fileName, snapshotFragment);
+        let snapshot = this.get(fileName);
+        if (!snapshot) {
+            const snap = await this.languageServiceManager.getSnapshot(fileName);
+            this.set(fileName, snap);
+            snapshot = snap;
         }
-        return snapshotFragment;
-    }
-    async retrieveFragment(fileName) {
-        return (await this.retrieve(fileName)).fragment;
+        return snapshot;
     }
 }
-exports.SnapshotFragmentMap = SnapshotFragmentMap;
+exports.SnapshotMap = SnapshotMap;
 function findContainingNode(node, textSpan, predicate) {
     const children = node.getChildren();
     const end = textSpan.start + textSpan.length;

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

@@ -1,70 +1,51 @@
-import type { Position, TextDocumentContentChangeEvent } from 'vscode-languageserver';
-import { AstroDocument, DocumentMapper, FragmentMapper, IdentityMapper, TagInformation } from '../../../core/documents';
-export interface DocumentSnapshot extends ts.IScriptSnapshot {
+import type { DiagnosticMessage } from '@astrojs/compiler/shared/types';
+import { EncodedSourceMap, TraceMap } from '@jridgewell/trace-mapping';
+import { Position, TextDocumentContentChangeEvent } from 'vscode-languageserver';
+import { AstroDocument, DocumentMapper, FragmentMapper, IdentityMapper, SourceMapDocumentMapper, TagInformation } from '../../../core/documents';
+export interface DocumentSnapshot extends ts.IScriptSnapshot, DocumentMapper {
     version: number;
     filePath: string;
     scriptKind: ts.ScriptKind;
     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.
-     */
-    createFragment(): Promise<SnapshotFragment>;
-    /**
-     * 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;
+    offsetAt(position: Position): number;
     /**
      * Convenience function for getText(0, getLength())
      */
     getFullText(): string;
 }
-/**
- * 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;
-}
 /**
  * Snapshots used for Astro files
  */
 export declare class AstroSnapshot implements DocumentSnapshot {
     readonly parent: AstroDocument;
     private readonly text;
+    private readonly tsxMap;
     readonly scriptKind: ts.ScriptKind;
-    private fragment?;
-    version: number;
+    readonly compilerDiagnostics: DiagnosticMessage[];
+    private mapper?;
+    private lineOffsets?;
+    private url;
     scriptTagSnapshots: ScriptTagDocumentSnapshot[];
-    constructor(parent: AstroDocument, text: string, scriptKind: ts.ScriptKind);
-    createFragment(): Promise<AstroSnapshotFragment>;
-    destroyFragment(): null;
+    version: number;
+    constructor(parent: AstroDocument, text: string, tsxMap: EncodedSourceMap, scriptKind: ts.ScriptKind, compilerDiagnostics: DiagnosticMessage[]);
+    isInGenerated(pos: Position): boolean;
+    getURL(): string;
     get filePath(): string;
     getText(start: number, end: number): string;
     getLength(): number;
     getFullText(): string;
     getChangeRange(): undefined;
     positionAt(offset: number): Position;
-}
-export declare class AstroSnapshotFragment implements SnapshotFragment {
-    private readonly mapper;
-    readonly parent: AstroDocument;
-    readonly text: string;
-    private readonly url;
-    private lineOffsets;
-    constructor(mapper: DocumentMapper, parent: AstroDocument, text: string, url: string);
-    positionAt(offset: number): Position;
     offsetAt(position: Position): number;
     getOriginalPosition(pos: Position): Position;
     getGeneratedPosition(pos: Position): Position;
-    isInGenerated(pos: Position): boolean;
-    getURL(): string;
+    private getLineOffsets;
+    private getMapper;
 }
-export declare class ScriptTagDocumentSnapshot extends FragmentMapper implements DocumentSnapshot, SnapshotFragment {
+/**
+ * Snapshots used for script tags inside Astro files
+ */
+export declare class ScriptTagDocumentSnapshot extends FragmentMapper implements DocumentSnapshot {
     scriptTag: TagInformation;
     private readonly parent;
     filePath: string;
@@ -75,8 +56,6 @@ export declare class ScriptTagDocumentSnapshot extends FragmentMapper implements
     constructor(scriptTag: TagInformation, parent: AstroDocument, filePath: string, scriptKind: ts.ScriptKind);
     positionAt(offset: number): Position;
     offsetAt(position: Position): number;
-    createFragment(): Promise<SnapshotFragment>;
-    destroyFragment(): void;
     getText(start: number, end: number): string;
     getLength(): number;
     getFullText(): string;
@@ -87,7 +66,7 @@ export declare class ScriptTagDocumentSnapshot extends FragmentMapper implements
  * Snapshot used for anything that is not an Astro file
  * It's both used for .js(x)/.ts(x) files and .svelte/.vue files
  */
-export declare class TypeScriptDocumentSnapshot extends IdentityMapper implements DocumentSnapshot, SnapshotFragment {
+export declare class TypeScriptDocumentSnapshot extends IdentityMapper implements DocumentSnapshot {
     version: number;
     readonly filePath: string;
     private text;
@@ -101,8 +80,14 @@ export declare class TypeScriptDocumentSnapshot extends IdentityMapper implement
     getChangeRange(): undefined;
     positionAt(offset: number): Position;
     offsetAt(position: Position): number;
-    createFragment(): Promise<this>;
-    destroyFragment(): void;
+    createFragment(): this;
     update(changes: TextDocumentContentChangeEvent[]): void;
     private getLineOffsets;
 }
+export declare class ConsumerDocumentMapper extends SourceMapDocumentMapper {
+    private nrPrependesLines;
+    constructor(traceMap: TraceMap, sourceUri: string, nrPrependesLines: number);
+    getOriginalPosition(generatedPosition: Position): Position;
+    getGeneratedPosition(originalPosition: Position): Position;
+    isInGenerated(): boolean;
+}

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

@@ -1,28 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptDocumentSnapshot = exports.ScriptTagDocumentSnapshot = exports.AstroSnapshotFragment = exports.AstroSnapshot = void 0;
+exports.ConsumerDocumentMapper = exports.TypeScriptDocumentSnapshot = exports.ScriptTagDocumentSnapshot = exports.AstroSnapshot = void 0;
+const trace_mapping_1 = require("@jridgewell/trace-mapping");
+const vscode_languageserver_1 = require("vscode-languageserver");
 const documents_1 = require("../../../core/documents");
 const utils_1 = require("../../../utils");
 /**
  * Snapshots used for Astro files
  */
 class AstroSnapshot {
-    constructor(parent, text, scriptKind) {
+    constructor(parent, text, tsxMap, scriptKind, compilerDiagnostics) {
         this.parent = parent;
         this.text = text;
+        this.tsxMap = tsxMap;
         this.scriptKind = scriptKind;
-        this.version = this.parent.version;
+        this.compilerDiagnostics = compilerDiagnostics;
+        this.url = (0, utils_1.pathToUrl)(this.filePath);
         this.scriptTagSnapshots = [];
+        this.version = this.parent.version;
     }
-    async createFragment() {
-        if (!this.fragment) {
-            const uri = (0, utils_1.pathToUrl)(this.filePath);
-            this.fragment = new AstroSnapshotFragment(new documents_1.IdentityMapper(uri), this.parent, this.text, uri);
-        }
-        return this.fragment;
+    isInGenerated(pos) {
+        throw new Error('Method not implemented.');
     }
-    destroyFragment() {
-        return null;
+    getURL() {
+        return this.url;
     }
     get filePath() {
         return this.parent.getFilePath() || '';
@@ -40,38 +41,34 @@ class AstroSnapshot {
         return undefined;
     }
     positionAt(offset) {
-        return (0, documents_1.positionAt)(offset, this.text);
-    }
-}
-exports.AstroSnapshot = AstroSnapshot;
-class AstroSnapshotFragment {
-    constructor(mapper, parent, text, url) {
-        this.mapper = mapper;
-        this.parent = parent;
-        this.text = text;
-        this.url = url;
-        this.lineOffsets = (0, documents_1.getLineOffsets)(this.text);
-    }
-    positionAt(offset) {
-        return (0, documents_1.positionAt)(offset, this.text, this.lineOffsets);
+        return (0, documents_1.positionAt)(offset, this.text, this.getLineOffsets());
     }
     offsetAt(position) {
-        return (0, documents_1.offsetAt)(position, this.text, this.lineOffsets);
+        return (0, documents_1.offsetAt)(position, this.text, this.getLineOffsets());
     }
     getOriginalPosition(pos) {
-        return this.mapper.getOriginalPosition(pos);
+        return this.getMapper().getOriginalPosition(pos);
     }
     getGeneratedPosition(pos) {
-        return this.mapper.getGeneratedPosition(pos);
+        return this.getMapper().getGeneratedPosition(pos);
     }
-    isInGenerated(pos) {
-        throw new Error('Method not implemented.');
+    getLineOffsets() {
+        if (!this.lineOffsets) {
+            this.lineOffsets = (0, documents_1.getLineOffsets)(this.text);
+        }
+        return this.lineOffsets;
     }
-    getURL() {
-        return this.url;
+    getMapper() {
+        if (!this.mapper) {
+            this.mapper = new ConsumerDocumentMapper(new trace_mapping_1.TraceMap(this.tsxMap), this.url, 0);
+        }
+        return this.mapper;
     }
 }
-exports.AstroSnapshotFragment = AstroSnapshotFragment;
+exports.AstroSnapshot = AstroSnapshot;
+/**
+ * Snapshots used for script tags inside Astro files
+ */
 class ScriptTagDocumentSnapshot extends documents_1.FragmentMapper {
     constructor(scriptTag, parent, filePath, scriptKind) {
         super(parent.getText(), scriptTag, filePath);
@@ -88,12 +85,6 @@ class ScriptTagDocumentSnapshot extends documents_1.FragmentMapper {
     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);
     }
@@ -145,12 +136,9 @@ class TypeScriptDocumentSnapshot extends documents_1.IdentityMapper {
     offsetAt(position) {
         return (0, documents_1.offsetAt)(position, this.text, this.getLineOffsets());
     }
-    async createFragment() {
+    createFragment() {
         return this;
     }
-    destroyFragment() {
-        // nothing to clean up
-    }
     update(changes) {
         for (const change of changes) {
             let start = 0;
@@ -175,3 +163,22 @@ class TypeScriptDocumentSnapshot extends documents_1.IdentityMapper {
     }
 }
 exports.TypeScriptDocumentSnapshot = TypeScriptDocumentSnapshot;
+class ConsumerDocumentMapper extends documents_1.SourceMapDocumentMapper {
+    constructor(traceMap, sourceUri, nrPrependesLines) {
+        super(traceMap, sourceUri);
+        this.nrPrependesLines = nrPrependesLines;
+    }
+    getOriginalPosition(generatedPosition) {
+        return super.getOriginalPosition(vscode_languageserver_1.Position.create(generatedPosition.line - this.nrPrependesLines, generatedPosition.character));
+    }
+    getGeneratedPosition(originalPosition) {
+        const result = super.getGeneratedPosition(originalPosition);
+        result.line += this.nrPrependesLines;
+        return result;
+    }
+    isInGenerated() {
+        // always return true and map outliers case by case
+        return true;
+    }
+}
+exports.ConsumerDocumentMapper = ConsumerDocumentMapper;

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

@@ -45,10 +45,6 @@ class GlobalSnapshotManager {
     }
     set(fileName, document) {
         fileName = (0, utils_1.normalizePath)(fileName);
-        const prev = this.get(fileName);
-        if (prev) {
-            prev.destroyFragment();
-        }
         this.documents.set(fileName, document);
         this.emitter.emit('change', fileName, document);
     }

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

@@ -12,8 +12,9 @@ const utils_2 = require("../utils");
 const DocumentSnapshot_1 = require("./DocumentSnapshot");
 // Utilities to create Snapshots from different contexts
 function createFromDocument(document, ts) {
-    const { code } = (0, astro2tsx_1.default)(document.getText(), classNameFromFilename(document.getURL()));
-    return new DocumentSnapshot_1.AstroSnapshot(document, code, ts.ScriptKind.TSX);
+    const { code, map, diagnostics } = (0, astro2tsx_1.default)(document.getText(), document.getURL());
+    const sourceMap = map;
+    return new DocumentSnapshot_1.AstroSnapshot(document, code, sourceMap, ts.ScriptKind.TSX, diagnostics);
 }
 exports.createFromDocument = createFromDocument;
 /**

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

@@ -1,7 +1,7 @@
 import type { Node } from 'vscode-html-languageservice';
 import { CompletionItemKind, Position, Range, SemanticTokensLegend, SymbolKind } from 'vscode-languageserver';
 import { AstroDocument, TagInformation } from '../../core/documents';
-import type { AstroSnapshot, ScriptTagDocumentSnapshot, SnapshotFragment } from './snapshots/DocumentSnapshot';
+import type { AstroSnapshot, DocumentSnapshot, ScriptTagDocumentSnapshot } from './snapshots/DocumentSnapshot';
 export declare const enum TokenType {
     class = 0,
     enum = 1,
@@ -38,7 +38,7 @@ export declare function convertRange(document: {
     start?: number;
     length?: number;
 }): Range;
-export declare function convertToLocationRange(defDoc: SnapshotFragment, textSpan: ts.TextSpan): Range;
+export declare function convertToLocationRange(defDoc: DocumentSnapshot, textSpan: ts.TextSpan): Range;
 export declare function ensureFrontmatterInsert(resultRange: Range, document: AstroDocument): Range;
 export declare function checkEndOfFileCodeInsert(resultRange: Range, document: AstroDocument): Range;
 export declare function removeAstroComponentSuffix(name: string): string;

package/dist/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAstroInstall = exports.isAstroWorkspace = exports.debounceThrottle = exports.debounceSameArg = exports.getRegExpMatches = exports.regexLastIndexOf = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.modifyLines = exports.toPascalCase = exports.mergeDeep = exports.get = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
+const path_1 = require("path");
 const vscode_uri_1 = require("vscode-uri");
 const importPackage_1 = require("./importPackage");
 /** Normalizes a document URI */
@@ -223,7 +224,7 @@ function getAstroInstall(basePaths) {
         if (!path) {
             throw Error;
         }
-        version = require(path + '/package.json').version;
+        version = require((0, path_1.resolve)(path, 'package.json')).version;
     }
     catch {
         // If we couldn't find it inside the workspace's node_modules, it might means we're in the monorepo
@@ -232,7 +233,7 @@ function getAstroInstall(basePaths) {
             if (!path) {
                 throw Error;
             }
-            version = require(path + '/package.json').version;
+            version = require((0, path_1.resolve)(path, 'package.json')).version;
         }
         catch (e) {
             // If we still couldn't find it, it probably just doesn't exist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.28.3",
+  "version": "0.29.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -14,11 +14,13 @@
     "types"
   ],
   "dependencies": {
+    "@astrojs/compiler": "^0.29.15",
+    "@jridgewell/trace-mapping": "^0.3.14",
     "@vscode/emmet-helper": "^2.8.4",
     "events": "^3.3.0",
     "prettier": "^2.7.1",
     "prettier-plugin-astro": "^0.7.0",
-    "source-map": "^0.7.3",
+    "synckit": "^0.7.2",
     "vscode-css-languageservice": "^6.0.1",
     "vscode-html-languageservice": "^5.0.0",
     "vscode-languageserver": "^8.0.1",
@@ -35,7 +37,7 @@
     "@types/node": "^16.11.58",
     "@types/prettier": "^2.7.0",
     "@types/sinon": "^10.0.11",
-    "astro": "^1.1.3",
+    "astro": "^1.6.2",
     "astro-scripts": "*",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",