@romenkova/cli 1.0.0 → 1.1.0

package/dist/commands/git/branch.js

@@ -0,0 +1,42 @@
+import { execSync } from "node:child_process";
+import { prompt, ui } from "../../ui.js";
+import { slugify } from "./git.js";
+const branchCommand = {
+    command: "branch",
+    describe: "Create a branch from a ticket ID",
+    builder: {
+        name: {
+            alias: "n",
+            type: "string",
+            demandOption: true,
+            describe: "Your name (used as branch prefix)",
+        },
+    },
+    handler: async (argv) => {
+        const author = argv.name;
+        ui.header("branch");
+        ui.info("author", author);
+        ui.separator();
+        const ticket = (await prompt("Ticket (e.g. XXX-000): ")).toUpperCase();
+        if (!/^[A-Z]+-\d+$/.test(ticket)) {
+            ui.fail(`Invalid ticket format: ${ticket}`, "Expected: XXX-000");
+            process.exit(1);
+        }
+        const description = await prompt("Description: ");
+        if (!description) {
+            ui.fail("Description cannot be empty.");
+            process.exit(1);
+        }
+        const branchName = `${author}/${ticket}-${slugify(description)}`;
+        ui.result("branch", branchName);
+        try {
+            execSync(`git checkout -b ${branchName}`, { stdio: "inherit" });
+        }
+        catch {
+            ui.fail("Failed to create branch.");
+            process.exit(1);
+        }
+        ui.done();
+    },
+};
+export default branchCommand;

package/dist/commands/git/commit.js

@@ -0,0 +1,35 @@
+import { execSync } from "node:child_process";
+import { ui } from "../../ui.js";
+import { extractTicket, getBranchName } from "./git.js";
+const commitCommand = {
+    command: "commit",
+    describe: "Create a commit prefixed with the ticket from the branch name",
+    handler: async () => {
+        ui.header("commit");
+        const branch = getBranchName();
+        const ticket = extractTicket(branch);
+        if (!ticket) {
+            ui.fail(`Could not extract ticket from branch: ${branch}`, "Expected: name/XXX-000-some-slug");
+            process.exit(1);
+        }
+        ui.info("branch", branch);
+        ui.highlight("ticket", ticket);
+        ui.separator();
+        const message = await prompt("Message: ");
+        if (!message) {
+            ui.fail("Commit message cannot be empty.");
+            process.exit(1);
+        }
+        const commitMessage = `${ticket}: ${message}`;
+        ui.result("commit", `"${commitMessage}"`);
+        try {
+            execSync(`git commit -m "${commitMessage}"`, { stdio: "inherit" });
+        }
+        catch {
+            ui.fail("Git commit failed.");
+            process.exit(1);
+        }
+        ui.done();
+    },
+};
+export default commitCommand;

package/dist/commands/git/git.js

@@ -0,0 +1,30 @@
+import { execSync } from "node:child_process";
+export function getBranchName() {
+    return execSync("git rev-parse --abbrev-ref HEAD", {
+        encoding: "utf-8",
+    }).trim();
+}
+export function extractTicket(branch) {
+    const match = branch.match(/\/([A-Z]+-\d+)/);
+    return match ? match[1] : null;
+}
+export function slugify(text) {
+    return text
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "");
+}
+export function getLog(count) {
+    const raw = execSync(`git log --oneline -n ${count} --format="%h %s"`, {
+        encoding: "utf-8",
+    }).trim();
+    if (!raw)
+        return [];
+    return raw.split("\n").map((line) => {
+        const spaceIndex = line.indexOf(" ");
+        return {
+            hash: line.substring(0, spaceIndex),
+            message: line.substring(spaceIndex + 1),
+        };
+    });
+}

package/dist/commands/git/index.js

@@ -0,0 +1,14 @@
+import branchCommand from "./branch.js";
+import commitCommand from "./commit.js";
+import rebaseCommand from "./rebase.js";
+const gitCommand = {
+    command: "git",
+    describe: "Git workflow helpers",
+    builder: (yargs) => yargs
+        .command(commitCommand)
+        .command(branchCommand)
+        .command(rebaseCommand)
+        .demandCommand(1, ""),
+    handler: () => { },
+};
+export default gitCommand;

package/dist/commands/git/rebase.js

@@ -0,0 +1,39 @@
+import { select } from "@inquirer/prompts";
+import chalk from "chalk";
+import { execSync } from "node:child_process";
+import { getLog } from "./git.js";
+import { ui } from "../../ui.js";
+const COMMIT_COUNT = 30;
+const rebaseCommand = {
+    command: "rebase",
+    describe: "Interactive rebase \u2014 pick a commit from the log",
+    handler: async () => {
+        ui.header("rebase");
+        const commits = getLog(COMMIT_COUNT);
+        if (commits.length === 0) {
+            ui.fail("No commits found.");
+            process.exit(1);
+        }
+        const index = await select({
+            message: "Rebase from which commit?",
+            loop: false,
+            pageSize: 20,
+            choices: commits.map((c, i) => ({
+                name: `${chalk.yellow(c.hash)} ${c.message}`,
+                value: i + 1,
+            })),
+        });
+        const isRoot = index === commits.length;
+        const rebaseArg = isRoot ? "--root" : `HEAD~${index}`;
+        ui.result("rebase", `git rebase -i ${rebaseArg}`);
+        try {
+            execSync(`git rebase -i ${rebaseArg}`, { stdio: "inherit" });
+        }
+        catch {
+            ui.fail("Rebase failed or was aborted.");
+            process.exit(1);
+        }
+        ui.done();
+    },
+};
+export default rebaseCommand;

package/dist/commands/rebase.js

@@ -0,0 +1,37 @@
+import { select } from "@inquirer/prompts";
+import chalk from "chalk";
+import { execSync } from "node:child_process";
+import { getLog } from "../git.js";
+import { ui } from "../ui.js";
+const COMMIT_COUNT = 30;
+const rebaseCommand = {
+    command: "rebase",
+    describe: "Interactive rebase \u2014 pick a commit from the log",
+    handler: async () => {
+        ui.header("rebase");
+        const commits = getLog(COMMIT_COUNT);
+        if (commits.length === 0) {
+            ui.fail("No commits found.");
+            process.exit(1);
+        }
+        const index = await select({
+            message: "Rebase from which commit?",
+            loop: false,
+            pageSize: 20,
+            choices: commits.map((c, i) => ({
+                name: `${chalk.yellow(c.hash)} ${c.message}`,
+                value: i + 1,
+            })),
+        });
+        ui.result("rebase", `git rebase -i HEAD~${index}`);
+        try {
+            execSync(`git rebase -i HEAD~${index}`, { stdio: "inherit" });
+        }
+        catch {
+            ui.fail("Rebase failed or was aborted.");
+            process.exit(1);
+        }
+        ui.done();
+    },
+};
+export default rebaseCommand;

package/dist/git.js

@@ -14,3 +14,17 @@ export function slugify(text) {
         .replace(/[^a-z0-9]+/g, "-")
         .replace(/^-+|-+$/g, "");
 }
+export function getLog(count) {
+    const raw = execSync(`git log --oneline -n ${count} --format="%h %s"`, {
+        encoding: "utf-8",
+    }).trim();
+    if (!raw)
+        return [];
+    return raw.split("\n").map((line) => {
+        const spaceIndex = line.indexOf(" ");
+        return {
+            hash: line.substring(0, spaceIndex),
+            message: line.substring(spaceIndex + 1),
+        };
+    });
+}

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import gitCommand from "./commands/git.js";
+import gitCommand from "./commands/git/index.js";
 yargs(hideBin(process.argv))
     .scriptName("ri")
     .command(gitCommand)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@romenkova/cli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Personal dev CLI",
   "type": "module",
   "main": "dist/index.js",
@@ -27,6 +27,7 @@
     "tsx": "^4.21.0"
   },
   "dependencies": {
+    "@inquirer/prompts": "^8.2.0",
     "chalk": "^5.6.2",
     "yargs": "^18.0.0"
   }