c12 3.0.2 → 3.0.4

package/README.md

@@ -109,8 +109,6 @@ Configuration base name. The default is `config`.
 
 Configuration file name without extension. Default is generated from `name` (f.e., if `name` is `foo`, the config file will be => `foo.config`).
 
-Set to `false` to avoid loading the config file.
-
 ### `rcFile`
 
 RC Config file name. Default is generated from `name` (name=foo => `.foorc`).
@@ -173,6 +171,11 @@ Environment name used for [environment specific configuration](#environment-spec
 
 The default is `process.env.NODE_ENV`. You can set `envName` to `false` or an empty string to disable the feature.
 
+### `resolve`
+
+You can define a custom function that resolves the config.
+
+
 ## Extending configuration
 
 If resolved config contains a `extends` key, it will be used to extend the configuration.

package/dist/index.d.mts

@@ -38,6 +38,9 @@ type Env = typeof process.env;
 declare function setupDotenv(options: DotenvOptions): Promise<Env>;
 /** Load environment variables into an object. */
 declare function loadDotenv(options: DotenvOptions): Promise<Env>;
+declare global {
+    var __c12_dotenv_vars__: Map<Record<string, any>, Set<string>>;
+}
 
 interface ConfigLayerMeta {
     name?: string;
@@ -148,4 +151,5 @@ interface WatchConfigOptions<T extends UserInputConfig = UserInputConfig, MT ext
 }
 declare function watchConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta>(options: WatchConfigOptions<T, MT>): Promise<ConfigWatcher<T, MT>>;
 
-export { type C12InputConfig, type ConfigLayer, type ConfigLayerMeta, type ConfigWatcher, type DefineConfig, type DotenvOptions, type Env, type InputConfig, type LoadConfigOptions, type ResolvableConfig, type ResolvableConfigContext, type ResolvedConfig, SUPPORTED_EXTENSIONS, type SourceOptions, type UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };
+export { SUPPORTED_EXTENSIONS, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };
+export type { C12InputConfig, ConfigLayer, ConfigLayerMeta, ConfigWatcher, DefineConfig, DotenvOptions, Env, InputConfig, LoadConfigOptions, ResolvableConfig, ResolvableConfigContext, ResolvedConfig, SourceOptions, UserInputConfig, WatchConfigOptions };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { l as loadConfig, S as SUPPORTED_EXTENSIONS } from './shared/c12.X4pJ8kft.mjs';
-export { a as loadDotenv, s as setupDotenv } from './shared/c12.X4pJ8kft.mjs';
+import { l as loadConfig, S as SUPPORTED_EXTENSIONS } from './shared/c12.CEGFwQZa.mjs';
+export { a as loadDotenv, s as setupDotenv } from './shared/c12.CEGFwQZa.mjs';
 import { debounce } from 'perfect-debounce';
 import { resolve } from 'pathe';
 import 'node:fs';
@@ -66,10 +66,15 @@ async function watchConfig(options) {
       });
     }
     const oldConfig = config;
-    const newConfig = await loadConfig(options);
-    config = newConfig;
+    try {
+      config = await loadConfig(options);
+    } catch (error) {
+      console.warn(`Failed to load config ${path}
+${error}`);
+      return;
+    }
     const changeCtx = {
-      newConfig,
+      newConfig: config,
       oldConfig,
       getDiff: () => diff(oldConfig.config, config.config)
     };

package/dist/shared/{c12.X4pJ8kft.mjs → c12.CEGFwQZa.mjs}

@@ -1,4 +1,4 @@
-import { existsSync, promises } from 'node:fs';
+import { statSync, promises, existsSync } from 'node:fs';
 import { rm, readFile } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
 import { homedir } from 'node:os';
@@ -18,8 +18,12 @@ async function setupDotenv(options) {
     env: targetEnvironment,
     interpolate: options.interpolate ?? true
   });
+  const dotenvVars = getDotEnvVars(targetEnvironment);
   for (const key in environment) {
-    if (!key.startsWith("_") && targetEnvironment[key] === void 0) {
+    if (key.startsWith("_")) {
+      continue;
+    }
+    if (targetEnvironment[key] === void 0 || dotenvVars.has(key)) {
       targetEnvironment[key] = environment[key];
     }
   }
@@ -28,13 +32,17 @@ async function setupDotenv(options) {
 async function loadDotenv(options) {
   const environment = /* @__PURE__ */ Object.create(null);
   const dotenvFile = resolve(options.cwd, options.fileName);
-  if (existsSync(dotenvFile)) {
+  const dotenvVars = getDotEnvVars(options.env || {});
+  Object.assign(environment, options.env);
+  if (statSync(dotenvFile, { throwIfNoEntry: false })?.isFile()) {
     const parsed = dotenv.parse(await promises.readFile(dotenvFile, "utf8"));
-    Object.assign(environment, parsed);
-  }
-  if (!options.env?._applied) {
-    Object.assign(environment, options.env);
-    environment._applied = true;
+    for (const key in parsed) {
+      if (key in environment && !dotenvVars.has(key)) {
+        continue;
+      }
+      environment[key] = parsed[key];
+      dotenvVars.add(key);
+    }
   }
   if (options.interpolate) {
     interpolate(environment);
@@ -81,6 +89,13 @@ function interpolate(target, source = {}, parse = (v) => v) {
     target[key] = interpolate2(getValue(key));
   }
 }
+function getDotEnvVars(targetEnvironment) {
+  const globalRegistry = globalThis.__c12_dotenv_vars__ ||= /* @__PURE__ */ new Map();
+  if (!globalRegistry.has(targetEnvironment)) {
+    globalRegistry.set(targetEnvironment, /* @__PURE__ */ new Set());
+  }
+  return globalRegistry.get(targetEnvironment);
+}
 
 const _normalize = (p) => p?.replace(/\\/g, "/");
 const ASYNC_LOADERS = {

package/dist/update.d.mts

@@ -49,4 +49,5 @@ interface UpdateConfigOptions {
     }) => MaybePromise<string | boolean>;
 }
 
-export { type UpdateConfigOptions, type UpdateConfigResult, updateConfig };
+export { updateConfig };
+export type { UpdateConfigOptions, UpdateConfigResult };

package/dist/update.mjs

@@ -1,5 +1,5 @@
 import { resolveModulePath } from 'exsolve';
-import { S as SUPPORTED_EXTENSIONS } from './shared/c12.X4pJ8kft.mjs';
+import { S as SUPPORTED_EXTENSIONS } from './shared/c12.CEGFwQZa.mjs';
 import { join, normalize } from 'pathe';
 import { mkdir, writeFile, readFile } from 'node:fs/promises';
 import { dirname, extname } from 'node:path';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -32,31 +32,31 @@
   },
   "dependencies": {
     "chokidar": "^4.0.3",
-    "confbox": "^0.1.8",
+    "confbox": "^0.2.2",
     "defu": "^6.1.4",
-    "dotenv": "^16.4.7",
-    "exsolve": "^1.0.0",
+    "dotenv": "^16.5.0",
+    "exsolve": "^1.0.5",
     "giget": "^2.0.0",
     "jiti": "^2.4.2",
-    "ohash": "^2.0.5",
+    "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "perfect-debounce": "^1.0.0",
-    "pkg-types": "^2.0.0",
+    "pkg-types": "^2.1.0",
     "rc9": "^2.1.2"
   },
   "devDependencies": {
-    "@types/node": "^22.13.5",
-    "@vitest/coverage-v8": "^3.0.7",
+    "@types/node": "^22.15.18",
+    "@vitest/coverage-v8": "^3.1.3",
     "automd": "^0.4.0",
-    "changelogen": "^0.6.0",
-    "eslint": "^9.21.0",
+    "changelogen": "^0.6.1",
+    "eslint": "^9.27.0",
     "eslint-config-unjs": "^0.4.2",
-    "expect-type": "^1.1.0",
+    "expect-type": "^1.2.1",
     "magicast": "^0.3.5",
-    "prettier": "^3.5.2",
-    "typescript": "^5.7.3",
+    "prettier": "^3.5.3",
+    "typescript": "^5.8.3",
     "unbuild": "^3.5.0",
-    "vitest": "^3.0.7"
+    "vitest": "^3.1.3"
   },
   "peerDependencies": {
     "magicast": "^0.3.5"
@@ -66,5 +66,5 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.5.1"
+  "packageManager": "pnpm@10.11.0"
 }