@casomoltd/nhs-pay 0.31.0 → 0.33.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 (142) hide show
  1. package/README.md +25 -22
  2. package/dist/afc-scales.d.ts +43 -10
  3. package/dist/afc-scales.js +50 -16
  4. package/dist/afc-scales.js.map +1 -1
  5. package/dist/allowances.js +11 -11
  6. package/dist/allowances.js.map +1 -1
  7. package/dist/award.d.ts +3 -3
  8. package/dist/award.js +21 -21
  9. package/dist/award.js.map +1 -1
  10. package/dist/circulars/england-md-1-2026-r2.d.ts +13 -0
  11. package/dist/circulars/england-md-1-2026-r2.js +13 -0
  12. package/dist/circulars/england-md-1-2026-r2.js.map +1 -1
  13. package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +22 -0
  14. package/dist/circulars/ni-hsc-tc8-05-2025.js +22 -0
  15. package/dist/circulars/ni-hsc-tc8-05-2025.js.map +1 -1
  16. package/dist/circulars/scotland-pcs-dd-2025-01.d.ts +20 -0
  17. package/dist/circulars/scotland-pcs-dd-2025-01.js +20 -0
  18. package/dist/circulars/scotland-pcs-dd-2025-01.js.map +1 -1
  19. package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +19 -0
  20. package/dist/circulars/scotland-pcs-dd-2026-01.js +30 -10
  21. package/dist/circulars/scotland-pcs-dd-2026-01.js.map +1 -1
  22. package/dist/circulars/scotland-pcs-dd-2026-02.d.ts +10 -0
  23. package/dist/circulars/scotland-pcs-dd-2026-02.js +10 -0
  24. package/dist/circulars/scotland-pcs-dd-2026-02.js.map +1 -1
  25. package/dist/circulars/wales-mdw-01-2025.d.ts +17 -0
  26. package/dist/circulars/wales-mdw-01-2025.js +17 -0
  27. package/dist/circulars/wales-mdw-01-2025.js.map +1 -1
  28. package/dist/circulars/wales-mdw-01-2026.d.ts +20 -0
  29. package/dist/circulars/wales-mdw-01-2026.js +20 -0
  30. package/dist/circulars/wales-mdw-01-2026.js.map +1 -1
  31. package/dist/commutation.js +3 -2
  32. package/dist/commutation.js.map +1 -1
  33. package/dist/dental-grades.d.ts +25 -0
  34. package/dist/dental-grades.js +25 -0
  35. package/dist/dental-grades.js.map +1 -0
  36. package/dist/dental-scales.d.ts +5 -21
  37. package/dist/dental-scales.js +73 -72
  38. package/dist/dental-scales.js.map +1 -1
  39. package/dist/document-source.d.ts +32 -23
  40. package/dist/document-source.js +32 -10
  41. package/dist/document-source.js.map +1 -1
  42. package/dist/errors.d.ts +12 -1
  43. package/dist/errors.js +18 -1
  44. package/dist/errors.js.map +1 -1
  45. package/dist/factor-basis.d.ts +9 -3
  46. package/dist/factor-basis.js +40 -28
  47. package/dist/factor-basis.js.map +1 -1
  48. package/dist/format.js +3 -2
  49. package/dist/format.js.map +1 -1
  50. package/dist/hcas-pcts.d.ts +1 -1
  51. package/dist/hcas-zone.d.ts +23 -0
  52. package/dist/hcas-zone.js +17 -0
  53. package/dist/hcas-zone.js.map +1 -0
  54. package/dist/hcas.d.ts +26 -18
  55. package/dist/hcas.js +45 -24
  56. package/dist/hcas.js.map +1 -1
  57. package/dist/index.d.ts +27 -18
  58. package/dist/index.js +17 -13
  59. package/dist/index.js.map +1 -1
  60. package/dist/medical-grades.d.ts +33 -0
  61. package/dist/medical-grades.js +33 -0
  62. package/dist/medical-grades.js.map +1 -0
  63. package/dist/medical-scales.d.ts +10 -33
  64. package/dist/medical-scales.js +104 -158
  65. package/dist/medical-scales.js.map +1 -1
  66. package/dist/member/benefits.js +9 -4
  67. package/dist/member/benefits.js.map +1 -1
  68. package/dist/member/input-period.d.ts +18 -5
  69. package/dist/member/input-period.js +24 -13
  70. package/dist/member/input-period.js.map +1 -1
  71. package/dist/member/valuation.js +3 -6
  72. package/dist/member/valuation.js.map +1 -1
  73. package/dist/pay-round.js +3 -3
  74. package/dist/pay-round.js.map +1 -1
  75. package/dist/pay-year.d.ts +17 -0
  76. package/dist/pay-year.js +20 -0
  77. package/dist/pay-year.js.map +1 -0
  78. package/dist/pension/ledger.d.ts +7 -0
  79. package/dist/pension/ledger.js +26 -18
  80. package/dist/pension/ledger.js.map +1 -1
  81. package/dist/pension/money.d.ts +2 -0
  82. package/dist/pension/money.js +4 -0
  83. package/dist/pension/money.js.map +1 -1
  84. package/dist/pension/uplift.d.ts +25 -21
  85. package/dist/pension/uplift.js +27 -12
  86. package/dist/pension/uplift.js.map +1 -1
  87. package/dist/pension.js +2 -1
  88. package/dist/pension.js.map +1 -1
  89. package/dist/post.d.ts +20 -21
  90. package/dist/post.js +54 -53
  91. package/dist/post.js.map +1 -1
  92. package/dist/published/england-afc.d.ts +29 -0
  93. package/dist/published/england-afc.js +142 -0
  94. package/dist/published/england-afc.js.map +1 -0
  95. package/dist/published/hcas-zones.d.ts +18 -0
  96. package/dist/published/hcas-zones.js +46 -0
  97. package/dist/published/hcas-zones.js.map +1 -0
  98. package/dist/published/wales-living-wage.d.ts +36 -0
  99. package/dist/published/wales-living-wage.js +30 -0
  100. package/dist/published/wales-living-wage.js.map +1 -0
  101. package/dist/regions.d.ts +25 -14
  102. package/dist/regions.js +61 -71
  103. package/dist/regions.js.map +1 -1
  104. package/dist/resolver.d.ts +46 -41
  105. package/dist/resolver.js +70 -142
  106. package/dist/resolver.js.map +1 -1
  107. package/dist/revaluation.d.ts +27 -11
  108. package/dist/revaluation.js +46 -32
  109. package/dist/revaluation.js.map +1 -1
  110. package/dist/role.d.ts +3 -3
  111. package/dist/scale-point.d.ts +11 -7
  112. package/dist/scale-point.js +29 -1
  113. package/dist/scale-point.js.map +1 -1
  114. package/dist/scale-tables.d.ts +42 -60
  115. package/dist/scale-tables.js +65 -105
  116. package/dist/scale-tables.js.map +1 -1
  117. package/dist/scale-translators.d.ts +90 -0
  118. package/dist/scale-translators.js +97 -0
  119. package/dist/scale-translators.js.map +1 -0
  120. package/dist/scales.d.ts +138 -101
  121. package/dist/scales.js +221 -457
  122. package/dist/scales.js.map +1 -1
  123. package/dist/sections/final-salary.js +3 -11
  124. package/dist/sections/final-salary.js.map +1 -1
  125. package/dist/sections/section-2015.d.ts +1 -3
  126. package/dist/sections/section-2015.js +1 -1
  127. package/dist/sections/section-2015.js.map +1 -1
  128. package/dist/sources.d.ts +12 -12
  129. package/dist/sources.js +13 -15
  130. package/dist/sources.js.map +1 -1
  131. package/dist/take-home.js +1 -2
  132. package/dist/take-home.js.map +1 -1
  133. package/dist/values.d.ts +10 -3
  134. package/dist/values.js +11 -4
  135. package/dist/values.js.map +1 -1
  136. package/dist/working-week.d.ts +23 -8
  137. package/dist/working-week.js +55 -25
  138. package/dist/working-week.js.map +1 -1
  139. package/package.json +3 -3
  140. package/dist/bands.d.ts +0 -63
  141. package/dist/bands.js +0 -78
  142. package/dist/bands.js.map +0 -1
@@ -41,11 +41,24 @@ const ASKED = 'pensionInputPeriod';
41
41
  * - **The opening value** is what is held at the close of the day before
42
42
  * the year, 5 April, and the closing value at the close of the 5 April
43
43
  * ending it; a revaluation falls in the year its date does.
44
- * - **A member serving the whole year** is valued in service at its end.
45
- * The year the member leaves in closes on the leaving date instead, at the
46
- * deferred value with the leaver adjustment. Our reading: no source read
47
- * here dates a leaver's closing value, and the leaving date is when their
48
- * rights stop accruing.
44
+ * - **Every year closes on its 5 April**, the year the member leaves in
45
+ * included: Finance Act 2004 s.234(5) values the pension as payable "if
46
+ * the individual became entitled to payment of it at the end of the
47
+ * pension input period"
48
+ * (https://www.legislation.gov.uk/ukpga/2004/12/section/234). A leaver's
49
+ * year holds the pay to the last day of service and nothing after it.
50
+ * - **The leaver index adjustment counts from the April it is applied
51
+ * in**, the uplift that opens the scheme year after the leaving, as
52
+ * every other revaluation falls in the year its date does. NHSBSA
53
+ * revalues the final year "from 6 April the following scheme year"
54
+ * (https://faq.nhsbsa.nhs.uk/knowledgebase/article/KA-29075/en-us) and
55
+ * DHSC's 2023 consultation response has retiring members receive it "on
56
+ * 6 April". Our reading: both date when it is applied, and no source
57
+ * read here says whether a retirement year's closing value, which adds
58
+ * back "the annual rate of the pension to which the individual became
59
+ * entitled" (s.236(8B)), carries it sooner. `at()` is not this reading:
60
+ * it prices a drawing with the adjustment, as Sch 9 para 5 defines the
61
+ * retirement pension.
49
62
  * - **The period's `cpi`** is the September CPI before the year, from the
50
63
  * same series: the Order's figure where the series reads published ones.
51
64
  *
@@ -147,17 +160,15 @@ function legacyArrangement(b, legacy, basis, r) {
147
160
  };
148
161
  }, r);
149
162
  }
150
- /** A career average pot on `on`: nothing before its period opens. */
163
+ /** A career average pot on `on`, as the scheme has applied it by then:
164
+ * nothing before its period opens. */
151
165
  function potAt({ ledger, period }, on) {
152
- return isoToDate(period.from) > on ? 0 : ledger.accruedAt(on);
166
+ return isoToDate(period.from) > on ? 0 : ledger.appliedAt(on);
153
167
  }
154
- /** One arrangement's values at the period's two ends: its close is the
155
- * leaving date in the year the member leaves, and the year's own end in
156
- * every other. */
157
- function valuesOver(heldAt, { opens, closes, left }) {
158
- const leftInYear = left !== null && left > opens;
168
+ /** One arrangement's values at the period's two ends. */
169
+ function valuesOver(heldAt, { opens, closes }) {
159
170
  const opening = heldAt(opens);
160
- const closing = heldAt(leftInYear ? left : closes);
171
+ const closing = heldAt(closes);
161
172
  return {
162
173
  pensionOpening: opening.pension,
163
174
  pensionClosing: closing.pension,
@@ -1 +1 @@
1
- {"version":3,"file":"input-period.js","sourceRoot":"","sources":["../../src/member/input-period.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"input-period.js","sourceRoot":"","sources":["../../src/member/input-period.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@ import { earliest } from '../dates.js';
6
6
  import { buildCurve, walkThrough } from '../pension/curve.js';
7
7
  import { buildLedger } from '../pension/ledger.js';
8
8
  import { estimateHistory } from '../pension/history.js';
9
+ import { factored } from '../factor-basis.js';
9
10
  import { moneyAt, sumMoney } from '../pension/money.js';
10
11
  import { schemeYearBefore, schemeYearEndDate, schemeYearEndFor, } from '../pension/scheme-year.js';
11
12
  import { seedFromJoinDate, seedFromStatement } from '../pension/seed.js';
@@ -122,12 +123,8 @@ export function careerAward(b, { section, window, seed }, dates) {
122
123
  award: {
123
124
  section,
124
125
  periods: [window],
125
- pension: {
126
- beforeFactor: moneyAt({ nominal: cash.revalued, real: todays.revalued }, dates.drawing),
127
- after: moneyAt({ nominal: cash.drawn, real: todays.drawn }, dates.drawing),
128
- factor: cash.factor,
129
- },
130
- automaticLumpSum: { beforeFactor: noLumpSum, after: noLumpSum, factor: null },
126
+ pension: factored(moneyAt({ nominal: cash.revalued, real: todays.revalued }, dates.drawing), cash.factor),
127
+ automaticLumpSum: factored(noLumpSum, null),
131
128
  ledgers: { cash: cash.ledger, todaysMoney: todays.ledger },
132
129
  provenance: { accrual: ACCRUALS.careerAverage },
133
130
  },
@@ -1 +1 @@
1
- {"version":3,"file":"valuation.js","sourceRoot":"","sources":["../../src/member/valuation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"valuation.js","sourceRoot":"","sources":["../../src/member/valuation.ts"],"names":[],"mappings":"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"}
package/dist/pay-round.js CHANGED
@@ -29,6 +29,8 @@ import { monthToDate } from './iso-date.js';
29
29
  import { getMedicalScales } from './medical-scales.js';
30
30
  import { getDentalScales } from './dental-scales.js';
31
31
  import { afcScaleSource } from './scales.js';
32
+ import { schemeYearOfPayYear } from './pay-year.js';
33
+ import { schemeYearStartDate } from './pension/scheme-year.js';
32
34
  /**
33
35
  * The round for a nation, family and year, as at `now`.
34
36
  *
@@ -117,9 +119,7 @@ function monthHasCompleted(month, now) {
117
119
  * `effectiveFrom` in the award table says so.
118
120
  */
119
121
  function roundStart(year) {
120
- const startYear = Number(year.slice(0, 4));
121
- invariant(Number.isInteger(startYear), `payRound: '${year}' does not start with a four-digit year`);
122
- return new Date(startYear, 3, 1);
122
+ return schemeYearStartDate(schemeYearOfPayYear(year));
123
123
  }
124
124
  /**
125
125
  * The one circular that published this award's scales, where there is
@@ -1 +1 @@
1
- {"version":3,"file":"pay-round.js","sourceRoot":"","sources":["../src/pay-round.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pay-round.js","sourceRoot":"","sources":["../src/pay-round.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ /**
2
+ * A pay year's place on the scheme calendar. Every pay round, for every
3
+ * staff group, runs from 1 April to 31 March, the scheme year's own cycle,
4
+ * so each pay year is exactly one scheme year: '2025-26' is the scheme year
5
+ * ending 31 March 2026. The award table holds to it: every award takes
6
+ * effect on 1 April (`award.ts`), and `tests/pay-year.test.ts` fails the
7
+ * day one does not.
8
+ *
9
+ * It names no staff group, so a staff group's own module builds on it
10
+ * rather than the other way round. It is kept out of
11
+ * `pension/scheme-year.ts`, which imports nothing, because a pay year is
12
+ * paye-calc's type.
13
+ */
14
+ import type { PayYear } from '@casomoltd/paye-calc';
15
+ import type { SchemeYearEnd } from './pension/scheme-year.js';
16
+ /** The scheme year a pay year's round runs over: 2026 for '2025-26'. */
17
+ export declare function schemeYearOfPayYear(year: PayYear): SchemeYearEnd;
@@ -0,0 +1,20 @@
1
+ /**
2
+ * A pay year's place on the scheme calendar. Every pay round, for every
3
+ * staff group, runs from 1 April to 31 March, the scheme year's own cycle,
4
+ * so each pay year is exactly one scheme year: '2025-26' is the scheme year
5
+ * ending 31 March 2026. The award table holds to it: every award takes
6
+ * effect on 1 April (`award.ts`), and `tests/pay-year.test.ts` fails the
7
+ * day one does not.
8
+ *
9
+ * It names no staff group, so a staff group's own module builds on it
10
+ * rather than the other way round. It is kept out of
11
+ * `pension/scheme-year.ts`, which imports nothing, because a pay year is
12
+ * paye-calc's type.
13
+ */
14
+ import { closingYearOf } from '@casomoltd/paye-calc';
15
+ import { schemeYearEnd } from './pension/scheme-year.js';
16
+ /** The scheme year a pay year's round runs over: 2026 for '2025-26'. */
17
+ export function schemeYearOfPayYear(year) {
18
+ return schemeYearEnd(closingYearOf(year));
19
+ }
20
+ //# sourceMappingURL=pay-year.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pay-year.js","sourceRoot":"","sources":["../src/pay-year.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAGvD,wEAAwE;AACxE,MAAM,UAAU,mBAAmB,CAAC,IAAa;IAC/C,OAAO,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC"}
@@ -141,6 +141,13 @@ export interface MemberLedger {
141
141
  * two differ by the ERF or LRF, and asking "what had they
142
142
  * built up" must not be answered with the reduced figure. */
143
143
  accruedAt(date: Date): number;
144
+ /** What `accruedAt` gives at `date`, as the scheme has applied it by
145
+ * then: the leaver index adjustment counts from the uplift that opens
146
+ * the scheme year after the leaving, on that Order's date, where
147
+ * `accruedAt` counts it from the last day of service. A tax year's
148
+ * pension input reads this one, on a ledger with no drawing
149
+ * (`member/input-period.ts`). */
150
+ appliedAt(date: Date): number;
144
151
  /** The statement-shaped view: the years a member can lay
145
152
  * beside the paper. */
146
153
  earningsRows(): readonly LedgerYear[];
@@ -20,10 +20,10 @@
20
20
  * construction.
21
21
  */
22
22
  import { uplift } from '@casomoltd/paye-calc';
23
- import { BeforeStatement, invariant, STATEMENT_READS } from '../errors.js';
23
+ import { BeforeStatement, invariant, isBeforeStatement, STATEMENT_READS, } from '../errors.js';
24
24
  import { dayAfter, monthsCountingPart, MONTHS_PER_YEAR } from '../dates.js';
25
25
  import { pointsToDecimal } from './prices.js';
26
- import { openingUpliftFor, phaseAt, upliftsFor } from './uplift.js';
26
+ import { MEMBER_PHASES, openingUpliftFor, phaseAt, upliftsFor, } from './uplift.js';
27
27
  import { schemeYearAfter, schemeYearBefore, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, } from './scheme-year.js';
28
28
  import { answersFrom, firstWalkedYear } from './seed.js';
29
29
  /** The 2015 Section's accrual denominator: a year's pension is its
@@ -148,7 +148,7 @@ function rowFor(ctx) {
148
148
  const monthsServed = monthsServedIn(year, req, ctx.first);
149
149
  const earnings = earningsIn(ctx, phase, monthsServed);
150
150
  const leaverAdjustment = leaverAdjustmentIn(ctx, monthsServed);
151
- const accrued = grownBy(revalued + earnings.earned, leaverAdjustment?.percent ?? 0);
151
+ const accrued = grownBy(bankedIn({ revalued, earned: earnings.earned }), leaverAdjustment?.percent ?? 0);
152
152
  const drawing = year === ctx.retireYear ? req.drawingFor() : null;
153
153
  return Object.freeze({
154
154
  schemeYearEnd: year,
@@ -189,7 +189,7 @@ function frozenOrNull(part) {
189
189
  }
190
190
  /** A year's pensionable pay and its slice: pay only while active. */
191
191
  function earningsIn({ year, req }, phase, months) {
192
- const given = phase === 'active' ? req.payIn(year) : null;
192
+ const given = phase === MEMBER_PHASES.active ? req.payIn(year) : null;
193
193
  const pensionableEarnings = given === null
194
194
  ? null
195
195
  : payFor({ year, prices: req.prices, annualPay: given.pay, months });
@@ -197,7 +197,7 @@ function earningsIn({ year, req }, phase, months) {
197
197
  // rather than three row subtypes: nothing about a row's
198
198
  // BEHAVIOUR differs by phase, so there is nothing to dispatch
199
199
  // and subtypes would override nothing.
200
- invariant(phase === 'active' || pensionableEarnings === null, `${phase} year ${year} carries pensionable earnings`);
200
+ invariant(phase === MEMBER_PHASES.active || pensionableEarnings === null, `${phase} year ${year} carries pensionable earnings`);
201
201
  return {
202
202
  given,
203
203
  pensionableEarnings,
@@ -219,7 +219,7 @@ function basisOf({ given, earned }) {
219
219
  * and 28(2)).
220
220
  */
221
221
  function leaverAdjustmentFor(year, prices, exitDate, months) {
222
- const inService = upliftsFor('active', prices.cpiFor)(year);
222
+ const inService = upliftsFor(MEMBER_PHASES.active, prices.cpiFor)(year);
223
223
  return {
224
224
  on: exitDate,
225
225
  percent: Math.max(0, inService.percent * months / MONTHS_PER_YEAR),
@@ -227,6 +227,12 @@ function leaverAdjustmentFor(year, prices, exitDate, months) {
227
227
  from: inService.from,
228
228
  };
229
229
  }
230
+ /** A year's revalued balance with its slice: what the scheme holds until
231
+ * it applies a leaver adjustment, and on every other row the accrued
232
+ * figure itself. */
233
+ function bankedIn({ revalued, earned }) {
234
+ return revalued + earned;
235
+ }
230
236
  /**
231
237
  * When a row's accrual is settled: the scheme year end, or for the
232
238
  * row a member leaves in, the last day of service. Never before that
@@ -246,8 +252,9 @@ function settlementOf(row) {
246
252
  * itself refuses nothing. */
247
253
  function refuseBeforeStatement(seed, date, read) {
248
254
  const from = answersFrom(seed);
249
- const beforeStatement = from !== null && date < from;
250
- if (beforeStatement)
255
+ if (from === null)
256
+ return;
257
+ if (isBeforeStatement(date, from))
251
258
  throw new BeforeStatement(read, date, from);
252
259
  }
253
260
  /**
@@ -270,27 +277,28 @@ function readerOver(frozen, seed) {
270
277
  refuseBeforeStatement(seed, date, STATEMENT_READS.balance);
271
278
  return date < startsAt ? startsAt : date;
272
279
  };
273
- /** Replay the steps up to `date`. `preDrawing` reads the row
274
- * carrying the retirement event at its pre-factor value. A row
275
- * the member leaves in settles on the last day of service, not
280
+ /** Replay the steps up to `date`, each settled row read by `settled`.
281
+ * A row the member leaves in settles on the last day of service, not
276
282
  * at its scheme year end. */
277
- const walkTo = (date, preDrawing) => {
283
+ const walkTo = (date, settled) => {
278
284
  let value = seed.opening;
279
285
  for (const row of frozen) {
280
286
  if (row.uplift !== null && row.uplift.appliedOn <= date) {
281
287
  value = row.revalued;
282
288
  }
283
- const settlesOn = settlementOf(row);
284
- if (settlesOn <= date) {
285
- value = preDrawing ? row.accrued : row.closing;
286
- }
289
+ if (settlementOf(row) <= date)
290
+ value = settled(row);
287
291
  }
288
292
  return value;
289
293
  };
290
294
  return Object.freeze({
291
295
  years: frozen,
292
- atDate: (date) => walkTo(answerableAt(date), false),
293
- accruedAt: (date) => walkTo(answerableAt(date), true),
296
+ atDate: (date) => walkTo(answerableAt(date), (row) => row.closing),
297
+ // The row carrying the retirement event, at its pre-factor value.
298
+ accruedAt: (date) => walkTo(answerableAt(date), (row) => row.accrued),
299
+ // The row the member leaves in, before its leaver adjustment: the next
300
+ // row opens on the adjusted balance, so its uplift brings it in.
301
+ appliedAt: (date) => walkTo(answerableAt(date), bankedIn),
294
302
  closingAt(schemeYearEnd) {
295
303
  if (schemeYearEnd <= seed.atSchemeYearEnd) {
296
304
  refuseBeforeStatement(seed, schemeYearEndDate(schemeYearEnd), STATEMENT_READS.yearClose);
@@ -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"}
@@ -25,21 +25,8 @@
25
25
  */
26
26
  import type { CpiEntry, CpiSource, Prices } from './prices.js';
27
27
  import type { SchemeYearEnd } from './scheme-year.js';
28
- /**
29
- * The three phases. Ordered by date and DERIVED from the member's
30
- * own dates: a phase is never "entered", so there are no
31
- * transitions to guard and no machine to run.
32
- *
33
- * FOUNDING ASSUMPTION, and this is where it lives: the phases are
34
- * TOTALLY ORDERED and each occurs at most once, because the input
35
- * carries a single exitDate. One unbroken membership — join,
36
- * contribute, leave, draw. A career break or a return to the
37
- * scheme cannot be expressed, and would be modelled as continuous
38
- * active service, OVERSTATING the pension. Relaxing it later
39
- * means allowing the sequence to repeat, which this shape already
40
- * permits: phase is computed per year from the member's dates.
41
- */
42
- export type MemberPhase = 'active' | 'deferred' | 'inPayment';
28
+ /** One of {@link MEMBER_PHASES}. */
29
+ export type MemberPhase = (typeof MEMBER_PHASES)[keyof typeof MEMBER_PHASES];
43
30
  /** One uplift, as applied to a member's record. */
44
31
  export interface AppliedUplift {
45
32
  /** The date the POT moves — 1 April through 2022, 6 April from
@@ -66,6 +53,25 @@ export interface AppliedUplift {
66
53
  * walk's first step, not about this rule, and putting it here
67
54
  * would make every caller narrow a value it always gets. */
68
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
+ };
69
75
  /** Active until the member leaves, deferred until they draw, in
70
76
  * payment after. Derived from dates; never entered.
71
77
  *
@@ -73,15 +79,13 @@ export type UpliftSource = (schemeYearEnd: SchemeYearEnd) => AppliedUplift;
73
79
  * function of phase alone and this is the only way a phase is
74
80
  * ever obtained. */
75
81
  export declare function phaseAt(year: SchemeYearEnd, exitYear: SchemeYearEnd, retireYear: SchemeYearEnd): MemberPhase;
76
- /** CPI + 1.5 points. A negative CPI is carried through, not
77
- * floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
78
- export declare function activeRatePct(cpi: number): number;
79
82
  /** Pensions Increase: CPI, floored at zero. Prices falling does
80
83
  * not claw a pension back.
81
84
  *
82
- * A DIFFERENT instrument from the one above. The in-service rate
83
- * comes from the Public Service Pensions Revaluation Order, made
84
- * 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
85
89
  * Pensions Increase, made by the annual Pensions Increase
86
90
  * (Review) Order under s.59 Social Security Pensions Act 1975,
87
91
  * and it is what lifts a preserved pension and one in payment.
@@ -23,10 +23,29 @@
23
23
  * Never the reverse — back-computing CPI as `rate − 1.5` would
24
24
  * make the test of the +1.5 rule agree with itself.
25
25
  */
26
- import { ACTIVE_REVAL_BONUS_PCT, appliedOnFor, } from '../revaluation.js';
26
+ import { activeRatePct, appliedOnFor } from '../revaluation.js';
27
27
  import { invariant } from '../errors.js';
28
28
  import { dayAfter, monthsCountingPart, MONTHS_PER_YEAR } from '../dates.js';
29
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
+ };
30
49
  /** Active until the member leaves, deferred until they draw, in
31
50
  * payment after. Derived from dates; never entered.
32
51
  *
@@ -35,20 +54,16 @@ import { schemeYearAfter, schemeYearEndFor } from './scheme-year.js';
35
54
  * ever obtained. */
36
55
  export function phaseAt(year, exitYear, retireYear) {
37
56
  if (year <= exitYear)
38
- return 'active';
39
- return year < retireYear ? 'deferred' : 'inPayment';
40
- }
41
- /** CPI + 1.5 points. A negative CPI is carried through, not
42
- * floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
43
- export function activeRatePct(cpi) {
44
- return cpi + ACTIVE_REVAL_BONUS_PCT;
57
+ return MEMBER_PHASES.active;
58
+ return year < retireYear ? MEMBER_PHASES.deferred : MEMBER_PHASES.inPayment;
45
59
  }
46
60
  /** Pensions Increase: CPI, floored at zero. Prices falling does
47
61
  * not claw a pension back.
48
62
  *
49
- * A DIFFERENT instrument from the one above. The in-service rate
50
- * comes from the Public Service Pensions Revaluation Order, made
51
- * 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
52
67
  * Pensions Increase, made by the annual Pensions Increase
53
68
  * (Review) Order under s.59 Social Security Pensions Act 1975,
54
69
  * and it is what lifts a preserved pension and one in payment.
@@ -84,7 +99,7 @@ export function deferredRatePct(cpi) {
84
99
  * year.
85
100
  */
86
101
  export function upliftsFor(phase, cpiFor) {
87
- const ratePct = phase === 'active'
102
+ const ratePct = phase === MEMBER_PHASES.active
88
103
  ? activeRatePct
89
104
  : deferredRatePct;
90
105
  return (schemeYearEnd) => {
@@ -1 +1 @@
1
- {"version":3,"file":"uplift.js","sourceRoot":"","sources":["../../src/pension/uplift.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EACL,sBAAsB,EACtB,YAAY,GACb,MAAM,mBAAmB,CAAC;AAC3B,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;AAiDnE;;;;;oBAKoB;AACpB,MAAM,UAAU,OAAO,CACrB,IAAmB,EAAE,QAAuB,EAAE,UAAyB;IAEvE,IAAI,IAAI,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACtC,OAAO,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;AACtD,CAAC;AAED;kEACkE;AAClE,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,OAAO,GAAG,GAAG,sBAAsB,CAAC;AACtC,CAAC;AAED;;;;;;;;;;;;;;6BAc6B;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,QAAQ;QAChC,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"}
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"}
package/dist/pension.js CHANGED
@@ -10,6 +10,7 @@
10
10
  * own `EmployerPensionRate.source` per nation.
11
11
  */
12
12
  import { NATION_KEYS, TAX_YEARS, taxYear, } from '@casomoltd/paye-calc';
13
+ import { PER_CENT } from './values.js';
13
14
  import { PensionTiersUnavailable } from './errors.js';
14
15
  // England and Wales share the NHSBSA-administered scheme, so they
15
16
  // share one rate; Scotland (SPPA) and NI (HSC) run their own.
@@ -64,7 +65,7 @@ export class PensionTiers {
64
65
  /** Contribution rate (%) for a salary; 0 if unbanded. */
65
66
  rateFor(salary) {
66
67
  const match = this.tierFor(salary);
67
- return match ? match.band.rate * 100 : 0;
68
+ return match ? match.band.rate * PER_CENT : 0;
68
69
  }
69
70
  /**
70
71
  * Matching tier (1-based) and band for a salary, or