@casomoltd/nhs-pay 0.31.0 → 0.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +25 -22
- package/dist/afc-scales.d.ts +43 -10
- package/dist/afc-scales.js +50 -16
- package/dist/afc-scales.js.map +1 -1
- package/dist/allowances.js +11 -11
- package/dist/allowances.js.map +1 -1
- package/dist/award.d.ts +3 -3
- package/dist/award.js +21 -21
- package/dist/award.js.map +1 -1
- package/dist/circulars/england-md-1-2026-r2.d.ts +13 -0
- package/dist/circulars/england-md-1-2026-r2.js +13 -0
- package/dist/circulars/england-md-1-2026-r2.js.map +1 -1
- package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +22 -0
- package/dist/circulars/ni-hsc-tc8-05-2025.js +22 -0
- package/dist/circulars/ni-hsc-tc8-05-2025.js.map +1 -1
- package/dist/circulars/scotland-pcs-dd-2025-01.d.ts +20 -0
- package/dist/circulars/scotland-pcs-dd-2025-01.js +20 -0
- package/dist/circulars/scotland-pcs-dd-2025-01.js.map +1 -1
- package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +19 -0
- package/dist/circulars/scotland-pcs-dd-2026-01.js +30 -10
- package/dist/circulars/scotland-pcs-dd-2026-01.js.map +1 -1
- package/dist/circulars/scotland-pcs-dd-2026-02.d.ts +10 -0
- package/dist/circulars/scotland-pcs-dd-2026-02.js +10 -0
- package/dist/circulars/scotland-pcs-dd-2026-02.js.map +1 -1
- package/dist/circulars/wales-mdw-01-2025.d.ts +17 -0
- package/dist/circulars/wales-mdw-01-2025.js +17 -0
- package/dist/circulars/wales-mdw-01-2025.js.map +1 -1
- package/dist/circulars/wales-mdw-01-2026.d.ts +20 -0
- package/dist/circulars/wales-mdw-01-2026.js +20 -0
- package/dist/circulars/wales-mdw-01-2026.js.map +1 -1
- package/dist/commutation.js +3 -2
- package/dist/commutation.js.map +1 -1
- package/dist/dental-grades.d.ts +25 -0
- package/dist/dental-grades.js +25 -0
- package/dist/dental-grades.js.map +1 -0
- package/dist/dental-scales.d.ts +5 -21
- package/dist/dental-scales.js +73 -72
- package/dist/dental-scales.js.map +1 -1
- package/dist/document-source.d.ts +32 -23
- package/dist/document-source.js +32 -10
- package/dist/document-source.js.map +1 -1
- package/dist/errors.d.ts +12 -1
- package/dist/errors.js +18 -1
- package/dist/errors.js.map +1 -1
- package/dist/factor-basis.d.ts +9 -3
- package/dist/factor-basis.js +40 -28
- package/dist/factor-basis.js.map +1 -1
- package/dist/format.js +3 -2
- package/dist/format.js.map +1 -1
- package/dist/hcas-pcts.d.ts +1 -1
- package/dist/hcas-zone.d.ts +23 -0
- package/dist/hcas-zone.js +17 -0
- package/dist/hcas-zone.js.map +1 -0
- package/dist/hcas.d.ts +26 -18
- package/dist/hcas.js +45 -24
- package/dist/hcas.js.map +1 -1
- package/dist/index.d.ts +27 -18
- package/dist/index.js +17 -13
- package/dist/index.js.map +1 -1
- package/dist/medical-grades.d.ts +33 -0
- package/dist/medical-grades.js +33 -0
- package/dist/medical-grades.js.map +1 -0
- package/dist/medical-scales.d.ts +10 -33
- package/dist/medical-scales.js +104 -158
- package/dist/medical-scales.js.map +1 -1
- package/dist/member/benefits.js +9 -4
- package/dist/member/benefits.js.map +1 -1
- package/dist/member/input-period.d.ts +18 -5
- package/dist/member/input-period.js +24 -13
- package/dist/member/input-period.js.map +1 -1
- package/dist/member/valuation.js +3 -6
- package/dist/member/valuation.js.map +1 -1
- package/dist/pay-round.js +3 -3
- package/dist/pay-round.js.map +1 -1
- package/dist/pay-year.d.ts +17 -0
- package/dist/pay-year.js +20 -0
- package/dist/pay-year.js.map +1 -0
- package/dist/pension/ledger.d.ts +7 -0
- package/dist/pension/ledger.js +26 -18
- package/dist/pension/ledger.js.map +1 -1
- package/dist/pension/money.d.ts +2 -0
- package/dist/pension/money.js +4 -0
- package/dist/pension/money.js.map +1 -1
- package/dist/pension/uplift.d.ts +25 -21
- package/dist/pension/uplift.js +27 -12
- package/dist/pension/uplift.js.map +1 -1
- package/dist/pension.js +2 -1
- package/dist/pension.js.map +1 -1
- package/dist/post.d.ts +20 -21
- package/dist/post.js +54 -53
- package/dist/post.js.map +1 -1
- package/dist/published/england-afc.d.ts +29 -0
- package/dist/published/england-afc.js +142 -0
- package/dist/published/england-afc.js.map +1 -0
- package/dist/published/hcas-zones.d.ts +18 -0
- package/dist/published/hcas-zones.js +46 -0
- package/dist/published/hcas-zones.js.map +1 -0
- package/dist/published/wales-living-wage.d.ts +36 -0
- package/dist/published/wales-living-wage.js +30 -0
- package/dist/published/wales-living-wage.js.map +1 -0
- package/dist/regions.d.ts +25 -14
- package/dist/regions.js +61 -71
- package/dist/regions.js.map +1 -1
- package/dist/resolver.d.ts +46 -41
- package/dist/resolver.js +70 -142
- package/dist/resolver.js.map +1 -1
- package/dist/revaluation.d.ts +27 -11
- package/dist/revaluation.js +46 -32
- package/dist/revaluation.js.map +1 -1
- package/dist/role.d.ts +3 -3
- package/dist/scale-point.d.ts +11 -7
- package/dist/scale-point.js +29 -1
- package/dist/scale-point.js.map +1 -1
- package/dist/scale-tables.d.ts +42 -60
- package/dist/scale-tables.js +65 -105
- package/dist/scale-tables.js.map +1 -1
- package/dist/scale-translators.d.ts +90 -0
- package/dist/scale-translators.js +97 -0
- package/dist/scale-translators.js.map +1 -0
- package/dist/scales.d.ts +138 -101
- package/dist/scales.js +221 -457
- package/dist/scales.js.map +1 -1
- package/dist/sections/final-salary.js +3 -11
- package/dist/sections/final-salary.js.map +1 -1
- package/dist/sections/section-2015.d.ts +1 -3
- package/dist/sections/section-2015.js +1 -1
- package/dist/sections/section-2015.js.map +1 -1
- package/dist/sources.d.ts +12 -12
- package/dist/sources.js +13 -15
- package/dist/sources.js.map +1 -1
- package/dist/take-home.js +1 -2
- package/dist/take-home.js.map +1 -1
- package/dist/values.d.ts +10 -3
- package/dist/values.js +11 -4
- package/dist/values.js.map +1 -1
- package/dist/working-week.d.ts +23 -8
- package/dist/working-week.js +55 -25
- package/dist/working-week.js.map +1 -1
- package/package.json +3 -3
- package/dist/bands.d.ts +0 -63
- package/dist/bands.js +0 -78
- package/dist/bands.js.map +0 -1
package/dist/medical-scales.d.ts
CHANGED
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* increment), so no pay step is collapsed away.
|
|
14
14
|
*
|
|
15
15
|
* Grades captured in the circulars but not yet wired here (add when a
|
|
16
|
-
*
|
|
16
|
+
* consumer needs them — they are one mapping line each): England's ultra-
|
|
17
17
|
* legacy closed grades SCMO (KB11), CMO (KB01), pre-2003 consultant
|
|
18
18
|
* (MC21), closed Specialist Registrar (MN25) and closed training
|
|
19
19
|
* variants (MN13/15/21/35/37/39); the second staff-grade scales
|
|
@@ -21,51 +21,28 @@
|
|
|
21
21
|
*/
|
|
22
22
|
import type { Nation, PayYear } from '@casomoltd/paye-calc';
|
|
23
23
|
import type { DocumentSource } from './document-source.js';
|
|
24
|
-
import type {
|
|
25
|
-
|
|
26
|
-
export declare const MEDICAL_GRADES: {
|
|
27
|
-
readonly resident: "resident";
|
|
28
|
-
readonly consultant: "consultant";
|
|
29
|
-
readonly specialtyDoctor: "specialty-doctor";
|
|
30
|
-
readonly specialist: "specialist";
|
|
31
|
-
readonly salariedGp: "salaried-gp";
|
|
32
|
-
readonly gpEducator: "gp-educator";
|
|
33
|
-
readonly locallyEmployedDoctor: "locally-employed-doctor";
|
|
34
|
-
readonly fho1: "fho1";
|
|
35
|
-
readonly fho2: "fho2";
|
|
36
|
-
readonly sho: "sho";
|
|
37
|
-
readonly spr: "spr";
|
|
38
|
-
readonly str: "str";
|
|
39
|
-
readonly specialtyRegistrarCore: "specialty-registrar-core";
|
|
40
|
-
readonly specialtyRegistrarFixed: "specialty-registrar-fixed";
|
|
41
|
-
readonly gpRegistrarSho: "gp-registrar-sho";
|
|
42
|
-
readonly gpRegistrarSpr: "gp-registrar-spr";
|
|
43
|
-
readonly gpRegistrarStr: "gp-registrar-str";
|
|
44
|
-
readonly staffGrade: "staff-grade";
|
|
45
|
-
readonly associateSpecialist: "associate-specialist";
|
|
46
|
-
readonly specialtyDoctor2008: "specialty-doctor-2008";
|
|
47
|
-
readonly associateSpecialist2008: "associate-specialist-2008";
|
|
48
|
-
readonly hospitalPractitioner: "hospital-practitioner";
|
|
49
|
-
};
|
|
50
|
-
export type MedicalGradeId = (typeof MEDICAL_GRADES)[keyof typeof MEDICAL_GRADES];
|
|
51
|
-
/** Ordered grade IDs — stable iteration/enumeration. */
|
|
52
|
-
export declare const MEDICAL_GRADE_IDS: MedicalGradeId[];
|
|
24
|
+
import type { MedicalGradeId } from './medical-grades.js';
|
|
25
|
+
import type { GradeFamily, GradeMeta } from './scale-tables.js';
|
|
53
26
|
/** A doctor grade's scale points in a nation/year, with its range. */
|
|
54
27
|
export type MedicalGradeMeta = GradeMeta<MedicalGradeId>;
|
|
28
|
+
/** Every read over the medical tables. */
|
|
29
|
+
export declare const MEDICAL_FAMILY: GradeFamily<MedicalGradeId>;
|
|
55
30
|
/**
|
|
56
31
|
* Pay years this family publishes, newest first — derived from the
|
|
57
32
|
* data so a new pay round can't leave a hand-maintained list stale.
|
|
58
33
|
*/
|
|
59
34
|
export declare const MEDICAL_PAY_YEARS: readonly PayYear[];
|
|
60
35
|
/**
|
|
61
|
-
* Published doctor grades for a nation and
|
|
36
|
+
* Published doctor grades for a nation and pay year, each with its
|
|
62
37
|
* scale points and salary range. Both args required — no default;
|
|
63
38
|
* an absent grade set throws `ScaleUnavailable`.
|
|
64
39
|
*/
|
|
65
40
|
export declare function getMedicalScales(year: PayYear, nation: Nation): MedicalGradeMeta[];
|
|
66
41
|
/**
|
|
67
|
-
* The newest
|
|
68
|
-
* every grade
|
|
42
|
+
* The newest document of the newest year a nation publishes doctors'
|
|
43
|
+
* pay for, across every medical grade that year. It searches
|
|
44
|
+
* the medical tables only: a document that sets dental pay alone is not
|
|
45
|
+
* a candidate.
|
|
69
46
|
*
|
|
70
47
|
* For prose that cites the nation rather than one family's table.
|
|
71
48
|
* Newest by issue date, not by any hardcoded preference: Scotland
|
package/dist/medical-scales.js
CHANGED
|
@@ -13,50 +13,25 @@
|
|
|
13
13
|
* increment), so no pay step is collapsed away.
|
|
14
14
|
*
|
|
15
15
|
* Grades captured in the circulars but not yet wired here (add when a
|
|
16
|
-
*
|
|
16
|
+
* consumer needs them — they are one mapping line each): England's ultra-
|
|
17
17
|
* legacy closed grades SCMO (KB11), CMO (KB01), pre-2003 consultant
|
|
18
18
|
* (MC21), closed Specialist Registrar (MN25) and closed training
|
|
19
19
|
* variants (MN13/15/21/35/37/39); the second staff-grade scales
|
|
20
20
|
* (England MH03/05, NI M212).
|
|
21
21
|
*/
|
|
22
|
-
import { NATION_KEYS,
|
|
23
|
-
import {
|
|
24
|
-
import {
|
|
22
|
+
import { NATION_KEYS, YEAR_LABELS } from '@casomoltd/paye-calc';
|
|
23
|
+
import { invariant } from './errors.js';
|
|
24
|
+
import { MEDICAL_GRADE_IDS } from './medical-grades.js';
|
|
25
|
+
import { combineScales, fromDocument, gradeFamily, } from './scale-tables.js';
|
|
26
|
+
import { byCode, byStage, numbered, byGrade, byPayPoint, byScalePoint, range, salariesOfCode, stepped, } from './scale-translators.js';
|
|
25
27
|
import { 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';
|
|
26
|
-
import { ENGLAND_MD_1_2026_R2 as ENG } from './circulars/england-md-1-2026-r2.js';
|
|
27
|
-
import { SCOTLAND_PCS_DD_2026_01 as SCO } from './circulars/scotland-pcs-dd-2026-01.js';
|
|
28
|
-
import { SCOTLAND_PCS_DD_2025_01 as SCO25 } from './circulars/scotland-pcs-dd-2025-01.js';
|
|
29
|
-
import { SCOTLAND_PCS_DD_2026_02 as SCO2 } from './circulars/scotland-pcs-dd-2026-02.js';
|
|
30
|
-
import { WALES_MDW_01_2025 as WAL } from './circulars/wales-mdw-01-2025.js';
|
|
31
|
-
import { WALES_MDW_01_2026 as WAL26 } from './circulars/wales-mdw-01-2026.js';
|
|
32
|
-
import { NI_HSC_TC8_05_2025 as NI } from './circulars/ni-hsc-tc8-05-2025.js';
|
|
33
|
-
/** Doctor grade identifiers wired into the domain. */
|
|
34
|
-
export const MEDICAL_GRADES = {
|
|
35
|
-
resident: 'resident',
|
|
36
|
-
consultant: 'consultant',
|
|
37
|
-
specialtyDoctor: 'specialty-doctor',
|
|
38
|
-
specialist: 'specialist',
|
|
39
|
-
salariedGp: 'salaried-gp',
|
|
40
|
-
gpEducator: 'gp-educator',
|
|
41
|
-
locallyEmployedDoctor: 'locally-employed-doctor',
|
|
42
|
-
fho1: 'fho1',
|
|
43
|
-
fho2: 'fho2',
|
|
44
|
-
sho: 'sho',
|
|
45
|
-
spr: 'spr',
|
|
46
|
-
str: 'str',
|
|
47
|
-
specialtyRegistrarCore: 'specialty-registrar-core',
|
|
48
|
-
specialtyRegistrarFixed: 'specialty-registrar-fixed',
|
|
49
|
-
gpRegistrarSho: 'gp-registrar-sho',
|
|
50
|
-
gpRegistrarSpr: 'gp-registrar-spr',
|
|
51
|
-
gpRegistrarStr: 'gp-registrar-str',
|
|
52
|
-
staffGrade: 'staff-grade',
|
|
53
|
-
associateSpecialist: 'associate-specialist',
|
|
54
|
-
specialtyDoctor2008: 'specialty-doctor-2008',
|
|
55
|
-
associateSpecialist2008: 'associate-specialist-2008',
|
|
56
|
-
hospitalPractitioner: 'hospital-practitioner',
|
|
57
|
-
};
|
|
58
|
-
/** Ordered grade IDs — stable iteration/enumeration. */
|
|
59
|
-
export const MEDICAL_GRADE_IDS = Object.values(MEDICAL_GRADES);
|
|
28
|
+
import { ENGLAND_MD_1_2026_R2 as ENG, ENGLAND_MD_1_2026_R2_CODES as ENG_CODES, } from './circulars/england-md-1-2026-r2.js';
|
|
29
|
+
import { SCOTLAND_PCS_DD_2026_01 as SCO, SCOTLAND_PCS_DD_2026_01_CODES as SCO_CODES, } from './circulars/scotland-pcs-dd-2026-01.js';
|
|
30
|
+
import { SCOTLAND_PCS_DD_2025_01 as SCO25, SCOTLAND_PCS_DD_2025_01_CODES as SCO25_CODES, } from './circulars/scotland-pcs-dd-2025-01.js';
|
|
31
|
+
import { SCOTLAND_PCS_DD_2026_02 as SCO2, SCOTLAND_PCS_DD_2026_02_CODES as SCO2_CODES, } from './circulars/scotland-pcs-dd-2026-02.js';
|
|
32
|
+
import { WALES_MDW_01_2025 as WAL, WALES_MDW_01_2025_CODES as WAL_CODES, } from './circulars/wales-mdw-01-2025.js';
|
|
33
|
+
import { WALES_MDW_01_2026 as WAL26, WALES_MDW_01_2026_CODES as WAL26_CODES, } from './circulars/wales-mdw-01-2026.js';
|
|
34
|
+
import { NI_HSC_TC8_05_2025 as NI, NI_HSC_TC8_05_2025_CODES as NI_CODES, } from './circulars/ni-hsc-tc8-05-2025.js';
|
|
60
35
|
// ── Mapping helpers ─────────────────────────────
|
|
61
36
|
/** Consultant year-point rows → points labelled by threshold, with the
|
|
62
37
|
* year of completed service carried on the point (not baked into the
|
|
@@ -66,7 +41,8 @@ const consultantByYear = (rows) => rows.map((r) => ({
|
|
|
66
41
|
salary: r.salary,
|
|
67
42
|
yearsExperience: r.yearCompleted,
|
|
68
43
|
}));
|
|
69
|
-
|
|
44
|
+
// ── Per-nation translation ──────────────────────
|
|
45
|
+
const england2026 = fromDocument(PC_MD_1_2026_R2, {
|
|
70
46
|
resident: byStage(ENG.doctorsInTraining),
|
|
71
47
|
consultant: consultantByYear(ENG.consultant),
|
|
72
48
|
'specialty-doctor': byCode(ENG.specialtyDoctor),
|
|
@@ -74,76 +50,60 @@ const england = fromDocument(PC_MD_1_2026_R2, {
|
|
|
74
50
|
'salaried-gp': range(ENG.salariedGpRange),
|
|
75
51
|
'gp-educator': byCode(ENG.gpEducators),
|
|
76
52
|
'locally-employed-doctor': byCode(ENG.locallyEmployedDoctors),
|
|
77
|
-
'staff-grade': stepped(
|
|
78
|
-
'associate-specialist': stepped(
|
|
53
|
+
'staff-grade': stepped(salariesOfCode(ENG.closedGrades, ENG_CODES.staffGrade)),
|
|
54
|
+
'associate-specialist': stepped(salariesOfCode(ENG.closedGrades, ENG_CODES.associateSpecialist)),
|
|
79
55
|
'specialty-doctor-2008': byCode(ENG.specialtyDoctor2008),
|
|
80
56
|
'associate-specialist-2008': byCode(ENG.associateSpecialist2008),
|
|
81
57
|
});
|
|
82
58
|
// Non-training grades from PCS(DD)2026/02 (12 Aug 2026); training
|
|
83
59
|
// grades from PCS(DD)2026/01, which deferred the rest to it. The
|
|
84
60
|
// two together are Scotland's complete 2026/27 round.
|
|
85
|
-
const
|
|
61
|
+
const scotland2026 = combineScales(fromDocument(PCS_DD_2026_02, {
|
|
86
62
|
consultant: consultantByYear(SCO2.consultant),
|
|
87
|
-
'specialty-doctor': SCO2.specialtyDoctor2022
|
|
88
|
-
|
|
89
|
-
salary: r.salary,
|
|
90
|
-
yearsExperience: r.scalePoint,
|
|
91
|
-
})),
|
|
92
|
-
specialist: SCO2.specialist2022.map((r) => ({
|
|
93
|
-
label: r.scalePoint === 0 ? 'Minimum' : `Point ${r.scalePoint}`,
|
|
94
|
-
salary: r.salary,
|
|
95
|
-
yearsExperience: r.scalePoint,
|
|
96
|
-
})),
|
|
63
|
+
'specialty-doctor': byScalePoint(SCO2.specialtyDoctor2022),
|
|
64
|
+
specialist: byScalePoint(SCO2.specialist2022),
|
|
97
65
|
'specialty-doctor-2008': stepped(SCO2.specialtyDoctor2008),
|
|
98
66
|
'associate-specialist-2008': stepped(SCO2.associateSpecialist2008),
|
|
99
|
-
'associate-specialist': stepped(
|
|
100
|
-
'staff-grade': stepped(
|
|
67
|
+
'associate-specialist': stepped(salariesOfCode(SCO2.closedGrades, SCO2_CODES.associateSpecialistPre2008)),
|
|
68
|
+
'staff-grade': stepped(salariesOfCode(SCO2.closedGrades, SCO2_CODES.staffGradePre1997)),
|
|
101
69
|
'salaried-gp': range(SCO2.salariedGpRange),
|
|
102
|
-
'gp-educator': SCO2.associateAdvisers
|
|
103
|
-
label: r.grade, salary: r.salary,
|
|
104
|
-
})),
|
|
70
|
+
'gp-educator': byGrade(SCO2.associateAdvisers),
|
|
105
71
|
}), fromDocument(PCS_DD_2026_01, {
|
|
106
|
-
fho1: stepped(
|
|
107
|
-
fho2: stepped(
|
|
108
|
-
sho: stepped(
|
|
109
|
-
spr: stepped(
|
|
110
|
-
str: stepped(
|
|
111
|
-
'specialty-registrar-core': stepped(
|
|
112
|
-
'specialty-registrar-fixed': stepped(
|
|
113
|
-
'gp-registrar-sho': stepped(
|
|
114
|
-
'gp-registrar-spr': stepped(
|
|
115
|
-
'gp-registrar-str': stepped(
|
|
72
|
+
fho1: stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.foundationYear1)),
|
|
73
|
+
fho2: stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.foundationYear2)),
|
|
74
|
+
sho: stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.seniorHouseOfficer)),
|
|
75
|
+
spr: stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.specialistRegistrar)),
|
|
76
|
+
str: stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.specialtyRegistrarFull)),
|
|
77
|
+
'specialty-registrar-core': stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.specialtyRegistrarCore)),
|
|
78
|
+
'specialty-registrar-fixed': stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.specialtyRegistrarFixed)),
|
|
79
|
+
'gp-registrar-sho': stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.gpRegistrarSho)),
|
|
80
|
+
'gp-registrar-spr': stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.gpRegistrarSpr)),
|
|
81
|
+
'gp-registrar-str': stepped(salariesOfCode(SCO.trainingGrades, SCO_CODES.gpRegistrarStr)),
|
|
116
82
|
}));
|
|
117
|
-
const
|
|
83
|
+
const wales2025 = fromDocument(MD_W_01_2025, {
|
|
118
84
|
consultant: consultantByYear(WAL.consultant),
|
|
119
|
-
str: stepped(
|
|
120
|
-
'specialty-registrar-core': stepped(
|
|
121
|
-
'specialty-registrar-fixed': stepped(
|
|
122
|
-
fho1: stepped(
|
|
123
|
-
fho2: stepped(
|
|
85
|
+
str: stepped(salariesOfCode(WAL.trainingGrades, WAL_CODES.specialtyRegistrarFull)),
|
|
86
|
+
'specialty-registrar-core': stepped(salariesOfCode(WAL.trainingGrades, WAL_CODES.specialtyRegistrarCore)),
|
|
87
|
+
'specialty-registrar-fixed': stepped(salariesOfCode(WAL.trainingGrades, WAL_CODES.specialtyRegistrarFixed)),
|
|
88
|
+
fho1: stepped(salariesOfCode(WAL.trainingGrades, WAL_CODES.foundationYear1)),
|
|
89
|
+
fho2: stepped(salariesOfCode(WAL.trainingGrades, WAL_CODES.foundationYear2)),
|
|
124
90
|
'specialty-doctor': byCode(WAL.specialtyDoctor),
|
|
125
91
|
specialist: byCode(WAL.specialist),
|
|
126
92
|
'salaried-gp': stepped(WAL.salariedGp.salaries),
|
|
127
|
-
'staff-grade': stepped(
|
|
128
|
-
'associate-specialist': stepped(
|
|
93
|
+
'staff-grade': stepped(salariesOfCode(WAL.closedGrades, WAL_CODES.staffGrade)),
|
|
94
|
+
'associate-specialist': stepped(salariesOfCode(WAL.closedGrades, WAL_CODES.associateSpecialist)),
|
|
129
95
|
'specialty-doctor-2008': byCode(WAL.specialtyDoctor2008),
|
|
130
96
|
'associate-specialist-2008': byCode(WAL.associateSpecialist2008),
|
|
131
|
-
'hospital-practitioner': stepped(
|
|
97
|
+
'hospital-practitioner': stepped(salariesOfCode(WAL.closedGrades, WAL_CODES.hospitalPractitioner)),
|
|
132
98
|
});
|
|
133
|
-
const
|
|
134
|
-
fho1: stepped(
|
|
135
|
-
fho2: stepped(
|
|
136
|
-
str: stepped(
|
|
137
|
-
'specialty-registrar-fixed': stepped(
|
|
138
|
-
'specialty-registrar-core': stepped(
|
|
139
|
-
'specialty-doctor': NI.specialtyDoctor
|
|
140
|
-
|
|
141
|
-
yearsExperience: r.yearsExperience,
|
|
142
|
-
})),
|
|
143
|
-
specialist: NI.specialist.map((r) => ({
|
|
144
|
-
label: `Point ${r.payPoint}`, salary: r.salary,
|
|
145
|
-
yearsExperience: r.yearsExperience,
|
|
146
|
-
})),
|
|
99
|
+
const northernIreland2025 = fromDocument(HSC_TC8_05_2025, {
|
|
100
|
+
fho1: stepped(salariesOfCode(NI.residentGrades, NI_CODES.foundationYear1)),
|
|
101
|
+
fho2: stepped(salariesOfCode(NI.residentGrades, NI_CODES.foundationYear2)),
|
|
102
|
+
str: stepped(salariesOfCode(NI.residentGrades, NI_CODES.specialtyRegistrarFull)),
|
|
103
|
+
'specialty-registrar-fixed': stepped(salariesOfCode(NI.residentGrades, NI_CODES.specialtyRegistrarFixed)),
|
|
104
|
+
'specialty-registrar-core': stepped(salariesOfCode(NI.residentGrades, NI_CODES.coreTraining)),
|
|
105
|
+
'specialty-doctor': byPayPoint(NI.specialtyDoctor),
|
|
106
|
+
specialist: byPayPoint(NI.specialist),
|
|
147
107
|
consultant: NI.consultant.map((r) => ({
|
|
148
108
|
label: `Threshold ${r.threshold} · pt ${r.payPoint}`, salary: r.salary,
|
|
149
109
|
})),
|
|
@@ -152,8 +112,8 @@ const northernIreland = fromDocument(HSC_TC8_05_2025, {
|
|
|
152
112
|
'hospital-practitioner': numbered(NI.hospitalPractitioner),
|
|
153
113
|
'specialty-doctor-2008': byCode(NI.specialtyDoctor2008),
|
|
154
114
|
'associate-specialist-2008': byCode(NI.associateSpecialist2008),
|
|
155
|
-
'associate-specialist': stepped(
|
|
156
|
-
'staff-grade': stepped(
|
|
115
|
+
'associate-specialist': stepped(salariesOfCode(NI.closedGrades, NI_CODES.associateSpecialist)),
|
|
116
|
+
'staff-grade': stepped(salariesOfCode(NI.closedGrades, NI_CODES.staffGrade)),
|
|
157
117
|
});
|
|
158
118
|
/**
|
|
159
119
|
* Wales's 2026 Resident Contract — Annex A §1c, in force from
|
|
@@ -178,30 +138,37 @@ const northernIreland = fromDocument(HSC_TC8_05_2025, {
|
|
|
178
138
|
* one to park it in the medical scales would put it where no consumer
|
|
179
139
|
* would look.
|
|
180
140
|
*/
|
|
181
|
-
const walesResident2026 = (rows) =>
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
}
|
|
141
|
+
const walesResident2026 = (rows) => {
|
|
142
|
+
// The two grade names are read by value, so check both are printed: a
|
|
143
|
+
// misspelt one would keep the dental row or flatten every registrar label.
|
|
144
|
+
for (const grade of [WAL26_CODES.dentalFoundationTrainee, WAL26_CODES.registrar]) {
|
|
145
|
+
invariant(rows.some((r) => r.grade === grade), `medical-scales: Wales 2026's resident table prints no "${grade}" row`);
|
|
146
|
+
}
|
|
147
|
+
return rows
|
|
148
|
+
.filter((r) => r.grade !== WAL26_CODES.dentalFoundationTrainee)
|
|
149
|
+
.map((r) => ({
|
|
150
|
+
label: r.grade === WAL26_CODES.registrar ? `Registrar ${r.spine}` : r.grade,
|
|
151
|
+
salary: r.salary,
|
|
152
|
+
}));
|
|
153
|
+
};
|
|
187
154
|
// Wales 2026/27 (M&D(W) 01/2026) — a full 3.5% uplift of the 2025 scales.
|
|
188
155
|
// The Associate Specialist MC01 code is removed in this circular, so unlike
|
|
189
|
-
// `
|
|
156
|
+
// `wales2025` there is no 'associate-specialist' entry here.
|
|
190
157
|
const wales2026 = fromDocument(MD_W_01_2026, {
|
|
191
158
|
resident: walesResident2026(WAL26.resident2026Contract),
|
|
192
159
|
consultant: consultantByYear(WAL26.consultant),
|
|
193
|
-
str: stepped(
|
|
194
|
-
'specialty-registrar-core': stepped(
|
|
195
|
-
'specialty-registrar-fixed': stepped(
|
|
196
|
-
fho1: stepped(
|
|
197
|
-
fho2: stepped(
|
|
160
|
+
str: stepped(salariesOfCode(WAL26.trainingGrades, WAL26_CODES.specialtyRegistrarFull)),
|
|
161
|
+
'specialty-registrar-core': stepped(salariesOfCode(WAL26.trainingGrades, WAL26_CODES.specialtyRegistrarCore)),
|
|
162
|
+
'specialty-registrar-fixed': stepped(salariesOfCode(WAL26.trainingGrades, WAL26_CODES.specialtyRegistrarFixed)),
|
|
163
|
+
fho1: stepped(salariesOfCode(WAL26.trainingGrades, WAL26_CODES.foundationYear1)),
|
|
164
|
+
fho2: stepped(salariesOfCode(WAL26.trainingGrades, WAL26_CODES.foundationYear2)),
|
|
198
165
|
'specialty-doctor': byCode(WAL26.specialtyDoctor),
|
|
199
166
|
specialist: byCode(WAL26.specialist),
|
|
200
167
|
'salaried-gp': stepped(WAL26.salariedGp.salaries),
|
|
201
|
-
'staff-grade': stepped(
|
|
168
|
+
'staff-grade': stepped(salariesOfCode(WAL26.closedGrades, WAL26_CODES.staffGrade)),
|
|
202
169
|
'specialty-doctor-2008': byCode(WAL26.specialtyDoctor2008),
|
|
203
170
|
'associate-specialist-2008': byCode(WAL26.associateSpecialist2008),
|
|
204
|
-
'hospital-practitioner': stepped(
|
|
171
|
+
'hospital-practitioner': stepped(salariesOfCode(WAL26.closedGrades, WAL26_CODES.hospitalPractitioner)),
|
|
205
172
|
});
|
|
206
173
|
// Scotland 2025/26 — a complete round in one circular (non-training
|
|
207
174
|
// from the main document, training grades from its addendum).
|
|
@@ -210,65 +177,59 @@ const wales2026 = fromDocument(MD_W_01_2026, {
|
|
|
210
177
|
// a new Scottish scale belongs in whichever of those published it.
|
|
211
178
|
const scotland2025 = combineScales(fromDocument(PCS_DD_2025_01, {
|
|
212
179
|
consultant: consultantByYear(SCO25.consultant),
|
|
213
|
-
'specialty-doctor': SCO25.specialtyDoctor2022
|
|
214
|
-
|
|
215
|
-
salary: r.salary,
|
|
216
|
-
yearsExperience: r.scalePoint,
|
|
217
|
-
})),
|
|
218
|
-
specialist: SCO25.specialist2022.map((r) => ({
|
|
219
|
-
label: r.scalePoint === 0 ? 'Minimum' : `Point ${r.scalePoint}`,
|
|
220
|
-
salary: r.salary,
|
|
221
|
-
yearsExperience: r.scalePoint,
|
|
222
|
-
})),
|
|
180
|
+
'specialty-doctor': byScalePoint(SCO25.specialtyDoctor2022),
|
|
181
|
+
specialist: byScalePoint(SCO25.specialist2022),
|
|
223
182
|
'specialty-doctor-2008': stepped(SCO25.specialtyDoctor2008),
|
|
224
183
|
'associate-specialist-2008': stepped(SCO25.associateSpecialist2008),
|
|
225
|
-
'associate-specialist': stepped(
|
|
226
|
-
'staff-grade': stepped(
|
|
184
|
+
'associate-specialist': stepped(salariesOfCode(SCO25.closedGrades, SCO25_CODES.associateSpecialistPre2008)),
|
|
185
|
+
'staff-grade': stepped(salariesOfCode(SCO25.closedGrades, SCO25_CODES.staffGradePre1997)),
|
|
227
186
|
'hospital-practitioner': numbered(SCO25.hospitalPractitioner),
|
|
228
187
|
'salaried-gp': range(SCO25.salariedGpRange),
|
|
229
|
-
'gp-educator': SCO25.associateAdvisers
|
|
230
|
-
label: r.grade, salary: r.salary,
|
|
231
|
-
})),
|
|
188
|
+
'gp-educator': byGrade(SCO25.associateAdvisers),
|
|
232
189
|
}), fromDocument(PCS_DD_2025_01_ADDENDUM, {
|
|
233
|
-
fho1: stepped(
|
|
234
|
-
fho2: stepped(
|
|
235
|
-
sho: stepped(
|
|
236
|
-
spr: stepped(
|
|
237
|
-
str: stepped(
|
|
238
|
-
'specialty-registrar-core': stepped(
|
|
239
|
-
'specialty-registrar-fixed': stepped(
|
|
240
|
-
'gp-registrar-sho': stepped(
|
|
241
|
-
'gp-registrar-spr': stepped(
|
|
242
|
-
'gp-registrar-str': stepped(
|
|
190
|
+
fho1: stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.foundationYear1)),
|
|
191
|
+
fho2: stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.foundationYear2)),
|
|
192
|
+
sho: stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.seniorHouseOfficer)),
|
|
193
|
+
spr: stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.specialistRegistrar)),
|
|
194
|
+
str: stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.specialtyRegistrarFull)),
|
|
195
|
+
'specialty-registrar-core': stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.specialtyRegistrarCore)),
|
|
196
|
+
'specialty-registrar-fixed': stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.specialtyRegistrarFixed)),
|
|
197
|
+
'gp-registrar-sho': stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.gpRegistrarSho)),
|
|
198
|
+
'gp-registrar-spr': stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.gpRegistrarSpr)),
|
|
199
|
+
'gp-registrar-str': stepped(salariesOfCode(SCO25.trainingGrades, SCO25_CODES.gpRegistrarStr)),
|
|
243
200
|
}));
|
|
244
201
|
const MEDICAL_SCALES = {
|
|
245
|
-
[
|
|
246
|
-
[NATION_KEYS.england]:
|
|
247
|
-
[NATION_KEYS.scotland]:
|
|
202
|
+
[YEAR_LABELS.Y2026_27]: {
|
|
203
|
+
[NATION_KEYS.england]: england2026,
|
|
204
|
+
[NATION_KEYS.scotland]: scotland2026,
|
|
248
205
|
[NATION_KEYS.wales]: wales2026,
|
|
249
206
|
},
|
|
250
|
-
[
|
|
251
|
-
[NATION_KEYS.wales]:
|
|
252
|
-
[NATION_KEYS.northernIreland]:
|
|
207
|
+
[YEAR_LABELS.Y2025_26]: {
|
|
208
|
+
[NATION_KEYS.wales]: wales2025,
|
|
209
|
+
[NATION_KEYS.northernIreland]: northernIreland2025,
|
|
253
210
|
[NATION_KEYS.scotland]: scotland2025,
|
|
254
211
|
},
|
|
255
212
|
};
|
|
213
|
+
/** Every read over the medical tables. */
|
|
214
|
+
export const MEDICAL_FAMILY = gradeFamily(MEDICAL_SCALES, MEDICAL_GRADE_IDS);
|
|
256
215
|
/**
|
|
257
216
|
* Pay years this family publishes, newest first — derived from the
|
|
258
217
|
* data so a new pay round can't leave a hand-maintained list stale.
|
|
259
218
|
*/
|
|
260
|
-
export const MEDICAL_PAY_YEARS =
|
|
219
|
+
export const MEDICAL_PAY_YEARS = MEDICAL_FAMILY.years;
|
|
261
220
|
/**
|
|
262
|
-
* Published doctor grades for a nation and
|
|
221
|
+
* Published doctor grades for a nation and pay year, each with its
|
|
263
222
|
* scale points and salary range. Both args required — no default;
|
|
264
223
|
* an absent grade set throws `ScaleUnavailable`.
|
|
265
224
|
*/
|
|
266
225
|
export function getMedicalScales(year, nation) {
|
|
267
|
-
return
|
|
226
|
+
return MEDICAL_FAMILY.scalesFor(year, nation);
|
|
268
227
|
}
|
|
269
228
|
/**
|
|
270
|
-
* The newest
|
|
271
|
-
* every grade
|
|
229
|
+
* The newest document of the newest year a nation publishes doctors'
|
|
230
|
+
* pay for, across every medical grade that year. It searches
|
|
231
|
+
* the medical tables only: a document that sets dental pay alone is not
|
|
232
|
+
* a candidate.
|
|
272
233
|
*
|
|
273
234
|
* For prose that cites the nation rather than one family's table.
|
|
274
235
|
* Newest by issue date, not by any hardcoded preference: Scotland
|
|
@@ -280,21 +241,6 @@ export function getMedicalScales(year, nation) {
|
|
|
280
241
|
* still the right thing to cite.
|
|
281
242
|
*/
|
|
282
243
|
export function latestMedicalSource(nation) {
|
|
283
|
-
|
|
284
|
-
let metas;
|
|
285
|
-
try {
|
|
286
|
-
metas = getMedicalScales(year, nation);
|
|
287
|
-
}
|
|
288
|
-
catch (error) {
|
|
289
|
-
if (!(error instanceof ScaleUnavailable))
|
|
290
|
-
throw error;
|
|
291
|
-
continue;
|
|
292
|
-
}
|
|
293
|
-
const [first, ...rest] = metas.map((m) => m.source);
|
|
294
|
-
if (first) {
|
|
295
|
-
return rest.reduce((a, b) => (b.issued > a.issued ? b : a), first);
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
throw new ScaleUnavailable(nation, MEDICAL_PAY_YEARS[0]);
|
|
244
|
+
return MEDICAL_FAMILY.latestSource(nation);
|
|
299
245
|
}
|
|
300
246
|
//# sourceMappingURL=medical-scales.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"medical-scales.js","sourceRoot":"","sources":["../src/medical-scales.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"medical-scales.js","sourceRoot":"","sources":["../src/medical-scales.ts"],"names":[],"mappings":"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"}
|
package/dist/member/benefits.js
CHANGED
|
@@ -137,10 +137,8 @@ function legacyAwards(b, legacy, choices, dates) {
|
|
|
137
137
|
function refuseUnmodelled(member, remedy, legacy) {
|
|
138
138
|
// Deferred until the split of a pre-rollback balance is read:
|
|
139
139
|
// https://github.com/casomoltd/nhs-pay/issues/20
|
|
140
|
-
if (remedy && member
|
|
141
|
-
|
|
142
|
-
< isoToDate(REMEDY.rollback)) {
|
|
143
|
-
throw new BenefitNotModelled(NOT_MODELLED.statementBeforeRollback, 'a statement from before rollback on 1 October 2023, which '
|
|
140
|
+
if (remedy && statementBeforeRollback(member)) {
|
|
141
|
+
throw new BenefitNotModelled(NOT_MODELLED.statementBeforeRollback, `a statement from before rollback on ${REMEDY.rollback}, which `
|
|
144
142
|
+ 'counts the remedy years in the 2015 Section');
|
|
145
143
|
}
|
|
146
144
|
// Deferred until part-time final-salary membership is modelled:
|
|
@@ -150,6 +148,13 @@ function refuseUnmodelled(member, remedy, legacy) {
|
|
|
150
148
|
+ 'part-time membership pro rata on whole-time final pay');
|
|
151
149
|
}
|
|
152
150
|
}
|
|
151
|
+
/** Whether the member's statement closes before rollback, and so still
|
|
152
|
+
* counts the remedy years in the 2015 Section. */
|
|
153
|
+
function statementBeforeRollback(member) {
|
|
154
|
+
return member.statement !== null
|
|
155
|
+
&& schemeYearEndDate(member.statement.yearEnd)
|
|
156
|
+
< isoToDate(REMEDY.rollback);
|
|
157
|
+
}
|
|
153
158
|
/** A legacy section's rules, as `MemberBenefits.legacy` states them. */
|
|
154
159
|
function legacyOf(section) {
|
|
155
160
|
const rules = RULES[section];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benefits.js","sourceRoot":"","sources":["../../src/member/benefits.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"benefits.js","sourceRoot":"","sources":["../../src/member/benefits.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,24 @@ import type { Built } from './valuation.js';
|
|
|
26
26
|
* - **The opening value** is what is held at the close of the day before
|
|
27
27
|
* the year, 5 April, and the closing value at the close of the 5 April
|
|
28
28
|
* ending it; a revaluation falls in the year its date does.
|
|
29
|
-
* - **
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
29
|
+
* - **Every year closes on its 5 April**, the year the member leaves in
|
|
30
|
+
* included: Finance Act 2004 s.234(5) values the pension as payable "if
|
|
31
|
+
* the individual became entitled to payment of it at the end of the
|
|
32
|
+
* pension input period"
|
|
33
|
+
* (https://www.legislation.gov.uk/ukpga/2004/12/section/234). A leaver's
|
|
34
|
+
* year holds the pay to the last day of service and nothing after it.
|
|
35
|
+
* - **The leaver index adjustment counts from the April it is applied
|
|
36
|
+
* in**, the uplift that opens the scheme year after the leaving, as
|
|
37
|
+
* every other revaluation falls in the year its date does. NHSBSA
|
|
38
|
+
* revalues the final year "from 6 April the following scheme year"
|
|
39
|
+
* (https://faq.nhsbsa.nhs.uk/knowledgebase/article/KA-29075/en-us) and
|
|
40
|
+
* DHSC's 2023 consultation response has retiring members receive it "on
|
|
41
|
+
* 6 April". Our reading: both date when it is applied, and no source
|
|
42
|
+
* read here says whether a retirement year's closing value, which adds
|
|
43
|
+
* back "the annual rate of the pension to which the individual became
|
|
44
|
+
* entitled" (s.236(8B)), carries it sooner. `at()` is not this reading:
|
|
45
|
+
* it prices a drawing with the adjustment, as Sch 9 para 5 defines the
|
|
46
|
+
* retirement pension.
|
|
34
47
|
* - **The period's `cpi`** is the September CPI before the year, from the
|
|
35
48
|
* same series: the Order's figure where the series reads published ones.
|
|
36
49
|
*
|