@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
@@ -11,121 +11,122 @@
11
11
  *
12
12
  * One canonical point per source row; no pay step collapsed.
13
13
  */
14
- import { NATION_KEYS, TAX_YEARS } from '@casomoltd/paye-calc';
14
+ import { NATION_KEYS, YEAR_LABELS } from '@casomoltd/paye-calc';
15
15
  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';
16
- import { byCode, combineScales, fromDocument, byStage, bySpine, numbered, resolveGradeMetas, scaleSalaries, stepped, } from './scale-tables.js';
17
- import { ENGLAND_MD_1_2026_R2 as ENG } from './circulars/england-md-1-2026-r2.js';
16
+ import { combineScales, fromDocument, gradeFamily, } from './scale-tables.js';
17
+ import { byCode, byStage, bySpine, numbered, salariesOfCode, scaleSalaries, stepped, } from './scale-translators.js';
18
+ import { invariant } from './errors.js';
19
+ import { DENTAL_GRADE_IDS } from './dental-grades.js';
20
+ 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';
18
21
  import { SCOTLAND_PCS_DD_2026_01 as SCO } from './circulars/scotland-pcs-dd-2026-01.js';
19
22
  import { SCOTLAND_PCS_DD_2025_01 as SCO25 } from './circulars/scotland-pcs-dd-2025-01.js';
20
23
  import { SCOTLAND_PCS_DD_2026_02 as SCO2 } from './circulars/scotland-pcs-dd-2026-02.js';
21
- import { WALES_MDW_01_2025 as WAL } from './circulars/wales-mdw-01-2025.js';
22
- import { WALES_MDW_01_2026 as WAL26 } from './circulars/wales-mdw-01-2026.js';
23
- import { NI_HSC_TC8_05_2025 as NI } from './circulars/ni-hsc-tc8-05-2025.js';
24
- /** Salaried-dental grade identifiers wired into the domain. */
25
- export const DENTAL_GRADES = {
26
- salariedDental: 'salaried-dental',
27
- dentalCoreTraining: 'dental-core-training',
28
- dentalSpecialtyTraining: 'dental-specialty-training',
29
- dentalEducator: 'dental-educator',
30
- salariedDentist: 'salaried-dentist',
31
- seniorSalariedDentist: 'senior-salaried-dentist',
32
- assistantClinicalDirectorDentist: 'assistant-clinical-director-dentist',
33
- clinicalDirectorDentist: 'clinical-director-dentist',
34
- communityDentalOfficer: 'community-dental-officer',
35
- seniorCommunityDentalOfficer: 'senior-community-dental-officer',
36
- assistantCommunityDentalClinicalDirector: 'assistant-community-dental-clinical-director',
37
- specialistCommunityDentist: 'specialist-community-dentist',
38
- communityDentalClinicalDirector: 'community-dental-clinical-director',
39
- };
40
- /** Ordered grade IDs — stable iteration/enumeration. */
41
- export const DENTAL_GRADE_IDS = Object.values(DENTAL_GRADES);
42
- // England §1 dentists in training: CT1-3 = core, ST1-8 = specialty.
24
+ import { WALES_MDW_01_2025 as WAL, WALES_MDW_01_2025_CODES as WAL_CODES, } from './circulars/wales-mdw-01-2025.js';
25
+ import { WALES_MDW_01_2026 as WAL26, WALES_MDW_01_2026_CODES as WAL26_CODES, } from './circulars/wales-mdw-01-2026.js';
26
+ 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';
27
+ // England §1 dentists in training: CT1-3 = core, ST1-8 = specialty, told
28
+ // apart by the stage each row prints.
43
29
  const engDentists = ENG.dentistsInTraining;
44
- // The England spine prints the band in its pay-scale code (LD01/11/21),
45
- // not a band column; map the code to the band so a relabelled boundary
46
- // stays correct (matches Wales's explicit "Band X Point N" labels).
30
+ /** The printed stage prefixes of the two kinds of dental training row. */
31
+ const TRAINING_STAGE = { core: 'CT', specialty: 'ST' };
32
+ const trainingRows = (prefix) => engDentists.filter((r) => r.stage.startsWith(prefix));
33
+ /** The bands Northern Ireland's salaried dental table numbers. */
34
+ const NI_DENTAL_BANDS = {
35
+ salaried: 1, senior: 2, assistantDirector: 3, clinicalDirector: 4,
36
+ };
37
+ /** The bands England's salaried dental spine is printed in. */
38
+ const SPINE_BANDS = { a: 'A', b: 'B', c: 'C' };
47
39
  const LD_BAND = {
48
- LD01: 'A', LD11: 'B', LD21: 'C',
40
+ [ENG_CODES.salariedDentalBandA]: SPINE_BANDS.a,
41
+ [ENG_CODES.salariedDentalBandB]: SPINE_BANDS.b,
42
+ [ENG_CODES.salariedDentalBandC]: SPINE_BANDS.c,
49
43
  };
44
+ const isSpineCode = (code) => Object.hasOwn(LD_BAND, code);
50
45
  const ldBand = (code) => {
51
- const band = LD_BAND[code];
52
- if (!band) {
46
+ if (!isSpineCode(code)) {
53
47
  throw new Error(`dental-scales: unknown spine code "${code}"`);
54
48
  }
55
- return band;
49
+ return LD_BAND[code];
56
50
  };
57
- const england = fromDocument(PC_MD_1_2026_R2, {
58
- 'salaried-dental': ENG.salariedDentalSpine.map((r) => ({
59
- label: `Band ${ldBand(r.code)} Point ${r.point}`,
60
- salary: r.salary,
61
- })),
62
- 'dental-core-training': byStage(engDentists.slice(0, 3)),
63
- 'dental-specialty-training': byStage(engDentists.slice(3)),
51
+ // Every training row is core or specialty training by its printed stage,
52
+ // so a row with another stage fails at load rather than going unread.
53
+ invariant(engDentists.every((r) => Object.values(TRAINING_STAGE)
54
+ .some((prefix) => r.stage.startsWith(prefix))), 'dental-scales: a dentists-in-training stage is neither core nor specialty');
55
+ // Both ways: every row's code is a band (`ldBand`), and every band's code
56
+ // is printed on some row, so a code the circular drops fails at load.
57
+ for (const code of Object.keys(LD_BAND)) {
58
+ invariant(ENG.salariedDentalSpine.some((r) => r.code === code), `dental-scales: England's dental spine prints no ${code} row`);
59
+ }
60
+ const england2026 = fromDocument(PC_MD_1_2026_R2, {
61
+ 'salaried-dental': bySpine(ENG.salariedDentalSpine.map((r) => ({
62
+ band: ldBand(r.code), point: r.point, salary: r.salary,
63
+ }))),
64
+ 'dental-core-training': byStage(trainingRows(TRAINING_STAGE.core)),
65
+ 'dental-specialty-training': byStage(trainingRows(TRAINING_STAGE.specialty)),
64
66
  'dental-educator': byCode(ENG.dentalEducators),
65
67
  });
66
68
  // The Public Dental Service spine comes from PCS(DD)2026/02 Annex G,
67
69
  // uplifted 3.75% (its para 3) rather than the 3.5% the rest of that
68
70
  // circular carries; dental core training from PCS(DD)2026/01.
69
- const scotland = combineScales(fromDocument(PCS_DD_2026_02, {
71
+ const scotland2026 = combineScales(fromDocument(PCS_DD_2026_02, {
70
72
  'salaried-dental': bySpine(SCO2.salariedDentalSpine),
71
73
  }), fromDocument(PCS_DD_2026_01, {
72
- 'dental-core-training': [
73
- {
74
- label: SCO.dentalCoreTraining.stage,
75
- salary: SCO.dentalCoreTraining.salary,
76
- },
77
- ],
74
+ 'dental-core-training': byStage([SCO.dentalCoreTraining]),
78
75
  }));
79
- const wales = fromDocument(MD_W_01_2025, {
76
+ const wales2025 = fromDocument(MD_W_01_2025, {
80
77
  'salaried-dental': bySpine(WAL.salariedDentalSpine),
81
- 'dental-core-training': stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN21', 'Wal MN21')),
78
+ 'dental-core-training': stepped(salariesOfCode(WAL.trainingGrades, WAL_CODES.dentalCoreTraining)),
82
79
  });
83
- const northernIreland = fromDocument(HSC_TC8_05_2025, {
84
- 'salaried-dentist': numbered(scaleSalaries(NI.salariedDental, (g) => g.band === 1, 'NI dental band 1')),
85
- 'senior-salaried-dentist': numbered(scaleSalaries(NI.salariedDental, (g) => g.band === 2, 'NI dental band 2')),
86
- 'assistant-clinical-director-dentist': numbered(scaleSalaries(NI.salariedDental, (g) => g.band === 3, 'NI dental band 3')),
87
- 'clinical-director-dentist': numbered(scaleSalaries(NI.salariedDental, (g) => g.band === 4, 'NI dental band 4')),
88
- 'dental-core-training': stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M242', 'NI M242')),
89
- 'community-dental-officer': numbered(scaleSalaries(NI.communityDentalService, (g) => g.code === 'M431', 'NI M431')),
90
- 'senior-community-dental-officer': numbered(scaleSalaries(NI.communityDentalService, (g) => g.code === 'M432', 'NI M432')),
91
- 'assistant-community-dental-clinical-director': numbered(scaleSalaries(NI.communityDentalService, (g) => g.code === 'M433', 'NI M433')),
92
- 'specialist-community-dentist': numbered(scaleSalaries(NI.communityDentalService, (g) => g.code === 'M434', 'NI M434')),
93
- 'community-dental-clinical-director': numbered(scaleSalaries(NI.communityDentalService, (g) => g.code === 'M435', 'NI M435')),
80
+ const northernIreland2025 = fromDocument(HSC_TC8_05_2025, {
81
+ 'salaried-dentist': niDentalBand(NI_DENTAL_BANDS.salaried),
82
+ 'senior-salaried-dentist': niDentalBand(NI_DENTAL_BANDS.senior),
83
+ 'assistant-clinical-director-dentist': niDentalBand(NI_DENTAL_BANDS.assistantDirector),
84
+ 'clinical-director-dentist': niDentalBand(NI_DENTAL_BANDS.clinicalDirector),
85
+ 'dental-core-training': stepped(salariesOfCode(NI.residentGrades, NI_CODES.coreTraining)),
86
+ 'community-dental-officer': numbered(salariesOfCode(NI.communityDentalService, NI_CODES.communityDentalOfficer)),
87
+ 'senior-community-dental-officer': numbered(salariesOfCode(NI.communityDentalService, NI_CODES.seniorCommunityDentalOfficer)),
88
+ 'assistant-community-dental-clinical-director': numbered(salariesOfCode(NI.communityDentalService, NI_CODES.assistantCommunityDentalClinicalDirector)),
89
+ 'specialist-community-dentist': numbered(salariesOfCode(NI.communityDentalService, NI_CODES.specialistCommunityDentist)),
90
+ 'community-dental-clinical-director': numbered(salariesOfCode(NI.communityDentalService, NI_CODES.communityDentalClinicalDirector)),
94
91
  });
95
92
  // Wales 2026/27 — salaried dental spine + dental core training, uplifted.
96
93
  const wales2026 = fromDocument(MD_W_01_2026, {
97
94
  'salaried-dental': bySpine(WAL26.salariedDentalSpine),
98
- 'dental-core-training': stepped(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN21', 'Wal26 MN21')),
95
+ 'dental-core-training': stepped(salariesOfCode(WAL26.trainingGrades, WAL26_CODES.dentalCoreTraining)),
99
96
  });
100
97
  // Scotland 2025/26 — the Public Dental Service spine (Annex G) and dental
101
98
  // core training (addendum).
102
99
  const scotland2025 = combineScales(fromDocument(PCS_DD_2025_01, {
103
100
  'salaried-dental': bySpine(SCO25.salariedDentalSpine),
104
101
  }), fromDocument(PCS_DD_2025_01_ADDENDUM, {
105
- 'dental-core-training': [
106
- { label: SCO25.dentalCoreTraining.stage, salary: SCO25.dentalCoreTraining.salary },
107
- ],
102
+ 'dental-core-training': byStage([SCO25.dentalCoreTraining]),
108
103
  }));
109
104
  const DENTAL_SCALES = {
110
- [TAX_YEARS.Y2026_27]: {
111
- [NATION_KEYS.england]: england,
112
- [NATION_KEYS.scotland]: scotland,
105
+ [YEAR_LABELS.Y2026_27]: {
106
+ [NATION_KEYS.england]: england2026,
107
+ [NATION_KEYS.scotland]: scotland2026,
113
108
  [NATION_KEYS.wales]: wales2026,
114
109
  },
115
- [TAX_YEARS.Y2025_26]: {
116
- [NATION_KEYS.wales]: wales,
117
- [NATION_KEYS.northernIreland]: northernIreland,
110
+ [YEAR_LABELS.Y2025_26]: {
111
+ [NATION_KEYS.wales]: wales2025,
112
+ [NATION_KEYS.northernIreland]: northernIreland2025,
118
113
  [NATION_KEYS.scotland]: scotland2025,
119
114
  },
120
115
  };
116
+ /** Every read over the dental tables. */
117
+ export const DENTAL_FAMILY = gradeFamily(DENTAL_SCALES, DENTAL_GRADE_IDS);
121
118
  /** Pay years this family publishes, newest first (derived from data). */
122
- export const DENTAL_PAY_YEARS = Object.keys(DENTAL_SCALES).sort().reverse();
119
+ export const DENTAL_PAY_YEARS = DENTAL_FAMILY.years;
123
120
  /**
124
- * Published salaried dental grades for a nation and tax year, each with
121
+ * Published salaried dental grades for a nation and pay year, each with
125
122
  * its scale points and salary range. Both args required; an absent
126
123
  * combination throws `ScaleUnavailable`.
127
124
  */
128
125
  export function getDentalScales(year, nation) {
129
- return resolveGradeMetas(DENTAL_SCALES, DENTAL_GRADE_IDS, year, nation);
126
+ return DENTAL_FAMILY.scalesFor(year, nation);
127
+ }
128
+ /** One band of Northern Ireland's salaried dental table, by number. */
129
+ function niDentalBand(band) {
130
+ return numbered(scaleSalaries(NI.salariedDental, (g) => g.band === band, `NI dental band ${band}`));
130
131
  }
131
132
  //# sourceMappingURL=dental-scales.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dental-scales.js","sourceRoot":"","sources":["../src/dental-scales.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dental-scales.js","sourceRoot":"","sources":["../src/dental-scales.ts"],"names":[],"mappings":"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"}
package/dist/format.js CHANGED
@@ -2,6 +2,7 @@
2
2
  * GBP and percentage formatting helpers for NHS
3
3
  * pay data.
4
4
  */
5
+ import { PER_CENT } from './values.js';
5
6
  // ── Intl formatters (reused across calls) ───────
6
7
  const gbpFormat = new Intl.NumberFormat('en-GB', {
7
8
  style: 'currency',
@@ -49,7 +50,7 @@ export function fmtPct(n) {
49
50
  }
50
51
  /** Format as 8.3% (Intl, input is whole %). */
51
52
  export function formatPct(n) {
52
- return pctFormat.format(n / 100);
53
+ return pctFormat.format(n / PER_CENT);
53
54
  }
54
55
  /**
55
56
  * Format to two decimal places where they carry signal,
@@ -59,7 +60,7 @@ export function formatPct(n) {
59
60
  * rate; small rates format through this one.
60
61
  */
61
62
  export function formatPctPrecise(n) {
62
- return pctPreciseFormat.format(n / 100);
63
+ return pctPreciseFormat.format(n / PER_CENT);
63
64
  }
64
65
  // ── Tax year labels ─────────────────────────────
65
66
  /** '2025-26' → '2025/26' */
@@ -1 +1 @@
1
- {"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,mDAAmD;AAEnD,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC/C,KAAK,EAAE,UAAU;IACjB,QAAQ,EAAE,KAAK;IACf,qBAAqB,EAAE,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,YAAY,CAC5C,OAAO,EACP;IACE,KAAK,EAAE,UAAU;IACjB,QAAQ,EAAE,KAAK;IACf,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CACF,CAAC;AAEF,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC/C,KAAK,EAAE,SAAS;IAChB,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IACtD,KAAK,EAAE,SAAS;IAChB,qBAAqB,EAAE,CAAC;CACzB,CAAC,CAAC;AAEH,mDAAmD;AAEnD,yCAAyC;AACzC,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,CACL,QAAQ;UACN,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,gBAAgB,CAC9B,CAAS;IAET,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,8BAA8B;AAC9B,MAAM,UAAU,QAAQ,CAAC,CAAS;IAChC,OAAO,CACL,QAAQ;UACN,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CACxC,CAAC;AACJ,CAAC;AAED,mDAAmD;AAEnD,sCAAsC;AACtC,MAAM,UAAU,MAAM,CAAC,CAAS;IAC9B,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;AAC5B,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AACnC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAS;IACxC,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC1C,CAAC;AAED,mDAAmD;AAEnD,4BAA4B;AAC5B,MAAM,UAAU,SAAS,CAAC,IAAe;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAChC,CAAC"}
1
+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErC,mDAAmD;AAEnD,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC/C,KAAK,EAAE,UAAU;IACjB,QAAQ,EAAE,KAAK;IACf,qBAAqB,EAAE,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,YAAY,CAC5C,OAAO,EACP;IACE,KAAK,EAAE,UAAU;IACjB,QAAQ,EAAE,KAAK;IACf,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CACF,CAAC;AAEF,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IAC/C,KAAK,EAAE,SAAS;IAChB,qBAAqB,EAAE,CAAC;IACxB,qBAAqB,EAAE,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,gBAAgB,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE;IACtD,KAAK,EAAE,SAAS;IAChB,qBAAqB,EAAE,CAAC;CACzB,CAAC,CAAC;AAEH,mDAAmD;AAEnD,yCAAyC;AACzC,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,CACL,QAAQ;UACN,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAC5B,CAAC;AACJ,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED,yCAAyC;AACzC,MAAM,UAAU,gBAAgB,CAC9B,CAAS;IAET,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,8BAA8B;AAC9B,MAAM,UAAU,QAAQ,CAAC,CAAS;IAChC,OAAO,CACL,QAAQ;UACN,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CACxC,CAAC;AACJ,CAAC;AAED,mDAAmD;AAEnD,sCAAsC;AACtC,MAAM,UAAU,MAAM,CAAC,CAAS;IAC9B,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;AAC5B,CAAC;AAED,+CAA+C;AAC/C,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAS;IACxC,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED,mDAAmD;AAEnD,4BAA4B;AAC5B,MAAM,UAAU,SAAS,CAAC,IAAe;IACvC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAChC,CAAC"}
@@ -8,7 +8,7 @@
8
8
  *
9
9
  * Browser-safe — no node:fs dependency.
10
10
  */
11
- import type { HcasZoneId } from './hcas.js';
11
+ import type { HcasZoneId } from './hcas-zone.js';
12
12
  export interface HcasPct {
13
13
  zone: HcasZoneId;
14
14
  pct: string;
package/dist/hcas-pcts.js CHANGED
@@ -8,7 +8,7 @@
8
8
  *
9
9
  * Browser-safe — no node:fs dependency.
10
10
  */
11
- // ── PCT data — Annex 8, HCAS payment zones ──
11
+ // ── PCT data — Annex 8, HCAS payment zones, Tables 12 to 14 ──
12
12
  // Source: "NHS Terms and Conditions of Service Handbook,
13
13
  // amendment 62" (#sa-41) — see docs/source-archive.md.
14
14
  const INNER_LONDON_PCTS = [
@@ -1 +1 @@
1
- {"version":3,"file":"hcas-pcts.js","sourceRoot":"","sources":["../src/hcas-pcts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,+CAA+C;AAC/C,yDAAyD;AACzD,uDAAuD;AAEvD,MAAM,iBAAiB,GAAsB;IAC3C,sBAAsB;IACtB,sBAAsB;IACtB,aAAa;IACb,QAAQ;IACR,WAAW;IACX,gBAAgB;IAChB,eAAe;IACf,SAAS;IACT,UAAU;IACV,WAAW;IACX,YAAY;CACb,CAAC;AAEF,MAAM,iBAAiB,GAAsB;IAC3C,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,QAAQ;IACR,SAAS;IACT,UAAU;IACV,oBAAoB;IACpB,UAAU;IACV,QAAQ;IACR,WAAW;IACX,iBAAiB;IACjB,QAAQ;IACR,SAAS;IACT,WAAW;IACX,SAAS;IACT,UAAU;IACV,uBAAuB;IACvB,iBAAiB;CAClB,CAAC;AAEF,MAAM,WAAW,GAAsB;IACrC,+BAA+B;IAC/B,UAAU;IACV,kCAAkC;IAClC,gBAAgB;IAChB,QAAQ;IACR,UAAU;IACV,SAAS;IACT,WAAW;IACX,yCAAyC;IACzC,0BAA0B;IAC1B,uBAAuB;IACvB,wBAAwB;IACxB,kBAAkB;IAClB,mBAAmB;IACnB,QAAQ;IACR,6BAA6B;IAC7B,WAAW;IACX,6BAA6B;IAC7B,aAAa;IACb,sBAAsB;IACtB,cAAc;IACd,yBAAyB;CAC1B,CAAC;AAEF,MAAM,SAAS,GAGT;IACJ,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,iBAAiB,EAAC;IAC/C,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,iBAAiB,EAAC;IAC/C,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAC;CACpC,CAAC;AAEF,mDAAmD;AAEnD,MAAM,SAAS,GACb,IAAI,GAAG,EAAE,CAAC;AAEZ,KAAK,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,IAAI,SAAS,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AASD,gDAAgD;AAChD,MAAM,UAAU,WAAW,CACzB,GAAW;IAEX,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,IAAI,CAAC;AAClD,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,WAAW;IACzB,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,IAAI,SAAS,EAAE,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"hcas-pcts.js","sourceRoot":"","sources":["../src/hcas-pcts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,gEAAgE;AAChE,yDAAyD;AACzD,uDAAuD;AAEvD,MAAM,iBAAiB,GAAsB;IAC3C,sBAAsB;IACtB,sBAAsB;IACtB,aAAa;IACb,QAAQ;IACR,WAAW;IACX,gBAAgB;IAChB,eAAe;IACf,SAAS;IACT,UAAU;IACV,WAAW;IACX,YAAY;CACb,CAAC;AAEF,MAAM,iBAAiB,GAAsB;IAC3C,OAAO;IACP,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,UAAU;IACV,QAAQ;IACR,SAAS;IACT,UAAU;IACV,oBAAoB;IACpB,UAAU;IACV,QAAQ;IACR,WAAW;IACX,iBAAiB;IACjB,QAAQ;IACR,SAAS;IACT,WAAW;IACX,SAAS;IACT,UAAU;IACV,uBAAuB;IACvB,iBAAiB;CAClB,CAAC;AAEF,MAAM,WAAW,GAAsB;IACrC,+BAA+B;IAC/B,UAAU;IACV,kCAAkC;IAClC,gBAAgB;IAChB,QAAQ;IACR,UAAU;IACV,SAAS;IACT,WAAW;IACX,yCAAyC;IACzC,0BAA0B;IAC1B,uBAAuB;IACvB,wBAAwB;IACxB,kBAAkB;IAClB,mBAAmB;IACnB,QAAQ;IACR,6BAA6B;IAC7B,WAAW;IACX,6BAA6B;IAC7B,aAAa;IACb,sBAAsB;IACtB,cAAc;IACd,yBAAyB;CAC1B,CAAC;AAEF,MAAM,SAAS,GAGT;IACJ,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,iBAAiB,EAAC;IAC/C,EAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,iBAAiB,EAAC;IAC/C,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAC;CACpC,CAAC;AAEF,mDAAmD;AAEnD,MAAM,SAAS,GACb,IAAI,GAAG,EAAE,CAAC;AAEZ,KAAK,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,IAAI,SAAS,EAAE,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;AACH,CAAC;AASD,gDAAgD;AAChD,MAAM,UAAU,WAAW,CACzB,GAAW;IAEX,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,IAAI,CAAC;AAClD,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,WAAW;IACzB,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,KAAK,MAAM,EAAC,IAAI,EAAE,IAAI,EAAC,IAAI,SAAS,EAAE,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -0,0 +1,23 @@
1
+ /**
2
+ * The HCAS zones' ids and the shape of one zone's rate, in a module that
3
+ * imports nothing, so `regions.ts`, the published zone table and `hcas.ts`
4
+ * can all name a zone without an import cycle (as `afc-band.ts` does for
5
+ * the bands).
6
+ */
7
+ /** One zone: its rate as a percentage of basic pay, and the cash floor
8
+ * and ceiling it is held between. */
9
+ export interface HcasZone {
10
+ readonly rate: number;
11
+ readonly min: number;
12
+ readonly max: number;
13
+ }
14
+ export declare const HCAS_ZONE_IDS: {
15
+ readonly INNER_LONDON: "inner-london";
16
+ readonly OUTER_LONDON: "outer-london";
17
+ readonly FRINGE: "fringe";
18
+ };
19
+ export type HcasZoneId = (typeof HCAS_ZONE_IDS)[keyof typeof HCAS_ZONE_IDS];
20
+ /** The three London zones, keyed by the zone id a region resolves to. */
21
+ export type HcasZones = Readonly<Record<HcasZoneId, HcasZone>>;
22
+ /** Type guard — is this string a valid zone ID? */
23
+ export declare function isHcasZoneId(value: string): value is HcasZoneId;
@@ -0,0 +1,17 @@
1
+ /**
2
+ * The HCAS zones' ids and the shape of one zone's rate, in a module that
3
+ * imports nothing, so `regions.ts`, the published zone table and `hcas.ts`
4
+ * can all name a zone without an import cycle (as `afc-band.ts` does for
5
+ * the bands).
6
+ */
7
+ export const HCAS_ZONE_IDS = {
8
+ INNER_LONDON: 'inner-london',
9
+ OUTER_LONDON: 'outer-london',
10
+ FRINGE: 'fringe',
11
+ };
12
+ const ZONE_ID_LIST = Object.values(HCAS_ZONE_IDS);
13
+ /** Type guard — is this string a valid zone ID? */
14
+ export function isHcasZoneId(value) {
15
+ return ZONE_ID_LIST.includes(value);
16
+ }
17
+ //# sourceMappingURL=hcas-zone.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hcas-zone.js","sourceRoot":"","sources":["../src/hcas-zone.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAUH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,YAAY,EAAE,cAAc;IAC5B,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,QAAQ;CACR,CAAC;AAUX,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAE/B,mDAAmD;AACnD,MAAM,UAAU,YAAY,CAC1B,KAAa;IAEb,OACE,YACD,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC"}
package/dist/hcas.d.ts CHANGED
@@ -1,19 +1,14 @@
1
1
  /**
2
- * HCAS (High Cost Area Supplement) zone identifiers,
3
- * supplement calculation, and gross salary.
2
+ * HCAS (High Cost Area Supplement): England's zones by pay year (HCAS is
3
+ * England's only), the supplement, and gross salary. The zone ids and
4
+ * types are in `hcas-zone.ts`.
4
5
  *
5
6
  * Browser-safe — no node:fs dependency.
6
7
  */
7
- import type { HcasZone, HcasZones } from './scales.js';
8
+ import type { PayYear } from '@casomoltd/paye-calc';
8
9
  import type { AfcRegionId } from './regions.js';
9
- export declare const HCAS_ZONE_IDS: {
10
- readonly INNER_LONDON: "inner-london";
11
- readonly OUTER_LONDON: "outer-london";
12
- readonly FRINGE: "fringe";
13
- };
14
- export type HcasZoneId = (typeof HCAS_ZONE_IDS)[keyof typeof HCAS_ZONE_IDS];
15
- /** Type guard — is this string a valid zone ID? */
16
- export declare function isHcasZoneId(value: string): value is HcasZoneId;
10
+ import type { HcasZone, HcasZones } from './hcas-zone.js';
11
+ import type { SalaryRange } from './values.js';
17
12
  /**
18
13
  * Calculate HCAS supplement for a base salary.
19
14
  * Applies percentage rate clamped between min/max.
@@ -21,14 +16,27 @@ export declare function isHcasZoneId(value: string): value is HcasZoneId;
21
16
  export declare function calculateHcasSupplement(baseSalary: number, zone: HcasZone): number;
22
17
  /**
23
18
  * Produce a region's gross from a base salary: the HCAS
24
- * supplement for England's high-cost zones, and nothing else.
19
+ * supplement for England's high-cost zones, and nothing else. The zones
20
+ * are England's for `year`, read here, so a caller cannot pass another
21
+ * year's or another nation's; a region outside them is paid its base.
25
22
  *
26
23
  * No nation adjustment happens here. Every nation's ladder is
27
- * transcribed in `scales.ts` and reached through
28
- * `getScalesForYear`, so a caller wanting Welsh pay asks for
24
+ * held in `scales.ts` and reached through
25
+ * `getAfcScales`, so a caller wanting Welsh pay asks for
29
26
  * the Welsh table rather than passing another nation's figure
30
- * to be adjusted. Flooring an England base for Wales produced
31
- * a number that was neither nation's once Wales's own scales
32
- * were read from its circular.
27
+ * to be adjusted.
33
28
  */
34
- export declare function grossSalary(base: number, region: AfcRegionId, hcas: HcasZones): number;
29
+ export declare function grossSalary(base: number, region: AfcRegionId, year: PayYear): number;
30
+ /**
31
+ * The basic salaries between which a zone pays its percentage: below
32
+ * `min` its cash floor applies, above `max` its cash cap. Exact, not
33
+ * rounded: a consumer rounds as it prints.
34
+ */
35
+ export declare function hcasRateBand(zone: HcasZone): SalaryRange;
36
+ /**
37
+ * England's HCAS zones for a pay year, from the handbook's table for that
38
+ * year: the zones a London supplement is read from, whatever nation the
39
+ * reader is in. Throws {@link ScaleUnavailable} for a year the table does
40
+ * not hold, rather than lending another year's ceilings.
41
+ */
42
+ export declare function englandHcasZones(year: PayYear): HcasZones;
package/dist/hcas.js CHANGED
@@ -1,45 +1,66 @@
1
1
  /**
2
- * HCAS (High Cost Area Supplement) zone identifiers,
3
- * supplement calculation, and gross salary.
2
+ * HCAS (High Cost Area Supplement): England's zones by pay year (HCAS is
3
+ * England's only), the supplement, and gross salary. The zone ids and
4
+ * types are in `hcas-zone.ts`.
4
5
  *
5
6
  * Browser-safe — no node:fs dependency.
6
7
  */
7
- import { resolveRegion } from './regions.js';
8
- export const HCAS_ZONE_IDS = {
9
- INNER_LONDON: 'inner-london',
10
- OUTER_LONDON: 'outer-london',
11
- FRINGE: 'fringe',
12
- };
13
- const ZONE_ID_LIST = Object.values(HCAS_ZONE_IDS);
14
- /** Type guard — is this string a valid zone ID? */
15
- export function isHcasZoneId(value) {
16
- return ZONE_ID_LIST.includes(value);
17
- }
8
+ import { NATION_KEYS } from '@casomoltd/paye-calc';
9
+ import { ScaleUnavailable } from './errors.js';
10
+ import { HCAS_ZONES } from './published/hcas-zones.js';
11
+ import { afcRegionToHcasZone } from './regions.js';
12
+ import { PER_CENT } from './values.js';
18
13
  /**
19
14
  * Calculate HCAS supplement for a base salary.
20
15
  * Applies percentage rate clamped between min/max.
21
16
  */
22
17
  export function calculateHcasSupplement(baseSalary, zone) {
23
- const raw = baseSalary * (zone.rate / 100);
18
+ const raw = baseSalary * rateOf(zone);
24
19
  return Math.round(Math.min(Math.max(raw, zone.min), zone.max));
25
20
  }
26
21
  /**
27
22
  * Produce a region's gross from a base salary: the HCAS
28
- * supplement for England's high-cost zones, and nothing else.
23
+ * supplement for England's high-cost zones, and nothing else. The zones
24
+ * are England's for `year`, read here, so a caller cannot pass another
25
+ * year's or another nation's; a region outside them is paid its base.
29
26
  *
30
27
  * No nation adjustment happens here. Every nation's ladder is
31
- * transcribed in `scales.ts` and reached through
32
- * `getScalesForYear`, so a caller wanting Welsh pay asks for
28
+ * held in `scales.ts` and reached through
29
+ * `getAfcScales`, so a caller wanting Welsh pay asks for
33
30
  * the Welsh table rather than passing another nation's figure
34
- * to be adjusted. Flooring an England base for Wales produced
35
- * a number that was neither nation's once Wales's own scales
36
- * were read from its circular.
31
+ * to be adjusted.
37
32
  */
38
- export function grossSalary(base, region, hcas) {
39
- const { hcasProp } = resolveRegion(region);
40
- if (!hcasProp) {
33
+ export function grossSalary(base, region, year) {
34
+ const zone = afcRegionToHcasZone(region);
35
+ if (zone === null) {
41
36
  return base;
42
37
  }
43
- return base + calculateHcasSupplement(base, hcas[hcasProp]);
38
+ return base + calculateHcasSupplement(base, englandHcasZones(year)[zone]);
39
+ }
40
+ /**
41
+ * The basic salaries between which a zone pays its percentage: below
42
+ * `min` its cash floor applies, above `max` its cash cap. Exact, not
43
+ * rounded: a consumer rounds as it prints.
44
+ */
45
+ export function hcasRateBand(zone) {
46
+ const rate = rateOf(zone);
47
+ return { min: zone.min / rate, max: zone.max / rate };
48
+ }
49
+ /** A zone's rate as a fraction of basic pay. */
50
+ function rateOf(zone) {
51
+ return zone.rate / PER_CENT;
52
+ }
53
+ /**
54
+ * England's HCAS zones for a pay year, from the handbook's table for that
55
+ * year: the zones a London supplement is read from, whatever nation the
56
+ * reader is in. Throws {@link ScaleUnavailable} for a year the table does
57
+ * not hold, rather than lending another year's ceilings.
58
+ */
59
+ export function englandHcasZones(year) {
60
+ const key = year;
61
+ const zones = HCAS_ZONES[key];
62
+ if (zones === undefined)
63
+ throw new ScaleUnavailable(NATION_KEYS.england, year);
64
+ return zones;
44
65
  }
45
66
  //# sourceMappingURL=hcas.js.map
package/dist/hcas.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"hcas.js","sourceRoot":"","sources":["../src/hcas.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAC,aAAa,EAAC,MAAM,cAAc,CAAC;AAE3C,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,YAAY,EAAE,cAAc;IAC5B,YAAY,EAAE,cAAc;IAC5B,MAAM,EAAE,QAAQ;CACR,CAAC;AAOX,MAAM,YAAY,GAChB,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAE/B,mDAAmD;AACnD,MAAM,UAAU,YAAY,CAC1B,KAAa;IAEb,OACE,YACD,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,UAAkB,EAClB,IAAc;IAEd,MAAM,GAAG,GAAG,UAAU,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC,KAAK,CACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAC5C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,MAAmB,EACnB,IAAe;IAEf,MAAM,EAAC,QAAQ,EAAC,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,GAAG,uBAAuB,CACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CACrB,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"hcas.js","sourceRoot":"","sources":["../src/hcas.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAC,mBAAmB,EAAC,MAAM,cAAc,CAAC;AAGjD,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErC;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,UAAkB,EAClB,IAAc;IAEd,MAAM,GAAG,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,IAAI,CAAC,KAAK,CACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAC5C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,WAAW,CACzB,IAAY,EACZ,MAAmB,EACnB,IAAa;IAEb,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,GAAG,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,OAAO,EAAC,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,IAAI,EAAC,CAAC;AACtD,CAAC;AAED,gDAAgD;AAChD,SAAS,MAAM,CAAC,IAAc;IAC5B,OAAO,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;AAC9B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAC5C,MAAM,GAAG,GAAc,IAAI,CAAC;IAC5B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,IAAI,gBAAgB,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/E,OAAO,KAAK,CAAC;AACf,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,8 +1,13 @@
1
- export { afcBand1 } from './afc-scales.js';
2
- export type { AfcBand1, AfcBand1Published } 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';
4
- export type { AfcBandId, HcasZone, HcasZones, WalesLivingWage, } from './scales.js';
1
+ export { afcBand1 } from './scales.js';
2
+ export type { AfcBand1, AfcBand1Published } from './scales.js';
3
+ export { AFC_BANDS, AFC_BAND_IDS } from './afc-band.js';
4
+ export type { AfcBandId } from './afc-band.js';
5
+ export { WALES_LIVING_WAGE } from './published/wales-living-wage.js';
6
+ export type { WalesLivingWage } from './published/wales-living-wage.js';
7
+ 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';
8
+ export type { AfcBandMeta, AfcPayYearLookup } from './scales.js';
5
9
  export type { PayLadder, ScalePoint } from './scale-point.js';
10
+ export { schemeYearOfPayYear } from './pay-year.js';
6
11
  export { PensionTiers, getEmployerPensionRate, getPensionScheme, getPensionTiers, getPensionTiersVO, lookupPensionTier, pensionTierRate, } from './pension.js';
7
12
  export type { EmployerPensionRate, NhsPensionScheme, PensionTier, } from './pension.js';
8
13
  export type { SalaryRange } from './values.js';
@@ -10,11 +15,16 @@ export { Post, NO_ADJUSTMENTS } from './post.js';
10
15
  export type { PostIdentity, PostAdjustments } from './post.js';
11
16
  export type { AfcRole, DentalRole, MedicalRole, Role, RoleKind, VsmRole, } from './role.js';
12
17
  export { afcResolver, dentalResolver, medicalResolver } from './resolver.js';
13
- export type { AfcResolver, DentalResolver, MedicalResolver, NationScaleResolver, PayScaleResolver, } from './resolver.js';
14
- export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_PAY_YEARS, getMedicalScales, latestMedicalSource, } from './medical-scales.js';
15
- export type { MedicalGradeId, MedicalGradeMeta, } from './medical-scales.js';
16
- export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_PAY_YEARS, getDentalScales, } from './dental-scales.js';
17
- export type { DentalGradeId, DentalGradeMeta, } from './dental-scales.js';
18
+ export type { AfcResolver, DentalResolver, MedicalResolver, NationScaleResolver, PayScaleResolver, ScaleYears, AfcPointQuery, AfcLabelQuery, GradePointQuery, GradeLabelQuery, } from './resolver.js';
19
+ export { MEDICAL_GRADES, MEDICAL_GRADE_IDS } from './medical-grades.js';
20
+ export type { MedicalGradeId } from './medical-grades.js';
21
+ export { MEDICAL_FAMILY, MEDICAL_PAY_YEARS, getMedicalScales, latestMedicalSource, } from './medical-scales.js';
22
+ export type { MedicalGradeMeta } from './medical-scales.js';
23
+ export { DENTAL_GRADES, DENTAL_GRADE_IDS } from './dental-grades.js';
24
+ export type { DentalGradeId } from './dental-grades.js';
25
+ export { DENTAL_FAMILY, DENTAL_PAY_YEARS, getDentalScales } from './dental-scales.js';
26
+ export type { GradeFamily } from './scale-tables.js';
27
+ export type { DentalGradeMeta } from './dental-scales.js';
18
28
  export { ADDITIONAL_PENSION_LIMIT, ADDITIONAL_PENSION_PAYMENTS, ADDITIONAL_PENSION_UNIT, additionalPensionCost, additionalPensionToBuy, } from './additional-pension.js';
19
29
  export type { AdditionalPensionPayment, AdditionalPensionPurchase, } from './additional-pension.js';
20
30
  export { ADDITIONAL_PENSION_COVERS } from './gad/additional-pension-table.js';
@@ -66,17 +76,16 @@ export type { LedgerSeed, SeedBasis } from './pension/seed.js';
66
76
  export { buildLedger } from './pension/ledger.js';
67
77
  export type { AppliedDrawing, AppliedLeaverAdjustment, LedgerRequest, LedgerYear, MemberLedger, } from './pension/ledger.js';
68
78
  export type { EstimatedHistory } from './pension/history.js';
69
- export { HCAS_ZONE_IDS, calculateHcasSupplement, grossSalary, isHcasZoneId, } from './hcas.js';
70
- export type { HcasZoneId } from './hcas.js';
79
+ export { HCAS_ZONE_IDS, isHcasZoneId } from './hcas-zone.js';
80
+ export type { HcasZone, HcasZoneId, HcasZones } from './hcas-zone.js';
81
+ export { calculateHcasSupplement, englandHcasZones, grossSalary, hcasRateBand, } from './hcas.js';
71
82
  export { getHcasPcts, getHcasZone, } from './hcas-pcts.js';
72
83
  export type { HcasPct } from './hcas-pcts.js';
73
- export { AFC_REGIONS, ZONE_TO_REGION, afcRegionToHcasZone, afcRegionToNation, isAfcRegionId, isNation, resolveRegion, } from './regions.js';
84
+ export { AFC_REGIONS, ZONE_TO_REGION, afcRegionToHcasZone, afcRegionToNation, afcRegionOf, baseAfcRegion, isAfcRegionId, resolveRegion, } from './regions.js';
74
85
  export type { AfcRegionId, ResolvedRegion, } from './regions.js';
75
- export { AFC_CURRENT_YEAR, AFC_PREVIOUS_YEAR, afcPointOf, getAfcScales, } from './bands.js';
76
- export type { AfcBandMeta, AfcScaleData, } from './bands.js';
77
86
  export { nhsTakeHome } from './take-home.js';
78
- export { afcWeekInForce, afcWeeklyHours, hoursPerYear } from './working-week.js';
87
+ export { afcWeekInForce, afcWeeklyHours, annualiseHourly, hoursPerYear, } from './working-week.js';
79
88
  export type { NhsTakeHomeOptions } from './take-home.js';
80
89
  export { fmtMoney, fmtPct, fmtSalary, formatGBP, formatGBPPrecise, formatPct, formatPctPrecise, yearLabel, } from './format.js';
81
- 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';
82
91
  export type { Nation, TaxRegion, TaxYear, PayYear, YearLabel, } from '@casomoltd/paye-calc';