@casomoltd/nhs-pay 0.29.0 → 0.31.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 (80) hide show
  1. package/README.md +78 -249
  2. package/dist/bands.d.ts +9 -1
  3. package/dist/bands.js +20 -0
  4. package/dist/bands.js.map +1 -1
  5. package/dist/dates.d.ts +3 -0
  6. package/dist/dates.js +7 -2
  7. package/dist/dates.js.map +1 -1
  8. package/dist/document-source.d.ts +16 -0
  9. package/dist/document-source.js +3 -1
  10. package/dist/document-source.js.map +1 -1
  11. package/dist/errors.d.ts +46 -11
  12. package/dist/errors.js +68 -28
  13. package/dist/errors.js.map +1 -1
  14. package/dist/factor-basis.d.ts +14 -0
  15. package/dist/factor-basis.js.map +1 -1
  16. package/dist/index.d.ts +13 -11
  17. package/dist/index.js +6 -5
  18. package/dist/index.js.map +1 -1
  19. package/dist/member/benefits.js +41 -39
  20. package/dist/member/benefits.js.map +1 -1
  21. package/dist/member/index.d.ts +1 -1
  22. package/dist/member/input-period.d.ts +41 -0
  23. package/dist/member/input-period.js +168 -0
  24. package/dist/member/input-period.js.map +1 -0
  25. package/dist/member/service.d.ts +8 -1
  26. package/dist/member/service.js +18 -1
  27. package/dist/member/service.js.map +1 -1
  28. package/dist/member/types.d.ts +101 -44
  29. package/dist/member/types.js.map +1 -1
  30. package/dist/member/valuation.d.ts +72 -14
  31. package/dist/member/valuation.js +115 -34
  32. package/dist/member/valuation.js.map +1 -1
  33. package/dist/pay-path.d.ts +21 -25
  34. package/dist/pay-path.js +85 -67
  35. package/dist/pay-path.js.map +1 -1
  36. package/dist/pension/ages.d.ts +6 -4
  37. package/dist/pension/ages.js +6 -4
  38. package/dist/pension/ages.js.map +1 -1
  39. package/dist/pension/curve.d.ts +2 -1
  40. package/dist/pension/curve.js +15 -7
  41. package/dist/pension/curve.js.map +1 -1
  42. package/dist/pension/history.d.ts +18 -3
  43. package/dist/pension/history.js +12 -5
  44. package/dist/pension/history.js.map +1 -1
  45. package/dist/pension/ledger.d.ts +15 -9
  46. package/dist/pension/ledger.js +91 -56
  47. package/dist/pension/ledger.js.map +1 -1
  48. package/dist/pension/prices.d.ts +11 -2
  49. package/dist/pension/prices.js +35 -14
  50. package/dist/pension/prices.js.map +1 -1
  51. package/dist/pension/scheme-year.d.ts +59 -0
  52. package/dist/pension/scheme-year.js +80 -0
  53. package/dist/pension/scheme-year.js.map +1 -0
  54. package/dist/pension/seed.d.ts +66 -50
  55. package/dist/pension/seed.js +111 -65
  56. package/dist/pension/seed.js.map +1 -1
  57. package/dist/pension/uplift.d.ts +13 -33
  58. package/dist/pension/uplift.js +11 -56
  59. package/dist/pension/uplift.js.map +1 -1
  60. package/dist/pension-projection.js +30 -22
  61. package/dist/pension-projection.js.map +1 -1
  62. package/dist/post.d.ts +1 -10
  63. package/dist/post.js +1 -12
  64. package/dist/post.js.map +1 -1
  65. package/dist/revaluation.d.ts +34 -35
  66. package/dist/revaluation.js +41 -41
  67. package/dist/revaluation.js.map +1 -1
  68. package/dist/scale-point.d.ts +6 -0
  69. package/dist/sections/final-salary.d.ts +64 -52
  70. package/dist/sections/final-salary.js +131 -69
  71. package/dist/sections/final-salary.js.map +1 -1
  72. package/dist/sections/section-2015.d.ts +2 -1
  73. package/dist/sections/section-2015.js.map +1 -1
  74. package/dist/sources.d.ts +10 -0
  75. package/dist/sources.js +20 -0
  76. package/dist/sources.js.map +1 -1
  77. package/dist/take-home.d.ts +4 -20
  78. package/dist/take-home.js +3 -23
  79. package/dist/take-home.js.map +1 -1
  80. package/package.json +3 -3
@@ -1,34 +1,14 @@
1
- /**
2
- * The final-salary engine the 1995 and 2008 Sections share. What
3
- * differs between them is statute — the denominator, the pay measure,
4
- * the lump sum, which factors apply — and each section holds its own
5
- * rules privately, so no caller can compose a combination the scheme
6
- * lacks, such as a 60 denominator on best-single-year pay.
7
- */
8
- import type { FactorOutcome } from '../factor-basis.js';
1
+ import type { Factored, FactorOutcome } from '../factor-basis.js';
9
2
  import type { PayPath } from '../pay-path.js';
10
- import type { ProjectionMoney } from '../pension/money.js';
11
3
  import type { Prices } from '../pension/prices.js';
12
- /** A window of service valued on final salary, as dates. */
13
- interface Membership {
14
- readonly from: Date;
15
- /** The last day of service in it, inclusive. */
16
- readonly to: Date;
17
- }
18
- /** How a section measures final pay, named for an award's provenance.
19
- * The measuring itself is each section's own `finalPay`. */
20
- export declare const PAY_MEASURES: {
21
- readonly bestSingleOf3: "best-single-of-3";
22
- readonly meanOf3ConsecutiveIn10: "mean-of-3-consecutive-in-10";
23
- };
24
- export type PayMeasure = (typeof PAY_MEASURES)[keyof typeof PAY_MEASURES];
25
- /** A factor for a final-salary benefit drawn on `drawn`. */
26
- type FactorFor = (dateOfBirth: Date, leaving: Date, drawn: Date) => FactorOutcome;
4
+ /** The fraction of final pay a year of membership earns: an 80th in the
5
+ * 1995 Section, a 60th in the 2008. */
6
+ type Denominator = 80 | 60;
27
7
  /** One section's statute, private to that section: each rule is the
28
8
  * section's own behaviour, so the engine never branches on which
29
9
  * section it is valuing. */
30
10
  export interface FinalSalaryRules {
31
- readonly denominator: 80 | 60;
11
+ readonly denominator: Denominator;
32
12
  readonly payMeasure: PayMeasure;
33
13
  /** The age the section's pension is payable unreduced, in whole
34
14
  * years: what its early and late factors are measured from. */
@@ -37,9 +17,8 @@ export interface FinalSalaryRules {
37
17
  * section's `pensionFactor` must agree, which
38
18
  * `section-factors.test.ts` asserts. */
39
19
  readonly lateUplift: boolean;
40
- /** Final pay in today's money over the scheme years up to and
41
- * including `lastYear`. */
42
- finalPay(payPath: PayPath, lastYear: number): number;
20
+ /** Final pay in today's money, measured back from `leaving`. */
21
+ finalPay(payPath: PayPath, leaving: Date): number;
43
22
  readonly pensionFactor: FactorFor;
44
23
  /** The automatic lump sum, as a multiple of the unreduced pension,
45
24
  * and the factor it is reduced by; null where the section pays
@@ -49,35 +28,36 @@ export interface FinalSalaryRules {
49
28
  readonly factor: FactorFor;
50
29
  } | null;
51
30
  }
52
- /** The 1995 Section's measure: the best single year of the last
53
- * three. */
54
- export declare function bestSingleOf3(payPath: PayPath, lastYear: number): number;
55
- /** The 2008 Section's measure: the best average of three consecutive
56
- * years in the last ten, each "revalued to current terms", which a
57
- * path already in today's money is. */
58
- export declare function meanOf3ConsecutiveIn10(payPath: PayPath, lastYear: number): number;
59
- /**
60
- * A final-salary pension before any factor, in today's money: the
61
- * membership, over the denominator, times final pay measured at
62
- * `lastYear`. The one place the formula is written, so the pension
63
- * held today and the pension drawn cannot come to disagree.
64
- */
65
- export declare function unreducedPension(rules: FinalSalaryRules, windows: readonly Membership[], payPath: PayPath, lastYear: number): {
66
- membership: number;
67
- finalPay: number;
68
- pension: number;
69
- automaticLumpSum: number;
70
- };
31
+ /** A factor for a final-salary benefit drawn on `drawn`. */
32
+ type FactorFor = (dateOfBirth: Date, leaving: Date, drawn: Date) => FactorOutcome;
33
+ /** A window of service valued on final salary, as dates. */
34
+ export interface Membership {
35
+ readonly from: Date;
36
+ /** The last day of service in it, inclusive. */
37
+ readonly to: Date;
38
+ }
39
+ /** A final-salary pension before any factor, and what it is measured
40
+ * from, in today's money. */
41
+ export interface UnreducedPension {
42
+ readonly membership: number;
43
+ readonly finalPay: number;
44
+ readonly pension: number;
45
+ readonly automaticLumpSum: number;
46
+ }
71
47
  /** A final-salary pension and lump sum, before and after factors. */
72
48
  interface FinalSalaryBenefit {
73
- readonly beforeFactor: ProjectionMoney;
74
- readonly pension: ProjectionMoney;
75
- readonly automaticLumpSum: ProjectionMoney;
76
- readonly automaticLumpSumBeforeFactor: ProjectionMoney;
77
- readonly factor: FactorOutcome;
49
+ readonly pension: Factored;
50
+ readonly automaticLumpSum: Factored<FactorOutcome | null>;
78
51
  readonly membership: number;
79
52
  readonly finalPay: number;
80
53
  }
54
+ /** How a section measures final pay, named for an award's provenance.
55
+ * The measuring itself is each section's own `finalPay`. */
56
+ export declare const PAY_MEASURES: {
57
+ readonly bestSingleOf3: "best-single-of-3";
58
+ readonly meanOf3ConsecutiveIn10: "mean-of-3-consecutive-in-10";
59
+ };
60
+ export type PayMeasure = (typeof PAY_MEASURES)[keyof typeof PAY_MEASURES];
81
61
  /**
82
62
  * Value final-salary membership at a drawing.
83
63
  *
@@ -95,4 +75,36 @@ export declare function finalSalaryBenefit(rules: FinalSalaryRules, { windows, p
95
75
  readonly drawing: Date;
96
76
  readonly prices: Prices;
97
77
  }): FinalSalaryBenefit;
78
+ /**
79
+ * A final-salary pension before any factor, in today's money: the
80
+ * membership, over the denominator, times final pay measured back from
81
+ * `leaving`. The one place the formula is written, so the pension
82
+ * held today and the pension drawn cannot come to disagree.
83
+ */
84
+ export declare function unreducedPension(rules: FinalSalaryRules, windows: readonly Membership[], payPath: PayPath, leaving: Date): UnreducedPension;
85
+ /**
86
+ * The 1995 Section's measure: the best single year of the last three,
87
+ * each year the 12 months ending on a leaving anniversary. SI 1995/300
88
+ * reg C1(6): "final year's pensionable pay" is "pensionable pay in
89
+ * respect of the member's last year of pensionable employment, ending on
90
+ * the date the member ceases to be in such employment", unless "pensionable
91
+ * pay was greater in either or both of the 2 consecutive years immediately
92
+ * preceding the last year".
93
+ */
94
+ export declare function bestSingleOf3(payPath: PayPath, leaving: Date): number;
95
+ /**
96
+ * The 2008 Section's measure: the best average of three consecutive
97
+ * years in the last ten, measured back from leaving, each "revalued to
98
+ * current terms", which a path already in today's money is. SI 2008/653
99
+ * reg 2.A.10(5)(b) compares "the period of 1095 days immediately
100
+ * preceding the relevant day (Period 1)", then "the period of 1095 days
101
+ * which overlaps Period 1 by 730 days (Period 2)", "and so on", and
102
+ * 2.A.10(6) takes the one that begins "within the period of 10 years
103
+ * ending with the relevant day" with the highest pay; for a leaver,
104
+ * 2.A.10(5)(a)(i) makes the relevant day "the day on which the member's
105
+ * active membership ceases". The short-service rule of 2.A.10(7), for
106
+ * under 1095 days' service in the ten years, is not modelled: it moves
107
+ * only a member with less than three years' service before leaving.
108
+ */
109
+ export declare function meanOf3ConsecutiveIn10(payPath: PayPath, leaving: Date): number;
98
110
  export {};
@@ -1,12 +1,117 @@
1
+ /**
2
+ * The final-salary engine the 1995 and 2008 Sections share. What
3
+ * differs between them is statute — the denominator, the pay measure,
4
+ * the lump sum, which factors apply — and each section holds its own
5
+ * rules privately, so no caller can compose a combination the scheme
6
+ * lacks, such as a 60 denominator on best-single-year pay.
7
+ */
8
+ import { dayAfter, daysBetween } from '../dates.js';
1
9
  import { moneyAt } from '../pension/money.js';
2
- import { schemeYearEndFor } from '../pension/seed.js';
10
+ import { schemeYearAfter, schemeYearEnd, schemeYearEndFor, schemeYearStartDate, } from '../pension/scheme-year.js';
3
11
  /** How a section measures final pay, named for an award's provenance.
4
12
  * The measuring itself is each section's own `finalPay`. */
5
13
  export const PAY_MEASURES = {
6
14
  bestSingleOf3: 'best-single-of-3',
7
15
  meanOf3ConsecutiveIn10: 'mean-of-3-consecutive-in-10',
8
16
  };
9
- const MS_PER_DAY = 24 * 60 * 60 * 1000;
17
+ /** The years the 1995 Section's best single year is chosen from: the
18
+ * last three. */
19
+ const BEST_SINGLE_OF_YEARS = 3;
20
+ /** The consecutive years the 2008 Section's measure averages. */
21
+ const CONSECUTIVE_YEARS = 3;
22
+ /** The last years those consecutive years must fall inside. */
23
+ const CONSECUTIVE_WITHIN_YEARS = 10;
24
+ /** The divisor for membership's odd days: see `membershipYears`. */
25
+ const DAYS_PER_MEMBERSHIP_YEAR = 365;
26
+ /**
27
+ * Value final-salary membership at a drawing.
28
+ *
29
+ * The pension is measured once, on the pay at leaving — final salary
30
+ * linkage: membership may have frozen years earlier, but the pay
31
+ * measure did not. In today's money that is the figure; in cash it is
32
+ * the same figure carried to the drawing date at the assumption, since
33
+ * pay and a deferred legacy pension both move with prices.
34
+ */
35
+ export function finalSalaryBenefit(rules, { windows, payPath, dateOfBirth, leaving, drawing, prices }) {
36
+ const { membership, finalPay: pay, pension: unreduced, automaticLumpSum: unreducedLump, } = unreducedPension(rules, windows, payPath, leaving);
37
+ const pensionFactor = rules.pensionFactor(dateOfBirth, leaving, drawing);
38
+ const lump = rules.automaticLumpSum;
39
+ const lumpFactor = lump === null
40
+ ? null
41
+ : lump.factor(dateOfBirth, leaving, drawing);
42
+ const lumpSum = lumpFactor === null ? 0 : unreducedLump * lumpFactor.factor;
43
+ const money = (real) => moneyAt({ real, nominal: prices.payAt(real, drawing) }, drawing);
44
+ return {
45
+ pension: {
46
+ beforeFactor: money(unreduced),
47
+ after: money(unreduced * pensionFactor.factor),
48
+ factor: pensionFactor,
49
+ },
50
+ automaticLumpSum: {
51
+ beforeFactor: money(unreducedLump),
52
+ after: money(lumpSum),
53
+ factor: lumpFactor,
54
+ },
55
+ membership,
56
+ finalPay: pay,
57
+ };
58
+ }
59
+ /**
60
+ * A final-salary pension before any factor, in today's money: the
61
+ * membership, over the denominator, times final pay measured back from
62
+ * `leaving`. The one place the formula is written, so the pension
63
+ * held today and the pension drawn cannot come to disagree.
64
+ */
65
+ export function unreducedPension(rules, windows, payPath, leaving) {
66
+ const membership = membershipYears(windows);
67
+ const pay = rules.finalPay(payPath, leaving);
68
+ const pension = (membership / rules.denominator) * pay;
69
+ return {
70
+ membership,
71
+ finalPay: pay,
72
+ pension,
73
+ automaticLumpSum: (rules.automaticLumpSum?.multiple ?? 0) * pension,
74
+ };
75
+ }
76
+ /**
77
+ * The 1995 Section's measure: the best single year of the last three,
78
+ * each year the 12 months ending on a leaving anniversary. SI 1995/300
79
+ * reg C1(6): "final year's pensionable pay" is "pensionable pay in
80
+ * respect of the member's last year of pensionable employment, ending on
81
+ * the date the member ceases to be in such employment", unless "pensionable
82
+ * pay was greater in either or both of the 2 consecutive years immediately
83
+ * preceding the last year".
84
+ */
85
+ export function bestSingleOf3(payPath, leaving) {
86
+ return Math.max(...yearsTo(payPath, leaving, BEST_SINGLE_OF_YEARS));
87
+ }
88
+ /**
89
+ * The 2008 Section's measure: the best average of three consecutive
90
+ * years in the last ten, measured back from leaving, each "revalued to
91
+ * current terms", which a path already in today's money is. SI 2008/653
92
+ * reg 2.A.10(5)(b) compares "the period of 1095 days immediately
93
+ * preceding the relevant day (Period 1)", then "the period of 1095 days
94
+ * which overlaps Period 1 by 730 days (Period 2)", "and so on", and
95
+ * 2.A.10(6) takes the one that begins "within the period of 10 years
96
+ * ending with the relevant day" with the highest pay; for a leaver,
97
+ * 2.A.10(5)(a)(i) makes the relevant day "the day on which the member's
98
+ * active membership ceases". The short-service rule of 2.A.10(7), for
99
+ * under 1095 days' service in the ten years, is not modelled: it moves
100
+ * only a member with less than three years' service before leaving.
101
+ */
102
+ export function meanOf3ConsecutiveIn10(payPath, leaving) {
103
+ // Three consecutive years starting inside the last ten can begin at any
104
+ // of the eight latest offsets back from leaving.
105
+ const windowsInside = CONSECUTIVE_WITHIN_YEARS - CONSECUTIVE_YEARS + 1;
106
+ const years = yearsTo(payPath, leaving, CONSECUTIVE_WITHIN_YEARS);
107
+ let best = 0;
108
+ for (let back = 0; back < windowsInside; back++) {
109
+ const sum = years.slice(back, back + CONSECUTIVE_YEARS)
110
+ .reduce((a, b) => a + b, 0);
111
+ best = Math.max(best, sum / CONSECUTIVE_YEARS);
112
+ }
113
+ return best;
114
+ }
10
115
  /**
11
116
  * Membership in years: whole years from the first day, then the days
12
117
  * left over as a fraction of 365. The legacy sections count
@@ -20,81 +125,38 @@ const MS_PER_DAY = 24 * 60 * 60 * 1000;
20
125
  function membershipYears(windows) {
21
126
  let total = 0;
22
127
  for (const { from, to } of windows) {
23
- const end = new Date(to.getFullYear(), to.getMonth(), to.getDate() + 1);
128
+ const end = dayAfter(to);
24
129
  let years = end.getFullYear() - from.getFullYear();
25
130
  const anniversary = (n) => new Date(from.getFullYear() + n, from.getMonth(), from.getDate());
26
131
  if (anniversary(years) > end)
27
132
  years -= 1;
28
- const days = Math.round((end.getTime() - anniversary(years).getTime()) / MS_PER_DAY);
29
- total += years + days / 365;
133
+ const days = daysBetween(anniversary(years), end);
134
+ total += years + days / DAYS_PER_MEMBERSHIP_YEAR;
30
135
  }
31
136
  return total;
32
137
  }
33
- /** Each year's pay on the path, in today's money. */
34
- const payIn = (payPath, year) => payPath.payFor(year).pay;
35
- /** The 1995 Section's measure: the best single year of the last
36
- * three. */
37
- export function bestSingleOf3(payPath, lastYear) {
38
- return Math.max(payIn(payPath, lastYear), payIn(payPath, lastYear - 1), payIn(payPath, lastYear - 2));
39
- }
40
- /** The 2008 Section's measure: the best average of three consecutive
41
- * years in the last ten, each "revalued to current terms", which a
42
- * path already in today's money is. */
43
- export function meanOf3ConsecutiveIn10(payPath, lastYear) {
44
- // Three consecutive years inside the last ten can end in any of the
45
- // last eight: the eighth-last is the latest window that still starts
46
- // inside the ten.
47
- const WINDOWS_IN_TEN = 10 - 3 + 1;
48
- let best = 0;
49
- for (let end = lastYear; end > lastYear - WINDOWS_IN_TEN; end--) {
50
- const mean = (payIn(payPath, end) + payIn(payPath, end - 1)
51
- + payIn(payPath, end - 2)) / 3;
52
- best = Math.max(best, mean);
53
- }
54
- return best;
55
- }
56
- /**
57
- * A final-salary pension before any factor, in today's money: the
58
- * membership, over the denominator, times final pay measured at
59
- * `lastYear`. The one place the formula is written, so the pension
60
- * held today and the pension drawn cannot come to disagree.
61
- */
62
- export function unreducedPension(rules, windows, payPath, lastYear) {
63
- const membership = membershipYears(windows);
64
- const pay = rules.finalPay(payPath, lastYear);
65
- const pension = (membership / rules.denominator) * pay;
66
- return {
67
- membership,
68
- finalPay: pay,
69
- pension,
70
- automaticLumpSum: (rules.automaticLumpSum?.multiple ?? 0) * pension,
71
- };
72
- }
73
138
  /**
74
- * Value final-salary membership at a drawing.
75
- *
76
- * The pension is measured once, on the pay at leaving — final salary
77
- * linkage: membership may have frozen years earlier, but the pay
78
- * measure did not. In today's money that is the figure; in cash it is
79
- * the same figure carried to the drawing date at the assumption, since
80
- * pay and a deferred legacy pension both move with prices.
139
+ * The pay of the `count` years of 12 months ending on `leaving`, then on
140
+ * each anniversary before it, latest first, in today's money. Both
141
+ * regulations measure from the leaving date, while the path holds pay by
142
+ * scheme year (1 April to 31 March), so each measured year takes the
143
+ * share of the scheme year it ends in that has run by the leaving date
144
+ * and the rest from the scheme year before, pay being even across a
145
+ * year. The share counts the scheme year's own days, 365 or 366, so a
146
+ * leaving on 31 March takes that scheme year whole and the year before
147
+ * is not read at all. Two parts are this library's reading, each at most
148
+ * a day in a year: anniversary years where 2.A.10 counts 1095-day
149
+ * periods, and one share, from the leaving year, for every year back.
81
150
  */
82
- export function finalSalaryBenefit(rules, { windows, payPath, dateOfBirth, leaving, drawing, prices }) {
83
- const { membership, finalPay: pay, pension: unreduced, automaticLumpSum: unreducedLump, } = unreducedPension(rules, windows, payPath, schemeYearEndFor(leaving));
84
- const factor = rules.pensionFactor(dateOfBirth, leaving, drawing);
85
- const lump = rules.automaticLumpSum;
86
- const lumpSum = lump === null
87
- ? 0
88
- : unreducedLump * lump.factor(dateOfBirth, leaving, drawing).factor;
89
- const money = (real) => moneyAt({ real, nominal: prices.payAt(real, drawing) }, drawing);
90
- return {
91
- beforeFactor: money(unreduced),
92
- pension: money(unreduced * factor.factor),
93
- automaticLumpSum: money(lumpSum),
94
- automaticLumpSumBeforeFactor: money(unreducedLump),
95
- factor,
96
- membership,
97
- finalPay: pay,
98
- };
151
+ function yearsTo(payPath, leaving, count) {
152
+ const last = schemeYearEndFor(leaving);
153
+ const opened = schemeYearStartDate(last);
154
+ const daysIn = daysBetween(opened, schemeYearStartDate(schemeYearAfter(last)));
155
+ const share = (daysBetween(opened, leaving) + 1) / daysIn;
156
+ const pay = (year) => payPath.payFor(schemeYearEnd(year)).pay;
157
+ const leftOnYearEnd = share === 1;
158
+ return Array.from({ length: count }, (_, back) => (leftOnYearEnd
159
+ ? pay(last - back)
160
+ : share * pay(last - back) + (1 - share) * pay(last - back - 1)));
99
161
  }
100
162
  //# sourceMappingURL=final-salary.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"final-salary.js","sourceRoot":"","sources":["../../src/sections/final-salary.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"final-salary.js","sourceRoot":"","sources":["../../src/sections/final-salary.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import type { Applies2015, FactorOutcome } from '../factor-basis.js';
2
2
  import type { MemberLedger, PayIn } from '../pension/ledger.js';
3
3
  import type { Prices } from '../pension/prices.js';
4
+ import type { SchemeYearEnd } from '../pension/scheme-year.js';
4
5
  import type { LedgerSeed } from '../pension/seed.js';
5
6
  /**
6
7
  * The factor for a benefit determined under the 2015 Section's rules,
@@ -37,7 +38,7 @@ export declare function careerAverage({ seed, payIn, dateOfBirth, leaving, drawi
37
38
  readonly leaving: Date;
38
39
  readonly drawing: Date;
39
40
  readonly prices: Prices;
40
- readonly through: number;
41
+ readonly through: SchemeYearEnd;
41
42
  }): CareerAverageRun & {
42
43
  readonly factor: FactorOutcome;
43
44
  };
@@ -1 +1 @@
1
- {"version":3,"file":"section-2015.js","sourceRoot":"","sources":["../../src/sections/section-2015.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,GAC3E,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAK5D;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CACxB,WAAiB,EACjB,KAAW,EACX,OAAoB;IAEpB,MAAM,GAAG,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,KAAK,GAAgB;QACzB,OAAO,EAAE,WAAW;QACpB,GAAG;QACH,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI;QACxE,OAAO;KACR,CAAC;IACF,OAAO,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAYD;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAS5D;IACC,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,WAAW,CAAC;QACzB,IAAI;QACJ,KAAK;QACL,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,OAAO;QACvB,MAAM;QACN,OAAO;QACP,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;YACjB,EAAE,EAAE,OAAO;YACX,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,cAAc,CAAC,KAAK;gBAC3C,CAAC,CAAC,EAAC,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAC;gBACzD,CAAC,CAAC,IAAI;SACT,CAAC;KACH,CAAC,CAAC;IACH,OAAO;QACL,MAAM,EAAE,IAAI,EAAE,MAAM;QACpB,GAAG,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;KAC7C,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"section-2015.js","sourceRoot":"","sources":["../../src/sections/section-2015.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,GAC3E,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAM5D;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CACxB,WAAiB,EACjB,KAAW,EACX,OAAoB;IAEpB,MAAM,GAAG,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,KAAK,GAAgB;QACzB,OAAO,EAAE,WAAW;QACpB,GAAG;QACH,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI;QACxE,OAAO;KACR,CAAC;IACF,OAAO,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAYD;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAS5D;IACC,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,WAAW,CAAC;QACzB,IAAI;QACJ,KAAK;QACL,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,OAAO;QACvB,MAAM;QACN,OAAO;QACP,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;YACjB,EAAE,EAAE,OAAO;YACX,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,cAAc,CAAC,KAAK;gBAC3C,CAAC,CAAC,EAAC,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAC;gBACzD,CAAC,CAAC,IAAI;SACT,CAAC;KACH,CAAC,CAAC;IACH,OAAO;QACL,MAAM,EAAE,IAAI,EAAE,MAAM;QACpB,GAAG,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;KAC7C,CAAC;AACJ,CAAC"}
package/dist/sources.d.ts CHANGED
@@ -36,6 +36,7 @@
36
36
  * manifest.
37
37
  */
38
38
  import { DocumentSource } from './document-source.js';
39
+ import type { PageSource } from './document-source.js';
39
40
  /** The 54th DDRB round, as accepted by each government. The report
40
41
  * itself is NOT the source: a recommendation can be modified, staged
41
42
  * or refused on the way in, and when it is, the acceptance is right
@@ -202,6 +203,15 @@ export declare const HSC_TC8_05_2025: DocumentSource;
202
203
  /** DHSC on who the 2028 rise in the minimum age reaches; archived as SA-59 in
203
204
  * docs/source-archive.md. A petition response that cites no instrument. */
204
205
  export declare const DHSC_PETITION_779519: DocumentSource;
206
+ /** NHSBSA's guide to the pension figures on a 2015 Section statement: "We
207
+ * produce your 2015 statement as of 31 March. The figures shown are not
208
+ * yet revalued." The source of `memberBenefits`' 31 March statement
209
+ * rule; archived as SA-63 in docs/source-archive.md. */
210
+ export declare const NHSBSA_STATEMENT_GUIDE: PageSource;
211
+ /** NHSBSA's page on asking for a pension estimate: "We base this on
212
+ * information your employer gives us up to 31 March." Archived as SA-64 in
213
+ * docs/source-archive.md. */
214
+ export declare const NHSBSA_ESTIMATE_GUIDE: PageSource;
205
215
  /** The Scottish scheme's own statement of who keeps 55; archived as SA-61 in
206
216
  * docs/source-archive.md, the version with paragraph 9 updated. */
207
217
  export declare const SPPA_NHS_CIRCULAR_2025_09: DocumentSource;
package/dist/sources.js CHANGED
@@ -406,6 +406,26 @@ export const DHSC_PETITION_779519 = new DocumentSource({
406
406
  url: 'https://petition.parliament.uk/petitions/779519?reveal_response=yes',
407
407
  issued: isoDate('2026-10-19'),
408
408
  });
409
+ /** NHSBSA's guide to the pension figures on a 2015 Section statement: "We
410
+ * produce your 2015 statement as of 31 March. The figures shown are not
411
+ * yet revalued." The source of `memberBenefits`' 31 March statement
412
+ * rule; archived as SA-63 in docs/source-archive.md. */
413
+ export const NHSBSA_STATEMENT_GUIDE = {
414
+ issuer: 'NHSBSA',
415
+ reference: 'Understanding your statement: Pension',
416
+ url: 'https://www.nhsbsa.nhs.uk/employee-section/understanding-your-statement'
417
+ + '/pension',
418
+ retrieved: isoDate('2026-11-07'),
419
+ };
420
+ /** NHSBSA's page on asking for a pension estimate: "We base this on
421
+ * information your employer gives us up to 31 March." Archived as SA-64 in
422
+ * docs/source-archive.md. */
423
+ export const NHSBSA_ESTIMATE_GUIDE = {
424
+ issuer: 'NHSBSA',
425
+ reference: 'Getting an estimate of your pension',
426
+ url: 'https://www.nhsbsa.nhs.uk/member-hub/getting-estimate-your-pension',
427
+ retrieved: isoDate('2026-11-07'),
428
+ };
409
429
  /** The Scottish scheme's own statement of who keeps 55; archived as SA-61 in
410
430
  * docs/source-archive.md, the version with paragraph 9 updated. */
411
431
  export const SPPA_NHS_CIRCULAR_2025_09 = new DocumentSource({
@@ -1 +1 @@
1
- {"version":3,"file":"sources.js","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAEtC,oDAAoD;AAEpD;;;6BAG6B;AAC7B,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,cAAc,CAAC;IAC9C,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,wCAAwC;IACnD,GAAG,EAAE,+DAA+D;UAChE,6BAA6B;IACjC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,2DAA2D;IAC3D,oCAAoC;IACpC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,cAAc,CAAC;IAC5C,MAAM,EAAE,sBAAsB;IAC9B,SAAS,EAAE,2CAA2C;IACtD,GAAG,EAAE,uBAAuB;UACxB,qEAAqE;IACzE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAAC;IAC/C,MAAM,EAAE,yBAAyB;IACjC,SAAS,EAAE,gBAAgB;IAC3B,GAAG,EAAE,2CAA2C;IAChD,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH,oDAAoD;AAEpD,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAAC;IAC/C,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,4BAA4B;IACvC,GAAG,EAAE,4CAA4C;UAC7C,sDAAsD;UACtD,uDAAuD;IAC3D,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,cAAc,CAAC;IAC/C,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,wCAAwC;IACnD,GAAG,EAAE,+DAA+D;UAChE,6BAA6B;IACjC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,4DAA4D;IAC5D,yDAAyD;IACzD,aAAa;IACb,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;IAC7C,MAAM,EAAE,sBAAsB;IAC9B,SAAS,EAAE,6CAA6C;IACxD,GAAG,EAAE,uBAAuB;UACxB,wDAAwD;UACxD,4CAA4C;IAChD,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;IAC7C,MAAM,EAAE,sBAAsB;IAC9B,SAAS,EAAE,6CAA6C;IACxD,GAAG,EAAE,uBAAuB;UACxB,wDAAwD;IAC5D,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,cAAc,CAAC;IAC1C,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,gDAAgD;IAC3D,GAAG,EAAE,mCAAmC;UACpC,wEAAwE;IAC5E,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,+DAA+D;IAC/D,mEAAmE;IACnE,gEAAgE;IAChE,wDAAwD;IACxD,0DAA0D;IAC1D,gEAAgE;IAChE,oCAAoC;IACpC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;IACnC,kBAAkB,EAChB,kEAAkE;UAChE,+DAA+D;UAC/D,qDAAqD;CAC5D,CAAC,CAAC;AAEH,oDAAoD;AAEpD;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,cAAc,CAAC;IACtD,MAAM,EAAE,eAAe;IACvB,SAAS,EAAE,wBAAwB;IACnC,GAAG,EAAE,8BAA8B;UAC/B,6BAA6B;IACjC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,cAAc,CAAC;IACtD,MAAM,EAAE,eAAe;IACvB,SAAS,EAAE,wBAAwB;IACnC,GAAG,EAAE,8BAA8B;UAC/B,6BAA6B;IACjC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,cAAc,CAAC;IAC1C,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,mBAAmB;IAC9B,GAAG,EAAE,0DAA0D;UAC3D,iEAAiE;UACjE,0DAA0D;IAC9D,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,cAAc,CAAC;IAC5C,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,0CAA0C;UAC3C,yBAAyB;IAC7B,0DAA0D;IAC1D,oDAAoD;IACpD,uDAAuD;IACvD,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,cAAc,CAAC;IAC5C,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,2BAA2B;IACtC,GAAG,EAAE,0CAA0C;UAC3C,uCAAuC;IAC3C,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH;;;kBAGkB;AAClB,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,cAAc,CAAC;IAC5C,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,0CAA0C;UAC3C,2BAA2B;IAC/B,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC;IAC3C,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,+DAA+D;IACpE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,iEAAiE;IACjE,iEAAiE;IACjE,8DAA8D;IAC9D,gEAAgE;IAChE,6DAA6D;IAC7D,8DAA8D;IAC9D,iEAAiE;IACjE,gEAAgE;IAChE,uBAAuB;IACvB,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;IACnC,kBAAkB,EAChB,2DAA2D;UACzD,oDAAoD;CAC3D,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,cAAc,CAAC;IACxD,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,gEAAgE;IACrE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH,oDAAoD;AACpD,EAAE;AACF,oEAAoE;AACpE,oEAAoE;AACpE,gEAAgE;AAEhE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,cAAc,CAAC;IAC9C,MAAM,EAAE,eAAe;IACvB,SAAS,EAAE,2CAA2C;IACtD,GAAG,EAAE,mDAAmD;UACpD,qDAAqD;IACzD,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;IAC7C,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,+DAA+D;IACpE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;IAC7C,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,+DAA+D;IACpE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH;;;uBAGuB;AACvB,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC;IAC7C,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,8DAA8D;IACnE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,cAAc,CAAC;IACtD,MAAM,EAAE,cAAc;IACtB,SAAS,EAAE,kCAAkC;IAC7C,GAAG,EAAE,iEAAiE;IACtE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC;IAC3C,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,0CAA0C;UAC3C,0CAA0C;IAC9C,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH;;;kEAGkE;AAClE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC;IAC3C,MAAM,EAAE,WAAW;IACnB,SAAS,EAAE,yBAAyB;IACpC,GAAG,EAAE,0CAA0C;UAC3C,+BAA+B;IACnC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,cAAc,CAAC;IAC9C,MAAM,EAAE,+BAA+B;IACvC,SAAS,EAAE,2BAA2B;IACtC,GAAG,EAAE,0DAA0D;UAC3D,2DAA2D;UAC3D,uEAAuE;IAC3E,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,mEAAmE;IACnE,mDAAmD;IACnD,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;IACnC,kBAAkB,EAChB,gEAAgE;UAC9D,iBAAiB;CACxB,CAAC,CAAC;AAEH,qDAAqD;AAErD;4EAC4E;AAC5E,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,cAAc,CAAC;IACnD,MAAM,EAAE,0CAA0C;IAClD,SAAS,EAAE,wCAAwC;IACnD,GAAG,EAAE,qEAAqE;IAC1E,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH;oEACoE;AACpE,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,cAAc,CAAC;IACxD,MAAM,EAAE,qCAAqC;IAC7C,SAAS,EAAE,kEAAkE;IAC7E,GAAG,EAAE,4EAA4E;UAC7E,mEAAmE;IACvE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC;AAEH;8BAC8B;AAC9B,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,cAAc,CAAC;IAChD,MAAM,EAAE,QAAQ;IAChB,SAAS,EAAE,oDAAoD;IAC/D,GAAG,EAAE,uDAAuD;UACxD,oDAAoD;UACpD,0BAA0B;IAC9B,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;IAC7B,gEAAgE;IAChE,uBAAuB;IACvB,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;AAEH,qDAAqD;AAErD;;;;;sDAKsD;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,cAAc,CAAC;IACrD,MAAM,EAAE,YAAY;IACpB,SAAS,EAAE,+CAA+C;IAC1D,GAAG,EAAE,yEAAyE;IAC9E,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC;CAChC,CAAC,CAAC"}
1
+ {"version":3,"file":"sources.js","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"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"}
@@ -20,7 +20,7 @@
20
20
  * library only selects the basis.
21
21
  */
22
22
  import { TakeHomePay } from '@casomoltd/paye-calc';
23
- import type { AnnualAllowance, TaxYear, TaxRegion, StudentLoanPlan, TaxCode } from '@casomoltd/paye-calc';
23
+ import type { TaxYear, TaxRegion, StudentLoanPlan, TaxCode } from '@casomoltd/paye-calc';
24
24
  /**
25
25
  * Generic PAYE deductions layered on the NHS salary — the paye-calc
26
26
  * inputs a bare scale salary doesn't carry. Each is optional and
@@ -35,8 +35,9 @@ export interface NhsTakeHomeOptions {
35
35
  }
36
36
  /**
37
37
  * The take-home pay of an NHS post. Its `annualAllowance()` has no
38
- * scheme pension input; read the allowance through
39
- * `nhsAnnualAllowance` (or `Post.annualAllowance`).
38
+ * scheme pension input: a year's input is a member's, read from
39
+ * `memberBenefits`' `pensionInputPeriod` through paye-calc's
40
+ * `definedBenefitInput`.
40
41
  *
41
42
  * @param salary Gross annual pay assessed for tax/NI (already
42
43
  * FTE-adjusted and net of any salary sacrifice)
@@ -47,20 +48,3 @@ export interface NhsTakeHomeOptions {
47
48
  * @param options Student loans / tax-code override
48
49
  */
49
50
  export declare function nhsTakeHome(salary: number, pensionRate: number, taxYear: TaxYear, taxRegion: TaxRegion, options?: NhsTakeHomeOptions): TakeHomePay;
50
- /**
51
- * The pension annual allowance an NHS member's year meets, estimated from
52
- * this year's 2015 Section accrual alone. The scheme is defined benefit,
53
- * so the pension input is paye-calc's DB multiple of the year's accrual,
54
- * not the contribution paid; without it adjusted income omits the scheme
55
- * and the taper never bites for high earners. An opted-out member (rate
56
- * 0) has no input.
57
- *
58
- * It takes no member history, so the input is a floor for anyone with
59
- * pension already built up: that pension's revaluation beyond the CPI
60
- * uplift, and any legacy section's growth, are inputs too, and are not
61
- * counted here.
62
- *
63
- * Source: HMRC PTM053301 (DB pension input amount), the citation
64
- * paye-calc's `DB_PENSION_INPUT_MULTIPLIER` carries.
65
- */
66
- export declare function nhsAnnualAllowance(salary: number, pensionRate: number, taxYear: TaxYear, taxRegion: TaxRegion): AnnualAllowance;
package/dist/take-home.js CHANGED
@@ -20,14 +20,14 @@
20
20
  * library only selects the basis.
21
21
  */
22
22
  import { TakeHomePay, GrossAnnual, NO_PENSION, PensionBasis, PensionPercent, getTaxYearConfig, payAt, } from '@casomoltd/paye-calc';
23
- import { yearlyAccrual } from './pension-projection.js';
24
23
  import { invariant } from './errors.js';
25
24
  /** A rate is a fraction here; paye-calc takes a pension per cent. */
26
25
  const PER_CENT = 100;
27
26
  /**
28
27
  * The take-home pay of an NHS post. Its `annualAllowance()` has no
29
- * scheme pension input; read the allowance through
30
- * `nhsAnnualAllowance` (or `Post.annualAllowance`).
28
+ * scheme pension input: a year's input is a member's, read from
29
+ * `memberBenefits`' `pensionInputPeriod` through paye-calc's
30
+ * `definedBenefitInput`.
31
31
  *
32
32
  * @param salary Gross annual pay assessed for tax/NI (already
33
33
  * FTE-adjusted and net of any salary sacrifice)
@@ -78,24 +78,4 @@ export function nhsTakeHome(salary, pensionRate, taxYear, taxRegion, options = {
78
78
  }
79
79
  return thp;
80
80
  }
81
- /**
82
- * The pension annual allowance an NHS member's year meets, estimated from
83
- * this year's 2015 Section accrual alone. The scheme is defined benefit,
84
- * so the pension input is paye-calc's DB multiple of the year's accrual,
85
- * not the contribution paid; without it adjusted income omits the scheme
86
- * and the taper never bites for high earners. An opted-out member (rate
87
- * 0) has no input.
88
- *
89
- * It takes no member history, so the input is a floor for anyone with
90
- * pension already built up: that pension's revaluation beyond the CPI
91
- * uplift, and any legacy section's growth, are inputs too, and are not
92
- * counted here.
93
- *
94
- * Source: HMRC PTM053301 (DB pension input amount), the citation
95
- * paye-calc's `DB_PENSION_INPUT_MULTIPLIER` carries.
96
- */
97
- export function nhsAnnualAllowance(salary, pensionRate, taxYear, taxRegion) {
98
- const isMember = pensionRate > 0;
99
- return nhsTakeHome(salary, pensionRate, taxYear, taxRegion).annualAllowance(isMember ? { dbAnnualAccrual: yearlyAccrual(salary) } : {});
100
- }
101
81
  //# sourceMappingURL=take-home.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"take-home.js","sourceRoot":"","sources":["../src/take-home.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EACL,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,KAAK,GACN,MAAM,sBAAsB,CAAC;AAQ9B,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,qEAAqE;AACrE,MAAM,QAAQ,GAAG,GAAG,CAAC;AAerB;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,WAAW,CACzB,MAAc,EACd,WAAmB,EACnB,OAAgB,EAChB,SAAoB,EACpB,UAA8B,EAAE;IAEhC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAChD,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACnC,qEAAqE;IACrE,8DAA8D;IAC9D,yBAAyB;IACzB,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;IACjC,GAAG,CAAC,UAAU,CAAC,QAAQ;QACrB,CAAC,CAAC;YACA,KAAK,EAAE,YAAY,CAAC,QAAQ;YAC5B,YAAY,EAAE,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC;SACrD;QACD,CAAC,CAAC,UAAU,CAAC,CAAC;IAChB,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,kEAAkE;IAClE,mEAAmE;IACnE,iEAAiE;IACjE,oEAAoE;IACpE,mEAAmE;IACnE,IAAI,QAAQ,EAAE,CAAC;QACb,gEAAgE;QAChE,2BAA2B;QAC3B,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC;YAC5C,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,YAAY,EAAE,GAAG,CAAC,gBAAgB;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI;SACjC,CAAC;QACF,SAAS,CACP,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK;gBACjC,KAAK,CAAC,MAAM,EAAE,EAAC,GAAG,MAAM,EAAE,OAAO,EAAE,UAAU,EAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EACvE,8DAA8D;cAC1D,yDAAyD;cACzD,mDAAmD;cACnD,qBAAqB,CAC1B,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,WAAmB,EACnB,OAAgB,EAChB,SAAoB;IAEpB,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;IACjC,OAAO,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,eAAe,CACzE,QAAQ,CAAC,CAAC,CAAC,EAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CACzD,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"take-home.js","sourceRoot":"","sources":["../src/take-home.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EACL,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,KAAK,GACN,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,qEAAqE;AACrE,MAAM,QAAQ,GAAG,GAAG,CAAC;AAerB;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,WAAW,CACzB,MAAc,EACd,WAAmB,EACnB,OAAgB,EAChB,SAAoB,EACpB,UAA8B,EAAE;IAEhC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAChD,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACnC,qEAAqE;IACrE,8DAA8D;IAC9D,yBAAyB;IACzB,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;IACjC,GAAG,CAAC,UAAU,CAAC,QAAQ;QACrB,CAAC,CAAC;YACA,KAAK,EAAE,YAAY,CAAC,QAAQ;YAC5B,YAAY,EAAE,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC;SACrD;QACD,CAAC,CAAC,UAAU,CAAC,CAAC;IAChB,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,kEAAkE;IAClE,mEAAmE;IACnE,iEAAiE;IACjE,oEAAoE;IACpE,mEAAmE;IACnE,IAAI,QAAQ,EAAE,CAAC;QACb,gEAAgE;QAChE,2BAA2B;QAC3B,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC;YAC5C,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,YAAY,EAAE,GAAG,CAAC,gBAAgB;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI;SACjC,CAAC;QACF,SAAS,CACP,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK;gBACjC,KAAK,CAAC,MAAM,EAAE,EAAC,GAAG,MAAM,EAAE,OAAO,EAAE,UAAU,EAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EACvE,8DAA8D;cAC1D,yDAAyD;cACzD,mDAAmD;cACnD,qBAAqB,CAC1B,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}