@markuplint/file-resolver 4.9.18 → 5.0.0-alpha.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-alpha.0](https://github.com/markuplint/markuplint/compare/v4.14.1...v5.0.0-alpha.0) (2026-02-20)
+
+### Bug Fixes
+
+- **file-resolver:** use "options" instead of deprecated "option" in test fixtures ([98a53f2](https://github.com/markuplint/markuplint/commit/98a53f27c4a6e640f20e2c74421c1cdeba3e7db5))
+
+- refactor(file-resolver)!: drop MLMarkupLanguageParser support ([3272ee7](https://github.com/markuplint/markuplint/commit/3272ee72a7c4fb3105fbecd41ec4ba5eff030092))
+
+### Features
+
+- **file-resolver:** add .jsonc config file support via cosmiconfig ([755848d](https://github.com/markuplint/markuplint/commit/755848dbec75105e3cdf9de6becb84546b66deec))
+
+### BREAKING CHANGES
+
+- Remove MLMarkupLanguageParser compatibility from
+  resolve-parser. Parser modules must now export MLParserModule
+  with a parser property.
+
+* Remove MLMarkupLanguageParser import and union types
+* Remove deprecated 'parser' in parserMod check
+* Update test mock to use Parser class instance
+
+Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
+
 ## [4.9.18](https://github.com/markuplint/markuplint/compare/@markuplint/file-resolver@4.9.17...@markuplint/file-resolver@4.9.18) (2026-02-10)
 
 **Note:** Version bump only for package @markuplint/file-resolver

package/lib/config-load-error.js

@@ -1,7 +1,9 @@
 export class ConfigLoadError extends Error {
+    filePath;
+    name = 'ConfigLoadError';
+    referrer;
     constructor(message, filePath, referrer) {
         super(message + ` in ${referrer}`);
-        this.name = 'ConfigLoadError';
         this.filePath = filePath;
         this.referrer = referrer;
     }

package/lib/config-provider.js

@@ -1,9 +1,3 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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;
 import path from 'node:path';
 import { mergeConfig } from '@markuplint/ml-config';
 import { ConfigParserError } from '@markuplint/parser-utils';
@@ -29,12 +23,10 @@ const KEY_SEPARATOR = '__ML_CONFIG_MERGE__';
  * Configuration files are searched via cosmiconfig and cached by file path.
  */
 export class ConfigProvider {
-    constructor() {
-        _ConfigProvider_cache.set(this, new Map());
-        _ConfigProvider_held.set(this, new Set());
-        _ConfigProvider_recursiveLoadKeyAndDepth.set(this, new Map());
-        _ConfigProvider_store.set(this, new Map());
-    }
+    #cache = new Map();
+    #held = new Set();
+    #recursiveLoadKeyAndDepth = new Map();
+    #store = new Map();
     /**
      * Recursively loads a configuration and all its `extends` dependencies.
      *
@@ -47,15 +39,15 @@ export class ConfigProvider {
     async recursiveLoad(key, cache, referrer, depth = 1) {
         const stack = new Set();
         const errs = [];
-        const ancestorDepth = __classPrivateFieldGet(this, _ConfigProvider_recursiveLoadKeyAndDepth, "f").get(key);
+        const ancestorDepth = this.#recursiveLoadKeyAndDepth.get(key);
         if (ancestorDepth != null && ancestorDepth < depth) {
             return {
                 stack,
                 errs: [new CircularReferenceError(`Circular reference detected: ${key}`)],
             };
         }
-        __classPrivateFieldGet(this, _ConfigProvider_recursiveLoadKeyAndDepth, "f").set(key, depth);
-        let config = __classPrivateFieldGet(this, _ConfigProvider_store, "f").get(key);
+        this.#recursiveLoadKeyAndDepth.set(key, depth);
+        let config = this.#store.get(key);
         if (!config) {
             config = await this._load(key, cache, referrer);
         }
@@ -93,18 +85,18 @@ export class ConfigProvider {
      */
     async resolve(targetFile, names, cache = true) {
         if (!cache) {
-            __classPrivateFieldGet(this, _ConfigProvider_store, "f").clear();
-            __classPrivateFieldGet(this, _ConfigProvider_cache, "f").clear();
+            this.#store.clear();
+            this.#cache.clear();
             cacheClear();
         }
         const keys = names.filter(nonNullableFilter);
         const key = keys.join(KEY_SEPARATOR);
-        const currentConfig = __classPrivateFieldGet(this, _ConfigProvider_cache, "f").get(key);
+        const currentConfig = this.#cache.get(key);
         if (currentConfig) {
             return currentConfig;
         }
         let configSet = await this._mergeConfigs(keys, cache, targetFile.path);
-        const filePath = [...configSet.files].reverse()[0];
+        const filePath = [...configSet.files].toReversed()[0];
         if (!filePath) {
             throw new ConfigParserError('Config file not found', {
                 filePath: targetFile.path,
@@ -114,8 +106,8 @@ export class ConfigProvider {
         configSet.errs.push(...errors);
         const { plugins, errors: pluginErrors } = await resolvePlugins(configSet.config.plugins);
         configSet.errs.push(...pluginErrors);
-        if (__classPrivateFieldGet(this, _ConfigProvider_held, "f").size > 0) {
-            const extendHelds = [...__classPrivateFieldGet(this, _ConfigProvider_held, "f").values()];
+        if (this.#held.size > 0) {
+            const extendHelds = [...this.#held.values()];
             for (const held of extendHelds) {
                 const [, prefix, namespace, name] = held.match(/^([a-z]+:)([^/]+)(?:\/(.+))?$/) ?? [];
                 switch (prefix) {
@@ -130,7 +122,7 @@ export class ConfigProvider {
                 }
             }
             configSet = await this._mergeConfigs([...keys, ...extendHelds], cache, targetFile.path);
-            __classPrivateFieldGet(this, _ConfigProvider_held, "f").clear();
+            this.#held.clear();
         }
         // Resolves `overrides`
         if (configSet.config.overrides) {
@@ -157,7 +149,7 @@ export class ConfigProvider {
             ...configSet,
             plugins,
         };
-        __classPrivateFieldGet(this, _ConfigProvider_cache, "f").set(key, result);
+        this.#cache.set(key, result);
         return result;
     }
     /**
@@ -180,7 +172,7 @@ export class ConfigProvider {
         }
         const { filePath, config } = res;
         const pathResolvedConfig = await this._pathResolve(config, filePath);
-        __classPrivateFieldGet(this, _ConfigProvider_store, "f").set(filePath, pathResolvedConfig);
+        this.#store.set(filePath, pathResolvedConfig);
         cpLog('Store key: %s', filePath);
         return filePath;
     }
@@ -193,11 +185,11 @@ export class ConfigProvider {
      */
     set(config, key) {
         key = key ?? uuid();
-        __classPrivateFieldGet(this, _ConfigProvider_store, "f").set(key, config);
+        this.#store.set(key, config);
         return key;
     }
     async _load(filePath, cache, referrer) {
-        const entity = __classPrivateFieldGet(this, _ConfigProvider_store, "f").get(filePath);
+        const entity = this.#store.get(filePath);
         if (entity) {
             return entity;
         }
@@ -205,11 +197,11 @@ export class ConfigProvider {
             const [, name] = filePath.match(/^markuplint:(.+)$/i) ?? [];
             const config = await getPreset(name ?? filePath);
             const pathResolvedConfig = await this._pathResolve(config, filePath);
-            __classPrivateFieldGet(this, _ConfigProvider_store, "f").set(filePath, pathResolvedConfig);
+            this.#store.set(filePath, pathResolvedConfig);
             return pathResolvedConfig;
         }
         if (isPluginModuleName(filePath)) {
-            __classPrivateFieldGet(this, _ConfigProvider_held, "f").add(filePath);
+            this.#held.add(filePath);
             return;
         }
         if (!(await moduleExists(filePath)) && !path.isAbsolute(filePath)) {
@@ -220,21 +212,21 @@ export class ConfigProvider {
             return config;
         }
         const pathResolvedConfig = await this._pathResolve(config, filePath);
-        __classPrivateFieldGet(this, _ConfigProvider_store, "f").set(filePath, pathResolvedConfig);
+        this.#store.set(filePath, pathResolvedConfig);
         return pathResolvedConfig;
     }
     async _mergeConfigs(keys, cache, referrer) {
         const resolvedKeys = new Set();
         const errs = [];
         for (const key of keys) {
-            __classPrivateFieldGet(this, _ConfigProvider_recursiveLoadKeyAndDepth, "f").clear();
+            this.#recursiveLoadKeyAndDepth.clear();
             const keySet = await this.recursiveLoad(key, cache, referrer);
             for (const k of keySet.stack) {
                 resolvedKeys.add(k);
             }
             errs.push(...keySet.errs);
         }
-        const configs = [...resolvedKeys].map(name => __classPrivateFieldGet(this, _ConfigProvider_store, "f").get(name)).filter(nonNullableFilter);
+        const configs = [...resolvedKeys].map(name => this.#store.get(name)).filter(nonNullableFilter);
         let resultConfig = {};
         for (const config of configs) {
             if (config instanceof ConfigLoadError) {
@@ -289,7 +281,6 @@ export class ConfigProvider {
         return errors;
     }
 }
-_ConfigProvider_cache = new WeakMap(), _ConfigProvider_held = new WeakMap(), _ConfigProvider_recursiveLoadKeyAndDepth = new WeakMap(), _ConfigProvider_store = 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);
@@ -307,8 +298,5 @@ async function load(filePath, cache, referrer) {
     return res.config;
 }
 class CircularReferenceError extends ReferenceError {
-    constructor() {
-        super(...arguments);
-        this.name = 'CircularReferenceError';
-    }
+    name = 'CircularReferenceError';
 }

package/lib/cosmiconfig.js

@@ -5,19 +5,38 @@ import { jsonc } from 'jsonc';
 import { ConfigLoadError } from './config-load-error.js';
 import { log } from './debug.js';
 const searchLog = log.extend('search');
+const jsoncLoader = (path, content) => {
+    try {
+        return jsonc.parse(content);
+    }
+    catch (error) {
+        if (error instanceof Error && error.name === 'JSONError') {
+            return defaultLoaders['noExt'](path, content);
+        }
+        throw error;
+    }
+};
 const explorer = cosmiconfig('markuplint', {
+    searchPlaces: [
+        'package.json',
+        '.markuplintrc',
+        '.markuplintrc.json',
+        '.markuplintrc.jsonc',
+        '.markuplintrc.yaml',
+        '.markuplintrc.yml',
+        '.markuplintrc.js',
+        '.markuplintrc.ts',
+        '.markuplintrc.cjs',
+        '.markuplintrc.mjs',
+        'markuplint.config.js',
+        'markuplint.config.ts',
+        'markuplint.config.cjs',
+        'markuplint.config.mjs',
+        'markuplint.config.jsonc',
+    ],
     loaders: {
-        noExt: ((path, content) => {
-            try {
-                return jsonc.parse(content);
-            }
-            catch (error) {
-                if (error instanceof Error && error.name === 'JSONError') {
-                    return defaultLoaders['noExt'](path, content);
-                }
-                throw error;
-            }
-        }),
+        noExt: jsoncLoader,
+        '.jsonc': jsoncLoader,
     },
     searchStrategy: 'project',
 });

package/lib/ml-file/ml-file.js

@@ -1,51 +1,39 @@
-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 __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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 _MLFile_basename, _MLFile_code, _MLFile_dirname, _MLFile_stat, _MLFile_type;
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import ignore from 'ignore';
 import { minimatch } from 'minimatch';
 export class MLFile {
+    #basename;
+    #code;
+    #dirname;
+    /**
+     * - `Stats`: Exists
+     * - `null`: Not exists
+     * - `undefined`: Doesn't read yet
+     */
+    #stat = undefined;
+    #type;
     constructor(target) {
-        _MLFile_basename.set(this, void 0);
-        _MLFile_code.set(this, void 0);
-        _MLFile_dirname.set(this, void 0);
-        /**
-         * - `Stats`: Exists
-         * - `null`: Not exists
-         * - `undefined`: Doesn't read yet
-         */
-        _MLFile_stat.set(this, undefined);
-        _MLFile_type.set(this, void 0);
         if (typeof target === 'string') {
-            __classPrivateFieldSet(this, _MLFile_basename, path.basename(target), "f");
-            __classPrivateFieldSet(this, _MLFile_dirname, path.dirname(target), "f");
-            __classPrivateFieldSet(this, _MLFile_code, null, "f");
-            __classPrivateFieldSet(this, _MLFile_type, 'file-base', "f");
+            this.#basename = path.basename(target);
+            this.#dirname = path.dirname(target);
+            this.#code = null;
+            this.#type = 'file-base';
             return;
         }
         if (!target.workspace && target.name && path.isAbsolute(target.name)) {
-            __classPrivateFieldSet(this, _MLFile_basename, path.basename(target.name), "f");
-            __classPrivateFieldSet(this, _MLFile_dirname, path.dirname(target.name), "f");
+            this.#basename = path.basename(target.name);
+            this.#dirname = path.dirname(target.name);
         }
         else {
-            __classPrivateFieldSet(this, _MLFile_basename, target.name ?? '<AnonymousFile>', "f");
-            __classPrivateFieldSet(this, _MLFile_dirname, target.workspace ?? process.cwd(), "f");
+            this.#basename = target.name ?? '<AnonymousFile>';
+            this.#dirname = target.workspace ?? process.cwd();
         }
-        __classPrivateFieldSet(this, _MLFile_code, target.sourceCode, "f");
-        __classPrivateFieldSet(this, _MLFile_type, 'code-base', "f");
+        this.#code = target.sourceCode;
+        this.#type = 'code-base';
     }
     get dirname() {
-        return __classPrivateFieldGet(this, _MLFile_dirname, "f");
+        return this.#dirname;
     }
     /**
      * Normalized `MLFile.dirname`
@@ -60,16 +48,16 @@ export class MLFile {
         return pathNormalize(this.path);
     }
     get path() {
-        return path.resolve(__classPrivateFieldGet(this, _MLFile_dirname, "f"), __classPrivateFieldGet(this, _MLFile_basename, "f"));
+        return path.resolve(this.#dirname, this.#basename);
     }
     async dirExists() {
-        return !!(await stat(__classPrivateFieldGet(this, _MLFile_dirname, "f")));
+        return !!(await stat(this.#dirname));
     }
     async getCode() {
-        if (__classPrivateFieldGet(this, _MLFile_code, "f") != null) {
-            return __classPrivateFieldGet(this, _MLFile_code, "f");
+        if (this.#code != null) {
+            return this.#code;
         }
-        if (__classPrivateFieldGet(this, _MLFile_type, "f") === 'file-base' && (await this.isExist())) {
+        if (this.#type === 'file-base' && (await this.isExist())) {
             return await this._fetch();
         }
         return '';
@@ -83,14 +71,14 @@ export class MLFile {
         return ignored;
     }
     async isExist() {
-        if (__classPrivateFieldGet(this, _MLFile_type, "f") === 'code-base') {
+        if (this.#type === 'code-base') {
             return true;
         }
         const stat = await this._stat();
         return !!stat;
     }
     async isFile() {
-        if (__classPrivateFieldGet(this, _MLFile_type, "f") === 'code-base') {
+        if (this.#type === 'code-base') {
             return true;
         }
         const stat = await this._stat();
@@ -100,25 +88,24 @@ export class MLFile {
         return minimatch(this.nPath, pathNormalize(globPath));
     }
     setCode(code) {
-        if (__classPrivateFieldGet(this, _MLFile_type, "f") === 'file-base') {
+        if (this.#type === 'file-base') {
             throw new Error(`This file object is readonly (File-base: ${this.path})`);
         }
-        __classPrivateFieldSet(this, _MLFile_code, code, "f");
+        this.#code = code;
     }
     async _fetch() {
         const code = await fs.readFile(this.path, { encoding: 'utf8' });
-        __classPrivateFieldSet(this, _MLFile_code, code, "f");
+        this.#code = code;
         return code;
     }
     async _stat() {
-        if (__classPrivateFieldGet(this, _MLFile_stat, "f")) {
-            return __classPrivateFieldGet(this, _MLFile_stat, "f");
+        if (this.#stat) {
+            return this.#stat;
         }
-        __classPrivateFieldSet(this, _MLFile_stat, await stat(this.path), "f");
-        return __classPrivateFieldGet(this, _MLFile_stat, "f");
+        this.#stat = await stat(this.path);
+        return this.#stat;
     }
 }
-_MLFile_basename = new WeakMap(), _MLFile_code = new WeakMap(), _MLFile_dirname = new WeakMap(), _MLFile_stat = new WeakMap(), _MLFile_type = new WeakMap();
 async function stat(filePath) {
     try {
         return await fs.stat(filePath);

package/lib/resolve-parser.d.ts

@@ -1,5 +1,5 @@
 import type { MLFile } from './ml-file/index.js';
-import type { MLMarkupLanguageParser, MLParser, ParserOptions } from '@markuplint/ml-ast';
+import type { MLParser, ParserOptions } from '@markuplint/ml-ast';
 import type { ParserConfig } from '@markuplint/ml-config';
 /**
  * Resolves the appropriate parser for a given file based on the parser configuration.
@@ -14,7 +14,7 @@ import type { ParserConfig } from '@markuplint/ml-config';
  */
 export declare function resolveParser(file: Readonly<MLFile>, parserConfig?: ParserConfig, parserOptions?: ParserOptions): Promise<{
     parserModName: string;
-    parser: MLParser | MLMarkupLanguageParser;
+    parser: MLParser;
     parserOptions: ParserOptions;
     matched: boolean;
 }>;

package/lib/resolve-parser.js

@@ -50,9 +50,5 @@ async function importParser(parserModName) {
     if (!parserMod) {
         throw new Error(`Parser module "${parserModName}" is not found.`);
     }
-    // TODO: To be dropped in v5
-    if (!('parser' in parserMod)) {
-        return parserMod;
-    }
     return parserMod.parser;
 }

package/package.json

@@ -1,10 +1,13 @@
 {
 	"name": "@markuplint/file-resolver",
-	"version": "4.9.18",
+	"version": "5.0.0-alpha.0",
 	"description": "The file resolver of markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
 	"license": "MIT",
+	"engines": {
+		"node": ">=22"
+	},
 	"type": "module",
 	"exports": {
 		".": {
@@ -27,21 +30,21 @@
 		"@types/node": "24.5.1"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "4.6.23",
-		"@markuplint/ml-ast": "4.4.11",
-		"@markuplint/ml-config": "4.8.15",
-		"@markuplint/ml-core": "4.13.3",
-		"@markuplint/ml-spec": "4.10.2",
-		"@markuplint/parser-utils": "4.8.11",
-		"@markuplint/selector": "4.7.8",
-		"@markuplint/shared": "4.4.13",
+		"@markuplint/html-parser": "5.0.0-alpha.0",
+		"@markuplint/ml-ast": "5.0.0-alpha.0",
+		"@markuplint/ml-config": "5.0.0-alpha.0",
+		"@markuplint/ml-core": "5.0.0-alpha.0",
+		"@markuplint/ml-spec": "5.0.0-alpha.0",
+		"@markuplint/parser-utils": "5.0.0-alpha.0",
+		"@markuplint/selector": "5.0.0-alpha.0",
+		"@markuplint/shared": "5.0.0-alpha.0",
 		"cosmiconfig": "9.0.0",
 		"debug": "4.4.3",
-		"glob": "13.0.1",
+		"glob": "13.0.6",
 		"ignore": "7.0.5",
 		"import-meta-resolve": "4.2.0",
 		"jsonc": "2.0.0",
-		"minimatch": "10.1.2"
+		"minimatch": "10.2.2"
 	},
-	"gitHead": "193ee7c1262bbed95424e38efdf1a8e56ff049f4"
+	"gitHead": "13dcfc84ec83d87360c720e253383b60767e1b56"
 }