@towles/tool 0.0.13 → 0.0.14

package/dist/index.mjs

@@ -1,28 +1,192 @@
 #!/usr/bin/env node
 import process$1 from 'node:process';
-import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
 import consola from 'consola';
-import prompts from 'prompts';
-import { execSync, exec } from 'node:child_process';
+import { z } from 'zod/v4';
 import * as fs from 'node:fs';
 import { existsSync, writeFileSync, mkdirSync } from 'node:fs';
 import * as path from 'node:path';
 import path__default from 'node:path';
-import { promisify } from 'node:util';
+import { homedir } from 'node:os';
+import * as commentJson from 'comment-json';
 import { colors } from 'consola/utils';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import prompts from 'prompts';
+import { execSync, exec } from 'node:child_process';
+import { promisify } from 'node:util';
 import { DateTime } from 'luxon';
-import { z } from 'zod/v4';
-import { homedir } from 'node:os';
-import stripJsonComments from 'strip-json-comments';
 
-const version = "0.0.13";
+async function loadTowlesToolContext({
+  cwd,
+  settingsFile,
+  debug = false
+}) {
+  return {
+    cwd,
+    settingsFile,
+    args: [],
+    // TODO: Load args from yargs
+    debug
+  };
+}
+
+const AppInfo = {
+  toolName: "towles-tool"
+};
+
+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")),
+  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"))
+});
+const UserSettingsSchema = z.object({
+  preferredEditor: z.string().default("code"),
+  journalSettings: JournalSettingsSchema
+});
+class LoadedSettings {
+  constructor(settingsFile) {
+    this.settingsFile = settingsFile;
+  }
+  settingsFile;
+}
+function createSettingsFile() {
+  let userSettings = UserSettingsSchema.parse({});
+  if (fs.existsSync(USER_SETTINGS_PATH)) {
+    const userContent = fs.readFileSync(USER_SETTINGS_PATH, "utf-8");
+    const parsedUserSettings = commentJson.parse(userContent);
+    userSettings = UserSettingsSchema.parse(parsedUserSettings);
+  }
+  return userSettings;
+}
+function saveSettings(settingsFile) {
+  try {
+    const dirPath = path.dirname(settingsFile.path);
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, { recursive: true });
+    }
+    fs.writeFileSync(
+      settingsFile.path,
+      commentJson.stringify(settingsFile.settings, null, 2),
+      "utf-8"
+    );
+  } catch (error) {
+    consola.error("Error saving user settings file:", error);
+  }
+}
+async function loadSettings() {
+  let userSettings = null;
+  if (fs.existsSync(USER_SETTINGS_PATH)) {
+    const userContent = fs.readFileSync(USER_SETTINGS_PATH, "utf-8");
+    const parsedUserSettings = commentJson.parse(userContent);
+    userSettings = UserSettingsSchema.parse(parsedUserSettings);
+    if (JSON.stringify(parsedUserSettings) !== JSON.stringify(userSettings)) {
+      consola.warn(`Settings file ${USER_SETTINGS_PATH} has been updated with default values.`);
+      const tempSettingsFile = {
+        path: USER_SETTINGS_PATH,
+        settings: userSettings
+      };
+      saveSettings(tempSettingsFile);
+    }
+  } else {
+    const confirmed = await consola.prompt(`Settings file not found. Create ${colors.cyan(USER_SETTINGS_PATH)}?`, {
+      type: "confirm"
+    });
+    if (!confirmed) {
+      throw new Error(`Settings file not found and user chose not to create it.`);
+    }
+    userSettings = createSettingsFile();
+  }
+  return new LoadedSettings(
+    {
+      path: USER_SETTINGS_PATH,
+      settings: userSettings
+    }
+  );
+}
+
+const version = "0.0.14";
+
+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());
+  parser.command(
+    ["journal", "j"],
+    "quickly create md files from templates files like daily-notes, meeting, notes, etc.",
+    (yargs2) => {
+      return yargs2.command(
+        ["daily-notes", "today"],
+        "Weekly files with daily sections for ongoing work and notes",
+        {},
+        (argv2) => {
+          parsedResult = { command: "journal", args: { subcommand: "daily-notes", title: "" } };
+        }
+      ).command(
+        ["meeting [title]", "m"],
+        "Structured meeting notes with agenda and action items",
+        {
+          title: {
+            type: "string",
+            describe: "Meeting title"
+          }
+        },
+        (argv2) => {
+          parsedResult = { command: "journal", args: { subcommand: "meeting", title: argv2.title || "" } };
+        }
+      ).command(
+        ["note [title]", "n"],
+        "General-purpose notes with structured sections",
+        {
+          title: {
+            type: "string",
+            describe: "Note title"
+          }
+        },
+        (argv2) => {
+          parsedResult = { command: "journal", args: { subcommand: "note", title: argv2.title || "" } };
+        }
+      ).demandCommand(1, "You need to specify a journal subcommand").help();
+    },
+    () => {
+      parser.showHelp();
+    }
+  );
+  parser.command(
+    ["git-commit [message...]", "gc"],
+    "Git commit command with optional message",
+    {
+      message: {
+        type: "string",
+        array: true,
+        describe: "Commit message words"
+      }
+    },
+    (argv2) => {
+      parsedResult = { command: "git-commit", args: { message: argv2.message } };
+    }
+  );
+  parser.command(
+    ["config", "cfg"],
+    "set or show configuration file.",
+    {},
+    () => {
+      parsedResult = { command: "config", args: {} };
+    }
+  );
+  await parser.parse();
+  if (!parsedResult) {
+    throw new Error("No command was parsed");
+  }
+  return parsedResult;
+}
 
 function execCommand(cmd, cwd) {
   return execSync(cmd, { encoding: "utf8", cwd }).trim();
 }
 
-async function gitCommitCommand(context, messageArgs) {
+async function gitCommitCommand(context, commitMessage) {
   try {
     const status = await getGitStatus(context.cwd);
     if (!status || status.staged.length === 0 && status.unstaged.length === 0 && status.untracked.length === 0) {
@@ -45,7 +209,6 @@ async function gitCommitCommand(context, messageArgs) {
       await execCommand("git add .", context.cwd);
       consola.success("Files staged");
     }
-    let commitMessage = messageArgs?.join(" ") || "";
     if (!commitMessage) {
       const response = await prompts({
         type: "text",
@@ -309,24 +472,6 @@ async function createJournalFile({ context, type, title }) {
   }
 }
 
-async function loadTowlesToolContext({
-  cwd,
-  settingsFile,
-  debug = false
-}) {
-  return {
-    cwd,
-    settingsFile,
-    args: [],
-    // TODO: Load args from yargs
-    debug
-  };
-}
-
-const AppInfo = {
-  toolName: "towles-tool"
-};
-
 async function configCommand(context) {
   consola.info("Configuration");
   consola.log("");
@@ -342,84 +487,38 @@ async function configCommand(context) {
   consola.log(`  ${context.cwd}`);
 }
 
-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")),
-  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"))
-});
-const UserSettingsSchema = z.object({
-  preferredEditor: z.string().default("code"),
-  journalSettings: JournalSettingsSchema
-});
-class LoadedSettings {
-  constructor(settingsFile) {
-    this.settingsFile = settingsFile;
-  }
-  settingsFile;
-}
-function createSettingsFile() {
-  const defaultSettings = UserSettingsSchema.parse({
-    // its odd, but but we have to get default value from each schema object, if we don't it failes.
-    // https://github.com/colinhacks/zod/discussions/1953
-    journalSettings: JournalSettingsSchema.parse({})
-  });
-  const settingsFile = {
-    path: USER_SETTINGS_PATH,
-    settings: defaultSettings
-  };
-  saveSettings(settingsFile);
-  consola.success(`Created settings file: ${USER_SETTINGS_PATH}`);
-  return defaultSettings;
-}
-function saveSettings(settingsFile) {
-  try {
-    const dirPath = path.dirname(settingsFile.path);
-    if (!fs.existsSync(dirPath)) {
-      fs.mkdirSync(dirPath, { recursive: true });
-    }
-    fs.writeFileSync(
-      settingsFile.path,
-      JSON.stringify(settingsFile.settings, null, 2),
-      "utf-8"
-    );
-  } catch (error) {
-    consola.error("Error saving user settings file:", error);
-  }
-}
-async function loadSettings() {
-  let userSettings = null;
-  if (fs.existsSync(USER_SETTINGS_PATH)) {
-    const userContent = fs.readFileSync(USER_SETTINGS_PATH, "utf-8");
-    const parsedUserSettings = JSON.parse(stripJsonComments(userContent));
-    userSettings = UserSettingsSchema.parse(parsedUserSettings);
-    if (JSON.stringify(parsedUserSettings) !== JSON.stringify(userSettings)) {
-      consola.warn(`Settings file ${USER_SETTINGS_PATH} has been updated with default values.`);
-      const tempSettingsFile = {
-        path: USER_SETTINGS_PATH,
-        settings: userSettings
-      };
-      saveSettings(tempSettingsFile);
-    }
-  } else {
-    const confirmed = await consola.prompt(`Settings file not found. Create ${colors.cyan(USER_SETTINGS_PATH)}?`, {
-      type: "confirm"
-    });
-    if (!confirmed) {
-      throw new Error(`Settings file not found and user chose not to create it.`);
+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 || "" });
+      break;
     }
-    userSettings = createSettingsFile();
+    case "git-commit":
+      await gitCommitCommand(context, parsedArgs.args.message);
+      break;
+    case "config":
+      await configCommand(context);
+      break;
+    default:
+      throw new Error(`Unknown command: ${parsedArgs.command}`);
   }
-  return new LoadedSettings(
-    {
-      path: USER_SETTINGS_PATH,
-      settings: userSettings
-    }
-  );
 }
-
 async function main() {
   const settings = await loadSettings();
   const context = await loadTowlesToolContext({
@@ -429,71 +528,8 @@ async function main() {
     // later can be set to false in production or when not debugging
   });
   consola.info(`Using configuration from ${settings.settingsFile.path}`);
-  const parser = yargs(hideBin(process$1.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());
-  parser.command(
-    ["journal", "j"],
-    "quickly create md files from templates files like daily-notes, meeting, notes, etc.",
-    (yargs2) => {
-      return yargs2.command(
-        ["daily-notes", "today"],
-        "Weekly files with daily sections for ongoing work and notes",
-        {},
-        async () => {
-          await createJournalFile({ context, type: JOURNAL_TYPES.DAILY_NOTES, title: "" });
-        }
-      ).command(
-        ["meeting [title]", "m"],
-        "Structured meeting notes with agenda and action items",
-        (yargs3) => {
-          return yargs3.positional("title", {
-            type: "string",
-            describe: "Meeting title"
-          });
-        },
-        async (argv) => {
-          await createJournalFile({ context, type: JOURNAL_TYPES.MEETING, title: argv.title || "" });
-        }
-      ).command(
-        ["note [title]", "n"],
-        "General-purpose notes with structured sections",
-        (yargs3) => {
-          return yargs3.positional("title", {
-            type: "string",
-            describe: "Note title"
-          });
-        },
-        async (argv) => {
-          await createJournalFile({ context, type: JOURNAL_TYPES.NOTE, title: argv.title || "" });
-        }
-      ).demandCommand(1, "You need to specify a journal subcommand").help();
-    },
-    () => {
-      parser.showHelp();
-    }
-  );
-  parser.command(
-    ["git-commit [message...]", "gc"],
-    "Git commit command with optional message",
-    (yargs2) => {
-      return yargs2.positional("message", {
-        type: "string",
-        array: true,
-        describe: "Commit message words"
-      });
-    },
-    async (argv) => {
-      await gitCommitCommand(context, argv.message || []);
-    }
-  );
-  parser.command(
-    ["config", "cfg"],
-    "set or show configuration file.",
-    {},
-    async () => {
-      await configCommand(context);
-    }
-  );
-  await parser.parse();
+  const parsedArgs = await parseArguments(process$1.argv);
+  await executeCommand(parsedArgs, context);
 }
 main().catch((error) => {
   consola.error("An unexpected critical error occurred:");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@towles/tool",
   "type": "module",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "One off quality of life scripts that I use on a daily basis.",
   "author": "Chris Towles <Chris.Towles.Dev@gmail.com>",
   "license": "MIT",
@@ -35,12 +35,13 @@
   "dependencies": {
     "@anthropic-ai/claude-code": "^1.0.51",
     "@anthropic-ai/sdk": "^0.56.0",
-    "consola": "^3.4.2",
+    "@clack/prompts": "^0.11.0",
+    "comment-json": "^4.2.5",
     "fzf": "^0.5.2",
     "luxon": "^3.7.1",
     "neverthrow": "^8.2.0",
     "prompts": "^2.4.2",
-    "strip-json-comments": "^5.0.2",
+    "consola": "^3.4.2",
     "yargs": "^17.7.2",
     "zod": "^4.0.5"
   },