load-oxfmt-config 0.28.0 → 0.29.0

package/README.md

@@ -33,9 +33,17 @@ yarn add oxfmt load-oxfmt-config
 pnpm add oxfmt load-oxfmt-config
 ```
 
-> `oxfmt >=0.73.0` is a peer dependency and is installed alongside this package.
+> `oxfmt >=0.74.0` is a peer dependency and is installed alongside this package.
 > Node.js `^22.13.0 || >=24` is supported.
 
+Oxfmt 0.74.0 accepts BOM-prefixed JSON/JSONC configs and uses EditorConfig
+`indent_size` as a fallback when `tab_width` is absent, including for tab or
+unspecified indentation styles. The loader follows these changes and preserves
+out-of-range widths so oxfmt reports configuration errors instead of silently
+wrapping them. Config merge precedence is unchanged, and no options were added,
+renamed, or removed. See the upstream
+[0.74.0 release notes](https://github.com/oxc-project/oxc/releases/tag/oxfmt_v0.74.0).
+
 Oxfmt 0.73.0 adds `associations` and `astro` options. The loader preserves
 association entries and Astro options in `OxfmtOptions`; it does not select a
 formatter. Association globs are relative to the returned config `dirname`, and
@@ -469,7 +477,7 @@ The loader reads the nearest `.editorconfig` file and maps the subset of fields
 
 - `end_of_line` → `endOfLine`
 - `indent_style` → `useTabs`
-- `indent_size` → `tabWidth` when `indent_style = space`
+- `indent_size` → `tabWidth` when `indent_style = space`, or as a fallback when `tab_width` is absent
 - `tab_width` → `tabWidth`
 - `max_line_length` → `printWidth`
 - `insert_final_newline` → `insertFinalNewline`
@@ -480,7 +488,10 @@ sections also generates an override to preserve source order. Other sections
 such as `[**]` and `[*.ts]` are converted into returned `overrides` entries;
 basename patterns such as `*.ts` are normalized to `**/*.ts` to match descendants.
 The per-file API evaluates matching sections directly, without rebasing them to
-the oxfmt config directory.
+the oxfmt config directory. It combines their raw properties before selecting
+`tabWidth`, so a scoped `indent_size` preserves an inherited `tab_width` unless
+the effective `indent_style` is `space`. Static overrides inherit global
+indentation properties when selecting their widths.
 
 ## Ignore Strategy
 
@@ -532,7 +543,8 @@ Section-specific `.editorconfig` entries are represented as generated `overrides
 
 `loadOxfmtConfig()` returns a static merged `OxfmtOptions` shape. Its generated
 EditorConfig globs cannot represent every relationship between config directories,
-particularly an ancestor EditorConfig with a nested oxfmt config. Use
+particularly an ancestor EditorConfig with a nested oxfmt config, or width
+interactions between overlapping scoped sections. Use
 `loadOxfmtConfigForFile()` to resolve EditorConfig against its original directory
 for a specific target file. Both APIs retain the nearest-file discovery strategy;
 they do not merge multiple EditorConfig files.

package/dist/index.mjs

@@ -234,7 +234,7 @@ async function readConfigFromFile(resolvedPath, options = {}) {
 		if (!useCache && extension === ".js") return readConfigDefaultExport(await importFreshJavaScriptConfigModule(resolvedPath));
 		return readConfigDefaultExport(await importJitiConfigModule(resolvedPath, useCache));
 	}
-	const content = await readFile(resolvedPath, "utf8");
+	const content = (await readFile(resolvedPath, "utf8")).replace(/^\u{FEFF}/u, "");
 	if (extension === ".jsonc") {
 		const parseErrors = [];
 		const parsed = parse(content, parseErrors, {
@@ -550,7 +550,8 @@ async function readEditorconfigFromFile(editorconfigPath, anchorDir, options = {
 	const readSections = async () => parseBuffer(await readFile(editorconfigPath));
 	const parsedSections = useCache ? await cachePromise(sectionCache, editorconfigPath, readSections) : await readSections();
 	const editorconfigDir = dirname(editorconfigPath);
-	const rootOptions = {};
+	let rootOptions = {};
+	const resolvedSection = {};
 	const overrides = [];
 	const relativeFile = options.filepath ? toPosixPath(relative(editorconfigDir, options.filepath)) : void 0;
 	if (relativeFile !== void 0 && isPathOutsideBase(relativeFile)) return {
@@ -559,16 +560,17 @@ async function readEditorconfigFromFile(editorconfigPath, anchorDir, options = {
 	};
 	for (const [sectionName, sectionBody] of parsedSections) {
 		if (!sectionName) continue;
-		const mappedOptions = mapEditorconfigSectionToOptions(sectionBody);
-		if (Object.keys(mappedOptions).length === 0) continue;
 		if (relativeFile !== void 0) {
-			if (matchesEditorconfigSection(sectionName, relativeFile, useCache)) Object.assign(rootOptions, mappedOptions);
+			if (matchesEditorconfigSection(sectionName, relativeFile, useCache)) Object.assign(resolvedSection, sectionBody);
 			continue;
 		}
+		const mappedOptions = mapEditorconfigSectionToOptions(sectionBody, resolvedSection);
 		if (isEditorconfigGlobalSection(sectionName)) {
-			Object.assign(rootOptions, mappedOptions);
+			Object.assign(resolvedSection, sectionBody);
+			rootOptions = mapEditorconfigSectionToOptions(resolvedSection);
 			if (overrides.length === 0) continue;
 		}
+		if (Object.keys(mappedOptions).length === 0) continue;
 		overrides.push({
 			options: mappedOptions,
 			files: [rebaseEditorconfigPattern(sectionName, editorconfigDir, anchorDir)]
@@ -576,7 +578,7 @@ async function readEditorconfigFromFile(editorconfigPath, anchorDir, options = {
 	}
 	return {
 		overrides,
-		rootOptions
+		rootOptions: relativeFile === void 0 ? rootOptions : mapEditorconfigSectionToOptions(resolvedSection)
 	};
 }
 /**
@@ -615,9 +617,10 @@ function isEditorconfigGlobalSection(sectionName) {
 * Maps a parsed EditorConfig section to the subset of oxfmt formatter options it supports.
 *
 * @param section - The parsed EditorConfig section body.
+* @param inheritedSection - Global properties inherited by a static override.
 * @returns Formatter options derived from the section.
 */
-function mapEditorconfigSectionToOptions(section) {
+function mapEditorconfigSectionToOptions(section, inheritedSection = {}) {
 	const options = {};
 	const endOfLine = parseEditorconfigEndOfLine(section.end_of_line);
 	if (endOfLine) options.endOfLine = endOfLine;
@@ -625,8 +628,13 @@ function mapEditorconfigSectionToOptions(section) {
 	else if (section.indent_style === "space") options.useTabs = false;
 	const singleQuote = parseEditorconfigQuoteType(section.quote_type);
 	if (isBoolean(singleQuote)) options.singleQuote = singleQuote;
-	const tabWidth = parseEditorconfigTabWidth(section, options.useTabs);
-	if (isNumber(tabWidth)) options.tabWidth = tabWidth;
+	if (section.indent_style !== void 0 || section.indent_size !== void 0 || section.tab_width !== void 0) {
+		const tabWidth = parseEditorconfigTabWidth({
+			...inheritedSection,
+			...section
+		});
+		if (isNumber(tabWidth)) options.tabWidth = tabWidth;
+	}
 	if (section.max_line_length && section.max_line_length !== "unset") {
 		const parsedPrintWidth = Number(section.max_line_length);
 		if (Number.isFinite(parsedPrintWidth)) options.printWidth = parsedPrintWidth;
@@ -703,19 +711,14 @@ function parseEditorconfigQuoteType(value) {
 * Resolves the effective tab width from an EditorConfig section.
 *
 * @param section - The parsed EditorConfig section body.
-* @param useTabs - The resolved indent style from the same section, when available.
 * @returns The resolved tab width, or undefined when no numeric value is available.
 */
-function parseEditorconfigTabWidth(section, useTabs) {
-	const indentSize = section.indent_size;
-	const tabWidth = section.tab_width;
-	if (useTabs === false && indentSize && indentSize !== "unset" && indentSize !== "tab") {
-		const parsedIndentSize = Number(indentSize);
-		if (Number.isFinite(parsedIndentSize)) return parsedIndentSize;
-	}
-	if (tabWidth && tabWidth !== "unset") {
-		const parsedTabWidth = Number(tabWidth);
-		if (Number.isFinite(parsedTabWidth)) return parsedTabWidth;
+function parseEditorconfigTabWidth(section) {
+	const values = section.indent_style === "space" ? [section.indent_size, section.tab_width] : [section.tab_width, section.indent_size];
+	for (const value of values) {
+		if (!value || value === "unset" || value === "tab") continue;
+		const parsedWidth = Number(value);
+		if (Number.isFinite(parsedWidth)) return parsedWidth;
 	}
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "load-oxfmt-config",
   "type": "module",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "description": "Load and resolve oxfmt configuration files, including explicit JS/TS config paths, and merge supported `.editorconfig` settings for Oxfmt.",
   "keywords": [
     "editorconfig",
@@ -43,12 +43,12 @@
   },
   "sideEffects": false,
   "peerDependencies": {
-    "oxfmt": ">=0.73.0"
+    "oxfmt": ">=0.74.0"
   },
   "dependencies": {
     "@ntnyq/utils": "^0.23.0",
     "editorconfig": "^3.0.2",
-    "ignore": "^7.0.12",
+    "ignore": "^7.0.13",
     "jiti": "^2.7.0",
     "jsonc-parser": "^3.3.1",
     "minimatch": "~10.2.6"