chore: add several minor improvements

Author: chrisbbreuer

bin/cli.ts

@@ -4,12 +4,12 @@ import type { GitItOptions } from '../src/types'
 import { spawn } from 'node:child_process'
 import { relative } from 'node:path'
 import process from 'node:process'
-import { CAC } from 'cac'
+import { CLI } from '@stacksjs/clapp'
 import { version } from '../package.json'
 import { downloadTemplate } from '../src/gitit'
 import { startShell } from '../src/utils'
 
-const cli = new CAC('gitit')
+const cli = new CLI('gitit')
 
 cli
 .command('[template] [dir]', 'Clone a template from a repository')

bun.lock

@@ -1,2 +1,2 @@
 dependencies:
-  bun.sh: ^1.2.10
+  bun.sh: ^1.3.10

deps.yaml

@@ -72,9 +72,6 @@
     "format": "bunx --bun pickier . --format",
     "format:fix": "bunx --bun pickier . --format --write"
   },
-  "dependencies": {
-    "nanotar": "^0.2.0"
-  },
   "devDependencies": {
     "better-dx": "^0.2.7",
     "bunfig": "^0.15.6"

package.json

@@ -0,0 +1,11 @@
+{
+  "version": "1.0",
+  "packages": {
+    "bun.sh@1.3.11": {
+      "name": "bun.sh",
+      "version": "1.3.11",
+      "resolved": "registry:bun.sh@1.3.11",
+      "integrity": "sha256:61aefeb2d13032a726efaca2ceff6667342381a393cb6550ded85f0ebb76890d"
+    }
+  }
+}

pantry.lock

@@ -5,8 +5,6 @@ import { existsSync, readdirSync } from 'node:fs'
 import { mkdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { dirname, join, resolve } from 'node:path'
 import { gunzipSync } from 'node:zlib'
-import defu from 'defu'
-import { parseTar } from 'nanotar'
 import { providers } from './providers'
 import { registryProvider } from './registry'
 import { cacheDirectory, debug, download, normalizeHeaders } from './utils'
@@ -58,8 +56,81 @@ async function installDependencies(options: InstallOptions): Promise < void> {
   })
 }
 
+export interface TarEntry {
+  name: string
+  type: 'file' | 'directory'
+  size: number
+  data?: Uint8Array
+}
+
+/**
+ * Parse a tar archive buffer into entries (POSIX ustar + GNU long name support)
+ */
+export function parseTar(data: Uint8Array): TarEntry[] {
+  const entries: TarEntry[] = []
+  let offset = 0
+  const decoder = new TextDecoder()
+  let longName: string | null = null
+
+  while (offset + 512 <= data.length) {
+    const header = data.subarray(offset, offset + 512)
+
+    // End of archive: zero block
+    let allZero = true
+    for (let i = 0; i < 512; i++) {
+      if (header[i] !== 0) {
+        allZero = false
+        break
+      }
+    }
+    if (allZero)
+      break
+
+    const nameRaw = decoder.decode(header.subarray(0, 100)).replace(/\0.*$/, '')
+    const prefix = decoder.decode(header.subarray(345, 500)).replace(/\0.*$/, '')
+    const sizeStr = decoder.decode(header.subarray(124, 136)).replace(/\0.*$/, '').trim()
+    const size = sizeStr ? Number.parseInt(sizeStr, 8) : 0
+    const typeflag = String.fromCharCode(header[156]!)
+
+    offset += 512
+    const dataBlocks = Math.ceil(size / 512) * 512
+
+    // GNU long name extension
+    if (typeflag === 'L') {
+      longName = decoder.decode(data.subarray(offset, offset + size)).replace(/\0.*$/, '')
+      offset += dataBlocks
+      continue
+    }
+
+    // Pax extended header — extract path if present
+    if (typeflag === 'x' || typeflag === 'g') {
+      const paxData = decoder.decode(data.subarray(offset, offset + size))
+      const pathMatch = paxData.match(/\d+ path=(.+)\n/)
+      if (pathMatch)
+        longName = pathMatch[1]!
+      offset += dataBlocks
+      continue
+    }
+
+    const name = longName ?? (prefix ? `${prefix}/${nameRaw}` : nameRaw)
+    longName = null
+
+    if (typeflag === '5') {
+      entries.push({ name, type: 'directory', size })
+    }
+    else if (typeflag === '0' || typeflag === '\0' || typeflag === '') {
+      const fileData = size > 0 ? data.slice(offset, offset + size) : undefined
+      entries.push({ name, type: 'file', size, data: fileData })
+    }
+
+    offset += dataBlocks
+  }
+
+  return entries
+}
+
 /**
-* Extract a tarball using nanotar (cross - platform)
+* Extract a tarball (cross-platform)
 */
 async function extractTar(options: GitItExtractOptions): Promise < void> {
   const { file, cwd, onentry } = options
@@ -214,13 +285,11 @@ export async function downloadTemplate(
 input: string,
 options: DownloadTemplateOptions = {},
 ): Promise < DownloadTemplateResult> {
-  options = defu(
-  {
-    registry: process.env.GITIT_REGISTRY,
-    auth: process.env.GITIT_AUTH,
-  },
-  options,
-  ) as DownloadTemplateOptions
+  options = {
+    ...options,
+    registry: process.env.GITIT_REGISTRY ?? options.registry,
+    auth: process.env.GITIT_AUTH ?? options.auth,
+  } as DownloadTemplateOptions
 
   // Load hooks
   const hooks = loadHooks(options)