@astrojs/language-server 0.21.0 → 0.21.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @astrojs/language-server
 
+## 0.21.1
+
+### Patch Changes
+
+- 0e9d7d0: Improve error handling in cases where we can't load types from the user's project and when the project isn't at the root of the folder
+- 3f79dbf: Fix `tsconfig.json` not loading properly in certain contexts on Windows
+
 ## 0.21.0
 
 ### Minor Changes

package/README.md

@@ -11,6 +11,5 @@ The Astro language server, implement the [language server protocol](https://micr
 │   ├── core        # Core code such as .astro file parsing, configuration manager, document definition etc
 │   └── plugins     # Modules for the different languages supported in .astro files
 ├── test            # Tests
-├── types           # Types
-└── astro.d.ts      # Types injected into .astro files by the language server
+└── types           # Types injected into Astro files by the language server under certain conditions
 ```

package/dist/check.js

@@ -4,6 +4,8 @@ exports.AstroCheck = exports.DiagnosticSeverity = void 0;
 const config_1 = require("./core/config");
 const documents_1 = require("./core/documents");
 const plugins_1 = require("./plugins");
+const LanguageServiceManager_1 = require("./plugins/typescript/LanguageServiceManager");
+const utils_1 = require("./utils");
 var vscode_languageserver_types_1 = require("vscode-languageserver-types");
 Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return vscode_languageserver_types_1.DiagnosticSeverity; } });
 class AstroCheck {
@@ -37,7 +39,8 @@ class AstroCheck {
         }));
     }
     initialize(workspacePath) {
-        this.pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(this.docManager, this.configManager, [workspacePath]));
+        const languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(this.docManager, [(0, utils_1.normalizeUri)(workspacePath)], this.configManager);
+        this.pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(this.configManager, languageServiceManager));
     }
     async getDiagnosticsForFile(uri) {
         const diagnostics = await this.pluginHost.getDiagnostics({ uri });

package/dist/importPackage.d.ts

@@ -1,6 +1,6 @@
 import type * as svelte from '@astrojs/svelte/dist/editor.cjs';
 import type * as vue from '@astrojs/svelte/dist/editor.cjs';
 export declare function setIsTrusted(_isTrusted: boolean): void;
-export declare function getPackagePath(packageName: string, fromPath: string): string | undefined;
+export declare function getPackagePath(packageName: string, fromPath: string[]): string | undefined;
 export declare function importSvelteIntegration(fromPath: string): typeof svelte | undefined;
 export declare function importVueIntegration(fromPath: string): typeof vue | undefined;

package/dist/importPackage.js

@@ -10,13 +10,10 @@ exports.setIsTrusted = setIsTrusted;
 function getPackagePath(packageName, fromPath) {
     const paths = [];
     if (isTrusted) {
-        paths.unshift(fromPath);
+        paths.unshift(...fromPath);
     }
     try {
-        const packageJSONPath = require.resolve(`${packageName}/package.json`, {
-            paths,
-        });
-        return (0, path_1.dirname)(packageJSONPath);
+        return (0, path_1.dirname)(require.resolve(packageName + '/package.json', { paths }));
     }
     catch (e) {
         return undefined;
@@ -24,10 +21,16 @@ function getPackagePath(packageName, fromPath) {
 }
 exports.getPackagePath = getPackagePath;
 function importEditorIntegration(packageName, fromPath) {
-    const pkgPath = getPackagePath(packageName, fromPath);
+    const pkgPath = getPackagePath(packageName, [fromPath]);
     if (pkgPath) {
-        const main = (0, path_1.resolve)(pkgPath, 'dist', 'editor.cjs');
-        return require(main);
+        try {
+            const main = (0, path_1.resolve)(pkgPath, 'dist', 'editor.cjs');
+            return require(main);
+        }
+        catch (e) {
+            console.error(`Couldn't load editor module from ${pkgPath}. Make sure you're using at least version v0.2.1 of the corresponding integration`);
+            return undefined;
+        }
     }
     return undefined;
 }

package/dist/plugins/astro/AstroPlugin.d.ts

@@ -1,13 +1,14 @@
 import { CompletionContext, FoldingRange, Position } from 'vscode-languageserver';
 import { ConfigManager } from '../../core/config';
-import { AstroDocument, DocumentManager } from '../../core/documents';
+import { AstroDocument } from '../../core/documents';
 import { AppCompletionList, Plugin } from '../interfaces';
+import { LanguageServiceManager } from '../typescript/LanguageServiceManager';
 export declare class AstroPlugin implements Plugin {
     __name: string;
     private configManager;
     private readonly languageServiceManager;
     private readonly completionProvider;
-    constructor(docManager: DocumentManager, configManager: ConfigManager, workspaceUris: string[]);
+    constructor(configManager: ConfigManager, languageServiceManager: LanguageServiceManager);
     getCompletions(document: AstroDocument, position: Position, completionContext?: CompletionContext): Promise<AppCompletionList | null>;
     getFoldingRanges(document: AstroDocument): FoldingRange[];
 }

package/dist/plugins/astro/AstroPlugin.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstroPlugin = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const LanguageServiceManager_1 = require("../typescript/LanguageServiceManager");
 const CompletionsProvider_1 = require("./features/CompletionsProvider");
 class AstroPlugin {
-    constructor(docManager, configManager, workspaceUris) {
+    constructor(configManager, languageServiceManager) {
         this.__name = 'astro';
         this.configManager = configManager;
-        this.languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(docManager, workspaceUris, configManager);
+        this.languageServiceManager = languageServiceManager;
         this.completionProvider = new CompletionsProvider_1.CompletionsProviderImpl(this.languageServiceManager);
     }
     async getCompletions(document, position, completionContext) {

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

@@ -1,8 +1,9 @@
 import { CancellationToken, CodeAction, CodeActionContext, CompletionContext, DefinitionLink, Diagnostic, FoldingRange, FormattingOptions, Hover, InlayHint, Position, Range, SemanticTokens, SignatureHelp, SignatureHelpContext, SymbolInformation, TextDocumentContentChangeEvent, TextEdit, WorkspaceEdit } from 'vscode-languageserver';
 import { ConfigManager } from '../../core/config';
-import { AstroDocument, DocumentManager } from '../../core/documents';
+import { AstroDocument } from '../../core/documents';
 import { AppCompletionItem, AppCompletionList, OnWatchFileChangesParam, Plugin } from '../interfaces';
 import { CompletionItemData } from './features/CompletionsProvider';
+import { LanguageServiceManager } from './LanguageServiceManager';
 import { Astro2TSXResult } from './astro2tsx';
 export declare class TypeScriptPlugin implements Plugin {
     __name: string;
@@ -19,7 +20,7 @@ export declare class TypeScriptPlugin implements Plugin {
     private readonly semanticTokensProvider;
     private readonly foldingRangesProvider;
     private readonly formattingProvider;
-    constructor(docManager: DocumentManager, configManager: ConfigManager, workspaceUris: string[]);
+    constructor(configManager: ConfigManager, languageServiceManager: LanguageServiceManager);
     doHover(document: AstroDocument, position: Position): Promise<Hover | null>;
     rename(document: AstroDocument, position: Position, newName: string): Promise<WorkspaceEdit | null>;
     formatDocument(document: AstroDocument, options: FormattingOptions): Promise<TextEdit[]>;

package/dist/plugins/typescript/TypeScriptPlugin.js

@@ -10,7 +10,6 @@ const CompletionsProvider_1 = require("./features/CompletionsProvider");
 const DiagnosticsProvider_1 = require("./features/DiagnosticsProvider");
 const HoverProvider_1 = require("./features/HoverProvider");
 const SignatureHelpProvider_1 = require("./features/SignatureHelpProvider");
-const LanguageServiceManager_1 = require("./LanguageServiceManager");
 const utils_1 = require("./utils");
 const DocumentSymbolsProvider_1 = require("./features/DocumentSymbolsProvider");
 const SemanticTokenProvider_1 = require("./features/SemanticTokenProvider");
@@ -22,10 +21,10 @@ const FormattingProvider_1 = require("./features/FormattingProvider");
 const astro2tsx_1 = __importDefault(require("./astro2tsx"));
 const utils_2 = require("./snapshots/utils");
 class TypeScriptPlugin {
-    constructor(docManager, configManager, workspaceUris) {
+    constructor(configManager, languageServiceManager) {
         this.__name = 'typescript';
         this.configManager = configManager;
-        this.languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(docManager, workspaceUris, configManager);
+        this.languageServiceManager = languageServiceManager;
         this.codeActionsProvider = new CodeActionsProvider_1.CodeActionsProviderImpl(this.languageServiceManager, this.configManager);
         this.completionProvider = new CompletionsProvider_1.CompletionsProviderImpl(this.languageServiceManager, this.configManager);
         this.hoverProvider = new HoverProvider_1.HoverProviderImpl(this.languageServiceManager);

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

@@ -72,7 +72,7 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     const tsconfigRoot = tsconfigPath ? (0, path_1.dirname)(tsconfigPath) : process.cwd();
     const workspacePaths = workspaceUris.map((uri) => (0, utils_1.urlToPath)(uri));
     const workspacePath = workspacePaths.find((uri) => tsconfigRoot.startsWith(uri)) || workspacePaths[0];
-    const astroVersion = (0, utils_1.getUserAstroVersion)(workspacePath);
+    const astroInstall = (0, utils_1.getAstroInstall)([tsconfigRoot, workspacePath]);
     const config = (await docContext.configManager.getConfig('astro.typescript', workspacePath)) ?? {};
     const allowArbitraryAttrs = config.allowArbitraryAttributes ?? false;
     // `raw` here represent the tsconfig merged with any extended config
@@ -81,9 +81,8 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     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))));
+    if (astroInstall) {
+        scriptFileNames.push(...['./env.d.ts', './astro-jsx.d.ts'].map((f) => typescript_1.default.sys.resolvePath((0, path_1.resolve)(astroInstall.path, f))));
     }
     let languageServerDirectory;
     try {
@@ -92,14 +91,13 @@ async function createLanguageService(tsconfigPath, docContext, workspaceUris) {
     catch (e) {
         languageServerDirectory = __dirname;
     }
-    // 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') &&
-        !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
+    // Fallback to internal types when Astro is not installed or the Astro version is too old
+    if (!astroInstall ||
+        ((astroInstall.version.major === 0 || astroInstall.version.full === '1.0.0-beta.0') &&
+            !astroInstall.version.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");
+        scriptFileNames.push(...['../types/astro-jsx.d.ts', '../types/env.d.ts'].map((f) => typescript_1.default.sys.resolvePath((0, path_1.resolve)(languageServerDirectory, f))));
+        console.warn("Couldn't load types from Astro, using internal types instead");
     }
     if (allowArbitraryAttrs) {
         const arbitraryAttrsDTS = typescript_1.default.sys.resolvePath((0, path_1.resolve)(languageServerDirectory, '../types/arbitrary-attrs.d.ts'));

package/dist/server.js

@@ -37,6 +37,7 @@ 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 LanguageServiceManager_1 = require("./plugins/typescript/LanguageServiceManager");
 const TagCloseRequest = new vscode.RequestType('html/tag');
 // Start the language server
 function startLanguageServer(connection) {
@@ -55,8 +56,8 @@ function startLanguageServer(connection) {
             if (!(0, utils_1.isAstroWorkspace)(uri) && uri !== '/' && uri !== '') {
                 return;
             }
-            const astroVersion = (0, utils_1.getUserAstroVersion)(uri);
-            if (astroVersion.exist === false) {
+            const astroInstall = (0, utils_1.getAstroInstall)([uri]);
+            if (!astroInstall) {
                 connection.sendNotification(vscode_languageserver_1.ShowMessageNotification.type, {
                     message: `Couldn't find Astro in workspace "${uri}". Experience might be degraded. For the best experience, please make sure Astro is installed and then restart the language server`,
                     type: vscode_languageserver_1.MessageType.Warning,
@@ -73,8 +74,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));
+            const languageServiceManager = new LanguageServiceManager_1.LanguageServiceManager(documentManager, workspaceUris.map(utils_1.normalizeUri), configManager);
+            typescriptPlugin = new plugins_1.TypeScriptPlugin(configManager, languageServiceManager);
+            pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(configManager, languageServiceManager));
             pluginHost.registerPlugin(typescriptPlugin);
         }
         return {

package/dist/utils.d.ts

@@ -69,11 +69,13 @@ export declare function debounceThrottle<T extends (...args: any) => void>(fn: 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;
-    minor: number;
-    patch: number;
-    exist: boolean;
+export interface AstroInstall {
+    path: string;
+    version: {
+        full: string;
+        major: number;
+        minor: number;
+        patch: number;
+    };
 }
-export declare function getUserAstroVersion(basePath: string): AstroVersion;
+export declare function getAstroInstall(basePaths: string[]): AstroInstall | undefined;

package/dist/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.getAstroInstall = 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");
+const importPackage_1 = require("./importPackage");
 /** Normalizes a document URI */
 function normalizeUri(uri) {
     return vscode_uri_1.URI.parse(uri).toString();
@@ -214,23 +215,29 @@ function isAstroWorkspace(workspacePath) {
     return false;
 }
 exports.isAstroWorkspace = isAstroWorkspace;
-function getUserAstroVersion(basePath) {
-    let version = '0.0.0';
-    let exist = true;
+function getAstroInstall(basePaths) {
+    let path;
+    let version;
     try {
-        const astroPackageJson = require.resolve('astro/package.json', { paths: [basePath] });
-        version = require(astroPackageJson).version;
+        path = (0, importPackage_1.getPackagePath)('astro', basePaths);
+        if (!path) {
+            throw Error;
+        }
+        version = require(path + '/package.json').version;
     }
     catch {
         // If we couldn't find it inside the workspace's node_modules, it might means we're in the monorepo
         try {
-            const monorepoPackageJson = require.resolve('./packages/astro/package.json', { paths: [basePath] });
-            version = require(monorepoPackageJson).version;
+            path = (0, importPackage_1.getPackagePath)('./packages/astro', basePaths);
+            if (!path) {
+                throw Error;
+            }
+            version = require(path + '/package.json').version;
         }
         catch (e) {
             // If we still couldn't find it, it probably just doesn't exist
-            exist = false;
-            console.error(`${basePath} seems to be an Astro project, but we couldn't find Astro or Astro is not installed`);
+            console.error(`${basePaths[0]} seems to be an Astro project, but we couldn't find Astro or Astro is not installed`);
+            return undefined;
         }
     }
     let [major, minor, patch] = version.split('.');
@@ -239,11 +246,13 @@ function getUserAstroVersion(basePath) {
         patch = patchParts[0];
     }
     return {
-        full: version,
-        major: Number(major),
-        minor: Number(minor),
-        patch: Number(patch),
-        exist,
+        path,
+        version: {
+            full: version,
+            major: Number(major),
+            minor: Number(minor),
+            patch: Number(patch),
+        },
     };
 }
-exports.getUserAstroVersion = getUserAstroVersion;
+exports.getAstroInstall = getAstroInstall;

package/package.json

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

package/types/README.md

@@ -0,0 +1,5 @@
+# Types
+
+**Heads up!** `env.d.ts` and `astro-jsx.d.ts` in this folder are only used as fallback by the language server whenever we're not able to load the real types from the user's project. The types here should be in line with the types from Astro, but only loosely as not being able to load the real types from the user's project is an uncommon situation and some things are not necessarily possible without relying on Astro's internals
+
+As such, if you're making a PR to fix/improve something related to types, you should probably make a PR to [Astro itself](https://github.com/withastro/astro), not this project!