@astrojs/language-server 0.20.0 → 0.21.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @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
+
+- 081cf24: Fix completions not working inside script tags, fix duplicate completions in some cases, added completions for the slot element
+
+## 0.20.1
+
+### Patch Changes
+
+- e6996f5: Fixed many situations where the language server would warn abusively about not being able to find Astro
+- 4589c2b: Fix the language server not warning properly when a package is implicitely any due to missing types
+
 ## 0.20.0
 
 ### Minor Changes

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

@@ -21,6 +21,10 @@ export declare function getLineAtPosition(position: Position, text: string): str
  * Return if a given offset is inside the start tag of a component
  */
 export declare function isInComponentStartTag(html: HTMLDocument, offset: number): boolean;
+/**
+ * Return if a given offset is inside the name of a tag
+ */
+export declare function isInTagName(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

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.isPossibleComponent = exports.isInComponentStartTag = 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.isInTagName = 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");
@@ -105,6 +105,14 @@ function isInComponentStartTag(html, offset) {
     return isPossibleComponent(node) && (!node.startTagEnd || offset < node.startTagEnd);
 }
 exports.isInComponentStartTag = isInComponentStartTag;
+/**
+ * Return if a given offset is inside the name of a tag
+ */
+function isInTagName(html, offset) {
+    const node = html.findNodeAt(offset);
+    return offset > node.start && offset < node.start + (node.tag?.length ?? 0);
+}
+exports.isInTagName = isInTagName;
 /**
  * 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

package/dist/plugins/PluginHost.js

@@ -38,19 +38,14 @@ class PluginHost {
         const astro = completions.find((completion) => completion.plugin === 'astro');
         if (html && ts) {
             const inComponentStartTag = (0, documents_1.isInComponentStartTag)(document.html, document.offsetAt(position));
-            if (!inComponentStartTag) {
+            // If the HTML plugin returned completions, it's highly likely that TS ones are duplicate
+            if (html.result.items.length > 0) {
                 ts.result.items = [];
             }
-            // If the Astro plugin has completions for us, don't show TypeScript's as they're most likely duplicates
+            // Inside components, if the Astro plugin has completions we don't want the TS ones are they're duplicates
             if (astro && astro.result.items.length > 0 && inComponentStartTag) {
                 ts.result.items = [];
             }
-            ts.result.items = ts.result.items.map((item) => {
-                if (item.sortText != '-1') {
-                    item.sortText = 'Z' + (item.sortText || '');
-                }
-                return item;
-            });
         }
         let flattenedCompletions = completions.flatMap((completion) => completion.result.items);
         const isIncomplete = completions.reduce((incomplete, completion) => incomplete || completion.result.isIncomplete, false);

package/dist/plugins/html/HTMLPlugin.js

@@ -11,7 +11,7 @@ class HTMLPlugin {
     constructor(configManager) {
         this.__name = 'html';
         this.lang = (0, vscode_html_languageservice_1.getLanguageService)({
-            customDataProviders: [astro_attributes_1.astroAttributes, astro_attributes_1.classListAttribute],
+            customDataProviders: [astro_attributes_1.astroAttributes, astro_attributes_1.astroElements, astro_attributes_1.classListAttribute],
         });
         this.attributeOnlyLang = (0, vscode_html_languageservice_1.getLanguageService)({
             customDataProviders: [astro_attributes_1.astroAttributes],
@@ -72,10 +72,14 @@ 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))
+        const inComponentTag = (0, utils_1.isInComponentStartTag)(html, offset);
+        const inTagName = (0, utils_1.isInTagName)(html, offset);
+        const results = inComponentTag && !inTagName
             ? (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], 
+            : // We filter items with no documentation to prevent duplicates with our own defined script and style tags
+                this.lang.doComplete(document, position, html).items.filter((item) => item.documentation !== undefined);
+        const langCompletions = inComponentTag ? [] : this.getLangCompletions(results);
+        return vscode_languageserver_1.CompletionList.create([...results, ...langCompletions, ...emmetResults.items], 
         // Emmet completions change on every keystroke, so they are never complete
         emmetResults.items.length > 0);
     }

package/dist/plugins/html/features/astro-attributes.d.ts

@@ -1,3 +1,4 @@
 export declare const classListAttribute: import("vscode-html-languageservice").IHTMLDataProvider;
+export declare const astroElements: import("vscode-html-languageservice").IHTMLDataProvider;
 export declare const astroAttributes: import("vscode-html-languageservice").IHTMLDataProvider;
 export declare const astroDirectives: import("vscode-html-languageservice").IHTMLDataProvider;

package/dist/plugins/html/features/astro-attributes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astroDirectives = exports.astroAttributes = exports.classListAttribute = void 0;
+exports.astroDirectives = exports.astroAttributes = exports.astroElements = exports.classListAttribute = void 0;
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 exports.classListAttribute = (0, vscode_html_languageservice_1.newHTMLDataProvider)('class-list', {
     version: 1,
@@ -17,42 +17,31 @@ exports.classListAttribute = (0, vscode_html_languageservice_1.newHTMLDataProvid
         },
     ],
 });
-exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)('astro-attributes', {
+exports.astroElements = (0, vscode_html_languageservice_1.newHTMLDataProvider)('astro-elements', {
     version: 1,
-    globalAttributes: [
-        {
-            name: 'set:html',
-            description: 'Inject unescaped HTML into this tag',
-            references: [
-                {
-                    name: 'Astro reference',
-                    url: 'https://docs.astro.build/en/reference/directives-reference/#sethtml',
-                },
-            ],
-        },
+    tags: [
         {
-            name: 'set:text',
-            description: 'Inject escaped text into this tag',
+            name: 'slot',
+            description: 'The slot element is a placeholder for external HTML content, allowing you to inject (or “slot”) child elements from other files into your component template.',
             references: [
                 {
                     name: 'Astro reference',
-                    url: 'https://docs.astro.build/en/reference/directives-reference/#settext',
+                    url: 'https://docs.astro.build/en/core-concepts/astro-components/#slots',
                 },
             ],
-        },
-        {
-            name: 'is:raw',
-            description: 'Instructs the Astro compiler to treat any children of this element as text',
-            valueSet: 'v',
-            references: [
+            attributes: [
                 {
-                    name: 'Astro reference',
-                    url: 'https://docs.astro.build/en/reference/directives-reference/#israw',
+                    name: 'name',
+                    description: 'The name attribute allows you to pass only HTML elements with the corresponding slot name into a slot’s location.',
+                    references: [
+                        {
+                            name: 'Astro reference',
+                            url: 'https://docs.astro.build/en/core-concepts/astro-components/#named-slots',
+                        },
+                    ],
                 },
             ],
         },
-    ],
-    tags: [
         {
             name: 'script',
             attributes: [
@@ -146,6 +135,42 @@ exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)
         },
     ],
 });
+exports.astroAttributes = (0, vscode_html_languageservice_1.newHTMLDataProvider)('astro-attributes', {
+    version: 1,
+    globalAttributes: [
+        {
+            name: 'set:html',
+            description: 'Inject unescaped HTML into this tag',
+            references: [
+                {
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#sethtml',
+                },
+            ],
+        },
+        {
+            name: 'set:text',
+            description: 'Inject escaped text into this tag',
+            references: [
+                {
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#settext',
+                },
+            ],
+        },
+        {
+            name: 'is:raw',
+            description: 'Instructs the Astro compiler to treat any children of this element as text',
+            valueSet: 'v',
+            references: [
+                {
+                    name: 'Astro reference',
+                    url: 'https://docs.astro.build/en/reference/directives-reference/#israw',
+                },
+            ],
+        },
+    ],
+});
 exports.astroDirectives = (0, vscode_html_languageservice_1.newHTMLDataProvider)('astro-directives', {
     version: 1,
     globalAttributes: [

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/CompletionsProvider.d.ts

@@ -21,7 +21,6 @@ export declare class CompletionsProviderImpl implements CompletionsProvider<Comp
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext, cancellationToken?: CancellationToken): Promise<AppCompletionList<CompletionItemData> | null>;
     resolveCompletion(document: AstroDocument, item: AppCompletionItem<CompletionItemData>, cancellationToken?: CancellationToken): Promise<AppCompletionItem<CompletionItemData>>;
     private toCompletionItem;
-    private isValidCompletion;
     private getCompletionDocument;
     /**
      * If the textEdit is out of the word range of the triggered position

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

@@ -78,26 +78,8 @@ class CompletionsProviderImpl {
             scriptTagIndex = scriptIndex;
             completions = lang.getCompletionsAtPosition(scriptFilePath, scriptOffset, {
                 ...tsPreferences,
-                // File extensions are required inside script tags, however TypeScript can't return completions with the `ts`
-                // extension, so what we'll do instead is force `minimal` (aka, no extension) and manually add the extensions
-                importModuleSpecifierEnding: 'minimal',
                 triggerCharacter: validTriggerCharacter,
             }, formatOptions);
-            if (completions) {
-                // Manually adds file extensions to js and ts files
-                completions.entries = completions?.entries.map((comp) => {
-                    if (comp.kind === typescript_1.ScriptElementKind.scriptElement &&
-                        (comp.kindModifiers === '.js' || comp.kindModifiers === '.ts')) {
-                        return {
-                            ...comp,
-                            name: comp.name + comp.kindModifiers,
-                        };
-                    }
-                    else {
-                        return comp;
-                    }
-                });
-            }
         }
         else {
             // PERF: Getting TS completions is fairly slow and I am currently not sure how to speed it up
@@ -132,7 +114,7 @@ class CompletionsProviderImpl {
         const fragment = await tsDoc.createFragment();
         const existingImports = this.getExistingImports(document);
         const completionItems = completions.entries
-            .filter(this.isValidCompletion)
+            .filter(isValidCompletion)
             .map((entry) => this.toCompletionItem(fragment, entry, filePath, offset, isCompletionInsideFrontmatter, scriptTagIndex, existingImports))
             .filter(utils_3.isNotNullOrUndefined)
             .map((comp) => this.fixTextEditRange(wordRangeStartPosition, comp));
@@ -250,13 +232,6 @@ class CompletionsProviderImpl {
             },
         };
     }
-    isValidCompletion(completion) {
-        // Remove completion for default exported function
-        if (completion.name === 'default' && completion.kindModifiers == typescript_1.ScriptElementKindModifier.exportedModifier) {
-            return false;
-        }
-        return true;
-    }
     getCompletionDocument(compDetail) {
         const { sourceDisplay, documentation: tsDocumentation, displayParts } = compDetail;
         let detail = (0, utils_2.removeAstroComponentSuffix)(typescript_1.default.displayPartsToString(displayParts));
@@ -355,3 +330,31 @@ function codeActionChangeToTextEdit(document, fragment, isInsideScriptTag, chang
     return vscode_languageserver_1.TextEdit.replace(range, change.newText);
 }
 exports.codeActionChangeToTextEdit = codeActionChangeToTextEdit;
+// When Svelte components are imported, we have to reference the svelte2tsx's types to properly type the component
+// An unfortunate downside of this is that it polutes completions, so let's filter those internal types manually
+const svelte2tsxTypes = new Set([
+    'Svelte2TsxComponent',
+    'Svelte2TsxComponentConstructorParameters',
+    'SvelteComponentConstructor',
+    'SvelteActionReturnType',
+    'SvelteTransitionConfig',
+    'SvelteTransitionReturnType',
+    'SvelteAnimationReturnType',
+    'SvelteWithOptionalProps',
+    'SvelteAllProps',
+    'SveltePropsAnyFallback',
+    'SvelteSlotsAnyFallback',
+    'SvelteRestProps',
+    'SvelteSlots',
+    'SvelteStore',
+]);
+function isValidCompletion(completion) {
+    // Remove completion for default exported function
+    const isDefaultExport = completion.name === 'default' && completion.kindModifiers == typescript_1.ScriptElementKindModifier.exportedModifier;
+    // Remove completion for svelte2tsx internal types
+    const isSvelte2tsxCompletion = completion.name.startsWith('__sveltets_') || svelte2tsxTypes.has(completion.name);
+    if (isDefaultExport || isSvelte2tsxCompletion) {
+        return false;
+    }
+    return true;
+}

package/dist/plugins/typescript/features/DiagnosticsProvider.d.ts

@@ -12,7 +12,6 @@ export declare enum DiagnosticCodes {
     ISOLATED_MODULE_COMPILE_ERR = 1208,
     TYPE_NOT_ASSIGNABLE = 2322,
     JSX_NO_CLOSING_TAG = 17008,
-    NO_DECL_IMPLICIT_ANY_TYPE = 7016,
     JSX_ELEMENT_NO_CALL = 2604
 }
 export declare class DiagnosticsProviderImpl implements DiagnosticsProvider {

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

@@ -20,7 +20,6 @@ var DiagnosticCodes;
     DiagnosticCodes[DiagnosticCodes["ISOLATED_MODULE_COMPILE_ERR"] = 1208] = "ISOLATED_MODULE_COMPILE_ERR";
     DiagnosticCodes[DiagnosticCodes["TYPE_NOT_ASSIGNABLE"] = 2322] = "TYPE_NOT_ASSIGNABLE";
     DiagnosticCodes[DiagnosticCodes["JSX_NO_CLOSING_TAG"] = 17008] = "JSX_NO_CLOSING_TAG";
-    DiagnosticCodes[DiagnosticCodes["NO_DECL_IMPLICIT_ANY_TYPE"] = 7016] = "NO_DECL_IMPLICIT_ANY_TYPE";
     DiagnosticCodes[DiagnosticCodes["JSX_ELEMENT_NO_CALL"] = 2604] = "JSX_ELEMENT_NO_CALL";
 })(DiagnosticCodes = exports.DiagnosticCodes || (exports.DiagnosticCodes = {}));
 class DiagnosticsProviderImpl {
@@ -87,7 +86,6 @@ class DiagnosticsProviderImpl {
                 isNoSpreadExpected(diag, document) &&
                 isNoCantReturnOutsideFunction(diag) &&
                 isNoIsolatedModuleError(diag) &&
-                isNoImportImplicitAnyType(diag) &&
                 isNoJsxCannotHaveMultipleAttrsError(diag));
         })
             .map(enhanceIfNecessary);
@@ -97,7 +95,6 @@ class DiagnosticsProviderImpl {
         const sourceFile = program?.getSourceFile(tsFilePath);
         const boundaries = {
             script: [],
-            markdown: [],
         };
         if (!sourceFile) {
             return boundaries;
@@ -112,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);
@@ -173,9 +166,6 @@ function isNoJsxCannotHaveMultipleAttrsError(diagnostic) {
 function isNoJSXMustHaveOneParent(diagnostic) {
     return diagnostic.code !== DiagnosticCodes.MUST_HAVE_PARENT_ELEMENT;
 }
-function isNoImportImplicitAnyType(diagnostic) {
-    return diagnostic.code !== DiagnosticCodes.NO_DECL_IMPLICIT_ANY_TYPE;
-}
 /**
  * When using the shorthand syntax for props TSX expects you to use the spread operator
  * Since the shorthand syntax works differently in Astro and this is not required, hide this message
@@ -191,7 +181,7 @@ function isNoSpreadExpected(diagnostic, document) {
 }
 /**
  * Ignore "Can't return outside of function body"
- * Since the frontmatter is at the top level, users trying to return a Response  for SSR mode run into this
+ * Since the frontmatter is at the top level, users trying to return a Response for SSR mode run into this
  */
 function isNoCantReturnOutsideFunction(diagnostic) {
     return diagnostic.code !== DiagnosticCodes.CANT_RETURN_OUTSIDE_FUNC;
@@ -218,6 +208,7 @@ function enhanceIfNecessary(diagnostic) {
             diagnostic.message +=
                 '\n\nIs the `@astrojs/vue` package installed? You can add it to your project by running the following command: `astro add vue`. If already installed, restarting the language server might be necessary in order for the change to take effect';
         }
+        return diagnostic;
     }
     // JSX element has no closing tag. JSX -> HTML
     if (diagnostic.code === DiagnosticCodes.JSX_NO_CLOSING_TAG) {
@@ -237,7 +228,7 @@ function enhanceIfNecessary(diagnostic) {
     }
     // For the rare case where an user might try to put a client directive on something that is not a component
     if (diagnostic.code === DiagnosticCodes.TYPE_NOT_ASSIGNABLE) {
-        if (diagnostic.message.includes("Property 'client:") && diagnostic.message.includes("to type 'HTMLProps")) {
+        if (diagnostic.message.includes("Property 'client:") && diagnostic.message.includes("to type 'HTMLAttributes")) {
             return {
                 ...diagnostic,
                 message: 'Client directives are only available on framework components',

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,10 +92,11 @@ 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') {
+    if ((astroVersion.major === 0 || astroVersion.full === '1.0.0-beta.0') &&
+        !astroVersion.full.startsWith('0.0.0-rc-') // 1.0.0's RC is considered to be 0.0.0, so we have to check for it
+    ) {
         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");
@@ -220,18 +226,6 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     }
     function getParsedTSConfig() {
         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 (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' &&
-                !configJson.compilerOptions?.types.includes('astro/astro-jsx')) {
-                configJson.compilerOptions.types.push('astro/astro-jsx');
-            }
-        }
-        configJson.compilerOptions = Object.assign(getDefaultCompilerOptions(astroVersion), configJson.compilerOptions);
         // 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
@@ -241,6 +235,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
             noEmit: true,
             declaration: false,
             resolveJsonModule: true,
+            allowSyntheticDefaultImports: true,
             allowNonTsExtensions: true,
             allowJs: true,
             jsx: typescript_1.default.JsxEmit.Preserve,
@@ -266,20 +261,6 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
         };
     }
 }
-/**
- * Default configuration used as a base and 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') {
-        types.push('astro/astro-jsx');
-    }
-    return {
-        maxNodeModuleJsDepth: 2,
-        allowSyntheticDefaultImports: true,
-        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,11 +44,17 @@ 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 ?? ''];
         workspaceUris.forEach((uri) => {
             uri = (0, utils_1.urlToPath)(uri);
+            // If the workspace is not an Astro project, we shouldn't warn about not finding Astro
+            // Unless the extension enabled itself in an untitled workspace, in which case the warning is valid
+            if (!(0, utils_1.isAstroWorkspace)(uri) && uri !== '/' && uri !== '') {
+                return;
+            }
             const astroVersion = (0, utils_1.getUserAstroVersion)(uri);
             if (astroVersion.exist === false) {
                 connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
@@ -56,12 +62,6 @@ function startLanguageServer(connection) {
                     type: vscode_languageserver_1.MessageType.Warning,
                 });
             }
-            if (astroVersion.exist && astroVersion.major === 0 && astroVersion.minor < 24 && astroVersion.patch < 5) {
-                connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
-                    message: `The version of Astro you're using (${astroVersion.full}) is not supported by this version of the Astro language server. Please upgrade Astro to any version higher than 0.23.4 or if using the VS Code extension, downgrade the extension to 0.8.10`,
-                    type: vscode_languageserver_1.MessageType.Error,
-                });
-            }
         });
         hasConfigurationCapability = !!(params.capabilities.workspace && !!params.capabilities.workspace.configuration);
         pluginHost.initialize({
@@ -73,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: {
@@ -213,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/dist/utils.d.ts

@@ -65,6 +65,10 @@ export declare function debounceSameArg<T>(fn: (arg: T) => void, shouldCancelPre
  * @param milliseconds Number of milliseconds to debounce/throttle
  */
 export declare function debounceThrottle<T extends (...args: any) => void>(fn: T, milliseconds: number): T;
+/**
+ * Try to determine if a workspace could be an Astro project based on the content of `package.json`
+ */
+export declare function isAstroWorkspace(workspacePath: string): boolean;
 export interface AstroVersion {
     full: string;
     major: number;

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.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;
+exports.getUserAstroVersion = exports.isAstroWorkspace = 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) {
@@ -197,6 +197,23 @@ function debounceThrottle(fn, milliseconds) {
     return maybeCall;
 }
 exports.debounceThrottle = debounceThrottle;
+/**
+ * Try to determine if a workspace could be an Astro project based on the content of `package.json`
+ */
+function isAstroWorkspace(workspacePath) {
+    try {
+        const astroPackageJson = require.resolve('./package.json', { paths: [workspacePath] });
+        const deps = Object.assign(require(astroPackageJson).dependencies ?? {}, require(astroPackageJson).devDependencies ?? {});
+        if (Object.keys(deps).includes('astro')) {
+            return true;
+        }
+    }
+    catch (e) {
+        return false;
+    }
+    return false;
+}
+exports.isAstroWorkspace = isAstroWorkspace;
 function getUserAstroVersion(basePath) {
     let version = '0.0.0';
     let exist = true;
@@ -213,7 +230,7 @@ function getUserAstroVersion(basePath) {
         catch (e) {
             // If we still couldn't find it, it probably just doesn't exist
             exist = false;
-            console.error(e);
+            console.error(`${basePath} seems to be an Astro project, but we couldn't find Astro or Astro is not installed`);
         }
     }
     let [major, minor, patch] = version.split('.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -31,12 +31,12 @@
     "vscode-uri": "^3.0.3"
   },
   "devDependencies": {
-    "@astrojs/svelte": "^0.2.1",
-    "@astrojs/vue": "^0.2.1",
+    "@astrojs/svelte": "^0.5.0",
+    "@astrojs/vue": "^0.5.0",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.1.0",
     "@types/sinon": "^10.0.11",
-    "astro": "^1.0.0-beta.1",
+    "astro": "^1.0.0-beta.72",
     "astro-scripts": "0.0.1",
     "chai": "^4.3.6",
     "cross-env": "^7.0.3",