@astrojs/language-server 2.15.5 → 2.16.1-alpha.0

package/dist/check.js

@@ -50,9 +50,9 @@ const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("./core/index.js");
 const svelte_js_1 = require("./core/svelte.js");
 const vue_js_1 = require("./core/vue.js");
-const utils_js_1 = require("./utils.js");
 const astro_js_1 = require("./plugins/astro.js");
 const index_js_2 = require("./plugins/typescript/index.js");
+const utils_js_1 = require("./utils.js");
 class AstroCheck {
     constructor(workspacePath, typescriptPath, tsconfigPath) {
         this.workspacePath = workspacePath;
@@ -128,7 +128,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 }) => {

package/dist/core/index.d.ts

@@ -4,7 +4,7 @@ import type ts from 'typescript';
 import type { HTMLDocument } from 'vscode-html-languageservice';
 import type { URI } from 'vscode-uri';
 import type { PackageInfo } from '../importPackage.js';
-import type { AstroMetadata } from './parseAstro';
+import type { AstroMetadata } from './parseAstro.js';
 export declare function addAstroTypes(astroInstall: PackageInfo | undefined, ts: typeof import('typescript'), host: ts.LanguageServiceHost): void;
 export declare function getAstroLanguagePlugin(): LanguagePlugin<URI, AstroVirtualCode>;
 export declare class AstroVirtualCode implements VirtualCode {

package/dist/core/index.js

@@ -39,10 +39,10 @@ exports.getAstroLanguagePlugin = getAstroLanguagePlugin;
 const path = __importStar(require("node:path"));
 const language_core_1 = require("@volar/language-core");
 const utils_js_1 = require("../utils.js");
-const astro2tsx_1 = require("./astro2tsx");
-const parseAstro_1 = require("./parseAstro");
-const parseCSS_1 = require("./parseCSS");
-const parseHTML_1 = require("./parseHTML");
+const astro2tsx_js_1 = require("./astro2tsx.js");
+const parseAstro_js_1 = require("./parseAstro.js");
+const parseCSS_js_1 = require("./parseCSS.js");
+const parseHTML_js_1 = require("./parseHTML.js");
 const parseJS_js_1 = require("./parseJS.js");
 const decoratedHosts = new WeakSet();
 function addAstroTypes(astroInstall, ts, host) {
@@ -160,14 +160,14 @@ class AstroVirtualCode {
                 },
             },
         ];
-        const tsx = (0, astro2tsx_1.astro2tsx)(this.snapshot.getText(0, this.snapshot.getLength()), this.fileName);
-        const astroMetadata = (0, parseAstro_1.getAstroMetadata)(this.fileName, this.snapshot.getText(0, this.snapshot.getLength()));
-        const { htmlDocument, virtualCode: htmlVirtualCode } = (0, parseHTML_1.parseHTML)(this.snapshot, astroMetadata.frontmatter.status === 'closed'
+        const tsx = (0, astro2tsx_js_1.astro2tsx)(this.snapshot.getText(0, this.snapshot.getLength()), this.fileName);
+        const astroMetadata = (0, parseAstro_js_1.getAstroMetadata)(this.fileName, this.snapshot.getText(0, this.snapshot.getLength()));
+        const { htmlDocument, virtualCode: htmlVirtualCode } = (0, parseHTML_js_1.parseHTML)(this.snapshot, astroMetadata.frontmatter.status === 'closed'
             ? astroMetadata.frontmatter.position.end.offset
             : 0);
         this.htmlDocument = htmlDocument;
         htmlVirtualCode.embeddedCodes = [
-            ...(0, parseCSS_1.extractStylesheets)(tsx.ranges.styles),
+            ...(0, parseCSS_js_1.extractStylesheets)(tsx.ranges.styles),
             ...(0, parseJS_js_1.extractScriptTags)(tsx.ranges.scripts),
         ];
         this.astroMeta = { ...astroMetadata, tsxRanges: tsx.ranges };

package/dist/core/utils.js

@@ -35,7 +35,7 @@ function toPascalCase(string) {
     return `${string}`
         .replace(new RegExp(/[-_]+/, 'g'), ' ')
         .replace(new RegExp(/[^\w\s]/, 'g'), '')
-        .replace(new RegExp(/\s+(.)(\w*)/, 'g'), ($1, $2, $3) => `${$2.toUpperCase() + $3.toLowerCase()}`)
+        .replace(new RegExp(/\s+(.)(\w*)/, 'g'), (_, $2, $3) => `${$2.toUpperCase() + $3.toLowerCase()}`)
         .replace(new RegExp(/\w/), (s) => s.toUpperCase());
 }
 function classNameFromFilename(filename) {

package/dist/languageServerPlugin.d.ts

@@ -1,5 +1,5 @@
-import { type Connection, type LanguagePlugin } from '@volar/language-server/node';
+import { type Connection, type InitializeParams, type LanguagePlugin } from '@volar/language-server/node';
 import { URI } from 'vscode-uri';
 import { type CollectionConfig } from './core/frontmatterHolders.js';
 export declare function getLanguagePlugins(collectionConfig: CollectionConfig): LanguagePlugin<URI, import("@volar/language-server/node").VirtualCode>[];
-export declare function getLanguageServicePlugins(connection: Connection, ts: typeof import('typescript'), collectionConfig: CollectionConfig): import("@volar/language-server/node").LanguageServicePlugin<any>[];
+export declare function getLanguageServicePlugins(connection: Connection, ts: typeof import('typescript'), collectionConfig: CollectionConfig, initializeParams?: InitializeParams): import("@volar/language-server/node").LanguageServicePlugin<any>[];

package/dist/languageServerPlugin.js

@@ -3,21 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLanguagePlugins = getLanguagePlugins;
 exports.getLanguageServicePlugins = getLanguageServicePlugins;
 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");
-const importPackage_js_1 = require("./importPackage.js");
 // Services
 const volar_service_css_1 = require("volar-service-css");
 const volar_service_emmet_1 = require("volar-service-emmet");
 const volar_service_prettier_1 = require("volar-service-prettier");
 const volar_service_typescript_twoslash_queries_1 = require("volar-service-typescript-twoslash-queries");
+const vscode_uri_1 = require("vscode-uri");
+const core_1 = require("./core");
 const frontmatterHolders_js_1 = require("./core/frontmatterHolders.js");
+const svelte_js_1 = require("./core/svelte.js");
+const vue_js_1 = require("./core/vue.js");
+const importPackage_js_1 = require("./importPackage.js");
 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");
+const index_js_1 = require("./plugins/typescript/index.js");
+const index_js_2 = require("./plugins/typescript-addons/index.js");
 const yaml_js_1 = require("./plugins/yaml.js");
 function getLanguagePlugins(collectionConfig) {
     const languagePlugins = [
@@ -28,15 +28,17 @@ function getLanguagePlugins(collectionConfig) {
     ];
     return languagePlugins;
 }
-function getLanguageServicePlugins(connection, ts, collectionConfig) {
+function getLanguageServicePlugins(connection, ts, collectionConfig, initializeParams) {
     const LanguageServicePlugins = [
         (0, html_js_1.create)(),
         (0, volar_service_css_1.create)(),
         (0, volar_service_emmet_1.create)(),
-        ...(0, index_js_2.create)(ts),
+        ...(0, index_js_1.create)(ts, {
+            disableAutoImportCache: initializeParams?.initializationOptions?.disableAutoImportCache,
+        }),
         (0, volar_service_typescript_twoslash_queries_1.create)(ts),
-        (0, index_js_1.create)(),
-        (0, astro_js_1.create)(ts),
+        (0, index_js_2.create)(),
+        (0, astro_js_1.create)(),
         getPrettierService(),
         (0, yaml_js_1.create)(collectionConfig),
     ];

package/dist/nodeServer.js

@@ -70,7 +70,7 @@ connection.onInitialize((params) => {
                 (0, index_js_1.addAstroTypes)(typeof astroInstall === 'string' ? undefined : astroInstall, typescript, languageServiceHost);
             },
         };
-    }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript, collectionConfig));
+    }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript, collectionConfig, params));
 });
 connection.onInitialized(() => {
     server.initialized();

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/typescript/diagnostics.d.ts

@@ -9,4 +9,4 @@ export declare enum DiagnosticCodes {
     JSX_NO_CLOSING_TAG = 17008,// JSX element '{0}' has no corresponding closing tag.
     JSX_ELEMENT_NO_CALL = 2604
 }
-export declare function enhancedProvideSemanticDiagnostics(originalDiagnostics: Diagnostic[], tsxLineCount?: number | undefined): Diagnostic[];
+export declare function enhancedProvideSemanticDiagnostics(originalDiagnostics: Diagnostic[], tsxLineCount?: number): Diagnostic[];

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

@@ -1,2 +1,4 @@
 import type { LanguageServicePlugin } from '@volar/language-server';
-export declare const create: (ts: typeof import("typescript")) => LanguageServicePlugin[];
+export declare const create: (ts: typeof import("typescript"), options?: {
+    disableAutoImportCache: boolean | undefined;
+}) => LanguageServicePlugin[];

package/dist/plugins/typescript/index.js

@@ -7,8 +7,10 @@ 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 = (ts) => {
-    const tsServicePlugins = (0, volar_service_typescript_1.create)(ts, {});
+const create = (ts, options) => {
+    const tsServicePlugins = (0, volar_service_typescript_1.create)(ts, {
+        disableAutoImportCache: options?.disableAutoImportCache,
+    });
     return tsServicePlugins.map((plugin) => {
         if (plugin.name === 'typescript-semantic') {
             return {

package/dist/plugins/yaml.js

@@ -100,6 +100,7 @@ const create = (collectionConfig) => {
                         // Remove last line that contains the source schema, it's not useful to users since they're generated
                         originalHover.contents.value = originalHover.contents.value
                             .replace(/\nSource:.*$/, '')
+                            .replace(/\n\nsource$/, '')
                             .trim();
                     }
                     return originalHover;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.15.5",
+  "version": "2.16.1-alpha.0",
   "author": "withastro",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/language-tools",
-    "directory": "packages/language-server"
+    "url": "https://github.com/withastro/astro.git",
+    "directory": "packages/language-tools/language-server"
   },
   "type": "commonjs",
   "main": "dist/index.js",
@@ -29,32 +29,25 @@
     "@volar/language-service": "~2.4.23",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.4.1",
-    "volar-service-css": "0.0.65",
-    "volar-service-emmet": "0.0.65",
-    "volar-service-html": "0.0.65",
-    "volar-service-prettier": "0.0.65",
-    "volar-service-typescript": "0.0.65",
-    "volar-service-typescript-twoslash-queries": "0.0.65",
-    "volar-service-yaml": "0.0.65",
+    "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",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
-    "@astrojs/svelte": "^5.0.3",
-    "@astrojs/vue": "^4.0.8",
-    "@types/chai": "^4.3.5",
-    "@types/mocha": "^10.0.1",
     "@types/node": "^20.9.0",
     "@volar/test-utils": "~2.4.23",
     "@volar/typescript": "~2.4.23",
-    "astro": "^4.14.0",
-    "chai": "^4.3.7",
-    "mocha": "^10.2.0",
-    "svelte": "^4.2.10",
-    "tsx": "^3.12.7",
+    "tsx": "^4.20.6",
     "typescript": "^5.9.3",
     "vscode-languageserver-protocol": "^3.17.5",
-    "vscode-languageserver-textdocument": "^1.0.11"
+    "vscode-languageserver-textdocument": "^1.0.11",
+    "astro-scripts": "0.0.14"
   },
   "peerDependencies": {
     "prettier": "^3.0.0",
@@ -71,8 +64,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "sync-fixture": "pnpm --dir ./test/fixture sync",
-    "test": "pnpm run sync-fixture && mocha --timeout 10000 --require tsx --require test/takedown.ts test/misc/init.test.ts test/**/*.test.ts",
-    "test:match": "pnpm run test -g"
+    "test": "astro-scripts test \"**/*.test.ts\" --teardown-test ./test/misc/teardown.ts --tsx true --setup ./test/setup.js",
+    "test:match": "pnpm run test --match"
   }
 }