itty-packager 1.3.0 → 1.6.2

package/.claude/settings.local.json

@@ -3,7 +3,8 @@
     "allow": [
       "Bash(bun bin/itty.js lint:*)",
       "Bash(bun bin/itty.js prepare:*)",
-      "Bash(bun bin/itty.js publish:*)"
+      "Bash(bun bin/itty.js publish:*)",
+      "Bash(cat:*)"
     ],
     "deny": []
   }

package/lib/commands/publish.js

@@ -2,7 +2,6 @@ import { parseArgs } from 'node:util'
 import { spawn } from 'node:child_process'
 import fs from 'fs-extra'
 import path from 'node:path'
-import readline from 'node:readline'
 import { prepareCommand } from './prepare.js'
 
 const SEMVER_TYPES = ['major', 'minor', 'patch']
@@ -79,41 +78,123 @@ async function getCommitMessage(newVersion, silent = false) {
     return `released v${newVersion}`
   }
 
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout
-    })
-
-    console.log('\nEnter optional commit message (empty submission skips):')
-    console.log('\x1b[90mPress Enter to finish, Ctrl+C to skip\x1b[0m')
-    process.stdout.write('\n')
-
+  return new Promise((resolve, reject) => {
+    // Show placeholder with hidden cursor
+    const placeholderText = '\x1b[90mpress enter to skip\x1b[0m'
+    process.stdout.write(`💬 Commit message: ${placeholderText}\x1b[?25l`) // Hide cursor
+    
     let inputLines = []
     let firstInput = true
+    let placeholderCleared = false
+    let inputBuffer = ''
+
+    // Set up raw mode for immediate key detection
+    process.stdin.setRawMode(true)
+    process.stdin.resume()
+
+    const clearPlaceholder = () => {
+      if (!placeholderCleared) {
+        // Clear line and show prompt with cursor
+        process.stdout.write('\r\x1b[K💬 Commit message: \x1b[?25h') // Show cursor
+        placeholderCleared = true
+      }
+    }
 
-    rl.on('line', (input) => {
-      if (firstInput && input.trim() === '') {
-        // First line is empty, skip custom message
-        rl.close()
-        resolve(`released v${newVersion}`)
+    const handleInput = (chunk) => {
+      const key = chunk.toString()
+      
+      // Check for escape sequences
+      if (key === '\x1b') {
+        // Wait for potential escape sequence completion
+        setTimeout(() => {
+          process.stdout.write('\r\x1b[K💬 Commit message: cancelled\x1b[?25h\n')
+          cleanup()
+          reject(new Error('User cancelled with Escape key'))
+        }, 10)
         return
       }
       
-      firstInput = false
+      // Handle Ctrl+C
+      if (key === '\x03') {
+        process.stdout.write('\r\x1b[K💬 Commit message: cancelled\x1b[?25h\n')
+        cleanup()
+        reject(new Error('User cancelled with Ctrl+C'))
+        return
+      }
+      
+      // Handle Enter
+      if (key === '\r' || key === '\n') {
+        if (!placeholderCleared && inputBuffer === '') {
+          // Empty input, skip
+          process.stdout.write('\r\x1b[K💬 Commit message: \x1b[90mskipped\x1b[0m\x1b[?25h\n')
+          cleanup()
+          resolve(`released v${newVersion}`)
+          return
+        }
+        
+        // Single line input - finish immediately
+        if (firstInput) {
+          const customMessage = inputBuffer.trim()
+          process.stdout.write('\x1b[?25h\n')
+          cleanup()
+          
+          if (!customMessage) {
+            process.stdout.write('\r💬 Commit message: \x1b[90mskipped\x1b[0m\n')
+            resolve(`released v${newVersion}`)
+          } else {
+            const escapedMessage = customMessage.replace(/"/g, '\\"')
+            resolve(`released v${newVersion} - ${escapedMessage}`)
+          }
+          return
+        }
+        
+        // Multi-line: empty line finishes input
+        if (inputBuffer.trim() === '') {
+          finishInput()
+          return
+        }
+        
+        // Add line and continue
+        inputLines.push(inputBuffer)
+        inputBuffer = ''
+        firstInput = false
+        process.stdout.write('\n')
+        return
+      }
       
-      if (input.trim() === '' && inputLines.length > 0) {
-        // Empty line after content - finish input
-        finishInput()
+      // Handle backspace
+      if (key === '\x7f' || key === '\x08') {
+        if (!placeholderCleared) return // Can't backspace in placeholder
+        
+        if (inputBuffer.length > 0) {
+          inputBuffer = inputBuffer.slice(0, -1)
+          process.stdout.write('\b \b')
+        }
         return
       }
       
-      inputLines.push(input)
-    })
+      // Handle printable characters
+      if (key.length === 1 && key >= ' ' && key <= '~') {
+        if (!placeholderCleared) {
+          clearPlaceholder()
+        }
+        
+        inputBuffer += key
+        process.stdout.write(key)
+        return
+      }
+    }
+
+    const cleanup = () => {
+      process.stdin.setRawMode(false)
+      process.stdin.pause()
+      process.stdin.removeListener('data', handleInput)
+    }
 
     const finishInput = () => {
-      rl.close()
       const customMessage = inputLines.join('\n').trim()
+      process.stdout.write('\x1b[?25h\n') // Show cursor and newline
+      cleanup()
       
       if (!customMessage) {
         resolve(`released v${newVersion}`)
@@ -124,18 +205,7 @@ async function getCommitMessage(newVersion, silent = false) {
       }
     }
 
-    rl.on('SIGINT', () => {
-      console.log('\nSkipped. Using default commit message.')
-      rl.close()
-      resolve(`released v${newVersion}`)
-    })
-
-    // Handle Ctrl+D (EOF) as completion
-    rl.on('close', () => {
-      if (!firstInput && inputLines.length > 0) {
-        finishInput()
-      }
-    })
+    process.stdin.on('data', handleInput)
   })
 }
 
@@ -283,10 +353,14 @@ Publish Options:
 
 Git Options:
       --tag               Create git tag for release
-      --push              Push changes and tags to git remote
+      --push              Push changes and tags to git remote (prompts for commit message)
       --no-git            Skip all git operations
   -h, --help              Show help
 
+Interactive Options:
+When using --push, you'll be prompted for an optional commit message.
+Press Enter to skip, Escape or Ctrl+C to cancel and revert version.
+
 Examples:
   itty publish                   # Patch version bump and publish from dist/ (default)
   itty publish --minor --tag     # Minor bump, publish, and create git tag
@@ -327,6 +401,12 @@ This creates a clean, flat package structure in node_modules.
   const silent = publishArgs.silent
   const verbose = publishArgs.verbose
 
+  // Read package.json and store original version for potential revert
+  const pkgPath = path.join(rootPath, 'package.json')
+  const originalPkg = await fs.readJSON(pkgPath)
+  const originalVersion = originalPkg.version
+  const newVersion = versionBump(originalVersion, releaseType)
+
   try {
     // Run prepare if requested
     if (shouldPrepare) {
@@ -334,12 +414,8 @@ This creates a clean, flat package structure in node_modules.
       await prepareCommand(verbose ? ['--verbose'] : [])
       console.log('✅ Prepare completed successfully\n')
     }
-    // Read package.json
-    const pkgPath = path.join(rootPath, 'package.json')
-    const pkg = await fs.readJSON(pkgPath)
-    const newVersion = versionBump(pkg.version, releaseType)
 
-    console.log(`📦 Publishing ${pkg.name} v${pkg.version} → v${newVersion}`)
+    console.log(`📦 Publishing ${originalPkg.name} v${originalVersion} → v${newVersion}`)
     if (verbose) console.log(`📁 Source: ${publishArgs.src}/`)
 
     // Check if source directory exists
@@ -353,6 +429,7 @@ This creates a clean, flat package structure in node_modules.
     await fs.ensureDir(tempDir)
 
     // Copy source files to temp directory
+    console.log(`📋 Copying files...`)
     if (verbose) console.log(`📋 Copying ${publishArgs.src}/ to ${path.relative(rootPath, tempDir)}/`)
     
     const filter = (src) => {
@@ -372,6 +449,7 @@ This creates a clean, flat package structure in node_modules.
     }
     
     await fs.copy(srcDir, tempDir, { filter })
+    if (!verbose) console.log(`✅ Files copied`)
 
     // Copy root files that should be included in the package (only for non-root publishing)
     if (!isRootPublish) {
@@ -396,72 +474,106 @@ This creates a clean, flat package structure in node_modules.
 
     // Update package.json in temp directory with transformed paths
     const updatedPkg = isRootPublish 
-      ? { ...pkg, version: newVersion }  // No path transformation for root publishing
-      : transformPackageExports({ ...pkg, version: newVersion }, publishArgs.src)
+      ? { ...originalPkg, version: newVersion }  // No path transformation for root publishing
+      : transformPackageExports({ ...originalPkg, version: newVersion }, publishArgs.src)
     const tempPkgPath = path.join(tempDir, 'package.json')
     
     const transformMessage = isRootPublish ? '' : ' (transforming paths)'
     if (verbose) console.log(`📝 Updating package.json to v${newVersion}${transformMessage}`)
     await fs.writeJSON(tempPkgPath, updatedPkg, { spaces: 2 })
 
-    if (dryRun) {
-      console.log('🧪 Dry run - skipping publish')
-    } else {
-      // Publish from temp directory
-      console.log(`🚀 Publishing to npm...`)
-      
-      const publishCmd = [
-        'npm publish',
-        publicAccess ? '--access=public' : '',
-        SEMVER_TYPES.includes(releaseType) ? '' : `--tag=${releaseType}`
-      ].filter(Boolean).join(' ')
-
-      if (verbose) console.log(`Running: ${publishCmd}`)
-      await runCommand(publishCmd, tempDir, verbose)
-      
-      // Update root package.json
+    // Update root package.json first (before git operations)
+    if (!dryRun) {
       if (verbose) console.log(`📝 Updating root package.json`)
       await fs.writeJSON(pkgPath, updatedPkg, { spaces: 2 })
     }
 
-    // Git operations
+    // Git operations (before publishing)
     if (!noGit && !dryRun) {
       if (shouldPush || shouldTag) {
-        // Get commit message (interactive or default)
-        const commitMessage = await getCommitMessage(newVersion, silent)
-        
-        if (verbose) console.log(`📋 Committing changes...`)
-        await runCommand('git add .', rootPath, verbose)
-        await runCommand(`git commit -m "${commitMessage}"`, rootPath, verbose)
+        try {
+          // Get commit message (interactive or default)
+          const 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)
+          if (!verbose) console.log(`✅ Changes committed`)
+        } 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
+        }
       }
 
       if (shouldTag) {
-        if (verbose) console.log(`🏷️  Creating git tag v${newVersion}`)
+        console.log(`🏷️  Creating git tag v${newVersion}`)
         await runCommand(`git tag -a v${newVersion} -m "Release v${newVersion}"`, rootPath, verbose)
+        if (!verbose) console.log(`✅ Tag created`)
       }
 
       if (shouldPush) {
-        if (verbose) console.log(`📤 Pushing to remote...`)
+        console.log(`📤 Pushing to remote...`)
         await runCommand('git push', rootPath, verbose)
+        if (!verbose) console.log(`✅ Pushed to remote`)
         
         if (shouldTag) {
-          if (verbose) console.log(`📤 Pushing tags...`)
+          console.log(`📤 Pushing tags...`)
           await runCommand('git push --tags', rootPath, verbose)
+          if (!verbose) console.log(`✅ Tags pushed`)
         }
       }
     }
 
+    // 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',
+        publicAccess ? '--access=public' : '',
+        SEMVER_TYPES.includes(releaseType) ? '' : `--tag=${releaseType}`
+      ].filter(Boolean).join(' ')
+
+      if (verbose) console.log(`Running: ${publishCmd}`)
+      await runCommand(publishCmd, tempDir, verbose)
+      if (!verbose) console.log(`✅ Published to npm`)
+    }
+
     // Cleanup
     if (!noCleanup) {
       if (verbose) console.log(`🧹 Cleaning up ${publishArgs.dest}/`)
       await fs.remove(tempDir)
     }
 
-    console.log(`✅ Successfully published ${pkg.name}@${newVersion}`)
+    console.log(`✅ Successfully published ${originalPkg.name}@${newVersion}`)
     
   } catch (error) {
     console.error(`❌ Publish failed: ${error.message}`)
     
+    // Revert version in root package.json if it was changed
+    if (!dryRun) {
+      try {
+        const currentPkg = await fs.readJSON(pkgPath)
+        if (currentPkg.version !== originalVersion) {
+          if (verbose) console.log(`🔄 Reverting version from v${currentPkg.version} to v${originalVersion}`)
+          await fs.writeJSON(pkgPath, { ...currentPkg, version: originalVersion }, { spaces: 2 })
+          console.log(`✅ Version reverted to v${originalVersion}`)
+        }
+      } catch (revertError) {
+        console.error(`❌ Failed to revert version: ${revertError.message}`)
+      }
+    }
+    
     // Cleanup on error
     if (await fs.pathExists(tempDir) && !noCleanup) {
       await fs.remove(tempDir)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itty-packager",
-  "version": "1.3.0",
+  "version": "1.6.2",
   "description": "Universal build tool for itty libraries",
   "type": "module",
   "bin": {