@astrojs/language-server 2.15.0 → 2.15.3

package/dist/core/frontmatterHolders.d.ts

@@ -9,16 +9,22 @@ export declare const SUPPORTED_FRONTMATTER_EXTENSIONS: {
 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>;
-    };
+    reload: (folders: {
+        uri: string;
+    }[]) => void;
+    configs: {
+        folder: URI;
+        config: CollectionConfigInstance;
+    }[];
 };
-export declare function getFrontmatterLanguagePlugin(collectionConfigs: CollectionConfig[]): LanguagePlugin<URI, FrontmatterHolder>;
+export type CollectionConfigInstance = {
+    collections: {
+        hasSchema: boolean;
+        name: string;
+    }[];
+    entries: Record<string, string>;
+};
+export declare function getFrontmatterLanguagePlugin(collectionConfig: CollectionConfig): LanguagePlugin<URI, FrontmatterHolder>;
 export declare class FrontmatterHolder implements VirtualCode {
     fileName: string;
     languageId: string;

package/dist/core/frontmatterHolders.js

@@ -8,14 +8,14 @@ exports.SUPPORTED_FRONTMATTER_EXTENSIONS = { md: 'markdown', mdx: 'mdx', 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) {
+function getCollectionName(collectionConfig, fileURI) {
+    for (const collection of collectionConfig.configs) {
         if (collection.config.entries[fileURI]) {
             return collection.config.entries[fileURI];
         }
     }
 }
-function getFrontmatterLanguagePlugin(collectionConfigs) {
+function getFrontmatterLanguagePlugin(collectionConfig) {
     return {
         getLanguageId(scriptId) {
             const fileType = exports.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS.find((ext) => scriptId.path.endsWith(`.${ext}`));
@@ -25,7 +25,7 @@ function getFrontmatterLanguagePlugin(collectionConfigs) {
         },
         createVirtualCode(scriptId, languageId, snapshot) {
             if (SUPPORTED_FRONTMATTER_EXTENSIONS_VALUES.includes(languageId)) {
-                return new FrontmatterHolder(scriptId.fsPath.replace(/\\/g, '/'), languageId, snapshot, getCollectionName(collectionConfigs, 
+                return new FrontmatterHolder(scriptId.fsPath.replace(/\\/g, '/'), languageId, snapshot, getCollectionName(collectionConfig, 
                 // 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()));

package/dist/languageServerPlugin.d.ts

@@ -1,5 +1,5 @@
 import { type Connection, type LanguagePlugin } from '@volar/language-server/node';
 import { URI } from 'vscode-uri';
 import { type CollectionConfig } from './core/frontmatterHolders.js';
-export declare function getLanguagePlugins(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>[];
+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>[];

package/dist/languageServerPlugin.js

@@ -19,18 +19,16 @@ 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 yaml_js_1 = require("./plugins/yaml.js");
-function getLanguagePlugins(collectionConfigs) {
+function getLanguagePlugins(collectionConfig) {
     const languagePlugins = [
         (0, core_1.getAstroLanguagePlugin)(),
         (0, vue_js_1.getVueLanguagePlugin)(),
         (0, svelte_js_1.getSvelteLanguagePlugin)(),
+        (0, frontmatterHolders_js_1.getFrontmatterLanguagePlugin)(collectionConfig),
     ];
-    if (collectionConfigs.length) {
-        languagePlugins.push((0, frontmatterHolders_js_1.getFrontmatterLanguagePlugin)(collectionConfigs));
-    }
     return languagePlugins;
 }
-function getLanguageServicePlugins(connection, ts, collectionConfigs) {
+function getLanguageServicePlugins(connection, ts, collectionConfig) {
     const LanguageServicePlugins = [
         (0, html_js_1.create)(),
         (0, volar_service_css_1.create)(),
@@ -40,10 +38,8 @@ function getLanguageServicePlugins(connection, ts, collectionConfigs) {
         (0, index_js_1.create)(),
         (0, astro_js_1.create)(ts),
         getPrettierService(),
+        (0, yaml_js_1.create)(collectionConfig),
     ];
-    if (collectionConfigs.length) {
-        LanguageServicePlugins.push((0, yaml_js_1.create)(collectionConfigs));
-    }
     return LanguageServicePlugins;
     function getPrettierService() {
         let prettier;

package/dist/nodeServer.js

@@ -17,12 +17,18 @@ connection.onInitialize((params) => {
     }
     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) => {
+    const collectionConfig = {
+        reload(folders) {
+            this.configs = loadCollectionConfig(folders);
+        },
+        configs: contentIntellisenseEnabled
+            ? loadCollectionConfig(
+            // The vast majority of clients support workspaceFolders, but sometimes some unusual environments like tests don't
+            params.workspaceFolders ?? (params.rootUri ? [{ uri: params.rootUri }] : []) ?? [])
+            : [],
+    };
+    function loadCollectionConfig(folders) {
+        return 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'));
@@ -43,7 +49,7 @@ connection.onInitialize((params) => {
     }
     return server.initialize(params, (0, node_1.createTypeScriptProject)(typescript, diagnosticMessages, ({ env }) => {
         return {
-            languagePlugins: (0, languageServerPlugin_js_1.getLanguagePlugins)(collectionConfigs),
+            languagePlugins: (0, languageServerPlugin_js_1.getLanguagePlugins)(collectionConfig),
             setup({ project }) {
                 const { languageServiceHost, configFileName } = project.typescript;
                 const rootPath = configFileName
@@ -63,7 +69,7 @@ connection.onInitialize((params) => {
                 (0, index_js_1.addAstroTypes)(typeof astroInstall === 'string' ? undefined : astroInstall, typescript, languageServiceHost);
             },
         };
-    }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript, collectionConfigs));
+    }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript, collectionConfig));
 });
 connection.onInitialized(() => {
     server.initialized();
@@ -83,6 +89,13 @@ connection.onInitialized(() => {
     ];
     if (contentIntellisenseEnabled) {
         extensions.push(...frontmatterHolders_js_1.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS);
+        server.fileWatcher.watchFiles(['**/*.schema.json', '**/collections.json']);
+        server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
+            const shouldReload = changes.some((change) => change.uri.endsWith('.schema.json') || change.uri.endsWith('collections.json'));
+            if (shouldReload) {
+                server.project.reload();
+            }
+        });
     }
     server.fileWatcher.watchFiles([`**/*.{${extensions.join(',')}}`]);
 });

package/dist/plugins/yaml.d.ts

@@ -1,3 +1,7 @@
 import type { LanguageServicePlugin } from '@volar/language-service';
+import type { Provide } from 'volar-service-yaml';
 import type { CollectionConfig } from '../core/frontmatterHolders.js';
-export declare const create: (collectionConfigs: CollectionConfig[]) => LanguageServicePlugin;
+type LanguageSettings = Parameters<ReturnType<Provide['yaml/languageService']>['configure']>['0'];
+export declare function getSettings(collectionConfig: CollectionConfig): LanguageSettings;
+export declare const create: (collectionConfig: CollectionConfig) => LanguageServicePlugin;
+export {};

package/dist/plugins/yaml.js

@@ -1,34 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
+exports.getSettings = getSettings;
 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(),
-                    };
-                });
-            });
+function getSettings(collectionConfig) {
+    const schemas = collectionConfig.configs.flatMap((workspaceCollectionConfig) => {
+        return workspaceCollectionConfig.config.collections.flatMap((collection) => {
             return {
-                completion: true,
-                format: false,
-                hover: true,
-                validate: true,
-                customTags: [],
-                yamlVersion: '1.2',
-                isKubernetes: false,
-                parentSkeletonSelectedFirst: false,
-                disableDefaultProperties: false,
-                schemas: schemas,
+                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,
+    };
+}
+const create = (collectionConfig) => {
+    const yamlPlugin = (0, volar_service_yaml_1.create)({
+        getLanguageSettings: () => getSettings(collectionConfig),
     });
     return {
         ...yamlPlugin,
@@ -41,16 +43,16 @@ const create = (collectionConfigs) => {
             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;
-                        }
+                    const changedSchemas = events.changes.filter((change) => change.uri.endsWith('.schema.json'));
+                    const changedConfig = events.changes.some((change) => change.uri.endsWith('collections.json'));
+                    if (changedConfig) {
+                        collectionConfig.reload(
+                        // For some reason, context.env.workspaceFolders is not an array of WorkspaceFolders nor the older format, strange
+                        context.env.workspaceFolders.map((folder) => ({ uri: folder.toString() })));
+                        languageService.configure(getSettings(collectionConfig));
                     }
-                    if (hasChanges) {
-                        // TODO: Figure out how to refresh the diagnostics
+                    for (const change of changedSchemas) {
+                        languageService.resetSchema(change.uri);
                     }
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/language-server",
-  "version": "2.15.0",
+  "version": "2.15.3",
   "author": "withastro",
   "license": "MIT",
   "repository": {