@seethruhead/cra-payroll 0.2.2 → 0.3.1

package/dist/cra-payroll.js

@@ -79322,8 +79322,9 @@ var parseResults = (text, config2, periodsPerYear) => t3(extractAll(text), ({ va
   ei: values.ei ?? 0,
   totalDeductions: values.totalDeductions ?? 0,
   net: values.net ?? 0,
-  rrspEmployee: rrspPerPeriod(config2.annualSalary, config2.rrspEmployeePercent, periodsPerYear),
-  rrspEmployer: rrspPerPeriod(config2.annualSalary, config2.rrspEmployerPercent, periodsPerYear)
+  rrspMatched: rrspPerPeriod(config2.annualSalary, config2.rrspMatchPercent, periodsPerYear),
+  rrspUnmatched: rrspPerPeriod(config2.annualSalary, config2.rrspUnmatchedPercent, periodsPerYear),
+  rrspEmployer: rrspPerPeriod(config2.annualSalary, config2.rrspMatchPercent, periodsPerYear)
 }));
 // src/cra.ts
 var CRA_URL = "https://apps.cra-arc.gc.ca/ebci/rhpd/beta/entry";
@@ -79369,7 +79370,7 @@ var fillSalaryInfo = async (session, config2, salaryPerPeriod, rrspEmployerPerPe
   if (salary.isErr())
     return salary;
   log(`salary: ${salaryPerPeriod}/period`);
-  if (config2.rrspEmployerPercent > 0) {
+  if (config2.rrspMatchPercent > 0) {
     log("setting employer RRSP...");
     const check = await session.checkCheckboxByLabel("Employer's contributions to the employee's RRSP");
     if (check.isErr())
@@ -79381,7 +79382,7 @@ var fillSalaryInfo = async (session, config2, salaryPerPeriod, rrspEmployerPerPe
     else
       log(`employer RRSP: ${rrspEmployerPerPeriod}/period`);
   }
-  if (config2.rrspEmployeePercent > 0) {
+  if (parseFloat(rrspEmployeePerPeriod) > 0) {
     log("setting employee RRSP...");
     const check = await session.checkCheckboxByLabel("Employee's contributions to RRSPs or RPPs or PRPPs");
     if (check.isErr())
@@ -79447,8 +79448,9 @@ var calculatePayroll = async (config2, headless = false) => {
   if (!periodsPerYear)
     return $err(`Unknown pay period: "${config2.payPeriod}"`);
   const salaryPerPeriod = (config2.annualSalary / periodsPerYear).toFixed(2);
-  const rrspEmployeePerPeriod = (config2.annualSalary * (config2.rrspEmployeePercent / 100) / periodsPerYear).toFixed(2);
-  const rrspEmployerPerPeriod = (config2.annualSalary * (config2.rrspEmployerPercent / 100) / periodsPerYear).toFixed(2);
+  const totalEmployeeRrspPercent = config2.rrspMatchPercent + config2.rrspUnmatchedPercent;
+  const rrspEmployeePerPeriod = (config2.annualSalary * (totalEmployeeRrspPercent / 100) / periodsPerYear).toFixed(2);
+  const rrspEmployerPerPeriod = (config2.annualSalary * (config2.rrspMatchPercent / 100) / periodsPerYear).toFixed(2);
   const sessionResult = await launchSession(headless);
   if (sessionResult.isErr())
     return $err(sessionResult.error);
@@ -79512,7 +79514,8 @@ var buildRow = (period, active, maxed, cum) => t3({ ded: periodDeductions(active
   row: {
     period,
     grossIncome: active.grossIncome,
-    rrspEmployee: active.rrspEmployee,
+    rrspMatched: active.rrspMatched,
+    rrspUnmatched: active.rrspUnmatched,
     rrspEmployer: active.rrspEmployer,
     ...taxes,
     ...ded,
@@ -79527,7 +79530,8 @@ var buildRow = (period, active, maxed, cum) => t3({ ded: periodDeductions(active
 var sumField = (rows, field) => round2(t7(rows, (r2) => r2[field]));
 var sumTotals = (rows) => ({
   grossIncome: sumField(rows, "grossIncome"),
-  rrspEmployee: sumField(rows, "rrspEmployee"),
+  rrspMatched: sumField(rows, "rrspMatched"),
+  rrspUnmatched: sumField(rows, "rrspUnmatched"),
   rrspEmployer: sumField(rows, "rrspEmployer"),
   federalTax: sumField(rows, "federalTax"),
   provincialTax: sumField(rows, "provincialTax"),
@@ -79563,7 +79567,7 @@ import { existsSync as existsSync3, renameSync, unlinkSync, chmodSync } from "fs
 // package.json
 var package_default = {
   name: "@seethruhead/cra-payroll",
-  version: "0.2.2",
+  version: "0.3.1",
   description: "Calculate Canadian payroll deductions using CRA's Payroll Deductions Online Calculator",
   type: "module",
   bin: {
@@ -79732,8 +79736,8 @@ Province:          ${config2.province}
 Year:              ${config2.year}
 Annual Salary:     $${money(config2.annualSalary)}
 Pay Period:        ${config2.payPeriod}
-RRSP (Employee):   ${config2.rrspEmployeePercent}%
-RRSP (Employer):   ${config2.rrspEmployerPercent}%${when(showCppEi, `CPP Maxed Out:     ${config2.cppMaxedOut ? "Yes" : "No"}
+RRSP (Matched):    ${config2.rrspMatchPercent}%${config2.rrspUnmatchedPercent > 0 ? `
+RRSP (Unmatched):  ${config2.rrspUnmatchedPercent}%` : ""}${when(showCppEi, `CPP Maxed Out:     ${config2.cppMaxedOut ? "Yes" : "No"}
 EI Maxed Out:      ${config2.eiMaxedOut ? "Yes" : "No"}`)}
 ${line("─", 40)}
 Calculating via CRA PDOC...
@@ -79742,9 +79746,11 @@ Calculating via CRA PDOC...
 // src/views/single.ts
 var f = (n5) => money(n5).padStart(10);
 var W = 42;
-var renderSingleResult = (r2) => `Results (per pay period)
+var renderSingleResult = (r2) => {
+  const totalEmployeeRrsp = r2.rrspMatched + r2.rrspUnmatched;
+  return `Results (per pay period)
 ${line("═", W)}
-  Gross Income:       $${f(r2.grossIncome)}${when(r2.rrspEmployee, `  RRSP (Employee):   -$${f(r2.rrspEmployee)}`)}${when(r2.rrspEmployer, `  RRSP (Employer):   -$${f(r2.rrspEmployer)}`)}
+  Gross Income:       $${f(r2.grossIncome)}${when(r2.rrspMatched, `  RRSP (Matched):    -$${f(r2.rrspMatched)}`)}${when(r2.rrspUnmatched, `  RRSP (Unmatched):  -$${f(r2.rrspUnmatched)}`)}${when(r2.rrspEmployer, `  RRSP (Employer):   -$${f(r2.rrspEmployer)}`)}
 ${line("─", W)}
   Federal Tax:       -$${f(r2.federalTax)}
   Provincial Tax:    -$${f(r2.provincialTax)}
@@ -79753,12 +79759,15 @@ ${line("─", W)}
 ${line("─", W)}
   Total Deductions:  -$${f(r2.totalDeductions)}
 ${line("═", W)}
-  Net Pay:             $${f(r2.net)}${when(r2.rrspEmployee, `     (after RRSP):     $${f(r2.net - r2.rrspEmployee)}`)}`;
+  Net Pay:             $${f(r2.net)}${when(totalEmployeeRrsp, `     (after RRSP):     $${f(r2.net - totalEmployeeRrsp)}`)}`;
+};
 
 // 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 showRrsp = (totals) => totals.rrspEmployee > 0 || totals.rrspEmployer > 0;
+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;
 var rrspFields = (show, fields) => show ? fields : {};
 var annotate = (r2, first2) => r2.cpp === 0 && r2.cpp2 === 0 && r2.ei === 0 ? " ✓ maxed" : r2.cpp < first2.cpp || r2.ei < first2.ei ? " ← partial" : "";
 var toRow = (r2, first2, rrsp) => ({
@@ -79770,7 +79779,7 @@ var toRow = (r2, first2, rrsp) => ({
   cpp2: r2.cpp2,
   ei: r2.ei,
   netPay: r2.netPay,
-  ...rrspFields(rrsp, { rrspEmp: r2.rrspEmployee, takeHome: r2.netPay - r2.rrspEmployee }),
+  ...rrspFields(rrsp, { rrspYou: totalEmployeeRrsp(r2), rrspEr: r2.rrspEmployer, takeHome: r2.netPay - totalEmployeeRrsp(r2) }),
   cumCppEi: r2.cumulativeCpp + r2.cumulativeCpp2 + r2.cumulativeEi,
   suffix: annotate(r2, first2)
 });
@@ -79783,7 +79792,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) => ({
@@ -79795,10 +79804,17 @@ var totalsRow = (totals, rrsp) => ({
   cpp2: totals.cpp2,
   ei: totals.ei,
   netPay: totals.netPay,
-  ...rrspFields(rrsp, { rrspEmp: totals.rrspEmployee, takeHome: totals.netPay - totals.rrspEmployee }),
+  ...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)}
@@ -79806,17 +79822,18 @@ ${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;
 var renderBreakdown = (label, totals, divisor = 1) => {
   const f2 = (n5) => money(n5 / divisor).padStart(10);
+  const totalEmployeeRrsp2 = totals.rrspMatched + totals.rrspUnmatched;
   return `
 ${label}
 ${line("═", W2)}
-  Gross Income:       $${f2(totals.grossIncome)}${when(totals.rrspEmployee, `  RRSP (Employee):   -$${f2(totals.rrspEmployee)}`)}${when(totals.rrspEmployer && divisor === 1, `  RRSP (Employer):   -$${f2(totals.rrspEmployer)}`)}
+  Gross Income:       $${f2(totals.grossIncome)}${when(totals.rrspMatched, `  RRSP (Matched):    -$${f2(totals.rrspMatched)}`)}${when(totals.rrspUnmatched, `  RRSP (Unmatched):  -$${f2(totals.rrspUnmatched)}`)}${when(totals.rrspEmployer && divisor === 1, `  RRSP (Employer):   -$${f2(totals.rrspEmployer)}`)}
 ${line("─", W2)}
   Federal Tax:       -$${f2(totals.federalTax)}
   Provincial Tax:    -$${f2(totals.provincialTax)}
@@ -79825,7 +79842,7 @@ ${line("─", W2)}
 ${line("─", W2)}
   Total Deductions:  -$${f2(totals.totalDeductions)}
 ${line("═", W2)}
-  Net Pay:             $${f2(totals.netPay)}${when(totals.rrspEmployee, `     (after RRSP):     $${money((totals.netPay - totals.rrspEmployee) / divisor).padStart(10)}`)}`;
+  Net Pay:             $${f2(totals.netPay)}${when(totalEmployeeRrsp2, `     (after RRSP):     $${money((totals.netPay - totalEmployeeRrsp2) / divisor).padStart(10)}`)}`;
 };
 var renderAnnual = (totals) => renderBreakdown("Annual Totals", totals);
 var renderMonthly = (totals) => renderBreakdown("Monthly Averages", totals, 12);
@@ -79861,8 +79878,8 @@ var { values } = parseArgs({
     province: { type: "string", short: "p" },
     "pay-period": { type: "string" },
     year: { type: "string", short: "y" },
-    "rrsp-employee": { type: "string" },
-    "rrsp-employer": { type: "string" },
+    "rrsp-match": { type: "string" },
+    "rrsp-unmatched": { type: "string" },
     "cpp-maxed": { type: "boolean", default: false },
     "ei-maxed": { type: "boolean", default: false },
     table: { type: "boolean", short: "t", default: false },
@@ -79891,8 +79908,8 @@ if (values.help) {
     -p, --province <name>     Province of employment
     -y, --year <year>         Tax year (default: current year)
     --pay-period <type>       Pay period (e.g. "Semi-monthly (24 pay periods a year)")
-    --rrsp-employee <pct>     Employee RRSP contribution % (default: 4)
-    --rrsp-employer <pct>     Employer RRSP match % (default: 4)
+    --rrsp-match <pct>        RRSP match % (employee + employer both contribute this, default: 4)
+    --rrsp-unmatched <pct>    Additional unmatched employee RRSP % (default: 0)
     --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)
@@ -79910,8 +79927,8 @@ if (values.help) {
       "annualSalary": 100000,
       "payPeriod": "Semi-monthly (24 pay periods a year)",
       "year": 2026,
-      "rrspEmployeePercent": 4,
-      "rrspEmployerPercent": 4,
+      "rrspMatchPercent": 4,
+      "rrspUnmatchedPercent": 0,
       "cppMaxedOut": false,
       "eiMaxedOut": false
     }
@@ -80046,12 +80063,12 @@ var resolveConfig = async (vals, fileConfig, isPiped) => {
   const payPeriod = await resolveField("pay-period", vals["pay-period"], fileConfig.payPeriod, "Semi-monthly (24 pay periods a year)", () => promptChoice("Pay period:", PAY_PERIODS2, "Semi-monthly (24 pay periods a year)"), isPiped);
   if (payPeriod.isErr())
     return $err(payPeriod.error);
-  const rrspEmployee = await resolveField("rrsp-employee", vals["rrsp-employee"] !== undefined ? parseFloat(vals["rrsp-employee"]) : undefined, fileConfig.rrspEmployeePercent, 4, () => promptNumber("Employee RRSP contribution (%)", 4), isPiped);
-  if (rrspEmployee.isErr())
-    return $err(rrspEmployee.error);
-  const rrspEmployer = await resolveField("rrsp-employer", vals["rrsp-employer"] !== undefined ? parseFloat(vals["rrsp-employer"]) : undefined, fileConfig.rrspEmployerPercent, 4, () => promptNumber("Employer RRSP match (%)", 4), isPiped);
-  if (rrspEmployer.isErr())
-    return $err(rrspEmployer.error);
+  const rrspMatch = await resolveField("rrsp-match", vals["rrsp-match"] !== undefined ? parseFloat(vals["rrsp-match"]) : undefined, fileConfig.rrspMatchPercent, 4, () => promptNumber("RRSP match % (employee + employer both contribute)", 4), isPiped);
+  if (rrspMatch.isErr())
+    return $err(rrspMatch.error);
+  const rrspUnmatched = await resolveField("rrsp-unmatched", vals["rrsp-unmatched"] !== undefined ? parseFloat(vals["rrsp-unmatched"]) : undefined, fileConfig.rrspUnmatchedPercent, 0, () => promptNumber("Additional unmatched employee RRSP %", 0), isPiped);
+  if (rrspUnmatched.isErr())
+    return $err(rrspUnmatched.error);
   const cppMaxedOut = vals["cpp-maxed"] === true ? true : fileConfig.cppMaxedOut ?? false;
   const eiMaxedOut = vals["ei-maxed"] === true ? true : fileConfig.eiMaxedOut ?? false;
   return $ok({
@@ -80059,8 +80076,8 @@ var resolveConfig = async (vals, fileConfig, isPiped) => {
     annualSalary: salary.value,
     payPeriod: payPeriod.value,
     year: year.value,
-    rrspEmployeePercent: rrspEmployee.value,
-    rrspEmployerPercent: rrspEmployer.value,
+    rrspMatchPercent: rrspMatch.value,
+    rrspUnmatchedPercent: rrspUnmatched.value,
     cppMaxedOut,
     eiMaxedOut
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seethruhead/cra-payroll",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Calculate Canadian payroll deductions using CRA's Payroll Deductions Online Calculator",
   "type": "module",
   "bin": {