@casomoltd/nhs-pay 0.32.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.
- package/README.md +23 -21
- package/dist/afc-scales.d.ts +43 -10
- package/dist/afc-scales.js +50 -16
- package/dist/afc-scales.js.map +1 -1
- package/dist/allowances.js +11 -11
- package/dist/allowances.js.map +1 -1
- package/dist/award.d.ts +3 -3
- package/dist/award.js +21 -21
- package/dist/award.js.map +1 -1
- package/dist/circulars/england-md-1-2026-r2.d.ts +13 -0
- package/dist/circulars/england-md-1-2026-r2.js +13 -0
- package/dist/circulars/england-md-1-2026-r2.js.map +1 -1
- package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +22 -0
- package/dist/circulars/ni-hsc-tc8-05-2025.js +22 -0
- package/dist/circulars/ni-hsc-tc8-05-2025.js.map +1 -1
- package/dist/circulars/scotland-pcs-dd-2025-01.d.ts +20 -0
- package/dist/circulars/scotland-pcs-dd-2025-01.js +20 -0
- package/dist/circulars/scotland-pcs-dd-2025-01.js.map +1 -1
- package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +19 -0
- package/dist/circulars/scotland-pcs-dd-2026-01.js +30 -10
- package/dist/circulars/scotland-pcs-dd-2026-01.js.map +1 -1
- package/dist/circulars/scotland-pcs-dd-2026-02.d.ts +10 -0
- package/dist/circulars/scotland-pcs-dd-2026-02.js +10 -0
- package/dist/circulars/scotland-pcs-dd-2026-02.js.map +1 -1
- package/dist/circulars/wales-mdw-01-2025.d.ts +17 -0
- package/dist/circulars/wales-mdw-01-2025.js +17 -0
- package/dist/circulars/wales-mdw-01-2025.js.map +1 -1
- package/dist/circulars/wales-mdw-01-2026.d.ts +20 -0
- package/dist/circulars/wales-mdw-01-2026.js +20 -0
- package/dist/circulars/wales-mdw-01-2026.js.map +1 -1
- package/dist/commutation.js +3 -2
- package/dist/commutation.js.map +1 -1
- package/dist/dental-grades.d.ts +25 -0
- package/dist/dental-grades.js +25 -0
- package/dist/dental-grades.js.map +1 -0
- package/dist/dental-scales.d.ts +5 -21
- package/dist/dental-scales.js +73 -72
- package/dist/dental-scales.js.map +1 -1
- package/dist/format.js +3 -2
- package/dist/format.js.map +1 -1
- package/dist/hcas-pcts.d.ts +1 -1
- package/dist/hcas-zone.d.ts +23 -0
- package/dist/hcas-zone.js +17 -0
- package/dist/hcas-zone.js.map +1 -0
- package/dist/hcas.d.ts +26 -18
- package/dist/hcas.js +45 -24
- package/dist/hcas.js.map +1 -1
- package/dist/index.d.ts +23 -14
- package/dist/index.js +13 -9
- package/dist/index.js.map +1 -1
- package/dist/medical-grades.d.ts +33 -0
- package/dist/medical-grades.js +33 -0
- package/dist/medical-grades.js.map +1 -0
- package/dist/medical-scales.d.ts +10 -33
- package/dist/medical-scales.js +104 -158
- package/dist/medical-scales.js.map +1 -1
- package/dist/member/input-period.d.ts +18 -5
- package/dist/member/input-period.js +24 -13
- package/dist/member/input-period.js.map +1 -1
- package/dist/pay-round.js +3 -3
- package/dist/pay-round.js.map +1 -1
- package/dist/pay-year.d.ts +17 -0
- package/dist/pay-year.js +20 -0
- package/dist/pay-year.js.map +1 -0
- package/dist/pension/ledger.d.ts +7 -0
- package/dist/pension/ledger.js +18 -11
- package/dist/pension/ledger.js.map +1 -1
- package/dist/pension.js +2 -1
- package/dist/pension.js.map +1 -1
- package/dist/post.d.ts +20 -21
- package/dist/post.js +54 -53
- package/dist/post.js.map +1 -1
- package/dist/published/england-afc.d.ts +29 -0
- package/dist/published/england-afc.js +142 -0
- package/dist/published/england-afc.js.map +1 -0
- package/dist/published/hcas-zones.d.ts +18 -0
- package/dist/published/hcas-zones.js +46 -0
- package/dist/published/hcas-zones.js.map +1 -0
- package/dist/published/wales-living-wage.d.ts +36 -0
- package/dist/published/wales-living-wage.js +30 -0
- package/dist/published/wales-living-wage.js.map +1 -0
- package/dist/regions.d.ts +25 -14
- package/dist/regions.js +61 -71
- package/dist/regions.js.map +1 -1
- package/dist/resolver.d.ts +46 -41
- package/dist/resolver.js +70 -142
- package/dist/resolver.js.map +1 -1
- package/dist/role.d.ts +3 -3
- package/dist/scale-point.d.ts +11 -7
- package/dist/scale-point.js +29 -1
- package/dist/scale-point.js.map +1 -1
- package/dist/scale-tables.d.ts +42 -60
- package/dist/scale-tables.js +65 -105
- package/dist/scale-tables.js.map +1 -1
- package/dist/scale-translators.d.ts +90 -0
- package/dist/scale-translators.js +97 -0
- package/dist/scale-translators.js.map +1 -0
- package/dist/scales.d.ts +138 -101
- package/dist/scales.js +221 -457
- package/dist/scales.js.map +1 -1
- package/dist/sources.d.ts +8 -12
- package/dist/sources.js +9 -15
- package/dist/sources.js.map +1 -1
- package/dist/take-home.js +1 -2
- package/dist/take-home.js.map +1 -1
- package/dist/values.d.ts +10 -3
- package/dist/values.js +11 -4
- package/dist/values.js.map +1 -1
- package/dist/working-week.d.ts +23 -8
- package/dist/working-week.js +55 -25
- package/dist/working-week.js.map +1 -1
- package/package.json +3 -3
- package/dist/bands.d.ts +0 -63
- package/dist/bands.js +0 -78
- package/dist/bands.js.map +0 -1
package/dist/pay-year.js
ADDED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A pay year's place on the scheme calendar. Every pay round, for every
|
|
3
|
+
* staff group, runs from 1 April to 31 March, the scheme year's own cycle,
|
|
4
|
+
* so each pay year is exactly one scheme year: '2025-26' is the scheme year
|
|
5
|
+
* ending 31 March 2026. The award table holds to it: every award takes
|
|
6
|
+
* effect on 1 April (`award.ts`), and `tests/pay-year.test.ts` fails the
|
|
7
|
+
* day one does not.
|
|
8
|
+
*
|
|
9
|
+
* It names no staff group, so a staff group's own module builds on it
|
|
10
|
+
* rather than the other way round. It is kept out of
|
|
11
|
+
* `pension/scheme-year.ts`, which imports nothing, because a pay year is
|
|
12
|
+
* paye-calc's type.
|
|
13
|
+
*/
|
|
14
|
+
import { closingYearOf } from '@casomoltd/paye-calc';
|
|
15
|
+
import { schemeYearEnd } from './pension/scheme-year.js';
|
|
16
|
+
/** The scheme year a pay year's round runs over: 2026 for '2025-26'. */
|
|
17
|
+
export function schemeYearOfPayYear(year) {
|
|
18
|
+
return schemeYearEnd(closingYearOf(year));
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=pay-year.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pay-year.js","sourceRoot":"","sources":["../src/pay-year.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAGvD,wEAAwE;AACxE,MAAM,UAAU,mBAAmB,CAAC,IAAa;IAC/C,OAAO,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC"}
|
package/dist/pension/ledger.d.ts
CHANGED
|
@@ -141,6 +141,13 @@ export interface MemberLedger {
|
|
|
141
141
|
* two differ by the ERF or LRF, and asking "what had they
|
|
142
142
|
* built up" must not be answered with the reduced figure. */
|
|
143
143
|
accruedAt(date: Date): number;
|
|
144
|
+
/** What `accruedAt` gives at `date`, as the scheme has applied it by
|
|
145
|
+
* then: the leaver index adjustment counts from the uplift that opens
|
|
146
|
+
* the scheme year after the leaving, on that Order's date, where
|
|
147
|
+
* `accruedAt` counts it from the last day of service. A tax year's
|
|
148
|
+
* pension input reads this one, on a ledger with no drawing
|
|
149
|
+
* (`member/input-period.ts`). */
|
|
150
|
+
appliedAt(date: Date): number;
|
|
144
151
|
/** The statement-shaped view: the years a member can lay
|
|
145
152
|
* beside the paper. */
|
|
146
153
|
earningsRows(): readonly LedgerYear[];
|
package/dist/pension/ledger.js
CHANGED
|
@@ -148,7 +148,7 @@ function rowFor(ctx) {
|
|
|
148
148
|
const monthsServed = monthsServedIn(year, req, ctx.first);
|
|
149
149
|
const earnings = earningsIn(ctx, phase, monthsServed);
|
|
150
150
|
const leaverAdjustment = leaverAdjustmentIn(ctx, monthsServed);
|
|
151
|
-
const accrued = grownBy(revalued
|
|
151
|
+
const accrued = grownBy(bankedIn({ revalued, earned: earnings.earned }), leaverAdjustment?.percent ?? 0);
|
|
152
152
|
const drawing = year === ctx.retireYear ? req.drawingFor() : null;
|
|
153
153
|
return Object.freeze({
|
|
154
154
|
schemeYearEnd: year,
|
|
@@ -227,6 +227,12 @@ function leaverAdjustmentFor(year, prices, exitDate, months) {
|
|
|
227
227
|
from: inService.from,
|
|
228
228
|
};
|
|
229
229
|
}
|
|
230
|
+
/** A year's revalued balance with its slice: what the scheme holds until
|
|
231
|
+
* it applies a leaver adjustment, and on every other row the accrued
|
|
232
|
+
* figure itself. */
|
|
233
|
+
function bankedIn({ revalued, earned }) {
|
|
234
|
+
return revalued + earned;
|
|
235
|
+
}
|
|
230
236
|
/**
|
|
231
237
|
* When a row's accrual is settled: the scheme year end, or for the
|
|
232
238
|
* row a member leaves in, the last day of service. Never before that
|
|
@@ -271,27 +277,28 @@ function readerOver(frozen, seed) {
|
|
|
271
277
|
refuseBeforeStatement(seed, date, STATEMENT_READS.balance);
|
|
272
278
|
return date < startsAt ? startsAt : date;
|
|
273
279
|
};
|
|
274
|
-
/** Replay the steps up to `date
|
|
275
|
-
*
|
|
276
|
-
* the member leaves in settles on the last day of service, not
|
|
280
|
+
/** Replay the steps up to `date`, each settled row read by `settled`.
|
|
281
|
+
* A row the member leaves in settles on the last day of service, not
|
|
277
282
|
* at its scheme year end. */
|
|
278
|
-
const walkTo = (date,
|
|
283
|
+
const walkTo = (date, settled) => {
|
|
279
284
|
let value = seed.opening;
|
|
280
285
|
for (const row of frozen) {
|
|
281
286
|
if (row.uplift !== null && row.uplift.appliedOn <= date) {
|
|
282
287
|
value = row.revalued;
|
|
283
288
|
}
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
value = preDrawing ? row.accrued : row.closing;
|
|
287
|
-
}
|
|
289
|
+
if (settlementOf(row) <= date)
|
|
290
|
+
value = settled(row);
|
|
288
291
|
}
|
|
289
292
|
return value;
|
|
290
293
|
};
|
|
291
294
|
return Object.freeze({
|
|
292
295
|
years: frozen,
|
|
293
|
-
atDate: (date) => walkTo(answerableAt(date),
|
|
294
|
-
|
|
296
|
+
atDate: (date) => walkTo(answerableAt(date), (row) => row.closing),
|
|
297
|
+
// The row carrying the retirement event, at its pre-factor value.
|
|
298
|
+
accruedAt: (date) => walkTo(answerableAt(date), (row) => row.accrued),
|
|
299
|
+
// The row the member leaves in, before its leaver adjustment: the next
|
|
300
|
+
// row opens on the adjusted balance, so its uplift brings it in.
|
|
301
|
+
appliedAt: (date) => walkTo(answerableAt(date), bankedIn),
|
|
295
302
|
closingAt(schemeYearEnd) {
|
|
296
303
|
if (schemeYearEnd <= seed.atSchemeYearEnd) {
|
|
297
304
|
refuseBeforeStatement(seed, schemeYearEndDate(schemeYearEnd), STATEMENT_READS.yearClose);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/pension/ledger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EACL,eAAe,EAAE,SAAS,EAAE,iBAAiB,EAAE,eAAe,GAC/D,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAO1E,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAE5C,OAAO,EACL,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,UAAU,GACrD,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EACtE,mBAAmB,GACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/pension/ledger.ts"],"names":[],"mappings":"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"}
|
package/dist/pension.js
CHANGED
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
* own `EmployerPensionRate.source` per nation.
|
|
11
11
|
*/
|
|
12
12
|
import { NATION_KEYS, TAX_YEARS, taxYear, } from '@casomoltd/paye-calc';
|
|
13
|
+
import { PER_CENT } from './values.js';
|
|
13
14
|
import { PensionTiersUnavailable } from './errors.js';
|
|
14
15
|
// England and Wales share the NHSBSA-administered scheme, so they
|
|
15
16
|
// share one rate; Scotland (SPPA) and NI (HSC) run their own.
|
|
@@ -64,7 +65,7 @@ export class PensionTiers {
|
|
|
64
65
|
/** Contribution rate (%) for a salary; 0 if unbanded. */
|
|
65
66
|
rateFor(salary) {
|
|
66
67
|
const match = this.tierFor(salary);
|
|
67
|
-
return match ? match.band.rate *
|
|
68
|
+
return match ? match.band.rate * PER_CENT : 0;
|
|
68
69
|
}
|
|
69
70
|
/**
|
|
70
71
|
* Matching tier (1-based) and band for a salary, or
|
package/dist/pension.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pension.js","sourceRoot":"","sources":["../src/pension.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,EACL,WAAW,EAAE,SAAS,EAAE,OAAO,GAChC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAC,uBAAuB,EAAC,MAAM,aAAa,CAAC;AAiCpD,kEAAkE;AAClE,8DAA8D;AAC9D,4DAA4D;AAC5D,iEAAiE;AACjE,gEAAgE;AAChE,8DAA8D;AAC9D,6DAA6D;AAC7D,MAAM,oBAAoB,GAAwB;IAChD,IAAI,EAAE,KAAK;IACX,SAAS,EAAE,MAAM;IACjB,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;IAC1C,aAAa,EAAE,QAAQ;IACvB,MAAM,EACJ,iFAAiF;CACpF,CAAC;AAEF,MAAM,sBAAsB,GAGxB;IACF,OAAO,EAAE,oBAAoB;IAC7B,KAAK,EAAE,oBAAoB;IAC3B,QAAQ,EAAE;QACR,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC1C,aAAa,EAAE,MAAM;QACrB,MAAM,EACJ,gEAAgE;KACnE;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,KAAK;QACX,SAAS,EAAE,CAAC;QACZ,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC;QAC1C,aAAa,EAAE,qBAAqB;QACpC,wDAAwD;QACxD,2DAA2D;QAC3D,sDAAsD;QACtD,MAAM,EACJ,4GAA4G;KAC/G;CACF,CAAC;AAEF,+DAA+D;AAC/D,MAAM,UAAU,sBAAsB,CACpC,MAAc;IAEd,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,YAAY;IAEJ;IADnB,YACmB,KAA6B;QAA7B,UAAK,GAAL,KAAK,CAAwB;IAC7C,CAAC;IAEJ,yDAAyD;IACzD,OAAO,CAAC,MAAc;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"pension.js","sourceRoot":"","sources":["../src/pension.ts"],"names":[],"mappings":"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"}
|
package/dist/post.d.ts
CHANGED
|
@@ -22,6 +22,12 @@ export interface PostIdentity {
|
|
|
22
22
|
*
|
|
23
23
|
* The year the money is PAID IN, which is not always the year the
|
|
24
24
|
* salary was published in — see {@link PostIdentity.payYear}.
|
|
25
|
+
*
|
|
26
|
+
* REQUIRED everywhere a Post is built, and never defaulted to the pay
|
|
27
|
+
* year (the house rule: no silent default for a domain-selecting
|
|
28
|
+
* input). A nation whose round runs late pays last year's salary under
|
|
29
|
+
* this year's deductions, so a default would price a Northern Irish
|
|
30
|
+
* reader's 2025-26 pay at 2025-26 deductions in the 2026-27 tax year.
|
|
25
31
|
*/
|
|
26
32
|
readonly taxYear: TaxYear;
|
|
27
33
|
/**
|
|
@@ -103,30 +109,20 @@ export declare class Post {
|
|
|
103
109
|
readonly adjustments: PostAdjustments;
|
|
104
110
|
private constructor();
|
|
105
111
|
/**
|
|
106
|
-
* Build a Post from a gross salary — whatever the member
|
|
107
|
-
*
|
|
108
|
-
*
|
|
109
|
-
*
|
|
110
|
-
*
|
|
111
|
-
* A bare salary is a `vsm` role (an off-scale post); a
|
|
112
|
-
* scale-point resolver passes the scale identity instead.
|
|
113
|
-
* Personal circumstances are added afterwards with
|
|
112
|
+
* Build a Post from a gross salary — whatever the member is actually
|
|
113
|
+
* paid, already adjusted for HCAS by the resolver — and the scale
|
|
114
|
+
* position it came from. `salary` is the fundamental input; everything
|
|
115
|
+
* else is derived. Personal circumstances are added afterwards with
|
|
114
116
|
* {@link Post.withAdjustments}.
|
|
115
|
-
*/
|
|
116
|
-
static fromSalary(salary: number, nation: Nation,
|
|
117
|
-
/** The year whose SCALE this salary was published on. */
|
|
118
|
-
year: PayYear,
|
|
119
|
-
/**
|
|
120
|
-
* The year whose tax, NI and pension tiers apply.
|
|
121
117
|
*
|
|
122
|
-
*
|
|
123
|
-
*
|
|
124
|
-
*
|
|
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.
|
|
118
|
+
* `role` is required: it decides which award and source the Post
|
|
119
|
+
* reports, so leaving it out must not quietly make a post off-scale.
|
|
120
|
+
* {@link Post.offScale} is the named way to build one.
|
|
128
121
|
*/
|
|
129
|
-
|
|
122
|
+
static fromSalary(salary: number, identity: PostIdentity, role: Role): Post;
|
|
123
|
+
/** An off-scale Post (a `vsm` role): a bare salary with no published
|
|
124
|
+
* scale, award or source. */
|
|
125
|
+
static offScale(this: void, salary: number, identity: PostIdentity): Post;
|
|
130
126
|
/**
|
|
131
127
|
* Pensionable pay: the pay the NHS pension contribution rate/tier
|
|
132
128
|
* are worked out on. Here = the FTE-pro-rated scale salary less any
|
|
@@ -142,6 +138,9 @@ export declare class Post {
|
|
|
142
138
|
* cost of being in the Scheme" — see docs/source-archive.md.
|
|
143
139
|
*/
|
|
144
140
|
get pensionablePay(): number;
|
|
141
|
+
/** The salary for the member's hours (FTE-scaled), before any salary
|
|
142
|
+
* sacrifice. */
|
|
143
|
+
get proRataSalary(): number;
|
|
145
144
|
/**
|
|
146
145
|
* The award covering this post, or `undefined` where its nation has
|
|
147
146
|
* announced none for the post's year. Takes no argument: a Post
|
package/dist/post.js
CHANGED
|
@@ -15,31 +15,11 @@ import { getPensionTiersVO } from './pension.js';
|
|
|
15
15
|
import { nhsTakeHome } from './take-home.js';
|
|
16
16
|
import { awardsFor } from './award.js';
|
|
17
17
|
import { afcScaleSource } from './scales.js';
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
* AfC branch gets from `afcScaleSource`. */
|
|
24
|
-
function gradeSource(metas, grade, identity) {
|
|
25
|
-
const meta = metas.find((m) => m.grade === grade);
|
|
26
|
-
if (!meta) {
|
|
27
|
-
throw new ScaleUnavailable(identity.nation, identity.payYear, grade);
|
|
28
|
-
}
|
|
29
|
-
return meta.source;
|
|
30
|
-
}
|
|
31
|
-
/** The scale id a role names, or `undefined` for an off-scale post. */
|
|
32
|
-
function scaleOf(role) {
|
|
33
|
-
switch (role.kind) {
|
|
34
|
-
case 'afc':
|
|
35
|
-
return role.band;
|
|
36
|
-
case 'medical':
|
|
37
|
-
case 'dental':
|
|
38
|
-
return role.grade;
|
|
39
|
-
case 'vsm':
|
|
40
|
-
return undefined;
|
|
41
|
-
}
|
|
42
|
-
}
|
|
18
|
+
import { MEDICAL_FAMILY } from './medical-scales.js';
|
|
19
|
+
import { DENTAL_FAMILY } from './dental-scales.js';
|
|
20
|
+
import { PER_CENT } from './values.js';
|
|
21
|
+
import { afcRegionToNation } from './regions.js';
|
|
22
|
+
import { invariant } from './errors.js';
|
|
43
23
|
/** The identity adjustments: full-time, no sacrifice/loans/override, in-scheme. */
|
|
44
24
|
export const NO_ADJUSTMENTS = {
|
|
45
25
|
fte: 1,
|
|
@@ -48,8 +28,6 @@ export const NO_ADJUSTMENTS = {
|
|
|
48
28
|
taxCode: null,
|
|
49
29
|
pensionOptedOut: false,
|
|
50
30
|
};
|
|
51
|
-
/** `pensionRate` is per cent. */
|
|
52
|
-
const PER_CENT = 100;
|
|
53
31
|
export class Post {
|
|
54
32
|
identity;
|
|
55
33
|
salary;
|
|
@@ -62,31 +40,25 @@ export class Post {
|
|
|
62
40
|
this.adjustments = adjustments;
|
|
63
41
|
}
|
|
64
42
|
/**
|
|
65
|
-
* Build a Post from a gross salary — whatever the member
|
|
66
|
-
*
|
|
67
|
-
*
|
|
68
|
-
*
|
|
69
|
-
*
|
|
70
|
-
* A bare salary is a `vsm` role (an off-scale post); a
|
|
71
|
-
* scale-point resolver passes the scale identity instead.
|
|
72
|
-
* Personal circumstances are added afterwards with
|
|
43
|
+
* Build a Post from a gross salary — whatever the member is actually
|
|
44
|
+
* paid, already adjusted for HCAS by the resolver — and the scale
|
|
45
|
+
* position it came from. `salary` is the fundamental input; everything
|
|
46
|
+
* else is derived. Personal circumstances are added afterwards with
|
|
73
47
|
* {@link Post.withAdjustments}.
|
|
74
|
-
*/
|
|
75
|
-
static fromSalary(salary, nation,
|
|
76
|
-
/** The year whose SCALE this salary was published on. */
|
|
77
|
-
year,
|
|
78
|
-
/**
|
|
79
|
-
* The year whose tax, NI and pension tiers apply.
|
|
80
48
|
*
|
|
81
|
-
*
|
|
82
|
-
*
|
|
83
|
-
*
|
|
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.
|
|
49
|
+
* `role` is required: it decides which award and source the Post
|
|
50
|
+
* reports, so leaving it out must not quietly make a post off-scale.
|
|
51
|
+
* {@link Post.offScale} is the named way to build one.
|
|
87
52
|
*/
|
|
88
|
-
|
|
89
|
-
|
|
53
|
+
static fromSalary(salary, identity, role) {
|
|
54
|
+
const roleNation = nationOf(role);
|
|
55
|
+
invariant(roleNation === undefined || roleNation === identity.nation, `Post.fromSalary: a ${roleNation} role for a post in ${identity.nation}`);
|
|
56
|
+
return new Post(identity, salary, role);
|
|
57
|
+
}
|
|
58
|
+
/** An off-scale Post (a `vsm` role): a bare salary with no published
|
|
59
|
+
* scale, award or source. */
|
|
60
|
+
static offScale(salary, identity) {
|
|
61
|
+
return new Post(identity, salary, { kind: 'vsm' });
|
|
90
62
|
}
|
|
91
63
|
/**
|
|
92
64
|
* Pensionable pay: the pay the NHS pension contribution rate/tier
|
|
@@ -103,8 +75,12 @@ export class Post {
|
|
|
103
75
|
* cost of being in the Scheme" — see docs/source-archive.md.
|
|
104
76
|
*/
|
|
105
77
|
get pensionablePay() {
|
|
106
|
-
|
|
107
|
-
|
|
78
|
+
return Math.max(0, this.proRataSalary - this.adjustments.salarySacrifice);
|
|
79
|
+
}
|
|
80
|
+
/** The salary for the member's hours (FTE-scaled), before any salary
|
|
81
|
+
* sacrifice. */
|
|
82
|
+
get proRataSalary() {
|
|
83
|
+
return Math.round(this.salary * this.adjustments.fte);
|
|
108
84
|
}
|
|
109
85
|
/**
|
|
110
86
|
* The award covering this post, or `undefined` where its nation has
|
|
@@ -156,9 +132,9 @@ export class Post {
|
|
|
156
132
|
case 'afc':
|
|
157
133
|
return afcScaleSource(this.payYear, this.identity.nation);
|
|
158
134
|
case 'medical':
|
|
159
|
-
return
|
|
135
|
+
return MEDICAL_FAMILY.sourceFor(role.grade, this.payYear, this.identity.nation);
|
|
160
136
|
case 'dental':
|
|
161
|
-
return
|
|
137
|
+
return DENTAL_FAMILY.sourceFor(role.grade, this.payYear, this.identity.nation);
|
|
162
138
|
// Listed rather than defaulted: an off-scale post genuinely has
|
|
163
139
|
// no publishing circular, and spelling it out means a new role
|
|
164
140
|
// kind fails the build here instead of silently citing nothing.
|
|
@@ -225,4 +201,29 @@ export class Post {
|
|
|
225
201
|
});
|
|
226
202
|
}
|
|
227
203
|
}
|
|
204
|
+
/** The scale id a role names, or `undefined` for an off-scale post. */
|
|
205
|
+
function scaleOf(role) {
|
|
206
|
+
switch (role.kind) {
|
|
207
|
+
case 'afc':
|
|
208
|
+
return role.band;
|
|
209
|
+
case 'medical':
|
|
210
|
+
case 'dental':
|
|
211
|
+
return role.grade;
|
|
212
|
+
case 'vsm':
|
|
213
|
+
return undefined;
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
/** The nation a role is priced in, or `undefined` for an off-scale post,
|
|
217
|
+
* which carries none of its own. */
|
|
218
|
+
function nationOf(role) {
|
|
219
|
+
switch (role.kind) {
|
|
220
|
+
case 'afc':
|
|
221
|
+
return afcRegionToNation(role.region);
|
|
222
|
+
case 'medical':
|
|
223
|
+
case 'dental':
|
|
224
|
+
return role.nation;
|
|
225
|
+
case 'vsm':
|
|
226
|
+
return undefined;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
228
229
|
//# sourceMappingURL=post.js.map
|
package/dist/post.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AASvD,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,YAAY,CAAC;AAErC,OAAO,EAAC,cAAc,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"post.js","sourceRoot":"","sources":["../src/post.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* England's Agenda for Change pay scales, as NHS Employers publishes them.
|
|
3
|
+
*
|
|
4
|
+
* England issues no AfC pay circular, only an NHS Employers web page and a
|
|
5
|
+
* poster, so the tables are transcribed here from the page, cited and
|
|
6
|
+
* pinned to `tests/fixtures/pay-scales.csv`, as the README's AfC pay scales
|
|
7
|
+
* rule for a web table says.
|
|
8
|
+
*
|
|
9
|
+
* Sources, by the names they carry in docs/source-archive.md, which holds
|
|
10
|
+
* every publisher URL and archived copy:
|
|
11
|
+
* - "NHS Employers — AfC pay scales 2025/26" (#sa-25)
|
|
12
|
+
* - "NHS Employers — AfC pay scales 2026/27" (#sa-26; its hourly table has printing
|
|
13
|
+
* errors; these tables read the ANNUAL column, so they cannot reach us —
|
|
14
|
+
* see the manifest)
|
|
15
|
+
* - "NHS Employers, 2026 AfC pay scales poster" (#sa-16) — the same award rendered a
|
|
16
|
+
* second time by the same publisher, which confirms the annual column is
|
|
17
|
+
* untouched by those errors
|
|
18
|
+
* - "Health Careers — AfC pay rates" (#sa-27)
|
|
19
|
+
*
|
|
20
|
+
* Each point is written through `afcPoint` as the year of service in which
|
|
21
|
+
* a member first reaches it, England's labels being authored as years (see
|
|
22
|
+
* `scales.ts` on point labels).
|
|
23
|
+
*/
|
|
24
|
+
import type { AfcBandId } from '../afc-band.js';
|
|
25
|
+
import type { SteppedPoint } from '../scale-point.js';
|
|
26
|
+
/** England's AfC ladder from 1 April 2025. */
|
|
27
|
+
export declare const ENGLAND_AFC_2025_26: Record<AfcBandId, SteppedPoint[]>;
|
|
28
|
+
/** England's AfC ladder from 1 April 2026. */
|
|
29
|
+
export declare const ENGLAND_AFC_2026_27: Record<AfcBandId, SteppedPoint[]>;
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* England's Agenda for Change pay scales, as NHS Employers publishes them.
|
|
3
|
+
*
|
|
4
|
+
* England issues no AfC pay circular, only an NHS Employers web page and a
|
|
5
|
+
* poster, so the tables are transcribed here from the page, cited and
|
|
6
|
+
* pinned to `tests/fixtures/pay-scales.csv`, as the README's AfC pay scales
|
|
7
|
+
* rule for a web table says.
|
|
8
|
+
*
|
|
9
|
+
* Sources, by the names they carry in docs/source-archive.md, which holds
|
|
10
|
+
* every publisher URL and archived copy:
|
|
11
|
+
* - "NHS Employers — AfC pay scales 2025/26" (#sa-25)
|
|
12
|
+
* - "NHS Employers — AfC pay scales 2026/27" (#sa-26; its hourly table has printing
|
|
13
|
+
* errors; these tables read the ANNUAL column, so they cannot reach us —
|
|
14
|
+
* see the manifest)
|
|
15
|
+
* - "NHS Employers, 2026 AfC pay scales poster" (#sa-16) — the same award rendered a
|
|
16
|
+
* second time by the same publisher, which confirms the annual column is
|
|
17
|
+
* untouched by those errors
|
|
18
|
+
* - "Health Careers — AfC pay rates" (#sa-27)
|
|
19
|
+
*
|
|
20
|
+
* Each point is written through `afcPoint` as the year of service in which
|
|
21
|
+
* a member first reaches it, England's labels being authored as years (see
|
|
22
|
+
* `scales.ts` on point labels).
|
|
23
|
+
*/
|
|
24
|
+
import { afcPoint } from '../afc-scales.js';
|
|
25
|
+
/** England's AfC ladder from 1 April 2025. */
|
|
26
|
+
export const ENGLAND_AFC_2025_26 = {
|
|
27
|
+
// Two points, both 24465. The publisher prints Band 2 with an
|
|
28
|
+
// entry point, a 2-year progression interval and a top point,
|
|
29
|
+
// and the wage floor has compressed the two to the same cash
|
|
30
|
+
// figure — so the structure is published and the equality is
|
|
31
|
+
// the fact, not a reason to collapse it. Wales's Band 2 is the
|
|
32
|
+
// same shape and is modelled the same way.
|
|
33
|
+
'2': [
|
|
34
|
+
afcPoint(1, false, 24465),
|
|
35
|
+
afcPoint(3, true, 24465),
|
|
36
|
+
],
|
|
37
|
+
'3': [
|
|
38
|
+
afcPoint(1, false, 24937),
|
|
39
|
+
afcPoint(3, true, 26598),
|
|
40
|
+
],
|
|
41
|
+
'4': [
|
|
42
|
+
afcPoint(1, false, 27485),
|
|
43
|
+
afcPoint(4, true, 30162),
|
|
44
|
+
],
|
|
45
|
+
'5': [
|
|
46
|
+
afcPoint(1, false, 31049),
|
|
47
|
+
afcPoint(3, false, 33487),
|
|
48
|
+
afcPoint(5, true, 37796),
|
|
49
|
+
],
|
|
50
|
+
'6': [
|
|
51
|
+
afcPoint(1, false, 38682),
|
|
52
|
+
afcPoint(3, false, 40823),
|
|
53
|
+
afcPoint(6, true, 46580),
|
|
54
|
+
],
|
|
55
|
+
'7': [
|
|
56
|
+
afcPoint(1, false, 47810),
|
|
57
|
+
afcPoint(3, false, 50273),
|
|
58
|
+
afcPoint(6, true, 54710),
|
|
59
|
+
],
|
|
60
|
+
'8a': [
|
|
61
|
+
afcPoint(1, false, 55690),
|
|
62
|
+
afcPoint(3, false, 58487),
|
|
63
|
+
afcPoint(6, true, 62682),
|
|
64
|
+
],
|
|
65
|
+
'8b': [
|
|
66
|
+
afcPoint(1, false, 64455),
|
|
67
|
+
afcPoint(3, false, 68631),
|
|
68
|
+
afcPoint(6, true, 74896),
|
|
69
|
+
],
|
|
70
|
+
'8c': [
|
|
71
|
+
afcPoint(1, false, 76965),
|
|
72
|
+
afcPoint(3, false, 81652),
|
|
73
|
+
afcPoint(6, true, 88682),
|
|
74
|
+
],
|
|
75
|
+
'8d': [
|
|
76
|
+
afcPoint(1, false, 91342),
|
|
77
|
+
afcPoint(3, false, 96941),
|
|
78
|
+
afcPoint(6, true, 105337),
|
|
79
|
+
],
|
|
80
|
+
'9': [
|
|
81
|
+
afcPoint(1, false, 109179),
|
|
82
|
+
afcPoint(3, false, 115763),
|
|
83
|
+
afcPoint(6, true, 125637),
|
|
84
|
+
],
|
|
85
|
+
};
|
|
86
|
+
/** England's AfC ladder from 1 April 2026. */
|
|
87
|
+
export const ENGLAND_AFC_2026_27 = {
|
|
88
|
+
// Two points, both 25272: the same published shape as 2025-26's.
|
|
89
|
+
'2': [
|
|
90
|
+
afcPoint(1, false, 25272),
|
|
91
|
+
afcPoint(3, true, 25272),
|
|
92
|
+
],
|
|
93
|
+
'3': [
|
|
94
|
+
afcPoint(1, false, 25760),
|
|
95
|
+
afcPoint(3, true, 27476),
|
|
96
|
+
],
|
|
97
|
+
'4': [
|
|
98
|
+
afcPoint(1, false, 28392),
|
|
99
|
+
afcPoint(4, true, 31157),
|
|
100
|
+
],
|
|
101
|
+
'5': [
|
|
102
|
+
afcPoint(1, false, 32073),
|
|
103
|
+
afcPoint(3, false, 34592),
|
|
104
|
+
afcPoint(5, true, 39043),
|
|
105
|
+
],
|
|
106
|
+
'6': [
|
|
107
|
+
afcPoint(1, false, 39959),
|
|
108
|
+
afcPoint(3, false, 42170),
|
|
109
|
+
afcPoint(6, true, 48117),
|
|
110
|
+
],
|
|
111
|
+
'7': [
|
|
112
|
+
afcPoint(1, false, 49387),
|
|
113
|
+
afcPoint(3, false, 51932),
|
|
114
|
+
afcPoint(6, true, 56515),
|
|
115
|
+
],
|
|
116
|
+
'8a': [
|
|
117
|
+
afcPoint(1, false, 57528),
|
|
118
|
+
afcPoint(3, false, 60417),
|
|
119
|
+
afcPoint(6, true, 64750),
|
|
120
|
+
],
|
|
121
|
+
'8b': [
|
|
122
|
+
afcPoint(1, false, 66582),
|
|
123
|
+
afcPoint(3, false, 70896),
|
|
124
|
+
afcPoint(6, true, 77368),
|
|
125
|
+
],
|
|
126
|
+
'8c': [
|
|
127
|
+
afcPoint(1, false, 79504),
|
|
128
|
+
afcPoint(3, false, 84346),
|
|
129
|
+
afcPoint(6, true, 91609),
|
|
130
|
+
],
|
|
131
|
+
'8d': [
|
|
132
|
+
afcPoint(1, false, 94356),
|
|
133
|
+
afcPoint(3, false, 100140),
|
|
134
|
+
afcPoint(6, true, 108814),
|
|
135
|
+
],
|
|
136
|
+
'9': [
|
|
137
|
+
afcPoint(1, false, 112782),
|
|
138
|
+
afcPoint(3, false, 119583),
|
|
139
|
+
afcPoint(6, true, 129783),
|
|
140
|
+
],
|
|
141
|
+
};
|
|
142
|
+
//# sourceMappingURL=england-afc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"england-afc.js","sourceRoot":"","sources":["../../src/published/england-afc.ts"],"names":[],"mappings":"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"}
|