@astrojs/language-server 0.20.3 → 0.22.0

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
@@ -80,6 +80,10 @@ 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 (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 {
         languageServerDirectory = (0, path_1.dirname)(require.resolve('@astrojs/language-server'));
@@ -87,15 +91,13 @@ 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') &&
-        !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'));
@@ -221,23 +223,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 +259,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

@@ -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) {
@@ -44,8 +45,10 @@ 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 environment = params.initializationOptions?.environment ?? 'node';
         const workspaceUris = params.workspaceFolders?.map((folder) => folder.uri.toString()) ?? [params.rootUri ?? ''];
         workspaceUris.forEach((uri) => {
             uri = (0, utils_1.urlToPath)(uri);
@@ -54,8 +57,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,
@@ -71,9 +74,11 @@ function startLanguageServer(connection) {
         pluginHost.registerPlugin(new HTMLPlugin_1.HTMLPlugin(configManager));
         pluginHost.registerPlugin(new CSSPlugin_1.CSSPlugin(configManager));
         // We don't currently support running the TypeScript and Astro plugin in the browser
-        if (params.initializationOptions.environment !== 'browser') {
-            pluginHost.registerPlugin(new AstroPlugin_1.AstroPlugin(documentManager, configManager, workspaceUris));
-            pluginHost.registerPlugin(new plugins_1.TypeScriptPlugin(documentManager, configManager, workspaceUris));
+        if (environment === 'node') {
+            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 {
             capabilities: {
@@ -86,6 +91,7 @@ function startLanguageServer(connection) {
                 },
                 foldingRangeProvider: true,
                 definitionProvider: true,
+                typeDefinitionProvider: true,
                 renameProvider: true,
                 documentFormattingProvider: true,
                 codeActionProvider: {
@@ -180,6 +186,7 @@ function startLanguageServer(connection) {
     // Features
     connection.onHover((params) => pluginHost.doHover(params.textDocument, params.position));
     connection.onDefinition((evt) => pluginHost.getDefinitions(evt.textDocument, evt.position));
+    connection.onTypeDefinition((evt) => pluginHost.getTypeDefinition(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) => {
@@ -212,6 +219,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

@@ -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.20.3",
+  "version": "0.22.0",
   "author": "withastro",
   "license": "MIT",
   "type": "commonjs",
@@ -20,6 +20,8 @@
   },
   "dependencies": {
     "@vscode/emmet-helper": "^2.8.4",
+    "prettier": "^2.7.1",
+    "prettier-plugin-astro": "^0.5.0",
     "source-map": "^0.7.3",
     "typescript": "~4.6.4",
     "vscode-css-languageservice": "^6.0.1",
@@ -35,6 +37,7 @@
     "@astrojs/vue": "^0.5.0",
     "@types/chai": "^4.3.0",
     "@types/mocha": "^9.1.0",
+    "@types/prettier": "^2.7.0",
     "@types/sinon": "^10.0.11",
     "astro": "^1.0.0-beta.72",
     "astro-scripts": "0.0.1",

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!