@astrojs/language-server 2.7.7 → 2.8.1

package/dist/check.js

@@ -118,7 +118,7 @@ class AstroCheck {
             (0, svelte_js_1.getSvelteLanguageModule)(),
             (0, vue_js_1.getVueLanguageModule)(),
         ];
-        const services = [(0, index_js_2.create)(this.ts), (0, astro_js_1.create)(this.ts)];
+        const services = [...(0, index_js_2.create)(this.ts), (0, astro_js_1.create)(this.ts)];
         if (tsconfigPath) {
             this.linter = kit.createTypeScriptChecker(languages, services, tsconfigPath);
         }

package/dist/core/astro2tsx.d.ts

@@ -40,7 +40,7 @@ export declare function safeConvertToTSX(content: string, options: ConvertToTSXO
 };
 export declare function getTSXRangesAsLSPRanges(tsx: TSXResult): LSPTSXRanges;
 export declare function astro2tsx(input: string, fileName: string, htmlDocument: HTMLDocument): {
-    virtualCode: VirtualCode<string>;
+    virtualCode: VirtualCode;
     diagnostics: import("@astrojs/compiler").DiagnosticMessage[] | {
         code: 1000;
         location: {

package/dist/core/index.js

@@ -168,6 +168,7 @@ class AstroVirtualCode {
         this.htmlDocument = htmlDocument;
         const scriptTags = (0, parseJS_js_1.extractScriptTags)(this.snapshot, htmlDocument, astroMetadata.ast);
         this.scriptCodeIds = scriptTags.map((scriptTag) => scriptTag.id);
+        htmlVirtualCode.embeddedCodes = [];
         htmlVirtualCode.embeddedCodes.push(...(0, parseCSS_1.extractStylesheets)(this.snapshot, htmlDocument, astroMetadata.ast), ...scriptTags);
         this.embeddedCodes = [];
         this.embeddedCodes.push(htmlVirtualCode);

package/dist/languageServerPlugin.d.ts

@@ -1,3 +1,3 @@
 import { Connection } from '@volar/language-server/node';
-import type { ServerOptions, createServerBase } from '@volar/language-server/lib/server.js';
-export declare function createServerOptions(connection: Connection, server: ReturnType<typeof createServerBase>): ServerOptions;
+import type { ServerOptions } from '@volar/language-server/lib/server.js';
+export declare function createServerOptions(connection: Connection, ts: typeof import('typescript')): ServerOptions;

package/dist/languageServerPlugin.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServerOptions = void 0;
 const node_1 = require("@volar/language-server/node");
+const vscode_uri_1 = require("vscode-uri");
 const core_1 = require("./core");
 const svelte_js_1 = require("./core/svelte.js");
 const vue_js_1 = require("./core/vue.js");
@@ -16,7 +17,7 @@ const astro_js_1 = require("./plugins/astro.js");
 const html_js_1 = require("./plugins/html.js");
 const index_js_1 = require("./plugins/typescript-addons/index.js");
 const index_js_2 = require("./plugins/typescript/index.js");
-function createServerOptions(connection, server) {
+function createServerOptions(connection, ts) {
     return {
         watchFileExtensions: [
             'js',
@@ -33,20 +34,18 @@ function createServerOptions(connection, server) {
             'svelte',
         ],
         getServicePlugins() {
-            const ts = getTypeScriptModule();
             return [
                 (0, html_js_1.create)(),
                 (0, volar_service_css_1.create)(),
                 (0, volar_service_emmet_1.create)(),
-                (0, index_js_2.create)(ts),
-                (0, volar_service_typescript_twoslash_queries_1.create)(),
+                ...(0, index_js_2.create)(ts),
+                (0, volar_service_typescript_twoslash_queries_1.create)(ts),
                 (0, index_js_1.create)(),
                 (0, astro_js_1.create)(ts),
                 getPrettierService(),
             ];
         },
         getLanguagePlugins(serviceEnv, projectContext) {
-            const ts = getTypeScriptModule();
             const languagePlugins = [
                 (0, vue_js_1.getVueLanguageModule)(),
                 (0, svelte_js_1.getSvelteLanguageModule)(),
@@ -55,7 +54,7 @@ function createServerOptions(connection, server) {
                 const rootPath = projectContext.typescript.configFileName
                     ? projectContext.typescript.configFileName.split('/').slice(0, -1).join('/')
                     : serviceEnv.typescript.uriToFileName(serviceEnv.workspaceFolder);
-                const nearestPackageJson = server.modules.typescript?.findConfigFile(rootPath, ts.sys.fileExists, 'package.json');
+                const nearestPackageJson = ts.findConfigFile(rootPath, ts.sys.fileExists, 'package.json');
                 const astroInstall = (0, utils_js_1.getAstroInstall)([rootPath], {
                     nearestPackageJson: nearestPackageJson,
                     readDirectory: ts.sys.readDirectory,
@@ -71,21 +70,14 @@ function createServerOptions(connection, server) {
             return languagePlugins;
         },
     };
-    function getTypeScriptModule() {
-        const tsModule = server.modules.typescript;
-        if (!tsModule) {
-            throw new Error('TypeScript module is missing');
-        }
-        return tsModule;
-    }
     function getPrettierService() {
         let prettier;
         let prettierPluginPath;
-        return (0, volar_service_prettier_1.create)({
-            getPrettier(env) {
-                const workspacePath = env.typescript.uriToFileName(env.workspaceFolder);
-                prettier = (0, importPackage_js_1.importPrettier)(workspacePath);
-                prettierPluginPath = (0, importPackage_js_1.getPrettierPluginPath)(workspacePath);
+        return (0, volar_service_prettier_1.create)((context) => {
+            const workspaceUri = vscode_uri_1.URI.parse(context.env.workspaceFolder);
+            if (workspaceUri.scheme === 'file') {
+                prettier = (0, importPackage_js_1.importPrettier)(workspaceUri.fsPath);
+                prettierPluginPath = (0, importPackage_js_1.getPrettierPluginPath)(workspaceUri.fsPath);
                 if (!prettier || !prettierPluginPath) {
                     connection.sendNotification(node_1.ShowMessageNotification.type, {
                         message: "Couldn't load `prettier` or `prettier-plugin-astro`. Formatting will not work. Please make sure those two packages are installed into your project.",
@@ -93,15 +85,32 @@ function createServerOptions(connection, server) {
                     });
                 }
                 return prettier;
-            },
-            languages: ['astro'],
-            ignoreIdeOptions: true,
-            useIdeOptionsFallback: true,
-            resolveConfigOptions: {
-                // This seems to be broken since Prettier 3, and it'll always use its cumbersome cache. Hopefully it works one day.
-                useCache: false,
-            },
-            additionalOptions: async (resolvedConfig) => {
+            }
+        }, {
+            documentSelector: ['astro'],
+            getFormattingOptions: async (prettier, document, formatOptions, context) => {
+                const filePath = vscode_uri_1.URI.parse(document.uri).fsPath;
+                const configOptions = await prettier.resolveConfig(filePath, {
+                    // This seems to be broken since Prettier 3, and it'll always use its cumbersome cache. Hopefully it works one day.
+                    useCache: false,
+                });
+                const editorOptions = await context.env.getConfiguration?.('prettier', document.uri);
+                // Return a config with the following cascade:
+                // - Prettier config file should always win if it exists, if it doesn't:
+                // - Prettier config from the VS Code extension is used, if it doesn't exist:
+                // - Use the editor's basic configuration settings
+                const resolvedConfig = {
+                    filepath: filePath,
+                    tabWidth: formatOptions.tabSize,
+                    useTabs: !formatOptions.insertSpaces,
+                    ...editorOptions,
+                    ...configOptions,
+                };
+                return {
+                    ...resolvedConfig,
+                    plugins: [...(await getAstroPrettierPlugin()), ...(resolvedConfig.plugins ?? [])],
+                    parser: 'astro',
+                };
                 async function getAstroPrettierPlugin() {
                     if (!prettier || !prettierPluginPath) {
                         return [];
@@ -110,12 +119,6 @@ function createServerOptions(connection, server) {
                         resolvedConfig.plugins?.includes('prettier-plugin-astro'); // getSupportInfo doesn't seems to work very well in Prettier 3 for plugins
                     return hasPluginLoadedAlready ? [] : [prettierPluginPath];
                 }
-                const plugins = [...(await getAstroPrettierPlugin()), ...(resolvedConfig.plugins ?? [])];
-                return {
-                    ...resolvedConfig,
-                    plugins: plugins,
-                    parser: 'astro',
-                };
             },
         });
     }

package/dist/nodeServer.js

@@ -6,7 +6,12 @@ const connection = (0, node_1.createConnection)();
 const server = (0, node_1.createServer)(connection);
 connection.listen();
 connection.onInitialize((params) => {
-    return server.initialize(params, node_1.createTypeScriptProjectProvider, (0, languageServerPlugin_js_1.createServerOptions)(connection, server));
+    const tsdk = params.initializationOptions?.typescript?.tsdk;
+    if (!tsdk) {
+        throw new Error('The `typescript.tsdk` init option is required. It should point to a directory containing a `typescript.js` or `tsserverlibrary.js` file, such as `node_modules/typescript/lib`.');
+    }
+    const { typescript, diagnosticMessages } = (0, node_1.loadTsdkByPath)(tsdk, params.locale);
+    return server.initialize(params, (0, node_1.createTypeScriptProjectProviderFactory)(typescript, diagnosticMessages), (0, languageServerPlugin_js_1.createServerOptions)(connection, typescript));
 });
 connection.onInitialized(() => {
     server.initialized();

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

@@ -1,2 +1,2 @@
 import type { ServicePlugin } from '@volar/language-server';
-export declare const create: (ts: typeof import('typescript')) => ServicePlugin;
+export declare const create: (ts: typeof import('typescript')) => ServicePlugin[];

package/dist/plugins/typescript/index.js

@@ -7,56 +7,61 @@ const codeActions_js_1 = require("./codeActions.js");
 const completions_js_1 = require("./completions.js");
 const diagnostics_js_1 = require("./diagnostics.js");
 const create = (ts) => {
-    const tsServicePlugin = (0, volar_service_typescript_1.create)(ts);
-    return {
-        ...tsServicePlugin,
-        create(context) {
-            const typeScriptPlugin = tsServicePlugin.create(context);
+    const tsServicePlugins = (0, volar_service_typescript_1.create)(ts, {});
+    return tsServicePlugins.map((plugin) => {
+        if (plugin.name === 'typescript-semantic') {
             return {
-                ...typeScriptPlugin,
-                async provideCompletionItems(document, position, completionContext, token) {
-                    const originalCompletions = await typeScriptPlugin.provideCompletionItems(document, position, completionContext, token);
-                    if (!originalCompletions)
-                        return null;
-                    return (0, completions_js_1.enhancedProvideCompletionItems)(originalCompletions);
-                },
-                async resolveCompletionItem(item, token) {
-                    const resolvedCompletionItem = await typeScriptPlugin.resolveCompletionItem(item, token);
-                    if (!resolvedCompletionItem)
-                        return item;
-                    return (0, completions_js_1.enhancedResolveCompletionItem)(resolvedCompletionItem, context);
-                },
-                async provideCodeActions(document, range, codeActionContext, token) {
-                    const originalCodeActions = await typeScriptPlugin.provideCodeActions(document, range, codeActionContext, token);
-                    if (!originalCodeActions)
-                        return null;
-                    return (0, codeActions_js_1.enhancedProvideCodeActions)(originalCodeActions, context);
-                },
-                async resolveCodeAction(codeAction, token) {
-                    const resolvedCodeAction = await typeScriptPlugin.resolveCodeAction(codeAction, token);
-                    if (!resolvedCodeAction)
-                        return codeAction;
-                    return (0, codeActions_js_1.enhancedResolveCodeAction)(resolvedCodeAction, context);
-                },
-                async provideSemanticDiagnostics(document, token) {
-                    const [_, source] = context.documents.getVirtualCodeByUri(document.uri);
-                    const code = source?.generated?.code;
-                    let tsxLineCount = undefined;
-                    if (code instanceof index_js_1.AstroVirtualCode) {
-                        // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
-                        if (code.hasCompilationErrors)
-                            return null;
-                        // We'll use this to filter out diagnostics that are outside the mapped range of the TSX
-                        tsxLineCount = code.astroMeta.tsxRanges.body.end.line;
-                    }
-                    const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
-                    if (!diagnostics)
-                        return null;
-                    return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, tsxLineCount);
+                ...plugin,
+                create(context) {
+                    const typeScriptPlugin = plugin.create(context);
+                    return {
+                        ...typeScriptPlugin,
+                        async provideCompletionItems(document, position, completionContext, token) {
+                            const originalCompletions = await typeScriptPlugin.provideCompletionItems(document, position, completionContext, token);
+                            if (!originalCompletions)
+                                return null;
+                            return (0, completions_js_1.enhancedProvideCompletionItems)(originalCompletions);
+                        },
+                        async resolveCompletionItem(item, token) {
+                            const resolvedCompletionItem = await typeScriptPlugin.resolveCompletionItem(item, token);
+                            if (!resolvedCompletionItem)
+                                return item;
+                            return (0, completions_js_1.enhancedResolveCompletionItem)(resolvedCompletionItem, context);
+                        },
+                        async provideCodeActions(document, range, codeActionContext, token) {
+                            const originalCodeActions = await typeScriptPlugin.provideCodeActions(document, range, codeActionContext, token);
+                            if (!originalCodeActions)
+                                return null;
+                            return (0, codeActions_js_1.enhancedProvideCodeActions)(originalCodeActions, context);
+                        },
+                        async resolveCodeAction(codeAction, token) {
+                            const resolvedCodeAction = await typeScriptPlugin.resolveCodeAction(codeAction, token);
+                            if (!resolvedCodeAction)
+                                return codeAction;
+                            return (0, codeActions_js_1.enhancedResolveCodeAction)(resolvedCodeAction, context);
+                        },
+                        async provideSemanticDiagnostics(document, token) {
+                            const [_, source] = context.documents.getVirtualCodeByUri(document.uri);
+                            const code = source?.generated?.code;
+                            let tsxLineCount = undefined;
+                            if (code instanceof index_js_1.AstroVirtualCode) {
+                                // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
+                                if (code.hasCompilationErrors)
+                                    return null;
+                                // We'll use this to filter out diagnostics that are outside the mapped range of the TSX
+                                tsxLineCount = code.astroMeta.tsxRanges.body.end.line;
+                            }
+                            const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
+                            if (!diagnostics)
+                                return null;
+                            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, tsxLineCount);
+                        },
+                    };
                 },
             };
-        },
-    };
+        }
+        return plugin;
+    });
 };
 exports.create = create;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.7.7",
+  "version": "2.8.1",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,20 +20,20 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.4.0",
+    "@astrojs/compiler": "^2.7.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~2.0.4",
-    "@volar/language-core": "~2.0.4",
-    "@volar/language-server": "~2.0.4",
-    "@volar/language-service": "~2.0.4",
-    "@volar/typescript": "~2.0.4",
+    "@volar/kit": "~2.1.2",
+    "@volar/language-core": "~2.1.2",
+    "@volar/language-server": "~2.1.2",
+    "@volar/language-service": "~2.1.2",
+    "@volar/typescript": "~2.1.2",
     "fast-glob": "^3.2.12",
-    "volar-service-css": "0.0.30",
-    "volar-service-emmet": "0.0.30",
-    "volar-service-html": "0.0.30",
-    "volar-service-prettier": "0.0.30",
-    "volar-service-typescript": "0.0.30",
-    "volar-service-typescript-twoslash-queries": "0.0.30",
+    "volar-service-css": "0.0.32",
+    "volar-service-emmet": "0.0.32",
+    "volar-service-html": "0.0.32",
+    "volar-service-prettier": "0.0.32",
+    "volar-service-typescript": "0.0.32",
+    "volar-service-typescript-twoslash-queries": "0.0.32",
     "vscode-html-languageservice": "^5.1.2",
     "vscode-uri": "^3.0.8"
   },
@@ -44,7 +44,7 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "@volar/test-utils": "~2.0.4",
+    "@volar/test-utils": "~2.1.2",
     "astro": "^4.3.5",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",