giget 0.1.4 → 0.1.6

package/README.md

@@ -9,7 +9,7 @@
 
 ## Features
 
-✔ Support popular git providers (GitHub, GitLab, and Bitbucket) out of the box.
+✔ Support popular git providers (GitHub, GitLab, Bitbucket, Sourcehut) out of the box.
 
 ✔ Built-in and custom [template registry](#template-registry).
 
@@ -21,6 +21,8 @@
 
 ✔ Support extracting with a subdir.
 
+✔ Authorization support to download private templates
+
 ## Usage (CLI)
 
 ```bash
@@ -39,13 +41,18 @@ npx giget@latest <template> [<dir>] [...options]
 - `--prefer-offline`: Use cache if exists otherwise try to download.
 - `--force-clean`: ⚠️ Remove any existing directory or file recusively before cloning.
 - `--shell`: ⚠️ Open a new shell with current working directory in cloned dir. (Experimental).
-- `--registry`: URL to a custom registry.
+- `--registry`: URL to a custom registry. (Can be overriden with `GIGET_REGISTRY` environment variable).
 - `--no-registry`: Disable registry lookup and functionality.
 - `--verbose`: Show verbose debugging info.
+- `--cwd`: Set current working directory to resolve dirs relative to it.
+- `--auth`: Custom Authorization token to use for downloading template. (Can be overriden with `GIGET_AUTH` environment variable).
 
 ### Examples
 
 ```sh
+# Clone nuxt starter from giget template registry
+npx giget@latest nuxt
+
 # Clone the main branch of github.com/unjs/template to unjs-template directory
 npx giget@latest gh:unjs/template
 
@@ -64,8 +71,8 @@ npx giget@latest gitlab:unjs/template
 # Clone from bitbucket
 npx giget@latest bitbucket:unjs/template
 
-# Clone nuxt starter from giget template registry
-npx giget@latest nuxt
+# Clone from sourcehut
+npx giget@latest sourcehut:pi0/unjs-template
 ```
 
 ## Template Registry
@@ -78,11 +85,12 @@ If you want to add your template to the built-in registry, just drop a PR to add
 
 A custom registry should provide an endpoint with dynamic path `/:template.json` that returns a JSON response with keys same as [custom providers](#custom-providers).
 
-  - `name`: (required) Name of the template.
-  - `tar` (required) Link to the tar download link.
-  - `defaultDir`: (optional) Default cloning directory.
-  - `url`: (optional) Webpage of the template.
-  - `subpath` (optional) Subpath inside the tar file.
+- `name`: (required) Name of the template.
+- `tar` (required) Link to the tar download link.
+- `defaultDir`: (optional) Default cloning directory.
+- `url`: (optional) Webpage of the template.
+- `subpath`: (optional) Subpath inside the tar file.
+- `headers`: (optional) Custom headers to send while downloading template.
 
 Because of the simplicity, you can even use a github repository as template registry but also you can build something more powerful by bringing your own API.
 
@@ -124,7 +132,7 @@ const { source, dir } = await downloadTemplate('github:unjs/template')
 - `source`: (string) Input source in format of `[provider]:repo[/subpath][#ref]`.
 - `dir`: (string) Destination directory to clone to. If not provided, `user-name` will be used relative to the current directory.
 - `options`: (object) Options are usually inferred from the input string. You can customize them.
-  - `provider`: (string) Either `github`, `gitlab` or `bitbucket`. The default is `github`.
+  - `provider`: (string) Either `github`, `gitlab`, `bitbucket` or `sourcehut`. The default is `github`.
   - `repo`: (string) Name of repository in format of `{username}/{reponame}`.
   - `ref`: (string) Git ref (branch or commit or tag). The default value is `main`.
   - `subdirpath`: (string) subdir of the repo to clone from. The default value is none.
@@ -133,7 +141,9 @@ const { source, dir } = await downloadTemplate('github:unjs/template')
   - `offline`: (boolean) Do not attempt to download and use cached version.
   - `preferOffline`: (boolean) Use cache if exists otherwise try to download.
   - `providers`: (object) A map from provider name to custom providers. Can be used to override built-ins too.
-  - `registry`: (string or false) Set to `false` to disable registry. Set to a URL string (without trailing slash) for custom registry.
+  - `registry`: (string or false) Set to `false` to disable registry. Set to a URL string (without trailing slash) for custom registry. (Can be overriden with `GIGET_REGISTRY` environment variable).
+  - `cwd`: (string) Current working directory to resolve dirs relative to it.
+  - `auth`: (string) Custom Authorization token to use for downloading template. (Can be overriden with `GIGET_AUTH` environment variable).
 
 **Return value:**
 
@@ -151,10 +161,11 @@ Using programmatic method, you can make your own custom template providers.
 ```ts
 import type { TemplateProvider } from 'giget'
 
-const rainbow: TemplateProvider = async (input) => {
+const rainbow: TemplateProvider = async (input, { auth }) => {
   return {
     name: 'rainbow',
     version: input,
+    headers: { Authorization: auth },
     url: `https://rainbow.template/?variant=${input}`,
     tar: `https://rainbow.template/dl/rainbow.${input}.tar.gz`
   }
@@ -175,19 +186,20 @@ const themes = registryProvider('https://raw.githubusercontent.com/unjs/giget/ma
 const { source, dir } = await downloadRepo('themes:test', { providers: { themes } })
 ```
 
-## 💻 Development
-
-- 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 `pnpm install`
-- Run interactive tests using `pnpm dev`
-
 ## Related projects
 
+Giget wouldn't be possible without inspering from former projects. In comparation giget does not depend on any local command which increases stability and performance, supports custom template providers, auth and many more features out of the box.
+
 - https://github.com/samsonjs/gitter
 - https://github.com/tiged/tiged
 - https://github.com/Rich-Harris/degit
 
+## 💻 Development
+
+- 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 `pnpm install`
+- Run interactive tests using `pnpm dev`
 
 ## License
 
@@ -196,14 +208,12 @@ Made with 💛
 Published under [MIT License](./LICENSE).
 
 <!-- Badges -->
+
 [npm-version-src]: https://img.shields.io/npm/v/giget?style=flat-square
 [npm-version-href]: https://npmjs.com/package/giget
-
 [npm-downloads-src]: https://img.shields.io/npm/dm/giget?style=flat-square
 [npm-downloads-href]: https://npmjs.com/package/giget
-
 [github-actions-src]: https://img.shields.io/github/workflow/status/unjs/giget/ci/main?style=flat-square
 [github-actions-href]: https://github.com/unjs/giget/actions?query=workflow%3Aci
-
 [codecov-src]: https://img.shields.io/codecov/c/gh/unjs/giget/main?style=flat-square
 [codecov-href]: https://codecov.io/gh/unjs/giget

package/dist/cli.cjs

@@ -4,12 +4,13 @@
 const node_path = require('node:path');
 const mri = require('mri');
 const colorette = require('colorette');
-const giget = require('./shared/giget.774476cb.cjs');
+const giget = require('./shared/giget.73314e21.cjs');
 require('node:fs/promises');
 require('node:os');
 require('node:fs');
 require('tar');
 require('pathe');
+require('defu');
 require('node:stream/promises');
 require('node:child_process');
 require('node-fetch-native');
@@ -20,12 +21,13 @@ const mri__default = /*#__PURE__*/_interopDefaultLegacy(mri);
 
 async function main() {
   const args = mri__default(process.argv.slice(2), {
-    boolean: ["help", "force", "force-clean", "offline", "prefer-offline", "shell", "registry", "verbose"]
+    boolean: ["help", "force", "force-clean", "offline", "prefer-offline", "shell", "verbose"],
+    string: ["registry", "cwd", "auth"]
   });
   const input = args._[0];
   const dir = args._[1];
   if (!input || args.help || args.h) {
-    console.error("Usage: npx getgit@latest <input> [<dir>] [--force] [--force-clean] [--offline] [--prefer-offline] [--shell] [--registry]  [--no-registry] [--verbose]");
+    console.error("Usage: npx getgit@latest <input> [<dir>] [--force] [--force-clean] [--offline] [--prefer-offline] [--shell] [--registry]  [--no-registry] [--verbose] [--cwd] [--auth]");
     process.exit(1);
   }
   if (args.verbose) {
@@ -36,7 +38,9 @@ async function main() {
     force: args.force,
     forceClean: args["force-clean"],
     offline: args.offline,
-    registry: args.registry
+    registry: args.registry,
+    cwd: args.cwd,
+    auth: args.auth
   });
   console.log(`\u2728 Successfully cloned ${colorette.cyan(r.name || r.url)} to ${colorette.cyan(node_path.relative(process.cwd(), r.dir))}
 `);

package/dist/cli.mjs

@@ -2,24 +2,26 @@
 import { relative } from 'node:path';
 import mri from 'mri';
 import { cyan } from 'colorette';
-import { d as downloadTemplate, s as startShell } from './shared/giget.1430f5a2.mjs';
+import { d as downloadTemplate, s as startShell } from './shared/giget.ae887001.mjs';
 import 'node:fs/promises';
 import 'node:os';
 import 'node:fs';
 import 'tar';
 import 'pathe';
+import 'defu';
 import 'node:stream/promises';
 import 'node:child_process';
 import 'node-fetch-native';
 
 async function main() {
   const args = mri(process.argv.slice(2), {
-    boolean: ["help", "force", "force-clean", "offline", "prefer-offline", "shell", "registry", "verbose"]
+    boolean: ["help", "force", "force-clean", "offline", "prefer-offline", "shell", "verbose"],
+    string: ["registry", "cwd", "auth"]
   });
   const input = args._[0];
   const dir = args._[1];
   if (!input || args.help || args.h) {
-    console.error("Usage: npx getgit@latest <input> [<dir>] [--force] [--force-clean] [--offline] [--prefer-offline] [--shell] [--registry]  [--no-registry] [--verbose]");
+    console.error("Usage: npx getgit@latest <input> [<dir>] [--force] [--force-clean] [--offline] [--prefer-offline] [--shell] [--registry]  [--no-registry] [--verbose] [--cwd] [--auth]");
     process.exit(1);
   }
   if (args.verbose) {
@@ -30,7 +32,9 @@ async function main() {
     force: args.force,
     forceClean: args["force-clean"],
     offline: args.offline,
-    registry: args.registry
+    registry: args.registry,
+    cwd: args.cwd,
+    auth: args.auth
   });
   console.log(`\u2728 Successfully cloned ${cyan(r.name || r.url)} to ${cyan(relative(process.cwd(), r.dir))}
 `);

package/dist/index.cjs

@@ -2,12 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const giget = require('./shared/giget.774476cb.cjs');
+const giget = require('./shared/giget.73314e21.cjs');
 require('node:fs/promises');
 require('node:os');
 require('node:fs');
 require('tar');
 require('pathe');
+require('defu');
 require('node:stream/promises');
 require('node:child_process');
 require('node-fetch-native');

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 interface GitInfo {
-    provider: 'github' | 'gitlab' | 'bitbucket';
+    provider: 'github' | 'gitlab' | 'bitbucket' | 'sourcehut';
     repo: string;
     subdir: string;
     ref: string;
@@ -11,11 +11,14 @@ interface TemplateInfo {
     subdir?: string;
     url?: string;
     defaultDir?: string;
+    headers?: Record<string, string>;
     source?: never;
     dir?: never;
     [key: string]: any;
 }
-declare type TemplateProvider = (input: string) => TemplateInfo | Promise<TemplateInfo> | null;
+declare type TemplateProvider = (input: string, options: {
+    auth?: string;
+}) => TemplateInfo | Promise<TemplateInfo> | null;
 
 interface DownloadTemplateOptions {
     provider?: string;
@@ -26,20 +29,17 @@ interface DownloadTemplateOptions {
     providers?: Record<string, TemplateProvider>;
     dir?: string;
     registry?: false | string;
+    cwd?: string;
+    auth?: string;
 }
-declare function downloadTemplate(input: string, opts?: DownloadTemplateOptions): Promise<{
-    source: string;
+declare type DownloadTemplateResult = Omit<TemplateInfo, 'dir' | 'source'> & {
     dir: string;
-    name: string;
-    tar: string;
-    version?: string;
-    subdir?: string;
-    url?: string;
-    defaultDir?: string;
-}>;
+    source: string;
+};
+declare function downloadTemplate(input: string, opts?: DownloadTemplateOptions): Promise<DownloadTemplateResult>;
 
 declare const registryProvider: (registryEndpoint?: string) => TemplateProvider;
 
 declare function startShell(cwd: string): void;
 
-export { DownloadTemplateOptions, GitInfo, TemplateInfo, TemplateProvider, downloadTemplate, registryProvider, startShell };
+export { DownloadTemplateOptions, DownloadTemplateResult, GitInfo, TemplateInfo, TemplateProvider, downloadTemplate, registryProvider, startShell };

package/dist/index.mjs

@@ -1,9 +1,10 @@
-export { d as downloadTemplate, r as registryProvider, s as startShell } from './shared/giget.1430f5a2.mjs';
+export { d as downloadTemplate, r as registryProvider, s as startShell } from './shared/giget.ae887001.mjs';
 import 'node:fs/promises';
 import 'node:os';
 import 'node:fs';
 import 'tar';
 import 'pathe';
+import 'defu';
 import 'node:stream/promises';
 import 'node:child_process';
 import 'node-fetch-native';

package/dist/shared/{giget.774476cb.cjs → giget.73314e21.cjs}

@@ -5,6 +5,7 @@ const node_os = require('node:os');
 const node_fs = require('node:fs');
 const tar = require('tar');
 const pathe = require('pathe');
+const defu = require('defu');
 const promises$1 = require('node:stream/promises');
 const node_child_process = require('node:child_process');
 const fetch = require('node-fetch-native');
@@ -13,16 +14,16 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 const fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 
-async function download(url, filePath) {
+async function download(url, filePath, opts = {}) {
   const infoPath = filePath + ".json";
   const info = JSON.parse(await promises.readFile(infoPath, "utf8").catch(() => "{}"));
-  const headRes = await fetch.fetch(url, { method: "HEAD" }).catch(() => null);
+  const headRes = await fetch.fetch(url, { method: "HEAD", headers: opts.headers }).catch(() => null);
   const etag = headRes?.headers.get("etag");
   if (info.etag === etag && node_fs.existsSync(filePath)) {
     return;
   }
   info.etag = etag;
-  const res = await fetch.fetch(url);
+  const res = await fetch.fetch(url, { headers: opts.headers });
   if (res.status >= 400) {
     throw new Error(`Failed to download ${url}: ${res.status} ${res.statusText}`);
   }
@@ -64,41 +65,56 @@ function startShell(cwd) {
   });
 }
 
-const github = (input) => {
+const github = (input, opts) => {
   const parsed = parseGitURI(input);
   return {
     name: parsed.repo.replace("/", "-"),
     version: parsed.ref,
     subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.auth}` : void 0 },
     url: `https://github.com/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `https://github.com/${parsed.repo}/archive/${parsed.ref}.tar.gz`
   };
 };
-const gitlab = (input) => {
+const gitlab = (input, opts) => {
   const parsed = parseGitURI(input);
   return {
     name: parsed.repo.replace("/", "-"),
     version: parsed.ref,
     subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.auth}` : void 0 },
     url: `https://gitlab.com/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `https://gitlab.com/${parsed.repo}/-/archive/${parsed.ref}.tar.gz`
   };
 };
-const bitbucket = (input) => {
+const bitbucket = (input, opts) => {
   const parsed = parseGitURI(input);
   return {
     name: parsed.repo.replace("/", "-"),
     version: parsed.ref,
     subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.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`
   };
 };
+const sourcehut = (input, opts) => {
+  const parsed = parseGitURI(input);
+  return {
+    name: parsed.repo.replace("/", "-"),
+    version: parsed.ref,
+    subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.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`
+  };
+};
 const providers = {
   github,
   gh: github,
   gitlab,
-  bitbucket
+  bitbucket,
+  sourcehut
 };
 
 const DEFAULT_REGISTRY = "https://raw.githubusercontent.com/unjs/giget/main/templates";
@@ -121,6 +137,10 @@ const registryProvider = (registryEndpoint = DEFAULT_REGISTRY) => {
 
 const sourceProtoRe = /^([\w-.]+):/;
 async function downloadTemplate(input, opts = {}) {
+  opts = defu.defu({
+    registry: process.env.GIGET_REGISTRY,
+    auth: process.env.GIGET_AUTH
+  }, opts);
   const registry = opts.registry !== false ? registryProvider(opts.registry) : null;
   let providerName = opts.provider || (registryProvider ? "registry" : "github");
   let source = input;
@@ -133,12 +153,13 @@ async function downloadTemplate(input, opts = {}) {
   if (!provider) {
     throw new Error(`Unsupported provider: ${providerName}`);
   }
-  const template = await Promise.resolve().then(() => provider(source)).catch((err) => {
+  const template = await Promise.resolve().then(() => provider(source, { auth: opts.auth })).catch((err) => {
     throw new Error(`Failed to download template from ${providerName}: ${err.message}`);
   });
   template.name = (template.name || "template").replace(/[^a-z0-9-]/gi, "-");
   template.defaultDir = (template.defaultDir || template.name).replace(/[^a-z0-9-]/gi, "-");
-  const extractPath = pathe.resolve(opts.dir || template.defaultDir);
+  const cwd = pathe.resolve(opts.cwd || ".");
+  const extractPath = pathe.resolve(cwd, opts.dir || template.defaultDir);
   if (opts.forceClean) {
     await promises.rm(extractPath, { recursive: true, force: true });
   }
@@ -154,7 +175,7 @@ async function downloadTemplate(input, opts = {}) {
   if (!opts.offline) {
     await promises.mkdir(pathe.dirname(tarPath), { recursive: true });
     const s2 = Date.now();
-    await download(template.tar, tarPath).catch((err) => {
+    await download(template.tar, tarPath, { headers: template.headers }).catch((err) => {
       if (!node_fs.existsSync(tarPath)) {
         throw err;
       }
@@ -174,7 +195,7 @@ async function downloadTemplate(input, opts = {}) {
     onentry(entry) {
       entry.path = entry.path.split("/").splice(1).join("/");
       if (subdir) {
-        if (entry.path.startsWith(subdir)) {
+        if (entry.path.startsWith(subdir + "/")) {
           entry.path = entry.path.substring(subdir.length);
         } else {
           entry.path = "";

package/dist/shared/{giget.1430f5a2.mjs → giget.ae887001.mjs}

@@ -3,20 +3,21 @@ import { homedir } from 'node:os';
 import { existsSync, createWriteStream, readdirSync } from 'node:fs';
 import { extract } from 'tar';
 import { resolve, relative, dirname } from 'pathe';
+import { defu } from 'defu';
 import { pipeline } from 'node:stream/promises';
 import { spawnSync } from 'node:child_process';
 import fetch$1, { fetch } from 'node-fetch-native';
 
-async function download(url, filePath) {
+async function download(url, filePath, opts = {}) {
   const infoPath = filePath + ".json";
   const info = JSON.parse(await readFile(infoPath, "utf8").catch(() => "{}"));
-  const headRes = await fetch(url, { method: "HEAD" }).catch(() => null);
+  const headRes = await fetch(url, { method: "HEAD", headers: opts.headers }).catch(() => null);
   const etag = headRes?.headers.get("etag");
   if (info.etag === etag && existsSync(filePath)) {
     return;
   }
   info.etag = etag;
-  const res = await fetch(url);
+  const res = await fetch(url, { headers: opts.headers });
   if (res.status >= 400) {
     throw new Error(`Failed to download ${url}: ${res.status} ${res.statusText}`);
   }
@@ -58,41 +59,56 @@ function startShell(cwd) {
   });
 }
 
-const github = (input) => {
+const github = (input, opts) => {
   const parsed = parseGitURI(input);
   return {
     name: parsed.repo.replace("/", "-"),
     version: parsed.ref,
     subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.auth}` : void 0 },
     url: `https://github.com/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `https://github.com/${parsed.repo}/archive/${parsed.ref}.tar.gz`
   };
 };
-const gitlab = (input) => {
+const gitlab = (input, opts) => {
   const parsed = parseGitURI(input);
   return {
     name: parsed.repo.replace("/", "-"),
     version: parsed.ref,
     subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.auth}` : void 0 },
     url: `https://gitlab.com/${parsed.repo}/tree/${parsed.ref}${parsed.subdir}`,
     tar: `https://gitlab.com/${parsed.repo}/-/archive/${parsed.ref}.tar.gz`
   };
 };
-const bitbucket = (input) => {
+const bitbucket = (input, opts) => {
   const parsed = parseGitURI(input);
   return {
     name: parsed.repo.replace("/", "-"),
     version: parsed.ref,
     subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.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`
   };
 };
+const sourcehut = (input, opts) => {
+  const parsed = parseGitURI(input);
+  return {
+    name: parsed.repo.replace("/", "-"),
+    version: parsed.ref,
+    subdir: parsed.subdir,
+    headers: { Authorization: opts.auth ? `Bearer ${opts.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`
+  };
+};
 const providers = {
   github,
   gh: github,
   gitlab,
-  bitbucket
+  bitbucket,
+  sourcehut
 };
 
 const DEFAULT_REGISTRY = "https://raw.githubusercontent.com/unjs/giget/main/templates";
@@ -115,6 +131,10 @@ const registryProvider = (registryEndpoint = DEFAULT_REGISTRY) => {
 
 const sourceProtoRe = /^([\w-.]+):/;
 async function downloadTemplate(input, opts = {}) {
+  opts = defu({
+    registry: process.env.GIGET_REGISTRY,
+    auth: process.env.GIGET_AUTH
+  }, opts);
   const registry = opts.registry !== false ? registryProvider(opts.registry) : null;
   let providerName = opts.provider || (registryProvider ? "registry" : "github");
   let source = input;
@@ -127,12 +147,13 @@ async function downloadTemplate(input, opts = {}) {
   if (!provider) {
     throw new Error(`Unsupported provider: ${providerName}`);
   }
-  const template = await Promise.resolve().then(() => provider(source)).catch((err) => {
+  const template = await Promise.resolve().then(() => provider(source, { auth: opts.auth })).catch((err) => {
     throw new Error(`Failed to download template from ${providerName}: ${err.message}`);
   });
   template.name = (template.name || "template").replace(/[^a-z0-9-]/gi, "-");
   template.defaultDir = (template.defaultDir || template.name).replace(/[^a-z0-9-]/gi, "-");
-  const extractPath = resolve(opts.dir || template.defaultDir);
+  const cwd = resolve(opts.cwd || ".");
+  const extractPath = resolve(cwd, opts.dir || template.defaultDir);
   if (opts.forceClean) {
     await rm(extractPath, { recursive: true, force: true });
   }
@@ -148,7 +169,7 @@ async function downloadTemplate(input, opts = {}) {
   if (!opts.offline) {
     await mkdir(dirname(tarPath), { recursive: true });
     const s2 = Date.now();
-    await download(template.tar, tarPath).catch((err) => {
+    await download(template.tar, tarPath, { headers: template.headers }).catch((err) => {
       if (!existsSync(tarPath)) {
         throw err;
       }
@@ -168,7 +189,7 @@ async function downloadTemplate(input, opts = {}) {
     onentry(entry) {
       entry.path = entry.path.split("/").splice(1).join("/");
       if (subdir) {
-        if (entry.path.startsWith(subdir)) {
+        if (entry.path.startsWith(subdir + "/")) {
           entry.path = entry.path.substring(subdir.length);
         } else {
           entry.path = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "giget",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Download templates and git repositories with pleasure!",
   "repository": "unjs/giget",
   "license": "MIT",
@@ -23,6 +23,7 @@
   ],
   "dependencies": {
     "colorette": "^2.0.19",
+    "defu": "^6.1.0",
     "mri": "^1.2.0",
     "node-fetch-native": "^0.1.4",
     "pathe": "^0.3.7",
@@ -33,11 +34,11 @@
     "@types/node": "^18.7.16",
     "@types/tar": "^6.1.2",
     "@vitest/coverage-c8": "^0.23.2",
-    "eslint": "^8.23.0",
+    "eslint": "^8.23.1",
     "jiti": "^1.15.0",
     "standard-version": "^9.5.0",
     "typescript": "^4.8.3",
-    "unbuild": "^0.8.10",
+    "unbuild": "^0.8.11",
     "vitest": "^0.23.2"
   },
   "packageManager": "pnpm@7.11.0",