@astrojs/language-server 0.19.4 → 0.19.5

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @astrojs/language-server
 
+## 0.19.5
+
+### Patch Changes
+
+- 421ab52: Added a new setting (`astro.typescript.allowArbitraryAttributes`) to enable support for arbitrary attributes
+- 06e3c95: Updated behaviour when no settings are provided. All features are now considered enabled by default
+- 301dcfb: Remove Lodash from the code base, significally reducing the file count of the package
+- dd1283b: Updated Component detection so completions now work for namespaced components (for example, typing `<myMarkdown.` will now give you a completion for the Content component)
+
 ## 0.19.4
 
 ### Patch Changes

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

@@ -15,12 +15,13 @@ declare type DeepPartial<T> = T extends Record<string, unknown> ? {
 export declare class ConfigManager {
     private globalConfig;
     private documentSettings;
+    shouldRefreshTSServices: boolean;
     private isTrusted;
     private connection;
     constructor(connection?: Connection);
     updateConfig(): void;
     removeDocument(scopeUri: string): void;
-    getConfig<T>(section: string, scopeUri: string): Promise<T>;
+    getConfig<T>(section: string, scopeUri: string): Promise<T | Record<string, any>>;
     getEmmetConfig(document: TextDocument): Promise<VSCodeEmmetConfig>;
     getAstroFormatConfig(document: TextDocument): Promise<LSFormatConfig>;
     getTSFormatConfig(document: TextDocument, vscodeOptions?: FormattingOptions): Promise<FormatCodeSettings>;

package/dist/core/config/ConfigManager.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigManager = exports.defaultLSConfig = void 0;
-const lodash_1 = require("lodash");
 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
+// 2. Inside tests, where we don't have a client connection because.. well.. we don't have a client
+// Additionally, the default config is used to set default settings for some settings (ex: formatting settings)
 exports.defaultLSConfig = {
     typescript: {
         enabled: true,
+        allowArbitraryAttributes: false,
         diagnostics: { enabled: true },
         hover: { enabled: true },
         completions: { enabled: true },
@@ -31,7 +36,7 @@ exports.defaultLSConfig = {
         documentSymbols: { enabled: true },
     },
     format: {
-        indentFrontmatter: true,
+        indentFrontmatter: false,
         newLineAfterFrontmatter: true,
     },
 };
@@ -44,19 +49,22 @@ class ConfigManager {
     constructor(connection) {
         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
         this.documentSettings = {};
+        this.shouldRefreshTSServices = true;
     }
     removeDocument(scopeUri) {
         delete this.documentSettings[scopeUri];
     }
     async getConfig(section, scopeUri) {
         if (!this.connection) {
-            return this.globalConfig[section];
+            return (0, utils_1.get)(this.globalConfig, section) ?? {};
         }
         if (!this.documentSettings[scopeUri]) {
             this.documentSettings[scopeUri] = {};
@@ -71,13 +79,22 @@ class ConfigManager {
     }
     async getEmmetConfig(document) {
         const emmetConfig = (await this.getConfig('emmet', document.uri)) ?? {};
-        return emmetConfig;
+        return {
+            ...emmetConfig,
+            preferences: emmetConfig.preferences ?? {},
+            showExpandedAbbreviation: emmetConfig.showExpandedAbbreviation ?? 'always',
+            showAbbreviationSuggestions: emmetConfig.showAbbreviationSuggestions ?? true,
+            syntaxProfiles: emmetConfig.syntaxProfiles ?? {},
+            variables: emmetConfig.variables ?? {},
+            excludeLanguages: emmetConfig.excludeLanguages ?? [],
+            showSuggestionsAsSnippets: emmetConfig.showSuggestionsAsSnippets ?? false,
+        };
     }
     async getAstroFormatConfig(document) {
         const astroFormatConfig = (await this.getConfig('astro.format', document.uri)) ?? {};
         return {
-            indentFrontmatter: astroFormatConfig.indentFrontmatter ?? true,
-            newLineAfterFrontmatter: astroFormatConfig.newLineAfterFrontmatter ?? true,
+            indentFrontmatter: astroFormatConfig.indentFrontmatter ?? exports.defaultLSConfig.format.indentFrontmatter,
+            newLineAfterFrontmatter: astroFormatConfig.newLineAfterFrontmatter ?? exports.defaultLSConfig.format.newLineAfterFrontmatter,
         };
     }
     async getTSFormatConfig(document, vscodeOptions) {
@@ -144,13 +161,13 @@ class ConfigManager {
     async isEnabled(document, plugin, feature) {
         const config = (await this.getConfig('astro', document.uri)) ?? {};
         if (config[plugin]) {
-            let res = config[plugin].enabled;
+            let res = config[plugin].enabled ?? true;
             if (feature && config[plugin][feature]) {
-                res = res && config[plugin][feature].enabled;
+                res = (res && config[plugin][feature].enabled) ?? true;
             }
             return res;
         }
-        return false;
+        return true;
     }
     /**
      * Updating the global config should only be done in cases where the client doesn't support `workspace/configuration`
@@ -161,11 +178,12 @@ class ConfigManager {
      */
     updateGlobalConfig(config, outsideAstro) {
         if (outsideAstro) {
-            this.globalConfig = (0, lodash_1.merge)({}, this.globalConfig, config);
+            this.globalConfig = (0, utils_1.mergeDeep)({}, this.globalConfig, config);
         }
         else {
-            this.globalConfig.astro = (0, lodash_1.merge)({}, exports.defaultLSConfig, this.globalConfig.astro, config);
+            this.globalConfig.astro = (0, utils_1.mergeDeep)({}, exports.defaultLSConfig, this.globalConfig.astro, config);
         }
+        this.shouldRefreshTSServices = true;
     }
 }
 exports.ConfigManager = ConfigManager;

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

@@ -3,74 +3,75 @@
  * Make sure that this is kept in sync with the `package.json` of the VS Code extension
  */
 export interface LSConfig {
-    typescript: LSTypescriptConfig;
-    html: LSHTMLConfig;
-    css: LSCSSConfig;
-    format: LSFormatConfig;
+    typescript?: LSTypescriptConfig;
+    html?: LSHTMLConfig;
+    css?: LSCSSConfig;
+    format?: LSFormatConfig;
 }
 export interface LSFormatConfig {
-    indentFrontmatter: boolean;
-    newLineAfterFrontmatter: boolean;
+    indentFrontmatter?: boolean;
+    newLineAfterFrontmatter?: boolean;
 }
 export interface LSTypescriptConfig {
-    enabled: boolean;
-    diagnostics: {
-        enabled: boolean;
+    enabled?: boolean;
+    allowArbitraryAttributes?: boolean;
+    diagnostics?: {
+        enabled?: boolean;
     };
-    hover: {
-        enabled: boolean;
+    hover?: {
+        enabled?: boolean;
     };
-    documentSymbols: {
-        enabled: boolean;
+    documentSymbols?: {
+        enabled?: boolean;
     };
-    completions: {
-        enabled: boolean;
+    completions?: {
+        enabled?: boolean;
     };
-    definitions: {
-        enabled: boolean;
+    definitions?: {
+        enabled?: boolean;
     };
-    codeActions: {
-        enabled: boolean;
+    codeActions?: {
+        enabled?: boolean;
     };
-    rename: {
-        enabled: boolean;
+    rename?: {
+        enabled?: boolean;
     };
-    signatureHelp: {
-        enabled: boolean;
+    signatureHelp?: {
+        enabled?: boolean;
     };
-    semanticTokens: {
-        enabled: boolean;
+    semanticTokens?: {
+        enabled?: boolean;
     };
 }
 export interface LSHTMLConfig {
-    enabled: boolean;
-    hover: {
-        enabled: boolean;
+    enabled?: boolean;
+    hover?: {
+        enabled?: boolean;
     };
-    completions: {
-        enabled: boolean;
-        emmet: boolean;
+    completions?: {
+        enabled?: boolean;
+        emmet?: boolean;
     };
-    tagComplete: {
-        enabled: boolean;
+    tagComplete?: {
+        enabled?: boolean;
     };
-    documentSymbols: {
-        enabled: boolean;
+    documentSymbols?: {
+        enabled?: boolean;
     };
 }
 export interface LSCSSConfig {
-    enabled: boolean;
-    hover: {
-        enabled: boolean;
+    enabled?: boolean;
+    hover?: {
+        enabled?: boolean;
     };
-    completions: {
-        enabled: boolean;
-        emmet: boolean;
+    completions?: {
+        enabled?: boolean;
+        emmet?: boolean;
     };
-    documentColors: {
-        enabled: boolean;
+    documentColors?: {
+        enabled?: boolean;
     };
-    documentSymbols: {
-        enabled: boolean;
+    documentSymbols?: {
+        enabled?: boolean;
     };
 }

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

@@ -17,18 +17,15 @@ 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 getLineAtPosition(position: Position, text: string): string;
-/**
- * Returns the node if offset is inside a HTML start tag
- */
-export declare function getNodeIfIsInHTMLStartTag(html: HTMLDocument, offset: number): Node | undefined;
-/**
- * Return if a Node is a Component
- */
-export declare function isComponentTag(node: Node): boolean;
 /**
  * Return if a given offset is inside the start tag of a component
  */
 export declare function isInComponentStartTag(html: HTMLDocument, offset: number): boolean;
+/**
+ * Return true if a specific node could be a component.
+ * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
+ */
+export declare function isPossibleComponent(node: Node): boolean;
 /**
  * Return if the current position is in a specific tag
  */

package/dist/core/documents/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstNonWhitespaceIndex = exports.getLineOffsets = exports.offsetAt = exports.positionAt = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInTag = exports.isInComponentStartTag = exports.isComponentTag = exports.getNodeIfIsInHTMLStartTag = exports.getLineAtPosition = exports.extractScriptTags = exports.extractStyleTags = exports.walk = void 0;
+exports.getFirstNonWhitespaceIndex = exports.getLineOffsets = exports.offsetAt = exports.positionAt = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInTag = exports.isPossibleComponent = 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");
@@ -97,35 +97,22 @@ function getLineAtPosition(position, text) {
     return text.substring(offsetAt({ line: position.line, character: 0 }, text), offsetAt({ line: position.line, character: Number.MAX_VALUE }, text));
 }
 exports.getLineAtPosition = getLineAtPosition;
-/**
- * Returns the node if offset is inside a HTML start tag
- */
-function getNodeIfIsInHTMLStartTag(html, offset) {
-    const node = html.findNodeAt(offset);
-    if (!!node.tag && node.tag[0] === node.tag[0].toLowerCase() && (!node.startTagEnd || offset < node.startTagEnd)) {
-        return node;
-    }
-}
-exports.getNodeIfIsInHTMLStartTag = getNodeIfIsInHTMLStartTag;
-/**
- * Return if a Node is a Component
- */
-function isComponentTag(node) {
-    if (!node.tag) {
-        return false;
-    }
-    const firstChar = node.tag[0];
-    return /[A-Z]/.test(firstChar);
-}
-exports.isComponentTag = isComponentTag;
 /**
  * Return if a given offset is inside the start tag of a component
  */
 function isInComponentStartTag(html, offset) {
     const node = html.findNodeAt(offset);
-    return isComponentTag(node) && (!node.startTagEnd || offset < node.startTagEnd);
+    return isPossibleComponent(node) && (!node.startTagEnd || offset < node.startTagEnd);
 }
 exports.isInComponentStartTag = isInComponentStartTag;
+/**
+ * Return true if a specific node could be a component.
+ * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
+ */
+function isPossibleComponent(node) {
+    return !!node.tag?.[0].match(/[A-Z]/) || !!node.tag?.match(/.+[.][A-Z]?/);
+}
+exports.isPossibleComponent = isPossibleComponent;
 /**
  * Return if the current position is in a specific tag
  */

package/dist/plugins/PluginHost.d.ts

@@ -1,7 +1,7 @@
 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 type { AppCompletionItem, Plugin } from './interfaces';
 import { DocumentManager } from '../core/documents/DocumentManager';
-interface PluginHostConfig {
+export interface PluginHostConfig {
     filterIncompleteCompletions: boolean;
     definitionLinkSupport: boolean;
 }
@@ -17,22 +17,21 @@ export declare class PluginHost {
     getDiagnostics(textDocument: TextDocumentIdentifier): Promise<Diagnostic[]>;
     doHover(textDocument: TextDocumentIdentifier, position: Position): Promise<Hover | null>;
     formatDocument(textDocument: TextDocumentIdentifier, options: FormattingOptions): Promise<TextEdit[]>;
-    getCodeActions(textDocument: TextDocumentIdentifier, range: Range, context: CodeActionContext, cancellationToken: CancellationToken): Promise<CodeAction[]>;
+    getCodeActions(textDocument: TextDocumentIdentifier, range: Range, context: CodeActionContext, cancellationToken?: CancellationToken): Promise<CodeAction[]>;
     doTagComplete(textDocument: TextDocumentIdentifier, position: Position): Promise<string | null>;
     getFoldingRanges(textDocument: TextDocumentIdentifier): Promise<FoldingRange[] | null>;
-    getDocumentSymbols(textDocument: TextDocumentIdentifier, cancellationToken: CancellationToken): Promise<SymbolInformation[]>;
+    getDocumentSymbols(textDocument: TextDocumentIdentifier, cancellationToken?: CancellationToken): Promise<SymbolInformation[]>;
     getSemanticTokens(textDocument: TextDocumentIdentifier, range?: Range, cancellationToken?: CancellationToken): Promise<SemanticTokens | null>;
     getLinkedEditingRanges(textDocument: TextDocumentIdentifier, position: Position): Promise<LinkedEditingRanges | null>;
     getDefinitions(textDocument: TextDocumentIdentifier, position: Position): Promise<DefinitionLink[] | Location[]>;
     rename(textDocument: TextDocumentIdentifier, position: Position, newName: string): Promise<WorkspaceEdit | null>;
     getDocumentColors(textDocument: TextDocumentIdentifier): Promise<ColorInformation[]>;
-    getInlayHints(textDocument: TextDocumentIdentifier, range: Range, cancellationToken: CancellationToken): Promise<InlayHint[]>;
     getColorPresentations(textDocument: TextDocumentIdentifier, range: Range, color: Color): Promise<ColorPresentation[]>;
-    getSignatureHelp(textDocument: TextDocumentIdentifier, position: Position, context: SignatureHelpContext | undefined, cancellationToken: CancellationToken): Promise<SignatureHelp | null>;
+    getInlayHints(textDocument: TextDocumentIdentifier, range: Range, cancellationToken?: CancellationToken): Promise<InlayHint[]>;
+    getSignatureHelp(textDocument: TextDocumentIdentifier, position: Position, context: SignatureHelpContext | undefined, cancellationToken?: CancellationToken): Promise<SignatureHelp | null>;
     onWatchFileChanges(onWatchFileChangesParams: any[]): void;
     updateNonAstroFile(fileName: string, changes: TextDocumentContentChangeEvent[]): void;
     private getDocument;
     private execute;
     private tryExecutePlugin;
 }
-export {};

package/dist/plugins/PluginHost.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginHost = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const lodash_1 = require("lodash");
 const utils_1 = require("../utils");
 const documents_1 = require("../core/documents");
 var ExecuteMode;
@@ -38,11 +37,12 @@ class PluginHost {
         const ts = completions.find((completion) => completion.plugin === 'typescript');
         const astro = completions.find((completion) => completion.plugin === 'astro');
         if (html && ts) {
-            if ((0, documents_1.getNodeIfIsInHTMLStartTag)(document.html, document.offsetAt(position))) {
+            const inComponentStartTag = (0, documents_1.isInComponentStartTag)(document.html, document.offsetAt(position));
+            if (!inComponentStartTag) {
                 ts.result.items = [];
             }
             // If the Astro plugin has completions for us, don't show TypeScript's as they're most likely duplicates
-            if (astro && astro.result.items.length > 0 && (0, documents_1.isInComponentStartTag)(document.html, document.offsetAt(position))) {
+            if (astro && astro.result.items.length > 0 && inComponentStartTag) {
                 ts.result.items = [];
             }
             ts.result.items = ts.result.items.map((item) => {
@@ -52,8 +52,20 @@ class PluginHost {
                 return item;
             });
         }
-        let flattenedCompletions = (0, lodash_1.flatten)(completions.map((completion) => completion.result.items));
+        let flattenedCompletions = completions.flatMap((completion) => completion.result.items);
         const isIncomplete = completions.reduce((incomplete, completion) => incomplete || completion.result.isIncomplete, false);
+        // If the result is incomplete, we need to filter the results ourselves
+        // to throw out non-matching results. VSCode does filter client-side,
+        // but other IDEs might not.
+        if (isIncomplete && this.pluginHostConfig.filterIncompleteCompletions) {
+            const offset = document.offsetAt(position);
+            // Assumption for performance reasons:
+            // Noone types import names longer than 20 characters and still expects perfect autocompletion.
+            const text = document.getText().substring(Math.max(0, offset - 20), offset);
+            const start = (0, utils_1.regexLastIndexOf)(text, /[\W\s]/g) + 1;
+            const filterValue = text.substring(start).toLowerCase();
+            flattenedCompletions = flattenedCompletions.filter((comp) => comp.label.toLowerCase().includes(filterValue));
+        }
         return vscode_languageserver_1.CompletionList.create(flattenedCompletions, isIncomplete);
     }
     async resolveCompletion(textDocument, completionItem) {
@@ -63,7 +75,8 @@ class PluginHost {
     }
     async getDiagnostics(textDocument) {
         const document = this.getDocument(textDocument.uri);
-        return (0, lodash_1.flatten)(await this.execute('getDiagnostics', [document], ExecuteMode.Collect));
+        const diagnostics = await this.execute('getDiagnostics', [document], ExecuteMode.Collect);
+        return diagnostics;
     }
     async doHover(textDocument, position) {
         const document = this.getDocument(textDocument.uri);
@@ -71,11 +84,11 @@ class PluginHost {
     }
     async formatDocument(textDocument, options) {
         const document = this.getDocument(textDocument.uri);
-        return (0, lodash_1.flatten)(await this.execute('formatDocument', [document, options], ExecuteMode.Collect));
+        return await this.execute('formatDocument', [document, options], ExecuteMode.Collect);
     }
     async getCodeActions(textDocument, range, context, cancellationToken) {
         const document = this.getDocument(textDocument.uri);
-        return (0, lodash_1.flatten)(await this.execute('getCodeActions', [document, range, context, cancellationToken], ExecuteMode.Collect));
+        return await this.execute('getCodeActions', [document, range, context, cancellationToken], ExecuteMode.Collect);
     }
     async doTagComplete(textDocument, position) {
         const document = this.getDocument(textDocument.uri);
@@ -83,12 +96,11 @@ class PluginHost {
     }
     async getFoldingRanges(textDocument) {
         const document = this.getDocument(textDocument.uri);
-        const foldingRanges = (0, lodash_1.flatten)(await this.execute('getFoldingRanges', [document], ExecuteMode.Collect));
-        return foldingRanges;
+        return await this.execute('getFoldingRanges', [document], ExecuteMode.Collect);
     }
     async getDocumentSymbols(textDocument, cancellationToken) {
         const document = this.getDocument(textDocument.uri);
-        return (0, lodash_1.flatten)(await this.execute('getDocumentSymbols', [document, cancellationToken], ExecuteMode.Collect));
+        return await this.execute('getDocumentSymbols', [document, cancellationToken], ExecuteMode.Collect);
     }
     async getSemanticTokens(textDocument, range, cancellationToken) {
         const document = this.getDocument(textDocument.uri);
@@ -100,7 +112,7 @@ class PluginHost {
     }
     async getDefinitions(textDocument, position) {
         const document = this.getDocument(textDocument.uri);
-        const definitions = (0, lodash_1.flatten)(await this.execute('getDefinitions', [document, position], ExecuteMode.Collect));
+        const definitions = await this.execute('getDefinitions', [document, position], ExecuteMode.Collect);
         if (this.pluginHostConfig.definitionLinkSupport) {
             return definitions;
         }
@@ -114,21 +126,18 @@ class PluginHost {
     }
     async getDocumentColors(textDocument) {
         const document = this.getDocument(textDocument.uri);
-        return (0, lodash_1.flatten)(await this.execute('getDocumentColors', [document], ExecuteMode.Collect));
+        return await this.execute('getDocumentColors', [document], ExecuteMode.Collect);
     }
-    async getInlayHints(textDocument, range, cancellationToken) {
+    async getColorPresentations(textDocument, range, color) {
         const document = this.getDocument(textDocument.uri);
-        return (0, lodash_1.flatten)(await this.execute('getInlayHints', [document, range], ExecuteMode.FirstNonNull));
+        return await this.execute('getColorPresentations', [document, range, color], ExecuteMode.Collect);
     }
-    async getColorPresentations(textDocument, range, color) {
+    async getInlayHints(textDocument, range, cancellationToken) {
         const document = this.getDocument(textDocument.uri);
-        return (0, lodash_1.flatten)(await this.execute('getColorPresentations', [document, range, color], ExecuteMode.Collect));
+        return (await this.execute('getInlayHints', [document, range], ExecuteMode.FirstNonNull)) ?? [];
     }
     async getSignatureHelp(textDocument, position, context, cancellationToken) {
         const document = this.getDocument(textDocument.uri);
-        if (!document) {
-            throw new Error('Cannot call methods on an unopened document');
-        }
         return await this.execute('getSignatureHelp', [document, position, context, cancellationToken], ExecuteMode.FirstNonNull);
     }
     onWatchFileChanges(onWatchFileChangesParams) {
@@ -160,10 +169,10 @@ class PluginHost {
                 }
                 return null;
             case ExecuteMode.Collect:
-                return Promise.all(plugins.map((plugin) => {
+                return (await Promise.all(plugins.map((plugin) => {
                     let ret = this.tryExecutePlugin(plugin, name, args, []);
                     return ret;
-                }));
+                }))).flat();
             case ExecuteMode.None:
                 await Promise.all(plugins.map((plugin) => this.tryExecutePlugin(plugin, name, args, null)));
                 return;

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

@@ -7,11 +7,10 @@ exports.CompletionsProviderImpl = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const typescript_1 = __importDefault(require("typescript"));
 const utils_1 = require("../../../core/documents/utils");
-const utils_2 = require("../../../utils");
-const utils_3 = require("../../typescript/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_4 = require("../../html/utils");
+const utils_3 = require("../../html/utils");
 class CompletionsProviderImpl {
     constructor(languageServiceManager) {
         this.lastCompletion = null;
@@ -39,7 +38,7 @@ class CompletionsProviderImpl {
             }
             const isAstro = componentFilePath?.endsWith('.astro');
             if (!isAstro) {
-                const directives = (0, utils_4.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items);
+                const directives = (0, utils_3.removeDataAttrCompletion)(this.directivesHTMLLang.doComplete(document, position, html).items);
                 items.push(...directives);
             }
         }
@@ -87,7 +86,7 @@ class CompletionsProviderImpl {
         const offset = document.offsetAt(position);
         const html = document.html;
         const node = html.findNodeAt(offset);
-        if (!(0, utils_2.isPossibleComponent)(node)) {
+        if (!(0, utils_1.isPossibleComponent)(node)) {
             return { completions: [], componentFilePath: null };
         }
         const inAttribute = node.start + node.tag.length < offset;
@@ -106,7 +105,7 @@ class CompletionsProviderImpl {
         const componentName = node.tag;
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);
         // Get the source file
-        const tsFilePath = (0, utils_3.toVirtualAstroFilePath)(tsDoc.filePath);
+        const tsFilePath = (0, utils_2.toVirtualAstroFilePath)(tsDoc.filePath);
         const program = lang.getProgram();
         const sourceFile = program?.getSourceFile(tsFilePath);
         const typeChecker = program?.getTypeChecker();
@@ -183,7 +182,7 @@ class CompletionsProviderImpl {
     }
     getPropType(declarations, typeChecker) {
         for (const decl of declarations) {
-            const fileName = (0, utils_3.toVirtualFilePath)(decl.getSourceFile().fileName);
+            const fileName = (0, utils_2.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)) {
                     console.error(`We only support functions declarations at the moment`);

package/dist/plugins/css/CSSPlugin.js

@@ -9,7 +9,6 @@ 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");
-const lodash_1 = require("lodash");
 class CSSPlugin {
     constructor(configManager) {
         this.__name = 'css';
@@ -103,7 +102,7 @@ class CSSPlugin {
             items: [],
         };
         const extensionConfig = await this.configManager.getConfig('astro', document.uri);
-        if (extensionConfig.css.completions.emmet) {
+        if (extensionConfig?.css?.completions?.emmet ?? true) {
             langService.setCompletionParticipants([
                 {
                     onCssProperty: (context) => {
@@ -130,7 +129,7 @@ class CSSPlugin {
         if (!(await this.featureEnabled(document, 'documentColors'))) {
             return [];
         }
-        const allColorInfo = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
+        const allColorInfo = this.getCSSDocumentsForDocument(document).flatMap((cssDoc) => {
             const cssLang = extractLanguage(cssDoc);
             const langService = (0, language_service_1.getLanguageService)(cssLang);
             if (!isSupportedByLangService(cssLang)) {
@@ -140,13 +139,13 @@ class CSSPlugin {
                 .findDocumentColors(cssDoc, cssDoc.stylesheet)
                 .map((colorInfo) => (0, documents_1.mapObjWithRangeToOriginal)(cssDoc, colorInfo));
         });
-        return (0, lodash_1.flatten)(allColorInfo);
+        return allColorInfo;
     }
     async getColorPresentations(document, range, color) {
         if (!(await this.featureEnabled(document, 'documentColors'))) {
             return [];
         }
-        const allColorPres = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
+        const allColorPres = this.getCSSDocumentsForDocument(document).flatMap((cssDoc) => {
             const cssLang = extractLanguage(cssDoc);
             const langService = (0, language_service_1.getLanguageService)(cssLang);
             if ((!cssDoc.isInGenerated(range.start) && !cssDoc.isInGenerated(range.end)) ||
@@ -157,26 +156,26 @@ class CSSPlugin {
                 .getColorPresentations(cssDoc, cssDoc.stylesheet, color, (0, documents_1.mapRangeToGenerated)(cssDoc, range))
                 .map((colorPres) => (0, documents_1.mapColorPresentationToOriginal)(cssDoc, colorPres));
         });
-        return (0, lodash_1.flatten)(allColorPres);
+        return allColorPres;
     }
     getFoldingRanges(document) {
-        const allFoldingRanges = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
+        const allFoldingRanges = this.getCSSDocumentsForDocument(document).flatMap((cssDoc) => {
             const cssLang = extractLanguage(cssDoc);
             const langService = (0, language_service_1.getLanguageService)(cssLang);
             return langService.getFoldingRanges(cssDoc).map((foldingRange) => (0, documents_1.mapFoldingRangeToParent)(cssDoc, foldingRange));
         });
-        return (0, lodash_1.flatten)(allFoldingRanges);
+        return allFoldingRanges;
     }
     async getDocumentSymbols(document) {
         if (!(await this.featureEnabled(document, 'documentSymbols'))) {
             return [];
         }
-        const allDocumentSymbols = this.getCSSDocumentsForDocument(document).map((cssDoc) => {
+        const allDocumentSymbols = this.getCSSDocumentsForDocument(document).flatMap((cssDoc) => {
             return (0, language_service_1.getLanguageService)(extractLanguage(cssDoc))
                 .findDocumentSymbols(cssDoc, cssDoc.stylesheet)
                 .map((symbol) => (0, documents_1.mapSymbolInformationToOriginal)(cssDoc, symbol));
         });
-        return (0, lodash_1.flatten)(allDocumentSymbols);
+        return allDocumentSymbols;
     }
     inStyleAttributeWithoutInterpolation(attrContext, text) {
         return (attrContext.name === 'style' &&

package/dist/plugins/html/HTMLPlugin.js

@@ -5,9 +5,8 @@ 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 utils_1 = require("../../core/documents/utils");
-const utils_2 = require("../../utils");
 const astro_attributes_1 = require("./features/astro-attributes");
-const utils_3 = require("./utils");
+const utils_2 = require("./utils");
 class HTMLPlugin {
     constructor(configManager) {
         this.__name = 'html';
@@ -38,7 +37,7 @@ class HTMLPlugin {
             return null;
         }
         // If the node we're hovering on is a component, instead only provide astro-specific hover info
-        if ((0, utils_2.isPossibleComponent)(node)) {
+        if ((0, utils_1.isPossibleComponent)(node)) {
             return this.componentLang.doHover(document, position, html);
         }
         return this.lang.doHover(document, position, html);
@@ -64,7 +63,7 @@ class HTMLPlugin {
         };
         const emmetConfig = await this.configManager.getEmmetConfig(document);
         const extensionConfig = (await this.configManager.getConfig('astro', document.uri)) ?? {};
-        if (extensionConfig?.html?.completions?.emmet) {
+        if (extensionConfig?.html?.completions?.emmet ?? true) {
             this.lang.setCompletionParticipants([
                 {
                     onHtmlContent: () => (emmetResults = (0, emmet_helper_1.doComplete)(document, position, 'html', emmetConfig) || emmetResults),
@@ -74,7 +73,7 @@ class HTMLPlugin {
         // If we're in a component starting tag, we do not want HTML language completions
         // as HTML attributes are not valid for components
         const results = (0, utils_1.isInComponentStartTag)(html, document.offsetAt(position))
-            ? (0, utils_3.removeDataAttrCompletion)(this.attributeOnlyLang.doComplete(document, position, html).items)
+            ? (0, utils_2.removeDataAttrCompletion)(this.attributeOnlyLang.doComplete(document, position, html).items)
             : this.lang.doComplete(document, position, html).items;
         return vscode_languageserver_1.CompletionList.create([...results, ...this.getLangCompletions(results), ...emmetResults.items], 
         // Emmet completions change on every keystroke, so they are never complete

package/dist/plugins/typescript/LanguageServiceManager.js

@@ -25,6 +25,7 @@ class LanguageServiceManager {
         this.docContext = {
             createDocument: this.createDocument,
             globalSnapshotManager: this.globalSnapshotManager,
+            configManager: this.configManager,
         };
         const handleDocumentChange = (document) => {
             this.getSnapshot(document);

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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CodeActionsProviderImpl = exports.sortImportKind = void 0;
-const lodash_1 = require("lodash");
 const typescript_1 = __importDefault(require("typescript"));
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const documents_1 = require("../../../core/documents");
@@ -144,7 +143,7 @@ class CodeActionsProviderImpl {
             description: (0, utils_2.removeAstroComponentSuffix)(a.description),
             fixName: 'import',
         })) ?? [];
-        return (0, lodash_1.flatten)(completion.entries.filter((c) => c.name === name || c.name === suffixedName).map(toFix));
+        return completion.entries.filter((c) => c.name === name || c.name === suffixedName).flatMap(toFix);
     }
     async organizeSortImports(document, skipDestructiveCodeActions = false, cancellationToken) {
         const { lang, tsDoc } = await this.languageServiceManager.getLSAndTSDoc(document);

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

@@ -32,7 +32,6 @@ const typescript_1 = __importStar(require("typescript"));
 const vscode_languageserver_2 = require("vscode-languageserver");
 const utils_2 = require("../utils");
 const utils_3 = require("../../../utils");
-const lodash_1 = require("lodash");
 const previewer_1 = require("../previewer");
 const utils_4 = require("./utils");
 // `import {...} from '..'` or `import ... from '..'`
@@ -113,9 +112,9 @@ class CompletionsProviderImpl {
             if (!isCompletionInsideFrontmatter && node.parent && node.tag === undefined && !isCompletionInsideExpression) {
                 return null;
             }
-            // If the current node is not a component (aka, it doesn't start with a caps), let's disable ourselves as the user
+            // If the current node is not a component, let's disable ourselves as the user
             // is most likely looking for HTML completions
-            if (!isCompletionInsideFrontmatter && !(0, utils_1.isComponentTag)(node) && !isCompletionInsideExpression) {
+            if (!isCompletionInsideFrontmatter && !(0, utils_1.isPossibleComponent)(node) && !isCompletionInsideExpression) {
                 return null;
             }
             completions = lang.getCompletionsAtPosition(filePath, offset, {
@@ -317,7 +316,7 @@ class CompletionsProviderImpl {
     }
     getExistingImports(document) {
         const rawImports = (0, utils_3.getRegExpMatches)(scriptImportRegex, document.getText()).map((match) => (match[1] ?? match[2]).split(','));
-        const tidiedImports = (0, lodash_1.flatten)(rawImports).map((match) => match.trim());
+        const tidiedImports = rawImports.flat().map((match) => match.trim());
         return new Set(tidiedImports);
     }
     isAstroComponentImport(className) {

package/dist/plugins/typescript/language-service.d.ts

@@ -3,6 +3,7 @@ import ts from 'typescript';
 import { TextDocumentContentChangeEvent } from 'vscode-languageserver';
 import { GlobalSnapshotManager, SnapshotManager } from './snapshots/SnapshotManager';
 import { DocumentSnapshot } from './snapshots/DocumentSnapshot';
+import { ConfigManager } from '../../core/config';
 export interface LanguageServiceContainer {
     readonly tsconfigPath: string;
     readonly compilerOptions: ts.CompilerOptions;
@@ -28,6 +29,7 @@ export interface LanguageServiceContainer {
 export interface LanguageServiceDocumentContext {
     createDocument: (fileName: string, content: string) => AstroDocument;
     globalSnapshotManager: GlobalSnapshotManager;
+    configManager: ConfigManager;
 }
 export declare function getLanguageService(path: string, workspaceUris: string[], docContext: LanguageServiceDocumentContext): Promise<LanguageServiceContainer>;
 export declare function forAllLanguageServices(cb: (service: LanguageServiceContainer) => any): Promise<void>;

package/dist/plugins/typescript/language-service.js

@@ -53,6 +53,10 @@ exports.forAllLanguageServices = forAllLanguageServices;
  */
 async function getLanguageServiceForTsconfig(tsconfigPath, docContext, workspaceUris) {
     let service;
+    if (docContext.configManager.shouldRefreshTSServices) {
+        services.clear();
+        docContext.configManager.shouldRefreshTSServices = false;
+    }
     if (services.has(tsconfigPath)) {
         service = await services.get(tsconfigPath);
     }
@@ -69,26 +73,32 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     const workspacePaths = workspaceUris.map((uri) => (0, utils_1.urlToPath)(uri));
     const workspacePath = workspacePaths.find((uri) => tsconfigRoot.startsWith(uri)) || workspacePaths[0];
     const astroVersion = (0, utils_1.getUserAstroVersion)(workspacePath);
+    const config = (await docContext.configManager.getConfig('astro.typescript', workspacePath)) ?? {};
+    const allowArbitraryAttrs = config.allowArbitraryAttributes ?? false;
     // `raw` here represent the tsconfig merged with any extended config
     const { compilerOptions, fileNames: files, raw: fullConfig } = getParsedTSConfig();
     let projectVersion = 0;
     const snapshotManager = new SnapshotManager_1.SnapshotManager(docContext.globalSnapshotManager, files, fullConfig, tsconfigRoot || process.cwd());
     const astroModuleLoader = (0, module_loader_1.createAstroModuleLoader)(getScriptSnapshot, compilerOptions);
+    let languageServerDirectory;
+    try {
+        languageServerDirectory = (0, path_1.dirname)(require.resolve('@astrojs/language-server'));
+    }
+    catch (e) {
+        languageServerDirectory = __dirname;
+    }
     const scriptFileNames = [];
     // Before Astro 1.0, JSX definitions were inside of the language-server instead of inside Astro
     // TODO: Remove this and astro-jsx.d.ts in types when we consider having support for Astro < 1.0 unnecessary
     if (astroVersion.major === 0 || astroVersion.full === '1.0.0-beta.0') {
-        let languageServerDirectory;
-        try {
-            languageServerDirectory = (0, path_1.dirname)(require.resolve('@astrojs/language-server'));
-        }
-        catch (e) {
-            languageServerDirectory = __dirname;
-        }
         const astroTSXFile = typescript_1.default.sys.resolvePath((0, path_1.resolve)(languageServerDirectory, '../types/astro-jsx.d.ts'));
         scriptFileNames.push(astroTSXFile);
         console.warn("Version lower than 1.0 detected, using internal types instead of Astro's");
     }
+    if (allowArbitraryAttrs) {
+        const arbitraryAttrsDTS = typescript_1.default.sys.resolvePath((0, path_1.resolve)(languageServerDirectory, '../types/arbitrary-attrs.d.ts'));
+        scriptFileNames.push(arbitraryAttrsDTS);
+    }
     const host = {
         getNewLine: () => typescript_1.default.sys.newLine,
         useCaseSensitiveFileNames: () => typescript_1.default.sys.useCaseSensitiveFileNames,

package/dist/server.js

@@ -155,6 +155,7 @@ function startLanguageServer(connection) {
         else {
             configManager.updateGlobalConfig(change.settings.astro || ConfigManager_1.defaultLSConfig);
         }
+        updateAllDiagnostics();
     });
     // Documents
     connection.onDidOpenTextDocument((params) => {

package/dist/utils.d.ts

@@ -1,5 +1,4 @@
 import { Position, Range } from 'vscode-languageserver';
-import { Node } from 'vscode-html-languageservice';
 /** Normalizes a document URI */
 export declare function normalizeUri(uri: string): string;
 /**
@@ -16,6 +15,17 @@ export declare function pathToUrl(path: string): string;
  * (bar or bar.astro in this example).
  */
 export declare function getLastPartOfPath(path: string): string;
+/**
+ * Return an element in an object using a path as a string (ex: `astro.typescript.format` will return astro['typescript']['format']).
+ * From: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_get
+ */
+export declare function get<T>(obj: Record<string, any>, path: string): T | undefined;
+/**
+ * Performs a deep merge of objects and returns new object. Does not modify
+ * objects (immutable) and merges arrays via concatenation.
+ * From: https://stackoverflow.com/a/48218209
+ */
+export declare function mergeDeep(...objects: Record<string, any>[]): Record<string, any>;
 /**
  * Transform a string into PascalCase
  */
@@ -24,18 +34,15 @@ export declare function toPascalCase(string: string): string;
  * Function to modify each line of a text, preserving the line break style (`\n` or `\r\n`)
  */
 export declare function modifyLines(text: string, replacementFn: (line: string, lineIdx: number) => string): string;
-/**
- * Return true if a specific node could be a component.
- * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
- */
-export declare function isPossibleComponent(node: Node): boolean;
-/** Flattens an array */
-export declare function flatten<T>(arr: T[][]): T[];
 /** Clamps a number between min and max */
 export declare function clamp(num: number, min: number, max: number): number;
 export declare function isNotNullOrUndefined<T>(val: T | undefined | null): val is T;
 export declare function isInRange(range: Range, positionToTest: Position): boolean;
 export declare function isBeforeOrEqualToPosition(position: Position, positionToTest: Position): boolean;
+/**
+ * Like str.lastIndexOf, but for regular expressions. Note that you need to provide the g-flag to your RegExp!
+ */
+export declare function regexLastIndexOf(text: string, regex: RegExp, endPos?: number): number;
 /**
  * Get all matches of a regexp.
  */

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserAstroVersion = exports.debounceThrottle = exports.debounceSameArg = exports.getRegExpMatches = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleComponent = exports.modifyLines = exports.toPascalCase = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
+exports.getUserAstroVersion = exports.debounceThrottle = exports.debounceSameArg = exports.getRegExpMatches = exports.regexLastIndexOf = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.modifyLines = exports.toPascalCase = exports.mergeDeep = exports.get = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
 const vscode_uri_1 = require("vscode-uri");
 /** Normalizes a document URI */
 function normalizeUri(uri) {
@@ -37,6 +37,44 @@ function getLastPartOfPath(path) {
     return path.replace(/\\/g, '/').split('/').pop() || '';
 }
 exports.getLastPartOfPath = getLastPartOfPath;
+/**
+ * Return an element in an object using a path as a string (ex: `astro.typescript.format` will return astro['typescript']['format']).
+ * From: https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_get
+ */
+function get(obj, path) {
+    const travel = (regexp) => String.prototype.split
+        .call(path, regexp)
+        .filter(Boolean)
+        .reduce((res, key) => (res !== null && res !== undefined ? res[key] : res), obj);
+    const result = travel(/[,[\]]+?/) || travel(/[,[\].]+?/);
+    return result === undefined ? undefined : result;
+}
+exports.get = get;
+/**
+ * Performs a deep merge of objects and returns new object. Does not modify
+ * objects (immutable) and merges arrays via concatenation.
+ * From: https://stackoverflow.com/a/48218209
+ */
+function mergeDeep(...objects) {
+    const isObject = (obj) => obj && typeof obj === 'object';
+    return objects.reduce((prev, obj) => {
+        Object.keys(obj).forEach((key) => {
+            const pVal = prev[key];
+            const oVal = obj[key];
+            if (Array.isArray(pVal) && Array.isArray(oVal)) {
+                prev[key] = pVal.concat(...oVal);
+            }
+            else if (isObject(pVal) && isObject(oVal)) {
+                prev[key] = mergeDeep(pVal, oVal);
+            }
+            else {
+                prev[key] = oVal;
+            }
+        });
+        return prev;
+    }, {});
+}
+exports.mergeDeep = mergeDeep;
 /**
  * Transform a string into PascalCase
  */
@@ -62,19 +100,6 @@ function modifyLines(text, replacementFn) {
         .join('\r\n');
 }
 exports.modifyLines = modifyLines;
-/**
- * Return true if a specific node could be a component.
- * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
- */
-function isPossibleComponent(node) {
-    return !!node.tag?.[0].match(/[A-Z]/) || !!node.tag?.match(/.+[.][A-Z]/);
-}
-exports.isPossibleComponent = isPossibleComponent;
-/** Flattens an array */
-function flatten(arr) {
-    return arr.reduce((all, item) => [...all, ...item], []);
-}
-exports.flatten = flatten;
 /** Clamps a number between min and max */
 function clamp(num, min, max) {
     return Math.max(min, Math.min(max, num));
@@ -93,6 +118,25 @@ function isBeforeOrEqualToPosition(position, positionToTest) {
         (positionToTest.line === position.line && positionToTest.character <= position.character));
 }
 exports.isBeforeOrEqualToPosition = isBeforeOrEqualToPosition;
+/**
+ * Like str.lastIndexOf, but for regular expressions. Note that you need to provide the g-flag to your RegExp!
+ */
+function regexLastIndexOf(text, regex, endPos) {
+    if (endPos === undefined) {
+        endPos = text.length;
+    }
+    else if (endPos < 0) {
+        endPos = 0;
+    }
+    const stringToWorkWith = text.substring(0, endPos + 1);
+    let lastIndexOf = -1;
+    let result = null;
+    while ((result = regex.exec(stringToWorkWith)) !== null) {
+        lastIndexOf = result.index;
+    }
+    return lastIndexOf;
+}
+exports.regexLastIndexOf = regexLastIndexOf;
 /**
  * Get all matches of a regexp.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.19.4",
+  "version": "0.19.5",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -22,7 +22,6 @@
     "@astrojs/vue-language-integration": "^0.1.1",
     "@astrojs/svelte-language-integration": "^0.1.6",
     "@vscode/emmet-helper": "^2.8.4",
-    "lodash": "^4.17.21",
     "source-map": "^0.7.3",
     "typescript": "~4.6.4",
     "vscode-css-languageservice": "^6.0.1",
@@ -35,7 +34,6 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.0",
-    "@types/lodash": "^4.14.179",
     "@types/mocha": "^9.1.0",
     "@types/sinon": "^10.0.11",
     "astro": "^1.0.0-beta.1",

package/types/arbitrary-attrs.d.ts

@@ -0,0 +1,5 @@
+declare namespace astroHTML.JSX {
+	interface HTMLAttributes {
+		[name: string]: any;
+	}
+}