@casomoltd/nhs-pay 0.15.2 → 0.16.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +66 -16
- package/dist/afc-band.d.ts +33 -0
- package/dist/afc-band.js +33 -0
- package/dist/afc-band.js.map +1 -0
- package/dist/afc-scales.d.ts +67 -0
- package/dist/afc-scales.js +238 -0
- package/dist/afc-scales.js.map +1 -0
- package/dist/allowances.d.ts +91 -0
- package/dist/allowances.js +180 -0
- package/dist/allowances.js.map +1 -0
- package/dist/award.d.ts +175 -36
- package/dist/award.js +370 -47
- package/dist/award.js.map +1 -1
- package/dist/bands.d.ts +34 -12
- package/dist/bands.js +26 -9
- package/dist/bands.js.map +1 -1
- package/dist/circulars/afc-shapes.d.ts +101 -0
- package/dist/circulars/afc-shapes.js +18 -0
- package/dist/circulars/afc-shapes.js.map +1 -0
- package/dist/circulars/{england-md-1-2026r.d.ts → england-md-1-2026-r2.d.ts} +198 -32
- package/dist/circulars/{england-md-1-2026r.js → england-md-1-2026-r2.js} +142 -76
- package/dist/circulars/england-md-1-2026-r2.js.map +1 -0
- package/dist/circulars/ni-hsc-afc-06-2025.d.ts +63 -0
- package/dist/circulars/ni-hsc-afc-06-2025.js +100 -0
- package/dist/circulars/ni-hsc-afc-06-2025.js.map +1 -0
- package/dist/circulars/ni-hsc-tc8-05-2025.d.ts +1 -1
- package/dist/circulars/ni-hsc-tc8-05-2025.js +1 -1
- package/dist/circulars/scotland-pcs-afc-2026-01.d.ts +82 -0
- package/dist/circulars/scotland-pcs-afc-2026-01.js +208 -0
- package/dist/circulars/scotland-pcs-afc-2026-01.js.map +1 -0
- package/dist/circulars/scotland-pcs-dd-2025-01.d.ts +1 -1
- package/dist/circulars/scotland-pcs-dd-2025-01.js +12 -4
- package/dist/circulars/scotland-pcs-dd-2025-01.js.map +1 -1
- package/dist/circulars/scotland-pcs-dd-2026-01.d.ts +2 -2
- package/dist/circulars/scotland-pcs-dd-2026-01.js +2 -2
- package/dist/circulars/scotland-pcs-dd-2026-02.d.ts +79 -0
- package/dist/circulars/scotland-pcs-dd-2026-02.js +185 -0
- package/dist/circulars/scotland-pcs-dd-2026-02.js.map +1 -0
- package/dist/circulars/wales-afc-w-02-2025.d.ts +53 -0
- package/dist/circulars/wales-afc-w-02-2025.js +85 -0
- package/dist/circulars/wales-afc-w-02-2025.js.map +1 -0
- package/dist/circulars/wales-afc-w-02-2026.d.ts +48 -0
- package/dist/circulars/wales-afc-w-02-2026.js +91 -0
- package/dist/circulars/wales-afc-w-02-2026.js.map +1 -0
- package/dist/circulars/wales-mdw-01-2025.d.ts +1 -1
- package/dist/circulars/wales-mdw-01-2025.js +1 -1
- package/dist/circulars/wales-mdw-01-2026.d.ts +1 -1
- package/dist/circulars/wales-mdw-01-2026.js +1 -1
- package/dist/dental-scales.d.ts +4 -4
- package/dist/dental-scales.js +30 -20
- package/dist/dental-scales.js.map +1 -1
- package/dist/document-source.d.ts +141 -0
- package/dist/document-source.js +80 -0
- package/dist/document-source.js.map +1 -0
- package/dist/errors.d.ts +31 -5
- package/dist/errors.js +32 -2
- package/dist/errors.js.map +1 -1
- package/dist/format.d.ts +2 -2
- package/dist/format.js.map +1 -1
- package/dist/gad/erf-2023-06-30.d.ts +1 -1
- package/dist/gad/erf-2023-06-30.js +2 -1
- package/dist/gad/erf-2023-06-30.js.map +1 -1
- package/dist/gad/factor-table.d.ts +2 -1
- package/dist/gad/factor-table.js.map +1 -1
- package/dist/gad/lrf-2023-06-30.d.ts +1 -1
- package/dist/gad/lrf-2023-06-30.js +2 -1
- package/dist/gad/lrf-2023-06-30.js.map +1 -1
- package/dist/hcas.d.ts +10 -14
- package/dist/hcas.js +13 -20
- package/dist/hcas.js.map +1 -1
- package/dist/index.d.ts +17 -9
- package/dist/index.js +17 -8
- package/dist/index.js.map +1 -1
- package/dist/iso-date.d.ts +87 -0
- package/dist/iso-date.js +97 -0
- package/dist/iso-date.js.map +1 -0
- package/dist/medical-scales.d.ts +19 -4
- package/dist/medical-scales.js +77 -20
- package/dist/medical-scales.js.map +1 -1
- package/dist/pension.d.ts +30 -0
- package/dist/pension.js +128 -8
- package/dist/pension.js.map +1 -1
- package/dist/post.d.ts +87 -2
- package/dist/post.js +112 -2
- package/dist/post.js.map +1 -1
- package/dist/regions.d.ts +1 -1
- package/dist/regions.js +1 -1
- package/dist/resolver.d.ts +57 -7
- package/dist/resolver.js +77 -25
- package/dist/resolver.js.map +1 -1
- package/dist/scale-point.d.ts +13 -4
- package/dist/scale-tables.d.ts +57 -10
- package/dist/scale-tables.js +58 -9
- package/dist/scale-tables.js.map +1 -1
- package/dist/scales.d.ts +169 -44
- package/dist/scales.js +462 -226
- package/dist/scales.js.map +1 -1
- package/dist/sources.d.ts +183 -0
- package/dist/sources.js +375 -0
- package/dist/sources.js.map +1 -0
- package/package.json +6 -4
- package/dist/circulars/england-md-1-2026r.js.map +0 -1
package/dist/index.d.ts
CHANGED
|
@@ -1,20 +1,28 @@
|
|
|
1
|
-
export { AFC_BANDS, AFC_BAND_IDS, AFC_HOURS_PER_YEAR,
|
|
2
|
-
export type { AfcBandId, HcasZone, HcasZones, } from './scales.js';
|
|
1
|
+
export { AFC_BANDS, AFC_BAND_IDS, AFC_HOURS_PER_YEAR, afcScaleSource, latestAfcYear, payYearLag, isAwaitingPayAward, assertPayYearLagIsSane, afcPayYears, NLW_HOURLY, WALES_LIVING_WAGE, annualiseHourly, } from './scales.js';
|
|
2
|
+
export type { AfcBandId, HcasZone, HcasZones, WalesLivingWage, } from './scales.js';
|
|
3
3
|
export type { ScalePoint } from './scale-point.js';
|
|
4
|
-
export { PensionTiers, getEmployerPensionRate, getPensionTiers, getPensionTiersVO, lookupPensionTier, pensionTierRate, } from './pension.js';
|
|
5
|
-
export type { EmployerPensionRate, PensionTier, } from './pension.js';
|
|
4
|
+
export { PensionTiers, getEmployerPensionRate, getPensionScheme, getPensionTiers, getPensionTiersVO, lookupPensionTier, pensionTierRate, } from './pension.js';
|
|
5
|
+
export type { EmployerPensionRate, NhsPensionScheme, PensionTier, } from './pension.js';
|
|
6
6
|
export type { SalaryRange } from './values.js';
|
|
7
7
|
export { Post, NO_ADJUSTMENTS } from './post.js';
|
|
8
8
|
export type { PostIdentity, PostAdjustments } from './post.js';
|
|
9
9
|
export type { AfcRole, DentalRole, MedicalRole, Role, RoleKind, VsmRole, } from './role.js';
|
|
10
10
|
export { afcResolver, dentalResolver, medicalResolver } from './resolver.js';
|
|
11
11
|
export type { AfcResolver, DentalResolver, MedicalResolver, NationScaleResolver, PayScaleResolver, } from './resolver.js';
|
|
12
|
-
export { MEDICAL_GRADES, MEDICAL_GRADE_IDS,
|
|
12
|
+
export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_PAY_YEARS, getMedicalScales, latestMedicalSource, } from './medical-scales.js';
|
|
13
13
|
export type { MedicalGradeId, MedicalGradeMeta, } from './medical-scales.js';
|
|
14
|
-
export { DENTAL_GRADES, DENTAL_GRADE_IDS,
|
|
14
|
+
export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_PAY_YEARS, getDentalScales, } from './dental-scales.js';
|
|
15
15
|
export type { DentalGradeId, DentalGradeMeta, } from './dental-scales.js';
|
|
16
|
-
export { AwardUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
|
|
17
|
-
export {
|
|
16
|
+
export { AmbiguousScalePoint, AwardUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
|
|
17
|
+
export { DocumentSource } from './document-source.js';
|
|
18
|
+
export { isoDate, isoMonth, monthOf, firstOfMonth, monthToDate, isoToDate, } from './iso-date.js';
|
|
19
|
+
export type { IsoDate, IsoMonth } from './iso-date.js';
|
|
20
|
+
export type { DocumentSourceFields, SourceCurrency, } from './document-source.js';
|
|
21
|
+
export { AFC_ENGLAND_SCALES_2025, AFC_ENGLAND_SCALES_2026, AFC_NI_2025, AFC_SCOTLAND, AFC_SCOTLAND_36_HOUR_WEEK, AFC_W_02_2025, AFC_W_02_2026, HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, PC_MD_1_2026_R2, PCS_DD_2025_01, PCS_DD_2025_01_ADDENDUM, PCS_DD_2026_01, PCS_DD_2026_02, } from './sources.js';
|
|
22
|
+
export { AWARD_FAMILIES, afcAward, awardsFor, changesFor, } from './award.js';
|
|
23
|
+
export type { AwardFamily, ForthcomingChange, PayAward, PayChange, PayScaleId, } from './award.js';
|
|
24
|
+
export { SESSION_ALLOWANCES, afcSessionAllowances, sessionAllowance, } from './allowances.js';
|
|
25
|
+
export type { SessionAllowance, SessionAllowanceId, } from './allowances.js';
|
|
18
26
|
export { ACTIVE_REVAL_BONUS_PCT, IN_SERVICE_REVALUATION, revaluationFor, } from './revaluation.js';
|
|
19
27
|
export type { RevaluationYear } from './revaluation.js';
|
|
20
28
|
export { ACCRUAL_RATE, factorProvenance, projectPension, retirementFactor, yearlyAccrual, } from './pension-projection.js';
|
|
@@ -45,4 +53,4 @@ export { nhsTakeHome } from './take-home.js';
|
|
|
45
53
|
export type { NhsTakeHomeOptions } from './take-home.js';
|
|
46
54
|
export { fmtMoney, fmtPct, fmtSalary, formatGBP, formatGBPPrecise, formatPct, formatPctPrecise, yearLabel, } from './format.js';
|
|
47
55
|
export { TAX_REGIONS, TAX_YEARS, NATIONS, NATION_KEYS, TakeHomePay, GrossAnnual, PensionBasis, PensionPercent, StudentLoanPlan, nationToTaxRegion, getTaxYearConfig, hoursPerYear, } from '@casomoltd/paye-calc';
|
|
48
|
-
export type { Nation, TaxRegion, TaxYear, } from '@casomoltd/paye-calc';
|
|
56
|
+
export type { Nation, TaxRegion, TaxYear, PayYear, YearLabel, } from '@casomoltd/paye-calc';
|
package/dist/index.js
CHANGED
|
@@ -1,21 +1,30 @@
|
|
|
1
1
|
// ── Scales ───────────────────────────────────────
|
|
2
|
-
export { AFC_BANDS, AFC_BAND_IDS, AFC_HOURS_PER_YEAR,
|
|
2
|
+
export { AFC_BANDS, AFC_BAND_IDS, AFC_HOURS_PER_YEAR, afcScaleSource, latestAfcYear, payYearLag, isAwaitingPayAward, assertPayYearLagIsSane, afcPayYears, NLW_HOURLY, WALES_LIVING_WAGE, annualiseHourly, } from './scales.js';
|
|
3
3
|
// ── Pension ──────────────────────────────────────
|
|
4
|
-
export { PensionTiers, getEmployerPensionRate, getPensionTiers, getPensionTiersVO, lookupPensionTier, pensionTierRate, } from './pension.js';
|
|
4
|
+
export { PensionTiers, getEmployerPensionRate, getPensionScheme, getPensionTiers, getPensionTiersVO, lookupPensionTier, pensionTierRate, } from './pension.js';
|
|
5
5
|
// ── Post & resolvers ─────────────────────────────
|
|
6
6
|
export { Post, NO_ADJUSTMENTS } from './post.js';
|
|
7
7
|
export { afcResolver, dentalResolver, medicalResolver } from './resolver.js';
|
|
8
8
|
// ── Medical & dental scales ──────────────────────
|
|
9
|
-
export { MEDICAL_GRADES, MEDICAL_GRADE_IDS,
|
|
10
|
-
export { DENTAL_GRADES, DENTAL_GRADE_IDS,
|
|
9
|
+
export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_PAY_YEARS, getMedicalScales, latestMedicalSource, } from './medical-scales.js';
|
|
10
|
+
export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_PAY_YEARS, getDentalScales, } from './dental-scales.js';
|
|
11
11
|
// ── Errors ───────────────────────────────────────
|
|
12
|
-
export { AwardUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
|
|
13
|
-
// ──
|
|
14
|
-
|
|
12
|
+
export { AmbiguousScalePoint, AwardUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
|
|
13
|
+
// ── Cited documents ──────────────────────────────
|
|
14
|
+
// Every published document the library reads a figure from. A consumer
|
|
15
|
+
// citing "where these figures come from" reads the record rather than
|
|
16
|
+
// keeping its own copy of the url.
|
|
17
|
+
export { DocumentSource } from './document-source.js';
|
|
18
|
+
export { isoDate, isoMonth, monthOf, firstOfMonth, monthToDate, isoToDate, } from './iso-date.js';
|
|
19
|
+
export { AFC_ENGLAND_SCALES_2025, AFC_ENGLAND_SCALES_2026, AFC_NI_2025, AFC_SCOTLAND, AFC_SCOTLAND_36_HOUR_WEEK, AFC_W_02_2025, AFC_W_02_2026, HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, PC_MD_1_2026_R2, PCS_DD_2025_01, PCS_DD_2025_01_ADDENDUM, PCS_DD_2026_01, PCS_DD_2026_02, } from './sources.js';
|
|
20
|
+
// ── Pay awards ───────────────────────────────────
|
|
21
|
+
export { AWARD_FAMILIES, afcAward, awardsFor, changesFor, } from './award.js';
|
|
22
|
+
// ── AfC allowances ───────────────────────────────
|
|
23
|
+
export { SESSION_ALLOWANCES, afcSessionAllowances, sessionAllowance, } from './allowances.js';
|
|
15
24
|
export { ACTIVE_REVAL_BONUS_PCT, IN_SERVICE_REVALUATION, revaluationFor, } from './revaluation.js';
|
|
16
25
|
// ── Pension Projection ─────────────────────────────
|
|
17
26
|
// Deliberate surface: the scenario-level API plus
|
|
18
|
-
// yearlyAccrual (
|
|
27
|
+
// yearlyAccrual (a consumer builds its pension-growth
|
|
19
28
|
// chart from it). Date plumbing (periodInYearsMonths,
|
|
20
29
|
// npaDate) and factor-table internals stay private —
|
|
21
30
|
// factor VALUES are reachable solely through
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,oDAAoD;AACpD,OAAO,EACL,SAAS,EACT,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The two date precisions this library holds, kept apart by the
|
|
3
|
+
* COMPILER rather than by a doc comment.
|
|
4
|
+
*
|
|
5
|
+
* Both are ISO text at runtime and both stay JSON-safe. The brand
|
|
6
|
+
* exists because the two are otherwise interchangeable, and handing
|
|
7
|
+
* one reader the other's precision fails OPEN: it builds an Invalid
|
|
8
|
+
* Date, every comparison against one is false, and the value then
|
|
9
|
+
* passes every date rule downstream. A wrong answer that looks like a
|
|
10
|
+
* right one is the worst failure this data has, so the type system
|
|
11
|
+
* carries the distinction.
|
|
12
|
+
*
|
|
13
|
+
* Lives here rather than in `@casomoltd/paye-calc`, which deals in tax
|
|
14
|
+
* years and holds no dates at all: a library carrying a concept it
|
|
15
|
+
* does not use is the same layering rule pointing the other way. Move
|
|
16
|
+
* it down if paye-calc ever grows dates.
|
|
17
|
+
*
|
|
18
|
+
* The concrete cost of NOT having this, before it existed: a consumer
|
|
19
|
+
* bridged the two precisions by writing `` `${award.expectedInPay}-01` ``
|
|
20
|
+
* — a hand-rolled splice on a month field, in the same codebase whose
|
|
21
|
+
* production error log was carrying `RangeError: Invalid Date`.
|
|
22
|
+
*/
|
|
23
|
+
/** A 'YYYY-MM' month. Precision is part of the type. */
|
|
24
|
+
export type IsoMonth = string & {
|
|
25
|
+
readonly precision: 'month';
|
|
26
|
+
};
|
|
27
|
+
/** A 'YYYY-MM-DD' calendar date. Precision is part of the type. */
|
|
28
|
+
export type IsoDate = string & {
|
|
29
|
+
readonly precision: 'date';
|
|
30
|
+
};
|
|
31
|
+
/**
|
|
32
|
+
* The ONLY way to make an {@link IsoMonth}, and so the one place the
|
|
33
|
+
* shape is checked. SHAPE, not validity — see {@link isoDate}.
|
|
34
|
+
*/
|
|
35
|
+
export declare function isoMonth(value: string): IsoMonth;
|
|
36
|
+
/**
|
|
37
|
+
* The ONLY way to make an {@link IsoDate}.
|
|
38
|
+
*
|
|
39
|
+
* Checks the SHAPE and nothing more: `2025-02-31` is four digits, two
|
|
40
|
+
* and two, so it mints one, and {@link isoToDate} then rolls it to
|
|
41
|
+
* 3 March. What a date IS cannot be settled by a regex — the real test
|
|
42
|
+
* is a round trip through `Date`, and that belongs at the one place
|
|
43
|
+
* typed text enters a consumer, which hands back the value itself
|
|
44
|
+
* rather than text for this to re-check.
|
|
45
|
+
*/
|
|
46
|
+
export declare function isoDate(value: string): IsoDate;
|
|
47
|
+
/**
|
|
48
|
+
* The month a date falls in. The ONE place a day is deliberately
|
|
49
|
+
* dropped, named so the loss shows at the call site instead of inside
|
|
50
|
+
* a `String.slice` nobody reads.
|
|
51
|
+
*/
|
|
52
|
+
export declare function monthOf(date: IsoDate): IsoMonth;
|
|
53
|
+
/**
|
|
54
|
+
* A month read as its first day.
|
|
55
|
+
*
|
|
56
|
+
* The one sanctioned widening from month precision to date precision,
|
|
57
|
+
* and the reason it is a named function rather than a template string:
|
|
58
|
+
* a consumer that needs a `Date` from a `YYYY-MM` field has to add a
|
|
59
|
+
* day from somewhere, and doing it inline puts an un-reviewed date
|
|
60
|
+
* construction in page code. Total — every 'YYYY-MM' plus '-01' is a
|
|
61
|
+
* valid 'YYYY-MM-DD'.
|
|
62
|
+
*/
|
|
63
|
+
export declare function firstOfMonth(month: IsoMonth): IsoDate;
|
|
64
|
+
/**
|
|
65
|
+
* A 'YYYY-MM' → the `Date` a caller needs, on the first of the month.
|
|
66
|
+
*
|
|
67
|
+
* Unchecked, because the brand already says the shape was checked —
|
|
68
|
+
* {@link isoMonth} is the only way to hold one.
|
|
69
|
+
*/
|
|
70
|
+
export declare function monthToDate(month: IsoMonth): Date;
|
|
71
|
+
/**
|
|
72
|
+
* A 'YYYY-MM-DD' → its `Date`, in the reader's own frame.
|
|
73
|
+
*
|
|
74
|
+
* Parsed by PARTS, never `new Date(iso)`: that reads a bare ISO date
|
|
75
|
+
* as UTC midnight, which then formats as the day BEFORE anywhere west
|
|
76
|
+
* of Greenwich. A stored date names a calendar day and carries no time
|
|
77
|
+
* zone, so the day printed has to be the day stored.
|
|
78
|
+
*
|
|
79
|
+
* This is also why no date question is settled by comparing text:
|
|
80
|
+
* 'YYYY-MM' sorts BEFORE every 'YYYY-MM-DD' that falls inside it, so
|
|
81
|
+
* April 2015 would read as earlier than 1 April 2015. Dates compare as
|
|
82
|
+
* dates.
|
|
83
|
+
*
|
|
84
|
+
* Unchecked for the same reason as {@link monthToDate}: the brand is
|
|
85
|
+
* the check, and {@link isoDate} is the only way to hold one.
|
|
86
|
+
*/
|
|
87
|
+
export declare function isoToDate(iso: IsoDate): Date;
|
package/dist/iso-date.js
ADDED
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The two date precisions this library holds, kept apart by the
|
|
3
|
+
* COMPILER rather than by a doc comment.
|
|
4
|
+
*
|
|
5
|
+
* Both are ISO text at runtime and both stay JSON-safe. The brand
|
|
6
|
+
* exists because the two are otherwise interchangeable, and handing
|
|
7
|
+
* one reader the other's precision fails OPEN: it builds an Invalid
|
|
8
|
+
* Date, every comparison against one is false, and the value then
|
|
9
|
+
* passes every date rule downstream. A wrong answer that looks like a
|
|
10
|
+
* right one is the worst failure this data has, so the type system
|
|
11
|
+
* carries the distinction.
|
|
12
|
+
*
|
|
13
|
+
* Lives here rather than in `@casomoltd/paye-calc`, which deals in tax
|
|
14
|
+
* years and holds no dates at all: a library carrying a concept it
|
|
15
|
+
* does not use is the same layering rule pointing the other way. Move
|
|
16
|
+
* it down if paye-calc ever grows dates.
|
|
17
|
+
*
|
|
18
|
+
* The concrete cost of NOT having this, before it existed: a consumer
|
|
19
|
+
* bridged the two precisions by writing `` `${award.expectedInPay}-01` ``
|
|
20
|
+
* — a hand-rolled splice on a month field, in the same codebase whose
|
|
21
|
+
* production error log was carrying `RangeError: Invalid Date`.
|
|
22
|
+
*/
|
|
23
|
+
import { invariant } from './errors.js';
|
|
24
|
+
/**
|
|
25
|
+
* The ONLY way to make an {@link IsoMonth}, and so the one place the
|
|
26
|
+
* shape is checked. SHAPE, not validity — see {@link isoDate}.
|
|
27
|
+
*/
|
|
28
|
+
export function isoMonth(value) {
|
|
29
|
+
invariant(/^\d{4}-\d{2}$/.test(value), `not a 'YYYY-MM' month: ${value}`);
|
|
30
|
+
return value;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* The ONLY way to make an {@link IsoDate}.
|
|
34
|
+
*
|
|
35
|
+
* Checks the SHAPE and nothing more: `2025-02-31` is four digits, two
|
|
36
|
+
* and two, so it mints one, and {@link isoToDate} then rolls it to
|
|
37
|
+
* 3 March. What a date IS cannot be settled by a regex — the real test
|
|
38
|
+
* is a round trip through `Date`, and that belongs at the one place
|
|
39
|
+
* typed text enters a consumer, which hands back the value itself
|
|
40
|
+
* rather than text for this to re-check.
|
|
41
|
+
*/
|
|
42
|
+
export function isoDate(value) {
|
|
43
|
+
invariant(/^\d{4}-\d{2}-\d{2}$/.test(value), `not a 'YYYY-MM-DD' date: ${value}`);
|
|
44
|
+
return value;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* The month a date falls in. The ONE place a day is deliberately
|
|
48
|
+
* dropped, named so the loss shows at the call site instead of inside
|
|
49
|
+
* a `String.slice` nobody reads.
|
|
50
|
+
*/
|
|
51
|
+
export function monthOf(date) {
|
|
52
|
+
return isoMonth(date.slice(0, 7));
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* A month read as its first day.
|
|
56
|
+
*
|
|
57
|
+
* The one sanctioned widening from month precision to date precision,
|
|
58
|
+
* and the reason it is a named function rather than a template string:
|
|
59
|
+
* a consumer that needs a `Date` from a `YYYY-MM` field has to add a
|
|
60
|
+
* day from somewhere, and doing it inline puts an un-reviewed date
|
|
61
|
+
* construction in page code. Total — every 'YYYY-MM' plus '-01' is a
|
|
62
|
+
* valid 'YYYY-MM-DD'.
|
|
63
|
+
*/
|
|
64
|
+
export function firstOfMonth(month) {
|
|
65
|
+
return isoDate(`${month}-01`);
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* A 'YYYY-MM' → the `Date` a caller needs, on the first of the month.
|
|
69
|
+
*
|
|
70
|
+
* Unchecked, because the brand already says the shape was checked —
|
|
71
|
+
* {@link isoMonth} is the only way to hold one.
|
|
72
|
+
*/
|
|
73
|
+
export function monthToDate(month) {
|
|
74
|
+
const [y, m] = month.split('-').map(Number);
|
|
75
|
+
return new Date(y, m - 1, 1);
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* A 'YYYY-MM-DD' → its `Date`, in the reader's own frame.
|
|
79
|
+
*
|
|
80
|
+
* Parsed by PARTS, never `new Date(iso)`: that reads a bare ISO date
|
|
81
|
+
* as UTC midnight, which then formats as the day BEFORE anywhere west
|
|
82
|
+
* of Greenwich. A stored date names a calendar day and carries no time
|
|
83
|
+
* zone, so the day printed has to be the day stored.
|
|
84
|
+
*
|
|
85
|
+
* This is also why no date question is settled by comparing text:
|
|
86
|
+
* 'YYYY-MM' sorts BEFORE every 'YYYY-MM-DD' that falls inside it, so
|
|
87
|
+
* April 2015 would read as earlier than 1 April 2015. Dates compare as
|
|
88
|
+
* dates.
|
|
89
|
+
*
|
|
90
|
+
* Unchecked for the same reason as {@link monthToDate}: the brand is
|
|
91
|
+
* the check, and {@link isoDate} is the only way to hold one.
|
|
92
|
+
*/
|
|
93
|
+
export function isoToDate(iso) {
|
|
94
|
+
const [y, m, d] = iso.split('-').map(Number);
|
|
95
|
+
return new Date(y, m - 1, d);
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=iso-date.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"iso-date.js","sourceRoot":"","sources":["../src/iso-date.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAQtC;;;GAGG;AACH,MAAM,UAAU,QAAQ,CAAC,KAAa;IACpC,SAAS,CACP,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAC3B,0BAA0B,KAAK,EAAE,CAClC,CAAC;IACF,OAAO,KAAiB,CAAC;AAC3B,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,OAAO,CAAC,KAAa;IACnC,SAAS,CACP,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,EACjC,4BAA4B,KAAK,EAAE,CACpC,CAAC;IACF,OAAO,KAAgB,CAAC;AAC1B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,IAAa;IACnC,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,KAAe;IAC1C,OAAO,OAAO,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC;AAChC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,KAAe;IACzC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC5C,OAAO,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,SAAS,CAAC,GAAY;IACpC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7C,OAAO,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/B,CAAC"}
|
package/dist/medical-scales.d.ts
CHANGED
|
@@ -19,7 +19,8 @@
|
|
|
19
19
|
* variants (MN13/15/21/35/37/39); the second staff-grade scales
|
|
20
20
|
* (England MH03/05, NI M212).
|
|
21
21
|
*/
|
|
22
|
-
import type { Nation,
|
|
22
|
+
import type { Nation, PayYear } from '@casomoltd/paye-calc';
|
|
23
|
+
import type { DocumentSource } from './document-source.js';
|
|
23
24
|
import type { GradeMeta } from './scale-tables.js';
|
|
24
25
|
/** Doctor grade identifiers wired into the domain. */
|
|
25
26
|
export declare const MEDICAL_GRADES: {
|
|
@@ -52,13 +53,27 @@ export declare const MEDICAL_GRADE_IDS: MedicalGradeId[];
|
|
|
52
53
|
/** A doctor grade's scale points in a nation/year, with its range. */
|
|
53
54
|
export type MedicalGradeMeta = GradeMeta<MedicalGradeId>;
|
|
54
55
|
/**
|
|
55
|
-
*
|
|
56
|
+
* Pay years this family publishes, newest first — derived from the
|
|
56
57
|
* data so a new pay round can't leave a hand-maintained list stale.
|
|
57
58
|
*/
|
|
58
|
-
export declare const
|
|
59
|
+
export declare const MEDICAL_PAY_YEARS: readonly PayYear[];
|
|
59
60
|
/**
|
|
60
61
|
* Published doctor grades for a nation and tax year, each with its
|
|
61
62
|
* scale points and salary range. Both args required — no default;
|
|
62
63
|
* an absent grade set throws `ScaleUnavailable`.
|
|
63
64
|
*/
|
|
64
|
-
export declare function getMedicalScales(year:
|
|
65
|
+
export declare function getMedicalScales(year: PayYear, nation: Nation): MedicalGradeMeta[];
|
|
66
|
+
/**
|
|
67
|
+
* The newest medical & dental document a nation has published, across
|
|
68
|
+
* every grade and every year it publishes.
|
|
69
|
+
*
|
|
70
|
+
* For prose that cites the nation rather than one family's table.
|
|
71
|
+
* Newest by issue date, not by any hardcoded preference: Scotland
|
|
72
|
+
* splits its 2026/27 round across two circulars and this picks
|
|
73
|
+
* PCS(DD)2026/02 (12 August) over PCS(DD)2026/01 (1 April).
|
|
74
|
+
*
|
|
75
|
+
* Walks back a year where a nation is behind — Northern Ireland has
|
|
76
|
+
* published no 2026-27 medical circular, and its most recent one is
|
|
77
|
+
* still the right thing to cite.
|
|
78
|
+
*/
|
|
79
|
+
export declare function latestMedicalSource(nation: Nation): DocumentSource;
|
package/dist/medical-scales.js
CHANGED
|
@@ -20,10 +20,13 @@
|
|
|
20
20
|
* (England MH03/05, NI M212).
|
|
21
21
|
*/
|
|
22
22
|
import { NATION_KEYS, TAX_YEARS } from '@casomoltd/paye-calc';
|
|
23
|
-
import {
|
|
24
|
-
import {
|
|
23
|
+
import { ScaleUnavailable } from './errors.js';
|
|
24
|
+
import { byCode, combineScales, fromDocument, byStage, numbered, range, resolveGradeMetas, scaleSalaries, stepped, } from './scale-tables.js';
|
|
25
|
+
import { HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, PC_MD_1_2026_R2, PCS_DD_2025_01, PCS_DD_2025_01_ADDENDUM, PCS_DD_2026_01, PCS_DD_2026_02, } from './sources.js';
|
|
26
|
+
import { ENGLAND_MD_1_2026_R2 as ENG } from './circulars/england-md-1-2026-r2.js';
|
|
25
27
|
import { SCOTLAND_PCS_DD_2026_01 as SCO } from './circulars/scotland-pcs-dd-2026-01.js';
|
|
26
28
|
import { SCOTLAND_PCS_DD_2025_01 as SCO25 } from './circulars/scotland-pcs-dd-2025-01.js';
|
|
29
|
+
import { SCOTLAND_PCS_DD_2026_02 as SCO2 } from './circulars/scotland-pcs-dd-2026-02.js';
|
|
27
30
|
import { WALES_MDW_01_2025 as WAL } from './circulars/wales-mdw-01-2025.js';
|
|
28
31
|
import { WALES_MDW_01_2026 as WAL26 } from './circulars/wales-mdw-01-2026.js';
|
|
29
32
|
import { NI_HSC_TC8_05_2025 as NI } from './circulars/ni-hsc-tc8-05-2025.js';
|
|
@@ -63,7 +66,7 @@ const consultantByYear = (rows) => rows.map((r) => ({
|
|
|
63
66
|
salary: r.salary,
|
|
64
67
|
yearsExperience: r.yearCompleted,
|
|
65
68
|
}));
|
|
66
|
-
const england = {
|
|
69
|
+
const england = fromDocument(PC_MD_1_2026_R2, {
|
|
67
70
|
resident: byStage(ENG.doctorsInTraining),
|
|
68
71
|
consultant: consultantByYear(ENG.consultant),
|
|
69
72
|
'specialty-doctor': byCode(ENG.specialtyDoctor),
|
|
@@ -75,8 +78,29 @@ const england = {
|
|
|
75
78
|
'associate-specialist': stepped(scaleSalaries(ENG.closedGrades, (g) => g.code === 'MC01', 'MC01')),
|
|
76
79
|
'specialty-doctor-2008': byCode(ENG.specialtyDoctor2008),
|
|
77
80
|
'associate-specialist-2008': byCode(ENG.associateSpecialist2008),
|
|
78
|
-
};
|
|
79
|
-
|
|
81
|
+
});
|
|
82
|
+
// Non-training grades from PCS(DD)2026/02 (12 Aug 2026); training
|
|
83
|
+
// grades from PCS(DD)2026/01, which deferred the rest to it. The
|
|
84
|
+
// two together are Scotland's complete 2026/27 round.
|
|
85
|
+
const scotland = combineScales(fromDocument(PCS_DD_2026_02, {
|
|
86
|
+
consultant: consultantByYear(SCO2.consultant),
|
|
87
|
+
'specialty-doctor': SCO2.specialtyDoctor2022.map((r) => ({
|
|
88
|
+
label: r.scalePoint === 0 ? 'Minimum' : `Point ${r.scalePoint}`,
|
|
89
|
+
salary: r.salary,
|
|
90
|
+
yearsExperience: r.scalePoint,
|
|
91
|
+
})),
|
|
92
|
+
specialist: SCO2.specialist2022.map((r) => ({
|
|
93
|
+
label: r.scalePoint === 0 ? 'Minimum' : `Point ${r.scalePoint}`,
|
|
94
|
+
salary: r.salary,
|
|
95
|
+
yearsExperience: r.scalePoint,
|
|
96
|
+
})),
|
|
97
|
+
'specialty-doctor-2008': stepped(SCO2.specialtyDoctor2008),
|
|
98
|
+
'associate-specialist-2008': stepped(SCO2.associateSpecialist2008),
|
|
99
|
+
'associate-specialist': stepped(scaleSalaries(SCO2.closedGrades, (g) => g.code === 'pre2008-as', 'Sco26 pre2008 AS')),
|
|
100
|
+
'staff-grade': stepped(scaleSalaries(SCO2.closedGrades, (g) => g.code === 'pre1997-sg', 'Sco26 pre1997 SG')),
|
|
101
|
+
'salaried-gp': range(SCO2.salariedGpRange),
|
|
102
|
+
'gp-educator': SCO2.associateAdvisers.map((r) => ({ label: r.grade, salary: r.salary })),
|
|
103
|
+
}), fromDocument(PCS_DD_2026_01, {
|
|
80
104
|
fho1: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Foundation House Officer 1', 'Sco FHO1')),
|
|
81
105
|
fho2: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'Foundation House Officer 2', 'Sco FHO2')),
|
|
82
106
|
sho: stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade.startsWith('Senior House Officer'), 'Sco SHO')),
|
|
@@ -87,8 +111,8 @@ const scotland = {
|
|
|
87
111
|
'gp-registrar-sho': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'GP Specialty Registrar (SHO)', 'Sco GP SHO')),
|
|
88
112
|
'gp-registrar-spr': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'GP Specialty Registrar (SpR)', 'Sco GP SpR')),
|
|
89
113
|
'gp-registrar-str': stepped(scaleSalaries(SCO.trainingGrades, (g) => g.grade === 'GP Specialty Registrar (StR)', 'Sco GP StR')),
|
|
90
|
-
};
|
|
91
|
-
const wales = {
|
|
114
|
+
}));
|
|
115
|
+
const wales = fromDocument(MD_W_01_2025, {
|
|
92
116
|
consultant: consultantByYear(WAL.consultant),
|
|
93
117
|
str: stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN37', 'Wal MN37')),
|
|
94
118
|
'specialty-registrar-core': stepped(scaleSalaries(WAL.trainingGrades, (g) => g.code === 'MN39', 'Wal MN39')),
|
|
@@ -103,8 +127,8 @@ const wales = {
|
|
|
103
127
|
'specialty-doctor-2008': byCode(WAL.specialtyDoctor2008),
|
|
104
128
|
'associate-specialist-2008': byCode(WAL.associateSpecialist2008),
|
|
105
129
|
'hospital-practitioner': stepped(scaleSalaries(WAL.closedGrades, (g) => g.code === 'MD01-41', 'Wal HP')),
|
|
106
|
-
};
|
|
107
|
-
const northernIreland = {
|
|
130
|
+
});
|
|
131
|
+
const northernIreland = fromDocument(HSC_TC8_05_2025, {
|
|
108
132
|
fho1: stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M220', 'NI M220')),
|
|
109
133
|
fho2: stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M230', 'NI M230')),
|
|
110
134
|
str: stepped(scaleSalaries(NI.residentGrades, (g) => g.code === 'M241', 'NI M241')),
|
|
@@ -128,11 +152,11 @@ const northernIreland = {
|
|
|
128
152
|
'associate-specialist-2008': byCode(NI.associateSpecialist2008),
|
|
129
153
|
'associate-specialist': stepped(scaleSalaries(NI.closedGrades, (g) => g.code === 'M080', 'NI M080')),
|
|
130
154
|
'staff-grade': stepped(scaleSalaries(NI.closedGrades, (g) => g.code === 'M211', 'NI M211')),
|
|
131
|
-
};
|
|
155
|
+
});
|
|
132
156
|
// Wales 2026/27 (M&D(W) 01/2026) — a full 3.5% uplift of the 2025 scales.
|
|
133
157
|
// The Associate Specialist MC01 code is removed in this circular, so unlike
|
|
134
158
|
// `wales` (2025) there is no 'associate-specialist' entry here.
|
|
135
|
-
const wales2026 = {
|
|
159
|
+
const wales2026 = fromDocument(MD_W_01_2026, {
|
|
136
160
|
consultant: consultantByYear(WAL26.consultant),
|
|
137
161
|
str: stepped(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN37', 'Wal26 MN37')),
|
|
138
162
|
'specialty-registrar-core': stepped(scaleSalaries(WAL26.trainingGrades, (g) => g.code === 'MN39', 'Wal26 MN39')),
|
|
@@ -146,12 +170,13 @@ const wales2026 = {
|
|
|
146
170
|
'specialty-doctor-2008': byCode(WAL26.specialtyDoctor2008),
|
|
147
171
|
'associate-specialist-2008': byCode(WAL26.associateSpecialist2008),
|
|
148
172
|
'hospital-practitioner': stepped(scaleSalaries(WAL26.closedGrades, (g) => g.code === 'MD01-41', 'Wal26 HP')),
|
|
149
|
-
};
|
|
150
|
-
// Scotland 2025/26 —
|
|
151
|
-
//
|
|
152
|
-
//
|
|
153
|
-
//
|
|
154
|
-
|
|
173
|
+
});
|
|
174
|
+
// Scotland 2025/26 — a complete round in one circular (non-training
|
|
175
|
+
// from the main document, training grades from its addendum).
|
|
176
|
+
// Scotland's 2026/27 round is complete too, but across TWO circulars:
|
|
177
|
+
// 2026/01 carries the training grades and 2026/02 everything else, so
|
|
178
|
+
// a new Scottish scale belongs in whichever of those published it.
|
|
179
|
+
const scotland2025 = combineScales(fromDocument(PCS_DD_2025_01, {
|
|
155
180
|
consultant: consultantByYear(SCO25.consultant),
|
|
156
181
|
'specialty-doctor': SCO25.specialtyDoctor2022.map((r) => ({
|
|
157
182
|
label: r.scalePoint === 0 ? 'Minimum' : `Point ${r.scalePoint}`,
|
|
@@ -170,6 +195,7 @@ const scotland2025 = {
|
|
|
170
195
|
'hospital-practitioner': numbered(SCO25.hospitalPractitioner),
|
|
171
196
|
'salaried-gp': range(SCO25.salariedGpRange),
|
|
172
197
|
'gp-educator': SCO25.associateAdvisers.map((r) => ({ label: r.grade, salary: r.salary })),
|
|
198
|
+
}), fromDocument(PCS_DD_2025_01_ADDENDUM, {
|
|
173
199
|
fho1: stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'FHO1', 'Sco25 FHO1')),
|
|
174
200
|
fho2: stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'FHO2', 'Sco25 FHO2')),
|
|
175
201
|
sho: stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'SHO', 'Sco25 SHO')),
|
|
@@ -180,7 +206,7 @@ const scotland2025 = {
|
|
|
180
206
|
'gp-registrar-sho': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'GP-SHO', 'Sco25 GP SHO')),
|
|
181
207
|
'gp-registrar-spr': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'GP-SpR', 'Sco25 GP SpR')),
|
|
182
208
|
'gp-registrar-str': stepped(scaleSalaries(SCO25.trainingGrades, (g) => g.code === 'GP-StR', 'Sco25 GP StR')),
|
|
183
|
-
};
|
|
209
|
+
}));
|
|
184
210
|
const MEDICAL_SCALES = {
|
|
185
211
|
[TAX_YEARS.Y2026_27]: {
|
|
186
212
|
[NATION_KEYS.england]: england,
|
|
@@ -194,10 +220,10 @@ const MEDICAL_SCALES = {
|
|
|
194
220
|
},
|
|
195
221
|
};
|
|
196
222
|
/**
|
|
197
|
-
*
|
|
223
|
+
* Pay years this family publishes, newest first — derived from the
|
|
198
224
|
* data so a new pay round can't leave a hand-maintained list stale.
|
|
199
225
|
*/
|
|
200
|
-
export const
|
|
226
|
+
export const MEDICAL_PAY_YEARS = Object.keys(MEDICAL_SCALES).sort().reverse();
|
|
201
227
|
/**
|
|
202
228
|
* Published doctor grades for a nation and tax year, each with its
|
|
203
229
|
* scale points and salary range. Both args required — no default;
|
|
@@ -206,4 +232,35 @@ export const MEDICAL_TAX_YEARS = Object.keys(MEDICAL_SCALES).sort().reverse();
|
|
|
206
232
|
export function getMedicalScales(year, nation) {
|
|
207
233
|
return resolveGradeMetas(MEDICAL_SCALES, MEDICAL_GRADE_IDS, year, nation);
|
|
208
234
|
}
|
|
235
|
+
/**
|
|
236
|
+
* The newest medical & dental document a nation has published, across
|
|
237
|
+
* every grade and every year it publishes.
|
|
238
|
+
*
|
|
239
|
+
* For prose that cites the nation rather than one family's table.
|
|
240
|
+
* Newest by issue date, not by any hardcoded preference: Scotland
|
|
241
|
+
* splits its 2026/27 round across two circulars and this picks
|
|
242
|
+
* PCS(DD)2026/02 (12 August) over PCS(DD)2026/01 (1 April).
|
|
243
|
+
*
|
|
244
|
+
* Walks back a year where a nation is behind — Northern Ireland has
|
|
245
|
+
* published no 2026-27 medical circular, and its most recent one is
|
|
246
|
+
* still the right thing to cite.
|
|
247
|
+
*/
|
|
248
|
+
export function latestMedicalSource(nation) {
|
|
249
|
+
for (const year of MEDICAL_PAY_YEARS) {
|
|
250
|
+
let metas;
|
|
251
|
+
try {
|
|
252
|
+
metas = getMedicalScales(year, nation);
|
|
253
|
+
}
|
|
254
|
+
catch (error) {
|
|
255
|
+
if (!(error instanceof ScaleUnavailable))
|
|
256
|
+
throw error;
|
|
257
|
+
continue;
|
|
258
|
+
}
|
|
259
|
+
const [first, ...rest] = metas.map((m) => m.source);
|
|
260
|
+
if (first) {
|
|
261
|
+
return rest.reduce((a, b) => (b.issued > a.issued ? b : a), first);
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
throw new ScaleUnavailable(nation, MEDICAL_PAY_YEARS[0]);
|
|
265
|
+
}
|
|
209
266
|
//# sourceMappingURL=medical-scales.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"medical-scales.js","sourceRoot":"","sources":["../src/medical-scales.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"medical-scales.js","sourceRoot":"","sources":["../src/medical-scales.ts"],"names":[],"mappings":"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"}
|
package/dist/pension.d.ts
CHANGED
|
@@ -75,6 +75,36 @@ export declare function lookupPensionTier(salary: number, tiers: PensionTier[]):
|
|
|
75
75
|
tier: number;
|
|
76
76
|
band: PensionTier;
|
|
77
77
|
} | null;
|
|
78
|
+
/**
|
|
79
|
+
* The NHS pension scheme a nation's staff belong to, and the
|
|
80
|
+
* document that publishes its member contribution tiers.
|
|
81
|
+
*
|
|
82
|
+
* Named separately from {@link EmployerPensionRate} because the two
|
|
83
|
+
* answer different questions and cite different documents: that one
|
|
84
|
+
* carries what the employer pays, this one identifies the scheme a
|
|
85
|
+
* reader is actually in and cites the tiers {@link getPensionTiers}
|
|
86
|
+
* returns.
|
|
87
|
+
*/
|
|
88
|
+
export interface NhsPensionScheme {
|
|
89
|
+
/** Scheme name as its own administrator publishes it. */
|
|
90
|
+
name: string;
|
|
91
|
+
/** Body that administers the scheme. */
|
|
92
|
+
administrator: string;
|
|
93
|
+
/**
|
|
94
|
+
* The document stating the member contribution rates for this
|
|
95
|
+
* year. Year-aware because the tiers are: SPPA republishes a
|
|
96
|
+
* circular per year, so citing a single page would date.
|
|
97
|
+
*/
|
|
98
|
+
source: string;
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* The scheme a nation's NHS staff contribute to for a tax year,
|
|
102
|
+
* with the citation for that year's member tiers. Throws
|
|
103
|
+
* {@link PensionTiersUnavailable} for a year the scheme has not
|
|
104
|
+
* published, so a caller can never render a rate beside a
|
|
105
|
+
* citation that does not cover it.
|
|
106
|
+
*/
|
|
107
|
+
export declare function getPensionScheme(year: TaxYear, nation: Nation): NhsPensionScheme;
|
|
78
108
|
/**
|
|
79
109
|
* Member pension contribution tiers for a nation and tax year.
|
|
80
110
|
*
|