@casomoltd/nhs-pay 0.32.0 → 0.34.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 (125) hide show
  1. package/README.md +24 -22
  2. package/dist/afc-band.d.ts +4 -4
  3. package/dist/afc-band.js +4 -4
  4. package/dist/afc-scales.d.ts +89 -60
  5. package/dist/afc-scales.js +166 -182
  6. package/dist/afc-scales.js.map +1 -1
  7. package/dist/allowances.js +11 -11
  8. package/dist/allowances.js.map +1 -1
  9. package/dist/award.d.ts +3 -3
  10. package/dist/award.js +21 -21
  11. package/dist/award.js.map +1 -1
  12. package/dist/circulars/afc-shapes.d.ts +41 -21
  13. package/dist/circulars/afc-shapes.js +9 -8
  14. package/dist/circulars/afc-shapes.js.map +1 -1
  15. package/dist/circulars/england-md-1-2026-r2.d.ts +13 -0
  16. package/dist/circulars/england-md-1-2026-r2.js +13 -0
  17. package/dist/circulars/england-md-1-2026-r2.js.map +1 -1
  18. package/dist/circulars/ni-hsc-afc-06-2025.d.ts +3 -2
  19. package/dist/circulars/ni-hsc-afc-06-2025.js +3 -2
  20. package/dist/circulars/ni-hsc-afc-06-2025.js.map +1 -1
  21. package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +22 -0
  22. package/dist/circulars/ni-hsc-tc8-05-2025.js +22 -0
  23. package/dist/circulars/ni-hsc-tc8-05-2025.js.map +1 -1
  24. package/dist/circulars/scotland-pcs-dd-2025-01.d.ts +20 -0
  25. package/dist/circulars/scotland-pcs-dd-2025-01.js +20 -0
  26. package/dist/circulars/scotland-pcs-dd-2025-01.js.map +1 -1
  27. package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +19 -0
  28. package/dist/circulars/scotland-pcs-dd-2026-01.js +30 -10
  29. package/dist/circulars/scotland-pcs-dd-2026-01.js.map +1 -1
  30. package/dist/circulars/scotland-pcs-dd-2026-02.d.ts +10 -0
  31. package/dist/circulars/scotland-pcs-dd-2026-02.js +10 -0
  32. package/dist/circulars/scotland-pcs-dd-2026-02.js.map +1 -1
  33. package/dist/circulars/wales-mdw-01-2025.d.ts +17 -0
  34. package/dist/circulars/wales-mdw-01-2025.js +17 -0
  35. package/dist/circulars/wales-mdw-01-2025.js.map +1 -1
  36. package/dist/circulars/wales-mdw-01-2026.d.ts +20 -0
  37. package/dist/circulars/wales-mdw-01-2026.js +20 -0
  38. package/dist/circulars/wales-mdw-01-2026.js.map +1 -1
  39. package/dist/commutation.js +3 -2
  40. package/dist/commutation.js.map +1 -1
  41. package/dist/dental-grades.d.ts +25 -0
  42. package/dist/dental-grades.js +25 -0
  43. package/dist/dental-grades.js.map +1 -0
  44. package/dist/dental-scales.d.ts +5 -21
  45. package/dist/dental-scales.js +73 -72
  46. package/dist/dental-scales.js.map +1 -1
  47. package/dist/format.js +3 -2
  48. package/dist/format.js.map +1 -1
  49. package/dist/hcas-pcts.d.ts +1 -1
  50. package/dist/hcas-pcts.js +1 -1
  51. package/dist/hcas-pcts.js.map +1 -1
  52. package/dist/hcas-zone.d.ts +23 -0
  53. package/dist/hcas-zone.js +17 -0
  54. package/dist/hcas-zone.js.map +1 -0
  55. package/dist/hcas.d.ts +26 -18
  56. package/dist/hcas.js +45 -24
  57. package/dist/hcas.js.map +1 -1
  58. package/dist/index.d.ts +25 -16
  59. package/dist/index.js +14 -10
  60. package/dist/index.js.map +1 -1
  61. package/dist/medical-grades.d.ts +33 -0
  62. package/dist/medical-grades.js +33 -0
  63. package/dist/medical-grades.js.map +1 -0
  64. package/dist/medical-scales.d.ts +10 -33
  65. package/dist/medical-scales.js +104 -158
  66. package/dist/medical-scales.js.map +1 -1
  67. package/dist/member/input-period.d.ts +18 -5
  68. package/dist/member/input-period.js +24 -13
  69. package/dist/member/input-period.js.map +1 -1
  70. package/dist/pay-round.js +3 -3
  71. package/dist/pay-round.js.map +1 -1
  72. package/dist/pay-year.d.ts +17 -0
  73. package/dist/pay-year.js +20 -0
  74. package/dist/pay-year.js.map +1 -0
  75. package/dist/pension/ledger.d.ts +7 -0
  76. package/dist/pension/ledger.js +18 -11
  77. package/dist/pension/ledger.js.map +1 -1
  78. package/dist/pension.js +2 -1
  79. package/dist/pension.js.map +1 -1
  80. package/dist/post.d.ts +20 -21
  81. package/dist/post.js +54 -53
  82. package/dist/post.js.map +1 -1
  83. package/dist/published/england-afc.d.ts +72 -0
  84. package/dist/published/england-afc.js +86 -0
  85. package/dist/published/england-afc.js.map +1 -0
  86. package/dist/published/hcas-zones.d.ts +18 -0
  87. package/dist/published/hcas-zones.js +46 -0
  88. package/dist/published/hcas-zones.js.map +1 -0
  89. package/dist/published/wales-living-wage.d.ts +36 -0
  90. package/dist/published/wales-living-wage.js +30 -0
  91. package/dist/published/wales-living-wage.js.map +1 -0
  92. package/dist/regions.d.ts +25 -14
  93. package/dist/regions.js +61 -71
  94. package/dist/regions.js.map +1 -1
  95. package/dist/resolver.d.ts +46 -41
  96. package/dist/resolver.js +70 -142
  97. package/dist/resolver.js.map +1 -1
  98. package/dist/role.d.ts +3 -3
  99. package/dist/scale-point.d.ts +11 -7
  100. package/dist/scale-point.js +29 -1
  101. package/dist/scale-point.js.map +1 -1
  102. package/dist/scale-tables.d.ts +42 -60
  103. package/dist/scale-tables.js +65 -105
  104. package/dist/scale-tables.js.map +1 -1
  105. package/dist/scale-translators.d.ts +90 -0
  106. package/dist/scale-translators.js +97 -0
  107. package/dist/scale-translators.js.map +1 -0
  108. package/dist/scales.d.ts +164 -102
  109. package/dist/scales.js +242 -462
  110. package/dist/scales.js.map +1 -1
  111. package/dist/sources.d.ts +8 -12
  112. package/dist/sources.js +9 -15
  113. package/dist/sources.js.map +1 -1
  114. package/dist/take-home.js +1 -2
  115. package/dist/take-home.js.map +1 -1
  116. package/dist/values.d.ts +10 -3
  117. package/dist/values.js +11 -4
  118. package/dist/values.js.map +1 -1
  119. package/dist/working-week.d.ts +23 -8
  120. package/dist/working-week.js +55 -25
  121. package/dist/working-week.js.map +1 -1
  122. package/package.json +3 -3
  123. package/dist/bands.d.ts +0 -63
  124. package/dist/bands.js +0 -78
  125. package/dist/bands.js.map +0 -1
package/dist/index.js CHANGED
@@ -1,14 +1,19 @@
1
1
  // ── Scales ───────────────────────────────────────
2
- export { afcBand1 } from './afc-scales.js';
3
- export { AFC_BANDS, AFC_BAND_IDS, afcScaleSource, latestAfcYear, payYearLag, isAwaitingPayAward, assertPayYearLagIsSane, afcPayYears, NLW_HOURLY, WALES_LIVING_WAGE, annualiseHourly, } from './scales.js';
2
+ export { afcBand1 } from './scales.js';
3
+ export { AFC_BANDS, AFC_BAND_IDS } from './afc-band.js';
4
+ export { WALES_LIVING_WAGE } from './published/wales-living-wage.js';
5
+ export { AFC_CURRENT_YEAR, AFC_PREVIOUS_YEAR, afcPointOf, getAfcScales, afcScaleSource, latestAfcYear, latestRoundLag, payRoundLag, isPayRoundInReach, isAwaitingPayAward, assertLatestRoundsInReach, afcPayYears, afcPayYearFor, AFC_PAY_YEAR_KINDS, } from './scales.js';
6
+ export { schemeYearOfPayYear } from './pay-year.js';
4
7
  // ── Pension ──────────────────────────────────────
5
8
  export { PensionTiers, getEmployerPensionRate, getPensionScheme, getPensionTiers, getPensionTiersVO, lookupPensionTier, pensionTierRate, } from './pension.js';
6
9
  // ── Post & resolvers ─────────────────────────────
7
10
  export { Post, NO_ADJUSTMENTS } from './post.js';
8
11
  export { afcResolver, dentalResolver, medicalResolver } from './resolver.js';
9
12
  // ── Medical & dental scales ──────────────────────
10
- export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_PAY_YEARS, getMedicalScales, latestMedicalSource, } from './medical-scales.js';
11
- export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_PAY_YEARS, getDentalScales, } from './dental-scales.js';
13
+ export { MEDICAL_GRADES, MEDICAL_GRADE_IDS } from './medical-grades.js';
14
+ export { MEDICAL_FAMILY, MEDICAL_PAY_YEARS, getMedicalScales, latestMedicalSource, } from './medical-scales.js';
15
+ export { DENTAL_GRADES, DENTAL_GRADE_IDS } from './dental-grades.js';
16
+ export { DENTAL_FAMILY, DENTAL_PAY_YEARS, getDentalScales } from './dental-scales.js';
12
17
  // ── Additional pension ───────────────────────────
13
18
  export { ADDITIONAL_PENSION_LIMIT, ADDITIONAL_PENSION_PAYMENTS, ADDITIONAL_PENSION_UNIT, additionalPensionCost, additionalPensionToBuy, } from './additional-pension.js';
14
19
  export { ADDITIONAL_PENSION_COVERS } from './gad/additional-pension-table.js';
@@ -67,21 +72,20 @@ export { isSchemeYearEnd, schemeYearAfter, schemeYearBefore, schemeYearClosedBy,
67
72
  export { SEED_BASES, seedFromJoinDate, seedFromStatement, } from './pension/seed.js';
68
73
  export { buildLedger } from './pension/ledger.js';
69
74
  // ── HCAS ─────────────────────────────────────────
70
- export { HCAS_ZONE_IDS, calculateHcasSupplement, grossSalary, isHcasZoneId, } from './hcas.js';
75
+ export { HCAS_ZONE_IDS, isHcasZoneId } from './hcas-zone.js';
76
+ export { calculateHcasSupplement, englandHcasZones, grossSalary, hcasRateBand, } from './hcas.js';
71
77
  // ── HCAS PCTs ────────────────────────────────────
72
78
  export { getHcasPcts, getHcasZone, } from './hcas-pcts.js';
73
79
  // ── Regions ──────────────────────────────────────
74
- export { AFC_REGIONS, ZONE_TO_REGION, afcRegionToHcasZone, afcRegionToNation, isAfcRegionId, isNation, resolveRegion, } from './regions.js';
75
- // ── Bands ────────────────────────────────────────
76
- export { AFC_CURRENT_YEAR, AFC_PREVIOUS_YEAR, afcPointOf, getAfcScales, } from './bands.js';
80
+ export { AFC_REGIONS, ZONE_TO_REGION, afcRegionToHcasZone, afcRegionToNation, afcRegionOf, baseAfcRegion, isAfcRegionId, resolveRegion, } from './regions.js';
77
81
  // ── Take-home ────────────────────────────────────
78
82
  export { nhsTakeHome } from './take-home.js';
79
83
  // ── Working week ──────────────────────────────
80
- export { afcWeekInForce, afcWeeklyHours, hoursPerYear } from './working-week.js';
84
+ export { afcWeekInForce, afcWeeklyHours, annualiseHourly, hoursPerYear, } from './working-week.js';
81
85
  // ── Format ───────────────────────────────────────
82
86
  export { fmtMoney, fmtPct, fmtSalary, formatGBP, formatGBPPrecise, formatPct, formatPctPrecise, yearLabel, } from './format.js';
83
87
  // ── Re-exports from paye-calc ────────────────────
84
88
  // Types that appear in our public API so consumers
85
89
  // don't need a direct paye-calc import for NHS work.
86
- export { TAX_REGIONS, TAX_YEARS, NATIONS, NATION_KEYS, TakeHomePay, GrossAnnual, PensionBasis, PensionPercent, StudentLoanPlan, nationToTaxRegion, getTaxYearConfig, } from '@casomoltd/paye-calc';
90
+ export { TAX_REGIONS, TAX_YEARS, YEAR_LABELS, NATIONS, NATION_KEYS, TakeHomePay, GrossAnnual, PensionBasis, PensionPercent, StudentLoanPlan, nationToTaxRegion, getTaxYearConfig, } from '@casomoltd/paye-calc';
87
91
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,33 @@
1
+ /**
2
+ * The doctor grades wired into the domain, in their own module so a
3
+ * module that names a grade (the award table, roles, the resolvers) need
4
+ * not import the translation layer in `medical-scales.ts`.
5
+ */
6
+ /** Doctor grade identifiers wired into the domain. */
7
+ export declare const MEDICAL_GRADES: {
8
+ readonly resident: "resident";
9
+ readonly consultant: "consultant";
10
+ readonly specialtyDoctor: "specialty-doctor";
11
+ readonly specialist: "specialist";
12
+ readonly salariedGp: "salaried-gp";
13
+ readonly gpEducator: "gp-educator";
14
+ readonly locallyEmployedDoctor: "locally-employed-doctor";
15
+ readonly fho1: "fho1";
16
+ readonly fho2: "fho2";
17
+ readonly sho: "sho";
18
+ readonly spr: "spr";
19
+ readonly str: "str";
20
+ readonly specialtyRegistrarCore: "specialty-registrar-core";
21
+ readonly specialtyRegistrarFixed: "specialty-registrar-fixed";
22
+ readonly gpRegistrarSho: "gp-registrar-sho";
23
+ readonly gpRegistrarSpr: "gp-registrar-spr";
24
+ readonly gpRegistrarStr: "gp-registrar-str";
25
+ readonly staffGrade: "staff-grade";
26
+ readonly associateSpecialist: "associate-specialist";
27
+ readonly specialtyDoctor2008: "specialty-doctor-2008";
28
+ readonly associateSpecialist2008: "associate-specialist-2008";
29
+ readonly hospitalPractitioner: "hospital-practitioner";
30
+ };
31
+ export type MedicalGradeId = (typeof MEDICAL_GRADES)[keyof typeof MEDICAL_GRADES];
32
+ /** Ordered grade IDs — stable iteration/enumeration. */
33
+ export declare const MEDICAL_GRADE_IDS: MedicalGradeId[];
@@ -0,0 +1,33 @@
1
+ /**
2
+ * The doctor grades wired into the domain, in their own module so a
3
+ * module that names a grade (the award table, roles, the resolvers) need
4
+ * not import the translation layer in `medical-scales.ts`.
5
+ */
6
+ /** Doctor grade identifiers wired into the domain. */
7
+ export const MEDICAL_GRADES = {
8
+ resident: 'resident',
9
+ consultant: 'consultant',
10
+ specialtyDoctor: 'specialty-doctor',
11
+ specialist: 'specialist',
12
+ salariedGp: 'salaried-gp',
13
+ gpEducator: 'gp-educator',
14
+ locallyEmployedDoctor: 'locally-employed-doctor',
15
+ fho1: 'fho1',
16
+ fho2: 'fho2',
17
+ sho: 'sho',
18
+ spr: 'spr',
19
+ str: 'str',
20
+ specialtyRegistrarCore: 'specialty-registrar-core',
21
+ specialtyRegistrarFixed: 'specialty-registrar-fixed',
22
+ gpRegistrarSho: 'gp-registrar-sho',
23
+ gpRegistrarSpr: 'gp-registrar-spr',
24
+ gpRegistrarStr: 'gp-registrar-str',
25
+ staffGrade: 'staff-grade',
26
+ associateSpecialist: 'associate-specialist',
27
+ specialtyDoctor2008: 'specialty-doctor-2008',
28
+ associateSpecialist2008: 'associate-specialist-2008',
29
+ hospitalPractitioner: 'hospital-practitioner',
30
+ };
31
+ /** Ordered grade IDs — stable iteration/enumeration. */
32
+ export const MEDICAL_GRADE_IDS = Object.values(MEDICAL_GRADES);
33
+ //# sourceMappingURL=medical-grades.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"medical-grades.js","sourceRoot":"","sources":["../src/medical-grades.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,sDAAsD;AACtD,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,QAAQ,EAAE,UAAU;IACpB,UAAU,EAAE,YAAY;IACxB,eAAe,EAAE,kBAAkB;IACnC,UAAU,EAAE,YAAY;IACxB,UAAU,EAAE,aAAa;IACzB,UAAU,EAAE,aAAa;IACzB,qBAAqB,EAAE,yBAAyB;IAChD,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,sBAAsB,EAAE,0BAA0B;IAClD,uBAAuB,EAAE,2BAA2B;IACpD,cAAc,EAAE,kBAAkB;IAClC,cAAc,EAAE,kBAAkB;IAClC,cAAc,EAAE,kBAAkB;IAClC,UAAU,EAAE,aAAa;IACzB,mBAAmB,EAAE,sBAAsB;IAC3C,mBAAmB,EAAE,uBAAuB;IAC5C,uBAAuB,EAAE,2BAA2B;IACpD,oBAAoB,EAAE,uBAAuB;CACrC,CAAC;AAKX,wDAAwD;AACxD,MAAM,CAAC,MAAM,iBAAiB,GAC5B,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC"}
@@ -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
- * page needs them — they are one mapping line each): England's ultra-
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 { GradeMeta } from './scale-tables.js';
25
- /** Doctor grade identifiers wired into the domain. */
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 tax year, each with its
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 medical & dental document a nation has published, across
68
- * every grade and every year it publishes.
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
@@ -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
- * page needs them — they are one mapping line each): England's ultra-
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, TAX_YEARS } from '@casomoltd/paye-calc';
23
- import { ScaleUnavailable } from './errors.js';
24
- import { byCode, combineScales, fromDocument, byStage, numbered, range, resolveGradeMetas, scaleSalaries, stepped, } from './scale-tables.js';
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
- const england = fromDocument(PC_MD_1_2026_R2, {
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(scaleSalaries(ENG.closedGrades, (g) => g.code === 'MH01', 'MH01')),
78
- 'associate-specialist': stepped(scaleSalaries(ENG.closedGrades, (g) => g.code === 'MC01', 'MC01')),
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 scotland = combineScales(fromDocument(PCS_DD_2026_02, {
61
+ const scotland2026 = combineScales(fromDocument(PCS_DD_2026_02, {
86
62
  consultant: consultantByYear(SCO2.consultant),
87
- 'specialty-doctor': SCO2.specialtyDoctor2022.map((r) => ({
88
- label: r.scalePoint === 0 ? 'Minimum' : `Point ${r.scalePoint}`,
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(scaleSalaries(SCO2.closedGrades, (g) => g.code === 'pre2008-as', 'Sco26 pre2008 AS')),
100
- 'staff-grade': stepped(scaleSalaries(SCO2.closedGrades, (g) => g.code === 'pre1997-sg', 'Sco26 pre1997 SG')),
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.map((r) => ({
103
- label: r.grade, salary: r.salary,
104
- })),
70
+ 'gp-educator': byGrade(SCO2.associateAdvisers),
105
71
  }), fromDocument(PCS_DD_2026_01, {
106
- fho1: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Foundation House Officer 1', 'Sco FHO1')),
107
- fho2: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Foundation House Officer 2', 'Sco FHO2')),
108
- sho: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade.startsWith('Senior House Officer'), 'Sco SHO')),
109
- spr: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Specialist Registrar', 'Sco SpR')),
110
- str: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Specialty Registrar (Full)', 'Sco StR')),
111
- 'specialty-registrar-core': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Specialty Registrar (Core Training)', 'Sco StR core')),
112
- 'specialty-registrar-fixed': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Specialty Registrar (Fixed Term)', 'Sco StR fixed')),
113
- 'gp-registrar-sho': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'GP Specialty Registrar (SHO)', 'Sco GP SHO')),
114
- 'gp-registrar-spr': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'GP Specialty Registrar (SpR)', 'Sco GP SpR')),
115
- 'gp-registrar-str': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'GP Specialty Registrar (StR)', 'Sco GP StR')),
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 wales = fromDocument(MD_W_01_2025, {
83
+ const wales2025 = fromDocument(MD_W_01_2025, {
118
84
  consultant: consultantByYear(WAL.consultant),
119
- str: stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN37', 'Wal MN37')),
120
- 'specialty-registrar-core': stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN39', 'Wal MN39')),
121
- 'specialty-registrar-fixed': stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN35', 'Wal MN35')),
122
- fho1: stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN13', 'Wal MN13')),
123
- fho2: stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN15', 'Wal MN15')),
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(scaleSalaries(WAL.closedGrades, (g) => g.code === 'MH01', 'Wal MH01')),
128
- 'associate-specialist': stepped(scaleSalaries(WAL.closedGrades, (g) => g.code === 'MC01', 'Wal MC01')),
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(scaleSalaries(WAL.closedGrades, (g) => g.code === 'MD01-41', 'Wal HP')),
97
+ 'hospital-practitioner': stepped(salariesOfCode(WAL.closedGrades, WAL_CODES.hospitalPractitioner)),
132
98
  });
133
- const northernIreland = fromDocument(HSC_TC8_05_2025, {
134
- fho1: stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M220', 'NI M220')),
135
- fho2: stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M230', 'NI M230')),
136
- str: stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M241', 'NI M241')),
137
- 'specialty-registrar-fixed': stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M240', 'NI M240')),
138
- 'specialty-registrar-core': stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M242', 'NI M242')),
139
- 'specialty-doctor': NI.specialtyDoctor.map((r) => ({
140
- label: `Point ${r.payPoint}`, salary: r.salary,
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(scaleSalaries(NI.closedGrades, (g) => g.code === 'M080', 'NI M080')),
156
- 'staff-grade': stepped(scaleSalaries(NI.closedGrades, (g) => g.code === 'M211', 'NI M211')),
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) => rows
182
- .filter((r) => r.grade !== 'Dental Foundation Trainee')
183
- .map((r) => ({
184
- label: r.grade === 'Registrar' ? `Registrar ${r.spine}` : r.grade,
185
- salary: r.salary,
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
- // `wales` (2025) there is no 'associate-specialist' entry here.
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(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN37', 'Wal26 MN37')),
194
- 'specialty-registrar-core': stepped(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN39', 'Wal26 MN39')),
195
- 'specialty-registrar-fixed': stepped(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN35', 'Wal26 MN35')),
196
- fho1: stepped(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN13', 'Wal26 MN13')),
197
- fho2: stepped(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN15', 'Wal26 MN15')),
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(scaleSalaries(WAL26.closedGrades, (g) => g.code === 'MH01', 'Wal26 MH01')),
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(scaleSalaries(WAL26.closedGrades, (g) => g.code === 'MD01-41', 'Wal26 HP')),
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.map((r) => ({
214
- label: r.scalePoint === 0 ? 'Minimum' : `Point ${r.scalePoint}`,
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(scaleSalaries(SCO25.closedGrades, (g) => g.code === 'pre2008-as', 'Sco25 pre2008 AS')),
226
- 'staff-grade': stepped(scaleSalaries(SCO25.closedGrades, (g) => g.code === 'pre1997-sg', 'Sco25 pre1997 SG')),
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.map((r) => ({
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(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'FHO1', 'Sco25 FHO1')),
234
- fho2: stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'FHO2', 'Sco25 FHO2')),
235
- sho: stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'SHO', 'Sco25 SHO')),
236
- spr: stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'SpR', 'Sco25 SpR')),
237
- str: stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'StR-full', 'Sco25 StR')),
238
- 'specialty-registrar-core': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'StR-core', 'Sco25 StR core')),
239
- 'specialty-registrar-fixed': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'StR-fixed', 'Sco25 StR fixed')),
240
- 'gp-registrar-sho': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'GP-SHO', 'Sco25 GP SHO')),
241
- 'gp-registrar-spr': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'GP-SpR', 'Sco25 GP SpR')),
242
- 'gp-registrar-str': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'GP-StR', 'Sco25 GP StR')),
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
- [TAX_YEARS.Y2026_27]: {
246
- [NATION_KEYS.england]: england,
247
- [NATION_KEYS.scotland]: 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
- [TAX_YEARS.Y2025_26]: {
251
- [NATION_KEYS.wales]: wales,
252
- [NATION_KEYS.northernIreland]: 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 = Object.keys(MEDICAL_SCALES).sort().reverse();
219
+ export const MEDICAL_PAY_YEARS = MEDICAL_FAMILY.years;
261
220
  /**
262
- * Published doctor grades for a nation and tax year, each with its
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 resolveGradeMetas(MEDICAL_SCALES, MEDICAL_GRADE_IDS, year, nation);
226
+ return MEDICAL_FAMILY.scalesFor(year, nation);
268
227
  }
269
228
  /**
270
- * The newest medical & dental document a nation has published, across
271
- * every grade and every year it publishes.
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
- for (const year of MEDICAL_PAY_YEARS) {
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