@astrojs/language-server 2.6.2 → 2.7.0

package/dist/plugins/typescript/index.js

@@ -1,64 +1,60 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
-const volar_service_typescript_1 = __importDefault(require("volar-service-typescript"));
+const volar_service_typescript_1 = require("volar-service-typescript");
 const index_js_1 = require("../../core/index.js");
 const codeActions_js_1 = require("./codeActions.js");
 const completions_js_1 = require("./completions.js");
 const diagnostics_js_1 = require("./diagnostics.js");
-const create = () => (context, modules) => {
-    const typeScriptPlugin = (0, volar_service_typescript_1.default)()(context, modules);
-    if (!context) {
-        return {
-            triggerCharacters: typeScriptPlugin.triggerCharacters,
-            signatureHelpTriggerCharacters: typeScriptPlugin.signatureHelpTriggerCharacters,
-            signatureHelpRetriggerCharacters: typeScriptPlugin.signatureHelpRetriggerCharacters,
-        };
-    }
+const create = (ts) => {
+    const tsServicePlugin = (0, volar_service_typescript_1.create)(ts);
     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.getVirtualFileByUri(document.uri);
-            const file = source?.root;
-            let tsxLineCount = undefined;
-            if (file instanceof index_js_1.AstroFile) {
-                // If we have compiler errors, our TSX isn't valid so don't bother showing TS errors
-                if (file.hasCompilationErrors)
-                    return null;
-                // We'll use this to filter out diagnostics that are outside the mapped range of the TSX
-                tsxLineCount = file.astroMeta.tsxRanges.body.end.line;
-            }
-            const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
-            if (!diagnostics)
-                return null;
-            return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, tsxLineCount);
+        ...tsServicePlugin,
+        create(context) {
+            const typeScriptPlugin = tsServicePlugin.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);
+                },
+            };
         },
     };
 };

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

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

package/dist/plugins/typescript-addons/index.js

@@ -4,36 +4,40 @@ exports.create = void 0;
 const index_js_1 = require("../../core/index.js");
 const utils_js_1 = require("../utils.js");
 const snippets_js_1 = require("./snippets.js");
-const create = () => (context) => {
+const create = () => {
     return {
-        isAdditionalCompletion: true,
-        // Q: Why the empty transform and resolve functions?
-        // A: Volar will skip mapping the completion items if those functions are defined, as such we can return the snippets
-        // completions as-is, this is notably useful for snippets that insert to the frontmatter, since we don't need to map anything.
-        transformCompletionItem(item) {
-            return item;
-        },
-        provideCompletionItems(document, position, completionContext, token) {
-            if (!context ||
-                !utils_js_1.isJSDocument ||
-                token.isCancellationRequested ||
-                completionContext.triggerKind === 2)
-                return null;
-            const [_, source] = context.documents.getVirtualFileByUri(document.uri);
-            const file = source?.root;
-            if (!(file instanceof index_js_1.AstroFile))
-                return undefined;
-            if (!(0, utils_js_1.isInsideFrontmatter)(document.offsetAt(position), file.astroMeta.frontmatter))
-                return null;
-            const completionList = {
-                items: [],
-                isIncomplete: false,
+        create(context) {
+            return {
+                isAdditionalCompletion: true,
+                // Q: Why the empty transform and resolve functions?
+                // A: Volar will skip mapping the completion items if those functions are defined, as such we can return the snippets
+                // completions as-is, this is notably useful for snippets that insert to the frontmatter, since we don't need to map anything.
+                transformCompletionItem(item) {
+                    return item;
+                },
+                provideCompletionItems(document, position, completionContext, token) {
+                    if (!context ||
+                        !utils_js_1.isJSDocument ||
+                        token.isCancellationRequested ||
+                        completionContext.triggerKind === 2)
+                        return null;
+                    const [_, source] = context.documents.getVirtualCodeByUri(document.uri);
+                    const code = source?.generated?.code;
+                    if (!(code instanceof index_js_1.AstroVirtualCode))
+                        return undefined;
+                    if (!(0, utils_js_1.isInsideFrontmatter)(document.offsetAt(position), code.astroMeta.frontmatter))
+                        return null;
+                    const completionList = {
+                        items: [],
+                        isIncomplete: false,
+                    };
+                    completionList.items.push(...(0, snippets_js_1.getSnippetCompletions)(code.astroMeta.frontmatter));
+                    return completionList;
+                },
+                resolveCompletionItem(item) {
+                    return item;
+                },
             };
-            completionList.items.push(...(0, snippets_js_1.getSnippetCompletions)(file.astroMeta.frontmatter));
-            return completionList;
-        },
-        resolveCompletionItem(item) {
-            return item;
         },
     };
 };

package/dist/utils.d.ts

@@ -10,5 +10,5 @@ export interface AstroInstall {
 export declare function getLanguageServerTypesDir(ts: typeof import('typescript')): string;
 export declare function getAstroInstall(basePaths: string[], checkForAstro?: {
     nearestPackageJson: string | undefined;
-    readDirectory: typeof import('typescript/lib/tsserverlibrary.js').sys.readDirectory;
+    readDirectory: typeof import('typescript').sys.readDirectory;
 }): AstroInstall | 'not-an-astro-project' | 'not-found';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -22,21 +22,19 @@
   "dependencies": {
     "@astrojs/compiler": "^2.4.0",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~1.11.1",
-    "@volar/language-core": "~1.11.1",
-    "@volar/language-server": "~1.11.1",
-    "@volar/language-service": "~1.11.1",
-    "@volar/source-map": "~1.11.1",
-    "@volar/typescript": "~1.11.1",
+    "@volar/kit": "~2.0.2",
+    "@volar/language-core": "~2.0.2",
+    "@volar/language-server": "~2.0.2",
+    "@volar/language-service": "~2.0.2",
+    "@volar/typescript": "~2.0.2",
     "fast-glob": "^3.2.12",
-    "muggle-string": "^0.3.1",
-    "volar-service-css": "0.0.17",
-    "volar-service-emmet": "0.0.17",
-    "volar-service-html": "0.0.17",
-    "volar-service-prettier": "0.0.17",
-    "volar-service-typescript": "0.0.17",
-    "volar-service-typescript-twoslash-queries": "0.0.17",
-    "vscode-html-languageservice": "^5.1.0",
+    "volar-service-css": "0.0.28",
+    "volar-service-emmet": "0.0.28",
+    "volar-service-html": "0.0.28",
+    "volar-service-prettier": "0.0.28",
+    "volar-service-typescript": "0.0.28",
+    "volar-service-typescript-twoslash-queries": "0.0.28",
+    "vscode-html-languageservice": "^5.1.1",
     "vscode-uri": "^3.0.8"
   },
   "devDependencies": {
@@ -45,6 +43,7 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
+    "@volar/test-utils": "~2.0.2",
     "astro": "^4.1.0",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",