@casomoltd/nhs-pay 0.8.0 → 0.9.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.
@@ -0,0 +1,48 @@
1
+ /**
2
+ * Calendar-date arithmetic. Package-private: consumed by
3
+ * pension-projection, deliberately not exported from the package
4
+ * root — consumers get scenario-level APIs, not date plumbing.
5
+ *
6
+ * Two distinct period policies live here ON PURPOSE — do not
7
+ * unify them:
8
+ * - periodInYearsMonths: complete calendar months on the
9
+ * day-clamped anniversary convention (the UK
10
+ * corresponding-date rule, Dodds v Walker [1981]) — what GAD
11
+ * factor lookups require.
12
+ * - yearsBetween: fractional 365.25-day years — what continuous
13
+ * compounding (revaluation, CPI deflation) requires.
14
+ * Feeding one into the other's consumer corrupts results.
15
+ *
16
+ * The platform has no period/duration type; Temporal
17
+ * (PlainDate.until) is the coming standard and is used as a
18
+ * dev-only test oracle (tests/period-oracle.test.ts). Migrate to
19
+ * it when Node ships Temporal unflagged.
20
+ */
21
+ /**
22
+ * Calculate the period between two dates in complete years and
23
+ * months plus remaining days, on the anniversary convention: a
24
+ * month completes on the day-clamped monthly anniversary of
25
+ * `from` (so 31 Jan → 28 Feb is one complete month). Requires
26
+ * `from <= to`; the postcondition invariant guards the contract
27
+ * a calendar period must satisfy — a naive month-diff-and-borrow
28
+ * here once produced negative days for month-end dates, which
29
+ * silently defeated the ERF round-up downstream.
30
+ */
31
+ export declare function periodInYearsMonths(from: Date, to: Date): {
32
+ years: number;
33
+ months: number;
34
+ days: number;
35
+ };
36
+ /** Fractional years between two dates, in 365.25-day years —
37
+ * for compounding, never for factor-table lookups (see the
38
+ * module header). */
39
+ export declare function yearsBetween(from: Date, to: Date): number;
40
+ /**
41
+ * NPA date = date of birth + NPA years. A 29 Feb birth date in
42
+ * a non-leap target year rolls over to 1 Mar via the Date
43
+ * constructor — DELIBERATE: that is the E&W age-attainment
44
+ * convention (a person born 29 Feb attains an age on 1 Mar in a
45
+ * common year), so do not "fix" this with day-clamping, which
46
+ * would move NPA a day earlier to 28 Feb.
47
+ */
48
+ export declare function npaDate(dateOfBirth: Date, npa: number): Date;
package/dist/dates.js ADDED
@@ -0,0 +1,74 @@
1
+ /**
2
+ * Calendar-date arithmetic. Package-private: consumed by
3
+ * pension-projection, deliberately not exported from the package
4
+ * root — consumers get scenario-level APIs, not date plumbing.
5
+ *
6
+ * Two distinct period policies live here ON PURPOSE — do not
7
+ * unify them:
8
+ * - periodInYearsMonths: complete calendar months on the
9
+ * day-clamped anniversary convention (the UK
10
+ * corresponding-date rule, Dodds v Walker [1981]) — what GAD
11
+ * factor lookups require.
12
+ * - yearsBetween: fractional 365.25-day years — what continuous
13
+ * compounding (revaluation, CPI deflation) requires.
14
+ * Feeding one into the other's consumer corrupts results.
15
+ *
16
+ * The platform has no period/duration type; Temporal
17
+ * (PlainDate.until) is the coming standard and is used as a
18
+ * dev-only test oracle (tests/period-oracle.test.ts). Migrate to
19
+ * it when Node ships Temporal unflagged.
20
+ */
21
+ import { invariant } from './errors.js';
22
+ const MS_PER_DAY = 24 * 60 * 60 * 1000;
23
+ const MS_PER_YEAR = 365.25 * MS_PER_DAY;
24
+ /** `date` plus `n` months, day-of-month clamped to the target
25
+ * month's length (31 Jan + 1mo = 28 Feb). */
26
+ function addMonthsClamped(date, n) {
27
+ const lastDay = new Date(date.getFullYear(), date.getMonth() + n + 1, 0).getDate();
28
+ return new Date(date.getFullYear(), date.getMonth() + n, Math.min(date.getDate(), lastDay));
29
+ }
30
+ /**
31
+ * Calculate the period between two dates in complete years and
32
+ * months plus remaining days, on the anniversary convention: a
33
+ * month completes on the day-clamped monthly anniversary of
34
+ * `from` (so 31 Jan → 28 Feb is one complete month). Requires
35
+ * `from <= to`; the postcondition invariant guards the contract
36
+ * a calendar period must satisfy — a naive month-diff-and-borrow
37
+ * here once produced negative days for month-end dates, which
38
+ * silently defeated the ERF round-up downstream.
39
+ */
40
+ export function periodInYearsMonths(from, to) {
41
+ let totalMonths = (to.getFullYear() - from.getFullYear()) * 12
42
+ + (to.getMonth() - from.getMonth());
43
+ if (addMonthsClamped(from, totalMonths) > to) {
44
+ totalMonths -= 1;
45
+ }
46
+ const anniversary = addMonthsClamped(from, totalMonths);
47
+ // Round absorbs the ±1h a DST boundary shifts local midnight.
48
+ const days = Math.round((to.getTime() - anniversary.getTime()) / MS_PER_DAY);
49
+ const years = Math.floor(totalMonths / 12);
50
+ const months = totalMonths % 12;
51
+ invariant(years >= 0 && months >= 0 && months < 12
52
+ && days >= 0 && days <= 31, `periodInYearsMonths produced an invalid period `
53
+ + `${years}yr ${months}mo ${days}d for `
54
+ + `${from.toISOString()} → ${to.toISOString()}`);
55
+ return { years, months, days };
56
+ }
57
+ /** Fractional years between two dates, in 365.25-day years —
58
+ * for compounding, never for factor-table lookups (see the
59
+ * module header). */
60
+ export function yearsBetween(from, to) {
61
+ return (to.getTime() - from.getTime()) / MS_PER_YEAR;
62
+ }
63
+ /**
64
+ * NPA date = date of birth + NPA years. A 29 Feb birth date in
65
+ * a non-leap target year rolls over to 1 Mar via the Date
66
+ * constructor — DELIBERATE: that is the E&W age-attainment
67
+ * convention (a person born 29 Feb attains an age on 1 Mar in a
68
+ * common year), so do not "fix" this with day-clamping, which
69
+ * would move NPA a day earlier to 28 Feb.
70
+ */
71
+ export function npaDate(dateOfBirth, npa) {
72
+ return new Date(dateOfBirth.getFullYear() + npa, dateOfBirth.getMonth(), dateOfBirth.getDate());
73
+ }
74
+ //# sourceMappingURL=dates.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dates.js","sourceRoot":"","sources":["../src/dates.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAEtC,MAAM,UAAU,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACvC,MAAM,WAAW,GAAG,MAAM,GAAG,UAAU,CAAC;AAExC;6CAC6C;AAC7C,SAAS,gBAAgB,CAAC,IAAU,EAAE,CAAS;IAC7C,MAAM,OAAO,GAAG,IAAI,IAAI,CACtB,IAAI,CAAC,WAAW,EAAE,EAClB,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,EACvB,CAAC,CACF,CAAC,OAAO,EAAE,CAAC;IACZ,OAAO,IAAI,IAAI,CACb,IAAI,CAAC,WAAW,EAAE,EAClB,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,EACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAClC,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CACjC,IAAU,EACV,EAAQ;IAER,IAAI,WAAW,GACb,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE;UAC1C,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtC,IAAI,gBAAgB,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC;QAC7C,WAAW,IAAI,CAAC,CAAC;IACnB,CAAC;IACD,MAAM,WAAW,GAAG,gBAAgB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACxD,8DAA8D;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CACrB,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC,GAAG,UAAU,CACpD,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,WAAW,GAAG,EAAE,CAAC;IAEhC,SAAS,CACP,KAAK,IAAI,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,MAAM,GAAG,EAAE;WACnC,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,EAC5B,iDAAiD;UAC7C,GAAG,KAAK,MAAM,MAAM,MAAM,IAAI,QAAQ;UACtC,GAAG,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,WAAW,EAAE,EAAE,CAClD,CAAC;IACF,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC;AAC/B,CAAC;AAED;;qBAEqB;AACrB,MAAM,UAAU,YAAY,CAAC,IAAU,EAAE,EAAQ;IAC/C,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC;AACvD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,OAAO,CACrB,WAAiB,EACjB,GAAW;IAEX,OAAO,IAAI,IAAI,CACb,WAAW,CAAC,WAAW,EAAE,GAAG,GAAG,EAC/B,WAAW,CAAC,QAAQ,EAAE,EACtB,WAAW,CAAC,OAAO,EAAE,CACtB,CAAC;AACJ,CAAC"}
package/dist/errors.d.ts CHANGED
@@ -46,6 +46,24 @@ export declare class PensionTiersUnavailable extends Error {
46
46
  readonly nation: Nation;
47
47
  constructor(year: TaxYear, nation: Nation);
48
48
  }
49
+ /**
50
+ * Thrown when a retirement period falls outside the printed GAD
51
+ * factor table — e.g. more than 13y0m early under the 30 Jun 2023
52
+ * ERF1. Sibling of {@link ScaleUnavailable}: the factor genuinely
53
+ * isn't published for that period, so callers with free date
54
+ * inputs catch it by type rather than matching message text.
55
+ */
56
+ export declare class RetirementFactorOutOfRange extends Error {
57
+ /** Table name in the governing guidance, e.g. 'ERF1' */
58
+ readonly guidanceRef: string;
59
+ readonly years: number;
60
+ readonly months: number;
61
+ readonly maxYears: number;
62
+ readonly maxMonths: number;
63
+ constructor(
64
+ /** Table name in the governing guidance, e.g. 'ERF1' */
65
+ guidanceRef: string, years: number, months: number, maxYears: number, maxMonths: number);
66
+ }
49
67
  /**
50
68
  * Thrown when no AfC pay award (consolidated % uplift) is recorded
51
69
  * for a (nation, year). Sibling of {@link ScaleUnavailable} — the
package/dist/errors.js CHANGED
@@ -60,6 +60,32 @@ export class PensionTiersUnavailable extends Error {
60
60
  this.name = 'PensionTiersUnavailable';
61
61
  }
62
62
  }
63
+ /**
64
+ * Thrown when a retirement period falls outside the printed GAD
65
+ * factor table — e.g. more than 13y0m early under the 30 Jun 2023
66
+ * ERF1. Sibling of {@link ScaleUnavailable}: the factor genuinely
67
+ * isn't published for that period, so callers with free date
68
+ * inputs catch it by type rather than matching message text.
69
+ */
70
+ export class RetirementFactorOutOfRange extends Error {
71
+ guidanceRef;
72
+ years;
73
+ months;
74
+ maxYears;
75
+ maxMonths;
76
+ constructor(
77
+ /** Table name in the governing guidance, e.g. 'ERF1' */
78
+ guidanceRef, years, months, maxYears, maxMonths) {
79
+ super(`${guidanceRef} out of range: ${years}yr ${months}mo `
80
+ + `(max ${maxYears}yr ${maxMonths}mo)`);
81
+ this.guidanceRef = guidanceRef;
82
+ this.years = years;
83
+ this.months = months;
84
+ this.maxYears = maxYears;
85
+ this.maxMonths = maxMonths;
86
+ this.name = 'RetirementFactorOutOfRange';
87
+ }
88
+ }
63
89
  /**
64
90
  * Thrown when no AfC pay award (consolidated % uplift) is recorded
65
91
  * for a (nation, year). Sibling of {@link ScaleUnavailable} — the
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CACvB,SAAkB,EAClB,OAAe;IAEf,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAE9B;IACA;IACA;IAEA;IALX,YACW,MAAc,EACd,IAAa,EACb,OAAgB;IACzB,6DAA6D;IACpD,UAAmB;QAE5B,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;QAN9C,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAS;QACb,YAAO,GAAP,OAAO,CAAS;QAEhB,eAAU,GAAV,UAAU,CAAS;QAG5B,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAErC;IACA;IAFX,YACW,IAAa,EACb,MAAc;QAEvB,KAAK,CACH,sCAAsC,MAAM,IAAI,IAAI,EAAE,CACvD,CAAC;QALO,SAAI,GAAJ,IAAI,CAAS;QACb,WAAM,GAAN,MAAM,CAAQ;QAKvB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAE9B;IACA;IAFX,YACW,IAAa,EACb,MAAc;QAEvB,KAAK,CAAC,iCAAiC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAHhD,SAAI,GAAJ,IAAI,CAAS;QACb,WAAM,GAAN,MAAM,CAAQ;QAGvB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED,SAAS,YAAY,CACnB,MAAc,EACd,IAAa,EACb,OAAgB,EAChB,UAAmB;IAEnB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,mBAAmB,UAAU,QAAQ;cACxC,GAAG,OAAO,OAAO,MAAM,IAAI,IAAI,EAAE,CAAC;IACxC,CAAC;IACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,0BAA0B,OAAO,MAAM;cAC1C,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,8BAA8B,MAAM,IAAI,IAAI,EAAE,CAAC;AACxD,CAAC"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS,CACvB,SAAkB,EAClB,OAAe;IAEf,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAE9B;IACA;IACA;IAEA;IALX,YACW,MAAc,EACd,IAAa,EACb,OAAgB;IACzB,6DAA6D;IACpD,UAAmB;QAE5B,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;QAN9C,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAS;QACb,YAAO,GAAP,OAAO,CAAS;QAEhB,eAAU,GAAV,UAAU,CAAS;QAG5B,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,uBAAwB,SAAQ,KAAK;IAErC;IACA;IAFX,YACW,IAAa,EACb,MAAc;QAEvB,KAAK,CACH,sCAAsC,MAAM,IAAI,IAAI,EAAE,CACvD,CAAC;QALO,SAAI,GAAJ,IAAI,CAAS;QACb,WAAM,GAAN,MAAM,CAAQ;QAKvB,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAED;;;;;;GAMG;AACH,MAAM,OAAO,0BAA2B,SAAQ,KAAK;IAGxC;IACA;IACA;IACA;IACA;IANX;IACE,wDAAwD;IAC/C,WAAmB,EACnB,KAAa,EACb,MAAc,EACd,QAAgB,EAChB,SAAiB;QAE1B,KAAK,CACH,GAAG,WAAW,kBAAkB,KAAK,MAAM,MAAM,KAAK;cAClD,QAAQ,QAAQ,MAAM,SAAS,KAAK,CACzC,CAAC;QATO,gBAAW,GAAX,WAAW,CAAQ;QACnB,UAAK,GAAL,KAAK,CAAQ;QACb,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,cAAS,GAAT,SAAS,CAAQ;QAM1B,IAAI,CAAC,IAAI,GAAG,4BAA4B,CAAC;IAC3C,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAE9B;IACA;IAFX,YACW,IAAa,EACb,MAAc;QAEvB,KAAK,CAAC,iCAAiC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAHhD,SAAI,GAAJ,IAAI,CAAS;QACb,WAAM,GAAN,MAAM,CAAQ;QAGvB,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED,SAAS,YAAY,CACnB,MAAc,EACd,IAAa,EACb,OAAgB,EAChB,UAAmB;IAEnB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,mBAAmB,UAAU,QAAQ;cACxC,GAAG,OAAO,OAAO,MAAM,IAAI,IAAI,EAAE,CAAC;IACxC,CAAC;IACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,0BAA0B,OAAO,MAAM;cAC1C,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,8BAA8B,MAAM,IAAI,IAAI,EAAE,CAAC;AACxD,CAAC"}
@@ -0,0 +1,33 @@
1
+ /**
2
+ * Verbatim transcription — GAD "NHSPS_EW — Consolidated Factor
3
+ * Spreadsheet" (workbook: NHS EW Consolidated Factors 2023-03),
4
+ * issued 30 June 2023. Sheet x-420 · PDF p.25.
5
+ *
6
+ * https://www.nhsbsa.nhs.uk/sites/default/files/2024-02/Early%20and%20Late%20Retirement%20Factors.pdf
7
+ *
8
+ * Table 0-420 (ERF1): 2015 scheme early retirement factors, normal
9
+ * health — applicable to main scheme pension and additional
10
+ * pension. Unisex; period measured as time to NPA. Methodology
11
+ * (rounding, order of operations) remains the 7 Aug 2019 guidance,
12
+ * which the workbook names as its related factor table guidance.
13
+ *
14
+ * Rows are years early (0–13), columns months (0–11), exactly as
15
+ * printed — the 13yr row prints a single 0-month value, so it is a
16
+ * single-cell row here. Delete this file whole when a later issue
17
+ * supersedes the table (expected with the post-May-2026 SCAPE
18
+ * review; git history is the archive).
19
+ */
20
+ /** 2015 scheme ERF — Table 0-420, issued 30 Jun 2023. */
21
+ export declare const ERF_0_420: {
22
+ readonly kind: "erf";
23
+ readonly provenance: {
24
+ readonly tableRef: "0-420";
25
+ readonly sheet: "x-420";
26
+ readonly page: 25;
27
+ readonly guidanceRef: "ERF1";
28
+ readonly issued: "2023-06-30";
29
+ readonly sourceUrl: string;
30
+ readonly methodGuidance: string;
31
+ };
32
+ readonly rows: readonly [readonly [1, 0.996, 0.991, 0.987, 0.983, 0.978, 0.974, 0.969, 0.965, 0.961, 0.956, 0.952], readonly [0.948, 0.944, 0.939, 0.935, 0.931, 0.927, 0.923, 0.919, 0.915, 0.911, 0.907, 0.903], readonly [0.899, 0.896, 0.892, 0.888, 0.885, 0.881, 0.877, 0.874, 0.87, 0.866, 0.863, 0.859], readonly [0.855, 0.852, 0.849, 0.845, 0.842, 0.839, 0.835, 0.832, 0.828, 0.825, 0.822, 0.818], readonly [0.815, 0.812, 0.809, 0.806, 0.802, 0.799, 0.796, 0.793, 0.79, 0.787, 0.784, 0.781], readonly [0.777, 0.775, 0.772, 0.769, 0.766, 0.763, 0.76, 0.757, 0.754, 0.752, 0.749, 0.746], readonly [0.743, 0.74, 0.738, 0.735, 0.732, 0.73, 0.727, 0.724, 0.721, 0.719, 0.716, 0.713], readonly [0.711, 0.708, 0.706, 0.703, 0.701, 0.698, 0.696, 0.693, 0.691, 0.688, 0.686, 0.683], readonly [0.681, 0.679, 0.676, 0.674, 0.672, 0.669, 0.667, 0.665, 0.662, 0.66, 0.658, 0.655], readonly [0.653, 0.651, 0.649, 0.647, 0.644, 0.642, 0.64, 0.638, 0.636, 0.634, 0.631, 0.629], readonly [0.627, 0.625, 0.623, 0.621, 0.619, 0.617, 0.615, 0.613, 0.611, 0.609, 0.607, 0.605], readonly [0.603, 0.601, 0.599, 0.597, 0.595, 0.593, 0.591, 0.59, 0.588, 0.586, 0.584, 0.582], readonly [0.58, 0.578, 0.577, 0.575, 0.573, 0.571, 0.569, 0.568, 0.566, 0.564, 0.562, 0.561], readonly [0.559]];
33
+ };
@@ -0,0 +1,67 @@
1
+ /**
2
+ * Verbatim transcription — GAD "NHSPS_EW — Consolidated Factor
3
+ * Spreadsheet" (workbook: NHS EW Consolidated Factors 2023-03),
4
+ * issued 30 June 2023. Sheet x-420 · PDF p.25.
5
+ *
6
+ * https://www.nhsbsa.nhs.uk/sites/default/files/2024-02/Early%20and%20Late%20Retirement%20Factors.pdf
7
+ *
8
+ * Table 0-420 (ERF1): 2015 scheme early retirement factors, normal
9
+ * health — applicable to main scheme pension and additional
10
+ * pension. Unisex; period measured as time to NPA. Methodology
11
+ * (rounding, order of operations) remains the 7 Aug 2019 guidance,
12
+ * which the workbook names as its related factor table guidance.
13
+ *
14
+ * Rows are years early (0–13), columns months (0–11), exactly as
15
+ * printed — the 13yr row prints a single 0-month value, so it is a
16
+ * single-cell row here. Delete this file whole when a later issue
17
+ * supersedes the table (expected with the post-May-2026 SCAPE
18
+ * review; git history is the archive).
19
+ */
20
+ /** 2015 scheme ERF — Table 0-420, issued 30 Jun 2023. */
21
+ export const ERF_0_420 = {
22
+ kind: 'erf',
23
+ provenance: {
24
+ tableRef: '0-420',
25
+ sheet: 'x-420',
26
+ page: 25,
27
+ guidanceRef: 'ERF1',
28
+ issued: '2023-06-30',
29
+ sourceUrl: 'https://www.nhsbsa.nhs.uk/sites/default/'
30
+ + 'files/2024-02/Early%20and%20Late%20Retirement'
31
+ + '%20Factors.pdf',
32
+ methodGuidance: 'GAD NHSPS 2015 E&W — Early and late'
33
+ + ' retirement in normal health, 7 Aug 2019',
34
+ },
35
+ rows: [
36
+ // 0mo 1mo 2mo 3mo 4mo 5mo 6mo
37
+ // 7mo 8mo 9mo 10mo 11mo
38
+ [1.000, 0.996, 0.991, 0.987, 0.983, 0.978,
39
+ 0.974, 0.969, 0.965, 0.961, 0.956, 0.952], // 0yr
40
+ [0.948, 0.944, 0.939, 0.935, 0.931, 0.927,
41
+ 0.923, 0.919, 0.915, 0.911, 0.907, 0.903], // 1yr
42
+ [0.899, 0.896, 0.892, 0.888, 0.885, 0.881,
43
+ 0.877, 0.874, 0.870, 0.866, 0.863, 0.859], // 2yr
44
+ [0.855, 0.852, 0.849, 0.845, 0.842, 0.839,
45
+ 0.835, 0.832, 0.828, 0.825, 0.822, 0.818], // 3yr
46
+ [0.815, 0.812, 0.809, 0.806, 0.802, 0.799,
47
+ 0.796, 0.793, 0.790, 0.787, 0.784, 0.781], // 4yr
48
+ [0.777, 0.775, 0.772, 0.769, 0.766, 0.763,
49
+ 0.760, 0.757, 0.754, 0.752, 0.749, 0.746], // 5yr
50
+ [0.743, 0.740, 0.738, 0.735, 0.732, 0.730,
51
+ 0.727, 0.724, 0.721, 0.719, 0.716, 0.713], // 6yr
52
+ [0.711, 0.708, 0.706, 0.703, 0.701, 0.698,
53
+ 0.696, 0.693, 0.691, 0.688, 0.686, 0.683], // 7yr
54
+ [0.681, 0.679, 0.676, 0.674, 0.672, 0.669,
55
+ 0.667, 0.665, 0.662, 0.660, 0.658, 0.655], // 8yr
56
+ [0.653, 0.651, 0.649, 0.647, 0.644, 0.642,
57
+ 0.640, 0.638, 0.636, 0.634, 0.631, 0.629], // 9yr
58
+ [0.627, 0.625, 0.623, 0.621, 0.619, 0.617,
59
+ 0.615, 0.613, 0.611, 0.609, 0.607, 0.605], // 10yr
60
+ [0.603, 0.601, 0.599, 0.597, 0.595, 0.593,
61
+ 0.591, 0.590, 0.588, 0.586, 0.584, 0.582], // 11yr
62
+ [0.580, 0.578, 0.577, 0.575, 0.573, 0.571,
63
+ 0.569, 0.568, 0.566, 0.564, 0.562, 0.561], // 12yr
64
+ [0.559], // 13yr — 0mo only
65
+ ],
66
+ };
67
+ //# sourceMappingURL=erf-2023-06-30.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"erf-2023-06-30.js","sourceRoot":"","sources":["../../src/gad/erf-2023-06-30.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,90 @@
1
+ /**
2
+ * GAD factor-table machinery — the translation layer between a
3
+ * verbatim factor-table transcription (the sibling issue files) and
4
+ * the projection domain. Mirrors the medical/dental circulars
5
+ * pattern at reduced weight: an issue file transcribes one printed
6
+ * table 1:1; {@link FactorTable} validates and wraps it; the
7
+ * projection module consumes factors only through it.
8
+ */
9
+ /**
10
+ * Citation carried in the data itself. Every past defect in this
11
+ * area was a stale-source defect, so the "where did these numbers
12
+ * come from" facts travel with the numbers, not in a comment.
13
+ */
14
+ export interface FactorProvenance {
15
+ /** Consolidated-workbook table reference, e.g. '0-420' */
16
+ readonly tableRef: string;
17
+ /** Workbook sheet the table is printed on, e.g. 'x-420' */
18
+ readonly sheet: string;
19
+ /** Page in the published PDF, e.g. 25 */
20
+ readonly page: number;
21
+ /** Name in the governing guidance, e.g. 'ERF1' */
22
+ readonly guidanceRef: string;
23
+ /** Date GAD issued the factors, ISO date, e.g. '2023-06-30' */
24
+ readonly issued: string;
25
+ /** Document the transcription was made from */
26
+ readonly sourceUrl: string;
27
+ /** Methodology document the table defers to */
28
+ readonly methodGuidance: string;
29
+ }
30
+ /**
31
+ * Everything that differs between the two table kinds, in one
32
+ * place. ERF factors fall as the period grows and part-months
33
+ * round UP (guidance §2.3); LRF factors rise and part-months
34
+ * round DOWN (§3.4). Both roundings are member-conservative;
35
+ * rounding, monotonic direction, and value range all follow from
36
+ * the kind.
37
+ */
38
+ declare const KIND_POLICY: {
39
+ readonly erf: {
40
+ readonly roundsUp: true;
41
+ readonly inOrder: (prev: number, next: number) => boolean;
42
+ readonly orderWord: "non-increasing";
43
+ readonly inRange: (factor: number) => boolean;
44
+ readonly rangeWord: "(0, 1]";
45
+ };
46
+ readonly lrf: {
47
+ readonly roundsUp: false;
48
+ readonly inOrder: (prev: number, next: number) => boolean;
49
+ readonly orderWord: "non-decreasing";
50
+ readonly inRange: (factor: number) => boolean;
51
+ readonly rangeWord: "[1, ∞)";
52
+ };
53
+ };
54
+ export type FactorTableKind = keyof typeof KIND_POLICY;
55
+ /** Verbatim table data as exported by an issue file. */
56
+ export interface FactorTableData {
57
+ readonly kind: FactorTableKind;
58
+ readonly provenance: FactorProvenance;
59
+ /**
60
+ * Ragged, exactly as printed: full rows have 12 month columns;
61
+ * the final row may hold fewer (the 2023 issue prints one). A
62
+ * cell the source doesn't publish is unrepresentable here.
63
+ */
64
+ readonly rows: readonly (readonly number[])[];
65
+ }
66
+ /**
67
+ * Lookup value object over one GAD factor table (pattern:
68
+ * PensionTiers). Bounds derive from the rows — never restated —
69
+ * and the rounding policy lives with the data it governs, so no
70
+ * caller can reach a raw cell and skip the rounding rule.
71
+ */
72
+ export declare class FactorTable {
73
+ readonly kind: FactorTableKind;
74
+ readonly provenance: FactorProvenance;
75
+ private readonly rows;
76
+ constructor(data: FactorTableData);
77
+ /**
78
+ * Factor for a calendar period, applying this table's rounding
79
+ * policy (§2.3 up for ERF, §3.4 down for LRF). Throws
80
+ * {@link RetirementFactorOutOfRange} when the rounded period
81
+ * falls outside the printed table — the factor genuinely isn't
82
+ * published, so callers catch it by type.
83
+ */
84
+ factorFor(period: {
85
+ years: number;
86
+ months: number;
87
+ days: number;
88
+ }): number;
89
+ }
90
+ export {};
@@ -0,0 +1,116 @@
1
+ /**
2
+ * GAD factor-table machinery — the translation layer between a
3
+ * verbatim factor-table transcription (the sibling issue files) and
4
+ * the projection domain. Mirrors the medical/dental circulars
5
+ * pattern at reduced weight: an issue file transcribes one printed
6
+ * table 1:1; {@link FactorTable} validates and wraps it; the
7
+ * projection module consumes factors only through it.
8
+ */
9
+ import { invariant, RetirementFactorOutOfRange, } from '../errors.js';
10
+ /**
11
+ * Everything that differs between the two table kinds, in one
12
+ * place. ERF factors fall as the period grows and part-months
13
+ * round UP (guidance §2.3); LRF factors rise and part-months
14
+ * round DOWN (§3.4). Both roundings are member-conservative;
15
+ * rounding, monotonic direction, and value range all follow from
16
+ * the kind.
17
+ */
18
+ const KIND_POLICY = {
19
+ erf: {
20
+ roundsUp: true,
21
+ // Non-strict: GAD prints 3dp and adjacent cells differ by as
22
+ // little as 0.001, so a legitimate issue may print two equal
23
+ // neighbours. The defect this guards (a mis-pasted row, as
24
+ // the 2019 transcription shipped) is a wrong-DIRECTION jump,
25
+ // which non-strict ordering still rejects.
26
+ inOrder: (prev, next) => next <= prev,
27
+ orderWord: 'non-increasing',
28
+ inRange: (factor) => factor > 0 && factor <= 1,
29
+ rangeWord: '(0, 1]',
30
+ },
31
+ lrf: {
32
+ roundsUp: false,
33
+ inOrder: (prev, next) => next >= prev,
34
+ orderWord: 'non-decreasing',
35
+ inRange: (factor) => factor >= 1,
36
+ rangeWord: '[1, ∞)',
37
+ },
38
+ };
39
+ const MONTHS_PER_ROW = 12;
40
+ /**
41
+ * Lookup value object over one GAD factor table (pattern:
42
+ * PensionTiers). Bounds derive from the rows — never restated —
43
+ * and the rounding policy lives with the data it governs, so no
44
+ * caller can reach a raw cell and skip the rounding rule.
45
+ */
46
+ export class FactorTable {
47
+ kind;
48
+ provenance;
49
+ rows;
50
+ constructor(data) {
51
+ const { kind, provenance, rows } = data;
52
+ const policy = KIND_POLICY[kind];
53
+ const ref = provenance.guidanceRef;
54
+ invariant(rows.length > 0, `${ref}: no rows`);
55
+ rows.forEach((row, y) => {
56
+ const isLast = y === rows.length - 1;
57
+ invariant(row.length === MONTHS_PER_ROW
58
+ || (isLast && row.length >= 1
59
+ && row.length < MONTHS_PER_ROW), `${ref}: row ${y} has ${row.length} cells — only the`
60
+ + ' final row may be shorter than 12, and no row'
61
+ + ' longer');
62
+ });
63
+ // Monotonicity across the flattened period order is the
64
+ // transcription tripwire: the superseded 2019 transcription
65
+ // carried final rows that jumped the wrong direction (a
66
+ // mis-pasted row), and this check rejects that class of
67
+ // defect at construction.
68
+ const flat = rows.flat();
69
+ for (let i = 1; i < flat.length; i++) {
70
+ invariant(policy.inOrder(flat[i - 1], flat[i]), `${ref}: factor order violation at flat index ${i}`
71
+ + ` — expected ${policy.orderWord}`);
72
+ }
73
+ for (const factor of flat) {
74
+ invariant(policy.inRange(factor), `${ref}: factor ${factor} outside the `
75
+ + `${policy.rangeWord} range`);
76
+ }
77
+ this.kind = kind;
78
+ this.provenance = provenance;
79
+ this.rows = rows;
80
+ }
81
+ /**
82
+ * Factor for a calendar period, applying this table's rounding
83
+ * policy (§2.3 up for ERF, §3.4 down for LRF). Throws
84
+ * {@link RetirementFactorOutOfRange} when the rounded period
85
+ * falls outside the printed table — the factor genuinely isn't
86
+ * published, so callers catch it by type.
87
+ */
88
+ factorFor(period) {
89
+ // Precondition, not table bounds: a malformed period (a
90
+ // date-arithmetic bug upstream) must fail loud here, never
91
+ // masquerade as the typed "factor not published" error.
92
+ invariant(Number.isInteger(period.years) && period.years >= 0
93
+ && Number.isInteger(period.months)
94
+ && period.months >= 0
95
+ && period.months < MONTHS_PER_ROW
96
+ && period.days >= 0, `${this.provenance.guidanceRef}: malformed period `
97
+ + `${period.years}yr ${period.months}mo `
98
+ + `${period.days}d`);
99
+ let { years, months } = period;
100
+ if (KIND_POLICY[this.kind].roundsUp && period.days > 0) {
101
+ months += 1;
102
+ if (months >= MONTHS_PER_ROW) {
103
+ months = 0;
104
+ years += 1;
105
+ }
106
+ }
107
+ const row = this.rows[years];
108
+ const factor = row?.[months];
109
+ if (factor === undefined) {
110
+ const last = this.rows.length - 1;
111
+ throw new RetirementFactorOutOfRange(this.provenance.guidanceRef, years, months, last, this.rows[last].length - 1);
112
+ }
113
+ return factor;
114
+ }
115
+ }
116
+ //# sourceMappingURL=factor-table.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"factor-table.js","sourceRoot":"","sources":["../../src/gad/factor-table.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,33 @@
1
+ /**
2
+ * Verbatim transcription — GAD "NHSPS_EW — Consolidated Factor
3
+ * Spreadsheet" (workbook: NHS EW Consolidated Factors 2023-03),
4
+ * issued 30 June 2023. Sheet x-421 · PDF p.26.
5
+ *
6
+ * https://www.nhsbsa.nhs.uk/sites/default/files/2024-02/Early%20and%20Late%20Retirement%20Factors.pdf
7
+ *
8
+ * Table 0-421 (LRF1): 2015 scheme late retirement factors — main
9
+ * scheme pension, members retiring from active service. Unisex;
10
+ * period measured as time after NPA. Methodology remains the
11
+ * 7 Aug 2019 guidance (see the ERF file header). The workbook's
12
+ * LRF2 (0-422, additional pension / pension debits) is not
13
+ * modelled — the library projects main-scheme pension only.
14
+ *
15
+ * Rows are years late (0–10), columns months (0–11), exactly as
16
+ * printed — the 10yr row prints a single 0-month value. Delete
17
+ * this file whole when a later issue supersedes the table
18
+ * (expected with the post-May-2026 SCAPE review).
19
+ */
20
+ /** 2015 scheme LRF — Table 0-421, issued 30 Jun 2023. */
21
+ export declare const LRF_0_421: {
22
+ readonly kind: "lrf";
23
+ readonly provenance: {
24
+ readonly tableRef: "0-421";
25
+ readonly sheet: "x-421";
26
+ readonly page: 26;
27
+ readonly guidanceRef: "LRF1";
28
+ readonly issued: "2023-06-30";
29
+ readonly sourceUrl: string;
30
+ readonly methodGuidance: string;
31
+ };
32
+ readonly rows: readonly [readonly [1, 1.003, 1.007, 1.01, 1.014, 1.017, 1.02, 1.024, 1.027, 1.031, 1.034, 1.037], readonly [1.041, 1.044, 1.048, 1.052, 1.056, 1.059, 1.063, 1.067, 1.07, 1.074, 1.078, 1.081], readonly [1.085, 1.089, 1.093, 1.097, 1.101, 1.106, 1.11, 1.114, 1.118, 1.122, 1.126, 1.13], readonly [1.134, 1.139, 1.143, 1.148, 1.152, 1.156, 1.161, 1.165, 1.17, 1.174, 1.179, 1.183], readonly [1.188, 1.193, 1.198, 1.203, 1.208, 1.213, 1.217, 1.222, 1.227, 1.232, 1.237, 1.242], readonly [1.247, 1.253, 1.258, 1.263, 1.269, 1.274, 1.28, 1.285, 1.291, 1.296, 1.302, 1.307], readonly [1.313, 1.318, 1.324, 1.33, 1.336, 1.342, 1.348, 1.354, 1.36, 1.366, 1.372, 1.378], readonly [1.384, 1.391, 1.397, 1.404, 1.411, 1.417, 1.424, 1.43, 1.437, 1.444, 1.45, 1.457], readonly [1.463, 1.471, 1.478, 1.485, 1.492, 1.5, 1.507, 1.514, 1.521, 1.529, 1.536, 1.543], readonly [1.55, 1.558, 1.566, 1.574, 1.582, 1.59, 1.598, 1.606, 1.614, 1.622, 1.63, 1.638], readonly [1.646]];
33
+ };
@@ -0,0 +1,61 @@
1
+ /**
2
+ * Verbatim transcription — GAD "NHSPS_EW — Consolidated Factor
3
+ * Spreadsheet" (workbook: NHS EW Consolidated Factors 2023-03),
4
+ * issued 30 June 2023. Sheet x-421 · PDF p.26.
5
+ *
6
+ * https://www.nhsbsa.nhs.uk/sites/default/files/2024-02/Early%20and%20Late%20Retirement%20Factors.pdf
7
+ *
8
+ * Table 0-421 (LRF1): 2015 scheme late retirement factors — main
9
+ * scheme pension, members retiring from active service. Unisex;
10
+ * period measured as time after NPA. Methodology remains the
11
+ * 7 Aug 2019 guidance (see the ERF file header). The workbook's
12
+ * LRF2 (0-422, additional pension / pension debits) is not
13
+ * modelled — the library projects main-scheme pension only.
14
+ *
15
+ * Rows are years late (0–10), columns months (0–11), exactly as
16
+ * printed — the 10yr row prints a single 0-month value. Delete
17
+ * this file whole when a later issue supersedes the table
18
+ * (expected with the post-May-2026 SCAPE review).
19
+ */
20
+ /** 2015 scheme LRF — Table 0-421, issued 30 Jun 2023. */
21
+ export const LRF_0_421 = {
22
+ kind: 'lrf',
23
+ provenance: {
24
+ tableRef: '0-421',
25
+ sheet: 'x-421',
26
+ page: 26,
27
+ guidanceRef: 'LRF1',
28
+ issued: '2023-06-30',
29
+ sourceUrl: 'https://www.nhsbsa.nhs.uk/sites/default/'
30
+ + 'files/2024-02/Early%20and%20Late%20Retirement'
31
+ + '%20Factors.pdf',
32
+ methodGuidance: 'GAD NHSPS 2015 E&W — Early and late'
33
+ + ' retirement in normal health, 7 Aug 2019',
34
+ },
35
+ rows: [
36
+ // 0mo 1mo 2mo 3mo 4mo 5mo 6mo
37
+ // 7mo 8mo 9mo 10mo 11mo
38
+ [1.000, 1.003, 1.007, 1.010, 1.014, 1.017,
39
+ 1.020, 1.024, 1.027, 1.031, 1.034, 1.037], // 0yr
40
+ [1.041, 1.044, 1.048, 1.052, 1.056, 1.059,
41
+ 1.063, 1.067, 1.070, 1.074, 1.078, 1.081], // 1yr
42
+ [1.085, 1.089, 1.093, 1.097, 1.101, 1.106,
43
+ 1.110, 1.114, 1.118, 1.122, 1.126, 1.130], // 2yr
44
+ [1.134, 1.139, 1.143, 1.148, 1.152, 1.156,
45
+ 1.161, 1.165, 1.170, 1.174, 1.179, 1.183], // 3yr
46
+ [1.188, 1.193, 1.198, 1.203, 1.208, 1.213,
47
+ 1.217, 1.222, 1.227, 1.232, 1.237, 1.242], // 4yr
48
+ [1.247, 1.253, 1.258, 1.263, 1.269, 1.274,
49
+ 1.280, 1.285, 1.291, 1.296, 1.302, 1.307], // 5yr
50
+ [1.313, 1.318, 1.324, 1.330, 1.336, 1.342,
51
+ 1.348, 1.354, 1.360, 1.366, 1.372, 1.378], // 6yr
52
+ [1.384, 1.391, 1.397, 1.404, 1.411, 1.417,
53
+ 1.424, 1.430, 1.437, 1.444, 1.450, 1.457], // 7yr
54
+ [1.463, 1.471, 1.478, 1.485, 1.492, 1.500,
55
+ 1.507, 1.514, 1.521, 1.529, 1.536, 1.543], // 8yr
56
+ [1.550, 1.558, 1.566, 1.574, 1.582, 1.590,
57
+ 1.598, 1.606, 1.614, 1.622, 1.630, 1.638], // 9yr
58
+ [1.646], // 10yr — 0mo only
59
+ ],
60
+ };
61
+ //# sourceMappingURL=lrf-2023-06-30.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"lrf-2023-06-30.js","sourceRoot":"","sources":["../../src/gad/lrf-2023-06-30.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAIH,yDAAyD;AACzD,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,KAAK;IACX,UAAU,EAAE;QACV,QAAQ,EAAE,OAAO;QACjB,KAAK,EAAE,OAAO;QACd,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,MAAM;QACnB,MAAM,EAAE,YAAY;QACpB,SAAS,EAAE,0CAA0C;cACjD,+CAA+C;cAC/C,gBAAgB;QACpB,cAAc,EAAE,qCAAqC;cACjD,0CAA0C;KAC/C;IACD,IAAI,EAAE;QACJ,iDAAiD;QACjD,mCAAmC;QACnC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;YACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM;QACnD,CAAC,KAAK,CAAC,EAAsC,kBAAkB;KAChE;CACiC,CAAC"}
package/dist/index.d.ts CHANGED
@@ -13,9 +13,10 @@ export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_TAX_YEARS, getMedicalScales,
13
13
  export type { MedicalGradeId, MedicalGradeMeta, } from './medical-scales.js';
14
14
  export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_TAX_YEARS, getDentalScales, } from './dental-scales.js';
15
15
  export type { DentalGradeId, DentalGradeMeta, } from './dental-scales.js';
16
- export { AwardUnavailable, PensionTiersUnavailable, ScaleUnavailable, } from './errors.js';
16
+ export { AwardUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
17
17
  export { afcAward } from './award.js';
18
- export { ACCRUAL_RATE, COMMUTATION_FACTOR, commute, lookupErf1, lookupLrf1, maxLumpSum, npaDate, periodInYearsMonths, projectPension, retirementFactor, revalue, yearlyAccrual, } from './pension-projection.js';
18
+ export { ACCRUAL_RATE, COMMUTATION_FACTOR, commute, maxLumpSum, projectPension, retirementFactor, yearlyAccrual, } from './pension-projection.js';
19
+ export type { FactorTableKind, } from './gad/factor-table.js';
19
20
  export type { CommutationResult, PensionEstimationInput, PensionProjectionInput, PensionProjectionResult, PensionStatementInput, ProjectionPoint, } from './pension-projection.js';
20
21
  export { HCAS_ZONE_IDS, calculateHcasSupplement, grossSalary, isHcasZoneId, } from './hcas.js';
21
22
  export type { HcasZoneId } from './hcas.js';
package/dist/index.js CHANGED
@@ -8,11 +8,19 @@ export { afcResolver, dentalResolver, medicalResolver } from './resolver.js';
8
8
  // ── Medical & dental scales ──────────────────────
9
9
  export { MEDICAL_GRADES, MEDICAL_GRADE_IDS, MEDICAL_TAX_YEARS, getMedicalScales, } from './medical-scales.js';
10
10
  export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_TAX_YEARS, getDentalScales, } from './dental-scales.js';
11
- export { AwardUnavailable, PensionTiersUnavailable, ScaleUnavailable, } from './errors.js';
11
+ // ── Errors ───────────────────────────────────────
12
+ export { AwardUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, } from './errors.js';
12
13
  // ── AfC pay award ────────────────────────────────
13
14
  export { afcAward } from './award.js';
14
15
  // ── Pension Projection ─────────────────────────────
15
- export { ACCRUAL_RATE, COMMUTATION_FACTOR, commute, lookupErf1, lookupLrf1, maxLumpSum, npaDate, periodInYearsMonths, projectPension, retirementFactor, revalue, yearlyAccrual, } from './pension-projection.js';
16
+ // Deliberate surface: the scenario-level API plus
17
+ // yearlyAccrual (hub-site builds its pension-growth
18
+ // chart from it). Date plumbing (periodInYearsMonths,
19
+ // npaDate), raw maths (revalue), and factor-table
20
+ // internals stay private — factors are reachable solely
21
+ // through retirementFactor/projectPension, which own
22
+ // the GAD rounding rules.
23
+ export { ACCRUAL_RATE, COMMUTATION_FACTOR, commute, maxLumpSum, projectPension, retirementFactor, yearlyAccrual, } from './pension-projection.js';
16
24
  // ── HCAS ─────────────────────────────────────────
17
25
  export { HCAS_ZONE_IDS, calculateHcasSupplement, grossSalary, isHcasZoneId, } from './hcas.js';
18
26
  // ── HCAS PCTs ────────────────────────────────────
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,cAAc,EACd,eAAe,EACf,eAAe,GAChB,MAAM,aAAa,CAAC;AAQrB,oDAAoD;AACpD,OAAO,EACL,YAAY,EACZ,sBAAsB,EACtB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAChB,MAAM,cAAc,CAAC;AAStB,oDAAoD;AACpD,OAAO,EAAC,IAAI,EAAE,cAAc,EAAC,MAAM,WAAW,CAAC;AAU/C,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAS3E,oDAAoD;AACpD,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,oDAAoD;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,sDAAsD;AACtD,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,OAAO,EACP,UAAU,EACV,UAAU,EACV,UAAU,EACV,OAAO,EACP,mBAAmB,EACnB,cAAc,EACd,gBAAgB,EAChB,OAAO,EACP,aAAa,GACd,MAAM,yBAAyB,CAAC;AAUjC,oDAAoD;AACpD,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,WAAW,EACX,YAAY,GACb,MAAM,WAAW,CAAC;AAGnB,oDAAoD;AACpD,OAAO,EACL,WAAW,EACX,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAGxB,oDAAoD;AACpD,OAAO,EACL,WAAW,EACX,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,QAAQ,EACR,aAAa,GACd,MAAM,cAAc,CAAC;AAMtB,oDAAoD;AACpD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,GACb,MAAM,YAAY,CAAC;AAMpB,oDAAoD;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,oDAAoD;AACpD,OAAO,EACL,QAAQ,EACR,MAAM,EACN,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,SAAS,EACT,SAAS,GACV,MAAM,aAAa,CAAC;AAErB,oDAAoD;AACpD,mDAAmD;AACnD,qDAAqD;AACrD,OAAO,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,WAAW,EACX,WAAW,EACX,WAAW,EACX,YAAY,EACZ,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,GACb,MAAM,sBAAsB,CAAC"}
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,cAAc,EACd,eAAe,EACf,eAAe,GAChB,MAAM,aAAa,CAAC;AAQrB,oDAAoD;AACpD,OAAO,EACL,YAAY,EACZ,sBAAsB,EACtB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAChB,MAAM,cAAc,CAAC;AAStB,oDAAoD;AACpD,OAAO,EAAC,IAAI,EAAE,cAAc,EAAC,MAAM,WAAW,CAAC;AAU/C,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAS3E,oDAAoD;AACpD,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAK5B,oDAAoD;AACpD,OAAO,EACL,gBAAgB,EAChB,uBAAuB,EACvB,0BAA0B,EAC1B,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAErB,oDAAoD;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,sDAAsD;AACtD,kDAAkD;AAClD,oDAAoD;AACpD,sDAAsD;AACtD,kDAAkD;AAClD,wDAAwD;AACxD,qDAAqD;AACrD,0BAA0B;AAC1B,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,OAAO,EACP,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,GACd,MAAM,yBAAyB,CAAC;AAajC,oDAAoD;AACpD,OAAO,EACL,aAAa,EACb,uBAAuB,EACvB,WAAW,EACX,YAAY,GACb,MAAM,WAAW,CAAC;AAGnB,oDAAoD;AACpD,OAAO,EACL,WAAW,EACX,WAAW,GACZ,MAAM,gBAAgB,CAAC;AAGxB,oDAAoD;AACpD,OAAO,EACL,WAAW,EACX,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,QAAQ,EACR,aAAa,GACd,MAAM,cAAc,CAAC;AAMtB,oDAAoD;AACpD,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,GACb,MAAM,YAAY,CAAC;AAMpB,oDAAoD;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,oDAAoD;AACpD,OAAO,EACL,QAAQ,EACR,MAAM,EACN,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,SAAS,EACT,SAAS,GACV,MAAM,aAAa,CAAC;AAErB,oDAAoD;AACpD,mDAAmD;AACnD,qDAAqD;AACrD,OAAO,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,WAAW,EACX,WAAW,EACX,WAAW,EACX,YAAY,EACZ,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,GACb,MAAM,sBAAsB,CAAC"}
@@ -6,10 +6,14 @@
6
6
  *
7
7
  * Sources:
8
8
  *
9
+ * GAD Consolidated Factor Spreadsheet (NHS EW Consolidated
10
+ * Factors 2023-03), issued 30 June 2023
11
+ * → ERF1/LRF1 values (see src/gad/ issue files for the
12
+ * verbatim transcriptions + per-table provenance)
13
+ *
9
14
  * GAD "NHSPS 2015 E&W — Early and late retirement in normal
10
- * health — Factors and guidance", 7 August 2019
11
- * → ERF1 table (Appendix B, p.25)
12
- * → LRF1 table (Appendix C, p.26)
15
+ * health — Factors and guidance", 7 August 2019 — methodology
16
+ * only (the 2023 workbook names it as its related guidance)
13
17
  * → Rounding rules (§2.3 ERF, §3.4 LRF)
14
18
  * → Order of operations (§1.18)
15
19
  *
@@ -26,6 +30,7 @@
26
30
  * → Commutation rate: £12 lump sum per £1 pension
27
31
  * → HMRC 25% cap on lump sum
28
32
  */
33
+ import type { FactorTableKind } from './gad/factor-table.js';
29
34
  /** A point on the projection curve */
30
35
  export interface ProjectionPoint {
31
36
  /** Age in years (can be fractional) */
@@ -89,7 +94,7 @@ export interface PensionProjectionResult {
89
94
  annualPension: number;
90
95
  /** ERF or LRF factor applied */
91
96
  factor: number;
92
- factorType: 'erf' | 'lrf' | 'none';
97
+ factorType: FactorTableKind | 'none';
93
98
  /** Gap between revalued and drawn pension */
94
99
  adjustmentAmount: number;
95
100
  /** Curve data for chart (both views) */
@@ -101,29 +106,14 @@ export interface PensionProjectionResult {
101
106
  export declare const ACCRUAL_RATE: number;
102
107
  /** Commutation: £12 lump sum per £1 pension */
103
108
  export declare const COMMUTATION_FACTOR = 12;
104
- /** Look up ERF1 factor for given years and months early */
105
- export declare function lookupErf1(years: number, months: number): number;
106
- /** Look up LRF1 factor for given years and months late */
107
- export declare function lookupLrf1(years: number, months: number): number;
108
- /**
109
- * Calculate the period between two dates in years,
110
- * months, and remaining days.
111
- */
112
- export declare function periodInYearsMonths(from: Date, to: Date): {
113
- years: number;
114
- months: number;
115
- days: number;
116
- };
117
- /** Calculate NPA date from date of birth and NPA age */
118
- export declare function npaDate(dateOfBirth: Date, npa: number): Date;
119
109
  /**
120
110
  * Determine whether ERF or LRF applies and return the
121
- * factor. ERF rounds UP to next month (§2.3), LRF
122
- * rounds DOWN to complete months (§3.4).
111
+ * factor. The rounding rules (ERF up §2.3, LRF down §3.4)
112
+ * live on the tables themselves — see FactorTable.
123
113
  */
124
114
  export declare function retirementFactor(retirementDate: Date, npDate: Date): {
125
115
  factor: number;
126
- type: 'erf' | 'lrf' | 'none';
116
+ type: FactorTableKind | 'none';
127
117
  };
128
118
  /** Annual pension accrual for one year of service */
129
119
  export declare function yearlyAccrual(pensionablePay: number): number;
@@ -6,10 +6,14 @@
6
6
  *
7
7
  * Sources:
8
8
  *
9
+ * GAD Consolidated Factor Spreadsheet (NHS EW Consolidated
10
+ * Factors 2023-03), issued 30 June 2023
11
+ * → ERF1/LRF1 values (see src/gad/ issue files for the
12
+ * verbatim transcriptions + per-table provenance)
13
+ *
9
14
  * GAD "NHSPS 2015 E&W — Early and late retirement in normal
10
- * health — Factors and guidance", 7 August 2019
11
- * → ERF1 table (Appendix B, p.25)
12
- * → LRF1 table (Appendix C, p.26)
15
+ * health — Factors and guidance", 7 August 2019 — methodology
16
+ * only (the 2023 workbook names it as its related guidance)
13
17
  * → Rounding rules (§2.3 ERF, §3.4 LRF)
14
18
  * → Order of operations (§1.18)
15
19
  *
@@ -26,6 +30,11 @@
26
30
  * → Commutation rate: £12 lump sum per £1 pension
27
31
  * → HMRC 25% cap on lump sum
28
32
  */
33
+ import { invariant } from './errors.js';
34
+ import { npaDate, periodInYearsMonths, yearsBetween, } from './dates.js';
35
+ import { FactorTable } from './gad/factor-table.js';
36
+ import { ERF_0_420 } from './gad/erf-2023-06-30.js';
37
+ import { LRF_0_421 } from './gad/lrf-2023-06-30.js';
29
38
  // ── Constants ───────────────────────────────────────
30
39
  /** 1/54 accrual rate — NHS 2015 CARE scheme */
31
40
  export const ACCRUAL_RATE = 1 / 54;
@@ -34,128 +43,16 @@ export const COMMUTATION_FACTOR = 12;
34
43
  /** In-service revaluation bonus above CPI */
35
44
  const ACTIVE_REVAL_BONUS = 0.015;
36
45
  // ── Factor Tables ───────────────────────────────────
37
- /**
38
- * ERF1 — Early Retirement Factors for 2015 scheme
39
- * GAD Appendix B, p.25 (7 August 2019)
40
- *
41
- * Rows = years early (0–13), Columns = months (0–11)
42
- * Factor applied to pension when retiring before NPA.
43
- */
44
- const ERF1 = [
45
- // 0mo 1mo 2mo 3mo 4mo 5mo 6mo
46
- // 7mo 8mo 9mo 10mo 11mo
47
- [1.000, 0.997, 0.994, 0.992, 0.989, 0.986,
48
- 0.983, 0.981, 0.978, 0.975, 0.972, 0.969], // 0yr
49
- [0.967, 0.963, 0.960, 0.957, 0.953, 0.950,
50
- 0.947, 0.943, 0.940, 0.937, 0.933, 0.930], // 1yr
51
- [0.927, 0.923, 0.919, 0.916, 0.912, 0.909,
52
- 0.905, 0.901, 0.898, 0.894, 0.891, 0.887], // 2yr
53
- [0.884, 0.880, 0.876, 0.873, 0.869, 0.865,
54
- 0.862, 0.858, 0.854, 0.851, 0.847, 0.843], // 3yr
55
- [0.840, 0.836, 0.832, 0.828, 0.824, 0.820,
56
- 0.816, 0.812, 0.808, 0.804, 0.800, 0.796], // 4yr
57
- [0.792, 0.788, 0.784, 0.780, 0.776, 0.772,
58
- 0.768, 0.764, 0.760, 0.756, 0.751, 0.747], // 5yr
59
- [0.733, 0.729, 0.724, 0.720, 0.715, 0.711,
60
- 0.706, 0.702, 0.697, 0.693, 0.689, 0.684], // 6yr
61
- [0.680, 0.675, 0.671, 0.667, 0.662, 0.658,
62
- 0.653, 0.649, 0.645, 0.640, 0.636, 0.632], // 7yr
63
- [0.627, 0.623, 0.619, 0.614, 0.610, 0.606,
64
- 0.602, 0.597, 0.593, 0.589, 0.585, 0.580], // 8yr
65
- [0.576, 0.572, 0.568, 0.564, 0.560, 0.556,
66
- 0.552, 0.548, 0.544, 0.540, 0.536, 0.532], // 9yr
67
- [0.528, 0.525, 0.521, 0.517, 0.513, 0.510,
68
- 0.506, 0.502, 0.498, 0.495, 0.491, 0.487], // 10yr
69
- [0.484, 0.480, 0.477, 0.473, 0.470, 0.466,
70
- 0.463, 0.459, 0.456, 0.452, 0.449, 0.446], // 11yr
71
- [0.442, 0.439, 0.436, 0.432, 0.429, 0.426,
72
- 0.422, 0.419, 0.416, 0.413, 0.409, 0.406], // 12yr
73
- [0.540, 0.536, 0.531, 0.527, 0.522, 0.518,
74
- 0.514, 0.509, 0.505, 0.501, 0.496, 0.492], // 13yr
75
- ];
76
- /**
77
- * LRF1 — Late Retirement Factors for 2015 scheme
78
- * GAD Appendix C, p.26 (7 August 2019)
79
- *
80
- * Rows = years late (0–10), Columns = months (0–11)
81
- * Factor applied to pension when retiring after NPA.
82
- */
83
- const LRF1 = [
84
- // 0mo 1mo 2mo 3mo 4mo 5mo 6mo
85
- // 7mo 8mo 9mo 10mo 11mo
86
- [1.000, 1.007, 1.013, 1.020, 1.027, 1.034,
87
- 1.040, 1.047, 1.054, 1.061, 1.067, 1.074], // 0yr
88
- [1.081, 1.088, 1.096, 1.103, 1.110, 1.117,
89
- 1.125, 1.132, 1.139, 1.146, 1.154, 1.161], // 1yr
90
- [1.168, 1.176, 1.183, 1.191, 1.198, 1.206,
91
- 1.213, 1.221, 1.228, 1.236, 1.243, 1.251], // 2yr
92
- [1.258, 1.266, 1.274, 1.282, 1.290, 1.298,
93
- 1.306, 1.314, 1.322, 1.330, 1.338, 1.346], // 3yr
94
- [1.354, 1.362, 1.370, 1.378, 1.387, 1.395,
95
- 1.403, 1.412, 1.420, 1.429, 1.437, 1.446], // 4yr
96
- [1.454, 1.463, 1.471, 1.480, 1.489, 1.497,
97
- 1.506, 1.515, 1.524, 1.533, 1.542, 1.551], // 5yr
98
- [1.560, 1.569, 1.578, 1.587, 1.596, 1.606,
99
- 1.615, 1.624, 1.634, 1.643, 1.653, 1.662], // 6yr
100
- [1.672, 1.681, 1.691, 1.701, 1.710, 1.720,
101
- 1.730, 1.740, 1.750, 1.760, 1.770, 1.780], // 7yr
102
- [1.790, 1.800, 1.810, 1.821, 1.831, 1.841,
103
- 1.852, 1.862, 1.873, 1.883, 1.894, 1.905], // 8yr
104
- [1.915, 1.926, 1.937, 1.948, 1.959, 1.970,
105
- 1.981, 1.992, 2.003, 2.014, 2.026, 2.037], // 9yr
106
- [1.411, 1.418, 1.425, 1.433, 1.440, 1.447,
107
- 1.455, 1.462, 1.469, 1.477, 1.484, 1.492], // 10yr
108
- ];
109
- // ── Factor Lookup ───────────────────────────────────
110
- /** Look up ERF1 factor for given years and months early */
111
- export function lookupErf1(years, months) {
112
- if (!(years >= 0 && years <= 13
113
- && months >= 0 && months <= 11)) {
114
- throw new Error(`ERF1 out of range: ${years}yr ${months}mo`
115
- + ' (max 13yr 11mo)');
116
- }
117
- return ERF1[years][months];
118
- }
119
- /** Look up LRF1 factor for given years and months late */
120
- export function lookupLrf1(years, months) {
121
- if (!(years >= 0 && years <= 10
122
- && months >= 0 && months <= 11)) {
123
- throw new Error(`LRF1 out of range: ${years}yr ${months}mo`
124
- + ' (max 10yr 11mo)');
125
- }
126
- return LRF1[years][months];
127
- }
128
- // ── Date Arithmetic ─────────────────────────────────
129
- /**
130
- * Calculate the period between two dates in years,
131
- * months, and remaining days.
132
- */
133
- export function periodInYearsMonths(from, to) {
134
- let years = to.getFullYear() - from.getFullYear();
135
- let months = to.getMonth() - from.getMonth();
136
- let days = to.getDate() - from.getDate();
137
- if (days < 0) {
138
- months -= 1;
139
- // Days in previous month of 'to'
140
- const prevMonth = new Date(to.getFullYear(), to.getMonth(), 0);
141
- days += prevMonth.getDate();
142
- }
143
- if (months < 0) {
144
- years -= 1;
145
- months += 12;
146
- }
147
- return { years, months, days };
148
- }
149
- // ── NPA Date ────────────────────────────────────────
150
- /** Calculate NPA date from date of birth and NPA age */
151
- export function npaDate(dateOfBirth, npa) {
152
- return new Date(dateOfBirth.getFullYear() + npa, dateOfBirth.getMonth(), dateOfBirth.getDate());
153
- }
46
+ // Which issue is in force is exactly these two constructions —
47
+ // swap the import when GAD supersedes a table (the two tables
48
+ // change on different dates, hence one issue file per table).
49
+ const ERF1 = new FactorTable(ERF_0_420);
50
+ const LRF1 = new FactorTable(LRF_0_421);
154
51
  // ── Retirement Factor ───────────────────────────────
155
52
  /**
156
53
  * Determine whether ERF or LRF applies and return the
157
- * factor. ERF rounds UP to next month (§2.3), LRF
158
- * rounds DOWN to complete months (§3.4).
54
+ * factor. The rounding rules (ERF up §2.3, LRF down §3.4)
55
+ * live on the tables themselves — see FactorTable.
159
56
  */
160
57
  export function retirementFactor(retirementDate, npDate) {
161
58
  if (retirementDate >= npDate) {
@@ -165,27 +62,11 @@ export function retirementFactor(retirementDate, npDate) {
165
62
  && period.days === 0) {
166
63
  return { factor: 1, type: 'none' };
167
64
  }
168
- // LRF rounds DOWN — ignore remaining days (§3.4)
169
- return {
170
- factor: lookupLrf1(period.years, period.months),
171
- type: 'lrf',
172
- };
65
+ return { factor: LRF1.factorFor(period), type: 'lrf' };
173
66
  }
174
- // Early retirement — ERF rounds UP to next month (§2.3)
67
+ // Early retirement
175
68
  const period = periodInYearsMonths(retirementDate, npDate);
176
- let { years, months } = period;
177
- // Round up: if there are remaining days, add a month
178
- if (period.days > 0) {
179
- months += 1;
180
- if (months > 11) {
181
- months = 0;
182
- years += 1;
183
- }
184
- }
185
- return {
186
- factor: lookupErf1(years, months),
187
- type: 'erf',
188
- };
69
+ return { factor: ERF1.factorFor(period), type: 'erf' };
189
70
  }
190
71
  // ── Core Calculations ───────────────────────────────
191
72
  /** Annual pension accrual for one year of service */
@@ -214,9 +95,7 @@ export function maxLumpSum(adjustedPension) {
214
95
  * ERF/LRF is applied BEFORE commutation (§1.18).
215
96
  */
216
97
  export function commute(adjustedPension, fraction) {
217
- if (fraction < 0 || fraction > 1) {
218
- throw new Error(`Commutation fraction must be 0–1, got ${fraction}`);
219
- }
98
+ invariant(fraction >= 0 && fraction <= 1, `Commutation fraction must be 0–1, got ${fraction}`);
220
99
  const max = maxLumpSum(adjustedPension);
221
100
  const lumpSum = max * fraction;
222
101
  const pensionGivenUp = lumpSum / COMMUTATION_FACTOR;
@@ -263,11 +142,6 @@ export function projectPension(input) {
263
142
  };
264
143
  }
265
144
  // ── Internal Helpers ────────────────────────────────
266
- /** Fractional years between two dates */
267
- function yearsBetween(from, to) {
268
- const msPerYear = 365.25 * 24 * 60 * 60 * 1000;
269
- return (to.getTime() - from.getTime()) / msPerYear;
270
- }
271
145
  /**
272
146
  * Simulate year-by-year accrual with in-service
273
147
  * revaluation over a fractional number of years.
@@ -1 +1 @@
1
- {"version":3,"file":"pension-projection.js","sourceRoot":"","sources":["../src/pension-projection.ts"],"names":[],"mappings":"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KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAG,MAAM;IACpD,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK;QACvC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAA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"}
1
+ {"version":3,"file":"pension-projection.js","sourceRoot":"","sources":["../src/pension-projection.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@casomoltd/nhs-pay",
3
- "version": "0.8.0",
3
+ "version": "0.9.1",
4
4
  "description": "NHS Agenda for Change pay scales, pension tiers, regions, and take-home calculator",
5
5
  "homepage": "https://github.com/casomoltd/nhs-pay#readme",
6
6
  "bugs": "https://github.com/casomoltd/nhs-pay/issues",
@@ -58,6 +58,7 @@
58
58
  "@casomoltd/paye-calc": "^0.5.11",
59
59
  "@casomoltd/tooling": "^0.21.1",
60
60
  "@commitlint/cli": "^20.0.0",
61
+ "@js-temporal/polyfill": "^0.5.1",
61
62
  "@types/node": "^25.5.0",
62
63
  "csv-parse": "^6.2.1",
63
64
  "eslint": "^9.0.0",