giget 1.1.0 → 1.1.2

package/README.md

@@ -113,10 +113,10 @@ Import:
 
 ```js
 // ESM
-import { downloadTemplate } from 'giget'
+import { downloadTemplate } from "giget";
 
 // CommonJS
-const { downloadTemplate } = require('giget')
+const { downloadTemplate } = require("giget");
 ```
 
 ### `downloadTemplate(source, options?)`
@@ -124,7 +124,7 @@ const { downloadTemplate } = require('giget')
 **Example:**
 
 ```js
-const { source, dir } = await downloadTemplate('github:unjs/template')
+const { source, dir } = await downloadTemplate("github:unjs/template");
 ```
 
 **Options:**
@@ -159,19 +159,21 @@ The return value is a promise that resolves to the resolved template.
 Using programmatic method, you can make your own custom template providers.
 
 ```ts
-import type { TemplateProvider } from 'giget'
+import type { TemplateProvider } from "giget";
 
 const rainbow: TemplateProvider = async (input, { auth }) => {
   return {
-    name: 'rainbow',
+    name: "rainbow",
     version: input,
-    headers: { Authorization: auth },
+    headers: { authorization: auth },
     url: `https://rainbow.template/?variant=${input}`,
-    tar: `https://rainbow.template/dl/rainbow.${input}.tar.gz`
-  }
-}
+    tar: `https://rainbow.template/dl/rainbow.${input}.tar.gz`,
+  };
+};
 
-const { source, dir } = await downloadRepo('rainbow:one', { providers: { rainbow } })
+const { source, dir } = await downloadRepo("rainbow:one", {
+  providers: { rainbow },
+});
 ```
 
 ### Custom Registry Providers
@@ -179,11 +181,15 @@ const { source, dir } = await downloadRepo('rainbow:one', { providers: { rainbow
 You can define additional [custom registry](#custom-registry) providers using `registryProvider` utility and register to `providers`.
 
 ```ts
-import { registryProvider } from 'giget'
+import { registryProvider } from "giget";
 
-const themes = registryProvider('https://raw.githubusercontent.com/unjs/giget/main/templates')
+const themes = registryProvider(
+  "https://raw.githubusercontent.com/unjs/giget/main/templates"
+);
 
-const { source, dir } = await downloadRepo('themes:test', { providers: { themes } })
+const { source, dir } = await downloadRepo("themes:test", {
+  providers: { themes },
+});
 ```
 
 ## Related projects

package/dist/cli.cjs

@@ -4,7 +4,7 @@
 const node_path = require('node:path');
 const mri = require('mri');
 const colorette = require('colorette');
-const giget = require('./shared/giget.51477975.cjs');
+const giget = require('./shared/giget.a16f8b31.cjs');
 require('node:fs/promises');
 require('node:fs');
 require('tar');

package/dist/cli.mjs

@@ -2,7 +2,7 @@
 import { relative } from 'node:path';
 import mri from 'mri';
 import { cyan } from 'colorette';
-import { d as downloadTemplate, s as startShell } from './shared/giget.6c52cb03.mjs';
+import { d as downloadTemplate, s as startShell } from './shared/giget.093c29e5.mjs';
 import 'node:fs/promises';
 import 'node:fs';
 import 'tar';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const giget = require('./shared/giget.51477975.cjs');
+const giget = require('./shared/giget.a16f8b31.cjs');
 require('node:fs/promises');
 require('node:fs');
 require('tar');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { d as downloadTemplate, r as registryProvider, s as startShell } from './shared/giget.6c52cb03.mjs';
+export { d as downloadTemplate, r as registryProvider, s as startShell } from './shared/giget.093c29e5.mjs';
 import 'node:fs/promises';
 import 'node:fs';
 import 'tar';

package/dist/shared/{giget.6c52cb03.mjs → giget.093c29e5.mjs}

@@ -48,14 +48,31 @@ function debug(...arguments_) {
     console.debug("[giget]", ...arguments_);
   }
 }
-async function sendFetch(url, options) {
-  const proxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy;
-  const requestOptions = proxy ? { agent: createHttpsProxyAgent(proxy), ...options } : options;
-  return await fetch(url, requestOptions);
+async function sendFetch(url, options = {}) {
+  if (!options.agent) {
+    const proxyEnv = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy;
+    if (proxyEnv) {
+      options.agent = createHttpsProxyAgent(proxyEnv);
+    }
+  }
+  if (options?.headers) {
+    options.headers = normalizeHeaders(options.headers);
+  }
+  return await fetch(url, options);
 }
 function cacheDirectory() {
   return process.env.XDG_CACHE_HOME ? resolve(process.env.XDG_CACHE_HOME, "giget") : resolve(homedir(), ".cache/giget");
 }
+function normalizeHeaders(headers = {}) {
+  const normalized = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (!value) {
+      continue;
+    }
+    normalized[key.toLowerCase()] = value;
+  }
+  return normalized;
+}
 function currentShell() {
   if (process.env.SHELL) {
     return process.env.SHELL;
@@ -86,7 +103,7 @@ const github = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `${github2}/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `${github2}/${parsed.repo}/archive/${parsed.ref}.tar.gz`
@@ -100,7 +117,7 @@ const gitlab = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `${gitlab2}/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `${gitlab2}/${parsed.repo}/-/archive/${parsed.ref}.tar.gz`
@@ -113,7 +130,7 @@ const bitbucket = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `https://bitbucket.com/${parsed.repo}/src/${parsed.ref}${parsed.subdir}`,
     tar: `https://bitbucket.org/${parsed.repo}/get/${parsed.ref}.tar.gz`
@@ -126,7 +143,7 @@ const sourcehut = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `https://git.sr.ht/~${parsed.repo}/tree/${parsed.ref}/item${parsed.subdir}`,
     tar: `https://git.sr.ht/~${parsed.repo}/archive/${parsed.ref}.tar.gz`
@@ -148,7 +165,7 @@ const registryProvider = (registryEndpoint = DEFAULT_REGISTRY, options) => {
     const registryURL = `${registryEndpoint}/${input}.json`;
     const result = await sendFetch(registryURL, {
       headers: {
-        Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+        authorization: options.auth ? `Bearer ${options.auth}` : void 0
       }
     });
     if (result.status >= 400) {
@@ -227,7 +244,7 @@ async function downloadTemplate(input, options = {}) {
     await download(template.tar, tarPath, {
       headers: {
         authorization: options.auth ? `Bearer ${options.auth}` : void 0,
-        ...template.headers
+        ...normalizeHeaders(template.headers)
       }
     }).catch((error) => {
       if (!existsSync(tarPath)) {

package/dist/shared/{giget.51477975.cjs → giget.a16f8b31.cjs}

@@ -50,14 +50,31 @@ function debug(...arguments_) {
     console.debug("[giget]", ...arguments_);
   }
 }
-async function sendFetch(url, options) {
-  const proxy = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy;
-  const requestOptions = proxy ? { agent: createHttpsProxyAgent(proxy), ...options } : options;
-  return await nodeFetchNative.fetch(url, requestOptions);
+async function sendFetch(url, options = {}) {
+  if (!options.agent) {
+    const proxyEnv = process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy;
+    if (proxyEnv) {
+      options.agent = createHttpsProxyAgent(proxyEnv);
+    }
+  }
+  if (options?.headers) {
+    options.headers = normalizeHeaders(options.headers);
+  }
+  return await nodeFetchNative.fetch(url, options);
 }
 function cacheDirectory() {
   return process.env.XDG_CACHE_HOME ? pathe.resolve(process.env.XDG_CACHE_HOME, "giget") : pathe.resolve(node_os.homedir(), ".cache/giget");
 }
+function normalizeHeaders(headers = {}) {
+  const normalized = {};
+  for (const [key, value] of Object.entries(headers)) {
+    if (!value) {
+      continue;
+    }
+    normalized[key.toLowerCase()] = value;
+  }
+  return normalized;
+}
 function currentShell() {
   if (process.env.SHELL) {
     return process.env.SHELL;
@@ -88,7 +105,7 @@ const github = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `${github2}/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `${github2}/${parsed.repo}/archive/${parsed.ref}.tar.gz`
@@ -102,7 +119,7 @@ const gitlab = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `${gitlab2}/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `${gitlab2}/${parsed.repo}/-/archive/${parsed.ref}.tar.gz`
@@ -115,7 +132,7 @@ const bitbucket = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `https://bitbucket.com/${parsed.repo}/src/${parsed.ref}${parsed.subdir}`,
     tar: `https://bitbucket.org/${parsed.repo}/get/${parsed.ref}.tar.gz`
@@ -128,7 +145,7 @@ const sourcehut = (input, options) => {
     version: parsed.ref,
     subdir: parsed.subdir,
     headers: {
-      Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+      authorization: options.auth ? `Bearer ${options.auth}` : void 0
     },
     url: `https://git.sr.ht/~${parsed.repo}/tree/${parsed.ref}/item${parsed.subdir}`,
     tar: `https://git.sr.ht/~${parsed.repo}/archive/${parsed.ref}.tar.gz`
@@ -150,7 +167,7 @@ const registryProvider = (registryEndpoint = DEFAULT_REGISTRY, options) => {
     const registryURL = `${registryEndpoint}/${input}.json`;
     const result = await sendFetch(registryURL, {
       headers: {
-        Authorization: options.auth ? `Bearer ${options.auth}` : void 0
+        authorization: options.auth ? `Bearer ${options.auth}` : void 0
       }
     });
     if (result.status >= 400) {
@@ -229,7 +246,7 @@ async function downloadTemplate(input, options = {}) {
     await download(template.tar, tarPath, {
       headers: {
         authorization: options.auth ? `Bearer ${options.auth}` : void 0,
-        ...template.headers
+        ...normalizeHeaders(template.headers)
       }
     }).catch((error) => {
       if (!node_fs.existsSync(tarPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "giget",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Download templates and git repositories with pleasure!",
   "repository": "unjs/giget",
   "license": "MIT",
@@ -49,10 +49,10 @@
     "changelogen": "^0.4.1",
     "eslint": "^8.34.0",
     "eslint-config-unjs": "^0.1.0",
-    "jiti": "^1.17.0",
+    "jiti": "^1.17.1",
     "prettier": "^2.8.4",
     "typescript": "^4.9.5",
-    "unbuild": "^1.1.1",
+    "unbuild": "^1.1.2",
     "vitest": "^0.28.5"
   },
   "packageManager": "pnpm@7.27.0"