@casomoltd/nhs-pay 0.4.15 → 0.6.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 (64) hide show
  1. package/README.md +134 -3
  2. package/dist/award.d.ts +32 -0
  3. package/dist/award.js +59 -0
  4. package/dist/award.js.map +1 -0
  5. package/dist/bands.d.ts +14 -24
  6. package/dist/bands.js +18 -138
  7. package/dist/bands.js.map +1 -1
  8. package/dist/circulars/england-md-1-2026r.d.ts +257 -0
  9. package/dist/circulars/england-md-1-2026r.js +302 -0
  10. package/dist/circulars/england-md-1-2026r.js.map +1 -0
  11. package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +166 -0
  12. package/dist/circulars/ni-hsc-tc8-05-2025.js +249 -0
  13. package/dist/circulars/ni-hsc-tc8-05-2025.js.map +1 -0
  14. package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +34 -0
  15. package/dist/circulars/scotland-pcs-dd-2026-01.js +96 -0
  16. package/dist/circulars/scotland-pcs-dd-2026-01.js.map +1 -0
  17. package/dist/circulars/wales-mdw-01-2025.d.ts +130 -0
  18. package/dist/circulars/wales-mdw-01-2025.js +221 -0
  19. package/dist/circulars/wales-mdw-01-2025.js.map +1 -0
  20. package/dist/dental-scales.d.ts +44 -0
  21. package/dist/dental-scales.js +103 -0
  22. package/dist/dental-scales.js.map +1 -0
  23. package/dist/errors.d.ts +44 -0
  24. package/dist/errors.js +71 -0
  25. package/dist/errors.js.map +1 -0
  26. package/dist/format.d.ts +1 -2
  27. package/dist/format.js +1 -2
  28. package/dist/format.js.map +1 -1
  29. package/dist/hcas-pcts.js +1 -1
  30. package/dist/hcas-pcts.js.map +1 -1
  31. package/dist/hcas.d.ts +17 -7
  32. package/dist/hcas.js +23 -10
  33. package/dist/hcas.js.map +1 -1
  34. package/dist/index.d.ts +16 -4
  35. package/dist/index.js +12 -3
  36. package/dist/index.js.map +1 -1
  37. package/dist/medical-scales.d.ts +64 -0
  38. package/dist/medical-scales.js +148 -0
  39. package/dist/medical-scales.js.map +1 -0
  40. package/dist/pension.d.ts +43 -14
  41. package/dist/pension.js +138 -30
  42. package/dist/pension.js.map +1 -1
  43. package/dist/post.d.ts +50 -0
  44. package/dist/post.js +65 -0
  45. package/dist/post.js.map +1 -0
  46. package/dist/regions.d.ts +0 -5
  47. package/dist/regions.js +0 -19
  48. package/dist/regions.js.map +1 -1
  49. package/dist/resolver.d.ts +56 -0
  50. package/dist/resolver.js +116 -0
  51. package/dist/resolver.js.map +1 -0
  52. package/dist/role.d.ts +51 -0
  53. package/dist/role.js +13 -0
  54. package/dist/role.js.map +1 -0
  55. package/dist/scale-tables.d.ts +63 -0
  56. package/dist/scale-tables.js +87 -0
  57. package/dist/scale-tables.js.map +1 -0
  58. package/dist/scales.d.ts +13 -9
  59. package/dist/scales.js +100 -72
  60. package/dist/scales.js.map +1 -1
  61. package/dist/values.d.ts +19 -0
  62. package/dist/values.js +13 -0
  63. package/dist/values.js.map +1 -0
  64. package/package.json +1 -1
package/dist/pension.js CHANGED
@@ -1,10 +1,16 @@
1
1
  /**
2
- * NHS pension tier types, lookup functions, and
3
- * year-specific tier data.
2
+ * NHS pension contributions: member tier types, the
3
+ * `PensionTiers` lookup value object, the per-scheme member
4
+ * tier tables (NHSBSA for England & Wales, SPPA for Scotland,
5
+ * HSC for Northern Ireland), and the per-nation employer
6
+ * contribution rates.
4
7
  *
5
- * Source: https://www.nhsbsa.nhs.uk/member-hub/member-hub-contribution-rates
8
+ * Member-tier sources are cited per table below and pinned in
9
+ * tests/fixtures/pension-tiers.csv; employer rates carry their
10
+ * own `EmployerPensionRate.source` per nation.
6
11
  */
7
- import { TAX_YEARS } from '@casomoltd/paye-calc';
12
+ import { NATION_KEYS, TAX_YEARS } from '@casomoltd/paye-calc';
13
+ import { PensionTiersUnavailable } from './errors.js';
8
14
  // England and Wales share the NHSBSA-administered scheme, so they
9
15
  // share one rate; Scotland (SPPA) and NI (HSC) run their own.
10
16
  const NHSBSA_EMPLOYER_RATE = {
@@ -37,15 +43,39 @@ export function getEmployerPensionRate(nation) {
37
43
  return EMPLOYER_PENSION_RATES[nation];
38
44
  }
39
45
  /**
40
- * Pension contribution rate (%) for a salary.
46
+ * A member's pension contribution tier table, owning the
47
+ * salary → tier / rate lookup. Wrap a tax year's tiers
48
+ * (see {@link getPensionTiersVO}) and query it directly,
49
+ * rather than re-scanning the array at each call site.
41
50
  */
42
- export function pensionTierRate(salary, tiers) {
43
- for (const tier of tiers) {
44
- if (salary <= tier.max) {
45
- return tier.rate * 100;
51
+ export class PensionTiers {
52
+ tiers;
53
+ constructor(tiers) {
54
+ this.tiers = tiers;
55
+ }
56
+ /** Contribution rate (%) for a salary; 0 if unbanded. */
57
+ rateFor(salary) {
58
+ const match = this.tierFor(salary);
59
+ return match ? match.band.rate * 100 : 0;
60
+ }
61
+ /**
62
+ * Matching tier (1-based) and band for a salary, or
63
+ * null when no band contains it.
64
+ */
65
+ tierFor(salary) {
66
+ for (const band of this.tiers) {
67
+ if (salary <= band.max) {
68
+ return { tier: band.tier, band };
69
+ }
46
70
  }
71
+ return null;
47
72
  }
48
- return 0;
73
+ }
74
+ /**
75
+ * Pension contribution rate (%) for a salary.
76
+ */
77
+ export function pensionTierRate(salary, tiers) {
78
+ return new PensionTiers(tiers).rateFor(salary);
49
79
  }
50
80
  /**
51
81
  * Look up the matching pension tier for a salary.
@@ -53,15 +83,34 @@ export function pensionTierRate(salary, tiers) {
53
83
  * or null if no tiers are provided.
54
84
  */
55
85
  export function lookupPensionTier(salary, tiers) {
56
- for (const t of tiers) {
57
- if (salary <= t.max) {
58
- return { tier: t.tier, band: t };
59
- }
60
- }
61
- return null;
86
+ return new PensionTiers(tiers).tierFor(salary);
62
87
  }
63
- // ── Tier data by tax year ───────────────────────
64
- const PENSION_TIERS_2025_26 = [
88
+ // ── Member contribution tiers by scheme + year ──
89
+ //
90
+ // Three schemes, not one table per nation: England & Wales share
91
+ // NHSBSA; Scotland is SPPA; Northern Ireland is HSC. They share the
92
+ // tiered-contribution idea but publish their own thresholds AND
93
+ // rates, so the same salary can land in a different tier — and a
94
+ // different rate — by nation. Each rate is a source-cited transcription
95
+ // pinned in tests/fixtures/pension-tiers.csv.
96
+ /** The three NHS pension schemes across the UK. */
97
+ const PENSION_SCHEMES = {
98
+ nhsbsa: 'nhsbsa', // England & Wales
99
+ sppa: 'sppa', // Scotland
100
+ hsc: 'hsc', // Northern Ireland
101
+ };
102
+ const NATION_TO_SCHEME = {
103
+ [NATION_KEYS.england]: PENSION_SCHEMES.nhsbsa,
104
+ [NATION_KEYS.wales]: PENSION_SCHEMES.nhsbsa,
105
+ [NATION_KEYS.scotland]: PENSION_SCHEMES.sppa,
106
+ [NATION_KEYS.northernIreland]: PENSION_SCHEMES.hsc,
107
+ };
108
+ // NHSBSA (England & Wales). Sources (member contribution rates):
109
+ // 2025/26 https://www.nhsbsa.nhs.uk/nhs-pensions-contribution-rates-202526
110
+ // 2026/27 https://www.nhsbsa.nhs.uk/member-hub/cost-being-scheme
111
+ // Six tiers; rates unchanged year-on-year, thresholds re-based to the
112
+ // AfC award. Pinned in tests/fixtures/pension-tiers.csv.
113
+ const NHSBSA_2025_26 = [
65
114
  { tier: 1, min: 0, max: 13259, rate: 0.052 },
66
115
  { tier: 2, min: 13260, max: 27797, rate: 0.065 },
67
116
  { tier: 3, min: 27798, max: 33868, rate: 0.083 },
@@ -69,7 +118,7 @@ const PENSION_TIERS_2025_26 = [
69
118
  { tier: 5, min: 50846, max: 65190, rate: 0.107 },
70
119
  { tier: 6, min: 65191, max: Infinity, rate: 0.125 },
71
120
  ];
72
- const PENSION_TIERS_2026_27 = [
121
+ const NHSBSA_2026_27 = [
73
122
  { tier: 1, min: 0, max: 13259, rate: 0.052 },
74
123
  { tier: 2, min: 13260, max: 28854, rate: 0.065 },
75
124
  { tier: 3, min: 28855, max: 35155, rate: 0.083 },
@@ -77,20 +126,79 @@ const PENSION_TIERS_2026_27 = [
77
126
  { tier: 5, min: 52779, max: 67668, rate: 0.107 },
78
127
  { tier: 6, min: 67669, max: Infinity, rate: 0.125 },
79
128
  ];
80
- const PENSION_TIERS = {
81
- [TAX_YEARS.Y2025_26]: PENSION_TIERS_2025_26,
82
- [TAX_YEARS.Y2026_27]: PENSION_TIERS_2026_27,
129
+ // SPPA (Scotland), from 1 April 2026. Source: SPPA circular 2026/03
130
+ // (9 Mar 2026), Table 2 — bands in 2026/27 terms, applied to a
131
+ // member's current-year annualised pensionable pay:
132
+ // https://pensions.gov.scot/sites/default/files/2026-03/2026_03_-_NHS_Employee_contribution_tier_bandings_from_1_April_2026.pdf
133
+ // Nine tiers; rates differ from NHSBSA. No 2025/26 tier table sourced
134
+ // yet (fail loud).
135
+ const SPPA_2026_27 = [
136
+ { tier: 1, min: 0, max: 13330, rate: 0.057 },
137
+ { tier: 2, min: 13331, max: 28987, rate: 0.064 },
138
+ { tier: 3, min: 28988, max: 34302, rate: 0.07 },
139
+ { tier: 4, min: 34303, max: 43038, rate: 0.087 },
140
+ { tier: 5, min: 43039, max: 45134, rate: 0.098 },
141
+ { tier: 6, min: 45135, max: 54862, rate: 0.105 },
142
+ { tier: 7, min: 54863, max: 59369, rate: 0.112 },
143
+ { tier: 8, min: 59370, max: 83026, rate: 0.116 },
144
+ { tier: 9, min: 83027, max: Infinity, rate: 0.127 },
145
+ ];
146
+ // HSC (Northern Ireland). Source: HSC Pension Service member
147
+ // contribution rates:
148
+ // https://hscpensions.hscni.net/hsc-pension-scheme/hsc-pension-members-section/membership-contributions-pay/
149
+ // Six tiers; rates higher than NHSBSA in tiers 2-6. HSC sets its own
150
+ // thresholds AND rates — the 2025/26 bands differ from NHSBSA 2025/26.
151
+ const HSC_2025_26 = [
152
+ { tier: 1, min: 0, max: 13259, rate: 0.052 },
153
+ { tier: 2, min: 13260, max: 27288, rate: 0.067 },
154
+ { tier: 3, min: 27289, max: 33247, rate: 0.085 },
155
+ { tier: 4, min: 33248, max: 49913, rate: 0.1 },
156
+ { tier: 5, min: 49914, max: 63994, rate: 0.109 },
157
+ { tier: 6, min: 63995, max: Infinity, rate: 0.127 },
158
+ ];
159
+ const HSC_2026_27 = [
160
+ { tier: 1, min: 0, max: 13259, rate: 0.052 },
161
+ { tier: 2, min: 13260, max: 28854, rate: 0.067 },
162
+ { tier: 3, min: 28855, max: 35155, rate: 0.085 },
163
+ { tier: 4, min: 35156, max: 52778, rate: 0.1 },
164
+ { tier: 5, min: 52779, max: 67668, rate: 0.109 },
165
+ { tier: 6, min: 67669, max: Infinity, rate: 0.127 },
166
+ ];
167
+ const PENSION_TIERS_BY_SCHEME = {
168
+ [PENSION_SCHEMES.nhsbsa]: {
169
+ [TAX_YEARS.Y2025_26]: NHSBSA_2025_26,
170
+ [TAX_YEARS.Y2026_27]: NHSBSA_2026_27,
171
+ },
172
+ [PENSION_SCHEMES.sppa]: {
173
+ [TAX_YEARS.Y2026_27]: SPPA_2026_27,
174
+ },
175
+ [PENSION_SCHEMES.hsc]: {
176
+ [TAX_YEARS.Y2025_26]: HSC_2025_26,
177
+ [TAX_YEARS.Y2026_27]: HSC_2026_27,
178
+ },
83
179
  };
84
180
  /**
85
- * Get member pension contribution tiers for a tax year.
181
+ * Member pension contribution tiers for a nation and tax year.
86
182
  *
87
- * These thresholds are England & Wales (NHSBSA), re-based to the
88
- * AfC pay award each year. Scotland (SPPA) and NI (HSC) share the
89
- * same six contribution *rates* but set their own pay-band
90
- * thresholds, which can place the same salary in a different
91
- * tier — do not treat these as UK-wide.
183
+ * The three schemes (NHSBSA for England & Wales, SPPA for Scotland,
184
+ * HSC for Northern Ireland) publish independent tier tables — their
185
+ * thresholds AND rates differ — so the nation is required; there is
186
+ * no UK-wide default. Throws {@link PensionTiersUnavailable} for an
187
+ * unpublished combination rather than substituting another scheme's
188
+ * or year's figures.
189
+ */
190
+ export function getPensionTiers(year, nation) {
191
+ const tiers = PENSION_TIERS_BY_SCHEME[NATION_TO_SCHEME[nation]][year];
192
+ if (!tiers) {
193
+ throw new PensionTiersUnavailable(year, nation);
194
+ }
195
+ return tiers;
196
+ }
197
+ /**
198
+ * {@link PensionTiers} value object for a nation and tax year —
199
+ * the same data as {@link getPensionTiers}, ready to query.
92
200
  */
93
- export function getPensionTiers(year) {
94
- return (PENSION_TIERS[year] ?? PENSION_TIERS_2025_26);
201
+ export function getPensionTiersVO(year, nation) {
202
+ return new PensionTiers(getPensionTiers(year, nation));
95
203
  }
96
204
  //# sourceMappingURL=pension.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pension.js","sourceRoot":"","sources":["../src/pension.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pension.js","sourceRoot":"","sources":["../src/pension.ts"],"names":[],"mappings":"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"}
package/dist/post.d.ts ADDED
@@ -0,0 +1,50 @@
1
+ /**
2
+ * Post — an immutable salaried NHS post: a person on a
3
+ * salary, in a nation and tax year, contributing to the
4
+ * NHS pension. Take-home, pension rate and contribution
5
+ * are all *derived* from it.
6
+ *
7
+ * A façade: every derived value delegates to the existing
8
+ * NHS modules ({@link nhsTakeHome}, {@link PensionTiers});
9
+ * nothing is absorbed here. A Post never mutates — change
10
+ * a value by building a new one (see {@link Post.withSalary}).
11
+ */
12
+ import type { Nation, TaxYear, TakeHomePay } from '@casomoltd/paye-calc';
13
+ import type { Role } from './role.js';
14
+ /** The tax/NI/pension context that fixes a Post. */
15
+ export interface PostIdentity {
16
+ readonly nation: Nation;
17
+ readonly taxYear: TaxYear;
18
+ }
19
+ export declare class Post {
20
+ readonly identity: PostIdentity;
21
+ readonly salary: number;
22
+ readonly role: Role;
23
+ private constructor();
24
+ /**
25
+ * Build a Post from a gross salary — whatever the member
26
+ * is actually paid, already adjusted for HCAS / floors
27
+ * by the resolver. `salary` is the fundamental input;
28
+ * everything else is derived.
29
+ *
30
+ * A bare salary is a `vsm` role (an off-scale post); a
31
+ * scale-point resolver passes the scale identity instead.
32
+ */
33
+ static fromSalary(salary: number, nation: Nation, year: TaxYear, role?: Role): Post;
34
+ /** Member contribution rate (%) for this salary. */
35
+ get pensionRate(): number;
36
+ /**
37
+ * Annual member pension contribution (£) — read from the
38
+ * take-home breakdown rather than re-derived, so it can
39
+ * never drift from what paye-calc actually deducts.
40
+ */
41
+ get pensionContribution(): number;
42
+ /** Full take-home breakdown (tax, NI, pension, net). */
43
+ get takeHome(): TakeHomePay;
44
+ /** Annual income tax (£). */
45
+ get tax(): number;
46
+ /** Annual national insurance (£). */
47
+ get nationalInsurance(): number;
48
+ /** The same post at a different salary (e.g. a raise). */
49
+ withSalary(salary: number): Post;
50
+ }
package/dist/post.js ADDED
@@ -0,0 +1,65 @@
1
+ /**
2
+ * Post — an immutable salaried NHS post: a person on a
3
+ * salary, in a nation and tax year, contributing to the
4
+ * NHS pension. Take-home, pension rate and contribution
5
+ * are all *derived* from it.
6
+ *
7
+ * A façade: every derived value delegates to the existing
8
+ * NHS modules ({@link nhsTakeHome}, {@link PensionTiers});
9
+ * nothing is absorbed here. A Post never mutates — change
10
+ * a value by building a new one (see {@link Post.withSalary}).
11
+ */
12
+ import { nationToTaxRegion } from '@casomoltd/paye-calc';
13
+ import { getPensionTiersVO } from './pension.js';
14
+ import { nhsTakeHome } from './take-home.js';
15
+ export class Post {
16
+ identity;
17
+ salary;
18
+ role;
19
+ constructor(identity, salary, role) {
20
+ this.identity = identity;
21
+ this.salary = salary;
22
+ this.role = role;
23
+ }
24
+ /**
25
+ * Build a Post from a gross salary — whatever the member
26
+ * is actually paid, already adjusted for HCAS / floors
27
+ * by the resolver. `salary` is the fundamental input;
28
+ * everything else is derived.
29
+ *
30
+ * A bare salary is a `vsm` role (an off-scale post); a
31
+ * scale-point resolver passes the scale identity instead.
32
+ */
33
+ static fromSalary(salary, nation, year, role = { kind: 'vsm' }) {
34
+ return new Post({ nation, taxYear: year }, salary, role);
35
+ }
36
+ /** Member contribution rate (%) for this salary. */
37
+ get pensionRate() {
38
+ return getPensionTiersVO(this.identity.taxYear, this.identity.nation).rateFor(this.salary);
39
+ }
40
+ /**
41
+ * Annual member pension contribution (£) — read from the
42
+ * take-home breakdown rather than re-derived, so it can
43
+ * never drift from what paye-calc actually deducts.
44
+ */
45
+ get pensionContribution() {
46
+ return this.takeHome.pensionDeduction;
47
+ }
48
+ /** Full take-home breakdown (tax, NI, pension, net). */
49
+ get takeHome() {
50
+ return nhsTakeHome(this.salary, this.pensionRate / 100, this.identity.taxYear, nationToTaxRegion(this.identity.nation));
51
+ }
52
+ /** Annual income tax (£). */
53
+ get tax() {
54
+ return this.takeHome.incomeTax;
55
+ }
56
+ /** Annual national insurance (£). */
57
+ get nationalInsurance() {
58
+ return this.takeHome.nationalInsurance;
59
+ }
60
+ /** The same post at a different salary (e.g. a raise). */
61
+ withSalary(salary) {
62
+ return new Post(this.identity, salary, this.role);
63
+ }
64
+ }
65
+ //# sourceMappingURL=post.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAMvD,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAS3C,MAAM,OAAO,IAAI;IAEJ;IACA;IACA;IAHX,YACW,QAAsB,EACtB,MAAc,EACd,IAAU;QAFV,aAAQ,GAAR,QAAQ,CAAc;QACtB,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAM;IAClB,CAAC;IAEJ;;;;;;;;OAQG;IACH,MAAM,CAAC,UAAU,CACf,MAAc,EACd,MAAc,EACd,IAAa,EACb,OAAa,EAAC,IAAI,EAAE,KAAK,EAAC;QAE1B,OAAO,IAAI,IAAI,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,oDAAoD;IACpD,IAAI,WAAW;QACb,OAAO,iBAAiB,CACtB,IAAI,CAAC,QAAQ,CAAC,OAAO,EACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CACrB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,IAAI,mBAAmB;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC;IACxC,CAAC;IAED,wDAAwD;IACxD,IAAI,QAAQ;QACV,OAAO,WAAW,CAChB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,WAAW,GAAG,GAAG,EACtB,IAAI,CAAC,QAAQ,CAAC,OAAO,EACrB,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CACxC,CAAC;IACJ,CAAC;IAED,6BAA6B;IAC7B,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,qCAAqC;IACrC,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACzC,CAAC;IAED,0DAA0D;IAC1D,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;CACF"}
package/dist/regions.d.ts CHANGED
@@ -28,10 +28,6 @@ export interface ResolvedRegion {
28
28
  taxRegion: TaxRegion;
29
29
  /** Key into AfcScaleYear.hcas, if applicable */
30
30
  hcasProp: keyof HcasZones | null;
31
- /** Short label for page titles */
32
- label: string;
33
- /** Tax system description for intro copy */
34
- taxNote: string;
35
31
  isWales: boolean;
36
32
  }
37
33
  /** Resolve a region code to tax/HCAS/label info. */
@@ -42,6 +38,5 @@ export declare const ZONE_TO_REGION: Record<HcasZoneId, AfcRegionId>;
42
38
  /** Map an AfC region code to its HCAS zone,
43
39
  * or null for non-HCAS regions. */
44
40
  export declare function afcRegionToHcasZone(id: AfcRegionId): HcasZoneId | null;
45
- export declare const ZONE_LABELS: Record<HcasZoneId, string>;
46
41
  /** Type guard for paye-calc Nation strings. */
47
42
  export declare function isNation(raw: string | null | undefined): raw is Nation;
package/dist/regions.js CHANGED
@@ -28,50 +28,36 @@ const REGION_INFO = {
28
28
  [AFC_REGIONS.ENG]: {
29
29
  taxRegion: TAX_REGIONS.rUK,
30
30
  hcasProp: null,
31
- label: 'England',
32
- taxNote: 'England and Wales tax rates',
33
31
  isWales: false,
34
32
  },
35
33
  [AFC_REGIONS.ENG_IL]: {
36
34
  taxRegion: TAX_REGIONS.rUK,
37
35
  hcasProp: 'innerLondon',
38
- label: 'England \u2014 Inner London HCAS',
39
- taxNote: 'England and Wales tax rates',
40
36
  isWales: false,
41
37
  },
42
38
  [AFC_REGIONS.ENG_OL]: {
43
39
  taxRegion: TAX_REGIONS.rUK,
44
40
  hcasProp: 'outerLondon',
45
- label: 'England \u2014 Outer London HCAS',
46
- taxNote: 'England and Wales tax rates',
47
41
  isWales: false,
48
42
  },
49
43
  [AFC_REGIONS.ENG_FR]: {
50
44
  taxRegion: TAX_REGIONS.rUK,
51
45
  hcasProp: 'fringe',
52
- label: 'England \u2014 Fringe HCAS',
53
- taxNote: 'England and Wales tax rates',
54
46
  isWales: false,
55
47
  },
56
48
  [AFC_REGIONS.WAL]: {
57
49
  taxRegion: TAX_REGIONS.rUK,
58
50
  hcasProp: null,
59
- label: 'Wales',
60
- taxNote: 'England and Wales tax rates',
61
51
  isWales: true,
62
52
  },
63
53
  [AFC_REGIONS.SCO]: {
64
54
  taxRegion: TAX_REGIONS.scotland,
65
55
  hcasProp: null,
66
- label: 'Scotland',
67
- taxNote: 'Scottish income tax rates',
68
56
  isWales: false,
69
57
  },
70
58
  [AFC_REGIONS.NI]: {
71
59
  taxRegion: TAX_REGIONS.rUK,
72
60
  hcasProp: null,
73
- label: 'Northern Ireland',
74
- taxNote: 'England and Wales tax rates',
75
61
  isWales: false,
76
62
  },
77
63
  };
@@ -107,11 +93,6 @@ const REGION_TO_ZONE = Object.fromEntries(Object.entries(ZONE_TO_REGION)
107
93
  export function afcRegionToHcasZone(id) {
108
94
  return REGION_TO_ZONE[id] ?? null;
109
95
  }
110
- export const ZONE_LABELS = {
111
- 'inner-london': 'Inner London',
112
- 'outer-london': 'Outer London',
113
- fringe: 'Fringe',
114
- };
115
96
  // ── Nation type guard ──────────────────────
116
97
  const NATION_SET = new Set(Object.keys(NATIONS));
117
98
  /** Type guard for paye-calc Nation strings. */
@@ -1 +1 @@
1
- {"version":3,"file":"regions.js","sourceRoot":"","sources":["../src/regions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"regions.js","sourceRoot":"","sources":["../src/regions.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,56 @@
1
+ /**
2
+ * Pay-scale resolvers — build a {@link Post} from a
3
+ * published pay scale. The AfC resolver reads the
4
+ * Agenda-for-Change tables; medical / dental resolvers
5
+ * (Phase 2) will read their own, all producing the same
6
+ * uniform Post. Polymorphism lives here, not on the Post.
7
+ *
8
+ * Each resolver stamps the Post's {@link Role} identity from
9
+ * the inputs it already holds (band / point / region), so the
10
+ * Post knows which scale position it came from.
11
+ */
12
+ import type { Nation, TaxYear } from '@casomoltd/paye-calc';
13
+ import type { AfcBandId } from './scales.js';
14
+ import type { AfcRegionId } from './regions.js';
15
+ import type { MedicalGradeId } from './medical-scales.js';
16
+ import type { DentalGradeId } from './dental-scales.js';
17
+ import { Post } from './post.js';
18
+ /**
19
+ * The uniform contract every pay family satisfies: build a
20
+ * Post from a salary, and enumerate what is published. The
21
+ * scale-point entry is family-specific (grades and their
22
+ * region model differ per family), so it is added by each
23
+ * resolver's own interface, not this shared one.
24
+ */
25
+ export interface PayScaleResolver<G extends string> {
26
+ fromSalary(salary: number, nation: Nation, year: TaxYear): Post;
27
+ /** Grades with a published scale for this nation/year. */
28
+ availableGrades(nation: Nation, year: TaxYear): readonly G[];
29
+ /** Latest year a grade is published for a nation, or null. */
30
+ latestYearFor(gradeId: G, nation: Nation): TaxYear | null;
31
+ }
32
+ /**
33
+ * AfC resolver — adds a band + point + region entry. AfC
34
+ * take-home threads an {@link AfcRegionId} (nation + HCAS
35
+ * zone collapsed), not a bare Nation, so its scale-point
36
+ * path resolves the HCAS / Wales-floor gross itself.
37
+ */
38
+ export interface AfcResolver extends PayScaleResolver<AfcBandId> {
39
+ fromScalePoint(band: AfcBandId, pointLabel: string, region: AfcRegionId, year: TaxYear): Post;
40
+ }
41
+ export declare const afcResolver: AfcResolver;
42
+ /**
43
+ * A basic-pay-by-nation resolver (medical, dental) — like the AfC
44
+ * resolver, but its scale-point entry threads a bare {@link Nation}
45
+ * (no HCAS/region), and it stamps a family-specific {@link Role} via
46
+ * the `toRole` builder its factory is given.
47
+ */
48
+ export interface NationScaleResolver<G extends string> extends PayScaleResolver<G> {
49
+ fromScalePoint(grade: G, pointLabel: string, nation: Nation, year: TaxYear): Post;
50
+ }
51
+ /** Medical (doctors) resolver — a grade + point + nation entry. */
52
+ export type MedicalResolver = NationScaleResolver<MedicalGradeId>;
53
+ /** Salaried dental resolver — a grade + point + nation entry. */
54
+ export type DentalResolver = NationScaleResolver<DentalGradeId>;
55
+ export declare const medicalResolver: MedicalResolver;
56
+ export declare const dentalResolver: DentalResolver;
@@ -0,0 +1,116 @@
1
+ /**
2
+ * Pay-scale resolvers — build a {@link Post} from a
3
+ * published pay scale. The AfC resolver reads the
4
+ * Agenda-for-Change tables; medical / dental resolvers
5
+ * (Phase 2) will read their own, all producing the same
6
+ * uniform Post. Polymorphism lives here, not on the Post.
7
+ *
8
+ * Each resolver stamps the Post's {@link Role} identity from
9
+ * the inputs it already holds (band / point / region), so the
10
+ * Post knows which scale position it came from.
11
+ */
12
+ import { AFC_TAX_YEARS } from './scales.js';
13
+ import { afcRegionToNation } from './regions.js';
14
+ import { getAfcScales } from './bands.js';
15
+ import { grossSalary } from './hcas.js';
16
+ import { getMedicalScales, MEDICAL_TAX_YEARS } from './medical-scales.js';
17
+ import { getDentalScales, DENTAL_TAX_YEARS } from './dental-scales.js';
18
+ import { ScaleUnavailable } from './errors.js';
19
+ import { Post } from './post.js';
20
+ export const afcResolver = {
21
+ fromSalary(salary, nation, year) {
22
+ return Post.fromSalary(salary, nation, year);
23
+ },
24
+ fromScalePoint(band, pointLabel, region, year) {
25
+ const nation = afcRegionToNation(region);
26
+ const scales = getAfcScales(year, nation);
27
+ const meta = scales.bands.find((b) => b.band === band);
28
+ if (!meta) {
29
+ throw new ScaleUnavailable(nation, year, band);
30
+ }
31
+ const point = meta.points.find((p) => p.label === pointLabel);
32
+ if (!point) {
33
+ throw new ScaleUnavailable(nation, year, band, pointLabel);
34
+ }
35
+ const gross = grossSalary(point.salary, region, scales.hcas, year);
36
+ return Post.fromSalary(gross, nation, year, {
37
+ kind: 'afc',
38
+ band,
39
+ point,
40
+ region,
41
+ });
42
+ },
43
+ availableGrades(nation, year) {
44
+ return getAfcScales(year, nation).bands.map((b) => b.band);
45
+ },
46
+ latestYearFor(gradeId, nation) {
47
+ for (const year of [...AFC_TAX_YEARS].reverse()) {
48
+ const published = getAfcScales(year, nation)
49
+ .bands.some((b) => b.band === gradeId);
50
+ if (published) {
51
+ return year;
52
+ }
53
+ }
54
+ return null;
55
+ },
56
+ };
57
+ // Medical & dental scales carry basic pay by nation (no HCAS), so their
58
+ // scale-point entry threads a Nation, not an AfC region. Each family
59
+ // owns the list of years it publishes (MEDICAL/DENTAL_TAX_YEARS, derived
60
+ // from its own tables), which `latestYearFor` probes newest-first.
61
+ /**
62
+ * Grade IDs published for a nation/year, or `[]` if the whole
63
+ * combination is unpublished — a non-throwing probe for `latestYearFor`
64
+ * (which walks years that may not all exist for a nation), distinct
65
+ * from `availableGrades`, which fails loud like the AfC resolver.
66
+ */
67
+ function publishedGrades(load) {
68
+ try {
69
+ return load().map((m) => m.grade);
70
+ }
71
+ catch (e) {
72
+ if (e instanceof ScaleUnavailable) {
73
+ return [];
74
+ }
75
+ throw e;
76
+ }
77
+ }
78
+ /**
79
+ * Build a {@link NationScaleResolver} over a family's `getScales`
80
+ * accessor and its {@link Role} stamp. Both the medical and dental
81
+ * resolvers are this factory with different data and role — the
82
+ * polymorphism the design intends, with no per-family machinery.
83
+ */
84
+ function makeNationScaleResolver(getScales, toRole, years) {
85
+ return {
86
+ fromSalary(salary, nation, year) {
87
+ return Post.fromSalary(salary, nation, year);
88
+ },
89
+ fromScalePoint(grade, pointLabel, nation, year) {
90
+ const meta = getScales(year, nation).find((m) => m.grade === grade);
91
+ if (!meta) {
92
+ throw new ScaleUnavailable(nation, year, grade);
93
+ }
94
+ const point = meta.points.find((p) => p.label === pointLabel);
95
+ if (!point) {
96
+ throw new ScaleUnavailable(nation, year, grade, pointLabel);
97
+ }
98
+ return Post.fromSalary(point.salary, nation, year, toRole(grade, point, nation));
99
+ },
100
+ availableGrades(nation, year) {
101
+ return getScales(year, nation).map((m) => m.grade);
102
+ },
103
+ latestYearFor(gradeId, nation) {
104
+ for (const year of years) {
105
+ const published = publishedGrades(() => getScales(year, nation)).includes(gradeId);
106
+ if (published) {
107
+ return year;
108
+ }
109
+ }
110
+ return null;
111
+ },
112
+ };
113
+ }
114
+ export const medicalResolver = makeNationScaleResolver(getMedicalScales, (grade, point, nation) => ({ kind: 'medical', grade, point, nation }), MEDICAL_TAX_YEARS);
115
+ export const dentalResolver = makeNationScaleResolver(getDentalScales, (grade, point, nation) => ({ kind: 'dental', grade, point, nation }), DENTAL_TAX_YEARS);
116
+ //# sourceMappingURL=resolver.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}