@casomoltd/nhs-pay 0.13.2 → 0.15.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.
@@ -2,7 +2,8 @@
2
2
  * NHS 2015 CARE Pension Projection
3
3
  *
4
4
  * Models the 2015 scheme lifecycle:
5
- * accrual → revaluation → crystallisation → commutation.
5
+ * accrual → revaluation → crystallisation. Commutation is a
6
+ * separate choice, in `commutation.ts`.
6
7
  *
7
8
  * Sources:
8
9
  *
@@ -155,7 +156,6 @@
155
156
  * 0.6% high over a full career at 2% CPI. That is now fixed,
156
157
  * at the cost described above.
157
158
  */
158
- import { invariant } from './errors.js';
159
159
  import { npaDate, periodInYearsMonths, yearsBetween, } from './dates.js';
160
160
  import { createPrices } from './pension/prices.js';
161
161
  import { ACCRUAL_RATE, buildLedger } from './pension/ledger.js';
@@ -170,20 +170,6 @@ import { LRF_0_421 } from './gad/lrf-2023-06-30.js';
170
170
  re-exported here, so the record and every figure read off it
171
171
  cannot hold two different 1/54s. */
172
172
  export { ACCRUAL_RATE };
173
- /** Commutation: £12 lump sum per £1 pension */
174
- export const COMMUTATION_FACTOR = 12;
175
- /**
176
- * The most of a member's benefits HMRC lets them take as a
177
- * tax-free lump sum, as a percentage.
178
- *
179
- * Exported because it is the only part of the commutation rule
180
- * a member can be told directly — {@link maxLumpSum} is the cap
181
- * in pounds, which answers "how much" but never "why that
182
- * much". A consumer explaining the swap needs this figure, and
183
- * a consumer that writes its own copy of it is one that can
184
- * drift from the library that applies it.
185
- */
186
- export const HMRC_LUMP_SUM_CAP_PCT = 25;
187
173
  // ── Factor Tables ───────────────────────────────────
188
174
  // Which issue is in force is exactly these two constructions —
189
175
  // swap the import when GAD supersedes a table (the two tables
@@ -232,47 +218,6 @@ export function retirementFactor(retirementDate, npDate) {
232
218
  export function yearlyAccrual(pensionablePay) {
233
219
  return pensionablePay * ACCRUAL_RATE;
234
220
  }
235
- // ── Commutation ─────────────────────────────────────
236
- /**
237
- * Maximum tax-free lump sum under the HMRC cap.
238
- *
239
- * The cap is on the lump sum as a share of the CAPITAL VALUE of
240
- * the benefits, and taking a lump sum lowers the pension that
241
- * value is measured from — so the answer is a fixed point, not
242
- * a percentage of anything the caller already holds. With `c`
243
- * the cap and `f` the commutation factor, capital value is
244
- * `20 × residual + lumpSum`, and solving
245
- *
246
- * L = c × (20 × (P − L/f) + L)
247
- *
248
- * for L gives the expression below. Written from
249
- * {@link HMRC_LUMP_SUM_CAP_PCT} rather than from its
250
- * rearrangement — the familiar `(20P) / (3 + 20/f)` is this
251
- * same solution with `c = 0.25` already substituted in, which
252
- * hides the one number a reader would want to check.
253
- */
254
- export function maxLumpSum(adjustedPension) {
255
- const cap = HMRC_LUMP_SUM_CAP_PCT / 100;
256
- return ((20 * cap * adjustedPension)
257
- / (1 - cap + (20 * cap) / COMMUTATION_FACTOR));
258
- }
259
- /**
260
- * Calculate commutation at a given fraction of max.
261
- * ERF/LRF is applied BEFORE commutation (§1.18).
262
- */
263
- export function commute(adjustedPension, fraction) {
264
- invariant(fraction >= 0 && fraction <= 1, `Commutation fraction must be 0–1, got ${fraction}`);
265
- const max = maxLumpSum(adjustedPension);
266
- const lumpSum = max * fraction;
267
- const pensionGivenUp = lumpSum / COMMUTATION_FACTOR;
268
- const residualPension = adjustedPension - pensionGivenUp;
269
- return {
270
- pensionGivenUp,
271
- residualPension,
272
- lumpSum,
273
- maxLumpSum: max,
274
- };
275
- }
276
221
  // ── Projection Orchestrator ─────────────────────────
277
222
  /**
278
223
  * Generate a full pension projection including curve
@@ -317,6 +262,11 @@ export function projectPension(input, today = new Date()) {
317
262
  isEstimation: cash.isEstimation,
318
263
  estimatedHistory: todays.history,
319
264
  ledger: cash.ledger,
265
+ /* The CASH run's series — the caller's own assumption. The
266
+ today's-money run's is the same object at a zero rate, so
267
+ converting an external figure through it is the identity,
268
+ which is what "today's money" means. */
269
+ prices: cash.prices,
320
270
  todaysMoneyLedger: todays.ledger,
321
271
  };
322
272
  }
@@ -430,7 +380,7 @@ function resolveProjection(input, today) {
430
380
  : null;
431
381
  return {
432
382
  today, dateOfBirth, exitDate, retirementDate, npa,
433
- ledger, history, isEstimation, factor, factorType,
383
+ ledger, history, isEstimation, factor, factorType, prices,
434
384
  /* The earliest date the ledger holds a balance for, which
435
385
  is the seed's own year end — NOT today.
436
386
 
@@ -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.13.2",
3
+ "version": "0.15.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",
@@ -43,7 +43,7 @@
43
43
  "hcas"
44
44
  ],
45
45
  "author": "Casomo Ltd",
46
- "license": "LGPL-3.0-only",
46
+ "license": "AGPL-3.0-only",
47
47
  "engines": {
48
48
  "node": ">=22"
49
49
  },