@theholocron/datapad 5.0.0-alpha.114 → 5.0.0-alpha.115

package/README.md

@@ -58,7 +58,8 @@ stopping at the first directory containing a `.git` entry (that directory
 is still searched before stopping) or the filesystem root. Never wanders
 past a repo boundary into an unrelated enclosing directory. `loadLayered`
 passes its own `walkUp` through to both the dedicated-file and
-fallback-file lookups.
+fallback-file lookups. Built on `@theholocron/fs-utils`'s generic
+`findUpward`/`hasGitEntry` — not reimplemented here.
 
 ### `loadConfigFromContent<T>({ dir, content, name, extension })`
 
@@ -88,7 +89,10 @@ paths actually merged, lowest priority first.
 
 Deep-merge, `vite`-style: plain objects merge recursively, arrays
 concatenate (`base` first), `undefined` in `override` is skipped, every
-other `override` value replaces `base`. Neither input is mutated.
+other `override` value replaces `base`. Neither input is mutated. A
+re-export of `@theholocron/object-utils`'s `deepMerge` under this
+package's established name — the merge logic itself has no awareness of
+configs at all, so it lives there instead of being duplicated here.
 
 ### `createDefineConfig<T>()`
 

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import { deepMerge as mergeConfig } from "@theholocron/object-utils";
 //#region src/define.d.ts
 /**
  * Build a typed identity `defineConfig` for a specific config shape.
@@ -46,7 +47,10 @@ declare class ConfigFileError extends Error {
  * on — stopping at the first directory containing a `.git` entry (checked
  * after that directory's own config probe, so the project root itself is
  * still searched) or the filesystem root. Never wanders past a repo
- * boundary into an unrelated enclosing directory.
+ * boundary into an unrelated enclosing directory. Built on
+ * `@theholocron/fs-utils`'s `findUpward`/`hasGitEntry` — the same
+ * upward-walk shape `@theholocron/sentinel`'s own `findPackageRoot` needs,
+ * only with a different predicate.
  */
 /** Default extension probe order, highest priority first. */
 declare const DEFAULT_EXTENSIONS: readonly ["ts", "js", "mjs", "cjs", "json"];
@@ -133,17 +137,4 @@ interface LoadConfigFromContentOptions {
  */
 declare function loadConfigFromContent<T>(opts: LoadConfigFromContentOptions): Promise<Loaded<T>>;
 //#endregion
-//#region src/merge.d.ts
-/**
- * Deep-merge two config objects, `vite`-style:
- *
- * - plain objects merge recursively
- * - arrays concatenate (`base` first, then `override`)
- * - an `undefined` value in `override` is skipped (keeps `base`)
- * - every other `override` value replaces `base`
- *
- * Neither input is mutated.
- */
-declare function mergeConfig<T>(base: T, override: unknown): T;
-//#endregion
 export { ConfigFileError, DEFAULT_EXTENSIONS, type LayeredResult, type LoadConfigFileOptions, type LoadConfigFromContentOptions, type LoadLayeredOptions, type Loaded, createDefineConfig, loadConfigFile, loadConfigFromContent, loadLayered, mergeConfig };

package/dist/index.mjs

@@ -1,6 +1,9 @@
 import { readFile, stat, writeFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
+import { findUpward, hasGitEntry } from "@theholocron/fs-utils";
+import { deepMerge, deepMerge as mergeConfig } from "@theholocron/object-utils";
 import { pathToFileURL } from "node:url";
+import { errorMessage } from "@theholocron/misc-utils";
 //#region src/define.ts
 /**
 * Build a typed identity `defineConfig` for a specific config shape.
@@ -34,33 +37,74 @@ var ConfigFileError = class extends Error {
 	}
 };
 //#endregion
-//#region src/merge.ts
+//#region src/utils.ts
 /**
-* Deep-merge two config objects, `vite`-style:
-*
-* - plain objects merge recursively
-* - arrays concatenate (`base` first, then `override`)
-* - an `undefined` value in `override` is skipped (keeps `base`)
-* - every other `override` value replaces `base`
-*
-* Neither input is mutated.
+* The actual file-loading mechanics `load.ts`'s exported functions share:
+* JSON parsing, dynamic `import()` (TS via `tsx`'s persistent ESM loader,
+* JS/MJS/CJS natively), and unwrapping the CJS/ESM default-export
+* double-wrap `tsx`'s transform produces. Kept separate from `load.ts`'s
+* own orchestration (which directory, which extension order, upward
+* search) — this file only knows "given one exact filepath and
+* extension, load it," always throwing {@link ConfigFileError} on failure.
 */
-function mergeConfig(base, override) {
-	if (!isPlainObject(base) || !isPlainObject(override)) return override === void 0 ? base : override;
-	const out = { ...base };
-	for (const [key, value] of Object.entries(override)) {
-		if (value === void 0) continue;
-		const prev = out[key];
-		if (Array.isArray(prev) && Array.isArray(value)) out[key] = [...prev, ...value];
-		else if (isPlainObject(prev) && isPlainObject(value)) out[key] = mergeConfig(prev, value);
-		else out[key] = value;
+async function loadFile(filepath, ext) {
+	if (ext === "json") return loadJson(filepath);
+	return extractDefault(filepath, ext === "ts" ? await importTs(filepath) : await importModule(filepath));
+}
+async function loadJson(filepath) {
+	const text = await readFile(filepath, "utf8");
+	try {
+		return JSON.parse(text);
+	} catch (err) {
+		throw new ConfigFileError(`${filepath} is not valid JSON: ${errorMessage(err)}`, filepath);
+	}
+}
+async function importModule(filepath) {
+	try {
+		return await import(pathToFileURL(filepath).href);
+	} catch (err) {
+		throw new ConfigFileError(`could not load ${filepath}: ${errorMessage(err)}`, filepath);
+	}
+}
+let tsRegistered;
+async function registerTsx() {
+	const { register } = await import("tsx/esm/api");
+	register();
+}
+/**
+* Load a `.ts` file. `tsx`'s ESM loader is registered once per process
+* (lazily — only when a `.ts` file is actually loaded). `register()` is
+* used over `tsImport()` because a single run may load several TS files
+* (`loadLayered` reads a dedicated file *and* a parent file) and
+* `tsImport`'s one-off register/unregister cycle is not reentrant.
+*/
+async function importTs(filepath) {
+	tsRegistered ??= registerTsx();
+	await tsRegistered;
+	try {
+		return await import(pathToFileURL(filepath).href);
+	} catch (err) {
+		throw new ConfigFileError(`could not load ${filepath}: ${errorMessage(err)}`, filepath);
 	}
-	return out;
 }
-function isPlainObject(value) {
-	if (typeof value !== "object" || value === null || Array.isArray(value)) return false;
-	const proto = Object.getPrototypeOf(value);
-	return proto === Object.prototype || proto === null;
+/**
+* Unwrap `export default`. `tsx` CJS-transforms `export default x` into
+* `exports.default = x`, which dynamic import wraps as
+* `{ default: { __esModule: true, default: x } }` — strip the extra layer
+* when present so ESM and CJS outputs both resolve.
+*/
+function extractDefault(filepath, mod) {
+	const outer = mod.default;
+	const raw = outer?.__esModule === true ? outer.default : outer;
+	if (raw === void 0 || raw === null) throw new ConfigFileError(`${filepath} must have a default export (use \`export default defineConfig({…})\`)`, filepath);
+	return raw;
+}
+async function isFile(path) {
+	try {
+		return (await stat(path)).isFile();
+	} catch {
+		return false;
+	}
 }
 //#endregion
 //#region src/load.ts
@@ -80,7 +124,10 @@ function isPlainObject(value) {
 * on — stopping at the first directory containing a `.git` entry (checked
 * after that directory's own config probe, so the project root itself is
 * still searched) or the filesystem root. Never wanders past a repo
-* boundary into an unrelated enclosing directory.
+* boundary into an unrelated enclosing directory. Built on
+* `@theholocron/fs-utils`'s `findUpward`/`hasGitEntry` — the same
+* upward-walk shape `@theholocron/sentinel`'s own `findPackageRoot` needs,
+* only with a different predicate.
 */
 /** Default extension probe order, highest priority first. */
 const DEFAULT_EXTENSIONS = [
@@ -91,6 +138,23 @@ const DEFAULT_EXTENSIONS = [
 	"json"
 ];
 /**
+* Probe `dir` for `<name>.config.<ext>` in extension-priority order,
+* loading and returning the first match. The one piece of per-directory
+* orchestration `loadConfigFile` needs on both its non-walking and
+* walking paths — pulled out so it can be unit-tested directly instead of
+* only through `loadConfigFile`'s full probe/walk behavior.
+*/
+async function probeExtensions(dir, name, extensions) {
+	for (const ext of extensions) {
+		const filepath = join(dir, `${name}.config.${ext}`);
+		if (!await isFile(filepath)) continue;
+		return {
+			config: await loadFile(filepath, ext),
+			filepath
+		};
+	}
+}
+/**
 * Load the first `<name>.config.<ext>` found starting at `cwd` — just
 * `cwd` itself by default, or walking up through ancestor directories when
 * `walkUp` is set (see the module doc comment for the stop conditions).
@@ -99,22 +163,9 @@ const DEFAULT_EXTENSIONS = [
 */
 async function loadConfigFile(opts) {
 	const extensions = opts.extensions ?? DEFAULT_EXTENSIONS;
-	let dir = opts.cwd;
-	for (;;) {
-		for (const ext of extensions) {
-			const filepath = join(dir, `${opts.name}.config.${ext}`);
-			if (!await isFile(filepath)) continue;
-			return {
-				config: await loadFile(filepath, ext),
-				filepath
-			};
-		}
-		if (!opts.walkUp) return null;
-		if (await hasGitEntry(dir)) return null;
-		const parent = dirname(dir);
-		if (parent === dir) return null;
-		dir = parent;
-	}
+	const checkDir = (dir) => probeExtensions(dir, opts.name, extensions);
+	if (!opts.walkUp) return await checkDir(opts.cwd) ?? null;
+	return await findUpward(opts.cwd, checkDir, hasGitEntry) ?? null;
 }
 /**
 * `<name>.config.*` layered over the `[fallback.key]` of
@@ -139,7 +190,7 @@ async function loadLayered(opts) {
 		}
 	}
 	if (!dedicated && base === void 0) return null;
-	const config = mergeConfig(base, dedicated?.config);
+	const config = deepMerge(base, dedicated?.config);
 	const sources = [baseFile, dedicated?.filepath ?? null].filter((s) => s !== null);
 	return {
 		config,
@@ -165,74 +216,5 @@ async function loadConfigFromContent(opts) {
 		filepath
 	};
 }
-async function loadFile(filepath, ext) {
-	if (ext === "json") return loadJson(filepath);
-	return extractDefault(filepath, ext === "ts" ? await importTs(filepath) : await importModule(filepath));
-}
-async function loadJson(filepath) {
-	const text = await readFile(filepath, "utf8");
-	try {
-		return JSON.parse(text);
-	} catch (err) {
-		throw new ConfigFileError(`${filepath} is not valid JSON: ${message(err)}`, filepath);
-	}
-}
-async function importModule(filepath) {
-	try {
-		return await import(pathToFileURL(filepath).href);
-	} catch (err) {
-		throw new ConfigFileError(`could not load ${filepath}: ${message(err)}`, filepath);
-	}
-}
-let tsRegistered;
-async function registerTsx() {
-	const { register } = await import("tsx/esm/api");
-	register();
-}
-/**
-* Load a `.ts` config. `tsx`'s ESM loader is registered once per process
-* (lazily — only when a `.ts` config is actually loaded). `register()` is
-* used over `tsImport()` because a single run may load several TS configs
-* (`loadLayered` reads a dedicated file *and* a parent file) and
-* `tsImport`'s one-off register/unregister cycle is not reentrant.
-*/
-async function importTs(filepath) {
-	tsRegistered ??= registerTsx();
-	await tsRegistered;
-	try {
-		return await import(pathToFileURL(filepath).href);
-	} catch (err) {
-		throw new ConfigFileError(`could not load ${filepath}: ${message(err)}`, filepath);
-	}
-}
-/**
-* Unwrap `export default`. `tsx` CJS-transforms `export default x` into
-* `exports.default = x`, which dynamic import wraps as
-* `{ default: { __esModule: true, default: x } }` — strip the extra layer
-* when present so ESM and CJS outputs both resolve.
-*/
-function extractDefault(filepath, mod) {
-	const outer = mod.default;
-	const raw = outer?.__esModule === true ? outer.default : outer;
-	if (raw === void 0 || raw === null) throw new ConfigFileError(`${filepath} must have a default export (use \`export default defineConfig({…})\`)`, filepath);
-	return raw;
-}
-async function isFile(path) {
-	try {
-		return (await stat(path)).isFile();
-	} catch {
-		return false;
-	}
-}
-/** `.git` is a directory in a normal checkout, a file in a worktree/submodule — existence is all that matters. */
-async function hasGitEntry(dir) {
-	try {
-		await stat(join(dir, ".git"));
-		return true;
-	} catch {
-		return false;
-	}
-}
-const message = (err) => err instanceof Error ? err.message : String(err);
 //#endregion
 export { ConfigFileError, DEFAULT_EXTENSIONS, createDefineConfig, loadConfigFile, loadConfigFromContent, loadLayered, mergeConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/datapad",
-  "version": "5.0.0-alpha.114",
+  "version": "5.0.0-alpha.115",
   "description": "Generic config-file loading for Holocron — discover, load (JSON/JS/TS/ESM/CJS), and merge <name>.config.* files with a typed defineConfig.",
   "keywords": [
     "config",
@@ -32,13 +32,16 @@
     "dist"
   ],
   "dependencies": {
+    "@theholocron/fs-utils": "^1.9.2",
+    "@theholocron/misc-utils": "^1.9.2",
+    "@theholocron/object-utils": "^1.9.2",
     "tsx": "4.23.12"
   },
   "devDependencies": {
-    "@theholocron/eslint-config": "^8.6.0",
-    "@theholocron/tsconfig": "^8.4.5",
-    "@theholocron/tsdown-config": "^8.4.5",
-    "@theholocron/vitest-config": "^8.4.5",
+    "@theholocron/eslint-config": "^8.7.0",
+    "@theholocron/tsconfig": "^8.7.0",
+    "@theholocron/tsdown-config": "^8.7.0",
+    "@theholocron/vitest-config": "^8.7.0",
     "@types/node": "^26",
     "@vitest/coverage-v8": "^4.1.11",
     "@vitest/eslint-plugin": "^1.6.27",