c12 0.2.8 → 0.2.11

package/README.md

@@ -85,7 +85,7 @@ Set to `false` to disable loading RC config.
 
 ### `globalRC`
 
-Load RC config from the user's home directory. Only enabled when `rcFile` is provided. Set to `false` to disable this functionality.
+Load RC config from the workspace directory and user's home directory. Only enabled when `rcFile` is provided. Set to `false` to disable this functionality.
 
 ### `dotenv`
 
@@ -99,6 +99,14 @@ Specify default configuration. It has the **lowest** priority.
 
 Specify override configuration. It has the **highest** priority.
 
+### `jiti`
+
+Custom [unjs/jiti](https://github.com/unjs/jiti) instance used to import configuration files.
+
+### `jitiOptions`
+
+Custom [unjs/jiti](https://github.com/unjs/jiti) options to import configuration files.
+
 ## Extending configuration
 
 If resolved config contains a `extends` key, it will be used to extend configuration.

package/dist/index.cjs

@@ -9,6 +9,7 @@ const os = require('os');
 const createJiti = require('jiti');
 const rc9 = require('rc9');
 const defu = require('defu');
+const pkgTypes = require('pkg-types');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -28,7 +29,6 @@ const dotenv__namespace = /*#__PURE__*/_interopNamespace(dotenv);
 const os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 const createJiti__default = /*#__PURE__*/_interopDefaultLegacy(createJiti);
 const rc9__namespace = /*#__PURE__*/_interopNamespace(rc9);
-const defu__default = /*#__PURE__*/_interopDefaultLegacy(defu);
 
 async function setupDotenv(options) {
   const targetEnv = options.env ?? process.env;
@@ -106,6 +106,12 @@ async function loadConfig(opts) {
       ...opts.extend
     };
   }
+  opts.jiti = opts.jiti || createJiti__default(null, {
+    interopDefault: true,
+    requireCache: false,
+    esmResolve: true,
+    ...opts.jitiOptions
+  });
   const r = {
     config: {},
     cwd: opts.cwd,
@@ -126,15 +132,26 @@ async function loadConfig(opts) {
   if (opts.rcFile) {
     if (opts.globalRc) {
       Object.assign(configRC, rc9__namespace.readUser({ name: opts.rcFile, dir: opts.cwd }));
+      const workspaceDir = await pkgTypes.findWorkspaceDir(opts.cwd).catch(() => null);
+      if (workspaceDir) {
+        Object.assign(configRC, rc9__namespace.read({ name: opts.rcFile, dir: workspaceDir }));
+      }
     }
     Object.assign(configRC, rc9__namespace.read({ name: opts.rcFile, dir: opts.cwd }));
   }
-  r.config = defu__default(opts.overrides, config, configRC);
+  r.config = defu.defu(
+    opts.overrides,
+    config,
+    configRC
+  );
   if (opts.extend) {
     await extendConfig(r.config, opts);
     r.layers = r.config._layers;
     delete r.config._layers;
-    r.config = defu__default(r.config, ...r.layers.map((e) => e.config));
+    r.config = defu.defu(
+      r.config,
+      ...r.layers.map((e) => e.config)
+    );
   }
   const baseLayers = [
     opts.overrides && { config: opts.overrides, configFile: void 0, cwd: void 0 },
@@ -146,7 +163,7 @@ async function loadConfig(opts) {
     ...r.layers
   ];
   if (opts.defaults) {
-    r.config = defu__default(r.config, opts.defaults);
+    r.config = defu.defu(r.config, opts.defaults);
   }
   return r;
 }
@@ -155,13 +172,23 @@ async function extendConfig(config, opts) {
   if (!opts.extend) {
     return;
   }
-  const key = opts.extend.extendKey;
-  const extendSources = (Array.isArray(config[key]) ? config[key] : [config[key]]).filter(Boolean);
-  delete config[key];
+  let keys = opts.extend.extendKey;
+  if (typeof keys === "string") {
+    keys = [keys];
+  }
+  const extendSources = [];
+  for (const key of keys) {
+    extendSources.push(...(Array.isArray(config[key]) ? config[key] : [config[key]]).filter(Boolean));
+    delete config[key];
+  }
   for (const extendSource of extendSources) {
+    if (typeof extendSource !== "string") {
+      console.warn(`Cannot extend config from \`${JSON.stringify(extendSource)}\` (which should be a string) in ${opts.cwd}`);
+      continue;
+    }
     const _config = await resolveConfig(extendSource, opts);
     if (!_config.config) {
-      console.warn(`Cannot extend config from ${extendSource} in ${opts.cwd}`);
+      console.warn(`Cannot extend config from \`${extendSource}\` in ${opts.cwd}`);
       continue;
     }
     await extendConfig(_config.config, { ...opts, cwd: _config.cwd });
@@ -174,7 +201,6 @@ async function extendConfig(config, opts) {
 }
 const GIT_PREFIXES = ["github:", "gitlab:", "bitbucket:", "https://"];
 const NPM_PACKAGE_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
-const jiti = createJiti__default(null, { cache: false, interopDefault: true, requireCache: false });
 async function resolveConfig(source, opts) {
   if (opts.resolve) {
     const res2 = await opts.resolve(source, opts);
@@ -196,7 +222,7 @@ async function resolveConfig(source, opts) {
   }
   if (NPM_PACKAGE_RE.test(source)) {
     try {
-      source = jiti.resolve(source, { paths: [opts.cwd] });
+      source = opts.jiti.resolve(source, { paths: [opts.cwd] });
     } catch (_err) {
     }
   }
@@ -207,13 +233,13 @@ async function resolveConfig(source, opts) {
   }
   const res = { config: null, cwd };
   try {
-    res.configFile = jiti.resolve(pathe.resolve(cwd, source), { paths: [cwd] });
+    res.configFile = opts.jiti.resolve(pathe.resolve(cwd, source), { paths: [cwd] });
   } catch (_err) {
   }
   if (!fs.existsSync(res.configFile)) {
     return res;
   }
-  res.config = jiti(res.configFile);
+  res.config = opts.jiti(res.configFile);
   if (typeof res.config === "function") {
     res.config = await res.config();
   }

package/dist/index.d.ts

@@ -1,3 +1,6 @@
+import { JITI } from 'jiti';
+import { JITIOptions } from 'jiti/dist/types';
+
 interface DotenvOptions {
     /**
      * The project root directory (either absolute or relative to the current working directory).
@@ -58,8 +61,10 @@ interface LoadConfigOptions<T extends InputConfig = InputConfig> {
     defaults?: T;
     overrides?: T;
     resolve?: (id: string, opts: LoadConfigOptions) => null | ResolvedConfig | Promise<ResolvedConfig | null>;
+    jiti?: JITI;
+    jitiOptions?: JITIOptions;
     extend?: false | {
-        extendKey?: string;
+        extendKey?: string | string[];
     };
 }
 declare function loadConfig<T extends InputConfig = InputConfig>(opts: LoadConfigOptions<T>): Promise<ResolvedConfig<T>>;

package/dist/index.mjs

@@ -4,7 +4,8 @@ import * as dotenv from 'dotenv';
 import os from 'os';
 import createJiti from 'jiti';
 import * as rc9 from 'rc9';
-import defu from 'defu';
+import { defu } from 'defu';
+import { findWorkspaceDir } from 'pkg-types';
 
 async function setupDotenv(options) {
   const targetEnv = options.env ?? process.env;
@@ -82,6 +83,12 @@ async function loadConfig(opts) {
       ...opts.extend
     };
   }
+  opts.jiti = opts.jiti || createJiti(null, {
+    interopDefault: true,
+    requireCache: false,
+    esmResolve: true,
+    ...opts.jitiOptions
+  });
   const r = {
     config: {},
     cwd: opts.cwd,
@@ -102,15 +109,26 @@ async function loadConfig(opts) {
   if (opts.rcFile) {
     if (opts.globalRc) {
       Object.assign(configRC, rc9.readUser({ name: opts.rcFile, dir: opts.cwd }));
+      const workspaceDir = await findWorkspaceDir(opts.cwd).catch(() => null);
+      if (workspaceDir) {
+        Object.assign(configRC, rc9.read({ name: opts.rcFile, dir: workspaceDir }));
+      }
     }
     Object.assign(configRC, rc9.read({ name: opts.rcFile, dir: opts.cwd }));
   }
-  r.config = defu(opts.overrides, config, configRC);
+  r.config = defu(
+    opts.overrides,
+    config,
+    configRC
+  );
   if (opts.extend) {
     await extendConfig(r.config, opts);
     r.layers = r.config._layers;
     delete r.config._layers;
-    r.config = defu(r.config, ...r.layers.map((e) => e.config));
+    r.config = defu(
+      r.config,
+      ...r.layers.map((e) => e.config)
+    );
   }
   const baseLayers = [
     opts.overrides && { config: opts.overrides, configFile: void 0, cwd: void 0 },
@@ -131,13 +149,23 @@ async function extendConfig(config, opts) {
   if (!opts.extend) {
     return;
   }
-  const key = opts.extend.extendKey;
-  const extendSources = (Array.isArray(config[key]) ? config[key] : [config[key]]).filter(Boolean);
-  delete config[key];
+  let keys = opts.extend.extendKey;
+  if (typeof keys === "string") {
+    keys = [keys];
+  }
+  const extendSources = [];
+  for (const key of keys) {
+    extendSources.push(...(Array.isArray(config[key]) ? config[key] : [config[key]]).filter(Boolean));
+    delete config[key];
+  }
   for (const extendSource of extendSources) {
+    if (typeof extendSource !== "string") {
+      console.warn(`Cannot extend config from \`${JSON.stringify(extendSource)}\` (which should be a string) in ${opts.cwd}`);
+      continue;
+    }
     const _config = await resolveConfig(extendSource, opts);
     if (!_config.config) {
-      console.warn(`Cannot extend config from ${extendSource} in ${opts.cwd}`);
+      console.warn(`Cannot extend config from \`${extendSource}\` in ${opts.cwd}`);
       continue;
     }
     await extendConfig(_config.config, { ...opts, cwd: _config.cwd });
@@ -150,7 +178,6 @@ async function extendConfig(config, opts) {
 }
 const GIT_PREFIXES = ["github:", "gitlab:", "bitbucket:", "https://"];
 const NPM_PACKAGE_RE = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/;
-const jiti = createJiti(null, { cache: false, interopDefault: true, requireCache: false });
 async function resolveConfig(source, opts) {
   if (opts.resolve) {
     const res2 = await opts.resolve(source, opts);
@@ -172,7 +199,7 @@ async function resolveConfig(source, opts) {
   }
   if (NPM_PACKAGE_RE.test(source)) {
     try {
-      source = jiti.resolve(source, { paths: [opts.cwd] });
+      source = opts.jiti.resolve(source, { paths: [opts.cwd] });
     } catch (_err) {
     }
   }
@@ -183,13 +210,13 @@ async function resolveConfig(source, opts) {
   }
   const res = { config: null, cwd };
   try {
-    res.configFile = jiti.resolve(resolve(cwd, source), { paths: [cwd] });
+    res.configFile = opts.jiti.resolve(resolve(cwd, source), { paths: [cwd] });
   } catch (_err) {
   }
   if (!existsSync(res.configFile)) {
     return res;
   }
-  res.config = jiti(res.configFile);
+  res.config = opts.jiti(res.configFile);
   if (typeof res.config === "function") {
     res.config = await res.config();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "0.2.8",
+  "version": "0.2.11",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -19,24 +19,25 @@
     "dist"
   ],
   "dependencies": {
-    "defu": "^6.0.0",
-    "dotenv": "^16.0.1",
+    "defu": "^6.1.0",
+    "dotenv": "^16.0.2",
     "gittar": "^0.1.1",
-    "jiti": "^1.14.0",
-    "mlly": "^0.5.4",
-    "pathe": "^0.3.2",
+    "jiti": "^1.15.0",
+    "mlly": "^0.5.14",
+    "pathe": "^0.3.7",
+    "pkg-types": "^0.3.5",
     "rc9": "^1.2.2"
   },
   "devDependencies": {
-    "@nuxtjs/eslint-config-typescript": "latest",
-    "c8": "latest",
-    "eslint": "latest",
-    "standard-version": "latest",
-    "typescript": "latest",
-    "unbuild": "latest",
-    "vitest": "latest"
+    "@nuxtjs/eslint-config-typescript": "^11.0.0",
+    "@vitest/coverage-c8": "^0.23.1",
+    "eslint": "^8.23.0",
+    "standard-version": "^9.5.0",
+    "typescript": "^4.8.2",
+    "unbuild": "^0.8.10",
+    "vitest": "^0.23.1"
   },
-  "packageManager": "pnpm@7.4.0",
+  "packageManager": "pnpm@7.11.0",
   "scripts": {
     "build": "unbuild",
     "dev": "vitest dev",