load-oxfmt-config 0.14.0 → 0.15.0

package/README.md

@@ -10,7 +10,7 @@
 ## Features
 
 - 🔍 **Auto-discovery** - Automatically searches for config files in current and parent directories
-- 📦 **Multiple formats** - Auto-discovers `.oxfmtrc.json`, `.oxfmtrc.jsonc`, and `oxfmt.config.ts`, and also supports explicit `.json` / `.jsonc` / `.js` / `.mjs` / `.cjs` / `.ts` / `.mts` / `.cts` config paths
+- 📦 **Multiple formats** - Auto-discovers `.oxfmtrc.json`, `.oxfmtrc.jsonc`, `oxfmt.config.ts`, and `oxfmt.config.mts`, and also supports explicit `.json` / `.jsonc` / `.js` / `.mjs` / `.cjs` / `.ts` / `.mts` / `.cts` config paths
 - 🧩 **EditorConfig fallback** - Merges supported `.editorconfig` fields into the returned oxfmt config result
 - 🚫 **Ignore resolution** - Resolves ignore status with oxfmt CLI-like global + config-scoped semantics
 - ⚡ **Built-in caching** - Caches both file resolution and parsed configs for optimal performance
@@ -32,6 +32,7 @@ pnpm add load-oxfmt-config
 ```
 
 > `oxfmt` is a peer dependency and should be installed alongside this package.
+> Node.js `^22.13.0 || >=24` is supported.
 
 ## Usage
 
@@ -370,6 +371,7 @@ When `configPath` is not provided, the loader automatically searches for config
    - `.oxfmtrc.json`
    - `.oxfmtrc.jsonc`
    - `oxfmt.config.ts`
+   - `oxfmt.config.mts`
 3. **Stops when:**
    - A valid config file is found
    - Reaches the filesystem root
@@ -407,7 +409,7 @@ JSON with comments support:
 }
 ```
 
-### TypeScript (`oxfmt.config.ts`)
+### TypeScript (`oxfmt.config.ts` / `oxfmt.config.mts`)
 
 ```ts
 export default {
@@ -460,7 +462,7 @@ Notes:
 - `node_modules` can be included by passing `withNodeModules: true`.
 
 - The default lockfile list mirrors oxfmt documentation intent (`package-lock.json`, `pnpm-lock.yaml`, etc.) and common ecosystem lockfiles. It is not guaranteed to be a complete internal oxfmt list.
-- `ignorePatterns` use gitignore semantics and are interpreted relative to the resolved oxfmt config directory.
+- `ignorePatterns` use gitignore semantics and are interpreted relative to the resolved oxfmt config directory. Parent-directory (`..`) path segments are rejected because patterns cannot match files outside that directory.
 - `includeConfigIgnorePatterns` defaults to `true` to preserve current behavior.
 - `loadConfigForIgnorePatterns` defaults to `true` to preserve current behavior.
 - Nested config behavior follows oxfmt semantics:
@@ -471,14 +473,13 @@ Notes:
 
 ## Precedence
 
-The merged result follows this order:
+The merged result follows oxfmt's fallback semantics:
 
-1. Root-level values from the nearest `.editorconfig`
-2. Root-level values from `.oxfmtrc.json`, `.oxfmtrc.jsonc`, or `oxfmt.config.ts`
-3. Overrides generated from `.editorconfig` sections
-4. Overrides declared directly in the oxfmt config file
+1. Root and section-specific `.editorconfig` values provide defaults for unset fields
+2. Root-level values from `.oxfmtrc.json`, `.oxfmtrc.jsonc`, `oxfmt.config.ts`, or `oxfmt.config.mts` take precedence over all `.editorconfig` values
+3. Overrides declared directly in the oxfmt config file have the highest priority
 
-This means explicit root-level oxfmt config values win over root-level `.editorconfig` fallback values. Section-specific `.editorconfig` entries are represented as generated `overrides` in the static result, and explicit oxfmt `overrides` are appended after them.
+Section-specific `.editorconfig` entries are represented as generated `overrides` in the static result. Fields already defined at the oxfmt config root are omitted from those generated overrides, and explicit oxfmt `overrides` are appended after them.
 
 ## Limitations
 

package/dist/index.d.mts

@@ -1,5 +1,4 @@
 import { FormatConfig } from "oxfmt";
-
 //#region src/types.d.ts
 /**
  * Object-form `.editorconfig` option for fine-grained lookup control.
@@ -88,7 +87,8 @@ interface OxfmtOptions extends FormatConfig {
   /**
    * Ignore files matching these glob patterns.
    *
-   * Patterns are based on the location of the oxfmt configuration file.
+   * Patterns use gitignore-style matching rooted at the oxfmt configuration
+   * directory. Parent-directory (`..`) path segments are rejected.
    */
   ignorePatterns?: string[];
   /**

package/dist/index.mjs

@@ -15,7 +15,8 @@ import ignore from "ignore";
 const OXFMT_CONFIG_FILES = [
 	".oxfmtrc.json",
 	".oxfmtrc.jsonc",
-	"oxfmt.config.ts"
+	"oxfmt.config.ts",
+	"oxfmt.config.mts"
 ];
 /**
 * Supported extensions for explicit config paths.
@@ -75,6 +76,46 @@ const EDITORCONFIG_FILE = ".editorconfig";
 */
 const EDITORCONFIG_GLOBAL_SECTION_NAMES = ["*"];
 //#endregion
+//#region src/utils.ts
+/**
+* Return a cached promise by key, creating and storing it on miss.
+*
+* If the promise rejects, the cache entry is removed so future calls can retry.
+*
+* @param cache - Map used to store inflight/resolved promises.
+* @param key - Cache key.
+* @param factory - Factory to create the promise when missing.
+* @returns Cached or newly created promise.
+*/
+function cachePromise(cache, key, factory) {
+	const cached = cache.get(key);
+	if (cached) return cached;
+	const task = factory().catch((error) => {
+		cache.delete(key);
+		throw error;
+	});
+	cache.set(key, task);
+	return task;
+}
+/**
+* Normalize a filesystem path to POSIX-style separators.
+*
+* @param path - Original path.
+* @returns Path using `/` as separator.
+*/
+function toPosixPath(path) {
+	return path.replaceAll("\\", "/");
+}
+/**
+* Split a path into non-empty segments.
+*
+* @param path - Original path.
+* @returns Path segments.
+*/
+function splitPathSegments(path) {
+	return path.split(/[\\/]+/u).filter(Boolean);
+}
+//#endregion
 //#region src/config.ts
 /**
 * CommonJS require scoped to this ESM module for loading `.cjs` config files.
@@ -93,6 +134,15 @@ const syntaxFallbackMessages = [
 	/Unexpected token 'import'/u
 ];
 /**
+* ESM namespaces loaded from `.js` config files while bypassing normal caches.
+*
+* Node can load synchronous ESM through `require()`, but deleting
+* `require.cache` does not invalidate the ESM loader cache. Remember the entry
+* file version so changed configs can switch to a cache-busted native import
+* without evaluating the first load twice.
+*/
+const freshJavaScriptModuleCache = /* @__PURE__ */ new Map();
+/**
 * Check whether an unknown config export is an object accepted by oxfmt.
 *
 * @param value - Runtime value to validate.
@@ -200,7 +250,9 @@ function deleteRequireCacheTree(requirePath, seen = /* @__PURE__ */ new Set()) {
 	if (seen.has(requirePath)) return;
 	seen.add(requirePath);
 	const cachedModule = require.cache[requirePath];
-	if (cachedModule) for (const child of cachedModule.children) deleteRequireCacheTree(child.id, seen);
+	if (cachedModule) {
+		for (const child of cachedModule.children) if (!splitPathSegments(child.id).includes("node_modules")) deleteRequireCacheTree(child.id, seen);
+	}
 	Reflect.deleteProperty(require.cache, requirePath);
 }
 /**
@@ -235,14 +287,37 @@ function requireFreshCommonJSConfig(resolvedPath) {
 * @returns Imported module namespace with a default config export.
 */
 async function importFreshJavaScriptConfigModule(resolvedPath) {
+	const cacheKey = await getFreshImportCacheKey(resolvedPath);
+	const cachedModule = freshJavaScriptModuleCache.get(resolvedPath);
+	if (cachedModule?.cacheKey === cacheKey) return cachedModule.namespace;
+	if (cachedModule) {
+		const namespace = await importNativeFreshModule(resolvedPath);
+		freshJavaScriptModuleCache.set(resolvedPath, {
+			cacheKey,
+			namespace
+		});
+		return namespace;
+	}
 	try {
 		const configModule = requireFreshModule(resolvedPath);
-		if (Object.prototype.toString.call(configModule) === "[object Module]") return importNativeFreshModule(resolvedPath);
+		if (Object.prototype.toString.call(configModule) === "[object Module]") {
+			const namespace = configModule;
+			freshJavaScriptModuleCache.set(resolvedPath, {
+				cacheKey,
+				namespace
+			});
+			return namespace;
+		}
 		return { default: readConfigModuleExports(configModule) };
 	} catch (error) {
 		if (!isJavaScriptLoaderFallbackError(error)) throw error;
 		try {
-			return await importNativeFreshModule(resolvedPath);
+			const namespace = await importNativeFreshModule(resolvedPath);
+			freshJavaScriptModuleCache.set(resolvedPath, {
+				cacheKey,
+				namespace
+			});
+			return namespace;
 		} catch (importError) {
 			if (!isJavaScriptLoaderFallbackError(importError)) throw importError;
 			return importJitiConfigModule(resolvedPath, false);
@@ -257,7 +332,7 @@ async function importFreshJavaScriptConfigModule(resolvedPath) {
 * @returns Cache key for resolve cache.
 */
 function getResolveCacheKey(cwd, configPath) {
-	return `${cwd}::${configPath || ""}`;
+	return JSON.stringify([cwd, configPath ?? null]);
 }
 /**
 * Build a cache key for config content; prefixes missing entries.
@@ -268,7 +343,11 @@ function getResolveCacheKey(cwd, configPath) {
 * @returns Cache key for config content cache.
 */
 function getConfigCacheKey(resolvedPath, editorconfigPath, resolveKey) {
-	return `${resolvedPath || `missing-oxfmt:${resolveKey}`}::${editorconfigPath || `missing-editorconfig:${resolveKey}`}`;
+	return JSON.stringify([
+		resolvedPath ?? null,
+		editorconfigPath ?? null,
+		resolveKey
+	]);
 }
 /**
 * Resolve the oxfmt config file path.
@@ -343,46 +422,6 @@ async function readConfigFromFile(resolvedPath, options = {}) {
 	return readParsedConfigObject(JSON.parse(content));
 }
 //#endregion
-//#region src/utils.ts
-/**
-* Return a cached promise by key, creating and storing it on miss.
-*
-* If the promise rejects, the cache entry is removed so future calls can retry.
-*
-* @param cache - Map used to store inflight/resolved promises.
-* @param key - Cache key.
-* @param factory - Factory to create the promise when missing.
-* @returns Cached or newly created promise.
-*/
-function cachePromise(cache, key, factory) {
-	const cached = cache.get(key);
-	if (cached) return cached;
-	const task = factory().catch((error) => {
-		cache.delete(key);
-		throw error;
-	});
-	cache.set(key, task);
-	return task;
-}
-/**
-* Normalize a filesystem path to POSIX-style separators.
-*
-* @param path - Original path.
-* @returns Path using `/` as separator.
-*/
-function toPosixPath(path) {
-	return path.replaceAll("\\", "/");
-}
-/**
-* Split a path into non-empty segments.
-*
-* @param path - Original path.
-* @returns Path segments.
-*/
-function splitPathSegments(path) {
-	return path.split(/[\\/]+/u).filter(Boolean);
-}
-//#endregion
 //#region src/editorconfig.ts
 /**
 * Builds the cache key used for resolved EditorConfig lookups.
@@ -420,12 +459,18 @@ function mergeRootOptions(oxfmtConfig, editorconfigRootOptions) {
 /**
 * Merges EditorConfig-derived overrides with explicit oxfmt overrides.
 *
-* @param oxfmtOverrides - Overrides declared in the oxfmt config.
+* @param oxfmtConfig - Explicit root options and overrides from the oxfmt config.
 * @param editorconfigOverrides - Overrides derived from .editorconfig sections.
 * @returns The merged overrides array, or undefined when no overrides exist.
 */
-function mergeOverrides(oxfmtOverrides, editorconfigOverrides) {
-	const mergedOverrides = [...editorconfigOverrides, ...oxfmtOverrides || []];
+function mergeOverrides(oxfmtConfig, editorconfigOverrides) {
+	const mergedOverrides = [...editorconfigOverrides.flatMap((override) => {
+		const options = Object.fromEntries(Object.entries(override.options || {}).filter(([name]) => !Object.hasOwn(oxfmtConfig, name)));
+		return Object.keys(options).length > 0 ? [{
+			...override,
+			options
+		}] : [];
+	}), ...oxfmtConfig.overrides || []];
 	return mergedOverrides.length > 0 ? mergedOverrides : void 0;
 }
 /**
@@ -622,7 +667,7 @@ async function loadOxfmtConfig(options = {}) {
 		if (!editorconfigPath) return oxfmtConfig;
 		const editorconfigData = await readEditorconfigFromFile(editorconfigPath, anchorDir);
 		const mergedConfig = mergeRootOptions(oxfmtConfig, editorconfigData.rootOptions);
-		const mergedOverrides = mergeOverrides(oxfmtConfig.overrides, editorconfigData.overrides);
+		const mergedOverrides = mergeOverrides(oxfmtConfig, editorconfigData.overrides);
 		if (!mergedOverrides) return mergedConfig;
 		return {
 			...mergedConfig,
@@ -728,16 +773,25 @@ async function matchIgnoreFile(filepath, ignoreFilePath, useCache, baseDir) {
 */
 async function matchIgnoreFileChain(filepath, ignoreFileEntries, useCache) {
 	let ignored = false;
+	let matched = false;
 	for (const entry of ignoreFileEntries) {
 		const matcher = await loadIgnoreMatcher(entry.path, useCache);
 		if (!matcher) continue;
 		const relativeToIgnore = relativeSafe(entry.baseDir ?? dirname(entry.path), filepath);
 		if (relativeToIgnore === ".." || relativeToIgnore.startsWith("../")) continue;
 		const result = matcher.test(relativeToIgnore);
-		if (result.ignored) ignored = true;
-		else if (result.unignored) ignored = false;
+		if (result.ignored) {
+			ignored = true;
+			matched = true;
+		} else if (result.unignored) {
+			ignored = false;
+			matched = true;
+		}
 	}
-	return ignored;
+	return {
+		ignored,
+		matched
+	};
 }
 /**
 * Resolve an ignore file path against cwd when needed.
@@ -783,7 +837,16 @@ async function resolveGitInfoExcludePath(repoRoot) {
 		if (!stats.isFile()) return;
 		const gitdir = (await readFile(gitEntryPath, "utf8")).split(/\r?\n/u).find((line) => line.startsWith("gitdir:"))?.slice(7).trim();
 		if (!gitdir) return;
-		return join(isAbsolute(gitdir) ? gitdir : resolve(repoRoot, gitdir), "info", "exclude");
+		const resolvedGitDir = isAbsolute(gitdir) ? gitdir : resolve(repoRoot, gitdir);
+		const commonDirPath = join(resolvedGitDir, "commondir");
+		try {
+			const commonDir = (await readFile(commonDirPath, "utf8")).trim();
+			if (commonDir) return join(isAbsolute(commonDir) ? commonDir : resolve(resolvedGitDir, commonDir), "info", "exclude");
+		} catch (error) {
+			const code = error.code;
+			if (code !== "ENOENT" && code !== "ENOTDIR") throw error;
+		}
+		return join(resolvedGitDir, "info", "exclude");
 	} catch (error) {
 		const code = error.code;
 		if (code === "ENOENT" || code === "ENOTDIR") return;
@@ -829,6 +892,18 @@ async function collectGitignorePaths(filepath) {
 	};
 }
 /**
+* Validate config ignore patterns using oxfmt's path constraints.
+*
+* @param patterns - Config ignore patterns.
+* @throws When a pattern contains a parent-directory path segment.
+*/
+function validateConfigIgnorePatterns(patterns) {
+	for (const pattern of patterns) {
+		const pathPart = pattern.startsWith("!") ? pattern.slice(1) : pattern;
+		if ((pathPart.endsWith(String.raw`\ `) ? pathPart : pathPart.trimEnd()).split("/").includes("..")) throw new Error(`Invalid pattern \`${pattern}\` in \`ignorePatterns\`: \`..\` is not supported, patterns are resolved within the config file's directory`);
+	}
+}
+/**
 * Match `ignorePatterns` from config with support for negated patterns.
 *
 * @param filepath - Absolute file path.
@@ -838,6 +913,7 @@ async function collectGitignorePaths(filepath) {
 * @returns True when patterns mark the file as ignored.
 */
 function matchConfigIgnorePatterns(filepath, configDir, patterns, useCache) {
+	validateConfigIgnorePatterns(patterns);
 	const relativeFile = relativeSafe(configDir, filepath);
 	if (relativeFile === ".." || relativeFile.startsWith("../")) return false;
 	if (!useCache) return ignore().add(patterns).ignores(relativeFile);
@@ -880,11 +956,12 @@ async function isOxfmtIgnored(options) {
 	};
 	const explicitIgnorePaths = (typeof options.ignorePath === "string" ? [options.ignorePath] : options.ignorePath)?.map((path) => resolveIgnoreFilePath(path, cwd));
 	const { paths: gitignorePaths, repoRoot } = await collectGitignorePaths(filepath);
-	if (await matchIgnoreFileChain(filepath, [...gitignorePaths].reverse().map((path) => ({ path })), useCache)) return {
+	const gitignoreResult = await matchIgnoreFileChain(filepath, [...gitignorePaths].reverse().map((path) => ({ path })), useCache);
+	if (gitignoreResult.ignored) return {
 		ignored: true,
 		reason: "gitignore"
 	};
-	if (repoRoot) {
+	if (repoRoot && !gitignoreResult.matched) {
 		const infoExcludePath = await resolveGitInfoExcludePath(repoRoot);
 		if (infoExcludePath && await matchIgnoreFile(filepath, infoExcludePath, useCache, repoRoot)) return {
 			ignored: true,
@@ -892,7 +969,7 @@ async function isOxfmtIgnored(options) {
 		};
 	}
 	if (explicitIgnorePaths && explicitIgnorePaths.length > 0) {
-		if (await matchIgnoreFileChain(filepath, explicitIgnorePaths.map((path) => ({ path })), useCache)) return {
+		if ((await matchIgnoreFileChain(filepath, explicitIgnorePaths.map((path) => ({ path })), useCache)).ignored) return {
 			ignored: true,
 			reason: "ignore-path"
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "load-oxfmt-config",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Load and resolve oxfmt configuration files, including explicit JS/TS config paths, and merge supported `.editorconfig` settings for Oxfmt.",
   "keywords": [
     "editorconfig",
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "ntnyq/load-oxfmt-config"
+    "url": "git+https://github.com/ntnyq/load-oxfmt-config.git"
   },
   "files": [
     "dist"
@@ -42,32 +42,37 @@
     "access": "public"
   },
   "dependencies": {
-    "@ntnyq/utils": "^0.16.0",
+    "@ntnyq/utils": "^0.16.1",
     "editorconfig": "^3.0.2",
-    "ignore": "^7.0.5",
+    "ignore": "^7.0.6",
     "jiti": "^2.7.0",
     "jsonc-parser": "^3.3.1"
   },
   "devDependencies": {
     "@ntnyq/tsconfig": "^3.1.0",
-    "@types/node": "^26.1.0",
-    "@typescript/native-preview": "^7.0.0-dev.20260706.1",
+    "@types/node": "^26.1.1",
+    "@typescript/native-preview": "^7.0.0-dev.20260707.2",
     "bumpp": "^11.1.0",
+    "changelogithub": "14.0.0",
     "husky": "^9.1.7",
     "nano-staged": "^1.0.2",
+    "npm": "11.18.0",
     "npm-run-all2": "^9.0.2",
-    "oxfmt": "^0.58.0",
-    "oxlint": "^1.73.0",
-    "tsdown": "^0.22.3",
+    "oxfmt": "^0.59.0",
+    "oxlint": "^1.74.0",
+    "tsdown": "^0.22.8",
     "vitest": "^4.1.10"
   },
   "peerDependencies": {
-    "oxfmt": ">=0.58.0"
+    "oxfmt": ">=0.59.0"
   },
   "nano-staged": {
     "*.{js,ts,mjs,tsx}": "oxlint --fix",
     "*": "oxfmt --no-error-on-unmatched-pattern"
   },
+  "engines": {
+    "node": "^22.13.0 || >=24"
+  },
   "scripts": {
     "build": "tsdown",
     "dev": "tsdown --watch",