@astrojs/language-server 0.28.1 → 0.29.0

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

@@ -1,5 +1,7 @@
-import type { SourceMapConsumer } from 'source-map';
+import { TraceMap } from '@jridgewell/trace-mapping';
+import type ts from 'typescript';
 import { CodeAction, ColorPresentation, CompletionItem, Diagnostic, FoldingRange, Hover, InsertReplaceEdit, LocationLink, Position, Range, SelectionRange, SymbolInformation, TextDocumentEdit, TextEdit } from 'vscode-languageserver';
+import { DocumentSnapshot, ScriptTagDocumentSnapshot } from '../../plugins/typescript/snapshots/DocumentSnapshot';
 import { TagInformation } from './utils';
 export interface DocumentMapper {
     /**
@@ -56,18 +58,21 @@ export declare class FragmentMapper implements DocumentMapper {
     getURL(): string;
 }
 export declare class SourceMapDocumentMapper implements DocumentMapper {
-    protected consumer: SourceMapConsumer;
+    protected traceMap: TraceMap;
     protected sourceUri: string;
     private parent?;
-    constructor(consumer: SourceMapConsumer, sourceUri: string, parent?: DocumentMapper | undefined);
+    constructor(traceMap: TraceMap, sourceUri: string, parent?: DocumentMapper | undefined);
     getOriginalPosition(generatedPosition: Position): Position;
     getGeneratedPosition(originalPosition: Position): Position;
     isInGenerated(position: Position): boolean;
     getURL(): string;
-    /**
-     * Needs to be called when source mapper is no longer needed in order to prevent memory leaks.
-     */
-    destroy(): void;
+}
+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;
 }
 export declare function mapRangeToOriginal(fragment: Pick<DocumentMapper, 'getOriginalPosition'>, range: Range): Range;
 export declare function mapRangeToGenerated(fragment: DocumentMapper, range: Range): Range;
@@ -84,5 +89,6 @@ export declare function mapSymbolInformationToOriginal(fragment: Pick<DocumentMa
 export declare function mapLocationLinkToOriginal(fragment: DocumentMapper, def: LocationLink): LocationLink;
 export declare function mapTextDocumentEditToOriginal(fragment: DocumentMapper, edit: TextDocumentEdit): TextDocumentEdit;
 export declare function mapCodeActionToOriginal(fragment: DocumentMapper, codeAction: CodeAction): CodeAction;
+export declare function mapScriptSpanStartToSnapshot(span: ts.TextSpan, scriptTagSnapshot: ScriptTagDocumentSnapshot, tsSnapshot: DocumentSnapshot): number;
 export declare function mapFoldingRangeToParent(fragment: DocumentMapper, foldingRange: FoldingRange): FoldingRange;
 export declare function mapSelectionRangeToParent(fragment: Pick<DocumentMapper, 'getOriginalPosition'>, selectionRange: SelectionRange): SelectionRange;

package/dist/core/documents/DocumentMapper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapSelectionRangeToParent = exports.mapFoldingRangeToParent = exports.mapCodeActionToOriginal = exports.mapTextDocumentEditToOriginal = exports.mapLocationLinkToOriginal = exports.mapSymbolInformationToOriginal = exports.mapColorPresentationToOriginal = exports.mapDiagnosticToGenerated = exports.mapEditToOriginal = exports.mapInsertReplaceEditToOriginal = exports.mapObjWithRangeToOriginal = exports.mapHoverToParent = exports.mapCompletionItemToOriginal = exports.mapRangeToGenerated = exports.mapRangeToOriginal = exports.SourceMapDocumentMapper = exports.FragmentMapper = exports.IdentityMapper = void 0;
+exports.mapSelectionRangeToParent = exports.mapFoldingRangeToParent = exports.mapScriptSpanStartToSnapshot = exports.mapCodeActionToOriginal = exports.mapTextDocumentEditToOriginal = exports.mapLocationLinkToOriginal = exports.mapSymbolInformationToOriginal = exports.mapColorPresentationToOriginal = exports.mapDiagnosticToGenerated = exports.mapEditToOriginal = exports.mapInsertReplaceEditToOriginal = exports.mapObjWithRangeToOriginal = exports.mapHoverToParent = exports.mapCompletionItemToOriginal = exports.mapRangeToGenerated = exports.mapRangeToOriginal = exports.ConsumerDocumentMapper = exports.SourceMapDocumentMapper = exports.FragmentMapper = exports.IdentityMapper = void 0;
+const trace_mapping_1 = require("@jridgewell/trace-mapping");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("./utils");
 /**
@@ -69,8 +70,8 @@ class FragmentMapper {
 }
 exports.FragmentMapper = FragmentMapper;
 class SourceMapDocumentMapper {
-    constructor(consumer, sourceUri, parent) {
-        this.consumer = consumer;
+    constructor(traceMap, sourceUri, parent) {
+        this.traceMap = traceMap;
         this.sourceUri = sourceUri;
         this.parent = parent;
     }
@@ -81,7 +82,7 @@ class SourceMapDocumentMapper {
         if (generatedPosition.line < 0) {
             return { line: -1, character: -1 };
         }
-        const mapped = this.consumer.originalPositionFor({
+        const mapped = (0, trace_mapping_1.originalPositionFor)(this.traceMap, {
             line: generatedPosition.line + 1,
             column: generatedPosition.character,
         });
@@ -101,7 +102,7 @@ class SourceMapDocumentMapper {
         if (this.parent) {
             originalPosition = this.parent.getGeneratedPosition(originalPosition);
         }
-        const mapped = this.consumer.generatedPositionFor({
+        const mapped = (0, trace_mapping_1.generatedPositionFor)(this.traceMap, {
             line: originalPosition.line + 1,
             column: originalPosition.character,
             source: this.sourceUri,
@@ -128,15 +129,27 @@ class SourceMapDocumentMapper {
     getURL() {
         return this.sourceUri;
     }
-    /**
-     * Needs to be called when source mapper is no longer needed in order to prevent memory leaks.
-     */
-    destroy() {
-        this.parent?.destroy?.();
-        this.consumer.destroy();
-    }
 }
 exports.SourceMapDocumentMapper = SourceMapDocumentMapper;
+class ConsumerDocumentMapper extends 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;
 function mapRangeToOriginal(fragment, range) {
     // DON'T use Range.create here! Positions might not be mapped
     // and therefore return negative numbers, which makes Range.create throw.
@@ -232,6 +245,11 @@ function mapCodeActionToOriginal(fragment, codeAction) {
     }, codeAction.kind);
 }
 exports.mapCodeActionToOriginal = mapCodeActionToOriginal;
+function mapScriptSpanStartToSnapshot(span, scriptTagSnapshot, tsSnapshot) {
+    const originalPosition = scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(span.start));
+    return tsSnapshot.offsetAt(tsSnapshot.getGeneratedPosition(originalPosition));
+}
+exports.mapScriptSpanStartToSnapshot = mapScriptSpanStartToSnapshot;
 function mapFoldingRangeToParent(fragment, foldingRange) {
     // Despite FoldingRange asking for a start and end line and a start and end character, FoldingRanges
     // don't use the Range type, instead asking for 4 number. Not sure why, but it's not convenient

package/dist/core/worker/TSXService.d.ts

@@ -0,0 +1,7 @@
+import type { TSXResult } from '@astrojs/compiler/shared/types';
+/**
+ * Parse code by `@astrojs/compiler`
+ */
+export declare function convertToTSX(source: string, options: {
+    sourcefile: string;
+}): TSXResult;

package/dist/core/worker/TSXService.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToTSX = void 0;
+const synckit_1 = require("synckit");
+const convertToTSXSync = (0, synckit_1.createSyncFn)(require.resolve('./TSXWorker'));
+/**
+ * Parse code by `@astrojs/compiler`
+ */
+function convertToTSX(source, options) {
+    return convertToTSXSync(source, options);
+}
+exports.convertToTSX = convertToTSX;

package/dist/core/worker/TSXWorker.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/core/worker/TSXWorker.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const synckit_1 = require("synckit");
+const dynamicImport = new Function('m', 'return import(m)');
+(0, synckit_1.runAsWorker)(async (source, options) => {
+    const { convertToTSX } = await dynamicImport('@astrojs/compiler');
+    const result = convertToTSX(source, options);
+    return result;
+});

package/dist/plugins/astro/AstroPlugin.d.ts

@@ -1,4 +1,4 @@
-import { CompletionContext, FoldingRange, FormattingOptions, Position, TextEdit } from 'vscode-languageserver';
+import { CompletionContext, Diagnostic, FoldingRange, FormattingOptions, Position, TextEdit } from 'vscode-languageserver';
 import type { ConfigManager } from '../../core/config';
 import type { AstroDocument } from '../../core/documents';
 import type { AppCompletionList, Plugin } from '../interfaces';
@@ -7,10 +7,11 @@ export declare class AstroPlugin implements Plugin {
     __name: string;
     private configManager;
     private readonly languageServiceManager;
-    private readonly ts;
     private readonly completionProvider;
+    private readonly diagnosticsProvider;
     constructor(configManager: ConfigManager, languageServiceManager: LanguageServiceManager);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
+    getDiagnostics(document: AstroDocument): Promise<Diagnostic[]>;
     formatDocument(document: AstroDocument, options: FormattingOptions): Promise<TextEdit[]>;
     getFoldingRanges(document: AstroDocument): FoldingRange[];
 }

package/dist/plugins/astro/AstroPlugin.js

@@ -4,18 +4,22 @@ exports.AstroPlugin = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const importPackage_1 = require("../../importPackage");
 const CompletionsProvider_1 = require("./features/CompletionsProvider");
+const DiagnosticsProvider_1 = require("./features/DiagnosticsProvider");
 class AstroPlugin {
     constructor(configManager, languageServiceManager) {
         this.__name = 'astro';
         this.configManager = configManager;
         this.languageServiceManager = languageServiceManager;
-        this.ts = languageServiceManager.docContext.ts;
         this.completionProvider = new CompletionsProvider_1.CompletionsProviderImpl(this.languageServiceManager);
+        this.diagnosticsProvider = new DiagnosticsProvider_1.DiagnosticsProviderImpl(this.languageServiceManager);
     }
     async getCompletions(document, position, completionContext) {
         const completions = this.completionProvider.getCompletions(document, position, completionContext);
         return completions;
     }
+    async getDiagnostics(document) {
+        return await this.diagnosticsProvider.getDiagnostics(document);
+    }
     async formatDocument(document, options) {
         const filePath = document.getFilePath();
         if (!filePath) {

package/dist/plugins/astro/features/CompletionsProvider.d.ts

@@ -1,13 +1,13 @@
 import { CompletionContext, Position } from 'vscode-languageserver';
 import type { AstroDocument } from '../../../core/documents';
 import type { AppCompletionList, CompletionsProvider } from '../../interfaces';
-import type { LanguageServiceManager as TypeScriptLanguageServiceManager } from '../../typescript/LanguageServiceManager';
+import type { LanguageServiceManager } from '../../typescript/LanguageServiceManager';
 export declare class CompletionsProviderImpl implements CompletionsProvider {
     private readonly languageServiceManager;
     private readonly ts;
     private lastCompletion;
     directivesHTMLLang: import("vscode-html-languageservice").LanguageService;
-    constructor(languageServiceManager: TypeScriptLanguageServiceManager);
+    constructor(languageServiceManager: LanguageServiceManager);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
     private getComponentScriptCompletion;
     private getPropCompletionsAndFilePath;

package/dist/plugins/astro/features/DiagnosticsProvider.d.ts

@@ -0,0 +1,10 @@
+import { Diagnostic } from 'vscode-languageserver-types';
+import { AstroDocument } from '../../../core/documents';
+import { DiagnosticsProvider } from '../../interfaces';
+import { LanguageServiceManager } from '../../typescript/LanguageServiceManager';
+export declare class DiagnosticsProviderImpl implements DiagnosticsProvider {
+    private languageServiceManager;
+    constructor(languageServiceManager: LanguageServiceManager);
+    getDiagnostics(document: AstroDocument): Promise<Diagnostic[]>;
+    private compilerMessageToDiagnostic;
+}

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

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DiagnosticsProviderImpl = void 0;
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+class DiagnosticsProviderImpl {
+    constructor(languageServiceManager) {
+        this.languageServiceManager = languageServiceManager;
+    }
+    async getDiagnostics(document) {
+        const { tsDoc } = (await this.languageServiceManager.getLSAndTSDoc(document));
+        return tsDoc.compilerDiagnostics.map(this.compilerMessageToDiagnostic);
+    }
+    compilerMessageToDiagnostic(message) {
+        return {
+            message: message.text + '\n\n' + message.hint,
+            range: vscode_languageserver_types_1.Range.create(message.location.line - 1, message.location.column - 1, message.location.line, message.location.length),
+            code: message.code,
+            severity: message.severity,
+            source: 'astro',
+        };
+    }
+}
+exports.DiagnosticsProviderImpl = DiagnosticsProviderImpl;

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

@@ -1,8 +1,8 @@
+import type { TSXResult } from '@astrojs/compiler/shared/types';
 import { CancellationToken, CodeAction, CodeActionContext, CompletionContext, DefinitionLink, Diagnostic, FoldingRange, Hover, InlayHint, Location, Position, Range, ReferenceContext, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, WorkspaceEdit } from 'vscode-languageserver';
 import type { ConfigManager } from '../../core/config';
 import type { AstroDocument } from '../../core/documents';
 import type { AppCompletionItem, AppCompletionList, OnWatchFileChangesParam, Plugin } from '../interfaces';
-import { Astro2TSXResult } from './astro2tsx';
 import { CompletionItemData } from './features/CompletionsProvider';
 import type { LanguageServiceManager } from './LanguageServiceManager';
 export declare class TypeScriptPlugin implements Plugin {
@@ -43,7 +43,7 @@ export declare class TypeScriptPlugin implements Plugin {
     onWatchFileChanges(onWatchFileChangesParas: OnWatchFileChangesParam[]): Promise<void>;
     updateNonAstroFile(fileName: string, changes: TextDocumentContentChangeEvent[], text?: string): Promise<void>;
     getSignatureHelp(document: AstroDocument, position: Position, context: SignatureHelpContext | undefined, cancellationToken?: CancellationToken): Promise<SignatureHelp | null>;
-    getTSXForDocument(document: AstroDocument): Astro2TSXResult;
+    getTSXForDocument(document: AstroDocument): TSXResult;
     /**
      * @internal Public for tests only
      */

package/dist/plugins/typescript/TypeScriptPlugin.js

@@ -20,8 +20,7 @@ const ReferencesProvider_1 = require("./features/ReferencesProvider");
 const SemanticTokenProvider_1 = require("./features/SemanticTokenProvider");
 const SignatureHelpProvider_1 = require("./features/SignatureHelpProvider");
 const TypeDefinitionsProvider_1 = require("./features/TypeDefinitionsProvider");
-const utils_1 = require("./snapshots/utils");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 class TypeScriptPlugin {
     constructor(configManager, languageServiceManager) {
         this.__name = 'typescript';
@@ -51,8 +50,7 @@ class TypeScriptPlugin {
     }
     async rename(document, position, newName) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = await tsDoc.createFragment();
-        const offset = fragment.offsetAt(fragment.getGeneratedPosition(position));
+        const offset = tsDoc.offsetAt(tsDoc.getGeneratedPosition(position));
         let renames = lang.findRenameLocations(tsDoc.filePath, offset, false, false, true);
         if (!renames) {
             return null;
@@ -61,13 +59,13 @@ class TypeScriptPlugin {
             changes: {},
         };
         renames.forEach((rename) => {
-            const filePath = (0, utils_2.ensureRealFilePath)(rename.fileName);
+            const filePath = (0, utils_1.ensureRealFilePath)(rename.fileName);
             if (!(filePath in edit.changes)) {
                 edit.changes[filePath] = [];
             }
             edit.changes[filePath].push({
                 newText: newName,
-                range: (0, utils_2.convertToLocationRange)(fragment, rename.textSpan),
+                range: (0, utils_1.convertToLocationRange)(tsDoc, rename.textSpan),
             });
         });
         return edit;
@@ -131,8 +129,8 @@ class TypeScriptPlugin {
     async onWatchFileChanges(onWatchFileChangesParas) {
         let doneUpdateProjectFiles = false;
         for (const { fileName, changeType } of onWatchFileChangesParas) {
-            const scriptKind = (0, utils_2.getScriptKindFromFileName)(fileName, this.ts);
-            if (scriptKind === this.ts.ScriptKind.Unknown && !(0, utils_2.isFrameworkFilePath)(fileName) && !(0, utils_2.isAstroFilePath)(fileName)) {
+            const scriptKind = (0, utils_1.getScriptKindFromFileName)(fileName, this.ts);
+            if (scriptKind === this.ts.ScriptKind.Unknown && !(0, utils_1.isFrameworkFilePath)(fileName) && !(0, utils_1.isAstroFilePath)(fileName)) {
                 continue;
             }
             if (changeType === vscode_languageserver_1.FileChangeType.Created && !doneUpdateProjectFiles) {
@@ -142,7 +140,7 @@ class TypeScriptPlugin {
             else if (changeType === vscode_languageserver_1.FileChangeType.Deleted) {
                 await this.languageServiceManager.deleteSnapshot(fileName);
             }
-            else if (!(0, utils_2.isAstroFilePath)(fileName)) {
+            else if (!(0, utils_1.isAstroFilePath)(fileName)) {
                 // Content updates for Astro files are handled through the documentManager and the 'documentChange' event
                 await this.languageServiceManager.updateExistingNonAstroFile(fileName);
             }
@@ -155,7 +153,7 @@ class TypeScriptPlugin {
         return this.signatureHelpProvider.getSignatureHelp(document, position, context, cancellationToken);
     }
     getTSXForDocument(document) {
-        return (0, astro2tsx_1.default)(document.getText(), (0, utils_1.classNameFromFilename)(document.getURL()));
+        return (0, astro2tsx_1.default)(document.getText(), document.getURL());
     }
     /**
      * @internal Public for tests only

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

@@ -1,4 +1,2 @@
-export interface Astro2TSXResult {
-    code: string;
-}
-export default function (content: string, className: string): Astro2TSXResult;
+import { TSXResult } from '@astrojs/compiler/shared/types';
+export default function (content: string, fileName: string): TSXResult;

package/dist/plugins/typescript/astro2tsx.js

@@ -1,95 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const parseAstro_1 = require("../../core/documents/parseAstro");
-function addProps(content, className) {
-    let defaultExportType = 'Record<string, any>';
-    let shouldAddGlobal = false;
-    let astroGlobal = "type AstroGlobal = import('astro').AstroGlobal";
-    const astroGlobalConstDef = `
-	/**
-	 * Astro global available in all contexts in .astro files
-	 *
-	 * [Astro documentation](https://docs.astro.build/reference/api-reference/#astro-global)
-	 */
-	declare const Astro: Readonly<AstroGlobal>;
-	`;
-    if (/(interface|type) Props/.test(content)) {
-        defaultExportType = 'Props';
-        shouldAddGlobal = true;
-        astroGlobal += ' & { props: Props }';
-    }
-    return ('\n' +
-        (shouldAddGlobal ? astroGlobal + '\n' + astroGlobalConstDef : '') +
-        `export default function ${className}__AstroComponent_(_props: ${defaultExportType}): any {}`);
-}
-function escapeTemplateLiteralContent(content) {
-    return content.replace(/`/g, '\\`');
-}
-function default_1(content, className) {
-    let result = {
-        code: '',
-    };
-    const astroDocument = (0, parseAstro_1.parseAstro)(content);
-    // Frontmatter replacements
-    let frontMatterRaw = '';
-    if (astroDocument.frontmatter.state === 'closed') {
-        frontMatterRaw = content
-            .substring(astroDocument.frontmatter.startOffset ?? 0, (astroDocument.frontmatter.endOffset ?? 0) + 3)
-            // Handle case where semicolons is not used in the frontmatter section
-            // We need to add something before the semi-colon or TypeScript won't be able to do completions
-            .replace(/((?!^)(?<!;)\n)(---)/g, (_whole, start, _dashes) => {
-            return start + '"";';
-        })
-            // Replace frontmatter marks with comments
-            .replace(/---/g, '///');
-    }
-    // Content replacement
-    const htmlBegin = astroDocument.frontmatter.endOffset ? astroDocument.frontmatter.endOffset + 3 : 0;
-    let htmlRaw = content
-        .substring(htmlBegin)
-        // Turn comments into JS comments
-        .replace(/<\s*!--([^-->]*)(.*?)-->/gs, (whole) => {
-        return `{/*${whole}*/}`;
-    })
-        // Turn styles tags into internal strings
-        .replace(/<\s*style([^>]*)>(.*?)<\s*\/\s*style>/gs, (_whole, attrs, children) => {
-        return `<style${attrs}>{\`${escapeTemplateLiteralContent(children)}\`}</style>`;
-    })
-        // Turn scripts into function calls
-        .replace(/<\s*script([^\/>]*)>(.*?)<\s*\/\s*script>/gs, (_whole, attrs, children, offset) => {
-        return `<script${attrs}>{()=>{${children}}}</script>`;
-    })
-        // Close void elements
-        .replace(/<(\s*(meta|base|br|col|embed|hr|img|input|link|meta|param|source|track|wbr)([^>]*))>/g, (whole, inner) => {
-        if (whole.endsWith('/>'))
-            return whole;
-        return `<${inner} />`;
-    })
-        // Replace `@` prefixed attributes with `_` prefix
-        .replace(/<([$A-Z_a-z][^\s\/>]*)([^\/>]*)>/g, (whole, tag, attrs) => {
-        if (attrs.includes('@')) {
-            return `<${tag}${attrs.replace(
-            // the following regular expression captures:
-            //   $1. any character that may appear before an attribute name (https://html.spec.whatwg.org/#before-attribute-name-state)
-            // then, one `@` at sign, then:
-            //   $2. any characters that may appear in an attribute name (https://html.spec.whatwg.org/#attribute-name-state)
-            // then, looking ahead any one character that may not appear in an attribute name, or the end
-            /([\f\n\r\t "'])@([^\f\n\r\t /=>"'<]+)(?=[\f\n\r\t /=>"'<]|$)/g, '$1_$2')}>`;
-        }
-        else {
-            return whole;
-        }
-    })
-        // Fix doctypes
-        .replace(/<!(doctype html)>/gi, (_whole, main) => {
-        return `<${main.toLowerCase()}/>`;
-    });
-    result.code =
-        frontMatterRaw +
-            htmlRaw +
-            '\n' +
-            // Add TypeScript definitions
-            addProps(frontMatterRaw, className);
-    return result;
+const TSXService_1 = require("../../core/worker/TSXService");
+function default_1(content, fileName) {
+    const tsx = (0, TSXService_1.convertToTSX)(content, { sourcefile: fileName });
+    return tsx;
 }
 exports.default = default_1;

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

@@ -17,7 +17,6 @@ class CodeActionsProviderImpl {
     }
     async getCodeActions(document, range, context, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
-        const fragment = await tsDoc.createFragment();
         const tsPreferences = await this.configManager.getTSPreferences(document);
         const formatOptions = await this.configManager.getTSFormatConfig(document);
         let result = [];
@@ -59,8 +58,8 @@ class CodeActionsProviderImpl {
                 isInsideScript = true;
             }
             else {
-                const start = fragment.offsetAt(fragment.getGeneratedPosition(range.start));
-                const end = fragment.offsetAt(fragment.getGeneratedPosition(range.end));
+                const start = tsDoc.offsetAt(tsDoc.getGeneratedPosition(range.start));
+                const end = tsDoc.offsetAt(tsDoc.getGeneratedPosition(range.end));
                 codeFixes = errorCodes.includes(2304)
                     ? this.getComponentQuickFix(start, end, lang, tsDoc.filePath, formatOptions, tsPreferences)
                     : undefined;
@@ -75,12 +74,12 @@ class CodeActionsProviderImpl {
         function codeFixToCodeAction(codeFix, diagnostics, kind, isInsideScript, ts) {
             const documentChanges = codeFix.changes.map((change) => {
                 return vscode_languageserver_types_1.TextDocumentEdit.create(vscode_languageserver_types_1.OptionalVersionedTextDocumentIdentifier.create(document.getURL(), null), change.textChanges.map((edit) => {
-                    let originalRange = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, edit.span));
+                    let originalRange = (0, documents_1.mapRangeToOriginal)(tsDoc, (0, utils_2.convertRange)(tsDoc, edit.span));
                     // Inside scripts, we don't need to restrain the insertion of code inside a specific zone as it will be
                     // restricted to the area of the script tag by default
                     if (!isInsideScript) {
                         if (codeFix.fixName === 'import') {
-                            return (0, CompletionsProvider_1.codeActionChangeToTextEdit)(document, fragment, false, edit, ts);
+                            return (0, CompletionsProvider_1.codeActionChangeToTextEdit)(document, tsDoc, false, edit, ts);
                         }
                         if (codeFix.fixName === 'fixMissingFunctionDeclaration') {
                             originalRange = (0, utils_2.checkEndOfFileCodeInsert)(originalRange, document);
@@ -108,7 +107,7 @@ class CodeActionsProviderImpl {
         function mapScriptTagFixToOriginal(changes, scriptTagSnapshot) {
             return changes.map((change) => {
                 change.textChanges.map((edit) => {
-                    edit.span.start = fragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(edit.span.start)));
+                    edit.span.start = (0, documents_1.mapScriptSpanStartToSnapshot)(edit.span, scriptTagSnapshot, tsDoc);
                     return edit;
                 });
                 return change;
@@ -145,7 +144,6 @@ class CodeActionsProviderImpl {
     async organizeSortImports(document, skipDestructiveCodeActions = false, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         const filePath = tsDoc.filePath;
-        const fragment = await tsDoc.createFragment();
         if (cancellationToken?.isCancellationRequested) {
             return [];
         }
@@ -160,7 +158,13 @@ class CodeActionsProviderImpl {
                 edit.fileName = tsDoc.filePath;
                 edit.textChanges = edit.textChanges
                     .map((change) => {
-                    change.span.start = fragment.offsetAt(scriptTagSnapshot.getOriginalPosition(scriptTagSnapshot.positionAt(change.span.start)));
+                    change.span.start = (0, documents_1.mapScriptSpanStartToSnapshot)(change.span, scriptTagSnapshot, tsDoc);
+                    // If the result ending position is unmapped, it usually means the ending position has a newline
+                    // inside the virtual part of the script tag, so let's just make it a character shorter
+                    const range = (0, documents_1.mapRangeToOriginal)(tsDoc, (0, utils_2.convertRange)(tsDoc, change.span));
+                    if (range.end.character === 0 && range.end.line === 0) {
+                        change.span.length -= 1;
+                    }
                     return change;
                 })
                     // Since our last line is a (virtual) export, organize imports will try to rewrite it, so let's only take
@@ -175,7 +179,12 @@ class CodeActionsProviderImpl {
         });
         const documentChanges = changes.map((change) => {
             return vscode_languageserver_types_1.TextDocumentEdit.create(vscode_languageserver_types_1.OptionalVersionedTextDocumentIdentifier.create(document.url, null), change.textChanges.map((edit) => {
-                const range = (0, documents_1.mapRangeToOriginal)(fragment, (0, utils_2.convertRange)(fragment, edit.span));
+                const range = (0, documents_1.mapRangeToOriginal)(tsDoc, (0, utils_2.convertRange)(tsDoc, edit.span));
+                if (document.offsetAt(range.start) < (document.astroMeta.content.firstNonWhitespaceOffset ?? 0)) {
+                    if (document.offsetAt(range.end) > document.astroMeta.frontmatter.endOffset) {
+                        range.end = document.positionAt(document.astroMeta.frontmatter.endOffset);
+                    }
+                }
                 return vscode_languageserver_types_1.TextEdit.replace(range, this.fixIndentationOfImports(edit.newText, range, document));
             }));
         });

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

@@ -4,7 +4,7 @@ import type { ConfigManager } from '../../../core/config';
 import { AstroDocument } from '../../../core/documents';
 import type { AppCompletionItem, AppCompletionList, CompletionsProvider } from '../../interfaces';
 import type { LanguageServiceManager } from '../LanguageServiceManager';
-import type { AstroSnapshotFragment } from '../snapshots/DocumentSnapshot';
+import type { DocumentSnapshot } from '../snapshots/DocumentSnapshot';
 export interface CompletionItemData extends TextDocumentIdentifier {
     filePath: string;
     offset: number;
@@ -34,4 +34,4 @@ export declare class CompletionsProviderImpl implements CompletionsProvider<Comp
     private isAstroComponentImport;
     private isValidCompletion;
 }
-export declare function codeActionChangeToTextEdit(document: AstroDocument, fragment: AstroSnapshotFragment, isInsideScriptTag: boolean, change: ts.TextChange, ts: typeof import('typescript/lib/tsserverlibrary')): TextEdit;
+export declare function codeActionChangeToTextEdit(document: AstroDocument, snapshot: DocumentSnapshot, isInsideScriptTag: boolean, change: ts.TextChange, ts: typeof import('typescript/lib/tsserverlibrary')): TextEdit;