@astrojs/language-server 2.13.4 → 2.14.1

package/dist/buildMappings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildMappings = void 0;
+exports.buildMappings = buildMappings;
 function buildMappings(chunks) {
     let length = 0;
     const mappings = [];
@@ -20,5 +20,4 @@ function buildMappings(chunks) {
     }
     return mappings;
 }
-exports.buildMappings = buildMappings;
 //# sourceMappingURL=buildMappings.js.map

package/dist/check.js

@@ -36,6 +36,7 @@ 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 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");
@@ -56,7 +57,7 @@ class AstroCheck {
      * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
      */
     async lint({ fileNames = undefined, cancel = () => false, logErrors = undefined, }) {
-        let files = (fileNames !== undefined ? fileNames : this.linter.projectHost.getScriptFileNames()).filter((file) => {
+        let files = (fileNames !== undefined ? fileNames : this.linter.getRootFileNames()).filter((file) => {
             // We don't have the same understanding of Svelte and Vue files as their own respective tools (vue-tsc, svelte-check)
             // So we don't want to check them here
             return !file.endsWith('.vue') && !file.endsWith('.svelte');
@@ -92,7 +93,7 @@ class AstroCheck {
                 if (logErrors !== undefined && errorText) {
                     console.info(errorText);
                 }
-                const fileSnapshot = this.linter.projectHost.getScriptSnapshot(file);
+                const fileSnapshot = this.linter.language.scripts.get(vscode_uri_1.URI.file(file))?.snapshot;
                 const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
                 result.fileResult.push({
                     errors: fileDiagnostics,
@@ -120,7 +121,8 @@ class AstroCheck {
         ];
         const services = [...(0, index_js_2.create)(this.ts), (0, astro_js_1.create)(this.ts)];
         if (tsconfigPath) {
-            this.linter = kit.createTypeScriptChecker(languagePlugins, services, tsconfigPath);
+            const includeProjectReference = false; // #920
+            this.linter = kit.createTypeScriptChecker(languagePlugins, services, tsconfigPath, includeProjectReference);
         }
         else {
             this.linter = kit.createTypeScriptInferredChecker(languagePlugins, services, () => {

package/dist/core/astro2tsx.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.astro2tsx = exports.getTSXRangesAsLSPRanges = exports.safeConvertToTSX = void 0;
+exports.safeConvertToTSX = safeConvertToTSX;
+exports.getTSXRangesAsLSPRanges = getTSXRangesAsLSPRanges;
+exports.astro2tsx = astro2tsx;
 const sync_1 = require("@astrojs/compiler/sync");
 const sourcemap_codec_1 = require("@jridgewell/sourcemap-codec");
 const language_server_1 = require("@volar/language-server");
@@ -50,7 +52,6 @@ function safeConvertToTSX(content, options) {
         };
     }
 }
-exports.safeConvertToTSX = safeConvertToTSX;
 function getTSXRangesAsLSPRanges(tsx) {
     const textDocument = vscode_html_languageservice_1.TextDocument.create('', 'typescriptreact', 0, tsx.code);
     return {
@@ -60,7 +61,6 @@ function getTSXRangesAsLSPRanges(tsx) {
         styles: tsx.metaRanges.styles ?? [],
     };
 }
-exports.getTSXRangesAsLSPRanges = getTSXRangesAsLSPRanges;
 function astro2tsx(input, fileName) {
     const tsx = safeConvertToTSX(input, { filename: fileName });
     return {
@@ -69,7 +69,6 @@ function astro2tsx(input, fileName) {
         ranges: getTSXRangesAsLSPRanges(tsx),
     };
 }
-exports.astro2tsx = astro2tsx;
 function getVirtualCodeTSX(input, tsx, fileName) {
     tsx.code = (0, utils_js_1.patchTSX)(tsx.code, fileName);
     const v3Mappings = (0, sourcemap_codec_1.decode)(tsx.map.mappings);

package/dist/core/compilerUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PointToPosition = void 0;
+exports.PointToPosition = PointToPosition;
 const language_server_1 = require("@volar/language-server");
 /**
  * Transform a Point from the Astro compiler to an LSP Position
@@ -9,5 +9,4 @@ 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);
 }
-exports.PointToPosition = PointToPosition;
 //# sourceMappingURL=compilerUtils.js.map

package/dist/core/frontmatterHolders.d.ts

@@ -0,0 +1,32 @@
+import { type CodeMapping, type LanguagePlugin, type VirtualCode } from '@volar/language-core';
+import type ts from 'typescript';
+import type { URI } from 'vscode-uri';
+export declare const SUPPORTED_FRONTMATTER_EXTENSIONS: {
+    md: string;
+    mdx: string;
+    mdoc: string;
+};
+export declare const SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS: string[];
+export declare const frontmatterRE: RegExp;
+export type CollectionConfig = {
+    folder: URI;
+    config: {
+        collections: {
+            hasSchema: boolean;
+            name: string;
+        }[];
+        entries: Record<string, string>;
+    };
+};
+export declare function getFrontmatterLanguagePlugin(collectionConfigs: CollectionConfig[]): LanguagePlugin<URI, FrontmatterHolder>;
+export declare class FrontmatterHolder implements VirtualCode {
+    fileName: string;
+    languageId: string;
+    snapshot: ts.IScriptSnapshot;
+    collection: string | undefined;
+    id: string;
+    mappings: CodeMapping[];
+    embeddedCodes: VirtualCode[];
+    hasFrontmatter: boolean;
+    constructor(fileName: string, languageId: string, snapshot: ts.IScriptSnapshot, collection: string | undefined);
+}

package/dist/core/frontmatterHolders.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FrontmatterHolder = exports.frontmatterRE = exports.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS = exports.SUPPORTED_FRONTMATTER_EXTENSIONS = void 0;
+exports.getFrontmatterLanguagePlugin = getFrontmatterLanguagePlugin;
+const yaml2ts_1 = require("@astrojs/yaml2ts");
+const language_core_1 = require("@volar/language-core");
+exports.SUPPORTED_FRONTMATTER_EXTENSIONS = { md: 'markdown', mdx: 'mdx', mdoc: 'mdoc' };
+exports.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS = Object.keys(exports.SUPPORTED_FRONTMATTER_EXTENSIONS);
+const SUPPORTED_FRONTMATTER_EXTENSIONS_VALUES = Object.values(exports.SUPPORTED_FRONTMATTER_EXTENSIONS);
+exports.frontmatterRE = /^---(.*?)^---/ms;
+function getCollectionName(collectionConfigs, fileURI) {
+    for (const collection of collectionConfigs) {
+        if (collection.config.entries[fileURI]) {
+            return collection.config.entries[fileURI];
+        }
+    }
+}
+function getFrontmatterLanguagePlugin(collectionConfigs) {
+    return {
+        getLanguageId(scriptId) {
+            const fileType = exports.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS.find((ext) => scriptId.path.endsWith(`.${ext}`));
+            if (fileType) {
+                return exports.SUPPORTED_FRONTMATTER_EXTENSIONS[fileType];
+            }
+        },
+        createVirtualCode(scriptId, languageId, snapshot) {
+            if (SUPPORTED_FRONTMATTER_EXTENSIONS_VALUES.includes(languageId)) {
+                return new FrontmatterHolder(scriptId.fsPath.replace(/\\/g, '/'), languageId, snapshot, getCollectionName(collectionConfigs, 
+                // The scriptId here is encoded and somewhat normalized, as such we can't use it directly to compare with
+                // the file URLs in the collection config entries that Astro generates.
+                decodeURIComponent(scriptId.toString()).toLowerCase()));
+            }
+        },
+        typescript: {
+            extraFileExtensions: exports.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS.map((ext) => ({
+                extension: ext,
+                isMixedContent: true,
+                scriptKind: 7,
+            })),
+            getServiceScript(astroCode) {
+                for (const code of (0, language_core_1.forEachEmbeddedCode)(astroCode)) {
+                    if (code.id === yaml2ts_1.VIRTUAL_CODE_ID) {
+                        return {
+                            code,
+                            extension: '.ts',
+                            scriptKind: 3,
+                        };
+                    }
+                }
+                return undefined;
+            },
+        },
+    };
+}
+class FrontmatterHolder {
+    constructor(fileName, languageId, snapshot, collection) {
+        this.fileName = fileName;
+        this.languageId = languageId;
+        this.snapshot = snapshot;
+        this.collection = collection;
+        this.id = 'frontmatter-holder';
+        this.hasFrontmatter = false;
+        this.mappings = [
+            {
+                sourceOffsets: [0],
+                generatedOffsets: [0],
+                lengths: [this.snapshot.getLength()],
+                data: {
+                    verification: true,
+                    completion: true,
+                    semantic: true,
+                    navigation: true,
+                    structure: true,
+                    format: true,
+                },
+            },
+        ];
+        this.embeddedCodes = [];
+        this.snapshot = snapshot;
+        // If the file is not part of a collection, we don't need to do anything
+        if (!this.collection) {
+            return;
+        }
+        const frontmatterContent = exports.frontmatterRE
+            .exec(this.snapshot.getText(0, this.snapshot.getLength()))?.[0]
+            .replaceAll('---', '   ') ?? '';
+        this.hasFrontmatter = frontmatterContent.length > 0;
+        this.embeddedCodes.push({
+            id: `yaml_frontmatter_${this.collection}`,
+            languageId: 'yaml',
+            snapshot: {
+                getText: (start, end) => frontmatterContent.substring(start, end),
+                getLength: () => frontmatterContent.length,
+                getChangeRange: () => undefined,
+            },
+            mappings: [
+                {
+                    sourceOffsets: [0],
+                    generatedOffsets: [0],
+                    lengths: [frontmatterContent.length],
+                    data: {
+                        verification: true,
+                        completion: true,
+                        semantic: true,
+                        navigation: true,
+                        structure: true,
+                        format: false,
+                    },
+                },
+            ],
+        });
+        if (this.hasFrontmatter) {
+            const yaml2tsResult = (0, yaml2ts_1.yaml2ts)(frontmatterContent, this.collection);
+            this.embeddedCodes.push(yaml2tsResult.virtualCode);
+        }
+    }
+}
+exports.FrontmatterHolder = FrontmatterHolder;
+//# sourceMappingURL=frontmatterHolders.js.map

package/dist/core/index.js

@@ -23,7 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AstroVirtualCode = exports.getAstroLanguagePlugin = void 0;
+exports.AstroVirtualCode = void 0;
+exports.getAstroLanguagePlugin = getAstroLanguagePlugin;
 const path = __importStar(require("node:path"));
 const language_core_1 = require("@volar/language-core");
 const utils_js_1 = require("../utils.js");
@@ -69,8 +70,8 @@ function getAstroLanguagePlugin(astroInstall, ts) {
                             code,
                             extension: fileExtension,
                             scriptKind: fileExtension === '.mjs'
-                                ? (1)
-                                : (3),
+                                ? 1
+                                : 3,
                         });
                     }
                 }
@@ -109,7 +110,7 @@ function getAstroLanguagePlugin(astroInstall, ts) {
                             target: ts.ScriptTarget.ESNext ?? 99,
                             jsx: ts.JsxEmit.Preserve ?? 1,
                             resolveJsonModule: true,
-                            allowJs: true,
+                            allowJs: true, // Needed for inline scripts, which are virtual .js files
                             isolatedModules: true,
                             moduleResolution: baseCompilationSettings.moduleResolution === ts.ModuleResolutionKind.Classic ||
                                 !baseCompilationSettings.moduleResolution
@@ -122,7 +123,6 @@ function getAstroLanguagePlugin(astroInstall, ts) {
         },
     };
 }
-exports.getAstroLanguagePlugin = getAstroLanguagePlugin;
 class AstroVirtualCode {
     constructor(fileName, snapshot) {
         this.fileName = fileName;
@@ -162,7 +162,7 @@ class AstroVirtualCode {
     get hasCompilationErrors() {
         return (
         // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
-        this.compilerDiagnostics.filter((diag) => diag.severity === (1))
+        this.compilerDiagnostics.filter((diag) => diag.severity === 1)
             .length > 0);
     }
 }

package/dist/core/parseAstro.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAstroMetadata = void 0;
+exports.getAstroMetadata = getAstroMetadata;
 const sync_1 = require("@astrojs/compiler/sync");
 function getAstroMetadata(fileName, input, options = { position: true }) {
     const parseResult = safeParseAst(fileName, input, options);
@@ -9,7 +9,6 @@ function getAstroMetadata(fileName, input, options = { position: true }) {
         frontmatter: getFrontmatterStatus(parseResult.ast, input),
     };
 }
-exports.getAstroMetadata = getAstroMetadata;
 function safeParseAst(fileName, input, parseOptions) {
     try {
         const parseResult = (0, sync_1.parse)(input, parseOptions);

package/dist/core/parseCSS.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractStylesheets = void 0;
+exports.extractStylesheets = extractStylesheets;
 const muggle_string_1 = require("muggle-string");
 const buildMappings_js_1 = require("../buildMappings.js");
 const SUPPORTED_LANGUAGES = ['css', 'scss', 'less'];
@@ -10,7 +10,6 @@ function isSupportedLanguage(lang) {
 function extractStylesheets(styles) {
     return mergeCSSContextsByLanguage(styles);
 }
-exports.extractStylesheets = extractStylesheets;
 function mergeCSSContextsByLanguage(inlineStyles) {
     const codes = {
         css: [],

package/dist/core/parseHTML.js

@@ -23,7 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.preprocessHTML = exports.parseHTML = void 0;
+exports.parseHTML = parseHTML;
+exports.preprocessHTML = preprocessHTML;
 const html = __importStar(require("vscode-html-languageservice"));
 const utils_1 = require("../plugins/utils");
 const htmlLs = html.getLanguageService();
@@ -34,7 +35,6 @@ function parseHTML(snapshot, frontmatterEnd) {
         htmlDocument: getHTMLDocument(htmlContent),
     };
 }
-exports.parseHTML = parseHTML;
 const createScanner = htmlLs.createScanner;
 /**
  * scan the text and remove any `>` or `<` that cause the tag to end short
@@ -81,7 +81,6 @@ function preprocessHTML(text, frontmatterEnd) {
         scanner = createScanner(content, offset, state ?? html.ScannerState.WithinTag);
     }
 }
-exports.preprocessHTML = preprocessHTML;
 function getHTMLVirtualCode(preprocessedHTML) {
     return {
         id: `html`,

package/dist/core/parseJS.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractScriptTags = void 0;
+exports.extractScriptTags = extractScriptTags;
 const muggle_string_1 = require("muggle-string");
 const buildMappings_1 = require("../buildMappings");
 function extractScriptTags(scripts) {
@@ -26,7 +26,6 @@ function extractScriptTags(scripts) {
     embeddedJSCodes.push(...JSONScripts);
     return embeddedJSCodes;
 }
-exports.extractScriptTags = extractScriptTags;
 function moduleScriptToVirtualCode(script, index) {
     let extension = 'mts';
     let languageId = 'typescript';

package/dist/core/svelte.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSvelteLanguagePlugin = void 0;
+exports.getSvelteLanguagePlugin = getSvelteLanguagePlugin;
 const language_core_1 = require("@volar/language-core");
 const utils_js_1 = require("./utils.js");
 function getSvelteLanguagePlugin() {
@@ -32,7 +32,6 @@ function getSvelteLanguagePlugin() {
         },
     };
 }
-exports.getSvelteLanguagePlugin = getSvelteLanguagePlugin;
 class SvelteVirtualCode {
     constructor(fileName, snapshot) {
         this.fileName = fileName;

package/dist/core/utils.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchTSX = exports.classNameFromFilename = exports.framework2tsx = void 0;
+exports.framework2tsx = framework2tsx;
+exports.classNameFromFilename = classNameFromFilename;
+exports.patchTSX = patchTSX;
 const vscode_uri_1 = require("vscode-uri");
 const importPackage_1 = require("../importPackage");
 function framework2tsx(filePath, sourceCode, framework) {
@@ -26,7 +28,6 @@ function framework2tsx(filePath, sourceCode, framework) {
         };
     }
 }
-exports.framework2tsx = framework2tsx;
 /**
  * Transform a string into PascalCase
  */
@@ -55,7 +56,6 @@ function classNameFromFilename(filename) {
     const finalName = firstValidCharIdx === -1 ? `A${inPascalCase}` : inPascalCase;
     return finalName;
 }
-exports.classNameFromFilename = classNameFromFilename;
 // TODO: Patch the upstream packages with these changes
 function patchTSX(code, filePath) {
     const basename = filePath.split('/').pop();
@@ -70,5 +70,4 @@ function patchTSX(code, filePath) {
         return isDynamic ? `_${m1}_` : m1[0].toUpperCase() + m1.slice(1);
     });
 }
-exports.patchTSX = patchTSX;
 //# sourceMappingURL=utils.js.map

package/dist/core/vue.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVueLanguagePlugin = void 0;
+exports.getVueLanguagePlugin = getVueLanguagePlugin;
 const language_core_1 = require("@volar/language-core");
 const utils_js_1 = require("./utils.js");
 function getVueLanguagePlugin() {
@@ -32,7 +32,6 @@ function getVueLanguagePlugin() {
         },
     };
 }
-exports.getVueLanguagePlugin = getVueLanguagePlugin;
 class VueVirtualCode {
     constructor(fileName, snapshot) {
         this.fileName = fileName;

package/dist/importPackage.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspacePnpPath = exports.getPrettierPluginPath = exports.importPrettier = exports.importVueIntegration = exports.importSvelteIntegration = exports.getPackagePath = exports.setIsTrusted = void 0;
+exports.setIsTrusted = setIsTrusted;
+exports.getPackagePath = getPackagePath;
+exports.importSvelteIntegration = importSvelteIntegration;
+exports.importVueIntegration = importVueIntegration;
+exports.importPrettier = importPrettier;
+exports.getPrettierPluginPath = getPrettierPluginPath;
+exports.getWorkspacePnpPath = getWorkspacePnpPath;
 const node_path_1 = require("node:path");
 let isTrusted = true;
 function setIsTrusted(_isTrusted) {
     isTrusted = _isTrusted;
 }
-exports.setIsTrusted = setIsTrusted;
 /**
  * Get the path of a package's directory from the paths in `fromPath`, if `root` is set to false, it will return the path of the package's entry point
  */
@@ -24,7 +29,6 @@ function getPackagePath(packageName, fromPath, root = true) {
         return undefined;
     }
 }
-exports.getPackagePath = getPackagePath;
 function importEditorIntegration(packageName, fromPath) {
     const pkgPath = getPackagePath(packageName, [fromPath]);
     if (pkgPath) {
@@ -45,11 +49,9 @@ function importEditorIntegration(packageName, fromPath) {
 function importSvelteIntegration(fromPath) {
     return importEditorIntegration('@astrojs/svelte', fromPath);
 }
-exports.importSvelteIntegration = importSvelteIntegration;
 function importVueIntegration(fromPath) {
     return importEditorIntegration('@astrojs/vue', fromPath);
 }
-exports.importVueIntegration = importVueIntegration;
 function importPrettier(fromPath) {
     const prettierPkg = getPackagePath('prettier', [fromPath, __dirname]);
     if (!prettierPkg) {
@@ -57,7 +59,6 @@ function importPrettier(fromPath) {
     }
     return require(prettierPkg);
 }
-exports.importPrettier = importPrettier;
 function getPrettierPluginPath(fromPath) {
     const prettierPluginPath = getPackagePath('prettier-plugin-astro', [fromPath, __dirname], false);
     if (!prettierPluginPath) {
@@ -65,7 +66,6 @@ function getPrettierPluginPath(fromPath) {
     }
     return prettierPluginPath;
 }
-exports.getPrettierPluginPath = getPrettierPluginPath;
 function getWorkspacePnpPath(workspacePath) {
     try {
         const possiblePath = (0, node_path_1.resolve)(workspacePath, '.pnp.cjs');
@@ -76,5 +76,4 @@ function getWorkspacePnpPath(workspacePath) {
         return null;
     }
 }
-exports.getWorkspacePnpPath = getWorkspacePnpPath;
 //# sourceMappingURL=importPackage.js.map

package/dist/languageServerPlugin.d.ts

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

package/dist/languageServerPlugin.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLanguageServicePlugins = exports.getLanguagePlugins = void 0;
+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");
@@ -13,11 +14,13 @@ 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 frontmatterHolders_js_1 = require("./core/frontmatterHolders.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");
-function getLanguagePlugins(connection, ts, serviceEnv, tsconfig) {
+const yaml_js_1 = require("./plugins/yaml.js");
+function getLanguagePlugins(connection, ts, serviceEnv, tsconfig, collectionConfigs) {
     const languagePlugins = [
         (0, vue_js_1.getVueLanguagePlugin)(),
         (0, svelte_js_1.getSvelteLanguagePlugin)(),
@@ -36,12 +39,14 @@ function getLanguagePlugins(connection, ts, serviceEnv, tsconfig) {
             type: node_1.MessageType.Warning,
         });
     }
+    if (collectionConfigs.length) {
+        languagePlugins.push((0, frontmatterHolders_js_1.getFrontmatterLanguagePlugin)(collectionConfigs));
+    }
     languagePlugins.unshift((0, core_1.getAstroLanguagePlugin)(typeof astroInstall === 'string' ? undefined : astroInstall, ts));
     return languagePlugins;
 }
-exports.getLanguagePlugins = getLanguagePlugins;
-function getLanguageServicePlugins(connection, ts) {
-    return [
+function getLanguageServicePlugins(connection, ts, collectionConfigs) {
+    const LanguageServicePlugins = [
         (0, html_js_1.create)(),
         (0, volar_service_css_1.create)(),
         (0, volar_service_emmet_1.create)(),
@@ -51,6 +56,10 @@ function getLanguageServicePlugins(connection, ts) {
         (0, astro_js_1.create)(ts),
         getPrettierService(),
     ];
+    if (collectionConfigs.length) {
+        LanguageServicePlugins.push((0, yaml_js_1.create)(collectionConfigs));
+    }
+    return LanguageServicePlugins;
     function getPrettierService() {
         let prettier;
         let prettierPluginPath;
@@ -123,5 +132,4 @@ function getLanguageServicePlugins(connection, ts) {
         });
     }
 }
-exports.getLanguageServicePlugins = getLanguageServicePlugins;
 //# sourceMappingURL=languageServerPlugin.js.map

package/dist/nodeServer.js

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_1 = require("@volar/language-server/node");
+const vscode_uri_1 = require("vscode-uri");
+const frontmatterHolders_js_1 = require("./core/frontmatterHolders.js");
 const languageServerPlugin_js_1 = require("./languageServerPlugin.js");
 const connection = (0, node_1.createConnection)();
 const server = (0, node_1.createServer)(connection);
+let contentIntellisenseEnabled = false;
 connection.listen();
 connection.onInitialize((params) => {
     const tsdk = params.initializationOptions?.typescript?.tsdk;
@@ -11,30 +14,57 @@ connection.onInitialize((params) => {
         throw new Error('The `typescript.tsdk` init option is required. It should point to a directory containing a `typescript.js` or `tsserverlibrary.js` file, such as `node_modules/typescript/lib`.');
     }
     const { typescript, diagnosticMessages } = (0, node_1.loadTsdkByPath)(tsdk, params.locale);
+    contentIntellisenseEnabled = params.initializationOptions?.contentIntellisense ?? false;
+    let collectionConfigs = [];
+    if (contentIntellisenseEnabled) {
+        // The vast majority of clients support workspaceFolders, but notably our tests currently don't
+        // Ref: https://github.com/volarjs/volar.js/issues/229
+        const folders = params.workspaceFolders ?? (params.rootUri ? [{ uri: params.rootUri }] : []) ?? [];
+        collectionConfigs = folders.flatMap((folder) => {
+            try {
+                const folderUri = vscode_uri_1.URI.parse(folder.uri);
+                let config = server.fileSystem.readFile(vscode_uri_1.Utils.joinPath(folderUri, '.astro/collections/collections.json'));
+                if (!config) {
+                    return [];
+                }
+                // `server.fs.readFile` can theoretically be async, but in practice it's always sync
+                const collections = JSON.parse(config);
+                return { folder: folderUri, config: collections };
+            }
+            catch (err) {
+                // If the file doesn't exist, we don't really care, but if it's something else, we want to know
+                if (err && err.code !== 'ENOENT')
+                    console.error(err);
+                return [];
+            }
+        });
+    }
     return server.initialize(params, (0, node_1.createTypeScriptProject)(typescript, diagnosticMessages, ({ env, configFileName }) => {
         return {
-            languagePlugins: (0, languageServerPlugin_js_1.getLanguagePlugins)(connection, typescript, env, configFileName),
+            languagePlugins: (0, languageServerPlugin_js_1.getLanguagePlugins)(connection, typescript, env, configFileName, collectionConfigs),
             setup() { },
         };
-    }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript), { pullModelDiagnostics: params.initializationOptions?.pullModelDiagnostics });
+    }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript, collectionConfigs));
 });
 connection.onInitialized(() => {
     server.initialized();
-    server.watchFiles([
-        `**/*.{${[
-            'js',
-            'cjs',
-            'mjs',
-            'ts',
-            'cts',
-            'mts',
-            'jsx',
-            'tsx',
-            'json',
-            'astro',
-            'vue',
-            'svelte',
-        ].join(',')}}`,
-    ]);
+    const extensions = [
+        'js',
+        'cjs',
+        'mjs',
+        'ts',
+        'cts',
+        'mts',
+        'jsx',
+        'tsx',
+        'json',
+        'astro',
+        'vue',
+        'svelte',
+    ];
+    if (contentIntellisenseEnabled) {
+        extensions.push(...frontmatterHolders_js_1.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS);
+    }
+    server.fileWatcher.watchFiles([`**/*.{${extensions.join(',')}}`]);
 });
 //# sourceMappingURL=nodeServer.js.map

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: (ts: typeof import("typescript")) => LanguageServicePlugin;

package/dist/plugins/astro.js

@@ -16,7 +16,10 @@ const create = (ts) => {
             completionProvider: {
                 triggerCharacters: ['-'],
             },
-            diagnosticProvider: {},
+            diagnosticProvider: {
+                interFileDependencies: false,
+                workspaceDiagnostics: false,
+            },
             codeLensProvider: {},
         },
         create(context) {
@@ -40,7 +43,7 @@ const create = (ts) => {
                         items: items,
                     };
                 },
-                provideSemanticDiagnostics(document, token) {
+                provideDiagnostics(document, token) {
                     if (token.isCancellationRequested)
                         return [];
                     const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));

package/dist/plugins/typescript/codeActions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enhancedResolveCodeAction = exports.enhancedProvideCodeActions = void 0;
+exports.enhancedProvideCodeActions = enhancedProvideCodeActions;
+exports.enhancedResolveCodeAction = enhancedResolveCodeAction;
 const language_server_1 = require("@volar/language-server");
 const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../../core/index.js");
@@ -8,7 +9,6 @@ const utils_js_1 = require("./utils.js");
 function enhancedProvideCodeActions(codeActions, context) {
     return codeActions.map((codeAction) => mapCodeAction(codeAction, context));
 }
-exports.enhancedProvideCodeActions = enhancedProvideCodeActions;
 function enhancedResolveCodeAction(codeAction, context) {
     /**
      * TypeScript code actions don't come through here, as they're considered to be already fully resolved
@@ -17,7 +17,6 @@ function enhancedResolveCodeAction(codeAction, context) {
      */
     return mapCodeAction(codeAction, context);
 }
-exports.enhancedResolveCodeAction = enhancedResolveCodeAction;
 function mapCodeAction(codeAction, context) {
     if (!codeAction.edit || !codeAction.edit.documentChanges)
         return codeAction;

package/dist/plugins/typescript/completions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enhancedResolveCompletionItem = exports.enhancedProvideCompletionItems = void 0;
+exports.enhancedProvideCompletionItems = enhancedProvideCompletionItems;
+exports.enhancedResolveCompletionItem = enhancedResolveCompletionItem;
 const language_server_1 = require("@volar/language-server");
 const vscode_uri_1 = require("vscode-uri");
 const index_js_1 = require("../../core/index.js");
@@ -25,7 +26,6 @@ function enhancedProvideCompletionItems(completions) {
     });
     return completions;
 }
-exports.enhancedProvideCompletionItems = enhancedProvideCompletionItems;
 function enhancedResolveCompletionItem(resolvedCompletion, context) {
     // Make sure we keep our icons even when the completion is resolved
     if (resolvedCompletion.data.isComponent) {
@@ -42,7 +42,6 @@ function enhancedResolveCompletionItem(resolvedCompletion, context) {
     }
     return resolvedCompletion;
 }
-exports.enhancedResolveCompletionItem = enhancedResolveCompletionItem;
 function getDetailForFileCompletion(detail, source) {
     return `${detail}\n\n${source}`;
 }

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

@@ -1,12 +1,12 @@
 import type { Diagnostic } from '@volar/language-server';
 export declare enum DiagnosticCodes {
-    IS_NOT_A_MODULE = 2306,
-    CANNOT_FIND_MODULE = 2307,
-    DUPLICATED_JSX_ATTRIBUTES = 17001,
-    CANT_RETURN_OUTSIDE_FUNC = 1108,
-    ISOLATED_MODULE_COMPILE_ERR = 1208,
-    TYPE_NOT_ASSIGNABLE = 2322,
-    JSX_NO_CLOSING_TAG = 17008,
+    IS_NOT_A_MODULE = 2306,// '{0}' is not a module.
+    CANNOT_FIND_MODULE = 2307,// Cannot find module '{0}' or its corresponding type declarations.
+    DUPLICATED_JSX_ATTRIBUTES = 17001,// JSX elements cannot have multiple attributes with the same name.
+    CANT_RETURN_OUTSIDE_FUNC = 1108,// A 'return' statement can only be used within a function body.
+    ISOLATED_MODULE_COMPILE_ERR = 1208,// '{0}' cannot be compiled under '--isolatedModules' because it is considered a global script file.
+    TYPE_NOT_ASSIGNABLE = 2322,// Type '{0}' is not assignable to type '{1}'.
+    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[];

package/dist/plugins/typescript/diagnostics.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enhancedProvideSemanticDiagnostics = exports.DiagnosticCodes = void 0;
+exports.DiagnosticCodes = void 0;
+exports.enhancedProvideSemanticDiagnostics = enhancedProvideSemanticDiagnostics;
 // List of codes:
 // https://github.com/Microsoft/TypeScript/blob/main/src/compiler/diagnosticMessages.json
 var DiagnosticCodes;
@@ -23,7 +24,6 @@ function enhancedProvideSemanticDiagnostics(originalDiagnostics, tsxLineCount) {
         .map((diag) => tsxLineCount ? generalEnhancements(astroEnhancements(diag)) : generalEnhancements(diag));
     return diagnostics;
 }
-exports.enhancedProvideSemanticDiagnostics = enhancedProvideSemanticDiagnostics;
 // General enhancements that apply to all files
 function generalEnhancements(diagnostic) {
     if (diagnostic.code === DiagnosticCodes.CANNOT_FIND_MODULE &&

package/dist/plugins/typescript/index.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: (ts: typeof import("typescript")) => LanguageServicePlugin[];

package/dist/plugins/typescript/index.js

@@ -41,7 +41,7 @@ const create = (ts) => {
                                 return codeAction;
                             return (0, codeActions_js_1.enhancedResolveCodeAction)(resolvedCodeAction, context);
                         },
-                        async provideSemanticDiagnostics(document, token) {
+                        async provideDiagnostics(document, token) {
                             const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
                             const sourceScript = decoded && context.language.scripts.get(decoded[0]);
                             const root = sourceScript?.generated?.root;
@@ -53,7 +53,7 @@ const create = (ts) => {
                                 // We'll use this to filter out diagnostics that are outside the mapped range of the TSX
                                 tsxLineCount = root.astroMeta.tsxRanges.body.end.line;
                             }
-                            const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
+                            const diagnostics = await typeScriptPlugin.provideDiagnostics(document, token);
                             if (!diagnostics)
                                 return null;
                             return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, tsxLineCount);

package/dist/plugins/typescript/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapEdit = void 0;
+exports.mapEdit = mapEdit;
 const utils_js_1 = require("../utils.js");
 function mapEdit(edit, code, languageId) {
     // Don't attempt to move the edit to the frontmatter if the file isn't the root TSX file, it means it's a script tag
@@ -17,5 +17,4 @@ function mapEdit(edit, code, languageId) {
     }
     return edit;
 }
-exports.mapEdit = mapEdit;
 //# sourceMappingURL=utils.js.map

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSnippetCompletions = void 0;
+exports.getSnippetCompletions = getSnippetCompletions;
 const language_server_1 = require("@volar/language-server");
 function getSnippetCompletions(frontmatter) {
     if (frontmatter.status === 'doesnt-exist')
@@ -62,5 +62,4 @@ function getSnippetCompletions(frontmatter) {
         },
     ];
 }
-exports.getSnippetCompletions = getSnippetCompletions;
 //# sourceMappingURL=snippets.js.map

package/dist/plugins/utils.d.ts

@@ -1,7 +1,7 @@
 import type { HTMLDocument, Node, TextEdit } from 'vscode-html-languageservice';
 import { Range } from 'vscode-html-languageservice';
 import type { AstroMetadata, FrontmatterStatus } from '../core/parseAstro.js';
-export declare function isJSDocument(languageId: string): boolean;
+export declare function isJSDocument(languageId: string): languageId is "typescript" | "typescriptreact" | "javascript" | "javascriptreact";
 /**
  * Return true if a specific node could be a component.
  * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component

package/dist/plugins/utils.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.editShouldBeInFrontmatter = exports.getOpenFrontmatterEdit = exports.getNewFrontmatterEdit = exports.ensureRangeIsInFrontmatter = exports.ensureProperEditForFrontmatter = exports.isInsideFrontmatter = exports.isInsideExpression = exports.isInComponentStartTag = exports.isPossibleComponent = exports.isJSDocument = void 0;
+exports.isJSDocument = isJSDocument;
+exports.isPossibleComponent = isPossibleComponent;
+exports.isInComponentStartTag = isInComponentStartTag;
+exports.isInsideExpression = isInsideExpression;
+exports.isInsideFrontmatter = isInsideFrontmatter;
+exports.ensureProperEditForFrontmatter = ensureProperEditForFrontmatter;
+exports.ensureRangeIsInFrontmatter = ensureRangeIsInFrontmatter;
+exports.getNewFrontmatterEdit = getNewFrontmatterEdit;
+exports.getOpenFrontmatterEdit = getOpenFrontmatterEdit;
+exports.editShouldBeInFrontmatter = editShouldBeInFrontmatter;
 const vscode_html_languageservice_1 = require("vscode-html-languageservice");
 function isJSDocument(languageId) {
     return (languageId === 'javascript' ||
@@ -8,7 +17,6 @@ function isJSDocument(languageId) {
         languageId === 'javascriptreact' ||
         languageId === 'typescriptreact');
 }
-exports.isJSDocument = isJSDocument;
 /**
  * Return true if a specific node could be a component.
  * This is not a 100% sure test as it'll return false for any component that does not match the standard format for a component
@@ -18,7 +26,6 @@ function isPossibleComponent(node) {
         return false;
     return !!/[A-Z]/.test(node.tag?.[0]) || !!/.+\.[A-Z]?/.test(node.tag);
 }
-exports.isPossibleComponent = isPossibleComponent;
 /**
  * Return if a given offset is inside the start tag of a component
  */
@@ -26,7 +33,6 @@ function isInComponentStartTag(html, offset) {
     const node = html.findNodeAt(offset);
     return isPossibleComponent(node) && (!node.startTagEnd || offset < node.startTagEnd);
 }
-exports.isInComponentStartTag = isInComponentStartTag;
 /**
  * Return if a given position is inside a JSX expression
  */
@@ -34,7 +40,6 @@ function isInsideExpression(html, tagStart, position) {
     const charactersInNode = html.substring(tagStart, position);
     return charactersInNode.lastIndexOf('{') > charactersInNode.lastIndexOf('}');
 }
-exports.isInsideExpression = isInsideExpression;
 /**
  * Return if a given offset is inside the frontmatter
  */
@@ -48,7 +53,6 @@ function isInsideFrontmatter(offset, frontmatter) {
             return false;
     }
 }
-exports.isInsideFrontmatter = isInsideFrontmatter;
 function ensureProperEditForFrontmatter(edit, metadata, newLine, position = 'top') {
     switch (metadata.frontmatter.status) {
         case 'open':
@@ -66,7 +70,6 @@ function ensureProperEditForFrontmatter(edit, metadata, newLine, position = 'top
             return getNewFrontmatterEdit(edit, metadata, newLine);
     }
 }
-exports.ensureProperEditForFrontmatter = ensureProperEditForFrontmatter;
 /**
  * Force a range to be at the start of the frontmatter if it is outside
  */
@@ -87,13 +90,11 @@ function ensureRangeIsInFrontmatter(range, metadata, position = 'top') {
     }
     return range;
 }
-exports.ensureRangeIsInFrontmatter = ensureRangeIsInFrontmatter;
 function getNewFrontmatterEdit(edit, astroMetadata, newLine) {
     edit.newText = `---${edit.newText.startsWith(newLine) ? '' : newLine}${edit.newText}---${newLine}${newLine}`;
     edit.range = vscode_html_languageservice_1.Range.create(astroMetadata.tsxRanges.frontmatter.start, astroMetadata.tsxRanges.frontmatter.start);
     return edit;
 }
-exports.getNewFrontmatterEdit = getNewFrontmatterEdit;
 function getOpenFrontmatterEdit(edit, astroMetadata, newLine) {
     edit.newText = edit.newText.startsWith(newLine)
         ? `${edit.newText}---`
@@ -101,7 +102,6 @@ function getOpenFrontmatterEdit(edit, astroMetadata, newLine) {
     edit.range = vscode_html_languageservice_1.Range.create(astroMetadata.tsxRanges.frontmatter.start, astroMetadata.tsxRanges.frontmatter.start);
     return edit;
 }
-exports.getOpenFrontmatterEdit = getOpenFrontmatterEdit;
 // Most edits that are at the beginning of the TSX, or outside the document are intended for the frontmatter
 function editShouldBeInFrontmatter(range, astroMetadata) {
     const isAtTSXStart = range.start.line < astroMetadata.tsxRanges.frontmatter.start.line;
@@ -111,5 +111,4 @@ function editShouldBeInFrontmatter(range, astroMetadata) {
         ? { itShould: true, position: isPastFile ? 'bottom' : 'top' }
         : { itShould: false, position: undefined };
 }
-exports.editShouldBeInFrontmatter = editShouldBeInFrontmatter;
 //# sourceMappingURL=utils.js.map

package/dist/plugins/yaml.d.ts

@@ -0,0 +1,3 @@
+import type { LanguageServicePlugin } from '@volar/language-service';
+import type { CollectionConfig } from '../core/frontmatterHolders.js';
+export declare const create: (collectionConfigs: CollectionConfig[]) => LanguageServicePlugin;

package/dist/plugins/yaml.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.create = void 0;
+const language_server_1 = require("@volar/language-server");
+const volar_service_yaml_1 = require("volar-service-yaml");
+const vscode_uri_1 = require("vscode-uri");
+const frontmatterHolders_js_1 = require("../core/frontmatterHolders.js");
+const create = (collectionConfigs) => {
+    const yamlPlugin = (0, volar_service_yaml_1.create)({
+        getLanguageSettings() {
+            const schemas = collectionConfigs.flatMap((workspaceCollectionConfig) => {
+                return workspaceCollectionConfig.config.collections.flatMap((collection) => {
+                    return {
+                        fileMatch: frontmatterHolders_js_1.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS.map((ext) => `volar-embedded-content://yaml_frontmatter_${collection.name}/**/*${ext}`),
+                        uri: vscode_uri_1.Utils.joinPath(workspaceCollectionConfig.folder, '.astro/collections', `${collection.name}.schema.json`).toString(),
+                    };
+                });
+            });
+            return {
+                completion: true,
+                format: false,
+                hover: true,
+                validate: true,
+                customTags: [],
+                yamlVersion: '1.2',
+                isKubernetes: false,
+                parentSkeletonSelectedFirst: false,
+                disableDefaultProperties: false,
+                schemas: schemas,
+            };
+        },
+    });
+    return {
+        ...yamlPlugin,
+        capabilities: {
+            ...yamlPlugin.capabilities,
+            codeLensProvider: undefined,
+        },
+        create(context) {
+            const yamlPluginInstance = yamlPlugin.create(context);
+            const languageService = yamlPluginInstance.provide?.['yaml/languageService']();
+            if (languageService && context.env.onDidChangeWatchedFiles) {
+                context.env.onDidChangeWatchedFiles(async (events) => {
+                    let hasChanges = false;
+                    for (const change of events.changes) {
+                        if (!change.uri.endsWith('.schema.json'))
+                            return;
+                        if (languageService.resetSchema(change.uri)) {
+                            hasChanges = true;
+                        }
+                    }
+                    if (hasChanges) {
+                        // TODO: Figure out how to refresh the diagnostics
+                    }
+                });
+            }
+            return {
+                ...yamlPluginInstance,
+                // Disable codelenses, we'll provide our own
+                provideCodeLenses: undefined,
+                resolveCodeLens: undefined,
+                async provideDiagnostics(document, token) {
+                    const originalDiagnostics = await yamlPluginInstance.provideDiagnostics(document, token);
+                    if (!originalDiagnostics) {
+                        return null;
+                    }
+                    const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
+                    const sourceScript = decoded && context.language.scripts.get(decoded[0]);
+                    const root = sourceScript?.generated?.root;
+                    if (!(root instanceof frontmatterHolders_js_1.FrontmatterHolder))
+                        return undefined;
+                    // If we don't have a frontmatter, but there are errors, it probably means a frontmatter was required
+                    if (!root.hasFrontmatter && originalDiagnostics.length > 0) {
+                        return [
+                            language_server_1.Diagnostic.create(language_server_1.Range.create(0, 0, 0, 0), 'Frontmatter is required for this file.', language_server_1.DiagnosticSeverity.Error),
+                        ];
+                    }
+                    return originalDiagnostics.map((diagnostic) => {
+                        // The YAML schema source is not useful to users, since it's generated. Also, it's quite long.
+                        if (diagnostic.source?.startsWith('yaml-schema:')) {
+                            diagnostic.source = 'astro';
+                            // In Astro, schema errors are always fatal
+                            diagnostic.severity = language_server_1.DiagnosticSeverity.Error;
+                            // Map missing properties to the entire frontmatte
+                            if (diagnostic.message.startsWith('Missing property')) {
+                                diagnostic.range = language_server_1.Range.create({ line: 0, character: 0 }, document.positionAt(document.getText().length));
+                            }
+                        }
+                        return diagnostic;
+                    });
+                },
+                async provideHover(document, position, token) {
+                    const originalHover = await yamlPluginInstance.provideHover(document, position, token);
+                    if (!originalHover) {
+                        return null;
+                    }
+                    if (language_server_1.MarkupContent.is(originalHover.contents)) {
+                        // 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:.*$/, '')
+                            .trim();
+                    }
+                    return originalHover;
+                },
+            };
+        },
+    };
+};
+exports.create = create;
+//# sourceMappingURL=yaml.js.map

package/dist/utils.js

@@ -23,13 +23,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAstroInstall = exports.getLanguageServerTypesDir = void 0;
+exports.getLanguageServerTypesDir = getLanguageServerTypesDir;
+exports.getAstroInstall = getAstroInstall;
 const path = __importStar(require("node:path"));
 const importPackage_js_1 = require("./importPackage.js");
 function getLanguageServerTypesDir(ts) {
     return ts.sys.resolvePath(path.resolve(__dirname, '../types'));
 }
-exports.getLanguageServerTypesDir = getLanguageServerTypesDir;
 function getAstroInstall(basePaths, checkForAstro) {
     let astroPath;
     let version;
@@ -92,5 +92,4 @@ function getAstroInstall(basePaths, checkForAstro) {
         },
     };
 }
-exports.getAstroInstall = getAstroInstall;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.13.4",
+  "version": "2.14.1",
   "author": "withastro",
   "license": "MIT",
   "repository": {
@@ -21,20 +21,22 @@
   },
   "dependencies": {
     "@astrojs/compiler": "^2.10.3",
+    "@astrojs/yaml2ts": "^0.2.1",
     "@jridgewell/sourcemap-codec": "^1.4.15",
-    "@volar/kit": "~2.4.0-alpha.15",
-    "@volar/language-core": "~2.4.0-alpha.15",
-    "@volar/language-server": "~2.4.0-alpha.15",
-    "@volar/language-service": "~2.4.0-alpha.15",
-    "@volar/typescript": "~2.4.0-alpha.15",
+    "@volar/kit": "~2.4.0",
+    "@volar/language-core": "~2.4.0",
+    "@volar/language-server": "~2.4.0",
+    "@volar/language-service": "~2.4.0",
+    "@volar/typescript": "~2.4.0",
     "fast-glob": "^3.2.12",
     "muggle-string": "^0.4.1",
-    "volar-service-css": "0.0.59",
-    "volar-service-emmet": "0.0.59",
-    "volar-service-html": "0.0.59",
-    "volar-service-prettier": "0.0.59",
-    "volar-service-typescript": "0.0.59",
-    "volar-service-typescript-twoslash-queries": "0.0.59",
+    "volar-service-css": "0.0.61",
+    "volar-service-emmet": "0.0.61",
+    "volar-service-html": "0.0.61",
+    "volar-service-prettier": "0.0.61",
+    "volar-service-typescript": "0.0.61",
+    "volar-service-typescript-twoslash-queries": "0.0.61",
+    "volar-service-yaml": "0.0.61",
     "vscode-html-languageservice": "^5.2.0",
     "vscode-uri": "^3.0.8"
   },
@@ -44,13 +46,13 @@
     "@types/chai": "^4.3.5",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.17.8",
-    "@volar/test-utils": "~2.4.0-alpha.15",
-    "astro": "^4.3.5",
+    "@volar/test-utils": "~2.4.0",
+    "astro": "^4.14.0",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
     "svelte": "^4.2.10",
     "tsx": "^3.12.7",
-    "typescript": "^5.2.2",
+    "typescript": "^5.5.4",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-textdocument": "^1.0.11"
   },
@@ -69,7 +71,8 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "test": "mocha --timeout 10000 --require tsx --require test/takedown.ts test/misc/init.test.ts test/**/*.test.ts",
+    "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"
   }
 }