@casomoltd/nhs-pay 0.33.0 → 0.35.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 (149) hide show
  1. package/README.md +4 -4
  2. package/dist/additional-pension.d.ts +6 -4
  3. package/dist/additional-pension.js +22 -18
  4. package/dist/additional-pension.js.map +1 -1
  5. package/dist/afc-band.d.ts +4 -4
  6. package/dist/afc-band.js +4 -4
  7. package/dist/afc-scales.d.ts +67 -71
  8. package/dist/afc-scales.js +165 -215
  9. package/dist/afc-scales.js.map +1 -1
  10. package/dist/circulars/afc-shapes.d.ts +41 -21
  11. package/dist/circulars/afc-shapes.js +9 -8
  12. package/dist/circulars/afc-shapes.js.map +1 -1
  13. package/dist/circulars/ni-hsc-afc-06-2025.d.ts +4 -3
  14. package/dist/circulars/ni-hsc-afc-06-2025.js +4 -3
  15. package/dist/circulars/ni-hsc-afc-06-2025.js.map +1 -1
  16. package/dist/dates.d.ts +9 -5
  17. package/dist/dates.js.map +1 -1
  18. package/dist/errors.d.ts +58 -45
  19. package/dist/errors.js +63 -52
  20. package/dist/errors.js.map +1 -1
  21. package/dist/factor-basis.d.ts +95 -106
  22. package/dist/factor-basis.js +97 -108
  23. package/dist/factor-basis.js.map +1 -1
  24. package/dist/gad/additional-pension-0-703-2026-07-08.d.ts +185 -0
  25. package/dist/gad/additional-pension-0-703-2026-07-08.js +89 -0
  26. package/dist/gad/{additional-pension-0-703-2023-10-03.js.map → additional-pension-0-703-2026-07-08.js.map} +1 -1
  27. package/dist/gad/additional-pension-0-712-2026-07-08.d.ts +34 -0
  28. package/dist/gad/additional-pension-0-712-2026-07-08.js +172 -0
  29. package/dist/gad/additional-pension-0-712-2026-07-08.js.map +1 -0
  30. package/dist/gad/additional-pension-0-713-2026-07-08.d.ts +34 -0
  31. package/dist/gad/additional-pension-0-713-2026-07-08.js +175 -0
  32. package/dist/gad/additional-pension-0-713-2026-07-08.js.map +1 -0
  33. package/dist/gad/additional-pension-0-714-2026-07-08.d.ts +34 -0
  34. package/dist/gad/additional-pension-0-714-2026-07-08.js +178 -0
  35. package/dist/gad/additional-pension-0-714-2026-07-08.js.map +1 -0
  36. package/dist/gad/additional-pension-0-715-2026-07-08.d.ts +34 -0
  37. package/dist/gad/additional-pension-0-715-2026-07-08.js +181 -0
  38. package/dist/gad/additional-pension-0-715-2026-07-08.js.map +1 -0
  39. package/dist/gad/additional-pension-0-716-2026-07-08.d.ts +34 -0
  40. package/dist/gad/additional-pension-0-716-2026-07-08.js +172 -0
  41. package/dist/gad/additional-pension-0-716-2026-07-08.js.map +1 -0
  42. package/dist/gad/additional-pension-0-717-2026-07-08.d.ts +34 -0
  43. package/dist/gad/additional-pension-0-717-2026-07-08.js +175 -0
  44. package/dist/gad/additional-pension-0-717-2026-07-08.js.map +1 -0
  45. package/dist/gad/additional-pension-0-718-2026-07-08.d.ts +34 -0
  46. package/dist/gad/additional-pension-0-718-2026-07-08.js +178 -0
  47. package/dist/gad/additional-pension-0-718-2026-07-08.js.map +1 -0
  48. package/dist/gad/additional-pension-0-719-2026-07-08.d.ts +34 -0
  49. package/dist/gad/additional-pension-0-719-2026-07-08.js +181 -0
  50. package/dist/gad/additional-pension-0-719-2026-07-08.js.map +1 -0
  51. package/dist/gad/additional-pension-table.d.ts +4 -11
  52. package/dist/gad/additional-pension-table.js.map +1 -1
  53. package/dist/gad/erf-0-420-2026-07-08.d.ts +51 -0
  54. package/dist/gad/erf-0-420-2026-07-08.js +83 -0
  55. package/dist/gad/erf-0-420-2026-07-08.js.map +1 -0
  56. package/dist/gad/erf-1-401-2026-07-08.d.ts +42 -0
  57. package/dist/gad/erf-1-401-2026-07-08.js +67 -0
  58. package/dist/gad/erf-1-401-2026-07-08.js.map +1 -0
  59. package/dist/gad/erf-1-402-2026-07-08.d.ts +43 -0
  60. package/dist/gad/erf-1-402-2026-07-08.js +78 -0
  61. package/dist/gad/erf-1-402-2026-07-08.js.map +1 -0
  62. package/dist/gad/erf-1-407-2026-07-08.d.ts +42 -0
  63. package/dist/gad/erf-1-407-2026-07-08.js +67 -0
  64. package/dist/gad/erf-1-407-2026-07-08.js.map +1 -0
  65. package/dist/gad/factor-set.d.ts +54 -0
  66. package/dist/gad/factor-set.js +83 -0
  67. package/dist/gad/factor-set.js.map +1 -0
  68. package/dist/gad/factor-table.d.ts +31 -20
  69. package/dist/gad/factor-table.js +67 -37
  70. package/dist/gad/factor-table.js.map +1 -1
  71. package/dist/gad/lrf-0-421-2026-07-08.d.ts +46 -0
  72. package/dist/gad/lrf-0-421-2026-07-08.js +72 -0
  73. package/dist/gad/lrf-0-421-2026-07-08.js.map +1 -0
  74. package/dist/gad/lrf-0-422-2026-07-08.d.ts +43 -0
  75. package/dist/gad/lrf-0-422-2026-07-08.js +69 -0
  76. package/dist/gad/{lrf-0-422-2023-06-30.js.map → lrf-0-422-2026-07-08.js.map} +1 -1
  77. package/dist/gad/lrf-2-416-2026-07-08.d.ts +41 -0
  78. package/dist/gad/lrf-2-416-2026-07-08.js +66 -0
  79. package/dist/gad/lrf-2-416-2026-07-08.js.map +1 -0
  80. package/dist/hcas-pcts.js +1 -1
  81. package/dist/hcas-pcts.js.map +1 -1
  82. package/dist/index.d.ts +7 -5
  83. package/dist/index.js +9 -7
  84. package/dist/index.js.map +1 -1
  85. package/dist/pension-projection.d.ts +30 -44
  86. package/dist/pension-projection.js +37 -61
  87. package/dist/pension-projection.js.map +1 -1
  88. package/dist/published/england-afc.d.ts +52 -9
  89. package/dist/published/england-afc.js +59 -115
  90. package/dist/published/england-afc.js.map +1 -1
  91. package/dist/scales.d.ts +31 -6
  92. package/dist/scales.js +38 -22
  93. package/dist/scales.js.map +1 -1
  94. package/dist/sections/section-1995.d.ts +6 -6
  95. package/dist/sections/section-1995.js +34 -27
  96. package/dist/sections/section-1995.js.map +1 -1
  97. package/dist/sections/section-2008.d.ts +4 -4
  98. package/dist/sections/section-2008.js +19 -23
  99. package/dist/sections/section-2008.js.map +1 -1
  100. package/dist/sections/section-2015.d.ts +7 -7
  101. package/dist/sections/section-2015.js +3 -7
  102. package/dist/sections/section-2015.js.map +1 -1
  103. package/package.json +1 -1
  104. package/dist/gad/additional-pension-0-703-2023-10-03.d.ts +0 -180
  105. package/dist/gad/additional-pension-0-703-2023-10-03.js +0 -87
  106. package/dist/gad/additional-pension-0-712-2023-10-03.d.ts +0 -35
  107. package/dist/gad/additional-pension-0-712-2023-10-03.js +0 -170
  108. package/dist/gad/additional-pension-0-712-2023-10-03.js.map +0 -1
  109. package/dist/gad/additional-pension-0-713-2023-10-03.d.ts +0 -35
  110. package/dist/gad/additional-pension-0-713-2023-10-03.js +0 -173
  111. package/dist/gad/additional-pension-0-713-2023-10-03.js.map +0 -1
  112. package/dist/gad/additional-pension-0-714-2023-10-03.d.ts +0 -35
  113. package/dist/gad/additional-pension-0-714-2023-10-03.js +0 -176
  114. package/dist/gad/additional-pension-0-714-2023-10-03.js.map +0 -1
  115. package/dist/gad/additional-pension-0-715-2023-10-03.d.ts +0 -35
  116. package/dist/gad/additional-pension-0-715-2023-10-03.js +0 -179
  117. package/dist/gad/additional-pension-0-715-2023-10-03.js.map +0 -1
  118. package/dist/gad/additional-pension-0-716-2023-10-03.d.ts +0 -35
  119. package/dist/gad/additional-pension-0-716-2023-10-03.js +0 -170
  120. package/dist/gad/additional-pension-0-716-2023-10-03.js.map +0 -1
  121. package/dist/gad/additional-pension-0-717-2023-10-03.d.ts +0 -35
  122. package/dist/gad/additional-pension-0-717-2023-10-03.js +0 -173
  123. package/dist/gad/additional-pension-0-717-2023-10-03.js.map +0 -1
  124. package/dist/gad/additional-pension-0-718-2023-10-03.d.ts +0 -35
  125. package/dist/gad/additional-pension-0-718-2023-10-03.js +0 -176
  126. package/dist/gad/additional-pension-0-718-2023-10-03.js.map +0 -1
  127. package/dist/gad/additional-pension-0-719-2023-10-03.d.ts +0 -35
  128. package/dist/gad/additional-pension-0-719-2023-10-03.js +0 -179
  129. package/dist/gad/additional-pension-0-719-2023-10-03.js.map +0 -1
  130. package/dist/gad/erf-1-401-2023-06-30.d.ts +0 -47
  131. package/dist/gad/erf-1-401-2023-06-30.js +0 -73
  132. package/dist/gad/erf-1-401-2023-06-30.js.map +0 -1
  133. package/dist/gad/erf-1-402-2023-06-30.d.ts +0 -48
  134. package/dist/gad/erf-1-402-2023-06-30.js +0 -84
  135. package/dist/gad/erf-1-402-2023-06-30.js.map +0 -1
  136. package/dist/gad/erf-1-407-2023-06-30.d.ts +0 -47
  137. package/dist/gad/erf-1-407-2023-06-30.js +0 -73
  138. package/dist/gad/erf-1-407-2023-06-30.js.map +0 -1
  139. package/dist/gad/erf-2023-06-30.d.ts +0 -72
  140. package/dist/gad/erf-2023-06-30.js +0 -105
  141. package/dist/gad/erf-2023-06-30.js.map +0 -1
  142. package/dist/gad/lrf-0-422-2023-06-30.d.ts +0 -45
  143. package/dist/gad/lrf-0-422-2023-06-30.js +0 -70
  144. package/dist/gad/lrf-2-416-2023-06-30.d.ts +0 -46
  145. package/dist/gad/lrf-2-416-2023-06-30.js +0 -72
  146. package/dist/gad/lrf-2-416-2023-06-30.js.map +0 -1
  147. package/dist/gad/lrf-2023-06-30.d.ts +0 -72
  148. package/dist/gad/lrf-2023-06-30.js +0 -99
  149. package/dist/gad/lrf-2023-06-30.js.map +0 -1
package/README.md CHANGED
@@ -207,7 +207,7 @@ const projection = projectPension({
207
207
  assumedCpi: 0.02,
208
208
  });
209
209
  console.log(projection.annualPension); // after ERF/LRF
210
- console.log(projection.factorType); // 'erf'
210
+ console.log(projection.drawnTable?.kind); // 'erf'
211
211
  console.log(projection.curve); // chart-ready points
212
212
 
213
213
  // Commutation takes the whole {nominal, real, asAt} figure, not
@@ -241,7 +241,7 @@ Why that name is left as it is, and what moves where when it changes: [*The two
241
241
 
242
242
  There is **one limit per ruler, and no single flag**, because the two can genuinely disagree: `real` is the model run at zero CPI while the allowance is carried forward at CPI, so around the crossover the allowance binds in today's money while the scheme limb still binds in cash. Show the limit belonging to the ruler on screen. See [*The two caps on tax-free cash*](docs/how-it-works.md#the-two-caps-on-tax-free-cash).
243
243
 
244
- Without a statement figure, `kind: 'estimation'` accrues from a `joinDate` instead. ERF/LRF factors are transcribed verbatim from the GAD consolidated factor workbook (30 June 2023 issue) with GAD's own rounding rules; a retirement date beyond the printed tables throws `RetirementFactorOutOfRange`.
244
+ Without a statement figure, `kind: 'estimation'` accrues from a `joinDate` instead. ERF/LRF factors are transcribed verbatim from the GAD consolidated factor workbook (the 2026 factor review set, issued 8 July 2026) with GAD's own rounding rules; a retirement date beyond the printed tables throws `RetirementFactorOutOfRange`.
245
245
 
246
246
  ## How it works
247
247
 
@@ -276,7 +276,7 @@ Cross-checked for England against [NHSPRB 39th Report (2026)][nhsprb-39], Table
276
276
  | 2015 Section accrual rate, NPA | NHSBSA 2015 Members' Guide (V13) |
277
277
  | 1995 and 2008 Sections' denominators, pay measures, lump sum | SI 1995/300 and SI 2008/653, as [`how-it-works.md`](docs/how-it-works.md) cites them |
278
278
  | McCloud remedy eligibility and window | Public Service Pensions and Judicial Offices Act 2022 ss.1–2; rollback by SI 2023/985 |
279
- | ERF / LRF factors: 0-420, 0-421, 1-401, 1-402, 1-407, 2-416 | GAD NHS EW consolidated factor workbook |
279
+ | ERF / LRF factors: 0-420, 0-421, 0-422, 1-401, 1-402, 1-407, 2-416 | GAD NHS EW consolidated factor workbook |
280
280
  | Promotional pay index | GAD, summary of the 2020 valuation assumptions, page 3 |
281
281
  | Commutation rate (£12 : £1) | NHSBSA Key Notes — 2015 Scheme Estimates (V2) |
282
282
  | Permitted maximum (lowest of three limbs) | [Sch 29 Finance Act 2004 para 2][sch29] |
@@ -333,7 +333,7 @@ Both Welsh years were transcribed during an outage of the NHS Wales web estate (
333
333
  | Pension contribution rates 2025/26 | [NHSBSA contribution rates][pension-2526] |
334
334
  | Income tax / NI rates | gov.uk (via paye-calc) |
335
335
  | National Living Wage | paye-calc (`nationalLivingWageHourly`) |
336
- | HCAS PCT zones | NHS Employers Annex 8 Table 12 |
336
+ | HCAS PCT zones | NHS Employers Annex 8, Tables 12 to 14 |
337
337
 
338
338
  [pension-2526]: https://www.nhsbsa.nhs.uk/nhs-pensions-contribution-rates-202526
339
339
 
@@ -16,7 +16,8 @@
16
16
  * NHSBSA's additional pension factsheet (the limit and the unit) — see
17
17
  * docs/source-archive.md.
18
18
  */
19
- import type { AdditionalPensionCover, AdditionalPensionProvenance } from './gad/additional-pension-table.js';
19
+ import type { AdditionalPensionCover } from './gad/additional-pension-table.js';
20
+ import type { GadTableProvenance } from './gad/factor-table.js';
20
21
  /** The unit additional pension is bought in, a year, per
21
22
  * `AP_FACTSHEET_2026`. */
22
23
  export declare const ADDITIONAL_PENSION_UNIT = 250;
@@ -58,7 +59,7 @@ export interface AdditionalPensionPurchase {
58
59
  /** The lump sum, or each monthly instalment, in pounds and pence. */
59
60
  readonly cost: number;
60
61
  /** The table the price was read from. */
61
- readonly table: AdditionalPensionProvenance;
62
+ readonly table: GadTableProvenance;
62
63
  }
63
64
  /**
64
65
  * The price of buying `annual` a year of additional pension, as a lump
@@ -68,8 +69,9 @@ export interface AdditionalPensionPurchase {
68
69
  * Pension Age, from their date of birth.
69
70
  *
70
71
  * Refused, by code: an amount off the £250 unit or over the limit, an
71
- * election outside the dates the tables and the limit hold for, or an
72
- * age or period the table does not print.
72
+ * election outside the dates the limit holds for, or an age or period
73
+ * the table does not print. The tables are GAD's current issue and
74
+ * price an election on any date.
73
75
  */
74
76
  export declare function additionalPensionCost(input: {
75
77
  readonly annual: number;
@@ -19,15 +19,16 @@
19
19
  import { periodInYearsMonths } from './dates.js';
20
20
  import { ADDITIONAL_PENSION_REFUSALS, AdditionalPensionUnavailable, invariant, } from './errors.js';
21
21
  import { FACTOR_APPLIES } from './factor-basis.js';
22
- import { AP_0_703 } from './gad/additional-pension-0-703-2023-10-03.js';
23
- import { AP_0_712 } from './gad/additional-pension-0-712-2023-10-03.js';
24
- import { AP_0_713 } from './gad/additional-pension-0-713-2023-10-03.js';
25
- import { AP_0_714 } from './gad/additional-pension-0-714-2023-10-03.js';
26
- import { AP_0_715 } from './gad/additional-pension-0-715-2023-10-03.js';
27
- import { AP_0_716 } from './gad/additional-pension-0-716-2023-10-03.js';
28
- import { AP_0_717 } from './gad/additional-pension-0-717-2023-10-03.js';
29
- import { AP_0_718 } from './gad/additional-pension-0-718-2023-10-03.js';
30
- import { AP_0_719 } from './gad/additional-pension-0-719-2023-10-03.js';
22
+ import { AP_0_703 } from './gad/additional-pension-0-703-2026-07-08.js';
23
+ import { AP_0_712 } from './gad/additional-pension-0-712-2026-07-08.js';
24
+ import { AP_0_713 } from './gad/additional-pension-0-713-2026-07-08.js';
25
+ import { AP_0_714 } from './gad/additional-pension-0-714-2026-07-08.js';
26
+ import { AP_0_715 } from './gad/additional-pension-0-715-2026-07-08.js';
27
+ import { AP_0_716 } from './gad/additional-pension-0-716-2026-07-08.js';
28
+ import { AP_0_717 } from './gad/additional-pension-0-717-2026-07-08.js';
29
+ import { AP_0_718 } from './gad/additional-pension-0-718-2026-07-08.js';
30
+ import { AP_0_719 } from './gad/additional-pension-0-719-2026-07-08.js';
31
+ import { oneIssue } from './gad/factor-table.js';
31
32
  import { isoDate, isoToDate } from './iso-date.js';
32
33
  import { normalPensionAge } from './pension/ages.js';
33
34
  import { inflationFactor, TODAYS_MONEY_CPI } from './pension/prices.js';
@@ -71,9 +72,9 @@ const INSTALMENT_TABLES = [
71
72
  AP_0_712, AP_0_713, AP_0_714, AP_0_715,
72
73
  AP_0_716, AP_0_717, AP_0_718, AP_0_719,
73
74
  ];
74
- /** The first day both the tables and the limit hold for, compared as
75
- * dates (see `isoToDate`). */
76
- const PRICED_FROM = new Date(Math.max(isoToDate(AP_0_703.provenance.implemented).getTime(), isoToDate(ADDITIONAL_PENSION_LIMIT.from).getTime()));
75
+ // Every table the price can read is one issue, GAD's current one,
76
+ // checked at load to share one in-use date.
77
+ oneIssue([AP_0_703, ...INSTALMENT_TABLES]);
77
78
  /**
78
79
  * The price of buying `annual` a year of additional pension, as a lump
79
80
  * sum or monthly instalments, read from GAD's tables at the member's age
@@ -82,8 +83,9 @@ const PRICED_FROM = new Date(Math.max(isoToDate(AP_0_703.provenance.implemented)
82
83
  * Pension Age, from their date of birth.
83
84
  *
84
85
  * Refused, by code: an amount off the £250 unit or over the limit, an
85
- * election outside the dates the tables and the limit hold for, or an
86
- * age or period the table does not print.
86
+ * election outside the dates the limit holds for, or an age or period
87
+ * the table does not print. The tables are GAD's current issue and
88
+ * price an election on any date.
87
89
  */
88
90
  export function additionalPensionCost(input) {
89
91
  const { annual, cover, payment, election, dateOfBirth } = input;
@@ -151,7 +153,7 @@ export function additionalPensionToBuy(input) {
151
153
  return annual;
152
154
  }
153
155
  /** Refuse a purchase no table prices: an amount off the unit or over the
154
- * limit, or an election outside the dates the tables and limit hold for. */
156
+ * limit, or an election outside the dates the limit holds for. */
155
157
  function refuseUnpriced(annual, election) {
156
158
  const wholeUnits = annual > 0 && annual % ADDITIONAL_PENSION_UNIT === 0;
157
159
  if (!wholeUnits) {
@@ -162,10 +164,12 @@ function refuseUnpriced(annual, election) {
162
164
  refuse('overLimit', `£${annual} a year is over the `
163
165
  + `£${ADDITIONAL_PENSION_LIMIT.annual} limit`);
164
166
  }
165
- const outsidePricedDates = election < PRICED_FROM
167
+ // The tables are GAD's current issue and price any election; the
168
+ // limit holds only between its own dates.
169
+ const outsideLimitDates = election < isoToDate(ADDITIONAL_PENSION_LIMIT.from)
166
170
  || election >= isoToDate(ADDITIONAL_PENSION_LIMIT.until);
167
- if (outsidePricedDates) {
168
- refuse('outsideDates', `no tables and limit for an election on `
171
+ if (outsideLimitDates) {
172
+ refuse('outsideDates', `no limit held for an election on `
169
173
  + election.toDateString());
170
174
  }
171
175
  }
@@ -1 +1 @@
1
- {"version":3,"file":"additional-pension.js","sourceRoot":"","sources":["../src/additional-pension.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"additional-pension.js","sourceRoot":"","sources":["../src/additional-pension.ts"],"names":[],"mappings":"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"}
@@ -4,10 +4,10 @@
4
4
  *
5
5
  * Its own module because a band id is more primitive than the scale
6
6
  * data: `scales.ts` holds the canonical tables and `afc-scales.ts`
7
- * translates the circulars into them, and both need to name a band. If
8
- * the registry lived with either, the other would import it and the
9
- * two would form a cycle that fails at module load, when the
10
- * translation runs.
7
+ * translates the circulars and England's page into them, and both need
8
+ * to name a band. If the registry lived with either, the other would
9
+ * import it and the two would form a cycle that fails at module load,
10
+ * when the translation runs.
11
11
  *
12
12
  * **Band 1 is absent, deliberately.** Every AfC circular still prints
13
13
  * it. It is closed to new entrants in England, Wales and Northern
package/dist/afc-band.js CHANGED
@@ -4,10 +4,10 @@
4
4
  *
5
5
  * Its own module because a band id is more primitive than the scale
6
6
  * data: `scales.ts` holds the canonical tables and `afc-scales.ts`
7
- * translates the circulars into them, and both need to name a band. If
8
- * the registry lived with either, the other would import it and the
9
- * two would form a cycle that fails at module load, when the
10
- * translation runs.
7
+ * translates the circulars and England's page into them, and both need
8
+ * to name a band. If the registry lived with either, the other would
9
+ * import it and the two would form a cycle that fails at module load,
10
+ * when the translation runs.
11
11
  *
12
12
  * **Band 1 is absent, deliberately.** Every AfC circular still prints
13
13
  * it. It is closed to new entrants in England, Wales and Northern
@@ -1,14 +1,14 @@
1
1
  /**
2
- * Translation layer: AfC circulars → canonical scale points.
2
+ * Translation layer: AfC tables as printed → canonical scale points.
3
3
  *
4
4
  * The counterpart to `medical-scales.ts` for Agenda for Change. The
5
- * verbatim transcriptions in `src/circulars/*` hold each publisher's
6
- * own table shape; this module maps them to the uniform
7
- * `Record<AfcBandId, SteppedPoint[]>` the rest of the library speaks.
8
- *
9
- * **England is the exception:** it publishes no AfC circular, so its
10
- * tables are transcribed from the publisher's page in
11
- * `published/england-afc.ts` (the README's AfC pay scales rule).
5
+ * verbatim transcriptions hold each publisher's own table shape: the
6
+ * devolved nations' circulars in `src/circulars/*`, and England's NHS
7
+ * Employers page in `published/england-afc.ts`, since England publishes
8
+ * no AfC circular (the README's AfC pay scales rule). This module maps
9
+ * them to the uniform `Record<AfcBandId, SteppedPoint[]>` the rest of the
10
+ * library speaks, and reads each one's Band 1 beside it. `scales.ts`
11
+ * pairs each result with its source.
12
12
  *
13
13
  * ── Point labels are DERIVED here, not authored ──
14
14
  *
@@ -25,69 +25,45 @@
25
25
  * nothing to catch it; computed from the transcribed interval, a
26
26
  * mis-read interval produces a wrong label that a fixture row fails on.
27
27
  */
28
- import type { Nation, PayYear } from '@casomoltd/paye-calc';
29
- import type { DocumentSource } from './document-source.js';
30
28
  import type { AfcBandId } from './afc-band.js';
31
29
  import type { SteppedPoint } from './scale-point.js';
32
- /** Band 1 as a nation publishes it, for the one nation still paying it
33
- * to new entrants. */
34
- export interface AfcBand1 {
35
- readonly year: PayYear;
30
+ /** Band 1 as a publisher prints it, before `scales.ts` attaches the year
31
+ * and source it is held under. */
32
+ export interface PrintedBand1 {
36
33
  readonly salary: number;
37
- /** What the circular says about the band's status, verbatim, where it
38
- * says anything — "closed to new entrants" for the three nations
39
- * that print it. Absent for Scotland, whose PCS(AFC)2026/1 carries no
40
- * closure statement and gives Band 1 a full Annex C pay journey, so
41
- * it is a band people are still hired onto. Carried with the figure
42
- * so a consumer stops typing the closure list by hand. */
34
+ /** The publisher's words for the band's status where it gives any:
35
+ * "closed to new entrants" in England, Wales and Northern Ireland,
36
+ * each of which footnotes it so. Absent for Scotland, whose
37
+ * PCS(AFC)2026/1 carries no closure statement and gives Band 1 a full
38
+ * Annex C pay journey, so it is a band people are still hired onto. */
43
39
  readonly note?: string;
44
- readonly source: DocumentSource;
45
40
  }
46
- /** A band's nation, attached from the key it is stored under rather
47
- * than stored beside it — one fact, one producer. */
48
- export interface AfcBand1Published extends AfcBand1 {
49
- readonly nation: Nation;
41
+ /** One nation-year's tables, translated: its ladder, and its Band 1. */
42
+ export interface AfcTables {
43
+ readonly scales: Record<AfcBandId, SteppedPoint[]>;
44
+ readonly band1: PrintedBand1;
50
45
  }
51
46
  /**
52
- * Band 1 for a nation and pay year, or `undefined` where that nation
53
- * publishes none we hold.
54
- *
55
- * Deliberately NOT part of `AFC_BANDS` or the scale list. Band 1 joining
56
- * either shifts every index that reads the list by position, and this
57
- * needs to shift nothing — it is a lookup beside the ladder, not a rung
58
- * added to it.
59
- */
60
- export declare function afcBand1(year: PayYear, nation: Nation): AfcBand1Published | undefined;
61
- /**
62
- * An Agenda for Change point from the year of service it is first
63
- * reached in: the label every nation's scale prints, and the same year
64
- * as a number, so a reader that needs the timing never has to parse it
65
- * back out of the label. The one producer of both, for all four nations.
47
+ * England's tables, read from the NHS Employers pay-scales pages,
48
+ * "NHS Employers — AfC pay scales 2025/26" (#sa-25) and "… 2026/27"
49
+ * (#sa-26), transcribed in `published/england-afc.ts`.
66
50
  */
67
- export declare function afcPoint(year: number, isTop: boolean, salary: number): SteppedPoint;
51
+ export declare const ENGLAND_TABLES_2025_26: AfcTables;
52
+ export declare const ENGLAND_TABLES_2026_27: AfcTables;
68
53
  /**
69
- * Wales's own ladders, read from Annex 1 of "Wales, AfC(W) 02/2025"
54
+ * Wales's own tables, read from Annex 1 of "Wales, AfC(W) 02/2025"
70
55
  * (#sa-44) and "Wales, AfC(W) 02/2026" (#sa-45). They differ from
71
56
  * England's at every band from 4 upward, so England's figures plus a
72
57
  * living-wage floor reproduce neither year: the floor lifts the bottom of
73
58
  * a ladder and cannot raise its top. Band 2 carries two points, as
74
- * England's does. Band 1 is published in both years and closed to new
75
- * entrants; it is absent here because `AFC_BANDS` starts at Band 2, and
76
- * reachable through `afcBand1`.
59
+ * England's does.
77
60
  */
78
- export declare const WALES_SCALES_2025_26: Record<AfcBandId, SteppedPoint[]>;
79
- export declare const WALES_SCALES_2026_27: Record<AfcBandId, SteppedPoint[]>;
61
+ export declare const WALES_TABLES_2025_26: AfcTables;
62
+ export declare const WALES_TABLES_2026_27: AfcTables;
80
63
  /**
81
- * Northern Ireland's ladder, from HSC (AfC) 06/2025 (3 December 2025,
82
- * effective 1 April 2025), translated from NI's own circular.
83
- *
84
- * ONE year. NI has issued no 2026-27 AfC pay circular: the Health
85
- * Minister stated a desire to proceed with 3.3% on 12 February 2026
86
- * "subject to my budgetary position", and as at the Assembly answer of
87
- * 15 July 2026 (AQW 49635/22-27) he "cannot" pay it
88
- * "until I have clarity on my Department's budget". HSC staff are
89
- * on these rates as at that answer. The 3.3% is still recorded in `award.ts` —
90
- * announced and published are different things.
64
+ * Northern Ireland's tables, from HSC (AfC) 06/2025 (3 December 2025,
65
+ * effective 1 April 2025). One year only: the circular's header says why
66
+ * NI has no 2026-27 round.
91
67
  *
92
68
  * The figures are England's for every band, because NI's circular prints
93
69
  * the same numbers. They are read from NI's circular, not England's table,
@@ -99,27 +75,37 @@ export declare const WALES_SCALES_2026_27: Record<AfcBandId, SteppedPoint[]>;
99
75
  * All 29 values are pinned against the circular in
100
76
  * `tests/fixtures/pay-scales.csv`.
101
77
  */
102
- export declare const NI_SCALES_2025_26: Record<AfcBandId, SteppedPoint[]>;
78
+ export declare const NI_TABLES_2025_26: AfcTables;
79
+ /**
80
+ * Scotland's Annex B by year: the salaries against bare point numbers.
81
+ * It gives each year's Band 1, and 2025-26's salaries; only Annex C
82
+ * carries the year of service a label needs.
83
+ */
84
+ declare const SCOTLAND_ANNEX_B: {
85
+ readonly "2025-26": {
86
+ band: string;
87
+ point: number;
88
+ salary: number;
89
+ hourly: number;
90
+ }[];
91
+ readonly "2026-27": {
92
+ band: string;
93
+ point: number;
94
+ salary: number;
95
+ hourly: number;
96
+ }[];
97
+ };
103
98
  /**
104
99
  * Scotland 2026-27, from Annex C: 3.75% on the revised 2025-26 base, so
105
100
  * the inflation guarantee reaches this year too. Source: "Scotland,
106
101
  * PCS(AFC)2026/1" (#sa-13), effective 1 April 2026.
107
102
  *
108
103
  * Annex C rather than Annex B because only Annex C carries the year of
109
- * service. Annex B gives the same salaries against a bare point
110
- * number, which cannot produce a label — `scotlandAnnexB` below exists
111
- * so a fixture can check the two annexes agree.
104
+ * service. Annex B gives the same salaries against a bare point number,
105
+ * which cannot produce a label — `scotlandAnnexB` exists so a fixture
106
+ * can check the two annexes agree.
112
107
  */
113
- export declare const SCOTLAND_SCALES_2026_27: Record<AfcBandId, SteppedPoint[]>;
114
- /**
115
- * Annex B's salaries for a year, keyed by band, in printed order.
116
- *
117
- * Exposed so a test can assert that the annex a label came from and
118
- * the annex the salaries were published in agree. Two annexes of one
119
- * circular disagreeing would mean a transcription error in one of
120
- * them, and nothing else would notice.
121
- */
122
- export declare function scotlandAnnexB(year: '2025-26' | '2026-27'): Map<AfcBandId, number[]>;
108
+ export declare const SCOTLAND_TABLES_2026_27: AfcTables;
123
109
  /**
124
110
  * Scotland 2025-26. Scotland negotiates its own award: the 2025-26
125
111
  * settlement was 4.25% with an inflation guarantee of at least one point
@@ -135,4 +121,14 @@ export declare function scotlandAnnexB(year: '2025-26' | '2026-27'): Map<AfcBand
135
121
  * publishes twice is faithful; re-typing the same increments would
136
122
  * only add a second place to mistype them.
137
123
  */
138
- export declare const SCOTLAND_SCALES_2025_26: Record<AfcBandId, SteppedPoint[]>;
124
+ export declare const SCOTLAND_TABLES_2025_26: AfcTables;
125
+ /**
126
+ * Annex B's salaries for a year, keyed by band, in printed order.
127
+ *
128
+ * Exposed so a test can assert that the annex a label came from and
129
+ * the annex the salaries were published in agree. Two annexes of one
130
+ * circular disagreeing would mean a transcription error in one of
131
+ * them, and nothing else would notice.
132
+ */
133
+ export declare function scotlandAnnexB(year: keyof typeof SCOTLAND_ANNEX_B): Map<AfcBandId, number[]>;
134
+ export {};