@invoicer/cli 1.1.1 → 1.1.2

package/logo.svg

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200" width="200" height="200">
-  <!-- Background -->
-  <rect width="200" height="200" rx="40" fill="#1e293b"/>
-  
-  <!-- "IN" Text -->
-  <text 
-    x="100" 
-    y="140" 
-    font-family="Arial, Helvetica, sans-serif" 
-    font-size="96" 
-    font-weight="900" 
-    fill="#ffffff" 
-    text-anchor="middle" 
-    letter-spacing="-8">IN</text>
-</svg>
-

package/src/cli.ts

@@ -1,44 +0,0 @@
-#!/usr/bin/env node
-import "dotenv/config";
-import { Command } from "commander";
-import { pathToFileURL } from "node:url";
-import { createProjectPaths, type ProjectPaths } from "./core/paths.js";
-import { registerGenerateCommand } from "./commands/generate.js";
-import { registerClientsCommand } from "./commands/clients.js";
-import { registerTimesheetCommand } from "./commands/timesheet.js";
-
-export function createProgram(paths: ProjectPaths = createProjectPaths()): Command {
-  const program = new Command();
-
-  program
-    .name("invoicer")
-    .description("Professional invoice generator with timesheet integration")
-    .version("1.0.0");
-
-  registerGenerateCommand(program, paths);
-  registerClientsCommand(program, paths);
-  registerTimesheetCommand(program, paths);
-
-  return program;
-}
-
-export async function runCli(argv = process.argv, paths: ProjectPaths = createProjectPaths()): Promise<void> {
-  const program = createProgram(paths);
-  await program.parseAsync(argv);
-}
-
-function isMainModule(): boolean {
-  const entry = process.argv[1];
-  if (!entry) {
-    return false;
-  }
-  return import.meta.url === pathToFileURL(entry).href;
-}
-
-if (isMainModule()) {
-  runCli().catch((error: unknown) => {
-    const message = error instanceof Error ? error.message : String(error);
-    console.error(`❌ ${message}`);
-    process.exit(1);
-  });
-}

package/src/commands/clients.ts

@@ -1,221 +0,0 @@
-import inquirer from "inquirer";
-import type { Command } from "commander";
-import { loadJsonFile, writeJsonFile } from "../core/json-store.js";
-import { type ProjectPaths } from "../core/paths.js";
-import { validateConfig } from "../core/validators.js";
-import { type ClientsOptions, type Config } from "../domain/types.js";
-
-function loadConfig(paths: ProjectPaths): Config {
-  return loadJsonFile(paths.configPath, { client: [], from: {} }, validateConfig);
-}
-
-export function registerClientsCommand(program: Command, paths: ProjectPaths): void {
-  program
-    .command("clients")
-    .description("Manage clients")
-    .option("--list", "List all configured clients", false)
-    .option("--add", "Add a new client interactively", false)
-    .option("--edit <name>", "Edit a client by name")
-    .option("--delete <name>", "Delete a client by name")
-    .action(async (options: ClientsOptions) => {
-      const cfg = loadConfig(paths);
-
-      if (options.list) {
-        if (cfg.client.length === 0) {
-          console.log("No clients configured.");
-          process.exit(0);
-        }
-
-        console.log("\n📋 Configured Clients:\n");
-        cfg.client.forEach((client, index) => {
-          console.log(`${index + 1}. ${client.name}`);
-          console.log(`   Currency: ${client.currency || "USD"}`);
-          console.log(`   Rate: ${client.defaultRate}/hr`);
-          console.log(`   Email: ${client.email || "—"}`);
-          if (client.address) console.log(`   Address: ${client.address}`);
-          if (client.payPeriodType) console.log(`   Terms: ${client.payPeriodType}`);
-          console.log();
-        });
-
-        process.exit(0);
-      }
-
-      if (options.add) {
-        const answers = await inquirer.prompt<{
-          name: string;
-          email: string;
-          address: string;
-          currency: string;
-          defaultRate: number;
-          payPeriodType: string;
-        }>([
-          {
-            type: "input",
-            name: "name",
-            message: "Client name:",
-            validate: (value: string) => value.trim().length > 0 || "Name is required",
-          },
-          {
-            type: "input",
-            name: "email",
-            message: "Email address:",
-            default: "",
-            validate: (value: string) =>
-              !value || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value) || "Enter valid email",
-          },
-          {
-            type: "input",
-            name: "address",
-            message: "Address (optional):",
-            default: "",
-          },
-          {
-            type: "list",
-            name: "currency",
-            message: "Currency:",
-            choices: ["USD", "EUR", "GBP", "JPY"],
-            default: "USD",
-          },
-          {
-            type: "number",
-            name: "defaultRate",
-            message: "Default rate per hour:",
-            default: 50,
-            validate: (value: number) => value > 0 || "Rate must be positive",
-          },
-          {
-            type: "input",
-            name: "payPeriodType",
-            message: "Payment terms (e.g., Net 30, Due on Receipt):",
-            default: "Due on Receipt",
-          },
-        ]);
-
-        const newClient = {
-          name: answers.name.trim(),
-          email: answers.email.trim(),
-          address: answers.address.trim(),
-          currency: answers.currency,
-          defaultRate: Number(answers.defaultRate),
-          payPeriodType: answers.payPeriodType.trim(),
-        };
-
-        if (cfg.client.some((client) => client.name === newClient.name)) {
-          console.error(`❌ Client "${newClient.name}" already exists`);
-          process.exit(1);
-        }
-
-        cfg.client.push(newClient);
-        writeJsonFile(paths.configPath, cfg);
-        console.log(`✅ Client "${newClient.name}" added successfully`);
-        process.exit(0);
-      }
-
-      if (options.edit) {
-        const clientName = options.edit.trim();
-        const clientIndex = cfg.client.findIndex((client) => client.name === clientName);
-
-        if (clientIndex === -1) {
-          console.error(`❌ Client "${clientName}" not found`);
-          process.exit(1);
-        }
-
-        const current = cfg.client[clientIndex];
-
-        const answers = await inquirer.prompt<{
-          name: string;
-          email: string;
-          address: string;
-          currency: string;
-          defaultRate: number;
-          payPeriodType: string;
-        }>([
-          {
-            type: "input",
-            name: "name",
-            message: "Client name:",
-            default: current.name,
-            validate: (value: string) => value.trim().length > 0 || "Name is required",
-          },
-          {
-            type: "input",
-            name: "email",
-            message: "Email:",
-            default: current.email || "",
-            validate: (value: string) =>
-              !value || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value) || "Enter valid email",
-          },
-          {
-            type: "input",
-            name: "address",
-            message: "Address:",
-            default: current.address || "",
-          },
-          {
-            type: "list",
-            name: "currency",
-            message: "Currency:",
-            choices: ["USD", "EUR", "GBP", "JPY"],
-            default: current.currency || "USD",
-          },
-          {
-            type: "number",
-            name: "defaultRate",
-            message: "Default rate per hour:",
-            default: current.defaultRate || 50,
-            validate: (value: number) => value > 0 || "Rate must be positive",
-          },
-          {
-            type: "input",
-            name: "payPeriodType",
-            message: "Payment terms:",
-            default: current.payPeriodType || "Due on Receipt",
-          },
-        ]);
-
-        cfg.client[clientIndex] = {
-          name: answers.name.trim(),
-          email: answers.email.trim(),
-          address: answers.address.trim(),
-          currency: answers.currency,
-          defaultRate: Number(answers.defaultRate),
-          payPeriodType: answers.payPeriodType.trim(),
-        };
-
-        writeJsonFile(paths.configPath, cfg);
-        console.log(`✅ Client "${answers.name}" updated successfully`);
-        process.exit(0);
-      }
-
-      if (options.delete) {
-        const clientName = options.delete.trim();
-        const clientIndex = cfg.client.findIndex((client) => client.name === clientName);
-
-        if (clientIndex === -1) {
-          console.error(`❌ Client "${clientName}" not found`);
-          process.exit(1);
-        }
-
-        const answer = await inquirer.prompt<{ confirm: boolean }>([
-          {
-            type: "confirm",
-            name: "confirm",
-            message: `Delete client "${clientName}"? This cannot be undone.`,
-            default: false,
-          },
-        ]);
-
-        if (!answer.confirm) {
-          console.log("Cancelled.");
-          process.exit(0);
-        }
-
-        cfg.client.splice(clientIndex, 1);
-        writeJsonFile(paths.configPath, cfg);
-        console.log(`✅ Client "${clientName}" deleted`);
-        process.exit(0);
-      }
-
-      console.log("Usage: invoicer clients [--list | --add | --edit <name> | --delete <name>]");
-    });
-}

package/src/commands/generate.ts

@@ -1,379 +0,0 @@
-import fs from "node:fs";
-import inquirer from "inquirer";
-import type { Command } from "commander";
-import { loadJsonFile, writeJsonFile } from "../core/json-store.js";
-import { type ProjectPaths } from "../core/paths.js";
-import { validateConfig, validateLastState } from "../core/validators.js";
-import { type Config, type GenerateOptions, type LastState, type LineItem } from "../domain/types.js";
-import {
-  getDefaultMonth,
-  getInvoiceDate,
-  getInvoicePeriod,
-  resolveInvoiceNumber,
-  validateMonth,
-} from "../services/invoice-number.js";
-import { hasSmtpConfig, sendInvoiceEmail } from "../services/email.js";
-import { renderInvoicePdf } from "../services/pdf-render.js";
-import {
-  aggregateEntriesByDescription,
-  archiveTimesheetEntries,
-  readTimesheetEntries,
-} from "../services/timesheet.js";
-
-function exitWithError(message: string): never {
-  console.error(message);
-  process.exit(1);
-}
-
-function loadConfig(paths: ProjectPaths): Config {
-  return loadJsonFile(paths.configPath, { client: [], from: {} }, validateConfig);
-}
-
-function loadLastState(paths: ProjectPaths): LastState {
-  return loadJsonFile(paths.lastPath, { clients: {} }, validateLastState);
-}
-
-function getCurrency(cfgCurrency?: string): string {
-  return cfgCurrency?.trim() || "USD";
-}
-
-async function selectClient(cfg: Config, preferredClientName?: string) {
-  if (preferredClientName) {
-    const matched = cfg.client.find((client) => client.name === preferredClientName);
-    if (!matched) {
-      exitWithError(`❌ Client "${preferredClientName}" not found in config.json`);
-    }
-    console.log(`📋 Using client: ${matched.name}`);
-    return matched;
-  }
-
-  if (cfg.client.length === 1) {
-    const [single] = cfg.client;
-    console.log(`📋 Using client: ${single.name}`);
-    return single;
-  }
-
-  const clientChoices = cfg.client.map((client, index) => ({
-    name: `${client.name} (${getCurrency(client.currency)} ${client.defaultRate}/hr)`,
-    value: index,
-  }));
-
-  const answer = await inquirer.prompt<{ clientIndex: number }>([
-    {
-      type: "list",
-      name: "clientIndex",
-      message: "Select client:",
-      choices: clientChoices,
-    },
-  ]);
-
-  return cfg.client[answer.clientIndex];
-}
-
-async function collectManualLineItems(params: {
-  options: GenerateOptions;
-  cfg: Config;
-  currency: string;
-  lastHours: number;
-  lastRate: number;
-  defaultRate: number;
-}): Promise<LineItem[]> {
-  const items: LineItem[] = [];
-  let addingItems = true;
-  let itemIndex = 1;
-
-  while (addingItems) {
-    const answer = await inquirer.prompt<{
-      description: string;
-      hours: number;
-      rate: number;
-    }>([
-      {
-        type: "input",
-        name: "description",
-        message: `Description (Item ${itemIndex}):`,
-        default:
-          itemIndex === 1
-            ? (params.options.desc || params.cfg.defaultDescription || "Services")
-            : "",
-      },
-      {
-        type: "number",
-        name: "hours",
-        message: "Hours:",
-        default:
-          itemIndex === 1
-            ? (params.options.hours ? Number(params.options.hours) : Number(params.lastHours ?? 160))
-            : undefined,
-      },
-      {
-        type: "number",
-        name: "rate",
-        message: "Rate per hour:",
-        default:
-          itemIndex === 1
-            ? (params.options.rate ? Number(params.options.rate) : Number(params.lastRate ?? params.defaultRate))
-            : params.defaultRate,
-      },
-    ]);
-
-    const hours = Number(answer.hours);
-    const rate = Number(answer.rate);
-
-    if (!Number.isFinite(hours) || !Number.isFinite(rate)) {
-      exitWithError("❌ Hours and rate must be valid numbers");
-    }
-
-    const amount = hours * rate;
-
-    items.push({
-      description: answer.description,
-      hours,
-      rate,
-      amount,
-    });
-
-    console.log(
-      `   ✓ ${answer.description}: ${hours}h × ${params.currency}${rate} = ${params.currency}${amount.toFixed(2)}`,
-    );
-
-    const addAnotherAnswer = await inquirer.prompt<{ addAnother: boolean }>([
-      {
-        type: "confirm",
-        name: "addAnother",
-        message: "Add another line item?",
-        default: false,
-      },
-    ]);
-
-    addingItems = addAnotherAnswer.addAnother;
-    itemIndex += 1;
-  }
-
-  return items;
-}
-
-export async function handleGenerateCommand(options: GenerateOptions, paths: ProjectPaths): Promise<void> {
-  fs.mkdirSync(paths.outDir, { recursive: true });
-
-  if (!fs.existsSync(paths.configPath)) {
-    console.error("❌ Missing config.json. Create it first (see README).");
-    console.error(`   Looked in: ${paths.projectRoot}`);
-    process.exit(1);
-  }
-
-  const cfg = loadConfig(paths);
-  const last = loadLastState(paths);
-
-  if (cfg.client.length === 0) {
-    exitWithError("❌ No clients found in config.json");
-  }
-
-  const selectedClient = await selectClient(cfg, options.client);
-
-  const clientKey = selectedClient.name;
-  const clientHistory = last.clients[clientKey] || {
-    lastHours: 160,
-    lastRate: selectedClient.defaultRate ?? 0,
-    seqByMonth: {},
-  };
-
-  const month = options.month || getDefaultMonth();
-
-  if (!validateMonth(month)) {
-    exitWithError("❌ Month must be in YYYY-MM format");
-  }
-
-  let lineItems: LineItem[] = [];
-  let entryIdsToArchive: number[] = [];
-
-  if (options.fromTimesheet) {
-    console.log(`\n🔍 Reading timesheet for ${selectedClient.name} (${month})...`);
-    const entries = readTimesheetEntries(paths, { client: selectedClient.name, month });
-
-    if (entries.length === 0) {
-      console.log("   No unbilled entries found for this period.");
-      console.log("   Falling back to manual entry mode.\n");
-    } else {
-      console.log(`   Found ${entries.length} unbilled entries.\n`);
-
-      const aggregated = aggregateEntriesByDescription(entries);
-
-      console.log("📊 Aggregated by service/project:\n");
-      aggregated.forEach((group, index) => {
-        console.log(`   ${index + 1}. ${group.description}`);
-        console.log(`      ${group.hours}h × $${group.rate}/hr = $${group.amount}`);
-        if (group.rateVariance) {
-          console.log(
-            `      ⚠️  Rate variance: $${group.minRate}-$${group.maxRate}/hr (using weighted average)`,
-          );
-        }
-        console.log(`      Period: ${group.periodFrom} to ${group.periodTo}`);
-        console.log(`      Based on ${group.entryIds.length} timesheet entries\n`);
-      });
-
-      const answer = await inquirer.prompt<{ confirmUse: boolean }>([
-        {
-          type: "confirm",
-          name: "confirmUse",
-          message: "Use these aggregated line items?",
-          default: true,
-        },
-      ]);
-
-      if (answer.confirmUse) {
-        lineItems = aggregated.map((group) => ({
-          description: group.description,
-          hours: group.hours,
-          rate: group.rate,
-          amount: group.amount,
-          periodFrom: group.periodFrom,
-          periodTo: group.periodTo,
-        }));
-        entryIdsToArchive = aggregated.flatMap((group) => group.entryIds);
-      }
-    }
-  }
-
-  if (lineItems.length === 0) {
-    lineItems = await collectManualLineItems({
-      options,
-      cfg,
-      currency: getCurrency(selectedClient.currency),
-      lastHours: clientHistory.lastHours,
-      lastRate: clientHistory.lastRate,
-      defaultRate: selectedClient.defaultRate ?? 0,
-    });
-  }
-
-  const seqByMonth = { ...(clientHistory.seqByMonth || {}) };
-  const invoiceNumber = resolveInvoiceNumber({
-    month,
-    invoicePrefix: cfg.invoicePrefix,
-    overrideInvoice: options.invoice,
-    seqByMonth,
-  });
-
-  const invoiceDate = getInvoiceDate();
-  const { periodFrom, periodTo } = getInvoicePeriod(month);
-
-  const currency = getCurrency(selectedClient.currency);
-  const total = lineItems.reduce((sum, item) => sum + item.amount, 0);
-
-  console.log(`\n💰 Total: ${currency}${total.toFixed(2)}\n`);
-
-  const outPath = await renderInvoicePdf(
-    paths,
-    {
-      from: cfg.from || {},
-      client: selectedClient,
-      currency,
-      invoiceNumber,
-      invoiceDate,
-      periodFrom,
-      periodTo,
-      lineItems,
-      paymentTerms: selectedClient.payPeriodType,
-      note: cfg.note,
-    },
-    month,
-  );
-
-  if (!last.clients) {
-    last.clients = {};
-  }
-
-  const firstLineItem = lineItems[0];
-
-  last.clients[clientKey] = {
-    lastHours: firstLineItem?.hours ?? clientHistory.lastHours,
-    lastRate: firstLineItem?.rate ?? clientHistory.lastRate,
-    seqByMonth,
-  };
-
-  writeJsonFile(paths.lastPath, last);
-
-  console.log("✅ Invoice generated:", outPath);
-  console.log("Invoice #:", invoiceNumber);
-  console.log("Total:", `${currency} ${total.toFixed(2)}`);
-
-  if (entryIdsToArchive.length > 0) {
-    const answer = await inquirer.prompt<{ confirmArchive: boolean }>([
-      {
-        type: "confirm",
-        name: "confirmArchive",
-        message: `Archive ${entryIdsToArchive.length} timesheet entries used in this invoice?`,
-        default: true,
-      },
-    ]);
-
-    if (answer.confirmArchive) {
-      const archivedCount = archiveTimesheetEntries(paths, entryIdsToArchive, invoiceNumber, month);
-      console.log(`✅ Archived ${archivedCount} entries to data/archive.json`);
-    }
-  }
-
-  if (hasSmtpConfig()) {
-    const answer = await inquirer.prompt<{ sendEmail: boolean }>([
-      {
-        type: "confirm",
-        name: "sendEmail",
-        message: "Send invoice via email?",
-        default: true,
-      },
-    ]);
-
-    if (answer.sendEmail) {
-      const emailAnswer = await inquirer.prompt<{ clientEmail: string }>([
-        {
-          type: "input",
-          name: "clientEmail",
-          message: "Client email address:",
-          default: selectedClient.email || "",
-          validate: (value: string) =>
-            /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value) || "Enter valid email",
-        },
-      ]);
-
-      try {
-        console.log("\n📧 Sending email...");
-
-        await sendInvoiceEmail({
-          outPath,
-          invoiceNumber,
-          clientName: selectedClient.name,
-          clientEmail: emailAnswer.clientEmail,
-          currency,
-          total,
-          periodFrom,
-          periodTo,
-          senderName: cfg.from?.name,
-        });
-
-        console.log(`✅ Email sent successfully to ${emailAnswer.clientEmail}`);
-      } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error("❌ Failed to send email:", message);
-        console.log("   PDF saved locally at:", outPath);
-      }
-    }
-  } else {
-    console.log("\n💡 Tip: Configure SMTP in .env to enable email sending");
-  }
-}
-
-export function registerGenerateCommand(program: Command, paths: ProjectPaths): void {
-  program
-    .command("generate", { isDefault: true })
-    .description("Generate an invoice from manual entry or timesheet")
-    .option("--from-timesheet", "Auto-populate from timesheet entries", false)
-    .option("--client <name>", "Client name (auto-selected if only one client)")
-    .option("--month <YYYY-MM>", "Invoice month (default: current month)")
-    .option("--hours <number>", "Hours for first line item")
-    .option("--rate <number>", "Rate for first line item")
-    .option("--desc <text>", "Description for first line item")
-    .option("--invoice <number>", "Custom invoice number")
-    .action(async (options: GenerateOptions) => {
-      await handleGenerateCommand(options, paths);
-    });
-}

package/src/commands/timesheet.ts

@@ -1,47 +0,0 @@
-import type { Command } from "commander";
-import { type ProjectPaths } from "../core/paths.js";
-import { type TimesheetOptions } from "../domain/types.js";
-import {
-  readArchivedEntries,
-  readTimesheetEntries,
-  toArchiveCsv,
-  toTimesheetCsv,
-} from "../services/timesheet.js";
-
-export function registerTimesheetCommand(program: Command, paths: ProjectPaths): void {
-  program
-    .command("timesheet")
-    .description("Manage timesheet data")
-    .option("--export <format>", "Export timesheet (csv|json)", "")
-    .option("--client <name>", "Filter by client")
-    .option("--month <YYYY-MM>", "Filter by month")
-    .option("--archive", "Show archived entries", false)
-    .action(async (options: TimesheetOptions) => {
-      if (options.archive) {
-        const archived = readArchivedEntries(paths, {
-          client: options.client || "",
-          month: options.month || "",
-        });
-
-        if (options.export === "csv") {
-          console.log(toArchiveCsv(archived));
-          process.exit(0);
-        }
-
-        console.log(JSON.stringify(archived, null, 2));
-        process.exit(0);
-      }
-
-      const entries = readTimesheetEntries(paths, {
-        client: options.client || "",
-        month: options.month || "",
-      });
-
-      if (options.export === "csv") {
-        console.log(toTimesheetCsv(entries));
-        process.exit(0);
-      }
-
-      console.log(JSON.stringify(entries, null, 2));
-    });
-}