@astrojs/language-server 0.23.1 → 0.24.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @astrojs/language-server
 
+## 0.24.0
+
+### Minor Changes
+
+- b66ae70: Update the VS Code extension to use a bundled version of the language server for better performance and compatibility with running the extension in the web
+- 5a583d3: TypeScript will now be loaded from VS Code / the workspace instead of being bundled inside the language server
+
+### Patch Changes
+
+- 5146422: Fix <> inside the frontmatter preventing certain HTML features from working inside the template
+
+## 0.23.3
+
+### Patch Changes
+
+- 150946c: Publish failed
+
+## 0.23.2
+
+### Patch Changes
+
+- b13fb51: Don't use `workspace/configuration` on clients that don't support it
+
 ## 0.23.1
 
 ### Patch Changes

package/dist/browser.js

@@ -5,4 +5,11 @@ const server_1 = require("./server");
 const messageReader = new browser_1.BrowserMessageReader(self);
 const messageWriter = new browser_1.BrowserMessageWriter(self);
 const connection = (0, browser_1.createConnection)(messageReader, messageWriter);
-(0, server_1.startLanguageServer)(connection);
+(0, server_1.startLanguageServer)(connection, {
+    loadTypescript(options) {
+        return undefined; // TODO: Full browser support
+    },
+    loadTypescriptLocalized(options) {
+        return undefined;
+    },
+});

package/dist/check.d.ts

@@ -11,7 +11,8 @@ export declare class AstroCheck {
     private docManager;
     private configManager;
     private pluginHost;
-    constructor(workspacePath: string, options?: LSConfig);
+    private ts;
+    constructor(workspacePath: string, typescriptPath: string, options?: LSConfig);
     upsertDocument(doc: {
         text: string;
         uri: string;

package/dist/check.js

@@ -9,11 +9,17 @@ const utils_1 = require("./utils");
 var vscode_languageserver_types_1 = require("vscode-languageserver-types");
 Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return vscode_languageserver_types_1.DiagnosticSeverity; } });
 class AstroCheck {
-    constructor(workspacePath, options) {
+    constructor(workspacePath, typescriptPath, options) {
         this.docManager = documents_1.DocumentManager.newInstance();
         this.configManager = new config_1.ConfigManager();
         this.pluginHost = new plugins_1.PluginHost(this.docManager);
         this.initialize(workspacePath);
+        try {
+            this.ts = require(typescriptPath);
+        }
+        catch (e) {
+            throw new Error(`Couldn't load TypeScript from path ${typescriptPath}`);
+        }
         if (options) {
             this.configManager.updateGlobalConfig(options);
         }
@@ -39,7 +45,7 @@ class AstroCheck {
         }));
     }
     initialize(workspacePath) {
-        const languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(this.docManager, [(0, utils_1.normalizeUri)(workspacePath)], this.configManager);
+        const languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(this.docManager, [(0, utils_1.normalizeUri)(workspacePath)], this.configManager, this.ts);
         this.pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(this.configManager, languageServiceManager));
     }
     async getDiagnosticsForFile(uri) {

package/dist/core/DiagnosticsManager.d.ts

@@ -1,5 +1,5 @@
-import { Connection, TextDocumentIdentifier, Diagnostic } from 'vscode-languageserver';
-import { DocumentManager, AstroDocument } from './documents';
+import type { Connection, Diagnostic, TextDocumentIdentifier } from 'vscode-languageserver';
+import type { AstroDocument, DocumentManager } from './documents';
 export declare type SendDiagnostics = Connection['sendDiagnostics'];
 export declare type GetDiagnostics = (doc: TextDocumentIdentifier) => Thenable<Diagnostic[]>;
 export declare class DiagnosticsManager {

package/dist/core/config/ConfigManager.d.ts

@@ -1,8 +1,8 @@
-import { VSCodeEmmetConfig } from '@vscode/emmet-helper';
-import { LSConfig, LSCSSConfig, LSHTMLConfig, LSTypescriptConfig } from './interfaces';
-import { Connection, FormattingOptions } from 'vscode-languageserver';
-import { TextDocument } from 'vscode-languageserver-textdocument';
-import { FormatCodeSettings, InlayHintsOptions, UserPreferences } from 'typescript';
+import type { VSCodeEmmetConfig } from '@vscode/emmet-helper';
+import type { FormatCodeSettings, UserPreferences } from 'typescript';
+import type { Connection, FormattingOptions } from 'vscode-languageserver';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { LSConfig, LSCSSConfig, LSHTMLConfig, LSTypescriptConfig } from './interfaces';
 export declare const defaultLSConfig: LSConfig;
 declare type DeepPartial<T> = T extends Record<string, unknown> ? {
     [P in keyof T]?: DeepPartial<T[P]>;
@@ -13,12 +13,13 @@ declare type DeepPartial<T> = T extends Record<string, unknown> ? {
  * For more info on this, see the [internal docs](../../../../../docs/internal/language-server/config.md)
  */
 export declare class ConfigManager {
+    private connection?;
+    private hasConfigurationCapability?;
     private globalConfig;
     private documentSettings;
     shouldRefreshTSServices: boolean;
     private isTrusted;
-    private connection;
-    constructor(connection?: Connection);
+    constructor(connection?: Connection | undefined, hasConfigurationCapability?: boolean | undefined);
     updateConfig(): void;
     removeDocument(scopeUri: string): void;
     getConfig<T>(section: string, scopeUri: string): Promise<T | Record<string, any>>;
@@ -26,7 +27,6 @@ export declare class ConfigManager {
     getPrettierVSConfig(document: TextDocument): Promise<Record<string, any>>;
     getTSFormatConfig(document: TextDocument, vscodeOptions?: FormattingOptions): Promise<FormatCodeSettings>;
     getTSPreferences(document: TextDocument): Promise<UserPreferences>;
-    getTSInlayHintsPreferences(document: TextDocument): Promise<InlayHintsOptions>;
     /**
      * Return true if a plugin and an optional feature is enabled
      */

package/dist/core/config/ConfigManager.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigManager = exports.defaultLSConfig = void 0;
-const typescript_1 = require("typescript");
 const utils_1 = require("../../utils");
 // The default language server configuration is used only in two cases:
 // 1. When the client does not support `workspace/configuration` requests and as such, needs a global config
@@ -46,13 +45,14 @@ exports.defaultLSConfig = {
  * For more info on this, see the [internal docs](../../../../../docs/internal/language-server/config.md)
  */
 class ConfigManager {
-    constructor(connection) {
+    constructor(connection, hasConfigurationCapability) {
+        this.connection = connection;
+        this.hasConfigurationCapability = hasConfigurationCapability;
         this.globalConfig = { astro: exports.defaultLSConfig };
         this.documentSettings = {};
         // If set to true, the next time we need a TypeScript language service, we'll rebuild it so it gets the new config
         this.shouldRefreshTSServices = false;
         this.isTrusted = true;
-        this.connection = connection;
     }
     updateConfig() {
         // Reset all cached document settings
@@ -63,7 +63,7 @@ class ConfigManager {
         delete this.documentSettings[scopeUri];
     }
     async getConfig(section, scopeUri) {
-        if (!this.connection) {
+        if (!this.connection || !this.hasConfigurationCapability) {
             return (0, utils_1.get)(this.globalConfig, section) ?? {};
         }
         if (!this.documentSettings[scopeUri]) {
@@ -118,7 +118,7 @@ class ConfigManager {
             insertSpaceAfterTypeAssertion: formatConfig.insertSpaceAfterTypeAssertion ?? false,
             placeOpenBraceOnNewLineForFunctions: formatConfig.placeOpenBraceOnNewLineForFunctions ?? false,
             placeOpenBraceOnNewLineForControlBlocks: formatConfig.placeOpenBraceOnNewLineForControlBlocks ?? false,
-            semicolons: formatConfig.semicolons ?? typescript_1.SemicolonPreference.Ignore,
+            semicolons: formatConfig.semicolons ?? 'ignore',
         };
     }
     async getTSPreferences(document) {
@@ -136,13 +136,7 @@ class ConfigManager {
             includeCompletionsForModuleExports: config.suggest?.autoImports ?? true,
             allowIncompleteCompletions: true,
             includeCompletionsWithInsertText: true,
-        };
-    }
-    async getTSInlayHintsPreferences(document) {
-        const config = (await this.getConfig('typescript', document.uri)) ?? {};
-        const tsPreferences = this.getTSPreferences(document);
-        return {
-            ...tsPreferences,
+            // Inlay Hints
             includeInlayParameterNameHints: getInlayParameterNameHintsPreference(config),
             includeInlayParameterNameHintsWhenArgumentMatchesName: !(config.inlayHints?.parameterNames?.suppressWhenArgumentMatchesName ?? true),
             includeInlayFunctionParameterTypeHints: config.inlayHints?.parameterTypes?.enabled ?? false,

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

@@ -1,4 +1,4 @@
-import { HTMLDocument, Range } from 'vscode-html-languageservice';
+import type { HTMLDocument, Range } from 'vscode-html-languageservice';
 import { WritableDocument } from './DocumentBase';
 import { AstroMetadata } from './parseAstro';
 import { TagInformation } from './utils';

package/dist/core/documents/AstroDocument.js

@@ -16,7 +16,7 @@ class AstroDocument extends DocumentBase_1.WritableDocument {
     }
     updateDocInfo() {
         this.astroMeta = (0, parseAstro_1.parseAstro)(this.content);
-        this.html = (0, parseHtml_1.parseHtml)(this.content);
+        this.html = (0, parseHtml_1.parseHtml)(this.content, this.astroMeta);
         this.styleTags = (0, utils_2.extractStyleTags)(this.content, this.html);
         this.scriptTags = (0, utils_2.extractScriptTags)(this.content, this.html);
     }

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

@@ -1,5 +1,5 @@
-import { Position } from 'vscode-languageserver';
-import { TextDocument } from 'vscode-languageserver-textdocument';
+import type { Position } from 'vscode-languageserver';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 /**
  * Represents a textual document.
  */

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

@@ -1,4 +1,4 @@
-import { TextDocumentContentChangeEvent, TextDocumentItem, VersionedTextDocumentIdentifier } from 'vscode-languageserver';
+import type { TextDocumentContentChangeEvent, TextDocumentItem, VersionedTextDocumentIdentifier } from 'vscode-languageserver';
 import { AstroDocument } from './AstroDocument';
 export declare type DocumentEvent = 'documentOpen' | 'documentChange' | 'documentClose';
 export declare class DocumentManager {

package/dist/core/documents/DocumentManager.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentManager = void 0;
 const events_1 = require("events");
-const AstroDocument_1 = require("./AstroDocument");
 const utils_1 = require("../../utils");
+const AstroDocument_1 = require("./AstroDocument");
 class DocumentManager {
     constructor(createDocument) {
         this.createDocument = createDocument;

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

@@ -1,6 +1,6 @@
-import { Position, Range, CompletionItem, Hover, Diagnostic, ColorPresentation, SymbolInformation, LocationLink, TextDocumentEdit, CodeAction, SelectionRange, TextEdit, InsertReplaceEdit, FoldingRange } from 'vscode-languageserver';
+import type { SourceMapConsumer } from 'source-map';
+import { CodeAction, ColorPresentation, CompletionItem, Diagnostic, FoldingRange, Hover, InsertReplaceEdit, LocationLink, Position, Range, SelectionRange, SymbolInformation, TextDocumentEdit, TextEdit } from 'vscode-languageserver';
 import { TagInformation } from './utils';
-import { SourceMapConsumer } from 'source-map';
 export interface DocumentMapper {
     /**
      * Map the generated position to the original position

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

@@ -1,9 +1,10 @@
 import { HTMLDocument, Position } from 'vscode-html-languageservice';
-import { AstroDocument } from './AstroDocument';
+import type { AstroDocument } from './AstroDocument';
+import { AstroMetadata } from './parseAstro';
 /**
  * Parses text as HTML
  */
-export declare function parseHtml(text: string): HTMLDocument;
+export declare function parseHtml(text: string, frontmatter: AstroMetadata): HTMLDocument;
 export interface AttributeContext {
     name: string;
     inValue: boolean;

package/dist/core/documents/parseHtml.js

@@ -7,8 +7,8 @@ const parser = (0, vscode_html_languageservice_1.getLanguageService)();
 /**
  * Parses text as HTML
  */
-function parseHtml(text) {
-    const preprocessed = preprocess(text);
+function parseHtml(text, frontmatter) {
+    const preprocessed = preprocess(text, frontmatter);
     // We can safely only set getText because only this is used for parsing
     const parsedDoc = parser.parseHTMLDocument({ getText: () => preprocessed });
     return parsedDoc;
@@ -18,12 +18,18 @@ const createScanner = parser.createScanner;
 /**
  * scan the text and remove any `>` or `<` that cause the tag to end short,
  */
-function preprocess(text) {
+function preprocess(text, frontmatter) {
     let scanner = createScanner(text);
     let token = scanner.scan();
     let currentStartTagStart = null;
+    const hasFrontmatter = frontmatter !== undefined;
     while (token !== vscode_html_languageservice_1.TokenType.EOS) {
         const offset = scanner.getTokenOffset();
+        if (hasFrontmatter &&
+            (scanner.getTokenText() === '>' || scanner.getTokenText() === '<') &&
+            offset < (frontmatter.content.firstNonWhitespaceOffset ?? 0)) {
+            blankStartOrEndTagLike(offset, vscode_html_languageservice_1.ScannerState.WithinContent);
+        }
         if (token === vscode_html_languageservice_1.TokenType.StartTagOpen) {
             currentStartTagStart = offset;
         }
@@ -46,6 +52,7 @@ function preprocess(text) {
             shouldBlankStartOrEndTagLike(offset)) {
             blankStartOrEndTagLike(offset);
         }
+        // TODO: Handle TypeScript generics inside expressions / Use the compiler to parse HTML instead?
         token = scanner.scan();
     }
     return text;
@@ -53,9 +60,9 @@ function preprocess(text) {
         // not null rather than falsy, otherwise it won't work on first tag(0)
         return currentStartTagStart !== null && (0, utils_1.isInsideExpression)(text, currentStartTagStart, offset);
     }
-    function blankStartOrEndTagLike(offset) {
+    function blankStartOrEndTagLike(offset, state) {
         text = text.substring(0, offset) + ' ' + text.substring(offset + 1);
-        scanner = createScanner(text, offset, vscode_html_languageservice_1.ScannerState.WithinTag);
+        scanner = createScanner(text, offset, state ?? vscode_html_languageservice_1.ScannerState.WithinTag);
     }
 }
 function getAttributeContextAtPosition(document, position) {

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

@@ -1,5 +1,5 @@
+import type { HTMLDocument, Node } from 'vscode-html-languageservice';
 import { Position } from 'vscode-languageserver';
-import { HTMLDocument, Node } from 'vscode-html-languageservice';
 export interface TagInformation {
     content: string;
     attributes: Record<string, string>;
@@ -14,8 +14,8 @@ export interface TagInformation {
     closed: boolean;
 }
 export declare function walk(node: Node): Generator<Node, void, unknown>;
-export declare function extractStyleTags(source: string, html?: HTMLDocument): TagInformation[];
-export declare function extractScriptTags(source: string, html?: HTMLDocument): TagInformation[];
+export declare function extractStyleTags(source: string, html: HTMLDocument): TagInformation[];
+export declare function extractScriptTags(source: string, html: HTMLDocument): TagInformation[];
 export declare function getLineAtPosition(position: Position, text: string): string;
 /**
  * Return if a given offset is inside the start tag of a component

package/dist/core/documents/utils.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFirstNonWhitespaceIndex = exports.getLineOffsets = exports.offsetAt = exports.positionAt = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInTag = exports.isPossibleComponent = exports.isInTagName = exports.isInComponentStartTag = exports.getLineAtPosition = exports.extractScriptTags = exports.extractStyleTags = exports.walk = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("../../utils");
-const parseHtml_1 = require("./parseHtml");
 function* walk(node) {
     for (let child of node.children) {
         yield* walk(child);
@@ -19,7 +18,7 @@ exports.walk = walk;
  * @param tag the tag to extract
  */
 function extractTags(text, tag, html) {
-    const rootNodes = html?.roots || (0, parseHtml_1.parseHtml)(text).roots;
+    const rootNodes = html.roots;
     const matchedNodes = rootNodes.filter((node) => node.tag === tag);
     if (tag === 'style' && !matchedNodes.length && rootNodes.length) {
         for (let child of walk(rootNodes[0])) {

package/dist/node.js

@@ -26,4 +26,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const vscode = __importStar(require("vscode-languageserver/node"));
 const server_1 = require("./server");
 const connection = vscode.createConnection(vscode.ProposedFeatures.all);
-(0, server_1.startLanguageServer)(connection);
+(0, server_1.startLanguageServer)(connection, {
+    loadTypescript(options) {
+        if (options?.typescript?.serverPath) {
+            return require(options?.typescript?.serverPath);
+        }
+    },
+    loadTypescriptLocalized(options) {
+        if (options?.typescript?.localizedPath) {
+            try {
+                return require(options?.typescript?.localizedPath);
+            }
+            catch { }
+        }
+    },
+});

package/dist/plugins/PluginHost.d.ts

@@ -1,6 +1,6 @@
-import { CancellationToken, Color, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FoldingRange, Hover, Position, Range, Location, SignatureHelp, SignatureHelpContext, TextDocumentContentChangeEvent, TextDocumentIdentifier, WorkspaceEdit, SymbolInformation, SemanticTokens, CodeActionContext, CodeAction, InlayHint, FormattingOptions, TextEdit, LinkedEditingRanges } from 'vscode-languageserver';
+import { CancellationToken, CodeAction, CodeActionContext, Color, ColorInformation, ColorPresentation, CompletionContext, CompletionItem, CompletionList, DefinitionLink, Diagnostic, FoldingRange, FormattingOptions, Hover, InlayHint, LinkedEditingRanges, Location, Position, Range, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, TextDocumentIdentifier, TextEdit, WorkspaceEdit } from 'vscode-languageserver';
+import type { DocumentManager } from '../core/documents/DocumentManager';
 import type { AppCompletionItem, Plugin } from './interfaces';
-import { DocumentManager } from '../core/documents/DocumentManager';
 export interface PluginHostConfig {
     filterIncompleteCompletions: boolean;
     definitionLinkSupport: boolean;

package/dist/plugins/PluginHost.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginHost = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const utils_1 = require("../utils");
 const documents_1 = require("../core/documents");
+const utils_1 = require("../utils");
 var ExecuteMode;
 (function (ExecuteMode) {
     ExecuteMode[ExecuteMode["None"] = 0] = "None";

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

@@ -1,12 +1,13 @@
-import { CompletionContext, FoldingRange, Position, TextEdit, FormattingOptions } from 'vscode-languageserver';
-import { ConfigManager } from '../../core/config';
-import { AstroDocument } from '../../core/documents';
-import { AppCompletionList, Plugin } from '../interfaces';
-import { LanguageServiceManager } from '../typescript/LanguageServiceManager';
+import { CompletionContext, 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';
+import type { LanguageServiceManager } from '../typescript/LanguageServiceManager';
 export declare class AstroPlugin implements Plugin {
     __name: string;
     private configManager;
     private readonly languageServiceManager;
+    private readonly ts;
     private readonly completionProvider;
     constructor(configManager: ConfigManager, languageServiceManager: LanguageServiceManager);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;

package/dist/plugins/astro/AstroPlugin.js

@@ -9,6 +9,7 @@ class AstroPlugin {
         this.__name = 'astro';
         this.configManager = configManager;
         this.languageServiceManager = languageServiceManager;
+        this.ts = languageServiceManager.docContext.ts;
         this.completionProvider = new CompletionsProvider_1.CompletionsProviderImpl(this.languageServiceManager);
     }
     async getCompletions(document, position, completionContext) {

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

@@ -1,9 +1,10 @@
-import type { AppCompletionList, CompletionsProvider } from '../../interfaces';
-import type { AstroDocument } from '../../../core/documents';
 import { CompletionContext, Position } from 'vscode-languageserver';
-import { LanguageServiceManager as TypeScriptLanguageServiceManager } from '../../typescript/LanguageServiceManager';
+import type { AstroDocument } from '../../../core/documents';
+import type { AppCompletionList, CompletionsProvider } from '../../interfaces';
+import type { LanguageServiceManager as TypeScriptLanguageServiceManager } 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);

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

@@ -1,16 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompletionsProviderImpl = void 0;
+const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 const vscode_languageserver_1 = require("vscode-languageserver");
-const typescript_1 = __importDefault(require("typescript"));
 const utils_1 = require("../../../core/documents/utils");
-const utils_2 = require("../../typescript/utils");
-const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 const astro_attributes_1 = require("../../html/features/astro-attributes");
-const utils_3 = require("../../html/utils");
+const utils_2 = require("../../html/utils");
+const utils_3 = require("../../typescript/utils");
 class CompletionsProviderImpl {
     constructor(languageServiceManager) {
         this.lastCompletion = null;
@@ -19,6 +15,7 @@ class CompletionsProviderImpl {
             useDefaultDataProvider: false,
         });
         this.languageServiceManager = languageServiceManager;
+        this.ts = languageServiceManager.docContext.ts;
     }
     async getCompletions(document, position, completionContext) {
         let items = [];
@@ -38,7 +35,7 @@ class CompletionsProviderImpl {
             }
             const isAstro = componentFilePath?.endsWith('.astro');
             if (!isAstro) {
-                const directives = (0, utils_3.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items);
+                const directives = (0, utils_2.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items);
                 items.push(...directives);
             }
         }
@@ -105,7 +102,7 @@ class CompletionsProviderImpl {
         const componentName = node.tag;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         // Get the source file
-        const tsFilePath = (0, utils_2.toVirtualAstroFilePath)(tsDoc.filePath);
+        const tsFilePath = (0, utils_3.toVirtualAstroFilePath)(tsDoc.filePath);
         const program = lang.getProgram();
         const sourceFile = program?.getSourceFile(tsFilePath);
         const typeChecker = program?.getTypeChecker();
@@ -157,12 +154,12 @@ class CompletionsProviderImpl {
     getImportedSymbol(sourceFile, identifier) {
         for (let list of sourceFile.getChildren()) {
             for (let node of list.getChildren()) {
-                if (typescript_1.default.isImportDeclaration(node)) {
+                if (this.ts.isImportDeclaration(node)) {
                     let clauses = node.importClause;
                     if (!clauses)
                         return null;
                     let namedImport = clauses.getChildAt(0);
-                    if (typescript_1.default.isNamedImports(namedImport)) {
+                    if (this.ts.isNamedImports(namedImport)) {
                         for (let imp of namedImport.elements) {
                             // Iterate the named imports
                             if (imp.name.getText() === identifier) {
@@ -170,7 +167,7 @@ class CompletionsProviderImpl {
                             }
                         }
                     }
-                    else if (typescript_1.default.isIdentifier(namedImport)) {
+                    else if (this.ts.isIdentifier(namedImport)) {
                         if (namedImport.getText() === identifier) {
                             return namedImport;
                         }
@@ -182,9 +179,9 @@ class CompletionsProviderImpl {
     }
     getPropType(declarations, typeChecker) {
         for (const decl of declarations) {
-            const fileName = (0, utils_2.toVirtualFilePath)(decl.getSourceFile().fileName);
+            const fileName = (0, utils_3.toVirtualFilePath)(decl.getSourceFile().fileName);
             if (fileName.endsWith('.tsx') || fileName.endsWith('.jsx') || fileName.endsWith('.d.ts')) {
-                if (!typescript_1.default.isFunctionDeclaration(decl) && !typescript_1.default.isFunctionTypeNode(decl)) {
+                if (!this.ts.isFunctionDeclaration(decl) && !this.ts.isFunctionTypeNode(decl)) {
                     console.error(`We only support functions declarations at the moment`);
                     continue;
                 }
@@ -221,7 +218,7 @@ class CompletionsProviderImpl {
             // Ensure that props shows up first as a completion, despite this plugin being ran after the HTML one
             sortText: '\0',
         };
-        if (mem.flags & typescript_1.default.SymbolFlags.Optional) {
+        if (mem.flags & this.ts.SymbolFlags.Optional) {
             item.filterText = item.label;
             item.label += '?';
             // Put optional props at a lower priority

package/dist/plugins/css/CSSDocument.d.ts

@@ -1,5 +1,5 @@
-import { Stylesheet, TextDocument } from 'vscode-css-languageservice';
-import { Position } from 'vscode-languageserver';
+import type { Stylesheet, TextDocument } from 'vscode-css-languageservice';
+import type { Position } from 'vscode-languageserver';
 import { AstroDocument, DocumentMapper, ReadableDocument, TagInformation } from '../../core/documents';
 export interface CSSDocumentBase extends DocumentMapper, TextDocument {
     languageId: string;

package/dist/plugins/css/CSSDocument.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CSSDocument = void 0;
-const language_service_1 = require("./language-service");
 const documents_1 = require("../../core/documents");
+const language_service_1 = require("./language-service");
 class CSSDocument extends documents_1.ReadableDocument {
     constructor(parent, styleInfo) {
         super();

package/dist/plugins/css/CSSPlugin.d.ts

@@ -1,5 +1,5 @@
 import { Color, ColorInformation, ColorPresentation, CompletionContext, CompletionList, FoldingRange, Hover, Position, Range, SymbolInformation } from 'vscode-languageserver';
-import { ConfigManager } from '../../core/config/ConfigManager';
+import type { ConfigManager } from '../../core/config/ConfigManager';
 import { AstroDocument } from '../../core/documents';
 import type { Plugin } from '../interfaces';
 export declare class CSSPlugin implements Plugin {

package/dist/plugins/css/CSSPlugin.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CSSPlugin = void 0;
+const emmet_helper_1 = require("@vscode/emmet-helper");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const documents_1 = require("../../core/documents");
-const emmet_helper_1 = require("@vscode/emmet-helper");
+const parseHtml_1 = require("../../core/documents/parseHtml");
 const CSSDocument_1 = require("./CSSDocument");
+const getIdClassCompletions_1 = require("./features/getIdClassCompletions");
 const language_service_1 = require("./language-service");
-const parseHtml_1 = require("../../core/documents/parseHtml");
 const StyleAttributeDocument_1 = require("./StyleAttributeDocument");
-const getIdClassCompletions_1 = require("./features/getIdClassCompletions");
 class CSSPlugin {
     constructor(configManager) {
         this.__name = 'css';

package/dist/plugins/css/StyleAttributeDocument.d.ts

@@ -1,5 +1,5 @@
-import { Stylesheet } from 'vscode-css-languageservice';
-import { Position } from 'vscode-languageserver';
+import type { Stylesheet } from 'vscode-css-languageservice';
+import type { Position } from 'vscode-languageserver';
 import { AstroDocument, DocumentMapper, ReadableDocument } from '../../core/documents';
 export declare class StyleAttributeDocument extends ReadableDocument implements DocumentMapper {
     private readonly parent;

package/dist/plugins/css/StyleAttributeDocument.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StyleAttributeDocument = void 0;
-const language_service_1 = require("./language-service");
 const documents_1 = require("../../core/documents");
+const language_service_1 = require("./language-service");
 const PREFIX = '__ {';
 const SUFFIX = '}';
 class StyleAttributeDocument extends documents_1.ReadableDocument {

package/dist/plugins/css/features/astro-selectors.d.ts

@@ -1,2 +1,2 @@
-import { IPseudoClassData } from 'vscode-css-languageservice';
+import type { IPseudoClassData } from 'vscode-css-languageservice';
 export declare const pseudoClass: IPseudoClassData[];

package/dist/plugins/css/features/getIdClassCompletions.d.ts

@@ -1,6 +1,6 @@
+import type { Stylesheet } from 'vscode-css-languageservice';
 import { CompletionItem, CompletionList } from 'vscode-languageserver';
-import { AttributeContext } from '../../../core/documents/parseHtml';
-import { Stylesheet } from 'vscode-css-languageservice';
+import type { AttributeContext } from '../../../core/documents/parseHtml';
 export declare function getIdClassCompletion(stylesheets: Stylesheet[], attributeContext: AttributeContext): CompletionList | null;
 /**
  * incomplete see

package/dist/plugins/html/HTMLPlugin.d.ts

@@ -1,7 +1,7 @@
-import { CompletionList, Position, FoldingRange, Hover, SymbolInformation, LinkedEditingRanges } from 'vscode-languageserver';
+import { CompletionList, FoldingRange, Hover, LinkedEditingRanges, Position, SymbolInformation } from 'vscode-languageserver';
+import type { ConfigManager } from '../../core/config/ConfigManager';
+import type { AstroDocument } from '../../core/documents/AstroDocument';
 import type { Plugin } from '../interfaces';
-import { ConfigManager } from '../../core/config/ConfigManager';
-import { AstroDocument } from '../../core/documents/AstroDocument';
 export declare class HTMLPlugin implements Plugin {
     __name: string;
     private lang;

package/dist/plugins/html/HTMLPlugin.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTMLPlugin = void 0;
-const vscode_languageserver_1 = require("vscode-languageserver");
 const emmet_helper_1 = require("@vscode/emmet-helper");
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
+const vscode_languageserver_1 = require("vscode-languageserver");
 const utils_1 = require("../../core/documents/utils");
 const astro_attributes_1 = require("./features/astro-attributes");
 const utils_2 = require("./utils");