@casomoltd/nhs-pay 0.31.0 → 0.32.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/document-source.d.ts +32 -23
- package/dist/document-source.js +32 -10
- package/dist/document-source.js.map +1 -1
- package/dist/errors.d.ts +12 -1
- package/dist/errors.js +18 -1
- package/dist/errors.js.map +1 -1
- package/dist/factor-basis.d.ts +9 -3
- package/dist/factor-basis.js +40 -28
- package/dist/factor-basis.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/member/benefits.js +9 -4
- package/dist/member/benefits.js.map +1 -1
- package/dist/member/valuation.js +3 -6
- package/dist/member/valuation.js.map +1 -1
- package/dist/pension/ledger.js +8 -7
- package/dist/pension/ledger.js.map +1 -1
- package/dist/pension/money.d.ts +2 -0
- package/dist/pension/money.js +4 -0
- package/dist/pension/money.js.map +1 -1
- package/dist/pension/uplift.d.ts +25 -21
- package/dist/pension/uplift.js +27 -12
- package/dist/pension/uplift.js.map +1 -1
- package/dist/revaluation.d.ts +27 -11
- package/dist/revaluation.js +46 -32
- package/dist/revaluation.js.map +1 -1
- package/dist/sections/final-salary.js +3 -11
- package/dist/sections/final-salary.js.map +1 -1
- package/dist/sections/section-2015.d.ts +1 -3
- package/dist/sections/section-2015.js +1 -1
- package/dist/sections/section-2015.js.map +1 -1
- package/dist/sources.d.ts +4 -0
- package/dist/sources.js +4 -0
- package/dist/sources.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -143,6 +143,7 @@ const benefits = memberBenefits(
|
|
|
143
143
|
declared: [],
|
|
144
144
|
current: {todaysMoney: 51932, asAt: isoDate('2026-09-01')},
|
|
145
145
|
ladder: null, // or the member's AfC band points and current point
|
|
146
|
+
partTime: false, // true: pay above is for fewer than full-time hours
|
|
146
147
|
},
|
|
147
148
|
statement: null, // or a 2015 Section balance off a statement
|
|
148
149
|
},
|
|
@@ -278,7 +279,7 @@ Cross-checked against [NHSPRB 39th Report (2026)][nhsprb-39], Table A25 (AfC 202
|
|
|
278
279
|
| Permitted maximum (lowest of three limbs) | [Sch 29 Finance Act 2004 para 2][sch29] |
|
|
279
280
|
| Applicable amount, defined benefits, `(A + (B × C)) / 4` | [Sch 29 Finance Act 2004 para 2C][sch29p2c] |
|
|
280
281
|
| Relevant valuation factor (20) | [Finance Act 2004 s.276][s276] |
|
|
281
|
-
| Lump Sum Allowance (
|
|
282
|
+
| Lump Sum Allowance (`LUMP_SUM_ALLOWANCE`, frozen) | [ITEPA 2003 s.637P][s637p] |
|
|
282
283
|
|
|
283
284
|
[sis]: https://www.legislation.gov.uk/secondary/public+service+pensions
|
|
284
285
|
[sch29]: https://www.legislation.gov.uk/ukpga/2004/12/schedule/29
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The published document a figure in this library was read from.
|
|
3
3
|
*
|
|
4
|
-
* One record type for any cited document
|
|
5
|
-
*
|
|
4
|
+
* One record type for any dated cited document. The library cites five
|
|
5
|
+
* KINDS (listed in `sources.ts`), three of which are easily confused: the
|
|
6
6
|
* instrument that ENACTED an award, the circular that PUBLISHES a pay
|
|
7
7
|
* scale, and the letter that sets an allowance. They are different
|
|
8
8
|
* documents in every nation — England's 2026-27 medical award was
|
|
@@ -73,11 +73,27 @@ export interface DocumentSourceFields {
|
|
|
73
73
|
* CPI for the calendar year, so a revision was a scheduled
|
|
74
74
|
* contingency with a knowable date — CPI confirms in January — and
|
|
75
75
|
* it duly arrived on 23 January 2026, moving 4.25% to 4.4%. A
|
|
76
|
-
*
|
|
77
|
-
*
|
|
76
|
+
* scheduled revision with no date recorded lapses unseen, and every
|
|
77
|
+
* figure it moves stays wrong until someone happens to look.
|
|
78
78
|
*/
|
|
79
79
|
readonly nextExpectedReason?: string;
|
|
80
80
|
}
|
|
81
|
+
/**
|
|
82
|
+
* A publisher's web page that prints no issue date: what it is, and the
|
|
83
|
+
* day it was read. Its own type rather than a {@link DocumentSource},
|
|
84
|
+
* whose `issued` a consumer prints as the date of publication, so an
|
|
85
|
+
* undated page cannot be shown as published on the day it was read.
|
|
86
|
+
*/
|
|
87
|
+
export interface PageSource {
|
|
88
|
+
/** Who publishes it — 'NHSBSA'. */
|
|
89
|
+
readonly issuer: string;
|
|
90
|
+
/** The page's own title, as printed. */
|
|
91
|
+
readonly reference: string;
|
|
92
|
+
/** The page itself, for a consumer to link. */
|
|
93
|
+
readonly url: string;
|
|
94
|
+
/** ISO date the page was read; it prints no date of its own. */
|
|
95
|
+
readonly retrieved: IsoDate;
|
|
96
|
+
}
|
|
81
97
|
/**
|
|
82
98
|
* A document this library cites — not commentary about it. Held on the
|
|
83
99
|
* record so a consumer cites the document rather than keeping its own
|
|
@@ -117,9 +133,12 @@ export declare class DocumentSource {
|
|
|
117
133
|
* Takes `now` rather than reading the clock, and is a method rather
|
|
118
134
|
* than a stored flag, because currency is a question about a moment
|
|
119
135
|
* and not a property of the record. A boolean computed at module
|
|
120
|
-
* load would freeze the answer for the life of the process
|
|
121
|
-
* same shape as the year defect this round exists to fix — and a
|
|
136
|
+
* load would freeze the answer for the life of the process, and a
|
|
122
137
|
* caller could not ask "was this current when the page was built?".
|
|
138
|
+
*
|
|
139
|
+
* `now` is compared as the calendar day it falls on in the reader's
|
|
140
|
+
* own frame, never its UTC day, which is the day before for a local
|
|
141
|
+
* midnight in summer time.
|
|
123
142
|
*/
|
|
124
143
|
currencyAt(now: Date): SourceCurrency;
|
|
125
144
|
}
|
|
@@ -138,20 +157,10 @@ export declare class DocumentSource {
|
|
|
138
157
|
* position is to state the gap: an unchecked citation should not look
|
|
139
158
|
* identical to a fresh one.
|
|
140
159
|
*/
|
|
141
|
-
export
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
export interface PageSource {
|
|
149
|
-
/** Who publishes it — 'NHSBSA'. */
|
|
150
|
-
readonly issuer: string;
|
|
151
|
-
/** The page's own title, as printed. */
|
|
152
|
-
readonly reference: string;
|
|
153
|
-
/** The page itself, for a consumer to link. */
|
|
154
|
-
readonly url: string;
|
|
155
|
-
/** ISO date the page was read; it prints no date of its own. */
|
|
156
|
-
readonly retrieved: IsoDate;
|
|
157
|
-
}
|
|
160
|
+
export declare const SOURCE_CURRENCIES: {
|
|
161
|
+
readonly current: "current";
|
|
162
|
+
readonly lapsed: "lapsed";
|
|
163
|
+
readonly unknown: "unknown";
|
|
164
|
+
};
|
|
165
|
+
/** One of {@link SOURCE_CURRENCIES}. */
|
|
166
|
+
export type SourceCurrency = (typeof SOURCE_CURRENCIES)[keyof typeof SOURCE_CURRENCIES];
|
package/dist/document-source.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The published document a figure in this library was read from.
|
|
3
3
|
*
|
|
4
|
-
* One record type for any cited document
|
|
5
|
-
*
|
|
4
|
+
* One record type for any dated cited document. The library cites five
|
|
5
|
+
* KINDS (listed in `sources.ts`), three of which are easily confused: the
|
|
6
6
|
* instrument that ENACTED an award, the circular that PUBLISHES a pay
|
|
7
7
|
* scale, and the letter that sets an allowance. They are different
|
|
8
8
|
* documents in every nation — England's 2026-27 medical award was
|
|
@@ -18,8 +18,7 @@
|
|
|
18
18
|
* scale carries one too, and `award.ts` imports every scale module —
|
|
19
19
|
* so defining it there would make a scale citing its source a cycle.
|
|
20
20
|
*/
|
|
21
|
-
|
|
22
|
-
const ISO_DATE_LENGTH = 10;
|
|
21
|
+
import { isoDateOf } from './iso-date.js';
|
|
23
22
|
/**
|
|
24
23
|
* A document this library cites — not commentary about it. Held on the
|
|
25
24
|
* record so a consumer cites the document rather than keeping its own
|
|
@@ -66,17 +65,40 @@ export class DocumentSource {
|
|
|
66
65
|
* Takes `now` rather than reading the clock, and is a method rather
|
|
67
66
|
* than a stored flag, because currency is a question about a moment
|
|
68
67
|
* and not a property of the record. A boolean computed at module
|
|
69
|
-
* load would freeze the answer for the life of the process
|
|
70
|
-
* same shape as the year defect this round exists to fix — and a
|
|
68
|
+
* load would freeze the answer for the life of the process, and a
|
|
71
69
|
* caller could not ask "was this current when the page was built?".
|
|
70
|
+
*
|
|
71
|
+
* `now` is compared as the calendar day it falls on in the reader's
|
|
72
|
+
* own frame, never its UTC day, which is the day before for a local
|
|
73
|
+
* midnight in summer time.
|
|
72
74
|
*/
|
|
73
75
|
currencyAt(now) {
|
|
74
76
|
if (!this.nextExpected) {
|
|
75
|
-
return
|
|
77
|
+
return SOURCE_CURRENCIES.unknown;
|
|
76
78
|
}
|
|
77
|
-
return this.nextExpected >= now
|
|
78
|
-
?
|
|
79
|
-
:
|
|
79
|
+
return this.nextExpected >= isoDateOf(now)
|
|
80
|
+
? SOURCE_CURRENCIES.current
|
|
81
|
+
: SOURCE_CURRENCIES.lapsed;
|
|
80
82
|
}
|
|
81
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* Whether a source is still within the window in which it is the
|
|
86
|
+
* newest document expected to exist.
|
|
87
|
+
*
|
|
88
|
+
* `lapsed` means the date we expected a successor by has passed and
|
|
89
|
+
* we hold no successor — so either the publisher is late, or one
|
|
90
|
+
* exists and we have not transcribed it. Both are worth surfacing;
|
|
91
|
+
* the caller decides which it is.
|
|
92
|
+
*
|
|
93
|
+
* `unknown` where no `nextExpected` is recorded. Absence of a date is
|
|
94
|
+
* not evidence of currency, and a consumer must never render it as
|
|
95
|
+
* "current" — nor render nothing, which reads the same way. House
|
|
96
|
+
* position is to state the gap: an unchecked citation should not look
|
|
97
|
+
* identical to a fresh one.
|
|
98
|
+
*/
|
|
99
|
+
export const SOURCE_CURRENCIES = {
|
|
100
|
+
current: 'current',
|
|
101
|
+
lapsed: 'lapsed',
|
|
102
|
+
unknown: 'unknown',
|
|
103
|
+
};
|
|
82
104
|
//# sourceMappingURL=document-source.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"document-source.js","sourceRoot":"","sources":["../src/document-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;
|
|
1
|
+
{"version":3,"file":"document-source.js","sourceRoot":"","sources":["../src/document-source.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AAgFxC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,OAAO,cAAc;IACzB,8DAA8D;IACrD,MAAM,CAAS;IACxB,mEAAmE;IAC1D,SAAS,CAAS;IAC3B,+CAA+C;IACtC,GAAG,CAAS;IACrB,wCAAwC;IAC/B,MAAM,CAAU;IACzB,sDAAsD;IAC7C,YAAY,CAAW;IAChC;iCAC6B;IACpB,kBAAkB,CAAU;IAErC,YAAY,MAA4B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAC;IACtD,CAAC;IAED;;;;;;;;;;;;;OAaG;IACH,UAAU,CAAC,GAAS;QAClB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,OAAO,iBAAiB,CAAC,OAAO,CAAC;QACnC,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,IAAI,SAAS,CAAC,GAAG,CAAC;YACxC,CAAC,CAAC,iBAAiB,CAAC,OAAO;YAC3B,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC;IAC/B,CAAC;CACF;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACV,CAAC"}
|
package/dist/errors.d.ts
CHANGED
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
* ({@link PayPathUnavailable}), service it does not model
|
|
8
8
|
* ({@link BenefitNotModelled}, keyed by a {@link NOT_MODELLED}
|
|
9
9
|
* code), and a read before a member's statement, where no balance
|
|
10
|
-
* exists ({@link BeforeStatement}
|
|
10
|
+
* exists ({@link BeforeStatement}, its boundary
|
|
11
|
+
* {@link isBeforeStatement}, which a caller can check first).
|
|
11
12
|
* - RangeError, thrown where a caller's input cannot be true.
|
|
12
13
|
* - {@link invariant} — an internal consistency guard. Its failure
|
|
13
14
|
* is a library bug, not an input problem, so no caller catches it;
|
|
@@ -210,6 +211,16 @@ export declare class AdditionalPensionUnavailable extends Error {
|
|
|
210
211
|
readonly code: AdditionalPensionRefusal;
|
|
211
212
|
constructor(code: AdditionalPensionRefusal, detail: string);
|
|
212
213
|
}
|
|
214
|
+
/**
|
|
215
|
+
* Whether a read on `on` falls before the first date a statement answers,
|
|
216
|
+
* and so is one {@link BeforeStatement} refuses. `answersFrom` is that date,
|
|
217
|
+
* the statement's 31 March (`MemberBenefits.statementAnswersFrom`), or null
|
|
218
|
+
* where there is no statement and every date is answered. The one
|
|
219
|
+
* definition of the boundary, so a caller checking its own dates first and
|
|
220
|
+
* the library refusing them cannot disagree on the day itself, which is
|
|
221
|
+
* answered.
|
|
222
|
+
*/
|
|
223
|
+
export declare function isBeforeStatement(on: Date, answersFrom: Date | null): boolean;
|
|
213
224
|
/**
|
|
214
225
|
* Assert a domain invariant that must ALWAYS hold. Throws a bare
|
|
215
226
|
* Error when `condition` is false. Unlike the absent-data errors
|
package/dist/errors.js
CHANGED
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
* ({@link PayPathUnavailable}), service it does not model
|
|
8
8
|
* ({@link BenefitNotModelled}, keyed by a {@link NOT_MODELLED}
|
|
9
9
|
* code), and a read before a member's statement, where no balance
|
|
10
|
-
* exists ({@link BeforeStatement}
|
|
10
|
+
* exists ({@link BeforeStatement}, its boundary
|
|
11
|
+
* {@link isBeforeStatement}, which a caller can check first).
|
|
11
12
|
* - RangeError, thrown where a caller's input cannot be true.
|
|
12
13
|
* - {@link invariant} — an internal consistency guard. Its failure
|
|
13
14
|
* is a library bug, not an input problem, so no caller catches it;
|
|
@@ -221,6 +222,10 @@ export class BeforeStatement extends Error {
|
|
|
221
222
|
this.read = read;
|
|
222
223
|
this.on = on;
|
|
223
224
|
this.statementDate = statementDate;
|
|
225
|
+
// A read on or after the statement has a balance to answer with, so
|
|
226
|
+
// refusing one would be the library's own bug, not the caller's.
|
|
227
|
+
invariant(isBeforeStatement(on, statementDate), `BeforeStatement for ${on.toDateString()}, not before the `
|
|
228
|
+
+ `statement's ${statementDate.toDateString()}`);
|
|
224
229
|
this.name = 'BeforeStatement';
|
|
225
230
|
}
|
|
226
231
|
}
|
|
@@ -253,6 +258,18 @@ export class AdditionalPensionUnavailable extends Error {
|
|
|
253
258
|
this.name = 'AdditionalPensionUnavailable';
|
|
254
259
|
}
|
|
255
260
|
}
|
|
261
|
+
/**
|
|
262
|
+
* Whether a read on `on` falls before the first date a statement answers,
|
|
263
|
+
* and so is one {@link BeforeStatement} refuses. `answersFrom` is that date,
|
|
264
|
+
* the statement's 31 March (`MemberBenefits.statementAnswersFrom`), or null
|
|
265
|
+
* where there is no statement and every date is answered. The one
|
|
266
|
+
* definition of the boundary, so a caller checking its own dates first and
|
|
267
|
+
* the library refusing them cannot disagree on the day itself, which is
|
|
268
|
+
* answered.
|
|
269
|
+
*/
|
|
270
|
+
export function isBeforeStatement(on, answersFrom) {
|
|
271
|
+
return answersFrom !== null && on < answersFrom;
|
|
272
|
+
}
|
|
256
273
|
/**
|
|
257
274
|
* Assert a domain invariant that must ALWAYS hold. Throws a bare
|
|
258
275
|
* Error when `condition` is false. Unlike the absent-data errors
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/factor-basis.d.ts
CHANGED
|
@@ -55,9 +55,6 @@ declare const TABLES: {
|
|
|
55
55
|
readonly firstAge: 65;
|
|
56
56
|
}>;
|
|
57
57
|
};
|
|
58
|
-
/** Every table the library reads, by its GAD reference. The one set of
|
|
59
|
-
* instances, so two callers cannot read the same table two ways. */
|
|
60
|
-
export declare function factorTable<K extends keyof typeof TABLES>(ref: K): (typeof TABLES)[K];
|
|
61
58
|
/** Which benefit a factor applies to, where two benefits measured from
|
|
62
59
|
* one pension age read different tables: a 1995 Section pension and its
|
|
63
60
|
* automatic lump sum, and 2015 Section additional pension. */
|
|
@@ -136,10 +133,19 @@ export interface Factored<F extends FactorOutcome | null = FactorOutcome> {
|
|
|
136
133
|
readonly after: ProjectionMoney;
|
|
137
134
|
readonly factor: F;
|
|
138
135
|
}
|
|
136
|
+
/** Every table the library reads, by its GAD reference. The one set of
|
|
137
|
+
* instances, so two callers cannot read the same table two ways. */
|
|
138
|
+
export declare function factorTable<K extends keyof typeof TABLES>(ref: K): (typeof TABLES)[K];
|
|
139
139
|
/**
|
|
140
140
|
* Read the factor for a drawing. The date decides the direction as well
|
|
141
141
|
* as the cell, so a basis whose direction the dates contradict is a bug
|
|
142
142
|
* in the section that derived it and fails loud.
|
|
143
143
|
*/
|
|
144
144
|
export declare function readFactor(basis: FactorBasis, dateOfBirth: Date, drawn: Date): FactorOutcome;
|
|
145
|
+
/**
|
|
146
|
+
* A figure with its factor applied: the one place `after` is made, so it
|
|
147
|
+
* is always `beforeFactor` times the factor, in both rulers. No factor
|
|
148
|
+
* means the rules pay nothing, so nothing is paid after it.
|
|
149
|
+
*/
|
|
150
|
+
export declare function factored<F extends FactorOutcome | null>(beforeFactor: ProjectionMoney, factor: F): Factored<F>;
|
|
145
151
|
export {};
|
package/dist/factor-basis.js
CHANGED
|
@@ -20,6 +20,7 @@ import { periodInYearsMonths, npaDate } from './dates.js';
|
|
|
20
20
|
import { invariant } from './errors.js';
|
|
21
21
|
import { LEGACY_PENSION_AGES } from './pension/ages.js';
|
|
22
22
|
import { FactorTable } from './gad/factor-table.js';
|
|
23
|
+
import { timesMoney } from './pension/money.js';
|
|
23
24
|
import { ERF_0_420 } from './gad/erf-2023-06-30.js';
|
|
24
25
|
import { LRF_0_421 } from './gad/lrf-2023-06-30.js';
|
|
25
26
|
import { LRF_0_422 } from './gad/lrf-0-422-2023-06-30.js';
|
|
@@ -62,11 +63,6 @@ const TABLES = {
|
|
|
62
63
|
[FACTOR_TABLES.earlyAge65]: new FactorTable(ERF_1_402),
|
|
63
64
|
[FACTOR_TABLES.late2008]: new FactorTable(LRF_2_416),
|
|
64
65
|
};
|
|
65
|
-
/** Every table the library reads, by its GAD reference. The one set of
|
|
66
|
-
* instances, so two callers cannot read the same table two ways. */
|
|
67
|
-
export function factorTable(ref) {
|
|
68
|
-
return TABLES[ref];
|
|
69
|
-
}
|
|
70
66
|
/** Which benefit a factor applies to, where two benefits measured from
|
|
71
67
|
* one pension age read different tables: a 1995 Section pension and its
|
|
72
68
|
* automatic lump sum, and 2015 Section additional pension. */
|
|
@@ -95,30 +91,11 @@ export const FACTOR_SOURCES = {
|
|
|
95
91
|
atPensionAge: 'at-normal-pension-age',
|
|
96
92
|
noLateUplift: 'section-awards-no-late-uplift',
|
|
97
93
|
};
|
|
98
|
-
/**
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const early = basis.direction === FACTOR_DIRECTIONS.early;
|
|
103
|
-
if (section2015) {
|
|
104
|
-
const additionalPension = basis.applies === FACTOR_APPLIES.additionalPension;
|
|
105
|
-
if (early)
|
|
106
|
-
return TABLES[FACTOR_TABLES.early2015];
|
|
107
|
-
return additionalPension
|
|
108
|
-
? TABLES[FACTOR_TABLES.late2015AdditionalPension]
|
|
109
|
-
: TABLES[FACTOR_TABLES.late2015];
|
|
110
|
-
}
|
|
111
|
-
if (section1995) {
|
|
112
|
-
const pension = basis.applies === FACTOR_APPLIES.pension;
|
|
113
|
-
return pension
|
|
114
|
-
? TABLES[FACTOR_TABLES.early1995Pension]
|
|
115
|
-
: TABLES[FACTOR_TABLES.early1995LumpSum];
|
|
116
|
-
}
|
|
117
|
-
return early
|
|
118
|
-
? TABLES[FACTOR_TABLES.earlyAge65]
|
|
119
|
-
: TABLES[FACTOR_TABLES.late2008];
|
|
94
|
+
/** Every table the library reads, by its GAD reference. The one set of
|
|
95
|
+
* instances, so two callers cannot read the same table two ways. */
|
|
96
|
+
export function factorTable(ref) {
|
|
97
|
+
return TABLES[ref];
|
|
120
98
|
}
|
|
121
|
-
const keyedByAge = (table) => table.index.by === 'age';
|
|
122
99
|
/**
|
|
123
100
|
* Read the factor for a drawing. The date decides the direction as well
|
|
124
101
|
* as the cell, so a basis whose direction the dates contradict is a bug
|
|
@@ -158,4 +135,39 @@ export function readFactor(basis, dateOfBirth, drawn) {
|
|
|
158
135
|
provenance: table.provenance,
|
|
159
136
|
};
|
|
160
137
|
}
|
|
138
|
+
/**
|
|
139
|
+
* A figure with its factor applied: the one place `after` is made, so it
|
|
140
|
+
* is always `beforeFactor` times the factor, in both rulers. No factor
|
|
141
|
+
* means the rules pay nothing, so nothing is paid after it.
|
|
142
|
+
*/
|
|
143
|
+
export function factored(beforeFactor, factor) {
|
|
144
|
+
const times = factor === null ? 0 : factor.factor;
|
|
145
|
+
return { beforeFactor, after: timesMoney(beforeFactor, times), factor };
|
|
146
|
+
}
|
|
147
|
+
/** The table a basis reads, and how it is keyed. */
|
|
148
|
+
function tableFor(basis) {
|
|
149
|
+
const section2015 = basis.against === MEMBERS_NPA;
|
|
150
|
+
const section1995 = basis.against === LEGACY_PENSION_AGES.section1995;
|
|
151
|
+
const early = basis.direction === FACTOR_DIRECTIONS.early;
|
|
152
|
+
if (section2015) {
|
|
153
|
+
const additionalPension = basis.applies === FACTOR_APPLIES.additionalPension;
|
|
154
|
+
if (early)
|
|
155
|
+
return TABLES[FACTOR_TABLES.early2015];
|
|
156
|
+
return additionalPension
|
|
157
|
+
? TABLES[FACTOR_TABLES.late2015AdditionalPension]
|
|
158
|
+
: TABLES[FACTOR_TABLES.late2015];
|
|
159
|
+
}
|
|
160
|
+
if (section1995) {
|
|
161
|
+
const pension = basis.applies === FACTOR_APPLIES.pension;
|
|
162
|
+
return pension
|
|
163
|
+
? TABLES[FACTOR_TABLES.early1995Pension]
|
|
164
|
+
: TABLES[FACTOR_TABLES.early1995LumpSum];
|
|
165
|
+
}
|
|
166
|
+
return early
|
|
167
|
+
? TABLES[FACTOR_TABLES.earlyAge65]
|
|
168
|
+
: TABLES[FACTOR_TABLES.late2008];
|
|
169
|
+
}
|
|
170
|
+
function keyedByAge(table) {
|
|
171
|
+
return table.index.by === 'age';
|
|
172
|
+
}
|
|
161
173
|
//# sourceMappingURL=factor-basis.js.map
|
package/dist/factor-basis.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factor-basis.js","sourceRoot":"","sources":["../src/factor-basis.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AACH,OAAO,EAAC,mBAAmB,EAAE,OAAO,EAAC,MAAM,YAAY,CAAC;AACxD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,mBAAmB,EAAC,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"factor-basis.js","sourceRoot":"","sources":["../src/factor-basis.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -19,9 +19,9 @@ export { ADDITIONAL_PENSION_LIMIT, ADDITIONAL_PENSION_PAYMENTS, ADDITIONAL_PENSI
|
|
|
19
19
|
export type { AdditionalPensionPayment, AdditionalPensionPurchase, } from './additional-pension.js';
|
|
20
20
|
export { ADDITIONAL_PENSION_COVERS } from './gad/additional-pension-table.js';
|
|
21
21
|
export type { AdditionalPensionCover, AdditionalPensionProvenance, } from './gad/additional-pension-table.js';
|
|
22
|
-
export { ADDITIONAL_PENSION_REFUSALS, AdditionalPensionUnavailable, AmbiguousScalePoint, AwardUnavailable, BeforeStatement, BenefitNotModelled, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, STATEMENT_READS, } from './errors.js';
|
|
22
|
+
export { ADDITIONAL_PENSION_REFUSALS, AdditionalPensionUnavailable, AmbiguousScalePoint, AwardUnavailable, BeforeStatement, BenefitNotModelled, isBeforeStatement, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, STATEMENT_READS, } from './errors.js';
|
|
23
23
|
export type { AdditionalPensionRefusal, NotModelled, StatementRead, } from './errors.js';
|
|
24
|
-
export { DocumentSource } from './document-source.js';
|
|
24
|
+
export { DocumentSource, SOURCE_CURRENCIES } from './document-source.js';
|
|
25
25
|
export { isoDate, isoMonth, monthOf, firstOfMonth, monthToDate, isoToDate, isoDateOf, } from './iso-date.js';
|
|
26
26
|
export type { IsoDate, IsoMonth } from './iso-date.js';
|
|
27
27
|
export type { DocumentSourceFields, PageSource, SourceCurrency, } from './document-source.js';
|
|
@@ -32,7 +32,7 @@ export { payRound } from './pay-round.js';
|
|
|
32
32
|
export type { PayRound, RoundStatus } from './pay-round.js';
|
|
33
33
|
export { SESSION_ALLOWANCES, afcSessionAllowances, sessionAllowance, } from './allowances.js';
|
|
34
34
|
export type { SessionAllowance, SessionAllowanceId, } from './allowances.js';
|
|
35
|
-
export { ACTIVE_REVAL_BONUS_PCT, IN_SERVICE_REVALUATION, revaluationFor, } from './revaluation.js';
|
|
35
|
+
export { ACTIVE_REVAL_BONUS_PCT, activeRatePct, IN_SERVICE_REVALUATION, revaluationFor, } from './revaluation.js';
|
|
36
36
|
export type { RevaluationYear } from './revaluation.js';
|
|
37
37
|
export { buildPayPath, PAY_BASES, promotionalIndex } from './pay-path.js';
|
|
38
38
|
export type { PayBasis, PayPath, YearPay } from './pay-path.js';
|
|
@@ -57,7 +57,7 @@ export type { ProjectionPoint } from './pension/curve.js';
|
|
|
57
57
|
export type { ProjectionMoney } from './pension/money.js';
|
|
58
58
|
export { createPrices, createPublishedPrices, inflationFactor, TODAYS_MONEY_CPI, } from './pension/prices.js';
|
|
59
59
|
export type { CpiEntry, CpiSource, Prices, } from './pension/prices.js';
|
|
60
|
-
export {
|
|
60
|
+
export { deferredRatePct, MEMBER_PHASES, upliftsFor, } from './pension/uplift.js';
|
|
61
61
|
export type { AppliedUplift, MemberPhase, UpliftSource, } from './pension/uplift.js';
|
|
62
62
|
export { isSchemeYearEnd, schemeYearAfter, schemeYearBefore, schemeYearClosedBy, schemeYearEnd, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, } from './pension/scheme-year.js';
|
|
63
63
|
export type { SchemeYearEnd } from './pension/scheme-year.js';
|
package/dist/index.js
CHANGED
|
@@ -13,12 +13,12 @@ export { DENTAL_GRADES, DENTAL_GRADE_IDS, DENTAL_PAY_YEARS, getDentalScales, } f
|
|
|
13
13
|
export { ADDITIONAL_PENSION_LIMIT, ADDITIONAL_PENSION_PAYMENTS, ADDITIONAL_PENSION_UNIT, additionalPensionCost, additionalPensionToBuy, } from './additional-pension.js';
|
|
14
14
|
export { ADDITIONAL_PENSION_COVERS } from './gad/additional-pension-table.js';
|
|
15
15
|
// ── Errors ───────────────────────────────────────
|
|
16
|
-
export { ADDITIONAL_PENSION_REFUSALS, AdditionalPensionUnavailable, AmbiguousScalePoint, AwardUnavailable, BeforeStatement, BenefitNotModelled, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, STATEMENT_READS, } from './errors.js';
|
|
16
|
+
export { ADDITIONAL_PENSION_REFUSALS, AdditionalPensionUnavailable, AmbiguousScalePoint, AwardUnavailable, BeforeStatement, BenefitNotModelled, isBeforeStatement, NOT_MODELLED, PayPathUnavailable, PensionTiersUnavailable, RetirementFactorOutOfRange, ScaleUnavailable, STATEMENT_READS, } from './errors.js';
|
|
17
17
|
// ── Cited documents ──────────────────────────────
|
|
18
18
|
// Every published document the library reads a figure from. A consumer
|
|
19
19
|
// citing "where these figures come from" reads the record rather than
|
|
20
20
|
// keeping its own copy of the url.
|
|
21
|
-
export { DocumentSource } from './document-source.js';
|
|
21
|
+
export { DocumentSource, SOURCE_CURRENCIES } from './document-source.js';
|
|
22
22
|
export { isoDate, isoMonth, monthOf, firstOfMonth, monthToDate, isoToDate, isoDateOf, } from './iso-date.js';
|
|
23
23
|
export { AFC_ENGLAND_SCALES_2025, AFC_ENGLAND_SCALES_2026, AFC_NI_2025, AFC_SCOTLAND, AFC_SCOTLAND_36_HOUR_WEEK, AFC_W_01_2026, AFC_W_02_2025, AFC_W_02_2026, AP_FACTSHEET_2026, DHSC_PETITION_779519, FA2004_SCH36_PARA_23ZB, SPPA_NHS_CIRCULAR_2025_09, HSC_TC8_05_2025, MD_W_01_2025, MD_W_01_2026, NHSBSA_ESTIMATE_GUIDE, NHSBSA_STATEMENT_GUIDE, 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';
|
|
24
24
|
// ── Pay awards ───────────────────────────────────
|
|
@@ -29,7 +29,7 @@ export { AWARD_FAMILIES, afcAward, anyNationSettled, awardFamilyFor, awardsFor,
|
|
|
29
29
|
export { payRound } from './pay-round.js';
|
|
30
30
|
// ── AfC allowances ───────────────────────────────
|
|
31
31
|
export { SESSION_ALLOWANCES, afcSessionAllowances, sessionAllowance, } from './allowances.js';
|
|
32
|
-
export { ACTIVE_REVAL_BONUS_PCT, IN_SERVICE_REVALUATION, revaluationFor, } from './revaluation.js';
|
|
32
|
+
export { ACTIVE_REVAL_BONUS_PCT, activeRatePct, IN_SERVICE_REVALUATION, revaluationFor, } from './revaluation.js';
|
|
33
33
|
// ── Pay path ───────────────────────────────────────
|
|
34
34
|
// GAD's promotional curve is the same for everybody, so it is public;
|
|
35
35
|
// a member's pay path is built inside and reached through the member's
|
|
@@ -62,7 +62,7 @@ export { firstJoinedOf, LEGACY_PENSION_AGES, mayDrawOn, memberMinimumPensionAge,
|
|
|
62
62
|
// ── The pension ledger ───────────────────────────────
|
|
63
63
|
// A consumer reads the ledger only when it wants the workings.
|
|
64
64
|
export { createPrices, createPublishedPrices, inflationFactor, TODAYS_MONEY_CPI, } from './pension/prices.js';
|
|
65
|
-
export {
|
|
65
|
+
export { deferredRatePct, MEMBER_PHASES, upliftsFor, } from './pension/uplift.js';
|
|
66
66
|
export { isSchemeYearEnd, schemeYearAfter, schemeYearBefore, schemeYearClosedBy, schemeYearEnd, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, } from './pension/scheme-year.js';
|
|
67
67
|
export { SEED_BASES, seedFromJoinDate, seedFromStatement, } from './pension/seed.js';
|
|
68
68
|
export { buildLedger } from './pension/ledger.js';
|
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,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAEzC,OAAO,EACL,SAAS,EACT,YAAY,EACZ,cAAc,EACd,aAAa,EACb,UAAU,EACV,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,eAAe,GAChB,MAAM,aAAa,CAAC;AASrB,oDAAoD;AACpD,OAAO,EACL,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAChB,MAAM,cAAc,CAAC;AAUtB,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,EAChB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAK5B,oDAAoD;AACpD,OAAO,EACL,wBAAwB,EACxB,2BAA2B,EAC3B,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAC,yBAAyB,EAAC,MAAM,mCAAmC,CAAC;AAK5E,oDAAoD;AACpD,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,EAC5B,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,uBAAuB,EACvB,0BAA0B,EAC1B,gBAAgB,EAChB,eAAe,GAChB,MAAM,aAAa,CAAC;AAKrB,oDAAoD;AACpD,uEAAuE;AACvE,sEAAsE;AACtE,mCAAmC;AACnC,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/member/benefits.js
CHANGED
|
@@ -137,10 +137,8 @@ function legacyAwards(b, legacy, choices, dates) {
|
|
|
137
137
|
function refuseUnmodelled(member, remedy, legacy) {
|
|
138
138
|
// Deferred until the split of a pre-rollback balance is read:
|
|
139
139
|
// https://github.com/casomoltd/nhs-pay/issues/20
|
|
140
|
-
if (remedy && member
|
|
141
|
-
|
|
142
|
-
< isoToDate(REMEDY.rollback)) {
|
|
143
|
-
throw new BenefitNotModelled(NOT_MODELLED.statementBeforeRollback, 'a statement from before rollback on 1 October 2023, which '
|
|
140
|
+
if (remedy && statementBeforeRollback(member)) {
|
|
141
|
+
throw new BenefitNotModelled(NOT_MODELLED.statementBeforeRollback, `a statement from before rollback on ${REMEDY.rollback}, which `
|
|
144
142
|
+ 'counts the remedy years in the 2015 Section');
|
|
145
143
|
}
|
|
146
144
|
// Deferred until part-time final-salary membership is modelled:
|
|
@@ -150,6 +148,13 @@ function refuseUnmodelled(member, remedy, legacy) {
|
|
|
150
148
|
+ 'part-time membership pro rata on whole-time final pay');
|
|
151
149
|
}
|
|
152
150
|
}
|
|
151
|
+
/** Whether the member's statement closes before rollback, and so still
|
|
152
|
+
* counts the remedy years in the 2015 Section. */
|
|
153
|
+
function statementBeforeRollback(member) {
|
|
154
|
+
return member.statement !== null
|
|
155
|
+
&& schemeYearEndDate(member.statement.yearEnd)
|
|
156
|
+
< isoToDate(REMEDY.rollback);
|
|
157
|
+
}
|
|
153
158
|
/** A legacy section's rules, as `MemberBenefits.legacy` states them. */
|
|
154
159
|
function legacyOf(section) {
|
|
155
160
|
const rules = RULES[section];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benefits.js","sourceRoot":"","sources":["../../src/member/benefits.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"benefits.js","sourceRoot":"","sources":["../../src/member/benefits.ts"],"names":[],"mappings":"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"}
|
package/dist/member/valuation.js
CHANGED
|
@@ -6,6 +6,7 @@ import { earliest } from '../dates.js';
|
|
|
6
6
|
import { buildCurve, walkThrough } from '../pension/curve.js';
|
|
7
7
|
import { buildLedger } from '../pension/ledger.js';
|
|
8
8
|
import { estimateHistory } from '../pension/history.js';
|
|
9
|
+
import { factored } from '../factor-basis.js';
|
|
9
10
|
import { moneyAt, sumMoney } from '../pension/money.js';
|
|
10
11
|
import { schemeYearBefore, schemeYearEndDate, schemeYearEndFor, } from '../pension/scheme-year.js';
|
|
11
12
|
import { seedFromJoinDate, seedFromStatement } from '../pension/seed.js';
|
|
@@ -122,12 +123,8 @@ export function careerAward(b, { section, window, seed }, dates) {
|
|
|
122
123
|
award: {
|
|
123
124
|
section,
|
|
124
125
|
periods: [window],
|
|
125
|
-
pension: {
|
|
126
|
-
|
|
127
|
-
after: moneyAt({ nominal: cash.drawn, real: todays.drawn }, dates.drawing),
|
|
128
|
-
factor: cash.factor,
|
|
129
|
-
},
|
|
130
|
-
automaticLumpSum: { beforeFactor: noLumpSum, after: noLumpSum, factor: null },
|
|
126
|
+
pension: factored(moneyAt({ nominal: cash.revalued, real: todays.revalued }, dates.drawing), cash.factor),
|
|
127
|
+
automaticLumpSum: factored(noLumpSum, null),
|
|
131
128
|
ledgers: { cash: cash.ledger, todaysMoney: todays.ledger },
|
|
132
129
|
provenance: { accrual: ACCRUALS.careerAverage },
|
|
133
130
|
},
|