@astrojs/language-server 2.0.0-next.6 → 2.0.0-next.8

package/dist/check.d.ts

@@ -0,0 +1,24 @@
+import * as kit from '@volar/kit';
+export { DiagnosticSeverity, type Diagnostic } from '@volar/language-server';
+export interface CheckResult {
+    errors: kit.Diagnostic[];
+    fileUrl: URL;
+    fileContent: string;
+}
+export declare class AstroCheck {
+    private readonly workspacePath;
+    private readonly typescriptPath;
+    private ts;
+    private project;
+    private linter;
+    constructor(workspacePath: string, typescriptPath: string | undefined);
+    /**
+     * Lint a list of files or the entire project and optionally log the errors found
+     * @param fileNames List of files to lint, if undefined, all files included in the project will be linted
+     * @param logErrors Whether to log errors by itself. This is disabled by default.
+     * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
+     */
+    lint(fileNames?: string[] | undefined, logErrors?: boolean): Promise<CheckResult[]>;
+    private initialize;
+    private getTsconfig;
+}

package/dist/check.js

@@ -0,0 +1,117 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    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 = void 0;
+const kit = __importStar(require("@volar/kit"));
+const fast_glob_1 = __importDefault(require("fast-glob"));
+const node_url_1 = require("node:url");
+const index_js_1 = require("./core/index.js");
+const svelte_js_1 = require("./core/svelte.js");
+const utils_js_1 = require("./core/utils.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"));
+// Export those for downstream consumers
+var language_server_1 = require("@volar/language-server");
+Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return language_server_1.DiagnosticSeverity; } });
+class AstroCheck {
+    constructor(workspacePath, typescriptPath) {
+        this.workspacePath = workspacePath;
+        this.typescriptPath = typescriptPath;
+        this.initialize();
+    }
+    /**
+     * Lint a list of files or the entire project and optionally log the errors found
+     * @param fileNames List of files to lint, if undefined, all files included in the project will be linted
+     * @param logErrors Whether to log errors by itself. This is disabled by default.
+     * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
+     */
+    async lint(fileNames = undefined, logErrors = false) {
+        const files = fileNames !== undefined
+            ? fileNames
+            : this.project.languageServiceHost
+                .getScriptFileNames()
+                .filter((file) => file.endsWith('.astro'));
+        const errors = [];
+        for (const file of files) {
+            const fileErrors = await this.linter.check(file);
+            if (logErrors) {
+                this.linter.logErrors(file, fileErrors);
+            }
+            if (fileErrors.length > 0) {
+                const fileSnapshot = this.project.languageServiceHost.getScriptSnapshot(file);
+                const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
+                errors.push({
+                    errors: fileErrors,
+                    fileContent: fileContent ?? '',
+                    fileUrl: (0, node_url_1.pathToFileURL)(file),
+                });
+            }
+        }
+        return errors;
+    }
+    initialize() {
+        this.ts = this.typescriptPath ? require(this.typescriptPath) : require('typescript');
+        const tsconfigPath = this.getTsconfig();
+        const config = {
+            languages: {
+                astro: (0, index_js_1.getLanguageModule)((0, utils_js_1.getAstroInstall)([this.workspacePath]), this.ts),
+                svelte: (0, svelte_js_1.getSvelteLanguageModule)(),
+                vue: (0, vue_js_1.getVueLanguageModule)(),
+            },
+            services: {
+                typescript: (0, index_js_2.default)(),
+                astro: (0, astro_js_1.default)(),
+            },
+        };
+        if (tsconfigPath) {
+            this.project = kit.createProject(tsconfigPath, [
+                { extension: 'astro', isMixedContent: true, scriptKind: 7 },
+                { extension: 'vue', isMixedContent: true, scriptKind: 7 },
+                { extension: 'svelte', isMixedContent: true, scriptKind: 7 },
+            ]);
+        }
+        else {
+            this.project = kit.createInferredProject(this.workspacePath, () => {
+                return fast_glob_1.default.sync('**/*.astro', {
+                    cwd: this.workspacePath,
+                    ignore: ['node_modules'],
+                    absolute: true,
+                });
+            });
+        }
+        this.linter = kit.createLinter(config, this.project.languageServiceHost);
+    }
+    getTsconfig() {
+        const tsconfig = this.ts.findConfigFile(this.workspacePath, this.ts.sys.fileExists) ||
+            this.ts.findConfigFile(this.workspacePath, this.ts.sys.fileExists, 'jsconfig.json');
+        return tsconfig;
+    }
+}
+exports.AstroCheck = AstroCheck;
+//# sourceMappingURL=check.js.map

package/dist/core/parseHTML.js

@@ -96,7 +96,7 @@ function getHTMLVirtualFile(fileName, preprocessedHTML) {
             {
                 sourceRange: [0, preprocessedHTML.length],
                 generatedRange: [0, preprocessedHTML.length],
-                data: { ...language_core_1.FileRangeCapabilities.full, completion: { additional: true } },
+                data: language_core_1.FileRangeCapabilities.full,
             },
         ],
         capabilities: {

package/dist/core/utils.js

@@ -82,7 +82,7 @@ function framework2tsx(fileName, filePath, sourceCode, framework) {
         return {
             fileName: fileName + '.tsx',
             capabilities: language_core_1.FileCapabilities.full,
-            kind: language_core_1.FileKind.TextFile,
+            kind: language_core_1.FileKind.TypeScriptHostFile,
             snapshot: {
                 getText: (start, end) => content.substring(start, end),
                 getLength: () => content.length,

package/dist/index.d.ts

@@ -1 +1,2 @@
 export * as protocol from '@volar/language-server/protocol';
+export { AstroCheck, CheckResult, Diagnostic, DiagnosticSeverity } from './check.js';

package/dist/index.js

@@ -23,6 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.protocol = void 0;
+exports.DiagnosticSeverity = exports.AstroCheck = exports.protocol = void 0;
 exports.protocol = __importStar(require("@volar/language-server/protocol"));
+var check_js_1 = require("./check.js");
+Object.defineProperty(exports, "AstroCheck", { enumerable: true, get: function () { return check_js_1.AstroCheck; } });
+Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return check_js_1.DiagnosticSeverity; } });
 //# sourceMappingURL=index.js.map

package/dist/languageServerPlugin.js

@@ -52,6 +52,11 @@ const plugin = (initOptions, modules) => ({
         config.services.astro ??= (0, astro_js_1.default)();
         config.services.prettier ??= (0, volar_service_prettier_1.default)({
             languages: ['astro'],
+            resolveConfigOptions: {
+                // Prettier's cache is a bit cumbersome, because you need to reload the config yourself on change
+                // TODO: Upstream a fix for this
+                useCache: false,
+            },
             additionalOptions: (resolvedConfig) => {
                 function getAstroPrettierPlugin() {
                     if (!ctx?.project.rootUri)
@@ -66,6 +71,7 @@ const plugin = (initOptions, modules) => ({
                 return {
                     plugins: [...getAstroPrettierPlugin(), ...(resolvedConfig.plugins ?? [])],
                     parser: 'astro',
+                    ...resolvedConfig,
                 };
             },
         });

package/dist/plugins/html.d.ts

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

package/dist/plugins/html.js

@@ -7,12 +7,16 @@ const volar_service_html_1 = __importDefault(require("volar-service-html"));
 const index_js_1 = require("../core/index.js");
 const utils_js_1 = require("../utils.js");
 const html_data_js_1 = require("./html-data.js");
-exports.default = () => (context) => {
-    const htmlPlugin = (0, volar_service_html_1.default)()(context);
+exports.default = () => (context, modules) => {
+    const htmlPlugin = (0, volar_service_html_1.default)()(context, modules);
     if (!context) {
         return { triggerCharacters: htmlPlugin.triggerCharacters };
     }
-    htmlPlugin.updateCustomData([html_data_js_1.astroAttributes, html_data_js_1.astroElements, html_data_js_1.classListAttribute]);
+    htmlPlugin.provide['html/updateCustomData']?.([
+        html_data_js_1.astroAttributes,
+        html_data_js_1.astroElements,
+        html_data_js_1.classListAttribute,
+    ]);
     return {
         ...htmlPlugin,
         provideCompletionItems(document, position, completionContext, token) {

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

@@ -1,4 +1,4 @@
-import { CodeAction } from '@volar/language-service';
+import { CodeAction } from '@volar/language-server';
 import type { TextDocument } from 'vscode-html-languageservice';
 import type { AstroFile } from '../../core/index.js';
 export declare function enhancedProvideCodeActions(codeActions: CodeAction[], file: AstroFile, document: TextDocument, newLine: string): CodeAction[];

package/dist/plugins/typescript/codeActions.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedProvideCodeActions = void 0;
-const language_service_1 = require("@volar/language-service");
+const language_server_1 = require("@volar/language-server");
 const utils_js_1 = require("../../utils.js");
 function enhancedProvideCodeActions(codeActions, file, document, newLine) {
     codeActions = codeActions.map((codeAction) => {
         if (!codeAction.edit)
             return codeAction;
         codeAction.edit.documentChanges = codeAction.edit.documentChanges?.map((change) => {
-            if (language_service_1.TextDocumentEdit.is(change)) {
+            if (language_server_1.TextDocumentEdit.is(change)) {
                 change.edits = change.edits.map((edit) => {
                     // Move code actions adding new imports to the frontmatter, as by default they'll be outside of it
                     // TODO: This is a bit brittle, but we're unfortunately too late into the process to be able to tell the `fixName`
@@ -30,7 +30,7 @@ function enhancedProvideCodeActions(codeActions, file, document, newLine) {
                                 return (0, utils_js_1.getOpenFrontmatterEdit)(edit, newLine);
                             case 'closed':
                                 const position = (0, utils_js_1.PointToPosition)(file.astroMeta.frontmatter.position.end);
-                                edit.range = language_service_1.Range.create(position, position);
+                                edit.range = language_server_1.Range.create(position, position);
                                 return edit;
                             case 'doesnt-exist':
                                 return (0, utils_js_1.getNewFrontmatterEdit)(edit, newLine);

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

@@ -1,3 +1,3 @@
-import { CompletionItem, CompletionList, ServiceContext } from '@volar/language-service';
+import { CompletionItem, CompletionList, ServiceContext } from '@volar/language-server';
 export declare function enhancedProvideCompletionItems(completions: CompletionList): CompletionList;
 export declare function enhancedResolveCompletionItem(resolvedCompletion: CompletionItem, originalItem: CompletionItem, context: ServiceContext): CompletionItem;

package/dist/plugins/typescript/completions.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhancedResolveCompletionItem = exports.enhancedProvideCompletionItems = void 0;
-const language_service_1 = require("@volar/language-service");
-const vscode_html_languageservice_1 = require("vscode-html-languageservice");
+const language_server_1 = require("@volar/language-server");
 const index_js_1 = require("../../core/index.js");
 const utils_js_1 = require("../../utils.js");
-const defaultHTMLProvider = (0, vscode_html_languageservice_1.getDefaultHTMLDataProvider)();
-const defaultTags = new Set(defaultHTMLProvider.provideTags().map((tag) => tag.name));
-const defaultAttributes = new Set(defaultHTMLProvider.provideTags().flatMap((tag) => tag.attributes.map((attr) => attr.name)));
 function enhancedProvideCompletionItems(completions) {
     completions.items = completions.items.filter(isValidCompletion).map((completion) => {
         const source = completion?.data?.originalItem?.source;
         if (source) {
             // For components import, use the file kind and sort them higher, as they're often what the user want over something else
             if (['.astro', '.svelte', '.vue'].some((ext) => source.endsWith(ext))) {
-                completion.kind = language_service_1.CompletionItemKind.File;
+                completion.kind = language_server_1.CompletionItemKind.File;
                 completion.detail = completion.detail + '\n\n' + source;
                 completion.sortText = '\0';
                 completion.data.isComponent = true;
@@ -37,6 +33,11 @@ function enhancedResolveCompletionItem(resolvedCompletion, originalItem, context
         return resolvedCompletion;
     const newLine = context.host.getNewLine ? context.host.getNewLine() : '\n';
     resolvedCompletion.additionalTextEdits = resolvedCompletion.additionalTextEdits?.map((edit) => {
+        // HACK: There's a weird situation sometimes where some components (especially Svelte) will get imported as type imports
+        // for some unknown reason. This work around the problem by always ensuring a normal import for components
+        if (resolvedCompletion.data.isComponent && edit.newText.includes('import type')) {
+            edit.newText.replace('import type', 'import');
+        }
         if (file.astroMeta.frontmatter.status === 'doesnt-exist') {
             return (0, utils_js_1.getNewFrontmatterEdit)(edit, newLine);
         }
@@ -72,8 +73,6 @@ const svelte2tsxTypes = new Set([
 ]);
 function isValidCompletion(completion) {
     const isSvelte2tsxCompletion = completion.label.startsWith('__sveltets_') || svelte2tsxTypes.has(completion.label);
-    if (defaultTags.has(completion.label) || defaultAttributes.has(completion.label))
-        return false;
     if (isSvelte2tsxCompletion)
         return false;
     return true;

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

@@ -1,4 +1,4 @@
-import type { Diagnostic } from '@volar/language-service';
+import type { Diagnostic } from '@volar/language-server';
 export declare enum DiagnosticCodes {
     IS_NOT_A_MODULE = 2306,
     CANNOT_FIND_MODULE = 2307,

package/dist/utils.js

@@ -55,7 +55,7 @@ exports.isInsideFrontmatter = isInsideFrontmatter;
  * Transform a Point from the Astro compiler to an LSP Position
  */
 function PointToPosition(point) {
-    return vscode_html_languageservice_1.Position.create(point.line, point.column);
+    return vscode_html_languageservice_1.Position.create(point.line, point.column - 1);
 }
 exports.PointToPosition = PointToPosition;
 /**
@@ -64,7 +64,6 @@ exports.PointToPosition = PointToPosition;
 function ensureRangeIsInFrontmatter(range, frontmatter) {
     if (frontmatter.status === 'open' || frontmatter.status === 'closed') {
         const position = PointToPosition(frontmatter.position.start);
-        position.line += 1;
         return vscode_html_languageservice_1.Range.create(position, position);
     }
     return range;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.0.0-next.6",
+  "version": "2.0.0-next.8",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -20,33 +20,34 @@
     "astro-ls": "./bin/nodeServer.js"
   },
   "dependencies": {
-    "@astrojs/compiler": "^1.4.1",
+    "@astrojs/compiler": "^1.4.2",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/language-core": "^1.6.2",
-    "@volar/language-server": "^1.6.2",
-    "@volar/language-service": "^1.6.2",
-    "@volar/source-map": "^1.6.2",
+    "@volar/kit": "^1.6.9",
+    "@volar/language-core": "^1.6.9",
+    "@volar/language-server": "^1.6.9",
+    "@volar/language-service": "^1.6.9",
+    "@volar/source-map": "^1.6.9",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.3.1",
     "prettier": "^2.8.8",
     "prettier-plugin-astro": "^0.9.0",
-    "volar-service-css": "^0.0.2",
-    "volar-service-emmet": "^0.0.2",
-    "volar-service-html": "^0.0.2",
-    "volar-service-prettier": "^0.0.1",
-    "volar-service-typescript": "^0.0.2",
-    "volar-service-typescript-twoslash-queries": "^0.0.2",
+    "volar-service-css": "^0.0.4",
+    "volar-service-emmet": "^0.0.4",
+    "volar-service-html": "^0.0.4",
+    "volar-service-prettier": "^0.0.4",
+    "volar-service-typescript": "^0.0.4",
+    "volar-service-typescript-twoslash-queries": "^0.0.4",
     "vscode-html-languageservice": "^5.0.5",
     "vscode-uri": "^3.0.7"
   },
   "devDependencies": {
-    "@astrojs/svelte": "^2.1.1",
-    "@astrojs/vue": "^2.1.1",
+    "@astrojs/svelte": "^2.2.0",
+    "@astrojs/vue": "^2.2.0",
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^16.18.26",
     "@types/prettier": "^2.7.2",
-    "astro": "^2.4.4",
+    "astro": "^2.5.4",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
     "tsx": "^3.12.7",
@@ -57,7 +58,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "test": "mocha --require tsx --require test/takedown.ts test/misc/init.test.ts test/**/*.test.ts",
+    "test": "mocha --timeout 10000 --require tsx --require test/takedown.ts test/misc/init.test.ts test/**/*.test.ts",
     "test:match": "pnpm run test -g"
   }
 }