c12 1.8.0 → 1.9.0

package/README.md

@@ -12,8 +12,8 @@ c12 (pronounced as /siːtwelv/, like c-twelve) is a smart configuration loader.
 
 ## ✅ Features
 
-- `.js`, `.ts`, `.cjs`, `.mjs` config loader with [unjs/jiti](https://github.com/unjs/jiti)
-- `.json`, `.json5` and `.jsonc` config support
+- `.js`, `.ts`, `.mjs`, `.cjs`, `.mts`, `.cts` `.json` config loader with [unjs/jiti](https://jiti.unjs.io)
+- `.jsonc`, `.json5`, `.yaml`, `.yml`, `.toml` config loader with [unjs/confbox](https://confbox.unjs.io)
 - `.config/` directory support following [config dir proposal](https://github.com/pi0/config-dir)
 - `.rc` config support with [unjs/rc9](https://github.com/unjs/rc9)
 - `.env` support with [dotenv](https://www.npmjs.com/package/dotenv)

package/dist/index.cjs

@@ -10,7 +10,6 @@ const rc9 = require('rc9');
 const defu = require('defu');
 const ohash = require('ohash');
 const pkgTypes = require('pkg-types');
-const chokidar = require('chokidar');
 const perfectDebounce = require('perfect-debounce');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -104,6 +103,29 @@ function interpolate(target, source = {}, parse = (v) => v) {
 }
 
 const _normalize = (p) => p?.replace(/\\/g, "/");
+const ASYNC_LOADERS = {
+  ".yaml": () => import('confbox/yaml').then((r) => r.parseYAML),
+  ".yml": () => import('confbox/yaml').then((r) => r.parseYAML),
+  ".jsonc": () => import('confbox/jsonc').then((r) => r.parseJSONC),
+  ".json5": () => import('confbox/json5').then((r) => r.parseJSON5),
+  ".toml": () => import('confbox/toml').then((r) => r.parseTOML)
+};
+const SUPPORTED_EXTENSIONS = [
+  // with jiti
+  ".js",
+  ".ts",
+  ".mjs",
+  ".cjs",
+  ".mts",
+  ".cts",
+  ".json",
+  // with confbox
+  ".jsonc",
+  ".json5",
+  ".yaml",
+  ".yml",
+  ".toml"
+];
 async function loadConfig(options) {
   options.cwd = pathe.resolve(process.cwd(), options.cwd || ".");
   options.name = options.name || "config";
@@ -120,17 +142,7 @@ async function loadConfig(options) {
     interopDefault: true,
     requireCache: false,
     esmResolve: true,
-    extensions: [
-      ".js",
-      ".mjs",
-      ".cjs",
-      ".ts",
-      ".mts",
-      ".cts",
-      ".json",
-      ".jsonc",
-      ".json5"
-    ],
+    extensions: [...SUPPORTED_EXTENSIONS],
     ...options.jitiOptions
   });
   const r = {
@@ -151,24 +163,17 @@ async function loadConfig(options) {
   }
   const configRC = {};
   if (options.rcFile) {
+    const rcSources = [];
+    rcSources.push(rc9__namespace.read({ name: options.rcFile, dir: options.cwd }));
     if (options.globalRc) {
-      Object.assign(
-        configRC,
-        rc9__namespace.readUser({ name: options.rcFile, dir: options.cwd })
-      );
       const workspaceDir = await pkgTypes.findWorkspaceDir(options.cwd).catch(() => {
       });
       if (workspaceDir) {
-        Object.assign(
-          configRC,
-          rc9__namespace.read({ name: options.rcFile, dir: workspaceDir })
-        );
+        rcSources.push(rc9__namespace.read({ name: options.rcFile, dir: workspaceDir }));
       }
+      rcSources.push(rc9__namespace.readUser({ name: options.rcFile, dir: options.cwd }));
     }
-    Object.assign(
-      configRC,
-      rc9__namespace.read({ name: options.rcFile, dir: options.cwd })
-    );
+    Object.assign(configRC, defu.defu({}, ...rcSources));
   }
   const pkgJson = {};
   if (options.packageJson) {
@@ -335,14 +340,11 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   if (!node_fs.existsSync(res.configFile)) {
     return res;
   }
-  if (res.configFile.endsWith(".jsonc")) {
-    const { parse } = await import('jsonc-parser');
-    res.config = parse(await promises.readFile(res.configFile, "utf8"));
-  } else if (res.configFile.endsWith(".json5")) {
-    const parse = await import('json5').then(
-      (m) => m.parse || m.default?.parse || m.default
-    );
-    res.config = parse(await promises.readFile(res.configFile, "utf8"));
+  const configFileExt = pathe.extname(res.configFile) || "";
+  if (configFileExt in ASYNC_LOADERS) {
+    const asyncLoader = await ASYNC_LOADERS[configFileExt]();
+    const contents = await promises.readFile(res.configFile, "utf8");
+    res.config = asyncLoader(contents);
   } else {
     res.config = options.jiti(res.configFile);
   }
@@ -384,9 +386,15 @@ async function watchConfig(options) {
   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, configFileName + "." + ext)
-        ),
+        ...SUPPORTED_EXTENSIONS.flatMap((ext) => [
+          pathe.resolve(l.cwd, configFileName + ext),
+          pathe.resolve(l.cwd, ".config", configFileName + ext),
+          pathe.resolve(
+            l.cwd,
+            ".config",
+            configFileName.replace(/\.config$/, "") + ext
+          )
+        ]),
         l.source && pathe.resolve(l.cwd, l.source),
         // TODO: Support watching rc from home and workspace
         options.rcFile && pathe.resolve(
@@ -397,7 +405,8 @@ async function watchConfig(options) {
       ]).filter(Boolean)
     )
   ];
-  const _fswatcher = chokidar.watch(watchingFiles, {
+  const watch = await import('chokidar').then((r) => r.watch || r.default || r);
+  const _fswatcher = watch(watchingFiles, {
     ignoreInitial: true,
     ...options.chokidarOptions
   });
@@ -451,6 +460,7 @@ async function watchConfig(options) {
   });
 }
 
+exports.SUPPORTED_EXTENSIONS = SUPPORTED_EXTENSIONS;
 exports.createDefineConfig = createDefineConfig;
 exports.loadConfig = loadConfig;
 exports.loadDotenv = loadDotenv;

package/dist/index.d.cts

@@ -96,6 +96,7 @@ 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>;
 
+declare const SUPPORTED_EXTENSIONS: readonly [".js", ".ts", ".mjs", ".cjs", ".mts", ".cts", ".json", ".jsonc", ".json5", ".yaml", ".yml", ".toml"];
 declare function loadConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta>(options: LoadConfigOptions<T, MT>): Promise<ResolvedConfig<T, MT>>;
 
 type ConfigWatcher<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta> = ResolvedConfig<T, MT> & {
@@ -122,4 +123,4 @@ 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 ResolvedConfig, type SourceOptions, type UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };
+export { type C12InputConfig, type ConfigLayer, type ConfigLayerMeta, type ConfigWatcher, type DefineConfig, type DotenvOptions, type Env, type InputConfig, type LoadConfigOptions, type ResolvedConfig, SUPPORTED_EXTENSIONS, type SourceOptions, type UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };

package/dist/index.d.mts

@@ -96,6 +96,7 @@ 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>;
 
+declare const SUPPORTED_EXTENSIONS: readonly [".js", ".ts", ".mjs", ".cjs", ".mts", ".cts", ".json", ".jsonc", ".json5", ".yaml", ".yml", ".toml"];
 declare function loadConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta>(options: LoadConfigOptions<T, MT>): Promise<ResolvedConfig<T, MT>>;
 
 type ConfigWatcher<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta> = ResolvedConfig<T, MT> & {
@@ -122,4 +123,4 @@ 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 ResolvedConfig, type SourceOptions, type UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };
+export { type C12InputConfig, type ConfigLayer, type ConfigLayerMeta, type ConfigWatcher, type DefineConfig, type DotenvOptions, type Env, type InputConfig, type LoadConfigOptions, type ResolvedConfig, SUPPORTED_EXTENSIONS, type SourceOptions, type UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };

package/dist/index.d.ts

@@ -96,6 +96,7 @@ 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>;
 
+declare const SUPPORTED_EXTENSIONS: readonly [".js", ".ts", ".mjs", ".cjs", ".mts", ".cts", ".json", ".jsonc", ".json5", ".yaml", ".yml", ".toml"];
 declare function loadConfig<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta>(options: LoadConfigOptions<T, MT>): Promise<ResolvedConfig<T, MT>>;
 
 type ConfigWatcher<T extends UserInputConfig = UserInputConfig, MT extends ConfigLayerMeta = ConfigLayerMeta> = ResolvedConfig<T, MT> & {
@@ -122,4 +123,4 @@ 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 ResolvedConfig, type SourceOptions, type UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };
+export { type C12InputConfig, type ConfigLayer, type ConfigLayerMeta, type ConfigWatcher, type DefineConfig, type DotenvOptions, type Env, type InputConfig, type LoadConfigOptions, type ResolvedConfig, SUPPORTED_EXTENSIONS, type SourceOptions, type UserInputConfig, type WatchConfigOptions, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };

package/dist/index.mjs

@@ -8,7 +8,6 @@ import * as rc9 from 'rc9';
 import { defu } from 'defu';
 import { hash, diff } from 'ohash';
 import { findWorkspaceDir, readPackageJSON } from 'pkg-types';
-import { watch } from 'chokidar';
 import { debounce } from 'perfect-debounce';
 
 async function setupDotenv(options) {
@@ -84,6 +83,29 @@ function interpolate(target, source = {}, parse = (v) => v) {
 }
 
 const _normalize = (p) => p?.replace(/\\/g, "/");
+const ASYNC_LOADERS = {
+  ".yaml": () => import('confbox/yaml').then((r) => r.parseYAML),
+  ".yml": () => import('confbox/yaml').then((r) => r.parseYAML),
+  ".jsonc": () => import('confbox/jsonc').then((r) => r.parseJSONC),
+  ".json5": () => import('confbox/json5').then((r) => r.parseJSON5),
+  ".toml": () => import('confbox/toml').then((r) => r.parseTOML)
+};
+const SUPPORTED_EXTENSIONS = [
+  // with jiti
+  ".js",
+  ".ts",
+  ".mjs",
+  ".cjs",
+  ".mts",
+  ".cts",
+  ".json",
+  // with confbox
+  ".jsonc",
+  ".json5",
+  ".yaml",
+  ".yml",
+  ".toml"
+];
 async function loadConfig(options) {
   options.cwd = resolve(process.cwd(), options.cwd || ".");
   options.name = options.name || "config";
@@ -100,17 +122,7 @@ async function loadConfig(options) {
     interopDefault: true,
     requireCache: false,
     esmResolve: true,
-    extensions: [
-      ".js",
-      ".mjs",
-      ".cjs",
-      ".ts",
-      ".mts",
-      ".cts",
-      ".json",
-      ".jsonc",
-      ".json5"
-    ],
+    extensions: [...SUPPORTED_EXTENSIONS],
     ...options.jitiOptions
   });
   const r = {
@@ -131,24 +143,17 @@ async function loadConfig(options) {
   }
   const configRC = {};
   if (options.rcFile) {
+    const rcSources = [];
+    rcSources.push(rc9.read({ name: options.rcFile, dir: options.cwd }));
     if (options.globalRc) {
-      Object.assign(
-        configRC,
-        rc9.readUser({ name: options.rcFile, dir: options.cwd })
-      );
       const workspaceDir = await findWorkspaceDir(options.cwd).catch(() => {
       });
       if (workspaceDir) {
-        Object.assign(
-          configRC,
-          rc9.read({ name: options.rcFile, dir: workspaceDir })
-        );
+        rcSources.push(rc9.read({ name: options.rcFile, dir: workspaceDir }));
       }
+      rcSources.push(rc9.readUser({ name: options.rcFile, dir: options.cwd }));
     }
-    Object.assign(
-      configRC,
-      rc9.read({ name: options.rcFile, dir: options.cwd })
-    );
+    Object.assign(configRC, defu({}, ...rcSources));
   }
   const pkgJson = {};
   if (options.packageJson) {
@@ -315,14 +320,11 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   if (!existsSync(res.configFile)) {
     return res;
   }
-  if (res.configFile.endsWith(".jsonc")) {
-    const { parse } = await import('jsonc-parser');
-    res.config = parse(await readFile(res.configFile, "utf8"));
-  } else if (res.configFile.endsWith(".json5")) {
-    const parse = await import('json5').then(
-      (m) => m.parse || m.default?.parse || m.default
-    );
-    res.config = parse(await readFile(res.configFile, "utf8"));
+  const configFileExt = extname(res.configFile) || "";
+  if (configFileExt in ASYNC_LOADERS) {
+    const asyncLoader = await ASYNC_LOADERS[configFileExt]();
+    const contents = await readFile(res.configFile, "utf8");
+    res.config = asyncLoader(contents);
   } else {
     res.config = options.jiti(res.configFile);
   }
@@ -364,9 +366,15 @@ async function watchConfig(options) {
   const watchingFiles = [
     ...new Set(
       (config.layers || []).filter((l) => l.cwd).flatMap((l) => [
-        ...["ts", "js", "mjs", "cjs", "cts", "mts", "json"].map(
-          (ext) => resolve(l.cwd, configFileName + "." + ext)
-        ),
+        ...SUPPORTED_EXTENSIONS.flatMap((ext) => [
+          resolve(l.cwd, configFileName + ext),
+          resolve(l.cwd, ".config", configFileName + ext),
+          resolve(
+            l.cwd,
+            ".config",
+            configFileName.replace(/\.config$/, "") + ext
+          )
+        ]),
         l.source && resolve(l.cwd, l.source),
         // TODO: Support watching rc from home and workspace
         options.rcFile && resolve(
@@ -377,6 +385,7 @@ async function watchConfig(options) {
       ]).filter(Boolean)
     )
   ];
+  const watch = await import('chokidar').then((r) => r.watch || r.default || r);
   const _fswatcher = watch(watchingFiles, {
     ignoreInitial: true,
     ...options.chokidarOptions
@@ -431,4 +440,4 @@ async function watchConfig(options) {
   });
 }
 
-export { createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };
+export { SUPPORTED_EXTENSIONS, createDefineConfig, loadConfig, loadDotenv, setupDotenv, watchConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -31,12 +31,11 @@
   },
   "dependencies": {
     "chokidar": "^3.5.3",
+    "confbox": "^0.1.3",
     "defu": "^6.1.4",
     "dotenv": "^16.3.2",
     "giget": "^1.2.1",
     "jiti": "^1.21.0",
-    "json5": "^2.2.3",
-    "jsonc-parser": "^3.2.1",
     "mlly": "^1.5.0",
     "ohash": "^1.1.3",
     "pathe": "^1.1.2",