@wyxos/zephyr 0.2.21 → 0.2.22

package/src/utils/task-planner.mjs

@@ -1,96 +1,99 @@
-export function planLaravelDeploymentTasks({
-  branch,
-  isLaravel,
-  changedFiles,
-  horizonConfigured = false
-}) {
-  const safeChangedFiles = Array.isArray(changedFiles) ? changedFiles : []
-
-  const shouldRunComposer =
-    isLaravel &&
-    safeChangedFiles.some(
-      (file) =>
-        file === 'composer.json' ||
-        file === 'composer.lock' ||
-        file.endsWith('/composer.json') ||
-        file.endsWith('/composer.lock')
-    )
-
-  const shouldRunMigrations =
-    isLaravel &&
-    safeChangedFiles.some((file) => file.startsWith('database/migrations/') && file.endsWith('.php'))
-
-  const hasPhpChanges = isLaravel && safeChangedFiles.some((file) => file.endsWith('.php'))
-
-  const shouldRunNpmInstall =
-    isLaravel &&
-    safeChangedFiles.some(
-      (file) =>
-        file === 'package.json' ||
-        file === 'package-lock.json' ||
-        file.endsWith('/package.json') ||
-        file.endsWith('/package-lock.json')
-    )
-
-  const hasFrontendChanges =
-    isLaravel &&
-    safeChangedFiles.some((file) =>
-      ['.vue', '.css', '.scss', '.js', '.ts', '.tsx', '.less'].some((ext) => file.endsWith(ext))
-    )
-
-  const shouldRunBuild = isLaravel && (hasFrontendChanges || shouldRunNpmInstall)
-  const shouldClearCaches = hasPhpChanges
-  const shouldRestartQueues = hasPhpChanges
-
-  const steps = [
-    {
-      label: `Pull latest changes for ${branch}`,
-      command: `git pull origin ${branch}`
-    }
-  ]
-
-  if (shouldRunComposer) {
-    steps.push({
-      label: 'Update Composer dependencies',
-      command: 'composer update --no-dev --no-interaction --prefer-dist'
-    })
-  }
-
-  if (shouldRunMigrations) {
-    steps.push({
-      label: 'Run database migrations',
-      command: 'php artisan migrate --force'
-    })
-  }
-
-  if (shouldRunNpmInstall) {
-    steps.push({
-      label: 'Install Node dependencies',
-      command: 'npm install'
-    })
-  }
-
-  if (shouldRunBuild) {
-    steps.push({
-      label: 'Compile frontend assets',
-      command: 'npm run build'
-    })
-  }
-
-  if (shouldClearCaches) {
-    steps.push({
-      label: 'Clear Laravel caches',
-      command: 'php artisan cache:clear && php artisan config:clear && php artisan view:clear'
-    })
-  }
-
-  if (shouldRestartQueues) {
-    steps.push({
-      label: horizonConfigured ? 'Restart Horizon workers' : 'Restart queue workers',
-      command: horizonConfigured ? 'php artisan horizon:terminate' : 'php artisan queue:restart'
-    })
-  }
-
-  return steps
-}
-
+export function planLaravelDeploymentTasks({
+  branch,
+  isLaravel,
+  changedFiles,
+  horizonConfigured = false,
+  phpCommand = 'php'
+}) {
+  const safeChangedFiles = Array.isArray(changedFiles) ? changedFiles : []
+
+  const shouldRunComposer =
+    isLaravel &&
+    safeChangedFiles.some(
+      (file) =>
+        file === 'composer.json' ||
+        file === 'composer.lock' ||
+        file.endsWith('/composer.json') ||
+        file.endsWith('/composer.lock')
+    )
+
+  const shouldRunMigrations =
+    isLaravel &&
+    safeChangedFiles.some((file) => file.startsWith('database/migrations/') && file.endsWith('.php'))
+
+  const hasPhpChanges = isLaravel && safeChangedFiles.some((file) => file.endsWith('.php'))
+
+  const shouldRunNpmInstall =
+    isLaravel &&
+    safeChangedFiles.some(
+      (file) =>
+        file === 'package.json' ||
+        file === 'package-lock.json' ||
+        file.endsWith('/package.json') ||
+        file.endsWith('/package-lock.json')
+    )
+
+  const hasFrontendChanges =
+    isLaravel &&
+    safeChangedFiles.some((file) =>
+      ['.vue', '.css', '.scss', '.js', '.ts', '.tsx', '.less'].some((ext) => file.endsWith(ext))
+    )
+
+  const shouldRunBuild = isLaravel && (hasFrontendChanges || shouldRunNpmInstall)
+  const shouldClearCaches = hasPhpChanges
+  const shouldRestartQueues = hasPhpChanges
+
+  const steps = [
+    {
+      label: `Pull latest changes for ${branch}`,
+      command: `git pull origin ${branch}`
+    }
+  ]
+
+  if (shouldRunComposer) {
+    // Composer is a PHP script, so we need to run it with the correct PHP version
+    // Try composer.phar first, then system composer, ensuring it uses the correct PHP
+    steps.push({
+      label: 'Update Composer dependencies',
+      command: `COMPOSER_ALLOW_SUPERUSER=1 if [ -f composer.phar ]; then ${phpCommand} composer.phar update --no-dev --no-interaction --prefer-dist; elif command -v composer >/dev/null 2>&1; then ${phpCommand} $(command -v composer) update --no-dev --no-interaction --prefer-dist; else ${phpCommand} composer update --no-dev --no-interaction --prefer-dist; fi`
+    })
+  }
+
+  if (shouldRunMigrations) {
+    steps.push({
+      label: 'Run database migrations',
+      command: `${phpCommand} artisan migrate --force`
+    })
+  }
+
+  if (shouldRunNpmInstall) {
+    steps.push({
+      label: 'Install Node dependencies',
+      command: 'npm install'
+    })
+  }
+
+  if (shouldRunBuild) {
+    steps.push({
+      label: 'Compile frontend assets',
+      command: 'npm run build'
+    })
+  }
+
+  if (shouldClearCaches) {
+    steps.push({
+      label: 'Clear Laravel caches',
+      command: `${phpCommand} artisan cache:clear && ${phpCommand} artisan config:clear && ${phpCommand} artisan view:clear`
+    })
+  }
+
+  if (shouldRestartQueues) {
+    steps.push({
+      label: horizonConfigured ? 'Restart Horizon workers' : 'Restart queue workers',
+      command: horizonConfigured ? `${phpCommand} artisan horizon:terminate` : `${phpCommand} artisan queue:restart`
+    })
+  }
+
+  return steps
+}
+

package/src/version-checker.mjs

@@ -1,162 +1,162 @@
-import { readFile } from 'node:fs/promises'
-import { fileURLToPath } from 'node:url'
-import path from 'node:path'
-import { spawn } from 'node:child_process'
-import process from 'node:process'
-import https from 'node:https'
-import semver from 'semver'
-
-const IS_WINDOWS = process.platform === 'win32'
-const ZEPHYR_SKIP_VERSION_CHECK_ENV = 'ZEPHYR_SKIP_VERSION_CHECK'
-
-async function getCurrentVersion() {
-  try {
-    // Try to get version from package.json
-    // When running via npx, the package.json is in the installed package directory
-    const packageJsonPath = path.resolve(
-      path.dirname(fileURLToPath(import.meta.url)),
-      '..',
-      'package.json'
-    )
-    const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'))
-    return packageJson.version
-  } catch (_error) {
-    // If we can't read package.json, return null
-    return null
-  }
-}
-
-function httpsGetJson(url) {
-  return new Promise((resolve, reject) => {
-    const request = https.get(
-      url,
-      {
-        headers: {
-          accept: 'application/json'
-        }
-      },
-      (response) => {
-        const { statusCode } = response
-        if (!statusCode || statusCode < 200 || statusCode >= 300) {
-          response.resume()
-          resolve(null)
-          return
-        }
-
-        response.setEncoding('utf8')
-        let raw = ''
-        response.on('data', (chunk) => {
-          raw += chunk
-        })
-        response.on('end', () => {
-          try {
-            resolve(JSON.parse(raw))
-          } catch (error) {
-            reject(error)
-          }
-        })
-      }
-    )
-
-    request.on('error', reject)
-    request.end()
-  })
-}
-
-async function getLatestVersion() {
-  try {
-    const data = await httpsGetJson('https://registry.npmjs.org/@wyxos/zephyr/latest')
-    if (!data) {
-      return null
-    }
-    return data.version || null
-  } catch (_error) {
-    return null
-  }
-}
-
-function isNewerVersionAvailable(current, latest) {
-  if (!current || !latest) {
-    return false
-  }
-
-  // Use semver to properly compare versions
-  try {
-    return semver.gt(latest, current)
-  } catch (_error) {
-    // If semver comparison fails, fall back to simple string comparison
-    return latest !== current
-  }
-}
-
-async function reExecuteWithLatest(args) {
-  // Re-execute with npx @wyxos/zephyr@latest
-  const command = IS_WINDOWS ? 'npx.cmd' : 'npx'
-  const npxArgs = ['@wyxos/zephyr@latest', ...args]
-
-  return new Promise((resolve, reject) => {
-    const child = spawn(command, npxArgs, {
-      stdio: 'inherit',
-      env: {
-        ...process.env,
-        [ZEPHYR_SKIP_VERSION_CHECK_ENV]: '1'
-      }
-    })
-
-    child.on('error', reject)
-    child.on('close', (code) => {
-      if (code === 0) {
-        resolve()
-      } else {
-        reject(new Error(`Command exited with code ${code}`))
-      }
-    })
-  })
-}
-
-export async function checkAndUpdateVersion(promptFn, args) {
-  try {
-    if (process.env[ZEPHYR_SKIP_VERSION_CHECK_ENV] === '1') {
-      return false
-    }
-
-    const currentVersion = await getCurrentVersion()
-    if (!currentVersion) {
-      // Can't determine current version, skip check
-      return false
-    }
-
-    const latestVersion = await getLatestVersion()
-    if (!latestVersion) {
-      // Can't fetch latest version, skip check
-      return false
-    }
-
-    if (!isNewerVersionAvailable(currentVersion, latestVersion)) {
-      // Already on latest or newer
-      return false
-    }
-
-    // Newer version available, prompt user
-    const { shouldUpdate } = await promptFn([
-      {
-        type: 'confirm',
-        name: 'shouldUpdate',
-        message: `A new version of @wyxos/zephyr is available (${latestVersion}). You are currently on ${currentVersion}. Update and continue?`,
-        default: true
-      }
-    ])
-
-    if (!shouldUpdate) {
-      return false
-    }
-
-    // User confirmed, re-execute with latest version
-    await reExecuteWithLatest(args)
-    return true // Indicates we've re-executed, so the current process should exit
-  } catch (_error) {
-    // If version check fails, just continue with current version
-    // Don't block the user from using the tool
-    return false
-  }
-}
+import { readFile } from 'node:fs/promises'
+import { fileURLToPath } from 'node:url'
+import path from 'node:path'
+import { spawn } from 'node:child_process'
+import process from 'node:process'
+import https from 'node:https'
+import semver from 'semver'
+
+const IS_WINDOWS = process.platform === 'win32'
+const ZEPHYR_SKIP_VERSION_CHECK_ENV = 'ZEPHYR_SKIP_VERSION_CHECK'
+
+async function getCurrentVersion() {
+  try {
+    // Try to get version from package.json
+    // When running via npx, the package.json is in the installed package directory
+    const packageJsonPath = path.resolve(
+      path.dirname(fileURLToPath(import.meta.url)),
+      '..',
+      'package.json'
+    )
+    const packageJson = JSON.parse(await readFile(packageJsonPath, 'utf8'))
+    return packageJson.version
+  } catch (_error) {
+    // If we can't read package.json, return null
+    return null
+  }
+}
+
+function httpsGetJson(url) {
+  return new Promise((resolve, reject) => {
+    const request = https.get(
+      url,
+      {
+        headers: {
+          accept: 'application/json'
+        }
+      },
+      (response) => {
+        const { statusCode } = response
+        if (!statusCode || statusCode < 200 || statusCode >= 300) {
+          response.resume()
+          resolve(null)
+          return
+        }
+
+        response.setEncoding('utf8')
+        let raw = ''
+        response.on('data', (chunk) => {
+          raw += chunk
+        })
+        response.on('end', () => {
+          try {
+            resolve(JSON.parse(raw))
+          } catch (error) {
+            reject(error)
+          }
+        })
+      }
+    )
+
+    request.on('error', reject)
+    request.end()
+  })
+}
+
+async function getLatestVersion() {
+  try {
+    const data = await httpsGetJson('https://registry.npmjs.org/@wyxos/zephyr/latest')
+    if (!data) {
+      return null
+    }
+    return data.version || null
+  } catch (_error) {
+    return null
+  }
+}
+
+function isNewerVersionAvailable(current, latest) {
+  if (!current || !latest) {
+    return false
+  }
+
+  // Use semver to properly compare versions
+  try {
+    return semver.gt(latest, current)
+  } catch (_error) {
+    // If semver comparison fails, fall back to simple string comparison
+    return latest !== current
+  }
+}
+
+async function reExecuteWithLatest(args) {
+  // Re-execute with npx @wyxos/zephyr@latest
+  const command = IS_WINDOWS ? 'npx.cmd' : 'npx'
+  const npxArgs = ['@wyxos/zephyr@latest', ...args]
+
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, npxArgs, {
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+        [ZEPHYR_SKIP_VERSION_CHECK_ENV]: '1'
+      }
+    })
+
+    child.on('error', reject)
+    child.on('close', (code) => {
+      if (code === 0) {
+        resolve()
+      } else {
+        reject(new Error(`Command exited with code ${code}`))
+      }
+    })
+  })
+}
+
+export async function checkAndUpdateVersion(promptFn, args) {
+  try {
+    if (process.env[ZEPHYR_SKIP_VERSION_CHECK_ENV] === '1') {
+      return false
+    }
+
+    const currentVersion = await getCurrentVersion()
+    if (!currentVersion) {
+      // Can't determine current version, skip check
+      return false
+    }
+
+    const latestVersion = await getLatestVersion()
+    if (!latestVersion) {
+      // Can't fetch latest version, skip check
+      return false
+    }
+
+    if (!isNewerVersionAvailable(currentVersion, latestVersion)) {
+      // Already on latest or newer
+      return false
+    }
+
+    // Newer version available, prompt user
+    const { shouldUpdate } = await promptFn([
+      {
+        type: 'confirm',
+        name: 'shouldUpdate',
+        message: `A new version of @wyxos/zephyr is available (${latestVersion}). You are currently on ${currentVersion}. Update and continue?`,
+        default: true
+      }
+    ])
+
+    if (!shouldUpdate) {
+      return false
+    }
+
+    // User confirmed, re-execute with latest version
+    await reExecuteWithLatest(args)
+    return true // Indicates we've re-executed, so the current process should exit
+  } catch (_error) {
+    // If version check fails, just continue with current version
+    // Don't block the user from using the tool
+    return false
+  }
+}