@casomoltd/nhs-pay 0.15.2 → 0.16.1

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 (102) hide show
  1. package/README.md +66 -16
  2. package/dist/afc-band.d.ts +33 -0
  3. package/dist/afc-band.js +33 -0
  4. package/dist/afc-band.js.map +1 -0
  5. package/dist/afc-scales.d.ts +67 -0
  6. package/dist/afc-scales.js +238 -0
  7. package/dist/afc-scales.js.map +1 -0
  8. package/dist/allowances.d.ts +91 -0
  9. package/dist/allowances.js +180 -0
  10. package/dist/allowances.js.map +1 -0
  11. package/dist/award.d.ts +175 -36
  12. package/dist/award.js +370 -47
  13. package/dist/award.js.map +1 -1
  14. package/dist/bands.d.ts +34 -12
  15. package/dist/bands.js +26 -9
  16. package/dist/bands.js.map +1 -1
  17. package/dist/circulars/afc-shapes.d.ts +101 -0
  18. package/dist/circulars/afc-shapes.js +18 -0
  19. package/dist/circulars/afc-shapes.js.map +1 -0
  20. package/dist/circulars/{england-md-1-2026r.d.ts → england-md-1-2026-r2.d.ts} +198 -32
  21. package/dist/circulars/{england-md-1-2026r.js → england-md-1-2026-r2.js} +142 -76
  22. package/dist/circulars/england-md-1-2026-r2.js.map +1 -0
  23. package/dist/circulars/ni-hsc-afc-06-2025.d.ts +63 -0
  24. package/dist/circulars/ni-hsc-afc-06-2025.js +100 -0
  25. package/dist/circulars/ni-hsc-afc-06-2025.js.map +1 -0
  26. package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +1 -1
  27. package/dist/circulars/ni-hsc-tc8-05-2025.js +1 -1
  28. package/dist/circulars/scotland-pcs-afc-2026-01.d.ts +82 -0
  29. package/dist/circulars/scotland-pcs-afc-2026-01.js +208 -0
  30. package/dist/circulars/scotland-pcs-afc-2026-01.js.map +1 -0
  31. package/dist/circulars/scotland-pcs-dd-2025-01.d.ts +1 -1
  32. package/dist/circulars/scotland-pcs-dd-2025-01.js +12 -4
  33. package/dist/circulars/scotland-pcs-dd-2025-01.js.map +1 -1
  34. package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +2 -2
  35. package/dist/circulars/scotland-pcs-dd-2026-01.js +2 -2
  36. package/dist/circulars/scotland-pcs-dd-2026-02.d.ts +79 -0
  37. package/dist/circulars/scotland-pcs-dd-2026-02.js +185 -0
  38. package/dist/circulars/scotland-pcs-dd-2026-02.js.map +1 -0
  39. package/dist/circulars/wales-afc-w-02-2025.d.ts +53 -0
  40. package/dist/circulars/wales-afc-w-02-2025.js +85 -0
  41. package/dist/circulars/wales-afc-w-02-2025.js.map +1 -0
  42. package/dist/circulars/wales-afc-w-02-2026.d.ts +48 -0
  43. package/dist/circulars/wales-afc-w-02-2026.js +91 -0
  44. package/dist/circulars/wales-afc-w-02-2026.js.map +1 -0
  45. package/dist/circulars/wales-mdw-01-2025.d.ts +1 -1
  46. package/dist/circulars/wales-mdw-01-2025.js +1 -1
  47. package/dist/circulars/wales-mdw-01-2026.d.ts +1 -1
  48. package/dist/circulars/wales-mdw-01-2026.js +1 -1
  49. package/dist/dental-scales.d.ts +4 -4
  50. package/dist/dental-scales.js +30 -20
  51. package/dist/dental-scales.js.map +1 -1
  52. package/dist/document-source.d.ts +141 -0
  53. package/dist/document-source.js +80 -0
  54. package/dist/document-source.js.map +1 -0
  55. package/dist/errors.d.ts +31 -5
  56. package/dist/errors.js +32 -2
  57. package/dist/errors.js.map +1 -1
  58. package/dist/format.d.ts +2 -2
  59. package/dist/format.js.map +1 -1
  60. package/dist/gad/erf-2023-06-30.d.ts +1 -1
  61. package/dist/gad/erf-2023-06-30.js +2 -1
  62. package/dist/gad/erf-2023-06-30.js.map +1 -1
  63. package/dist/gad/factor-table.d.ts +2 -1
  64. package/dist/gad/factor-table.js.map +1 -1
  65. package/dist/gad/lrf-2023-06-30.d.ts +1 -1
  66. package/dist/gad/lrf-2023-06-30.js +2 -1
  67. package/dist/gad/lrf-2023-06-30.js.map +1 -1
  68. package/dist/hcas.d.ts +10 -14
  69. package/dist/hcas.js +13 -20
  70. package/dist/hcas.js.map +1 -1
  71. package/dist/index.d.ts +17 -9
  72. package/dist/index.js +17 -8
  73. package/dist/index.js.map +1 -1
  74. package/dist/iso-date.d.ts +87 -0
  75. package/dist/iso-date.js +97 -0
  76. package/dist/iso-date.js.map +1 -0
  77. package/dist/medical-scales.d.ts +19 -4
  78. package/dist/medical-scales.js +77 -20
  79. package/dist/medical-scales.js.map +1 -1
  80. package/dist/pension.d.ts +30 -0
  81. package/dist/pension.js +128 -8
  82. package/dist/pension.js.map +1 -1
  83. package/dist/post.d.ts +87 -2
  84. package/dist/post.js +112 -2
  85. package/dist/post.js.map +1 -1
  86. package/dist/regions.d.ts +1 -1
  87. package/dist/regions.js +1 -1
  88. package/dist/resolver.d.ts +57 -7
  89. package/dist/resolver.js +77 -25
  90. package/dist/resolver.js.map +1 -1
  91. package/dist/scale-point.d.ts +13 -4
  92. package/dist/scale-tables.d.ts +57 -10
  93. package/dist/scale-tables.js +58 -9
  94. package/dist/scale-tables.js.map +1 -1
  95. package/dist/scales.d.ts +169 -44
  96. package/dist/scales.js +462 -226
  97. package/dist/scales.js.map +1 -1
  98. package/dist/sources.d.ts +183 -0
  99. package/dist/sources.js +375 -0
  100. package/dist/sources.js.map +1 -0
  101. package/package.json +6 -4
  102. package/dist/circulars/england-md-1-2026r.js.map +0 -1
package/dist/resolver.js CHANGED
@@ -9,42 +9,70 @@
9
9
  * the inputs it already holds (band / point / region), so the
10
10
  * Post knows which scale position it came from.
11
11
  */
12
- import { AFC_TAX_YEARS } from './scales.js';
12
+ import { afcPayYears } from './scales.js';
13
13
  import { afcRegionToNation } from './regions.js';
14
14
  import { getAfcScales } from './bands.js';
15
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';
16
+ import { getMedicalScales, MEDICAL_PAY_YEARS } from './medical-scales.js';
17
+ import { getDentalScales, DENTAL_PAY_YEARS } from './dental-scales.js';
18
+ import { AmbiguousScalePoint, ScaleUnavailable } from './errors.js';
19
19
  import { Post } from './post.js';
20
20
  export const afcResolver = {
21
- fromSalary(salary, nation, year) {
22
- return Post.fromSalary(salary, nation, year);
21
+ fromSalary(salary, nation, year, taxYear) {
22
+ return Post.fromSalary(salary, nation, year, taxYear);
23
23
  },
24
- fromScalePoint(band, pointLabel, region, year) {
24
+ fromPoint(band, point, region, year, taxYear) {
25
25
  const nation = afcRegionToNation(region);
26
26
  const scales = getAfcScales(year, nation);
27
+ // The point must be ON this band's published scale. Without it,
28
+ // the accessor this round now prefers will happily build a
29
+ // Northern Ireland Post from an England point — the exact
30
+ // substitution the per-nation tables exist to prevent, and one
31
+ // `fromScalePoint` ruled out by construction.
32
+ // Matched by VALUE, not reference: a consumer may map the points
33
+ // through its own view type before handing one back, and identity
34
+ // would then reject a legitimate call.
27
35
  const meta = scales.bands.find((b) => b.band === band);
28
- if (!meta) {
29
- throw new ScaleUnavailable(nation, year, band);
36
+ const onScale = meta?.points.some((p) => p.label === point.label && p.salary === point.salary);
37
+ if (!onScale) {
38
+ throw new ScaleUnavailable(nation, year, band, point.label);
30
39
  }
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, {
40
+ const gross = grossSalary(point.salary, region, scales.hcas);
41
+ return Post.fromSalary(gross, nation, year, taxYear, {
37
42
  kind: 'afc',
38
43
  band,
39
44
  point,
40
45
  region,
41
46
  });
42
47
  },
48
+ fromScalePoint(band, pointLabel, region, year, taxYear) {
49
+ const nation = afcRegionToNation(region);
50
+ const scales = getAfcScales(year, nation);
51
+ const meta = scales.bands.find((b) => b.band === band);
52
+ if (!meta) {
53
+ throw new ScaleUnavailable(nation, year, band);
54
+ }
55
+ const matches = meta.points.filter((p) => p.label === pointLabel);
56
+ if (matches.length === 0) {
57
+ throw new ScaleUnavailable(nation, year, band, pointLabel);
58
+ }
59
+ // The same rule as the medical and dental resolvers. A domain rule
60
+ // has to hold on every path, and this one landed on one of two.
61
+ if (matches.length > 1) {
62
+ throw new AmbiguousScalePoint(band, pointLabel, matches.length);
63
+ }
64
+ return this.fromPoint(band, matches[0], region, year, taxYear);
65
+ },
43
66
  availableGrades(nation, year) {
44
67
  return getAfcScales(year, nation).bands.map((b) => b.band);
45
68
  },
46
69
  latestYearFor(gradeId, nation) {
47
- for (const year of [...AFC_TAX_YEARS].reverse()) {
70
+ // That nation's own published years, not England's: probing
71
+ // England's list would call getAfcScales for a year this
72
+ // nation has not published, which throws ScaleUnavailable —
73
+ // breaking the "or null" contract for the exact case the
74
+ // method exists to answer.
75
+ for (const year of [...afcPayYears(nation)].reverse()) {
48
76
  const published = getAfcScales(year, nation)
49
77
  .bands.some((b) => b.band === gradeId);
50
78
  if (published) {
@@ -56,7 +84,7 @@ export const afcResolver = {
56
84
  };
57
85
  // Medical & dental scales carry basic pay by nation (no HCAS), so their
58
86
  // 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
87
+ // owns the list of years it publishes (MEDICAL/DENTAL_PAY_YEARS, derived
60
88
  // from its own tables), which `latestYearFor` probes newest-first.
61
89
  /**
62
90
  * Grade IDs published for a nation/year, or `[]` if the whole
@@ -83,19 +111,43 @@ function publishedGrades(load) {
83
111
  */
84
112
  function makeNationScaleResolver(getScales, toRole, years) {
85
113
  return {
86
- fromSalary(salary, nation, year) {
87
- return Post.fromSalary(salary, nation, year);
114
+ fromSalary(salary, nation, year, taxYear) {
115
+ return Post.fromSalary(salary, nation, year, taxYear);
88
116
  },
89
- fromScalePoint(grade, pointLabel, nation, year) {
117
+ fromScalePoint(grade, pointLabel, nation, year, taxYear) {
90
118
  const meta = getScales(year, nation).find((m) => m.grade === grade);
91
119
  if (!meta) {
92
120
  throw new ScaleUnavailable(nation, year, grade);
93
121
  }
94
- const point = meta.points.find((p) => p.label === pointLabel);
95
- if (!point) {
122
+ const matches = meta.points.filter((p) => p.label === pointLabel);
123
+ if (matches.length === 0) {
96
124
  throw new ScaleUnavailable(nation, year, grade, pointLabel);
97
125
  }
98
- return Post.fromSalary(point.salary, nation, year, toRole(grade, point, nation));
126
+ // Loud, not first-match. Where a label names several points the
127
+ // caller has asked a question the data cannot answer, and the
128
+ // salaries happening to agree today is not a reason to guess.
129
+ if (matches.length > 1) {
130
+ throw new AmbiguousScalePoint(grade, pointLabel, matches.length);
131
+ }
132
+ return Post.fromSalary(matches[0].salary, nation, year, taxYear, toRole(grade, matches[0], nation));
133
+ },
134
+ fromPoint(grade, point, nation, year, taxYear) {
135
+ // The point must belong to the scale it is being resolved
136
+ // against. `fromPoint` takes a point the caller is already
137
+ // holding, so nothing else checks that it came from THIS
138
+ // grade, nation and year — and a consumer that renders one
139
+ // nation's table and resolves against another gets a Post
140
+ // built from a salary that nation does not pay.
141
+ //
142
+ // By VALUE, not identity: a consumer may map points through
143
+ // its own view type before handing one back.
144
+ const meta = getScales(year, nation)
145
+ .find((m) => m.grade === grade);
146
+ const onScale = meta?.points.some((p) => p.label === point.label && p.salary === point.salary);
147
+ if (!onScale) {
148
+ throw new ScaleUnavailable(nation, year, grade, point.label);
149
+ }
150
+ return Post.fromSalary(point.salary, nation, year, taxYear, toRole(grade, point, nation));
99
151
  },
100
152
  availableGrades(nation, year) {
101
153
  return getScales(year, nation).map((m) => m.grade);
@@ -111,6 +163,6 @@ function makeNationScaleResolver(getScales, toRole, years) {
111
163
  },
112
164
  };
113
165
  }
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);
166
+ export const medicalResolver = makeNationScaleResolver(getMedicalScales, (grade, point, nation) => ({ kind: 'medical', grade, point, nation }), MEDICAL_PAY_YEARS);
167
+ export const dentalResolver = makeNationScaleResolver(getDentalScales, (grade, point, nation) => ({ kind: 'dental', grade, point, nation }), DENTAL_PAY_YEARS);
116
168
  //# sourceMappingURL=resolver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAIxC,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAAC,eAAe,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAC,mBAAmB,EAAE,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAClE,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAsE/B,MAAM,CAAC,MAAM,WAAW,GAAgB;IACtC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;QACtC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;QAC1C,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,gEAAgE;QAChE,2DAA2D;QAC3D,0DAA0D;QAC1D,+DAA+D;QAC/D,8CAA8C;QAC9C,iEAAiE;QACjE,kEAAkE;QAClE,uCAAuC;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,IAAI,EAAE,MAAM,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAC5D,CAAC;QACF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,KAAK,GAAG,WAAW,CACvB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAClC,CAAC;QACF,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE;YACnD,IAAI,EAAE,KAAK;YACX,IAAI;YACJ,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;QACpD,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CACvB,CAAC;QACF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAC9B,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,gBAAgB,CACxB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAC/B,CAAC;QACJ,CAAC;QACD,mEAAmE;QACnE,gEAAgE;QAChE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CACnB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CACxC,CAAC;IACJ,CAAC;IAED,eAAe,CAAC,MAAM,EAAE,IAAI;QAC1B,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CACd,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,OAAO,EAAE,MAAM;QAC3B,4DAA4D;QAC5D,yDAAyD;QACzD,4DAA4D;QAC5D,yDAAyD;QACzD,2BAA2B;QAC3B,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YACtD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC;iBACzC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;YACzC,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAC;AAEF,wEAAwE;AACxE,qEAAqE;AACrE,yEAAyE;AACzE,mEAAmE;AAEnE;;;;;GAKG;AACH,SAAS,eAAe,CACtB,IAAiC;IAEjC,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,gBAAgB,EAAE,CAAC;YAClC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC;AA4CD;;;;;GAKG;AACH,SAAS,uBAAuB,CAC9B,SAAqE,EACrE,MAA6D,EAC7D,KAAyB;IAEzB,OAAO;QACL,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;YACtC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC;QAED,cAAc,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;YACrD,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CACvC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CACzB,CAAC;YACF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAClD,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAC9B,CAAC;YACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,gBAAgB,CACxB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,CAChC,CAAC;YACJ,CAAC;YACD,gEAAgE;YAChE,8DAA8D;YAC9D,8DAA8D;YAC9D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,IAAI,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YACnE,CAAC;YACD,OAAO,IAAI,CAAC,UAAU,CACpB,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EACxC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAClC,CAAC;QACJ,CAAC;QAED,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;YAC3C,0DAA0D;YAC1D,2DAA2D;YAC3D,yDAAyD;YACzD,2DAA2D;YAC3D,0DAA0D;YAC1D,gDAAgD;YAChD,EAAE;YACF,4DAA4D;YAC5D,6CAA6C;YAC7C,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;iBACjC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;YAClC,MAAM,OAAO,GAAG,IAAI,EAAE,MAAM,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAC5D,CAAC;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,gBAAgB,CACxB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CACjC,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC,UAAU,CACpB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EACnC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAC7B,CAAC;QACJ,CAAC;QAED,eAAe,CAAC,MAAM,EAAE,IAAI;YAC1B,OAAO,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACrD,CAAC;QAED,aAAa,CAAC,OAAO,EAAE,MAAM;YAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,SAAS,GAAG,eAAe,CAAC,GAAG,EAAE,CACrC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CACxB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACpB,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;AACJ,CAAC;AAQD,MAAM,CAAC,MAAM,eAAe,GAAoB,uBAAuB,CACrE,gBAAgB,EAChB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,EACnE,iBAAiB,CAClB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAmB,uBAAuB,CACnE,eAAe,EACf,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,EAClE,gBAAgB,CACjB,CAAC"}
@@ -19,9 +19,18 @@ export interface ScalePoint {
19
19
  */
20
20
  yearsExperience?: number;
21
21
  /**
22
- * The 2016-contract nodal pay point (1–5) this step sits on, for the
23
- * resident/training scales the source keys by nodal point. Absent where
24
- * the scale has no nodal-point axis (consultant, SAS, dental spine).
22
+ * The 2016-contract nodal pay point this step sits on, for the scales
23
+ * the source keys by nodal point — the training grades, and England's
24
+ * locally employed doctors. Absent where the scale has no nodal-point
25
+ * axis (consultant, SAS, dental spine).
26
+ *
27
+ * The publisher's own LABEL, not a number: England's ten points from
28
+ * PC(M&D) 1/2026 R2 subdivide the original five ('3a', '3b', '4a',
29
+ * '4b', '4c', '5a', '5b', '5c'), so the identifier is not ordinal and
30
+ * two points can pay the same while remaining distinct. A `string`
31
+ * rather than one nation's union, because each publisher labels its
32
+ * own scale; `tests/scale-invariants.test.ts` pins England's ten
33
+ * against the circular, so widening here cannot hide a typo there.
25
34
  */
26
- nodalPoint?: number;
35
+ nodalPoint?: string;
27
36
  }
@@ -9,24 +9,68 @@
9
9
  * canonical container, the grouping accessor, and the translators
10
10
  * generic enough to be shared across both families.
11
11
  */
12
- import type { Nation, TaxYear } from '@casomoltd/paye-calc';
12
+ import type { Nation, PayYear, YearLabel } from '@casomoltd/paye-calc';
13
+ import type { DocumentSource } from './document-source.js';
13
14
  import type { ScalePoint } from './scale-point.js';
14
15
  import type { SalaryRange } from './values.js';
15
- /** A grade's canonical scale points in a nation/year, with its range. */
16
+ /**
17
+ * One grade's points together with the document that published them.
18
+ *
19
+ * The pair travels as one value because a nation-year is not enough to
20
+ * identify the source: Scotland's 2026/27 round is split across
21
+ * PCS(DD)2026/01 (training grades) and PCS(DD)2026/02 (everything
22
+ * else), so two grades in the same bucket cite different circulars.
23
+ */
24
+ export interface GradeScale {
25
+ readonly points: readonly ScalePoint[];
26
+ readonly source: DocumentSource;
27
+ }
28
+ /** A grade's canonical scale points in a nation/year, with its range
29
+ * and the document that publishes them. */
16
30
  export interface GradeMeta<G extends string> {
17
31
  grade: G;
18
32
  points: readonly ScalePoint[];
19
33
  salary: SalaryRange;
34
+ /** The circular these figures were transcribed from — carried so a
35
+ * consumer rendering a pay table cites the document that prints the
36
+ * salaries, never the instrument that announced the award. They are
37
+ * different documents in every nation. */
38
+ source: DocumentSource;
20
39
  }
21
- /** Canonical basic-pay tables keyed year → nation → grade → points. */
22
- export type GradeScaleTables<G extends string> = Partial<Record<TaxYear, Partial<Record<Nation, Partial<Record<G, readonly ScalePoint[]>>>>>>;
40
+ /** Canonical basic-pay tables keyed year → nation → grade → scale. */
41
+ export type GradeScaleTables<G extends string> = Partial<Record<YearLabel, Partial<Record<Nation, Partial<Record<G, GradeScale>>>>>>;
42
+ /**
43
+ * Bind every grade in a mapping to the document it was read from.
44
+ *
45
+ * Pass `G` explicitly at the call site. Left to inference it is read
46
+ * from the literal it is handed, which makes every key valid and turns
47
+ * a mistyped grade into a scale that silently vanishes from the table
48
+ * rather than a compile error.
49
+ *
50
+ * Combine the results with {@link combineScales}, never a bare spread:
51
+ * a duplicate key inside one object literal is a compile error, and the
52
+ * same duplicate across two spreads is not.
53
+ */
54
+ export declare function fromDocument<G extends string>(source: DocumentSource, points: {
55
+ [K in G]?: readonly ScalePoint[];
56
+ }): Partial<Record<G, GradeScale>>;
57
+ /**
58
+ * Merge the parts of a nation-year whose grades come from more than one
59
+ * document, refusing an overlap.
60
+ *
61
+ * A grade can have exactly one publishing circular in a nation and
62
+ * year. Spreading two partial records instead would let the later one
63
+ * win in silence — the same first-match-by-accident this module's
64
+ * callers were rewritten to stop doing.
65
+ */
66
+ export declare function combineScales<G extends string>(...parts: Partial<Record<G, GradeScale>>[]): Partial<Record<G, GradeScale>>;
23
67
  /**
24
68
  * Group a nation/year's grades into metas, in `gradeIds` order. `year`
25
69
  * and `nation` are both required; an absent combination throws
26
70
  * {@link ScaleUnavailable} rather than defaulting to another nation's
27
71
  * or year's figures.
28
72
  */
29
- export declare function resolveGradeMetas<G extends string>(tables: GradeScaleTables<G>, gradeIds: readonly G[], year: TaxYear, nation: Nation): GradeMeta<G>[];
73
+ export declare function resolveGradeMetas<G extends string>(tables: GradeScaleTables<G>, gradeIds: readonly G[], year: PayYear, nation: Nation): GradeMeta<G>[];
30
74
  /**
31
75
  * An incremental scale with no distinct labels beyond position: the
32
76
  * first point is "Minimum", the rest "Point 1", "Point 2", … (the
@@ -45,18 +89,21 @@ export declare const numbered: (salaries: readonly number[]) => readonly ScalePo
45
89
  export declare const byStage: (rows: readonly {
46
90
  stage: string;
47
91
  salary: number;
48
- nodalPoint?: number;
92
+ nodalPoint?: string;
49
93
  }[]) => readonly ScalePoint[];
50
94
  /**
51
- * One point per row, labelled by the row's pay-scale `code`. Carries the
52
- * row's `yearsExperience` onto the point where the source lists one (the
53
- * SAS scales) — the code alone is opaque, so the year is the reader-facing
54
- * axis; rows without it (GP educators, closed grades) stay code-only.
95
+ * One point per row, labelled by the row's pay-scale `code`. Carries
96
+ * whichever axis the source lists beside the code, because the code
97
+ * alone is opaque: `yearsExperience` for the SAS scales, `nodalPoint`
98
+ * for locally employed doctors, whose codes England publishes against
99
+ * the 2016-contract points and NOT in code order. Rows with neither
100
+ * (GP educators, closed grades) stay code-only.
55
101
  */
56
102
  export declare const byCode: (rows: readonly {
57
103
  code: string;
58
104
  salary: number;
59
105
  yearsExperience?: number;
106
+ nodalPoint?: string;
60
107
  }[]) => readonly ScalePoint[];
61
108
  /** One point per row, labelled "Band {band} Point {point}" (dental spine). */
62
109
  export declare const bySpine: (rows: readonly {
@@ -10,6 +10,47 @@
10
10
  * generic enough to be shared across both families.
11
11
  */
12
12
  import { ScaleUnavailable } from './errors.js';
13
+ /**
14
+ * Bind every grade in a mapping to the document it was read from.
15
+ *
16
+ * Pass `G` explicitly at the call site. Left to inference it is read
17
+ * from the literal it is handed, which makes every key valid and turns
18
+ * a mistyped grade into a scale that silently vanishes from the table
19
+ * rather than a compile error.
20
+ *
21
+ * Combine the results with {@link combineScales}, never a bare spread:
22
+ * a duplicate key inside one object literal is a compile error, and the
23
+ * same duplicate across two spreads is not.
24
+ */
25
+ export function fromDocument(source, points) {
26
+ const out = {};
27
+ for (const [grade, pts] of Object.entries(points)) {
28
+ out[grade] = { points: pts, source };
29
+ }
30
+ return out;
31
+ }
32
+ /**
33
+ * Merge the parts of a nation-year whose grades come from more than one
34
+ * document, refusing an overlap.
35
+ *
36
+ * A grade can have exactly one publishing circular in a nation and
37
+ * year. Spreading two partial records instead would let the later one
38
+ * win in silence — the same first-match-by-accident this module's
39
+ * callers were rewritten to stop doing.
40
+ */
41
+ export function combineScales(...parts) {
42
+ const out = {};
43
+ for (const part of parts) {
44
+ for (const [grade, scale] of Object.entries(part)) {
45
+ if (out[grade]) {
46
+ throw new Error(`scale-tables: grade "${grade}" is claimed by two documents `
47
+ + 'in one nation and year — only one can have published it');
48
+ }
49
+ out[grade] = scale;
50
+ }
51
+ }
52
+ return out;
53
+ }
13
54
  /**
14
55
  * Group a nation/year's grades into metas, in `gradeIds` order. `year`
15
56
  * and `nation` are both required; an absent combination throws
@@ -17,22 +58,25 @@ import { ScaleUnavailable } from './errors.js';
17
58
  * or year's figures.
18
59
  */
19
60
  export function resolveGradeMetas(tables, gradeIds, year, nation) {
20
- const grades = tables[year]?.[nation];
61
+ // The table keys on the label; the signature carries the basis.
62
+ const key = year;
63
+ const grades = tables[key]?.[nation];
21
64
  const metas = grades
22
65
  ? gradeIds.flatMap((grade) => {
23
- const points = grades[grade];
24
- if (!points) {
66
+ const scale = grades[grade];
67
+ if (!scale) {
25
68
  return [];
26
69
  }
27
- const salaries = points.map((p) => p.salary);
70
+ const salaries = scale.points.map((p) => p.salary);
28
71
  return [
29
72
  {
30
73
  grade,
31
- points,
74
+ points: scale.points,
32
75
  salary: {
33
76
  min: Math.min(...salaries),
34
77
  max: Math.max(...salaries),
35
78
  },
79
+ source: scale.source,
36
80
  },
37
81
  ];
38
82
  })
@@ -74,10 +118,12 @@ export const byStage = (rows) => rows.map((r) => ({
74
118
  ...(r.nodalPoint !== undefined ? { nodalPoint: r.nodalPoint } : {}),
75
119
  }));
76
120
  /**
77
- * One point per row, labelled by the row's pay-scale `code`. Carries the
78
- * row's `yearsExperience` onto the point where the source lists one (the
79
- * SAS scales) — the code alone is opaque, so the year is the reader-facing
80
- * axis; rows without it (GP educators, closed grades) stay code-only.
121
+ * One point per row, labelled by the row's pay-scale `code`. Carries
122
+ * whichever axis the source lists beside the code, because the code
123
+ * alone is opaque: `yearsExperience` for the SAS scales, `nodalPoint`
124
+ * for locally employed doctors, whose codes England publishes against
125
+ * the 2016-contract points and NOT in code order. Rows with neither
126
+ * (GP educators, closed grades) stay code-only.
81
127
  */
82
128
  export const byCode = (rows) => rows.map((r) => ({
83
129
  label: r.code,
@@ -85,6 +131,9 @@ export const byCode = (rows) => rows.map((r) => ({
85
131
  ...(r.yearsExperience !== undefined
86
132
  ? { yearsExperience: r.yearsExperience }
87
133
  : {}),
134
+ ...(r.nodalPoint !== undefined
135
+ ? { nodalPoint: r.nodalPoint }
136
+ : {}),
88
137
  }));
89
138
  /** One point per row, labelled "Band {band} Point {point}" (dental spine). */
90
139
  export const bySpine = (rows) => rows.map((r) => ({
@@ -1 +1 @@
1
- {"version":3,"file":"scale-tables.js","sourceRoot":"","sources":["../src/scale-tables.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scale-tables.js","sourceRoot":"","sources":["../src/scale-tables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAQH,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAmC7C;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,YAAY,CAC1B,MAAsB,EACtB,MAA0C;IAE1C,MAAM,GAAG,GAAmC,EAAE,CAAC;IAC/C,KAAK,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAE7C,EAAE,CAAC;QACJ,GAAG,CAAC,KAAK,CAAC,GAAG,EAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAC,CAAC;IACrC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,aAAa,CAC3B,GAAG,KAAuC;IAE1C,MAAM,GAAG,GAAmC,EAAE,CAAC;IAC/C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAE7C,EAAE,CAAC;YACJ,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CACb,wBAAwB,KAAK,gCAAgC;sBAC3D,yDAAyD,CAC5D,CAAC;YACJ,CAAC;YACD,GAAG,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;QACrB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAA2B,EAC3B,QAAsB,EACtB,IAAa,EACb,MAAc;IAEd,gEAAgE;IAChE,MAAM,GAAG,GAAc,IAAI,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,MAAM;QAClB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACnD,OAAO;gBACL;oBACE,KAAK;oBACL,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,MAAM,EAAE;wBACN,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;wBAC1B,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;qBAC3B;oBACD,MAAM,EAAE,KAAK,CAAC,MAAM;iBACrB;aACF,CAAC;QACJ,CAAC,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IACP,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,mDAAmD;AACnD,uEAAuE;AACvE,wEAAwE;AACxE,qEAAqE;AACrE,uCAAuC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,QAA2B,EACJ,EAAE,CACzB,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3B,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE;IACzC,MAAM;CACP,CAAC,CAAC,CAAC;AAEN,4DAA4D;AAC5D,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,CAAc,EAAyB,EAAE,CAAC;IAC9D,EAAC,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,EAAC;IACvC,EAAC,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,EAAC;CACxC,CAAC;AAEF,uDAAuD;AACvD,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAA2B,EACJ,EAAE,CACzB,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC;AAEnE;;;;GAIG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,IAAqE,EAC9C,EAAE,CACzB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACf,KAAK,EAAE,CAAC,CAAC,KAAK;IACd,MAAM,EAAE,CAAC,CAAC,MAAM;IAChB,GAAG,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAC,UAAU,EAAE,CAAC,CAAC,UAAU,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;CAClE,CAAC,CAAC,CAAC;AAEN;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,IAKG,EACoB,EAAE,CACzB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACf,KAAK,EAAE,CAAC,CAAC,IAAI;IACb,MAAM,EAAE,CAAC,CAAC,MAAM;IAChB,GAAG,CAAC,CAAC,CAAC,eAAe,KAAK,SAAS;QACjC,CAAC,CAAC,EAAC,eAAe,EAAE,CAAC,CAAC,eAAe,EAAC;QACtC,CAAC,CAAC,EAAE,CAAC;IACP,GAAG,CAAC,CAAC,CAAC,UAAU,KAAK,SAAS;QAC5B,CAAC,CAAC,EAAC,UAAU,EAAE,CAAC,CAAC,UAAU,EAAC;QAC5B,CAAC,CAAC,EAAE,CAAC;CACR,CAAC,CAAC,CAAC;AAEN,8EAA8E;AAC9E,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,IAAuE,EAChD,EAAE,CACzB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACf,KAAK,EAAE,QAAQ,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,KAAK,EAAE;IACxC,MAAM,EAAE,CAAC,CAAC,MAAM;CACjB,CAAC,CAAC,CAAC;AAEN;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAkB,EAClB,KAAwB,EACxB,GAAW,EACQ,EAAE;IACrB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,GAAG,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,KAAK,CAAC,QAAQ,CAAC;AACxB,CAAC,CAAC"}