@astrojs/language-server 0.20.3 → 0.21.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @astrojs/language-server
 
+## 0.21.0
+
+### Minor Changes
+
+- 574b75d: Remove support for the Markdown component
+- d23ba22: Changed how Astro's types are consumed to avoid making type acquisition explicit inside Astro files
+
+### Patch Changes
+
+- 81f3aa5: Added a debug command to show the currently opened document's TSX output
+
 ## 0.20.3
 
 ### Patch Changes

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

@@ -3,6 +3,7 @@ import { ConfigManager } from '../../core/config';
 import { AstroDocument, DocumentManager } from '../../core/documents';
 import { AppCompletionItem, AppCompletionList, OnWatchFileChangesParam, Plugin } from '../interfaces';
 import { CompletionItemData } from './features/CompletionsProvider';
+import { Astro2TSXResult } from './astro2tsx';
 export declare class TypeScriptPlugin implements Plugin {
     __name: string;
     private configManager;
@@ -34,5 +35,6 @@ export declare class TypeScriptPlugin implements Plugin {
     onWatchFileChanges(onWatchFileChangesParas: OnWatchFileChangesParam[]): Promise<void>;
     updateNonAstroFile(fileName: string, changes: TextDocumentContentChangeEvent[]): Promise<void>;
     getSignatureHelp(document: AstroDocument, position: Position, context: SignatureHelpContext | undefined, cancellationToken?: CancellationToken): Promise<SignatureHelp | null>;
+    getTSXForDocument(document: AstroDocument): Astro2TSXResult;
     private featureEnabled;
 }

package/dist/plugins/typescript/TypeScriptPlugin.js

@@ -19,6 +19,8 @@ const CodeActionsProvider_1 = require("./features/CodeActionsProvider");
 const DefinitionsProvider_1 = require("./features/DefinitionsProvider");
 const InlayHintsProvider_1 = require("./features/InlayHintsProvider");
 const FormattingProvider_1 = require("./features/FormattingProvider");
+const astro2tsx_1 = __importDefault(require("./astro2tsx"));
+const utils_2 = require("./snapshots/utils");
 class TypeScriptPlugin {
     constructor(docManager, configManager, workspaceUris) {
         this.__name = 'typescript';
@@ -137,6 +139,9 @@ class TypeScriptPlugin {
     async getSignatureHelp(document, position, context, cancellationToken) {
         return this.signatureHelpProvider.getSignatureHelp(document, position, context, cancellationToken);
     }
+    getTSXForDocument(document) {
+        return (0, astro2tsx_1.default)(document.getText(), (0, utils_2.classNameFromFilename)(document.getURL()));
+    }
     async featureEnabled(document, feature) {
         return ((await this.configManager.isEnabled(document, 'typescript')) &&
             (await this.configManager.isEnabled(document, 'typescript', feature)));

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

@@ -1,5 +1,4 @@
-interface Astro2TSXResult {
+export interface Astro2TSXResult {
     code: string;
 }
 export default function (content: string, className: string): Astro2TSXResult;
-export {};

package/dist/plugins/typescript/astro2tsx.js

@@ -41,10 +41,6 @@ function default_1(content, className) {
         // Turn styles tags into internal strings
         .replace(/<\s*style([^>]*)>(.*?)<\s*\/\s*style>/gs, (_whole, attrs, children) => {
         return `<style${attrs}>{\`${escapeTemplateLiteralContent(children)}\`}</style>`;
-    })
-        // Turn Markdown tags into internal strings
-        .replace(/<\s*Markdown([^>]*)>(.*?)<\s*\/\s*Markdown>/gs, (_whole, attrs, children) => {
-        return `<Markdown${attrs}>{\`${escapeTemplateLiteralContent(children)}\`}</Markdown>`;
     })
         // Turn scripts into function calls
         .replace(/<\s*script([^\/>]*)>(.*?)<\s*\/\s*script>/gs, (_whole, attrs, children, offset) => {

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

@@ -95,7 +95,6 @@ class DiagnosticsProviderImpl {
         const sourceFile = program?.getSourceFile(tsFilePath);
         const boundaries = {
             script: [],
-            markdown: [],
         };
         if (!sourceFile) {
             return boundaries;
@@ -110,10 +109,6 @@ class DiagnosticsProviderImpl {
                             boundaries.script.push([node.getStart(), node.getEnd()]);
                             break;
                         }
-                        case 'Markdown': {
-                            boundaries.markdown.push([node.getStart(), node.getEnd()]);
-                            break;
-                        }
                     }
                 }
                 findTags(node);

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

@@ -19,7 +19,7 @@ class FoldingRangesProviderImpl {
             const node = html.findNodeAt(span.textSpan.start);
             // Due to how our TSX output transform those tags into function calls or template literals
             // TypeScript thinks of those as outlining spans, which is fine but we don't want folding ranges for those
-            return node.tag !== 'script' && node.tag !== 'style' && node.tag !== 'Markdown';
+            return node.tag !== 'script' && node.tag !== 'style';
         });
         const scriptOutliningSpans = [];
         document.scriptTags.forEach((scriptTag) => {

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

@@ -80,6 +80,11 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     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);
+    const scriptFileNames = [];
+    if (astroVersion.exist) {
+        const astroDir = (0, path_1.dirname)(require.resolve('astro', { paths: [workspacePath] }));
+        scriptFileNames.push(...['./env.d.ts', './astro-jsx.d.ts'].map((f) => typescript_1.default.sys.resolvePath((0, path_1.resolve)(astroDir, f))));
+    }
     let languageServerDirectory;
     try {
         languageServerDirectory = (0, path_1.dirname)(require.resolve('@astrojs/language-server'));
@@ -87,7 +92,6 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     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') &&
@@ -221,23 +225,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         });
     }
     function getParsedTSConfig() {
-        let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {
-            compilerOptions: getDefaultCompilerOptions(astroVersion),
-        };
-        // If our user has types in their config but it doesn't include the types needed for Astro, add them to the config
-        if (configJson.compilerOptions?.types) {
-            if (!configJson.compilerOptions?.types.includes('astro/env')) {
-                configJson.compilerOptions.types.push('astro/env');
-            }
-            if ((astroVersion.major >= 1 || astroVersion.full.startsWith('0.0.0-rc-')) &&
-                astroVersion.full !== '1.0.0-beta.0' &&
-                !configJson.compilerOptions?.types.includes('astro/astro-jsx')) {
-                configJson.compilerOptions.types.push('astro/astro-jsx');
-            }
-        }
-        else {
-            configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(astroVersion), configJson.compilerOptions);
-        }
+        let configJson = (tsconfigPath && typescript_1.default.readConfigFile(tsconfigPath, typescript_1.default.sys.readFile).config) || {};
         // 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
@@ -273,18 +261,6 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         };
     }
 }
-/**
- * Default compiler configuration used when the user doesn't have any
- */
-function getDefaultCompilerOptions(astroVersion) {
-    const types = ['astro/env'];
-    if ((astroVersion.major >= 1 && astroVersion.full !== '1.0.0-beta.0') || astroVersion.full.startsWith('0.0.0-rc-')) {
-        types.push('astro/astro-jsx');
-    }
-    return {
-        types: types,
-    };
-}
 function getDefaultExclude() {
     return ['dist', 'node_modules'];
 }

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

@@ -26,3 +26,4 @@ export declare function createFromTSFilePath(filePath: string): TypeScriptDocume
  */
 export declare function createFromAstroFilePath(filePath: string, createDocument: (filePath: string, text: string) => AstroDocument): AstroSnapshot;
 export declare function createFromFrameworkFilePath(filePath: string, framework: FrameworkExt): TypeScriptDocumentSnapshot;
+export declare function classNameFromFilename(filename: string): string;

package/dist/plugins/typescript/snapshots/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.createFromFrameworkFilePath = exports.createFromAstroFilePath = exports.createFromTSFilePath = exports.createFromNonAstroFilePath = exports.createFromFilePath = exports.createFromDocument = void 0;
+exports.classNameFromFilename = 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");
@@ -106,3 +106,4 @@ function classNameFromFilename(filename) {
     const finalName = firstValidCharIdx === -1 ? `A${inPascalCase}` : inPascalCase;
     return finalName;
 }
+exports.classNameFromFilename = classNameFromFilename;

package/dist/server.js

@@ -44,6 +44,7 @@ function startLanguageServer(connection) {
     const documentManager = new DocumentManager_1.DocumentManager();
     const pluginHost = new PluginHost_1.PluginHost(documentManager);
     const configManager = new ConfigManager_1.ConfigManager(connection);
+    let typescriptPlugin = undefined;
     let hasConfigurationCapability = false;
     connection.onInitialize((params) => {
         const workspaceUris = params.workspaceFolders?.map((folder) => folder.uri.toString()) ?? [params.rootUri ?? ''];
@@ -72,8 +73,9 @@ function startLanguageServer(connection) {
         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') {
+            typescriptPlugin = new plugins_1.TypeScriptPlugin(documentManager, configManager, workspaceUris);
             pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(documentManager, configManager, workspaceUris));
-            pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(documentManager, configManager, workspaceUris));
+            pluginHost.registerPlugin(typescriptPlugin);
         }
         return {
             capabilities: {
@@ -212,6 +214,16 @@ function startLanguageServer(connection) {
         }
         updateAllDiagnostics();
     });
+    connection.onRequest('$/getTSXOutput', async (uri) => {
+        const doc = documentManager.get(uri);
+        if (!doc) {
+            return undefined;
+        }
+        if (doc) {
+            const tsxOutput = typescriptPlugin.getTSXForDocument(doc);
+            return tsxOutput.code;
+        }
+    });
     documentManager.on('documentChange', (0, utils_1.debounceThrottle)(async (document) => diagnosticsManager.update(document), 1000));
     documentManager.on('documentClose', (document) => {
         diagnosticsManager.removeDiagnostics(document);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.20.3",
+  "version": "0.21.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",