@wyxos/zephyr 0.2.12 → 0.2.14

package/src/release-node.mjs

@@ -1,70 +1,105 @@
-import { spawn } from 'node:child_process'
+import { spawn, exec } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { dirname, join } from 'node:path'
 import { readFile } from 'node:fs/promises'
 import fs from 'node:fs'
 import path from 'node:path'
 import process from 'node:process'
-
-const STEP_PREFIX = '→'
-const OK_PREFIX = '✔'
-const WARN_PREFIX = '⚠'
+import chalk from 'chalk'
 
 const IS_WINDOWS = process.platform === 'win32'
 
 function logStep(message) {
-  console.log(`${STEP_PREFIX} ${message}`)
+  console.log(chalk.yellow(`→ ${message}`))
 }
 
 function logSuccess(message) {
-  console.log(`${OK_PREFIX} ${message}`)
+  console.log(chalk.green(`✔ ${message}`))
 }
 
 function logWarning(message) {
-  console.warn(`${WARN_PREFIX} ${message}`)
+  console.warn(chalk.yellow(`⚠ ${message}`))
 }
 
 function runCommand(command, args, { cwd = process.cwd(), capture = false, useShell = false } = {}) {
   return new Promise((resolve, reject) => {
-    // On Windows, npm-related commands need shell: true to resolve npx.cmd
+    // On Windows, npm-related commands need shell to resolve npx.cmd
     // Git commands work fine without shell, so we only use it when explicitly requested
-    const spawnOptions = {
-      cwd,
-      stdio: capture ? ['ignore', 'pipe', 'pipe'] : 'inherit'
-    }
+    const needsShell = useShell || (IS_WINDOWS && (command === 'npm' || command === 'npx'))
+
+    if (needsShell) {
+      // When using shell, use exec to avoid deprecation warning with spawn
+      // Properly escape arguments for Windows cmd.exe
+      const escapedArgs = args.map(arg => {
+        // If arg contains spaces or special chars, wrap in quotes and escape internal quotes
+        if (arg.includes(' ') || arg.includes('"') || arg.includes('&') || arg.includes('|')) {
+          return `"${arg.replace(/"/g, '\\"')}"`
+        }
+        return arg
+      })
+      const commandString = `${command} ${escapedArgs.join(' ')}`
+
+      exec(commandString, { cwd, encoding: 'utf8' }, (error, stdout, stderr) => {
+        if (error) {
+          const err = new Error(`Command failed (${error.code}): ${command} ${args.join(' ')}`)
+          if (capture) {
+            err.stdout = stdout || ''
+            err.stderr = stderr || ''
+          } else {
+            // When not capturing, exec still provides output, so show it
+            if (stdout) process.stdout.write(stdout)
+            if (stderr) process.stderr.write(stderr)
+          }
+          err.exitCode = error.code
+          reject(err)
+          return
+        }
 
-    if (useShell || (IS_WINDOWS && (command === 'npm' || command === 'npx'))) {
-      spawnOptions.shell = true
-    }
+        if (capture) {
+          resolve({ stdout: stdout.trim(), stderr: stderr.trim() })
+        } else {
+          // When not capturing, exec still provides output, so show it
+          if (stdout) process.stdout.write(stdout)
+          if (stderr) process.stderr.write(stderr)
+          resolve(undefined)
+        }
+      })
+    } else {
+      // Use spawn for commands that don't need shell
+      const spawnOptions = {
+        cwd,
+        stdio: capture ? ['ignore', 'pipe', 'pipe'] : 'inherit'
+      }
 
-    const child = spawn(command, args, spawnOptions)
-    let stdout = ''
-    let stderr = ''
+      const child = spawn(command, args, spawnOptions)
+      let stdout = ''
+      let stderr = ''
 
-    if (capture) {
-      child.stdout.on('data', (chunk) => {
-        stdout += chunk
-      })
+      if (capture) {
+        child.stdout.on('data', (chunk) => {
+          stdout += chunk
+        })
 
-      child.stderr.on('data', (chunk) => {
-        stderr += chunk
-      })
-    }
+        child.stderr.on('data', (chunk) => {
+          stderr += chunk
+        })
+      }
 
-    child.on('error', reject)
-    child.on('close', (code) => {
-      if (code === 0) {
-        resolve(capture ? { stdout: stdout.trim(), stderr: stderr.trim() } : undefined)
-      } else {
-        const error = new Error(`Command failed (${code}): ${command} ${args.join(' ')}`)
-        if (capture) {
-          error.stdout = stdout
-          error.stderr = stderr
+      child.on('error', reject)
+      child.on('close', (code) => {
+        if (code === 0) {
+          resolve(capture ? { stdout: stdout.trim(), stderr: stderr.trim() } : undefined)
+        } else {
+          const error = new Error(`Command failed (${code}): ${command} ${args.join(' ')}`)
+          if (capture) {
+            error.stdout = stdout
+            error.stderr = stderr
+          }
+          error.exitCode = code
+          reject(error)
         }
-        error.exitCode = code
-        reject(error)
-      }
-    })
+      })
+    }
   })
 }
 
@@ -210,29 +245,10 @@ async function runLint(skipLint, pkg, rootDir = process.cwd()) {
 
   logStep('Running lint...')
 
-  let dotInterval = null
   try {
-    // Capture output and show dots as progress
-    process.stdout.write('  ')
-    dotInterval = setInterval(() => {
-      process.stdout.write('.')
-    }, 200)
-
-    await runCommand('npm', ['run', 'lint'], { capture: true, cwd: rootDir })
-
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
+    await runCommand('npm', ['run', 'lint'], { cwd: rootDir })
     logSuccess('Lint passed.')
   } catch (error) {
-    // Clear dots and show error output
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
     if (error.stdout) {
       console.error(error.stdout)
     }
@@ -257,35 +273,18 @@ async function runTests(skipTests, pkg, rootDir = process.cwd()) {
 
   logStep('Running test suite...')
 
-  let dotInterval = null
   try {
-    // Capture output and show dots as progress
-    process.stdout.write('  ')
-    dotInterval = setInterval(() => {
-      process.stdout.write('.')
-    }, 200)
-
-    // Prefer test:run if available, otherwise use test with --run flag
+    // Prefer test:run if available, otherwise use test with --run and --reporter flags
     if (hasScript(pkg, 'test:run')) {
-      await runCommand('npm', ['run', 'test:run'], { capture: true, cwd: rootDir })
+      // Pass reporter flag to test:run script
+      await runCommand('npm', ['run', 'test:run', '--', '--reporter=dot'], { cwd: rootDir })
     } else {
-      // For test script, try to pass --run flag (works with vitest)
-      await runCommand('npm', ['test', '--', '--run'], { capture: true, cwd: rootDir })
+      // For test script, pass --run and --reporter flags (works with vitest)
+      await runCommand('npm', ['test', '--', '--run', '--reporter=dot'], { cwd: rootDir })
     }
 
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
     logSuccess('Tests passed.')
   } catch (error) {
-    // Clear dots and show error output
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
     if (error.stdout) {
       console.error(error.stdout)
     }
@@ -309,29 +308,10 @@ async function runBuild(skipBuild, pkg, rootDir = process.cwd()) {
 
   logStep('Building project...')
 
-  let dotInterval = null
   try {
-    // Capture output and show dots as progress
-    process.stdout.write('  ')
-    dotInterval = setInterval(() => {
-      process.stdout.write('.')
-    }, 200)
-
-    await runCommand('npm', ['run', 'build'], { capture: true, cwd: rootDir })
-
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
+    await runCommand('npm', ['run', 'build'], { cwd: rootDir })
     logSuccess('Build completed.')
   } catch (error) {
-    // Clear dots and show error output
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
     if (error.stdout) {
       console.error(error.stdout)
     }
@@ -355,29 +335,10 @@ async function runLibBuild(skipBuild, pkg, rootDir = process.cwd()) {
 
   logStep('Building library...')
 
-  let dotInterval = null
   try {
-    // Capture output and show dots as progress
-    process.stdout.write('  ')
-    dotInterval = setInterval(() => {
-      process.stdout.write('.')
-    }, 200)
-
-    await runCommand('npm', ['run', 'build:lib'], { capture: true, cwd: rootDir })
-
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
+    await runCommand('npm', ['run', 'build:lib'], { cwd: rootDir })
     logSuccess('Library built.')
   } catch (error) {
-    // Clear dots and show error output
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
     if (error.stdout) {
       console.error(error.stdout)
     }
@@ -488,7 +449,7 @@ async function pushChanges(rootDir = process.cwd()) {
 async function publishPackage(pkg, rootDir = process.cwd()) {
   // Check if package is configured as private/restricted
   const isPrivate = pkg.publishConfig?.access === 'restricted'
-  
+
   if (isPrivate) {
     logWarning('Skipping npm publish (package is configured as private/restricted).')
     logWarning('Private packages require npm paid plan. Publish manually or use GitHub Packages.')
@@ -571,14 +532,7 @@ async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd()) {
 
   const worktreeDir = path.resolve(rootDir, '.gh-pages')
 
-  let dotInterval = null
   try {
-    // Capture output and show dots as progress
-    process.stdout.write('  ')
-    dotInterval = setInterval(() => {
-      process.stdout.write('.')
-    }, 200)
-
     try {
       await runCommand('git', ['worktree', 'remove', worktreeDir, '-f'], { capture: true, cwd: rootDir })
     } catch { }
@@ -606,19 +560,8 @@ async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd()) {
     await runCommand('git', ['-C', worktreeDir, 'commit', '-m', `deploy: demo ${new Date().toISOString()}`, '--allow-empty'], { capture: true })
     await runCommand('git', ['-C', worktreeDir, 'push', '-f', 'origin', 'gh-pages'], { capture: true })
 
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
     logSuccess('GitHub Pages deployment completed.')
   } catch (error) {
-    // Clear dots and show error output
-    if (dotInterval) {
-      clearInterval(dotInterval)
-      dotInterval = null
-    }
-    process.stdout.write('\n')
     if (error.stdout) {
       console.error(error.stdout)
     }
@@ -651,11 +594,11 @@ export async function releaseNode() {
 
     await runLint(skipLint, pkg, rootDir)
     await runTests(skipTests, pkg, rootDir)
-    await runBuild(skipBuild, pkg, rootDir)
     await runLibBuild(skipBuild, pkg, rootDir)
     await ensureNpmAuth(rootDir)
 
     const updatedPkg = await bumpVersion(releaseType, rootDir)
+    await runBuild(skipBuild, updatedPkg, rootDir)
     await pushChanges(rootDir)
     await publishPackage(updatedPkg, rootDir)
     await deployGHPages(skipDeploy, updatedPkg, rootDir)

package/src/release-packagist.mjs

@@ -27,16 +27,30 @@ function logWarning(message) {
 
 function runCommand(command, args, { cwd = process.cwd(), capture = false, useShell = false } = {}) {
   return new Promise((resolve, reject) => {
+    const needsShell = useShell || (IS_WINDOWS && (command === 'php' || command === 'composer'))
+    
     const spawnOptions = {
       cwd,
       stdio: capture ? ['ignore', 'pipe', 'pipe'] : 'inherit'
     }
 
-    if (useShell || (IS_WINDOWS && (command === 'php' || command === 'composer'))) {
+    let child
+    if (needsShell) {
+      // When using shell, construct the command string to avoid deprecation warning
+      // Properly escape arguments for Windows cmd.exe
+      const escapedArgs = args.map(arg => {
+        // If arg contains spaces or special chars, wrap in quotes and escape internal quotes
+        if (arg.includes(' ') || arg.includes('"') || arg.includes('&') || arg.includes('|')) {
+          return `"${arg.replace(/"/g, '\\"')}"`
+        }
+        return arg
+      })
+      const commandString = `${command} ${escapedArgs.join(' ')}`
       spawnOptions.shell = true
+      child = spawn(commandString, [], spawnOptions)
+    } else {
+      child = spawn(command, args, spawnOptions)
     }
-
-    const child = spawn(command, args, spawnOptions)
     let stdout = ''
     let stderr = ''