itty-packager 1.6.13 → 1.8.0

package/CHANGELOG.md

@@ -0,0 +1,4 @@
+# CHANGELOG
+
+### 1.7.0
+- added support for --otp flag (prompts for NPM OTP) or default interactive auth for publishing

package/README.md

@@ -65,6 +65,7 @@ Build your TypeScript library with Rollup, TypeScript compilation, and optional
 - `--hybrid` - Build both ESM and CJS (default: ESM only)
 - `--minify` - Minify output with terser (default: `true`)
 - `--no-minify` - Skip minification
+- `--release-from <dir>` - Release directory - exports relative to this (default: same as `--out`)
 - `-s, --snippet <name>` - Generate snippet file for README injection
 - `-h, --help` - Show help
 
@@ -72,15 +73,16 @@ Build your TypeScript library with Rollup, TypeScript compilation, and optional
 - Compiles all TypeScript files from `src/` to `dist/`
 - Generates ESM (`.mjs`) output only
 - Minifies output by default
-- Updates `package.json` exports with correct paths
+- Updates `package.json` exports with correct paths (relative to the release directory)
 - Single file exports map to root export, multiple files get individual exports
 
 **Examples:**
 ```bash
 itty build                              # Basic ESM build, minified
-itty build --hybrid --sourcemap        # Build both ESM/CJS with sourcemaps
-itty build --snippet=connect           # Build with snippet generation for README
-itty build --from=lib --out=build      # Build from lib/ to build/
+itty build --hybrid --sourcemap         # Build both ESM/CJS with sourcemaps
+itty build --snippet=connect            # Build with snippet generation for README
+itty build --from=lib --out=build       # Build from lib/ to build/
+itty build --release-from=.             # Exports include output dir prefix (for root releasing)
 ```
 
 ### `itty lint`
@@ -181,10 +183,11 @@ Version bump and release your package to npm with git operations and clean, flat
 - Git tag uses the same message as the commit
 
 **Default Behavior:**
+- Verifies npm auth before making any changes (prompts for login if expired)
 - Defaults to patch version bump if no type specified
+- Publishes to npm before git operations (so failed publishes don't leave orphaned tags)
 - Extracts build artifacts to temporary directory
 - Copies root files: `README.md`, `LICENSE`, `.npmrc` (if they exist)
-- Transforms package.json paths (e.g., `./dist/file.mjs` → `./file.mjs`)
 - Creates clean, flat package structure in node_modules
 
 **Examples:**
@@ -201,22 +204,22 @@ itty release --silent --push   # Release with git operations, no interactive pro
 
 ## Package Structure
 
-The release command creates a clean package structure by:
+The build + release commands work together to create a clean package structure:
 
-1. **Extracting build artifacts** from your `dist/` directory to package root
-2. **Copying essential files** like README, LICENSE
-3. **Transforming paths** in package.json to point to root-level files
-4. **Publishing the clean structure** so users get flat imports
+1. **Build** compiles to `dist/` and writes exports relative to the release directory (no `dist/` prefix by default)
+2. **Release** extracts build artifacts from `dist/` to a flat package root
+3. **Copies essential files** like README, LICENSE
+4. **Publishes the clean structure** so users get flat imports
 
-**Before (in your project):**
+**In your project:**
 ```
-package.json exports: "./dist/connect.mjs"
+package.json exports: "./connect.mjs"
 dist/connect.mjs
 README.md
 LICENSE
 ```
 
-**After (in node_modules):**
+**In node_modules (after publish):**
 ```
 package.json exports: "./connect.mjs"
 connect.mjs

package/lib/builder.js

@@ -14,6 +14,7 @@ export async function build(options = {}) {
   const {
     from = 'src',
     out = 'dist',
+    'release-from': releaseFrom,
     copy: copyFiles,
     snippet,
     sourcemap = false,
@@ -21,6 +22,10 @@ export async function build(options = {}) {
     minify = true
   } = options
 
+  // If releasing from the output dir (default), exports need no prefix.
+  // If releasing from elsewhere (e.g. root), exports need the output dir prefix.
+  const exportPrefix = (releaseFrom ?? out) === out ? '.' : `./${out}`
+
   console.log(`📦 Building from ${from}/ to ${out}/`)
 
   // Clean output directory
@@ -55,13 +60,13 @@ export async function build(options = {}) {
     // Single file maps to root export
     const file = files[0]
     const exportObj = {
-      import: `./${out}/${path.basename(file.esm)}`,
-      types: `./${out}/${path.basename(file.types)}`,
+      import: `${exportPrefix}/${path.basename(file.esm)}`,
+      types: `${exportPrefix}/${path.basename(file.types)}`,
     }
 
     // Add CJS export only if hybrid mode is enabled
     if (hybrid) {
-      exportObj.require = `./${out}/${path.basename(file.cjs)}`
+      exportObj.require = `${exportPrefix}/${path.basename(file.cjs)}`
     }
 
     pkg.exports = {
@@ -71,13 +76,13 @@ export async function build(options = {}) {
     // Multiple files get individual exports
     pkg.exports = files.reduce((acc, file) => {
       const exportObj = {
-        import: `./${out}/${path.basename(file.esm)}`,
-        types: `./${out}/${path.basename(file.types)}`,
+        import: `${exportPrefix}/${path.basename(file.esm)}`,
+        types: `${exportPrefix}/${path.basename(file.types)}`,
       }
 
       // Add CJS export only if hybrid mode is enabled
       if (hybrid) {
-        exportObj.require = `./${out}/${path.basename(file.cjs)}`
+        exportObj.require = `${exportPrefix}/${path.basename(file.cjs)}`
       }
 
       acc[file.shortPath] = exportObj

package/lib/commands/build.js

@@ -38,6 +38,10 @@ export async function buildCommand(args) {
         type: 'boolean',
         description: 'Skip minification'
       },
+      'release-from': {
+        type: 'string',
+        description: 'Release directory - exports are relative to this (default: same as --out)'
+      },
       snippet: {
         type: 'string',
         short: 's',
@@ -59,22 +63,24 @@ itty build - Build your library with rollup and typescript
 Usage: itty build [options]
 
 Options:
-  -f, --from <dir>        Source directory (default: src)
-  -o, --out <dir>         Output directory (default: dist)
-  -c, --copy <files>      Files to copy to output (comma-separated)
-      --sourcemap         Generate source maps (default: false)
-      --hybrid            Build both ESM and CJS (default: ESM only)
-      --minify            Minify output with terser (default: true)
-      --no-minify         Skip minification
-  -s, --snippet <name>    Generate snippet file for README injection
-  -h, --help              Show help
+  -f, --from <dir>           Source directory (default: src)
+  -o, --out <dir>            Output directory (default: dist)
+  -c, --copy <files>         Files to copy to output (comma-separated)
+      --sourcemap            Generate source maps (default: false)
+      --hybrid               Build both ESM and CJS (default: ESM only)
+      --minify               Minify output with terser (default: true)
+      --no-minify            Skip minification
+      --release-from <dir>   Release directory - exports relative to this (default: same as --out)
+  -s, --snippet <name>       Generate snippet file for README injection
+  -h, --help                 Show help
 
 Examples:
   itty build                              # Build ESM only, minified, no sourcemaps
-  itty build --hybrid --sourcemap        # Build both ESM/CJS with sourcemaps
-  itty build --no-minify                 # Build without minification
-  itty build --from=lib --out=build      # Build from lib/ to build/
-  itty build --snippet=connect           # Build with connect snippet generation
+  itty build --hybrid --sourcemap         # Build both ESM/CJS with sourcemaps
+  itty build --no-minify                  # Build without minification
+  itty build --from=lib --out=build       # Build from lib/ to build/
+  itty build --snippet=connect            # Build with connect snippet generation
+  itty build --release-from=.             # Exports include output dir prefix (for root releasing)
 `)
     return
   }

package/lib/commands/release.js

@@ -6,49 +6,6 @@ import { prepareCommand } from './prepare.js'
 
 const SEMVER_TYPES = ['major', 'minor', 'patch']
 
-function transformPackageExports(pkg, srcDir) {
-  // Transform package.json exports to remove srcDir prefix from paths
-  if (pkg.exports) {
-    const transformPath = (exportPath) => {
-      if (typeof exportPath === 'string' && exportPath.startsWith(`./${srcDir}/`)) {
-        return exportPath.replace(`./${srcDir}/`, './')
-      }
-      return exportPath
-    }
-
-    const transformExportObj = (exportObj) => {
-      if (typeof exportObj === 'string') {
-        return transformPath(exportObj)
-      }
-
-      if (typeof exportObj === 'object' && exportObj !== null) {
-        const transformed = {}
-        for (const [key, value] of Object.entries(exportObj)) {
-          if (typeof value === 'string') {
-            transformed[key] = transformPath(value)
-          } else if (typeof value === 'object') {
-            transformed[key] = transformExportObj(value)
-          } else {
-            transformed[key] = value
-          }
-        }
-        return transformed
-      }
-
-      return exportObj
-    }
-
-    const transformedExports = {}
-    for (const [key, value] of Object.entries(pkg.exports)) {
-      transformedExports[key] = transformExportObj(value)
-    }
-
-    return { ...pkg, exports: transformedExports }
-  }
-
-  return pkg
-}
-
 function versionBump(currentVersion, type) {
   const parts = currentVersion.split('.').map(Number)
 
@@ -209,6 +166,54 @@ async function getCommitMessage(newVersion, silent = false) {
   })
 }
 
+async function promptOtp() {
+  return new Promise((resolve, reject) => {
+    process.stdout.write('🔑 Enter OTP code: ')
+    let code = ''
+
+    process.stdin.setRawMode(true)
+    process.stdin.resume()
+
+    const handleInput = (chunk) => {
+      const key = chunk.toString()
+
+      if (key === '\x03') {
+        cleanup()
+        reject(new Error('User cancelled with Ctrl+C'))
+        return
+      }
+
+      if (key === '\r' || key === '\n') {
+        process.stdout.write('\n')
+        cleanup()
+        resolve(code.trim())
+        return
+      }
+
+      if (key === '\x7f' || key === '\x08') {
+        if (code.length > 0) {
+          code = code.slice(0, -1)
+          process.stdout.write('\b \b')
+        }
+        return
+      }
+
+      if (key >= '0' && key <= '9') {
+        code += key
+        process.stdout.write(key)
+      }
+    }
+
+    const cleanup = () => {
+      process.stdin.setRawMode(false)
+      process.stdin.pause()
+      process.stdin.removeListener('data', handleInput)
+    }
+
+    process.stdin.on('data', handleInput)
+  })
+}
+
 async function runCommand(command, cwd = process.cwd(), verbose = false) {
   return new Promise((resolve, reject) => {
     const [cmd, ...args] = command.split(' ')
@@ -318,6 +323,10 @@ export async function releaseCommand(args) {
         type: 'boolean',
         description: 'Skip interactive prompts (use default commit message)'
       },
+      otp: {
+        type: 'boolean',
+        description: 'Prompt for a one-time password (OTP) for npm publish'
+      },
       verbose: {
         type: 'boolean',
         short: 'v',
@@ -354,6 +363,7 @@ Publish Options:
       --prepare           Run prepare (lint, test, build) before publishing
       --silent            Skip interactive prompts (use default commit message)
       --no-license        Do not copy LICENSE file to published package
+      --otp               Prompt for a one-time password (OTP) for npm publish
   -v, --verbose           Show detailed output including npm and git command details
 
 Git Options:
@@ -408,6 +418,7 @@ This creates a clean, flat package structure in node_modules.
   const noLicense = releaseArgs['no-license']
   const shouldPrepare = releaseArgs.prepare
   const silent = releaseArgs.silent
+  const useOtp = releaseArgs.otp
   const verbose = releaseArgs.verbose
 
   // Read package.json and store original version for potential revert
@@ -430,6 +441,17 @@ This creates a clean, flat package structure in node_modules.
       throw new Error(`Source directory "${sourceDir}" does not exist. Run "itty build" first.`)
     }
 
+    // Verify npm auth before making any changes
+    if (!dryRun) {
+      console.log(`🔑 Verifying npm auth...`)
+      try {
+        await runCommand('npm whoami --registry=https://registry.npmjs.org', rootPath, verbose)
+      } catch {
+        console.log(`⚠️  npm session expired — logging in...`)
+        await runCommand('npm login --registry=https://registry.npmjs.org', rootPath, true)
+      }
+    }
+
     // Clean and create temp directory
     if (verbose) console.log(`🧹 Preparing ${releaseArgs.dest}/`)
     await fs.emptyDir(tempDir)
@@ -478,47 +500,65 @@ This creates a clean, flat package structure in node_modules.
       }
     }
 
-    // Update package.json in temp directory with transformed paths
-    const updatedPkg = isRootPublish
-      ? { ...originalPkg, version: newVersion }  // No path transformation for root publishing
-      : transformPackageExports({ ...originalPkg, version: newVersion }, sourceDir)
+    // Update package.json with new version
+    const updatedPkg = { ...originalPkg, version: newVersion }
     const tempPkgPath = path.join(tempDir, 'package.json')
 
-    const transformMessage = isRootPublish ? '' : ' (transforming paths)'
-    if (verbose) console.log(`📝 Updating package.json to v${newVersion}${transformMessage}`)
+    if (verbose) console.log(`📝 Updating package.json to v${newVersion}`)
     await fs.writeJSON(tempPkgPath, updatedPkg, { spaces: 2 })
 
-    // Update root package.json first (before git operations)
+    // Update root package.json with new version
     if (!dryRun) {
       if (verbose) console.log(`📝 Updating root package.json`)
       await fs.writeJSON(pkgPath, updatedPkg, { spaces: 2 })
     }
 
-    // Git operations (before publishing)
-    if (!noGit && !dryRun) {
-      let commitMessage = `released v${newVersion}` // Default message
-
-      if (shouldPush || shouldTag) {
-        try {
-          // Get commit message (interactive or default)
-          commitMessage = await getCommitMessage(newVersion, silent)
-
-          console.log(`📋 Committing changes...`)
-          if (verbose) console.log(`Running: git add . && git commit`)
-          await runCommand('git add .', rootPath, verbose)
-          await runCommand(`git commit -m "${commitMessage}"`, rootPath, verbose)
-        } catch (error) {
-          if (error.message.includes('cancelled')) {
-            console.log('❌ Commit cancelled - reverting version and exiting')
-            // Revert the version we just updated
-            await fs.writeJSON(pkgPath, originalPkg, { spaces: 2 })
-            // Don't rethrow - exit cleanly since this is user-initiated
-            process.exit(0)
-          }
-          throw error
+    // Collect interactive inputs before publish
+    let commitMessage = `released v${newVersion}`
+    if (!noGit && !dryRun && (shouldPush || shouldTag)) {
+      try {
+        commitMessage = await getCommitMessage(newVersion, silent)
+      } catch (error) {
+        if (error.message.includes('cancelled')) {
+          console.log('❌ Release cancelled - reverting version and exiting')
+          await fs.writeJSON(pkgPath, originalPkg, { spaces: 2 })
+          process.exit(0)
         }
+        throw error
+      }
+    }
+
+    // NPM publish (before git operations so failed publishes don't leave orphaned tags)
+    if (dryRun) {
+      console.log('🍸 Dry run - skipping publish')
+    } else {
+      let otpCode
+      if (useOtp) {
+        otpCode = await promptOtp()
+        if (!otpCode) throw new Error('No OTP code provided')
       }
 
+      console.log(`🚀 Publishing to npm...`)
+
+      const publishCmd = [
+        'npm publish',
+        '--registry=https://registry.npmjs.org',
+        publicAccess ? '--access=public' : '',
+        SEMVER_TYPES.includes(releaseType) ? '' : `--tag=${releaseType}`,
+        otpCode ? `--otp=${otpCode}` : ''
+      ].filter(Boolean).join(' ')
+
+      if (verbose) console.log(`Running: ${publishCmd}`)
+      await runCommand(publishCmd, tempDir, true)
+    }
+
+    // Git operations (only after successful publish)
+    if (!noGit && !dryRun && (shouldPush || shouldTag)) {
+      console.log(`📋 Committing changes...`)
+      if (verbose) console.log(`Running: git add . && git commit`)
+      await runCommand('git add .', rootPath, verbose)
+      await runCommand(`git commit -m "${commitMessage}"`, rootPath, verbose)
+
       if (shouldTag) {
         console.log(`🏷️ Creating git tag v${newVersion}`)
         await runCommand(`git tag -a v${newVersion} -m "${commitMessage}"`, rootPath, verbose)
@@ -535,24 +575,6 @@ This creates a clean, flat package structure in node_modules.
       }
     }
 
-    // NPM publish as final step
-    if (dryRun) {
-      console.log('🍸 Dry run - skipping publish')
-    } else {
-      // Publish from temp directory
-      console.log(`🚀 Publishing to npm...`)
-
-      const publishCmd = [
-        'npm publish',
-        '--registry=https://registry.npmjs.org',
-        publicAccess ? '--access=public' : '',
-        SEMVER_TYPES.includes(releaseType) ? '' : `--tag=${releaseType}`
-      ].filter(Boolean).join(' ')
-
-      if (verbose) console.log(`Running: ${publishCmd}`)
-      await runCommand(publishCmd, tempDir, verbose)
-    }
-
     // Cleanup
     if (!noCleanup) {
       if (verbose) console.log(`🧹 Cleaning up ${releaseArgs.dest}/`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itty-packager",
-  "version": "1.6.13",
+  "version": "1.8.0",
   "description": "Universal build tool for itty libraries",
   "type": "module",
   "bin": {
@@ -9,7 +9,7 @@
   "scripts": {
     "lint": "bun bin/itty.js lint",
     "dev": "bun test --coverage --watch",
-    "release": "bun bin/itty.js release --patch --tag --push --root"
+    "release": "bun bin/itty.js release --patch --tag --push --root --otp"
   },
   "keywords": [
     "build",

package/test/build.spec.ts

@@ -67,6 +67,40 @@ const tests: TestTree = {
         expect(result.exitCode).toBe(0)
         await expectFile(path.join(project.dir, 'build/main.mjs')).toExist()
       }
+    },
+
+    'export paths': {
+      'default: exports have no dist/ prefix': async () => {
+        const project = await ProjectFixture.create('exports-default', {
+          'src/index.ts': 'export const a = 1',
+          'package.json': JSON.stringify({
+            name: 'test-exports',
+            version: '1.0.0',
+            type: 'module'
+          }, null, 2)
+        })
+
+        await cli.run(['build'], { cwd: project.dir })
+        const pkg = JSON.parse(await Bun.file(path.join(project.dir, 'package.json')).text())
+        expect(pkg.exports['.'].import).toBe('./index.mjs')
+        expect(pkg.exports['.'].types).toBe('./index.d.ts')
+      },
+
+      '--release-from=. adds dist/ prefix': async () => {
+        const project = await ProjectFixture.create('exports-release-from', {
+          'src/index.ts': 'export const a = 1',
+          'package.json': JSON.stringify({
+            name: 'test-exports-root',
+            version: '1.0.0',
+            type: 'module'
+          }, null, 2)
+        })
+
+        await cli.run(['build', '--release-from=.'], { cwd: project.dir })
+        const pkg = JSON.parse(await Bun.file(path.join(project.dir, 'package.json')).text())
+        expect(pkg.exports['.'].import).toBe('./dist/index.mjs')
+        expect(pkg.exports['.'].types).toBe('./dist/index.d.ts')
+      }
     }
   }
 }

package/test/release.spec.ts

@@ -155,20 +155,20 @@ const tests: TestTree = {
       }
     },
 
-    'package structure transformation': {
-      'copies and transforms dist files': async () => {
-        const project = await ProjectFixture.create('package-transform', {
+    'package structure': {
+      'copies dist files and preserves exports': async () => {
+        const project = await ProjectFixture.create('package-structure', {
           'dist/index.mjs': 'export const main = "test"',
           'dist/utils.mjs': 'export const utils = "helper"',
           'README.md': '# Test Package',
           'LICENSE': 'MIT License',
           'package.json': JSON.stringify({
-            name: 'test-transform',
+            name: 'test-structure',
             version: '1.0.0',
             type: 'module',
             exports: {
-              '.': './dist/index.mjs',
-              './utils': './dist/utils.mjs'
+              '.': './index.mjs',
+              './utils': './utils.mjs'
             }
           }, null, 2)
         })
@@ -176,14 +176,14 @@ const tests: TestTree = {
         const result = await cli.run(['release', '--dry-run', '--no-git', '--no-cleanup'], { cwd: project.dir })
         expect(result.exitCode).toBe(0)
 
-        // Check that temp directory was created with transformed structure
+        // Check that temp directory was created with flat structure
         const tempDir = path.join(project.dir, '.dist')
         await expectFile(path.join(tempDir, 'index.mjs')).toExist()
         await expectFile(path.join(tempDir, 'utils.mjs')).toExist()
         await expectFile(path.join(tempDir, 'README.md')).toExist()
         await expectFile(path.join(tempDir, 'LICENSE')).toExist()
 
-        // Check that package.json was transformed
+        // Check that exports are preserved as-is (no transformation needed)
         const pkgContent = fs.readFileSync(path.join(tempDir, 'package.json'), 'utf-8')
         const pkg = JSON.parse(pkgContent)
         expect(pkg.exports).toEqual({