c12 1.11.0 → 2.0.0-beta.1

package/README.md

@@ -32,6 +32,7 @@ c12 (pronounced as /siːtwelv/, like c-twelve) is a smart configuration loader.
 - [Automd](https://automd.unjs.io)
 - [Changelogen](https://changelogen.unjs.io)
 - [RemixKit](https://github.com/jrestall/remix-kit)
+- [Hey API](https://github.com/hey-api/openapi-ts)
 
 ## Usage
 

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const loader = require('./shared/c12.24612422.cjs');
+const loader = require('./shared/c12.CkVjnBFL.cjs');
 const perfectDebounce = require('perfect-debounce');
 const pathe = require('pathe');
 const ohash = require('ohash');

package/dist/index.d.cts

@@ -1,5 +1,4 @@
-import { JITI } from 'jiti';
-import { JITIOptions } from 'jiti/dist/types';
+import { Jiti, JitiOptions } from 'jiti';
 import { DownloadTemplateOptions } from 'giget';
 import { WatchOptions } from 'chokidar';
 import { diff } from 'ohash';
@@ -110,8 +109,8 @@ interface LoadConfigOptions<T extends UserInputConfig = UserInputConfig, MT exte
     overrides?: ResolvableConfig<T>;
     omit$Keys?: boolean;
     resolve?: (id: string, options: LoadConfigOptions<T, MT>) => null | undefined | ResolvedConfig<T, MT> | Promise<ResolvedConfig<T, MT> | undefined | null>;
-    jiti?: JITI;
-    jitiOptions?: JITIOptions;
+    jiti?: Jiti;
+    jitiOptions?: JitiOptions;
     giget?: DownloadTemplateOptions;
     merger?: (...sources: Array<T | null | undefined>) => T;
     extend?: false | {

package/dist/index.d.mts

@@ -1,5 +1,4 @@
-import { JITI } from 'jiti';
-import { JITIOptions } from 'jiti/dist/types';
+import { Jiti, JitiOptions } from 'jiti';
 import { DownloadTemplateOptions } from 'giget';
 import { WatchOptions } from 'chokidar';
 import { diff } from 'ohash';
@@ -110,8 +109,8 @@ interface LoadConfigOptions<T extends UserInputConfig = UserInputConfig, MT exte
     overrides?: ResolvableConfig<T>;
     omit$Keys?: boolean;
     resolve?: (id: string, options: LoadConfigOptions<T, MT>) => null | undefined | ResolvedConfig<T, MT> | Promise<ResolvedConfig<T, MT> | undefined | null>;
-    jiti?: JITI;
-    jitiOptions?: JITIOptions;
+    jiti?: Jiti;
+    jitiOptions?: JitiOptions;
     giget?: DownloadTemplateOptions;
     merger?: (...sources: Array<T | null | undefined>) => T;
     extend?: false | {

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-import { JITI } from 'jiti';
-import { JITIOptions } from 'jiti/dist/types';
+import { Jiti, JitiOptions } from 'jiti';
 import { DownloadTemplateOptions } from 'giget';
 import { WatchOptions } from 'chokidar';
 import { diff } from 'ohash';
@@ -110,8 +109,8 @@ interface LoadConfigOptions<T extends UserInputConfig = UserInputConfig, MT exte
     overrides?: ResolvableConfig<T>;
     omit$Keys?: boolean;
     resolve?: (id: string, options: LoadConfigOptions<T, MT>) => null | undefined | ResolvedConfig<T, MT> | Promise<ResolvedConfig<T, MT> | undefined | null>;
-    jiti?: JITI;
-    jitiOptions?: JITIOptions;
+    jiti?: Jiti;
+    jitiOptions?: JitiOptions;
     giget?: DownloadTemplateOptions;
     merger?: (...sources: Array<T | null | undefined>) => T;
     extend?: false | {

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { l as loadConfig, S as SUPPORTED_EXTENSIONS } from './shared/c12.cab0c9da.mjs';
-export { a as loadDotenv, s as setupDotenv } from './shared/c12.cab0c9da.mjs';
+import { l as loadConfig, S as SUPPORTED_EXTENSIONS } from './shared/c12.72yV1YOl.mjs';
+export { a as loadDotenv, s as setupDotenv } from './shared/c12.72yV1YOl.mjs';
 import { debounce } from 'perfect-debounce';
 import { resolve } from 'pathe';
 import { diff } from 'ohash';

package/dist/shared/{c12.cab0c9da.mjs → c12.72yV1YOl.mjs}

@@ -1,8 +1,8 @@
 import { existsSync, promises } from 'node:fs';
 import { rm, readFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
-import { resolve, dirname, basename, join, extname } from 'pathe';
-import createJiti from 'jiti';
+import { resolve, join, dirname, basename, extname } from 'pathe';
+import { createJiti } from 'jiti';
 import * as rc9 from 'rc9';
 import { defu } from 'defu';
 import { hash } from 'ohash';
@@ -118,10 +118,9 @@ async function loadConfig(options) {
     };
   }
   const _merger = options.merger || defu;
-  options.jiti = options.jiti || createJiti(void 0, {
+  options.jiti = options.jiti || createJiti(join(options.cwd, options.configFile), {
     interopDefault: true,
-    requireCache: false,
-    esmResolve: true,
+    moduleCache: false,
     extensions: [...SUPPORTED_EXTENSIONS],
     ...options.jitiOptions
   });
@@ -312,7 +311,7 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   }
   const tryResolve = (id) => {
     try {
-      return options.jiti.resolve(id, { paths: [options.cwd] });
+      return options.jiti.esmResolve(id, { try: true });
     } catch {
     }
   };
@@ -342,7 +341,7 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     const contents = await readFile(res.configFile, "utf8");
     res.config = asyncLoader(contents);
   } else {
-    res.config = options.jiti(res.configFile);
+    res.config = await options.jiti.import(res.configFile);
   }
   if (res.config instanceof Function) {
     res.config = await res.config();

package/dist/shared/{c12.24612422.cjs → c12.CkVjnBFL.cjs}

@@ -4,15 +4,13 @@ const node_fs = require('node:fs');
 const promises = require('node:fs/promises');
 const node_os = require('node:os');
 const pathe = require('pathe');
-const createJiti = require('jiti');
+const jiti = require('jiti');
 const rc9 = require('rc9');
 const defu = require('defu');
 const ohash = require('ohash');
 const pkgTypes = require('pkg-types');
 const dotenv = require('dotenv');
 
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
-
 function _interopNamespaceCompat(e) {
   if (e && typeof e === 'object' && 'default' in e) return e;
   const n = Object.create(null);
@@ -25,7 +23,6 @@ function _interopNamespaceCompat(e) {
   return n;
 }
 
-const createJiti__default = /*#__PURE__*/_interopDefaultCompat(createJiti);
 const rc9__namespace = /*#__PURE__*/_interopNamespaceCompat(rc9);
 const dotenv__namespace = /*#__PURE__*/_interopNamespaceCompat(dotenv);
 
@@ -138,10 +135,9 @@ async function loadConfig(options) {
     };
   }
   const _merger = options.merger || defu.defu;
-  options.jiti = options.jiti || createJiti__default(void 0, {
+  options.jiti = options.jiti || jiti.createJiti(pathe.join(options.cwd, options.configFile), {
     interopDefault: true,
-    requireCache: false,
-    esmResolve: true,
+    moduleCache: false,
     extensions: [...SUPPORTED_EXTENSIONS],
     ...options.jitiOptions
   });
@@ -332,7 +328,7 @@ async function resolveConfig(source, options, sourceOptions = {}) {
   }
   const tryResolve = (id) => {
     try {
-      return options.jiti.resolve(id, { paths: [options.cwd] });
+      return options.jiti.esmResolve(id, { try: true });
     } catch {
     }
   };
@@ -362,7 +358,7 @@ async function resolveConfig(source, options, sourceOptions = {}) {
     const contents = await promises.readFile(res.configFile, "utf8");
     res.config = asyncLoader(contents);
   } else {
-    res.config = options.jiti(res.configFile);
+    res.config = await options.jiti.import(res.configFile);
   }
   if (res.config instanceof Function) {
     res.config = await res.config();

package/dist/update.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 const mlly = require('mlly');
-const loader = require('./shared/c12.24612422.cjs');
+const loader = require('./shared/c12.CkVjnBFL.cjs');
 const pathe = require('pathe');
 const promises = require('node:fs/promises');
 const node_path = require('node:path');
@@ -17,8 +17,12 @@ require('dotenv');
 const UPDATABLE_EXTS = [".js", ".ts", ".mjs", ".cjs", ".mts", ".cts"];
 async function updateConfig(opts) {
   const { parseModule } = await import('magicast');
-  let configFile = await _tryResolve(opts.configFile, opts.cwd, loader.SUPPORTED_EXTENSIONS) || await _tryResolve(
-    `.config/${opts.configFile}`,
+  let configFile = await _tryResolve(
+    `./${opts.configFile}`,
+    opts.cwd,
+    loader.SUPPORTED_EXTENSIONS
+  ) || await _tryResolve(
+    `./.config/${opts.configFile}`,
     opts.cwd,
     loader.SUPPORTED_EXTENSIONS
   );
@@ -28,7 +32,7 @@ async function updateConfig(opts) {
       opts.cwd,
       opts.configFile + (opts.createExtension || ".ts")
     );
-    const createResult = await opts.onCreate?.({ configFile }) || true;
+    const createResult = await opts.onCreate?.({ configFile }) ?? true;
     if (!createResult) {
       throw new Error("Config file creation aborted.");
     }
@@ -51,7 +55,7 @@ async function updateConfig(opts) {
     throw new Error("Default export is missing in the config file!");
   }
   const configObj = defaultExport.$type === "function-call" ? defaultExport.$args[0] : defaultExport;
-  opts.onUpdate?.(configObj);
+  await opts.onUpdate?.(configObj);
   await promises.writeFile(configFile, _module.generate().code);
   return {
     configFile,

package/dist/update.mjs

@@ -1,5 +1,5 @@
 import { resolvePath } from 'mlly';
-import { S as SUPPORTED_EXTENSIONS } from './shared/c12.cab0c9da.mjs';
+import { S as SUPPORTED_EXTENSIONS } from './shared/c12.72yV1YOl.mjs';
 import { join } from 'pathe';
 import { mkdir, writeFile, readFile } from 'node:fs/promises';
 import { dirname, extname } from 'node:path';
@@ -15,8 +15,12 @@ import 'dotenv';
 const UPDATABLE_EXTS = [".js", ".ts", ".mjs", ".cjs", ".mts", ".cts"];
 async function updateConfig(opts) {
   const { parseModule } = await import('magicast');
-  let configFile = await _tryResolve(opts.configFile, opts.cwd, SUPPORTED_EXTENSIONS) || await _tryResolve(
-    `.config/${opts.configFile}`,
+  let configFile = await _tryResolve(
+    `./${opts.configFile}`,
+    opts.cwd,
+    SUPPORTED_EXTENSIONS
+  ) || await _tryResolve(
+    `./.config/${opts.configFile}`,
     opts.cwd,
     SUPPORTED_EXTENSIONS
   );
@@ -26,7 +30,7 @@ async function updateConfig(opts) {
       opts.cwd,
       opts.configFile + (opts.createExtension || ".ts")
     );
-    const createResult = await opts.onCreate?.({ configFile }) || true;
+    const createResult = await opts.onCreate?.({ configFile }) ?? true;
     if (!createResult) {
       throw new Error("Config file creation aborted.");
     }
@@ -49,7 +53,7 @@ async function updateConfig(opts) {
     throw new Error("Default export is missing in the config file!");
   }
   const configObj = defaultExport.$type === "function-call" ? defaultExport.$args[0] : defaultExport;
-  opts.onUpdate?.(configObj);
+  await opts.onUpdate?.(configObj);
   await writeFile(configFile, _module.generate().code);
   return {
     configFile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "1.11.0",
+  "version": "2.0.0-beta.1",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -31,7 +31,7 @@
     "lint": "eslint . && prettier -c src test",
     "lint:fix": "eslint . --fix && prettier -w src test",
     "prepack": "unbuild",
-    "release": "pnpm test && changelogen --release && npm publish && git push --follow-tags",
+    "release": "pnpm build && pnpm test && changelogen --release --prerelease --push --publish --publishTag beta",
     "test": "pnpm lint && vitest run --coverage && pnpm test:types",
     "test:types": "tsc --noEmit"
   },
@@ -41,26 +41,26 @@
     "defu": "^6.1.4",
     "dotenv": "^16.4.5",
     "giget": "^1.2.3",
-    "jiti": "^1.21.6",
+    "jiti": "^2.0.0-beta.3",
     "mlly": "^1.7.1",
     "ohash": "^1.1.3",
     "pathe": "^1.1.2",
     "perfect-debounce": "^1.0.0",
-    "pkg-types": "^1.1.1",
+    "pkg-types": "^1.1.2",
     "rc9": "^2.1.2"
   },
   "devDependencies": {
-    "@types/node": "^20.14.2",
+    "@types/node": "^20.14.9",
     "@vitest/coverage-v8": "^1.6.0",
     "automd": "^0.3.7",
     "changelogen": "^0.5.5",
-    "eslint": "^9.4.0",
+    "eslint": "^9.6.0",
     "eslint-config-unjs": "^0.3.2",
     "expect-type": "^0.19.0",
     "magicast": "^0.3.4",
     "prettier": "^3.3.2",
-    "typescript": "^5.4.5",
-    "unbuild": "^2.0.0",
+    "typescript": "^5.5.3",
+    "unbuild": "^3.0.0-rc.3",
     "vitest": "^1.6.0"
   },
   "peerDependencies": {
@@ -71,5 +71,5 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@9.3.0"
+  "packageManager": "pnpm@9.4.0"
 }