@wyxos/zephyr 0.2.7 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyxos/zephyr",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "A streamlined deployment tool for web applications with intelligent Laravel project detection",
   "type": "module",
   "main": "./src/index.mjs",

package/src/release-node.mjs

@@ -5,24 +5,14 @@ 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}`)
-}
-
-function logSuccess(message) {
-  console.log(`${OK_PREFIX} ${message}`)
-}
-
-function logWarning(message) {
-  console.warn(`${WARN_PREFIX} ${message}`)
-}
+const logProcessing = (message = '') => console.log(chalk.yellow(message))
+const logSuccess = (message = '') => console.log(chalk.green(message))
+const logWarning = (message = '') => console.warn(chalk.yellow(message))
+const logError = (message = '') => console.error(chalk.red(message))
 
 function runCommand(command, args, { cwd = process.cwd(), capture = false, useShell = false } = {}) {
   return new Promise((resolve, reject) => {
@@ -114,10 +104,13 @@ async function ensureUpToDateWithUpstream(branch, upstreamRef, rootDir = process
   const remoteBranch = branchParts.join('/')
 
   if (remoteName && remoteBranch) {
-    logStep(`Fetching latest updates from ${remoteName}/${remoteBranch}...`)
+    logProcessing(`Fetching latest updates from ${remoteName}/${remoteBranch}...`)
     try {
-      await runCommand('git', ['fetch', remoteName, remoteBranch], { cwd: rootDir })
+      await runCommand('git', ['fetch', remoteName, remoteBranch], { capture: true, cwd: rootDir })
     } catch (error) {
+      if (error.stderr) {
+        logError(error.stderr)
+      }
       throw new Error(`Failed to fetch ${upstreamRef}: ${error.message}`)
     }
   }
@@ -136,11 +129,14 @@ async function ensureUpToDateWithUpstream(branch, upstreamRef, rootDir = process
 
   if (Number.isFinite(behind) && behind > 0) {
     if (remoteName && remoteBranch) {
-      logStep(`Fast-forwarding ${branch} with ${upstreamRef}...`)
+      logProcessing(`Fast-forwarding ${branch} with ${upstreamRef}...`)
 
       try {
-        await runCommand('git', ['pull', '--ff-only', remoteName, remoteBranch], { cwd: rootDir })
+        await runCommand('git', ['pull', '--ff-only', remoteName, remoteBranch], { capture: true, cwd: rootDir })
       } catch (error) {
+        if (error.stderr) {
+          logError(error.stderr)
+        }
         throw new Error(
           `Unable to fast-forward ${branch} with ${upstreamRef}. Resolve conflicts manually, then rerun the release.\n${error.message}`
         )
@@ -198,11 +194,11 @@ async function runLint(skipLint, pkg, rootDir = process.cwd()) {
   }
 
   if (!hasScript(pkg, 'lint')) {
-    logStep('Skipping lint (no lint script found in package.json).')
+    logProcessing('Skipping lint (no lint script found in package.json).')
     return
   }
 
-  logStep('Running lint...')
+  logProcessing('Running lint...')
   await runCommand('npm', ['run', 'lint'], { cwd: rootDir })
   logSuccess('Lint passed.')
 }
@@ -215,11 +211,11 @@ async function runTests(skipTests, pkg, rootDir = process.cwd()) {
 
   // Check for test:run or test script
   if (!hasScript(pkg, 'test:run') && !hasScript(pkg, 'test')) {
-    logStep('Skipping tests (no test or test:run script found in package.json).')
+    logProcessing('Skipping tests (no test or test:run script found in package.json).')
     return
   }
 
-  logStep('Running test suite...')
+  logProcessing('Running test suite...')
 
   let dotInterval = null
   try {
@@ -251,10 +247,10 @@ async function runTests(skipTests, pkg, rootDir = process.cwd()) {
     }
     process.stdout.write('\n')
     if (error.stdout) {
-      console.error(error.stdout)
+      logError(error.stdout)
     }
     if (error.stderr) {
-      console.error(error.stderr)
+      logError(error.stderr)
     }
     throw error
   }
@@ -267,11 +263,11 @@ async function runBuild(skipBuild, pkg, rootDir = process.cwd()) {
   }
 
   if (!hasScript(pkg, 'build')) {
-    logStep('Skipping build (no build script found in package.json).')
+    logProcessing('Skipping build (no build script found in package.json).')
     return
   }
 
-  logStep('Building project...')
+  logProcessing('Building project...')
   await runCommand('npm', ['run', 'build'], { cwd: rootDir })
   logSuccess('Build completed.')
 }
@@ -283,11 +279,11 @@ async function runLibBuild(skipBuild, pkg, rootDir = process.cwd()) {
   }
 
   if (!hasScript(pkg, 'build:lib')) {
-    logStep('Skipping library build (no build:lib script found in package.json).')
+    logProcessing('Skipping library build (no build:lib script found in package.json).')
     return false
   }
 
-  logStep('Building library...')
+  logProcessing('Building library...')
   await runCommand('npm', ['run', 'build:lib'], { cwd: rootDir })
   logSuccess('Library built.')
 
@@ -299,9 +295,9 @@ async function runLibBuild(skipBuild, pkg, rootDir = process.cwd()) {
   })
 
   if (hasLibChanges) {
-    logStep('Committing lib build artifacts...')
-    await runCommand('git', ['add', 'lib/'], { cwd: rootDir })
-    await runCommand('git', ['commit', '-m', 'chore: build lib artifacts'], { cwd: rootDir })
+    logProcessing('Committing lib build artifacts...')
+    await runCommand('git', ['add', 'lib/'], { capture: true, cwd: rootDir })
+    await runCommand('git', ['commit', '-m', 'chore: build lib artifacts'], { capture: true, cwd: rootDir })
     logSuccess('Lib build artifacts committed.')
   }
 
@@ -309,13 +305,24 @@ async function runLibBuild(skipBuild, pkg, rootDir = process.cwd()) {
 }
 
 async function ensureNpmAuth(rootDir = process.cwd()) {
-  logStep('Confirming npm authentication...')
-  await runCommand('npm', ['whoami'], { cwd: rootDir })
-  logSuccess('npm authenticated.')
+  logProcessing('Confirming npm authentication...')
+  try {
+    const result = await runCommand('npm', ['whoami'], { capture: true, cwd: rootDir })
+    // Only show username if we captured it, otherwise just show success
+    if (result?.stdout) {
+      // Silently authenticated - we don't need to show the username
+    }
+    logSuccess('npm authenticated.')
+  } catch (error) {
+    if (error.stderr) {
+      logError(error.stderr)
+    }
+    throw error
+  }
 }
 
 async function bumpVersion(releaseType, rootDir = process.cwd()) {
-  logStep(`Bumping package version...`)
+  logProcessing(`Bumping package version...`)
 
   // Lib changes should already be committed by runLibBuild, but check anyway
   const { stdout: statusBefore } = await runCommand('git', ['status', '--porcelain'], { capture: true, cwd: rootDir })
@@ -325,22 +332,29 @@ async function bumpVersion(releaseType, rootDir = process.cwd()) {
   })
 
   if (hasLibChanges) {
-    logStep('Stashing lib build artifacts...')
-    await runCommand('git', ['stash', 'push', '-u', '-m', 'temp: lib build artifacts', 'lib/'], { cwd: rootDir })
+    logProcessing('Stashing lib build artifacts...')
+    await runCommand('git', ['stash', 'push', '-u', '-m', 'temp: lib build artifacts', 'lib/'], { capture: true, cwd: rootDir })
   }
 
   try {
     // npm version will update package.json and create a commit with default message
-    await runCommand('npm', ['version', releaseType], { cwd: rootDir })
+    const result = await runCommand('npm', ['version', releaseType], { capture: true, cwd: rootDir })
+    // Extract version from output (e.g., "v0.2.8" or "0.2.8")
+    if (result?.stdout) {
+      const versionMatch = result.stdout.match(/v?(\d+\.\d+\.\d+)/)
+      if (versionMatch) {
+        // Version is shown in the logSuccess message below, no need to show it here
+      }
+    }
   } finally {
     // Restore lib changes and ensure they're in the commit
     if (hasLibChanges) {
-      logStep('Restoring lib build artifacts...')
-      await runCommand('git', ['stash', 'pop'], { cwd: rootDir })
-      await runCommand('git', ['add', 'lib/'], { cwd: rootDir })
+      logProcessing('Restoring lib build artifacts...')
+      await runCommand('git', ['stash', 'pop'], { capture: true, cwd: rootDir })
+      await runCommand('git', ['add', 'lib/'], { capture: true, cwd: rootDir })
       const { stdout: statusAfter } = await runCommand('git', ['status', '--porcelain'], { capture: true, cwd: rootDir })
       if (statusAfter.includes('lib/')) {
-        await runCommand('git', ['commit', '--amend', '--no-edit'], { cwd: rootDir })
+        await runCommand('git', ['commit', '--amend', '--no-edit'], { capture: true, cwd: rootDir })
       }
     }
   }
@@ -349,16 +363,26 @@ async function bumpVersion(releaseType, rootDir = process.cwd()) {
   const commitMessage = `chore: release ${pkg.version}`
 
   // Amend the commit message to use our custom format
-  await runCommand('git', ['commit', '--amend', '-m', commitMessage], { cwd: rootDir })
+  await runCommand('git', ['commit', '--amend', '-m', commitMessage], { capture: true, cwd: rootDir })
 
   logSuccess(`Version updated to ${pkg.version}.`)
   return pkg
 }
 
 async function pushChanges(rootDir = process.cwd()) {
-  logStep('Pushing commits and tags to origin...')
-  await runCommand('git', ['push', '--follow-tags'], { cwd: rootDir })
-  logSuccess('Git push completed.')
+  logProcessing('Pushing commits and tags to origin...')
+  try {
+    await runCommand('git', ['push', '--follow-tags'], { capture: true, cwd: rootDir })
+    logSuccess('Git push completed.')
+  } catch (error) {
+    if (error.stdout) {
+      logError(error.stdout)
+    }
+    if (error.stderr) {
+      logError(error.stderr)
+    }
+    throw error
+  }
 }
 
 async function publishPackage(pkg, rootDir = process.cwd()) {
@@ -371,9 +395,19 @@ async function publishPackage(pkg, rootDir = process.cwd()) {
     publishArgs.push('--access', access)
   }
 
-  logStep(`Publishing ${pkg.name}@${pkg.version} to npm...`)
-  await runCommand('npm', publishArgs, { cwd: rootDir })
-  logSuccess('npm publish completed.')
+  logProcessing(`Publishing ${pkg.name}@${pkg.version} to npm...`)
+  try {
+    await runCommand('npm', publishArgs, { capture: true, cwd: rootDir })
+    logSuccess('npm publish completed.')
+  } catch (error) {
+    if (error.stdout) {
+      logError(error.stdout)
+    }
+    if (error.stderr) {
+      logError(error.stderr)
+    }
+    throw error
+  }
 }
 
 function extractDomainFromHomepage(homepage) {
@@ -405,11 +439,11 @@ async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd()) {
   }
 
   if (!distExists) {
-    logStep('Skipping GitHub Pages deployment (no dist directory found).')
+    logProcessing('Skipping GitHub Pages deployment (no dist directory found).')
     return
   }
 
-  logStep('Deploying to GitHub Pages...')
+  logProcessing('Deploying to GitHub Pages...')
 
   // Write CNAME file to dist if homepage is set
   const cnamePath = path.join(distPath, 'CNAME')
@@ -459,35 +493,41 @@ async function deployGHPages(skipDeploy, pkg, rootDir = process.cwd()) {
 }
 
 export async function releaseNode() {
-  const { releaseType, skipTests, skipLint, skipBuild, skipDeploy } = parseArgs()
-  const rootDir = process.cwd()
+  try {
+    const { releaseType, skipTests, skipLint, skipBuild, skipDeploy } = parseArgs()
+    const rootDir = process.cwd()
 
-  logStep('Reading package metadata...')
-  const pkg = await readPackage(rootDir)
+    logProcessing('Reading package metadata...')
+    const pkg = await readPackage(rootDir)
 
-  logStep('Checking working tree status...')
-  await ensureCleanWorkingTree(rootDir)
+    logProcessing('Checking working tree status...')
+    await ensureCleanWorkingTree(rootDir)
 
-  const branch = await getCurrentBranch(rootDir)
-  if (!branch) {
-    throw new Error('Unable to determine current branch.')
-  }
+    const branch = await getCurrentBranch(rootDir)
+    if (!branch) {
+      throw new Error('Unable to determine current branch.')
+    }
 
-  logStep(`Current branch: ${branch}`)
-  const upstreamRef = await getUpstreamRef(rootDir)
-  await ensureUpToDateWithUpstream(branch, upstreamRef, rootDir)
+    logProcessing(`Current branch: ${branch}`)
+    const upstreamRef = await getUpstreamRef(rootDir)
+    await ensureUpToDateWithUpstream(branch, upstreamRef, rootDir)
 
-  await runLint(skipLint, pkg, rootDir)
-  await runTests(skipTests, pkg, rootDir)
-  await runBuild(skipBuild, pkg, rootDir)
-  await runLibBuild(skipBuild, pkg, rootDir)
-  await ensureNpmAuth(rootDir)
+    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 pushChanges(rootDir)
-  await publishPackage(updatedPkg, rootDir)
-  await deployGHPages(skipDeploy, updatedPkg, rootDir)
+    const updatedPkg = await bumpVersion(releaseType, rootDir)
+    await pushChanges(rootDir)
+    await publishPackage(updatedPkg, rootDir)
+    await deployGHPages(skipDeploy, updatedPkg, rootDir)
 
-  logSuccess(`Release workflow completed for ${updatedPkg.name}@${updatedPkg.version}.`)
+    logSuccess(`Release workflow completed for ${updatedPkg.name}@${updatedPkg.version}.`)
+  } catch (error) {
+    logError('\nRelease failed:')
+    logError(error.message)
+    throw error
+  }
 }