@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
@@ -7,14 +7,16 @@
7
7
  * active CPI + 1.5, a negative CPI carried through
8
8
  * deferred/paid max(0, CPI), floored
9
9
  *
10
- * `rate = CPI + 1.5` holds on 11 of 11 rows, 2016–2026. The
10
+ * `rate = CPI + 1.5` holds on every applied rate held, 2016–2025,
11
+ * in `tests/fixtures/revaluation-applied.csv`. The
11
12
  * Pensions Increase column of the 2020 Valuation Report App. E
12
13
  * equals `max(0, CPI)` on 8 of 8 published years, 2016–2023 —
13
14
  * including 2016, where −0.1 CPI gives 1.4 active and 0.0
14
15
  * deferred, and 2023's 10.1 spike.
15
16
  *
16
- * So there is no second rate table. The published Pensions
17
- * Increase figures are a GOLDEN TEST, not production data.
17
+ * So there is no second rate table. The published applied rates
18
+ * and Pensions Increase figures are GOLDEN TESTS, not production
19
+ * data.
18
20
  *
19
21
  * Note the direction: CPI is sourced independently from each
20
22
  * Order's operative words and the rates derive forward from it.
@@ -22,22 +24,9 @@
22
24
  * make the test of the +1.5 rule agree with itself.
23
25
  */
24
26
  import type { CpiEntry, CpiSource, Prices } from './prices.js';
25
- import type { LedgerSeed } from './seed.js';
26
- /**
27
- * The three phases. Ordered by date and DERIVED from the member's
28
- * own dates: a phase is never "entered", so there are no
29
- * transitions to guard and no machine to run.
30
- *
31
- * FOUNDING ASSUMPTION, and this is where it lives: the phases are
32
- * TOTALLY ORDERED and each occurs at most once, because the input
33
- * carries a single exitDate. One unbroken membership — join,
34
- * contribute, leave, draw. A career break or a return to the
35
- * scheme cannot be expressed, and would be modelled as continuous
36
- * active service, OVERSTATING the pension. Relaxing it later
37
- * means allowing the sequence to repeat, which this shape already
38
- * permits: phase is computed per year from the member's dates.
39
- */
40
- export type MemberPhase = 'active' | 'deferred' | 'inPayment';
27
+ import type { SchemeYearEnd } from './scheme-year.js';
28
+ /** One of {@link MEMBER_PHASES}. */
29
+ export type MemberPhase = (typeof MEMBER_PHASES)[keyof typeof MEMBER_PHASES];
41
30
  /** One uplift, as applied to a member's record. */
42
31
  export interface AppliedUplift {
43
32
  /** The date the POT moves — 1 April through 2022, 6 April from
@@ -63,23 +52,40 @@ export interface AppliedUplift {
63
52
  * field, `LedgerYear.uplift`; nullability there is about the
64
53
  * walk's first step, not about this rule, and putting it here
65
54
  * would make every caller narrow a value it always gets. */
66
- export type UpliftSource = (schemeYearEnd: number) => AppliedUplift;
55
+ export type UpliftSource = (schemeYearEnd: SchemeYearEnd) => AppliedUplift;
56
+ /**
57
+ * The three phases. Ordered by date and DERIVED from the member's
58
+ * own dates: a phase is never "entered", so there are no
59
+ * transitions to guard and no machine to run.
60
+ *
61
+ * FOUNDING ASSUMPTION, and this is where it lives: the phases are
62
+ * TOTALLY ORDERED and each occurs at most once, because the input
63
+ * carries a single exitDate. One unbroken membership — join,
64
+ * contribute, leave, draw. A career break or a return to the
65
+ * scheme cannot be expressed, and would be modelled as continuous
66
+ * active service, OVERSTATING the pension. Relaxing it later
67
+ * means allowing the sequence to repeat, which this shape already
68
+ * permits: phase is computed per year from the member's dates.
69
+ */
70
+ export declare const MEMBER_PHASES: {
71
+ readonly active: "active";
72
+ readonly deferred: "deferred";
73
+ readonly inPayment: "inPayment";
74
+ };
67
75
  /** Active until the member leaves, deferred until they draw, in
68
76
  * payment after. Derived from dates; never entered.
69
77
  *
70
78
  * Lives beside the rule it selects, because the rule is a
71
79
  * function of phase alone and this is the only way a phase is
72
80
  * ever obtained. */
73
- export declare function phaseAt(year: number, exitYear: number, retireYear: number): MemberPhase;
74
- /** CPI + 1.5 points. A negative CPI is carried through, not
75
- * floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
76
- export declare function activeRatePct(cpi: number): number;
81
+ export declare function phaseAt(year: SchemeYearEnd, exitYear: SchemeYearEnd, retireYear: SchemeYearEnd): MemberPhase;
77
82
  /** Pensions Increase: CPI, floored at zero. Prices falling does
78
83
  * not claw a pension back.
79
84
  *
80
- * A DIFFERENT instrument from the one above. The in-service rate
81
- * comes from the Public Service Pensions Revaluation Order, made
82
- * under s.9(2) Public Service Pensions Act 2013; this one is
85
+ * A DIFFERENT instrument from the in-service rate
86
+ * (`activeRatePct`, in `revaluation.ts`), which comes from the
87
+ * Public Service Pensions Revaluation Order, made under s.9(2)
88
+ * Public Service Pensions Act 2013; this one is
83
89
  * Pensions Increase, made by the annual Pensions Increase
84
90
  * (Review) Order under s.59 Social Security Pensions Act 1975,
85
91
  * and it is what lifts a preserved pension and one in payment.
@@ -107,10 +113,10 @@ export declare function deferredRatePct(cpi: number): number;
107
113
  *
108
114
  * That the published rates ARE `CPI + 1.5` is not asserted here,
109
115
  * because nothing here reads them: the rule is checked against
110
- * the TABLE, on all eleven rows at once, by
111
- * `tests/prices.test.ts` — "reproduces every published rate, 11
112
- * of 11". That check owns it, and it fires whether or not any
113
- * caller ever asks for a published year.
116
+ * every applied rate at once, by `tests/prices.test.ts` —
117
+ * "reproduces every applied rate". That check owns it, and it
118
+ * fires whether or not any caller ever asks for a published
119
+ * year.
114
120
  */
115
121
  export declare function upliftsFor(phase: MemberPhase, cpiFor: CpiSource): UpliftSource;
116
122
  /**
@@ -157,26 +163,4 @@ export declare function upliftsFor(phase: MemberPhase, cpiFor: CpiSource): Uplif
157
163
  * deferred or in-payment rate: the months the pension has run by
158
164
  * that April, over twelve. See `firstIncreaseShare`.
159
165
  */
160
- export declare function openingUpliftFor(seedSchemeYearEnd: number, exitDate: Date, retirementDate: Date, prices: Prices): AppliedUplift;
161
- /**
162
- * A member's stated balance, on whatever date it is stated —
163
- * the day they read it, or the day their statement prints. That
164
- * is a position mid-scheme-year, and a seed is a year-end
165
- * closing balance, so it has to be carried back to one.
166
- *
167
- * In November the April uplift has already been applied to the
168
- * figure being read, so dividing it out lands on the last
169
- * year-end closing balance and the walk re-applies it — no
170
- * double count, and no year of accrual thrown away. On a date
171
- * before that April the figure already IS the year-end balance
172
- * and nothing is divided, which is why a statement printed on
173
- * 31 March passes through untouched.
174
- *
175
- * ONE route for both the dated and the undated case, because
176
- * there is only one question: what was the closing balance at
177
- * the year end before this date? `seedFromStatement` stays
178
- * strict about wanting a year end; this is what finds it.
179
- * Statements print on arbitrary days — 7 November is a real
180
- * one — so the strict form alone could not serve them.
181
- */
182
- export declare function seedFromBalanceAt(balance: number, asOf: Date, exitDate: Date, retirementDate: Date, prices: Prices): LedgerSeed;
166
+ export declare function openingUpliftFor(seedSchemeYearEnd: SchemeYearEnd, exitDate: Date, retirementDate: Date, prices: Prices): AppliedUplift;
@@ -7,24 +7,45 @@
7
7
  * active CPI + 1.5, a negative CPI carried through
8
8
  * deferred/paid max(0, CPI), floored
9
9
  *
10
- * `rate = CPI + 1.5` holds on 11 of 11 rows, 2016–2026. The
10
+ * `rate = CPI + 1.5` holds on every applied rate held, 2016–2025,
11
+ * in `tests/fixtures/revaluation-applied.csv`. The
11
12
  * Pensions Increase column of the 2020 Valuation Report App. E
12
13
  * equals `max(0, CPI)` on 8 of 8 published years, 2016–2023 —
13
14
  * including 2016, where −0.1 CPI gives 1.4 active and 0.0
14
15
  * deferred, and 2023's 10.1 spike.
15
16
  *
16
- * So there is no second rate table. The published Pensions
17
- * Increase figures are a GOLDEN TEST, not production data.
17
+ * So there is no second rate table. The published applied rates
18
+ * and Pensions Increase figures are GOLDEN TESTS, not production
19
+ * data.
18
20
  *
19
21
  * Note the direction: CPI is sourced independently from each
20
22
  * Order's operative words and the rates derive forward from it.
21
23
  * Never the reverse — back-computing CPI as `rate − 1.5` would
22
24
  * make the test of the +1.5 rule agree with itself.
23
25
  */
24
- import { ACTIVE_REVAL_BONUS_PCT, appliedOnFor, } from '../revaluation.js';
26
+ import { activeRatePct, appliedOnFor } from '../revaluation.js';
25
27
  import { invariant } from '../errors.js';
26
28
  import { dayAfter, monthsCountingPart, MONTHS_PER_YEAR } from '../dates.js';
27
- import { schemeYearClosedBy, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, seedFromStatement, } from './seed.js';
29
+ import { schemeYearAfter, schemeYearEndFor } from './scheme-year.js';
30
+ /**
31
+ * The three phases. Ordered by date and DERIVED from the member's
32
+ * own dates: a phase is never "entered", so there are no
33
+ * transitions to guard and no machine to run.
34
+ *
35
+ * FOUNDING ASSUMPTION, and this is where it lives: the phases are
36
+ * TOTALLY ORDERED and each occurs at most once, because the input
37
+ * carries a single exitDate. One unbroken membership — join,
38
+ * contribute, leave, draw. A career break or a return to the
39
+ * scheme cannot be expressed, and would be modelled as continuous
40
+ * active service, OVERSTATING the pension. Relaxing it later
41
+ * means allowing the sequence to repeat, which this shape already
42
+ * permits: phase is computed per year from the member's dates.
43
+ */
44
+ export const MEMBER_PHASES = {
45
+ active: 'active',
46
+ deferred: 'deferred',
47
+ inPayment: 'inPayment',
48
+ };
28
49
  /** Active until the member leaves, deferred until they draw, in
29
50
  * payment after. Derived from dates; never entered.
30
51
  *
@@ -33,20 +54,16 @@ import { schemeYearClosedBy, schemeYearEndDate, schemeYearEndFor, schemeYearStar
33
54
  * ever obtained. */
34
55
  export function phaseAt(year, exitYear, retireYear) {
35
56
  if (year <= exitYear)
36
- return 'active';
37
- return year < retireYear ? 'deferred' : 'inPayment';
38
- }
39
- /** CPI + 1.5 points. A negative CPI is carried through, not
40
- * floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
41
- export function activeRatePct(cpi) {
42
- return cpi + ACTIVE_REVAL_BONUS_PCT;
57
+ return MEMBER_PHASES.active;
58
+ return year < retireYear ? MEMBER_PHASES.deferred : MEMBER_PHASES.inPayment;
43
59
  }
44
60
  /** Pensions Increase: CPI, floored at zero. Prices falling does
45
61
  * not claw a pension back.
46
62
  *
47
- * A DIFFERENT instrument from the one above. The in-service rate
48
- * comes from the Public Service Pensions Revaluation Order, made
49
- * under s.9(2) Public Service Pensions Act 2013; this one is
63
+ * A DIFFERENT instrument from the in-service rate
64
+ * (`activeRatePct`, in `revaluation.ts`), which comes from the
65
+ * Public Service Pensions Revaluation Order, made under s.9(2)
66
+ * Public Service Pensions Act 2013; this one is
50
67
  * Pensions Increase, made by the annual Pensions Increase
51
68
  * (Review) Order under s.59 Social Security Pensions Act 1975,
52
69
  * and it is what lifts a preserved pension and one in payment.
@@ -76,13 +93,13 @@ export function deferredRatePct(cpi) {
76
93
  *
77
94
  * That the published rates ARE `CPI + 1.5` is not asserted here,
78
95
  * because nothing here reads them: the rule is checked against
79
- * the TABLE, on all eleven rows at once, by
80
- * `tests/prices.test.ts` — "reproduces every published rate, 11
81
- * of 11". That check owns it, and it fires whether or not any
82
- * caller ever asks for a published year.
96
+ * every applied rate at once, by `tests/prices.test.ts` —
97
+ * "reproduces every applied rate". That check owns it, and it
98
+ * fires whether or not any caller ever asks for a published
99
+ * year.
83
100
  */
84
101
  export function upliftsFor(phase, cpiFor) {
85
- const ratePct = phase === 'active'
102
+ const ratePct = phase === MEMBER_PHASES.active
86
103
  ? activeRatePct
87
104
  : deferredRatePct;
88
105
  return (schemeYearEnd) => {
@@ -139,60 +156,13 @@ export function upliftsFor(phase, cpiFor) {
139
156
  * that April, over twelve. See `firstIncreaseShare`.
140
157
  */
141
158
  export function openingUpliftFor(seedSchemeYearEnd, exitDate, retirementDate, prices) {
142
- const phase = phaseAt(seedSchemeYearEnd + 1, schemeYearEndFor(exitDate), schemeYearEndFor(retirementDate));
159
+ const phase = phaseAt(schemeYearAfter(seedSchemeYearEnd), schemeYearEndFor(exitDate), schemeYearEndFor(retirementDate));
143
160
  const uplift = upliftsFor(phase, prices.cpiFor)(seedSchemeYearEnd);
144
161
  const firstAfterLeaving = seedSchemeYearEnd === schemeYearEndFor(exitDate);
145
162
  if (!firstAfterLeaving)
146
163
  return uplift;
147
164
  return { ...uplift, percent: uplift.percent * firstIncreaseShare(exitDate, uplift.appliedOn) };
148
165
  }
149
- /**
150
- * A member's stated balance, on whatever date it is stated —
151
- * the day they read it, or the day their statement prints. That
152
- * is a position mid-scheme-year, and a seed is a year-end
153
- * closing balance, so it has to be carried back to one.
154
- *
155
- * In November the April uplift has already been applied to the
156
- * figure being read, so dividing it out lands on the last
157
- * year-end closing balance and the walk re-applies it — no
158
- * double count, and no year of accrual thrown away. On a date
159
- * before that April the figure already IS the year-end balance
160
- * and nothing is divided, which is why a statement printed on
161
- * 31 March passes through untouched.
162
- *
163
- * ONE route for both the dated and the undated case, because
164
- * there is only one question: what was the closing balance at
165
- * the year end before this date? `seedFromStatement` stays
166
- * strict about wanting a year end; this is what finds it.
167
- * Statements print on arbitrary days — 7 November is a real
168
- * one — so the strict form alone could not serve them.
169
- */
170
- export function seedFromBalanceAt(balance, asOf, exitDate, retirementDate, prices) {
171
- const lastYearEnd = schemeYearClosedBy(asOf);
172
- /* A figure read after leaving, before the leaving year has closed,
173
- already holds that year's part slice and its leaver adjustment,
174
- and the walk would re-walk that year and add both again. Refused
175
- rather than guessed at. With no month served there is neither,
176
- and once the year has closed the seed is its closing and the walk
177
- starts after it: both round-trip. */
178
- const exitYear = schemeYearEndFor(exitDate);
179
- const monthsServedBeforeLeaving = monthsCountingPart(schemeYearStartDate(exitYear), dayAfter(exitDate));
180
- const leavingYearStillOpen = lastYearEnd < exitYear;
181
- const readAfterServingPartOfLeavingYear = asOf > exitDate
182
- && leavingYearStillOpen
183
- && monthsServedBeforeLeaving > 0;
184
- invariant(!readAfterServingPartOfLeavingYear, `a balance stated on ${asOf.toDateString()}, after leaving on `
185
- + `${exitDate.toDateString()} in the same scheme year`);
186
- /* The uplift undone here is the one OPENING year
187
- `lastYearEnd + 1`, and it is the very object `buildLedger`
188
- re-applies to that year: inverting the walk exactly is this
189
- function's only job, so both sides ask `openingUpliftFor`
190
- rather than each naming the phase, the year and the CPI
191
- series for themselves. */
192
- const applied = openingUpliftFor(lastYearEnd, exitDate, retirementDate, prices);
193
- const already = applied.appliedOn <= asOf;
194
- return seedFromStatement(already ? balance / (1 + applied.percent / 100) : balance, schemeYearEndDate(lastYearEnd));
195
- }
196
166
  /**
197
167
  * A pension's first increase after it begins is proportionate to the
198
168
  * months it has run: HM Treasury's 2026 Pensions Increase tables
@@ -1 +1 @@
1
- {"version":3,"file":"uplift.js","sourceRoot":"","sources":["../../src/pension/uplift.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"uplift.js","sourceRoot":"","sources":["../../src/pension/uplift.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAC,eAAe,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAoCnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;CACd,CAAC;AAEX;;;;;oBAKoB;AACpB,MAAM,UAAU,OAAO,CACrB,IAAmB,EAAE,QAAuB,EAAE,UAAyB;IAEvE,IAAI,IAAI,IAAI,QAAQ;QAAE,OAAO,aAAa,CAAC,MAAM,CAAC;IAClD,OAAO,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC;AAC9E,CAAC;AAED;;;;;;;;;;;;;;;6BAe6B;AAC7B,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,UAAU,CACxB,KAAkB,EAClB,MAAiB;IAEjB,MAAM,OAAO,GAAG,KAAK,KAAK,aAAa,CAAC,MAAM;QAC5C,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,eAAe,CAAC;IAEpB,OAAO,CAAC,aAAa,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;QACnC,OAAO;YACL,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC;YACtC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1B,IAAI;SACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,MAAM,UAAU,gBAAgB,CAC9B,iBAAgC,EAChC,QAAc,EACd,cAAoB,EACpB,MAAc;IAEd,MAAM,KAAK,GAAG,OAAO,CACnB,eAAe,CAAC,iBAAiB,CAAC,EAClC,gBAAgB,CAAC,QAAQ,CAAC,EAC1B,gBAAgB,CAAC,cAAc,CAAC,CACjC,CAAC;IACF,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACnE,MAAM,iBAAiB,GAAG,iBAAiB,KAAK,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3E,IAAI,CAAC,iBAAiB;QAAE,OAAO,MAAM,CAAC;IACtC,OAAO,EAAC,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAC7D,QAAQ,EAAE,MAAM,CAAC,SAAS,CAC3B,EAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,kBAAkB,CAAC,QAAc,EAAE,SAAe;IACzD,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IACjE,SAAS,CACP,MAAM,IAAI,eAAe,EACzB,oBAAoB,MAAM,2BAA2B;UACjD,QAAQ,CAAC,YAAY,EAAE,CAC5B,CAAC;IACF,OAAO,MAAM,GAAG,eAAe,CAAC;AAClC,CAAC"}
@@ -155,9 +155,9 @@ import { earliest, npaDate, periodInYearsMonths, } from './dates.js';
155
155
  import { createPrices } from './pension/prices.js';
156
156
  import { ACCRUAL_RATE, atDrawing, buildLedger, flatPay, } from './pension/ledger.js';
157
157
  import { estimateHistory } from './pension/history.js';
158
- import { seedFromBalanceAt } from './pension/uplift.js';
159
158
  import { buildCurve, walkThrough } from './pension/curve.js';
160
- import { schemeYearEndDate, seedFromJoinDate } from './pension/seed.js';
159
+ import { schemeYearBefore, schemeYearEndDate } from './pension/scheme-year.js';
160
+ import { seedFromBalanceAt, seedFromJoinDate } from './pension/seed.js';
161
161
  import { FACTOR_TABLES, factorTable } from './factor-basis.js';
162
162
  // ── Constants ───────────────────────────────────────
163
163
  /* The accrual rate is owned by the ledger that applies it and
@@ -289,8 +289,30 @@ export function projectPension(input, today = new Date()) {
289
289
  todaysMoneyLedger: todays.ledger,
290
290
  };
291
291
  }
292
+ /** The flat-pay walk from `seed` to the drawing, and the factor the
293
+ * drawing takes. */
294
+ function walkToDrawing(input, seed, prices) {
295
+ const { currentSalary, dateOfBirth, exitDate, retirementDate, npa } = input;
296
+ const { factor, type: factorType } = retirementFactor(retirementDate, npaDate(dateOfBirth, npa));
297
+ const ledger = buildLedger({
298
+ seed,
299
+ payIn: flatPay(currentSalary),
300
+ exitDate,
301
+ retirementDate,
302
+ prices,
303
+ through: walkThrough(retirementDate, npaDate(dateOfBirth, npa)),
304
+ drawingFor: () => ({
305
+ on: retirementDate,
306
+ factor,
307
+ table: factorType === null
308
+ ? null
309
+ : { kind: factorType, provenance: factorProvenance(factorType) },
310
+ }),
311
+ });
312
+ return { ledger, factor, factorType };
313
+ }
292
314
  function resolveProjection(input, today) {
293
- const { currentSalary, dateOfBirth, exitDate, retirementDate, npa, assumedCpi, } = input;
315
+ const { dateOfBirth, exitDate, retirementDate, npa, assumedCpi } = input;
294
316
  /* The drawing date is used EXACTLY AS GIVEN, to the day.
295
317
  Retiring on a birthday, mid-month, or on a scheme year end
296
318
  are three different questions and this function answers
@@ -310,24 +332,8 @@ function resolveProjection(input, today) {
310
332
  // The ONLY place the input variant is read.
311
333
  const seed = isEstimation
312
334
  ? seedFromJoinDate(input.joinDate)
313
- : seedFromBalanceAt(input.accruedPension, input.statementDate, exitDate, retirementDate, prices);
314
- const { factor, type: factorType } = retirementFactor(retirementDate, npaDate(dateOfBirth, npa));
315
- const through = walkThrough(retirementDate, npaDate(dateOfBirth, npa));
316
- const ledger = buildLedger({
317
- seed,
318
- payIn: flatPay(currentSalary),
319
- exitDate,
320
- retirementDate,
321
- prices,
322
- through,
323
- drawingFor: () => ({
324
- on: retirementDate,
325
- factor,
326
- table: factorType === null
327
- ? null
328
- : { kind: factorType, provenance: factorProvenance(factorType) },
329
- }),
330
- });
335
+ : seedFromBalanceAt({ balance: input.accruedPension, asOf: input.statementDate }, exitDate, retirementDate, prices);
336
+ const { ledger, factor, factorType } = walkToDrawing(input, seed, prices);
331
337
  const { revalued, drawn } = atDrawing(ledger, retirementDate, factor);
332
338
  /* Illustration only, and only where a statement leaves a gap:
333
339
  an estimation path already walks from the join date, so
@@ -353,7 +359,9 @@ function resolveProjection(input, today) {
353
359
  other; starting the curve at today withholds them.
354
360
  Starting at today would also put a past leaving date
355
361
  outside the curve's range. */
356
- curveFrom: earliest(today, exitDate, schemeYearEndDate(history === null ? seed.atSchemeYearEnd : history.from - 1)),
362
+ curveFrom: earliest(today, exitDate, schemeYearEndDate(history === null
363
+ ? seed.atSchemeYearEnd
364
+ : schemeYearBefore(history.from))),
357
365
  // The leaving row settles on the last day of service, so the
358
366
  // entitlement is read there, before any retirement factor.
359
367
  accruedAtExit: ledger.accruedAt(exitDate),
@@ -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/dist/post.d.ts CHANGED
@@ -10,7 +10,7 @@
10
10
  * a value by building a new one (see {@link Post.withSalary},
11
11
  * {@link Post.withAdjustments}).
12
12
  */
13
- import type { Nation, PayYear, TaxYear, TakeHomePay, AnnualAllowance, StudentLoanPlan, TaxCode } from '@casomoltd/paye-calc';
13
+ import type { Nation, PayYear, TaxYear, TakeHomePay, StudentLoanPlan, TaxCode } from '@casomoltd/paye-calc';
14
14
  import type { Role } from './role.js';
15
15
  import type { DocumentSource } from './document-source.js';
16
16
  import type { PayAward } from './award.js';
@@ -196,15 +196,6 @@ export declare class Post {
196
196
  private get _pensionFraction();
197
197
  /** Full take-home breakdown (tax, NI, pension, net). */
198
198
  get takeHome(): TakeHomePay;
199
- /**
200
- * The pension annual allowance this post's year meets, with the
201
- * scheme's defined-benefit pension input: read it here, not off
202
- * `takeHome`, whose own allowance has no scheme input. The input is
203
- * this year's accrual alone (`nhsAnnualAllowance`): a post knows no
204
- * member history, so revaluation of pension already built up is not
205
- * counted.
206
- */
207
- get annualAllowance(): AnnualAllowance;
208
199
  /** Annual income tax (£). */
209
200
  get tax(): number;
210
201
  /** Annual national insurance (£). */
package/dist/post.js CHANGED
@@ -12,7 +12,7 @@
12
12
  */
13
13
  import { nationToTaxRegion } from '@casomoltd/paye-calc';
14
14
  import { getPensionTiersVO } from './pension.js';
15
- import { nhsAnnualAllowance, nhsTakeHome } from './take-home.js';
15
+ import { nhsTakeHome } from './take-home.js';
16
16
  import { awardsFor } from './award.js';
17
17
  import { afcScaleSource } from './scales.js';
18
18
  import { ScaleUnavailable } from './errors.js';
@@ -201,17 +201,6 @@ export class Post {
201
201
  taxCode: this.adjustments.taxCode,
202
202
  });
203
203
  }
204
- /**
205
- * The pension annual allowance this post's year meets, with the
206
- * scheme's defined-benefit pension input: read it here, not off
207
- * `takeHome`, whose own allowance has no scheme input. The input is
208
- * this year's accrual alone (`nhsAnnualAllowance`): a post knows no
209
- * member history, so revaluation of pension already built up is not
210
- * counted.
211
- */
212
- get annualAllowance() {
213
- return nhsAnnualAllowance(this.pensionablePay, this._pensionFraction, this.identity.taxYear, nationToTaxRegion(this.identity.nation));
214
- }
215
204
  /** Annual income tax (£). */
216
205
  get tax() {
217
206
  return this.takeHome.incomeTax;
package/dist/post.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"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"}