infra-kit 0.1.25 → 0.1.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +7 -6
- package/dist/main.js.map +4 -4
- package/package.json +1 -1
- package/src/commands/gh-merge-dev/gh-merge-dev.ts +30 -5
- package/src/commands/worktrees-manage/worktrees-manage.ts +3 -29
- package/src/entry/main.ts +2 -2
- package/src/shared/constants.ts +2 -0
- package/src/shared/git-utils/git-utils.ts +29 -0
- package/src/shared/git-utils/index.ts +1 -0
- package/src/shared/version-utils/index.ts +1 -0
- /package/src/shared/{version-utils.ts → version-utils/version-utils.ts} +0 -0
package/dist/main.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import{Command as
|
|
2
|
-
`),console.log(`\u2714\uFE0F Successfully delivered ${s} to production!`)}catch(n){console.error("\u274C Error merging release branch into dev:",n instanceof Error?n.message:"Unknown error"),
|
|
1
|
+
import{Command as ne}from"commander";import _ from"@inquirer/confirm";import H from"@inquirer/select";import b from"node:process";import{$ as f}from"zx";import j from"node:process";import{$ as G}from"zx";var c=async()=>{try{await G`gh --version`}catch(e){console.error("Error: GitHub CLI (gh) is not installed.",e?.message),console.error("Please install it from: https://cli.github.com/"),j.exit(1)}try{await G`gh auth status`}catch(e){console.error("Error: GitHub CLI (gh) is not authenticated.",e?.message),console.error('Please authenticate it from: https://cli.github.com/manual/gh_auth_login or type "gh auth login"'),j.exit(1)}};import B from"node:process";import{$ as M}from"zx";var l=async()=>{try{let e=await M`gh pr list --search "Release in:title" --base dev --json number,title,headRefName,state,baseRefName`,r=JSON.parse(e.stdout);return r.length===0&&(console.error("\u274C No release PRs found. Check the project folder for the script. Exiting..."),B.exit(1)),r.map(o=>o.headRefName)}catch(e){console.error("\u274C Error fetching release PRs:",e instanceof Error?e.message:String(e)),B.exit(1)}};var k=async e=>{let{version:r,yes:o}=e;await c();let t=await l(),s="";r?s=`release/v${r}`:s=await H({message:"\u{1F33F} Select release branch",choices:t.map(n=>({name:n.replace("release/v",""),value:n}))}),t.includes(s)||(console.error(`\u274C Release branch ${s} not found in open PRs. Exiting...`),b.exit(1)),(o?!0:await _({message:`Are you sure you want to deliver version ${s} to production?`}))||(console.log("Operation cancelled. Exiting..."),b.exit(0));try{await f`gh pr merge ${s} --squash --admin --delete-branch`,await f`gh pr create --base main --head dev --title "Release v${s.replace("release/v","")} (RC)" --body ""`,await f`gh pr merge dev --squash --admin`,await f`gh workflow run deploy-all.yml --ref main -f environment=prod`,await f`git switch main && git pull && git switch dev && git pull && git merge main --no-edit && git push`,console.log(`
|
|
2
|
+
`),console.log(`\u2714\uFE0F Successfully delivered ${s} to production!`)}catch(n){console.error("\u274C Error merging release branch into dev:",n instanceof Error?n.message:"Unknown error"),b.exit(1)}};var $=e=>e.replace("release/","").slice(1).split(".").map(Number),u=e=>e.sort((r,o)=>{let[t,s,a]=$(r),[n,i,v]=$(o);return t!==n?(t??0)-(n??0):s!==i?(s??0)-(i??0):(a??0)-(v??0)});var x=async()=>{await c();let r=(await l()).map(t=>t.replace("release/","")),o=u(r);console.log(`All release branches:
|
|
3
3
|
`),console.log(o.join(`
|
|
4
|
-
`))};import
|
|
5
|
-
`).filter(Boolean).map(o=>{let t=o.split(" ").filter(Boolean);return t.length<3?null:`release/${t[0]?.split("/").pop()||""}`}).filter(o=>o!==null),
|
|
4
|
+
`))};import O from"@inquirer/confirm";import F from"node:process";import{$ as E}from"zx";var A=["dev","arthur","renana","roman","eliran","oriana"],R="-worktrees";import{$ as N}from"zx";var w=async()=>(await N`git worktree list`).stdout.split(`
|
|
5
|
+
`).filter(Boolean).map(o=>{let t=o.split(" ").filter(Boolean);return t.length<3?null:`release/${t[0]?.split("/").pop()||""}`}).filter(o=>o!==null),d=async()=>(await N`git rev-parse --show-toplevel`).stdout.trim();var T="release",V="release/v",P=async e=>{let{yes:r}=e;try{await c(),(r?!0:await O({message:"Are you sure you want to proceed with these worktree changes?"}))||(console.log("Operation cancelled. Exiting..."),F.exit(0));let t=await U(),s=await w(),n=`${await d()}${R}`;await q(`${n}/${T}`);let{branchesToCreate:i,branchesToRemove:v}=X(t,s),p=await K(i,n),y=await z(v,n);return J(p,y),{created:p,removed:y}}catch(o){throw console.error("\u274C Error managing worktrees:",o),o}},U=async()=>{let e=await l();return u(e)},q=async e=>{await E`mkdir -p ${e}`},X=(e,r)=>{let o=r.filter(a=>a.startsWith(V)),t=e.filter(a=>!o.includes(a)),s=o.filter(a=>!e.includes(a));return{branchesToCreate:t,branchesToRemove:s}},K=async(e,r)=>{let o=[];for(let t of e)try{let s=`${r}/${t}`;await E`git worktree add ${s} ${t}`,o.push(t)}catch(s){console.error(`\u274C Failed to create worktree for ${t}:`,s)}return o},z=async(e,r)=>{let o=[];for(let t of e)try{let s=`${r}/${t}`;await E`git worktree remove ${s}`,o.push(t)}catch(s){console.error(`\u274C Failed to remove worktree for ${t}:`,s)}return o},J=(e,r)=>{e.length>0?(console.log(`
|
|
6
|
+
`),console.log("\u2705 Created worktrees:"),console.log(e.join(`
|
|
6
7
|
`)),console.log()):console.log("\u2139\uFE0F No new worktrees to create"),r.length>0?(console.log("\u274C Removed worktrees:"),console.log(r.join(`
|
|
7
|
-
`)),console.log()):console.log("\u2139\uFE0F No unused worktrees to remove")};import
|
|
8
|
-
`),console.log(`\u2705 Successfully launched deploy-all workflow_dispatch for release branch: ${a} and environment: ${n}`)}catch(i){console.error("\u274C Error launching workflow:",i instanceof Error?i.message:"Unknown error"),
|
|
8
|
+
`)),console.log()):console.log("\u2139\uFE0F No unused worktrees to remove")};import Q from"@inquirer/checkbox";import Y from"@inquirer/confirm";import Z from"node:process";import{$ as g}from"zx";var C=async e=>{let{all:r,yes:o}=e;await c();let t=await l(),s=await w(),a=await d(),n=`${a}${R}`,i=[];r?i=t:i=await Q({required:!0,message:"\u{1F33F} Select release branches",choices:t.map(p=>({name:p.replace("release/v",""),value:p}))}),(o?!0:await Y({message:`Are you sure you want to merge dev into these branches: ${i.join(", ")}?`}))||(console.log("Operation cancelled. Exiting..."),Z.exit(0)),await g`git fetch origin`,await g`git switch dev`,await g`git pull origin dev`;for(let p of i){let y=s.includes(p);await ee({branch:p,isBranchInWorktrees:y,worktreeDir:n,projectRoot:a})}console.log("\u2705 All merges completed!")},ee=async e=>{let{branch:r,isBranchInWorktrees:o,worktreeDir:t,projectRoot:s}=e;console.log(`Merging dev into ${r}...`);try{o?await g`cd ${t}/${r}`:await g`git switch ${r}`,await g`git pull origin ${r}`,await g`git merge origin/dev --no-edit`,await g`git push origin ${r}`,console.log(`\u2714\uFE0F Successfully merged dev into ${r}`)}catch(a){console.error(`Error merging dev into ${r}:`,a instanceof Error?a.message:"Unknown error")}finally{o?await g`cd ${s}`:await g`git switch dev`}};import re from"@inquirer/confirm";import L from"node:process";import{$ as m,question as oe}from"zx";var D=async e=>{let{versions:r,yes:o}=e,t="";r?t=r:t=await oe("Enter versions by comma (e.g. 1.2.5, 1.2.6): ");let s=t.split(",").map(n=>n.trim());s.length===0&&(console.error("No versions provided. Exiting..."),L.exit(1)),(o?!0:await re({message:`Are you sure you want to create release branches for these versions: ${s.join(", ")}?`}))||(console.log("Operation cancelled. Exiting..."),L.exit(0)),await m`git fetch origin`,await m`git switch dev`,await m`git pull origin dev`;for(let n of s)await te(n);console.log("\u2705 All release branches were created successfully.")};async function te(e){await c();let r=`release/v${e}`;console.log(`Creating release branch ${r}...`);try{await m`git switch dev`,await m`git pull origin dev`,await m`git checkout -b ${r}`,await m`git push -u origin ${r}`,await m`git commit --allow-empty-message --allow-empty --message ''`,await m`git push origin ${r}`,await m`gh pr create --title "Release v${e}" --body "Release v${e}" --base dev --head ${r}`,await m`git switch dev`,console.log(`\u2714\uFE0F Successfully created release branch: ${r}`)}catch(o){console.error(`Error creating release branch ${r}:`,o instanceof Error?o.message:"Unknown error")}}import I from"@inquirer/select";import S from"node:process";import{$ as se}from"zx";var W=async e=>{let{version:r,env:o}=e;await c();let t=["dev"],s=await l();t.push(...s);let a="";r?a=`release/v${r}`:a=await I({message:"\u{1F33F} Select release branch",choices:t.map(i=>({name:i.replace("release/v",""),value:i}))}),t.includes(a)||(console.error(`\u274C Release branch ${a} not found in open PRs. Exiting...`),S.exit(1));let n="";o?n=o:n=await I({message:"\u{1F9EA} Select environment",choices:A.map(i=>({name:i,value:i}))}),A.includes(n)||(console.error(`\u274C Invalid environment: ${n}. Exiting...`),S.exit(1));try{await se`gh workflow run deploy-all.yml --ref ${a} -f environment=${n}`,console.log(`
|
|
9
|
+
`),console.log(`\u2705 Successfully launched deploy-all workflow_dispatch for release branch: ${a} and environment: ${n}`)}catch(i){console.error("\u274C Error launching workflow:",i instanceof Error?i.message:"Unknown error"),S.exit(1)}};var h=new ne;h.command("merge-dev").description("Merge dev branch into every release branch").option("-a, --all","Select all release branches").option("-y, --yes","Skip confirmation prompt").action(async e=>{await C({all:e.all,yes:e.yes})});h.command("release-list").description("List all release branches").action(async()=>{await x()});h.command("release-create").description("Create new release branches").option("-v, --versions <versions>","Specify the versions to create by comma, e.g. 1.2.5, 1.2.6").option("-y, --yes","Skip confirmation prompt").action(async e=>{await D({versions:e.versions,yes:e.yes})});h.command("release-deploy").description("Deploy any release branch to any environment").option("-v, --version <version>","Specify the version to deploy, e.g. 1.2.5").option("-e, --env <env>","Specify the environment to deploy to, e.g. dev").action(async e=>{await W({version:e.version,env:e.env})});h.command("release-deliver").description("Release a new version to production").option("-v, --version <version>","Specify the version to release, e.g. 1.2.5").option("-y, --yes","Skip confirmation prompt").action(async e=>{await k({version:e.version,yes:e.yes})});h.command("worktrees-manage").description("Manage git worktrees for release branches").option("-y, --yes","Skip confirmation prompt").action(async e=>{await P({yes:e.yes})});h.parse();
|
|
9
10
|
//# sourceMappingURL=main.js.map
|
package/dist/main.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
|
-
"sources": ["../src/entry/main.ts", "../src/commands/gh-release-deliver/gh-release-deliver.ts", "../src/shared/gh-cli-auth/gh-cli-auth.ts", "../src/shared/gh-release-prs/gh-release-prs.ts", "../src/shared/version-utils.ts", "../src/commands/gh-release-list/gh-release-list.ts", "../src/commands/worktrees-manage/worktrees-manage.ts", "../src/commands/gh-merge-dev/gh-merge-dev.ts", "../src/commands/gh-release-create/gh-release-create.ts", "../src/commands/gh-release-deploy/gh-release-deploy.ts"
|
|
4
|
-
"sourcesContent": ["import { Command } from 'commander'\n\nimport { ghReleaseDeliver } from 'src/commands/gh-release-deliver'\nimport { ghReleaseList } from 'src/commands/gh-release-list'\nimport { manageWorktrees } from 'src/commands/worktrees-manage'\n\nimport { ghMergeDev } from '../commands/gh-merge-dev'\nimport { ghReleaseCreate } from '../commands/gh-release-create'\nimport { ghReleaseDeploy } from '../commands/gh-release-deploy'\n\nconst program = new Command()\n\nprogram\n .command('merge-dev')\n .description('Merge dev branch into every release branch')\n .option('-a, --all', 'Select all release branches')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async (options) => {\n await ghMergeDev({ all: options.all, yes: options.yes })\n })\n\nprogram\n .command('release-list')\n .description('List all release branches')\n .action(async () => {\n await ghReleaseList()\n })\n\nprogram\n .command('release-create')\n .description('Create new release branches')\n .option('-v, --versions <versions>', 'Specify the versions to create by comma, e.g. 1.2.5, 1.2.6')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async (options) => {\n await ghReleaseCreate({ versions: options.versions, yes: options.yes })\n })\n\nprogram\n .command('release-deploy')\n .description('Deploy any release branch to any environment')\n .option('-v, --version <version>', 'Specify the version to deploy, e.g. 1.2.5')\n .option('-e, --env <env>', 'Specify the environment to deploy to, e.g. dev')\n .action(async (options) => {\n await ghReleaseDeploy({ version: options.version, env: options.env })\n })\n\nprogram\n .command('release-deliver')\n .description('Release a new version to production')\n .option('-v, --version <version>', 'Specify the version to release, e.g. 1.2.5')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async (options) => {\n await ghReleaseDeliver({ version: options.version, yes: options.yes })\n })\n\nprogram\n .command('worktrees-manage')\n .description('Manage git worktrees for release branches')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async () => {\n await manageWorktrees()\n })\n\nprogram.parse()\n", "/* eslint-disable no-console */\nimport confirm from '@inquirer/confirm'\nimport select from '@inquirer/select'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\n\ninterface GhReleaseDeliverArgs {\n version: string\n yes: boolean\n}\n\n/**\n * Deliver a release branch to production\n */\nexport const ghReleaseDeliver = async (args: GhReleaseDeliverArgs) => {\n const { version, yes } = args\n\n await validateGitHubCliAndAuth()\n\n const releasePRsList = await getReleasePRs()\n\n let selectedReleaseBranch = '' // \"release/v1.8.0\"\n\n if (version) {\n selectedReleaseBranch = `release/v${version}`\n } else {\n selectedReleaseBranch = await select({\n message: '\uD83C\uDF3F Select release branch',\n choices: releasePRsList.map((pr) => ({\n name: pr.replace('release/v', ''),\n value: pr,\n })),\n })\n }\n\n // Check if release branch exists in the list\n if (!releasePRsList.includes(selectedReleaseBranch)) {\n console.error(`\u274C Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)\n process.exit(1)\n }\n\n const answer = yes\n ? true\n : await confirm({\n message: `Are you sure you want to deliver version ${selectedReleaseBranch} to production?`,\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n try {\n await $`gh pr merge ${selectedReleaseBranch} --squash --admin --delete-branch` // TODO: add --body (AI for generate message)\n\n await $`gh pr create --base main --head dev --title \"Release v${selectedReleaseBranch.replace('release/v', '')} (RC)\" --body \"\"`\n\n await $`gh pr merge dev --squash --admin`\n\n await $`gh workflow run deploy-all.yml --ref main -f environment=prod`\n\n // Merge main into dev\n await $`git switch main && git pull && git switch dev && git pull && git merge main --no-edit && git push`\n\n console.log('\\n')\n console.log(`\u2714\uFE0F Successfully delivered ${selectedReleaseBranch} to production!`)\n } catch (error: unknown) {\n console.error('\u274C Error merging release branch into dev:', error instanceof Error ? error.message : 'Unknown error')\n process.exit(1)\n }\n}\n", "import process from 'node:process'\nimport { $ } from 'zx'\n\n/**\n * Validate GitHub CLI installation and authentication status and throw an error if not valid\n */\nexport const validateGitHubCliAndAuth = async () => {\n try {\n await $`gh --version`\n } catch (error: unknown) {\n console.error('Error: GitHub CLI (gh) is not installed.', (error as Error)?.message)\n console.error('Please install it from: https://cli.github.com/')\n process.exit(1)\n }\n\n try {\n await $`gh auth status`\n } catch (error: unknown) {\n console.error('Error: GitHub CLI (gh) is not authenticated.', (error as Error)?.message)\n console.error('Please authenticate it from: https://cli.github.com/manual/gh_auth_login or type \"gh auth login\"')\n process.exit(1)\n }\n}\n", "import process from 'node:process'\nimport { $ } from 'zx'\n\ninterface ReleasePR {\n headRefName: string\n number: number\n state: string\n title: string\n baseRefName: string\n}\n\n/**\n * Fetch open release PRs from GitHub with 'Release' in the title and base 'dev'.\n * Returns an array of headRefName strings.\n * Throws an error if fetching fails.\n */\nexport const getReleasePRs = async (): Promise<string[]> => {\n try {\n // Example of releasePRs.output: {\"headRefName\":\"release/v1.8.0\",\"number\":665,\"state\":\"OPEN\",\"title\":\"WIP Release/v1.8.0\"}\n const releasePRs =\n await $`gh pr list --search \"Release in:title\" --base dev --json number,title,headRefName,state,baseRefName`\n\n const releasePRsArray: ReleasePR[] = JSON.parse(releasePRs.stdout)\n\n if (releasePRsArray.length === 0) {\n console.error('\u274C No release PRs found. Check the project folder for the script. Exiting...')\n process.exit(1)\n }\n\n return releasePRsArray.map((pr) => pr.headRefName)\n } catch (error) {\n console.error('\u274C Error fetching release PRs:', error instanceof Error ? error.message : String(error))\n process.exit(1)\n }\n}\n", "/**\n * Parse version string into major, minor, patch numbers\n */\nexport const parseVersion = (versionStr: string): [number, number, number] => {\n return versionStr.replace('release/', '').slice(1).split('.').map(Number) as [number, number, number]\n}\n\n/**\n * Sort version strings in ascending order\n */\nexport const sortVersions = (versions: string[]): string[] => {\n return versions.sort((a, b) => {\n const [majA, minA, patchA] = parseVersion(a)\n const [majB, minB, patchB] = parseVersion(b)\n\n if (majA !== majB) return (majA ?? 0) - (majB ?? 0)\n if (minA !== minB) return (minA ?? 0) - (minB ?? 0)\n return (patchA ?? 0) - (patchB ?? 0)\n })\n}\n", "/* eslint-disable no-console */\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\nimport { sortVersions } from 'src/shared/version-utils'\n\n/**\n * List all open release branches\n */\nexport const ghReleaseList = async () => {\n await validateGitHubCliAndAuth()\n\n const releasePRs = await getReleasePRs()\n\n const releasePRsList = releasePRs.map((pr) => pr.replace('release/', ''))\n const sortedReleases = sortVersions(releasePRsList)\n\n console.log('All release branches: \\n')\n console.log(sortedReleases.join('\\n'))\n}\n", "/* eslint-disable no-console */\nimport confirm from '@inquirer/confirm'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\nimport { sortVersions } from 'src/shared/version-utils'\n\n// Constants\nconst WORKTREES_DIR_SUFFIX = '-worktrees'\nconst RELEASE_DIR = 'release'\nconst RELEASE_BRANCH_PREFIX = 'release/v'\n\ninterface WorktreeManagementArgs {\n yes: boolean\n}\n\ninterface WorktreeManagementResult {\n created: string[]\n removed: string[]\n}\n\n/**\n * Manage git worktrees for release branches\n * Creates worktrees for active release branches and removes unused ones\n */\nexport const manageWorktrees = async (options: WorktreeManagementArgs): Promise<WorktreeManagementResult> => {\n const { yes } = options\n\n try {\n await validateGitHubCliAndAuth()\n\n // Ask for confirmation\n const answer = yes\n ? true\n : await confirm({\n message: 'Are you sure you want to proceed with these worktree changes?',\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n const activeReleaseBranches = await getActiveReleaseBranches()\n const currentWorktrees = await getCurrentWorktrees()\n const projectRoot = await getProjectRoot()\n\n const worktreeDir = `${projectRoot}${WORKTREES_DIR_SUFFIX}`\n await ensureWorktreeDirectory(`${worktreeDir}/${RELEASE_DIR}`)\n\n const { branchesToCreate, branchesToRemove } = categorizeWorktrees(activeReleaseBranches, currentWorktrees)\n\n const createdWorktrees = await createWorktrees(branchesToCreate, worktreeDir)\n const removedWorktrees = await removeWorktrees(branchesToRemove, worktreeDir)\n\n logResults(createdWorktrees, removedWorktrees)\n\n return {\n created: createdWorktrees,\n removed: removedWorktrees,\n }\n } catch (error) {\n console.error('\u274C Error managing worktrees:', error)\n throw error\n }\n}\n/**\n * Get active release branches from GitHub\n *\n * @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n */\nconst getActiveReleaseBranches = async (): Promise<string[]> => {\n const releasePRs = await getReleasePRs()\n\n return sortVersions(releasePRs)\n}\n\n/**\n * Get current git worktrees\n *\n * @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n */\nconst getCurrentWorktrees = async (): Promise<string[]> => {\n const worktreesOutput = await $`git worktree list`\n const worktreeLines = worktreesOutput.stdout.split('\\n').filter(Boolean)\n\n return worktreeLines\n .map((line) => {\n const parts = line.split(' ').filter(Boolean)\n\n if (parts.length < 3) return null\n\n return `release/${parts[0]?.split('/').pop() || ''}`\n })\n .filter((branch) => branch !== null)\n}\n\n/**\n * Get the current project root directory\n */\nconst getProjectRoot = async (): Promise<string> => {\n const result = await $`git rev-parse --show-toplevel`\n return result.stdout.trim()\n}\n\n/**\n * Ensure the worktree directory exists\n */\nconst ensureWorktreeDirectory = async (worktreeDir: string): Promise<void> => {\n await $`mkdir -p ${worktreeDir}`\n}\n\n/**\n * Categorize worktrees into those that need to be created or removed\n */\nconst categorizeWorktrees = (\n activeBranches: string[], // [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n currentWorktrees: string[], // [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n): { branchesToCreate: string[]; branchesToRemove: string[] } => {\n const currentBranchNames = currentWorktrees.filter((branch) => branch.startsWith(RELEASE_BRANCH_PREFIX))\n\n const branchesToCreate = activeBranches.filter((branch) => !currentBranchNames.includes(branch))\n\n const branchesToRemove = currentBranchNames.filter((branch) => !activeBranches.includes(branch))\n\n return { branchesToCreate, branchesToRemove }\n}\n\n/**\n * Create worktrees for the specified branches\n */\nconst createWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {\n const created: string[] = []\n\n for (const branch of branches) {\n try {\n const worktreePath = `${worktreeDir}/${branch}`\n await $`git worktree add ${worktreePath} ${branch}`\n created.push(branch)\n } catch (error) {\n console.error(`\u274C Failed to create worktree for ${branch}:`, error)\n }\n }\n\n return created\n}\n\n/**\n * Remove worktrees for the specified branches\n */\nconst removeWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {\n const removed: string[] = []\n\n for (const branch of branches) {\n try {\n const worktreePath = `${worktreeDir}/${branch}`\n await $`git worktree remove ${worktreePath}`\n removed.push(branch)\n } catch (error) {\n console.error(`\u274C Failed to remove worktree for ${branch}:`, error)\n }\n }\n\n return removed\n}\n\n/**\n * Log the results of worktree management\n */\nconst logResults = (created: string[], removed: string[]): void => {\n if (created.length > 0) {\n console.log('\u2705 Created worktrees:')\n console.log(created.join('\\n'))\n console.log()\n } else {\n console.log('\u2139\uFE0F No new worktrees to create')\n }\n\n if (removed.length > 0) {\n console.log('\u274C Removed worktrees:')\n console.log(removed.join('\\n'))\n console.log()\n } else {\n console.log('\u2139\uFE0F No unused worktrees to remove')\n }\n}\n", "/* eslint-disable no-console */\nimport checkbox from '@inquirer/checkbox'\nimport confirm from '@inquirer/confirm'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\n\ninterface GhMergeDevArgs {\n all: boolean\n yes: boolean\n}\n\n/**\n * Merge dev into every release branch\n */\nexport const ghMergeDev = async (args: GhMergeDevArgs) => {\n const { all, yes } = args\n\n await validateGitHubCliAndAuth()\n\n const releasePRsList = await getReleasePRs()\n\n let selectedReleaseBranches: string[] = []\n\n if (all) {\n selectedReleaseBranches = releasePRsList\n } else {\n selectedReleaseBranches = await checkbox({\n required: true,\n message: '\uD83C\uDF3F Select release branches',\n choices: releasePRsList.map((pr) => ({\n name: pr.replace('release/v', ''),\n value: pr,\n })),\n })\n }\n\n // Validate input\n // if (selectedReleaseBranches.length === 0) {\n // console.error('No branches provided. Exiting...')\n // process.exit(1)\n // }\n\n const answer = yes\n ? true\n : await confirm({\n message: `Are you sure you want to merge dev into these branches: ${selectedReleaseBranches.join(', ')}?`,\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n await $`git fetch origin`\n await $`git switch dev`\n await $`git pull origin dev`\n\n // Merge dev into each branch\n for (const branch of selectedReleaseBranches) {\n await mergeDev(branch)\n }\n\n console.log('\u2705 All merges completed!')\n}\n\n// Function to merge dev into a given branch\nconst mergeDev = async (branch: string) => {\n console.log(`Merging dev into ${branch}...`)\n\n try {\n await $`git switch ${branch}`\n\n await $`git pull origin ${branch}`\n\n await $`git merge origin/dev --no-edit`\n\n await $`git push origin ${branch}`\n\n await $`git switch dev`\n\n console.log(`\u2714\uFE0F Successfully merged dev into ${branch}`)\n } catch (error: unknown) {\n console.error(`Error merging dev into ${branch}:`, error instanceof Error ? error.message : 'Unknown error')\n }\n}\n", "/* eslint-disable no-console */\nimport confirm from '@inquirer/confirm'\nimport process from 'node:process'\nimport { $, question } from 'zx'\n\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\n\ninterface GhReleaseCreateArgs {\n versions: string\n yes: boolean\n}\n\n/**\n * Create release branches for a given version\n */\nexport const ghReleaseCreate = async (options: GhReleaseCreateArgs) => {\n const { versions, yes } = options\n\n let versionBranches = ''\n\n if (versions) {\n versionBranches = versions\n } else {\n versionBranches = await question('Enter versions by comma (e.g. 1.2.5, 1.2.6): ')\n }\n\n const versionsList = versionBranches.split(',').map((version) => version.trim())\n\n // Validate input\n if (versionsList.length === 0) {\n console.error('No versions provided. Exiting...')\n process.exit(1)\n }\n\n const answer = yes\n ? true\n : await confirm({\n message: `Are you sure you want to create release branches for these versions: ${versionsList.join(', ')}?`,\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n await $`git fetch origin`\n\n await $`git switch dev`\n\n await $`git pull origin dev`\n\n // Create release branches for each version\n for (const version of versionsList) {\n await createReleaseBranch(version)\n }\n\n console.log('\u2705 All release branches were created successfully.')\n}\n\n// #region Declarations\n\n// Function to create a release branch\nasync function createReleaseBranch(version: string) {\n await validateGitHubCliAndAuth()\n\n const branchName = `release/v${version}`\n\n console.log(`Creating release branch ${branchName}...`)\n\n try {\n await $`git switch dev`\n await $`git pull origin dev`\n\n await $`git checkout -b ${branchName}`\n await $`git push -u origin ${branchName}`\n await $`git commit --allow-empty-message --allow-empty --message ''`\n await $`git push origin ${branchName}`\n\n // Create PR if not already exists (optional: you may want to check for existing PRs)\n await $`gh pr create --title \"Release v${version}\" --body \"Release v${version}\" --base dev --head ${branchName}`\n\n await $`git switch dev`\n console.log(`\u2714\uFE0F Successfully created release branch: ${branchName}`)\n } catch (error: unknown) {\n console.error(\n `Error creating release branch ${branchName}:`,\n error instanceof Error ? error.message : 'Unknown error',\n )\n }\n}\n// #endregion Declarations\n", "/* eslint-disable no-console */\nimport select from '@inquirer/select'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { ENVs } from 'src/shared/constants'\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\n\ninterface GhReleaseDeployArgs {\n version: string\n env: string\n}\n\n/**\n * Deploy a release branch to an environment\n */\nexport const ghReleaseDeploy = async (args: GhReleaseDeployArgs) => {\n const { version, env } = args\n\n await validateGitHubCliAndAuth()\n\n // TODO: add validation for semver version for version variable\n\n const releasePRsList: string[] = ['dev'] // [\"release/v1.8.0\", \"release/v1.9.0\"]\n\n const releasePRs = await getReleasePRs()\n\n releasePRsList.push(...releasePRs)\n\n let selectedReleaseBranch = '' // \"release/v1.8.0\"\n\n if (version) {\n selectedReleaseBranch = `release/v${version}`\n } else {\n selectedReleaseBranch = await select({\n message: '\uD83C\uDF3F Select release branch',\n choices: releasePRsList.map((pr) => ({\n name: pr.replace('release/v', ''),\n value: pr,\n })),\n })\n }\n\n // Check if release branch exists in the list\n if (!releasePRsList.includes(selectedReleaseBranch)) {\n console.error(`\u274C Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)\n process.exit(1)\n }\n\n let selectedEnv = ''\n\n if (env) {\n selectedEnv = env\n } else {\n selectedEnv = await select({\n message: '\uD83E\uDDEA Select environment',\n choices: ENVs.map((env) => ({\n name: env,\n value: env,\n })),\n })\n }\n\n if (!ENVs.includes(selectedEnv)) {\n console.error(`\u274C Invalid environment: ${selectedEnv}. Exiting...`)\n process.exit(1)\n }\n\n try {\n await $`gh workflow run deploy-all.yml --ref ${selectedReleaseBranch} -f environment=${selectedEnv}`\n\n console.log('\\n')\n console.log(\n `\u2705 Successfully launched deploy-all workflow_dispatch for release branch: ${selectedReleaseBranch} and environment: ${selectedEnv}`,\n )\n } catch (error: unknown) {\n console.error('\u274C Error launching workflow:', error instanceof Error ? error.message : 'Unknown error')\n process.exit(1)\n }\n}\n", "/**\n * List of environments for the project deployment\n */\nexport const ENVs = ['dev', 'arthur', 'renana', 'roman', 'eliran', 'oriana']\n"],
|
|
5
|
-
"mappings": "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
|
|
6
|
-
"names": ["Command", "confirm", "select", "process", "$", "process", "$", "validateGitHubCliAndAuth", "error", "process", "$", "getReleasePRs", "releasePRs", "releasePRsArray", "pr", "error", "ghReleaseDeliver", "args", "version", "yes", "validateGitHubCliAndAuth", "releasePRsList", "getReleasePRs", "selectedReleaseBranch", "select", "pr", "process", "confirm", "$", "error", "parseVersion", "versionStr", "sortVersions", "versions", "a", "b", "majA", "minA", "patchA", "majB", "minB", "patchB", "ghReleaseList", "validateGitHubCliAndAuth", "releasePRsList", "getReleasePRs", "pr", "sortedReleases", "sortVersions", "confirm", "process", "$", "WORKTREES_DIR_SUFFIX", "RELEASE_DIR", "RELEASE_BRANCH_PREFIX", "manageWorktrees", "options", "yes", "validateGitHubCliAndAuth", "confirm", "process", "activeReleaseBranches", "getActiveReleaseBranches", "currentWorktrees", "getCurrentWorktrees", "worktreeDir", "getProjectRoot", "ensureWorktreeDirectory", "branchesToCreate", "branchesToRemove", "categorizeWorktrees", "createdWorktrees", "createWorktrees", "removedWorktrees", "removeWorktrees", "logResults", "error", "releasePRs", "getReleasePRs", "sortVersions", "$", "
|
|
3
|
+
"sources": ["../src/entry/main.ts", "../src/commands/gh-release-deliver/gh-release-deliver.ts", "../src/shared/gh-cli-auth/gh-cli-auth.ts", "../src/shared/gh-release-prs/gh-release-prs.ts", "../src/shared/version-utils/version-utils.ts", "../src/commands/gh-release-list/gh-release-list.ts", "../src/commands/worktrees-manage/worktrees-manage.ts", "../src/shared/constants.ts", "../src/shared/git-utils/git-utils.ts", "../src/commands/gh-merge-dev/gh-merge-dev.ts", "../src/commands/gh-release-create/gh-release-create.ts", "../src/commands/gh-release-deploy/gh-release-deploy.ts"],
|
|
4
|
+
"sourcesContent": ["import { Command } from 'commander'\n\nimport { ghReleaseDeliver } from 'src/commands/gh-release-deliver'\nimport { ghReleaseList } from 'src/commands/gh-release-list'\nimport { manageWorktrees } from 'src/commands/worktrees-manage'\n\nimport { ghMergeDev } from '../commands/gh-merge-dev'\nimport { ghReleaseCreate } from '../commands/gh-release-create'\nimport { ghReleaseDeploy } from '../commands/gh-release-deploy'\n\nconst program = new Command()\n\nprogram\n .command('merge-dev')\n .description('Merge dev branch into every release branch')\n .option('-a, --all', 'Select all release branches')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async (options) => {\n await ghMergeDev({ all: options.all, yes: options.yes })\n })\n\nprogram\n .command('release-list')\n .description('List all release branches')\n .action(async () => {\n await ghReleaseList()\n })\n\nprogram\n .command('release-create')\n .description('Create new release branches')\n .option('-v, --versions <versions>', 'Specify the versions to create by comma, e.g. 1.2.5, 1.2.6')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async (options) => {\n await ghReleaseCreate({ versions: options.versions, yes: options.yes })\n })\n\nprogram\n .command('release-deploy')\n .description('Deploy any release branch to any environment')\n .option('-v, --version <version>', 'Specify the version to deploy, e.g. 1.2.5')\n .option('-e, --env <env>', 'Specify the environment to deploy to, e.g. dev')\n .action(async (options) => {\n await ghReleaseDeploy({ version: options.version, env: options.env })\n })\n\nprogram\n .command('release-deliver')\n .description('Release a new version to production')\n .option('-v, --version <version>', 'Specify the version to release, e.g. 1.2.5')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async (options) => {\n await ghReleaseDeliver({ version: options.version, yes: options.yes })\n })\n\nprogram\n .command('worktrees-manage')\n .description('Manage git worktrees for release branches')\n .option('-y, --yes', 'Skip confirmation prompt')\n .action(async (options) => {\n await manageWorktrees({ yes: options.yes })\n })\n\nprogram.parse()\n", "/* eslint-disable no-console */\nimport confirm from '@inquirer/confirm'\nimport select from '@inquirer/select'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\n\ninterface GhReleaseDeliverArgs {\n version: string\n yes: boolean\n}\n\n/**\n * Deliver a release branch to production\n */\nexport const ghReleaseDeliver = async (args: GhReleaseDeliverArgs) => {\n const { version, yes } = args\n\n await validateGitHubCliAndAuth()\n\n const releasePRsList = await getReleasePRs()\n\n let selectedReleaseBranch = '' // \"release/v1.8.0\"\n\n if (version) {\n selectedReleaseBranch = `release/v${version}`\n } else {\n selectedReleaseBranch = await select({\n message: '\uD83C\uDF3F Select release branch',\n choices: releasePRsList.map((pr) => ({\n name: pr.replace('release/v', ''),\n value: pr,\n })),\n })\n }\n\n // Check if release branch exists in the list\n if (!releasePRsList.includes(selectedReleaseBranch)) {\n console.error(`\u274C Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)\n process.exit(1)\n }\n\n const answer = yes\n ? true\n : await confirm({\n message: `Are you sure you want to deliver version ${selectedReleaseBranch} to production?`,\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n try {\n await $`gh pr merge ${selectedReleaseBranch} --squash --admin --delete-branch` // TODO: add --body (AI for generate message)\n\n await $`gh pr create --base main --head dev --title \"Release v${selectedReleaseBranch.replace('release/v', '')} (RC)\" --body \"\"`\n\n await $`gh pr merge dev --squash --admin`\n\n await $`gh workflow run deploy-all.yml --ref main -f environment=prod`\n\n // Merge main into dev\n await $`git switch main && git pull && git switch dev && git pull && git merge main --no-edit && git push`\n\n console.log('\\n')\n console.log(`\u2714\uFE0F Successfully delivered ${selectedReleaseBranch} to production!`)\n } catch (error: unknown) {\n console.error('\u274C Error merging release branch into dev:', error instanceof Error ? error.message : 'Unknown error')\n process.exit(1)\n }\n}\n", "import process from 'node:process'\nimport { $ } from 'zx'\n\n/**\n * Validate GitHub CLI installation and authentication status and throw an error if not valid\n */\nexport const validateGitHubCliAndAuth = async () => {\n try {\n await $`gh --version`\n } catch (error: unknown) {\n console.error('Error: GitHub CLI (gh) is not installed.', (error as Error)?.message)\n console.error('Please install it from: https://cli.github.com/')\n process.exit(1)\n }\n\n try {\n await $`gh auth status`\n } catch (error: unknown) {\n console.error('Error: GitHub CLI (gh) is not authenticated.', (error as Error)?.message)\n console.error('Please authenticate it from: https://cli.github.com/manual/gh_auth_login or type \"gh auth login\"')\n process.exit(1)\n }\n}\n", "import process from 'node:process'\nimport { $ } from 'zx'\n\ninterface ReleasePR {\n headRefName: string\n number: number\n state: string\n title: string\n baseRefName: string\n}\n\n/**\n * Fetch open release PRs from GitHub with 'Release' in the title and base 'dev'.\n * Returns an array of headRefName strings.\n * Throws an error if fetching fails.\n */\nexport const getReleasePRs = async (): Promise<string[]> => {\n try {\n // Example of releasePRs.output: {\"headRefName\":\"release/v1.8.0\",\"number\":665,\"state\":\"OPEN\",\"title\":\"WIP Release/v1.8.0\"}\n const releasePRs =\n await $`gh pr list --search \"Release in:title\" --base dev --json number,title,headRefName,state,baseRefName`\n\n const releasePRsArray: ReleasePR[] = JSON.parse(releasePRs.stdout)\n\n if (releasePRsArray.length === 0) {\n console.error('\u274C No release PRs found. Check the project folder for the script. Exiting...')\n process.exit(1)\n }\n\n return releasePRsArray.map((pr) => pr.headRefName)\n } catch (error) {\n console.error('\u274C Error fetching release PRs:', error instanceof Error ? error.message : String(error))\n process.exit(1)\n }\n}\n", "/**\n * Parse version string into major, minor, patch numbers\n */\nexport const parseVersion = (versionStr: string): [number, number, number] => {\n return versionStr.replace('release/', '').slice(1).split('.').map(Number) as [number, number, number]\n}\n\n/**\n * Sort version strings in ascending order\n */\nexport const sortVersions = (versions: string[]): string[] => {\n return versions.sort((a, b) => {\n const [majA, minA, patchA] = parseVersion(a)\n const [majB, minB, patchB] = parseVersion(b)\n\n if (majA !== majB) return (majA ?? 0) - (majB ?? 0)\n if (minA !== minB) return (minA ?? 0) - (minB ?? 0)\n return (patchA ?? 0) - (patchB ?? 0)\n })\n}\n", "/* eslint-disable no-console */\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\nimport { sortVersions } from 'src/shared/version-utils'\n\n/**\n * List all open release branches\n */\nexport const ghReleaseList = async () => {\n await validateGitHubCliAndAuth()\n\n const releasePRs = await getReleasePRs()\n\n const releasePRsList = releasePRs.map((pr) => pr.replace('release/', ''))\n const sortedReleases = sortVersions(releasePRsList)\n\n console.log('All release branches: \\n')\n console.log(sortedReleases.join('\\n'))\n}\n", "/* eslint-disable no-console */\nimport confirm from '@inquirer/confirm'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { WORKTREES_DIR_SUFFIX } from 'src/shared/constants'\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\nimport { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'\nimport { sortVersions } from 'src/shared/version-utils'\n\n// Constants\nconst RELEASE_DIR = 'release'\nconst RELEASE_BRANCH_PREFIX = 'release/v'\n\ninterface WorktreeManagementArgs {\n yes: boolean\n}\n\ninterface WorktreeManagementResult {\n created: string[]\n removed: string[]\n}\n\n/**\n * Manage git worktrees for release branches\n * Creates worktrees for active release branches and removes unused ones\n */\nexport const manageWorktrees = async (options: WorktreeManagementArgs): Promise<WorktreeManagementResult> => {\n const { yes } = options\n\n try {\n await validateGitHubCliAndAuth()\n\n // Ask for confirmation\n const answer = yes\n ? true\n : await confirm({\n message: 'Are you sure you want to proceed with these worktree changes?',\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n const activeReleaseBranches = await getActiveReleaseBranches()\n const currentWorktrees = await getCurrentWorktrees()\n const projectRoot = await getProjectRoot()\n\n const worktreeDir = `${projectRoot}${WORKTREES_DIR_SUFFIX}`\n await ensureWorktreeDirectory(`${worktreeDir}/${RELEASE_DIR}`)\n\n const { branchesToCreate, branchesToRemove } = categorizeWorktrees(activeReleaseBranches, currentWorktrees)\n\n const createdWorktrees = await createWorktrees(branchesToCreate, worktreeDir)\n const removedWorktrees = await removeWorktrees(branchesToRemove, worktreeDir)\n\n logResults(createdWorktrees, removedWorktrees)\n\n return {\n created: createdWorktrees,\n removed: removedWorktrees,\n }\n } catch (error) {\n console.error('\u274C Error managing worktrees:', error)\n throw error\n }\n}\n/**\n * Get active release branches from GitHub\n *\n * @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n */\nconst getActiveReleaseBranches = async (): Promise<string[]> => {\n const releasePRs = await getReleasePRs()\n\n return sortVersions(releasePRs)\n}\n\n/**\n * Ensure the worktree directory exists\n */\nconst ensureWorktreeDirectory = async (worktreeDir: string): Promise<void> => {\n await $`mkdir -p ${worktreeDir}`\n}\n\n/**\n * Categorize worktrees into those that need to be created or removed\n */\nconst categorizeWorktrees = (\n activeBranches: string[], // [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n currentWorktrees: string[], // [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n): { branchesToCreate: string[]; branchesToRemove: string[] } => {\n const currentBranchNames = currentWorktrees.filter((branch) => branch.startsWith(RELEASE_BRANCH_PREFIX))\n\n const branchesToCreate = activeBranches.filter((branch) => !currentBranchNames.includes(branch))\n\n const branchesToRemove = currentBranchNames.filter((branch) => !activeBranches.includes(branch))\n\n return { branchesToCreate, branchesToRemove }\n}\n\n/**\n * Create worktrees for the specified branches\n */\nconst createWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {\n const created: string[] = []\n\n for (const branch of branches) {\n try {\n const worktreePath = `${worktreeDir}/${branch}`\n await $`git worktree add ${worktreePath} ${branch}`\n created.push(branch)\n } catch (error) {\n console.error(`\u274C Failed to create worktree for ${branch}:`, error)\n }\n }\n\n return created\n}\n\n/**\n * Remove worktrees for the specified branches\n */\nconst removeWorktrees = async (branches: string[], worktreeDir: string): Promise<string[]> => {\n const removed: string[] = []\n\n for (const branch of branches) {\n try {\n const worktreePath = `${worktreeDir}/${branch}`\n await $`git worktree remove ${worktreePath}`\n removed.push(branch)\n } catch (error) {\n console.error(`\u274C Failed to remove worktree for ${branch}:`, error)\n }\n }\n\n return removed\n}\n\n/**\n * Log the results of worktree management\n */\nconst logResults = (created: string[], removed: string[]): void => {\n if (created.length > 0) {\n console.log('\\n')\n console.log('\u2705 Created worktrees:')\n console.log(created.join('\\n'))\n console.log()\n } else {\n console.log('\u2139\uFE0F No new worktrees to create')\n }\n\n if (removed.length > 0) {\n console.log('\u274C Removed worktrees:')\n console.log(removed.join('\\n'))\n console.log()\n } else {\n console.log('\u2139\uFE0F No unused worktrees to remove')\n }\n}\n", "/**\n * List of environments for the project deployment\n */\nexport const ENVs = ['dev', 'arthur', 'renana', 'roman', 'eliran', 'oriana']\n\nexport const WORKTREES_DIR_SUFFIX = '-worktrees'\n", "import { $ } from 'zx'\n\n/**\n * Get current git worktrees\n *\n * @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24]\n */\nexport const getCurrentWorktrees = async (): Promise<string[]> => {\n const worktreesOutput = await $`git worktree list`\n const worktreeLines = worktreesOutput.stdout.split('\\n').filter(Boolean)\n\n return worktreeLines\n .map((line) => {\n const parts = line.split(' ').filter(Boolean)\n\n if (parts.length < 3) return null\n\n return `release/${parts[0]?.split('/').pop() || ''}`\n })\n .filter((branch) => branch !== null)\n}\n\n/**\n * Get the current project root directory\n */\nexport const getProjectRoot = async (): Promise<string> => {\n const result = await $`git rev-parse --show-toplevel`\n return result.stdout.trim()\n}\n", "/* eslint-disable no-console */\nimport checkbox from '@inquirer/checkbox'\nimport confirm from '@inquirer/confirm'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { WORKTREES_DIR_SUFFIX } from 'src/shared/constants'\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\nimport { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'\n\ninterface GhMergeDevArgs {\n all: boolean\n yes: boolean\n}\n\n/**\n * Merge dev into every release branch\n */\nexport const ghMergeDev = async (args: GhMergeDevArgs) => {\n const { all, yes } = args\n\n await validateGitHubCliAndAuth()\n\n const releasePRsList = await getReleasePRs()\n\n const currentWorktrees = await getCurrentWorktrees()\n const projectRoot = await getProjectRoot()\n const worktreeDir = `${projectRoot}${WORKTREES_DIR_SUFFIX}`\n\n let selectedReleaseBranches: string[] = []\n\n if (all) {\n selectedReleaseBranches = releasePRsList\n } else {\n selectedReleaseBranches = await checkbox({\n required: true,\n message: '\uD83C\uDF3F Select release branches',\n choices: releasePRsList.map((pr) => ({\n name: pr.replace('release/v', ''),\n value: pr,\n })),\n })\n }\n\n // Validate input\n // if (selectedReleaseBranches.length === 0) {\n // console.error('No branches provided. Exiting...')\n // process.exit(1)\n // }\n\n const answer = yes\n ? true\n : await confirm({\n message: `Are you sure you want to merge dev into these branches: ${selectedReleaseBranches.join(', ')}?`,\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n await $`git fetch origin`\n await $`git switch dev`\n await $`git pull origin dev`\n\n // Merge dev into each branch\n for (const branch of selectedReleaseBranches) {\n const isBranchInWorktrees = currentWorktrees.includes(branch)\n\n await mergeDev({ branch, isBranchInWorktrees, worktreeDir, projectRoot })\n }\n\n console.log('\u2705 All merges completed!')\n}\n\n// Function to merge dev into a given branch\ninterface MergeDevArgs {\n branch: string\n isBranchInWorktrees: boolean\n worktreeDir: string\n projectRoot: string\n}\n\nconst mergeDev = async (args: MergeDevArgs) => {\n const { branch, isBranchInWorktrees, worktreeDir, projectRoot } = args\n\n console.log(`Merging dev into ${branch}...`)\n\n try {\n if (isBranchInWorktrees) {\n await $`cd ${worktreeDir}/${branch}`\n } else {\n await $`git switch ${branch}`\n }\n\n await $`git pull origin ${branch}`\n\n await $`git merge origin/dev --no-edit`\n\n await $`git push origin ${branch}`\n\n console.log(`\u2714\uFE0F Successfully merged dev into ${branch}`)\n } catch (error: unknown) {\n console.error(`Error merging dev into ${branch}:`, error instanceof Error ? error.message : 'Unknown error')\n } finally {\n if (isBranchInWorktrees) {\n await $`cd ${projectRoot}`\n } else {\n await $`git switch dev`\n }\n }\n}\n", "/* eslint-disable no-console */\nimport confirm from '@inquirer/confirm'\nimport process from 'node:process'\nimport { $, question } from 'zx'\n\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\n\ninterface GhReleaseCreateArgs {\n versions: string\n yes: boolean\n}\n\n/**\n * Create release branches for a given version\n */\nexport const ghReleaseCreate = async (options: GhReleaseCreateArgs) => {\n const { versions, yes } = options\n\n let versionBranches = ''\n\n if (versions) {\n versionBranches = versions\n } else {\n versionBranches = await question('Enter versions by comma (e.g. 1.2.5, 1.2.6): ')\n }\n\n const versionsList = versionBranches.split(',').map((version) => version.trim())\n\n // Validate input\n if (versionsList.length === 0) {\n console.error('No versions provided. Exiting...')\n process.exit(1)\n }\n\n const answer = yes\n ? true\n : await confirm({\n message: `Are you sure you want to create release branches for these versions: ${versionsList.join(', ')}?`,\n })\n\n if (!answer) {\n console.log('Operation cancelled. Exiting...')\n process.exit(0)\n }\n\n await $`git fetch origin`\n\n await $`git switch dev`\n\n await $`git pull origin dev`\n\n // Create release branches for each version\n for (const version of versionsList) {\n await createReleaseBranch(version)\n }\n\n console.log('\u2705 All release branches were created successfully.')\n}\n\n// #region Declarations\n\n// Function to create a release branch\nasync function createReleaseBranch(version: string) {\n await validateGitHubCliAndAuth()\n\n const branchName = `release/v${version}`\n\n console.log(`Creating release branch ${branchName}...`)\n\n try {\n await $`git switch dev`\n await $`git pull origin dev`\n\n await $`git checkout -b ${branchName}`\n await $`git push -u origin ${branchName}`\n await $`git commit --allow-empty-message --allow-empty --message ''`\n await $`git push origin ${branchName}`\n\n // Create PR if not already exists (optional: you may want to check for existing PRs)\n await $`gh pr create --title \"Release v${version}\" --body \"Release v${version}\" --base dev --head ${branchName}`\n\n await $`git switch dev`\n console.log(`\u2714\uFE0F Successfully created release branch: ${branchName}`)\n } catch (error: unknown) {\n console.error(\n `Error creating release branch ${branchName}:`,\n error instanceof Error ? error.message : 'Unknown error',\n )\n }\n}\n// #endregion Declarations\n", "/* eslint-disable no-console */\nimport select from '@inquirer/select'\nimport process from 'node:process'\nimport { $ } from 'zx'\n\nimport { ENVs } from 'src/shared/constants'\nimport { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'\nimport { getReleasePRs } from 'src/shared/gh-release-prs'\n\ninterface GhReleaseDeployArgs {\n version: string\n env: string\n}\n\n/**\n * Deploy a release branch to an environment\n */\nexport const ghReleaseDeploy = async (args: GhReleaseDeployArgs) => {\n const { version, env } = args\n\n await validateGitHubCliAndAuth()\n\n // TODO: add validation for semver version for version variable\n\n const releasePRsList: string[] = ['dev'] // [\"release/v1.8.0\", \"release/v1.9.0\"]\n\n const releasePRs = await getReleasePRs()\n\n releasePRsList.push(...releasePRs)\n\n let selectedReleaseBranch = '' // \"release/v1.8.0\"\n\n if (version) {\n selectedReleaseBranch = `release/v${version}`\n } else {\n selectedReleaseBranch = await select({\n message: '\uD83C\uDF3F Select release branch',\n choices: releasePRsList.map((pr) => ({\n name: pr.replace('release/v', ''),\n value: pr,\n })),\n })\n }\n\n // Check if release branch exists in the list\n if (!releasePRsList.includes(selectedReleaseBranch)) {\n console.error(`\u274C Release branch ${selectedReleaseBranch} not found in open PRs. Exiting...`)\n process.exit(1)\n }\n\n let selectedEnv = ''\n\n if (env) {\n selectedEnv = env\n } else {\n selectedEnv = await select({\n message: '\uD83E\uDDEA Select environment',\n choices: ENVs.map((env) => ({\n name: env,\n value: env,\n })),\n })\n }\n\n if (!ENVs.includes(selectedEnv)) {\n console.error(`\u274C Invalid environment: ${selectedEnv}. Exiting...`)\n process.exit(1)\n }\n\n try {\n await $`gh workflow run deploy-all.yml --ref ${selectedReleaseBranch} -f environment=${selectedEnv}`\n\n console.log('\\n')\n console.log(\n `\u2705 Successfully launched deploy-all workflow_dispatch for release branch: ${selectedReleaseBranch} and environment: ${selectedEnv}`,\n )\n } catch (error: unknown) {\n console.error('\u274C Error launching workflow:', error instanceof Error ? error.message : 'Unknown error')\n process.exit(1)\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["Command", "confirm", "select", "process", "$", "process", "$", "validateGitHubCliAndAuth", "error", "process", "$", "getReleasePRs", "releasePRs", "releasePRsArray", "pr", "error", "ghReleaseDeliver", "args", "version", "yes", "validateGitHubCliAndAuth", "releasePRsList", "getReleasePRs", "selectedReleaseBranch", "select", "pr", "process", "confirm", "$", "error", "parseVersion", "versionStr", "sortVersions", "versions", "a", "b", "majA", "minA", "patchA", "majB", "minB", "patchB", "ghReleaseList", "validateGitHubCliAndAuth", "releasePRsList", "getReleasePRs", "pr", "sortedReleases", "sortVersions", "confirm", "process", "$", "ENVs", "WORKTREES_DIR_SUFFIX", "$", "getCurrentWorktrees", "line", "parts", "branch", "getProjectRoot", "RELEASE_DIR", "RELEASE_BRANCH_PREFIX", "manageWorktrees", "options", "yes", "validateGitHubCliAndAuth", "confirm", "process", "activeReleaseBranches", "getActiveReleaseBranches", "currentWorktrees", "getCurrentWorktrees", "worktreeDir", "getProjectRoot", "WORKTREES_DIR_SUFFIX", "ensureWorktreeDirectory", "branchesToCreate", "branchesToRemove", "categorizeWorktrees", "createdWorktrees", "createWorktrees", "removedWorktrees", "removeWorktrees", "logResults", "error", "releasePRs", "getReleasePRs", "sortVersions", "$", "activeBranches", "currentBranchNames", "branch", "branches", "created", "worktreePath", "removed", "checkbox", "confirm", "process", "$", "ghMergeDev", "args", "all", "yes", "validateGitHubCliAndAuth", "releasePRsList", "getReleasePRs", "currentWorktrees", "getCurrentWorktrees", "projectRoot", "getProjectRoot", "worktreeDir", "WORKTREES_DIR_SUFFIX", "selectedReleaseBranches", "checkbox", "pr", "confirm", "process", "$", "branch", "isBranchInWorktrees", "mergeDev", "error", "confirm", "process", "$", "question", "ghReleaseCreate", "options", "versions", "yes", "versionBranches", "question", "versionsList", "version", "process", "confirm", "$", "createReleaseBranch", "validateGitHubCliAndAuth", "branchName", "error", "select", "process", "$", "ghReleaseDeploy", "args", "version", "env", "validateGitHubCliAndAuth", "releasePRsList", "releasePRs", "getReleasePRs", "selectedReleaseBranch", "select", "pr", "process", "selectedEnv", "ENVs", "$", "error", "program", "Command", "options", "ghMergeDev", "ghReleaseList", "ghReleaseCreate", "ghReleaseDeploy", "ghReleaseDeliver", "manageWorktrees"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -4,8 +4,10 @@ import confirm from '@inquirer/confirm'
|
|
|
4
4
|
import process from 'node:process'
|
|
5
5
|
import { $ } from 'zx'
|
|
6
6
|
|
|
7
|
+
import { WORKTREES_DIR_SUFFIX } from 'src/shared/constants'
|
|
7
8
|
import { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'
|
|
8
9
|
import { getReleasePRs } from 'src/shared/gh-release-prs'
|
|
10
|
+
import { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'
|
|
9
11
|
|
|
10
12
|
interface GhMergeDevArgs {
|
|
11
13
|
all: boolean
|
|
@@ -22,6 +24,10 @@ export const ghMergeDev = async (args: GhMergeDevArgs) => {
|
|
|
22
24
|
|
|
23
25
|
const releasePRsList = await getReleasePRs()
|
|
24
26
|
|
|
27
|
+
const currentWorktrees = await getCurrentWorktrees()
|
|
28
|
+
const projectRoot = await getProjectRoot()
|
|
29
|
+
const worktreeDir = `${projectRoot}${WORKTREES_DIR_SUFFIX}`
|
|
30
|
+
|
|
25
31
|
let selectedReleaseBranches: string[] = []
|
|
26
32
|
|
|
27
33
|
if (all) {
|
|
@@ -60,18 +66,33 @@ export const ghMergeDev = async (args: GhMergeDevArgs) => {
|
|
|
60
66
|
|
|
61
67
|
// Merge dev into each branch
|
|
62
68
|
for (const branch of selectedReleaseBranches) {
|
|
63
|
-
|
|
69
|
+
const isBranchInWorktrees = currentWorktrees.includes(branch)
|
|
70
|
+
|
|
71
|
+
await mergeDev({ branch, isBranchInWorktrees, worktreeDir, projectRoot })
|
|
64
72
|
}
|
|
65
73
|
|
|
66
74
|
console.log('✅ All merges completed!')
|
|
67
75
|
}
|
|
68
76
|
|
|
69
77
|
// Function to merge dev into a given branch
|
|
70
|
-
|
|
78
|
+
interface MergeDevArgs {
|
|
79
|
+
branch: string
|
|
80
|
+
isBranchInWorktrees: boolean
|
|
81
|
+
worktreeDir: string
|
|
82
|
+
projectRoot: string
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
const mergeDev = async (args: MergeDevArgs) => {
|
|
86
|
+
const { branch, isBranchInWorktrees, worktreeDir, projectRoot } = args
|
|
87
|
+
|
|
71
88
|
console.log(`Merging dev into ${branch}...`)
|
|
72
89
|
|
|
73
90
|
try {
|
|
74
|
-
|
|
91
|
+
if (isBranchInWorktrees) {
|
|
92
|
+
await $`cd ${worktreeDir}/${branch}`
|
|
93
|
+
} else {
|
|
94
|
+
await $`git switch ${branch}`
|
|
95
|
+
}
|
|
75
96
|
|
|
76
97
|
await $`git pull origin ${branch}`
|
|
77
98
|
|
|
@@ -79,10 +100,14 @@ const mergeDev = async (branch: string) => {
|
|
|
79
100
|
|
|
80
101
|
await $`git push origin ${branch}`
|
|
81
102
|
|
|
82
|
-
await $`git switch dev`
|
|
83
|
-
|
|
84
103
|
console.log(`✔️ Successfully merged dev into ${branch}`)
|
|
85
104
|
} catch (error: unknown) {
|
|
86
105
|
console.error(`Error merging dev into ${branch}:`, error instanceof Error ? error.message : 'Unknown error')
|
|
106
|
+
} finally {
|
|
107
|
+
if (isBranchInWorktrees) {
|
|
108
|
+
await $`cd ${projectRoot}`
|
|
109
|
+
} else {
|
|
110
|
+
await $`git switch dev`
|
|
111
|
+
}
|
|
87
112
|
}
|
|
88
113
|
}
|
|
@@ -3,12 +3,13 @@ import confirm from '@inquirer/confirm'
|
|
|
3
3
|
import process from 'node:process'
|
|
4
4
|
import { $ } from 'zx'
|
|
5
5
|
|
|
6
|
+
import { WORKTREES_DIR_SUFFIX } from 'src/shared/constants'
|
|
6
7
|
import { validateGitHubCliAndAuth } from 'src/shared/gh-cli-auth'
|
|
7
8
|
import { getReleasePRs } from 'src/shared/gh-release-prs'
|
|
9
|
+
import { getCurrentWorktrees, getProjectRoot } from 'src/shared/git-utils'
|
|
8
10
|
import { sortVersions } from 'src/shared/version-utils'
|
|
9
11
|
|
|
10
12
|
// Constants
|
|
11
|
-
const WORKTREES_DIR_SUFFIX = '-worktrees'
|
|
12
13
|
const RELEASE_DIR = 'release'
|
|
13
14
|
const RELEASE_BRANCH_PREFIX = 'release/v'
|
|
14
15
|
|
|
@@ -77,34 +78,6 @@ const getActiveReleaseBranches = async (): Promise<string[]> => {
|
|
|
77
78
|
return sortVersions(releasePRs)
|
|
78
79
|
}
|
|
79
80
|
|
|
80
|
-
/**
|
|
81
|
-
* Get current git worktrees
|
|
82
|
-
*
|
|
83
|
-
* @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24]
|
|
84
|
-
*/
|
|
85
|
-
const getCurrentWorktrees = async (): Promise<string[]> => {
|
|
86
|
-
const worktreesOutput = await $`git worktree list`
|
|
87
|
-
const worktreeLines = worktreesOutput.stdout.split('\n').filter(Boolean)
|
|
88
|
-
|
|
89
|
-
return worktreeLines
|
|
90
|
-
.map((line) => {
|
|
91
|
-
const parts = line.split(' ').filter(Boolean)
|
|
92
|
-
|
|
93
|
-
if (parts.length < 3) return null
|
|
94
|
-
|
|
95
|
-
return `release/${parts[0]?.split('/').pop() || ''}`
|
|
96
|
-
})
|
|
97
|
-
.filter((branch) => branch !== null)
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
/**
|
|
101
|
-
* Get the current project root directory
|
|
102
|
-
*/
|
|
103
|
-
const getProjectRoot = async (): Promise<string> => {
|
|
104
|
-
const result = await $`git rev-parse --show-toplevel`
|
|
105
|
-
return result.stdout.trim()
|
|
106
|
-
}
|
|
107
|
-
|
|
108
81
|
/**
|
|
109
82
|
* Ensure the worktree directory exists
|
|
110
83
|
*/
|
|
@@ -171,6 +144,7 @@ const removeWorktrees = async (branches: string[], worktreeDir: string): Promise
|
|
|
171
144
|
*/
|
|
172
145
|
const logResults = (created: string[], removed: string[]): void => {
|
|
173
146
|
if (created.length > 0) {
|
|
147
|
+
console.log('\n')
|
|
174
148
|
console.log('✅ Created worktrees:')
|
|
175
149
|
console.log(created.join('\n'))
|
|
176
150
|
console.log()
|
package/src/entry/main.ts
CHANGED
|
@@ -57,8 +57,8 @@ program
|
|
|
57
57
|
.command('worktrees-manage')
|
|
58
58
|
.description('Manage git worktrees for release branches')
|
|
59
59
|
.option('-y, --yes', 'Skip confirmation prompt')
|
|
60
|
-
.action(async () => {
|
|
61
|
-
await manageWorktrees()
|
|
60
|
+
.action(async (options) => {
|
|
61
|
+
await manageWorktrees({ yes: options.yes })
|
|
62
62
|
})
|
|
63
63
|
|
|
64
64
|
program.parse()
|
package/src/shared/constants.ts
CHANGED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { $ } from 'zx'
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Get current git worktrees
|
|
5
|
+
*
|
|
6
|
+
* @returns [release/v1.18.22, release/v1.18.23, release/v1.18.24]
|
|
7
|
+
*/
|
|
8
|
+
export const getCurrentWorktrees = async (): Promise<string[]> => {
|
|
9
|
+
const worktreesOutput = await $`git worktree list`
|
|
10
|
+
const worktreeLines = worktreesOutput.stdout.split('\n').filter(Boolean)
|
|
11
|
+
|
|
12
|
+
return worktreeLines
|
|
13
|
+
.map((line) => {
|
|
14
|
+
const parts = line.split(' ').filter(Boolean)
|
|
15
|
+
|
|
16
|
+
if (parts.length < 3) return null
|
|
17
|
+
|
|
18
|
+
return `release/${parts[0]?.split('/').pop() || ''}`
|
|
19
|
+
})
|
|
20
|
+
.filter((branch) => branch !== null)
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Get the current project root directory
|
|
25
|
+
*/
|
|
26
|
+
export const getProjectRoot = async (): Promise<string> => {
|
|
27
|
+
const result = await $`git rev-parse --show-toplevel`
|
|
28
|
+
return result.stdout.trim()
|
|
29
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { getCurrentWorktrees, getProjectRoot } from './git-utils'
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { parseVersion, sortVersions } from './version-utils'
|
|
File without changes
|