markuplint 4.18.4 → 4.18.5

package/ARCHITECTURE.ja.md

@@ -170,7 +170,7 @@ flowchart TD
 2. options.configFile     -- 明示的な設定ファイルパス（--config フラグ）
 3. ConfigProvider.search()-- ファイル位置からの自動探索（--no-search-config でなければ）
 4. options.defaultConfig  -- フォールバック設定
-5. markuplint:recommended -- 設定が一切見つからない場合のデフォルト
+5. markuplint:recommended -- 設定が一切見つからない場合のデフォルト（`configFile` も指定されていない場合）
 ```
 
 これらは `ConfigProvider.resolve()` で結合され、`@markuplint/ml-config` の `mergeConfig()` を使用して全レイヤーをマージします。

package/ARCHITECTURE.md

@@ -170,7 +170,7 @@ The `resolveConfig()` method resolves configuration from multiple sources with t
 2. options.configFile     -- Explicit config file path (--config flag)
 3. ConfigProvider.search()-- Auto-discovery from file location (unless --no-search-config)
 4. options.defaultConfig  -- Fallback config
-5. markuplint:recommended -- Default when no config is found at all
+5. markuplint:recommended -- Default when no config is found at all (and no `configFile` is given)
 ```
 
 These are combined via `ConfigProvider.resolve()` which merges all layers using `@markuplint/ml-config`'s `mergeConfig()`.

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
+
+- **markuplint:** do not search for a configuration file when noSearchConfig is set ([1163e16](https://github.com/markuplint/markuplint/commit/1163e16afc265b8f2fc05345f6ceed6d3232a105)), closes [#4409](https://github.com/markuplint/markuplint/issues/4409)
+- **markuplint:** keep inline configurations when the configuration is resolved again ([b0d5d0b](https://github.com/markuplint/markuplint/commit/b0d5d0bb449c695e563678cd5c3719c109edad7a)), closes [#4415](https://github.com/markuplint/markuplint/issues/4415)
+
 ## [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

package/SKILL.md

@@ -88,7 +88,7 @@ Change how MLEngine resolves and merges configuration. Follow recipe #3 in `docs
 
 1. Read `src/api/ml-engine.ts` and locate `resolveConfig()`
 2. Current priority: options.config -> configFile -> search -> defaultConfig -> recommended
-3. Understand `ConfigProvider` methods: `search()`, `set()`, `resolve()` (from `@markuplint/file-resolver`)
+3. Understand `ConfigProvider` methods: `search()`, `set()`, `resolve()`, `invalidate()`, `runExclusive()` (from `@markuplint/file-resolver`); `resolve()` with `cache` `false` clears the store, including what `set()` has just registered
 
 ### Step 2: Modify the logic
 

package/docs/maintenance.ja.md

@@ -119,7 +119,9 @@ expect(violations).toStrictEqual([
 3. `@markuplint/file-resolver` の `ConfigProvider` を理解:
    - `set(config)` で設定を登録しキーを返す
    - `search(file)` でターゲットに最も近い設定ファイルを検索
-   - `resolve(file, keys, cache)` で全設定レイヤーをマージ
+   - `resolve(file, keys, cache)` で全設定レイヤーをマージ。`cache` が `false` のときは最初にストアを消すため、直前に `set()` で登録した設定も消える
+   - `invalidate()` でストアとキャッシュを消す。インライン設定を残したまま読み直すには、`set()` の前に呼び、`cache` を `true` にして `resolve()` する（`resolveConfig(false)` がそうしている）
+   - `runExclusive(fn)` で `invalidate()` → `set()` / `search()` → `resolve()` の一連を、重なる呼び出しに割り込まれずに実行する
 4. イベント発行（`this.emit('config', ...)`）を保持しつつ `resolveConfig()` を変更
 5. 新しい API オプションを追加する場合、`src/api/types.ts` の `APIOptions` を更新
 6. `src/api/ml-engine.spec.ts` にテストを追加

package/docs/maintenance.md

@@ -119,7 +119,9 @@ expect(violations).toStrictEqual([
 3. Understand `ConfigProvider` from `@markuplint/file-resolver`:
    - `set(config)` registers a config and returns a key
    - `search(file)` finds the nearest config file for a target
-   - `resolve(file, keys, cache)` merges all config layers
+   - `resolve(file, keys, cache)` merges all config layers; with `cache` `false` it first clears the store, which also discards what `set()` has just registered
+   - `invalidate()` clears the store and the caches; call it before `set()`, then `resolve()` with `cache` `true`, for a re-read that keeps the inline configs (`resolveConfig(false)` does)
+   - `runExclusive(fn)` runs a whole `invalidate()` → `set()` / `search()` → `resolve()` sequence without an overlapping call interleaving
 4. Make changes to `resolveConfig()`, preserving the event emissions (`this.emit('config', ...)`)
 5. If adding new API options, update `APIOptions` in `src/api/types.ts`
 6. Add tests in `src/api/ml-engine.spec.ts`

package/lib/api/ml-engine.d.ts

@@ -74,6 +74,21 @@ export declare class MLEngine extends Emitter<MLEngineEventMap> {
     private i18n;
     private onChange;
     private provide;
+    /**
+     * Resolves the configuration for the target file: the configuration found by searching
+     * upward from the file (else `defaultConfig`), then `configFile`, then `config`.
+     * `markuplint:recommended` is used only when none of them is given.
+     *
+     * With `noSearchConfig` the search is not run at all, because it throws for a
+     * configuration file that cannot be loaded anywhere up to the file system root.
+     * `defaultConfig` still applies. `configFile` does not stop the search.
+     *
+     * `cache` set to `false` reads every configuration file again, and the inline configurations
+     * (`defaultConfig`, `config` and the `markuplint:recommended` fallback) are kept (#4415).
+     *
+     * @param cache - Whether to reuse cached configuration; `false` reads the configuration files again
+     * @returns The merged configuration with the plugins, files and errors collected on the way
+     */
     resolveConfig(cache: boolean): Promise<ConfigSet>;
     private resolveParser;
     private resolvePretenders;

package/lib/api/ml-engine.js

@@ -294,31 +294,62 @@ export class MLEngine extends Emitter {
             configErrors: configSet.errs,
         };
     }
+    /**
+     * Resolves the configuration for the target file: the configuration found by searching
+     * upward from the file (else `defaultConfig`), then `configFile`, then `config`.
+     * `markuplint:recommended` is used only when none of them is given.
+     *
+     * With `noSearchConfig` the search is not run at all, because it throws for a
+     * configuration file that cannot be loaded anywhere up to the file system root.
+     * `defaultConfig` still applies. `configFile` does not stop the search.
+     *
+     * `cache` set to `false` reads every configuration file again, and the inline configurations
+     * (`defaultConfig`, `config` and the `markuplint:recommended` fallback) are kept (#4415).
+     *
+     * @param cache - Whether to reuse cached configuration; `false` reads the configuration files again
+     * @returns The merged configuration with the plugins, files and errors collected on the way
+     */
     async resolveConfig(cache) {
         this.emit('log', 'resolveConfig', JSON.stringify(__classPrivateFieldGet(this, _MLEngine_configProvider, "f"), null, 2));
         configLog('configProvider: %s', __classPrivateFieldGet(this, _MLEngine_configProvider, "f"));
-        const defaultConfigKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(mergeConfig(__classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig));
-        configLog('defaultConfigKey: %s', defaultConfigKey ?? 'N/A');
-        this.emit('log', 'defaultConfigKey', defaultConfigKey ?? 'N/A');
-        const targetConfig = await __classPrivateFieldGet(this, _MLEngine_configProvider, "f").search(__classPrivateFieldGet(this, _MLEngine_file, "f"));
-        this.emit('log', 'targetConfig', targetConfig ?? 'N/A');
-        const configFilePathsFromTarget = __classPrivateFieldGet(this, _MLEngine_options, "f")?.noSearchConfig
-            ? (defaultConfigKey ?? null)
-            : (targetConfig ?? defaultConfigKey);
-        configLog('configFilePathsFromTarget: %s', configFilePathsFromTarget ?? 'N/A');
-        this.emit('log', 'configFilePathsFromTarget', configFilePathsFromTarget ?? 'N/A');
-        const configKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.config && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(mergeConfig(__classPrivateFieldGet(this, _MLEngine_options, "f").config));
-        configLog('option.config: %s', configKey ?? 'N/A');
-        this.emit('log', 'option.config', configFilePathsFromTarget ?? 'N/A');
-        let defaultRecommended = null;
-        if (!defaultConfigKey && !configFilePathsFromTarget && !configKey) {
-            // No configured
-            // Default: set recommended
-            defaultRecommended = __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set({ extends: ['markuplint:recommended'] });
-        }
-        configLog('defaultRecommended: %s', defaultRecommended ?? 'N/A');
-        this.emit('log', 'defaultRecommended', defaultRecommended ?? 'N/A');
-        const configSet = await __classPrivateFieldGet(this, _MLEngine_configProvider, "f").resolve(__classPrivateFieldGet(this, _MLEngine_file, "f"), [configFilePathsFromTarget, __classPrivateFieldGet(this, _MLEngine_options, "f")?.configFile, configKey, defaultRecommended], cache);
+        // The whole invalidate → set → search → resolve sequence runs as one exclusive unit: an
+        // overlapping call on this engine's provider (a watch-triggered `provide(false)` while
+        // `exec()` or `--show-config` resolves) must not clear the configurations registered below
+        // before `resolve()` has used them (#4415).
+        const configSet = await __classPrivateFieldGet(this, _MLEngine_configProvider, "f").runExclusive(async () => {
+            if (!cache) {
+                // Before any `set()` below. `resolve()` with `cache` set to `false` would clear the store
+                // itself, after the inline configurations were registered, and then fail to load their
+                // keys as file paths (#4415). Everything is cleared here instead, and `resolve()` is
+                // called with `cache` as `true`: what was cleared is read again.
+                __classPrivateFieldGet(this, _MLEngine_configProvider, "f").invalidate();
+            }
+            const defaultConfigKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(mergeConfig(__classPrivateFieldGet(this, _MLEngine_options, "f")?.defaultConfig));
+            configLog('defaultConfigKey: %s', defaultConfigKey ?? 'N/A');
+            this.emit('log', 'defaultConfigKey', defaultConfigKey ?? 'N/A');
+            // Not searching at all (#4409), rather than discarding the result: the search throws for a
+            // configuration file that cannot be loaded anywhere up to the file system root.
+            const noSearch = !!__classPrivateFieldGet(this, _MLEngine_options, "f")?.noSearchConfig;
+            const targetConfig = noSearch ? null : await __classPrivateFieldGet(this, _MLEngine_configProvider, "f").search(__classPrivateFieldGet(this, _MLEngine_file, "f"));
+            this.emit('log', 'targetConfig', noSearch ? 'skipped (noSearchConfig)' : (targetConfig ?? 'N/A'));
+            // The configuration that stands in for the target's own: the search result, else `defaultConfig`.
+            const configFilePathsFromTarget = targetConfig ?? defaultConfigKey ?? null;
+            configLog('configFilePathsFromTarget: %s', configFilePathsFromTarget ?? 'N/A');
+            this.emit('log', 'configFilePathsFromTarget', configFilePathsFromTarget ?? 'N/A');
+            const configKey = __classPrivateFieldGet(this, _MLEngine_options, "f")?.config && __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set(mergeConfig(__classPrivateFieldGet(this, _MLEngine_options, "f").config));
+            configLog('option.config: %s', configKey ?? 'N/A');
+            this.emit('log', 'option.config', configKey ?? 'N/A');
+            let defaultRecommended = null;
+            if (!defaultConfigKey && !configFilePathsFromTarget && !configKey && !__classPrivateFieldGet(this, _MLEngine_options, "f")?.configFile) {
+                // No configured
+                // Default: set recommended
+                // Not with `configFile`: the preset is merged after it and would override its rules (#4415).
+                defaultRecommended = __classPrivateFieldGet(this, _MLEngine_configProvider, "f").set({ extends: ['markuplint:recommended'] });
+            }
+            configLog('defaultRecommended: %s', defaultRecommended ?? 'N/A');
+            this.emit('log', 'defaultRecommended', defaultRecommended ?? 'N/A');
+            return __classPrivateFieldGet(this, _MLEngine_configProvider, "f").resolve(__classPrivateFieldGet(this, _MLEngine_file, "f"), [configFilePathsFromTarget, __classPrivateFieldGet(this, _MLEngine_options, "f")?.configFile, configKey, defaultRecommended], true);
+        });
         this.emit('config', __classPrivateFieldGet(this, _MLEngine_file, "f").path, configSet);
         if (__classPrivateFieldGet(this, _MLEngine_options, "f")?.watch) {
             // It doesn't watch the main HTML file because it may is watched and managed by a language server or text editor or more.

package/lib/api/types.d.ts

@@ -6,9 +6,18 @@ import type { AnyMLRule, MLSchema, Ruleset } from '@markuplint/ml-core';
  * Options for the markuplint API, controlling configuration, locale, rules, and behavior.
  */
 export type APIOptions = {
+    /**
+     * The path of a configuration file. When it is given, `markuplint:recommended` is not added
+     * after it as the fallback, so the file's own rules are not overridden (#4415).
+     */
     readonly configFile?: string;
     readonly config?: Config;
     readonly defaultConfig?: Config;
+    /**
+     * Do not search for a configuration file from the target file. No configuration file is
+     * read for the search, so a malformed one cannot affect the run. `defaultConfig`, `config`
+     * and `configFile` still apply; `configFile` alone does not disable the search.
+     */
     readonly noSearchConfig?: boolean;
     readonly locale?: string;
     readonly fix?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "markuplint",
-	"version": "4.18.4",
+	"version": "4.18.5",
 	"description": "An HTML linter for all markup developers",
 	"author": "Yusuke Hirao",
 	"license": "MIT",
@@ -24,7 +24,7 @@
 	},
 	"dependencies": {
 		"@markuplint/cli-utils": "4.18.0",
-		"@markuplint/file-resolver": "4.18.4",
+		"@markuplint/file-resolver": "4.18.5",
 		"@markuplint/html-parser": "4.18.4",
 		"@markuplint/html-spec": "4.18.4",
 		"@markuplint/i18n": "4.18.0",
@@ -43,5 +43,5 @@
 		"strip-ansi": "7.2.0",
 		"type-fest": "5.10.0"
 	},
-	"gitHead": "b5fbb4572f7313e3c80735da1677d33cb82e6e2f"
+	"gitHead": "e7307cd5bdb771ac91e723c4c8869499190f2465"
 }