@casomoltd/nhs-pay 0.31.0 → 0.33.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (142) hide show
  1. package/README.md +25 -22
  2. package/dist/afc-scales.d.ts +43 -10
  3. package/dist/afc-scales.js +50 -16
  4. package/dist/afc-scales.js.map +1 -1
  5. package/dist/allowances.js +11 -11
  6. package/dist/allowances.js.map +1 -1
  7. package/dist/award.d.ts +3 -3
  8. package/dist/award.js +21 -21
  9. package/dist/award.js.map +1 -1
  10. package/dist/circulars/england-md-1-2026-r2.d.ts +13 -0
  11. package/dist/circulars/england-md-1-2026-r2.js +13 -0
  12. package/dist/circulars/england-md-1-2026-r2.js.map +1 -1
  13. package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +22 -0
  14. package/dist/circulars/ni-hsc-tc8-05-2025.js +22 -0
  15. package/dist/circulars/ni-hsc-tc8-05-2025.js.map +1 -1
  16. package/dist/circulars/scotland-pcs-dd-2025-01.d.ts +20 -0
  17. package/dist/circulars/scotland-pcs-dd-2025-01.js +20 -0
  18. package/dist/circulars/scotland-pcs-dd-2025-01.js.map +1 -1
  19. package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +19 -0
  20. package/dist/circulars/scotland-pcs-dd-2026-01.js +30 -10
  21. package/dist/circulars/scotland-pcs-dd-2026-01.js.map +1 -1
  22. package/dist/circulars/scotland-pcs-dd-2026-02.d.ts +10 -0
  23. package/dist/circulars/scotland-pcs-dd-2026-02.js +10 -0
  24. package/dist/circulars/scotland-pcs-dd-2026-02.js.map +1 -1
  25. package/dist/circulars/wales-mdw-01-2025.d.ts +17 -0
  26. package/dist/circulars/wales-mdw-01-2025.js +17 -0
  27. package/dist/circulars/wales-mdw-01-2025.js.map +1 -1
  28. package/dist/circulars/wales-mdw-01-2026.d.ts +20 -0
  29. package/dist/circulars/wales-mdw-01-2026.js +20 -0
  30. package/dist/circulars/wales-mdw-01-2026.js.map +1 -1
  31. package/dist/commutation.js +3 -2
  32. package/dist/commutation.js.map +1 -1
  33. package/dist/dental-grades.d.ts +25 -0
  34. package/dist/dental-grades.js +25 -0
  35. package/dist/dental-grades.js.map +1 -0
  36. package/dist/dental-scales.d.ts +5 -21
  37. package/dist/dental-scales.js +73 -72
  38. package/dist/dental-scales.js.map +1 -1
  39. package/dist/document-source.d.ts +32 -23
  40. package/dist/document-source.js +32 -10
  41. package/dist/document-source.js.map +1 -1
  42. package/dist/errors.d.ts +12 -1
  43. package/dist/errors.js +18 -1
  44. package/dist/errors.js.map +1 -1
  45. package/dist/factor-basis.d.ts +9 -3
  46. package/dist/factor-basis.js +40 -28
  47. package/dist/factor-basis.js.map +1 -1
  48. package/dist/format.js +3 -2
  49. package/dist/format.js.map +1 -1
  50. package/dist/hcas-pcts.d.ts +1 -1
  51. package/dist/hcas-zone.d.ts +23 -0
  52. package/dist/hcas-zone.js +17 -0
  53. package/dist/hcas-zone.js.map +1 -0
  54. package/dist/hcas.d.ts +26 -18
  55. package/dist/hcas.js +45 -24
  56. package/dist/hcas.js.map +1 -1
  57. package/dist/index.d.ts +27 -18
  58. package/dist/index.js +17 -13
  59. package/dist/index.js.map +1 -1
  60. package/dist/medical-grades.d.ts +33 -0
  61. package/dist/medical-grades.js +33 -0
  62. package/dist/medical-grades.js.map +1 -0
  63. package/dist/medical-scales.d.ts +10 -33
  64. package/dist/medical-scales.js +104 -158
  65. package/dist/medical-scales.js.map +1 -1
  66. package/dist/member/benefits.js +9 -4
  67. package/dist/member/benefits.js.map +1 -1
  68. package/dist/member/input-period.d.ts +18 -5
  69. package/dist/member/input-period.js +24 -13
  70. package/dist/member/input-period.js.map +1 -1
  71. package/dist/member/valuation.js +3 -6
  72. package/dist/member/valuation.js.map +1 -1
  73. package/dist/pay-round.js +3 -3
  74. package/dist/pay-round.js.map +1 -1
  75. package/dist/pay-year.d.ts +17 -0
  76. package/dist/pay-year.js +20 -0
  77. package/dist/pay-year.js.map +1 -0
  78. package/dist/pension/ledger.d.ts +7 -0
  79. package/dist/pension/ledger.js +26 -18
  80. package/dist/pension/ledger.js.map +1 -1
  81. package/dist/pension/money.d.ts +2 -0
  82. package/dist/pension/money.js +4 -0
  83. package/dist/pension/money.js.map +1 -1
  84. package/dist/pension/uplift.d.ts +25 -21
  85. package/dist/pension/uplift.js +27 -12
  86. package/dist/pension/uplift.js.map +1 -1
  87. package/dist/pension.js +2 -1
  88. package/dist/pension.js.map +1 -1
  89. package/dist/post.d.ts +20 -21
  90. package/dist/post.js +54 -53
  91. package/dist/post.js.map +1 -1
  92. package/dist/published/england-afc.d.ts +29 -0
  93. package/dist/published/england-afc.js +142 -0
  94. package/dist/published/england-afc.js.map +1 -0
  95. package/dist/published/hcas-zones.d.ts +18 -0
  96. package/dist/published/hcas-zones.js +46 -0
  97. package/dist/published/hcas-zones.js.map +1 -0
  98. package/dist/published/wales-living-wage.d.ts +36 -0
  99. package/dist/published/wales-living-wage.js +30 -0
  100. package/dist/published/wales-living-wage.js.map +1 -0
  101. package/dist/regions.d.ts +25 -14
  102. package/dist/regions.js +61 -71
  103. package/dist/regions.js.map +1 -1
  104. package/dist/resolver.d.ts +46 -41
  105. package/dist/resolver.js +70 -142
  106. package/dist/resolver.js.map +1 -1
  107. package/dist/revaluation.d.ts +27 -11
  108. package/dist/revaluation.js +46 -32
  109. package/dist/revaluation.js.map +1 -1
  110. package/dist/role.d.ts +3 -3
  111. package/dist/scale-point.d.ts +11 -7
  112. package/dist/scale-point.js +29 -1
  113. package/dist/scale-point.js.map +1 -1
  114. package/dist/scale-tables.d.ts +42 -60
  115. package/dist/scale-tables.js +65 -105
  116. package/dist/scale-tables.js.map +1 -1
  117. package/dist/scale-translators.d.ts +90 -0
  118. package/dist/scale-translators.js +97 -0
  119. package/dist/scale-translators.js.map +1 -0
  120. package/dist/scales.d.ts +138 -101
  121. package/dist/scales.js +221 -457
  122. package/dist/scales.js.map +1 -1
  123. package/dist/sections/final-salary.js +3 -11
  124. package/dist/sections/final-salary.js.map +1 -1
  125. package/dist/sections/section-2015.d.ts +1 -3
  126. package/dist/sections/section-2015.js +1 -1
  127. package/dist/sections/section-2015.js.map +1 -1
  128. package/dist/sources.d.ts +12 -12
  129. package/dist/sources.js +13 -15
  130. package/dist/sources.js.map +1 -1
  131. package/dist/take-home.js +1 -2
  132. package/dist/take-home.js.map +1 -1
  133. package/dist/values.d.ts +10 -3
  134. package/dist/values.js +11 -4
  135. package/dist/values.js.map +1 -1
  136. package/dist/working-week.d.ts +23 -8
  137. package/dist/working-week.js +55 -25
  138. package/dist/working-week.js.map +1 -1
  139. package/package.json +3 -3
  140. package/dist/bands.d.ts +0 -63
  141. package/dist/bands.js +0 -78
  142. package/dist/bands.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"scales.js","sourceRoot":"","sources":["../src/scales.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"scales.js","sourceRoot":"","sources":["../src/scales.ts"],"names":[],"mappings":"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"}
@@ -6,6 +6,7 @@
6
6
  * lacks, such as a 60 denominator on best-single-year pay.
7
7
  */
8
8
  import { dayAfter, daysBetween } from '../dates.js';
9
+ import { factored } from '../factor-basis.js';
9
10
  import { moneyAt } from '../pension/money.js';
10
11
  import { schemeYearAfter, schemeYearEnd, schemeYearEndFor, schemeYearStartDate, } from '../pension/scheme-year.js';
11
12
  /** How a section measures final pay, named for an award's provenance.
@@ -39,19 +40,10 @@ export function finalSalaryBenefit(rules, { windows, payPath, dateOfBirth, leavi
39
40
  const lumpFactor = lump === null
40
41
  ? null
41
42
  : lump.factor(dateOfBirth, leaving, drawing);
42
- const lumpSum = lumpFactor === null ? 0 : unreducedLump * lumpFactor.factor;
43
43
  const money = (real) => moneyAt({ real, nominal: prices.payAt(real, drawing) }, drawing);
44
44
  return {
45
- pension: {
46
- beforeFactor: money(unreduced),
47
- after: money(unreduced * pensionFactor.factor),
48
- factor: pensionFactor,
49
- },
50
- automaticLumpSum: {
51
- beforeFactor: money(unreducedLump),
52
- after: money(lumpSum),
53
- factor: lumpFactor,
54
- },
45
+ pension: factored(money(unreduced), pensionFactor),
46
+ automaticLumpSum: factored(money(unreducedLump), lumpFactor),
55
47
  membership,
56
48
  finalPay: pay,
57
49
  };
@@ -1 +1 @@
1
- {"version":3,"file":"final-salary.js","sourceRoot":"","sources":["../../src/sections/final-salary.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"final-salary.js","sourceRoot":"","sources":["../../src/sections/final-salary.ts"],"names":[],"mappings":"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"}
@@ -16,10 +16,8 @@ export declare function factor2015(dateOfBirth: Date, drawn: Date, applies: Appl
16
16
  interface CareerAverageRun {
17
17
  readonly ledger: MemberLedger;
18
18
  readonly seed: LedgerSeed;
19
- /** At the drawing, before its factor. */
19
+ /** At the drawing, before its factor; `factored` applies it. */
20
20
  readonly revalued: number;
21
- /** At the drawing, after its factor. */
22
- readonly drawn: number;
23
21
  }
24
22
  /**
25
23
  * Walk a career average pot in one ruler: the 2015 Section's own, or a
@@ -55,7 +55,7 @@ export function careerAverage({ seed, payIn, dateOfBirth, leaving, drawing, pric
55
55
  });
56
56
  return {
57
57
  ledger, seed, factor,
58
- ...atDrawing(ledger, drawing, factor.factor),
58
+ revalued: atDrawing(ledger, drawing, factor.factor).revalued,
59
59
  };
60
60
  }
61
61
  //# sourceMappingURL=section-2015.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"section-2015.js","sourceRoot":"","sources":["../../src/sections/section-2015.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,GAC3E,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAM5D;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CACxB,WAAiB,EACjB,KAAW,EACX,OAAoB;IAEpB,MAAM,GAAG,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,KAAK,GAAgB;QACzB,OAAO,EAAE,WAAW;QACpB,GAAG;QACH,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI;QACxE,OAAO;KACR,CAAC;IACF,OAAO,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAYD;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAS5D;IACC,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,WAAW,CAAC;QACzB,IAAI;QACJ,KAAK;QACL,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,OAAO;QACvB,MAAM;QACN,OAAO;QACP,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;YACjB,EAAE,EAAE,OAAO;YACX,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,cAAc,CAAC,KAAK;gBAC3C,CAAC,CAAC,EAAC,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAC;gBACzD,CAAC,CAAC,IAAI;SACT,CAAC;KACH,CAAC,CAAC;IACH,OAAO;QACL,MAAM,EAAE,IAAI,EAAE,MAAM;QACpB,GAAG,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC;KAC7C,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"section-2015.js","sourceRoot":"","sources":["../../src/sections/section-2015.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,GAC3E,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAM5D;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CACxB,WAAiB,EACjB,KAAW,EACX,OAAoB;IAEpB,MAAM,GAAG,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,KAAK,GAAgB;QACzB,OAAO,EAAE,WAAW;QACpB,GAAG;QACH,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI;QACxE,OAAO;KACR,CAAC;IACF,OAAO,UAAU,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAUD;;;;;;;;;GASG;AACH,MAAM,UAAU,aAAa,CAAC,EAC5B,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAS5D;IACC,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,WAAW,CAAC;QACzB,IAAI;QACJ,KAAK;QACL,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,OAAO;QACvB,MAAM;QACN,OAAO;QACP,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;YACjB,EAAE,EAAE,OAAO;YACX,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,cAAc,CAAC,KAAK;gBAC3C,CAAC,CAAC,EAAC,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAC;gBACzD,CAAC,CAAC,IAAI;SACT,CAAC;KACH,CAAC,CAAC;IACH,OAAO;QACL,MAAM,EAAE,IAAI,EAAE,MAAM;QACpB,QAAQ,EAAE,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ;KAC7D,CAAC;AACJ,CAAC"}
package/dist/sources.d.ts CHANGED
@@ -20,6 +20,10 @@
20
20
  * - **Legislation** — an Act's own provision, where the rule a figure
21
21
  * turns on is the statute's rather than the scheme's.
22
22
  *
23
+ * Each is a `DocumentSource`, except a publisher's web page that prints
24
+ * no issue date, which is a `PageSource`: it carries the day it was
25
+ * read, so it cannot be shown as published on that day.
26
+ *
23
27
  * They diverge in every nation. England's 2026-27 medical award was
24
28
  * enacted by HCWS1462 on parliament.uk while its salaries are printed
25
29
  * in PC(M&D) 1/2026 R2 on nhsemployers.org. Reading the award's source
@@ -57,11 +61,9 @@ export declare const AFC_WALES_2026: DocumentSource;
57
61
  * staff in 2026/27, explicitly subject to his budgetary position; no
58
62
  * HSC pay circular implementing it had been issued as at 3 Sep 2026.
59
63
  * Every other row is a settled acceptance or an implementing circular.
60
- * Carrying that distinction as a field was considered and rejected:
61
- * the caveat's only use is wording on a page, and presentation copy is
62
- * the consumer's. Re-check for an implementing circular before relying
63
- * on this row, and revisit the decision if a second conditional award
64
- * ever appears.
64
+ * The distinction is not carried as a field: the caveat's only use is
65
+ * wording on a page, and presentation copy is the consumer's. Re-check
66
+ * for an implementing circular before relying on this row.
65
67
  *
66
68
  * It is NOT the source of any scale. NI has published no 2026-27 pay
67
69
  * table, so `afcScaleSource` has no 2026-27 row for it and
@@ -111,7 +113,7 @@ export declare const AFC_W_02_2026: DocumentSource;
111
113
  * ladder — the third of `DocumentSource`'s kinds. It carries
112
114
  * the hourly floor in its Action paragraph and the annual floor in
113
115
  * its own spine-point table, and neither derives from the other, so
114
- * both are transcribed from it in `scales.ts`.
116
+ * both are transcribed from it in `published/wales-living-wage.ts`.
115
117
  *
116
118
  * `issued` is the date on the letter's face, 6 January 2026, not the
117
119
  * 1 April its rates take effect.
@@ -134,12 +136,10 @@ export declare const AFC_SCOTLAND: DocumentSource;
134
136
  * The circular that sets NHS Scotland's full-time week to 36 hours
135
137
  * from 1 April 2026.
136
138
  *
137
- * A CONDITIONS circular, not a scales one, which is why it is not in
138
- * `AFC_SCALE_SOURCES`: it moves no salary. It is held because it is
139
- * the instrument behind a claim the site makes — the hourly rates,
140
- * and `hoursPerYear`, are computed on a week this document sets, and
141
- * before this record existed a consumer page carried its url as a
142
- * hand-typed string constant.
139
+ * A CONDITIONS circular, not a scales one, which is why no AfC scale year
140
+ * cites it: it moves no salary. It is held because it is the
141
+ * instrument the hourly rates and `hoursPerYear` are computed on: it
142
+ * sets the week.
143
143
  *
144
144
  * Cited rather than the policy paper it is often confused with:
145
145
  * gov.scot's Fairer Scotland Duty assessment describes the reduction
package/dist/sources.js CHANGED
@@ -20,6 +20,10 @@
20
20
  * - **Legislation** — an Act's own provision, where the rule a figure
21
21
  * turns on is the statute's rather than the scheme's.
22
22
  *
23
+ * Each is a `DocumentSource`, except a publisher's web page that prints
24
+ * no issue date, which is a `PageSource`: it carries the day it was
25
+ * read, so it cannot be shown as published on that day.
26
+ *
23
27
  * They diverge in every nation. England's 2026-27 medical award was
24
28
  * enacted by HCWS1462 on parliament.uk while its salaries are printed
25
29
  * in PC(M&D) 1/2026 R2 on nhsemployers.org. Reading the award's source
@@ -112,11 +116,9 @@ export const AFC_WALES_2026 = new DocumentSource({
112
116
  * staff in 2026/27, explicitly subject to his budgetary position; no
113
117
  * HSC pay circular implementing it had been issued as at 3 Sep 2026.
114
118
  * Every other row is a settled acceptance or an implementing circular.
115
- * Carrying that distinction as a field was considered and rejected:
116
- * the caveat's only use is wording on a page, and presentation copy is
117
- * the consumer's. Re-check for an implementing circular before relying
118
- * on this row, and revisit the decision if a second conditional award
119
- * ever appears.
119
+ * The distinction is not carried as a field: the caveat's only use is
120
+ * wording on a page, and presentation copy is the consumer's. Re-check
121
+ * for an implementing circular before relying on this row.
120
122
  *
121
123
  * It is NOT the source of any scale. NI has published no 2026-27 pay
122
124
  * table, so `afcScaleSource` has no 2026-27 row for it and
@@ -214,7 +216,7 @@ export const AFC_W_02_2026 = new DocumentSource({
214
216
  * ladder — the third of `DocumentSource`'s kinds. It carries
215
217
  * the hourly floor in its Action paragraph and the annual floor in
216
218
  * its own spine-point table, and neither derives from the other, so
217
- * both are transcribed from it in `scales.ts`.
219
+ * both are transcribed from it in `published/wales-living-wage.ts`.
218
220
  *
219
221
  * `issued` is the date on the letter's face, 6 January 2026, not the
220
222
  * 1 April its rates take effect.
@@ -256,9 +258,7 @@ export const AFC_SCOTLAND = new DocumentSource({
256
258
  // adjustment was paid the March after the calendar year. So the
257
259
  // next instrument to touch these figures is due around March
258
260
  // 2027, ahead of the 2027-28 round. Dating this at the annual
259
- // cycle would have us believe the figures were current through a
260
- // restatement — which is exactly how the 4.25% column stayed on
261
- // the site for a year.
261
+ // cycle would treat the figures as current through a restatement.
262
262
  nextExpected: isoDate('2027-03-01'),
263
263
  nextExpectedReason: 'a possible restatement under the settlement\'s inflation '
264
264
  + 'guarantee, once CPI for calendar 2026 is confirmed',
@@ -267,12 +267,10 @@ export const AFC_SCOTLAND = new DocumentSource({
267
267
  * The circular that sets NHS Scotland's full-time week to 36 hours
268
268
  * from 1 April 2026.
269
269
  *
270
- * A CONDITIONS circular, not a scales one, which is why it is not in
271
- * `AFC_SCALE_SOURCES`: it moves no salary. It is held because it is
272
- * the instrument behind a claim the site makes — the hourly rates,
273
- * and `hoursPerYear`, are computed on a week this document sets, and
274
- * before this record existed a consumer page carried its url as a
275
- * hand-typed string constant.
270
+ * A CONDITIONS circular, not a scales one, which is why no AfC scale year
271
+ * cites it: it moves no salary. It is held because it is the
272
+ * instrument the hourly rates and `hoursPerYear` are computed on: it
273
+ * sets the week.
276
274
  *
277
275
  * Cited rather than the policy paper it is often confused with:
278
276
  * gov.scot's Fairer Scotland Duty assessment describes the reduction
@@ -1 +1 @@
1
- {"version":3,"file":"sources.js","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sources.js","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"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"}
package/dist/take-home.js CHANGED
@@ -21,8 +21,7 @@
21
21
  */
22
22
  import { TakeHomePay, GrossAnnual, NO_PENSION, PensionBasis, PensionPercent, getTaxYearConfig, payAt, } from '@casomoltd/paye-calc';
23
23
  import { invariant } from './errors.js';
24
- /** A rate is a fraction here; paye-calc takes a pension per cent. */
25
- const PER_CENT = 100;
24
+ import { PER_CENT } from './values.js';
26
25
  /**
27
26
  * The take-home pay of an NHS post. Its `annualAllowance()` has no
28
27
  * scheme pension input: a year's input is a member's, read from
@@ -1 +1 @@
1
- {"version":3,"file":"take-home.js","sourceRoot":"","sources":["../src/take-home.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EACL,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,KAAK,GACN,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,qEAAqE;AACrE,MAAM,QAAQ,GAAG,GAAG,CAAC;AAerB;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,WAAW,CACzB,MAAc,EACd,WAAmB,EACnB,OAAgB,EAChB,SAAoB,EACpB,UAA8B,EAAE;IAEhC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAChD,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACnC,qEAAqE;IACrE,8DAA8D;IAC9D,yBAAyB;IACzB,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;IACjC,GAAG,CAAC,UAAU,CAAC,QAAQ;QACrB,CAAC,CAAC;YACA,KAAK,EAAE,YAAY,CAAC,QAAQ;YAC5B,YAAY,EAAE,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC;SACrD;QACD,CAAC,CAAC,UAAU,CAAC,CAAC;IAChB,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,kEAAkE;IAClE,mEAAmE;IACnE,iEAAiE;IACjE,oEAAoE;IACpE,mEAAmE;IACnE,IAAI,QAAQ,EAAE,CAAC;QACb,gEAAgE;QAChE,2BAA2B;QAC3B,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC;YAC5C,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,YAAY,EAAE,GAAG,CAAC,gBAAgB;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI;SACjC,CAAC;QACF,SAAS,CACP,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK;gBACjC,KAAK,CAAC,MAAM,EAAE,EAAC,GAAG,MAAM,EAAE,OAAO,EAAE,UAAU,EAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EACvE,8DAA8D;cAC1D,yDAAyD;cACzD,mDAAmD;cACnD,qBAAqB,CAC1B,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"take-home.js","sourceRoot":"","sources":["../src/take-home.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EACL,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,KAAK,GACN,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAerC;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,WAAW,CACzB,MAAc,EACd,WAAmB,EACnB,OAAgB,EAChB,SAAoB,EACpB,UAA8B,EAAE;IAEhC,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAChD,GAAG,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IACnC,qEAAqE;IACrE,8DAA8D;IAC9D,yBAAyB;IACzB,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;IACjC,GAAG,CAAC,UAAU,CAAC,QAAQ;QACrB,CAAC,CAAC;YACA,KAAK,EAAE,YAAY,CAAC,QAAQ;YAC5B,YAAY,EAAE,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC;SACrD;QACD,CAAC,CAAC,UAAU,CAAC,CAAC;IAChB,IAAI,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChD,CAAC;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,kEAAkE;IAClE,mEAAmE;IACnE,iEAAiE;IACjE,oEAAoE;IACpE,mEAAmE;IACnE,IAAI,QAAQ,EAAE,CAAC;QACb,gEAAgE;QAChE,2BAA2B;QAC3B,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC;YAC5C,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,YAAY,EAAE,GAAG,CAAC,gBAAgB;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,IAAI;SACjC,CAAC;QACF,SAAS,CACP,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK;gBACjC,KAAK,CAAC,MAAM,EAAE,EAAC,GAAG,MAAM,EAAE,OAAO,EAAE,UAAU,EAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EACvE,8DAA8D;cAC1D,yDAAyD;cACzD,mDAAmD;cACnD,qBAAqB,CAC1B,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
package/dist/values.d.ts CHANGED
@@ -1,13 +1,16 @@
1
1
  /**
2
- * Small shared value objects used across the pay-scale
3
- * and pension layers — a named home for paired fields
4
- * that would otherwise travel as loose primitives.
2
+ * Small shared values used across the pay-scale and
3
+ * pension layers: the per-cent unit, and value objects, a
4
+ * named home for paired fields that would otherwise travel
5
+ * as loose primitives.
5
6
  *
6
7
  * Deferred: this local shape stands until paye-calc owns a
7
8
  * shared Range/MinMax value object. When it does, re-point
8
9
  * SalaryRange and PensionTier at it rather than keep a
9
10
  * parallel interval type.
10
11
  */
12
+ /** Per cent: a rate stated per 100. */
13
+ export declare const PER_CENT = 100;
11
14
  /**
12
15
  * A closed salary interval. `max` may be Infinity for an
13
16
  * open-topped band (e.g. the top pension tier).
@@ -16,3 +19,7 @@ export interface SalaryRange {
16
19
  readonly min: number;
17
20
  readonly max: number;
18
21
  }
22
+ /** The range a scale's points span, lowest salary to highest. */
23
+ export declare function salaryRangeOf(points: readonly {
24
+ readonly salary: number;
25
+ }[]): SalaryRange;
package/dist/values.js CHANGED
@@ -1,12 +1,19 @@
1
1
  /**
2
- * Small shared value objects used across the pay-scale
3
- * and pension layers — a named home for paired fields
4
- * that would otherwise travel as loose primitives.
2
+ * Small shared values used across the pay-scale and
3
+ * pension layers: the per-cent unit, and value objects, a
4
+ * named home for paired fields that would otherwise travel
5
+ * as loose primitives.
5
6
  *
6
7
  * Deferred: this local shape stands until paye-calc owns a
7
8
  * shared Range/MinMax value object. When it does, re-point
8
9
  * SalaryRange and PensionTier at it rather than keep a
9
10
  * parallel interval type.
10
11
  */
11
- export {};
12
+ /** Per cent: a rate stated per 100. */
13
+ export const PER_CENT = 100;
14
+ /** The range a scale's points span, lowest salary to highest. */
15
+ export function salaryRangeOf(points) {
16
+ const salaries = points.map((p) => p.salary);
17
+ return { min: Math.min(...salaries), max: Math.max(...salaries) };
18
+ }
12
19
  //# sourceMappingURL=values.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"values.js","sourceRoot":"","sources":["../src/values.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG"}
1
+ {"version":3,"file":"values.js","sourceRoot":"","sources":["../src/values.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,uCAAuC;AACvC,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,CAAC;AAW5B,iEAAiE;AACjE,MAAM,UAAU,aAAa,CAC3B,MAA4C;IAE5C,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,EAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAC,CAAC;AAClE,CAAC"}
@@ -13,11 +13,12 @@
13
13
  * - Scotland, 36 hours from 1 April 2026: the same circular's 2026-27
14
14
  * Annex B prints its rates on a 36-hour week, the week
15
15
  * `AFC_SCOTLAND_36_HOUR_WEEK` (PCS(AFC)2026/2, in `sources.ts`) sets.
16
- * Scotland's week before 2025-26 has no archived source, so those years
17
- * throw rather than serve a figure nobody has checked.
16
+ * Every nation's week is held for 2025-26 and 2026-27 only, the years
17
+ * these sources are read for; any other year throws rather than serve a
18
+ * figure nobody has checked.
18
19
  * See docs/source-archive.md.
19
20
  */
20
- import type { Nation, PayYear, TaxYear } from '@casomoltd/paye-calc';
21
+ import type { Nation, PayYear } from '@casomoltd/paye-calc';
21
22
  /**
22
23
  * The full-time AfC week a pay round's scale is built on: the week its
23
24
  * circular divides by. A member paid on last year's round is on last
@@ -25,12 +26,14 @@ import type { Nation, PayYear, TaxYear } from '@casomoltd/paye-calc';
25
26
  */
26
27
  export declare function afcWeeklyHours(year: PayYear, nation: Nation): number;
27
28
  /**
28
- * The full-time AfC week in force in a tax year, whatever round a nation
29
- * is paying on: a week changes on 1 April, by the calendar, as Scotland's
30
- * 36 hours did in 2026. It differs from `afcWeeklyHours` only for a
31
- * nation still paying an earlier round.
29
+ * The full-time AfC week in force on a date, whatever round a nation is
30
+ * paying on. Keyed by date because a week changes on 1 April, by the
31
+ * calendar, as Scotland's 36 hours did in 2026: that is neither a tax
32
+ * year's boundary (6 April) nor a pay round's, which can run late. It
33
+ * differs from `afcWeeklyHours` only for a nation still paying an earlier
34
+ * round.
32
35
  */
33
- export declare function afcWeekInForce(year: TaxYear, nation: Nation): number;
36
+ export declare function afcWeekInForce(on: Date, nation: Nation): number;
34
37
  /**
35
38
  * Hours in a year at a given week: the divisor for an hourly rate.
36
39
  *
@@ -41,3 +44,15 @@ export declare function afcWeekInForce(year: TaxYear, nation: Nation): number;
41
44
  * ignore them. `tests/working-week.test.ts` pins it.
42
45
  */
43
46
  export declare function hoursPerYear(weeklyHours: number): number;
47
+ /**
48
+ * Annualise an hourly rate at given weekly hours.
49
+ *
50
+ * `weeklyHours` is required: the standard week varies by
51
+ * nation and year (`afcWeeklyHours`), so defaulting it
52
+ * would silently return an rUK answer for a Scottish rate.
53
+ * Pass `afcWeeklyHours(year, nation)`.
54
+ *
55
+ * The inverse of dividing by `hoursPerYear`, which it reads, so the two
56
+ * agree up to the rounding of the hourly rate and of the result.
57
+ */
58
+ export declare function annualiseHourly(hourly: number, weeklyHours: number): number;
@@ -13,17 +13,22 @@
13
13
  * - Scotland, 36 hours from 1 April 2026: the same circular's 2026-27
14
14
  * Annex B prints its rates on a 36-hour week, the week
15
15
  * `AFC_SCOTLAND_36_HOUR_WEEK` (PCS(AFC)2026/2, in `sources.ts`) sets.
16
- * Scotland's week before 2025-26 has no archived source, so those years
17
- * throw rather than serve a figure nobody has checked.
16
+ * Every nation's week is held for 2025-26 and 2026-27 only, the years
17
+ * these sources are read for; any other year throws rather than serve a
18
+ * figure nobody has checked.
18
19
  * See docs/source-archive.md.
19
20
  */
20
21
  import { NATION_KEYS } from '@casomoltd/paye-calc';
21
- /** The week everywhere but Scotland, every year this library covers. */
22
- const FULL_TIME_WEEK = 37.5;
23
- /** Scotland's week, for the years a circular sets it. */
24
- const SCOTLAND_WEEK = {
25
- '2025-26': 37,
26
- '2026-27': 36,
22
+ import { schemeYearOfPayYear } from './pay-year.js';
23
+ import { schemeYearEndFor } from './pension/scheme-year.js';
24
+ /** The handbook's week, everywhere but Scotland (#sa-41). */
25
+ const HANDBOOK_WEEK = 37.5;
26
+ /** Each nation's week, for the years a source sets it, keyed by the
27
+ * scheme year (1 April to 31 March) it holds over. A year outside it
28
+ * throws rather than assume the week held still. */
29
+ const AFC_WEEK = {
30
+ 2026: withHandbookWeek({ scotland: 37 }), // 2025-26
31
+ 2027: withHandbookWeek({ scotland: 36 }), // 2026-27
27
32
  };
28
33
  // A year of weeks as payroll counts it: 365 days over 7.
29
34
  const DAYS_PER_YEAR = 365;
@@ -34,26 +39,18 @@ const DAYS_PER_WEEK = 7;
34
39
  * year's week.
35
40
  */
36
41
  export function afcWeeklyHours(year, nation) {
37
- return weekFor(year, nation);
42
+ return weekFor(schemeYearOfPayYear(year), nation);
38
43
  }
39
44
  /**
40
- * The full-time AfC week in force in a tax year, whatever round a nation
41
- * is paying on: a week changes on 1 April, by the calendar, as Scotland's
42
- * 36 hours did in 2026. It differs from `afcWeeklyHours` only for a
43
- * nation still paying an earlier round.
45
+ * The full-time AfC week in force on a date, whatever round a nation is
46
+ * paying on. Keyed by date because a week changes on 1 April, by the
47
+ * calendar, as Scotland's 36 hours did in 2026: that is neither a tax
48
+ * year's boundary (6 April) nor a pay round's, which can run late. It
49
+ * differs from `afcWeeklyHours` only for a nation still paying an earlier
50
+ * round.
44
51
  */
45
- export function afcWeekInForce(year, nation) {
46
- return weekFor(year, nation);
47
- }
48
- /** The week for a year's label, whichever question asks it. */
49
- function weekFor(label, nation) {
50
- if (nation !== NATION_KEYS.scotland)
51
- return FULL_TIME_WEEK;
52
- const week = SCOTLAND_WEEK[label];
53
- if (week === undefined) {
54
- throw new RangeError(`No sourced AfC week for Scotland in ${label}`);
55
- }
56
- return week;
52
+ export function afcWeekInForce(on, nation) {
53
+ return weekFor(schemeYearEndFor(on), nation);
57
54
  }
58
55
  /**
59
56
  * Hours in a year at a given week: the divisor for an hourly rate.
@@ -67,4 +64,37 @@ function weekFor(label, nation) {
67
64
  export function hoursPerYear(weeklyHours) {
68
65
  return (weeklyHours * DAYS_PER_YEAR) / DAYS_PER_WEEK;
69
66
  }
67
+ /**
68
+ * Annualise an hourly rate at given weekly hours.
69
+ *
70
+ * `weeklyHours` is required: the standard week varies by
71
+ * nation and year (`afcWeeklyHours`), so defaulting it
72
+ * would silently return an rUK answer for a Scottish rate.
73
+ * Pass `afcWeeklyHours(year, nation)`.
74
+ *
75
+ * The inverse of dividing by `hoursPerYear`, which it reads, so the two
76
+ * agree up to the rounding of the hourly rate and of the result.
77
+ */
78
+ export function annualiseHourly(hourly, weeklyHours) {
79
+ return Math.round(hourly * hoursPerYear(weeklyHours));
80
+ }
81
+ /** The week over the scheme year (1 April to 31 March) ending in `end`,
82
+ * whichever question asks it. */
83
+ function weekFor(end, nation) {
84
+ const weeks = AFC_WEEK[end];
85
+ if (weeks === undefined) {
86
+ throw new RangeError(`No sourced AfC week for the year to 31 March ${end}`);
87
+ }
88
+ return weeks[nation];
89
+ }
90
+ /** One scheme year's weeks: the handbook's in England, Wales and Northern
91
+ * Ireland, and Scotland's own. */
92
+ function withHandbookWeek({ scotland }) {
93
+ return {
94
+ [NATION_KEYS.england]: HANDBOOK_WEEK,
95
+ [NATION_KEYS.wales]: HANDBOOK_WEEK,
96
+ [NATION_KEYS.northernIreland]: HANDBOOK_WEEK,
97
+ [NATION_KEYS.scotland]: scotland,
98
+ };
99
+ }
70
100
  //# sourceMappingURL=working-week.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"working-week.js","sourceRoot":"","sources":["../src/working-week.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAGjD,wEAAwE;AACxE,MAAM,cAAc,GAAG,IAAI,CAAC;AAE5B,yDAAyD;AACzD,MAAM,aAAa,GAAuC;IACxD,SAAS,EAAE,EAAE;IACb,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,yDAAyD;AACzD,MAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAa,EAAE,MAAc;IAC1D,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,IAAa,EAAE,MAAc;IAC1D,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,+DAA+D;AAC/D,SAAS,OAAO,CAAC,KAAgB,EAAE,MAAc;IAC/C,IAAI,MAAM,KAAK,WAAW,CAAC,QAAQ;QAAE,OAAO,cAAc,CAAC;IAC3D,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,UAAU,CAClB,uCAAuC,KAAK,EAAE,CAC/C,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,WAAmB;IAC9C,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC,GAAG,aAAa,CAAC;AACvD,CAAC"}
1
+ {"version":3,"file":"working-week.js","sourceRoot":"","sources":["../src/working-week.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAG1D,6DAA6D;AAC7D,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B;;qDAEqD;AACrD,MAAM,QAAQ,GAAwE;IACpF,IAAI,EAAE,gBAAgB,CAAC,EAAC,QAAQ,EAAE,EAAE,EAAC,CAAC,EAAE,UAAU;IAClD,IAAI,EAAE,gBAAgB,CAAC,EAAC,QAAQ,EAAE,EAAE,EAAC,CAAC,EAAE,UAAU;CACnD,CAAC;AAEF,yDAAyD;AACzD,MAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,IAAa,EAAE,MAAc;IAC1D,OAAO,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,EAAQ,EAAE,MAAc;IACrD,OAAO,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,WAAmB;IAC9C,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC,GAAG,aAAa,CAAC;AACvD,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAC7B,MAAc,EACd,WAAmB;IAEnB,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;AACxD,CAAC;AAED;kCACkC;AAClC,SAAS,OAAO,CAAC,GAAkB,EAAE,MAAc;IACjD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,UAAU,CAAC,gDAAgD,GAAG,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC;AACvB,CAAC;AAED;mCACmC;AACnC,SAAS,gBAAgB,CACvB,EAAC,QAAQ,EAA8B;IAEvC,OAAO;QACL,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,aAAa;QACpC,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,aAAa;QAClC,CAAC,WAAW,CAAC,eAAe,CAAC,EAAE,aAAa;QAC5C,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,QAAQ;KACjC,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@casomoltd/nhs-pay",
3
- "version": "0.31.0",
3
+ "version": "0.33.0",
4
4
  "description": "NHS pay scales and take-home pay, and a member's NHS pension across the 1995, 2008 and 2015 Sections",
5
5
  "homepage": "https://casomo.co.uk",
6
6
  "bugs": "https://github.com/casomoltd/nhs-pay/issues",
@@ -67,10 +67,10 @@
67
67
  "provenance": true
68
68
  },
69
69
  "peerDependencies": {
70
- "@casomoltd/paye-calc": ">=0.15.0"
70
+ "@casomoltd/paye-calc": ">=0.18.0"
71
71
  },
72
72
  "devDependencies": {
73
- "@casomoltd/paye-calc": "^0.15.0",
73
+ "@casomoltd/paye-calc": "^0.18.0",
74
74
  "@casomoltd/tooling": "^0.37.0",
75
75
  "@commitlint/cli": "^20.0.0",
76
76
  "@js-temporal/polyfill": "^0.5.1",