@casomoltd/nhs-pay 0.27.0 → 0.29.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.
- package/dist/additional-pension.js +56 -32
- package/dist/additional-pension.js.map +1 -1
- package/dist/dates.d.ts +2 -0
- package/dist/dates.js +17 -3
- package/dist/dates.js.map +1 -1
- package/dist/index.d.ts +5 -4
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/iso-date.d.ts +4 -9
- package/dist/iso-date.js +10 -11
- package/dist/iso-date.js.map +1 -1
- package/dist/member/benefits.d.ts +11 -0
- package/dist/member/benefits.js +179 -0
- package/dist/member/benefits.js.map +1 -0
- package/dist/member/index.d.ts +9 -0
- package/dist/member/index.js +9 -0
- package/dist/member/index.js.map +1 -0
- package/dist/member/service.d.ts +65 -0
- package/dist/member/service.js +166 -0
- package/dist/member/service.js.map +1 -0
- package/dist/{member-benefits.d.ts → member/types.d.ts} +39 -42
- package/dist/member/types.js +46 -0
- package/dist/member/types.js.map +1 -0
- package/dist/member/valuation.d.ts +67 -0
- package/dist/member/valuation.js +162 -0
- package/dist/member/valuation.js.map +1 -0
- package/dist/pension/ages.d.ts +64 -31
- package/dist/pension/ages.js +66 -38
- package/dist/pension/ages.js.map +1 -1
- package/dist/post.d.ts +22 -29
- package/dist/post.js +14 -17
- package/dist/post.js.map +1 -1
- package/dist/sections/final-salary.d.ts +1 -0
- package/dist/sections/final-salary.js +1 -0
- package/dist/sections/final-salary.js.map +1 -1
- package/dist/sources.d.ts +13 -1
- package/dist/sources.js +25 -1
- package/dist/sources.js.map +1 -1
- package/dist/take-home.d.ts +12 -6
- package/dist/take-home.js +12 -6
- package/dist/take-home.js.map +1 -1
- package/package.json +3 -3
- package/dist/member-benefits.js +0 -462
- package/dist/member-benefits.js.map +0 -1
package/dist/pension/ages.d.ts
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The ages a member's NHS pension turns on: each section's pension age, the
|
|
3
|
-
* 2015
|
|
4
|
-
* to draw, from when they first joined.
|
|
3
|
+
* 2015 Section's from their date of birth, and the earliest age they can choose
|
|
4
|
+
* to draw, from when they first joined and when they draw.
|
|
5
5
|
*
|
|
6
|
-
* NORMAL PENSION AGE in the 2015
|
|
6
|
+
* NORMAL PENSION AGE in the 2015 Section = the member's State Pension age, with
|
|
7
7
|
* a floor of 65 (NHSBSA 2015 Members' Guide V13, May 2024, archived as SA-38 in
|
|
8
8
|
* docs/source-archive.md). The SPA timetable is legislated — Pensions Acts
|
|
9
|
-
* 1995/2007/2011/2014 — and reproduced in
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
9
|
+
* 1995/2007/2011/2014 — and reproduced in DWP's "State Pension age timetables",
|
|
10
|
+
* archived as SA-62 in docs/source-archive.md (last updated 15 May 2014; the
|
|
11
|
+
* legislated dates have not changed since — the 2023 SPA review left them as
|
|
12
|
+
* enacted).
|
|
13
13
|
*
|
|
14
14
|
* Whole years only. The Acts phase each rise through narrow transitional birth
|
|
15
15
|
* cohorts whose exact SPA is 65/66/67 plus some months; `normalPensionAge`
|
|
@@ -28,45 +28,78 @@ import type { IsoDate } from '../iso-date.js';
|
|
|
28
28
|
/**
|
|
29
29
|
* The fixed pension ages the legacy sections' factors are measured from,
|
|
30
30
|
* named for the section that sets each: DHSC_PETITION_779519, archived as SA-59
|
|
31
|
-
* in docs/source-archive.md
|
|
32
|
-
*
|
|
33
|
-
*
|
|
31
|
+
* in docs/source-archive.md, states "The Normal Pension Age in the NHS Pension
|
|
32
|
+
* Scheme is 60 in the 1995 Section, 65 in the 2008 Section". The factor tables
|
|
33
|
+
* are keyed by pension age, and these are the only two a legacy benefit has;
|
|
34
|
+
* the 2015 Section's is the member's own normal pension age.
|
|
34
35
|
*/
|
|
35
36
|
export declare const LEGACY_PENSION_AGES: {
|
|
36
37
|
readonly section1995: 60;
|
|
37
38
|
readonly section2008: 65;
|
|
38
39
|
};
|
|
39
|
-
/** The
|
|
40
|
-
*
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
*
|
|
44
|
-
*
|
|
40
|
+
/** The age from which the scheme gave every member a right to draw: 55 at
|
|
41
|
+
* the latest, in the 1995 and 2008 Sections and the 2015 Section alike.
|
|
42
|
+
* DHSC's petition response (DHSC_PETITION_779519, archived as SA-59 in
|
|
43
|
+
* docs/source-archive.md) and SPPA's NHS Circular 2025/09 (SA-61) say so.
|
|
44
|
+
* It is the right paye-calc's `minimumPensionAgeFor` protects through the
|
|
45
|
+
* 2028 rise, and so the age an earlier joiner keeps. A lower age kept from
|
|
46
|
+
* 2006 or 2010 is not modelled; what that costs is in
|
|
47
|
+
* docs/how-it-works.md#minimum-pension-age. */
|
|
45
48
|
export declare const MPA_KEPT_AGE = 55;
|
|
49
|
+
/** The last day a member can have first joined and hold that right
|
|
50
|
+
* immediately before paye-calc's `protectedPensionAgeCutoff()`: the day
|
|
51
|
+
* before it. For a caller to show; the rule itself compares against the
|
|
52
|
+
* cut-off. */
|
|
53
|
+
export declare const MPA_RISE_JOINED_AFTER: IsoDate;
|
|
46
54
|
/**
|
|
47
|
-
* Normal pension age for a 2015
|
|
55
|
+
* Normal pension age for a 2015 Section member born on
|
|
48
56
|
* `dateOfBirth`, in whole years (see the module header for the
|
|
49
57
|
* transitional-cohort rounding).
|
|
50
58
|
*/
|
|
51
59
|
export declare function normalPensionAge(dateOfBirth: Date): number;
|
|
60
|
+
/** The two dates a member's minimum pension age turns on, besides the day
|
|
61
|
+
* they draw: when they were born, and when they first joined the scheme. */
|
|
62
|
+
export interface JoiningHistory {
|
|
63
|
+
readonly born: IsoDate;
|
|
64
|
+
readonly firstJoined: IsoDate;
|
|
65
|
+
}
|
|
52
66
|
/**
|
|
53
|
-
* The earliest age a member can choose to draw a pension
|
|
54
|
-
* ill health. It depends on two dates:
|
|
67
|
+
* The earliest age a member can choose to draw a pension on `drawing`, other
|
|
68
|
+
* than through ill health. It depends on two dates:
|
|
55
69
|
*
|
|
56
|
-
* - **When they first joined.**
|
|
57
|
-
*
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
*
|
|
70
|
+
* - **When they first joined.** The law (Finance Act 2004 Sch 36 para 23ZB,
|
|
71
|
+
* through paye-calc's `minimumPensionAgeFor`) keeps a protected pension age
|
|
72
|
+
* for a member who held a right to draw before 57 immediately before its
|
|
73
|
+
* cut-off. The scheme gave every member that right from 55
|
|
74
|
+
* (`MPA_KEPT_AGE`), so this is anyone in it by `MPA_RISE_JOINED_AFTER`.
|
|
75
|
+
* SPPA's NHS Circular 2025/09 (SA-61) keeps it across opting out and
|
|
76
|
+
* rejoining (Annex A Q9), and a later period's date would tell a
|
|
77
|
+
* long-serving member 57, so this reads their FIRST joining.
|
|
61
78
|
* - **When they draw.** Only for a member the rise reaches, and only before it
|
|
62
|
-
* takes effect: until 6 April 2028 the law's minimum is still 55
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
*
|
|
79
|
+
* takes effect: until 6 April 2028 the law's minimum is still 55.
|
|
80
|
+
*/
|
|
81
|
+
export declare function memberMinimumPensionAge(history: JoiningHistory, drawing: IsoDate): number;
|
|
82
|
+
/**
|
|
83
|
+
* Whether a member may draw their pension on `drawing`, other than through
|
|
84
|
+
* ill health: on or after the birthday at which they reach their minimum
|
|
85
|
+
* pension age on that day. An age is reached on the birthday, as `npaDate`
|
|
86
|
+
* counts it. A caller walking the ages asks it of each drawing day.
|
|
67
87
|
*/
|
|
68
|
-
export declare function
|
|
88
|
+
export declare function mayDrawOn(history: JoiningHistory, drawing: IsoDate): boolean;
|
|
89
|
+
/** A member's minimum pension age on a drawing day, and whether they have
|
|
90
|
+
* reached it by then. */
|
|
91
|
+
interface DrawingTest {
|
|
92
|
+
readonly minimumAge: number;
|
|
93
|
+
readonly mayDraw: boolean;
|
|
94
|
+
}
|
|
95
|
+
/** The one place the minimum pension age is applied to a drawing: both
|
|
96
|
+
* answers at once, for a caller that refuses a drawing and names the age. */
|
|
97
|
+
export declare function drawingTest({ born, firstJoined }: JoiningHistory, drawing: IsoDate): DrawingTest;
|
|
98
|
+
/** The first day of a member's earliest period: the joining the minimum
|
|
99
|
+
* pension age reads. */
|
|
100
|
+
export declare function firstJoinedOf(member: {
|
|
69
101
|
readonly service: readonly {
|
|
70
102
|
readonly joined: IsoDate;
|
|
71
103
|
}[];
|
|
72
|
-
}
|
|
104
|
+
}): IsoDate;
|
|
105
|
+
export {};
|
package/dist/pension/ages.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The ages a member's NHS pension turns on: each section's pension age, the
|
|
3
|
-
* 2015
|
|
4
|
-
* to draw, from when they first joined.
|
|
3
|
+
* 2015 Section's from their date of birth, and the earliest age they can choose
|
|
4
|
+
* to draw, from when they first joined and when they draw.
|
|
5
5
|
*
|
|
6
|
-
* NORMAL PENSION AGE in the 2015
|
|
6
|
+
* NORMAL PENSION AGE in the 2015 Section = the member's State Pension age, with
|
|
7
7
|
* a floor of 65 (NHSBSA 2015 Members' Guide V13, May 2024, archived as SA-38 in
|
|
8
8
|
* docs/source-archive.md). The SPA timetable is legislated — Pensions Acts
|
|
9
|
-
* 1995/2007/2011/2014 — and reproduced in
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
9
|
+
* 1995/2007/2011/2014 — and reproduced in DWP's "State Pension age timetables",
|
|
10
|
+
* archived as SA-62 in docs/source-archive.md (last updated 15 May 2014; the
|
|
11
|
+
* legislated dates have not changed since — the 2023 SPA review left them as
|
|
12
|
+
* enacted).
|
|
13
13
|
*
|
|
14
14
|
* Whole years only. The Acts phase each rise through narrow transitional birth
|
|
15
15
|
* cohorts whose exact SPA is 65/66/67 plus some months; `normalPensionAge`
|
|
@@ -24,30 +24,38 @@
|
|
|
24
24
|
* keeps. The rule, its source and what it leaves out are in
|
|
25
25
|
* docs/how-it-works.md#minimum-pension-age.
|
|
26
26
|
*/
|
|
27
|
-
import {
|
|
28
|
-
import { earliest } from '../dates.js';
|
|
27
|
+
import { minimumPensionAgeFor, protectedPensionAgeCutoff, } from '@casomoltd/paye-calc';
|
|
28
|
+
import { dayBefore, earliest, npaDate } from '../dates.js';
|
|
29
29
|
import { invariant } from '../errors.js';
|
|
30
|
-
import { isoDate, isoToDate } from '../iso-date.js';
|
|
30
|
+
import { isoDate, isoDateOf, isoToDate } from '../iso-date.js';
|
|
31
31
|
/**
|
|
32
32
|
* The fixed pension ages the legacy sections' factors are measured from,
|
|
33
33
|
* named for the section that sets each: DHSC_PETITION_779519, archived as SA-59
|
|
34
|
-
* in docs/source-archive.md
|
|
35
|
-
*
|
|
36
|
-
*
|
|
34
|
+
* in docs/source-archive.md, states "The Normal Pension Age in the NHS Pension
|
|
35
|
+
* Scheme is 60 in the 1995 Section, 65 in the 2008 Section". The factor tables
|
|
36
|
+
* are keyed by pension age, and these are the only two a legacy benefit has;
|
|
37
|
+
* the 2015 Section's is the member's own normal pension age.
|
|
37
38
|
*/
|
|
38
39
|
export const LEGACY_PENSION_AGES = {
|
|
39
40
|
section1995: 60,
|
|
40
41
|
section2008: 65,
|
|
41
42
|
};
|
|
42
|
-
/** The
|
|
43
|
-
*
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
*
|
|
47
|
-
*
|
|
43
|
+
/** The age from which the scheme gave every member a right to draw: 55 at
|
|
44
|
+
* the latest, in the 1995 and 2008 Sections and the 2015 Section alike.
|
|
45
|
+
* DHSC's petition response (DHSC_PETITION_779519, archived as SA-59 in
|
|
46
|
+
* docs/source-archive.md) and SPPA's NHS Circular 2025/09 (SA-61) say so.
|
|
47
|
+
* It is the right paye-calc's `minimumPensionAgeFor` protects through the
|
|
48
|
+
* 2028 rise, and so the age an earlier joiner keeps. A lower age kept from
|
|
49
|
+
* 2006 or 2010 is not modelled; what that costs is in
|
|
50
|
+
* docs/how-it-works.md#minimum-pension-age. */
|
|
48
51
|
export const MPA_KEPT_AGE = 55;
|
|
52
|
+
/** The last day a member can have first joined and hold that right
|
|
53
|
+
* immediately before paye-calc's `protectedPensionAgeCutoff()`: the day
|
|
54
|
+
* before it. For a caller to show; the rule itself compares against the
|
|
55
|
+
* cut-off. */
|
|
56
|
+
export const MPA_RISE_JOINED_AFTER = isoDateOf(dayBefore(protectedPensionAgeCutoff()));
|
|
49
57
|
/**
|
|
50
|
-
* 2015
|
|
58
|
+
* 2015 Section floor (Members' Guide V13). Everyone born before
|
|
51
59
|
* the first band below has SPA ≤ 65 (women's pre-equalisation
|
|
52
60
|
* SPA was lower still), so the floor is their NPA.
|
|
53
61
|
*/
|
|
@@ -69,7 +77,7 @@ const SPA_BANDS = [
|
|
|
69
77
|
{ from: isoToDate(isoDate('1977-04-06')), npa: 68 },
|
|
70
78
|
];
|
|
71
79
|
/**
|
|
72
|
-
* Normal pension age for a 2015
|
|
80
|
+
* Normal pension age for a 2015 Section member born on
|
|
73
81
|
* `dateOfBirth`, in whole years (see the module header for the
|
|
74
82
|
* transitional-cohort rounding).
|
|
75
83
|
*/
|
|
@@ -83,28 +91,48 @@ export function normalPensionAge(dateOfBirth) {
|
|
|
83
91
|
return npa;
|
|
84
92
|
}
|
|
85
93
|
/**
|
|
86
|
-
* The earliest age a member can choose to draw a pension
|
|
87
|
-
* ill health. It depends on two dates:
|
|
94
|
+
* The earliest age a member can choose to draw a pension on `drawing`, other
|
|
95
|
+
* than through ill health. It depends on two dates:
|
|
88
96
|
*
|
|
89
|
-
* - **When they first joined.**
|
|
90
|
-
*
|
|
91
|
-
*
|
|
92
|
-
*
|
|
93
|
-
*
|
|
97
|
+
* - **When they first joined.** The law (Finance Act 2004 Sch 36 para 23ZB,
|
|
98
|
+
* through paye-calc's `minimumPensionAgeFor`) keeps a protected pension age
|
|
99
|
+
* for a member who held a right to draw before 57 immediately before its
|
|
100
|
+
* cut-off. The scheme gave every member that right from 55
|
|
101
|
+
* (`MPA_KEPT_AGE`), so this is anyone in it by `MPA_RISE_JOINED_AFTER`.
|
|
102
|
+
* SPPA's NHS Circular 2025/09 (SA-61) keeps it across opting out and
|
|
103
|
+
* rejoining (Annex A Q9), and a later period's date would tell a
|
|
104
|
+
* long-serving member 57, so this reads their FIRST joining.
|
|
94
105
|
* - **When they draw.** Only for a member the rise reaches, and only before it
|
|
95
|
-
* takes effect: until 6 April 2028 the law's minimum is still 55
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
106
|
+
* takes effect: until 6 April 2028 the law's minimum is still 55.
|
|
107
|
+
*/
|
|
108
|
+
export function memberMinimumPensionAge(history, drawing) {
|
|
109
|
+
return drawingTest(history, drawing).minimumAge;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Whether a member may draw their pension on `drawing`, other than through
|
|
113
|
+
* ill health: on or after the birthday at which they reach their minimum
|
|
114
|
+
* pension age on that day. An age is reached on the birthday, as `npaDate`
|
|
115
|
+
* counts it. A caller walking the ages asks it of each drawing day.
|
|
100
116
|
*/
|
|
101
|
-
export function
|
|
117
|
+
export function mayDrawOn(history, drawing) {
|
|
118
|
+
return drawingTest(history, drawing).mayDraw;
|
|
119
|
+
}
|
|
120
|
+
/** The one place the minimum pension age is applied to a drawing: both
|
|
121
|
+
* answers at once, for a caller that refuses a drawing and names the age. */
|
|
122
|
+
export function drawingTest({ born, firstJoined }, drawing) {
|
|
123
|
+
const on = isoToDate(drawing);
|
|
124
|
+
const minimumAge = minimumPensionAgeFor({
|
|
125
|
+
rightFromAge: MPA_KEPT_AGE,
|
|
126
|
+
heldBeforeCutoff: isoToDate(firstJoined) < protectedPensionAgeCutoff(),
|
|
127
|
+
}, on);
|
|
128
|
+
return { minimumAge, mayDraw: on >= npaDate(isoToDate(born), minimumAge) };
|
|
129
|
+
}
|
|
130
|
+
/** The first day of a member's earliest period: the joining the minimum
|
|
131
|
+
* pension age reads. */
|
|
132
|
+
export function firstJoinedOf(member) {
|
|
102
133
|
if (member.service.length === 0) {
|
|
103
134
|
throw new RangeError('member: no service declared');
|
|
104
135
|
}
|
|
105
|
-
|
|
106
|
-
const law = minimumPensionAge(drawingOn);
|
|
107
|
-
const reached = firstJoined > isoToDate(MPA_RISE_JOINED_AFTER);
|
|
108
|
-
return reached ? law : Math.min(MPA_KEPT_AGE, law);
|
|
136
|
+
return isoDateOf(earliest(...member.service.map((p) => isoToDate(p.joined))));
|
|
109
137
|
}
|
|
110
138
|
//# sourceMappingURL=ages.js.map
|
package/dist/pension/ages.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ages.js","sourceRoot":"","sources":["../../src/pension/ages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"ages.js","sourceRoot":"","sources":["../../src/pension/ages.ts"],"names":[],"mappings":"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"}
|
package/dist/post.d.ts
CHANGED
|
@@ -26,23 +26,19 @@ export interface PostIdentity {
|
|
|
26
26
|
readonly taxYear: TaxYear;
|
|
27
27
|
/**
|
|
28
28
|
* The year the SALARY was published in, where that differs from
|
|
29
|
-
* {@link PostIdentity.taxYear}.
|
|
29
|
+
* {@link PostIdentity.taxYear}.
|
|
30
30
|
*
|
|
31
31
|
* The two are the same whenever a nation's pay round lands inside
|
|
32
|
-
* its own year
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
* Northern Ireland's pay points, the largest by 1.8 points of
|
|
39
|
-
* salary.
|
|
32
|
+
* its own year. They separate the moment a round runs late: Northern
|
|
33
|
+
* Ireland's staff are paid 2025-26 salaries during the 2026-27 tax
|
|
34
|
+
* year, and they contribute at the 2026-27 tier because contribution
|
|
35
|
+
* tiers are set by the SCHEME year, not by which round their salary
|
|
36
|
+
* came from. Read as one, the deduction would be overstated on four of
|
|
37
|
+
* Northern Ireland's pay points, the largest by 1.8 points of salary.
|
|
40
38
|
*
|
|
41
|
-
* REQUIRED
|
|
42
|
-
*
|
|
43
|
-
*
|
|
44
|
-
* them apart. Every construction path already knows both, so the
|
|
45
|
-
* option bought nothing but a place for them to recombine.
|
|
39
|
+
* REQUIRED: a fallback to `taxYear` would let `post.payYear` quietly
|
|
40
|
+
* answer with the tax year, joining the two bases inside the accessor
|
|
41
|
+
* that exists to keep them apart. Every construction path knows both.
|
|
46
42
|
*/
|
|
47
43
|
readonly payYear: PayYear;
|
|
48
44
|
}
|
|
@@ -123,13 +119,12 @@ export declare class Post {
|
|
|
123
119
|
/**
|
|
124
120
|
* The year whose tax, NI and pension tiers apply.
|
|
125
121
|
*
|
|
126
|
-
* REQUIRED, and ahead of `role` for that reason
|
|
127
|
-
*
|
|
128
|
-
*
|
|
129
|
-
*
|
|
130
|
-
*
|
|
131
|
-
*
|
|
132
|
-
* times it is wrong are exactly the times nobody is looking.
|
|
122
|
+
* REQUIRED, and ahead of `role` for that reason: a default to the
|
|
123
|
+
* pay year would give a caller who did not think about it the
|
|
124
|
+
* salary's own year, pricing a Northern Irish reader's 2025-26 pay
|
|
125
|
+
* at 2025-26 deductions in the 2026-27 tax year. A default that is
|
|
126
|
+
* right most of the time is worse than none, because the times it
|
|
127
|
+
* is wrong are exactly the times nobody is looking.
|
|
133
128
|
*/
|
|
134
129
|
taxYear: TaxYear, role?: Role): Post;
|
|
135
130
|
/**
|
|
@@ -182,18 +177,13 @@ export declare class Post {
|
|
|
182
177
|
* transcribed it".
|
|
183
178
|
*/
|
|
184
179
|
get scaleSource(): DocumentSource | undefined;
|
|
180
|
+
/** The year this post's SALARY was published in. */
|
|
181
|
+
get payYear(): PayYear;
|
|
185
182
|
/**
|
|
186
183
|
* Member contribution rate (%). The tier's single rate applies to
|
|
187
184
|
* the WHOLE of {@link Post.pensionablePay} (a slab/cliff-edge rate,
|
|
188
185
|
* not a marginal band); 0 when opted out.
|
|
189
186
|
*/
|
|
190
|
-
/**
|
|
191
|
-
* The year this post's SALARY was published in.
|
|
192
|
-
*
|
|
193
|
-
* Falls back to the tax year, which is right for every post whose
|
|
194
|
-
* pay round landed inside its own year.
|
|
195
|
-
*/
|
|
196
|
-
get payYear(): PayYear;
|
|
197
187
|
get pensionRate(): number;
|
|
198
188
|
/**
|
|
199
189
|
* Annual member pension contribution (£) — read from the
|
|
@@ -209,7 +199,10 @@ export declare class Post {
|
|
|
209
199
|
/**
|
|
210
200
|
* The pension annual allowance this post's year meets, with the
|
|
211
201
|
* scheme's defined-benefit pension input: read it here, not off
|
|
212
|
-
* `takeHome`, whose own allowance has no scheme input.
|
|
202
|
+
* `takeHome`, whose own allowance has no scheme input. The input is
|
|
203
|
+
* this year's accrual alone (`nhsAnnualAllowance`): a post knows no
|
|
204
|
+
* member history, so revaluation of pension already built up is not
|
|
205
|
+
* counted.
|
|
213
206
|
*/
|
|
214
207
|
get annualAllowance(): AnnualAllowance;
|
|
215
208
|
/** Annual income tax (£). */
|
package/dist/post.js
CHANGED
|
@@ -78,13 +78,12 @@ export class Post {
|
|
|
78
78
|
/**
|
|
79
79
|
* The year whose tax, NI and pension tiers apply.
|
|
80
80
|
*
|
|
81
|
-
* REQUIRED, and ahead of `role` for that reason
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
*
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
* times it is wrong are exactly the times nobody is looking.
|
|
81
|
+
* REQUIRED, and ahead of `role` for that reason: a default to the
|
|
82
|
+
* pay year would give a caller who did not think about it the
|
|
83
|
+
* salary's own year, pricing a Northern Irish reader's 2025-26 pay
|
|
84
|
+
* at 2025-26 deductions in the 2026-27 tax year. A default that is
|
|
85
|
+
* right most of the time is worse than none, because the times it
|
|
86
|
+
* is wrong are exactly the times nobody is looking.
|
|
88
87
|
*/
|
|
89
88
|
taxYear, role = { kind: 'vsm' }) {
|
|
90
89
|
return new Post({ nation, taxYear, payYear: year }, salary, role);
|
|
@@ -167,20 +166,15 @@ export class Post {
|
|
|
167
166
|
return undefined;
|
|
168
167
|
}
|
|
169
168
|
}
|
|
169
|
+
/** The year this post's SALARY was published in. */
|
|
170
|
+
get payYear() {
|
|
171
|
+
return this.identity.payYear;
|
|
172
|
+
}
|
|
170
173
|
/**
|
|
171
174
|
* Member contribution rate (%). The tier's single rate applies to
|
|
172
175
|
* the WHOLE of {@link Post.pensionablePay} (a slab/cliff-edge rate,
|
|
173
176
|
* not a marginal band); 0 when opted out.
|
|
174
177
|
*/
|
|
175
|
-
/**
|
|
176
|
-
* The year this post's SALARY was published in.
|
|
177
|
-
*
|
|
178
|
-
* Falls back to the tax year, which is right for every post whose
|
|
179
|
-
* pay round landed inside its own year.
|
|
180
|
-
*/
|
|
181
|
-
get payYear() {
|
|
182
|
-
return this.identity.payYear;
|
|
183
|
-
}
|
|
184
178
|
get pensionRate() {
|
|
185
179
|
if (this.adjustments.pensionOptedOut) {
|
|
186
180
|
return 0;
|
|
@@ -210,7 +204,10 @@ export class Post {
|
|
|
210
204
|
/**
|
|
211
205
|
* The pension annual allowance this post's year meets, with the
|
|
212
206
|
* scheme's defined-benefit pension input: read it here, not off
|
|
213
|
-
* `takeHome`, whose own allowance has no scheme input.
|
|
207
|
+
* `takeHome`, whose own allowance has no scheme input. The input is
|
|
208
|
+
* this year's accrual alone (`nhsAnnualAllowance`): a post knows no
|
|
209
|
+
* member history, so revaluation of pension already built up is not
|
|
210
|
+
* counted.
|
|
214
211
|
*/
|
|
215
212
|
get annualAllowance() {
|
|
216
213
|
return nhsAnnualAllowance(this.pensionablePay, this._pensionFraction, this.identity.taxYear, nationToTaxRegion(this.identity.nation));
|
package/dist/post.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAUvD,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AAErC,OAAO,EAAC,cAAc,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAGnD;;6CAE6C;AAC7C,SAAS,WAAW,CAClB,KAAoD,EACpD,KAAQ,EACR,QAA4C;IAE5C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;IAClD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,gBAAgB,CACxB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,CACzC,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC;AAED,uEAAuE;AACvE,SAAS,OAAO,CAAC,IAAU;IACzB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,KAAK;YACR,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,KAAK,KAAK;YACR,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,7 @@ interface FinalSalaryBenefit {
|
|
|
73
73
|
readonly beforeFactor: ProjectionMoney;
|
|
74
74
|
readonly pension: ProjectionMoney;
|
|
75
75
|
readonly automaticLumpSum: ProjectionMoney;
|
|
76
|
+
readonly automaticLumpSumBeforeFactor: ProjectionMoney;
|
|
76
77
|
readonly factor: FactorOutcome;
|
|
77
78
|
readonly membership: number;
|
|
78
79
|
readonly finalPay: number;
|
|
@@ -91,6 +91,7 @@ export function finalSalaryBenefit(rules, { windows, payPath, dateOfBirth, leavi
|
|
|
91
91
|
beforeFactor: money(unreduced),
|
|
92
92
|
pension: money(unreduced * factor.factor),
|
|
93
93
|
automaticLumpSum: money(lumpSum),
|
|
94
|
+
automaticLumpSumBeforeFactor: money(unreducedLump),
|
|
94
95
|
factor,
|
|
95
96
|
membership,
|
|
96
97
|
finalPay: pay,
|
|
@@ -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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"}
|
package/dist/sources.d.ts
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* allowance — so a second copy of its url or issue date is a second
|
|
8
8
|
* copy that can fall out of step with the first.
|
|
9
9
|
*
|
|
10
|
-
*
|
|
10
|
+
* Five kinds live here and the difference is load-bearing:
|
|
11
11
|
*
|
|
12
12
|
* - **Award instruments** — what a nation ACCEPTED. A written
|
|
13
13
|
* ministerial statement, a gov.scot news page, a Welsh written
|
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
* - **Allowance letters** — what sets a cash allowance per session.
|
|
18
18
|
* - **Scheme statements** — what an issuer says of a scheme: a factsheet,
|
|
19
19
|
* or a government response, which says so where it cites no instrument.
|
|
20
|
+
* - **Legislation** — an Act's own provision, where the rule a figure
|
|
21
|
+
* turns on is the statute's rather than the scheme's.
|
|
20
22
|
*
|
|
21
23
|
* They diverge in every nation. England's 2026-27 medical award was
|
|
22
24
|
* enacted by HCWS1462 on parliament.uk while its salaries are printed
|
|
@@ -200,6 +202,16 @@ export declare const HSC_TC8_05_2025: DocumentSource;
|
|
|
200
202
|
/** DHSC on who the 2028 rise in the minimum age reaches; archived as SA-59 in
|
|
201
203
|
* docs/source-archive.md. A petition response that cites no instrument. */
|
|
202
204
|
export declare const DHSC_PETITION_779519: DocumentSource;
|
|
205
|
+
/** The Scottish scheme's own statement of who keeps 55; archived as SA-61 in
|
|
206
|
+
* docs/source-archive.md, the version with paragraph 9 updated. */
|
|
207
|
+
export declare const SPPA_NHS_CIRCULAR_2025_09: DocumentSource;
|
|
203
208
|
/** The additional pension limit and unit; archived as SA-58 in
|
|
204
209
|
* docs/source-archive.md. */
|
|
205
210
|
export declare const AP_FACTSHEET_2026: DocumentSource;
|
|
211
|
+
/** The protected pension age kept through the 2028 rise in the minimum age:
|
|
212
|
+
* Finance Act 2004 Sch 36 para 23ZB, inserted by Finance Act 2022 s.10(5)
|
|
213
|
+
* (Royal Assent 24 February 2022); archived as SA-60 in docs/source-archive.md.
|
|
214
|
+
* paye-calc's `minimumPensionAgeFor` models the rule, and
|
|
215
|
+
* `memberMinimumPensionAge` applies it to the scheme's right from 55. Held
|
|
216
|
+
* here because paye-calc keeps no source records. */
|
|
217
|
+
export declare const FA2004_SCH36_PARA_23ZB: DocumentSource;
|
package/dist/sources.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* allowance — so a second copy of its url or issue date is a second
|
|
8
8
|
* copy that can fall out of step with the first.
|
|
9
9
|
*
|
|
10
|
-
*
|
|
10
|
+
* Five kinds live here and the difference is load-bearing:
|
|
11
11
|
*
|
|
12
12
|
* - **Award instruments** — what a nation ACCEPTED. A written
|
|
13
13
|
* ministerial statement, a gov.scot news page, a Welsh written
|
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
* - **Allowance letters** — what sets a cash allowance per session.
|
|
18
18
|
* - **Scheme statements** — what an issuer says of a scheme: a factsheet,
|
|
19
19
|
* or a government response, which says so where it cites no instrument.
|
|
20
|
+
* - **Legislation** — an Act's own provision, where the rule a figure
|
|
21
|
+
* turns on is the statute's rather than the scheme's.
|
|
20
22
|
*
|
|
21
23
|
* They diverge in every nation. England's 2026-27 medical award was
|
|
22
24
|
* enacted by HCWS1462 on parliament.uk while its salaries are printed
|
|
@@ -404,6 +406,15 @@ export const DHSC_PETITION_779519 = new DocumentSource({
|
|
|
404
406
|
url: 'https://petition.parliament.uk/petitions/779519?reveal_response=yes',
|
|
405
407
|
issued: isoDate('2026-10-19'),
|
|
406
408
|
});
|
|
409
|
+
/** The Scottish scheme's own statement of who keeps 55; archived as SA-61 in
|
|
410
|
+
* docs/source-archive.md, the version with paragraph 9 updated. */
|
|
411
|
+
export const SPPA_NHS_CIRCULAR_2025_09 = new DocumentSource({
|
|
412
|
+
issuer: 'the Scottish Public Pensions Agency',
|
|
413
|
+
reference: 'NHS Circular 2025/09, Increase to the normal minimum pension age',
|
|
414
|
+
url: 'https://pensions.gov.scot/sites/default/files/2025-07/NHS_Circular_2025-09'
|
|
415
|
+
+ '_Increase_to_the_normal_minimum_pension_age_from_6_April_2028.pdf',
|
|
416
|
+
issued: isoDate('2025-11-04'),
|
|
417
|
+
});
|
|
407
418
|
/** The additional pension limit and unit; archived as SA-58 in
|
|
408
419
|
* docs/source-archive.md. */
|
|
409
420
|
export const AP_FACTSHEET_2026 = new DocumentSource({
|
|
@@ -417,4 +428,17 @@ export const AP_FACTSHEET_2026 = new DocumentSource({
|
|
|
417
428
|
// expected each April.
|
|
418
429
|
nextExpected: isoDate('2027-04-01'),
|
|
419
430
|
});
|
|
431
|
+
// ── Legislation ───────────────────────────────────
|
|
432
|
+
/** The protected pension age kept through the 2028 rise in the minimum age:
|
|
433
|
+
* Finance Act 2004 Sch 36 para 23ZB, inserted by Finance Act 2022 s.10(5)
|
|
434
|
+
* (Royal Assent 24 February 2022); archived as SA-60 in docs/source-archive.md.
|
|
435
|
+
* paye-calc's `minimumPensionAgeFor` models the rule, and
|
|
436
|
+
* `memberMinimumPensionAge` applies it to the scheme's right from 55. Held
|
|
437
|
+
* here because paye-calc keeps no source records. */
|
|
438
|
+
export const FA2004_SCH36_PARA_23ZB = new DocumentSource({
|
|
439
|
+
issuer: 'Parliament',
|
|
440
|
+
reference: 'Finance Act 2004, Schedule 36, paragraph 23ZB',
|
|
441
|
+
url: 'https://www.legislation.gov.uk/ukpga/2004/12/schedule/36/paragraph/23ZB',
|
|
442
|
+
issued: isoDate('2022-02-24'),
|
|
443
|
+
});
|
|
420
444
|
//# sourceMappingURL=sources.js.map
|
package/dist/sources.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sources.js","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"AAAA
|
|
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"}
|