@casomoltd/nhs-pay 0.28.0 → 0.29.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.
@@ -125,7 +125,7 @@ export interface Award {
125
125
  /** Where it is held and paid from. */
126
126
  readonly section: SectionId;
127
127
  readonly periods: readonly ServicePeriod[];
128
- /** The pension at the drawing before its factor: final salary as
128
+ /** The PENSION at the drawing before its factor: final salary as
129
129
  * measured, or the career average pot as revalued. */
130
130
  readonly beforeFactor: ProjectionMoney;
131
131
  /** After the factor: what is paid. */
@@ -133,6 +133,14 @@ export interface Award {
133
133
  /** Nil rather than absent where the rules pay none, so a caller
134
134
  * cannot forget to ask. */
135
135
  readonly automaticLumpSum: ProjectionMoney;
136
+ /** The automatic lump sum at the drawing before its early or late
137
+ * factor, on the same rulers as `beforeFactor`: the section's multiple
138
+ * of that pension. Nil where the rules pay none, as a career average
139
+ * award never does. */
140
+ readonly automaticLumpSumBeforeFactor: ProjectionMoney;
141
+ /** The PENSION's early or late factor. A lump sum is reduced by a
142
+ * factor of its own, which this does not carry, so read the lump sum
143
+ * before it from `automaticLumpSumBeforeFactor`, never by dividing. */
136
144
  readonly factor: FactorOutcome;
137
145
  /** A career average award's year-by-year walk, in cash and in today's
138
146
  * money; null for final salary, which keeps no balance to walk. */
@@ -73,6 +73,7 @@ export function legacyAward(b, legacy, valued, dates) {
73
73
  beforeFactor: benefit.beforeFactor,
74
74
  pension: benefit.pension,
75
75
  automaticLumpSum: benefit.automaticLumpSum,
76
+ automaticLumpSumBeforeFactor: benefit.automaticLumpSumBeforeFactor,
76
77
  factor: benefit.factor,
77
78
  ledgers: null,
78
79
  provenance: {
@@ -89,13 +90,17 @@ export function careerAward(b, { section, window, seedFor }, dates) {
89
90
  const walkIn = (prices) => walk(b, { window, seed: seedFor(prices), prices }, dates);
90
91
  const cash = walkIn(b.cashPrices);
91
92
  const todays = walkIn(b.todaysPrices);
93
+ // A career average award pays no automatic lump sum, before or after a
94
+ // factor.
95
+ const noLumpSum = moneyAt({ nominal: 0, real: 0 }, dates.drawing);
92
96
  return {
93
97
  award: {
94
98
  section,
95
99
  periods: [window],
96
100
  beforeFactor: moneyAt({ nominal: cash.revalued, real: todays.revalued }, dates.drawing),
97
101
  pension: moneyAt({ nominal: cash.drawn, real: todays.drawn }, dates.drawing),
98
- automaticLumpSum: moneyAt({ nominal: 0, real: 0 }, dates.drawing),
102
+ automaticLumpSum: noLumpSum,
103
+ automaticLumpSumBeforeFactor: noLumpSum,
99
104
  factor: cash.factor,
100
105
  ledgers: { cash: cash.ledger, todaysMoney: todays.ledger },
101
106
  provenance: { accrual: ACCRUALS.careerAverage },
@@ -1 +1 @@
1
- {"version":3,"file":"valuation.js","sourceRoot":"","sources":["../../src/member/valuation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"valuation.js","sourceRoot":"","sources":["../../src/member/valuation.ts"],"names":[],"mappings":"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"}
package/dist/post.d.ts CHANGED
@@ -26,23 +26,19 @@ export interface PostIdentity {
26
26
  readonly taxYear: TaxYear;
27
27
  /**
28
28
  * The year the SALARY was published in, where that differs from
29
- * {@link PostIdentity.taxYear}. Defaults to `taxYear`.
29
+ * {@link PostIdentity.taxYear}.
30
30
  *
31
31
  * The two are the same whenever a nation's pay round lands inside
32
- * its own year, which is why one field carried both for so long.
33
- * They separate the moment a round runs late: Northern Ireland's
34
- * staff are paid 2025-26 salaries during the 2026-27 tax year, and
35
- * they contribute at the 2026-27 tier because contribution tiers
36
- * are set by the SCHEME year, not by which round their salary came
37
- * from. Collapsing the two overstated the deduction on four of
38
- * Northern Ireland's pay points, the largest by 1.8 points of
39
- * salary.
32
+ * its own year. They separate the moment a round runs late: Northern
33
+ * Ireland's staff are paid 2025-26 salaries during the 2026-27 tax
34
+ * year, and they contribute at the 2026-27 tier because contribution
35
+ * tiers are set by the SCHEME year, not by which round their salary
36
+ * came from. Read as one, the deduction would be overstated on four of
37
+ * Northern Ireland's pay points, the largest by 1.8 points of salary.
40
38
  *
41
- * REQUIRED. It was optional, falling back to `taxYear`, which
42
- * meant `post.payYear` could quietly answer with the tax year and
43
- * the two bases met again inside the accessor that exists to keep
44
- * them apart. Every construction path already knows both, so the
45
- * option bought nothing but a place for them to recombine.
39
+ * REQUIRED: a fallback to `taxYear` would let `post.payYear` quietly
40
+ * answer with the tax year, joining the two bases inside the accessor
41
+ * that exists to keep them apart. Every construction path knows both.
46
42
  */
47
43
  readonly payYear: PayYear;
48
44
  }
@@ -123,13 +119,12 @@ export declare class Post {
123
119
  /**
124
120
  * The year whose tax, NI and pension tiers apply.
125
121
  *
126
- * REQUIRED, and ahead of `role` for that reason. It defaulted to
127
- * the pay year once, and that default is the whole defect: a
128
- * caller who simply did not think about it got the salary's own
129
- * year, which priced a Northern Irish reader's 2025-26 pay at
130
- * 2025-26 deductions in the 2026-27 tax year. A default that is
131
- * right most of the time is worse than no default, because the
132
- * times it is wrong are exactly the times nobody is looking.
122
+ * REQUIRED, and ahead of `role` for that reason: a default to the
123
+ * pay year would give a caller who did not think about it the
124
+ * salary's own year, pricing a Northern Irish reader's 2025-26 pay
125
+ * at 2025-26 deductions in the 2026-27 tax year. A default that is
126
+ * right most of the time is worse than none, because the times it
127
+ * is wrong are exactly the times nobody is looking.
133
128
  */
134
129
  taxYear: TaxYear, role?: Role): Post;
135
130
  /**
@@ -182,18 +177,13 @@ export declare class Post {
182
177
  * transcribed it".
183
178
  */
184
179
  get scaleSource(): DocumentSource | undefined;
180
+ /** The year this post's SALARY was published in. */
181
+ get payYear(): PayYear;
185
182
  /**
186
183
  * Member contribution rate (%). The tier's single rate applies to
187
184
  * the WHOLE of {@link Post.pensionablePay} (a slab/cliff-edge rate,
188
185
  * not a marginal band); 0 when opted out.
189
186
  */
190
- /**
191
- * The year this post's SALARY was published in.
192
- *
193
- * Falls back to the tax year, which is right for every post whose
194
- * pay round landed inside its own year.
195
- */
196
- get payYear(): PayYear;
197
187
  get pensionRate(): number;
198
188
  /**
199
189
  * Annual member pension contribution (£) — read from the
@@ -209,7 +199,10 @@ export declare class Post {
209
199
  /**
210
200
  * The pension annual allowance this post's year meets, with the
211
201
  * scheme's defined-benefit pension input: read it here, not off
212
- * `takeHome`, whose own allowance has no scheme input.
202
+ * `takeHome`, whose own allowance has no scheme input. The input is
203
+ * this year's accrual alone (`nhsAnnualAllowance`): a post knows no
204
+ * member history, so revaluation of pension already built up is not
205
+ * counted.
213
206
  */
214
207
  get annualAllowance(): AnnualAllowance;
215
208
  /** Annual income tax (£). */
package/dist/post.js CHANGED
@@ -78,13 +78,12 @@ export class Post {
78
78
  /**
79
79
  * The year whose tax, NI and pension tiers apply.
80
80
  *
81
- * REQUIRED, and ahead of `role` for that reason. It defaulted to
82
- * the pay year once, and that default is the whole defect: a
83
- * caller who simply did not think about it got the salary's own
84
- * year, which priced a Northern Irish reader's 2025-26 pay at
85
- * 2025-26 deductions in the 2026-27 tax year. A default that is
86
- * right most of the time is worse than no default, because the
87
- * times it is wrong are exactly the times nobody is looking.
81
+ * REQUIRED, and ahead of `role` for that reason: a default to the
82
+ * pay year would give a caller who did not think about it the
83
+ * salary's own year, pricing a Northern Irish reader's 2025-26 pay
84
+ * at 2025-26 deductions in the 2026-27 tax year. A default that is
85
+ * right most of the time is worse than none, because the times it
86
+ * is wrong are exactly the times nobody is looking.
88
87
  */
89
88
  taxYear, role = { kind: 'vsm' }) {
90
89
  return new Post({ nation, taxYear, payYear: year }, salary, role);
@@ -167,20 +166,15 @@ export class Post {
167
166
  return undefined;
168
167
  }
169
168
  }
169
+ /** The year this post's SALARY was published in. */
170
+ get payYear() {
171
+ return this.identity.payYear;
172
+ }
170
173
  /**
171
174
  * Member contribution rate (%). The tier's single rate applies to
172
175
  * the WHOLE of {@link Post.pensionablePay} (a slab/cliff-edge rate,
173
176
  * not a marginal band); 0 when opted out.
174
177
  */
175
- /**
176
- * The year this post's SALARY was published in.
177
- *
178
- * Falls back to the tax year, which is right for every post whose
179
- * pay round landed inside its own year.
180
- */
181
- get payYear() {
182
- return this.identity.payYear;
183
- }
184
178
  get pensionRate() {
185
179
  if (this.adjustments.pensionOptedOut) {
186
180
  return 0;
@@ -210,7 +204,10 @@ export class Post {
210
204
  /**
211
205
  * The pension annual allowance this post's year meets, with the
212
206
  * scheme's defined-benefit pension input: read it here, not off
213
- * `takeHome`, whose own allowance has no scheme input.
207
+ * `takeHome`, whose own allowance has no scheme input. The input is
208
+ * this year's accrual alone (`nhsAnnualAllowance`): a post knows no
209
+ * member history, so revaluation of pension already built up is not
210
+ * counted.
214
211
  */
215
212
  get annualAllowance() {
216
213
  return nhsAnnualAllowance(this.pensionablePay, this._pensionFraction, this.identity.taxYear, nationToTaxRegion(this.identity.nation));
package/dist/post.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"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"}
@@ -73,6 +73,7 @@ interface FinalSalaryBenefit {
73
73
  readonly beforeFactor: ProjectionMoney;
74
74
  readonly pension: ProjectionMoney;
75
75
  readonly automaticLumpSum: ProjectionMoney;
76
+ readonly automaticLumpSumBeforeFactor: ProjectionMoney;
76
77
  readonly factor: FactorOutcome;
77
78
  readonly membership: number;
78
79
  readonly finalPay: number;
@@ -91,6 +91,7 @@ export function finalSalaryBenefit(rules, { windows, payPath, dateOfBirth, leavi
91
91
  beforeFactor: money(unreduced),
92
92
  pension: money(unreduced * factor.factor),
93
93
  automaticLumpSum: money(lumpSum),
94
+ automaticLumpSumBeforeFactor: money(unreducedLump),
94
95
  factor,
95
96
  membership,
96
97
  finalPay: pay,
@@ -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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"}
@@ -48,12 +48,18 @@ export interface NhsTakeHomeOptions {
48
48
  */
49
49
  export declare function nhsTakeHome(salary: number, pensionRate: number, taxYear: TaxYear, taxRegion: TaxRegion, options?: NhsTakeHomeOptions): TakeHomePay;
50
50
  /**
51
- * The pension annual allowance an NHS member's year meets. The scheme
52
- * is defined benefit, so the pension input is the growth in CARE
53
- * benefits (paye-calc's DB multiple of the year's accrual), not the
54
- * contribution paid;
55
- * without it adjusted income omits the scheme and the taper never
56
- * bites for high earners. An opted-out member (rate 0) has no input.
51
+ * The pension annual allowance an NHS member's year meets, estimated from
52
+ * this year's 2015 Section accrual alone. The scheme is defined benefit,
53
+ * so the pension input is paye-calc's DB multiple of the year's accrual,
54
+ * not the contribution paid; without it adjusted income omits the scheme
55
+ * and the taper never bites for high earners. An opted-out member (rate
56
+ * 0) has no input.
57
+ *
58
+ * It takes no member history, so the input is a floor for anyone with
59
+ * pension already built up: that pension's revaluation beyond the CPI
60
+ * uplift, and any legacy section's growth, are inputs too, and are not
61
+ * counted here.
62
+ *
57
63
  * Source: HMRC PTM053301 (DB pension input amount), the citation
58
64
  * paye-calc's `DB_PENSION_INPUT_MULTIPLIER` carries.
59
65
  */
package/dist/take-home.js CHANGED
@@ -79,12 +79,18 @@ export function nhsTakeHome(salary, pensionRate, taxYear, taxRegion, options = {
79
79
  return thp;
80
80
  }
81
81
  /**
82
- * The pension annual allowance an NHS member's year meets. The scheme
83
- * is defined benefit, so the pension input is the growth in CARE
84
- * benefits (paye-calc's DB multiple of the year's accrual), not the
85
- * contribution paid;
86
- * without it adjusted income omits the scheme and the taper never
87
- * bites for high earners. An opted-out member (rate 0) has no input.
82
+ * The pension annual allowance an NHS member's year meets, estimated from
83
+ * this year's 2015 Section accrual alone. The scheme is defined benefit,
84
+ * so the pension input is paye-calc's DB multiple of the year's accrual,
85
+ * not the contribution paid; without it adjusted income omits the scheme
86
+ * and the taper never bites for high earners. An opted-out member (rate
87
+ * 0) has no input.
88
+ *
89
+ * It takes no member history, so the input is a floor for anyone with
90
+ * pension already built up: that pension's revaluation beyond the CPI
91
+ * uplift, and any legacy section's growth, are inputs too, and are not
92
+ * counted here.
93
+ *
88
94
  * Source: HMRC PTM053301 (DB pension input amount), the citation
89
95
  * paye-calc's `DB_PENSION_INPUT_MULTIPLIER` carries.
90
96
  */
@@ -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;AAQ9B,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,qEAAqE;AACrE,MAAM,QAAQ,GAAG,GAAG,CAAC;AAerB;;;;;;;;;;;;GAYG;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;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,WAAmB,EACnB,OAAgB,EAChB,SAAoB;IAEpB,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;IACjC,OAAO,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,eAAe,CACzE,QAAQ,CAAC,CAAC,CAAC,EAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CACzD,CAAC;AACJ,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;AAQ9B,OAAO,EAAC,aAAa,EAAC,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,qEAAqE;AACrE,MAAM,QAAQ,GAAG,GAAG,CAAC;AAerB;;;;;;;;;;;;GAYG;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;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,WAAmB,EACnB,OAAgB,EAChB,SAAoB;IAEpB,MAAM,QAAQ,GAAG,WAAW,GAAG,CAAC,CAAC;IACjC,OAAO,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,eAAe,CACzE,QAAQ,CAAC,CAAC,CAAC,EAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,CACzD,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@casomoltd/nhs-pay",
3
- "version": "0.28.0",
3
+ "version": "0.29.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",