c12 1.0.1 → 1.1.1

package/dist/index.cjs

@@ -3,7 +3,8 @@
 const node_fs = require('node:fs');
 const pathe = require('pathe');
 const dotenv = require('dotenv');
-const os = require('node:os');
+const promises = require('node:fs/promises');
+const node_os = require('node:os');
 const createJiti = require('jiti');
 const rc9 = require('rc9');
 const defu = require('defu');
@@ -63,25 +64,32 @@ function interpolate(target, source = {}, parse = (v) => v) {
       return value;
     }
     const matches = value.match(/(.?\${?(?:[\w:]+)?}?)/g) || [];
-    return parse(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("\\$", "$");
-      } 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 "";
+    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("\\$", "$");
+        } 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]);
         }
-        value2 = getValue(key);
-        value2 = interpolate2(value2, [...parents, key]);
-      }
-      return value2 !== void 0 ? newValue.replace(replacePart, value2) : newValue;
-    }, value));
+        return value2 !== void 0 ? newValue.replace(replacePart, value2) : newValue;
+      }, value)
+    );
   }
   for (const key in target) {
     target[key] = interpolate2(getValue(key));
@@ -124,14 +132,23 @@ async function loadConfig(options) {
   const configRC = {};
   if (options.rcFile) {
     if (options.globalRc) {
-      Object.assign(configRC, rc9__namespace.readUser({ name: options.rcFile, dir: options.cwd }));
+      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 }));
+        Object.assign(
+          configRC,
+          rc9__namespace.read({ name: options.rcFile, dir: workspaceDir })
+        );
       }
     }
-    Object.assign(configRC, rc9__namespace.read({ name: options.rcFile, dir: options.cwd }));
+    Object.assign(
+      configRC,
+      rc9__namespace.read({ name: options.rcFile, dir: options.cwd })
+    );
   }
   r.config = defu.defu(
     options.overrides,
@@ -143,20 +160,18 @@ async function loadConfig(options) {
     await extendConfig(r.config, options);
     r.layers = r.config._layers;
     delete r.config._layers;
-    r.config = defu.defu(
-      r.config,
-      ...r.layers.map((e) => e.config)
-    );
+    r.config = defu.defu(r.config, ...r.layers.map((e) => e.config));
   }
   const baseLayers = [
-    options.overrides && { config: options.overrides, configFile: void 0, cwd: void 0 },
+    options.overrides && {
+      config: options.overrides,
+      configFile: void 0,
+      cwd: void 0
+    },
     { config, configFile: options.configFile, cwd: options.cwd },
     options.rcFile && { config: configRC, configFile: options.rcFile }
   ].filter((l) => l && l.config);
-  r.layers = [
-    ...baseLayers,
-    ...r.layers
-  ];
+  r.layers = [...baseLayers, ...r.layers];
   if (options.defaults) {
     r.config = defu.defu(r.config, options.defaults);
   }
@@ -173,17 +188,27 @@ async function extendConfig(config, options) {
   }
   const extendSources = [];
   for (const key of keys) {
-    extendSources.push(...(Array.isArray(config[key]) ? config[key] : [config[key]]).filter(Boolean));
+    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 ${options.cwd}`);
+      console.warn(
+        `Cannot extend config from \`${JSON.stringify(
+          extendSource
+        )}\` (which should be a string) in ${options.cwd}`
+      );
       continue;
     }
     const _config = await resolveConfig(extendSource, options);
     if (!_config.config) {
-      console.warn(`Cannot extend config from \`${extendSource}\` in ${options.cwd}`);
+      console.warn(
+        `Cannot extend config from \`${extendSource}\` in ${options.cwd}`
+      );
       continue;
     }
     await extendConfig(_config.config, { ...options, cwd: _config.cwd });
@@ -204,16 +229,16 @@ async function resolveConfig(source, options) {
     }
   }
   if (GIT_PREFIXES.some((prefix) => source.startsWith(prefix))) {
+    const { downloadTemplate } = await import('giget');
     const url = new URL(source);
-    const subPath = url.pathname.split("/").slice(2).join("/");
     const gitRepo = url.protocol + url.pathname.split("/").slice(0, 2).join("/");
-    const tmpdir = pathe.resolve(os.tmpdir(), "c12/", gitRepo.replace(/[#/:@\\]/g, "_"));
-    await node_fs.promises.rm(tmpdir, { recursive: true }).catch(() => {
-    });
-    const gittar = await import('gittar').then((r) => r.default || r);
-    const tarFile = await gittar.fetch(gitRepo);
-    await gittar.extract(tarFile, tmpdir);
-    source = pathe.resolve(tmpdir, subPath);
+    const name = gitRepo.replace(/[#/:@\\]/g, "_");
+    const tmpDir = process.env.XDG_CACHE_HOME ? pathe.resolve(process.env.XDG_CACHE_HOME, "c12", name) : pathe.resolve(node_os.homedir(), ".cache/c12", name);
+    if (node_fs.existsSync(tmpDir)) {
+      await promises.rmdir(tmpDir, { recursive: true });
+    }
+    const clonned = await downloadTemplate(source, { dir: tmpDir });
+    source = clonned.dir;
   }
   if (NPM_PACKAGE_RE.test(source)) {
     try {
@@ -228,7 +253,9 @@ async function resolveConfig(source, options) {
   }
   const res = { config: void 0, cwd };
   try {
-    res.configFile = options.jiti.resolve(pathe.resolve(cwd, source), { paths: [cwd] });
+    res.configFile = options.jiti.resolve(pathe.resolve(cwd, source), {
+      paths: [cwd]
+    });
   } catch {
   }
   if (!node_fs.existsSync(res.configFile)) {

package/dist/index.d.ts

@@ -4,12 +4,12 @@ import { JITIOptions } from 'jiti/dist/types';
 interface DotenvOptions {
     /**
      * The project root directory (either absolute or relative to the current working directory).
-    */
+     */
     cwd: string;
     /**
      * What file to look in for environment variables (either absolute or relative
      * to the current working directory). For example, `.env`.
-    */
+     */
     fileName?: string;
     /**
      * Whether to interpolate variables within .env.
@@ -24,10 +24,10 @@ interface DotenvOptions {
     interpolate?: boolean;
     /**
      * An object describing environment variables (key, value pairs).
-    */
+     */
     env?: NodeJS.ProcessEnv;
 }
-declare type Env = typeof process.env;
+type Env = typeof process.env;
 /**
  * Load and interpolate environment variables into `process.env`.
  * If you need more control (or access to the values), consider using `loadDotenv` instead

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { existsSync, promises } from 'node:fs';
 import { resolve, extname, dirname } from 'pathe';
 import * as dotenv from 'dotenv';
-import os from 'node:os';
+import { rmdir } from 'node:fs/promises';
+import { homedir } from 'node:os';
 import createJiti from 'jiti';
 import * as rc9 from 'rc9';
 import { defu } from 'defu';
@@ -47,25 +48,32 @@ function interpolate(target, source = {}, parse = (v) => v) {
       return value;
     }
     const matches = value.match(/(.?\${?(?:[\w:]+)?}?)/g) || [];
-    return parse(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("\\$", "$");
-      } 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 "";
+    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("\\$", "$");
+        } 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]);
         }
-        value2 = getValue(key);
-        value2 = interpolate2(value2, [...parents, key]);
-      }
-      return value2 !== void 0 ? newValue.replace(replacePart, value2) : newValue;
-    }, value));
+        return value2 !== void 0 ? newValue.replace(replacePart, value2) : newValue;
+      }, value)
+    );
   }
   for (const key in target) {
     target[key] = interpolate2(getValue(key));
@@ -108,14 +116,23 @@ async function loadConfig(options) {
   const configRC = {};
   if (options.rcFile) {
     if (options.globalRc) {
-      Object.assign(configRC, rc9.readUser({ name: options.rcFile, dir: options.cwd }));
+      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 }));
+        Object.assign(
+          configRC,
+          rc9.read({ name: options.rcFile, dir: workspaceDir })
+        );
       }
     }
-    Object.assign(configRC, rc9.read({ name: options.rcFile, dir: options.cwd }));
+    Object.assign(
+      configRC,
+      rc9.read({ name: options.rcFile, dir: options.cwd })
+    );
   }
   r.config = defu(
     options.overrides,
@@ -127,20 +144,18 @@ async function loadConfig(options) {
     await extendConfig(r.config, options);
     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 = [
-    options.overrides && { config: options.overrides, configFile: void 0, cwd: void 0 },
+    options.overrides && {
+      config: options.overrides,
+      configFile: void 0,
+      cwd: void 0
+    },
     { config, configFile: options.configFile, cwd: options.cwd },
     options.rcFile && { config: configRC, configFile: options.rcFile }
   ].filter((l) => l && l.config);
-  r.layers = [
-    ...baseLayers,
-    ...r.layers
-  ];
+  r.layers = [...baseLayers, ...r.layers];
   if (options.defaults) {
     r.config = defu(r.config, options.defaults);
   }
@@ -157,17 +172,27 @@ async function extendConfig(config, options) {
   }
   const extendSources = [];
   for (const key of keys) {
-    extendSources.push(...(Array.isArray(config[key]) ? config[key] : [config[key]]).filter(Boolean));
+    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 ${options.cwd}`);
+      console.warn(
+        `Cannot extend config from \`${JSON.stringify(
+          extendSource
+        )}\` (which should be a string) in ${options.cwd}`
+      );
       continue;
     }
     const _config = await resolveConfig(extendSource, options);
     if (!_config.config) {
-      console.warn(`Cannot extend config from \`${extendSource}\` in ${options.cwd}`);
+      console.warn(
+        `Cannot extend config from \`${extendSource}\` in ${options.cwd}`
+      );
       continue;
     }
     await extendConfig(_config.config, { ...options, cwd: _config.cwd });
@@ -188,16 +213,16 @@ async function resolveConfig(source, options) {
     }
   }
   if (GIT_PREFIXES.some((prefix) => source.startsWith(prefix))) {
+    const { downloadTemplate } = await import('giget');
     const url = new URL(source);
-    const subPath = url.pathname.split("/").slice(2).join("/");
     const gitRepo = url.protocol + url.pathname.split("/").slice(0, 2).join("/");
-    const tmpdir = resolve(os.tmpdir(), "c12/", gitRepo.replace(/[#/:@\\]/g, "_"));
-    await promises.rm(tmpdir, { recursive: true }).catch(() => {
-    });
-    const gittar = await import('gittar').then((r) => r.default || r);
-    const tarFile = await gittar.fetch(gitRepo);
-    await gittar.extract(tarFile, tmpdir);
-    source = resolve(tmpdir, subPath);
+    const name = gitRepo.replace(/[#/:@\\]/g, "_");
+    const tmpDir = process.env.XDG_CACHE_HOME ? resolve(process.env.XDG_CACHE_HOME, "c12", name) : resolve(homedir(), ".cache/c12", name);
+    if (existsSync(tmpDir)) {
+      await rmdir(tmpDir, { recursive: true });
+    }
+    const clonned = await downloadTemplate(source, { dir: tmpDir });
+    source = clonned.dir;
   }
   if (NPM_PACKAGE_RE.test(source)) {
     try {
@@ -212,7 +237,9 @@ async function resolveConfig(source, options) {
   }
   const res = { config: void 0, cwd };
   try {
-    res.configFile = options.jiti.resolve(resolve(cwd, source), { paths: [cwd] });
+    res.configFile = options.jiti.resolve(resolve(cwd, source), {
+      paths: [cwd]
+    });
   } catch {
   }
   if (!existsSync(res.configFile)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c12",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "Smart Config Loader",
   "repository": "unjs/c12",
   "license": "MIT",
@@ -19,31 +19,34 @@
   "files": [
     "dist"
   ],
+  "scripts": {
+    "build": "unbuild",
+    "dev": "vitest dev",
+    "lint": "eslint --ext .ts,.js,.mjs,.cjs . && prettier -c src test",
+    "lint:fix": "eslint --ext .ts,.js,.mjs,.cjs . --fix && prettier -w src test",
+    "prepack": "unbuild",
+    "release": "pnpm test && changelogen --release && npm publish && git push --follow-tags",
+    "test": "vitest run --coverage"
+  },
   "dependencies": {
-    "defu": "^6.1.1",
+    "defu": "^6.1.2",
     "dotenv": "^16.0.3",
-    "gittar": "^0.1.1",
-    "jiti": "^1.16.0",
-    "mlly": "^1.0.0",
-    "pathe": "^1.0.0",
+    "giget": "^1.0.0",
+    "jiti": "^1.17.0",
+    "mlly": "^1.1.1",
+    "pathe": "^1.1.0",
     "pkg-types": "^1.0.1",
-    "rc9": "^2.0.0"
+    "rc9": "^2.0.1"
   },
   "devDependencies": {
-    "@vitest/coverage-c8": "^0.25.2",
-    "eslint": "^8.27.0",
-    "eslint-config-unjs": "^0.0.2",
-    "standard-version": "^9.5.0",
-    "typescript": "^4.8.4",
-    "unbuild": "^0.9.4",
-    "vitest": "^0.25.2"
+    "@vitest/coverage-c8": "^0.28.5",
+    "changelogen": "^0.4.1",
+    "eslint": "^8.34.0",
+    "eslint-config-unjs": "^0.1.0",
+    "prettier": "^2.8.4",
+    "typescript": "^4.9.5",
+    "unbuild": "^1.1.1",
+    "vitest": "^0.28.5"
   },
-  "packageManager": "pnpm@7.16.0",
-  "scripts": {
-    "build": "unbuild",
-    "dev": "vitest dev",
-    "lint": "eslint --ext .ts,.js,.mjs,.cjs .",
-    "release": "pnpm test && standard-version && git push --follow-tags && pnpm publish",
-    "test": "vitest run --coverage"
-  }
-}
+  "packageManager": "pnpm@7.27.0"
+}