load-oxfmt-config 0.13.0 → 0.14.0

package/dist/index.d.mts

@@ -187,27 +187,6 @@ interface IsOxfmtIgnoredResult {
   reason?: 'default-dir' | 'lockfile' | 'gitignore' | 'git-info-exclude' | 'prettierignore' | 'ignore-path' | 'config-ignore-patterns';
 }
 //#endregion
-//#region src/config-file.d.ts
-/**
- * Resolve the oxfmt config file path.
- *
- * - If `configPath` is provided, absolute paths are returned as-is;
- *   relative paths are joined to `cwd`.
- * - Otherwise, walk upward from `cwd` to find known filenames.
- *
- * @param cwd - Starting directory for resolution.
- * @param configPath - Optional explicit path.
- * @returns Absolute path to config file, or undefined when not found.
- *
- * @example
- * ```ts
- * import { resolveOxfmtrcPath } from 'load-oxfmt-config'
- *
- * const path = await resolveOxfmtrcPath(process.cwd())
- * ```
- */
-declare function resolveOxfmtrcPath(cwd: string, configPath?: string): Promise<string | undefined>;
-//#endregion
 //#region src/core.d.ts
 /**
  * Resolve config + editorconfig and return merged config with metadata.
@@ -244,4 +223,52 @@ declare function loadOxfmtConfig(options?: LoadOxfmtConfigOptions): Promise<Load
  */
 declare function isOxfmtIgnored(options: IsOxfmtIgnoredOptions): Promise<IsOxfmtIgnoredResult>;
 //#endregion
-export { EditorconfigOption, IsOxfmtIgnoredOptions, IsOxfmtIgnoredResult, LoadOxfmtConfigOptions, LoadOxfmtConfigResult, OxfmtConfigOverride, OxfmtOptions, isOxfmtIgnored, loadOxfmtConfig, resolveOxfmtrcPath };
+//#region src/config.d.ts
+/**
+ * Build a cache key for path resolution (cwd + configPath).
+ *
+ * @param cwd - Current working directory.
+ * @param configPath - Optional config path.
+ * @returns Cache key for resolve cache.
+ */
+declare function getResolveCacheKey(cwd: string, configPath?: string): string;
+/**
+ * Build a cache key for config content; prefixes missing entries.
+ *
+ * @param resolvedPath - Resolved oxfmt config path.
+ * @param editorconfigPath - Resolved editorconfig path.
+ * @param resolveKey - Resolution cache key.
+ * @returns Cache key for config content cache.
+ */
+declare function getConfigCacheKey(resolvedPath: string | undefined, editorconfigPath: string | undefined, resolveKey: string): string;
+/**
+ * Resolve the oxfmt config file path.
+ *
+ * - If `configPath` is provided, absolute paths are returned as-is;
+ *   relative paths are joined to `cwd`.
+ * - Otherwise, walk upward from `cwd` to find known filenames.
+ *
+ * @param cwd - Starting directory for resolution.
+ * @param configPath - Optional explicit path.
+ * @returns Absolute path to config file, or undefined when not found.
+ *
+ * @example
+ * ```ts
+ * import { resolveOxfmtrcPath } from 'load-oxfmt-config'
+ *
+ * const path = await resolveOxfmtrcPath(process.cwd())
+ * ```
+ */
+declare function resolveOxfmtrcPath(cwd: string, configPath?: string): Promise<string | undefined>;
+/**
+ * Read and parse an oxfmt config file.
+ *
+ * @param resolvedPath - Absolute path to config file.
+ * @param options - Config loading options.
+ * @returns Parsed config object.
+ */
+declare function readConfigFromFile(resolvedPath: string, options?: {
+  useCache?: boolean;
+}): Promise<OxfmtOptions>;
+//#endregion
+export { EditorconfigOption, IsOxfmtIgnoredOptions, IsOxfmtIgnoredResult, LoadOxfmtConfigOptions, LoadOxfmtConfigResult, OxfmtConfigOverride, OxfmtOptions, getConfigCacheKey, getResolveCacheKey, isOxfmtIgnored, loadOxfmtConfig, readConfigFromFile, resolveOxfmtrcPath };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import { basename, dirname, extname, isAbsolute, join, relative, resolve } from "node:path";
 import process from "node:process";
-import { interopDefault, isBoolean, isNumber, isObject } from "@ntnyq/utils";
+import { hasOwn, interopDefault, isBoolean, isNumber, isObject, isRecord, isString, isUndefined } from "@ntnyq/utils";
 import { readFile, stat } from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import { parse, printParseErrorCode } from "jsonc-parser";
@@ -75,7 +75,7 @@ const EDITORCONFIG_FILE = ".editorconfig";
 */
 const EDITORCONFIG_GLOBAL_SECTION_NAMES = ["*"];
 //#endregion
-//#region src/config-file.ts
+//#region src/config.ts
 /**
 * CommonJS require scoped to this ESM module for loading `.cjs` config files.
 */
@@ -99,7 +99,18 @@ const syntaxFallbackMessages = [
 * @returns True when the value can be treated as an oxfmt options object.
 */
 function isConfigObject(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
+	return isRecord(value);
+}
+/**
+* Read a parsed JSON-like config value as an oxfmt config object.
+*
+* @param config - Runtime config value.
+* @returns Oxfmt config object.
+* @throws When the config value is not an object.
+*/
+function readParsedConfigObject(config) {
+	if (!isConfigObject(config)) throw new Error("Configuration file must be an object.");
+	return config;
 }
 /**
 * Read the default export from a JavaScript or TypeScript config module.
@@ -109,7 +120,7 @@ function isConfigObject(value) {
 * @throws When the module has no default export or the default export is not an object.
 */
 function readConfigDefaultExport(mod) {
-	if (!Object.hasOwn(mod, "default")) throw new Error("Configuration file has no default export.");
+	if (!hasOwn(mod, "default")) throw new Error("Configuration file has no default export.");
 	const config = mod["default"];
 	if (!isConfigObject(config)) throw new Error("Configuration file must have a default export that is an object.");
 	return config;
@@ -155,7 +166,7 @@ async function getFreshImportCacheKey(resolvedPath) {
 * @returns Error code when present.
 */
 function getErrorCode(error) {
-	return typeof error === "object" && error !== null && "code" in error && typeof error.code === "string" ? error.code : void 0;
+	return isObject(error) && "code" in error && isString(error.code) ? error.code : void 0;
 }
 /**
 * Check whether a loader error should continue the JS config fallback chain.
@@ -321,15 +332,15 @@ async function readConfigFromFile(resolvedPath, options = {}) {
 		});
 		if (parseErrors.length > 0) {
 			const firstError = parseErrors[0];
-			const errorCode = firstError === void 0 ? "Unknown" : printParseErrorCode(firstError.error);
+			const errorCode = isUndefined(firstError) ? "Unknown" : printParseErrorCode(firstError.error);
 			throw new Error(`Invalid JSONC syntax: ${errorCode}`);
 		}
-		return parsed ?? {};
+		return readParsedConfigObject(isUndefined(parsed) && content.trim() === "" ? {} : parsed);
 	}
-	if (extension === ".json") return JSON.parse(content);
-	if (!extension) return JSON.parse(content);
+	if (extension === ".json") return readParsedConfigObject(JSON.parse(content));
+	if (!extension) return readParsedConfigObject(JSON.parse(content));
 	if (!OXFMT_EXPLICIT_CONFIG_EXTENSIONS.includes(extension)) throw new Error(`Unsupported oxfmt config extension "${extension}" at ${resolvedPath}`);
-	return JSON.parse(content);
+	return readParsedConfigObject(JSON.parse(content));
 }
 //#endregion
 //#region src/utils.ts
@@ -757,6 +768,29 @@ async function hasGitEntry(dir) {
 	}
 }
 /**
+* Resolve the git info exclude file from a repo root.
+*
+* Worktrees and submodules store `.git` as a file containing a `gitdir:` pointer.
+*
+* @param repoRoot - Git repository working tree root.
+* @returns Absolute path to the git info exclude file, or undefined when unavailable.
+*/
+async function resolveGitInfoExcludePath(repoRoot) {
+	const gitEntryPath = join(repoRoot, ".git");
+	try {
+		const stats = await stat(gitEntryPath);
+		if (stats.isDirectory()) return join(gitEntryPath, "info", "exclude");
+		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");
+	} catch (error) {
+		const code = error.code;
+		if (code === "ENOENT" || code === "ENOTDIR") return;
+		throw error;
+	}
+}
+/**
 * Find the nearest git repo root by walking up from a start directory.
 *
 * @param fromDir - Directory to start from.
@@ -851,7 +885,8 @@ async function isOxfmtIgnored(options) {
 		reason: "gitignore"
 	};
 	if (repoRoot) {
-		if (await matchIgnoreFile(filepath, join(repoRoot, ".git", "info", "exclude"), useCache, repoRoot)) return {
+		const infoExcludePath = await resolveGitInfoExcludePath(repoRoot);
+		if (infoExcludePath && await matchIgnoreFile(filepath, infoExcludePath, useCache, repoRoot)) return {
 			ignored: true,
 			reason: "git-info-exclude"
 		};
@@ -881,4 +916,4 @@ async function isOxfmtIgnored(options) {
 	return { ignored: false };
 }
 //#endregion
-export { isOxfmtIgnored, loadOxfmtConfig, resolveOxfmtrcPath };
+export { getConfigCacheKey, getResolveCacheKey, isOxfmtIgnored, loadOxfmtConfig, readConfigFromFile, resolveOxfmtrcPath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "load-oxfmt-config",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "description": "Load and resolve oxfmt configuration files, including explicit JS/TS config paths, and merge supported `.editorconfig` settings for Oxfmt.",
   "keywords": [
     "editorconfig",
@@ -50,19 +50,19 @@
   },
   "devDependencies": {
     "@ntnyq/tsconfig": "^3.1.0",
-    "@types/node": "^26.0.1",
-    "@typescript/native-preview": "^7.0.0-dev.20260629.1",
+    "@types/node": "^26.1.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260706.1",
     "bumpp": "^11.1.0",
     "husky": "^9.1.7",
     "nano-staged": "^1.0.2",
     "npm-run-all2": "^9.0.2",
-    "oxfmt": "^0.57.0",
-    "oxlint": "^1.72.0",
+    "oxfmt": "^0.58.0",
+    "oxlint": "^1.73.0",
     "tsdown": "^0.22.3",
-    "vitest": "^4.1.9"
+    "vitest": "^4.1.10"
   },
   "peerDependencies": {
-    "oxfmt": ">=0.57.0"
+    "oxfmt": ">=0.58.0"
   },
   "nano-staged": {
     "*.{js,ts,mjs,tsx}": "oxlint --fix",