@astrojs/language-server 0.15.0 → 0.17.0

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

@@ -13,32 +13,59 @@ class DiagnosticsProviderImpl {
         this.languageServiceManager = languageServiceManager;
     }
     async getDiagnostics(document, _cancellationToken) {
-        var _a, _b;
         // Don't return diagnostics for files inside node_modules. These are considered read-only
         // and they would pollute the output for astro check
-        if (((_a = document.getFilePath()) === null || _a === void 0 ? void 0 : _a.includes('/node_modules/')) || ((_b = document.getFilePath()) === null || _b === void 0 ? void 0 : _b.includes('\\node_modules\\'))) {
+        if (document.getFilePath()?.includes('/node_modules/') || document.getFilePath()?.includes('\\node_modules\\')) {
             return [];
         }
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);
+        const fragment = await tsDoc.createFragment();
+        let scriptDiagnostics = [];
+        document.scriptTags.forEach((scriptTag) => {
+            const { filePath: scriptFilePath, snapshot: scriptTagSnapshot } = (0, utils_1.getScriptTagSnapshot)(tsDoc, document, scriptTag.container);
+            const scriptDiagnostic = [
+                ...lang.getSyntacticDiagnostics(scriptFilePath),
+                ...lang.getSuggestionDiagnostics(scriptFilePath),
+                ...lang.getSemanticDiagnostics(scriptFilePath),
+            ]
+                // We need to duplicate the diagnostic creation here because we can't map TS's diagnostics range to the original
+                // file due to some internal cache inside TS that would cause it to being mapped twice in some cases
+                .map((diagnostic) => ({
+                range: (0, utils_1.convertRange)(scriptTagSnapshot, diagnostic),
+                severity: (0, utils_1.mapSeverity)(diagnostic.category),
+                source: 'ts',
+                message: typescript_1.default.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                code: diagnostic.code,
+                tags: getDiagnosticTag(diagnostic),
+            }))
+                .map(mapRange(scriptTagSnapshot, document));
+            scriptDiagnostics.push(...scriptDiagnostic);
+        });
         const { script: scriptBoundaries } = this.getTagBoundaries(lang, filePath);
         const syntaxDiagnostics = lang.getSyntacticDiagnostics(filePath);
         const suggestionDiagnostics = lang.getSuggestionDiagnostics(filePath);
-        const semanticDiagnostics = lang.getSemanticDiagnostics(filePath).filter((d) => {
-            return isNoWithinBoundary(scriptBoundaries, d);
+        const semanticDiagnostics = lang.getSemanticDiagnostics(filePath);
+        const diagnostics = [
+            ...syntaxDiagnostics,
+            ...suggestionDiagnostics,
+            ...semanticDiagnostics,
+        ].filter((diag) => {
+            return isNoWithinBoundary(scriptBoundaries, diag);
         });
-        const diagnostics = [...syntaxDiagnostics, ...suggestionDiagnostics, ...semanticDiagnostics];
-        const fragment = await tsDoc.createFragment();
-        return diagnostics
-            .map((diagnostic) => ({
-            range: (0, utils_1.convertRange)(tsDoc, diagnostic),
-            severity: (0, utils_1.mapSeverity)(diagnostic.category),
-            source: 'ts',
-            message: typescript_1.default.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
-            code: diagnostic.code,
-            tags: getDiagnosticTag(diagnostic),
-        }))
-            .map(mapRange(fragment, document))
+        return [
+            ...diagnostics
+                .map((diagnostic) => ({
+                range: (0, utils_1.convertRange)(tsDoc, diagnostic),
+                severity: (0, utils_1.mapSeverity)(diagnostic.category),
+                source: 'ts',
+                message: typescript_1.default.flattenDiagnosticMessageText(diagnostic.messageText, '\n'),
+                code: diagnostic.code,
+                tags: getDiagnosticTag(diagnostic),
+            }))
+                .map(mapRange(fragment, document)),
+            ...scriptDiagnostics,
+        ]
             .filter((diag) => {
             return (hasNoNegativeLines(diag) &&
                 isNoJSXImplicitRuntimeWarning(diag) &&
@@ -47,13 +74,14 @@ class DiagnosticsProviderImpl {
                 isNoSpreadExpected(diag) &&
                 isNoCantResolveJSONModule(diag) &&
                 isNoCantReturnOutsideFunction(diag) &&
+                isNoIsolatedModuleError(diag) &&
                 isNoJsxCannotHaveMultipleAttrsError(diag));
         })
             .map(enhanceIfNecessary);
     }
     getTagBoundaries(lang, tsFilePath) {
         const program = lang.getProgram();
-        const sourceFile = program === null || program === void 0 ? void 0 : program.getSourceFile(tsFilePath);
+        const sourceFile = program?.getSourceFile(tsFilePath);
         const boundaries = {
             script: [],
             markdown: [],
@@ -147,12 +175,26 @@ function isNoCantReturnOutsideFunction(diagnostic) {
 function isNoCantResolveJSONModule(diagnostic) {
     return diagnostic.code !== 2732;
 }
+/**
+ * When the content of the file is invalid and can't be parsed properly for TSX generation, TS will show an error about
+ * how the current module can't be compiled under --isolatedModule, this is confusing to users so let's ignore this
+ */
+function isNoIsolatedModuleError(diagnostic) {
+    return diagnostic.code !== 1208;
+}
 /**
  * Some diagnostics have JSX-specific nomenclature or unclear description. Enhance them for more clarity.
  */
 function enhanceIfNecessary(diagnostic) {
+    // JSX element has no closing tag. JSX -> HTML
+    if (diagnostic.code === 17008) {
+        return {
+            ...diagnostic,
+            message: diagnostic.message.replace('JSX', 'HTML'),
+        };
+    }
+    // For the rare case where an user might try to put a client directive on something that is not a component
     if (diagnostic.code === 2322) {
-        // For the rare case where an user might try to put a client directive on something that is not a component
         if (diagnostic.message.includes("Property 'client:") && diagnostic.message.includes("to type 'HTMLProps")) {
             return {
                 ...diagnostic,

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

@@ -11,7 +11,6 @@ class DocumentSymbolsProviderImpl {
         this.languageServiceManager = languageServiceManager;
     }
     async getDocumentSymbols(document) {
-        var _a, _b, _c;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const fragment = await tsDoc.createFragment();
         const navTree = lang.getNavigationTree(tsDoc.filePath);
@@ -27,17 +26,17 @@ class DocumentSymbolsProviderImpl {
             result.push(vscode_languageserver_types_1.SymbolInformation.create('Frontmatter', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt(document.astroMeta.frontmatter.startOffset), document.positionAt(document.astroMeta.frontmatter.endOffset)), document.getURL()));
         }
         // Add a "Template" namespace for everything under the frontmatter
-        result.push(vscode_languageserver_types_1.SymbolInformation.create('Template', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt((_a = document.astroMeta.frontmatter.endOffset) !== null && _a !== void 0 ? _a : 0), document.positionAt(document.getTextLength())), document.getURL()));
+        result.push(vscode_languageserver_types_1.SymbolInformation.create('Template', vscode_languageserver_types_1.SymbolKind.Namespace, vscode_languageserver_types_1.Range.create(document.positionAt(document.astroMeta.frontmatter.endOffset ?? 0), document.positionAt(document.getTextLength())), document.getURL()));
         for (let symbol of symbols.splice(1)) {
             symbol = (0, documents_1.mapSymbolInformationToOriginal)(fragment, symbol);
-            if (document.offsetAt(symbol.location.range.end) >= ((_b = document.astroMeta.content.firstNonWhitespaceOffset) !== null && _b !== void 0 ? _b : 0)) {
+            if (document.offsetAt(symbol.location.range.end) >= (document.astroMeta.content.firstNonWhitespaceOffset ?? 0)) {
                 if (symbol.containerName === originalContainerName) {
                     symbol.containerName = 'Template';
                 }
                 // For some reason, it seems like TypeScript thinks that the "class" attribute is a real class, weird
                 if (symbol.kind === vscode_languageserver_types_1.SymbolKind.Class && symbol.name === '<class>') {
                     const node = document.html.findNodeAt(document.offsetAt(symbol.location.range.start));
-                    if ((_c = node.attributes) === null || _c === void 0 ? void 0 : _c.class) {
+                    if (node.attributes?.class) {
                         continue;
                     }
                 }

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

@@ -15,15 +15,22 @@ class FoldingRangesProviderImpl {
         const html = document.html;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);
-        const outliningSpans = lang.getOutliningSpans(filePath);
-        const foldingRanges = [];
-        for (const span of outliningSpans) {
+        const outliningSpans = lang.getOutliningSpans(filePath).filter((span) => {
             const node = html.findNodeAt(span.textSpan.start);
             // Due to how our TSX output transform those tags into function calls or template literals
             // TypeScript thinks of those as outlining spans, which is fine but we don't want folding ranges for those
-            if (node.tag === 'script' || node.tag === 'Markdown' || node.tag === 'style') {
-                continue;
-            }
+            return node.tag !== 'script' && node.tag !== 'style' && node.tag !== 'Markdown';
+        });
+        const scriptOutliningSpans = [];
+        document.scriptTags.forEach((scriptTag) => {
+            const { snapshot: scriptTagSnapshot, filePath: scriptFilePath } = (0, utils_1.getScriptTagSnapshot)(tsDoc, document, scriptTag.container);
+            scriptOutliningSpans.push(...lang.getOutliningSpans(scriptFilePath).map((span) => {
+                span.textSpan.start = document.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(span.textSpan.start)));
+                return span;
+            }));
+        });
+        const foldingRanges = [];
+        for (const span of [...outliningSpans, ...scriptOutliningSpans]) {
             const start = document.positionAt(span.textSpan.start);
             const end = adjustFoldingEnd(start, document.positionAt(span.textSpan.start + span.textSpan.length), document);
             // When using this method for generating folding ranges, TypeScript tend to return some

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/SemanticTokenProvider.js

@@ -15,7 +15,7 @@ class SemanticTokensProviderImpl {
     async getSemanticTokens(document, range, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const fragment = (await tsDoc.createFragment());
-        if (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested) {
+        if (cancellationToken?.isCancellationRequested) {
             return null;
         }
         const filePath = (0, utils_1.toVirtualAstroFilePath)(tsDoc.filePath);

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

@@ -15,13 +15,21 @@ class SignatureHelpProviderImpl {
     async getSignatureHelp(document, position, context, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const fragment = await tsDoc.createFragment();
-        if (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested) {
+        if (cancellationToken?.isCancellationRequested) {
             return null;
         }
         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;
         }
@@ -44,7 +52,7 @@ class SignatureHelpProviderImpl {
      * adopted from https://github.com/microsoft/vscode/blob/265a2f6424dfbd3a9788652c7d376a7991d049a3/extensions/typescript-language-features/src/languageFeatures/signatureHelp.ts#L103
      */
     toTsTriggerReason(context) {
-        switch (context === null || context === void 0 ? void 0 : context.triggerKind) {
+        switch (context?.triggerKind) {
             case vscode_languageserver_1.SignatureHelpTriggerKind.TriggerCharacter:
                 if (context.triggerCharacter) {
                     if (this.isReTrigger(context.isRetrigger, context.triggerCharacter)) {

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

@@ -1,6 +1,7 @@
 import type { SnapshotFragment, DocumentSnapshot } from '../snapshots/DocumentSnapshot';
 import type { LanguageServiceManager } from '../LanguageServiceManager';
 import { Position } from 'vscode-languageserver';
+import ts from 'typescript';
 export declare function isPartOfImportStatement(text: string, position: Position): boolean;
 export declare class SnapshotFragmentMap {
     private languageServiceManager;
@@ -21,3 +22,4 @@ export declare class SnapshotFragmentMap {
     }>;
     retrieveFragment(fileName: string): Promise<SnapshotFragment>;
 }
+export declare function findContainingNode<T extends ts.Node>(node: ts.Node, textSpan: ts.TextSpan, predicate: (node: ts.Node) => node is T): T | undefined;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SnapshotFragmentMap = exports.isPartOfImportStatement = void 0;
+exports.findContainingNode = exports.SnapshotFragmentMap = exports.isPartOfImportStatement = void 0;
 const documents_1 = require("../../../core/documents");
 function isPartOfImportStatement(text, position) {
     const line = (0, documents_1.getLineAtPosition)(position, text);
@@ -19,8 +19,7 @@ class SnapshotFragmentMap {
         return this.map.get(fileName);
     }
     getFragment(fileName) {
-        var _a;
-        return (_a = this.map.get(fileName)) === null || _a === void 0 ? void 0 : _a.fragment;
+        return this.map.get(fileName)?.fragment;
     }
     async retrieve(fileName) {
         let snapshotFragment = this.get(fileName);
@@ -37,3 +36,20 @@ class SnapshotFragmentMap {
     }
 }
 exports.SnapshotFragmentMap = SnapshotFragmentMap;
+function findContainingNode(node, textSpan, predicate) {
+    const children = node.getChildren();
+    const end = textSpan.start + textSpan.length;
+    for (const child of children) {
+        if (!(child.getStart() <= textSpan.start && child.getEnd() >= end)) {
+            continue;
+        }
+        if (predicate(child)) {
+            return child;
+        }
+        const foundInChildren = findContainingNode(child, textSpan, predicate);
+        if (foundInChildren) {
+            return foundInChildren;
+        }
+    }
+}
+exports.findContainingNode = findContainingNode;

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) {
@@ -132,7 +133,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     function updateSnapshotFromDocument(document) {
         const filePath = document.getFilePath() || '';
         const prevSnapshot = snapshotManager.get(filePath);
-        if ((prevSnapshot === null || prevSnapshot === void 0 ? void 0 : prevSnapshot.version) === document.version) {
+        if (prevSnapshot?.version === document.version) {
             return prevSnapshot;
         }
         if (!prevSnapshot) {
@@ -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() {
@@ -186,16 +203,15 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         snapshotManager.updateNonAstroFile(fileName, changes);
     }
     function getParsedTSConfig() {
-        var _a, _b, _c, _d;
         let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {};
         // If our user has types in their config but it doesn't include the types needed for Astro, add them to the config
-        if ((_a = configJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) {
-            if (!((_b = configJson.compilerOptions) === null || _b === void 0 ? void 0 : _b.types.includes('astro/env'))) {
+        if (configJson.compilerOptions?.types) {
+            if (!configJson.compilerOptions?.types.includes('astro/env')) {
                 configJson.compilerOptions.types.push('astro/env');
             }
             if (astroVersion.major >= 1 &&
                 astroVersion.full !== '1.0.0-beta.0' &&
-                !((_c = configJson.compilerOptions) === null || _c === void 0 ? void 0 : _c.types.includes('astro/astro-jsx'))) {
+                !configJson.compilerOptions?.types.includes('astro/astro-jsx')) {
                 configJson.compilerOptions.types.push('astro/astro-jsx');
             }
         }
@@ -203,7 +219,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         // Delete include so that .astro files don't get mistakenly excluded by the user
         delete configJson.include;
         // If the user supplied exclude, let's use theirs otherwise, use ours
-        (_d = configJson.exclude) !== null && _d !== void 0 ? _d : (configJson.exclude = getDefaultExclude());
+        configJson.exclude ?? (configJson.exclude = getDefaultExclude());
         // Everything here will always, unconditionally, be in the resulting config
         const forcedCompilerOptions = {
             noEmit: true,
@@ -215,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/module-loader.js

@@ -39,7 +39,7 @@ class ModuleResolutionCache {
      */
     delete(resolvedModuleName) {
         this.cache.forEach((val, key) => {
-            if ((val === null || val === void 0 ? void 0 : val.resolvedFileName) === resolvedModuleName) {
+            if (val?.resolvedFileName === resolvedModuleName) {
                 this.cache.delete(key);
             }
         });

package/dist/plugins/typescript/previewer.js

@@ -72,7 +72,7 @@ function getTagBodyText(tag) {
 function getTagDocumentation(tag) {
     function getWithType() {
         const body = (typescript_1.default.displayPartsToString(tag.text) || '').split(/^(\S+)\s*-?\s*/);
-        if ((body === null || body === void 0 ? void 0 : body.length) === 3) {
+        if (body?.length === 3) {
             const param = body[1];
             const doc = body[2];
             const label = `*@${tag.name}* \`${param}\``;

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

@@ -129,7 +129,7 @@ class SnapshotManager {
         const { include, exclude } = this.fileSpec;
         // Since we default to not include anything,
         //  just don't waste time on this
-        if ((include === null || include === void 0 ? void 0 : include.length) === 0) {
+        if (include?.length === 0) {
             return;
         }
         const projectFiles = typescript_1.default.sys
@@ -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

@@ -55,8 +55,7 @@ exports.createFromNonAstroFilePath = createFromNonAstroFilePath;
  * @param options options that apply in case it's a svelte file
  */
 function createFromTSFilePath(filePath) {
-    var _a;
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, originalText);
 }
 exports.createFromTSFilePath = createFromTSFilePath;
@@ -66,15 +65,13 @@ exports.createFromTSFilePath = createFromTSFilePath;
  * @param createDocument function that is used to create a document
  */
 function createFromAstroFilePath(filePath, createDocument) {
-    var _a;
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     return createFromDocument(createDocument(filePath, originalText));
 }
 exports.createFromAstroFilePath = createFromAstroFilePath;
 function createFromFrameworkFilePath(filePath, framework) {
-    var _a;
     const className = classNameFromFilename(filePath);
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     let code = '';
     if (framework === 'svelte') {
         code = (0, svelte_language_integration_1.toTSX)(originalText, className);

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,
@@ -41,6 +42,7 @@ export declare function convertRange(document: {
 }): Range;
 export declare function convertToLocationRange(defDoc: SnapshotFragment, 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;
 export declare type FrameworkExt = 'astro' | 'vue' | 'jsx' | 'tsx' | 'svelte';
 declare type FrameworkVirtualExt = 'ts' | 'tsx';
@@ -57,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 {};