c12 0.1.4 → 0.2.2

package/README.md

@@ -182,8 +182,8 @@ Layers:
 
 - Clone this repository
 - Enable [Corepack](https://github.com/nodejs/corepack) using `corepack enable` (use `npm i -g corepack` for Node.js < 16.10)
-- Install dependencies using `yarn install`
-- Run interactive tests using `yarn dev`
+- Install dependencies using `pnpm install`
+- Run interactive tests using `pnpm dev`
 
 ## License
 

package/dist/index.cjs

@@ -130,9 +130,17 @@ async function loadConfig(opts) {
     Object.assign(configRC, rc9__namespace.read({ name: opts.rcFile, dir: opts.cwd }));
   }
   r.config = defu__default(opts.overrides, config, configRC);
+  const baseLayers = [
+    opts.overrides && { config: opts.overrides, configFile: void 0, cwd: void 0 },
+    { config, configFile: opts.configFile, cwd: opts.cwd },
+    opts.rcFile && { config: configRC, configFile: opts.rcFile }
+  ].filter((l) => l && l.config && Object.keys(l.config).length);
   if (opts.extend) {
     await extendConfig(r.config, opts);
-    r.layers = r.config._layers;
+    r.layers = [
+      ...baseLayers,
+      ...r.config._layers
+    ];
     delete r.config._layers;
     r.config = defu__default(r.config, ...r.layers.map((e) => e.config));
   }

package/dist/index.d.ts

@@ -36,11 +36,14 @@ declare function loadDotenv(opts: DotenvOptions): Promise<Env>;
 
 interface InputConfig extends Record<string, any> {
 }
-interface ResolvedConfig<T extends InputConfig = InputConfig> {
+interface ConfigLayer<T extends InputConfig = InputConfig> {
     config: T;
     cwd?: string;
     configFile?: string;
-    layers?: ResolvedConfig<T>[];
+}
+interface ResolvedConfig<T extends InputConfig = InputConfig> extends ConfigLayer<T> {
+    layers?: ConfigLayer<T>[];
+    cwd?: string;
 }
 interface ResolveConfigOptions {
     cwd: string;
@@ -61,4 +64,4 @@ interface LoadConfigOptions<T extends InputConfig = InputConfig> {
 }
 declare function loadConfig<T extends InputConfig = InputConfig>(opts: LoadConfigOptions<T>): Promise<ResolvedConfig<T>>;
 
-export { DotenvOptions, Env, InputConfig, LoadConfigOptions, ResolveConfigOptions, ResolvedConfig, loadConfig, loadDotenv, setupDotenv };
+export { ConfigLayer, DotenvOptions, Env, InputConfig, LoadConfigOptions, ResolveConfigOptions, ResolvedConfig, loadConfig, loadDotenv, setupDotenv };

package/dist/index.mjs

@@ -106,9 +106,17 @@ async function loadConfig(opts) {
     Object.assign(configRC, rc9.read({ name: opts.rcFile, dir: opts.cwd }));
   }
   r.config = defu(opts.overrides, config, configRC);
+  const baseLayers = [
+    opts.overrides && { config: opts.overrides, configFile: void 0, cwd: void 0 },
+    { config, configFile: opts.configFile, cwd: opts.cwd },
+    opts.rcFile && { config: configRC, configFile: opts.rcFile }
+  ].filter((l) => l && l.config && Object.keys(l.config).length);
   if (opts.extend) {
     await extendConfig(r.config, opts);
-    r.layers = r.config._layers;
+    r.layers = [
+      ...baseLayers,
+      ...r.config._layers
+    ];
     delete r.config._layers;
     r.config = defu(r.config, ...r.layers.map((e) => e.config));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "0.1.4",
+  "version": "0.2.2",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "dev": "vitest dev",
     "lint": "eslint --ext .ts,.js,.mjs,.cjs .",
     "prepack": "unbuild",
-    "release": "yarn test && standard-version && git push --follow-tags && npm publish",
+    "release": "pnpm test && standard-version && git push --follow-tags && pnpm publish",
     "test": "vitest run --coverage"
   },
   "dependencies": {
@@ -43,5 +43,6 @@
     "typescript": "latest",
     "unbuild": "latest",
     "vitest": "latest"
-  }
+  },
+  "packageManager": "pnpm@6.32.3"
 }