@seethruhead/cra-payroll 0.3.0 → 0.4.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.0",
+  version: "0.4.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",
     "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 {}
   }
@@ -79764,7 +79827,7 @@ ${line("═", W)}
 
 // src/views/table.ts
 var col = (v, w) => typeof v === "number" ? money(v).padStart(w) : v.padStart(w);
-var renderRow = (r2) => `${r2.label} │ ${col(r2.gross, 10)} │ ${col(r2.fedTax, 10)} │ ${col(r2.provTax, 10)} │ ${col(r2.cpp, 10)} │ ${col(r2.cpp2, 6)} │ ${col(r2.ei, 10)} │ ${col(r2.netPay, 10)}${r2.rrspEmp !== undefined ? ` │ ${col(r2.rrspEmp, 10)} │ ${col(r2.takeHome, 10)}` : ""} │ ${col(r2.cumCppEi, 10)}${r2.suffix ?? ""}`;
+var renderRow = (r2) => `${r2.label} │ ${col(r2.gross, 10)} │ ${col(r2.fedTax, 10)} │ ${col(r2.provTax, 10)} │ ${col(r2.cpp, 10)} │ ${col(r2.cpp2, 6)} │ ${col(r2.ei, 10)} │ ${col(r2.netPay, 10)}${r2.rrspYou !== undefined ? ` │ ${col(r2.rrspYou, 10)} │ ${col(r2.rrspEr, 10)} │ ${col(r2.takeHome, 10)}` : ""} │ ${col(r2.cumCppEi, 10)}${r2.suffix ?? ""}`;
 var totalEmployeeRrsp = (r2) => r2.rrspMatched + r2.rrspUnmatched;
 var totalEmployeeRrspTotals = (t8) => t8.rrspMatched + t8.rrspUnmatched;
 var showRrsp = (totals) => totals.rrspMatched > 0 || totals.rrspUnmatched > 0 || totals.rrspEmployer > 0;
@@ -79779,7 +79842,7 @@ var toRow = (r2, first2, rrsp) => ({
   cpp2: r2.cpp2,
   ei: r2.ei,
   netPay: r2.netPay,
-  ...rrspFields(rrsp, { rrspEmp: totalEmployeeRrsp(r2), takeHome: r2.netPay - totalEmployeeRrsp(r2) }),
+  ...rrspFields(rrsp, { rrspYou: totalEmployeeRrsp(r2), rrspEr: r2.rrspEmployer, takeHome: r2.netPay - totalEmployeeRrsp(r2) }),
   cumCppEi: r2.cumulativeCpp + r2.cumulativeCpp2 + r2.cumulativeEi,
   suffix: annotate(r2, first2)
 });
@@ -79792,7 +79855,7 @@ var headerRow = (rrsp) => ({
   cpp2: "CPP2",
   ei: "EI",
   netPay: "Net Pay",
-  ...rrspFields(rrsp, { rrspEmp: "RRSP Emp", takeHome: "Take Home" }),
+  ...rrspFields(rrsp, { rrspYou: "RRSP You", rrspEr: "RRSP Er", takeHome: "Take Home" }),
   cumCppEi: "Cum CPP/EI"
 });
 var totalsRow = (totals, rrsp) => ({
@@ -79804,10 +79867,17 @@ var totalsRow = (totals, rrsp) => ({
   cpp2: totals.cpp2,
   ei: totals.ei,
   netPay: totals.netPay,
-  ...rrspFields(rrsp, { rrspEmp: totalEmployeeRrspTotals(totals), takeHome: totals.netPay - totalEmployeeRrspTotals(totals) }),
+  ...rrspFields(rrsp, { rrspYou: totalEmployeeRrspTotals(totals), rrspEr: totals.rrspEmployer, takeHome: totals.netPay - totalEmployeeRrspTotals(totals) }),
   cumCppEi: ""
 });
-var renderTable = (yearly, periodsPerYear, year = 2026) => t3(yearly, (ctx) => ({ ...ctx, rrsp: showRrsp(ctx.totals) }), (ctx) => ({ ...ctx, header: renderRow(headerRow(ctx.rrsp)) }), (ctx) => ({ ...ctx, bodyRows: ctx.rows.map((r2) => renderRow(toRow(r2, ctx.rows[0], ctx.rrsp))) }), (ctx) => ({ ...ctx, totalsStr: renderRow(totalsRow(ctx.totals, ctx.rrsp)), W: ctx.header.length }), (ctx) => `Per-Paycheck Table (${year})
+var renderTable = (yearly, periodsPerYear, year = 2026) => t3(yearly, (ctx) => ({ ...ctx, rrsp: showRrsp(ctx.totals) }), (ctx) => ({ ...ctx, header: renderRow(headerRow(ctx.rrsp)) }), (ctx) => ({ ...ctx, bodyRows: ctx.rows.map((r2) => renderRow(toRow(r2, ctx.rows[0], ctx.rrsp))) }), (ctx) => ({ ...ctx, totalsStr: renderRow(totalsRow(ctx.totals, ctx.rrsp)), W: ctx.header.length }), (ctx) => {
+  const t8 = ctx.totals;
+  const empTotal = totalEmployeeRrspTotals(t8);
+  const rrspSummary = !ctx.rrsp ? "" : `
+  RRSP You:  $${money(empTotal)}/yr ($${money(empTotal / periodsPerYear)}/period)${t8.rrspMatched > 0 ? `  — matched: $${money(t8.rrspMatched)}/yr` : ""}${t8.rrspUnmatched > 0 ? `  — unmatched: $${money(t8.rrspUnmatched)}/yr` : ""}
+  RRSP Er:   $${money(t8.rrspEmployer)}/yr ($${money(t8.rrspEmployer / periodsPerYear)}/period)
+  RRSP Total (You + Er): $${money(empTotal + t8.rrspEmployer)}/yr`;
+  return `Per-Paycheck Table (${year})
 ${line("═", ctx.W)}
 ${ctx.header}
 ${line("─", ctx.W)}
@@ -79815,8 +79885,8 @@ ${ctx.bodyRows.join(`
 `)}
 ${line("─", ctx.W)}
 ${ctx.totalsStr}
-${line("═", ctx.W)}${when(ctx.rrsp, `
-  RRSP (Employer match): $${money(ctx.totals.rrspEmployer)}/yr ($${money(ctx.totals.rrspEmployer / periodsPerYear)}/period)`)}`);
+${line("═", ctx.W)}${rrspSummary}`;
+});
 
 // src/views/summary.ts
 var W2 = 42;
@@ -79878,6 +79948,7 @@ var { values } = parseArgs({
     table: { type: "boolean", short: "t", 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 },
@@ -79908,6 +79979,7 @@ if (values.help) {
     -t, --table               Show per-paycheck table for the year (tracks CPP/EI max)
     -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
@@ -80002,14 +80074,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 {};
@@ -80025,7 +80097,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) {
@@ -80075,8 +80147,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);
@@ -80090,8 +80162,8 @@ var runYearlyMode = async (config2, headless, flags) => {
   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);
@@ -80122,6 +80194,7 @@ 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;
@@ -80129,8 +80202,8 @@ 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 });
+  await runYearlyMode(config2, headless, service, { table: wantTable, 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.0",
+  "version": "0.4.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",
     "test:integration": "bun test src/integration.test.ts --timeout 120000 --max-concurrency 1",
     "test:all": "bun test --timeout 120000 --max-concurrency 1"
   },