@casomoltd/nhs-pay 0.33.0 → 0.35.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 +4 -4
- package/dist/additional-pension.d.ts +6 -4
- package/dist/additional-pension.js +22 -18
- package/dist/additional-pension.js.map +1 -1
- package/dist/afc-band.d.ts +4 -4
- package/dist/afc-band.js +4 -4
- package/dist/afc-scales.d.ts +67 -71
- package/dist/afc-scales.js +165 -215
- package/dist/afc-scales.js.map +1 -1
- package/dist/circulars/afc-shapes.d.ts +41 -21
- package/dist/circulars/afc-shapes.js +9 -8
- package/dist/circulars/afc-shapes.js.map +1 -1
- package/dist/circulars/ni-hsc-afc-06-2025.d.ts +4 -3
- package/dist/circulars/ni-hsc-afc-06-2025.js +4 -3
- package/dist/circulars/ni-hsc-afc-06-2025.js.map +1 -1
- package/dist/dates.d.ts +9 -5
- package/dist/dates.js.map +1 -1
- package/dist/errors.d.ts +58 -45
- package/dist/errors.js +63 -52
- package/dist/errors.js.map +1 -1
- package/dist/factor-basis.d.ts +95 -106
- package/dist/factor-basis.js +97 -108
- package/dist/factor-basis.js.map +1 -1
- package/dist/gad/additional-pension-0-703-2026-07-08.d.ts +185 -0
- package/dist/gad/additional-pension-0-703-2026-07-08.js +89 -0
- package/dist/gad/{additional-pension-0-703-2023-10-03.js.map → additional-pension-0-703-2026-07-08.js.map} +1 -1
- package/dist/gad/additional-pension-0-712-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-712-2026-07-08.js +172 -0
- package/dist/gad/additional-pension-0-712-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-0-713-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-713-2026-07-08.js +175 -0
- package/dist/gad/additional-pension-0-713-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-0-714-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-714-2026-07-08.js +178 -0
- package/dist/gad/additional-pension-0-714-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-0-715-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-715-2026-07-08.js +181 -0
- package/dist/gad/additional-pension-0-715-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-0-716-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-716-2026-07-08.js +172 -0
- package/dist/gad/additional-pension-0-716-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-0-717-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-717-2026-07-08.js +175 -0
- package/dist/gad/additional-pension-0-717-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-0-718-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-718-2026-07-08.js +178 -0
- package/dist/gad/additional-pension-0-718-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-0-719-2026-07-08.d.ts +34 -0
- package/dist/gad/additional-pension-0-719-2026-07-08.js +181 -0
- package/dist/gad/additional-pension-0-719-2026-07-08.js.map +1 -0
- package/dist/gad/additional-pension-table.d.ts +4 -11
- package/dist/gad/additional-pension-table.js.map +1 -1
- package/dist/gad/erf-0-420-2026-07-08.d.ts +51 -0
- package/dist/gad/erf-0-420-2026-07-08.js +83 -0
- package/dist/gad/erf-0-420-2026-07-08.js.map +1 -0
- package/dist/gad/erf-1-401-2026-07-08.d.ts +42 -0
- package/dist/gad/erf-1-401-2026-07-08.js +67 -0
- package/dist/gad/erf-1-401-2026-07-08.js.map +1 -0
- package/dist/gad/erf-1-402-2026-07-08.d.ts +43 -0
- package/dist/gad/erf-1-402-2026-07-08.js +78 -0
- package/dist/gad/erf-1-402-2026-07-08.js.map +1 -0
- package/dist/gad/erf-1-407-2026-07-08.d.ts +42 -0
- package/dist/gad/erf-1-407-2026-07-08.js +67 -0
- package/dist/gad/erf-1-407-2026-07-08.js.map +1 -0
- package/dist/gad/factor-set.d.ts +54 -0
- package/dist/gad/factor-set.js +83 -0
- package/dist/gad/factor-set.js.map +1 -0
- package/dist/gad/factor-table.d.ts +31 -20
- package/dist/gad/factor-table.js +67 -37
- package/dist/gad/factor-table.js.map +1 -1
- package/dist/gad/lrf-0-421-2026-07-08.d.ts +46 -0
- package/dist/gad/lrf-0-421-2026-07-08.js +72 -0
- package/dist/gad/lrf-0-421-2026-07-08.js.map +1 -0
- package/dist/gad/lrf-0-422-2026-07-08.d.ts +43 -0
- package/dist/gad/lrf-0-422-2026-07-08.js +69 -0
- package/dist/gad/{lrf-0-422-2023-06-30.js.map → lrf-0-422-2026-07-08.js.map} +1 -1
- package/dist/gad/lrf-2-416-2026-07-08.d.ts +41 -0
- package/dist/gad/lrf-2-416-2026-07-08.js +66 -0
- package/dist/gad/lrf-2-416-2026-07-08.js.map +1 -0
- package/dist/hcas-pcts.js +1 -1
- package/dist/hcas-pcts.js.map +1 -1
- package/dist/index.d.ts +7 -5
- package/dist/index.js +9 -7
- package/dist/index.js.map +1 -1
- package/dist/pension-projection.d.ts +30 -44
- package/dist/pension-projection.js +37 -61
- package/dist/pension-projection.js.map +1 -1
- package/dist/published/england-afc.d.ts +52 -9
- package/dist/published/england-afc.js +59 -115
- package/dist/published/england-afc.js.map +1 -1
- package/dist/scales.d.ts +31 -6
- package/dist/scales.js +38 -22
- package/dist/scales.js.map +1 -1
- package/dist/sections/section-1995.d.ts +6 -6
- package/dist/sections/section-1995.js +34 -27
- package/dist/sections/section-1995.js.map +1 -1
- package/dist/sections/section-2008.d.ts +4 -4
- package/dist/sections/section-2008.js +19 -23
- package/dist/sections/section-2008.js.map +1 -1
- package/dist/sections/section-2015.d.ts +7 -7
- package/dist/sections/section-2015.js +3 -7
- package/dist/sections/section-2015.js.map +1 -1
- package/package.json +1 -1
- package/dist/gad/additional-pension-0-703-2023-10-03.d.ts +0 -180
- package/dist/gad/additional-pension-0-703-2023-10-03.js +0 -87
- package/dist/gad/additional-pension-0-712-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-712-2023-10-03.js +0 -170
- package/dist/gad/additional-pension-0-712-2023-10-03.js.map +0 -1
- package/dist/gad/additional-pension-0-713-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-713-2023-10-03.js +0 -173
- package/dist/gad/additional-pension-0-713-2023-10-03.js.map +0 -1
- package/dist/gad/additional-pension-0-714-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-714-2023-10-03.js +0 -176
- package/dist/gad/additional-pension-0-714-2023-10-03.js.map +0 -1
- package/dist/gad/additional-pension-0-715-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-715-2023-10-03.js +0 -179
- package/dist/gad/additional-pension-0-715-2023-10-03.js.map +0 -1
- package/dist/gad/additional-pension-0-716-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-716-2023-10-03.js +0 -170
- package/dist/gad/additional-pension-0-716-2023-10-03.js.map +0 -1
- package/dist/gad/additional-pension-0-717-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-717-2023-10-03.js +0 -173
- package/dist/gad/additional-pension-0-717-2023-10-03.js.map +0 -1
- package/dist/gad/additional-pension-0-718-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-718-2023-10-03.js +0 -176
- package/dist/gad/additional-pension-0-718-2023-10-03.js.map +0 -1
- package/dist/gad/additional-pension-0-719-2023-10-03.d.ts +0 -35
- package/dist/gad/additional-pension-0-719-2023-10-03.js +0 -179
- package/dist/gad/additional-pension-0-719-2023-10-03.js.map +0 -1
- package/dist/gad/erf-1-401-2023-06-30.d.ts +0 -47
- package/dist/gad/erf-1-401-2023-06-30.js +0 -73
- package/dist/gad/erf-1-401-2023-06-30.js.map +0 -1
- package/dist/gad/erf-1-402-2023-06-30.d.ts +0 -48
- package/dist/gad/erf-1-402-2023-06-30.js +0 -84
- package/dist/gad/erf-1-402-2023-06-30.js.map +0 -1
- package/dist/gad/erf-1-407-2023-06-30.d.ts +0 -47
- package/dist/gad/erf-1-407-2023-06-30.js +0 -73
- package/dist/gad/erf-1-407-2023-06-30.js.map +0 -1
- package/dist/gad/erf-2023-06-30.d.ts +0 -72
- package/dist/gad/erf-2023-06-30.js +0 -105
- package/dist/gad/erf-2023-06-30.js.map +0 -1
- package/dist/gad/lrf-0-422-2023-06-30.d.ts +0 -45
- package/dist/gad/lrf-0-422-2023-06-30.js +0 -70
- package/dist/gad/lrf-2-416-2023-06-30.d.ts +0 -46
- package/dist/gad/lrf-2-416-2023-06-30.js +0 -72
- package/dist/gad/lrf-2-416-2023-06-30.js.map +0 -1
- package/dist/gad/lrf-2023-06-30.d.ts +0 -72
- package/dist/gad/lrf-2023-06-30.js +0 -99
- package/dist/gad/lrf-2023-06-30.js.map +0 -1
|
@@ -9,12 +9,12 @@
|
|
|
9
9
|
*
|
|
10
10
|
* GAD consolidated factor workbook
|
|
11
11
|
* → ERF1/LRF1 values: src/gad/ holds the verbatim
|
|
12
|
-
* transcriptions, and each carries its own issue
|
|
13
|
-
*
|
|
12
|
+
* transcriptions, and each carries its own issue and
|
|
13
|
+
* provenance
|
|
14
14
|
*
|
|
15
15
|
* GAD "NHSPS 2015 E&W — Early and late retirement in normal
|
|
16
16
|
* health — Factors and guidance", 7 August 2019 — methodology
|
|
17
|
-
* only (the
|
|
17
|
+
* only (the workbook names it as its related guidance)
|
|
18
18
|
* → Rounding rules (§2.3 ERF, §3.4 LRF)
|
|
19
19
|
* → Order of operations (§1.18)
|
|
20
20
|
*
|
|
@@ -158,41 +158,24 @@ import { estimateHistory } from './pension/history.js';
|
|
|
158
158
|
import { buildCurve, walkThrough } from './pension/curve.js';
|
|
159
159
|
import { schemeYearBefore, schemeYearEndDate } from './pension/scheme-year.js';
|
|
160
160
|
import { seedFromBalanceAt, seedFromJoinDate } from './pension/seed.js';
|
|
161
|
-
import {
|
|
161
|
+
import { FACTOR_APPLIES, factorTable, TABLES_2015 } from './factor-basis.js';
|
|
162
162
|
// ── Constants ───────────────────────────────────────
|
|
163
163
|
/* The accrual rate is owned by the ledger that applies it and
|
|
164
164
|
re-exported here, so the record and every figure read off it
|
|
165
165
|
cannot hold two different 1/54s. */
|
|
166
166
|
export { ACCRUAL_RATE };
|
|
167
|
-
// ── Factor Tables ───────────────────────────────────
|
|
168
|
-
// The 2015 Section's two tables, read through the one set every
|
|
169
|
-
// factor in the library comes from, so this and `memberBenefits`
|
|
170
|
-
// cannot round the same drawing two ways.
|
|
171
|
-
const ERF1 = factorTable(FACTOR_TABLES.early2015);
|
|
172
|
-
const LRF1 = factorTable(FACTOR_TABLES.late2015);
|
|
173
|
-
/**
|
|
174
|
-
* Provenance of the 2015 Section's in-force table behind a factor
|
|
175
|
-
* kind — the
|
|
176
|
-
* citation facts (table ref, guidance name, issue date, source
|
|
177
|
-
* PDF) consumers render instead of hand-typing them, so a page
|
|
178
|
-
* showing "GAD factors issued 30 June 2023" updates itself when
|
|
179
|
-
* a later issue supersedes the table above.
|
|
180
|
-
*/
|
|
181
|
-
export function factorProvenance(kind) {
|
|
182
|
-
return kind === 'erf'
|
|
183
|
-
? ERF1.provenance
|
|
184
|
-
: LRF1.provenance;
|
|
185
|
-
}
|
|
186
167
|
// ── Retirement Factor ───────────────────────────────
|
|
168
|
+
/** The 2015 Section main pension's tables, as its basis states them. */
|
|
169
|
+
const MAIN_2015 = TABLES_2015[FACTOR_APPLIES.pension];
|
|
187
170
|
/**
|
|
188
171
|
* Determine whether ERF or LRF applies and return the
|
|
189
|
-
* factor. The rounding rules (ERF up §2.3, LRF down §3.4)
|
|
190
|
-
*
|
|
172
|
+
* factor. The rounding rules (ERF up §2.3, LRF down §3.4) live on the
|
|
173
|
+
* tables themselves — see FactorTable.
|
|
191
174
|
*
|
|
192
|
-
* `type`
|
|
193
|
-
* at NPA is not an early retirement with a
|
|
194
|
-
* a table there hands a consumer an ERF
|
|
195
|
-
* member who took no reduction.
|
|
175
|
+
* `type` and `provenance` are null where neither table applies.
|
|
176
|
+
* Retiring exactly at NPA is not an early retirement with a
|
|
177
|
+
* factor of 1: naming a table there hands a consumer an ERF
|
|
178
|
+
* citation to render at a member who took no reduction.
|
|
196
179
|
*
|
|
197
180
|
* A second route to the factor `factor2015` reads through
|
|
198
181
|
* `factor-basis.ts`, kept because this public signature takes the
|
|
@@ -202,33 +185,24 @@ export function factorProvenance(kind) {
|
|
|
202
185
|
* `tests/section-factors.test.ts` holds the two routes equal.
|
|
203
186
|
*/
|
|
204
187
|
export function retirementFactor(retirementDate, npDate) {
|
|
205
|
-
|
|
206
|
-
|
|
188
|
+
const drawnAtOrAfterNpa = retirementDate >= npDate;
|
|
189
|
+
if (drawnAtOrAfterNpa) {
|
|
207
190
|
const period = periodInYearsMonths(npDate, retirementDate);
|
|
208
|
-
|
|
209
|
-
&& period.days === 0
|
|
210
|
-
|
|
191
|
+
const drawnAtNpa = period.years === 0 && period.months === 0
|
|
192
|
+
&& period.days === 0;
|
|
193
|
+
if (drawnAtNpa) {
|
|
194
|
+
return { factor: 1, type: null, provenance: null };
|
|
211
195
|
}
|
|
212
|
-
|
|
196
|
+
const lrf = factorTable(MAIN_2015.late);
|
|
197
|
+
return {
|
|
198
|
+
factor: lrf.factorFor(period), type: 'lrf', provenance: lrf.provenance,
|
|
199
|
+
};
|
|
213
200
|
}
|
|
214
|
-
// Early retirement
|
|
215
201
|
const period = periodInYearsMonths(retirementDate, npDate);
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
* whole period before its pension age: {@link retirementFactor} for
|
|
221
|
-
* a caller that holds the period rather than the two dates it
|
|
222
|
-
* spans. The 1995 and 2008 Sections are keyed by age and are not
|
|
223
|
-
* read here. A whole period has no part-month to round, so the
|
|
224
|
-
* table is read at exactly that row. Months are 0 to 11; a period
|
|
225
|
-
* past the last printed row raises
|
|
226
|
-
* {@link RetirementFactorOutOfRange}. It stays when
|
|
227
|
-
* `projectPension` retires: a caller holding a period is not a
|
|
228
|
-
* projection.
|
|
229
|
-
*/
|
|
230
|
-
export function erf2015For(period) {
|
|
231
|
-
return ERF1.factorFor({ ...period, days: 0 });
|
|
202
|
+
const erf = factorTable(MAIN_2015.early);
|
|
203
|
+
return {
|
|
204
|
+
factor: erf.factorFor(period), type: 'erf', provenance: erf.provenance,
|
|
205
|
+
};
|
|
232
206
|
}
|
|
233
207
|
// ── Core Calculations ───────────────────────────────
|
|
234
208
|
/** Annual pension accrual for one year of service */
|
|
@@ -275,7 +249,7 @@ export function projectPension(input, today = new Date()) {
|
|
|
275
249
|
annualPension: pair(cash.annualPension, todays.annualPension, cash.retirementDate),
|
|
276
250
|
accruedNow: pair(cash.ledger.atDate(today), todays.ledger.atDate(today), today),
|
|
277
251
|
factor: cash.factor,
|
|
278
|
-
|
|
252
|
+
drawnTable: cash.drawnTable,
|
|
279
253
|
adjustmentAmount: pair(cash.revaluedAtRetirement - cash.annualPension, todays.revaluedAtRetirement - todays.annualPension, cash.retirementDate),
|
|
280
254
|
curve: buildCurve(cash, todays),
|
|
281
255
|
isEstimation: cash.isEstimation,
|
|
@@ -289,11 +263,15 @@ export function projectPension(input, today = new Date()) {
|
|
|
289
263
|
todaysMoneyLedger: todays.ledger,
|
|
290
264
|
};
|
|
291
265
|
}
|
|
266
|
+
// ── Internal Helpers ────────────────────────────────
|
|
292
267
|
/** The flat-pay walk from `seed` to the drawing, and the factor the
|
|
293
268
|
* drawing takes. */
|
|
294
269
|
function walkToDrawing(input, seed, prices) {
|
|
295
270
|
const { currentSalary, dateOfBirth, exitDate, retirementDate, npa } = input;
|
|
296
|
-
const
|
|
271
|
+
const drawing = retirementFactor(retirementDate, npaDate(dateOfBirth, npa));
|
|
272
|
+
const drawnTable = drawing.type === null
|
|
273
|
+
? null
|
|
274
|
+
: { kind: drawing.type, provenance: drawing.provenance };
|
|
297
275
|
const ledger = buildLedger({
|
|
298
276
|
seed,
|
|
299
277
|
payIn: flatPay(currentSalary),
|
|
@@ -303,13 +281,11 @@ function walkToDrawing(input, seed, prices) {
|
|
|
303
281
|
through: walkThrough(retirementDate, npaDate(dateOfBirth, npa)),
|
|
304
282
|
drawingFor: () => ({
|
|
305
283
|
on: retirementDate,
|
|
306
|
-
factor,
|
|
307
|
-
table:
|
|
308
|
-
? null
|
|
309
|
-
: { kind: factorType, provenance: factorProvenance(factorType) },
|
|
284
|
+
factor: drawing.factor,
|
|
285
|
+
table: drawnTable,
|
|
310
286
|
}),
|
|
311
287
|
});
|
|
312
|
-
return { ledger, factor,
|
|
288
|
+
return { ledger, factor: drawing.factor, drawnTable };
|
|
313
289
|
}
|
|
314
290
|
function resolveProjection(input, today) {
|
|
315
291
|
const { dateOfBirth, exitDate, retirementDate, npa, assumedCpi } = input;
|
|
@@ -333,7 +309,7 @@ function resolveProjection(input, today) {
|
|
|
333
309
|
const seed = isEstimation
|
|
334
310
|
? seedFromJoinDate(input.joinDate)
|
|
335
311
|
: seedFromBalanceAt({ balance: input.accruedPension, asOf: input.statementDate }, exitDate, retirementDate, prices);
|
|
336
|
-
const { ledger, factor,
|
|
312
|
+
const { ledger, factor, drawnTable } = walkToDrawing(input, seed, prices);
|
|
337
313
|
const { revalued, drawn } = atDrawing(ledger, retirementDate, factor);
|
|
338
314
|
/* Illustration only, and only where a statement leaves a gap:
|
|
339
315
|
an estimation path already walks from the join date, so
|
|
@@ -350,7 +326,7 @@ function resolveProjection(input, today) {
|
|
|
350
326
|
: null;
|
|
351
327
|
return {
|
|
352
328
|
today, dateOfBirth, exitDate, retirementDate, npa,
|
|
353
|
-
ledger, history, isEstimation, factor,
|
|
329
|
+
ledger, history, isEstimation, factor, drawnTable, prices,
|
|
354
330
|
/* The earliest date the ledger holds a balance for, which
|
|
355
331
|
is the seed's own year end — NOT today.
|
|
356
332
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pension-projection.js","sourceRoot":"","sources":["../src/pension-projection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwJG;AAEH,OAAO,EACL,QAAQ,EACR,OAAO,EACP,mBAAmB,GACpB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EACL,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,GAC9C,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAEtE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"pension-projection.js","sourceRoot":"","sources":["../src/pension-projection.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,13 +17,56 @@
|
|
|
17
17
|
* untouched by those errors
|
|
18
18
|
* - "Health Careers — AfC pay rates" (#sa-27)
|
|
19
19
|
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
20
|
+
* Transcribed as the page prints each band: Band 1 as one figure, and
|
|
21
|
+
* every other band as an entry point, the "Years until" interval and a
|
|
22
|
+
* top point, Bands 5 to 9 with an intermediate step between. The point
|
|
23
|
+
* labels are derived from those intervals in `afc-scales.ts`, as every
|
|
24
|
+
* nation's are, so a mis-read interval shows as a wrong label that the
|
|
25
|
+
* fixture fails on.
|
|
23
26
|
*/
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
/** England's AfC ladder from 1 April 2025, as printed in SA-25. */
|
|
28
|
+
export declare const ENGLAND_AFC_2025_26: {
|
|
29
|
+
readonly flatBands: {
|
|
30
|
+
band: string;
|
|
31
|
+
salary: number;
|
|
32
|
+
note: string;
|
|
33
|
+
}[];
|
|
34
|
+
readonly steppedBands: ({
|
|
35
|
+
band: string;
|
|
36
|
+
entry: number;
|
|
37
|
+
yearsToNext: number;
|
|
38
|
+
top: number;
|
|
39
|
+
intermediate?: undefined;
|
|
40
|
+
yearsToTop?: undefined;
|
|
41
|
+
} | {
|
|
42
|
+
band: string;
|
|
43
|
+
entry: number;
|
|
44
|
+
yearsToNext: number;
|
|
45
|
+
intermediate: number;
|
|
46
|
+
yearsToTop: number;
|
|
47
|
+
top: number;
|
|
48
|
+
})[];
|
|
49
|
+
};
|
|
50
|
+
/** England's AfC ladder from 1 April 2026, as printed in SA-26. */
|
|
51
|
+
export declare const ENGLAND_AFC_2026_27: {
|
|
52
|
+
readonly flatBands: {
|
|
53
|
+
band: string;
|
|
54
|
+
salary: number;
|
|
55
|
+
note: string;
|
|
56
|
+
}[];
|
|
57
|
+
readonly steppedBands: ({
|
|
58
|
+
band: string;
|
|
59
|
+
entry: number;
|
|
60
|
+
yearsToNext: number;
|
|
61
|
+
top: number;
|
|
62
|
+
intermediate?: undefined;
|
|
63
|
+
yearsToTop?: undefined;
|
|
64
|
+
} | {
|
|
65
|
+
band: string;
|
|
66
|
+
entry: number;
|
|
67
|
+
yearsToNext: number;
|
|
68
|
+
intermediate: number;
|
|
69
|
+
yearsToTop: number;
|
|
70
|
+
top: number;
|
|
71
|
+
})[];
|
|
72
|
+
};
|
|
@@ -17,126 +17,70 @@
|
|
|
17
17
|
* untouched by those errors
|
|
18
18
|
* - "Health Careers — AfC pay rates" (#sa-27)
|
|
19
19
|
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
20
|
+
* Transcribed as the page prints each band: Band 1 as one figure, and
|
|
21
|
+
* every other band as an entry point, the "Years until" interval and a
|
|
22
|
+
* top point, Bands 5 to 9 with an intermediate step between. The point
|
|
23
|
+
* labels are derived from those intervals in `afc-scales.ts`, as every
|
|
24
|
+
* nation's are, so a mis-read interval shows as a wrong label that the
|
|
25
|
+
* fixture fails on.
|
|
23
26
|
*/
|
|
24
|
-
|
|
25
|
-
/** England's AfC ladder from 1 April 2025. */
|
|
27
|
+
/** England's AfC ladder from 1 April 2025, as printed in SA-25. */
|
|
26
28
|
export const ENGLAND_AFC_2025_26 = {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
//
|
|
31
|
-
// the
|
|
32
|
-
//
|
|
33
|
-
'2
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
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),
|
|
29
|
+
flatBands: [
|
|
30
|
+
{ band: 'Band 1', salary: 24465, note: 'closed to new entrants' },
|
|
31
|
+
],
|
|
32
|
+
// Band 2's entry and top are the same figure: the wage floor has
|
|
33
|
+
// compressed the band, and the page still prints it as a progression,
|
|
34
|
+
// so it is transcribed as printed rather than collapsed to one point.
|
|
35
|
+
// Wales's Band 2 is the same shape.
|
|
36
|
+
steppedBands: [
|
|
37
|
+
{ band: 'Band 2', entry: 24465, yearsToNext: 2, top: 24465 },
|
|
38
|
+
{ band: 'Band 3', entry: 24937, yearsToNext: 2, top: 26598 },
|
|
39
|
+
{ band: 'Band 4', entry: 27485, yearsToNext: 3, top: 30162 },
|
|
40
|
+
{ band: 'Band 5', entry: 31049, yearsToNext: 2, intermediate: 33487,
|
|
41
|
+
yearsToTop: 2, top: 37796 },
|
|
42
|
+
{ band: 'Band 6', entry: 38682, yearsToNext: 2, intermediate: 40823,
|
|
43
|
+
yearsToTop: 3, top: 46580 },
|
|
44
|
+
{ band: 'Band 7', entry: 47810, yearsToNext: 2, intermediate: 50273,
|
|
45
|
+
yearsToTop: 3, top: 54710 },
|
|
46
|
+
{ band: 'Band 8a', entry: 55690, yearsToNext: 2, intermediate: 58487,
|
|
47
|
+
yearsToTop: 3, top: 62682 },
|
|
48
|
+
{ band: 'Band 8b', entry: 64455, yearsToNext: 2, intermediate: 68631,
|
|
49
|
+
yearsToTop: 3, top: 74896 },
|
|
50
|
+
{ band: 'Band 8c', entry: 76965, yearsToNext: 2, intermediate: 81652,
|
|
51
|
+
yearsToTop: 3, top: 88682 },
|
|
52
|
+
{ band: 'Band 8d', entry: 91342, yearsToNext: 2, intermediate: 96941,
|
|
53
|
+
yearsToTop: 3, top: 105337 },
|
|
54
|
+
{ band: 'Band 9', entry: 109179, yearsToNext: 2, intermediate: 115763,
|
|
55
|
+
yearsToTop: 3, top: 125637 },
|
|
84
56
|
],
|
|
85
57
|
};
|
|
86
|
-
/** England's AfC ladder from 1 April 2026. */
|
|
58
|
+
/** England's AfC ladder from 1 April 2026, as printed in SA-26. */
|
|
87
59
|
export const ENGLAND_AFC_2026_27 = {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
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),
|
|
60
|
+
flatBands: [
|
|
61
|
+
{ band: 'Band 1', salary: 25272, note: 'closed to new entrants' },
|
|
62
|
+
],
|
|
63
|
+
// Band 2: the same compressed, printed-as-a-progression shape as 2025-26.
|
|
64
|
+
steppedBands: [
|
|
65
|
+
{ band: 'Band 2', entry: 25272, yearsToNext: 2, top: 25272 },
|
|
66
|
+
{ band: 'Band 3', entry: 25760, yearsToNext: 2, top: 27476 },
|
|
67
|
+
{ band: 'Band 4', entry: 28392, yearsToNext: 3, top: 31157 },
|
|
68
|
+
{ band: 'Band 5', entry: 32073, yearsToNext: 2, intermediate: 34592,
|
|
69
|
+
yearsToTop: 2, top: 39043 },
|
|
70
|
+
{ band: 'Band 6', entry: 39959, yearsToNext: 2, intermediate: 42170,
|
|
71
|
+
yearsToTop: 3, top: 48117 },
|
|
72
|
+
{ band: 'Band 7', entry: 49387, yearsToNext: 2, intermediate: 51932,
|
|
73
|
+
yearsToTop: 3, top: 56515 },
|
|
74
|
+
{ band: 'Band 8a', entry: 57528, yearsToNext: 2, intermediate: 60417,
|
|
75
|
+
yearsToTop: 3, top: 64750 },
|
|
76
|
+
{ band: 'Band 8b', entry: 66582, yearsToNext: 2, intermediate: 70896,
|
|
77
|
+
yearsToTop: 3, top: 77368 },
|
|
78
|
+
{ band: 'Band 8c', entry: 79504, yearsToNext: 2, intermediate: 84346,
|
|
79
|
+
yearsToTop: 3, top: 91609 },
|
|
80
|
+
{ band: 'Band 8d', entry: 94356, yearsToNext: 2, intermediate: 100140,
|
|
81
|
+
yearsToTop: 3, top: 108814 },
|
|
82
|
+
{ band: 'Band 9', entry: 112782, yearsToNext: 2, intermediate: 119583,
|
|
83
|
+
yearsToTop: 3, top: 129783 },
|
|
140
84
|
],
|
|
141
85
|
};
|
|
142
86
|
//# sourceMappingURL=england-afc.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"england-afc.js","sourceRoot":"","sources":["../../src/published/england-afc.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"england-afc.js","sourceRoot":"","sources":["../../src/published/england-afc.ts"],"names":[],"mappings":"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"}
|
package/dist/scales.d.ts
CHANGED
|
@@ -14,7 +14,8 @@
|
|
|
14
14
|
*
|
|
15
15
|
* England publishes no AfC circular, so its tables are transcribed from
|
|
16
16
|
* the publisher's page in `src/published/england-afc.ts` (the README's
|
|
17
|
-
* AfC pay scales rule)
|
|
17
|
+
* AfC pay scales rule) and translated by `afc-scales.ts` like the
|
|
18
|
+
* others. The HCAS zones and the Welsh living-wage floor sit beside it
|
|
18
19
|
* in `src/published/`, each citing its own
|
|
19
20
|
* source. The other three nations' sources are cited in their own
|
|
20
21
|
* circular files, beside the data they justify — including the warning
|
|
@@ -25,10 +26,11 @@
|
|
|
25
26
|
* the year of service in which a member first reaches it: increment 1
|
|
26
27
|
* is `Year 1`, and the top point takes a `+` because service continues
|
|
27
28
|
* past it. No publisher prints such a label; every one is our reading
|
|
28
|
-
* of an interval the publisher does print. For
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
* `afcPoint`, which writes the label and the year
|
|
29
|
+
* of an interval the publisher does print. For all four nations the
|
|
30
|
+
* year is derived in `afc-scales.ts`, from the transcribed interval
|
|
31
|
+
* (England, Wales, Northern Ireland) or Annex C's yearly increment
|
|
32
|
+
* (Scotland), through `afcPoint`, which writes the label and the year
|
|
33
|
+
* from one number, so
|
|
32
34
|
* a label and the timing a pay path reads from it cannot disagree.
|
|
33
35
|
*
|
|
34
36
|
* Labels are lookup keys for `afcResolver.fromScalePoint`, so changing
|
|
@@ -41,6 +43,7 @@ import type { Nation, PayYear, TaxYear } from '@casomoltd/paye-calc';
|
|
|
41
43
|
import type { DocumentSource } from './document-source.js';
|
|
42
44
|
import type { PayLadder, SteppedPoint } from './scale-point.js';
|
|
43
45
|
import type { SalaryRange } from './values.js';
|
|
46
|
+
import type { PrintedBand1 } from './afc-scales.js';
|
|
44
47
|
import type { AfcBandId } from './afc-band.js';
|
|
45
48
|
import type { SchemeYearEnd } from './pension/scheme-year.js';
|
|
46
49
|
/** What {@link afcPayYearFor} finds for a scheme year. */
|
|
@@ -64,6 +67,17 @@ export type AfcPayYearLookup = {
|
|
|
64
67
|
} | {
|
|
65
68
|
readonly kind: typeof AFC_PAY_YEAR_KINDS.awaited;
|
|
66
69
|
};
|
|
70
|
+
/** Band 1 for a nation and pay year: the figure and status its publisher
|
|
71
|
+
* prints, with the year and source it is held under. */
|
|
72
|
+
export interface AfcBand1 extends PrintedBand1 {
|
|
73
|
+
readonly year: PayYear;
|
|
74
|
+
readonly source: DocumentSource;
|
|
75
|
+
}
|
|
76
|
+
/** A band's nation, attached from the key it is stored under rather
|
|
77
|
+
* than stored beside it — one fact, one producer. */
|
|
78
|
+
export interface AfcBand1Published extends AfcBand1 {
|
|
79
|
+
readonly nation: Nation;
|
|
80
|
+
}
|
|
67
81
|
/** One AfC band's published ladder for a nation and year. */
|
|
68
82
|
export interface AfcBandMeta {
|
|
69
83
|
band: AfcBandId;
|
|
@@ -101,6 +115,17 @@ export declare const AFC_PREVIOUS_YEAR: PayYear;
|
|
|
101
115
|
* never defaults a locale, since a forgotten `nation` would silently
|
|
102
116
|
* return England figures for every region. */
|
|
103
117
|
export declare function getAfcScales(year: PayYear, nation: Nation): AfcBandMeta[];
|
|
118
|
+
/**
|
|
119
|
+
* Band 1 for a nation and pay year. Throws {@link ScaleUnavailable} for a
|
|
120
|
+
* year that nation has not published, as {@link getAfcScales} does, so
|
|
121
|
+
* the two reads of one ladder fail the same way.
|
|
122
|
+
*
|
|
123
|
+
* Deliberately NOT part of `AFC_BANDS` or the scale list. Band 1 joining
|
|
124
|
+
* either shifts every index that reads the list by position, and this
|
|
125
|
+
* needs to shift nothing — it is a lookup beside the ladder, not a rung
|
|
126
|
+
* added to it.
|
|
127
|
+
*/
|
|
128
|
+
export declare function afcBand1(year: PayYear, nation: Nation): AfcBand1Published;
|
|
104
129
|
/** One band's published ladder for a pay year and nation. Every band is
|
|
105
130
|
* on every ladder (a nation-year's scales are total over the bands), so
|
|
106
131
|
* only the year and nation can be unpublished, which throws
|
|
@@ -133,7 +158,7 @@ export declare function afcPayYears(nation: Nation): PayYear[];
|
|
|
133
158
|
* The most recent year a nation has actually published AfC scales for.
|
|
134
159
|
*
|
|
135
160
|
* Nations do not move together: Northern Ireland's latest is a round
|
|
136
|
-
* behind the others (see `
|
|
161
|
+
* behind the others (see `NI_TABLES_2025_26` in `afc-scales.ts`). A
|
|
137
162
|
* consumer that asks for a site-wide "current year" gets
|
|
138
163
|
* `ScaleUnavailable` there, which is correct but is not an answer; this
|
|
139
164
|
* is the answer.
|