c12 4.0.0-beta.3 → 4.0.0-beta.5

package/README.md

@@ -30,6 +30,7 @@ c12 (pronounced as /siːtwelv/, like c-twelve) is a smart configuration loader.
 ## 🦴 Used by
 
 - [Hey API](https://github.com/hey-api/openapi-ts)
+- [Gen API](https://github.com/hairyf/genapi)
 - [Kysely](https://github.com/kysely-org/kysely-ctl)
 - [Nitro](https://nitro.build/)
 - [Nuxt](https://nuxt.com/)
@@ -205,6 +206,21 @@ const { config } = await loadConfig({
 });
 ```
 
+### `jitiOptions`
+
+Options passed to [unjs/jiti](https://github.com/unjs/jiti) when c12 falls back to it for loading config files. Has no effect if a custom `import` is provided.
+
+**Example:**
+
+```js
+const { config } = await loadConfig({
+  jitiOptions: {
+    fsCache: false,
+    transformOptions: { /* ... */ },
+  },
+});
+```
+
 ### `resolveModule`
 
 Custom resolver for picking which export to use from the loaded module. Default: `(mod) => mod.default || mod`.

package/dist/_chunks/libs/ohash.d.mts

@@ -1,4 +1,3 @@
-//#region node_modules/.pnpm/ohash@2.0.11/node_modules/ohash/dist/utils/index.d.mts
 /**
  * Calculates the difference between two objects and returns a list of differences.
  *
@@ -26,5 +25,4 @@ declare class DiffHashedObject {
   toString(): string;
   toJSON(): string;
 }
-//#endregion
 export { diff as t };

package/dist/_chunks/libs/ohash.mjs

@@ -1,4 +1,3 @@
-import "node:module";
 import { createHash } from "node:crypto";
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {

package/dist/index.d.mts

@@ -1,8 +1,7 @@
 import { t as diff } from "./_chunks/libs/ohash.mjs";
-import { ChokidarOptions } from "chokidar";
+import * as _$jiti from "jiti";
 import { DownloadTemplateOptions } from "giget";
-
-//#region src/dotenv.d.ts
+import { ChokidarOptions } from "chokidar";
 interface DotenvOptions {
   /**
    * The project root directory (either absolute or relative to the current working directory).
@@ -60,8 +59,7 @@ declare function loadDotenv(options: DotenvOptions): Promise<Env>;
 declare global {
   var __c12_dotenv_vars__: Map<Record<string, any>, Set<string>>;
 }
-//#endregion
-//#region src/types.d.ts
+type JitiOptions = NonNullable<Parameters<typeof _$jiti.createJiti>[1]>;
 interface ConfigLayerMeta {
   name?: string;
   [key: string]: any;
@@ -144,6 +142,8 @@ interface LoadConfigOptions<T extends UserInputConfig = UserInputConfig, MT exte
   import?: (id: string) => Promise<unknown>;
   /** Custom resolver for picking which export to use from the loaded module. Default: `(mod) => mod.default || mod` */
   resolveModule?: (mod: any) => any;
+  /** Options to override defaults when c12 falls back to [jiti](https://github.com/unjs/jiti) for loading config files. */
+  jitiOptions?: JitiOptions;
   giget?: false | DownloadTemplateOptions;
   merger?: (...sources: Array<T | null | undefined>) => T;
   extend?: false | {
@@ -153,12 +153,8 @@ interface LoadConfigOptions<T extends UserInputConfig = UserInputConfig, MT exte
 }
 type DefineConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta> = (input: InputConfig<T, MT>) => InputConfig<T, MT>;
 declare function createDefineConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta>(): DefineConfig<T, MT>;
-//#endregion
-//#region src/loader.d.ts
 declare const SUPPORTED_EXTENSIONS: string[];
 declare function loadConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta>(options: LoadConfigOptions<T, MT>): Promise<ResolvedConfig<T, MT>>;
-//#endregion
-//#region src/watch.d.ts
 type DiffEntries = ReturnType<typeof diff>;
 type ConfigWatcher<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta> = ResolvedConfig<T, MT> & {
   watchingFiles: string[];
@@ -183,5 +179,4 @@ interface WatchConfigOptions<T extends UserInputConfig = UserInputConfig, MT ext
   }) => void | Promise<void>;
 }
 declare function watchConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta>(options: WatchConfigOptions<T, MT>): Promise<ConfigWatcher<T, MT>>;
-//#endregion
 export { C12InputConfig, ConfigFunctionContext, ConfigLayer, ConfigLayerMeta, ConfigSource, type ConfigWatcher, DefineConfig, type DotenvOptions, type Env, InputConfig, LoadConfigOptions, ResolvableConfig, ResolvableConfigContext, ResolvedConfig, SUPPORTED_EXTENSIONS, SourceOptions, UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };

package/dist/index.mjs

@@ -102,6 +102,7 @@ function getDotEnvVars(targetEnvironment) {
 	return globalRegistry.get(targetEnvironment);
 }
 const _normalize = (p) => p?.replace(/\\/g, "/");
+let importCounter = 0;
 const ASYNC_LOADERS = {
 	".yaml": () => import("confbox/yaml").then((r) => r.parseYAML),
 	".yml": () => import("confbox/yaml").then((r) => r.parseYAML),
@@ -310,7 +311,7 @@ async function resolveConfig(source, options, sourceOptions = {}) {
 	}
 	if (NPM_PACKAGE_RE.test(source)) source = tryResolve(source, options) || source;
 	const ext = extname(source);
-	const isDir = !ext || ext === basename(source);
+	const isDir = _isDirectory(resolve(options.cwd, source)) ?? (!ext || ext === basename(source));
 	const cwd = resolve(options.cwd, isDir ? source : dirname(source));
 	if (isDir) source = options.configFile;
 	const res = {
@@ -328,18 +329,23 @@ async function resolveConfig(source, options, sourceOptions = {}) {
 	else {
 		const _resolveModule = options.resolveModule || ((mod) => mod.default || mod);
 		if (options.import) res.config = _resolveModule(await options.import(res.configFile));
-		else res.config = await import(res.configFile).then(_resolveModule, async (error) => {
-			const { createJiti } = await import("jiti").catch(() => {
-				throw new Error(`Failed to load config file \`${res.configFile}\`: ${error?.message}.  Hint install \`jiti\` for compatibility.`, { cause: error });
+		else {
+			const _configURL = pathToFileURL(res.configFile);
+			_configURL.search = `_${++importCounter}`;
+			res.config = await import(_configURL.href).then(_resolveModule, async (error) => {
+				const { createJiti } = await import("jiti").catch(() => {
+					throw new Error(`Failed to load config file \`${res.configFile}\`: ${error?.message}.  Hint install \`jiti\` for compatibility.`, { cause: error });
+				});
+				const jiti = createJiti(join(options.cwd || ".", options.configFile || "/"), {
+					interopDefault: true,
+					moduleCache: false,
+					extensions: [...SUPPORTED_EXTENSIONS],
+					...options.jitiOptions
+				});
+				options.import = (id) => jiti.import(id);
+				return _resolveModule(await options.import(res.configFile));
 			});
-			const jiti = createJiti(join(options.cwd || ".", options.configFile || "/"), {
-				interopDefault: true,
-				moduleCache: false,
-				extensions: [...SUPPORTED_EXTENSIONS]
-			});
-			options.import = (id) => jiti.import(id);
-			return _resolveModule(await options.import(res.configFile));
-		});
+		}
 	}
 	if (typeof res.config === "function") res.config = await res.config(options.context);
 	if (options.envName) {
@@ -366,6 +372,13 @@ function tryResolve(id, options) {
 	});
 	return res ? normalize(res) : void 0;
 }
+function _isDirectory(path) {
+	try {
+		return statSync(path).isDirectory();
+	} catch {
+		return null;
+	}
+}
 function createDefineConfig() {
 	return (input) => input;
 }

package/dist/update.d.mts

@@ -1,6 +1,4 @@
-import * as magicast from "magicast";
-
-//#region src/update.d.ts
+import * as _$magicast from "magicast";
 /**
  * @experimental Update a config file or create a new one.
  */
@@ -10,7 +8,7 @@ interface UpdateConfigResult {
   created?: boolean;
 }
 type MaybePromise<T> = T | Promise<T>;
-type MagicAstOptions = Exclude<Parameters<(typeof magicast)["parseModule"]>[1], undefined>;
+type MagicAstOptions = Exclude<Parameters<(typeof _$magicast)["parseModule"]>[1], undefined>;
 interface UpdateConfigOptions {
   /**
    * Current working directory
@@ -49,5 +47,4 @@ interface UpdateConfigOptions {
     configFile: string;
   }) => MaybePromise<string | boolean>;
 }
-//#endregion
 export { UpdateConfigOptions, UpdateConfigResult, updateConfig };

package/dist/update.mjs

@@ -1,12 +1,6 @@
 import { resolveModulePath } from "exsolve";
-import "node:fs";
 import { mkdir, readFile, writeFile } from "node:fs/promises";
-import "node:url";
-import "node:os";
 import { join, normalize } from "pathe";
-import "rc9";
-import "defu";
-import "pkg-types";
 import { dirname, extname } from "node:path";
 const SUPPORTED_EXTENSIONS = Object.freeze([
 	".js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.5",
   "description": "Smart Config Loader",
   "license": "MIT",
   "repository": "unjs/c12",
@@ -19,38 +19,38 @@
     "dev": "vitest dev",
     "lint": "oxlint . && oxfmt --check src test",
     "lint:fix": "automd && oxlint . --fix && oxfmt src test",
-    "release": "pnpm test && pnpm build && changelogen --release --prerelease --publish && git push --follow-tags",
+    "release": "pnpm test && pnpm build && changelogen --release --prerelease --push && npm publish",
     "test": "pnpm lint && vitest run --coverage && pnpm test:types",
     "test:types": "tsgo --noEmit"
   },
   "dependencies": {
     "confbox": "^0.2.4",
-    "defu": "^6.1.4",
+    "defu": "^6.1.7",
     "exsolve": "^1.0.8",
     "pathe": "^2.0.3",
-    "pkg-types": "^2.3.0",
-    "rc9": "^3.0.0"
+    "pkg-types": "^2.3.1",
+    "rc9": "^3.0.1"
   },
   "devDependencies": {
-    "@types/node": "^25.2.3",
-    "@typescript/native-preview": "^7.0.0-dev.20260216.1",
-    "@vitest/coverage-v8": "^4.0.18",
+    "@types/node": "^25.6.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260505.1",
+    "@vitest/coverage-v8": "^4.1.5",
     "automd": "^0.4.3",
     "changelogen": "^0.6.2",
     "chokidar": "^5.0.0",
-    "dotenv": "^17.3.1",
+    "dotenv": "^17.4.2",
     "eslint-config-unjs": "^0.6.2",
     "expect-type": "^1.3.0",
-    "giget": "^3.1.2",
-    "jiti": "^2.6.1",
+    "giget": "^3.2.0",
+    "jiti": "^2.7.0",
     "magicast": "^0.5.2",
-    "obuild": "^0.4.27",
+    "obuild": "^0.4.34",
     "ohash": "^2.0.11",
-    "oxfmt": "^0.33.0",
-    "oxlint": "^1.48.0",
+    "oxfmt": "^0.48.0",
+    "oxlint": "^1.63.0",
     "perfect-debounce": "^2.1.0",
-    "typescript": "^5.9.3",
-    "vitest": "^4.0.18"
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.5"
   },
   "peerDependencies": {
     "chokidar": "^5",
@@ -76,5 +76,5 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.29.3"
+  "packageManager": "pnpm@10.33.3"
 }