@astrojs/language-server 0.14.0 → 0.16.1

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

@@ -132,7 +132,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     function updateSnapshotFromDocument(document) {
         const filePath = document.getFilePath() || '';
         const prevSnapshot = snapshotManager.get(filePath);
-        if ((prevSnapshot === null || prevSnapshot === void 0 ? void 0 : prevSnapshot.version) === document.version) {
+        if (prevSnapshot?.version === document.version) {
             return prevSnapshot;
         }
         if (!prevSnapshot) {
@@ -186,16 +186,15 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         snapshotManager.updateNonAstroFile(fileName, changes);
     }
     function getParsedTSConfig() {
-        var _a, _b, _c, _d;
         let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {};
         // If our user has types in their config but it doesn't include the types needed for Astro, add them to the config
-        if ((_a = configJson.compilerOptions) === null || _a === void 0 ? void 0 : _a.types) {
-            if (!((_b = configJson.compilerOptions) === null || _b === void 0 ? void 0 : _b.types.includes('astro/env'))) {
+        if (configJson.compilerOptions?.types) {
+            if (!configJson.compilerOptions?.types.includes('astro/env')) {
                 configJson.compilerOptions.types.push('astro/env');
             }
             if (astroVersion.major >= 1 &&
                 astroVersion.full !== '1.0.0-beta.0' &&
-                !((_c = configJson.compilerOptions) === null || _c === void 0 ? void 0 : _c.types.includes('astro/astro-jsx'))) {
+                !configJson.compilerOptions?.types.includes('astro/astro-jsx')) {
                 configJson.compilerOptions.types.push('astro/astro-jsx');
             }
         }
@@ -203,7 +202,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         // Delete include so that .astro files don't get mistakenly excluded by the user
         delete configJson.include;
         // If the user supplied exclude, let's use theirs otherwise, use ours
-        (_d = configJson.exclude) !== null && _d !== void 0 ? _d : (configJson.exclude = getDefaultExclude());
+        configJson.exclude ?? (configJson.exclude = getDefaultExclude());
         // Everything here will always, unconditionally, be in the resulting config
         const forcedCompilerOptions = {
             noEmit: true,

package/dist/plugins/typescript/module-loader.js

@@ -39,7 +39,7 @@ class ModuleResolutionCache {
      */
     delete(resolvedModuleName) {
         this.cache.forEach((val, key) => {
-            if ((val === null || val === void 0 ? void 0 : val.resolvedFileName) === resolvedModuleName) {
+            if (val?.resolvedFileName === resolvedModuleName) {
                 this.cache.delete(key);
             }
         });

package/dist/plugins/typescript/previewer.js

@@ -72,7 +72,7 @@ function getTagBodyText(tag) {
 function getTagDocumentation(tag) {
     function getWithType() {
         const body = (typescript_1.default.displayPartsToString(tag.text) || '').split(/^(\S+)\s*-?\s*/);
-        if ((body === null || body === void 0 ? void 0 : body.length) === 3) {
+        if (body?.length === 3) {
             const param = body[1];
             const doc = body[2];
             const label = `*@${tag.name}* \`${param}\``;

package/dist/plugins/typescript/snapshots/SnapshotManager.js

@@ -129,7 +129,7 @@ class SnapshotManager {
         const { include, exclude } = this.fileSpec;
         // Since we default to not include anything,
         //  just don't waste time on this
-        if ((include === null || include === void 0 ? void 0 : include.length) === 0) {
+        if (include?.length === 0) {
             return;
         }
         const projectFiles = typescript_1.default.sys

package/dist/plugins/typescript/snapshots/utils.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createFromFrameworkFilePath = exports.createFromAstroFilePath = exports.createFromTSFilePath = exports.createFromNonAstroFilePath = exports.createFromFilePath = exports.createFromDocument = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const astro2tsx_1 = __importDefault(require("../astro2tsx"));
+const vscode_uri_1 = require("vscode-uri");
 const utils_1 = require("../utils");
 const DocumentSnapshot_1 = require("./DocumentSnapshot");
 const svelte_language_integration_1 = require("@astrojs/svelte-language-integration");
+const utils_2 = require("../../../utils");
 // Utilities to create Snapshots from different contexts
 function createFromDocument(document) {
-    const { code } = (0, astro2tsx_1.default)(document.getText());
+    const { code } = (0, astro2tsx_1.default)(document.getText(), classNameFromFilename(document.getURL()));
     return new DocumentSnapshot_1.AstroSnapshot(document, code, typescript_1.default.ScriptKind.TSX);
 }
 exports.createFromDocument = createFromDocument;
@@ -53,8 +55,7 @@ exports.createFromNonAstroFilePath = createFromNonAstroFilePath;
  * @param options options that apply in case it's a svelte file
  */
 function createFromTSFilePath(filePath) {
-    var _a;
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, originalText);
 }
 exports.createFromTSFilePath = createFromTSFilePath;
@@ -64,21 +65,38 @@ exports.createFromTSFilePath = createFromTSFilePath;
  * @param createDocument function that is used to create a document
  */
 function createFromAstroFilePath(filePath, createDocument) {
-    var _a;
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     return createFromDocument(createDocument(filePath, originalText));
 }
 exports.createFromAstroFilePath = createFromAstroFilePath;
 function createFromFrameworkFilePath(filePath, framework) {
-    var _a;
-    const originalText = (_a = typescript_1.default.sys.readFile(filePath)) !== null && _a !== void 0 ? _a : '';
+    const className = classNameFromFilename(filePath);
+    const originalText = typescript_1.default.sys.readFile(filePath) ?? '';
     let code = '';
     if (framework === 'svelte') {
-        code = (0, svelte_language_integration_1.toTSX)(originalText);
+        code = (0, svelte_language_integration_1.toTSX)(originalText, className);
     }
     else {
-        code = 'export default function(props: Record<string, any>): any {<div></div>}';
+        code = `export default function ${className}__AstroComponent_(props: Record<string, any>): any {}`;
     }
     return new DocumentSnapshot_1.TypeScriptDocumentSnapshot(0, filePath, code, typescript_1.default.ScriptKind.TSX);
 }
 exports.createFromFrameworkFilePath = createFromFrameworkFilePath;
+function classNameFromFilename(filename) {
+    const url = vscode_uri_1.URI.parse(filename);
+    const withoutExtensions = vscode_uri_1.Utils.basename(url).slice(0, -vscode_uri_1.Utils.extname(url).length);
+    const withoutInvalidCharacters = withoutExtensions
+        .split('')
+        // Although "-" is invalid, we leave it in, pascal-case-handling will throw it out later
+        .filter((char) => /[A-Za-z$_\d-]/.test(char))
+        .join('');
+    const firstValidCharIdx = withoutInvalidCharacters
+        .split('')
+        // Although _ and $ are valid first characters for classes, they are invalid first characters
+        // for tag names. For a better import autocompletion experience, we therefore throw them out.
+        .findIndex((char) => /[A-Za-z]/.test(char));
+    const withoutLeadingInvalidCharacters = withoutInvalidCharacters.substr(firstValidCharIdx);
+    const inPascalCase = (0, utils_2.toPascalCase)(withoutLeadingInvalidCharacters);
+    const finalName = firstValidCharIdx === -1 ? `A${inPascalCase}` : inPascalCase;
+    return finalName;
+}

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

@@ -1,5 +1,6 @@
 import ts from 'typescript';
 import { CompletionItemKind, DiagnosticSeverity, Position, Range, SymbolKind, SemanticTokensLegend } from 'vscode-languageserver';
+import { AstroDocument } from '../../core/documents';
 import { SnapshotFragment } from './snapshots/DocumentSnapshot';
 export declare const enum TokenType {
     class = 0,
@@ -39,6 +40,9 @@ export declare function convertRange(document: {
     length?: number;
 }): Range;
 export declare function convertToLocationRange(defDoc: SnapshotFragment, textSpan: ts.TextSpan): Range;
+export declare function ensureFrontmatterInsert(resultRange: Range, document: AstroDocument): Range;
+export declare function checkEndOfFileCodeInsert(resultRange: Range, document: AstroDocument): Range;
+export declare function removeAstroComponentSuffix(name: string): string;
 export declare type FrameworkExt = 'astro' | 'vue' | 'jsx' | 'tsx' | 'svelte';
 declare type FrameworkVirtualExt = 'ts' | 'tsx';
 export declare function getFrameworkFromFilePath(filePath: string): FrameworkExt;

package/dist/plugins/typescript/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
+exports.ensureRealFilePath = exports.ensureRealAstroFilePath = exports.toRealAstroFilePath = exports.toVirtualFilePath = exports.toVirtualAstroFilePath = exports.isVirtualFilePath = exports.isVirtualSvelteFilePath = exports.isVirtualVueFilePath = exports.isVirtualAstroFilePath = exports.isFrameworkFilePath = exports.isAstroFilePath = exports.isVirtualFrameworkFilePath = exports.getFrameworkFromFilePath = exports.removeAstroComponentSuffix = exports.checkEndOfFileCodeInsert = exports.ensureFrontmatterInsert = exports.convertToLocationRange = exports.convertRange = exports.mapSeverity = exports.getScriptKindFromFileName = exports.isSubPath = exports.findTsConfigPath = exports.getExtensionFromScriptKind = exports.getCommitCharactersForScriptElement = exports.scriptElementKindToCompletionItemKind = exports.symbolKindFromString = exports.getSemanticTokenLegend = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const path_1 = require("path");
 const utils_1 = require("../../utils");
@@ -239,6 +239,34 @@ function convertToLocationRange(defDoc, textSpan) {
     return range;
 }
 exports.convertToLocationRange = convertToLocationRange;
+// Some code actions will insert code at the start of the file instead of inside our frontmatter
+// We'll redirect those to the proper starting place
+function ensureFrontmatterInsert(resultRange, document) {
+    if (document.astroMeta.frontmatter.state === 'closed') {
+        const position = document.positionAt(document.astroMeta.frontmatter.startOffset);
+        position.line += 1;
+        position.character = resultRange.start.character;
+        return vscode_languageserver_1.Range.create(position, position);
+    }
+    return resultRange;
+}
+exports.ensureFrontmatterInsert = ensureFrontmatterInsert;
+// Some code actions ill insert code at the end of the generated TSX file, so we'll manually
+// redirect it to the end of the frontmatter instead
+function checkEndOfFileCodeInsert(resultRange, document) {
+    if (resultRange.start.line > document.lineCount) {
+        if (document.astroMeta.frontmatter.state === 'closed') {
+            const position = document.positionAt(document.astroMeta.frontmatter.endOffset);
+            return vscode_languageserver_1.Range.create(position, position);
+        }
+    }
+    return resultRange;
+}
+exports.checkEndOfFileCodeInsert = checkEndOfFileCodeInsert;
+function removeAstroComponentSuffix(name) {
+    return name.replace(/(\w+)__AstroComponent_/, '$1');
+}
+exports.removeAstroComponentSuffix = removeAstroComponentSuffix;
 const VirtualExtension = {
     ts: 'ts',
     tsx: 'tsx',

package/dist/server.js

@@ -36,16 +36,17 @@ const PluginHost_1 = require("./plugins/PluginHost");
 const plugins_1 = require("./plugins");
 const utils_1 = require("./utils");
 const utils_2 = require("./plugins/typescript/utils");
+const CodeActionsProvider_1 = require("./plugins/typescript/features/CodeActionsProvider");
 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);
+    const configManager = new ConfigManager_1.ConfigManager(connection);
+    let hasConfigurationCapability = false;
     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 : ''];
+        const workspaceUris = params.workspaceFolders?.map((folder) => folder.uri.toString()) ?? [params.rootUri ?? ''];
         workspaceUris.forEach((uri) => {
             uri = (0, utils_1.urlToPath)(uri);
             const astroVersion = (0, utils_1.getUserAstroVersion)(uri);
@@ -62,9 +63,10 @@ function startLanguageServer(connection) {
                 });
             }
         });
+        hasConfigurationCapability = !!(params.capabilities.workspace && !!params.capabilities.workspace.configuration);
         pluginHost.initialize({
-            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),
+            filterIncompleteCompletions: !params.initializationOptions?.dontFilterIncompleteCompletions,
+            definitionLinkSupport: !!params.capabilities.textDocument?.definition?.linkSupport,
         });
         // Register plugins
         pluginHost.registerPlugin(new HTMLPlugin_1.HTMLPlugin(configManager));
@@ -74,15 +76,26 @@ function startLanguageServer(connection) {
             pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(documentManager, configManager, workspaceUris));
             pluginHost.registerPlugin(new plugins_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.TextDocumentSyncKind.Incremental,
+                textDocumentSync: {
+                    openClose: true,
+                    change: vscode.TextDocumentSyncKind.Incremental,
+                    save: {
+                        includeText: true,
+                    },
+                },
                 foldingRangeProvider: true,
                 definitionProvider: true,
                 renameProvider: true,
+                codeActionProvider: {
+                    codeActionKinds: [
+                        vscode_languageserver_1.CodeActionKind.QuickFix,
+                        vscode_languageserver_1.CodeActionKind.SourceOrganizeImports,
+                        // VS Code specific
+                        CodeActionsProvider_1.sortImportKind,
+                    ],
+                },
                 completionProvider: {
                     resolveProvider: true,
                     triggerCharacters: [
@@ -127,10 +140,18 @@ function startLanguageServer(connection) {
             },
         };
     });
-    // On update of the user configuration of the language-server
-    connection.onDidChangeConfiguration(({ settings }) => {
-        configManager.updateConfig(settings.astro);
-        configManager.updateEmmetConfig(settings.emmet);
+    // The params don't matter here because in "pull mode" it's always null, it's intended that when the config is updated
+    // you should just reset "your internal cache" and get the config again for relevant documents, weird API design
+    connection.onDidChangeConfiguration(async (change) => {
+        if (hasConfigurationCapability) {
+            configManager.updateConfig();
+            documentManager.getAllOpenedByClient().forEach(async (document) => {
+                await configManager.getConfig('astro', document[1].uri);
+            });
+        }
+        else {
+            configManager.updateGlobalConfig(change.settings.astro || ConfigManager_1.defaultLSConfig);
+        }
     });
     // Documents
     connection.onDidOpenTextDocument((params) => {
@@ -157,6 +178,7 @@ function startLanguageServer(connection) {
     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.onCodeAction((evt, cancellationToken) => pluginHost.getCodeActions(evt.textDocument, evt.range, evt.context, cancellationToken));
     connection.onCompletion(async (evt) => {
         const promise = pluginHost.getCompletions(evt.textDocument, evt.position, evt.context);
         return promise;
@@ -185,10 +207,17 @@ function startLanguageServer(connection) {
         updateAllDiagnostics();
     });
     documentManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
-    documentManager.on('documentClose', (document) => diagnosticsManager.removeDiagnostics(document));
+    documentManager.on('documentClose', (document) => {
+        diagnosticsManager.removeDiagnostics(document);
+        configManager.removeDocument(document.uri);
+    });
     // Taking off 🚀
     connection.onInitialized(() => {
         connection.console.log('Successfully initialized! 🚀');
+        // Register for all configuration changes.
+        if (hasConfigurationCapability) {
+            connection.client.register(vscode_languageserver_1.DidChangeConfigurationNotification.type);
+        }
     });
     connection.listen();
 }

package/dist/utils.d.ts

@@ -16,6 +16,14 @@ export declare function pathToUrl(path: string): string;
  * (bar or bar.astro in this example).
  */
 export declare function getLastPartOfPath(path: string): string;
+/**
+ * Transform a string into PascalCase
+ */
+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
@@ -28,6 +36,10 @@ 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;
+/**
+ * Get all matches of a regexp.
+ */
+export declare function getRegExpMatches(regex: RegExp, str: string): RegExpExecArray[];
 /**
  * Debounces a function but cancels previous invocation only if
  * a second function determines it should.

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserAstroVersion = exports.debounceThrottle = exports.debounceSameArg = exports.isBeforeOrEqualToPosition = exports.isInRange = exports.isNotNullOrUndefined = exports.clamp = exports.flatten = exports.isPossibleComponent = exports.getLastPartOfPath = exports.pathToUrl = exports.urlToPath = exports.normalizePath = exports.normalizeUri = void 0;
+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;
 const vscode_uri_1 = require("vscode-uri");
 /** Normalizes a document URI */
 function normalizeUri(uri) {
@@ -37,13 +37,37 @@ function getLastPartOfPath(path) {
     return path.replace(/\\/g, '/').split('/').pop() || '';
 }
 exports.getLastPartOfPath = getLastPartOfPath;
+/**
+ * Transform a string into PascalCase
+ */
+function toPascalCase(string) {
+    return `${string}`
+        .replace(new RegExp(/[-_]+/, 'g'), ' ')
+        .replace(new RegExp(/[^\w\s]/, 'g'), '')
+        .replace(new RegExp(/\s+(.)(\w*)/, 'g'), ($1, $2, $3) => `${$2.toUpperCase() + $3.toLowerCase()}`)
+        .replace(new RegExp(/\w/), (s) => s.toUpperCase());
+}
+exports.toPascalCase = toPascalCase;
+/**
+ * Function to modify each line of a text, preserving the line break style (`\n` or `\r\n`)
+ */
+function modifyLines(text, replacementFn) {
+    let idx = 0;
+    return text
+        .split('\r\n')
+        .map((l1) => l1
+        .split('\n')
+        .map((line) => replacementFn(line, idx++))
+        .join('\n'))
+        .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) {
-    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]/));
+    return !!node.tag?.[0].match(/[A-Z]/) || !!node.tag?.match(/.+[.][A-Z]/);
 }
 exports.isPossibleComponent = isPossibleComponent;
 /** Flattens an array */
@@ -69,6 +93,18 @@ function isBeforeOrEqualToPosition(position, positionToTest) {
         (positionToTest.line === position.line && positionToTest.character <= position.character));
 }
 exports.isBeforeOrEqualToPosition = isBeforeOrEqualToPosition;
+/**
+ * Get all matches of a regexp.
+ */
+function getRegExpMatches(regex, str) {
+    const matches = [];
+    let match;
+    while ((match = regex.exec(str))) {
+        matches.push(match);
+    }
+    return matches;
+}
+exports.getRegExpMatches = getRegExpMatches;
 /**
  * Debounces a function but cancels previous invocation only if
  * a second function determines it should.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.14.0",
+  "version": "0.16.1",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -19,7 +19,7 @@
     "test": "cross-env TS_NODE_TRANSPILE_ONLY=true mocha --timeout 20000 --require ts-node/register \"test/**/*.ts\" --exclude \"test/**/*.d.ts\""
   },
   "dependencies": {
-    "@astrojs/svelte-language-integration": "^0.1.2",
+    "@astrojs/svelte-language-integration": "^0.1.4",
     "@vscode/emmet-helper": "^2.8.4",
     "lodash": "^4.17.21",
     "source-map": "^0.7.3",