@casomoltd/nhs-pay 0.30.0 → 0.32.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.
Files changed (82) hide show
  1. package/README.md +71 -252
  2. package/dist/bands.d.ts +9 -1
  3. package/dist/bands.js +20 -0
  4. package/dist/bands.js.map +1 -1
  5. package/dist/document-source.d.ts +32 -7
  6. package/dist/document-source.js +32 -8
  7. package/dist/document-source.js.map +1 -1
  8. package/dist/errors.d.ts +57 -11
  9. package/dist/errors.js +85 -28
  10. package/dist/errors.js.map +1 -1
  11. package/dist/factor-basis.d.ts +23 -3
  12. package/dist/factor-basis.js +40 -28
  13. package/dist/factor-basis.js.map +1 -1
  14. package/dist/index.d.ts +16 -14
  15. package/dist/index.js +9 -8
  16. package/dist/index.js.map +1 -1
  17. package/dist/member/benefits.js +25 -13
  18. package/dist/member/benefits.js.map +1 -1
  19. package/dist/member/index.d.ts +1 -1
  20. package/dist/member/input-period.d.ts +4 -4
  21. package/dist/member/input-period.js +11 -9
  22. package/dist/member/input-period.js.map +1 -1
  23. package/dist/member/service.d.ts +4 -0
  24. package/dist/member/service.js +9 -3
  25. package/dist/member/service.js.map +1 -1
  26. package/dist/member/types.d.ts +81 -49
  27. package/dist/member/types.js.map +1 -1
  28. package/dist/member/valuation.d.ts +10 -8
  29. package/dist/member/valuation.js +14 -21
  30. package/dist/member/valuation.js.map +1 -1
  31. package/dist/pay-path.d.ts +21 -25
  32. package/dist/pay-path.js +85 -67
  33. package/dist/pay-path.js.map +1 -1
  34. package/dist/pension/ages.d.ts +6 -4
  35. package/dist/pension/ages.js +6 -4
  36. package/dist/pension/ages.js.map +1 -1
  37. package/dist/pension/curve.d.ts +2 -1
  38. package/dist/pension/curve.js +15 -7
  39. package/dist/pension/curve.js.map +1 -1
  40. package/dist/pension/history.d.ts +18 -3
  41. package/dist/pension/history.js +12 -5
  42. package/dist/pension/history.js.map +1 -1
  43. package/dist/pension/ledger.d.ts +15 -9
  44. package/dist/pension/ledger.js +95 -59
  45. package/dist/pension/ledger.js.map +1 -1
  46. package/dist/pension/money.d.ts +2 -0
  47. package/dist/pension/money.js +4 -0
  48. package/dist/pension/money.js.map +1 -1
  49. package/dist/pension/prices.d.ts +11 -2
  50. package/dist/pension/prices.js +35 -14
  51. package/dist/pension/prices.js.map +1 -1
  52. package/dist/pension/scheme-year.d.ts +59 -0
  53. package/dist/pension/scheme-year.js +80 -0
  54. package/dist/pension/scheme-year.js.map +1 -0
  55. package/dist/pension/seed.d.ts +66 -50
  56. package/dist/pension/seed.js +111 -65
  57. package/dist/pension/seed.js.map +1 -1
  58. package/dist/pension/uplift.d.ts +38 -54
  59. package/dist/pension/uplift.js +38 -68
  60. package/dist/pension/uplift.js.map +1 -1
  61. package/dist/pension-projection.js +30 -22
  62. package/dist/pension-projection.js.map +1 -1
  63. package/dist/post.d.ts +1 -10
  64. package/dist/post.js +1 -12
  65. package/dist/post.js.map +1 -1
  66. package/dist/revaluation.d.ts +56 -41
  67. package/dist/revaluation.js +76 -62
  68. package/dist/revaluation.js.map +1 -1
  69. package/dist/scale-point.d.ts +6 -0
  70. package/dist/sections/final-salary.d.ts +3 -8
  71. package/dist/sections/final-salary.js +6 -10
  72. package/dist/sections/final-salary.js.map +1 -1
  73. package/dist/sections/section-2015.d.ts +3 -4
  74. package/dist/sections/section-2015.js +1 -1
  75. package/dist/sections/section-2015.js.map +1 -1
  76. package/dist/sources.d.ts +14 -0
  77. package/dist/sources.js +24 -0
  78. package/dist/sources.js.map +1 -1
  79. package/dist/take-home.d.ts +4 -20
  80. package/dist/take-home.js +3 -23
  81. package/dist/take-home.js.map +1 -1
  82. package/package.json +3 -3
@@ -1 +1 @@
1
- {"version":3,"file":"curve.js","sourceRoot":"","sources":["../../src/pension/curve.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"curve.js","sourceRoot":"","sources":["../../src/pension/curve.ts"],"names":[],"mappings":"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"}
@@ -32,6 +32,12 @@
32
32
  * member actually gave. A pension projected from a pay derived
33
33
  * from that same pension would be arguing in a circle.
34
34
  *
35
+ * It is **the one estimate of the years before a statement**.
36
+ * The statement's own walk refuses every read before its 31 March
37
+ * (`BeforeStatement`); this walks a ledger of its own from the join
38
+ * date, so the chart's built-up arm is drawn from here and nowhere
39
+ * else.
40
+ *
35
41
  * ── Why it is calibrated by a walk, not a formula ───
36
42
  *
37
43
  * Closed form exists. With flat pay, a constant rate `r` and
@@ -71,6 +77,7 @@
71
77
  */
72
78
  import type { MemberLedger } from './ledger.js';
73
79
  import type { Prices } from './prices.js';
80
+ import type { SchemeYearEnd } from './scheme-year.js';
74
81
  /** An illustrative run-up to a stated balance. */
75
82
  export interface EstimatedHistory {
76
83
  /**
@@ -86,12 +93,20 @@ export interface EstimatedHistory {
86
93
  /** The walked years, ending exactly on the stated balance. */
87
94
  readonly ledger: MemberLedger;
88
95
  /** First and last scheme year covered, inclusive. */
89
- readonly from: number;
90
- readonly to: number;
96
+ readonly from: SchemeYearEnd;
97
+ readonly to: SchemeYearEnd;
91
98
  }
99
+ /**
100
+ * Estimate the years from `joinDate` up to a stated balance.
101
+ *
102
+ * Null when there is nothing to draw — a member who joined in
103
+ * or after the statement's own scheme year has no run-up, and
104
+ * inventing one would put pension on the chart before they had
105
+ * any.
106
+ */
92
107
  export declare function estimateHistory({ joinDate, statedBalance, statementSchemeYearEnd, prices, }: {
93
108
  joinDate: Date;
94
109
  statedBalance: number;
95
- statementSchemeYearEnd: number;
110
+ statementSchemeYearEnd: SchemeYearEnd;
96
111
  prices: Prices;
97
112
  }): EstimatedHistory | null;
@@ -32,6 +32,12 @@
32
32
  * member actually gave. A pension projected from a pay derived
33
33
  * from that same pension would be arguing in a circle.
34
34
  *
35
+ * It is **the one estimate of the years before a statement**.
36
+ * The statement's own walk refuses every read before its 31 March
37
+ * (`BeforeStatement`); this walks a ledger of its own from the join
38
+ * date, so the chart's built-up arm is drawn from here and nowhere
39
+ * else.
40
+ *
35
41
  * ── Why it is calibrated by a walk, not a formula ───
36
42
  *
37
43
  * Closed form exists. With flat pay, a constant rate `r` and
@@ -70,7 +76,11 @@
70
76
  * 2021 pounds with 2025 pounds and reads low by a tenth.
71
77
  */
72
78
  import { buildLedger, flatPay } from './ledger.js';
73
- import { firstWalkedYear, schemeYearEndDate, seedFromJoinDate, } from './seed.js';
79
+ import { schemeYearEnd, schemeYearEndDate } from './scheme-year.js';
80
+ import { firstWalkedYear, seedFromJoinDate } from './seed.js';
81
+ /** Far enough past the statement that no leaving or drawing date
82
+ * falls inside the estimated window. */
83
+ const YEARS_BEYOND_THE_WINDOW = 60;
74
84
  /**
75
85
  * Estimate the years from `joinDate` up to a stated balance.
76
86
  *
@@ -79,16 +89,13 @@ import { firstWalkedYear, schemeYearEndDate, seedFromJoinDate, } from './seed.js
79
89
  * inventing one would put pension on the chart before they had
80
90
  * any.
81
91
  */
82
- /** Far enough past the statement that no leaving or drawing date
83
- * falls inside the estimated window. */
84
- const YEARS_BEYOND_THE_WINDOW = 60;
85
92
  export function estimateHistory({ joinDate, statedBalance, statementSchemeYearEnd, prices, }) {
86
93
  const seed = seedFromJoinDate(joinDate);
87
94
  const first = firstWalkedYear(seed);
88
95
  if (first > statementSchemeYearEnd || statedBalance <= 0) {
89
96
  return null;
90
97
  }
91
- const beyondTheWindow = schemeYearEndDate(statementSchemeYearEnd + YEARS_BEYOND_THE_WINDOW);
98
+ const beyondTheWindow = schemeYearEndDate(schemeYearEnd(statementSchemeYearEnd + YEARS_BEYOND_THE_WINDOW));
92
99
  const walk = (pay) => buildLedger({
93
100
  seed,
94
101
  payIn: flatPay(pay),
@@ -1 +1 @@
1
- {"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/pension/history.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsEG;AAEH,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAGjD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,WAAW,CAAC;AAqBnB;;;;;;;GAOG;AACH;yCACyC;AACzC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC,MAAM,UAAU,eAAe,CAAC,EAC9B,QAAQ,EACR,aAAa,EACb,sBAAsB,EACtB,MAAM,GAMP;IACC,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,sBAAsB,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,iBAAiB,CACvC,sBAAsB,GAAG,uBAAuB,CACjD,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,WAAW,CAAC;QACxC,IAAI;QACJ,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;QACnB,4DAA4D;QAC5D,gEAAgE;QAChE,iEAAiE;QACjE,sCAAsC;QACtC,QAAQ,EAAE,eAAe;QACzB,cAAc,EAAE,eAAe;QAC/B,MAAM;QACN,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;QACtB,OAAO,EAAE,sBAAsB;KAChC,CAAC,CAAC;IAEH,4DAA4D;IAC5D,kDAAkD;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAC3D,wDAAwD;IACxD,6DAA6D;IAC7D,2DAA2D;IAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAE7D,MAAM,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC;IAC5C,OAAO;QACL,UAAU;QACV,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC;QACxB,IAAI,EAAE,KAAK;QACX,EAAE,EAAE,sBAAsB;KAC3B,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/pension/history.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4EG;AAEH,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAGjD,OAAO,EAAC,aAAa,EAAE,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAC,eAAe,EAAE,gBAAgB,EAAC,MAAM,WAAW,CAAC;AAsB5D;yCACyC;AACzC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,EAC9B,QAAQ,EACR,aAAa,EACb,sBAAsB,EACtB,MAAM,GAMP;IACC,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,sBAAsB,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,iBAAiB,CACvC,aAAa,CAAC,sBAAsB,GAAG,uBAAuB,CAAC,CAChE,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,WAAW,CAAC;QACxC,IAAI;QACJ,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;QACnB,4DAA4D;QAC5D,gEAAgE;QAChE,iEAAiE;QACjE,sCAAsC;QACtC,QAAQ,EAAE,eAAe;QACzB,cAAc,EAAE,eAAe;QAC/B,MAAM;QACN,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;QACtB,OAAO,EAAE,sBAAsB;KAChC,CAAC,CAAC;IAEH,4DAA4D;IAC5D,kDAAkD;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAC3D,wDAAwD;IACxD,6DAA6D;IAC7D,2DAA2D;IAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAE7D,MAAM,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC;IAC5C,OAAO;QACL,UAAU;QACV,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC;QACxB,IAAI,EAAE,KAAK;QACX,EAAE,EAAE,sBAAsB;KAC3B,CAAC;AACJ,CAAC"}
@@ -23,6 +23,7 @@ import type { FactorProvenance, FactorTableKind } from '../gad/factor-table.js';
23
23
  import type { PayBasis, YearPay } from '../pay-path.js';
24
24
  import type { CpiEntry, Prices } from './prices.js';
25
25
  import type { AppliedUplift, MemberPhase } from './uplift.js';
26
+ import type { SchemeYearEnd } from './scheme-year.js';
26
27
  import type { LedgerSeed } from './seed.js';
27
28
  /** The retirement event, recorded on the year it falls in. */
28
29
  export interface AppliedDrawing {
@@ -64,7 +65,7 @@ export interface AppliedLeaverAdjustment {
64
65
  export interface LedgerYear {
65
66
  /** Scheme year END — 2026 for 2025/26. The same key the
66
67
  * revaluation table uses, so a row joins by value. */
67
- readonly schemeYearEnd: number;
68
+ readonly schemeYearEnd: SchemeYearEnd;
68
69
  readonly phase: MemberPhase;
69
70
  /** Nominal pensionable pay for this year, or null when not
70
71
  * accruing. In a partial year this is the PAY scaled by months
@@ -122,13 +123,18 @@ export interface MemberLedger {
122
123
  * or the today's-money one, and it reports in the money it
123
124
  * was built in. Pairing the two is the orchestrator's job —
124
125
  * see `pension-projection.ts` — because neither walk can see
125
- * the other. */
126
+ * the other.
127
+ *
128
+ * Before a statement's 31 March this and `accruedAt` throw
129
+ * `BeforeStatement`: the statement gives no balance there. */
126
130
  atDate(date: Date): number;
127
- /** Closing balance at the end of a scheme year. Years at or
128
- * before the seed's own year return the seed balance: the
129
- * walk starts after it, so there is no row, but there is
130
- * still an answer. */
131
- closingAt(schemeYearEnd: number): number;
131
+ /** Closing balance at the end of a scheme year. The seed's own
132
+ * year returns the seed balance: the walk starts after it, so
133
+ * there is no row, but there is still an answer. A year before
134
+ * it does the same for a walk that opens the membership, and
135
+ * for a statement's walk throws `BeforeStatement`, as every
136
+ * read before a statement does. */
137
+ closingAt(schemeYearEnd: SchemeYearEnd): number;
132
138
  /** The ACCRUED entitlement at `date`, before any retirement
133
139
  * factor. Distinct from `atDate`, which reports the pension
134
140
  * actually in force: on the row carrying the drawing those
@@ -147,7 +153,7 @@ export interface MemberLedger {
147
153
  * revalued at the in-service rate, but their accrual belongs to
148
154
  * another ledger.
149
155
  */
150
- export type PayIn = (schemeYearEnd: number) => YearPay | {
156
+ export type PayIn = (schemeYearEnd: SchemeYearEnd) => YearPay | {
151
157
  readonly pay: number;
152
158
  readonly basis: typeof LEDGER_BASES.assumed;
153
159
  } | null;
@@ -187,7 +193,7 @@ export interface LedgerRequest {
187
193
  /** The retirement event, built once for the year it falls in. */
188
194
  readonly drawingFor: () => AppliedDrawing | null;
189
195
  /** Last scheme year to walk. */
190
- readonly through: number;
196
+ readonly through: SchemeYearEnd;
191
197
  }
192
198
  /**
193
199
  * 1/54 of pensionable pay, the 2015 CARE accrual rate — NHSBSA
@@ -19,10 +19,16 @@
19
19
  * source on every call, never stored, and every row is frozen at
20
20
  * construction.
21
21
  */
22
- import { invariant } from '../errors.js';
22
+ import { uplift } from '@casomoltd/paye-calc';
23
+ import { BeforeStatement, invariant, isBeforeStatement, STATEMENT_READS, } from '../errors.js';
23
24
  import { dayAfter, monthsCountingPart, MONTHS_PER_YEAR } from '../dates.js';
24
- import { openingUpliftFor, phaseAt, upliftsFor } from './uplift.js';
25
- import { firstWalkedYear, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, } from './seed.js';
25
+ import { pointsToDecimal } from './prices.js';
26
+ import { MEMBER_PHASES, openingUpliftFor, phaseAt, upliftsFor, } from './uplift.js';
27
+ import { schemeYearAfter, schemeYearBefore, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, } from './scheme-year.js';
28
+ import { answersFrom, firstWalkedYear } from './seed.js';
29
+ /** The 2015 Section's accrual denominator: a year's pension is its
30
+ * pensionable pay over 54. */
31
+ const ACCRUAL_DENOMINATOR = 54;
26
32
  /**
27
33
  * 1/54 of pensionable pay, the 2015 CARE accrual rate — NHSBSA
28
34
  * 2015 Members' Guide (V13) p.6.
@@ -31,7 +37,7 @@ import { firstWalkedYear, schemeYearEndDate, schemeYearEndFor, schemeYearStartDa
31
37
  * slice and every figure a consumer reads come from one constant
32
38
  * rather than a literal here and a name somewhere else.
33
39
  */
34
- export const ACCRUAL_RATE = 1 / 54;
40
+ export const ACCRUAL_RATE = 1 / ACCRUAL_DENOMINATOR;
35
41
  /** What a ledger row's earnings rest on beyond a pay path's own bases:
36
42
  * one flat figure the caller assumed, or nothing earned. */
37
43
  const LEDGER_BASES = {
@@ -47,12 +53,15 @@ export function flatPay(pay) {
47
53
  }
48
54
  export function buildLedger(req) {
49
55
  const { seed, exitDate, retirementDate, through } = req;
56
+ // Refused here, where every walk is built, rather than by each caller:
57
+ // a leaving before the seed's close is never walked.
58
+ refuseBeforeStatement(seed, exitDate, STATEMENT_READS.leaving);
50
59
  const exitYear = schemeYearEndFor(exitDate);
51
60
  const retireYear = schemeYearEndFor(retirementDate);
52
61
  const first = firstWalkedYear(seed);
53
62
  const years = [];
54
63
  let opening = seed.opening;
55
- for (let year = first; year <= through; year++) {
64
+ for (let year = first; year <= through; year = schemeYearAfter(year)) {
56
65
  const row = rowFor({
57
66
  year,
58
67
  opening,
@@ -62,7 +71,7 @@ export function buildLedger(req) {
62
71
  begins inside the first walked year — never off which
63
72
  route produced it, which the seed's own doc forbids
64
73
  anything downstream from asking. */
65
- isFirst: years.length === 0 && seed.accruingFrom !== null,
74
+ opensMembership: years.length === 0 && seed.accruingFrom !== null,
66
75
  req, first, exitYear, retireYear,
67
76
  });
68
77
  years.push(row);
@@ -109,7 +118,7 @@ function monthsServedIn(year, req, first) {
109
118
  return monthsCountingPart(from, dayAfter(req.exitDate));
110
119
  }
111
120
  if (joinedThisYear !== null) {
112
- return monthsCountingPart(joinedThisYear, schemeYearStartDate(year + 1));
121
+ return monthsCountingPart(joinedThisYear, schemeYearStartDate(schemeYearAfter(year)));
113
122
  }
114
123
  return MONTHS_PER_YEAR;
115
124
  }
@@ -125,65 +134,81 @@ function payFor({ year, prices, annualPay, months, }) {
125
134
  const whole = prices.payAt(annualPay, schemeYearEndDate(year));
126
135
  return (whole * months) / MONTHS_PER_YEAR;
127
136
  }
137
+ /** `amount` grown by a rate in percentage points. */
138
+ function grownBy(amount, points) {
139
+ return uplift(amount, pointsToDecimal(points));
140
+ }
128
141
  /** One row: revalue the pot, add the year's slice, then apply
129
142
  * the retirement transform if this is the year it falls in. */
130
143
  function rowFor(ctx) {
131
- const { year, opening, req, exitYear, retireYear } = ctx;
132
- const { prices } = req;
133
- const phase = phaseAt(year, exitYear, retireYear);
144
+ const { year, opening, req } = ctx;
145
+ const phase = phaseAt(year, ctx.exitYear, ctx.retireYear);
146
+ const uplift = upliftOpening(ctx);
147
+ const revalued = grownBy(opening, uplift?.percent ?? 0);
148
+ const monthsServed = monthsServedIn(year, req, ctx.first);
149
+ const earnings = earningsIn(ctx, phase, monthsServed);
150
+ const leaverAdjustment = leaverAdjustmentIn(ctx, monthsServed);
151
+ const accrued = grownBy(revalued + earnings.earned, leaverAdjustment?.percent ?? 0);
152
+ const drawing = year === ctx.retireYear ? req.drawingFor() : null;
153
+ return Object.freeze({
154
+ schemeYearEnd: year,
155
+ phase,
156
+ pensionableEarnings: earnings.pensionableEarnings,
157
+ earned: earnings.earned,
158
+ earningsBasis: basisOf(earnings),
159
+ opening,
160
+ uplift: frozenOrNull(uplift),
161
+ revalued,
162
+ leaverAdjustment: frozenOrNull(leaverAdjustment),
163
+ accrued,
164
+ drawing: frozenOrNull(drawing),
165
+ closing: accrued * (drawing?.factor ?? 1),
166
+ });
167
+ }
168
+ /** The uplift opening a row's year; null on the first row of a walk
169
+ * that opens the membership. */
170
+ function upliftOpening({ opensMembership, year, req }) {
134
171
  /* The rate is `openingUpliftFor`'s answer, never assembled
135
172
  here: the seed inverts this exact step, and the two must ask
136
173
  one function rather than each name the phase, the year and
137
174
  the series for themselves. */
138
- const uplift = ctx.isFirst
175
+ return opensMembership
139
176
  ? null
140
- : openingUpliftFor(year - 1, req.exitDate, req.retirementDate, prices);
141
- const revalued = uplift === null
142
- ? opening
143
- : opening * (1 + uplift.percent / 100);
144
- const monthsServed = monthsServedIn(year, req, ctx.first);
145
- const given = phase === 'active'
146
- ? req.payIn(year)
177
+ : openingUpliftFor(schemeYearBefore(year), req.exitDate, req.retirementDate, req.prices);
178
+ }
179
+ /** The leaver index adjustment on the row the member leaves in; null on
180
+ * every other. */
181
+ function leaverAdjustmentIn({ year, exitYear, req }, monthsServed) {
182
+ return year === exitYear
183
+ ? leaverAdjustmentFor(year, req.prices, req.exitDate, monthsServed)
147
184
  : null;
185
+ }
186
+ /** A row's part, frozen, so it cannot be rewritten through the row. */
187
+ function frozenOrNull(part) {
188
+ return part === null ? null : Object.freeze(part);
189
+ }
190
+ /** A year's pensionable pay and its slice: pay only while active. */
191
+ function earningsIn({ year, req }, phase, months) {
192
+ const given = phase === MEMBER_PHASES.active ? req.payIn(year) : null;
148
193
  const pensionableEarnings = given === null
149
194
  ? null
150
- : payFor({ year, prices, annualPay: given.pay, months: monthsServed });
151
- const earned = pensionableEarnings === null
152
- ? 0
153
- : pensionableEarnings * ACCRUAL_RATE;
154
- const leftThisYear = year === exitYear;
155
- const leaverAdjustment = leftThisYear
156
- ? leaverAdjustmentFor(year, prices, req.exitDate, monthsServed)
157
- : null;
158
- const accrued = (revalued + earned)
159
- * (1 + (leaverAdjustment?.percent ?? 0) / 100);
160
- const drawing = year === retireYear
161
- ? req.drawingFor()
162
- : null;
163
- const factor = drawing?.factor ?? 1;
195
+ : payFor({ year, prices: req.prices, annualPay: given.pay, months });
164
196
  // The one nonsense the shape still permits. An invariant
165
197
  // rather than three row subtypes: nothing about a row's
166
198
  // BEHAVIOUR differs by phase, so there is nothing to dispatch
167
199
  // and subtypes would override nothing.
168
- invariant(phase === 'active' || pensionableEarnings === null, `${phase} year ${year} carries pensionable earnings`);
169
- return Object.freeze({
170
- schemeYearEnd: year,
171
- phase,
200
+ invariant(phase === MEMBER_PHASES.active || pensionableEarnings === null, `${phase} year ${year} carries pensionable earnings`);
201
+ return {
202
+ given,
172
203
  pensionableEarnings,
173
- earned,
174
- earningsBasis: earned === 0 || given === null
175
- ? LEDGER_BASES.none
176
- : given.basis,
177
- opening,
178
- uplift: uplift === null ? null : Object.freeze(uplift),
179
- revalued,
180
- leaverAdjustment: leaverAdjustment === null
181
- ? null
182
- : Object.freeze(leaverAdjustment),
183
- accrued,
184
- drawing: drawing === null ? null : Object.freeze(drawing),
185
- closing: accrued * factor,
186
- });
204
+ earned: pensionableEarnings === null
205
+ ? 0
206
+ : pensionableEarnings * ACCRUAL_RATE,
207
+ };
208
+ }
209
+ /** What a row's earnings rest on: nothing, where nothing was earned. */
210
+ function basisOf({ given, earned }) {
211
+ return earned === 0 || given === null ? LEDGER_BASES.none : given.basis;
187
212
  }
188
213
  /**
189
214
  * The leaver index adjustment for the year the member leaves in
@@ -194,7 +219,7 @@ function rowFor(ctx) {
194
219
  * and 28(2)).
195
220
  */
196
221
  function leaverAdjustmentFor(year, prices, exitDate, months) {
197
- const inService = upliftsFor('active', prices.cpiFor)(year);
222
+ const inService = upliftsFor(MEMBER_PHASES.active, prices.cpiFor)(year);
198
223
  return {
199
224
  on: exitDate,
200
225
  percent: Math.max(0, inService.percent * months / MONTHS_PER_YEAR),
@@ -215,6 +240,17 @@ function settlementOf(row) {
215
240
  const upliftOn = row.uplift?.appliedOn;
216
241
  return upliftOn !== undefined && upliftOn > leftOn ? upliftOn : leftOn;
217
242
  }
243
+ /** Refuse `read` on `date` where it falls before a statement's 31 March,
244
+ * which gives no balance there: the one estimate of those years is
245
+ * `estimateHistory`'s, never this walk's. A seed that answers before
246
+ * itself refuses nothing. */
247
+ function refuseBeforeStatement(seed, date, read) {
248
+ const from = answersFrom(seed);
249
+ if (from === null)
250
+ return;
251
+ if (isBeforeStatement(date, from))
252
+ throw new BeforeStatement(read, date, from);
253
+ }
218
254
  /**
219
255
  * The read side, over rows already walked.
220
256
  *
@@ -227,15 +263,14 @@ function readerOver(frozen, seed) {
227
263
  * the year its seed sits at. */
228
264
  const startsAt = schemeYearEndDate(seed.atSchemeYearEnd);
229
265
  /**
230
- * Asked about a date BEFORE the ledger begins, answer at the
231
- * beginning instead — the balance is the seed's, and the seed
232
- * is a figure at a stated date.
233
- *
234
- * So a date before the seed reads the seed's own year end, and
235
- * an earlier leaving date cannot read higher off the same
236
- * statement than a later one.
266
+ * Asked about a date BEFORE the ledger begins, a walk that
267
+ * opens the membership answers at its beginning, where it held
268
+ * nothing; a statement's walk refuses, per the seed.
237
269
  */
238
- const answerableAt = (date) => date < startsAt ? startsAt : date;
270
+ const answerableAt = (date) => {
271
+ refuseBeforeStatement(seed, date, STATEMENT_READS.balance);
272
+ return date < startsAt ? startsAt : date;
273
+ };
239
274
  /** Replay the steps up to `date`. `preDrawing` reads the row
240
275
  * carrying the retirement event at its pre-factor value. A row
241
276
  * the member leaves in settles on the last day of service, not
@@ -259,6 +294,7 @@ function readerOver(frozen, seed) {
259
294
  accruedAt: (date) => walkTo(answerableAt(date), true),
260
295
  closingAt(schemeYearEnd) {
261
296
  if (schemeYearEnd <= seed.atSchemeYearEnd) {
297
+ refuseBeforeStatement(seed, schemeYearEndDate(schemeYearEnd), STATEMENT_READS.yearClose);
262
298
  return seed.opening;
263
299
  }
264
300
  const row = frozen.find((r) => r.schemeYearEnd === schemeYearEnd);
@@ -1 +1 @@
1
- {"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/pension/ledger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/pension/ledger.ts"],"names":[],"mappings":"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"}
@@ -46,6 +46,8 @@ export declare function moneyAt(readings: Readings, asAt: Date): ProjectionMoney
46
46
  export declare function sumMoney(xs: readonly Readings[], asAt: Date): ProjectionMoney;
47
47
  /** `a` less `b`, each ruler on its own, at `a`'s date. */
48
48
  export declare function minusMoney(a: ProjectionMoney, b: Readings): ProjectionMoney;
49
+ /** A figure multiplied by a scalar, both rulers, at its own date. */
50
+ export declare function timesMoney(m: ProjectionMoney, by: number): ProjectionMoney;
49
51
  /** A figure divided by a scalar, both rulers, at its own date. */
50
52
  export declare function divideMoney(m: ProjectionMoney, by: number): ProjectionMoney;
51
53
  export {};
@@ -17,6 +17,10 @@ export function sumMoney(xs, asAt) {
17
17
  export function minusMoney(a, b) {
18
18
  return moneyAt({ nominal: a.nominal - b.nominal, real: a.real - b.real }, a.asAt);
19
19
  }
20
+ /** A figure multiplied by a scalar, both rulers, at its own date. */
21
+ export function timesMoney(m, by) {
22
+ return moneyAt({ nominal: m.nominal * by, real: m.real * by }, m.asAt);
23
+ }
20
24
  /** A figure divided by a scalar, both rulers, at its own date. */
21
25
  export function divideMoney(m, by) {
22
26
  return moneyAt({ nominal: m.nominal / by, real: m.real / by }, m.asAt);
@@ -1 +1 @@
1
- {"version":3,"file":"money.js","sourceRoot":"","sources":["../../src/pension/money.ts"],"names":[],"mappings":"AAwCA;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,QAAkB,EAAE,IAAU;IACpD,OAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAC,CAAC;AAChE,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,QAAQ,CACtB,EAAuB,EAAE,IAAU;IAEnC,OAAO,OAAO,CAAC;QACb,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;KACzC,EAAE,IAAI,CAAC,CAAC;AACX,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CACxB,CAAkB,EAAE,CAAW;IAE/B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAC,EACpE,CAAC,CAAC,IAAI,CAAC,CAAC;AACZ,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,WAAW,CACzB,CAAkB,EAAE,EAAU;IAE9B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE,EAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC"}
1
+ {"version":3,"file":"money.js","sourceRoot":"","sources":["../../src/pension/money.ts"],"names":[],"mappings":"AAwCA;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,QAAkB,EAAE,IAAU;IACpD,OAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAC,CAAC;AAChE,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,QAAQ,CACtB,EAAuB,EAAE,IAAU;IAEnC,OAAO,OAAO,CAAC;QACb,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;KACzC,EAAE,IAAI,CAAC,CAAC;AACX,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CACxB,CAAkB,EAAE,CAAW;IAE/B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAC,EACpE,CAAC,CAAC,IAAI,CAAC,CAAC;AACZ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,UAAU,CACxB,CAAkB,EAAE,EAAU;IAE9B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE,EAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,WAAW,CACzB,CAAkB,EAAE,EAAU;IAE9B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE,EAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC"}
@@ -36,10 +36,11 @@
36
36
  * in the money it was written for. Beyond the published record
37
37
  * it is the assumption, as above.
38
38
  */
39
+ import type { SchemeYearEnd } from './scheme-year.js';
39
40
  /** One year of the September CPI series, and where it came from. */
40
41
  export interface CpiEntry {
41
42
  /** Scheme year END, e.g. 2016 for the 2015/16 year. */
42
- readonly schemeYearEnd: number;
43
+ readonly schemeYearEnd: SchemeYearEnd;
43
44
  /** Percentage points. Negative is legal: September 2015 was
44
45
  * -0.1, which is the scheme's very first uplift. */
45
46
  readonly cpi: number;
@@ -57,7 +58,7 @@ export interface CpiEntry {
57
58
  * CHOICE rather than a table and a condition — WHICH series
58
59
  * stays the caller's question and never the rule's. A projection
59
60
  * makes that choice exactly once, in `openingUpliftFor`. */
60
- export type CpiSource = (schemeYearEnd: number) => CpiEntry;
61
+ export type CpiSource = (schemeYearEnd: SchemeYearEnd) => CpiEntry;
61
62
  /** The CPI a projection revalues at, and the money readings
62
63
  * that follow from it. The published record itself is
63
64
  * `revaluation.ts`'s: a series here reads it through
@@ -110,6 +111,14 @@ export interface Prices {
110
111
  /** The CPI a today's-money run assumes, as a decimal: none, so every
111
112
  * figure is read in the money of the run date. */
112
113
  export declare const TODAYS_MONEY_CPI = 0;
114
+ /**
115
+ * A CPI or revaluation rate in percentage points as a decimal: 3.8 points
116
+ * is 0.038. A `CpiEntry`, an Order and every rate a ledger row carries are
117
+ * in points, as the Orders print them; an assumption, a growth factor and
118
+ * paye-calc's `cpi` are decimals. Every crossing of a CPI-derived rate
119
+ * between the two goes through here or {@link decimalToPoints}.
120
+ */
121
+ export declare function pointsToDecimal(points: number): number;
113
122
  /**
114
123
  * How much more a pound of `asAt` money is than a pound of
115
124
  * `from` money, under the caller's assumption.
@@ -38,9 +38,27 @@
38
38
  */
39
39
  import { invariant } from '../errors.js';
40
40
  import { appliedOnFor, IN_SERVICE_REVALUATION, revaluationFor, } from '../revaluation.js';
41
+ import { schemeYearEnd } from './scheme-year.js';
41
42
  /** The CPI a today's-money run assumes, as a decimal: none, so every
42
43
  * figure is read in the money of the run date. */
43
44
  export const TODAYS_MONEY_CPI = 0;
45
+ /** Percentage points in one unit of a decimal rate. */
46
+ const POINTS_PER_UNIT = 100;
47
+ /**
48
+ * A CPI or revaluation rate in percentage points as a decimal: 3.8 points
49
+ * is 0.038. A `CpiEntry`, an Order and every rate a ledger row carries are
50
+ * in points, as the Orders print them; an assumption, a growth factor and
51
+ * paye-calc's `cpi` are decimals. Every crossing of a CPI-derived rate
52
+ * between the two goes through here or {@link decimalToPoints}.
53
+ */
54
+ export function pointsToDecimal(points) {
55
+ return points / POINTS_PER_UNIT;
56
+ }
57
+ /** A decimal rate in percentage points: 0.02 is 2 points. The inverse of
58
+ * {@link pointsToDecimal}. */
59
+ function decimalToPoints(decimal) {
60
+ return decimal * POINTS_PER_UNIT;
61
+ }
44
62
  /**
45
63
  * How much more a pound of `asAt` money is than a pound of
46
64
  * `from` money, under the caller's assumption.
@@ -74,7 +92,9 @@ export function inflationFactor(asAt, from, assumedCpi) {
74
92
  function aprilsBetween(from, to) {
75
93
  let count = 0;
76
94
  for (let year = from.getFullYear(); year <= to.getFullYear(); year++) {
77
- const applied = appliedOnFor(year);
95
+ // The Order labelled by the scheme year ending in `year` is applied
96
+ // in that year's April.
97
+ const applied = appliedOnFor(schemeYearEnd(year));
78
98
  if (applied > from && applied <= to)
79
99
  count += 1;
80
100
  }
@@ -91,7 +111,7 @@ function aprilsBetween(from, to) {
91
111
  * date the module needs.
92
112
  */
93
113
  export function createPrices(assumedCpi, asOf) {
94
- const assumedPct = assumedCpi * 100;
114
+ const assumedPct = decimalToPoints(assumedCpi);
95
115
  const valueAt = (amount, from, to) => amount * inflationFactor(to, from, assumedCpi);
96
116
  return {
97
117
  /* Frozen at the mint. A `CpiEntry` is the provenance a
@@ -133,7 +153,7 @@ export function createPrices(assumedCpi, asOf) {
133
153
  */
134
154
  export function createPublishedPrices(assumedCpi, asOf) {
135
155
  const assumed = createPrices(assumedCpi, asOf);
136
- const cpiFor = (schemeYearEnd) => publishedCpiFor(schemeYearEnd, assumedCpi * 100);
156
+ const cpiFor = (year) => publishedCpiFor(year, decimalToPoints(assumedCpi));
137
157
  return {
138
158
  ...assumed,
139
159
  cpiFor,
@@ -146,25 +166,25 @@ export function createPublishedPrices(assumedCpi, asOf) {
146
166
  * record ends. A year before the scheme's first Order, or a gap
147
167
  * inside the record, has no honest answer and is refused.
148
168
  */
149
- function publishedCpiFor(schemeYearEnd, assumedPct) {
150
- const order = revaluationFor(schemeYearEnd);
169
+ function publishedCpiFor(year, assumedPct) {
170
+ const order = revaluationFor(year);
151
171
  if (order !== null) {
152
172
  return Object.freeze({
153
- schemeYearEnd, cpi: order.septemberCpiPct, si: order.si,
173
+ schemeYearEnd: year, cpi: order.septemberCpiPct, si: order.si,
154
174
  });
155
175
  }
156
- const first = IN_SERVICE_REVALUATION[0];
176
+ const first = IN_SERVICE_REVALUATION.at(0);
157
177
  const last = IN_SERVICE_REVALUATION.at(-1);
158
178
  invariant(first !== undefined && last !== undefined, 'the Revaluation Order table is empty');
159
- if (schemeYearEnd < first.yearEnd) {
160
- throw new Error(`No Revaluation Order for ${schemeYearEnd}: `
179
+ if (year < first.yearEnd) {
180
+ throw new Error(`No Revaluation Order for ${year}: `
161
181
  + `the scheme's first is ${first.si}, for ${first.yearEnd}`);
162
182
  }
163
- if (schemeYearEnd <= last.yearEnd) {
183
+ if (year <= last.yearEnd) {
164
184
  throw new Error(`No Revaluation Order recorded for `
165
- + `${schemeYearEnd}, inside the published record`);
185
+ + `${year}, inside the published record`);
166
186
  }
167
- return Object.freeze({ schemeYearEnd, cpi: assumedPct, si: null });
187
+ return Object.freeze({ schemeYearEnd: year, cpi: assumedPct, si: null });
168
188
  }
169
189
  /**
170
190
  * How much more a pound of `to` money is than a pound of `from`
@@ -176,9 +196,10 @@ function pricesBetween(from, to, cpiFor) {
176
196
  const [lo, hi] = ahead ? [from, to] : [to, from];
177
197
  let factor = 1;
178
198
  for (let year = lo.getFullYear(); year <= hi.getFullYear(); year++) {
179
- const applied = appliedOnFor(year);
199
+ const labelled = schemeYearEnd(year);
200
+ const applied = appliedOnFor(labelled);
180
201
  if (applied > lo && applied <= hi) {
181
- factor *= 1 + cpiFor(year).cpi / 100;
202
+ factor *= 1 + pointsToDecimal(cpiFor(labelled).cpi);
182
203
  }
183
204
  }
184
205
  return ahead ? factor : 1 / factor;