@markuplint/file-resolver 4.18.4 → 4.18.5

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.18.5](https://github.com/markuplint/markuplint/compare/v4.18.4...v4.18.5) (2026-10-27)
+
+### Bug Fixes
+
+- **file-resolver:** add invalidate and runExclusive to ConfigProvider ([e8490a8](https://github.com/markuplint/markuplint/commit/e8490a8d19d37277f170be480cbca6a2a62b155c)), closes [#4415](https://github.com/markuplint/markuplint/issues/4415)
+- **file-resolver:** find the configuration above a nested package.json ([dbd077b](https://github.com/markuplint/markuplint/commit/dbd077bb13c0c3ed5f7febf77105917b411c42dd)), closes [#4405](https://github.com/markuplint/markuplint/issues/4405)
+
 ## [4.18.4](https://github.com/markuplint/markuplint/compare/v4.18.3...v4.18.4) (2026-10-22)
 
 **Note:** Version bump only for package @markuplint/file-resolver

package/lib/config-provider.d.ts

@@ -10,6 +10,39 @@ import type { Nullable } from '@markuplint/shared';
  */
 export declare class ConfigProvider {
     #private;
+    /**
+     * Clears every cached and stored configuration: the resolved-config cache, the store of loaded
+     * and registered configurations, the plugin-resolution cache and the shared explorer's caches.
+     *
+     * `resolve()` with `cache` set to `false` calls this as its first step. That is too late for a
+     * caller that has just registered a configuration with {@link set}: the clearing discards it.
+     * Such a caller that wants a fresh re-read calls this method first, then {@link set} and
+     * {@link search}, then `resolve()` with `cache` left `true`: what was registered after the
+     * clearing survives to `resolve()` (#4415).
+     *
+     * The plugin-resolution cache and the explorer are shared by every `ConfigProvider` in the
+     * process, so clearing them here affects other instances too. They are only caches, and a
+     * later call reads the files again.
+     */
+    invalidate(): void;
+    /**
+     * Runs `fn` after every earlier `runExclusive()` call on this instance has settled. The queue
+     * is this provider's own, held in `#queue`.
+     *
+     * Wrap a whole {@link invalidate} → {@link set} / {@link search} → `resolve()` sequence in it:
+     * an overlapping call on the same provider (two watch-triggered re-resolves of one engine close
+     * together, or callers that share one provider) can then not clear the configurations this call
+     * has just registered and not yet consumed (#4415).
+     *
+     * Only calls that go through this method are serialized: a direct `set()`, `search()` or
+     * `resolve()` call on the same provider is not queued. `fn` must not call `runExclusive()` on
+     * the same provider and wait for it: the inner call waits for `fn` to settle, so it never ends.
+     *
+     * @template T - The type `fn` resolves to
+     * @param fn - The sequence to run exclusively
+     * @returns What `fn` resolves to; a rejection of `fn` does not block the next call
+     */
+    runExclusive<T>(fn: () => Promise<T>): Promise<T>;
     /**
      * Recursively loads a configuration and all its `extends` dependencies.
      *
@@ -27,6 +60,11 @@ export declare class ConfigProvider {
      * Resolves the full configuration for a target file by merging all named configs,
      * resolving plugins, and applying file-specific overrides.
      *
+     * With `cache` set to `false` it first clears the store, which also discards any configuration
+     * the caller has just registered with {@link set}. A caller that registers inline
+     * configurations and wants a fresh re-read calls {@link invalidate} before registering them and
+     * passes `cache` as `true` (#4415).
+     *
      * @param targetFile - The file being linted
      * @param names - Config file paths or module names to merge
      * @param cache - Whether to use cached results
@@ -34,7 +72,8 @@ export declare class ConfigProvider {
      */
     resolve(targetFile: Readonly<MLFile>, names: readonly Nullable<string>[], cache?: boolean): Promise<ConfigSet>;
     /**
-     * Searches for a markuplint configuration file starting from the target file's directory.
+     * Searches for a markuplint configuration file starting from the target file's directory
+     * and going up through its ancestors; the nearest one wins (see `search` in `cosmiconfig.ts`).
      *
      * @param targetFile - The file whose directory to search from
      * @returns The file path of the found config, or `null` if none was found

package/lib/config-provider.js

@@ -3,14 +3,20 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ConfigProvider_cache, _ConfigProvider_held, _ConfigProvider_recursiveLoadKeyAndDepth, _ConfigProvider_store;
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _ConfigProvider_cache, _ConfigProvider_held, _ConfigProvider_recursiveLoadKeyAndDepth, _ConfigProvider_store, _ConfigProvider_queue;
 import path from 'node:path';
 import { mergeConfig } from '@markuplint/ml-config';
 import { ConfigParserError } from '@markuplint/parser-utils';
 import { InvalidSelectorError, createSelector } from '@markuplint/selector';
 import { nonNullableFilter, toNoEmptyStringArrayFromStringOrArray } from '@markuplint/shared';
 import { ConfigLoadError } from './config-load-error.js';
-import { load as loadConfig, search } from './cosmiconfig.js';
+import { clearExplorerCache, load as loadConfig, search } from './cosmiconfig.js';
 import { log } from './debug.js';
 import { generalImport } from './general-import.js';
 import { getPreset } from './get-preset.js';
@@ -34,6 +40,59 @@ export class ConfigProvider {
         _ConfigProvider_held.set(this, new Set());
         _ConfigProvider_recursiveLoadKeyAndDepth.set(this, new Map());
         _ConfigProvider_store.set(this, new Map());
+        _ConfigProvider_queue.set(this, Promise.resolve());
+    }
+    /**
+     * Clears every cached and stored configuration: the resolved-config cache, the store of loaded
+     * and registered configurations, the plugin-resolution cache and the shared explorer's caches.
+     *
+     * `resolve()` with `cache` set to `false` calls this as its first step. That is too late for a
+     * caller that has just registered a configuration with {@link set}: the clearing discards it.
+     * Such a caller that wants a fresh re-read calls this method first, then {@link set} and
+     * {@link search}, then `resolve()` with `cache` left `true`: what was registered after the
+     * clearing survives to `resolve()` (#4415).
+     *
+     * The plugin-resolution cache and the explorer are shared by every `ConfigProvider` in the
+     * process, so clearing them here affects other instances too. They are only caches, and a
+     * later call reads the files again.
+     */
+    invalidate() {
+        __classPrivateFieldGet(this, _ConfigProvider_store, "f").clear();
+        __classPrivateFieldGet(this, _ConfigProvider_cache, "f").clear();
+        __classPrivateFieldGet(this, _ConfigProvider_held, "f").clear();
+        cacheClear();
+        clearExplorerCache();
+    }
+    /**
+     * Runs `fn` after every earlier `runExclusive()` call on this instance has settled. The queue
+     * is this provider's own, held in `#queue`.
+     *
+     * Wrap a whole {@link invalidate} → {@link set} / {@link search} → `resolve()` sequence in it:
+     * an overlapping call on the same provider (two watch-triggered re-resolves of one engine close
+     * together, or callers that share one provider) can then not clear the configurations this call
+     * has just registered and not yet consumed (#4415).
+     *
+     * Only calls that go through this method are serialized: a direct `set()`, `search()` or
+     * `resolve()` call on the same provider is not queued. `fn` must not call `runExclusive()` on
+     * the same provider and wait for it: the inner call waits for `fn` to settle, so it never ends.
+     *
+     * @template T - The type `fn` resolves to
+     * @param fn - The sequence to run exclusively
+     * @returns What `fn` resolves to; a rejection of `fn` does not block the next call
+     */
+    async runExclusive(fn) {
+        const previous = __classPrivateFieldGet(this, _ConfigProvider_queue, "f");
+        let release;
+        __classPrivateFieldSet(this, _ConfigProvider_queue, new Promise(resolve => {
+            release = resolve;
+        }), "f");
+        await previous;
+        try {
+            return await fn();
+        }
+        finally {
+            release();
+        }
     }
     /**
      * Recursively loads a configuration and all its `extends` dependencies.
@@ -86,6 +145,11 @@ export class ConfigProvider {
      * Resolves the full configuration for a target file by merging all named configs,
      * resolving plugins, and applying file-specific overrides.
      *
+     * With `cache` set to `false` it first clears the store, which also discards any configuration
+     * the caller has just registered with {@link set}. A caller that registers inline
+     * configurations and wants a fresh re-read calls {@link invalidate} before registering them and
+     * passes `cache` as `true` (#4415).
+     *
      * @param targetFile - The file being linted
      * @param names - Config file paths or module names to merge
      * @param cache - Whether to use cached results
@@ -93,9 +157,7 @@ export class ConfigProvider {
      */
     async resolve(targetFile, names, cache = true) {
         if (!cache) {
-            __classPrivateFieldGet(this, _ConfigProvider_store, "f").clear();
-            __classPrivateFieldGet(this, _ConfigProvider_cache, "f").clear();
-            cacheClear();
+            this.invalidate();
         }
         const keys = names.filter(nonNullableFilter);
         const key = keys.join(KEY_SEPARATOR);
@@ -161,7 +223,8 @@ export class ConfigProvider {
         return result;
     }
     /**
-     * Searches for a markuplint configuration file starting from the target file's directory.
+     * Searches for a markuplint configuration file starting from the target file's directory
+     * and going up through its ancestors; the nearest one wins (see `search` in `cosmiconfig.ts`).
      *
      * @param targetFile - The file whose directory to search from
      * @returns The file path of the found config, or `null` if none was found
@@ -289,7 +352,7 @@ export class ConfigProvider {
         return errors;
     }
 }
-_ConfigProvider_cache = new WeakMap(), _ConfigProvider_held = new WeakMap(), _ConfigProvider_recursiveLoadKeyAndDepth = new WeakMap(), _ConfigProvider_store = new WeakMap();
+_ConfigProvider_cache = new WeakMap(), _ConfigProvider_held = new WeakMap(), _ConfigProvider_recursiveLoadKeyAndDepth = new WeakMap(), _ConfigProvider_store = new WeakMap(), _ConfigProvider_queue = new WeakMap();
 async function load(filePath, cache, referrer) {
     if (!fileExists(filePath) && (await moduleExists(filePath))) {
         const config = (await generalImport(filePath)) ?? new ConfigLoadError('Module is not found', filePath, referrer);

package/lib/cosmiconfig.d.ts

@@ -1,6 +1,34 @@
 import type { LoaderSync } from 'cosmiconfig';
 import { ConfigLoadError } from './config-load-error.js';
 type CosmiConfig = ReturnType<LoaderSync>;
+/**
+ * Clears the shared explorer's own search and load caches.
+ *
+ * `search()` and `load()` clear them only as a side effect of one call; this lets a caller
+ * clear them up front, before any `search()` or `load()`, so that the calls that follow read the
+ * current file content (see `ConfigProvider#invalidate`, #4415).
+ */
+export declare function clearExplorerCache(): void;
+/**
+ * Searches for a configuration file in the directory of `filePath` and then in each ancestor
+ * directory up to the file system root, and returns the nearest one.
+ *
+ * This walk is done here instead of by cosmiconfig's `searchStrategy: 'project'`, because that
+ * strategy stops at the first directory that has a `package.json`, which hides a configuration
+ * file at a monorepo root from every file inside a package (#4405). The documented behavior is
+ * that the search goes upward from the target file's directory
+ * (https://markuplint.dev/docs/configuration). `searchStrategy: 'global'` is not a fit either: it
+ * also searches the OS-level configuration directory, and that cannot be turned off.
+ *
+ * A `package.json` that has no `markuplint` key is not a configuration file, so the walk
+ * continues past it. There is no upper bound below the file system root, so a configuration file
+ * in a directory outside the project applies when nothing nearer exists.
+ *
+ * @template T - The type of the configuration object
+ * @param filePath - The path of the target file; the search starts from its directory
+ * @param cacheClear - Whether to clear the explorer's caches before searching
+ * @returns The path and content of the nearest configuration file, or `null` if none was found
+ */
 export declare function search<T = CosmiConfig>(filePath: string, cacheClear: boolean): Promise<{
     filePath: string;
     config: T;

package/lib/cosmiconfig.js

@@ -19,26 +19,75 @@ const explorer = cosmiconfig('markuplint', {
             }
         }),
     },
-    searchStrategy: 'project',
+    // Checks only the directory it is given; see `search()` for the ancestor walk.
+    searchStrategy: 'none',
 });
+/**
+ * Clears the shared explorer's own search and load caches.
+ *
+ * `search()` and `load()` clear them only as a side effect of one call; this lets a caller
+ * clear them up front, before any `search()` or `load()`, so that the calls that follow read the
+ * current file content (see `ConfigProvider#invalidate`, #4415).
+ */
+export function clearExplorerCache() {
+    explorer.clearCaches();
+}
+/**
+ * Yields `dir` and then each of its ancestors, ending with the file system root.
+ *
+ * @param dir - The directory to start from
+ */
+function* ancestorDirs(dir) {
+    let current = path.resolve(dir);
+    while (true) {
+        yield current;
+        const parent = path.dirname(current);
+        if (parent === current) {
+            return;
+        }
+        current = parent;
+    }
+}
+/**
+ * Searches for a configuration file in the directory of `filePath` and then in each ancestor
+ * directory up to the file system root, and returns the nearest one.
+ *
+ * This walk is done here instead of by cosmiconfig's `searchStrategy: 'project'`, because that
+ * strategy stops at the first directory that has a `package.json`, which hides a configuration
+ * file at a monorepo root from every file inside a package (#4405). The documented behavior is
+ * that the search goes upward from the target file's directory
+ * (https://markuplint.dev/docs/configuration). `searchStrategy: 'global'` is not a fit either: it
+ * also searches the OS-level configuration directory, and that cannot be turned off.
+ *
+ * A `package.json` that has no `markuplint` key is not a configuration file, so the walk
+ * continues past it. There is no upper bound below the file system root, so a configuration file
+ * in a directory outside the project applies when nothing nearer exists.
+ *
+ * @template T - The type of the configuration object
+ * @param filePath - The path of the target file; the search starts from its directory
+ * @param cacheClear - Whether to clear the explorer's caches before searching
+ * @returns The path and content of the nearest configuration file, or `null` if none was found
+ */
 export async function search(filePath, cacheClear) {
     if (cacheClear) {
         explorer.clearCaches();
     }
-    const dir = path.dirname(filePath);
-    searchLog('Search dir: %s', dir);
-    const result = await explorer.search(dir).catch(cacheConfigError(dir, filePath));
-    searchLog('Search result: %O', result);
-    if (!result || result.isEmpty) {
-        return null;
+    for (const dir of ancestorDirs(path.dirname(filePath))) {
+        searchLog('Search dir: %s', dir);
+        const result = await explorer.search(dir).catch(cacheConfigError(dir, filePath));
+        searchLog('Search result: %O', result);
+        if (!result || result.isEmpty) {
+            continue;
+        }
+        const config = result.config;
+        return {
+            filePath: result.filepath,
+            config: config && typeof config === 'object' && 'default' in config && typeof config.default === 'object'
+                ? config.default
+                : config,
+        };
     }
-    const config = result.config;
-    return {
-        filePath: result.filepath,
-        config: config && typeof config === 'object' && 'default' in config && typeof config.default === 'object'
-            ? config.default
-            : config,
-    };
+    return null;
 }
 export async function load(filePath, cacheClear, referrer) {
     if (cacheClear) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "4.18.4",
+	"version": "4.18.5",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -43,5 +43,5 @@
 		"jsonc": "2.0.0",
 		"minimatch": "10.2.6"
 	},
-	"gitHead": "b5fbb4572f7313e3c80735da1677d33cb82e6e2f"
+	"gitHead": "e7307cd5bdb771ac91e723c4c8869499190f2465"
 }