@towles/tool 0.0.15 → 0.0.17

package/README.md

@@ -75,6 +75,7 @@ if that works, then you need to add the pnpm global bin directory to your PATH.
 - [rolldown-vite](https://voidzero.dev/posts/announcing-rolldown-vite) - A Vite plugin for rolling down your code
 - ~~[zx](https://github.com/google/zx) google created library to write shell scripts in a more powerful and expressive way via the Anthropic API.~~
 - [prompts](https://github.com/terkelg/prompts) - A library for creating beautiful command-line prompts, with fuzzy search and other features.
+  - had to patch it so `esc` cancels the selection with [pnpm-patch-i](https://github.com/antfu/pnpm-patch-i)
 - [yargs](https://github.com/yargs/yargs) - A modern, feature-rich command-line argument parser with enhanced error handling, TypeScript support, and flexible command configuration.
 - ~~[ink](https://github.com/vadimdemedes/ink) - React for interactive command-line apps~~
     - wanted hotkey support and more complex UI but this was overkill for this project.

package/dist/index.mjs

@@ -15,6 +15,9 @@ import prompts from 'prompts';
 import { execSync, exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import { DateTime } from 'luxon';
+import { Fzf } from 'fzf';
+import stripAnsi from 'strip-ansi';
+import { exec as exec$1 } from 'tinyexec';
 
 async function loadTowlesToolContext({
   cwd,
@@ -38,7 +41,7 @@ const USER_SETTINGS_DIR = path.join(homedir(), ".config", AppInfo.toolName);
 const USER_SETTINGS_PATH = path.join(USER_SETTINGS_DIR, `${AppInfo.toolName}.settings.json`);
 const JournalSettingsSchema = z.object({
   // https://moment.github.io/luxon/#/formatting?id=table-of-tokens
-  dailyPathTemplate: z.string().default(path.join(homedir(), "journal", "{yyyy}/{MM}/daily-notes/{yyyy}-{MM}-{dd}-daily-notes.md")),
+  dailyPathTemplate: z.string().default(path.join(homedir(), "journal", "{monday:yyyy}/{monday:MM}/daily-notes/{monday:yyyy}-{monday:MM}-{monday:dd}-daily-notes.md")),
   meetingPathTemplate: z.string().default(path.join(homedir(), "journal", "{yyyy}/{MM}/meetings/{yyyy}-{MM}-{dd}-{title}.md")),
   notePathTemplate: z.string().default(path.join(homedir(), "journal", "{yyyy}/{MM}/notes/{yyyy}-{MM}-{dd}-{title}.md"))
 });
@@ -52,12 +55,23 @@ class LoadedSettings {
   }
   settingsFile;
 }
+function createDefaultSettings() {
+  return UserSettingsSchema.parse({
+    // NOTE: yes its odd zod can't use defaults from objects nested but it appears to be the case. 
+    journalSettings: JournalSettingsSchema.parse({})
+  });
+}
 function createSettingsFile() {
-  let userSettings = UserSettingsSchema.parse({});
+  let userSettings = createDefaultSettings();
   if (fs.existsSync(USER_SETTINGS_PATH)) {
     const userContent = fs.readFileSync(USER_SETTINGS_PATH, "utf-8");
     const parsedUserSettings = commentJson.parse(userContent);
     userSettings = UserSettingsSchema.parse(parsedUserSettings);
+  } else {
+    saveSettings({
+      path: USER_SETTINGS_PATH,
+      settings: userSettings
+    });
   }
   return userSettings;
 }
@@ -107,8 +121,13 @@ async function loadSettings() {
   );
 }
 
-const version = "0.0.15";
+const version = "0.0.17";
 
+const JOURNAL_TYPES = {
+  DAILY_NOTES: "daily-notes",
+  MEETING: "meeting",
+  NOTE: "note"
+};
 async function parseArguments(argv) {
   let parsedResult = null;
   const parser = yargs(hideBin(argv)).scriptName(AppInfo.toolName).usage("Usage: $0 <command> [options]").version(version).demandCommand(1, "You need at least one command").recommendCommands().strict().help().wrap(yargs().terminalWidth());
@@ -121,7 +140,7 @@ async function parseArguments(argv) {
         "Weekly files with daily sections for ongoing work and notes",
         {},
         (argv2) => {
-          parsedResult = { command: "journal", args: { subcommand: "daily-notes", title: "" } };
+          parsedResult = { command: "journal", args: { jouralType: "daily-notes", title: "" } };
         }
       ).command(
         ["meeting [title]", "m"],
@@ -133,7 +152,7 @@ async function parseArguments(argv) {
           }
         },
         (argv2) => {
-          parsedResult = { command: "journal", args: { subcommand: "meeting", title: argv2.title || "" } };
+          parsedResult = { command: "journal", args: { jouralType: "meeting", title: argv2.title || "" } };
         }
       ).command(
         ["note [title]", "n"],
@@ -145,7 +164,7 @@ async function parseArguments(argv) {
           }
         },
         (argv2) => {
-          parsedResult = { command: "journal", args: { subcommand: "note", title: argv2.title || "" } };
+          parsedResult = { command: "journal", args: { jouralType: "note", title: argv2.title || "" } };
         }
       ).demandCommand(1, "You need to specify a journal subcommand").help();
     },
@@ -167,6 +186,20 @@ async function parseArguments(argv) {
       parsedResult = { command: "git-commit", args: { message: argv2.message } };
     }
   );
+  parser.command(
+    ["gh-branch [assignedToMe...]", "branch", "br"],
+    "Create git branch from github issue",
+    {
+      assignedToMe: {
+        type: "boolean",
+        describe: "filter issues based on if assigned to you by default",
+        default: false
+      }
+    },
+    (argv2) => {
+      parsedResult = { command: "gh-branch", args: { assignedToMe: argv2.assignedToMe } };
+    }
+  );
   parser.command(
     ["config", "cfg"],
     "set or show configuration file.",
@@ -310,11 +343,6 @@ function formatDate(date) {
 }
 
 const execAsync = promisify(exec);
-const JOURNAL_TYPES = {
-  DAILY_NOTES: "daily-notes",
-  MEETING: "meeting",
-  NOTE: "note"
-};
 function ensureDirectoryExists(folderPath) {
   if (!existsSync(folderPath)) {
     consola.info(`Creating journal directory: ${colors.cyan(folderPath)}`);
@@ -382,13 +410,18 @@ async function openInEditor({ editor, filePath }) {
     consola.warn(`Could not open in editor : '${editor}'. Modify your editor in the config: examples include 'code', 'code-insiders',  etc...`, ex);
   }
 }
-function resolvePathTemplate(template, title, date) {
+function resolvePathTemplate(template, title, date, mondayDate) {
   const dateTime = DateTime.fromJSDate(date, { zone: "utc" });
   return template.replace(/\{([^}]+)\}/g, (match, token) => {
     try {
       if (token === "title") {
         return title.toLowerCase().replace(/\s+/g, "-");
       }
+      if (token.startsWith("monday:")) {
+        const mondayToken = token.substring(7);
+        const mondayDateTime = DateTime.fromJSDate(mondayDate, { zone: "utc" });
+        return mondayDateTime.toFormat(mondayToken);
+      }
       const result = dateTime.toFormat(token);
       const isLikelyInvalid = token.includes("invalid") || result.length > 20 || // Very long results are likely garbage
       result.length > token.length * 2 && /\d{10,}/.test(result) || // Contains very long numbers
@@ -404,7 +437,7 @@ function resolvePathTemplate(template, title, date) {
     }
   });
 }
-function generateJournalFileInfoByType({ journalSettings, date = /* @__PURE__ */ new Date(), type = JOURNAL_TYPES.DAILY_NOTES, title }) {
+function generateJournalFileInfoByType({ journalSettings, date = /* @__PURE__ */ new Date(), type, title }) {
   const currentDate = new Date(date);
   let templatePath = "";
   let mondayDate = getMondayOfWeek(currentDate);
@@ -426,9 +459,9 @@ function generateJournalFileInfoByType({ journalSettings, date = /* @__PURE__ */
       break;
     }
     default:
-      throw new Error(`Unknown journal type: ${type}`);
+      throw new Error(`Unknown JournalType: ${type}`);
   }
-  const resolvedPath = resolvePathTemplate(templatePath, title, currentDate);
+  const resolvedPath = resolvePathTemplate(templatePath, title, currentDate, mondayDate);
   return {
     currentDate,
     fullPath: resolvedPath,
@@ -437,6 +470,11 @@ function generateJournalFileInfoByType({ journalSettings, date = /* @__PURE__ */
 }
 async function createJournalFile({ context, type, title }) {
   try {
+    if (title.trim().length === 0 && (type === JOURNAL_TYPES.MEETING || type === JOURNAL_TYPES.NOTE)) {
+      title = await consola.prompt(`Enter ${type} title:`, {
+        type: "text"
+      });
+    }
     const currentDate = /* @__PURE__ */ new Date();
     const fileInfo = generateJournalFileInfoByType({
       journalSettings: context.settingsFile.settings.journalSettings,
@@ -487,31 +525,161 @@ async function configCommand(context) {
   consola.log(`  ${context.cwd}`);
 }
 
+const isGithubCliInstalled = async () => {
+  try {
+    const proc = await exec$1(`gh`, ["--version"]);
+    return proc.stdout.indexOf("https://github.com/cli/cli") > 0;
+  } catch (e) {
+    return false;
+  }
+};
+const getIssues = async ({ assignedToMe, cwd }) => {
+  let issues = [];
+  const flags = [
+    "issue",
+    "list",
+    "--json",
+    "labels,number,title,state"
+  ];
+  if (assignedToMe) {
+    flags.push("--assignee");
+    flags.push("@me");
+  }
+  const result = await exec$1(`gh`, flags);
+  const striped = stripAnsi(result.stdout);
+  issues = JSON.parse(striped);
+  return issues;
+};
+
+const createBranch = async ({ branchName }) => {
+  const result = await exec$1(`git`, ["checkout", "-b", branchName]);
+  return result.stdout;
+};
+
+const getTerminalColumns = () => process.stdout?.columns || 80;
+const limitText = (text, maxWidth) => {
+  if (text.length <= maxWidth)
+    return text;
+  return `${text.slice(0, maxWidth - 1)}${colors.dim("\u2026")}`;
+};
+function hexToRgb(hex) {
+  const cleanHex = hex.replace("#", "");
+  const r = Number.parseInt(cleanHex.slice(0, 2), 16);
+  const g = Number.parseInt(cleanHex.slice(2, 4), 16);
+  const b = Number.parseInt(cleanHex.slice(4, 6), 16);
+  return { r, g, b };
+}
+function printWithHexColor({ msg, hex }) {
+  const colorWithHex = hex.startsWith("#") ? hex : `#${hex}`;
+  const { r, g, b } = hexToRgb(colorWithHex);
+  const colorStart = `\x1B[38;2;${r};${g};${b}m`;
+  const colorEnd = "\x1B[0m";
+  return `${colorStart}${msg}${colorEnd}`;
+}
+
+const checkPreqrequisites = async () => {
+  const cliInstalled = await isGithubCliInstalled();
+  if (!cliInstalled) {
+    consola.log("Github CLI not installed");
+    process.exit(1);
+  }
+};
+function customTrimEnd(str, charsToTrim) {
+  let i = str.length - 1;
+  while (i >= 0 && charsToTrim.includes(str[i])) {
+    i--;
+  }
+  return str.substring(0, i + 1);
+}
+const createBranchNameFromIssue = (selectedIssue) => {
+  let slug = selectedIssue.title.toLowerCase();
+  slug = slug.trim();
+  slug = slug.replaceAll(" ", "-");
+  slug = slug.replace(/[^0-9a-zA-Z_]/g, "-");
+  slug = slug.replaceAll("--", "-");
+  slug = slug.replaceAll("--", "-");
+  slug = slug.replaceAll("--", "-");
+  slug = customTrimEnd(slug, ["-"]);
+  const branchName = `feature/${selectedIssue.number}-${slug}`;
+  return branchName;
+};
+async function githubBranchCommand(context, args) {
+  await checkPreqrequisites();
+  const assignedToMe = Boolean(args.assignedToMe);
+  consola.log("Assigned to me:", assignedToMe);
+  const currentIssues = await getIssues({ assignedToMe, cwd: context.cwd });
+  if (currentIssues.length === 0) {
+    consola.log(colors.yellow("No issues found, check assignments"));
+    process.exit(1);
+  } else {
+    consola.log(colors.green(`${currentIssues.length} Issues found assigned to you`));
+  }
+  let lineMaxLength = getTerminalColumns();
+  const longestNumber = Math.max(...currentIssues.map((i) => i.number.toString().length));
+  const longestLabels = Math.max(...currentIssues.map((i) => i.labels.map((x) => x.name).join(", ").length));
+  lineMaxLength = lineMaxLength > 130 ? 130 : lineMaxLength;
+  const descriptionLength = lineMaxLength - longestNumber - longestLabels - 15;
+  const choices = currentIssues.map(
+    (i) => {
+      const labelText = i.labels.map((l) => printWithHexColor({ msg: l.name, hex: l.color })).join(", ");
+      const labelTextNoColor = i.labels.map((l) => l.name).join(", ");
+      const labelStartpad = longestLabels - labelTextNoColor.length;
+      return {
+        title: i.number.toString(),
+        value: i.number,
+        description: `${limitText(i.title, descriptionLength).padEnd(descriptionLength)} ${"".padStart(labelStartpad)}${labelText}`
+        // pads to make sure the labels are aligned, no diea why padStart doesn't work on labelText
+      };
+    }
+  );
+  choices.push({ title: "Cancel", value: "cancel" });
+  const fzf = new Fzf(choices, {
+    selector: (item) => `${item.value} ${item.description}`,
+    casing: "case-insensitive"
+  });
+  try {
+    const result = await prompts({
+      name: "issueNumber",
+      message: "Github issue to create branch for:",
+      type: "autocomplete",
+      choices,
+      async suggest(input, choices2) {
+        consola.log(input);
+        const results = fzf.find(input);
+        return results.map((r) => choices2.find((c) => c.value === r.item.value));
+      }
+    }, {
+      // when escape is used just cancel
+      onCancel: () => {
+        consola.info(colors.dim("Canceled"));
+        process.exit(0);
+      }
+    });
+    if (result.issueNumber === "cancel") {
+      consola.log(colors.dim("Canceled"));
+      process.exit(0);
+    }
+    const selectedIssue = currentIssues.find((i) => i.number === result.issueNumber);
+    consola.log(`Selected issue ${colors.green(selectedIssue.number)} - ${colors.green(selectedIssue.title)}`);
+    const branchName = createBranchNameFromIssue(selectedIssue);
+    createBranch({ branchName });
+  } catch (e) {
+    process.exit(1);
+  }
+}
+
 async function executeCommand(parsedArgs, context) {
   switch (parsedArgs.command) {
     case "journal": {
-      const { subcommand, title } = parsedArgs.args;
-      let journalType;
-      switch (subcommand) {
-        case "daily-notes":
-        case "today":
-          journalType = JOURNAL_TYPES.DAILY_NOTES;
-          break;
-        case "meeting":
-          journalType = JOURNAL_TYPES.MEETING;
-          break;
-        case "note":
-          journalType = JOURNAL_TYPES.NOTE;
-          break;
-        default:
-          throw new Error(`Unknown journal subcommand: ${subcommand}`);
-      }
-      await createJournalFile({ context, type: journalType, title: title || "" });
+      await createJournalFile({ context, type: parsedArgs.args.jouralType, title: parsedArgs.args.title || "" });
       break;
     }
     case "git-commit":
       await gitCommitCommand(context, parsedArgs.args.message);
       break;
+    case "gh-branch":
+      await githubBranchCommand(context, parsedArgs.args);
+      break;
     case "config":
       await configCommand(context);
       break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@towles/tool",
   "type": "module",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "One off quality of life scripts that I use on a daily basis.",
   "author": "Chris Towles <Chris.Towles.Dev@gmail.com>",
   "license": "MIT",
@@ -37,11 +37,13 @@
     "@anthropic-ai/sdk": "^0.56.0",
     "@clack/prompts": "^0.11.0",
     "comment-json": "^4.2.5",
+    "consola": "^3.4.2",
     "fzf": "^0.5.2",
     "luxon": "^3.7.1",
     "neverthrow": "^8.2.0",
     "prompts": "^2.4.2",
-    "consola": "^3.4.2",
+    "strip-ansi": "^7.1.0",
+    "tinyexec": "^0.3.2",
     "yargs": "^17.7.2",
     "zod": "^4.0.5"
   },
@@ -55,7 +57,6 @@
     "lint-staged": "^15.5.2",
     "oxlint": "^1.7.0",
     "simple-git-hooks": "^2.13.0",
-    "tinyexec": "^0.3.2",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",
     "unbuild": "^3.5.0",