@seethruhead/cra-payroll 0.3.1 → 0.5.0

package/dist/cra-payroll.js

@@ -69212,8 +69212,8 @@ var init_LaunchOptions = __esm(() => {
 
 // src/cli.ts
 import { parseArgs } from "util";
-import { resolve as resolve6 } from "path";
-import { existsSync as existsSync4, readFileSync as readFileSync4, fstatSync } from "fs";
+import { resolve as resolve7 } from "path";
+import { existsSync as existsSync5, readFileSync as readFileSync5, fstatSync } from "fs";
 import { createInterface as createInterface2 } from "readline";
 
 // node_modules/neverthrow/dist/index.cjs.js
@@ -79486,10 +79486,73 @@ ${text.value}
   await session.close();
   return parsed;
 };
+// src/cache.ts
+import { resolve as resolve6 } from "path";
+import { existsSync as existsSync3, mkdirSync, readFileSync as readFileSync4, writeFileSync } from "fs";
+import { createHash } from "crypto";
+var DEFAULT_CACHE_DIR = resolve6(process.env.HOME || "~", ".config", "cra-payroll", "cache");
+var ensureDir = (dir) => {
+  if (!existsSync3(dir))
+    mkdirSync(dir, { recursive: true });
+};
+var cacheKey = (config2) => {
+  const data = JSON.stringify({
+    province: config2.province,
+    annualSalary: config2.annualSalary,
+    payPeriod: config2.payPeriod,
+    year: config2.year,
+    rrspMatchPercent: config2.rrspMatchPercent,
+    rrspUnmatchedPercent: config2.rrspUnmatchedPercent,
+    cppMaxedOut: config2.cppMaxedOut,
+    eiMaxedOut: config2.eiMaxedOut
+  });
+  return createHash("sha256").update(data).digest("hex").slice(0, 16);
+};
+var cachePath = (config2, dir) => resolve6(dir, `${cacheKey(config2)}.json`);
+var readCache = (config2, dir) => {
+  const path12 = cachePath(config2, dir);
+  if (!existsSync3(path12))
+    return null;
+  try {
+    const data = JSON.parse(readFileSync4(path12, "utf-8"));
+    if (typeof data.grossIncome === "number" && typeof data.net === "number") {
+      return data;
+    }
+    return null;
+  } catch {
+    return null;
+  }
+};
+var writeCache = (config2, result, dir) => {
+  try {
+    ensureDir(dir);
+    writeFileSync(cachePath(config2, dir), JSON.stringify(result, null, 2));
+  } catch (e2) {
+    log(`cache write failed: ${e2.message}`);
+  }
+};
+var withCache = (inner, cacheDir = DEFAULT_CACHE_DIR) => ({
+  calculate: async (config2, headless) => {
+    const cached = readCache(config2, cacheDir);
+    if (cached) {
+      log(`cache hit: ${cachePath(config2, cacheDir)}`);
+      return $ok(cached);
+    }
+    log(`cache miss, hitting CRA...`);
+    const result = await inner.calculate(config2, headless);
+    if (result.isOk()) {
+      writeCache(config2, result.value, cacheDir);
+    }
+    return result;
+  }
+});
+
 // src/calculator.ts
-var craService = {
+var rawService = {
   calculate: calculatePayroll
 };
+var craService = withCache(rawService);
+var craServiceNoCache = rawService;
 
 // src/yearly.ts
 var CPP_MAX_BASE = 4230.45;
@@ -79563,11 +79626,11 @@ var calculateYearly = async (service, config2, headless = false) => {
 
 // src/updater.ts
 import { execSync as execSync2 } from "child_process";
-import { existsSync as existsSync3, renameSync, unlinkSync, chmodSync } from "fs";
+import { existsSync as existsSync4, renameSync, unlinkSync, chmodSync } from "fs";
 // package.json
 var package_default = {
   name: "@seethruhead/cra-payroll",
-  version: "0.3.1",
+  version: "0.5.0",
   description: "Calculate Canadian payroll deductions using CRA's Payroll Deductions Online Calculator",
   type: "module",
   bin: {
@@ -79581,7 +79644,7 @@ var package_default = {
     build: "bun build --compile src/cli.ts --outfile cra-payroll --external electron",
     "build:npm": "bun build src/cli.ts --outfile dist/cra-payroll.js --target=node",
     release: "bash release.sh",
-    test: "bun test src/unit.test.ts",
+    test: "bun test src/unit.test.ts src/cache.test.ts src/monthly.test.ts",
     "test:integration": "bun test src/integration.test.ts --timeout 120000 --max-concurrency 1",
     "test:all": "bun test --timeout 120000 --max-concurrency 1"
   },
@@ -79706,13 +79769,13 @@ var selfUpdate = async () => {
   console.log(`Downloading ${update.downloadUrl}...
 `);
   let binaryPath = "";
-  if (process.execPath && existsSync3(process.execPath) && !process.execPath.endsWith("/bun")) {
+  if (process.execPath && existsSync4(process.execPath) && !process.execPath.endsWith("/bun")) {
     binaryPath = process.execPath;
   }
   if (!binaryPath) {
     try {
       const which = execSync2("which cra-payroll", { encoding: "utf-8" }).trim();
-      if (which && existsSync3(which))
+      if (which && existsSync4(which))
         binaryPath = which;
     } catch {}
   }
@@ -79825,11 +79888,155 @@ ${ctx.totalsStr}
 ${line("═", ctx.W)}${rrspSummary}`;
 });
 
+// src/views/monthlyTable.ts
+var col2 = (v, w) => typeof v === "number" ? money(v).padStart(w) : v.padStart(w);
+var renderRow2 = (r2) => `${r2.label} │ ${col2(r2.gross, 10)} │ ${col2(r2.fedTax, 10)} │ ${col2(r2.provTax, 10)} │ ${col2(r2.cpp, 10)} │ ${col2(r2.cpp2, 6)} │ ${col2(r2.ei, 10)} │ ${col2(r2.netPay, 10)}${r2.rrspYou !== undefined ? ` │ ${col2(r2.rrspYou, 10)} │ ${col2(r2.rrspEr, 10)} │ ${col2(r2.takeHome, 10)}` : ""}`;
+var totalEmployeeRrsp2 = (r2) => r2.rrspMatched + r2.rrspUnmatched;
+var totalEmployeeRrspTotals2 = (t8) => t8.rrspMatched + t8.rrspUnmatched;
+var showRrsp2 = (totals) => totals.rrspMatched > 0 || totals.rrspUnmatched > 0 || totals.rrspEmployer > 0;
+var rrspFields2 = (show, fields) => show ? fields : {};
+var toRow2 = (r2, rrsp) => ({
+  label: ` ${r2.month} `,
+  gross: r2.grossIncome,
+  fedTax: r2.federalTax,
+  provTax: r2.provincialTax,
+  cpp: r2.cpp,
+  cpp2: r2.cpp2,
+  ei: r2.ei,
+  netPay: r2.netPay,
+  ...rrspFields2(rrsp, { rrspYou: totalEmployeeRrsp2(r2), rrspEr: r2.rrspEmployer, takeHome: r2.netPay - totalEmployeeRrsp2(r2) })
+});
+var headerRow2 = (rrsp) => ({
+  label: "     ",
+  gross: "Gross",
+  fedTax: "Fed Tax",
+  provTax: "Prov Tax",
+  cpp: "CPP",
+  cpp2: "CPP2",
+  ei: "EI",
+  netPay: "Net Pay",
+  ...rrspFields2(rrsp, { rrspYou: "RRSP You", rrspEr: "RRSP Er", takeHome: "Take Home" })
+});
+var totalsRow2 = (totals, rrsp) => ({
+  label: " TOT ",
+  gross: totals.grossIncome,
+  fedTax: totals.federalTax,
+  provTax: totals.provincialTax,
+  cpp: totals.cpp,
+  cpp2: totals.cpp2,
+  ei: totals.ei,
+  netPay: totals.netPay,
+  ...rrspFields2(rrsp, { rrspYou: totalEmployeeRrspTotals2(totals), rrspEr: totals.rrspEmployer, takeHome: totals.netPay - totalEmployeeRrspTotals2(totals) })
+});
+var renderMonthlyTable = (monthly, year = 2026) => t3(monthly, (ctx) => ({ ...ctx, rrsp: showRrsp2(ctx.totals) }), (ctx) => ({ ...ctx, header: renderRow2(headerRow2(ctx.rrsp)) }), (ctx) => ({ ...ctx, bodyRows: ctx.rows.map((r2) => renderRow2(toRow2(r2, ctx.rrsp))) }), (ctx) => ({ ...ctx, totalsStr: renderRow2(totalsRow2(ctx.totals, ctx.rrsp)), W: ctx.header.length }), (ctx) => {
+  const t8 = ctx.totals;
+  const empTotal = totalEmployeeRrspTotals2(t8);
+  const rrspSummary = !ctx.rrsp ? "" : `
+  RRSP You:  $${money(empTotal)}/yr${t8.rrspMatched > 0 ? `  — matched: $${money(t8.rrspMatched)}/yr` : ""}${t8.rrspUnmatched > 0 ? `  — unmatched: $${money(t8.rrspUnmatched)}/yr` : ""}
+  RRSP Er:   $${money(t8.rrspEmployer)}/yr
+  RRSP Total (You + Er): $${money(empTotal + t8.rrspEmployer)}/yr`;
+  return `Monthly Table (${year})
+${line("═", ctx.W)}
+${ctx.header}
+${line("─", ctx.W)}
+${ctx.bodyRows.join(`
+`)}
+${line("─", ctx.W)}
+${ctx.totalsStr}
+${line("═", ctx.W)}${rrspSummary}`;
+});
+
+// src/monthly.ts
+var MONTH_NAMES = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+var isWeekday = (d) => {
+  const dow = d.getDay();
+  return dow !== 0 && dow !== 6;
+};
+var nextWeekday = (d) => {
+  const next = new Date(d);
+  while (!isWeekday(next))
+    next.setDate(next.getDate() + 1);
+  return next;
+};
+var addDays = (d, n5) => {
+  const next = new Date(d);
+  next.setDate(next.getDate() + n5);
+  return next;
+};
+var dailyPayMonths = (year, count) => {
+  const months = new Array(12).fill(0);
+  let d = nextWeekday(new Date(year, 0, 1));
+  for (let i2 = 0;i2 < count; i2++) {
+    months[d.getMonth()]++;
+    d = nextWeekday(addDays(d, 1));
+  }
+  return months;
+};
+var weeklyPayMonths = (year, count, everyNWeeks) => {
+  const months = new Array(12).fill(0);
+  let d = new Date(year, 0, 1);
+  while (d.getDay() !== 5)
+    d.setDate(d.getDate() + 1);
+  for (let i2 = 0;i2 < count; i2++) {
+    months[d.getMonth()]++;
+    d = addDays(d, 7 * everyNWeeks);
+  }
+  return months;
+};
+var semiMonthlyPayMonths = () => new Array(12).fill(2);
+var monthlyPayMonths = () => new Array(12).fill(1);
+var evenPayMonths = (count) => {
+  const base = Math.floor(count / 12);
+  const extra = count % 12;
+  return t5(0, 12).map((i2) => base + (i2 < extra ? 1 : 0));
+};
+var periodsPerMonth = (year, payPeriod, totalPeriods) => {
+  if (payPeriod.includes("Daily"))
+    return dailyPayMonths(year, totalPeriods);
+  if (payPeriod.includes("Semi-monthly"))
+    return semiMonthlyPayMonths();
+  if (payPeriod.startsWith("Monthly"))
+    return monthlyPayMonths();
+  if (payPeriod.includes("Biweekly"))
+    return weeklyPayMonths(year, totalPeriods, 2);
+  if (payPeriod.includes("Weekly"))
+    return weeklyPayMonths(year, totalPeriods, 1);
+  return evenPayMonths(totalPeriods);
+};
+var round22 = (n5) => Math.round(n5 * 100) / 100;
+var sumRows = (rows) => ({
+  grossIncome: round22(t7(rows, (r2) => r2.grossIncome)),
+  rrspMatched: round22(t7(rows, (r2) => r2.rrspMatched)),
+  rrspUnmatched: round22(t7(rows, (r2) => r2.rrspUnmatched)),
+  rrspEmployer: round22(t7(rows, (r2) => r2.rrspEmployer)),
+  federalTax: round22(t7(rows, (r2) => r2.federalTax)),
+  provincialTax: round22(t7(rows, (r2) => r2.provincialTax)),
+  cpp: round22(t7(rows, (r2) => r2.cpp)),
+  cpp2: round22(t7(rows, (r2) => r2.cpp2)),
+  ei: round22(t7(rows, (r2) => r2.ei)),
+  totalDeductions: round22(t7(rows, (r2) => r2.totalDeductions)),
+  netPay: round22(t7(rows, (r2) => r2.netPay))
+});
+var groupByMonth = (yearly, year, payPeriod, totalPeriods) => {
+  const distribution = periodsPerMonth(year, payPeriod, totalPeriods);
+  let offset = 0;
+  const rows = distribution.map((count, i2) => {
+    const chunk = yearly.rows.slice(offset, offset + count);
+    offset += count;
+    return {
+      month: MONTH_NAMES[i2],
+      periods: count,
+      ...sumRows(chunk)
+    };
+  });
+  return { rows, totals: yearly.totals };
+};
+
 // src/views/summary.ts
 var W2 = 42;
 var renderBreakdown = (label, totals, divisor = 1) => {
   const f2 = (n5) => money(n5 / divisor).padStart(10);
-  const totalEmployeeRrsp2 = totals.rrspMatched + totals.rrspUnmatched;
+  const totalEmployeeRrsp3 = totals.rrspMatched + totals.rrspUnmatched;
   return `
 ${label}
 ${line("═", W2)}
@@ -79842,7 +80049,7 @@ ${line("─", W2)}
 ${line("─", W2)}
   Total Deductions:  -$${f2(totals.totalDeductions)}
 ${line("═", W2)}
-  Net Pay:             $${f2(totals.netPay)}${when(totalEmployeeRrsp2, `     (after RRSP):     $${money((totals.netPay - totalEmployeeRrsp2) / divisor).padStart(10)}`)}`;
+  Net Pay:             $${f2(totals.netPay)}${when(totalEmployeeRrsp3, `     (after RRSP):     $${money((totals.netPay - totalEmployeeRrsp3) / divisor).padStart(10)}`)}`;
 };
 var renderAnnual = (totals) => renderBreakdown("Annual Totals", totals);
 var renderMonthly = (totals) => renderBreakdown("Monthly Averages", totals, 12);
@@ -79883,8 +80090,10 @@ var { values } = parseArgs({
     "cpp-maxed": { type: "boolean", default: false },
     "ei-maxed": { type: "boolean", default: false },
     table: { type: "boolean", short: "t", default: false },
+    "month-table": { type: "boolean", short: "M", default: false },
     annual: { type: "boolean", short: "a", default: false },
     monthly: { type: "boolean", short: "m", default: false },
+    "no-cache": { type: "boolean", default: false },
     update: { type: "boolean", default: false },
     version: { type: "boolean", default: false },
     headless: { type: "boolean", default: false },
@@ -79913,8 +80122,10 @@ if (values.help) {
     --cpp-maxed               CPP contributions maxed out for the year
     --ei-maxed                EI premiums maxed out for the year
     -t, --table               Show per-paycheck table for the year (tracks CPP/EI max)
+    -M, --month-table         Show monthly table for the year
     -a, --annual              Show annualized totals
     -m, --monthly             Show monthly averages
+    --no-cache                Skip cache and force a fresh CRA lookup
     --headless                Run browser headless (may be blocked by CRA)
     --update                  Self-update to the latest release
     --version                 Show current version
@@ -80009,14 +80220,14 @@ var readStdinConfig = async () => {
 };
 var readFileConfig = (configFlag) => {
   const configPaths = [
-    configFlag ? resolve6(configFlag) : "",
-    resolve6("config.json"),
-    resolve6(process.env.HOME || "~", ".config", "cra-payroll.json"),
-    resolve6(process.env.HOME || "~", ".cra-payroll.json")
+    configFlag ? resolve7(configFlag) : "",
+    resolve7("config.json"),
+    resolve7(process.env.HOME || "~", ".config", "cra-payroll.json"),
+    resolve7(process.env.HOME || "~", ".cra-payroll.json")
   ].filter(Boolean);
   for (const p of configPaths) {
-    if (p && existsSync4(p)) {
-      return JSON.parse(readFileSync4(p, "utf-8"));
+    if (p && existsSync5(p)) {
+      return JSON.parse(readFileSync5(p, "utf-8"));
     }
   }
   return {};
@@ -80032,7 +80243,7 @@ var loadFileConfig = async (configFlag, isPiped) => {
   try {
     const config2 = readFileConfig(configFlag);
     if (configFlag && Object.keys(config2).length === 0) {
-      return $err(`Config file not found: ${resolve6(configFlag)}`);
+      return $err(`Config file not found: ${resolve7(configFlag)}`);
     }
     return $ok(config2);
   } catch (e2) {
@@ -80082,8 +80293,8 @@ var resolveConfig = async (vals, fileConfig, isPiped) => {
     eiMaxedOut
   });
 };
-var runYearlyMode = async (config2, headless, flags) => {
-  const yearlyResult = await calculateYearly(craService, config2, headless);
+var runYearlyMode = async (config2, headless, svc, flags) => {
+  const yearlyResult = await calculateYearly(svc, config2, headless);
   if (yearlyResult.isErr()) {
     console.error(`Error: ${yearlyResult.error}`);
     process.exit(1);
@@ -80092,13 +80303,17 @@ var runYearlyMode = async (config2, headless, flags) => {
   const periodsPerYear = PAY_PERIODS[config2.payPeriod];
   if (flags.table)
     console.log(renderTable(yearly, periodsPerYear, config2.year));
+  if (flags.monthTable) {
+    const monthly = groupByMonth(yearly, config2.year, config2.payPeriod, periodsPerYear);
+    console.log(renderMonthlyTable(monthly, config2.year));
+  }
   if (flags.annual)
     console.log(renderAnnual(yearly.totals));
   if (flags.monthly)
     console.log(renderMonthly(yearly.totals));
 };
-var runSingleMode = async (config2, headless) => {
-  const calcResult = await calculatePayroll(config2, headless);
+var runSingleMode = async (config2, headless, svc) => {
+  const calcResult = await svc.calculate(config2, headless);
   if (calcResult.isErr()) {
     console.error(`Error: ${calcResult.error}`);
     process.exit(1);
@@ -80129,15 +80344,17 @@ if (configResult.isErr()) {
 }
 var config2 = configResult.value;
 var headless = values.headless ?? false;
+var service = values["no-cache"] ? craServiceNoCache : craService;
 if (values.verbose)
   setVerbose(true);
 var wantTable = values.table ?? false;
+var wantMonthTable = values["month-table"] ?? false;
 var wantAnnual = values.annual ?? false;
 var wantMonthly = values.monthly ?? false;
-console.log(renderConfig(config2, !wantTable && !wantAnnual && !wantMonthly));
-if (wantTable || wantAnnual || wantMonthly) {
-  await runYearlyMode(config2, headless, { table: wantTable, annual: wantAnnual, monthly: wantMonthly });
+console.log(renderConfig(config2, !wantTable && !wantMonthTable && !wantAnnual && !wantMonthly));
+if (wantTable || wantMonthTable || wantAnnual || wantMonthly) {
+  await runYearlyMode(config2, headless, service, { table: wantTable, monthTable: wantMonthTable, annual: wantAnnual, monthly: wantMonthly });
 } else {
-  await runSingleMode(config2, headless);
+  await runSingleMode(config2, headless, service);
 }
 await showUpdateNag();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seethruhead/cra-payroll",
-  "version": "0.3.1",
+  "version": "0.5.0",
   "description": "Calculate Canadian payroll deductions using CRA's Payroll Deductions Online Calculator",
   "type": "module",
   "bin": {
@@ -14,7 +14,7 @@
     "build": "bun build --compile src/cli.ts --outfile cra-payroll --external electron",
     "build:npm": "bun build src/cli.ts --outfile dist/cra-payroll.js --target=node",
     "release": "bash release.sh",
-    "test": "bun test src/unit.test.ts",
+    "test": "bun test src/unit.test.ts src/cache.test.ts src/monthly.test.ts",
     "test:integration": "bun test src/integration.test.ts --timeout 120000 --max-concurrency 1",
     "test:all": "bun test --timeout 120000 --max-concurrency 1"
   },