@casomoltd/nhs-pay 0.21.1 → 0.23.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 (83) hide show
  1. package/README.md +9 -4
  2. package/dist/additional-pension.d.ts +104 -0
  3. package/dist/additional-pension.js +163 -0
  4. package/dist/additional-pension.js.map +1 -0
  5. package/dist/dates.d.ts +21 -8
  6. package/dist/dates.js +46 -18
  7. package/dist/dates.js.map +1 -1
  8. package/dist/errors.d.ts +26 -0
  9. package/dist/errors.js +29 -0
  10. package/dist/errors.js.map +1 -1
  11. package/dist/factor-basis.d.ts +75 -22
  12. package/dist/factor-basis.js +95 -24
  13. package/dist/factor-basis.js.map +1 -1
  14. package/dist/gad/additional-pension-0-703-2023-10-03.d.ts +180 -0
  15. package/dist/gad/additional-pension-0-703-2023-10-03.js +87 -0
  16. package/dist/gad/additional-pension-0-703-2023-10-03.js.map +1 -0
  17. package/dist/gad/additional-pension-0-712-2023-10-03.d.ts +35 -0
  18. package/dist/gad/additional-pension-0-712-2023-10-03.js +170 -0
  19. package/dist/gad/additional-pension-0-712-2023-10-03.js.map +1 -0
  20. package/dist/gad/additional-pension-0-713-2023-10-03.d.ts +35 -0
  21. package/dist/gad/additional-pension-0-713-2023-10-03.js +173 -0
  22. package/dist/gad/additional-pension-0-713-2023-10-03.js.map +1 -0
  23. package/dist/gad/additional-pension-0-714-2023-10-03.d.ts +35 -0
  24. package/dist/gad/additional-pension-0-714-2023-10-03.js +176 -0
  25. package/dist/gad/additional-pension-0-714-2023-10-03.js.map +1 -0
  26. package/dist/gad/additional-pension-0-715-2023-10-03.d.ts +35 -0
  27. package/dist/gad/additional-pension-0-715-2023-10-03.js +179 -0
  28. package/dist/gad/additional-pension-0-715-2023-10-03.js.map +1 -0
  29. package/dist/gad/additional-pension-0-716-2023-10-03.d.ts +35 -0
  30. package/dist/gad/additional-pension-0-716-2023-10-03.js +170 -0
  31. package/dist/gad/additional-pension-0-716-2023-10-03.js.map +1 -0
  32. package/dist/gad/additional-pension-0-717-2023-10-03.d.ts +35 -0
  33. package/dist/gad/additional-pension-0-717-2023-10-03.js +173 -0
  34. package/dist/gad/additional-pension-0-717-2023-10-03.js.map +1 -0
  35. package/dist/gad/additional-pension-0-718-2023-10-03.d.ts +35 -0
  36. package/dist/gad/additional-pension-0-718-2023-10-03.js +176 -0
  37. package/dist/gad/additional-pension-0-718-2023-10-03.js.map +1 -0
  38. package/dist/gad/additional-pension-0-719-2023-10-03.d.ts +35 -0
  39. package/dist/gad/additional-pension-0-719-2023-10-03.js +179 -0
  40. package/dist/gad/additional-pension-0-719-2023-10-03.js.map +1 -0
  41. package/dist/gad/additional-pension-table.d.ts +51 -0
  42. package/dist/gad/additional-pension-table.js +23 -0
  43. package/dist/gad/additional-pension-table.js.map +1 -0
  44. package/dist/gad/factor-table.d.ts +7 -3
  45. package/dist/gad/factor-table.js.map +1 -1
  46. package/dist/gad/lrf-0-422-2023-06-30.d.ts +45 -0
  47. package/dist/gad/lrf-0-422-2023-06-30.js +70 -0
  48. package/dist/gad/lrf-0-422-2023-06-30.js.map +1 -0
  49. package/dist/gad/lrf-2023-06-30.d.ts +3 -3
  50. package/dist/gad/lrf-2023-06-30.js +3 -3
  51. package/dist/index.d.ts +16 -11
  52. package/dist/index.js +10 -6
  53. package/dist/index.js.map +1 -1
  54. package/dist/member-benefits.d.ts +16 -1
  55. package/dist/member-benefits.js +19 -3
  56. package/dist/member-benefits.js.map +1 -1
  57. package/dist/pension/history.d.ts +0 -8
  58. package/dist/pension/history.js +10 -4
  59. package/dist/pension/history.js.map +1 -1
  60. package/dist/pension/ledger.d.ts +59 -32
  61. package/dist/pension/ledger.js +129 -100
  62. package/dist/pension/ledger.js.map +1 -1
  63. package/dist/pension/prices.d.ts +75 -58
  64. package/dist/pension/prices.js +111 -42
  65. package/dist/pension/prices.js.map +1 -1
  66. package/dist/pension/uplift.d.ts +32 -24
  67. package/dist/pension/uplift.js +66 -18
  68. package/dist/pension/uplift.js.map +1 -1
  69. package/dist/pension-projection.d.ts +3 -3
  70. package/dist/pension-projection.js +8 -13
  71. package/dist/pension-projection.js.map +1 -1
  72. package/dist/sections/section-1995.d.ts +2 -2
  73. package/dist/sections/section-1995.js +3 -3
  74. package/dist/sections/section-1995.js.map +1 -1
  75. package/dist/sections/section-2008.js +5 -3
  76. package/dist/sections/section-2008.js.map +1 -1
  77. package/dist/sections/section-2015.d.ts +8 -7
  78. package/dist/sections/section-2015.js +14 -10
  79. package/dist/sections/section-2015.js.map +1 -1
  80. package/dist/sources.d.ts +3 -0
  81. package/dist/sources.js +14 -0
  82. package/dist/sources.js.map +1 -1
  83. package/package.json +1 -1
@@ -0,0 +1,70 @@
1
+ /**
2
+ * Verbatim transcription — GAD "NHSPS_EW — Consolidated Factor
3
+ * Spreadsheet", table 0-422, factors issued 30 June 2023.
4
+ * Sheet x-422 · PDF p.27.
5
+ *
6
+ * Table 0-422 (LRF2): 2015 scheme late retirement factors for
7
+ * additional pension and pension debits, members retiring from active
8
+ * status. Unisex; period measured as time after NPA, in the same
9
+ * layout as table 0-421 (see lrf-2023-06-30.ts, which carries the
10
+ * methodology note). Additional pension takes this table, not 0-421:
11
+ * the two agree at the pension age and 0-422 is the larger at every
12
+ * month after it.
13
+ *
14
+ * Sources: "NHSBSA, Early and Late Retirement Factors" (the extract)
15
+ * and "GAD NHS_EW Consolidated Factors, version 2026-01" (the
16
+ * workbook, and the source of record) — see docs/source-archive.md.
17
+ * Every one of its 121 cells agrees between the two, and the workbook's
18
+ * Version control sheet shows x-422 last updated in version 2023-02, the
19
+ * `issued` date below.
20
+ *
21
+ * To check it: page 27 of NHSBSA's extract, `sourceUrl` below, or sheet
22
+ * x-422 of the workbook (SA-02 and SA-01 in docs/source-archive.md).
23
+ *
24
+ * Rows are years late (0–10), columns months (0–11), exactly as
25
+ * printed — the 10yr row prints a single 0-month value. Delete this
26
+ * file whole when a later issue supersedes the table.
27
+ */
28
+ import { isoDate } from '../iso-date.js';
29
+ /** 2015 scheme LRF for additional pension — Table 0-422, issued 30 Jun
30
+ * 2023. */
31
+ export const LRF_0_422 = {
32
+ kind: 'lrf',
33
+ index: { by: 'period' },
34
+ provenance: {
35
+ tableRef: '0-422',
36
+ sheet: 'x-422',
37
+ page: 27,
38
+ guidanceRef: 'LRF2',
39
+ issued: isoDate('2023-06-30'),
40
+ sourceUrl: 'https://www.nhsbsa.nhs.uk/sites/default/'
41
+ + 'files/2024-02/Early%20and%20Late%20Retirement'
42
+ + '%20Factors.pdf',
43
+ methodGuidance: 'GAD NHSPS 2015 E&W — Early and late'
44
+ + ' retirement in normal health, 7 Aug 2019',
45
+ },
46
+ rows: [
47
+ [1.000, 1.005, 1.009, 1.014, 1.019, 1.023,
48
+ 1.028, 1.033, 1.037, 1.042, 1.047, 1.051], // 0yr
49
+ [1.056, 1.061, 1.066, 1.071, 1.076, 1.082,
50
+ 1.087, 1.092, 1.097, 1.102, 1.107, 1.112], // 1yr
51
+ [1.117, 1.123, 1.129, 1.134, 1.140, 1.145,
52
+ 1.151, 1.157, 1.162, 1.168, 1.174, 1.179], // 2yr
53
+ [1.185, 1.191, 1.197, 1.203, 1.210, 1.216,
54
+ 1.222, 1.228, 1.234, 1.241, 1.247, 1.253], // 3yr
55
+ [1.259, 1.266, 1.273, 1.280, 1.287, 1.294,
56
+ 1.300, 1.307, 1.314, 1.321, 1.328, 1.335], // 4yr
57
+ [1.342, 1.349, 1.357, 1.364, 1.372, 1.380,
58
+ 1.387, 1.395, 1.402, 1.410, 1.417, 1.425], // 5yr
59
+ [1.433, 1.441, 1.449, 1.458, 1.466, 1.475,
60
+ 1.483, 1.491, 1.500, 1.508, 1.516, 1.525], // 6yr
61
+ [1.533, 1.543, 1.552, 1.561, 1.570, 1.580,
62
+ 1.589, 1.598, 1.608, 1.617, 1.626, 1.635], // 7yr
63
+ [1.645, 1.655, 1.665, 1.675, 1.686, 1.696,
64
+ 1.706, 1.717, 1.727, 1.737, 1.748, 1.758], // 8yr
65
+ [1.768, 1.780, 1.791, 1.802, 1.814, 1.825,
66
+ 1.837, 1.848, 1.860, 1.871, 1.882, 1.894], // 9yr
67
+ [1.905], // 10yr — 0mo only
68
+ ],
69
+ };
70
+ //# sourceMappingURL=lrf-0-422-2023-06-30.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lrf-0-422-2023-06-30.js","sourceRoot":"","sources":["../../src/gad/lrf-0-422-2023-06-30.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAGH,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAEvC;YACY;AACZ,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,EAAC,EAAE,EAAE,QAAQ,EAAC;IACrB,UAAU,EAAE;QACV,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,MAAM;QACnB,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;QAC7B,SAAS,EAAE,0CAA0C;cACjD,+CAA+C;cAC/C,gBAAgB;QACpB,cAAc,EAAE,qCAAqC;cACjD,0CAA0C;KAC/C;IACD,IAAI,EAAE;QACJ,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,CAAC,EAAsC,kBAAkB;KAChE;CACiC,CAAC"}
@@ -17,9 +17,9 @@
17
17
  * Table 0-421 (LRF1): 2015 scheme late retirement factors — main
18
18
  * scheme pension, members retiring from active service. Unisex;
19
19
  * period measured as time after NPA. Methodology remains the
20
- * 7 Aug 2019 guidance (see the ERF file header). The workbook's
21
- * LRF2 (0-422, additional pension / pension debits) is not
22
- * modelled — the library projects main-scheme pension only.
20
+ * 7 Aug 2019 guidance (see the ERF file header). Additional
21
+ * pension takes the workbook's LRF2 instead, table 0-422
22
+ * (lrf-0-422-2023-06-30.ts).
23
23
  *
24
24
  * Rows are years late (0–10), columns months (0–11), exactly as
25
25
  * printed — the 10yr row prints a single 0-month value. Delete
@@ -17,9 +17,9 @@
17
17
  * Table 0-421 (LRF1): 2015 scheme late retirement factors — main
18
18
  * scheme pension, members retiring from active service. Unisex;
19
19
  * period measured as time after NPA. Methodology remains the
20
- * 7 Aug 2019 guidance (see the ERF file header). The workbook's
21
- * LRF2 (0-422, additional pension / pension debits) is not
22
- * modelled — the library projects main-scheme pension only.
20
+ * 7 Aug 2019 guidance (see the ERF file header). Additional
21
+ * pension takes the workbook's LRF2 instead, table 0-422
22
+ * (lrf-0-422-2023-06-30.ts).
23
23
  *
24
24
  * Rows are years late (0–10), columns months (0–11), exactly as
25
25
  * printed — the 10yr row prints a single 0-month value. Delete
package/dist/index.d.ts CHANGED
@@ -15,13 +15,17 @@ export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_PAY_YEARS, getMedicalScales,
15
15
  export type { MedicalGradeId, MedicalGradeMeta, } from './medical-scales.js';
16
16
  export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_PAY_YEARS, getDentalScales, } from './dental-scales.js';
17
17
  export type { DentalGradeId, DentalGradeMeta, } from './dental-scales.js';
18
- export { AmbiguousScalePoint, AwardUnavailable, BenefitNotModelled, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
19
- export type { NotModelled } from './errors.js';
18
+ export { ADDITIONAL_PENSION_LIMIT, ADDITIONAL_PENSION_PAYMENTS, ADDITIONAL_PENSION_UNIT, additionalPensionCost, additionalPensionToBuy, } from './additional-pension.js';
19
+ export type { AdditionalPensionPayment, AdditionalPensionPurchase, } from './additional-pension.js';
20
+ export { ADDITIONAL_PENSION_COVERS } from './gad/additional-pension-table.js';
21
+ export type { AdditionalPensionCover, AdditionalPensionProvenance, } from './gad/additional-pension-table.js';
22
+ export { ADDITIONAL_PENSION_REFUSALS, AdditionalPensionUnavailable, AmbiguousScalePoint, AwardUnavailable, BenefitNotModelled, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
23
+ export type { AdditionalPensionRefusal, NotModelled } from './errors.js';
20
24
  export { DocumentSource } from './document-source.js';
21
25
  export { isoDate, isoMonth, monthOf, firstOfMonth, monthToDate, isoToDate, isoDateOf, } from './iso-date.js';
22
26
  export type { IsoDate, IsoMonth } from './iso-date.js';
23
27
  export type { DocumentSourceFields, SourceCurrency, } from './document-source.js';
24
- export { AFC_ENGLAND_SCALES_2025, AFC_ENGLAND_SCALES_2026, AFC_NI_2025, AFC_SCOTLAND, AFC_SCOTLAND_36_HOUR_WEEK, AFC_W_01_2026, AFC_W_02_2025, AFC_W_02_2026, HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, PC_MD_1_2026_R2, PCS_DD_2025_01, PCS_DD_2025_01_ADDENDUM, PCS_DD_2026_01, PCS_DD_2026_02, } from './sources.js';
28
+ export { AFC_ENGLAND_SCALES_2025, AFC_ENGLAND_SCALES_2026, AFC_NI_2025, AFC_SCOTLAND, AFC_SCOTLAND_36_HOUR_WEEK, AFC_W_01_2026, AFC_W_02_2025, AFC_W_02_2026, AP_FACTSHEET_2026, HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, PC_MD_1_2026_R2, PCS_DD_2025_01, PCS_DD_2025_01_ADDENDUM, PCS_DD_2026_01, PCS_DD_2026_02, } from './sources.js';
25
29
  export { AWARD_FAMILIES, afcAward, anyNationSettled, awardFamilyFor, awardsFor, changesFor, } from './award.js';
26
30
  export type { AwardFamily, ForthcomingChange, PayAward, PayChange, PayScaleId, } from './award.js';
27
31
  export { payRound } from './pay-round.js';
@@ -30,33 +34,34 @@ export { SESSION_ALLOWANCES, afcSessionAllowances, sessionAllowance, } from './a
30
34
  export type { SessionAllowance, SessionAllowanceId, } from './allowances.js';
31
35
  export { ACTIVE_REVAL_BONUS_PCT, IN_SERVICE_REVALUATION, revaluationFor, } from './revaluation.js';
32
36
  export type { RevaluationYear } from './revaluation.js';
33
- export { PAY_BASES, promotionalIndex } from './pay-path.js';
37
+ export { buildPayPath, PAY_BASES, promotionalIndex } from './pay-path.js';
34
38
  export type { PayBasis, PayPath, YearPay } from './pay-path.js';
35
- export { ACCRUALS, memberBenefits, PERIOD_KINDS, REMEDY, REMEDY_BASES, SECTION_OPENED, SECTIONS, } from './member-benefits.js';
39
+ export { ACCRUALS, memberBenefits, PAST_YEARS, PERIOD_KINDS, REMEDY, REMEDY_BASES, SECTION_OPENED, SECTIONS, } from './member-benefits.js';
36
40
  export { PAY_MEASURES } from './sections/final-salary.js';
37
41
  export type { PayMeasure } from './sections/final-salary.js';
38
- export type { Assumptions, Award, DeclaredPeriod, Holdings, LegacyRules, LegacySectionId, Member, MemberBenefits, Position, RemedyBasis, RemedyElection, RetirementChoices, SectionId, ServicePeriod, } from './member-benefits.js';
42
+ export type { Assumptions, Award, DeclaredPeriod, Holdings, LegacyRules, LegacySectionId, Member, MemberBenefits, PastYears, Position, RemedyBasis, RemedyElection, RetirementChoices, SectionId, ServicePeriod, } from './member-benefits.js';
39
43
  export type { DeclaredPay, MemberPay } from './pay-path.js';
40
- export { FACTOR_SOURCES } from './factor-basis.js';
41
- export type { FactorOutcome } from './factor-basis.js';
44
+ export { FACTOR_APPLIES, FACTOR_SOURCES } from './factor-basis.js';
45
+ export type { Applies2015, FactorOutcome } from './factor-basis.js';
46
+ export { factor2015 } from './sections/section-2015.js';
42
47
  export { CASH_CHOICES } from './commutation.js';
43
48
  export type { CashChoice } from './commutation.js';
44
49
  export { ACCRUAL_RATE, erf2015For, factorProvenance, projectPension, retirementFactor, yearlyAccrual, } from './pension-projection.js';
45
50
  export { COMMUTATION_FACTOR, HMRC_LUMP_SUM_CAP_PCT, LUMP_SUM_ALLOWANCE, LUMP_SUM_CAPS, nhsCommutationLimits, VALUATION_FACTOR, commute, } from './commutation.js';
46
51
  export type { CommutationLimits, CommutationResult, DatedAmount, LumpSumCap, LumpSumLimit, LumpSumLimits, } from './commutation.js';
47
- export type { FactorProvenance, FactorTableKind, } from './gad/factor-table.js';
52
+ export type { FactorProvenance, FactorTableKind, GadTableProvenance, } from './gad/factor-table.js';
48
53
  export { normalPensionAge } from './npa.js';
49
54
  export type { PensionEstimationInput, PensionProjectionInput, PensionProjectionResult, PensionStatementInput, } from './pension-projection.js';
50
55
  export type { ProjectionPoint } from './pension/curve.js';
51
56
  export type { ProjectionMoney } from './pension/money.js';
52
- export { createPrices } from './pension/prices.js';
57
+ export { createPrices, createPublishedPrices, inflationFactor, TODAYS_MONEY_CPI, } from './pension/prices.js';
53
58
  export type { CpiEntry, CpiSource, Prices, } from './pension/prices.js';
54
59
  export { activeRatePct, deferredRatePct, upliftsFor, } from './pension/uplift.js';
55
60
  export type { AppliedUplift, MemberPhase, UpliftSource, } from './pension/uplift.js';
56
61
  export { schemeYearClosedBy, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, seedFromJoinDate, seedFromStatement, } from './pension/seed.js';
57
62
  export type { LedgerSeed } from './pension/seed.js';
58
63
  export { buildLedger } from './pension/ledger.js';
59
- export type { AppliedDrawing, LedgerRequest, LedgerYear, MemberLedger, } from './pension/ledger.js';
64
+ export type { AppliedDrawing, AppliedLeaverAdjustment, LedgerRequest, LedgerYear, MemberLedger, } from './pension/ledger.js';
60
65
  export type { EstimatedHistory } from './pension/history.js';
61
66
  export { HCAS_ZONE_IDS, calculateHcasSupplement, grossSalary, isHcasZoneId, } from './hcas.js';
62
67
  export type { HcasZoneId } from './hcas.js';
package/dist/index.js CHANGED
@@ -9,15 +9,18 @@ export { afcResolver, dentalResolver, medicalResolver } from './resolver.js';
9
9
  // ── Medical & dental scales ──────────────────────
10
10
  export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_PAY_YEARS, getMedicalScales, latestMedicalSource, } from './medical-scales.js';
11
11
  export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_PAY_YEARS, getDentalScales, } from './dental-scales.js';
12
+ // ── Additional pension ───────────────────────────
13
+ export { ADDITIONAL_PENSION_LIMIT, ADDITIONAL_PENSION_PAYMENTS, ADDITIONAL_PENSION_UNIT, additionalPensionCost, additionalPensionToBuy, } from './additional-pension.js';
14
+ export { ADDITIONAL_PENSION_COVERS } from './gad/additional-pension-table.js';
12
15
  // ── Errors ───────────────────────────────────────
13
- export { AmbiguousScalePoint, AwardUnavailable, BenefitNotModelled, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
16
+ export { ADDITIONAL_PENSION_REFUSALS, AdditionalPensionUnavailable, AmbiguousScalePoint, AwardUnavailable, BenefitNotModelled, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
14
17
  // ── Cited documents ──────────────────────────────
15
18
  // Every published document the library reads a figure from. A consumer
16
19
  // citing "where these figures come from" reads the record rather than
17
20
  // keeping its own copy of the url.
18
21
  export { DocumentSource } from './document-source.js';
19
22
  export { isoDate, isoMonth, monthOf, firstOfMonth, monthToDate, isoToDate, isoDateOf, } from './iso-date.js';
20
- export { AFC_ENGLAND_SCALES_2025, AFC_ENGLAND_SCALES_2026, AFC_NI_2025, AFC_SCOTLAND, AFC_SCOTLAND_36_HOUR_WEEK, AFC_W_01_2026, AFC_W_02_2025, AFC_W_02_2026, HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, PC_MD_1_2026_R2, PCS_DD_2025_01, PCS_DD_2025_01_ADDENDUM, PCS_DD_2026_01, PCS_DD_2026_02, } from './sources.js';
23
+ export { AFC_ENGLAND_SCALES_2025, AFC_ENGLAND_SCALES_2026, AFC_NI_2025, AFC_SCOTLAND, AFC_SCOTLAND_36_HOUR_WEEK, AFC_W_01_2026, AFC_W_02_2025, AFC_W_02_2026, AP_FACTSHEET_2026, HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, PC_MD_1_2026_R2, PCS_DD_2025_01, PCS_DD_2025_01_ADDENDUM, PCS_DD_2026_01, PCS_DD_2026_02, } from './sources.js';
21
24
  // ── Pay awards ───────────────────────────────────
22
25
  export { AWARD_FAMILIES, afcAward, anyNationSettled, awardFamilyFor, awardsFor, changesFor, } from './award.js';
23
26
  // ── Pay rounds ───────────────────────────────────
@@ -31,14 +34,15 @@ export { ACTIVE_REVAL_BONUS_PCT, IN_SERVICE_REVALUATION, revaluationFor, } from
31
34
  // GAD's promotional curve is the same for everybody, so it is public;
32
35
  // a member's pay path is built inside and reached through the member's
33
36
  // benefits.
34
- export { PAY_BASES, promotionalIndex } from './pay-path.js';
37
+ export { buildPayPath, PAY_BASES, promotionalIndex } from './pay-path.js';
35
38
  // ── Member benefits ────────────────────────────────
36
39
  // A member's benefits across every section they hold: built once from
37
40
  // the member, asked once per set of retirement choices. The sections
38
41
  // themselves are internal.
39
- export { ACCRUALS, memberBenefits, PERIOD_KINDS, REMEDY, REMEDY_BASES, SECTION_OPENED, SECTIONS, } from './member-benefits.js';
42
+ export { ACCRUALS, memberBenefits, PAST_YEARS, PERIOD_KINDS, REMEDY, REMEDY_BASES, SECTION_OPENED, SECTIONS, } from './member-benefits.js';
40
43
  export { PAY_MEASURES } from './sections/final-salary.js';
41
- export { FACTOR_SOURCES } from './factor-basis.js';
44
+ export { FACTOR_APPLIES, FACTOR_SOURCES } from './factor-basis.js';
45
+ export { factor2015 } from './sections/section-2015.js';
42
46
  export { CASH_CHOICES } from './commutation.js';
43
47
  // ── Pension Projection ─────────────────────────────
44
48
  // The 2015 Section's scenario-level API, plus yearlyAccrual (one
@@ -57,7 +61,7 @@ export { COMMUTATION_FACTOR, HMRC_LUMP_SUM_CAP_PCT, LUMP_SUM_ALLOWANCE, LUMP_SUM
57
61
  export { normalPensionAge } from './npa.js';
58
62
  // ── The pension ledger ───────────────────────────────
59
63
  // A consumer reads the ledger only when it wants the workings.
60
- export { createPrices } from './pension/prices.js';
64
+ export { createPrices, createPublishedPrices, inflationFactor, TODAYS_MONEY_CPI, } from './pension/prices.js';
61
65
  export { activeRatePct, deferredRatePct, upliftsFor, } from './pension/uplift.js';
62
66
  export { schemeYearClosedBy, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, seedFromJoinDate, seedFromStatement, } from './pension/seed.js';
63
67
  export { buildLedger } from './pension/ledger.js';
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -41,10 +41,24 @@ export interface Member {
41
41
  readonly asAt: IsoDate;
42
42
  } | null;
43
43
  }
44
+ /** How the cash ruler reads the years behind the run date. */
45
+ export declare const PAST_YEARS: {
46
+ /** The assumption throughout, as for the years ahead. */
47
+ readonly assumed: "assumed";
48
+ /** The published record: each year's Revaluation Order, and pay
49
+ * carried into each year's cash by the same Orders' CPI, an
50
+ * approximation to the pay awards — the ledger an Annual Benefit
51
+ * Statement prints. See `createPublishedPrices`. */
52
+ readonly published: "published";
53
+ };
54
+ export type PastYears = (typeof PAST_YEARS)[keyof typeof PAST_YEARS];
44
55
  /** Fixed for one valuation, and worth disclosing beside it. Pay growth is
45
56
  * not here: it is GAD's published curve, the same for everybody. */
46
57
  export interface Assumptions {
47
58
  readonly assumedCpi: number;
59
+ /** Which cash ledger comes back, so the caller names it. The
60
+ * today's-money ruler is the assumption at zero either way. */
61
+ readonly pastYears: PastYears;
48
62
  }
49
63
  /**
50
64
  * How the remedy window is valued, for a member who has one: as more
@@ -64,7 +78,8 @@ export type RemedyElection = {
64
78
  };
65
79
  /** One set of choices; a caller comparing options asks once for each. */
66
80
  export interface RetirementChoices {
67
- /** Stops accruing. Accrues the whole scheme year it falls in. */
81
+ /** The last day of pensionable service: its scheme year accrues
82
+ * for the months served to it. */
68
83
  readonly leaving: IsoDate;
69
84
  /** Every section is drawn on this one date. Drawing sections on
70
85
  * different dates, and partial retirement, are deferred:
@@ -27,7 +27,7 @@ import { buildCurve, walkThrough } from './pension/curve.js';
27
27
  import { seedFromBalanceAt } from './pension/uplift.js';
28
28
  import { estimateHistory } from './pension/history.js';
29
29
  import { moneyAt, sumMoney } from './pension/money.js';
30
- import { createPrices } from './pension/prices.js';
30
+ import { createPrices, createPublishedPrices, TODAYS_MONEY_CPI, } from './pension/prices.js';
31
31
  import { schemeYearEndDate, schemeYearEndFor, seedFromJoinDate, } from './pension/seed.js';
32
32
  import { finalSalaryBenefit, unreducedPension, } from './sections/final-salary.js';
33
33
  import { RULES_1995 } from './sections/section-1995.js';
@@ -45,6 +45,22 @@ export const SECTIONS = {
45
45
  s2008: 'section-2008',
46
46
  s2015: 'section-2015',
47
47
  };
48
+ /** How the cash ruler reads the years behind the run date. */
49
+ export const PAST_YEARS = {
50
+ /** The assumption throughout, as for the years ahead. */
51
+ assumed: 'assumed',
52
+ /** The published record: each year's Revaluation Order, and pay
53
+ * carried into each year's cash by the same Orders' CPI, an
54
+ * approximation to the pay awards — the ledger an Annual Benefit
55
+ * Statement prints. See `createPublishedPrices`. */
56
+ published: 'published',
57
+ };
58
+ /** The price series each reading of the past is priced on. Total over
59
+ * `PastYears`, so a new reading fails the build until it has one. */
60
+ const CASH_SERIES = {
61
+ [PAST_YEARS.assumed]: createPrices,
62
+ [PAST_YEARS.published]: createPublishedPrices,
63
+ };
48
64
  /**
49
65
  * How the remedy window is valued, for a member who has one: as more
50
66
  * service in their legacy section, or under the 2015 Section's rules
@@ -425,8 +441,8 @@ export function memberBenefits(member, assumptions, today) {
425
441
  payPath: buildPayPath(member.dateOfBirth, member.pay),
426
442
  legacy,
427
443
  ordinary2015,
428
- cashPrices: createPrices(assumptions.assumedCpi, today),
429
- todaysPrices: createPrices(0, today),
444
+ cashPrices: CASH_SERIES[assumptions.pastYears](assumptions.assumedCpi, today),
445
+ todaysPrices: createPrices(TODAYS_MONEY_CPI, today),
430
446
  };
431
447
  return {
432
448
  periods,
@@ -1 +1 @@
1
- {"version":3,"file":"member-benefits.js","sourceRoot":"","sources":["../src/member-benefits.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"member-benefits.js","sourceRoot":"","sources":["../src/member-benefits.ts"],"names":[],"mappings":"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"}
@@ -89,14 +89,6 @@ export interface EstimatedHistory {
89
89
  readonly from: number;
90
90
  readonly to: number;
91
91
  }
92
- /**
93
- * Estimate the years from `joinDate` up to a stated balance.
94
- *
95
- * Null when there is nothing to draw — a member who joined in
96
- * or after the statement's own scheme year has no run-up, and
97
- * inventing one would put pension on the chart before they had
98
- * any.
99
- */
100
92
  export declare function estimateHistory({ joinDate, statedBalance, statementSchemeYearEnd, prices, }: {
101
93
  joinDate: Date;
102
94
  statedBalance: number;
@@ -79,19 +79,25 @@ import { firstWalkedYear, schemeYearEndDate, seedFromJoinDate, } from './seed.js
79
79
  * inventing one would put pension on the chart before they had
80
80
  * any.
81
81
  */
82
+ /** Far enough past the statement that no leaving or drawing date
83
+ * falls inside the estimated window. */
84
+ const YEARS_BEYOND_THE_WINDOW = 60;
82
85
  export function estimateHistory({ joinDate, statedBalance, statementSchemeYearEnd, prices, }) {
83
86
  const seed = seedFromJoinDate(joinDate);
84
87
  const first = firstWalkedYear(seed);
85
88
  if (first > statementSchemeYearEnd || statedBalance <= 0) {
86
89
  return null;
87
90
  }
91
+ const beyondTheWindow = schemeYearEndDate(statementSchemeYearEnd + YEARS_BEYOND_THE_WINDOW);
88
92
  const walk = (pay) => buildLedger({
89
93
  seed,
90
94
  payIn: flatPay(pay),
91
- // Accruing throughout, and drawing far enough out that no
92
- // retirement factor lands inside the window.
93
- exitDate: schemeYearEndDate(statementSchemeYearEnd),
94
- retirementDate: schemeYearEndDate(statementSchemeYearEnd + 60),
95
+ // Still in service at the statement, so neither leaving nor
96
+ // drawing lands inside the window: `through` ends the walk, and
97
+ // a leaving date there would give the member a leaver adjustment
98
+ // for a year they carried on working.
99
+ exitDate: beyondTheWindow,
100
+ retirementDate: beyondTheWindow,
95
101
  prices,
96
102
  drawingFor: () => null,
97
103
  through: statementSchemeYearEnd,
@@ -1 +1 @@
1
- {"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/pension/history.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsEG;AAEH,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAGjD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,WAAW,CAAC;AAqBnB;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,EAC9B,QAAQ,EACR,aAAa,EACb,sBAAsB,EACtB,MAAM,GAMP;IACC,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,sBAAsB,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,WAAW,CAAC;QACxC,IAAI;QACJ,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;QACnB,0DAA0D;QAC1D,6CAA6C;QAC7C,QAAQ,EAAE,iBAAiB,CAAC,sBAAsB,CAAC;QACnD,cAAc,EAAE,iBAAiB,CAAC,sBAAsB,GAAG,EAAE,CAAC;QAC9D,MAAM;QACN,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;QACtB,OAAO,EAAE,sBAAsB;KAChC,CAAC,CAAC;IAEH,4DAA4D;IAC5D,kDAAkD;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAC3D,wDAAwD;IACxD,6DAA6D;IAC7D,2DAA2D;IAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAE7D,MAAM,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC;IAC5C,OAAO;QACL,UAAU;QACV,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC;QACxB,IAAI,EAAE,KAAK;QACX,EAAE,EAAE,sBAAsB;KAC3B,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"history.js","sourceRoot":"","sources":["../../src/pension/history.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsEG;AAEH,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAGjD,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,WAAW,CAAC;AAqBnB;;;;;;;GAOG;AACH;yCACyC;AACzC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAEnC,MAAM,UAAU,eAAe,CAAC,EAC9B,QAAQ,EACR,aAAa,EACb,sBAAsB,EACtB,MAAM,GAMP;IACC,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,GAAG,sBAAsB,IAAI,aAAa,IAAI,CAAC,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,iBAAiB,CACvC,sBAAsB,GAAG,uBAAuB,CACjD,CAAC;IACF,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,WAAW,CAAC;QACxC,IAAI;QACJ,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;QACnB,4DAA4D;QAC5D,gEAAgE;QAChE,iEAAiE;QACjE,sCAAsC;QACtC,QAAQ,EAAE,eAAe;QACzB,cAAc,EAAE,eAAe;QAC/B,MAAM;QACN,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;QACtB,OAAO,EAAE,sBAAsB;KAChC,CAAC,CAAC;IAEH,4DAA4D;IAC5D,kDAAkD;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IAC3D,wDAAwD;IACxD,6DAA6D;IAC7D,2DAA2D;IAC3D,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAE7D,MAAM,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC;IAC5C,OAAO;QACL,UAAU;QACV,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC;QACxB,IAAI,EAAE,KAAK;QACX,EAAE,EAAE,sBAAsB;KAC3B,CAAC;AACJ,CAAC"}
@@ -2,12 +2,13 @@
2
2
  * The member's pension as a balance-forward periodic ledger.
3
3
  *
4
4
  * closing(N) = [closing(N−1) × (1 + uplift(N)) + earned(N)]
5
- * × factor(N)
5
+ * × (1 + leaver(N)) × factor(N)
6
6
  *
7
- * One uniform row per scheme year. `factor` is 1 on every row but
8
- * the retirement one, so there is no branch in the recurrence —
9
- * only a multiplier that is usually the identity, the same trick
10
- * as an uplift of zero.
7
+ * One uniform row per scheme year. `leaver` is 0 on every row but
8
+ * the one the member leaves in, and `factor` 1 on every row but the
9
+ * retirement one, so there is no branch in the recurrence — only
10
+ * multipliers that are usually the identity, the same trick as an
11
+ * uplift of zero.
11
12
  *
12
13
  * **The order is load-bearing.** The pot is revalued FIRST and
13
14
  * the year's slice added after, so a slice earns no revaluation
@@ -20,18 +21,9 @@
20
21
  */
21
22
  import type { FactorProvenance, FactorTableKind } from '../gad/factor-table.js';
22
23
  import type { PayBasis, YearPay } from '../pay-path.js';
23
- import type { Prices } from './prices.js';
24
+ import type { CpiEntry, Prices } from './prices.js';
24
25
  import type { AppliedUplift, MemberPhase } from './uplift.js';
25
26
  import type { LedgerSeed } from './seed.js';
26
- /**
27
- * 1/54 of pensionable pay, the 2015 CARE accrual rate — NHSBSA
28
- * 2015 Members' Guide (V13) p.6.
29
- *
30
- * Lives beside the recurrence that applies it, so the row's own
31
- * slice and every figure a consumer reads come from one constant
32
- * rather than a literal here and a name somewhere else.
33
- */
34
- export declare const ACCRUAL_RATE: number;
35
27
  /** The retirement event, recorded on the year it falls in. */
36
28
  export interface AppliedDrawing {
37
29
  /** The retirement date itself — drawing is date-based, by
@@ -48,13 +40,25 @@ export interface AppliedDrawing {
48
40
  readonly provenance: FactorProvenance;
49
41
  } | null;
50
42
  }
51
- /** What a ledger row's earnings rest on beyond a pay path's own bases:
52
- * one flat figure the caller assumed, or nothing earned. */
53
- declare const LEDGER_BASES: {
54
- readonly assumed: "assumed";
55
- readonly none: "none";
56
- };
57
- export type EarningsBasis = (typeof LEDGER_BASES)[keyof typeof LEDGER_BASES] | PayBasis;
43
+ /**
44
+ * The leaver index adjustment (SI 2015/94 Sch 9 para 3): the
45
+ * in-service rate for the leaving year, scaled by the months served
46
+ * in it, applied to the whole accrued balance on the last day.
47
+ */
48
+ export interface AppliedLeaverAdjustment {
49
+ /** The last day of pensionable service, the day it applies. */
50
+ readonly on: Date;
51
+ /** Percentage points on the whole accrued balance: the leaving
52
+ * year's in-service rate × months / 12, a share of it rather than
53
+ * a year's rate, and never below zero (para 3(2A)). */
54
+ readonly percent: number;
55
+ /** Months served in the leaving year, a part month of 16 days or
56
+ * more counting as one (para 3(3)). */
57
+ readonly months: number;
58
+ /** The CPI row the in-service rate derives from, as an uplift
59
+ * carries its own. */
60
+ readonly from: CpiEntry;
61
+ }
58
62
  /** One scheme year, accounted for the way the scheme accounts
59
63
  * for it. Every field is nominal £/yr unless said otherwise. */
60
64
  export interface LedgerYear {
@@ -94,9 +98,15 @@ export interface LedgerYear {
94
98
  readonly uplift: AppliedUplift | null;
95
99
  /** opening × (1 + uplift), before this year's slice. */
96
100
  readonly revalued: number;
101
+ /** On the row the member leaves in, the in-service rate for the
102
+ * months they served in it; null on every other row. */
103
+ readonly leaverAdjustment: AppliedLeaverAdjustment | null;
104
+ /** (revalued + earned) × (1 + leaver adjustment): the entitlement
105
+ * before any retirement factor. */
106
+ readonly accrued: number;
97
107
  /** The retirement transform, on the one row where it happens. */
98
108
  readonly drawing: AppliedDrawing | null;
99
- /** (revalued + earned) × factor. Before the drawing row an
109
+ /** accrued × factor. Before the drawing row an
100
110
  * accrued ENTITLEMENT; after it, a pension IN PAYMENT — the
101
111
  * same money, with `drawing` the dated record of the moment it
102
112
  * changed character. */
@@ -141,11 +151,6 @@ export type PayIn = (schemeYearEnd: number) => YearPay | {
141
151
  readonly pay: number;
142
152
  readonly basis: typeof LEDGER_BASES.assumed;
143
153
  } | null;
144
- /**
145
- * One figure held flat every year, in today's money: no promotion, no
146
- * progression, and every row saying its pay was assumed.
147
- */
148
- export declare function flatPay(pay: number): PayIn;
149
154
  export interface LedgerRequest {
150
155
  readonly seed: LedgerSeed;
151
156
  /**
@@ -170,10 +175,11 @@ export interface LedgerRequest {
170
175
  */
171
176
  readonly payIn: PayIn;
172
177
  /**
173
- * A date in the last scheme year of service. Only the year it
174
- * names is read: the member is active for all of it and the
175
- * in-service rate stops at its close, so two dates inside one
176
- * scheme year are the same input — see `rowFor`.
178
+ * The last day of pensionable service. The year it falls in earns
179
+ * pay for the months served to it and takes the leaver index
180
+ * adjustment for them; the first increase after it is
181
+ * proportionate to the months since. A 31 March date is a whole
182
+ * final year — see `rowFor`.
177
183
  */
178
184
  readonly exitDate: Date;
179
185
  readonly retirementDate: Date;
@@ -183,6 +189,27 @@ export interface LedgerRequest {
183
189
  /** Last scheme year to walk. */
184
190
  readonly through: number;
185
191
  }
192
+ /**
193
+ * 1/54 of pensionable pay, the 2015 CARE accrual rate — NHSBSA
194
+ * 2015 Members' Guide (V13) p.6.
195
+ *
196
+ * Lives beside the recurrence that applies it, so the row's own
197
+ * slice and every figure a consumer reads come from one constant
198
+ * rather than a literal here and a name somewhere else.
199
+ */
200
+ export declare const ACCRUAL_RATE: number;
201
+ /** What a ledger row's earnings rest on beyond a pay path's own bases:
202
+ * one flat figure the caller assumed, or nothing earned. */
203
+ declare const LEDGER_BASES: {
204
+ readonly assumed: "assumed";
205
+ readonly none: "none";
206
+ };
207
+ export type EarningsBasis = (typeof LEDGER_BASES)[keyof typeof LEDGER_BASES] | PayBasis;
208
+ /**
209
+ * One figure held flat every year, in today's money: no promotion, no
210
+ * progression, and every row saying its pay was assumed.
211
+ */
212
+ export declare function flatPay(pay: number): PayIn;
186
213
  export declare function buildLedger(req: LedgerRequest): MemberLedger;
187
214
  /**
188
215
  * The pension at the drawing, before and after its factor, read off