@astrojs/language-server 0.11.0 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @astrojs/language-server
 
+## 0.12.0
+
+### Minor Changes
+
+- 8a58a56: Refactor the language-server, fixes many issues related to imports, add support for completions in multiple style tags
+
 ## 0.11.0
 
 ### Minor Changes

package/bin/browserServer.js

@@ -0,0 +1,3 @@
+#! /usr/bin/env node
+
+require('../dist/browser.js');

package/bin/nodeServer.js

@@ -0,0 +1,3 @@
+#! /usr/bin/env node
+
+require('../dist/node.js');

package/dist/browser.d.ts

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

package/dist/browser.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const browser_1 = require("vscode-languageserver/browser");
+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);

package/dist/check.js

@@ -15,11 +15,8 @@ class AstroCheck {
     }
     upsertDocument(doc) {
         this.docManager.openDocument({
-            languageId: 'astro',
-            version: 0,
             text: doc.text,
             uri: doc.uri,
-            overrideText: true
         });
         this.docManager.markAsOpenedInClient(doc.uri);
     }
@@ -37,7 +34,7 @@ class AstroCheck {
         }));
     }
     initialize(workspacePath) {
-        this.pluginHost.register(new plugins_1.TypeScriptPlugin(this.docManager, this.configManager, [workspacePath]));
+        this.pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(this.docManager, this.configManager, [workspacePath]));
     }
     async getDiagnosticsForFile(uri) {
         var _a;
@@ -45,7 +42,7 @@ class AstroCheck {
         return {
             filePath: new URL(uri).pathname || '',
             text: ((_a = this.docManager.get(uri)) === null || _a === void 0 ? void 0 : _a.getText()) || '',
-            diagnostics
+            diagnostics,
         };
     }
 }

package/dist/core/DiagnosticsManager.d.ts

@@ -1,5 +1,5 @@
 import { Connection, TextDocumentIdentifier, Diagnostic } from 'vscode-languageserver';
-import { DocumentManager, Document } from './documents';
+import { DocumentManager, AstroDocument } from './documents';
 export declare type SendDiagnostics = Connection['sendDiagnostics'];
 export declare type GetDiagnostics = (doc: TextDocumentIdentifier) => Thenable<Diagnostic[]>;
 export declare class DiagnosticsManager {
@@ -8,6 +8,6 @@ export declare class DiagnosticsManager {
     private getDiagnostics;
     constructor(sendDiagnostics: SendDiagnostics, docManager: DocumentManager, getDiagnostics: GetDiagnostics);
     updateAll(): void;
-    update(document: Document): Promise<void>;
-    removeDiagnostics(document: Document): void;
+    update(document: AstroDocument): Promise<void>;
+    removeDiagnostics(document: AstroDocument): void;
 }

package/dist/core/DiagnosticsManager.js

@@ -16,13 +16,13 @@ class DiagnosticsManager {
         const diagnostics = await this.getDiagnostics({ uri: document.getURL() });
         this.sendDiagnostics({
             uri: document.getURL(),
-            diagnostics
+            diagnostics,
         });
     }
     removeDiagnostics(document) {
         this.sendDiagnostics({
             uri: document.getURL(),
-            diagnostics: []
+            diagnostics: [],
         });
     }
 }

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

@@ -1,178 +1,33 @@
 import { VSCodeEmmetConfig } from '@vscode/emmet-helper';
-import { UserPreferences } from 'typescript';
-/**
-* Representation of the language server config.
-*/
-export interface LSConfig {
-    typescript: LSTypescriptConfig;
-    css: LSCSSConfig;
-    html: LSHTMLConfig;
-    astro: LSAstroConfig;
-}
-export interface LSTypescriptConfig {
-    enable: boolean;
-    diagnostics: {
-        enable: boolean;
-    };
-    hover: {
-        enable: boolean;
-    };
-    documentSymbols: {
-        enable: boolean;
-    };
-    completions: {
-        enable: boolean;
-    };
-    findReferences: {
-        enable: boolean;
-    };
-    definitions: {
-        enable: boolean;
-    };
-    codeActions: {
-        enable: boolean;
-    };
-    rename: {
-        enable: boolean;
-    };
-    selectionRange: {
-        enable: boolean;
-    };
-    signatureHelp: {
-        enable: boolean;
-    };
-    semanticTokens: {
-        enable: boolean;
-    };
-}
-export interface LSCSSConfig {
-    enable: boolean;
-    globals: string;
-    diagnostics: {
-        enable: boolean;
-    };
-    hover: {
-        enable: boolean;
-    };
-    completions: {
-        enable: boolean;
-        emmet: boolean;
-    };
-    documentColors: {
-        enable: boolean;
-    };
-    colorPresentations: {
-        enable: boolean;
-    };
-    documentSymbols: {
-        enable: boolean;
-    };
-    selectionRange: {
-        enable: boolean;
-    };
-}
-export interface LSHTMLConfig {
-    enable: boolean;
-    hover: {
-        enable: boolean;
-    };
-    completions: {
-        enable: boolean;
-        emmet: boolean;
-    };
-    tagComplete: {
-        enable: boolean;
-    };
-    documentSymbols: {
-        enable: boolean;
-    };
-    renameTags: {
-        enable: boolean;
-    };
-    linkedEditing: {
-        enable: boolean;
-    };
-}
-export declare type CompilerWarningsSettings = Record<string, 'ignore' | 'error'>;
-export interface LSAstroConfig {
-    enable: boolean;
-    compilerWarnings: CompilerWarningsSettings;
-    diagnostics: {
-        enable: boolean;
-    };
-    format: {
-        enable: boolean;
-    };
-    rename: {
-        enable: boolean;
-    };
-    completions: {
-        enable: boolean;
-    };
-    hover: {
-        enable: boolean;
-    };
-    codeActions: {
-        enable: boolean;
-    };
-    selectionRange: {
-        enable: boolean;
-    };
-}
-export declare type TsUserConfigLang = 'typescript' | 'javascript';
-declare type DeepPartial<T> = T extends CompilerWarningsSettings ? T : {
+import { LSConfig } from './interfaces';
+declare type DeepPartial<T> = T extends Record<string, unknown> ? {
     [P in keyof T]?: DeepPartial<T[P]>;
-};
-/**
- * A subset of the JS/TS VS Code settings which
- * are transformed to ts.UserPreferences.
- * It may not be available in other IDEs, that's why the keys are optional.
- */
-export interface TSUserConfig {
-    preferences?: TsUserPreferencesConfig;
-    suggest?: TSSuggestConfig;
-}
+} : T;
 /**
- * A subset of the JS/TS VS Code settings which
- * are transformed to ts.UserPreferences.
+ * Manager class to facilitate accessing and updating the user's config
+ * Not to be confused with other kind of configurations (such as the Astro project configuration and the TypeScript/Javascript one)
+ * For more info on this, see the [internal docs](../../../../../docs/internal/language-server/config.md)
  */
-export interface TsUserPreferencesConfig {
-    importModuleSpecifier: UserPreferences['importModuleSpecifierPreference'];
-    quoteStyle: UserPreferences['quotePreference'];
-}
-/**
- * A subset of the JS/TS VS Code settings which
- * are transformed to ts.UserPreferences.
- */
-export interface TSSuggestConfig {
-    includeAutomaticOptionalChainCompletions: boolean | undefined;
-}
 export declare class ConfigManager {
     private config;
-    private listeners;
     private emmetConfig;
-    private tsUserPreferences;
-    /**
-       * Updates config.
-       */
-    update(config: DeepPartial<LSConfig>): void;
+    private isTrusted;
+    updateConfig(config: DeepPartial<LSConfig>): void;
+    updateEmmetConfig(config: VSCodeEmmetConfig): void;
+    getEmmetConfig(): VSCodeEmmetConfig;
     /**
-       * Whether or not specified config is enabled
-       * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
-       */
+     * Whether or not specified setting is enabled
+     * @param key a string which is a path. Example: 'astro.diagnostics.enabled'.
+     */
     enabled(key: string): boolean;
     /**
-      * Get specific config
-      * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
-      */
+     * Get a specific setting value
+     * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
+     */
     get<T>(key: string): T;
     /**
-    * Register a listener which is invoked when the config changed.
-    */
-    onChange(callback: (config: ConfigManager) => void): void;
-    updateEmmetConfig(config: VSCodeEmmetConfig): void;
-    updateTsJsUserPreferences(config: Record<TsUserConfigLang, TSUserConfig>): void;
-    private _updateTsUserPreferences;
-    getEmmetConfig(): VSCodeEmmetConfig;
+     * Get the entire user configuration
+     */
+    getFullConfig(): Readonly<LSConfig>;
 }
 export {};

package/dist/core/config/ConfigManager.js

@@ -2,134 +2,95 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigManager = void 0;
 const lodash_1 = require("lodash");
-/**
- * Default config for the language server.
- */
 const defaultLSConfig = {
+    astro: {
+        enabled: true,
+        diagnostics: { enabled: true },
+        rename: { enabled: true },
+        format: { enabled: true },
+        completions: { enabled: true },
+        hover: { enabled: true },
+        codeActions: { enabled: true },
+        selectionRange: { enabled: true },
+    },
     typescript: {
-        enable: true,
-        diagnostics: { enable: true },
-        hover: { enable: true },
-        completions: { enable: true },
-        definitions: { enable: true },
-        findReferences: { enable: true },
-        documentSymbols: { enable: true },
-        codeActions: { enable: true },
-        rename: { enable: true },
-        selectionRange: { enable: true },
-        signatureHelp: { enable: true },
-        semanticTokens: { enable: true }
+        enabled: true,
+        diagnostics: { enabled: true },
+        hover: { enabled: true },
+        completions: { enabled: true },
+        definitions: { enabled: true },
+        findReferences: { enabled: true },
+        documentSymbols: { enabled: true },
+        codeActions: { enabled: true },
+        rename: { enabled: true },
+        selectionRange: { enabled: true },
+        signatureHelp: { enabled: true },
+        semanticTokens: { enabled: true },
+        implementation: { enabled: true },
+        typeDefinition: { enabled: true },
     },
     css: {
-        enable: true,
-        globals: '',
-        diagnostics: { enable: true },
-        hover: { enable: true },
-        completions: { enable: true, emmet: true },
-        documentColors: { enable: true },
-        colorPresentations: { enable: true },
-        documentSymbols: { enable: true },
-        selectionRange: { enable: true }
+        enabled: true,
+        diagnostics: { enabled: true },
+        hover: { enabled: true },
+        completions: { enabled: true, emmet: true },
+        documentColors: { enabled: true },
+        colorPresentations: { enabled: true },
+        documentSymbols: { enabled: true },
+        selectionRange: { enabled: true },
     },
     html: {
-        enable: true,
-        hover: { enable: true },
-        completions: { enable: true, emmet: true },
-        tagComplete: { enable: true },
-        documentSymbols: { enable: true },
-        renameTags: { enable: true },
-        linkedEditing: { enable: true }
+        enabled: true,
+        hover: { enabled: true },
+        completions: { enabled: true, emmet: true },
+        tagComplete: { enabled: true },
+        documentSymbols: { enabled: true },
+        renameTags: { enabled: true },
+        linkedEditing: { enabled: true },
     },
-    astro: {
-        enable: true,
-        compilerWarnings: {},
-        diagnostics: { enable: true },
-        rename: { enable: true },
-        format: {
-            enable: true
-        },
-        completions: { enable: true },
-        hover: { enable: true },
-        codeActions: { enable: true },
-        selectionRange: { enable: true }
-    }
 };
+/**
+ * Manager class to facilitate accessing and updating the user's config
+ * Not to be confused with other kind of configurations (such as the Astro project configuration and the TypeScript/Javascript one)
+ * For more info on this, see the [internal docs](../../../../../docs/internal/language-server/config.md)
+ */
 class ConfigManager {
     constructor() {
         this.config = defaultLSConfig;
-        this.listeners = [];
         this.emmetConfig = {};
-        this.tsUserPreferences = {
-            typescript: {
-                includeCompletionsForImportStatements: true,
-                includeCompletionsWithInsertText: true,
-                includeAutomaticOptionalChainCompletions: true
-            },
-            javascript: {
-                includeCompletionsForImportStatements: true,
-                includeCompletionsWithInsertText: true,
-                includeAutomaticOptionalChainCompletions: true
-            }
-        };
+        this.isTrusted = true;
     }
-    /**
-       * Updates config.
-       */
-    update(config) {
-        var _a;
+    updateConfig(config) {
         // Ideally we shouldn't need the merge here because all updates should be valid and complete configs.
         // But since those configs come from the client they might be out of synch with the valid config:
         // We might at some point in the future forget to synch config settings in all packages after updating the config.
         this.config = (0, lodash_1.merge)({}, defaultLSConfig, this.config, config);
-        // Merge will keep arrays/objects if the new one is empty/has less entries,
-        // therefore we need some extra checks if there are new settings
-        if ((_a = config.astro) === null || _a === void 0 ? void 0 : _a.compilerWarnings) {
-            this.config.astro.compilerWarnings = config.astro.compilerWarnings;
-        }
-        this.listeners.forEach((listener) => listener(this));
+    }
+    updateEmmetConfig(config) {
+        this.emmetConfig = config || {};
+    }
+    getEmmetConfig() {
+        return this.emmetConfig;
     }
     /**
-       * Whether or not specified config is enabled
-       * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
-       */
+     * Whether or not specified setting is enabled
+     * @param key a string which is a path. Example: 'astro.diagnostics.enabled'.
+     */
     enabled(key) {
         return !!this.get(key);
     }
     /**
-      * Get specific config
-      * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
-      */
+     * Get a specific setting value
+     * @param key a string which is a path. Example: 'astro.diagnostics.enable'.
+     */
     get(key) {
         return (0, lodash_1.get)(this.config, key);
     }
     /**
-    * Register a listener which is invoked when the config changed.
-    */
-    onChange(callback) {
-        this.listeners.push(callback);
-    }
-    updateEmmetConfig(config) {
-        this.emmetConfig = config || {};
-    }
-    updateTsJsUserPreferences(config) {
-        ['typescript', 'javascript'].forEach((lang) => {
-            if (config[lang]) {
-                this._updateTsUserPreferences(lang, config[lang]);
-            }
-        });
-    }
-    _updateTsUserPreferences(lang, config) {
-        var _a, _b, _c, _d;
-        this.tsUserPreferences[lang] = {
-            ...this.tsUserPreferences[lang],
-            importModuleSpecifierPreference: (_a = config.preferences) === null || _a === void 0 ? void 0 : _a.importModuleSpecifier,
-            quotePreference: (_b = config.preferences) === null || _b === void 0 ? void 0 : _b.quoteStyle,
-            includeAutomaticOptionalChainCompletions: (_d = (_c = config.suggest) === null || _c === void 0 ? void 0 : _c.includeAutomaticOptionalChainCompletions) !== null && _d !== void 0 ? _d : true,
-            includeCompletionsWithInsertText: true
-        };
-    }
-    getEmmetConfig() {
-        return this.emmetConfig;
+     * Get the entire user configuration
+     */
+    getFullConfig() {
+        return this.config;
     }
 }
 exports.ConfigManager = ConfigManager;

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

@@ -1 +1,2 @@
 export * from './ConfigManager';
+export * from './interfaces';

package/dist/core/config/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ConfigManager"), exports);
+__exportStar(require("./interfaces"), exports);

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

@@ -0,0 +1,123 @@
+/**
+ * Representation of the language server config.
+ * Make sure that this is kept in sync with the `package.json` of the VS Code extension
+ */
+export interface LSConfig {
+    astro: LSAstroConfig;
+    typescript: LSTypescriptConfig;
+    html: LSHTMLConfig;
+    css: LSCSSConfig;
+}
+export interface LSAstroConfig {
+    enabled: boolean;
+    diagnostics: {
+        enabled: boolean;
+    };
+    format: {
+        enabled: boolean;
+    };
+    rename: {
+        enabled: boolean;
+    };
+    completions: {
+        enabled: boolean;
+    };
+    hover: {
+        enabled: boolean;
+    };
+    codeActions: {
+        enabled: boolean;
+    };
+    selectionRange: {
+        enabled: boolean;
+    };
+}
+export interface LSTypescriptConfig {
+    enabled: boolean;
+    diagnostics: {
+        enabled: boolean;
+    };
+    hover: {
+        enabled: boolean;
+    };
+    documentSymbols: {
+        enabled: boolean;
+    };
+    completions: {
+        enabled: boolean;
+    };
+    findReferences: {
+        enabled: boolean;
+    };
+    definitions: {
+        enabled: boolean;
+    };
+    codeActions: {
+        enabled: boolean;
+    };
+    rename: {
+        enabled: boolean;
+    };
+    selectionRange: {
+        enabled: boolean;
+    };
+    signatureHelp: {
+        enabled: boolean;
+    };
+    semanticTokens: {
+        enabled: boolean;
+    };
+    implementation: {
+        enabled: boolean;
+    };
+    typeDefinition: {
+        enabled: boolean;
+    };
+}
+export interface LSHTMLConfig {
+    enabled: boolean;
+    hover: {
+        enabled: boolean;
+    };
+    completions: {
+        enabled: boolean;
+        emmet: boolean;
+    };
+    tagComplete: {
+        enabled: boolean;
+    };
+    documentSymbols: {
+        enabled: boolean;
+    };
+    renameTags: {
+        enabled: boolean;
+    };
+    linkedEditing: {
+        enabled: boolean;
+    };
+}
+export interface LSCSSConfig {
+    enabled: boolean;
+    diagnostics: {
+        enabled: boolean;
+    };
+    hover: {
+        enabled: boolean;
+    };
+    completions: {
+        enabled: boolean;
+        emmet: boolean;
+    };
+    documentColors: {
+        enabled: boolean;
+    };
+    colorPresentations: {
+        enabled: boolean;
+    };
+    documentSymbols: {
+        enabled: boolean;
+    };
+    selectionRange: {
+        enabled: boolean;
+    };
+}

package/dist/core/config/interfaces.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,18 @@
+import { HTMLDocument } from 'vscode-html-languageservice';
+import { WritableDocument } from './DocumentBase';
+import { AstroMetadata } from './parseAstro';
+import { TagInformation } from './utils';
+export declare class AstroDocument extends WritableDocument {
+    url: string;
+    content: string;
+    languageId: string;
+    astroMeta: AstroMetadata;
+    html: HTMLDocument;
+    styleTags: TagInformation[];
+    constructor(url: string, content: string);
+    private updateDocInfo;
+    setText(text: string): void;
+    getText(): string;
+    getURL(): string;
+    getFilePath(): string | null;
+}

package/dist/core/documents/AstroDocument.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AstroDocument = void 0;
+const utils_1 = require("../../utils");
+const DocumentBase_1 = require("./DocumentBase");
+const parseAstro_1 = require("./parseAstro");
+const parseHtml_1 = require("./parseHtml");
+const utils_2 = require("./utils");
+class AstroDocument extends DocumentBase_1.WritableDocument {
+    constructor(url, content) {
+        super();
+        this.url = url;
+        this.content = content;
+        this.languageId = 'astro';
+        this.updateDocInfo();
+    }
+    updateDocInfo() {
+        this.astroMeta = (0, parseAstro_1.parseAstro)(this.content);
+        this.html = (0, parseHtml_1.parseHtml)(this.content);
+        this.styleTags = (0, utils_2.extractStyleTags)(this.content, this.html);
+    }
+    setText(text) {
+        this.content = text;
+        this.version++;
+        this.updateDocInfo();
+    }
+    getText() {
+        return this.content;
+    }
+    getURL() {
+        return this.url;
+    }
+    getFilePath() {
+        return (0, utils_1.urlToPath)(this.url);
+    }
+}
+exports.AstroDocument = AstroDocument;