c12 3.3.0 → 3.3.2

package/dist/update.mjs

@@ -1,74 +1,80 @@
-import { resolveModulePath } from 'exsolve';
-import { S as SUPPORTED_EXTENSIONS } from './shared/c12.Bzgyhsy6.mjs';
-import { join, normalize } from 'pathe';
-import { mkdir, writeFile, readFile } from 'node:fs/promises';
-import { dirname, extname } from 'node:path';
-import 'node:fs';
-import 'node:url';
-import 'node:os';
-import 'jiti';
-import 'rc9';
-import 'defu';
-import 'pkg-types';
-import 'dotenv';
+import { resolveModulePath } from "exsolve";
+import "node:fs";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import "node:url";
+import "node:os";
+import { join, normalize } from "pathe";
+import "jiti";
+import "rc9";
+import "defu";
+import "pkg-types";
+import { dirname, extname } from "node:path";
 
-const UPDATABLE_EXTS = [".js", ".ts", ".mjs", ".cjs", ".mts", ".cts"];
+//#region src/loader.ts
+const SUPPORTED_EXTENSIONS = Object.freeze([
+	".js",
+	".ts",
+	".mjs",
+	".cjs",
+	".mts",
+	".cts",
+	".json",
+	".jsonc",
+	".json5",
+	".yaml",
+	".yml",
+	".toml"
+]);
+
+//#endregion
+//#region src/update.ts
+const UPDATABLE_EXTS = [
+	".js",
+	".ts",
+	".mjs",
+	".cjs",
+	".mts",
+	".cts"
+];
+/**
+* @experimental Update a config file or create a new one.
+*/
 async function updateConfig(opts) {
-  const { parseModule } = await import('magicast');
-  let configFile = tryResolve(`./${opts.configFile}`, opts.cwd, SUPPORTED_EXTENSIONS) || tryResolve(
-    `./.config/${opts.configFile}`,
-    opts.cwd,
-    SUPPORTED_EXTENSIONS
-  ) || tryResolve(
-    `./.config/${opts.configFile.split(".")[0]}`,
-    opts.cwd,
-    SUPPORTED_EXTENSIONS
-  );
-  let created = false;
-  if (!configFile) {
-    configFile = join(
-      opts.cwd,
-      opts.configFile + (opts.createExtension || ".ts")
-    );
-    const createResult = await opts.onCreate?.({ configFile }) ?? true;
-    if (!createResult) {
-      throw new Error("Config file creation aborted.");
-    }
-    const content = typeof createResult === "string" ? createResult : `export default {}
-`;
-    await mkdir(dirname(configFile), { recursive: true });
-    await writeFile(configFile, content, "utf8");
-    created = true;
-  }
-  const ext = extname(configFile);
-  if (!UPDATABLE_EXTS.includes(ext)) {
-    throw new Error(
-      `Unsupported config file extension: ${ext} (${configFile}) (supported: ${UPDATABLE_EXTS.join(", ")})`
-    );
-  }
-  const contents = await readFile(configFile, "utf8");
-  const _module = parseModule(contents, opts.magicast);
-  const defaultExport = _module.exports.default;
-  if (!defaultExport) {
-    throw new Error("Default export is missing in the config file!");
-  }
-  const configObj = defaultExport.$type === "function-call" ? defaultExport.$args[0] : defaultExport;
-  await opts.onUpdate?.(configObj);
-  await writeFile(configFile, _module.generate().code);
-  return {
-    configFile,
-    created
-  };
+	const { parseModule } = await import("magicast");
+	let configFile = tryResolve(`./${opts.configFile}`, opts.cwd, SUPPORTED_EXTENSIONS) || tryResolve(`./.config/${opts.configFile}`, opts.cwd, SUPPORTED_EXTENSIONS) || tryResolve(`./.config/${opts.configFile.split(".")[0]}`, opts.cwd, SUPPORTED_EXTENSIONS);
+	let created = false;
+	if (!configFile) {
+		configFile = join(opts.cwd, opts.configFile + (opts.createExtension || ".ts"));
+		const createResult = await opts.onCreate?.({ configFile }) ?? true;
+		if (!createResult) throw new Error("Config file creation aborted.");
+		const content = typeof createResult === "string" ? createResult : `export default {}\n`;
+		await mkdir(dirname(configFile), { recursive: true });
+		await writeFile(configFile, content, "utf8");
+		created = true;
+	}
+	const ext = extname(configFile);
+	if (!UPDATABLE_EXTS.includes(ext)) throw new Error(`Unsupported config file extension: ${ext} (${configFile}) (supported: ${UPDATABLE_EXTS.join(", ")})`);
+	const _module = parseModule(await readFile(configFile, "utf8"), opts.magicast);
+	const defaultExport = _module.exports.default;
+	if (!defaultExport) throw new Error("Default export is missing in the config file!");
+	const configObj = defaultExport.$type === "function-call" ? defaultExport.$args[0] : defaultExport;
+	await opts.onUpdate?.(configObj);
+	await writeFile(configFile, _module.generate().code);
+	return {
+		configFile,
+		created
+	};
 }
 function tryResolve(path, cwd, extensions) {
-  const res = resolveModulePath(path, {
-    try: true,
-    from: join(cwd, "/"),
-    extensions,
-    suffixes: ["", "/index"],
-    cache: false
-  });
-  return res ? normalize(res) : void 0;
+	const res = resolveModulePath(path, {
+		try: true,
+		from: join(cwd, "/"),
+		extensions,
+		suffixes: ["", "/index"],
+		cache: false
+	});
+	return res ? normalize(res) : void 0;
 }
 
-export { updateConfig };
+//#endregion
+export { updateConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -21,10 +21,10 @@
     "dist"
   ],
   "scripts": {
-    "build": "automd && unbuild",
+    "build": "obuild",
     "dev": "vitest dev",
     "lint": "eslint . && prettier -c src test",
-    "lint:fix": "eslint . --fix && prettier -w src test",
+    "lint:fix": "automd && eslint . --fix && prettier -w src test",
     "prepack": "unbuild",
     "release": "pnpm build && pnpm test && changelogen --release --push --publish",
     "test": "pnpm lint && vitest run --coverage && pnpm test:types",
@@ -34,10 +34,10 @@
     "chokidar": "^4.0.3",
     "confbox": "^0.2.2",
     "defu": "^6.1.4",
-    "dotenv": "^17.2.2",
-    "exsolve": "^1.0.7",
+    "dotenv": "^17.2.3",
+    "exsolve": "^1.0.8",
     "giget": "^2.0.0",
-    "jiti": "^2.5.1",
+    "jiti": "^2.6.1",
     "ohash": "^2.0.11",
     "pathe": "^2.0.3",
     "perfect-debounce": "^2.0.0",
@@ -45,26 +45,26 @@
     "rc9": "^2.1.2"
   },
   "devDependencies": {
-    "@types/node": "^24.4.0",
-    "@vitest/coverage-v8": "^3.2.4",
-    "automd": "^0.4.0",
+    "@types/node": "^24.10.0",
+    "@vitest/coverage-v8": "^4.0.8",
+    "automd": "^0.4.2",
     "changelogen": "^0.6.2",
-    "eslint": "^9.35.0",
+    "eslint": "^9.39.1",
     "eslint-config-unjs": "^0.5.0",
     "expect-type": "^1.2.2",
-    "magicast": "^0.3.5",
+    "magicast": "^0.5.1",
+    "obuild": "^0.4.1",
     "prettier": "^3.6.2",
-    "typescript": "^5.9.2",
-    "unbuild": "^3.6.1",
-    "vitest": "^3.2.4"
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.8"
   },
   "peerDependencies": {
-    "magicast": "^0.3.5"
+    "magicast": "*"
   },
   "peerDependenciesMeta": {
     "magicast": {
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.16.1"
+  "packageManager": "pnpm@10.21.0"
 }

package/dist/shared/c12.Bzgyhsy6.mjs

@@ -1,418 +0,0 @@
-import { statSync, promises, existsSync } from 'node:fs';
-import { rm, readFile } from 'node:fs/promises';
-import { pathToFileURL } from 'node:url';
-import { homedir } from 'node:os';
-import { resolve, join, dirname, basename, extname, normalize } from 'pathe';
-import { resolveModulePath } from 'exsolve';
-import { createJiti } from 'jiti';
-import * as rc9 from 'rc9';
-import { defu } from 'defu';
-import { findWorkspaceDir, readPackageJSON } from 'pkg-types';
-import * as dotenv from 'dotenv';
-
-async function setupDotenv(options) {
-  const targetEnvironment = options.env ?? process.env;
-  const environment = await loadDotenv({
-    cwd: options.cwd,
-    fileName: options.fileName ?? ".env",
-    env: targetEnvironment,
-    interpolate: options.interpolate ?? true
-  });
-  const dotenvVars = getDotEnvVars(targetEnvironment);
-  for (const key in environment) {
-    if (key.startsWith("_")) {
-      continue;
-    }
-    if (targetEnvironment[key] === void 0 || dotenvVars.has(key)) {
-      targetEnvironment[key] = environment[key];
-    }
-  }
-  return environment;
-}
-async function loadDotenv(options) {
-  const environment = /* @__PURE__ */ Object.create(null);
-  const cwd = resolve(options.cwd || ".");
-  const _fileName = options.fileName || ".env";
-  const dotenvFiles = typeof _fileName === "string" ? [_fileName] : _fileName;
-  const dotenvVars = getDotEnvVars(options.env || {});
-  Object.assign(environment, options.env);
-  for (const file of dotenvFiles) {
-    const dotenvFile = resolve(cwd, file);
-    if (!statSync(dotenvFile, { throwIfNoEntry: false })?.isFile()) {
-      continue;
-    }
-    const parsed = dotenv.parse(await promises.readFile(dotenvFile, "utf8"));
-    for (const key in parsed) {
-      if (key in environment && !dotenvVars.has(key)) {
-        continue;
-      }
-      environment[key] = parsed[key];
-      dotenvVars.add(key);
-    }
-  }
-  if (options.interpolate) {
-    interpolate(environment);
-  }
-  return environment;
-}
-function interpolate(target, source = {}, parse = (v) => v) {
-  function getValue(key) {
-    return source[key] === void 0 ? target[key] : source[key];
-  }
-  function interpolate2(value, parents = []) {
-    if (typeof value !== "string") {
-      return value;
-    }
-    const matches = value.match(/(.?\${?(?:[\w:]+)?}?)/g) || [];
-    return parse(
-      // eslint-disable-next-line unicorn/no-array-reduce
-      matches.reduce((newValue, match) => {
-        const parts = /(.?)\${?([\w:]+)?}?/g.exec(match) || [];
-        const prefix = parts[1];
-        let value2, replacePart;
-        if (prefix === "\\") {
-          replacePart = parts[0] || "";
-          value2 = replacePart.replace(String.raw`\$`, "$");
-        } else {
-          const key = parts[2];
-          replacePart = (parts[0] || "").slice(prefix.length);
-          if (parents.includes(key)) {
-            console.warn(
-              `Please avoid recursive environment variables ( loop: ${parents.join(
-                " > "
-              )} > ${key} )`
-            );
-            return "";
-          }
-          value2 = getValue(key);
-          value2 = interpolate2(value2, [...parents, key]);
-        }
-        return value2 === void 0 ? newValue : newValue.replace(replacePart, value2);
-      }, value)
-    );
-  }
-  for (const key in target) {
-    target[key] = interpolate2(getValue(key));
-  }
-}
-function getDotEnvVars(targetEnvironment) {
-  const globalRegistry = globalThis.__c12_dotenv_vars__ ||= /* @__PURE__ */ new Map();
-  if (!globalRegistry.has(targetEnvironment)) {
-    globalRegistry.set(targetEnvironment, /* @__PURE__ */ new Set());
-  }
-  return globalRegistry.get(targetEnvironment);
-}
-
-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 = Object.freeze([
-  // 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";
-  options.envName = options.envName ?? process.env.NODE_ENV;
-  options.configFile = options.configFile ?? (options.name === "config" ? "config" : `${options.name}.config`);
-  options.rcFile = options.rcFile ?? `.${options.name}rc`;
-  if (options.extend !== false) {
-    options.extend = {
-      extendKey: "extends",
-      ...options.extend
-    };
-  }
-  const _merger = options.merger || defu;
-  options.jiti = options.jiti || createJiti(join(options.cwd, options.configFile), {
-    interopDefault: true,
-    moduleCache: false,
-    extensions: [...SUPPORTED_EXTENSIONS],
-    ...options.jitiOptions
-  });
-  const r = {
-    config: {},
-    cwd: options.cwd,
-    configFile: resolve(options.cwd, options.configFile),
-    layers: [],
-    _configFile: void 0
-  };
-  const rawConfigs = {
-    overrides: options.overrides,
-    main: void 0,
-    rc: void 0,
-    packageJson: void 0,
-    defaultConfig: options.defaultConfig
-  };
-  if (options.dotenv) {
-    await setupDotenv({
-      cwd: options.cwd,
-      ...options.dotenv === true ? {} : options.dotenv
-    });
-  }
-  const _mainConfig = await resolveConfig(".", options);
-  if (_mainConfig.configFile) {
-    rawConfigs.main = _mainConfig.config;
-    r.configFile = _mainConfig.configFile;
-    r._configFile = _mainConfig._configFile;
-  }
-  if (_mainConfig.meta) {
-    r.meta = _mainConfig.meta;
-  }
-  if (options.rcFile) {
-    const rcSources = [];
-    rcSources.push(rc9.read({ name: options.rcFile, dir: options.cwd }));
-    if (options.globalRc) {
-      const workspaceDir = await findWorkspaceDir(options.cwd).catch(() => {
-      });
-      if (workspaceDir) {
-        rcSources.push(rc9.read({ name: options.rcFile, dir: workspaceDir }));
-      }
-      rcSources.push(rc9.readUser({ name: options.rcFile, dir: options.cwd }));
-    }
-    rawConfigs.rc = _merger({}, ...rcSources);
-  }
-  if (options.packageJson) {
-    const keys = (Array.isArray(options.packageJson) ? options.packageJson : [
-      typeof options.packageJson === "string" ? options.packageJson : options.name
-    ]).filter((t) => t && typeof t === "string");
-    const pkgJsonFile = await readPackageJSON(options.cwd).catch(() => {
-    });
-    const values = keys.map((key) => pkgJsonFile?.[key]);
-    rawConfigs.packageJson = _merger({}, ...values);
-  }
-  const configs = {};
-  for (const key in rawConfigs) {
-    const value = rawConfigs[key];
-    configs[key] = await (typeof value === "function" ? value({ configs, rawConfigs }) : value);
-  }
-  if (Array.isArray(configs.main)) {
-    r.config = configs.main;
-  } else {
-    r.config = _merger(
-      configs.overrides,
-      configs.main,
-      configs.rc,
-      configs.packageJson,
-      configs.defaultConfig
-    );
-    if (options.extend) {
-      await extendConfig(r.config, options);
-      r.layers = r.config._layers;
-      delete r.config._layers;
-      r.config = _merger(r.config, ...r.layers.map((e) => e.config));
-    }
-  }
-  const baseLayers = [
-    configs.overrides && {
-      config: configs.overrides,
-      configFile: void 0,
-      cwd: void 0
-    },
-    { config: configs.main, configFile: options.configFile, cwd: options.cwd },
-    configs.rc && { config: configs.rc, configFile: options.rcFile },
-    configs.packageJson && {
-      config: configs.packageJson,
-      configFile: "package.json"
-    }
-  ].filter((l) => l && l.config);
-  r.layers = [...baseLayers, ...r.layers];
-  if (options.defaults) {
-    r.config = _merger(r.config, options.defaults);
-  }
-  if (options.omit$Keys) {
-    for (const key in r.config) {
-      if (key.startsWith("$")) {
-        delete r.config[key];
-      }
-    }
-  }
-  if (options.configFileRequired && !r._configFile) {
-    throw new Error(`Required config (${r.configFile}) cannot be resolved.`);
-  }
-  return r;
-}
-async function extendConfig(config, options) {
-  config._layers = config._layers || [];
-  if (!options.extend) {
-    return;
-  }
-  let keys = options.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 (let extendSource of extendSources) {
-    const originalExtendSource = extendSource;
-    let sourceOptions = {};
-    if (extendSource.source) {
-      sourceOptions = extendSource.options || {};
-      extendSource = extendSource.source;
-    }
-    if (Array.isArray(extendSource)) {
-      sourceOptions = extendSource[1] || {};
-      extendSource = extendSource[0];
-    }
-    if (typeof extendSource !== "string") {
-      console.warn(
-        `Cannot extend config from \`${JSON.stringify(
-          originalExtendSource
-        )}\` in ${options.cwd}`
-      );
-      continue;
-    }
-    const _config = await resolveConfig(extendSource, options, sourceOptions);
-    if (!_config.config) {
-      console.warn(
-        `Cannot extend config from \`${extendSource}\` in ${options.cwd}`
-      );
-      continue;
-    }
-    await extendConfig(_config.config, { ...options, cwd: _config.cwd });
-    config._layers.push(_config);
-    if (_config.config._layers) {
-      config._layers.push(..._config.config._layers);
-      delete _config.config._layers;
-    }
-  }
-}
-const GIGET_PREFIXES = [
-  "gh:",
-  "github:",
-  "gitlab:",
-  "bitbucket:",
-  "https://",
-  "http://"
-];
-const NPM_PACKAGE_RE = /^(@[\da-z~-][\d._a-z~-]*\/)?[\da-z~-][\d._a-z~-]*($|\/.*)/;
-async function resolveConfig(source, options, sourceOptions = {}) {
-  const originalSource = source;
-  if (options.resolve) {
-    const res2 = await options.resolve(source, options);
-    if (res2) {
-      return res2;
-    }
-  }
-  const _merger = options.merger || defu;
-  const customProviderKeys = Object.keys(
-    sourceOptions.giget?.providers || {}
-  ).map((key) => `${key}:`);
-  const gigetPrefixes = customProviderKeys.length > 0 ? [.../* @__PURE__ */ new Set([...customProviderKeys, ...GIGET_PREFIXES])] : GIGET_PREFIXES;
-  if (options.giget !== false && gigetPrefixes.some((prefix) => source.startsWith(prefix))) {
-    const { downloadTemplate } = await import('giget');
-    const { digest } = await import('ohash');
-    const cloneName = source.replace(/\W+/g, "_").split("_").splice(0, 3).join("_") + "_" + digest(source).slice(0, 10).replace(/[-_]/g, "");
-    let cloneDir;
-    const localNodeModules = resolve(options.cwd, "node_modules");
-    const parentDir = dirname(options.cwd);
-    if (basename(parentDir) === ".c12") {
-      cloneDir = join(parentDir, cloneName);
-    } else if (existsSync(localNodeModules)) {
-      cloneDir = join(localNodeModules, ".c12", cloneName);
-    } else {
-      cloneDir = process.env.XDG_CACHE_HOME ? resolve(process.env.XDG_CACHE_HOME, "c12", cloneName) : resolve(homedir(), ".cache/c12", cloneName);
-    }
-    if (existsSync(cloneDir) && !sourceOptions.install) {
-      await rm(cloneDir, { recursive: true });
-    }
-    const cloned = await downloadTemplate(source, {
-      dir: cloneDir,
-      install: sourceOptions.install,
-      force: sourceOptions.install,
-      auth: sourceOptions.auth,
-      ...options.giget,
-      ...sourceOptions.giget
-    });
-    source = cloned.dir;
-  }
-  if (NPM_PACKAGE_RE.test(source)) {
-    source = tryResolve(source, options) || 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;
-  }
-  const res = {
-    config: void 0,
-    configFile: void 0,
-    cwd,
-    source,
-    sourceOptions
-  };
-  res.configFile = tryResolve(resolve(cwd, source), options) || tryResolve(
-    resolve(cwd, ".config", source.replace(/\.config$/, "")),
-    options
-  ) || tryResolve(resolve(cwd, ".config", source), options) || tryResolve(resolve(options.cwd || cwd, originalSource), options) || source;
-  if (!existsSync(res.configFile)) {
-    return res;
-  }
-  res._configFile = res.configFile;
-  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 = await options.jiti.import(res.configFile, {
-      default: true
-    });
-  }
-  if (typeof res.config === "function") {
-    res.config = await res.config(options.context);
-  }
-  if (options.envName) {
-    const envConfig = {
-      ...res.config["$" + options.envName],
-      ...res.config.$env?.[options.envName]
-    };
-    if (Object.keys(envConfig).length > 0) {
-      res.config = _merger(envConfig, res.config);
-    }
-  }
-  res.meta = defu(res.sourceOptions.meta, res.config.$meta);
-  delete res.config.$meta;
-  if (res.sourceOptions.overrides) {
-    res.config = _merger(res.sourceOptions.overrides, res.config);
-  }
-  res.configFile = _normalize(res.configFile);
-  res.source = _normalize(res.source);
-  return res;
-}
-function tryResolve(id, options) {
-  const res = resolveModulePath(id, {
-    try: true,
-    from: pathToFileURL(join(options.cwd || ".", options.configFile || "/")),
-    suffixes: ["", "/index"],
-    extensions: SUPPORTED_EXTENSIONS,
-    cache: false
-  });
-  return res ? normalize(res) : void 0;
-}
-
-export { SUPPORTED_EXTENSIONS as S, loadDotenv as a, loadConfig as l, setupDotenv as s };