infra-kit 0.1.2 → 0.1.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "infra-kit",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "infra-kit",
   "main": "dist/main.js",
   "module": "dist/main.js",
@@ -29,6 +29,8 @@
     "fix": "pnpm run prettier-fix && pnpm run eslint-fix && pnpm run qa"
   },
   "dependencies": {
+    "@inquirer/checkbox": "^4.0.6",
+    "@inquirer/confirm": "^5.1.3",
     "@inquirer/select": "^4.0.6",
     "commander": "^13.1.0",
     "zx": "^8.3.0"

package/src/commands/gh-deploy/gh-deploy.ts

@@ -3,12 +3,15 @@ import { $ } from 'zx'
 
 import { validateGitHubCliAndAuth } from '../../shared/gh-cli-auth'
 
+/**
+ * Deploy a release branch to an environment
+ */
 export const ghDeploy = async () => {
   await validateGitHubCliAndAuth()
 
   const ENVs = ['dev', 'arthur', 'renana', 'roman', 'eliran', 'alex', 'vova', 'oriana']
 
-  let releasePRsList: string[] = []
+  let releasePRsList: string[] = [] // ["release/v1.8.0", "release/v1.9.0"]
 
   try {
     // Example of releasePRs.output: {"headRefName":"release/v1.8.0","number":665,"state":"OPEN","title":"WIP Release/v1.8.0"}

package/src/commands/gh-merge-dev/gh-merge-dev.ts

@@ -1,37 +1,65 @@
-import { $, question } from 'zx'
+import checkbox from '@inquirer/checkbox'
+import confirm from '@inquirer/confirm'
+import { $ } from 'zx'
+
+import { validateGitHubCliAndAuth } from '../../shared/gh-cli-auth'
 
 /**
  * Merge dev into every release branch
  */
 export const ghMergeDev = async () => {
-  const branchesInput = await question('Enter branch names separated by commas: ')
+  await validateGitHubCliAndAuth()
 
-  const branches = branchesInput.split(',').map((branch) => branch.trim())
+  let releasePRsList: string[] = [] // ["release/v1.8.0", "release/v1.9.0"]
 
-  // Validate input
-  if (branches.length === 0) {
-    console.error('No branches provided. Exiting...')
+  try {
+    // Example of releasePRs.output: {"headRefName":"release/v1.8.0","number":665,"state":"OPEN","title":"WIP Release/v1.8.0"}
+    const releasePRs =
+      await $`gh pr list --search "Release in:title" --base dev --json number,title,headRefName,state,baseRefName`
+
+    const releasePRsArray = JSON.parse(releasePRs.stdout)
+
+    if (releasePRsArray.length === 0) {
+      console.error('❌ No release PRs found. Check the project folder for the script. Exiting...')
+      process.exit(1)
+    }
+
+    releasePRsList = releasePRsArray.map((pr) => pr.headRefName)
+  } catch (error) {
+    console.error('❌ Error fetching release PRs:', error.message)
     process.exit(1)
   }
 
-  // Confirm the operation
-  const confirm = await question(
-    `Are you sure you want to merge dev into these branches: ${branches.join(', ')}? (y/n) `,
-  )
+  const selectedReleaseBranches = await checkbox({
+    required: true,
+    message: '🔍 Select release branches',
+    choices: releasePRsList.map((pr) => ({
+      name: pr,
+      value: pr,
+    })),
+  })
+
+  // Validate input
+  // if (selectedReleaseBranches.length === 0) {
+  //   console.error('No branches provided. Exiting...')
+  //   process.exit(1)
+  // }
+
+  const answer = await confirm({
+    message: `Are you sure you want to merge dev into these branches: ${selectedReleaseBranches.join(', ')}?`,
+  })
 
-  if (confirm.toLowerCase() !== 'y') {
+  if (!answer) {
     console.log('Operation cancelled. Exiting...')
     process.exit(0)
   }
 
   await $`git fetch origin`
-
   await $`git switch dev`
-
   await $`git pull origin dev`
 
   // Merge dev into each branch
-  for (const branch of branches) {
+  for (const branch of selectedReleaseBranches) {
     await mergeDev(branch)
   }