c12 1.4.0 → 1.4.2

package/README.md

@@ -75,9 +75,9 @@ Resolve configuration from this working directory. The default is `process.cwd()
 
 Configuration base name. The default is `config`.
 
-### `configName`
+### `configFile`
 
-Configuration file name without extension. Default is generated from `name` (name=foo => `foo.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.
 

package/dist/index.cjs

@@ -64,7 +64,7 @@ async function loadDotenv(options) {
 }
 function interpolate(target, source = {}, parse = (v) => v) {
   function getValue(key) {
-    return source[key] !== void 0 ? source[key] : target[key];
+    return source[key] === void 0 ? target[key] : source[key];
   }
   function interpolate2(value, parents = []) {
     if (typeof value !== "string") {
@@ -94,7 +94,7 @@ function interpolate(target, source = {}, parse = (v) => v) {
           value2 = getValue(key);
           value2 = interpolate2(value2, [...parents, key]);
         }
-        return value2 !== void 0 ? newValue.replace(replacePart, value2) : newValue;
+        return value2 === void 0 ? newValue : newValue.replace(replacePart, value2);
       }, value)
     );
   }
@@ -107,7 +107,7 @@ async function loadConfig(options) {
   options.cwd = pathe.resolve(process.cwd(), options.cwd || ".");
   options.name = options.name || "config";
   options.envName = options.envName ?? process.env.NODE_ENV;
-  options.configFile = options.configFile ?? (options.name !== "config" ? `${options.name}.config` : "config");
+  options.configFile = options.configFile ?? (options.name === "config" ? "config" : `${options.name}.config`);
   options.rcFile = options.rcFile ?? `.${options.name}rc`;
   if (options.extend !== false) {
     options.extend = {
@@ -276,7 +276,8 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     } catch {
     }
   }
-  const isDir = !pathe.extname(source);
+  const ext = pathe.extname(source);
+  const isDir = !ext || ext === pathe.basename(source);
   const cwd = pathe.resolve(options.cwd, isDir ? source : pathe.dirname(source));
   if (isDir) {
     source = options.configFile;
@@ -329,11 +330,12 @@ const eventMap = {
 async function watchConfig(options) {
   let config = await loadConfig(options);
   const configName = options.name || "config";
+  const configFileName = options.configFile ?? (options.name === "config" ? "config" : `${options.name}.config`);
   const watchingFiles = [
     ...new Set(
       (config.layers || []).filter((l) => l.cwd).flatMap((l) => [
         ...["ts", "js", "mjs", "cjs", "cts", "mts", "json"].map(
-          (ext) => pathe.resolve(l.cwd, (options.name || "config") + "." + ext)
+          (ext) => pathe.resolve(l.cwd, configFileName + "." + ext)
         ),
         l.source && pathe.resolve(l.cwd, l.source),
         // TODO: Support watching rc from home and workspace
@@ -378,10 +380,10 @@ async function watchConfig(options) {
       await options.onUpdate(changeCtx);
     }
   };
-  if (options.debounce !== false) {
-    _fswatcher.on("all", perfectDebounce.debounce(onChange, options.debounce));
-  } else {
+  if (options.debounce === false) {
     _fswatcher.on("all", onChange);
+  } else {
+    _fswatcher.on("all", perfectDebounce.debounce(onChange, options.debounce ?? 100));
   }
   const utils = {
     watchingFiles,

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { existsSync, promises } from 'node:fs';
-import { resolve, extname, dirname } from 'pathe';
+import { resolve, extname, basename, dirname } from 'pathe';
 import * as dotenv from 'dotenv';
 import { rm } from 'node:fs/promises';
 import { homedir } from 'node:os';
@@ -44,7 +44,7 @@ async function loadDotenv(options) {
 }
 function interpolate(target, source = {}, parse = (v) => v) {
   function getValue(key) {
-    return source[key] !== void 0 ? source[key] : target[key];
+    return source[key] === void 0 ? target[key] : source[key];
   }
   function interpolate2(value, parents = []) {
     if (typeof value !== "string") {
@@ -74,7 +74,7 @@ function interpolate(target, source = {}, parse = (v) => v) {
           value2 = getValue(key);
           value2 = interpolate2(value2, [...parents, key]);
         }
-        return value2 !== void 0 ? newValue.replace(replacePart, value2) : newValue;
+        return value2 === void 0 ? newValue : newValue.replace(replacePart, value2);
       }, value)
     );
   }
@@ -87,7 +87,7 @@ async function loadConfig(options) {
   options.cwd = resolve(process.cwd(), options.cwd || ".");
   options.name = options.name || "config";
   options.envName = options.envName ?? process.env.NODE_ENV;
-  options.configFile = options.configFile ?? (options.name !== "config" ? `${options.name}.config` : "config");
+  options.configFile = options.configFile ?? (options.name === "config" ? "config" : `${options.name}.config`);
   options.rcFile = options.rcFile ?? `.${options.name}rc`;
   if (options.extend !== false) {
     options.extend = {
@@ -256,7 +256,8 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     } catch {
     }
   }
-  const isDir = !extname(source);
+  const ext = extname(source);
+  const isDir = !ext || ext === basename(source);
   const cwd = resolve(options.cwd, isDir ? source : dirname(source));
   if (isDir) {
     source = options.configFile;
@@ -309,11 +310,12 @@ const eventMap = {
 async function watchConfig(options) {
   let config = await loadConfig(options);
   const configName = options.name || "config";
+  const configFileName = options.configFile ?? (options.name === "config" ? "config" : `${options.name}.config`);
   const watchingFiles = [
     ...new Set(
       (config.layers || []).filter((l) => l.cwd).flatMap((l) => [
         ...["ts", "js", "mjs", "cjs", "cts", "mts", "json"].map(
-          (ext) => resolve(l.cwd, (options.name || "config") + "." + ext)
+          (ext) => resolve(l.cwd, configFileName + "." + ext)
         ),
         l.source && resolve(l.cwd, l.source),
         // TODO: Support watching rc from home and workspace
@@ -358,10 +360,10 @@ async function watchConfig(options) {
       await options.onUpdate(changeCtx);
     }
   };
-  if (options.debounce !== false) {
-    _fswatcher.on("all", debounce(onChange, options.debounce));
-  } else {
+  if (options.debounce === false) {
     _fswatcher.on("all", onChange);
+  } else {
+    _fswatcher.on("all", debounce(onChange, options.debounce ?? 100));
   }
   const utils = {
     watchingFiles,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -26,32 +26,32 @@
     "lint:fix": "eslint --ext .ts,.js,.mjs,.cjs . --fix && prettier -w src test",
     "prepack": "unbuild",
     "release": "changelogen --release && npm publish && git push --follow-tags",
-    "test": "vitest run --coverage && pnpm test:types",
+    "test": "pnpm lint && vitest run --coverage && pnpm test:types",
     "test:types": "tsc --noEmit"
   },
   "dependencies": {
     "chokidar": "^3.5.3",
     "defu": "^6.1.2",
-    "dotenv": "^16.0.3",
+    "dotenv": "^16.3.1",
     "giget": "^1.1.2",
     "jiti": "^1.18.2",
-    "mlly": "^1.2.0",
-    "ohash": "^1.1.1",
-    "pathe": "^1.1.0",
-    "perfect-debounce": "^0.1.3",
-    "pkg-types": "^1.0.2",
-    "rc9": "^2.1.0"
+    "mlly": "^1.4.0",
+    "ohash": "^1.1.2",
+    "pathe": "^1.1.1",
+    "perfect-debounce": "^1.0.0",
+    "pkg-types": "^1.0.3",
+    "rc9": "^2.1.1"
   },
   "devDependencies": {
-    "@vitest/coverage-c8": "^0.30.1",
+    "@vitest/coverage-v8": "^0.32.2",
     "changelogen": "^0.5.3",
-    "eslint": "^8.38.0",
-    "eslint-config-unjs": "^0.1.0",
-    "expect-type": "^0.15.0",
-    "prettier": "^2.8.7",
-    "typescript": "^5.0.4",
+    "eslint": "^8.43.0",
+    "eslint-config-unjs": "^0.2.1",
+    "expect-type": "^0.16.0",
+    "prettier": "^2.8.8",
+    "typescript": "^5.1.3",
     "unbuild": "^1.2.1",
-    "vitest": "^0.30.1"
+    "vitest": "^0.32.2"
   },
-  "packageManager": "pnpm@8.3.0"
+  "packageManager": "pnpm@8.6.3"
 }