@casomoltd/nhs-pay 0.9.1 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -121,6 +121,36 @@ console.log(post.takeHome.net); // annual net after tax + NI + pension
121
121
  dental grades. Both fail loud (`ScaleUnavailable`) for an
122
122
  unpublished nation/year or grade rather than defaulting.
123
123
 
124
+ ### Project a 2015-scheme pension
125
+
126
+ ```ts
127
+ import {projectPension, commute} from '@casomoltd/nhs-pay';
128
+
129
+ const projection = projectPension({
130
+ kind: 'statement',
131
+ accruedPension: 5000, // from the Annual Benefit Statement
132
+ currentSalary: 54000,
133
+ dateOfBirth: new Date(1990, 0, 1),
134
+ exitDate: new Date(2035, 0, 1),
135
+ retirementDate: new Date(2053, 0, 1), // before NPA → ERF
136
+ npa: 67,
137
+ assumedCpi: 0.02,
138
+ });
139
+ console.log(projection.annualPension); // after ERF/LRF
140
+ console.log(projection.factorType); // 'erf'
141
+ console.log(projection.curve); // chart-ready points
142
+
143
+ const {lumpSum, residualPension} = commute(
144
+ projection.annualPension, 1, // take the HMRC max
145
+ );
146
+ ```
147
+
148
+ Without a statement figure, `kind: 'estimation'` accrues from a
149
+ `joinDate` instead. ERF/LRF factors are transcribed verbatim from
150
+ the GAD consolidated factor workbook (30 June 2023 issue) with
151
+ GAD's own rounding rules; a retirement date beyond the printed
152
+ tables throws `RetirementFactorOutOfRange`.
153
+
124
154
  ## API reference
125
155
 
126
156
  ### Scales (`scales.ts`)
@@ -149,6 +179,29 @@ unpublished nation/year or grade rather than defaulting.
149
179
 
150
180
  **Types:** `PensionTier`
151
181
 
182
+ ### Pension projection (`pension-projection.ts`)
183
+
184
+ | Export | Description |
185
+ | -------------------- | ---------------------------------------------- |
186
+ | `projectPension` | Full 2015-scheme projection with chart curve |
187
+ | `retirementFactor` | ERF/LRF factor for retirement vs NPA date |
188
+ | `commute` | Lump-sum commutation at a fraction of the max |
189
+ | `maxLumpSum` | Maximum tax-free lump sum (HMRC 25% rule) |
190
+ | `yearlyAccrual` | One year's pension accrual |
191
+ | `ACCRUAL_RATE` | 1/54 CARE accrual rate |
192
+ | `COMMUTATION_FACTOR` | £12 lump sum per £1 pension |
193
+
194
+ `projectPension(input, today?)` takes an optional evaluation
195
+ date (defaults to now) — inject a fixed date for reproducible
196
+ output. Date plumbing, raw revaluation maths and the GAD factor
197
+ tables are deliberately private: factors are reachable only
198
+ through `retirementFactor` / `projectPension`, which own the
199
+ GAD rounding rules.
200
+
201
+ **Types:** `PensionProjectionInput` (`PensionStatementInput` |
202
+ `PensionEstimationInput`), `PensionProjectionResult`,
203
+ `ProjectionPoint`, `CommutationResult`, `FactorTableKind`
204
+
152
205
  ### HCAS (`hcas.ts`)
153
206
 
154
207
  | Export | Description |
@@ -175,7 +228,6 @@ unpublished nation/year or grade rather than defaulting.
175
228
  | ------------------- | ------------------------------------ |
176
229
  | `AFC_REGIONS` | Region key-to-ID mapping |
177
230
  | `ZONE_TO_REGION` | HCAS zone → AFC region mapping |
178
- | `ZONE_LABELS` | HCAS zone → display label |
179
231
  | `resolveRegion` | Resolve region to tax/HCAS/label |
180
232
  | `afcRegionToNation` | Map region to paye-calc Nation |
181
233
  | `isAfcRegionId` | Type guard for region IDs |
@@ -188,11 +240,10 @@ unpublished nation/year or grade rather than defaulting.
188
240
  | Export | Description |
189
241
  | ------------------- | ------------------------------------ |
190
242
  | `getAfcScales` | Band + scale + pension, nation-aware |
191
- | `AFC_BAND_INFO` | Static band metadata (roles, slugs) |
192
243
  | `AFC_CURRENT_YEAR` | Current financial year |
193
244
  | `AFC_PREVIOUS_YEAR` | Previous financial year |
194
245
 
195
- **Types:** `AfcBandInfo`, `AfcBandMeta`, `AfcScaleData`
246
+ **Types:** `AfcBandMeta`, `AfcScaleData`
196
247
 
197
248
  ### Take-home (`take-home.ts`)
198
249
 
@@ -216,8 +267,7 @@ year)`, `fromSalary`, `availableGrades(nation, year)` and
216
267
  the data is sourced and modelled.
217
268
 
218
269
  **Types:** `MedicalGradeId`, `DentalGradeId`, `MedicalGradeMeta`,
219
- `DentalGradeMeta`, `MedicalRole`, `DentalRole`, `Role`, `Post`,
220
- `GradeMeta`
270
+ `DentalGradeMeta`, `MedicalRole`, `DentalRole`, `Role`, `Post`
221
271
 
222
272
  ### Format (`format.ts`)
223
273
 
@@ -231,6 +281,17 @@ the data is sourced and modelled.
231
281
  | `formatPct` | Format percentage (Intl) |
232
282
  | `yearLabel` | Convert '2025-26' to '2025/26' |
233
283
 
284
+ ### Errors (`errors.ts`)
285
+
286
+ All data lookups fail loud rather than defaulting:
287
+
288
+ | Export | Thrown when |
289
+ | ---------------------------- | -------------------------------------- |
290
+ | `ScaleUnavailable` | Unpublished nation/year/grade queried |
291
+ | `PensionTiersUnavailable` | No pension tiers for a year/nation |
292
+ | `AwardUnavailable` | No pay award for a year/nation |
293
+ | `RetirementFactorOutOfRange` | Retirement period beyond the GAD table |
294
+
234
295
  ### Re-exports from paye-calc
235
296
 
236
297
  `TAX_REGIONS`, `TAX_YEARS`, `NATIONS`, `NATION_KEYS`,
@@ -135,5 +135,11 @@ export declare function commute(adjustedPension: number, fraction: number): Comm
135
135
  /**
136
136
  * Generate a full pension projection including curve
137
137
  * data for both nominal and real (CPI-deflated) views.
138
+ *
139
+ * `today` is the evaluation date — the anchor for the
140
+ * accrued/projected split and the real-terms deflator.
141
+ * Injectable so tests can pin exact curve values;
142
+ * captured exactly once and threaded (a second capture
143
+ * could flip the ms-precision accrued flag).
138
144
  */
139
- export declare function projectPension(input: PensionProjectionInput): PensionProjectionResult;
145
+ export declare function projectPension(input: PensionProjectionInput, today?: Date): PensionProjectionResult;
@@ -111,34 +111,26 @@ export function commute(adjustedPension, fraction) {
111
111
  /**
112
112
  * Generate a full pension projection including curve
113
113
  * data for both nominal and real (CPI-deflated) views.
114
+ *
115
+ * `today` is the evaluation date — the anchor for the
116
+ * accrued/projected split and the real-terms deflator.
117
+ * Injectable so tests can pin exact curve values;
118
+ * captured exactly once and threaded (a second capture
119
+ * could flip the ms-precision accrued flag).
114
120
  */
115
- export function projectPension(input) {
116
- const { dateOfBirth, exitDate, retirementDate, npa, assumedCpi, } = input;
117
- const today = new Date();
118
- const npDateValue = npaDate(dateOfBirth, npa);
119
- const isEstimation = input.kind === 'estimation';
120
- const accruedAtExit = computeAccruedAtExit(input, today);
121
- // Revalue from exit to retirement (deferred = CPI only)
122
- const exitToRetirement = yearsBetween(exitDate, retirementDate);
123
- const revaluedAtRetirement = exitToRetirement > 0
124
- ? revalue(accruedAtExit, assumedCpi, exitToRetirement)
125
- : accruedAtExit;
126
- // Apply ERF/LRF
127
- const { factor, type: factorType } = retirementFactor(retirementDate, npDateValue);
128
- const annualPension = revaluedAtRetirement * factor;
129
- const adjustmentAmount = revaluedAtRetirement
130
- - annualPension;
131
- // Generate curve
132
- const curve = buildCurve(input, accruedAtExit, today);
121
+ export function projectPension(input, today = new Date()) {
122
+ const resolved = resolveProjection(input, today);
123
+ const adjustmentAmount = resolved.revaluedAtRetirement
124
+ - resolved.annualPension;
133
125
  return {
134
- accruedAtExit,
135
- revaluedAtRetirement,
136
- annualPension,
137
- factor,
138
- factorType,
126
+ accruedAtExit: resolved.accruedAtExit,
127
+ revaluedAtRetirement: resolved.revaluedAtRetirement,
128
+ annualPension: resolved.annualPension,
129
+ factor: resolved.factor,
130
+ factorType: resolved.factorType,
139
131
  adjustmentAmount,
140
- curve,
141
- isEstimation,
132
+ curve: buildCurve(resolved),
133
+ isEstimation: resolved.isEstimation,
142
134
  };
143
135
  }
144
136
  // ── Internal Helpers ────────────────────────────────
@@ -160,67 +152,90 @@ function simulateAccrual(startPension, salary, activeRate, years) {
160
152
  }
161
153
  return pension;
162
154
  }
163
- /** Determine accrued pension at exit date */
164
- function computeAccruedAtExit(input, today) {
165
- const { currentSalary, exitDate, assumedCpi } = input;
166
- const activeRate = assumedCpi + ACTIVE_REVAL_BONUS;
167
- if (input.kind === 'statement') {
168
- const yearsToExit = yearsBetween(today, exitDate);
169
- if (yearsToExit <= 0)
170
- return input.accruedPension;
171
- return simulateAccrual(input.accruedPension, currentSalary, activeRate, yearsToExit);
172
- }
173
- // Estimation: accrue from join to exit
174
- const joinToExit = yearsBetween(input.joinDate, exitDate);
175
- return simulateAccrual(0, currentSalary, activeRate, Math.max(0, joinToExit));
155
+ /**
156
+ * Nominal accrued pension at a date in the active phase.
157
+ * A date at or before the origin degrades to zero years,
158
+ * which simulateAccrual returns untouched — so the
159
+ * statement path's "already past exit" case needs no
160
+ * special branch.
161
+ */
162
+ function accruedNominalAt(anchor, date) {
163
+ const years = Math.max(0, yearsBetween(anchor.accrualOrigin, date));
164
+ return simulateAccrual(anchor.accrualBase, anchor.currentSalary, anchor.activeRate, years);
176
165
  }
177
- /** Compute nominal pension for a point in active phase */
178
- function activeNominal(input, pointDate, today, activeRate) {
179
- const { currentSalary } = input;
180
- if (input.kind === 'statement') {
181
- const yrs = Math.max(0, yearsBetween(today, pointDate));
182
- return simulateAccrual(input.accruedPension, currentSalary, activeRate, yrs);
183
- }
184
- const yrsFromJoin = yearsBetween(input.joinDate, pointDate);
185
- return simulateAccrual(0, currentSalary, activeRate, Math.max(0, yrsFromJoin));
166
+ /** The single place input.kind is read */
167
+ function resolveProjection(input, today) {
168
+ const { currentSalary, dateOfBirth, exitDate, retirementDate, npa, assumedCpi, } = input;
169
+ const isEstimation = input.kind === 'estimation';
170
+ // The accrual anchor is the only residue of kind:
171
+ // statement = (ABS figure, today);
172
+ // estimation = (nothing banked, scheme join date).
173
+ const anchor = {
174
+ accrualBase: isEstimation ? 0 : input.accruedPension,
175
+ accrualOrigin: isEstimation ? input.joinDate : today,
176
+ currentSalary,
177
+ activeRate: assumedCpi + ACTIVE_REVAL_BONUS,
178
+ };
179
+ const accruedAtExit = accruedNominalAt(anchor, exitDate);
180
+ // Revalue from exit to retirement (deferred = CPI
181
+ // only); revalue self-guards non-positive periods
182
+ const revaluedAtRetirement = revalue(accruedAtExit, assumedCpi, yearsBetween(exitDate, retirementDate));
183
+ // Apply ERF/LRF
184
+ const { factor, type: factorType } = retirementFactor(retirementDate, npaDate(dateOfBirth, npa));
185
+ const annualPension = revaluedAtRetirement * factor;
186
+ return {
187
+ ...anchor,
188
+ today,
189
+ dateOfBirth,
190
+ exitDate,
191
+ retirementDate,
192
+ npa,
193
+ assumedCpi,
194
+ isEstimation,
195
+ accruedAtExit,
196
+ revaluedAtRetirement,
197
+ factor,
198
+ factorType,
199
+ annualPension,
200
+ };
186
201
  }
187
202
  /** Build the projection curve at yearly intervals */
188
- function buildCurve(input, accruedAtExit, today) {
189
- const { dateOfBirth, exitDate, retirementDate, npa, assumedCpi, } = input;
190
- const npDateValue = npaDate(dateOfBirth, npa);
203
+ function buildCurve(resolved) {
204
+ const { today, dateOfBirth, retirementDate, npa, assumedCpi, } = resolved;
191
205
  const points = [];
192
206
  const currentAge = yearsBetween(dateOfBirth, today);
193
207
  const endAge = Math.max(npa + 5, yearsBetween(dateOfBirth, retirementDate) + 5);
194
208
  const startAge = Math.floor(currentAge);
195
- const activeRate = assumedCpi + ACTIVE_REVAL_BONUS;
196
- // Pre-compute pension at retirement for in-payment
197
- const exitToRet = Math.max(0, yearsBetween(exitDate, retirementDate));
198
- const { factor } = retirementFactor(retirementDate, npDateValue);
199
- const atRetirement = revalue(accruedAtExit, assumedCpi, exitToRet) * factor;
200
209
  for (let age = startAge; age <= Math.ceil(endAge); age++) {
201
210
  const pointDate = new Date(dateOfBirth.getFullYear() + age, dateOfBirth.getMonth(), dateOfBirth.getDate());
202
211
  const yearsFromToday = yearsBetween(today, pointDate);
203
- const { nominal, accrued } = curvePointValue(input, pointDate, today, exitDate, retirementDate, accruedAtExit, assumedCpi, activeRate, atRetirement);
212
+ const { nominal, accrued } = curvePointValue(resolved, pointDate);
204
213
  const deflator = Math.pow(1 + assumedCpi, Math.max(0, yearsFromToday));
205
214
  const real = nominal / deflator;
206
215
  points.push({ age, nominal, real, accrued });
207
216
  }
208
217
  return points;
209
218
  }
210
- /** Determine nominal value and accrued flag for a point */
211
- function curvePointValue(input, pointDate, today, exitDate, retirementDate, accruedAtExit, assumedCpi, activeRate, atRetirement) {
219
+ /**
220
+ * Nominal value and accrued flag for one curve point —
221
+ * names the three lifecycle phases (active, deferred,
222
+ * in payment) and nothing else.
223
+ */
224
+ function curvePointValue(resolved, pointDate) {
225
+ const { today, exitDate, retirementDate, assumedCpi, } = resolved;
212
226
  if (pointDate <= exitDate) {
213
- const nominal = activeNominal(input, pointDate, today, activeRate);
227
+ const nominal = accruedNominalAt(resolved, pointDate);
214
228
  return { nominal, accrued: pointDate <= today };
215
229
  }
216
230
  if (pointDate <= retirementDate) {
217
231
  const yrsDeferred = yearsBetween(exitDate, pointDate);
218
- const nominal = revalue(accruedAtExit, assumedCpi, yrsDeferred);
232
+ const nominal = revalue(resolved.accruedAtExit, assumedCpi, yrsDeferred);
219
233
  return { nominal, accrued: false };
220
234
  }
221
- // In payment
235
+ // In payment — grows from the annualPension the
236
+ // projection reports, never a re-derivation of it
222
237
  const yrsInPayment = yearsBetween(retirementDate, pointDate);
223
- const nominal = revalue(atRetirement, assumedCpi, yrsInPayment);
238
+ const nominal = revalue(resolved.annualPension, assumedCpi, yrsInPayment);
224
239
  return { nominal, accrued: false };
225
240
  }
226
241
  //# sourceMappingURL=pension-projection.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pension-projection.js","sourceRoot":"","sources":["../src/pension-projection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pension-projection.js","sourceRoot":"","sources":["../src/pension-projection.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@casomoltd/nhs-pay",
3
- "version": "0.9.1",
3
+ "version": "0.10.0",
4
4
  "description": "NHS Agenda for Change pay scales, pension tiers, regions, and take-home calculator",
5
5
  "homepage": "https://github.com/casomoltd/nhs-pay#readme",
6
6
  "bugs": "https://github.com/casomoltd/nhs-pay/issues",