@astrojs/language-server 2.16.2 → 2.16.4

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/parseHTML.js

@@ -83,7 +83,7 @@ function preprocessHTML(text, frontmatterEnd) {
     }
     return content;
     function shouldBlankStartOrEndTagLike(offset) {
-        // not null rather than falsy, otherwise it won't work on first tag(0)
+        // not null rather than falsy; otherwise, it won't work on first tag(0)
         return (currentStartTagStart !== null && (0, utils_1.isInsideExpression)(content, currentStartTagStart, offset));
     }
     function blankStartOrEndTagLike(offset, state) {

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/dist/plugins/html-data.js

@@ -28,7 +28,7 @@ exports.astroElements = (0, vscode_html_languageservice_1.newHTMLDataProvider)('
             references: [
                 {
                     name: 'Astro reference',
-                    url: 'https://docs.astro.build/en/core-concepts/astro-components/#slots',
+                    url: 'https://docs.astro.build/en/basics/astro-components/#slots',
                 },
             ],
             attributes: [
@@ -38,7 +38,7 @@ exports.astroElements = (0, vscode_html_languageservice_1.newHTMLDataProvider)('
                     references: [
                         {
                             name: 'Astro reference',
-                            url: 'https://docs.astro.build/en/core-concepts/astro-components/#named-slots',
+                            url: 'https://docs.astro.build/en/basics/astro-components/#named-slots',
                         },
                     ],
                 },
@@ -92,7 +92,7 @@ exports.astroElements = (0, vscode_html_languageservice_1.newHTMLDataProvider)('
                     references: [
                         {
                             name: 'Astro reference',
-                            url: 'https://docs.astro.build/en/guides/view-transitions/#script-behavior',
+                            url: 'https://docs.astro.build/en/guides/view-transitions/#data-astro-rerun',
                         },
                     ],
                 },

package/dist/plugins/typescript/utils.js

@@ -10,7 +10,7 @@ function mapEdit(edit, code, languageId) {
         }
     }
     else {
-        // If the edit is at the start of the file, add a newline before it, otherwise we'll get `<script>text`
+        // If the edit is at the start of the file, add a newline before it; otherwise, we'll get `<script>text`
         if (edit.range.start.line === 0 && edit.range.start.character === 0) {
             edit.newText = '\n' + edit.newText;
         }

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

@@ -35,7 +35,7 @@ function getSnippetCompletions(frontmatter) {
                 value: [
                     'Create a new getStaticPaths function.',
                     '\n',
-                    '[Astro reference](https://docs.astro.build/en/reference/api-reference/#getstaticpaths)',
+                    '[Astro reference](https://docs.astro.build/en/reference/routing-reference/#getstaticpaths)',
                 ].join('\n'),
             },
             insertText: 'export const getStaticPaths = (() => {\n\t$1\n\treturn [];\n}) satisfies GetStaticPaths;',
@@ -52,9 +52,9 @@ function getSnippetCompletions(frontmatter) {
             documentation: {
                 kind: 'markdown',
                 value: [
-                    'Add prerender export. When [using server-side rendering](https://docs.astro.build/en/guides/server-side-rendering/#enabling-ssr-in-your-project), this value will be used to determine whether to prerender the page or not.',
+                    'Add prerender export. When [using server-side rendering](https://docs.astro.build/en/guides/on-demand-rendering/#enabling-on-demand-rendering), this value will be used to determine whether or not to prerender the page.',
                     '\n',
-                    '[Astro reference](https://docs.astro.build/en/guides/server-side-rendering/#configuring-individual-routes)',
+                    '[Astro reference](https://docs.astro.build/en/reference/routing-reference/#prerender)',
                 ].join('\n'),
             },
             insertText: 'export const prerender = ${1|true,false|}',

package/dist/plugins/yaml.js

@@ -47,7 +47,7 @@ const create = (collectionConfig) => {
                     const changedConfig = events.changes.some((change) => change.uri.endsWith('collections.json'));
                     if (changedConfig) {
                         collectionConfig.reload(
-                        // For some reason, context.env.workspaceFolders is not an array of WorkspaceFolders nor the older format, strange
+                        // For some reason, context.env.workspaceFolders is neither an array of WorkspaceFolders nor the older format, strange
                         context.env.workspaceFolders.map((folder) => ({ uri: folder.toString() })));
                         languageService.configure(getSettings(collectionConfig));
                     }
@@ -83,7 +83,7 @@ const create = (collectionConfig) => {
                             diagnostic.source = 'astro';
                             // In Astro, schema errors are always fatal
                             diagnostic.severity = language_server_1.DiagnosticSeverity.Error;
-                            // Map missing properties to the entire frontmatte
+                            // Map missing properties to the entire frontmatter
                             if (diagnostic.message.startsWith('Missing property')) {
                                 diagnostic.range = language_server_1.Range.create({ line: 0, character: 0 }, document.positionAt(document.getText().length));
                             }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.16.2",
+  "version": "2.16.4",
   "author": "withastro",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
+    "url": "git+https://github.com/withastro/astro.git",
     "directory": "packages/language-tools/language-server"
   },
   "type": "commonjs",
@@ -20,33 +20,33 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^2.10.3",
-    "@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",
+    "@astrojs/compiler": "^2.13.1",
+    "@astrojs/yaml2ts": "^0.2.3",
+    "@jridgewell/sourcemap-codec": "^1.5.5",
+    "@volar/kit": "~2.4.28",
+    "@volar/language-core": "~2.4.28",
+    "@volar/language-server": "~2.4.28",
+    "@volar/language-service": "~2.4.28",
     "muggle-string": "^0.4.1",
-    "volar-service-css": "0.0.67",
-    "volar-service-emmet": "0.0.67",
-    "volar-service-html": "0.0.67",
-    "volar-service-prettier": "0.0.67",
-    "volar-service-typescript": "0.0.67",
-    "volar-service-typescript-twoslash-queries": "0.0.67",
-    "volar-service-yaml": "0.0.67",
-    "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.28",
+    "@volar/typescript": "~2.4.28",
+    "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"
   }
 }

package/types/env.d.ts

@@ -1,7 +1,7 @@
 /**
  * Astro global available in all contexts in .astro files
  *
- * [Astro documentation](https://docs.astro.build/reference/api-reference/#astro-global)
+ * [Astro documentation](https://docs.astro.build/en/reference/api-reference/)
  */
 declare const Astro: any;
 declare const Fragment: any;

package/dist/core/compilerUtils.d.ts

@@ -1,11 +0,0 @@
-import type { AttributeNode, Point } from '@astrojs/compiler';
-import { Position as LSPPosition } from '@volar/language-server';
-/**
- * Transform a Point from the Astro compiler to an LSP Position
- */
-export declare function PointToPosition(point: Point): LSPPosition;
-type WithRequired<T, K extends keyof T> = T & {
-    [P in K]-?: T[P];
-};
-export type AttributeNodeWithPosition = WithRequired<AttributeNode, 'position'>;
-export {};

package/dist/core/compilerUtils.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PointToPosition = PointToPosition;
-const language_server_1 = require("@volar/language-server");
-/**
- * Transform a Point from the Astro compiler to an LSP Position
- */
-function PointToPosition(point) {
-    // Columns and lines are 0-based in LSP, but the compiler's Point are 1 based.
-    return language_server_1.Position.create(point.line - 1, point.column - 1);
-}
-//# sourceMappingURL=compilerUtils.js.map