@astrojs/language-server 0.11.0 → 0.13.0

package/dist/server.js

@@ -1,42 +1,67 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startServer = void 0;
-const vscode_languageserver_1 = require("vscode-languageserver");
-const documents_1 = require("./core/documents");
-const config_1 = require("./core/config");
-const plugins_1 = require("./plugins");
+exports.startLanguageServer = void 0;
+const vscode = __importStar(require("vscode-languageserver"));
+const ConfigManager_1 = require("./core/config/ConfigManager");
+const DocumentManager_1 = require("./core/documents/DocumentManager");
 const DiagnosticsManager_1 = require("./core/DiagnosticsManager");
+const AstroPlugin_1 = require("./plugins/astro/AstroPlugin");
+const CSSPlugin_1 = require("./plugins/css/CSSPlugin");
+const HTMLPlugin_1 = require("./plugins/html/HTMLPlugin");
+const PluginHost_1 = require("./plugins/PluginHost");
+const TypeScriptPlugin_1 = require("./plugins/typescript/TypeScriptPlugin");
 const utils_1 = require("./utils");
-const TagCloseRequest = new vscode_languageserver_1.RequestType('html/tag');
-/**
- * Starts `astro-languageservice`
- */
-function startServer() {
-    let connection = (0, vscode_languageserver_1.createConnection)(vscode_languageserver_1.ProposedFeatures.all);
-    const docManager = documents_1.DocumentManager.newInstance();
-    const configManager = new config_1.ConfigManager();
-    const pluginHost = new plugins_1.PluginHost(docManager);
-    connection.onInitialize((evt) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-        const workspaceUris = (_b = (_a = evt.workspaceFolders) === null || _a === void 0 ? void 0 : _a.map((folder) => folder.uri.toString())) !== null && _b !== void 0 ? _b : [(_c = evt.rootUri) !== null && _c !== void 0 ? _c : ''];
+const TagCloseRequest = new vscode.RequestType('html/tag');
+// Start the language server
+function startLanguageServer(connection) {
+    // Create our managers
+    const configManager = new ConfigManager_1.ConfigManager();
+    const documentManager = new DocumentManager_1.DocumentManager();
+    const pluginHost = new PluginHost_1.PluginHost(documentManager);
+    connection.onInitialize((params) => {
+        var _a, _b, _c, _d, _e, _f;
+        const workspaceUris = (_b = (_a = params.workspaceFolders) === null || _a === void 0 ? void 0 : _a.map((folder) => folder.uri.toString())) !== null && _b !== void 0 ? _b : [(_c = params.rootUri) !== null && _c !== void 0 ? _c : ''];
         pluginHost.initialize({
-            filterIncompleteCompletions: !((_d = evt.initializationOptions) === null || _d === void 0 ? void 0 : _d.dontFilterIncompleteCompletions),
-            definitionLinkSupport: !!((_f = (_e = evt.capabilities.textDocument) === null || _e === void 0 ? void 0 : _e.definition) === null || _f === void 0 ? void 0 : _f.linkSupport),
+            filterIncompleteCompletions: !((_d = params.initializationOptions) === null || _d === void 0 ? void 0 : _d.dontFilterIncompleteCompletions),
+            definitionLinkSupport: !!((_f = (_e = params.capabilities.textDocument) === null || _e === void 0 ? void 0 : _e.definition) === null || _f === void 0 ? void 0 : _f.linkSupport),
         });
-        pluginHost.register(new plugins_1.HTMLPlugin(docManager, configManager));
-        pluginHost.register(new plugins_1.CSSPlugin(docManager, configManager));
-        pluginHost.register(new plugins_1.TypeScriptPlugin(docManager, configManager, workspaceUris));
-        pluginHost.register(new plugins_1.AstroPlugin(docManager, configManager, workspaceUris));
-        configManager.update(((_j = (_h = (_g = evt.initializationOptions) === null || _g === void 0 ? void 0 : _g.configuration) === null || _h === void 0 ? void 0 : _h.astro) === null || _j === void 0 ? void 0 : _j.plugin) ||
-            ((_k = evt.initializationOptions) === null || _k === void 0 ? void 0 : _k.config) ||
-            {});
-        configManager.updateTsJsUserPreferences(((_l = evt.initializationOptions) === null || _l === void 0 ? void 0 : _l.configuration) ||
-            ((_m = evt.initializationOptions) === null || _m === void 0 ? void 0 : _m.typescriptConfig) ||
-            {});
-        configManager.updateEmmetConfig(((_p = (_o = evt.initializationOptions) === null || _o === void 0 ? void 0 : _o.configuration) === null || _p === void 0 ? void 0 : _p.emmet) || ((_q = evt.initializationOptions) === null || _q === void 0 ? void 0 : _q.emmetConfig) || {});
+        // Register plugins
+        pluginHost.registerPlugin(new HTMLPlugin_1.HTMLPlugin(configManager));
+        pluginHost.registerPlugin(new CSSPlugin_1.CSSPlugin(configManager));
+        // We don't currently support running the TypeScript and Astro plugin in the browser
+        if (params.initializationOptions.environment !== 'browser') {
+            pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(documentManager, configManager, workspaceUris));
+            pluginHost.registerPlugin(new TypeScriptPlugin_1.TypeScriptPlugin(documentManager, configManager, workspaceUris));
+        }
+        // Update language-server config with what the user supplied to us at launch
+        configManager.updateConfig(params.initializationOptions.configuration.astro);
+        configManager.updateEmmetConfig(params.initializationOptions.configuration.emmet);
         return {
             capabilities: {
-                textDocumentSync: vscode_languageserver_1.TextDocumentSyncKind.Incremental,
+                textDocumentSync: vscode.TextDocumentSyncKind.Incremental,
                 foldingRangeProvider: true,
                 definitionProvider: true,
                 renameProvider: true,
@@ -69,7 +94,9 @@ function startServer() {
                         ':',
                     ],
                 },
+                colorProvider: true,
                 hoverProvider: true,
+                documentSymbolProvider: true,
                 signatureHelpProvider: {
                     triggerCharacters: ['(', ',', '<'],
                     retriggerCharacters: [')'],
@@ -77,17 +104,22 @@ function startServer() {
             },
         };
     });
+    // On update of the user configuration of the language-server
+    connection.onDidChangeConfiguration(({ settings }) => {
+        configManager.updateConfig(settings.astro);
+        configManager.updateEmmetConfig(settings.emmet);
+    });
     // Documents
-    connection.onDidOpenTextDocument((evt) => {
-        docManager.openDocument(Object.assign({ overrideText: true }, evt.textDocument));
-        docManager.markAsOpenedInClient(evt.textDocument.uri);
+    connection.onDidOpenTextDocument((params) => {
+        documentManager.openDocument(params.textDocument);
+        documentManager.markAsOpenedInClient(params.textDocument.uri);
     });
-    connection.onDidCloseTextDocument((evt) => docManager.closeDocument(evt.textDocument.uri));
-    const diagnosticsManager = new DiagnosticsManager_1.DiagnosticsManager(connection.sendDiagnostics, docManager, pluginHost.getDiagnostics.bind(pluginHost));
-    const updateAllDiagnostics = (0, utils_1.debounceThrottle)(() => diagnosticsManager.updateAll(), 1000);
-    connection.onDidChangeTextDocument((evt) => {
-        docManager.updateDocument(evt.textDocument.uri, evt.contentChanges);
+    connection.onDidCloseTextDocument((params) => documentManager.closeDocument(params.textDocument.uri));
+    connection.onDidChangeTextDocument((params) => {
+        documentManager.updateDocument(params.textDocument, params.contentChanges);
     });
+    const diagnosticsManager = new DiagnosticsManager_1.DiagnosticsManager(connection.sendDiagnostics, documentManager, pluginHost.getDiagnostics.bind(pluginHost));
+    const updateAllDiagnostics = (0, utils_1.debounceThrottle)(() => diagnosticsManager.updateAll(), 1000);
     connection.onDidChangeWatchedFiles((evt) => {
         const params = evt.changes
             .map((change) => ({
@@ -98,15 +130,10 @@ function startServer() {
         pluginHost.onWatchFileChanges(params);
         updateAllDiagnostics();
     });
-    //connection.onDidChangeTextDocument(updateAllDiagnostics);
-    // Config
-    connection.onDidChangeConfiguration(({ settings }) => {
-        var _a;
-        configManager.update((_a = settings.astro) === null || _a === void 0 ? void 0 : _a.plugin);
-        configManager.updateEmmetConfig(settings.emmet);
-        configManager.updateTsJsUserPreferences(settings);
-    });
     // Features
+    connection.onHover((params) => pluginHost.doHover(params.textDocument, params.position));
+    connection.onDefinition((evt) => pluginHost.getDefinitions(evt.textDocument, evt.position));
+    connection.onFoldingRanges((evt) => pluginHost.getFoldingRanges(evt.textDocument));
     connection.onCompletion(async (evt) => {
         const promise = pluginHost.getCompletions(evt.textDocument, evt.position, evt.context);
         return promise;
@@ -118,14 +145,26 @@ function startServer() {
         }
         return pluginHost.resolveCompletion(data, completionItem);
     });
-    connection.onHover((evt) => pluginHost.doHover(evt.textDocument, evt.position));
-    connection.onDefinition((evt) => pluginHost.getDefinitions(evt.textDocument, evt.position));
-    connection.onFoldingRanges((evt) => pluginHost.getFoldingRanges(evt.textDocument));
+    connection.onDocumentSymbol((params, cancellationToken) => pluginHost.getDocumentSymbols(params.textDocument, cancellationToken));
+    connection.onDocumentColor((params) => pluginHost.getDocumentColors(params.textDocument));
+    connection.onColorPresentation((params) => pluginHost.getColorPresentations(params.textDocument, params.range, params.color));
     connection.onRequest(TagCloseRequest, (evt) => pluginHost.doTagComplete(evt.textDocument, evt.position));
     connection.onSignatureHelp((evt, cancellationToken) => pluginHost.getSignatureHelp(evt.textDocument, evt.position, evt.context, cancellationToken));
-    connection.onRenameRequest(evt => pluginHost.rename(evt.textDocument, evt.position, evt.newName));
-    docManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
-    docManager.on('documentClose', (document) => diagnosticsManager.removeDiagnostics(document));
+    connection.onRenameRequest((evt) => pluginHost.rename(evt.textDocument, evt.position, evt.newName));
+    connection.onDidSaveTextDocument(updateAllDiagnostics);
+    connection.onNotification('$/onDidChangeNonAstroFile', async (e) => {
+        const path = (0, utils_1.urlToPath)(e.uri);
+        if (path) {
+            pluginHost.updateNonAstroFile(path, e.changes);
+        }
+        updateAllDiagnostics();
+    });
+    documentManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
+    documentManager.on('documentClose', (document) => diagnosticsManager.removeDiagnostics(document));
+    // Taking off 🚀
+    connection.onInitialized(() => {
+        connection.console.log('Successfully initialized! 🚀');
+    });
     connection.listen();
 }
-exports.startServer = startServer;
+exports.startLanguageServer = startLanguageServer;

package/dist/utils.d.ts

@@ -2,22 +2,28 @@ import { Position, Range } from 'vscode-languageserver';
 import { Node } from 'vscode-html-languageservice';
 /** Normalizes a document URI */
 export declare function normalizeUri(uri: string): string;
+/**
+ * Some paths (on windows) start with a upper case driver letter, some don't.
+ * This is normalized here.
+ */
+export declare function normalizePath(path: string): string;
 /** Turns a URL into a normalized FS Path */
 export declare function urlToPath(stringUrl: string): string | null;
 /** Converts a path to a URL */
 export declare function pathToUrl(path: string): string;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * Given a path like foo/bar or foo/bar.astro , returns its last path
+ * (bar or bar.astro in this example).
+ */
+export declare function getLastPartOfPath(path: 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;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * Return true if a specific node could be a component with a client directive on it.
+ * 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 isPossibleClientComponent(node: Node): boolean;
 /** Flattens an array */
@@ -25,9 +31,7 @@ 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;
-/** Checks if a position is inside range */
-export declare function isInRange(positionToTest: Position, range: Range): boolean;
-/**  */
+export declare function isInRange(range: Range, positionToTest: Position): boolean;
 export declare function isBeforeOrEqualToPosition(position: Position, positionToTest: Position): boolean;
 /**
  * Debounces a function but cancels previous invocation only if
@@ -35,15 +39,15 @@ export declare function isBeforeOrEqualToPosition(position: Position, positionTo
  *
  * @param fn The function with it's argument
  * @param determineIfSame The function which determines if the previous invocation should be canceld or not
- * @param miliseconds Number of miliseconds to debounce
+ * @param milliseconds Number of miliseconds to debounce
  */
-export declare function debounceSameArg<T>(fn: (arg: T) => void, shouldCancelPrevious: (newArg: T, prevArg?: T) => boolean, miliseconds: number): (arg: T) => void;
+export declare function debounceSameArg<T>(fn: (arg: T) => void, shouldCancelPrevious: (newArg: T, prevArg?: T) => boolean, milliseconds: number): (arg: T) => void;
 /**
- * Debounces a function but also waits at minimum the specified number of miliseconds until
+ * Debounces a function but also waits at minimum the specified number of milliseconds until
  * the next invocation. This avoids needless calls when a synchronous call (like diagnostics)
  * took too long and the whole timeout of the next call was eaten up already.
  *
  * @param fn The function with it's argument
- * @param miliseconds Number of miliseconds to debounce/throttle
+ * @param milliseconds Number of milliseconds to debounce/throttle
  */
-export declare function debounceThrottle<T extends (...args: any) => void>(fn: T, miliseconds: number): T;
+export declare function debounceThrottle<T extends (...args: any) => void>(fn: T, milliseconds: number): T;

package/dist/utils.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.debounceThrottle = exports.debounceSameArg = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleClientComponent = exports.isPossibleComponent = exports.pathToUrl = exports.urlToPath = exports.normalizeUri = void 0;
+exports.debounceThrottle = exports.debounceSameArg = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleClientComponent = exports.isPossibleComponent = 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) {
     return vscode_uri_1.URI.parse(uri).toString();
 }
 exports.normalizeUri = normalizeUri;
+/**
+ * Some paths (on windows) start with a upper case driver letter, some don't.
+ * This is normalized here.
+ */
+function normalizePath(path) {
+    return vscode_uri_1.URI.file(path).fsPath.replace(/\\/g, '/');
+}
+exports.normalizePath = normalizePath;
 /** Turns a URL into a normalized FS Path */
 function urlToPath(stringUrl) {
     const url = vscode_uri_1.URI.parse(stringUrl);
@@ -22,21 +30,25 @@ function pathToUrl(path) {
 }
 exports.pathToUrl = pathToUrl;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * Given a path like foo/bar or foo/bar.astro , returns its last path
+ * (bar or bar.astro in this example).
+ */
+function getLastPartOfPath(path) {
+    return path.replace(/\\/g, '/').split('/').pop() || '';
+}
+exports.getLastPartOfPath = getLastPartOfPath;
+/**
+ * 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) {
-    var _a;
-    return !!((_a = node.tag) === null || _a === void 0 ? void 0 : _a[0].match(/[A-Z]/));
+    var _a, _b;
+    return !!((_a = node.tag) === null || _a === void 0 ? void 0 : _a[0].match(/[A-Z]/)) || !!((_b = node.tag) === null || _b === void 0 ? void 0 : _b.match(/.+[.][A-Z]/));
 }
 exports.isPossibleComponent = isPossibleComponent;
 /**
- *
- * The language service is case insensitive, and would provide
- * hover info for Svelte components like `Option` which have
- * the same name like a html tag.
+ * Return true if a specific node could be a component with a client directive on it.
+ * 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 isPossibleClientComponent(node) {
     if (isPossibleComponent(node) && node.attributes) {
@@ -63,14 +75,13 @@ function isNotNullOrUndefined(val) {
     return val !== undefined && val !== null;
 }
 exports.isNotNullOrUndefined = isNotNullOrUndefined;
-/** Checks if a position is inside range */
-function isInRange(positionToTest, range) {
+function isInRange(range, positionToTest) {
     return isBeforeOrEqualToPosition(range.end, positionToTest) && isBeforeOrEqualToPosition(positionToTest, range.start);
 }
 exports.isInRange = isInRange;
-/**  */
 function isBeforeOrEqualToPosition(position, positionToTest) {
-    return positionToTest.line < position.line || (positionToTest.line === position.line && positionToTest.character <= position.character);
+    return (positionToTest.line < position.line ||
+        (positionToTest.line === position.line && positionToTest.character <= position.character));
 }
 exports.isBeforeOrEqualToPosition = isBeforeOrEqualToPosition;
 /**
@@ -79,9 +90,9 @@ exports.isBeforeOrEqualToPosition = isBeforeOrEqualToPosition;
  *
  * @param fn The function with it's argument
  * @param determineIfSame The function which determines if the previous invocation should be canceld or not
- * @param miliseconds Number of miliseconds to debounce
+ * @param milliseconds Number of miliseconds to debounce
  */
-function debounceSameArg(fn, shouldCancelPrevious, miliseconds) {
+function debounceSameArg(fn, shouldCancelPrevious, milliseconds) {
     let timeout;
     let prevArg;
     return (arg) => {
@@ -92,31 +103,31 @@ function debounceSameArg(fn, shouldCancelPrevious, miliseconds) {
         timeout = setTimeout(() => {
             fn(arg);
             prevArg = undefined;
-        }, miliseconds);
+        }, milliseconds);
     };
 }
 exports.debounceSameArg = debounceSameArg;
 /**
- * Debounces a function but also waits at minimum the specified number of miliseconds until
+ * Debounces a function but also waits at minimum the specified number of milliseconds until
  * the next invocation. This avoids needless calls when a synchronous call (like diagnostics)
  * took too long and the whole timeout of the next call was eaten up already.
  *
  * @param fn The function with it's argument
- * @param miliseconds Number of miliseconds to debounce/throttle
+ * @param milliseconds Number of milliseconds to debounce/throttle
  */
-function debounceThrottle(fn, miliseconds) {
+function debounceThrottle(fn, milliseconds) {
     let timeout;
-    let lastInvocation = Date.now() - miliseconds;
+    let lastInvocation = Date.now() - milliseconds;
     function maybeCall(...args) {
         clearTimeout(timeout);
         timeout = setTimeout(() => {
-            if (Date.now() - lastInvocation < miliseconds) {
+            if (Date.now() - lastInvocation < milliseconds) {
                 maybeCall(...args);
                 return;
             }
             fn(...args);
             lastInvocation = Date.now();
-        }, miliseconds);
+        }, milliseconds);
     }
     return maybeCall;
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
   "main": "dist/index.js",
   "bin": {
-    "astro-ls": "./bin/server.js"
+    "astro-ls": "./bin/nodeServer.js"
   },
   "files": [
     "dist",
@@ -16,27 +16,33 @@
   "scripts": {
     "build": "tsc",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "tap --no-coverage test/**"
+    "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
     "@astrojs/svelte-language-integration": "^0.1.0",
+    "@vscode/emmet-helper": "^2.8.4",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",
-    "ts-morph": "^12.0.0",
-    "typescript": "^4.5.4",
-    "vscode-css-languageservice": "^5.1.1",
-    "@vscode/emmet-helper": "^2.8.4",
-    "vscode-html-languageservice": "^3.0.3",
-    "vscode-languageserver": "6.1.1",
+    "typescript": "~4.6.2",
+    "vscode-css-languageservice": "^5.1.13",
+    "vscode-html-languageservice": "^4.2.2",
+    "vscode-languageserver": "7.0.0",
     "vscode-languageserver-protocol": "^3.16.0",
     "vscode-languageserver-textdocument": "^1.0.1",
     "vscode-languageserver-types": "^3.16.0",
     "vscode-uri": "^3.0.2"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.116",
-    "astro": "^0.23.5",
+    "@types/chai": "^4.3.0",
+    "@types/lodash": "^4.14.179",
+    "@types/mocha": "^9.1.0",
+    "@types/sinon": "^10.0.11",
+    "astro": "^0.23.7",
     "astro-scripts": "0.0.1",
-    "tap": "^15.0.9"
+    "chai": "^4.3.6",
+    "cross-env": "^7.0.3",
+    "mocha": "^9.2.2",
+    "sinon": "^13.0.1",
+    "ts-node": "^10.7.0"
   }
 }