@astrojs/language-server 2.16.0 → 2.16.1-beta.1

package/dist/check.js

@@ -32,9 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstroCheck = exports.DiagnosticSeverity = exports.Diagnostic = void 0;
 const node_fs_1 = require("node:fs");
@@ -45,7 +42,7 @@ const kit = __importStar(require("@volar/kit"));
 const language_server_1 = require("@volar/language-server");
 Object.defineProperty(exports, "Diagnostic", { enumerable: true, get: function () { return language_server_1.Diagnostic; } });
 Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return language_server_1.DiagnosticSeverity; } });
-const fast_glob_1 = __importDefault(require("fast-glob"));
+const tinyglobby_1 = require("tinyglobby");
 const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("./core/index.js");
 const svelte_js_1 = require("./core/svelte.js");
@@ -128,7 +125,7 @@ class AstroCheck {
             (0, svelte_js_1.getSvelteLanguagePlugin)(),
             (0, vue_js_1.getVueLanguagePlugin)(),
         ];
-        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)()];
         if (tsconfigPath) {
             const includeProjectReference = false; // #920
             this.linter = kit.createTypeScriptChecker(languagePlugins, services, tsconfigPath, includeProjectReference, ({ project }) => {
@@ -139,10 +136,12 @@ class AstroCheck {
         }
         else {
             this.linter = kit.createTypeScriptInferredChecker(languagePlugins, services, () => {
-                return fast_glob_1.default.sync('**/*.astro', {
+                return (0, tinyglobby_1.globSync)('**/*.astro', {
                     cwd: this.workspacePath,
                     ignore: ['node_modules'],
                     absolute: true,
+                    // Required to avoid tinyglobby running eternally
+                    expandDirectories: false,
                 });
             }, undefined, ({ project }) => {
                 const { languageServiceHost } = project.typescript;

package/dist/core/astro2tsx.js

@@ -18,7 +18,7 @@ function safeConvertToTSX(content, options) {
         return tsx;
     }
     catch (e) {
-        console.error(`There was an error transforming ${options.filename} to TSX. An empty file will be returned instead. Please create an issue: https://github.com/withastro/language-tools/issues\nError: ${e}.`);
+        console.error(`There was an error transforming ${options.filename} to TSX. An empty file will be returned instead. Please create an issue: https://github.com/withastro/astro/issues\nError: ${e}.`);
         return {
             code: '',
             map: {
@@ -34,7 +34,7 @@ function safeConvertToTSX(content, options) {
                     code: 1000,
                     location: { file: options.filename, line: 1, column: 1, length: content.length },
                     severity: 1,
-                    text: `The Astro compiler encountered an unknown error while transform this file to TSX. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/language-tools/issues`,
+                    text: `The Astro compiler encountered an unknown error while transform this file to TSX. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/astro/issues`,
                 },
             ],
             metaRanges: {

package/dist/core/parseAstro.js

@@ -15,7 +15,7 @@ function safeParseAst(fileName, input, parseOptions) {
         return parseResult;
     }
     catch (e) {
-        console.error(`There was an error parsing ${fileName}'s AST. An empty AST will be returned instead to avoid breaking the server. Please create an issue: https://github.com/withastro/language-tools/issues\nError: ${e}.`);
+        console.error(`There was an error parsing ${fileName}'s AST. An empty AST will be returned instead to avoid breaking the server. Please create an issue: https://github.com/withastro/astro/issues\nError: ${e}.`);
         return {
             ast: {
                 type: 'root',
@@ -31,7 +31,7 @@ function safeParseAst(fileName, input, parseOptions) {
                         length: input.length,
                     },
                     severity: 1,
-                    text: `The Astro compiler encountered an unknown error while parsing this file's AST. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/language-tools/issues`,
+                    text: `The Astro compiler encountered an unknown error while parsing this file's AST. Please create an issue with your code and the error shown in the server's logs: https://github.com/withastro/astro/issues`,
                 },
             ],
         };

package/dist/languageServerPlugin.js

@@ -38,7 +38,7 @@ function getLanguageServicePlugins(connection, ts, collectionConfig, initializeP
         }),
         (0, volar_service_typescript_twoslash_queries_1.create)(ts),
         (0, index_js_2.create)(),
-        (0, astro_js_1.create)(ts),
+        (0, astro_js_1.create)(),
         getPrettierService(),
         (0, yaml_js_1.create)(collectionConfig),
     ];

package/dist/plugins/astro.d.ts

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

package/dist/plugins/astro.js

@@ -1,16 +1,10 @@
 "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 node_path_1 = require("node:path");
 const language_server_1 = require("@volar/language-server");
-const fast_glob_1 = __importDefault(require("fast-glob"));
 const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../core/index.js");
-const utils_js_1 = require("./utils.js");
-const create = (ts) => {
+const create = () => {
     return {
         capabilities: {
             completionProvider: {
@@ -20,7 +14,6 @@ const create = (ts) => {
                 interFileDependencies: false,
                 workspaceDiagnostics: false,
             },
-            codeLensProvider: {},
         },
         create(context) {
             return {
@@ -64,54 +57,11 @@ const create = (ts) => {
                         };
                     }
                 },
-                provideCodeLenses(document, token) {
-                    if (token.isCancellationRequested)
-                        return;
-                    if (!(0, utils_js_1.isJSDocument)(document.languageId))
-                        return;
-                    if (!context.project.typescript)
-                        return;
-                    const { uriConverter } = context.project.typescript;
-                    const languageService = context.inject('typescript/languageService');
-                    if (!languageService)
-                        return;
-                    const tsProgram = languageService.getProgram();
-                    if (!tsProgram)
-                        return;
-                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
-                    if (!decoded)
-                        return;
-                    const globcodeLens = [];
-                    const sourceFile = tsProgram.getSourceFile(decoded[0].fsPath);
-                    function walk() {
-                        return ts.forEachChild(sourceFile, function cb(node) {
-                            if (ts.isCallExpression(node) && node.expression.getText() === 'Astro.glob') {
-                                const globArgument = node.arguments.at(0);
-                                if (globArgument && decoded) {
-                                    globcodeLens.push(getGlobResultAsCodeLens(globArgument.getText().slice(1, -1), (0, node_path_1.dirname)(uriConverter.asFileName(decoded[0])), document.positionAt(node.arguments.pos)));
-                                }
-                            }
-                            return ts.forEachChild(node, cb);
-                        });
-                    }
-                    walk();
-                    return globcodeLens;
-                },
             };
         },
     };
 };
 exports.create = create;
-function getGlobResultAsCodeLens(globText, dir, position) {
-    const globResult = fast_glob_1.default.sync(globText, {
-        cwd: dir,
-        onlyFiles: true,
-    });
-    return {
-        range: language_server_1.Range.create(position, position),
-        command: { title: `Matches ${globResult.length} files`, command: '' },
-    };
-}
 function getFrontmatterCompletion(file, document, position) {
     const base = {
         kind: language_server_1.CompletionItemKind.Snippet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.16.0",
+  "version": "2.16.1-beta.1",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,33 +20,33 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.10.3",
+    "@astrojs/compiler": "^2.13.0",
     "@astrojs/yaml2ts": "^0.2.2",
-    "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~2.4.23",
-    "@volar/language-core": "~2.4.23",
-    "@volar/language-server": "~2.4.23",
-    "@volar/language-service": "~2.4.23",
-    "fast-glob": "^3.2.12",
+    "@jridgewell/sourcemap-codec": "^1.5.5",
+    "@volar/kit": "~2.4.27",
+    "@volar/language-core": "~2.4.27",
+    "@volar/language-server": "~2.4.27",
+    "@volar/language-service": "~2.4.27",
     "muggle-string": "^0.4.1",
-    "volar-service-css": "0.0.66",
-    "volar-service-emmet": "0.0.66",
-    "volar-service-html": "0.0.66",
-    "volar-service-prettier": "0.0.66",
-    "volar-service-typescript": "0.0.66",
-    "volar-service-typescript-twoslash-queries": "0.0.66",
-    "volar-service-yaml": "0.0.66",
-    "vscode-html-languageservice": "^5.5.2",
+    "tinyglobby": "^0.2.15",
+    "volar-service-css": "0.0.68",
+    "volar-service-emmet": "0.0.68",
+    "volar-service-html": "0.0.68",
+    "volar-service-prettier": "0.0.68",
+    "volar-service-typescript": "0.0.68",
+    "volar-service-typescript-twoslash-queries": "0.0.68",
+    "volar-service-yaml": "0.0.68",
+    "vscode-html-languageservice": "^5.6.1",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "@volar/test-utils": "~2.4.23",
-    "@volar/typescript": "~2.4.23",
-    "tsx": "^4.20.6",
+    "@volar/test-utils": "~2.4.27",
+    "@volar/typescript": "~2.4.27",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "vscode-languageserver-protocol": "^3.17.5",
-    "vscode-languageserver-textdocument": "^1.0.11",
+    "vscode-languageserver-textdocument": "^1.0.12",
     "astro-scripts": "0.0.14"
   },
   "peerDependencies": {
@@ -64,8 +64,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "sync-fixture": "pnpm --dir ./test/fixture sync",
-    "test": "pnpm sync-fixture && astro-scripts test \"**/*.test.ts\" --teardown-test ./test/misc/teardown.ts --tsx true",
+    "test": "astro-scripts test \"**/*.test.ts\" --teardown-test ./test/misc/teardown.ts --tsx true --setup ./test/setup.js",
     "test:match": "pnpm run test --match"
   }
 }