@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"valuation.js","sourceRoot":"","sources":["../../src/member/valuation.ts"],"names":[],"mappings":"AAaA,OAAO,EAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAI5D,OAAO,EAAC,eAAe,EAAE,KAAK,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EACL,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,GACtD,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAGvE,OAAO,EACL,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AA+D1D,qCAAqC;AACrC,MAAM,CAAC,MAAM,KAAK,GAA8C;IAC9D,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU;IAC5B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU;CAC7B,CAAC;AAEF;;;yEAGyE;AACzE,MAAM,cAAc,GAAiC;IACnD,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,WAAW;IACzC,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,WAAW;IAC3C,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,aAAa;CACnD,CAAC;AAEF,qEAAqE;AACrE,MAAM,UAAU,WAAW,CAAC,KAAkB;IAC5C,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,aAAa,CAAC;AAC1D,CAAC;AAED;;8DAE8D;AAC9D,MAAM,UAAU,iBAAiB,CAC/B,MAAqB,EAAE,KAAkB;IAEzC,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC;KACpE,CAAC;AACJ,CAAC;AAED;sEACsE;AACtE,MAAM,UAAU,UAAU,CAAC,MAAqB;IAC9C,OAAO,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAClD,CAAC;AAED;6CAC6C;AAC7C,MAAM,UAAU,QAAQ,CAAC,CAAQ;IAC/B,MAAM,EAAC,SAAS,EAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,OAAO,SAAS,KAAK,IAAI;QACvB,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;AACrE,CAAC;AAED;;8DAE8D;AAC9D,MAAM,UAAU,QAAQ,CAAC,CAAQ;IAC/B,MAAM,EAAC,KAAK,EAAC,GAAG,CAAC,CAAC;IAClB,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,SAAS,GAAoC,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,EAAE,KAAK,CAAC,CAAC;IAClE,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QACtB,MAAM,EAAC,OAAO,EAAE,gBAAgB,EAAC,GAAG,iBAAiB,CACnD,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CACjE,CAAC;QACF,SAAS,CAAC,IAAI,CAAC;YACb,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;YACtB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC;SACzC,CAAC,CAAC;IACL,CAAC;IACD,mEAAmE;IACnE,6CAA6C;IAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,EAAE;QACtB,MAAM,EAAE,CAAC,CAAC,YAAY;QACtB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjB,MAAM,EAAE,CAAC,CAAC,YAAY;KACvB,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClC,SAAS,CAAC,IAAI,CAAC;QACb,OAAO,EAAE,QAAQ,CAAC,KAAK;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;QACtB,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;KAC1B,CAAC,CAAC;IACH,OAAO;QACL,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;KACnE,CAAC;AACJ,CAAC;AAED;gDACgD;AAChD,MAAM,UAAU,WAAW,CACzB,CAAQ,EAAE,EAAC,OAAO,EAAE,MAAM,EAAoB,EAAE,KAAc;IAE9D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,EAAE;QACxC,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC;QAC5C,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK;QACjD,MAAM,EAAE,CAAC,CAAC,UAAU;KACrB,CAAC,CAAC;IACH,OAAO;QACL,OAAO;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,OAAO,EAAE,IAAI;QACb,UAAU,EAAE;YACV,OAAO,EAAE,QAAQ,CAAC,WAAW;YAC7B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,WAAW,CACzB,CAAQ,EAAE,EAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAe,EAAE,KAAc;IAE/D,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,EAAE,CAChC,IAAI,CAAC,CAAC,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC,EAAE,KAAK,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACtC,uEAAuE;IACvE,UAAU;IACV,MAAM,SAAS,GAAG,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAChE,OAAO;QACL,KAAK,EAAE;YACL,OAAO;YACP,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"valuation.js","sourceRoot":"","sources":["../../src/member/valuation.ts"],"names":[],"mappings":"AAaA,OAAO,EAAC,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAI5D,OAAO,EAAC,eAAe,EAAE,KAAK,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAGpD,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AACrC,OAAO,EAAC,UAAU,EAAE,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EACL,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,GACtD,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAGvE,OAAO,EACL,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AAIrC,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AA+D1D,qCAAqC;AACrC,MAAM,CAAC,MAAM,KAAK,GAA8C;IAC9D,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU;IAC5B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,UAAU;CAC7B,CAAC;AAEF;;;yEAGyE;AACzE,MAAM,cAAc,GAAiC;IACnD,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,WAAW;IACzC,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,WAAW;IAC3C,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,aAAa;CACnD,CAAC;AAEF,qEAAqE;AACrE,MAAM,UAAU,WAAW,CAAC,KAAkB;IAC5C,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,aAAa,CAAC;AAC1D,CAAC;AAED;;8DAE8D;AAC9D,MAAM,UAAU,iBAAiB,CAC/B,MAAqB,EAAE,KAAkB;IAEzC,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC;KACpE,CAAC;AACJ,CAAC;AAED;sEACsE;AACtE,MAAM,UAAU,UAAU,CAAC,MAAqB;IAC9C,OAAO,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;AAClD,CAAC;AAED;6CAC6C;AAC7C,MAAM,UAAU,QAAQ,CAAC,CAAQ;IAC/B,MAAM,EAAC,SAAS,EAAC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,OAAO,SAAS,KAAK,IAAI;QACvB,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;AACrE,CAAC;AAED;;8DAE8D;AAC9D,MAAM,UAAU,QAAQ,CAAC,CAAQ;IAC/B,MAAM,EAAC,KAAK,EAAC,GAAG,CAAC,CAAC;IAClB,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,SAAS,GAAoC,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,EAAE,KAAK,CAAC,CAAC;IAClE,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QACtB,MAAM,EAAC,OAAO,EAAE,gBAAgB,EAAC,GAAG,iBAAiB,CACnD,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CACjE,CAAC;QACF,SAAS,CAAC,IAAI,CAAC;YACb,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;YACtB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC;SACzC,CAAC,CAAC;IACL,CAAC;IACD,mEAAmE;IACnE,6CAA6C;IAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,EAAE;QACtB,MAAM,EAAE,CAAC,CAAC,YAAY;QACtB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjB,MAAM,EAAE,CAAC,CAAC,YAAY;KACvB,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAClC,SAAS,CAAC,IAAI,CAAC;QACb,OAAO,EAAE,QAAQ,CAAC,KAAK;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;QACtB,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC;KAC1B,CAAC,CAAC;IACH,OAAO;QACL,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC;KACnE,CAAC;AACJ,CAAC;AAED;gDACgD;AAChD,MAAM,UAAU,WAAW,CACzB,CAAQ,EAAE,EAAC,OAAO,EAAE,MAAM,EAAoB,EAAE,KAAc;IAE9D,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,EAAE;QACxC,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC;QAC5C,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK;QACjD,MAAM,EAAE,CAAC,CAAC,UAAU;KACrB,CAAC,CAAC;IACH,OAAO;QACL,OAAO;QACP,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,OAAO,EAAE,IAAI;QACb,UAAU,EAAE;YACV,OAAO,EAAE,QAAQ,CAAC,WAAW;YAC7B,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B;KACF,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,WAAW,CACzB,CAAQ,EAAE,EAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAe,EAAE,KAAc;IAE/D,MAAM,MAAM,GAAG,CAAC,MAAc,EAAE,EAAE,CAChC,IAAI,CAAC,CAAC,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAC,EAAE,KAAK,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACtC,uEAAuE;IACvE,UAAU;IACV,MAAM,SAAS,GAAG,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAChE,OAAO;QACL,KAAK,EAAE;YACL,OAAO;YACP,OAAO,EAAE,CAAC,MAAM,CAAC;YACjB,OAAO,EAAE,QAAQ,CAAC,OAAO,CACvB,EAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAC,EAAE,KAAK,CAAC,OAAO,CAC/D,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,gBAAgB,EAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;YAC3C,OAAO,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,EAAC;YACxD,UAAU,EAAE,EAAC,OAAO,EAAE,QAAQ,CAAC,aAAa,EAAC;SAC9C;QACD,IAAI;QACJ,MAAM;KACP,CAAC;AACJ,CAAC;AAED;yEACyE;AACzE,MAAM,UAAU,WAAW,CACzB,CAAQ,EAAE,GAAgB,EAC1B,EAAC,OAAO,EAAE,OAAO,EAAU;IAE3B,MAAM,SAAS,GAAG,CAAC,CAAmB,EAAE,MAAc,EAAE,EAAE,CACxD,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,IAAI;QACzB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,eAAe,CAAC;YAChB,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;YACxC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO;YAC7B,sBAAsB,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe;YAC9C,MAAM;SACP,CAAC,CAAC;IACP,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;IAC5D,MAAM,GAAG,GAAG,CAAC,CAAmB,EAAE,OAAgC,EAAE,EAAE,CAAC,CAAC;QACtE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO;QACtD,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC;QACtD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,OAAO;QACzB,SAAS,EAAE,QAAQ,CACjB,CAAC,CAAC,KAAK,EAAE,OAAO,EAChB,iBAAiB,CAAC,OAAO,KAAK,IAAI;YAChC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe;YACxB,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CACpC;KACF,CAAC,CAAC;IACH,OAAO;QACL,OAAO,EAAE,EAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAC;QAChE,gBAAgB,EAAE,aAAa;QAC/B,KAAK,EAAE,UAAU,CACf,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAC3D;KACF,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAC3B,CAAQ,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAO,EAAE,EAAC,OAAO,EAAE,OAAO,EAAU,EACnE,OAAsB;IAEtB,OAAO,WAAW,CAAC;QACjB,IAAI;QACJ,KAAK,EAAE,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC;QACpC,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,OAAO;QACvB,MAAM;QACN,OAAO;QACP,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;KACvB,CAAC,CAAC;AACL,CAAC;AAED;6EAC6E;AAC7E,MAAM,UAAU,0BAA0B,CACxC,KAA2B,EAAE,CAAQ,EAAE,OAAa;IAEpD,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,GAAG,OAAO,EAAE,CAAC;QACpC,MAAM,IAAI,UAAU,CAClB,GAAG,KAAK,8CAA8C;cAClD,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,EAAE,CAC3B,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,iBAAiB,CAC/B,CAAQ,EAAE,EAAC,OAAO,EAAE,MAAM,EAAoB,EAAE,EAAQ,EAAE,IAAiB;IAE3E,MAAM,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACrD,MAAM,EAAC,OAAO,EAAE,gBAAgB,EAAC,GAAG,gBAAgB,CAClD,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,IAAI,CAC5D,CAAC;IACF,OAAO,EAAC,OAAO,EAAE,gBAAgB,EAAC,CAAC;AACrC,CAAC;AAED;;0EAE0E;AAC1E,MAAM,UAAU,SAAS,CAAC,CAAQ,EAAE,OAAa;IAC/C,OAAO,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAC,CAAC;AACnE,CAAC;AAED;sEACsE;AACtE,SAAS,eAAe,CAAC,CAAQ;IAC/B,OAAO,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AAC1E,CAAC;AAED,oEAAoE;AACpE,SAAS,IAAI,CACX,CAAQ,EAAE,EAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAO,EAAE,EAAC,OAAO,EAAE,OAAO,EAAU;IAEnE,OAAO,aAAa,CAAC;QACnB,IAAI;QACJ,KAAK,EAAE,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC;QACpC,WAAW,EAAE,CAAC,CAAC,IAAI;QACnB,OAAO;QACP,OAAO;QACP,MAAM;QACN,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC;KACvC,CAAC,CAAC;AACL,CAAC;AAED;kBACkB;AAClB,SAAS,SAAS,CAAC,CAAQ,EAAE,MAAqB,EAAE,OAAa;IAC/D,MAAM,KAAK,GAAG,gBAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtD,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI;QAC7C,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,IAAI,CAAC,CAAC;AACZ,CAAC;AAED,mEAAmE;AACnE,SAAS,YAAY,CACnB,MAAgC,EAAE,OAAa;IAE/C,OAAO,MAAM;SACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC;SAC3C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,EAAC,CAAC,CAAC,CAAC;AACpE,CAAC"}
|
package/dist/pension/ledger.js
CHANGED
|
@@ -20,10 +20,10 @@
|
|
|
20
20
|
* construction.
|
|
21
21
|
*/
|
|
22
22
|
import { uplift } from '@casomoltd/paye-calc';
|
|
23
|
-
import { BeforeStatement, invariant, STATEMENT_READS } from '../errors.js';
|
|
23
|
+
import { BeforeStatement, invariant, isBeforeStatement, STATEMENT_READS, } from '../errors.js';
|
|
24
24
|
import { dayAfter, monthsCountingPart, MONTHS_PER_YEAR } from '../dates.js';
|
|
25
25
|
import { pointsToDecimal } from './prices.js';
|
|
26
|
-
import { openingUpliftFor, phaseAt, upliftsFor } from './uplift.js';
|
|
26
|
+
import { MEMBER_PHASES, openingUpliftFor, phaseAt, upliftsFor, } from './uplift.js';
|
|
27
27
|
import { schemeYearAfter, schemeYearBefore, schemeYearEndDate, schemeYearEndFor, schemeYearStartDate, } from './scheme-year.js';
|
|
28
28
|
import { answersFrom, firstWalkedYear } from './seed.js';
|
|
29
29
|
/** The 2015 Section's accrual denominator: a year's pension is its
|
|
@@ -189,7 +189,7 @@ function frozenOrNull(part) {
|
|
|
189
189
|
}
|
|
190
190
|
/** A year's pensionable pay and its slice: pay only while active. */
|
|
191
191
|
function earningsIn({ year, req }, phase, months) {
|
|
192
|
-
const given = phase ===
|
|
192
|
+
const given = phase === MEMBER_PHASES.active ? req.payIn(year) : null;
|
|
193
193
|
const pensionableEarnings = given === null
|
|
194
194
|
? null
|
|
195
195
|
: payFor({ year, prices: req.prices, annualPay: given.pay, months });
|
|
@@ -197,7 +197,7 @@ function earningsIn({ year, req }, phase, months) {
|
|
|
197
197
|
// rather than three row subtypes: nothing about a row's
|
|
198
198
|
// BEHAVIOUR differs by phase, so there is nothing to dispatch
|
|
199
199
|
// and subtypes would override nothing.
|
|
200
|
-
invariant(phase ===
|
|
200
|
+
invariant(phase === MEMBER_PHASES.active || pensionableEarnings === null, `${phase} year ${year} carries pensionable earnings`);
|
|
201
201
|
return {
|
|
202
202
|
given,
|
|
203
203
|
pensionableEarnings,
|
|
@@ -219,7 +219,7 @@ function basisOf({ given, earned }) {
|
|
|
219
219
|
* and 28(2)).
|
|
220
220
|
*/
|
|
221
221
|
function leaverAdjustmentFor(year, prices, exitDate, months) {
|
|
222
|
-
const inService = upliftsFor(
|
|
222
|
+
const inService = upliftsFor(MEMBER_PHASES.active, prices.cpiFor)(year);
|
|
223
223
|
return {
|
|
224
224
|
on: exitDate,
|
|
225
225
|
percent: Math.max(0, inService.percent * months / MONTHS_PER_YEAR),
|
|
@@ -246,8 +246,9 @@ function settlementOf(row) {
|
|
|
246
246
|
* itself refuses nothing. */
|
|
247
247
|
function refuseBeforeStatement(seed, date, read) {
|
|
248
248
|
const from = answersFrom(seed);
|
|
249
|
-
|
|
250
|
-
|
|
249
|
+
if (from === null)
|
|
250
|
+
return;
|
|
251
|
+
if (isBeforeStatement(date, from))
|
|
251
252
|
throw new BeforeStatement(read, date, from);
|
|
252
253
|
}
|
|
253
254
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/pension/ledger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,sBAAsB,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"ledger.js","sourceRoot":"","sources":["../../src/pension/ledger.ts"],"names":[],"mappings":"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"}
|
package/dist/pension/money.d.ts
CHANGED
|
@@ -46,6 +46,8 @@ export declare function moneyAt(readings: Readings, asAt: Date): ProjectionMoney
|
|
|
46
46
|
export declare function sumMoney(xs: readonly Readings[], asAt: Date): ProjectionMoney;
|
|
47
47
|
/** `a` less `b`, each ruler on its own, at `a`'s date. */
|
|
48
48
|
export declare function minusMoney(a: ProjectionMoney, b: Readings): ProjectionMoney;
|
|
49
|
+
/** A figure multiplied by a scalar, both rulers, at its own date. */
|
|
50
|
+
export declare function timesMoney(m: ProjectionMoney, by: number): ProjectionMoney;
|
|
49
51
|
/** A figure divided by a scalar, both rulers, at its own date. */
|
|
50
52
|
export declare function divideMoney(m: ProjectionMoney, by: number): ProjectionMoney;
|
|
51
53
|
export {};
|
package/dist/pension/money.js
CHANGED
|
@@ -17,6 +17,10 @@ export function sumMoney(xs, asAt) {
|
|
|
17
17
|
export function minusMoney(a, b) {
|
|
18
18
|
return moneyAt({ nominal: a.nominal - b.nominal, real: a.real - b.real }, a.asAt);
|
|
19
19
|
}
|
|
20
|
+
/** A figure multiplied by a scalar, both rulers, at its own date. */
|
|
21
|
+
export function timesMoney(m, by) {
|
|
22
|
+
return moneyAt({ nominal: m.nominal * by, real: m.real * by }, m.asAt);
|
|
23
|
+
}
|
|
20
24
|
/** A figure divided by a scalar, both rulers, at its own date. */
|
|
21
25
|
export function divideMoney(m, by) {
|
|
22
26
|
return moneyAt({ nominal: m.nominal / by, real: m.real / by }, m.asAt);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"money.js","sourceRoot":"","sources":["../../src/pension/money.ts"],"names":[],"mappings":"AAwCA;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,QAAkB,EAAE,IAAU;IACpD,OAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAC,CAAC;AAChE,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,QAAQ,CACtB,EAAuB,EAAE,IAAU;IAEnC,OAAO,OAAO,CAAC;QACb,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;KACzC,EAAE,IAAI,CAAC,CAAC;AACX,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CACxB,CAAkB,EAAE,CAAW;IAE/B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAC,EACpE,CAAC,CAAC,IAAI,CAAC,CAAC;AACZ,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,WAAW,CACzB,CAAkB,EAAE,EAAU;IAE9B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE,EAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC"}
|
|
1
|
+
{"version":3,"file":"money.js","sourceRoot":"","sources":["../../src/pension/money.ts"],"names":[],"mappings":"AAwCA;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,QAAkB,EAAE,IAAU;IACpD,OAAO,EAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAC,CAAC;AAChE,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,QAAQ,CACtB,EAAuB,EAAE,IAAU;IAEnC,OAAO,OAAO,CAAC;QACb,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;KACzC,EAAE,IAAI,CAAC,CAAC;AACX,CAAC;AAED,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CACxB,CAAkB,EAAE,CAAW;IAE/B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAC,EACpE,CAAC,CAAC,IAAI,CAAC,CAAC;AACZ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,UAAU,CACxB,CAAkB,EAAE,EAAU;IAE9B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE,EAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,WAAW,CACzB,CAAkB,EAAE,EAAU;IAE9B,OAAO,OAAO,CAAC,EAAC,OAAO,EAAE,CAAC,CAAC,OAAO,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,GAAG,EAAE,EAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AACvE,CAAC"}
|
package/dist/pension/uplift.d.ts
CHANGED
|
@@ -25,21 +25,8 @@
|
|
|
25
25
|
*/
|
|
26
26
|
import type { CpiEntry, CpiSource, Prices } from './prices.js';
|
|
27
27
|
import type { SchemeYearEnd } from './scheme-year.js';
|
|
28
|
-
/**
|
|
29
|
-
|
|
30
|
-
* own dates: a phase is never "entered", so there are no
|
|
31
|
-
* transitions to guard and no machine to run.
|
|
32
|
-
*
|
|
33
|
-
* FOUNDING ASSUMPTION, and this is where it lives: the phases are
|
|
34
|
-
* TOTALLY ORDERED and each occurs at most once, because the input
|
|
35
|
-
* carries a single exitDate. One unbroken membership — join,
|
|
36
|
-
* contribute, leave, draw. A career break or a return to the
|
|
37
|
-
* scheme cannot be expressed, and would be modelled as continuous
|
|
38
|
-
* active service, OVERSTATING the pension. Relaxing it later
|
|
39
|
-
* means allowing the sequence to repeat, which this shape already
|
|
40
|
-
* permits: phase is computed per year from the member's dates.
|
|
41
|
-
*/
|
|
42
|
-
export type MemberPhase = 'active' | 'deferred' | 'inPayment';
|
|
28
|
+
/** One of {@link MEMBER_PHASES}. */
|
|
29
|
+
export type MemberPhase = (typeof MEMBER_PHASES)[keyof typeof MEMBER_PHASES];
|
|
43
30
|
/** One uplift, as applied to a member's record. */
|
|
44
31
|
export interface AppliedUplift {
|
|
45
32
|
/** The date the POT moves — 1 April through 2022, 6 April from
|
|
@@ -66,6 +53,25 @@ export interface AppliedUplift {
|
|
|
66
53
|
* walk's first step, not about this rule, and putting it here
|
|
67
54
|
* would make every caller narrow a value it always gets. */
|
|
68
55
|
export type UpliftSource = (schemeYearEnd: SchemeYearEnd) => AppliedUplift;
|
|
56
|
+
/**
|
|
57
|
+
* The three phases. Ordered by date and DERIVED from the member's
|
|
58
|
+
* own dates: a phase is never "entered", so there are no
|
|
59
|
+
* transitions to guard and no machine to run.
|
|
60
|
+
*
|
|
61
|
+
* FOUNDING ASSUMPTION, and this is where it lives: the phases are
|
|
62
|
+
* TOTALLY ORDERED and each occurs at most once, because the input
|
|
63
|
+
* carries a single exitDate. One unbroken membership — join,
|
|
64
|
+
* contribute, leave, draw. A career break or a return to the
|
|
65
|
+
* scheme cannot be expressed, and would be modelled as continuous
|
|
66
|
+
* active service, OVERSTATING the pension. Relaxing it later
|
|
67
|
+
* means allowing the sequence to repeat, which this shape already
|
|
68
|
+
* permits: phase is computed per year from the member's dates.
|
|
69
|
+
*/
|
|
70
|
+
export declare const MEMBER_PHASES: {
|
|
71
|
+
readonly active: "active";
|
|
72
|
+
readonly deferred: "deferred";
|
|
73
|
+
readonly inPayment: "inPayment";
|
|
74
|
+
};
|
|
69
75
|
/** Active until the member leaves, deferred until they draw, in
|
|
70
76
|
* payment after. Derived from dates; never entered.
|
|
71
77
|
*
|
|
@@ -73,15 +79,13 @@ export type UpliftSource = (schemeYearEnd: SchemeYearEnd) => AppliedUplift;
|
|
|
73
79
|
* function of phase alone and this is the only way a phase is
|
|
74
80
|
* ever obtained. */
|
|
75
81
|
export declare function phaseAt(year: SchemeYearEnd, exitYear: SchemeYearEnd, retireYear: SchemeYearEnd): MemberPhase;
|
|
76
|
-
/** CPI + 1.5 points. A negative CPI is carried through, not
|
|
77
|
-
* floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
|
|
78
|
-
export declare function activeRatePct(cpi: number): number;
|
|
79
82
|
/** Pensions Increase: CPI, floored at zero. Prices falling does
|
|
80
83
|
* not claw a pension back.
|
|
81
84
|
*
|
|
82
|
-
* A DIFFERENT instrument from the
|
|
83
|
-
*
|
|
84
|
-
*
|
|
85
|
+
* A DIFFERENT instrument from the in-service rate
|
|
86
|
+
* (`activeRatePct`, in `revaluation.ts`), which comes from the
|
|
87
|
+
* Public Service Pensions Revaluation Order, made under s.9(2)
|
|
88
|
+
* Public Service Pensions Act 2013; this one is
|
|
85
89
|
* Pensions Increase, made by the annual Pensions Increase
|
|
86
90
|
* (Review) Order under s.59 Social Security Pensions Act 1975,
|
|
87
91
|
* and it is what lifts a preserved pension and one in payment.
|
package/dist/pension/uplift.js
CHANGED
|
@@ -23,10 +23,29 @@
|
|
|
23
23
|
* Never the reverse — back-computing CPI as `rate − 1.5` would
|
|
24
24
|
* make the test of the +1.5 rule agree with itself.
|
|
25
25
|
*/
|
|
26
|
-
import {
|
|
26
|
+
import { activeRatePct, appliedOnFor } from '../revaluation.js';
|
|
27
27
|
import { invariant } from '../errors.js';
|
|
28
28
|
import { dayAfter, monthsCountingPart, MONTHS_PER_YEAR } from '../dates.js';
|
|
29
29
|
import { schemeYearAfter, schemeYearEndFor } from './scheme-year.js';
|
|
30
|
+
/**
|
|
31
|
+
* The three phases. Ordered by date and DERIVED from the member's
|
|
32
|
+
* own dates: a phase is never "entered", so there are no
|
|
33
|
+
* transitions to guard and no machine to run.
|
|
34
|
+
*
|
|
35
|
+
* FOUNDING ASSUMPTION, and this is where it lives: the phases are
|
|
36
|
+
* TOTALLY ORDERED and each occurs at most once, because the input
|
|
37
|
+
* carries a single exitDate. One unbroken membership — join,
|
|
38
|
+
* contribute, leave, draw. A career break or a return to the
|
|
39
|
+
* scheme cannot be expressed, and would be modelled as continuous
|
|
40
|
+
* active service, OVERSTATING the pension. Relaxing it later
|
|
41
|
+
* means allowing the sequence to repeat, which this shape already
|
|
42
|
+
* permits: phase is computed per year from the member's dates.
|
|
43
|
+
*/
|
|
44
|
+
export const MEMBER_PHASES = {
|
|
45
|
+
active: 'active',
|
|
46
|
+
deferred: 'deferred',
|
|
47
|
+
inPayment: 'inPayment',
|
|
48
|
+
};
|
|
30
49
|
/** Active until the member leaves, deferred until they draw, in
|
|
31
50
|
* payment after. Derived from dates; never entered.
|
|
32
51
|
*
|
|
@@ -35,20 +54,16 @@ import { schemeYearAfter, schemeYearEndFor } from './scheme-year.js';
|
|
|
35
54
|
* ever obtained. */
|
|
36
55
|
export function phaseAt(year, exitYear, retireYear) {
|
|
37
56
|
if (year <= exitYear)
|
|
38
|
-
return
|
|
39
|
-
return year < retireYear ?
|
|
40
|
-
}
|
|
41
|
-
/** CPI + 1.5 points. A negative CPI is carried through, not
|
|
42
|
-
* floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
|
|
43
|
-
export function activeRatePct(cpi) {
|
|
44
|
-
return cpi + ACTIVE_REVAL_BONUS_PCT;
|
|
57
|
+
return MEMBER_PHASES.active;
|
|
58
|
+
return year < retireYear ? MEMBER_PHASES.deferred : MEMBER_PHASES.inPayment;
|
|
45
59
|
}
|
|
46
60
|
/** Pensions Increase: CPI, floored at zero. Prices falling does
|
|
47
61
|
* not claw a pension back.
|
|
48
62
|
*
|
|
49
|
-
* A DIFFERENT instrument from the
|
|
50
|
-
*
|
|
51
|
-
*
|
|
63
|
+
* A DIFFERENT instrument from the in-service rate
|
|
64
|
+
* (`activeRatePct`, in `revaluation.ts`), which comes from the
|
|
65
|
+
* Public Service Pensions Revaluation Order, made under s.9(2)
|
|
66
|
+
* Public Service Pensions Act 2013; this one is
|
|
52
67
|
* Pensions Increase, made by the annual Pensions Increase
|
|
53
68
|
* (Review) Order under s.59 Social Security Pensions Act 1975,
|
|
54
69
|
* and it is what lifts a preserved pension and one in payment.
|
|
@@ -84,7 +99,7 @@ export function deferredRatePct(cpi) {
|
|
|
84
99
|
* year.
|
|
85
100
|
*/
|
|
86
101
|
export function upliftsFor(phase, cpiFor) {
|
|
87
|
-
const ratePct = phase ===
|
|
102
|
+
const ratePct = phase === MEMBER_PHASES.active
|
|
88
103
|
? activeRatePct
|
|
89
104
|
: deferredRatePct;
|
|
90
105
|
return (schemeYearEnd) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uplift.js","sourceRoot":"","sources":["../../src/pension/uplift.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"uplift.js","sourceRoot":"","sources":["../../src/pension/uplift.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAC,aAAa,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAE,kBAAkB,EAAE,eAAe,EAAC,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAC,eAAe,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAoCnE;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;CACd,CAAC;AAEX;;;;;oBAKoB;AACpB,MAAM,UAAU,OAAO,CACrB,IAAmB,EAAE,QAAuB,EAAE,UAAyB;IAEvE,IAAI,IAAI,IAAI,QAAQ;QAAE,OAAO,aAAa,CAAC,MAAM,CAAC;IAClD,OAAO,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC;AAC9E,CAAC;AAED;;;;;;;;;;;;;;;6BAe6B;AAC7B,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,UAAU,CACxB,KAAkB,EAClB,MAAiB;IAEjB,MAAM,OAAO,GAAG,KAAK,KAAK,aAAa,CAAC,MAAM;QAC5C,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,eAAe,CAAC;IAEpB,OAAO,CAAC,aAAa,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;QACnC,OAAO;YACL,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC;YACtC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1B,IAAI;SACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,MAAM,UAAU,gBAAgB,CAC9B,iBAAgC,EAChC,QAAc,EACd,cAAoB,EACpB,MAAc;IAEd,MAAM,KAAK,GAAG,OAAO,CACnB,eAAe,CAAC,iBAAiB,CAAC,EAClC,gBAAgB,CAAC,QAAQ,CAAC,EAC1B,gBAAgB,CAAC,cAAc,CAAC,CACjC,CAAC;IACF,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACnE,MAAM,iBAAiB,GAAG,iBAAiB,KAAK,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC3E,IAAI,CAAC,iBAAiB;QAAE,OAAO,MAAM,CAAC;IACtC,OAAO,EAAC,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAC7D,QAAQ,EAAE,MAAM,CAAC,SAAS,CAC3B,EAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,kBAAkB,CAAC,QAAc,EAAE,SAAe;IACzD,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IACjE,SAAS,CACP,MAAM,IAAI,eAAe,EACzB,oBAAoB,MAAM,2BAA2B;UACjD,QAAQ,CAAC,YAAY,EAAE,CAC5B,CAAC;IACF,OAAO,MAAM,GAAG,eAAe,CAAC;AAClC,CAAC"}
|
package/dist/revaluation.d.ts
CHANGED
|
@@ -28,14 +28,19 @@
|
|
|
28
28
|
* "SPPA NHS Circular 2023/01 — pension indexation and CARE
|
|
29
29
|
* revaluation" — the clearest annual statement of the exact NHS
|
|
30
30
|
* in-service rate. Scotland, but the same CPI + 1.5% rule and
|
|
31
|
-
* the same rate as England and Wales.
|
|
31
|
+
* the same rate as England and Wales. A rate source only: the
|
|
32
|
+
* date it gives, 10 April 2023, is superseded by SI 2023/252
|
|
33
|
+
* art 1(3), which brings the Order into force on 6 April 2023
|
|
34
|
+
* for all four NHS 2015 schemes (Northern Ireland's by NISR
|
|
35
|
+
* 2023/54 art 1(3)(b)).
|
|
32
36
|
*
|
|
33
37
|
* "NHS Pension Scheme Valuation Report 2020", Appendix E
|
|
34
38
|
* "Inter-valuation events" — the in-service revaluation as
|
|
35
|
-
* ACTUALLY APPLIED,
|
|
36
|
-
* the orders. No rate is
|
|
37
|
-
*
|
|
38
|
-
* test oracle in
|
|
39
|
+
* ACTUALLY APPLIED, each year commencing April 2016 to April 2023,
|
|
40
|
+
* independent of the orders. No rate is transcribed here: each
|
|
41
|
+
* year's `activeRatePct` is the rule applied to the Order's CPI,
|
|
42
|
+
* and the applied rates are the test oracle in
|
|
43
|
+
* `tests/fixtures/revaluation-applied.csv`.
|
|
39
44
|
*
|
|
40
45
|
* "SI 2015/94 Sch 9 para 3 — revaluation": the NHS Pension
|
|
41
46
|
* Scheme Regulations 2015 add 1.5 to the prices "increase or
|
|
@@ -56,10 +61,12 @@
|
|
|
56
61
|
*
|
|
57
62
|
* ── Three facts this data carries ───────────────────
|
|
58
63
|
*
|
|
59
|
-
* **The revaluation date
|
|
60
|
-
*
|
|
61
|
-
* annual allowance
|
|
62
|
-
*
|
|
64
|
+
* **The revaluation date is not fixed.** It is 1 April through
|
|
65
|
+
* 2022 and 6 April from 2023, to manage the interaction with the
|
|
66
|
+
* annual allowance; for 2023 the operative instrument is SI
|
|
67
|
+
* 2023/252 art 1(3), which names 6 April for the NHS schemes.
|
|
68
|
+
* `appliedOn` records it per year rather than letting a
|
|
69
|
+
* scheme-year boundary be assumed.
|
|
63
70
|
*
|
|
64
71
|
* **CPI is sourced independently of the rate**, never derived
|
|
65
72
|
* from it. Taking `septemberCpiPct = rate - 1.5` would make
|
|
@@ -99,6 +106,7 @@
|
|
|
99
106
|
* equivalent uplift is earnings dynamisation, not this.
|
|
100
107
|
*/
|
|
101
108
|
import type { SchemeYearEnd } from './pension/scheme-year.js';
|
|
109
|
+
import type { IsoDate } from './iso-date.js';
|
|
102
110
|
/** One scheme year's revaluation, and what set it. */
|
|
103
111
|
export interface RevaluationYear {
|
|
104
112
|
/** Scheme year END, e.g. 2022 for the 2021/22 year. */
|
|
@@ -118,15 +126,23 @@ export interface RevaluationYear {
|
|
|
118
126
|
* date again (11 April in 2022, 6 April in 2026) belonging
|
|
119
127
|
* to a different instrument. That is the trap on the 2022
|
|
120
128
|
* row, where 11 April is the date a search turns up. */
|
|
121
|
-
readonly appliedOn:
|
|
129
|
+
readonly appliedOn: IsoDate;
|
|
122
130
|
/** The statutory instrument that made it. */
|
|
123
131
|
readonly si: string;
|
|
132
|
+
/** The in-service rate the Order gives an active member, in
|
|
133
|
+
* percentage points: {@link activeRatePct} over
|
|
134
|
+
* `septemberCpiPct`, derived here once and never transcribed. */
|
|
135
|
+
readonly activeRatePct: number;
|
|
124
136
|
}
|
|
125
137
|
/** The bonus the scheme adds to CPI while a member is paying
|
|
126
138
|
* in, in PERCENTAGE POINTS. Added, never compounded. */
|
|
127
139
|
export declare const ACTIVE_REVAL_BONUS_PCT = 1.5;
|
|
128
|
-
/** In-service revaluation, oldest first, each year a `SchemeYearEnd
|
|
140
|
+
/** In-service revaluation, oldest first, each year a `SchemeYearEnd`
|
|
141
|
+
* with the active rate its Order gives. */
|
|
129
142
|
export declare const IN_SERVICE_REVALUATION: readonly RevaluationYear[];
|
|
143
|
+
/** CPI + 1.5 points. A negative CPI is carried through, not
|
|
144
|
+
* floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
|
|
145
|
+
export declare function activeRatePct(cpi: number): number;
|
|
130
146
|
/** The published rate for a scheme year, or null where the
|
|
131
147
|
* year isn't published — never a silent fallback. */
|
|
132
148
|
export declare function revaluationFor(yearEnd: SchemeYearEnd): RevaluationYear | null;
|
package/dist/revaluation.js
CHANGED
|
@@ -28,14 +28,19 @@
|
|
|
28
28
|
* "SPPA NHS Circular 2023/01 — pension indexation and CARE
|
|
29
29
|
* revaluation" — the clearest annual statement of the exact NHS
|
|
30
30
|
* in-service rate. Scotland, but the same CPI + 1.5% rule and
|
|
31
|
-
* the same rate as England and Wales.
|
|
31
|
+
* the same rate as England and Wales. A rate source only: the
|
|
32
|
+
* date it gives, 10 April 2023, is superseded by SI 2023/252
|
|
33
|
+
* art 1(3), which brings the Order into force on 6 April 2023
|
|
34
|
+
* for all four NHS 2015 schemes (Northern Ireland's by NISR
|
|
35
|
+
* 2023/54 art 1(3)(b)).
|
|
32
36
|
*
|
|
33
37
|
* "NHS Pension Scheme Valuation Report 2020", Appendix E
|
|
34
38
|
* "Inter-valuation events" — the in-service revaluation as
|
|
35
|
-
* ACTUALLY APPLIED,
|
|
36
|
-
* the orders. No rate is
|
|
37
|
-
*
|
|
38
|
-
* test oracle in
|
|
39
|
+
* ACTUALLY APPLIED, each year commencing April 2016 to April 2023,
|
|
40
|
+
* independent of the orders. No rate is transcribed here: each
|
|
41
|
+
* year's `activeRatePct` is the rule applied to the Order's CPI,
|
|
42
|
+
* and the applied rates are the test oracle in
|
|
43
|
+
* `tests/fixtures/revaluation-applied.csv`.
|
|
39
44
|
*
|
|
40
45
|
* "SI 2015/94 Sch 9 para 3 — revaluation": the NHS Pension
|
|
41
46
|
* Scheme Regulations 2015 add 1.5 to the prices "increase or
|
|
@@ -56,10 +61,12 @@
|
|
|
56
61
|
*
|
|
57
62
|
* ── Three facts this data carries ───────────────────
|
|
58
63
|
*
|
|
59
|
-
* **The revaluation date
|
|
60
|
-
*
|
|
61
|
-
* annual allowance
|
|
62
|
-
*
|
|
64
|
+
* **The revaluation date is not fixed.** It is 1 April through
|
|
65
|
+
* 2022 and 6 April from 2023, to manage the interaction with the
|
|
66
|
+
* annual allowance; for 2023 the operative instrument is SI
|
|
67
|
+
* 2023/252 art 1(3), which names 6 April for the NHS schemes.
|
|
68
|
+
* `appliedOn` records it per year rather than letting a
|
|
69
|
+
* scheme-year boundary be assumed.
|
|
63
70
|
*
|
|
64
71
|
* **CPI is sourced independently of the rate**, never derived
|
|
65
72
|
* from it. Taking `septemberCpiPct = rate - 1.5` would make
|
|
@@ -99,11 +106,7 @@
|
|
|
99
106
|
* equivalent uplift is earnings dynamisation, not this.
|
|
100
107
|
*/
|
|
101
108
|
import { schemeYearEnd } from './pension/scheme-year.js';
|
|
102
|
-
|
|
103
|
-
const APRIL_MONTH_INDEX = 3;
|
|
104
|
-
/** The day of April the scheme applies an Order from 2023, and so the day
|
|
105
|
-
* a year with no Order yet is read as moving on. */
|
|
106
|
-
const UPLIFT_DAY_FROM_2023 = 6;
|
|
109
|
+
import { isoDate, isoToDate } from './iso-date.js';
|
|
107
110
|
/** The bonus the scheme adds to CPI while a member is paying
|
|
108
111
|
* in, in PERCENTAGE POINTS. Added, never compounded. */
|
|
109
112
|
export const ACTIVE_REVAL_BONUS_PCT = 1.5;
|
|
@@ -122,72 +125,87 @@ const REVALUATION_ROWS = [
|
|
|
122
125
|
// qualifier.
|
|
123
126
|
yearEnd: 2016,
|
|
124
127
|
septemberCpiPct: -0.1,
|
|
125
|
-
appliedOn: '2016-04-01',
|
|
128
|
+
appliedOn: isoDate('2016-04-01'),
|
|
126
129
|
si: 'SI 2016/438',
|
|
127
130
|
},
|
|
128
131
|
{
|
|
129
132
|
yearEnd: 2017,
|
|
130
133
|
septemberCpiPct: 1.0,
|
|
131
|
-
appliedOn: '2017-04-01',
|
|
134
|
+
appliedOn: isoDate('2017-04-01'),
|
|
132
135
|
si: 'SI 2017/242',
|
|
133
136
|
},
|
|
134
137
|
{
|
|
135
138
|
yearEnd: 2018,
|
|
136
139
|
septemberCpiPct: 3.0,
|
|
137
|
-
appliedOn: '2018-04-01',
|
|
140
|
+
appliedOn: isoDate('2018-04-01'),
|
|
138
141
|
si: 'SI 2018/338',
|
|
139
142
|
},
|
|
140
143
|
{
|
|
141
144
|
yearEnd: 2019,
|
|
142
145
|
septemberCpiPct: 2.4,
|
|
143
|
-
appliedOn: '2019-04-01',
|
|
146
|
+
appliedOn: isoDate('2019-04-01'),
|
|
144
147
|
si: 'SI 2019/455',
|
|
145
148
|
},
|
|
146
149
|
{
|
|
147
150
|
yearEnd: 2020,
|
|
148
151
|
septemberCpiPct: 1.7,
|
|
149
|
-
appliedOn: '2020-04-01',
|
|
152
|
+
appliedOn: isoDate('2020-04-01'),
|
|
150
153
|
si: 'SI 2020/230',
|
|
151
154
|
},
|
|
152
155
|
{
|
|
153
156
|
yearEnd: 2021,
|
|
154
157
|
septemberCpiPct: 0.5,
|
|
155
|
-
appliedOn: '2021-04-01',
|
|
158
|
+
appliedOn: isoDate('2021-04-01'),
|
|
156
159
|
si: 'SI 2021/276',
|
|
157
160
|
},
|
|
158
161
|
{
|
|
159
162
|
yearEnd: 2022,
|
|
160
163
|
septemberCpiPct: 3.1,
|
|
161
|
-
appliedOn: '2022-04-01',
|
|
164
|
+
appliedOn: isoDate('2022-04-01'),
|
|
162
165
|
si: 'SI 2022/215',
|
|
163
166
|
},
|
|
164
167
|
{
|
|
165
168
|
yearEnd: 2023,
|
|
166
169
|
septemberCpiPct: 10.1,
|
|
167
|
-
appliedOn: '2023-04-06',
|
|
170
|
+
appliedOn: isoDate('2023-04-06'),
|
|
168
171
|
si: 'SI 2023/252',
|
|
169
172
|
},
|
|
170
173
|
{
|
|
171
174
|
yearEnd: 2024,
|
|
172
175
|
septemberCpiPct: 6.7,
|
|
173
|
-
appliedOn: '2024-04-06',
|
|
176
|
+
appliedOn: isoDate('2024-04-06'),
|
|
174
177
|
si: 'SI 2024/290',
|
|
175
178
|
},
|
|
176
179
|
{
|
|
177
180
|
yearEnd: 2025,
|
|
178
181
|
septemberCpiPct: 1.7,
|
|
179
|
-
appliedOn: '2025-04-06',
|
|
182
|
+
appliedOn: isoDate('2025-04-06'),
|
|
180
183
|
si: 'SI 2025/252',
|
|
181
184
|
},
|
|
182
185
|
{
|
|
183
186
|
yearEnd: 2026,
|
|
184
187
|
septemberCpiPct: 3.8,
|
|
185
|
-
appliedOn: '2026-04-06',
|
|
188
|
+
appliedOn: isoDate('2026-04-06'),
|
|
186
189
|
si: 'SI 2026/254',
|
|
187
190
|
},
|
|
188
191
|
];
|
|
189
|
-
/** In-service revaluation, oldest first, each year a `SchemeYearEnd
|
|
190
|
-
|
|
192
|
+
/** In-service revaluation, oldest first, each year a `SchemeYearEnd`
|
|
193
|
+
* with the active rate its Order gives. */
|
|
194
|
+
export const IN_SERVICE_REVALUATION = REVALUATION_ROWS.map((row) => ({
|
|
195
|
+
...row,
|
|
196
|
+
yearEnd: schemeYearEnd(row.yearEnd),
|
|
197
|
+
activeRatePct: activeRatePct(row.septemberCpiPct),
|
|
198
|
+
}));
|
|
199
|
+
/** April, as `Date` counts months from nought. */
|
|
200
|
+
const APRIL_MONTH_INDEX = 3;
|
|
201
|
+
/** The day of April the scheme applies an Order from 2023, and so the day
|
|
202
|
+
* a year with no Order yet is read as moving on. */
|
|
203
|
+
const UPLIFT_DAY_FROM_2023 = 6;
|
|
204
|
+
/** CPI + 1.5 points. A negative CPI is carried through, not
|
|
205
|
+
* floored: September 2015's −0.1 gave a 1.4% uplift, not 1.5%. */
|
|
206
|
+
export function activeRatePct(cpi) {
|
|
207
|
+
return cpi + ACTIVE_REVAL_BONUS_PCT;
|
|
208
|
+
}
|
|
191
209
|
/** The published rate for a scheme year, or null where the
|
|
192
210
|
* year isn't published — never a silent fallback. */
|
|
193
211
|
export function revaluationFor(yearEnd) {
|
|
@@ -210,10 +228,6 @@ export function appliedOnFor(yearEnd) {
|
|
|
210
228
|
if (published === null) {
|
|
211
229
|
return new Date(yearEnd, APRIL_MONTH_INDEX, UPLIFT_DAY_FROM_2023);
|
|
212
230
|
}
|
|
213
|
-
|
|
214
|
-
// Built LOCAL, matching every other date in this library:
|
|
215
|
-
// parsing the ISO string gives UTC midnight, and under BST
|
|
216
|
-
// the two conventions sit an hour apart.
|
|
217
|
-
return new Date(y, m - 1, d);
|
|
231
|
+
return isoToDate(published.appliedOn);
|
|
218
232
|
}
|
|
219
233
|
//# sourceMappingURL=revaluation.js.map
|
package/dist/revaluation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revaluation.js","sourceRoot":"","sources":["../src/revaluation.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"revaluation.js","sourceRoot":"","sources":["../src/revaluation.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* lacks, such as a 60 denominator on best-single-year pay.
|
|
7
7
|
*/
|
|
8
8
|
import { dayAfter, daysBetween } from '../dates.js';
|
|
9
|
+
import { factored } from '../factor-basis.js';
|
|
9
10
|
import { moneyAt } from '../pension/money.js';
|
|
10
11
|
import { schemeYearAfter, schemeYearEnd, schemeYearEndFor, schemeYearStartDate, } from '../pension/scheme-year.js';
|
|
11
12
|
/** How a section measures final pay, named for an award's provenance.
|
|
@@ -39,19 +40,10 @@ export function finalSalaryBenefit(rules, { windows, payPath, dateOfBirth, leavi
|
|
|
39
40
|
const lumpFactor = lump === null
|
|
40
41
|
? null
|
|
41
42
|
: lump.factor(dateOfBirth, leaving, drawing);
|
|
42
|
-
const lumpSum = lumpFactor === null ? 0 : unreducedLump * lumpFactor.factor;
|
|
43
43
|
const money = (real) => moneyAt({ real, nominal: prices.payAt(real, drawing) }, drawing);
|
|
44
44
|
return {
|
|
45
|
-
pension:
|
|
46
|
-
|
|
47
|
-
after: money(unreduced * pensionFactor.factor),
|
|
48
|
-
factor: pensionFactor,
|
|
49
|
-
},
|
|
50
|
-
automaticLumpSum: {
|
|
51
|
-
beforeFactor: money(unreducedLump),
|
|
52
|
-
after: money(lumpSum),
|
|
53
|
-
factor: lumpFactor,
|
|
54
|
-
},
|
|
45
|
+
pension: factored(money(unreduced), pensionFactor),
|
|
46
|
+
automaticLumpSum: factored(money(unreducedLump), lumpFactor),
|
|
55
47
|
membership,
|
|
56
48
|
finalPay: pay,
|
|
57
49
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"final-salary.js","sourceRoot":"","sources":["../../src/sections/final-salary.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"final-salary.js","sourceRoot":"","sources":["../../src/sections/final-salary.ts"],"names":[],"mappings":"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"}
|