@astrojs/language-server 0.9.3 → 0.11.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @astrojs/language-server
 
+## 0.11.0
+
+### Minor Changes
+
+- fd92a85: Add support for loading files from non-JSX frameworks such as Vue and Svelte
+
+### Patch Changes
+
+- d056cd5: Fixes production bugs in extension
+
 ## 0.9.3
 
 ### Patch Changes

package/dist/core/config/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];

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];

package/dist/plugins/astro/AstroPlugin.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];

package/dist/plugins/astro/features/CompletionProvider.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];

package/dist/plugins/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];

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

@@ -1,6 +1,6 @@
 import * as ts from 'typescript';
 import { TextDocumentContentChangeEvent, Position, Range } from 'vscode-languageserver';
-import { Document, DocumentMapper } from '../../core/documents';
+import { Document, DocumentMapper, IdentityMapper } from '../../core/documents';
 /**
  * The mapper to get from original snapshot positions to generated and vice versa.
  */
@@ -39,9 +39,10 @@ export interface DocumentSnapshot extends ts.IScriptSnapshot {
      * Convenience function for getText(0, getLength())
      */
     getFullText(): string;
+    createFragment(mapper: IdentityMapper): DocumentFragmentSnapshot;
+    toTSX(code: string, filePath: string): string;
 }
-export declare const createDocumentSnapshot: (filePath: string, currentText: string | null, createDocument?: ((_filePath: string, text: string, overrideText: boolean) => Document) | undefined) => DocumentSnapshot;
-export declare class DocumentFragmentSnapshot implements Omit<DocumentSnapshot, 'getFragment' | 'destroyFragment'>, SnapshotFragment {
+export declare abstract class DocumentFragmentSnapshot implements Omit<DocumentSnapshot, 'createFragment' | 'getFragment' | 'destroyFragment' | 'toTSX'>, SnapshotFragment {
     private mapper;
     private parent;
     version: number;
@@ -51,7 +52,8 @@ export declare class DocumentFragmentSnapshot implements Omit<DocumentSnapshot,
     parserError: null;
     scriptKind: ts.ScriptKind;
     scriptInfo: null;
-    constructor(mapper: any, parent: Document);
+    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;
@@ -64,6 +66,12 @@ export declare class DocumentFragmentSnapshot implements Omit<DocumentSnapshot,
     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;
@@ -73,15 +81,19 @@ export declare class TypeScriptDocumentSnapshot implements DocumentSnapshot {
     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<DocumentFragmentSnapshot>;
+    getFragment(): Promise<FrameworkDocumentFragmentSnapshot>;
     getOriginalPosition(pos: Position): Position;
-    destroyFragment(): void;
     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 {};

package/dist/plugins/typescript/DocumentSnapshot.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];
@@ -22,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptDocumentSnapshot = exports.DocumentFragmentSnapshot = exports.createDocumentSnapshot = void 0;
+exports.createDocumentSnapshot = exports.TypeScriptDocumentSnapshot = exports.AstroDocumentFragmentSnapshot = exports.DocumentFragmentSnapshot = void 0;
 const ts = __importStar(require("typescript"));
 const documents_1 = require("../../core/documents");
 const utils_1 = require("../../core/documents/utils");
@@ -30,39 +34,22 @@ const utils_2 = require("../../utils");
 const utils_3 = require("./utils");
 const os_1 = require("os");
 const astro2tsx_1 = __importDefault(require("./astro2tsx"));
-const createDocumentSnapshot = (filePath, currentText, createDocument) => {
-    var _a;
-    const text = currentText || ((_a = ts.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '');
-    if ((0, utils_3.isAstroFilePath)(filePath)) {
-        if (!createDocument)
-            throw new Error('Astro documents require the "createDocument" utility to be provided');
-        const snapshot = new AstroDocumentSnapshot(createDocument(filePath, text, currentText !== null));
-        return snapshot;
-    }
-    return new TypeScriptDocumentSnapshot(0, filePath, text);
-};
-exports.createDocumentSnapshot = createDocumentSnapshot;
-class AstroDocumentSnapshot {
-    constructor(doc) {
-        this.doc = doc;
-        this.version = this.doc.version;
-        this.scriptKind = ts.ScriptKind.Unknown;
+const svelte_language_integration_1 = require("@astrojs/svelte-language-integration");
+class DocumentFragmentSnapshot {
+    constructor(mapper, parent, toTSX) {
+        this.mapper = mapper;
+        this.parent = parent;
         this.parserError = null;
-    }
-    async getFragment() {
-        const uri = (0, utils_2.pathToUrl)(this.filePath);
-        const mapper = await this.getMapper(uri);
-        return new DocumentFragmentSnapshot(mapper, this.doc);
-    }
-    async destroyFragment() {
-        return;
-    }
-    get text() {
-        let raw = this.doc.getText();
-        return (0, astro2tsx_1.default)(raw).code;
-    }
-    get filePath() {
-        return this.doc.getFilePath() || '';
+        this.scriptKind = ts.ScriptKind.TSX;
+        this.scriptInfo = null;
+        const filePath = parent.getFilePath();
+        if (!filePath)
+            throw new Error('Cannot create a document fragment from a non-local document');
+        const text = parent.getText();
+        this.version = parent.version;
+        this.filePath = this.toVirtualFilePath(filePath);
+        this.url = this.toVirtualFilePath(filePath);
+        this.text = toTSX(text, this.filePath);
     }
     getText(start, end) {
         return this.text.substring(start, end);
@@ -86,25 +73,33 @@ class AstroDocumentSnapshot {
     offsetAt(position) {
         return (0, utils_1.offsetAt)(position, this.text);
     }
-    getMapper(uri) {
-        return new documents_1.IdentityMapper(uri);
+    getOriginalPosition(pos) {
+        return this.mapper.getOriginalPosition(pos);
+    }
+    getGeneratedPosition(pos) {
+        return this.mapper.getGeneratedPosition(pos);
+    }
+    isInGenerated(pos) {
+        return !(0, utils_1.isInTag)(pos, this.parent.styleInfo);
+    }
+    getURL() {
+        return this.url;
     }
 }
-class DocumentFragmentSnapshot {
-    constructor(mapper, parent) {
-        this.mapper = mapper;
-        this.parent = parent;
-        this.parserError = null;
+exports.DocumentFragmentSnapshot = DocumentFragmentSnapshot;
+class DocumentSnapshotBase {
+    constructor(doc) {
+        this.doc = doc;
+        this.version = this.doc.version;
         this.scriptKind = ts.ScriptKind.TSX;
-        this.scriptInfo = null;
-        const filePath = parent.getFilePath();
-        if (!filePath)
-            throw new Error('Cannot create a document fragment from a non-local document');
-        const text = parent.getText();
-        this.version = parent.version;
-        this.filePath = (0, utils_3.toVirtualAstroFilePath)(filePath);
-        this.url = (0, utils_3.toVirtualAstroFilePath)(filePath);
-        this.text = (0, astro2tsx_1.default)(text).code;
+        this.parserError = null;
+    }
+    get text() {
+        let raw = this.doc.getText();
+        return this.toTSX(raw, this.filePath);
+    }
+    get filePath() {
+        return this.doc.getFilePath() || '';
     }
     getText(start, end) {
         return this.text.substring(start, end);
@@ -128,20 +123,56 @@ class DocumentFragmentSnapshot {
     offsetAt(position) {
         return (0, utils_1.offsetAt)(position, this.text);
     }
-    getOriginalPosition(pos) {
-        return this.mapper.getOriginalPosition(pos);
+    getMapper(uri) {
+        return new documents_1.IdentityMapper(uri);
     }
-    getGeneratedPosition(pos) {
-        return this.mapper.getGeneratedPosition(pos);
+}
+class FrameworkDocumentSnapshot extends DocumentSnapshotBase {
+    toTSX(code, filePath) {
+        if ((0, utils_3.isVirtualSvelteFilePath)(filePath)) {
+            return (0, svelte_language_integration_1.toTSX)(code);
+        }
+        return 'export default function() {}';
     }
-    isInGenerated(pos) {
-        return !(0, utils_1.isInTag)(pos, this.parent.styleInfo);
+    createFragment(mapper) {
+        return new FrameworkDocumentFragmentSnapshot(mapper, this.doc, this.toTSX);
     }
-    getURL() {
-        return this.url;
+    async getFragment() {
+        const uri = (0, utils_2.pathToUrl)(this.filePath);
+        const mapper = await this.getMapper(uri);
+        return this.createFragment(mapper);
+    }
+    async destroyFragment() {
+        return;
     }
 }
-exports.DocumentFragmentSnapshot = DocumentFragmentSnapshot;
+class FrameworkDocumentFragmentSnapshot extends DocumentFragmentSnapshot {
+    toVirtualFilePath(filePath) {
+        return filePath;
+    }
+}
+class AstroDocumentSnapshot extends DocumentSnapshotBase {
+    createFragment(mapper) {
+        return new AstroDocumentFragmentSnapshot(mapper, this.doc, this.toTSX);
+    }
+    async getFragment() {
+        const uri = (0, utils_2.pathToUrl)(this.filePath);
+        const mapper = await this.getMapper(uri);
+        return new AstroDocumentFragmentSnapshot(mapper, this.doc, this.toTSX);
+    }
+    async destroyFragment() {
+        return;
+    }
+    toTSX(code, filePath) {
+        return (0, astro2tsx_1.default)(code).code;
+    }
+}
+class AstroDocumentFragmentSnapshot extends DocumentFragmentSnapshot {
+    toVirtualFilePath(filePath) {
+        return (0, utils_3.toVirtualAstroFilePath)(filePath);
+    }
+}
+exports.AstroDocumentFragmentSnapshot = AstroDocumentFragmentSnapshot;
 class TypeScriptDocumentSnapshot {
     constructor(version, filePath, text) {
         this.version = version;
@@ -152,6 +183,17 @@ class TypeScriptDocumentSnapshot {
         this.parserError = null;
         this.url = (0, utils_2.pathToUrl)(filePath);
     }
+    // We don't create Fragments for TypescriptDocument, nor do we convert them to TSX so those three methods are not
+    // necessary, though they're required to be implemented for DocumentSnapshot
+    toTSX() {
+        return;
+    }
+    createFragment() {
+        return;
+    }
+    destroyFragment() {
+        return;
+    }
     getText(start, end) {
         return this.text.substring(start, end);
     }
@@ -176,9 +218,6 @@ class TypeScriptDocumentSnapshot {
     getOriginalPosition(pos) {
         return pos;
     }
-    destroyFragment() {
-        // nothing to clean up
-    }
     getLineContainingOffset(offset) {
         const chunks = this.getText(0, offset).split('\n');
         return chunks[chunks.length - 1];
@@ -200,3 +239,21 @@ class TypeScriptDocumentSnapshot {
     }
 }
 exports.TypeScriptDocumentSnapshot = TypeScriptDocumentSnapshot;
+const createDocumentSnapshot = (filePath, currentText, createDocument) => {
+    var _a;
+    let text = currentText || ((_a = ts.sys.readFile(filePath.replace(".tsx", ""))) !== null && _a !== void 0 ? _a : '');
+    if ((0, utils_3.isVirtualFrameworkFilePath)('vue', 'tsx', filePath) || (0, utils_3.isVirtualFrameworkFilePath)('svelte', 'tsx', filePath)) {
+        if (!createDocument)
+            throw new Error('Framework documents require the "createDocument" utility to be provided');
+        const snapshot = new FrameworkDocumentSnapshot(createDocument(filePath, text, currentText !== null));
+        return snapshot;
+    }
+    if ((0, utils_3.isAstroFilePath)(filePath)) {
+        if (!createDocument)
+            throw new Error('Astro documents require the "createDocument" utility to be provided');
+        const snapshot = new AstroDocumentSnapshot(createDocument(filePath, text, currentText !== null));
+        return snapshot;
+    }
+    return new TypeScriptDocumentSnapshot(0, filePath, text);
+};
+exports.createDocumentSnapshot = createDocumentSnapshot;

package/dist/plugins/typescript/SnapshotManager.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];
@@ -74,10 +78,12 @@ class SnapshotManager {
         return this.documents.delete(fileName);
     }
     getFileNames() {
-        return Array.from(this.documents.keys()).map((fileName) => (0, utils_1.toVirtualAstroFilePath)(fileName));
+        return Array.from(this.documents.keys()).map((fileName) => (0, utils_1.toVirtualFilePath)(fileName));
     }
     getProjectFileNames() {
-        return [...this.projectFiles];
+        return this.projectFiles.map((file) => {
+            return (0, utils_1.toVirtualFilePath)(file);
+        });
     }
     logStatistics() {
         const date = new Date();

package/dist/plugins/typescript/TypeScriptPlugin.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];
@@ -99,8 +103,8 @@ class TypeScriptPlugin {
         const result = await Promise.all(defs.definitions.map(async (def) => {
             const { fragment, snapshot } = await docs.retrieve(def.fileName);
             if ((0, utils_3.isNoTextSpanInGeneratedCode)(snapshot.getFullText(), def.textSpan)) {
-                const fileName = (0, utils_1.ensureRealAstroFilePath)(def.fileName);
-                const textSpan = (0, utils_1.isVirtualAstroFilePath)(tsFilePath) ? { start: 0, length: 0 } : def.textSpan;
+                const fileName = (0, utils_1.ensureRealFilePath)(def.fileName);
+                const textSpan = (0, utils_1.isVirtualFilePath)(tsFilePath) ? { start: 0, length: 0 } : def.textSpan;
                 return vscode_languageserver_1.LocationLink.create((0, utils_2.pathToUrl)(fileName), (0, utils_1.convertToLocationRange)(fragment, textSpan), (0, utils_1.convertToLocationRange)(fragment, textSpan), (0, utils_1.convertToLocationRange)(mainFragment, defs.textSpan));
             }
         }));

package/dist/plugins/typescript/astro-sys.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];

package/dist/plugins/typescript/features/CompletionsProvider.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];

package/dist/plugins/typescript/languageService.js

@@ -2,7 +2,11 @@
 /* eslint-disable require-jsdoc */
 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];

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

@@ -13,16 +13,19 @@ export declare function convertRange(document: {
     length?: number;
 }): Range;
 export declare function convertToLocationRange(defDoc: SnapshotFragment, textSpan: ts.TextSpan): Range;
-declare type FrameworkExt = 'astro' | 'vue' | 'jsx' | 'tsx' | 'svelte';
+declare type FrameworkExt = 'astro' | 'vue' | 'jsx' | 'tsx' | 'svelte' | 'ts';
 declare type FrameworkVirtualExt = 'ts' | 'tsx';
 export declare function isVirtualFrameworkFilePath(ext: FrameworkExt, virtualExt: FrameworkVirtualExt, filePath: string): boolean;
 export declare function isAstroFilePath(filePath: string): boolean;
+export declare function isFrameworkFilePath(filePath: string): boolean;
 export declare function isVirtualAstroFilePath(filePath: string): boolean;
 export declare function isVirtualVueFilePath(filePath: string): boolean;
 export declare function isVirtualJsxFilePath(filePath: string): boolean;
 export declare function isVirtualSvelteFilePath(filePath: string): boolean;
+export declare function isVirtualTsFilePath(filePath: string): boolean;
 export declare function isVirtualFilePath(filePath: string): boolean;
 export declare function toVirtualAstroFilePath(filePath: string): string;
+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;

package/dist/plugins/typescript/utils.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];
@@ -19,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.substituteWithWhitespace = exports.isSubPath = exports.findTsConfigPath = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualJsxFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.convertToLocationRange = exports.convertRange = exports.getExtensionFromScriptKind = exports.getScriptKindFromFileName = exports.mapSeverity = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = void 0;
+exports.substituteWithWhitespace = exports.isSubPath = exports.findTsConfigPath = exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualTsFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualJsxFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.convertToLocationRange = exports.convertRange = exports.getExtensionFromScriptKind = exports.getScriptKindFromFileName = exports.mapSeverity = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = void 0;
 const ts = __importStar(require("typescript"));
 const vscode_languageserver_1 = require("vscode-languageserver");
 const path_1 = require("path");
@@ -175,12 +179,16 @@ function isAstroFilePath(filePath) {
     return filePath.endsWith('.astro');
 }
 exports.isAstroFilePath = isAstroFilePath;
+function isFrameworkFilePath(filePath) {
+    return filePath.endsWith('.svelte') || filePath.endsWith('.vue');
+}
+exports.isFrameworkFilePath = isFrameworkFilePath;
 function isVirtualAstroFilePath(filePath) {
     return isVirtualFrameworkFilePath('astro', VirtualExtension.tsx, filePath);
 }
 exports.isVirtualAstroFilePath = isVirtualAstroFilePath;
 function isVirtualVueFilePath(filePath) {
-    return isVirtualFrameworkFilePath('vue', VirtualExtension.ts, filePath);
+    return isVirtualFrameworkFilePath('vue', VirtualExtension.tsx, filePath);
 }
 exports.isVirtualVueFilePath = isVirtualVueFilePath;
 function isVirtualJsxFilePath(filePath) {
@@ -188,11 +196,15 @@ function isVirtualJsxFilePath(filePath) {
 }
 exports.isVirtualJsxFilePath = isVirtualJsxFilePath;
 function isVirtualSvelteFilePath(filePath) {
-    return isVirtualFrameworkFilePath('svelte', VirtualExtension.ts, filePath);
+    return isVirtualFrameworkFilePath('svelte', VirtualExtension.tsx, filePath);
 }
 exports.isVirtualSvelteFilePath = isVirtualSvelteFilePath;
+function isVirtualTsFilePath(filePath) {
+    return isVirtualFrameworkFilePath('ts', VirtualExtension.tsx, filePath);
+}
+exports.isVirtualTsFilePath = isVirtualTsFilePath;
 function isVirtualFilePath(filePath) {
-    return isVirtualAstroFilePath(filePath) || isVirtualVueFilePath(filePath) || isVirtualSvelteFilePath(filePath) || isVirtualJsxFilePath(filePath);
+    return isVirtualAstroFilePath(filePath) || isVirtualVueFilePath(filePath) || isVirtualSvelteFilePath(filePath) || isVirtualJsxFilePath(filePath) || isVirtualTsFilePath(filePath);
 }
 exports.isVirtualFilePath = isVirtualFilePath;
 function toVirtualAstroFilePath(filePath) {
@@ -207,6 +219,18 @@ function toVirtualAstroFilePath(filePath) {
     }
 }
 exports.toVirtualAstroFilePath = toVirtualAstroFilePath;
+function toVirtualFilePath(filePath) {
+    if (isVirtualFilePath(filePath)) {
+        return filePath;
+    }
+    else if (isFrameworkFilePath(filePath) || isAstroFilePath(filePath) || filePath.endsWith('.ts')) {
+        return `${filePath}.tsx`;
+    }
+    else {
+        return filePath;
+    }
+}
+exports.toVirtualFilePath = toVirtualFilePath;
 function toRealAstroFilePath(filePath) {
     return filePath.slice(0, -'.tsx'.length);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.9.3",
+  "version": "0.11.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -10,7 +10,6 @@
   },
   "files": [
     "dist",
-    "astro.d.ts",
     "bin",
     "types"
   ],
@@ -20,6 +19,7 @@
     "test": "tap --no-coverage test/**"
   },
   "dependencies": {
+    "@astrojs/svelte-language-integration": "^0.1.0",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",
     "ts-morph": "^12.0.0",