@astrojs/language-server 2.3.1 → 2.3.3

package/dist/check.d.ts

@@ -1,6 +1,6 @@
 import * as kit from '@volar/kit';
 import { Diagnostic, DiagnosticSeverity } from '@volar/language-server';
-export { DiagnosticSeverity, Diagnostic };
+export { Diagnostic, DiagnosticSeverity };
 export interface CheckResult {
     status: 'completed' | 'cancelled' | undefined;
     fileChecked: number;
@@ -11,6 +11,7 @@ export interface CheckResult {
         errors: kit.Diagnostic[];
         fileUrl: URL;
         fileContent: string;
+        text: string;
     }[];
 }
 export declare class AstroCheck {

package/dist/check.js

@@ -26,19 +26,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AstroCheck = exports.Diagnostic = exports.DiagnosticSeverity = void 0;
+exports.AstroCheck = exports.DiagnosticSeverity = exports.Diagnostic = void 0;
 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 node_fs_1 = require("node:fs");
 const node_url_1 = require("node:url");
 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 astro_js_1 = __importDefault(require("./plugins/astro.js"));
-const index_js_2 = __importDefault(require("./plugins/typescript/index.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");
 class AstroCheck {
     constructor(workspacePath, typescriptPath, tsconfigPath) {
         this.workspacePath = workspacePath;
@@ -67,7 +68,9 @@ class AstroCheck {
                 result.status = 'cancelled';
                 return result;
             }
-            const fileDiagnostics = (await this.linter.check(file)).filter((diag) => {
+            const fileDiagnostics = await this.linter.check(file);
+            // Filter diagnostics based on the logErrors level
+            const fileDiagnosticsToPrint = fileDiagnostics.filter((diag) => {
                 const severity = diag.severity ?? language_server_1.DiagnosticSeverity.Error;
                 switch (logErrors?.level ?? 'error') {
                     case 'error':
@@ -78,16 +81,18 @@ class AstroCheck {
                         return severity <= language_server_1.DiagnosticSeverity.Hint;
                 }
             });
-            if (logErrors) {
-                this.linter.logErrors(file, fileDiagnostics);
-            }
             if (fileDiagnostics.length > 0) {
+                const errorText = this.linter.printErrors(file, fileDiagnosticsToPrint);
+                if (logErrors !== undefined && errorText) {
+                    console.info(errorText);
+                }
                 const fileSnapshot = this.project.languageHost.getScriptSnapshot(file);
                 const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
                 result.fileResult.push({
                     errors: fileDiagnostics,
                     fileContent: fileContent ?? '',
                     fileUrl: (0, node_url_1.pathToFileURL)(file),
+                    text: errorText,
                 });
                 result.errors += fileDiagnostics.filter((diag) => diag.severity === language_server_1.DiagnosticSeverity.Error).length;
                 result.warnings += fileDiagnostics.filter((diag) => diag.severity === language_server_1.DiagnosticSeverity.Warning).length;
@@ -108,8 +113,8 @@ class AstroCheck {
                 vue: (0, vue_js_1.getVueLanguageModule)(),
             },
             services: {
-                typescript: (0, index_js_2.default)(),
-                astro: (0, astro_js_1.default)(),
+                typescript: (0, index_js_2.create)(),
+                astro: (0, astro_js_1.create)(),
             },
         };
         if (tsconfigPath) {
@@ -131,7 +136,13 @@ class AstroCheck {
         this.linter = kit.createLinter(config, this.project.languageHost);
     }
     getTsconfig() {
-        const searchPath = this.tsconfigPath ?? this.workspacePath;
+        if (this.tsconfigPath) {
+            if (!(0, node_fs_1.existsSync)(this.tsconfigPath)) {
+                throw new Error(`Specified tsconfig file \`${this.tsconfigPath}\` does not exist.`);
+            }
+            return this.tsconfigPath;
+        }
+        const searchPath = this.workspacePath;
         const tsconfig = this.ts.findConfigFile(searchPath, this.ts.sys.fileExists) ||
             this.ts.findConfigFile(searchPath, this.ts.sys.fileExists, 'jsconfig.json');
         return tsconfig;

package/dist/languageServerPlugin.js

@@ -1,23 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.plugin = void 0;
 const node_1 = require("@volar/language-server/node");
-const volar_service_css_1 = __importDefault(require("volar-service-css"));
-const volar_service_emmet_1 = __importDefault(require("volar-service-emmet"));
-const volar_service_prettier_1 = __importDefault(require("volar-service-prettier"));
-const volar_service_typescript_twoslash_queries_1 = __importDefault(require("volar-service-typescript-twoslash-queries"));
 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");
-const astro_js_1 = __importDefault(require("./plugins/astro.js"));
-const html_js_1 = __importDefault(require("./plugins/html.js"));
-const index_js_1 = require("./plugins/typescript-addons/index.js");
-const index_js_2 = __importDefault(require("./plugins/typescript/index.js"));
 const utils_js_1 = require("./utils.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 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 plugin = (initOptions, modules) => ({
     extraFileExtensions: [
         { extension: 'astro', isMixedContent: true, scriptKind: 7 },
@@ -53,19 +51,19 @@ const plugin = (initOptions, modules) => ({
             config.languages.svelte = (0, svelte_js_1.getSvelteLanguageModule)();
         }
         config.services ??= {};
-        config.services.html ??= (0, html_js_1.default)();
-        config.services.css ??= (0, volar_service_css_1.default)();
-        config.services.emmet ??= (0, volar_service_emmet_1.default)();
-        config.services.typescript ??= (0, index_js_2.default)();
-        config.services.typescripttwoslash ??= (0, volar_service_typescript_twoslash_queries_1.default)();
-        config.services.typescriptaddons ??= (0, index_js_1.createTypescriptAddonsService)();
-        config.services.astro ??= (0, astro_js_1.default)();
+        config.services.html ??= (0, html_js_1.create)();
+        config.services.css ??= (0, volar_service_css_1.create)();
+        config.services.emmet ??= (0, volar_service_emmet_1.create)();
+        config.services.typescript ??= (0, index_js_2.create)();
+        config.services.typescripttwoslash ??= (0, volar_service_typescript_twoslash_queries_1.create)();
+        config.services.typescriptaddons ??= (0, index_js_1.create)();
+        config.services.astro ??= (0, astro_js_1.create)();
         if (ctx) {
             const rootDir = ctx.env.uriToFileName(ctx.project.rootUri.toString());
             const prettier = (0, importPackage_js_1.importPrettier)(rootDir);
             const prettierPluginPath = (0, importPackage_js_1.getPrettierPluginPath)(rootDir);
             if (prettier && prettierPluginPath) {
-                config.services.prettier ??= (0, volar_service_prettier_1.default)({
+                config.services.prettier ??= (0, volar_service_prettier_1.create)({
                     prettier: prettier,
                     languages: ['astro'],
                     ignoreIdeOptions: true,

package/dist/plugins/astro.d.ts

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

package/dist/plugins/astro.js

@@ -3,12 +3,13 @@ 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 language_server_1 = require("@volar/language-server");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const node_path_1 = require("node:path");
 const index_js_1 = require("../core/index.js");
 const utils_js_1 = require("./utils.js");
-exports.default = () => (context, modules) => {
+const create = () => (context, modules) => {
     return {
         triggerCharacters: ['-'],
         provideCompletionItems(document, position, completionContext, token) {
@@ -75,6 +76,7 @@ exports.default = () => (context, modules) => {
         },
     };
 };
+exports.create = create;
 function getGlobResultAsCodeLens(globText, dir, position) {
     const globResult = fast_glob_1.default.sync(globText, {
         cwd: dir,

package/dist/plugins/html.d.ts

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

package/dist/plugins/html.js

@@ -3,12 +3,13 @@ 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 language_server_1 = require("@volar/language-server");
 const volar_service_html_1 = __importDefault(require("volar-service-html"));
 const index_js_1 = require("../core/index.js");
 const html_data_js_1 = require("./html-data.js");
 const utils_js_1 = require("./utils.js");
-exports.default = () => (context, modules) => {
+const create = () => (context, modules) => {
     const htmlPlugin = (0, volar_service_html_1.default)()(context, modules);
     if (!context) {
         return { triggerCharacters: htmlPlugin.triggerCharacters };
@@ -45,4 +46,5 @@ exports.default = () => (context, modules) => {
         },
     };
 };
+exports.create = create;
 //# sourceMappingURL=html.js.map

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

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

package/dist/plugins/typescript/index.js

@@ -3,13 +3,14 @@ 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 language_server_1 = require("@volar/language-server");
 const volar_service_typescript_1 = __importDefault(require("volar-service-typescript"));
 const index_js_1 = require("../../core/index.js");
 const utils_js_1 = require("../utils.js");
 const completions_js_1 = require("./completions.js");
 const diagnostics_js_1 = require("./diagnostics.js");
-exports.default = () => (context, modules) => {
+const create = () => (context, modules) => {
     const typeScriptPlugin = (0, volar_service_typescript_1.default)()(context, modules);
     if (!context) {
         return {
@@ -124,4 +125,5 @@ exports.default = () => (context, modules) => {
         },
     };
 };
+exports.create = create;
 //# sourceMappingURL=index.js.map

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

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

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTypescriptAddonsService = void 0;
+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 createTypescriptAddonsService = () => (context) => {
+const create = () => (context) => {
     return {
         isAdditionalCompletion: true,
         // Q: Why the empty transform and resolve functions?
@@ -37,5 +37,5 @@ const createTypescriptAddonsService = () => (context) => {
         },
     };
 };
-exports.createTypescriptAddonsService = createTypescriptAddonsService;
+exports.create = create;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -30,12 +30,12 @@
     "@volar/typescript": "~1.10.0",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
-    "volar-service-css": "0.0.11",
-    "volar-service-emmet": "0.0.11",
-    "volar-service-html": "0.0.11",
-    "volar-service-prettier": "0.0.11",
-    "volar-service-typescript": "0.0.11",
-    "volar-service-typescript-twoslash-queries": "0.0.11",
+    "volar-service-css": "0.0.13",
+    "volar-service-emmet": "0.0.13",
+    "volar-service-html": "0.0.13",
+    "volar-service-prettier": "0.0.13",
+    "volar-service-typescript": "0.0.13",
+    "volar-service-typescript-twoslash-queries": "0.0.13",
     "vscode-html-languageservice": "^5.0.6",
     "vscode-uri": "^3.0.7"
   },