@novha/calc-engines 1.5.0 → 1.6.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.
@@ -7,7 +7,8 @@ class CanadaIncomeTaxServiceImpl {
7
7
  this._rules = rules;
8
8
  }
9
9
  calculateNetIncome() {
10
- const grossTax = this.computeGrossTax(this._income, this._rules.taxBrackets);
10
+ const bracketBreakdown = this.computeTaxBracketBreakdown(this._income, this._rules.taxBrackets);
11
+ const grossTax = bracketBreakdown.reduce((total, b) => total + b.taxOnAmount, 0);
11
12
  const netTax = this.applyCredits(grossTax, this._rules.credits);
12
13
  const cpp = this.computeCPP(this._income, this._rules.contributions?.cpp);
13
14
  const ei = this.computeEI(this._income, this._rules.contributions?.ei);
@@ -19,8 +20,36 @@ class CanadaIncomeTaxServiceImpl {
19
20
  totalDeductions: netTax + cpp + ei,
20
21
  netIncome: this._income - netTax - cpp - ei,
21
22
  effectiveTaxRate: netTax / this._income,
23
+ taxBracketBreakdown: bracketBreakdown,
22
24
  };
23
25
  }
26
+ computeTaxBracketBreakdown(income, brackets) {
27
+ return brackets.map((b, index) => {
28
+ if (income <= b.from) {
29
+ return {
30
+ bracketIndex: index,
31
+ bracketName: `Bracket ${index + 1}`,
32
+ from: b.from,
33
+ to: b.to ?? null,
34
+ rate: b.rate,
35
+ amountInBracket: 0,
36
+ taxOnAmount: 0,
37
+ };
38
+ }
39
+ const upper = b.to ?? income;
40
+ const taxable = Math.min(income, upper) - b.from;
41
+ const taxOnAmount = taxable * b.rate;
42
+ return {
43
+ bracketIndex: index,
44
+ bracketName: `Bracket ${index + 1}`,
45
+ from: b.from,
46
+ to: b.to ?? null,
47
+ rate: b.rate,
48
+ amountInBracket: taxable,
49
+ taxOnAmount: taxOnAmount,
50
+ };
51
+ });
52
+ }
24
53
  computeGrossTax(income, brackets) {
25
54
  return brackets.reduce((total, b) => {
26
55
  if (income <= b.from)
@@ -48,4 +77,4 @@ class CanadaIncomeTaxServiceImpl {
48
77
  }
49
78
  }
50
79
  exports.CanadaIncomeTaxServiceImpl = CanadaIncomeTaxServiceImpl;
51
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FuYWRhSW5jb21lVGF4U2VydmljZUltcGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW5jb21lLXRheC9jYW5hZGEvQ2FuYWRhSW5jb21lVGF4U2VydmljZUltcGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBV0EsTUFBYSwwQkFBMEI7SUFJbkMsWUFBWSxNQUFjLEVBQUUsS0FBcUI7UUFDN0MsSUFBSSxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUM7UUFDdEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxLQUFLLENBQUM7SUFDeEIsQ0FBQztJQUVNLGtCQUFrQjtRQUVyQixNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUM3RSxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2hFLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUMxRSxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFFdkUsT0FBTztZQUNILFdBQVcsRUFBRSxJQUFJLENBQUMsT0FBTztZQUN6QixTQUFTLEVBQUUsTUFBTTtZQUNqQixHQUFHO1lBQ0gsRUFBRTtZQUNGLGVBQWUsRUFBRSxNQUFNLEdBQUcsR0FBRyxHQUFHLEVBQUU7WUFDbEMsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLEdBQUcsTUFBTSxHQUFHLEdBQUcsR0FBRyxFQUFFO1lBQzNDLGdCQUFnQixFQUFFLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTztTQUMxQyxDQUFDO0lBQ04sQ0FBQztJQUVPLGVBQWUsQ0FBQyxNQUFjLEVBQUUsUUFBc0I7UUFDMUQsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ2hDLElBQUksTUFBTSxJQUFJLENBQUMsQ0FBQyxJQUFJO2dCQUFFLE9BQU8sS0FBSyxDQUFDO1lBRW5DLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQyxFQUFFLElBQUksTUFBTSxDQUFDO1lBQzdCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7WUFFakQsT0FBTyxLQUFLLEdBQUcsT0FBTyxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUM7UUFDcEMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ1YsQ0FBQztJQUVPLFlBQVksQ0FBQyxHQUFXLEVBQUUsVUFBcUMsRUFBRTtRQUNyRSxNQUFNLFlBQVksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sQ0FDOUMsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsSUFBSSxFQUNuQyxDQUFDLENBQ0osQ0FBQztRQUVGLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsR0FBRyxHQUFHLFlBQVksQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFTyxVQUFVLENBQUMsTUFBYyxFQUFFLEdBQXFCO1FBQ3BELElBQUksQ0FBQyxHQUFHLElBQUksTUFBTSxJQUFJLEdBQUcsQ0FBQyxTQUFTO1lBQUUsT0FBTyxDQUFDLENBQUM7UUFFOUMsTUFBTSxhQUFhLEdBQUcsTUFBTSxHQUFHLEdBQUcsQ0FBQyxTQUFTLENBQUM7UUFDN0MsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUNYLGFBQWEsR0FBRyxHQUFHLENBQUMsSUFBSSxFQUN4QixHQUFHLENBQUMsZUFBZSxDQUN0QixDQUFDO0lBQ04sQ0FBQztJQUVPLFNBQVMsQ0FBQyxNQUFjLEVBQUUsRUFBbUI7UUFDakQsSUFBSSxDQUFDLEVBQUU7WUFBRSxPQUFPLENBQUMsQ0FBQztRQUVsQixNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUM1QixNQUFNLEVBQ04sRUFBRSxDQUFDLG9CQUFvQixDQUMxQixDQUFDO1FBRUYsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUNYLGVBQWUsR0FBRyxFQUFFLENBQUMsSUFBSSxFQUN6QixFQUFFLENBQUMsZUFBZSxDQUNyQixDQUFDO0lBQ04sQ0FBQztDQUNKO0FBdEVELGdFQXNFQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFRheEJyYWNrZXQgfSBmcm9tIFwiLi4vZG9tYWluL3R5cGVzXCI7XG5pbXBvcnQgeyBDYW5hZGFJbmNvbWVUYXhTZXJ2aWNlIH0gZnJvbSBcIi4vQ2FuYWRhSW5jb21lVGF4U2VydmljZVwiO1xuaW1wb3J0IHtcbiAgICBDUFBDb250cmlidXRpb24sXG4gICAgQ29tcHV0ZWRJbmNvbWVUYXhWYWx1ZXMsXG4gICAgRUlDb250cmlidXRpb24sXG4gICAgSW5jb21lVGF4UnVsZXMsXG4gICAgVGF4Q3JlZGl0XG59IGZyb20gXCIuL2RvbWFpbi90eXBlc1wiO1xuXG5cbmV4cG9ydCBjbGFzcyBDYW5hZGFJbmNvbWVUYXhTZXJ2aWNlSW1wbCBpbXBsZW1lbnRzIENhbmFkYUluY29tZVRheFNlcnZpY2Uge1xuICAgIHByaXZhdGUgX2luY29tZTogbnVtYmVyO1xuICAgIHByaXZhdGUgX3J1bGVzOiBJbmNvbWVUYXhSdWxlcztcblxuICAgIGNvbnN0cnVjdG9yKGluY29tZTogbnVtYmVyLCBydWxlczogSW5jb21lVGF4UnVsZXMpIHtcbiAgICAgICAgdGhpcy5faW5jb21lID0gaW5jb21lO1xuICAgICAgICB0aGlzLl9ydWxlcyA9IHJ1bGVzO1xuICAgIH1cblxuICAgIHB1YmxpYyBjYWxjdWxhdGVOZXRJbmNvbWUoKTogQ29tcHV0ZWRJbmNvbWVUYXhWYWx1ZXMge1xuXG4gICAgICAgIGNvbnN0IGdyb3NzVGF4ID0gdGhpcy5jb21wdXRlR3Jvc3NUYXgodGhpcy5faW5jb21lLCB0aGlzLl9ydWxlcy50YXhCcmFja2V0cyk7XG4gICAgICAgIGNvbnN0IG5ldFRheCA9IHRoaXMuYXBwbHlDcmVkaXRzKGdyb3NzVGF4LCB0aGlzLl9ydWxlcy5jcmVkaXRzKTtcbiAgICAgICAgY29uc3QgY3BwID0gdGhpcy5jb21wdXRlQ1BQKHRoaXMuX2luY29tZSwgdGhpcy5fcnVsZXMuY29udHJpYnV0aW9ucz8uY3BwKTtcbiAgICAgICAgY29uc3QgZWkgPSB0aGlzLmNvbXB1dGVFSSh0aGlzLl9pbmNvbWUsIHRoaXMuX3J1bGVzLmNvbnRyaWJ1dGlvbnM/LmVpKTtcblxuICAgICAgICByZXR1cm4ge1xuICAgICAgICAgICAgZ3Jvc3NJbmNvbWU6IHRoaXMuX2luY29tZSxcbiAgICAgICAgICAgIGluY29tZVRheDogbmV0VGF4LFxuICAgICAgICAgICAgY3BwLFxuICAgICAgICAgICAgZWksXG4gICAgICAgICAgICB0b3RhbERlZHVjdGlvbnM6IG5ldFRheCArIGNwcCArIGVpLFxuICAgICAgICAgICAgbmV0SW5jb21lOiB0aGlzLl9pbmNvbWUgLSBuZXRUYXggLSBjcHAgLSBlaSxcbiAgICAgICAgICAgIGVmZmVjdGl2ZVRheFJhdGU6IG5ldFRheCAvIHRoaXMuX2luY29tZSxcbiAgICAgICAgfTtcbiAgICB9XG5cbiAgICBwcml2YXRlIGNvbXB1dGVHcm9zc1RheChpbmNvbWU6IG51bWJlciwgYnJhY2tldHM6IFRheEJyYWNrZXRbXSk6IG51bWJlciB7XG4gICAgICAgIHJldHVybiBicmFja2V0cy5yZWR1Y2UoKHRvdGFsLCBiKSA9PiB7XG4gICAgICAgICAgICBpZiAoaW5jb21lIDw9IGIuZnJvbSkgcmV0dXJuIHRvdGFsO1xuICAgIFxuICAgICAgICAgICAgY29uc3QgdXBwZXIgPSBiLnRvID8/IGluY29tZTtcbiAgICAgICAgICAgIGNvbnN0IHRheGFibGUgPSBNYXRoLm1pbihpbmNvbWUsIHVwcGVyKSAtIGIuZnJvbTtcbiAgICBcbiAgICAgICAgICAgIHJldHVybiB0b3RhbCArIHRheGFibGUgKiBiLnJhdGU7XG4gICAgICAgIH0sIDApO1xuICAgIH1cblxuICAgIHByaXZhdGUgYXBwbHlDcmVkaXRzKHRheDogbnVtYmVyLCBjcmVkaXRzOiBSZWNvcmQ8c3RyaW5nLCBUYXhDcmVkaXQ+ID0ge30pOiBudW1iZXIge1xuICAgICAgICBjb25zdCB0b3RhbENyZWRpdHMgPSBPYmplY3QudmFsdWVzKGNyZWRpdHMpLnJlZHVjZShcbiAgICAgICAgICAgIChzdW0sIGMpID0+IHN1bSArIGMuYW1vdW50ICogYy5yYXRlLFxuICAgICAgICAgICAgMCxcbiAgICAgICAgKTtcbiAgICBcbiAgICAgICAgcmV0dXJuIE1hdGgubWF4KDAsIHRheCAtIHRvdGFsQ3JlZGl0cyk7XG4gICAgfVxuXG4gICAgcHJpdmF0ZSBjb21wdXRlQ1BQKGluY29tZTogbnVtYmVyLCBjcHA/OiBDUFBDb250cmlidXRpb24pOiBudW1iZXIge1xuICAgICAgICBpZiAoIWNwcCB8fCBpbmNvbWUgPD0gY3BwLmV4ZW1wdGlvbikgcmV0dXJuIDA7XG4gICAgXG4gICAgICAgIGNvbnN0IGNvbnRyaWJ1dGFibGUgPSBpbmNvbWUgLSBjcHAuZXhlbXB0aW9uO1xuICAgICAgICByZXR1cm4gTWF0aC5taW4oXG4gICAgICAgICAgICBjb250cmlidXRhYmxlICogY3BwLnJhdGUsXG4gICAgICAgICAgICBjcHAubWF4Q29udHJpYnV0aW9uLFxuICAgICAgICApO1xuICAgIH1cblxuICAgIHByaXZhdGUgY29tcHV0ZUVJKGluY29tZTogbnVtYmVyLCBlaT86IEVJQ29udHJpYnV0aW9uKTogbnVtYmVyIHtcbiAgICAgICAgaWYgKCFlaSkgcmV0dXJuIDA7XG4gICAgXG4gICAgICAgIGNvbnN0IGluc3VyYWJsZUluY29tZSA9IE1hdGgubWluKFxuICAgICAgICAgICAgaW5jb21lLFxuICAgICAgICAgICAgZWkubWF4SW5zdXJhYmxlRWFybmluZ3MsXG4gICAgICAgICk7XG4gICAgXG4gICAgICAgIHJldHVybiBNYXRoLm1pbihcbiAgICAgICAgICAgIGluc3VyYWJsZUluY29tZSAqIGVpLnJhdGUsXG4gICAgICAgICAgICBlaS5tYXhDb250cmlidXRpb24sXG4gICAgICAgICk7XG4gICAgfVxufSJdfQ==
80
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CanadaIncomeTaxServiceImpl.js","sourceRoot":"","sources":["../../../src/income-tax/canada/CanadaIncomeTaxServiceImpl.ts"],"names":[],"mappings":"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","sourcesContent":["import { BracketAllocation, TaxBracket } from \"../domain/types\";\nimport { CanadaIncomeTaxService } from \"./CanadaIncomeTaxService\";\nimport {\n    CPPContribution,\n    ComputedIncomeTaxValues,\n    EIContribution,\n    IncomeTaxRules,\n    TaxCredit\n} from \"./domain/types\";\n\n\nexport class CanadaIncomeTaxServiceImpl implements CanadaIncomeTaxService {\n    private _income: number;\n    private _rules: IncomeTaxRules;\n\n    constructor(income: number, rules: IncomeTaxRules) {\n        this._income = income;\n        this._rules = rules;\n    }\n\n    public calculateNetIncome(): ComputedIncomeTaxValues {\n\n        const bracketBreakdown = this.computeTaxBracketBreakdown(this._income, this._rules.taxBrackets);\n        const grossTax = bracketBreakdown.reduce((total, b) => total + b.taxOnAmount, 0);\n        const netTax = this.applyCredits(grossTax, this._rules.credits);\n        const cpp = this.computeCPP(this._income, this._rules.contributions?.cpp);\n        const ei = this.computeEI(this._income, this._rules.contributions?.ei);\n\n        return {\n            grossIncome: this._income,\n            incomeTax: netTax,\n            cpp,\n            ei,\n            totalDeductions: netTax + cpp + ei,\n            netIncome: this._income - netTax - cpp - ei,\n            effectiveTaxRate: netTax / this._income,\n            taxBracketBreakdown: bracketBreakdown,\n        };\n    }\n\n    private computeTaxBracketBreakdown(income: number, brackets: TaxBracket[]): BracketAllocation[] {\n        return brackets.map((b, index) => {\n            if (income <= b.from) {\n                return {\n                    bracketIndex: index,\n                    bracketName: `Bracket ${index + 1}`,\n                    from: b.from,\n                    to: b.to ?? null,\n                    rate: b.rate,\n                    amountInBracket: 0,\n                    taxOnAmount: 0,\n                };\n            }\n    \n            const upper = b.to ?? income;\n            const taxable = Math.min(income, upper) - b.from;\n            const taxOnAmount = taxable * b.rate;\n    \n            return {\n                bracketIndex: index,\n                bracketName: `Bracket ${index + 1}`,\n                from: b.from,\n                to: b.to ?? null,\n                rate: b.rate,\n                amountInBracket: taxable,\n                taxOnAmount: taxOnAmount,\n            };\n        });\n    }\n\n    private computeGrossTax(income: number, brackets: TaxBracket[]): number {\n        return brackets.reduce((total, b) => {\n            if (income <= b.from) return total;\n    \n            const upper = b.to ?? income;\n            const taxable = Math.min(income, upper) - b.from;\n    \n            return total + taxable * b.rate;\n        }, 0);\n    }\n\n    private applyCredits(tax: number, credits: Record<string, TaxCredit> = {}): number {\n        const totalCredits = Object.values(credits).reduce(\n            (sum, c) => sum + c.amount * c.rate,\n            0,\n        );\n    \n        return Math.max(0, tax - totalCredits);\n    }\n\n    private computeCPP(income: number, cpp?: CPPContribution): number {\n        if (!cpp || income <= cpp.exemption) return 0;\n    \n        const contributable = income - cpp.exemption;\n        return Math.min(\n            contributable * cpp.rate,\n            cpp.maxContribution,\n        );\n    }\n\n    private computeEI(income: number, ei?: EIContribution): number {\n        if (!ei) return 0;\n    \n        const insurableIncome = Math.min(\n            income,\n            ei.maxInsurableEarnings,\n        );\n    \n        return Math.min(\n            insurableIncome * ei.rate,\n            ei.maxContribution,\n        );\n    }\n}"]}
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW5jb21lLXRheC9jYW5hZGEvZG9tYWluL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBUYXhCcmFja2V0IH0gZnJvbSBcIi4uLy4uL2RvbWFpbi90eXBlc1wiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEluY29tZVRheFJ1bGVzIHtcbiAgICB0YXhCcmFja2V0czogVGF4QnJhY2tldFtdO1xuICAgIGNyZWRpdHM/OiBSZWNvcmQ8c3RyaW5nLCBUYXhDcmVkaXQ+O1xuICAgIGNvbnRyaWJ1dGlvbnM/OiBDb250cmlidXRpb25zO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFRheENyZWRpdCB7XG4gICAgYW1vdW50OiBudW1iZXI7XG4gICAgdHlwZTogJ25vblJlZnVuZGFibGUnIHwgJ3JlZnVuZGFibGUnO1xuICAgIHJhdGU6IG51bWJlcjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBDb250cmlidXRpb25zIHtcbiAgICBjcHA/OiBDUFBDb250cmlidXRpb247XG4gICAgZWk/OiBFSUNvbnRyaWJ1dGlvbjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBDUFBDb250cmlidXRpb24ge1xuICAgIHJhdGU6IG51bWJlcjtcbiAgICBtYXhDb250cmlidXRpb246IG51bWJlcjtcbiAgICBleGVtcHRpb246IG51bWJlcjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBFSUNvbnRyaWJ1dGlvbiB7XG4gICAgcmF0ZTogbnVtYmVyO1xuICAgIG1heEluc3VyYWJsZUVhcm5pbmdzOiBudW1iZXI7XG4gICAgbWF4Q29udHJpYnV0aW9uOiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ29tcHV0ZWRJbmNvbWVUYXhWYWx1ZXMge1xuICAgIGdyb3NzSW5jb21lOiBudW1iZXI7XG4gICAgaW5jb21lVGF4OiBudW1iZXI7XG4gICAgY3BwOiBudW1iZXI7XG4gICAgZWk6IG51bWJlcjtcbiAgICB0b3RhbERlZHVjdGlvbnM6IG51bWJlcjtcbiAgICBuZXRJbmNvbWU6IG51bWJlcjtcbiAgICBlZmZlY3RpdmVUYXhSYXRlOiBudW1iZXI7XG59XG5cbiJdfQ==
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW5jb21lLXRheC9jYW5hZGEvZG9tYWluL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBCcmFja2V0QWxsb2NhdGlvbiwgVGF4QnJhY2tldCB9IGZyb20gXCIuLi8uLi9kb21haW4vdHlwZXNcIjtcblxuZXhwb3J0IGludGVyZmFjZSBJbmNvbWVUYXhSdWxlcyB7XG4gICAgdGF4QnJhY2tldHM6IFRheEJyYWNrZXRbXTtcbiAgICBjcmVkaXRzPzogUmVjb3JkPHN0cmluZywgVGF4Q3JlZGl0PjtcbiAgICBjb250cmlidXRpb25zPzogQ29udHJpYnV0aW9ucztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBUYXhDcmVkaXQge1xuICAgIGFtb3VudDogbnVtYmVyO1xuICAgIHR5cGU6ICdub25SZWZ1bmRhYmxlJyB8ICdyZWZ1bmRhYmxlJztcbiAgICByYXRlOiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ29udHJpYnV0aW9ucyB7XG4gICAgY3BwPzogQ1BQQ29udHJpYnV0aW9uO1xuICAgIGVpPzogRUlDb250cmlidXRpb247XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ1BQQ29udHJpYnV0aW9uIHtcbiAgICByYXRlOiBudW1iZXI7XG4gICAgbWF4Q29udHJpYnV0aW9uOiBudW1iZXI7XG4gICAgZXhlbXB0aW9uOiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRUlDb250cmlidXRpb24ge1xuICAgIHJhdGU6IG51bWJlcjtcbiAgICBtYXhJbnN1cmFibGVFYXJuaW5nczogbnVtYmVyO1xuICAgIG1heENvbnRyaWJ1dGlvbjogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIENvbXB1dGVkSW5jb21lVGF4VmFsdWVzIHtcbiAgICBncm9zc0luY29tZTogbnVtYmVyO1xuICAgIGluY29tZVRheDogbnVtYmVyO1xuICAgIGNwcDogbnVtYmVyO1xuICAgIGVpOiBudW1iZXI7XG4gICAgdG90YWxEZWR1Y3Rpb25zOiBudW1iZXI7XG4gICAgbmV0SW5jb21lOiBudW1iZXI7XG4gICAgZWZmZWN0aXZlVGF4UmF0ZTogbnVtYmVyO1xuICAgIHRheEJyYWNrZXRCcmVha2Rvd246IEJyYWNrZXRBbGxvY2F0aW9uW107XG59XG5cbiJdfQ==
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW5jb21lLXRheC9kb21haW4vdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJ1bGVNZXRhIH0gZnJvbSBcIi4uLy4uL3NoYXJlZC9kb21haW4vdHlwZXNcIjtcblxuZXhwb3J0IGludGVyZmFjZSBSdWxlSW5wdXQge1xuICAgIG5hbWU6IHN0cmluZztcbiAgICB0eXBlOiAnbnVtYmVyJyB8ICdzZWxlY3QnIHwgJ3RleHQnO1xuICAgIHJlcXVpcmVkOiBib29sZWFuO1xuICAgIHVuaXQ/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUnVsZU91dHB1dCB7XG4gICAgbmFtZTogc3RyaW5nO1xuICAgIHR5cGU6ICdudW1iZXInIHwgJ3N0cmluZyc7XG4gICAgdW5pdD86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBUYXhCcmFja2V0IHtcbiAgICBmcm9tOiBudW1iZXI7XG4gICAgdG86IG51bWJlciB8IG51bGw7XG4gICAgcmF0ZTogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEluY29tZVRheENhbGN1bGF0b3JTY2hlbWE8VD4ge1xuICAgIG1ldGE6IFJ1bGVNZXRhO1xuICAgIGlucHV0czogUnVsZUlucHV0W107XG4gICAgb3V0cHV0czogUnVsZU91dHB1dFtdO1xuICAgIHJ1bGVzOiBUO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFnZUJhc2VkUmViYXRlIHtcbiAgYWdlTWluOiBudW1iZXI7XG4gIGFtb3VudDogbnVtYmVyO1xufSJdfQ==
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW5jb21lLXRheC9kb21haW4vdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFJ1bGVNZXRhIH0gZnJvbSBcIi4uLy4uL3NoYXJlZC9kb21haW4vdHlwZXNcIjtcblxuZXhwb3J0IGludGVyZmFjZSBSdWxlSW5wdXQge1xuICAgIG5hbWU6IHN0cmluZztcbiAgICB0eXBlOiAnbnVtYmVyJyB8ICdzZWxlY3QnIHwgJ3RleHQnO1xuICAgIHJlcXVpcmVkOiBib29sZWFuO1xuICAgIHVuaXQ/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUnVsZU91dHB1dCB7XG4gICAgbmFtZTogc3RyaW5nO1xuICAgIHR5cGU6ICdudW1iZXInIHwgJ3N0cmluZyc7XG4gICAgdW5pdD86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBUYXhCcmFja2V0IHtcbiAgICBmcm9tOiBudW1iZXI7XG4gICAgdG86IG51bWJlciB8IG51bGw7XG4gICAgcmF0ZTogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEluY29tZVRheENhbGN1bGF0b3JTY2hlbWE8VD4ge1xuICAgIG1ldGE6IFJ1bGVNZXRhO1xuICAgIGlucHV0czogUnVsZUlucHV0W107XG4gICAgb3V0cHV0czogUnVsZU91dHB1dFtdO1xuICAgIHJ1bGVzOiBUO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFnZUJhc2VkUmViYXRlIHtcbiAgICBhZ2VNaW46IG51bWJlcjtcbiAgICBhbW91bnQ6IG51bWJlcjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCcmFja2V0QWxsb2NhdGlvbiB7XG4gICAgYnJhY2tldEluZGV4OiBudW1iZXI7XG4gICAgYnJhY2tldE5hbWU6IHN0cmluZztcbiAgICBmcm9tOiBudW1iZXI7XG4gICAgdG86IG51bWJlciB8IG51bGw7XG4gICAgcmF0ZTogbnVtYmVyO1xuICAgIGFtb3VudEluQnJhY2tldDogbnVtYmVyO1xuICAgIHRheE9uQW1vdW50OiBudW1iZXI7XG59Il19
@@ -9,7 +9,7 @@ class FranceIncomeTaxServiceImpl {
9
9
  }
10
10
  calculateNetIncome() {
11
11
  const taxablePerPart = this._familyParts * this._income / this._familyParts;
12
- const { tax: taxPerPart, marginalRate } = this.calculateProgressiveTax(taxablePerPart);
12
+ const { tax: taxPerPart, marginalRate, bracketBreakdown } = this.calculateProgressiveTax(taxablePerPart);
13
13
  const incomeTax = taxPerPart * this._familyParts;
14
14
  const socialContributions = this._income * this._rules.socialContributions.employee.rate;
15
15
  const totalDeductions = incomeTax + socialContributions;
@@ -22,27 +22,59 @@ class FranceIncomeTaxServiceImpl {
22
22
  netIncome: this.round(netIncome),
23
23
  averageTaxRate: this.round(incomeTax / this._income),
24
24
  marginalTaxRate: marginalRate,
25
+ taxBracketBreakdown: bracketBreakdown,
25
26
  };
26
27
  }
27
28
  calculateProgressiveTax(income) {
28
29
  let tax = 0;
29
30
  let marginalRate = 0;
30
- for (const bracket of this._rules.taxBrackets) {
31
+ const bracketBreakdown = [];
32
+ for (let index = 0; index < this._rules.taxBrackets.length; index++) {
33
+ const bracket = this._rules.taxBrackets[index];
31
34
  const upperBound = bracket.to ?? income;
32
35
  if (income <= bracket.from) {
36
+ bracketBreakdown.push({
37
+ bracketIndex: index,
38
+ bracketName: `Bracket ${index + 1}`,
39
+ from: bracket.from,
40
+ to: bracket.to ?? null,
41
+ rate: bracket.rate,
42
+ amountInBracket: 0,
43
+ taxOnAmount: 0,
44
+ });
33
45
  break;
34
46
  }
35
47
  const taxableAmount = Math.min(upperBound, income) - bracket.from;
36
48
  if (taxableAmount > 0) {
37
49
  tax += taxableAmount * bracket.rate;
38
50
  marginalRate = bracket.rate;
51
+ bracketBreakdown.push({
52
+ bracketIndex: index,
53
+ bracketName: `Bracket ${index + 1}`,
54
+ from: bracket.from,
55
+ to: bracket.to ?? null,
56
+ rate: bracket.rate,
57
+ amountInBracket: taxableAmount,
58
+ taxOnAmount: taxableAmount * bracket.rate,
59
+ });
60
+ }
61
+ else {
62
+ bracketBreakdown.push({
63
+ bracketIndex: index,
64
+ bracketName: `Bracket ${index + 1}`,
65
+ from: bracket.from,
66
+ to: bracket.to ?? null,
67
+ rate: bracket.rate,
68
+ amountInBracket: 0,
69
+ taxOnAmount: 0,
70
+ });
39
71
  }
40
72
  }
41
- return { tax, marginalRate };
73
+ return { tax, marginalRate, bracketBreakdown };
42
74
  }
43
75
  round(value) {
44
76
  return Math.round(value * 100) / 100;
45
77
  }
46
78
  }
47
79
  exports.FranceIncomeTaxServiceImpl = FranceIncomeTaxServiceImpl;
48
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnJhbmNlSW5jb21lVGF4U2VydmljZUltcGwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaW5jb21lLXRheC9mcmFuY2UvRnJhbmNlSW5jb21lVGF4U2VydmljZUltcGwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsTUFBYSwwQkFBMEI7SUFLbkMsWUFBWSxNQUFjLEVBQUUsS0FBcUIsRUFBRSxXQUFtQjtRQUNsRSxJQUFJLENBQUMsT0FBTyxHQUFHLE1BQU0sQ0FBQztRQUN0QixJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQztRQUNwQixJQUFJLENBQUMsWUFBWSxHQUFHLFdBQVcsQ0FBQztJQUNwQyxDQUFDO0lBRU0sa0JBQWtCO1FBRTNCLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxZQUFZLEdBQUcsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDO1FBQzVFLE1BQU0sRUFBRSxHQUFHLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxHQUFHLElBQUksQ0FBQyx1QkFBdUIsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUN2RixNQUFNLFNBQVMsR0FBRyxVQUFVLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQztRQUNqRCxNQUFNLG1CQUFtQixHQUFHLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDO1FBQ3pGLE1BQU0sZUFBZSxHQUFHLFNBQVMsR0FBRyxtQkFBbUIsQ0FBQztRQUN4RCxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsT0FBTyxHQUFHLGVBQWUsQ0FBQztRQUVqRCxPQUFPO1lBQ04sV0FBVyxFQUFFLElBQUksQ0FBQyxPQUFPO1lBQ3pCLFNBQVMsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQztZQUNoQyxtQkFBbUIsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLG1CQUFtQixDQUFDO1lBQ3BELGVBQWUsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQztZQUM1QyxTQUFTLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUM7WUFDaEMsY0FBYyxFQUFFLElBQUksQ0FBQyxLQUFLLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDcEQsZUFBZSxFQUFFLFlBQVk7U0FDN0IsQ0FBQztJQUNILENBQUM7SUFHVSx1QkFBdUIsQ0FBQyxNQUFjO1FBSWhELElBQUksR0FBRyxHQUFHLENBQUMsQ0FBQztRQUNaLElBQUksWUFBWSxHQUFHLENBQUMsQ0FBQztRQUVyQixLQUFLLE1BQU0sT0FBTyxJQUFJLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDL0MsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLEVBQUUsSUFBSSxNQUFNLENBQUM7WUFFeEMsSUFBSSxNQUFNLElBQUksT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUM1QixNQUFNO1lBQ1AsQ0FBQztZQUVELE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7WUFFbEUsSUFBSSxhQUFhLEdBQUcsQ0FBQyxFQUFFLENBQUM7Z0JBQ3ZCLEdBQUcsSUFBSSxhQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQztnQkFDcEMsWUFBWSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7WUFDN0IsQ0FBQztRQUNGLENBQUM7UUFFRCxPQUFPLEVBQUUsR0FBRyxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQzlCLENBQUM7SUFFVSxLQUFLLENBQUMsS0FBYTtRQUM3QixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQyxHQUFHLEdBQUcsQ0FBQztJQUN0QyxDQUFDO0NBQ0Q7QUE1REQsZ0VBNERDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcHV0ZWRJbmNvbWVUYXhWYWx1ZXMsIEluY29tZVRheFJ1bGVzIH0gZnJvbSBcIi4vZG9tYWluL3R5cGVzXCI7XG5pbXBvcnQgeyBGcmFuY2VJbmNvbWVUYXhTZXJ2aWNlIH0gZnJvbSBcIi4vRnJhbmNlSW5jb21lVGF4U2VydmljZVwiO1xuXG5leHBvcnQgY2xhc3MgRnJhbmNlSW5jb21lVGF4U2VydmljZUltcGwgaW1wbGVtZW50cyBGcmFuY2VJbmNvbWVUYXhTZXJ2aWNlIHtcbiAgICBwcml2YXRlIF9pbmNvbWU6IG51bWJlcjtcbiAgICBwcml2YXRlIF9ydWxlczogSW5jb21lVGF4UnVsZXM7XG4gICAgcHJpdmF0ZSBfZmFtaWx5UGFydHM6IG51bWJlcjtcblxuICAgIGNvbnN0cnVjdG9yKGluY29tZTogbnVtYmVyLCBydWxlczogSW5jb21lVGF4UnVsZXMsIGZhbWlseVBhcnRzOiBudW1iZXIpIHtcbiAgICAgICAgdGhpcy5faW5jb21lID0gaW5jb21lO1xuICAgICAgICB0aGlzLl9ydWxlcyA9IHJ1bGVzO1xuICAgICAgICB0aGlzLl9mYW1pbHlQYXJ0cyA9IGZhbWlseVBhcnRzO1xuICAgIH1cblxuICAgIHB1YmxpYyBjYWxjdWxhdGVOZXRJbmNvbWUoKTogQ29tcHV0ZWRJbmNvbWVUYXhWYWx1ZXMge1xuXG5cdFx0Y29uc3QgdGF4YWJsZVBlclBhcnQgPSB0aGlzLl9mYW1pbHlQYXJ0cyAqIHRoaXMuX2luY29tZSAvIHRoaXMuX2ZhbWlseVBhcnRzO1xuXHRcdGNvbnN0IHsgdGF4OiB0YXhQZXJQYXJ0LCBtYXJnaW5hbFJhdGUgfSA9IHRoaXMuY2FsY3VsYXRlUHJvZ3Jlc3NpdmVUYXgodGF4YWJsZVBlclBhcnQpO1xuXHRcdGNvbnN0IGluY29tZVRheCA9IHRheFBlclBhcnQgKiB0aGlzLl9mYW1pbHlQYXJ0cztcblx0XHRjb25zdCBzb2NpYWxDb250cmlidXRpb25zID0gdGhpcy5faW5jb21lICogdGhpcy5fcnVsZXMuc29jaWFsQ29udHJpYnV0aW9ucy5lbXBsb3llZS5yYXRlO1xuXHRcdGNvbnN0IHRvdGFsRGVkdWN0aW9ucyA9IGluY29tZVRheCArIHNvY2lhbENvbnRyaWJ1dGlvbnM7XG5cdFx0Y29uc3QgbmV0SW5jb21lID0gdGhpcy5faW5jb21lIC0gdG90YWxEZWR1Y3Rpb25zO1xuXG5cdFx0cmV0dXJuIHtcblx0XHRcdGdyb3NzSW5jb21lOiB0aGlzLl9pbmNvbWUsXG5cdFx0XHRpbmNvbWVUYXg6IHRoaXMucm91bmQoaW5jb21lVGF4KSxcblx0XHRcdHNvY2lhbENvbnRyaWJ1dGlvbnM6IHRoaXMucm91bmQoc29jaWFsQ29udHJpYnV0aW9ucyksXG5cdFx0XHR0b3RhbERlZHVjdGlvbnM6IHRoaXMucm91bmQodG90YWxEZWR1Y3Rpb25zKSxcblx0XHRcdG5ldEluY29tZTogdGhpcy5yb3VuZChuZXRJbmNvbWUpLFxuXHRcdFx0YXZlcmFnZVRheFJhdGU6IHRoaXMucm91bmQoaW5jb21lVGF4IC8gdGhpcy5faW5jb21lKSxcblx0XHRcdG1hcmdpbmFsVGF4UmF0ZTogbWFyZ2luYWxSYXRlLFxuXHRcdH07XG5cdH1cblxuXG4gICAgcHJpdmF0ZSBjYWxjdWxhdGVQcm9ncmVzc2l2ZVRheChpbmNvbWU6IG51bWJlcik6IHtcbiAgICAgICAgdGF4OiBudW1iZXI7XG4gICAgICAgIG1hcmdpbmFsUmF0ZTogbnVtYmVyXG4gICAgfSB7XG5cdFx0bGV0IHRheCA9IDA7XG5cdFx0bGV0IG1hcmdpbmFsUmF0ZSA9IDA7XG5cblx0XHRmb3IgKGNvbnN0IGJyYWNrZXQgb2YgdGhpcy5fcnVsZXMudGF4QnJhY2tldHMpIHtcblx0XHRcdGNvbnN0IHVwcGVyQm91bmQgPSBicmFja2V0LnRvID8/IGluY29tZTtcblxuXHRcdFx0aWYgKGluY29tZSA8PSBicmFja2V0LmZyb20pIHtcblx0XHRcdFx0YnJlYWs7XG5cdFx0XHR9XG5cblx0XHRcdGNvbnN0IHRheGFibGVBbW91bnQgPSBNYXRoLm1pbih1cHBlckJvdW5kLCBpbmNvbWUpIC0gYnJhY2tldC5mcm9tO1xuXG5cdFx0XHRpZiAodGF4YWJsZUFtb3VudCA+IDApIHtcblx0XHRcdFx0dGF4ICs9IHRheGFibGVBbW91bnQgKiBicmFja2V0LnJhdGU7XG5cdFx0XHRcdG1hcmdpbmFsUmF0ZSA9IGJyYWNrZXQucmF0ZTtcblx0XHRcdH1cblx0XHR9XG5cblx0XHRyZXR1cm4geyB0YXgsIG1hcmdpbmFsUmF0ZSB9O1xuXHR9XG5cbiAgICBwcml2YXRlIHJvdW5kKHZhbHVlOiBudW1iZXIpOiBudW1iZXIge1xuXHRcdHJldHVybiBNYXRoLnJvdW5kKHZhbHVlICogMTAwKSAvIDEwMDtcblx0fVxufVxuIl19
80
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"FranceIncomeTaxServiceImpl.js","sourceRoot":"","sources":["../../../src/income-tax/france/FranceIncomeTaxServiceImpl.ts"],"names":[],"mappings":"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","sourcesContent":["import { BracketAllocation } from \"../domain/types\";\nimport { ComputedIncomeTaxValues, IncomeTaxRules } from \"./domain/types\";\nimport { FranceIncomeTaxService } from \"./FranceIncomeTaxService\";\n\nexport class FranceIncomeTaxServiceImpl implements FranceIncomeTaxService {\n    private _income: number;\n    private _rules: IncomeTaxRules;\n    private _familyParts: number;\n\n    constructor(income: number, rules: IncomeTaxRules, familyParts: number) {\n        this._income = income;\n        this._rules = rules;\n        this._familyParts = familyParts;\n    }\n\n    public calculateNetIncome(): ComputedIncomeTaxValues {\n\n\t\tconst taxablePerPart = this._familyParts * this._income / this._familyParts;\n\t\tconst { tax: taxPerPart, marginalRate, bracketBreakdown } = this.calculateProgressiveTax(taxablePerPart);\n\t\tconst incomeTax = taxPerPart * this._familyParts;\n\t\tconst socialContributions = this._income * this._rules.socialContributions.employee.rate;\n\t\tconst totalDeductions = incomeTax + socialContributions;\n\t\tconst netIncome = this._income - totalDeductions;\n\n\t\treturn {\n\t\t\tgrossIncome: this._income,\n\t\t\tincomeTax: this.round(incomeTax),\n\t\t\tsocialContributions: this.round(socialContributions),\n\t\t\ttotalDeductions: this.round(totalDeductions),\n\t\t\tnetIncome: this.round(netIncome),\n\t\t\taverageTaxRate: this.round(incomeTax / this._income),\n\t\t\tmarginalTaxRate: marginalRate,\n\t\t\ttaxBracketBreakdown: bracketBreakdown,\n\t\t};\n\t}\n\n\n    private calculateProgressiveTax(income: number): {\n        tax: number;\n        marginalRate: number;\n        bracketBreakdown: BracketAllocation[];\n    } {\n\t\tlet tax = 0;\n\t\tlet marginalRate = 0;\n\t\tconst bracketBreakdown: BracketAllocation[] = [];\n\n\t\tfor (let index = 0; index < this._rules.taxBrackets.length; index++) {\n\t\t\tconst bracket = this._rules.taxBrackets[index];\n\t\t\tconst upperBound = bracket.to ?? income;\n\n\t\t\tif (income <= bracket.from) {\n\t\t\t\tbracketBreakdown.push({\n\t\t\t\t\tbracketIndex: index,\n\t\t\t\t\tbracketName: `Bracket ${index + 1}`,\n\t\t\t\t\tfrom: bracket.from,\n\t\t\t\t\tto: bracket.to ?? null,\n\t\t\t\t\trate: bracket.rate,\n\t\t\t\t\tamountInBracket: 0,\n\t\t\t\t\ttaxOnAmount: 0,\n\t\t\t\t});\n\t\t\t\tbreak;\n\t\t\t}\n\n\t\t\tconst taxableAmount = Math.min(upperBound, income) - bracket.from;\n\n\t\t\tif (taxableAmount > 0) {\n\t\t\t\ttax += taxableAmount * bracket.rate;\n\t\t\t\tmarginalRate = bracket.rate;\n\t\t\t\tbracketBreakdown.push({\n\t\t\t\t\tbracketIndex: index,\n\t\t\t\t\tbracketName: `Bracket ${index + 1}`,\n\t\t\t\t\tfrom: bracket.from,\n\t\t\t\t\tto: bracket.to ?? null,\n\t\t\t\t\trate: bracket.rate,\n\t\t\t\t\tamountInBracket: taxableAmount,\n\t\t\t\t\ttaxOnAmount: taxableAmount * bracket.rate,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\tbracketBreakdown.push({\n\t\t\t\t\tbracketIndex: index,\n\t\t\t\t\tbracketName: `Bracket ${index + 1}`,\n\t\t\t\t\tfrom: bracket.from,\n\t\t\t\t\tto: bracket.to ?? null,\n\t\t\t\t\trate: bracket.rate,\n\t\t\t\t\tamountInBracket: 0,\n\t\t\t\t\ttaxOnAmount: 0,\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\n\t\treturn { tax, marginalRate, bracketBreakdown };\n\t}\n\n    private round(value: number): number {\n\t\treturn Math.round(value * 100) / 100;\n\t}\n}\n"]}
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW5jb21lLXRheC9mcmFuY2UvZG9tYWluL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSdWxlTWV0YSB9IGZyb20gXCIuLi8uLi8uLi9zaGFyZWQvZG9tYWluL3R5cGVzXCI7XG5pbXBvcnQgeyBSdWxlSW5wdXQsIFJ1bGVPdXRwdXQsIFRheEJyYWNrZXQgfSBmcm9tIFwiLi4vLi4vZG9tYWluL3R5cGVzXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSW5jb21lVGF4UnVsZXMge1xuICAgIHRheEJyYWNrZXRzOiBUYXhCcmFja2V0W107XG4gICAgcXVvdGllbnRGYW1pbGlhbDogUXVvdGllbnRGYW1pbGlhbDtcbiAgICBzb2NpYWxDb250cmlidXRpb25zOiBDb250cmlidXRpb25zO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIENvbnRyaWJ1dGlvbnMge1xuICAgIGVtcGxveWVlOiB7IHJhdGU6IG51bWJlcjsgfTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBRdW90aWVudEZhbWlsaWFsIHtcbiAgICBlbmFibGVkOiBib29sZWFuO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEluY29tZVRheENhbGN1bGF0b3JTY2hlbWEge1xuICAgIG1ldGE6IFJ1bGVNZXRhO1xuICAgIGlucHV0czogUnVsZUlucHV0W107XG4gICAgb3V0cHV0czogUnVsZU91dHB1dFtdO1xuICAgIHJ1bGVzOiBJbmNvbWVUYXhSdWxlcztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBDb21wdXRlZEluY29tZVRheFZhbHVlcyB7XG4gICAgZ3Jvc3NJbmNvbWU6IG51bWJlcjtcblx0aW5jb21lVGF4OiBudW1iZXI7XG5cdHNvY2lhbENvbnRyaWJ1dGlvbnM6IG51bWJlcjtcblx0dG90YWxEZWR1Y3Rpb25zOiBudW1iZXI7XG5cdG5ldEluY29tZTogbnVtYmVyO1xuXHRhdmVyYWdlVGF4UmF0ZTogbnVtYmVyO1xuXHRtYXJnaW5hbFRheFJhdGU6IG51bWJlcjtcbn0iXX0=
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW5jb21lLXRheC9mcmFuY2UvZG9tYWluL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBSdWxlTWV0YSB9IGZyb20gXCIuLi8uLi8uLi9zaGFyZWQvZG9tYWluL3R5cGVzXCI7XG5pbXBvcnQgeyBCcmFja2V0QWxsb2NhdGlvbiwgUnVsZUlucHV0LCBSdWxlT3V0cHV0LCBUYXhCcmFja2V0IH0gZnJvbSBcIi4uLy4uL2RvbWFpbi90eXBlc1wiO1xuXG5leHBvcnQgaW50ZXJmYWNlIEluY29tZVRheFJ1bGVzIHtcbiAgICB0YXhCcmFja2V0czogVGF4QnJhY2tldFtdO1xuICAgIHF1b3RpZW50RmFtaWxpYWw6IFF1b3RpZW50RmFtaWxpYWw7XG4gICAgc29jaWFsQ29udHJpYnV0aW9uczogQ29udHJpYnV0aW9ucztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBDb250cmlidXRpb25zIHtcbiAgICBlbXBsb3llZTogeyByYXRlOiBudW1iZXI7IH07XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUXVvdGllbnRGYW1pbGlhbCB7XG4gICAgZW5hYmxlZDogYm9vbGVhbjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBJbmNvbWVUYXhDYWxjdWxhdG9yU2NoZW1hIHtcbiAgICBtZXRhOiBSdWxlTWV0YTtcbiAgICBpbnB1dHM6IFJ1bGVJbnB1dFtdO1xuICAgIG91dHB1dHM6IFJ1bGVPdXRwdXRbXTtcbiAgICBydWxlczogSW5jb21lVGF4UnVsZXM7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ29tcHV0ZWRJbmNvbWVUYXhWYWx1ZXMge1xuICAgIGdyb3NzSW5jb21lOiBudW1iZXI7XG5cdGluY29tZVRheDogbnVtYmVyO1xuXHRzb2NpYWxDb250cmlidXRpb25zOiBudW1iZXI7XG5cdHRvdGFsRGVkdWN0aW9uczogbnVtYmVyO1xuXHRuZXRJbmNvbWU6IG51bWJlcjtcblx0YXZlcmFnZVRheFJhdGU6IG51bWJlcjtcblx0bWFyZ2luYWxUYXhSYXRlOiBudW1iZXI7XG5cdHRheEJyYWNrZXRCcmVha2Rvd246IEJyYWNrZXRBbGxvY2F0aW9uW107XG59Il19
@@ -20,9 +20,10 @@ class SouthAfricaIncomeTaxServiceImpl {
20
20
  totalDeductions: 0,
21
21
  netIncome: grossIncome,
22
22
  effectiveTaxRate: 0,
23
+ taxBracketBreakdown: [],
23
24
  };
24
25
  }
25
- const grossTax = this.calculateBracketTax(this._income);
26
+ const { grossTax, bracketBreakdown } = this.calculateBracketTaxWithBreakdown(this._income);
26
27
  const rebate = this.getRebate(this._age);
27
28
  const medicalAidCredit = this.calculateMedicalAidCredit(this._medicalAidMembers);
28
29
  const incomeTax = Math.max(0, grossTax - rebate - medicalAidCredit);
@@ -37,8 +38,55 @@ class SouthAfricaIncomeTaxServiceImpl {
37
38
  totalDeductions: this.round(totalDeductions),
38
39
  netIncome: this.round(netIncome),
39
40
  effectiveTaxRate: this.round(effectiveTaxRate, 4),
41
+ taxBracketBreakdown: bracketBreakdown,
40
42
  };
41
43
  }
44
+ calculateBracketTaxWithBreakdown(income) {
45
+ let tax = 0;
46
+ const bracketBreakdown = [];
47
+ for (let index = 0; index < this._rules.taxBrackets.length; index++) {
48
+ const bracket = this._rules.taxBrackets[index];
49
+ if (income <= bracket.from) {
50
+ bracketBreakdown.push({
51
+ bracketIndex: index,
52
+ bracketName: `Bracket ${index + 1}`,
53
+ from: bracket.from,
54
+ to: bracket.to ?? null,
55
+ rate: bracket.rate,
56
+ amountInBracket: 0,
57
+ taxOnAmount: 0,
58
+ });
59
+ break;
60
+ }
61
+ const upper = bracket.to ?? income;
62
+ const taxableAmount = Math.min(upper, income) - bracket.from;
63
+ if (taxableAmount > 0) {
64
+ const taxOnAmount = taxableAmount * bracket.rate;
65
+ tax += taxOnAmount;
66
+ bracketBreakdown.push({
67
+ bracketIndex: index,
68
+ bracketName: `Bracket ${index + 1}`,
69
+ from: bracket.from,
70
+ to: bracket.to ?? null,
71
+ rate: bracket.rate,
72
+ amountInBracket: taxableAmount,
73
+ taxOnAmount: taxOnAmount,
74
+ });
75
+ }
76
+ else {
77
+ bracketBreakdown.push({
78
+ bracketIndex: index,
79
+ bracketName: `Bracket ${index + 1}`,
80
+ from: bracket.from,
81
+ to: bracket.to ?? null,
82
+ rate: bracket.rate,
83
+ amountInBracket: 0,
84
+ taxOnAmount: 0,
85
+ });
86
+ }
87
+ }
88
+ return { grossTax: tax, bracketBreakdown };
89
+ }
42
90
  calculateBracketTax(income) {
43
91
  let tax = 0;
44
92
  for (const bracket of this._rules.taxBrackets) {
@@ -94,4 +142,4 @@ class SouthAfricaIncomeTaxServiceImpl {
94
142
  }
95
143
  }
96
144
  exports.SouthAfricaIncomeTaxServiceImpl = SouthAfricaIncomeTaxServiceImpl;
97
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SouthAfricaIncomeTaxServiceImpl.js","sourceRoot":"","sources":["../../../src/income-tax/south-africa/SouthAfricaIncomeTaxServiceImpl.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComputedIncomeTaxValues, IncomeTaxRules } from \"./domain/types\";\nimport { SouthAfricaIncomeTaxService } from \"./SouthAfricaIncomeTaxService\";\n\nexport class SouthAfricaIncomeTaxServiceImpl implements SouthAfricaIncomeTaxService {\n    private _income: number;\n    private _age: number;\n    private _rules: IncomeTaxRules;\n    private _medicalAidMembers: number = 0;\n\n    constructor(income: number, age: number, rules: IncomeTaxRules, medicalAidMembers: number = 0) {\n        this._income = income;\n        this._age = age;\n        this._rules = rules;\n        this._medicalAidMembers = medicalAidMembers;\n    }\n\n    calculateNetIncome(): ComputedIncomeTaxValues {\n        const grossIncome = this._income;\n\n        const threshold = this.getTaxThreshold(this._age);\n\n        if (this._income <= threshold) {\n            return {\n                grossIncome,\n                incomeTax: 0,\n                uif: 0,\n                totalDeductions: 0,\n                netIncome: grossIncome,\n                effectiveTaxRate: 0,\n            };\n        }\n\n        const grossTax = this.calculateBracketTax(this._income);\n\n        const rebate = this.getRebate(this._age);\n        const medicalAidCredit =\n            this.calculateMedicalAidCredit(this._medicalAidMembers);\n        const incomeTax = Math.max(0, grossTax - rebate - medicalAidCredit);\n\n        const uif = this.calculateUif(this._income);\n\n        const totalDeductions = incomeTax + uif;\n        const netIncome = grossIncome - totalDeductions;\n        const effectiveTaxRate = incomeTax / grossIncome;\n\n        return {\n            grossIncome,\n            incomeTax: this.round(incomeTax),\n            uif: this.round(uif),\n            totalDeductions: this.round(totalDeductions),\n            netIncome: this.round(netIncome),\n            effectiveTaxRate: this.round(effectiveTaxRate, 4),\n        };\n    }\n\n    private calculateBracketTax(income: number): number {\n        let tax = 0;\n\n        for (const bracket of this._rules.taxBrackets) {\n            if (income <= bracket.from) break;\n\n            const upper = bracket.to ?? income;\n            const taxableAmount = Math.min(upper, income) - bracket.from;\n\n            if (taxableAmount > 0) {\n                tax += taxableAmount * bracket.rate;\n            }\n        }\n\n        return tax;\n    }\n\n    private getTaxThreshold(age: number): number {\n        const thresholds = this._rules.taxThresholds;\n\n        if (age >= 75) return thresholds.age75Plus;\n        if (age >= 65) return thresholds.age65To74;\n\n        return thresholds.under65;\n    }\n\n    private getRebate(age: number): number {\n        let rebate = this._rules.rebates.primary.amount;\n\n        if (age >= this._rules.rebates.secondary.ageMin) {\n            rebate += this._rules.rebates.secondary.amount;\n        }\n\n        if (age >= this._rules.rebates.tertiary.ageMin) {\n            rebate += this._rules.rebates.tertiary.amount;\n        }\n\n        return rebate;\n    }\n\n    private calculateUif(income: number): number {\n        const cappedIncome = Math.min(\n            income,\n            this._rules.uif.annualIncomeCap,\n        );\n\n        return Math.min(\n            cappedIncome * this._rules.uif.rate,\n            this._rules.uif.maxAnnualContribution,\n        );\n    }\n\n    private calculateMedicalAidCredit(members: number): number {\n        if (members <= 0) return 0;\n\n        const monthly = this._rules.medicalAidTaxCredit.monthly;\n\n        let monthlyCredit = monthly.taxpayer;\n\n        if (members >= 2) {\n            monthlyCredit += monthly.firstDependant;\n        }\n\n        if (members > 2) {\n            monthlyCredit +=\n                (members - 2) * monthly.additionalDependant;\n        }\n\n        return (\n            monthlyCredit *\n            this._rules.medicalAidTaxCredit.annualMultiplier\n        );\n    }\n\n    private round(value: number, decimals = 2): number {\n        return Number(value.toFixed(decimals));\n    }\n}"]}
145
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SouthAfricaIncomeTaxServiceImpl.js","sourceRoot":"","sources":["../../../src/income-tax/south-africa/SouthAfricaIncomeTaxServiceImpl.ts"],"names":[],"mappings":"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","sourcesContent":["import { BracketAllocation } from \"../domain/types\";\nimport { ComputedIncomeTaxValues, IncomeTaxRules } from \"./domain/types\";\nimport { SouthAfricaIncomeTaxService } from \"./SouthAfricaIncomeTaxService\";\n\nexport class SouthAfricaIncomeTaxServiceImpl implements SouthAfricaIncomeTaxService {\n    private _income: number;\n    private _age: number;\n    private _rules: IncomeTaxRules;\n    private _medicalAidMembers: number = 0;\n\n    constructor(income: number, age: number, rules: IncomeTaxRules, medicalAidMembers: number = 0) {\n        this._income = income;\n        this._age = age;\n        this._rules = rules;\n        this._medicalAidMembers = medicalAidMembers;\n    }\n\n    calculateNetIncome(): ComputedIncomeTaxValues {\n        const grossIncome = this._income;\n\n        const threshold = this.getTaxThreshold(this._age);\n\n        if (this._income <= threshold) {\n            return {\n                grossIncome,\n                incomeTax: 0,\n                uif: 0,\n                totalDeductions: 0,\n                netIncome: grossIncome,\n                effectiveTaxRate: 0,\n                taxBracketBreakdown: [],\n            };\n        }\n\n        const { grossTax, bracketBreakdown } = this.calculateBracketTaxWithBreakdown(this._income);\n\n        const rebate = this.getRebate(this._age);\n        const medicalAidCredit =\n            this.calculateMedicalAidCredit(this._medicalAidMembers);\n        const incomeTax = Math.max(0, grossTax - rebate - medicalAidCredit);\n\n        const uif = this.calculateUif(this._income);\n\n        const totalDeductions = incomeTax + uif;\n        const netIncome = grossIncome - totalDeductions;\n        const effectiveTaxRate = incomeTax / grossIncome;\n\n        return {\n            grossIncome,\n            incomeTax: this.round(incomeTax),\n            uif: this.round(uif),\n            totalDeductions: this.round(totalDeductions),\n            netIncome: this.round(netIncome),\n            effectiveTaxRate: this.round(effectiveTaxRate, 4),\n            taxBracketBreakdown: bracketBreakdown,\n        };\n    }\n\n    private calculateBracketTaxWithBreakdown(income: number): { grossTax: number; bracketBreakdown: BracketAllocation[] } {\n        let tax = 0;\n        const bracketBreakdown: BracketAllocation[] = [];\n\n        for (let index = 0; index < this._rules.taxBrackets.length; index++) {\n            const bracket = this._rules.taxBrackets[index];\n            \n            if (income <= bracket.from) {\n                bracketBreakdown.push({\n                    bracketIndex: index,\n                    bracketName: `Bracket ${index + 1}`,\n                    from: bracket.from,\n                    to: bracket.to ?? null,\n                    rate: bracket.rate,\n                    amountInBracket: 0,\n                    taxOnAmount: 0,\n                });\n                break;\n            }\n\n            const upper = bracket.to ?? income;\n            const taxableAmount = Math.min(upper, income) - bracket.from;\n\n            if (taxableAmount > 0) {\n                const taxOnAmount = taxableAmount * bracket.rate;\n                tax += taxOnAmount;\n                bracketBreakdown.push({\n                    bracketIndex: index,\n                    bracketName: `Bracket ${index + 1}`,\n                    from: bracket.from,\n                    to: bracket.to ?? null,\n                    rate: bracket.rate,\n                    amountInBracket: taxableAmount,\n                    taxOnAmount: taxOnAmount,\n                });\n            } else {\n                bracketBreakdown.push({\n                    bracketIndex: index,\n                    bracketName: `Bracket ${index + 1}`,\n                    from: bracket.from,\n                    to: bracket.to ?? null,\n                    rate: bracket.rate,\n                    amountInBracket: 0,\n                    taxOnAmount: 0,\n                });\n            }\n        }\n\n        return { grossTax: tax, bracketBreakdown };\n    }\n\n    private calculateBracketTax(income: number): number {\n        let tax = 0;\n\n        for (const bracket of this._rules.taxBrackets) {\n            if (income <= bracket.from) break;\n\n            const upper = bracket.to ?? income;\n            const taxableAmount = Math.min(upper, income) - bracket.from;\n\n            if (taxableAmount > 0) {\n                tax += taxableAmount * bracket.rate;\n            }\n        }\n\n        return tax;\n    }\n\n    private getTaxThreshold(age: number): number {\n        const thresholds = this._rules.taxThresholds;\n\n        if (age >= 75) return thresholds.age75Plus;\n        if (age >= 65) return thresholds.age65To74;\n\n        return thresholds.under65;\n    }\n\n    private getRebate(age: number): number {\n        let rebate = this._rules.rebates.primary.amount;\n\n        if (age >= this._rules.rebates.secondary.ageMin) {\n            rebate += this._rules.rebates.secondary.amount;\n        }\n\n        if (age >= this._rules.rebates.tertiary.ageMin) {\n            rebate += this._rules.rebates.tertiary.amount;\n        }\n\n        return rebate;\n    }\n\n    private calculateUif(income: number): number {\n        const cappedIncome = Math.min(\n            income,\n            this._rules.uif.annualIncomeCap,\n        );\n\n        return Math.min(\n            cappedIncome * this._rules.uif.rate,\n            this._rules.uif.maxAnnualContribution,\n        );\n    }\n\n    private calculateMedicalAidCredit(members: number): number {\n        if (members <= 0) return 0;\n\n        const monthly = this._rules.medicalAidTaxCredit.monthly;\n\n        let monthlyCredit = monthly.taxpayer;\n\n        if (members >= 2) {\n            monthlyCredit += monthly.firstDependant;\n        }\n\n        if (members > 2) {\n            monthlyCredit +=\n                (members - 2) * monthly.additionalDependant;\n        }\n\n        return (\n            monthlyCredit *\n            this._rules.medicalAidTaxCredit.annualMultiplier\n        );\n    }\n\n    private round(value: number, decimals = 2): number {\n        return Number(value.toFixed(decimals));\n    }\n}"]}
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW5jb21lLXRheC9zb3V0aC1hZnJpY2EvZG9tYWluL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBZ2VCYXNlZFJlYmF0ZSwgVGF4QnJhY2tldCB9IGZyb20gXCIuLi8uLi9kb21haW4vdHlwZXNcIjtcblxuZXhwb3J0IGludGVyZmFjZSBJbmNvbWVUYXhSdWxlcyB7XG4gIHRheEJyYWNrZXRzOiBUYXhCcmFja2V0W107XG4gIHJlYmF0ZXM6IFRheFJlYmF0ZXM7XG4gIHRheFRocmVzaG9sZHM6IFRheFRocmVzaG9sZHM7XG4gIG1lZGljYWxBaWRUYXhDcmVkaXQ6IE1lZGljYWxBaWRUYXhDcmVkaXQ7XG4gIHVpZjogVWlmUnVsZXM7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgVGF4UmViYXRlcyB7XG4gIHByaW1hcnk6IEFnZUJhc2VkUmViYXRlO1xuICBzZWNvbmRhcnk6IEFnZUJhc2VkUmViYXRlO1xuICB0ZXJ0aWFyeTogQWdlQmFzZWRSZWJhdGU7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgVGF4VGhyZXNob2xkcyB7XG4gIHVuZGVyNjU6IG51bWJlcjtcbiAgYWdlNjVUbzc0OiBudW1iZXI7XG4gIGFnZTc1UGx1czogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIE1lZGljYWxBaWRUYXhDcmVkaXQge1xuICBtb250aGx5OiBNZWRpY2FsQWlkTW9udGhseUNyZWRpdDtcbiAgYW5udWFsTXVsdGlwbGllcjogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIE1lZGljYWxBaWRNb250aGx5Q3JlZGl0IHtcbiAgdGF4cGF5ZXI6IG51bWJlcjtcbiAgZmlyc3REZXBlbmRhbnQ6IG51bWJlcjtcbiAgYWRkaXRpb25hbERlcGVuZGFudDogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFVpZlJ1bGVzIHtcbiAgcmF0ZTogbnVtYmVyO1xuICBhbm51YWxJbmNvbWVDYXA6IG51bWJlcjtcbiAgbWF4QW5udWFsQ29udHJpYnV0aW9uOiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ29tcHV0ZWRJbmNvbWVUYXhWYWx1ZXMge1xuICBncm9zc0luY29tZTogbnVtYmVyO1xuICBpbmNvbWVUYXg6IG51bWJlcjtcbiAgdWlmOiBudW1iZXI7XG4gIHRvdGFsRGVkdWN0aW9uczogbnVtYmVyO1xuICBuZXRJbmNvbWU6IG51bWJlcjtcbiAgZWZmZWN0aXZlVGF4UmF0ZTogbnVtYmVyO1xufVxuIl19
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvaW5jb21lLXRheC9zb3V0aC1hZnJpY2EvZG9tYWluL3R5cGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBZ2VCYXNlZFJlYmF0ZSwgQnJhY2tldEFsbG9jYXRpb24sIFRheEJyYWNrZXQgfSBmcm9tIFwiLi4vLi4vZG9tYWluL3R5cGVzXCI7XG5cbmV4cG9ydCBpbnRlcmZhY2UgSW5jb21lVGF4UnVsZXMge1xuICB0YXhCcmFja2V0czogVGF4QnJhY2tldFtdO1xuICByZWJhdGVzOiBUYXhSZWJhdGVzO1xuICB0YXhUaHJlc2hvbGRzOiBUYXhUaHJlc2hvbGRzO1xuICBtZWRpY2FsQWlkVGF4Q3JlZGl0OiBNZWRpY2FsQWlkVGF4Q3JlZGl0O1xuICB1aWY6IFVpZlJ1bGVzO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFRheFJlYmF0ZXMge1xuICBwcmltYXJ5OiBBZ2VCYXNlZFJlYmF0ZTtcbiAgc2Vjb25kYXJ5OiBBZ2VCYXNlZFJlYmF0ZTtcbiAgdGVydGlhcnk6IEFnZUJhc2VkUmViYXRlO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFRheFRocmVzaG9sZHMge1xuICB1bmRlcjY1OiBudW1iZXI7XG4gIGFnZTY1VG83NDogbnVtYmVyO1xuICBhZ2U3NVBsdXM6IG51bWJlcjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBNZWRpY2FsQWlkVGF4Q3JlZGl0IHtcbiAgbW9udGhseTogTWVkaWNhbEFpZE1vbnRobHlDcmVkaXQ7XG4gIGFubnVhbE11bHRpcGxpZXI6IG51bWJlcjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBNZWRpY2FsQWlkTW9udGhseUNyZWRpdCB7XG4gIHRheHBheWVyOiBudW1iZXI7XG4gIGZpcnN0RGVwZW5kYW50OiBudW1iZXI7XG4gIGFkZGl0aW9uYWxEZXBlbmRhbnQ6IG51bWJlcjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBVaWZSdWxlcyB7XG4gIHJhdGU6IG51bWJlcjtcbiAgYW5udWFsSW5jb21lQ2FwOiBudW1iZXI7XG4gIG1heEFubnVhbENvbnRyaWJ1dGlvbjogbnVtYmVyO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIENvbXB1dGVkSW5jb21lVGF4VmFsdWVzIHtcbiAgICBncm9zc0luY29tZTogbnVtYmVyO1xuICAgIGluY29tZVRheDogbnVtYmVyO1xuICAgIHVpZjogbnVtYmVyO1xuICAgIHRvdGFsRGVkdWN0aW9uczogbnVtYmVyO1xuICAgIG5ldEluY29tZTogbnVtYmVyO1xuICAgIGVmZmVjdGl2ZVRheFJhdGU6IG51bWJlcjtcbiAgICB0YXhCcmFja2V0QnJlYWtkb3duOiBCcmFja2V0QWxsb2NhdGlvbltdO1xufVxuIl19
@@ -5,6 +5,7 @@ export declare class CanadaIncomeTaxServiceImpl implements CanadaIncomeTaxServic
5
5
  private _rules;
6
6
  constructor(income: number, rules: IncomeTaxRules);
7
7
  calculateNetIncome(): ComputedIncomeTaxValues;
8
+ private computeTaxBracketBreakdown;
8
9
  private computeGrossTax;
9
10
  private applyCredits;
10
11
  private computeCPP;
@@ -1,4 +1,4 @@
1
- import { TaxBracket } from "../../domain/types";
1
+ import { BracketAllocation, TaxBracket } from "../../domain/types";
2
2
  export interface IncomeTaxRules {
3
3
  taxBrackets: TaxBracket[];
4
4
  credits?: Record<string, TaxCredit>;
@@ -31,4 +31,5 @@ export interface ComputedIncomeTaxValues {
31
31
  totalDeductions: number;
32
32
  netIncome: number;
33
33
  effectiveTaxRate: number;
34
+ taxBracketBreakdown: BracketAllocation[];
34
35
  }
@@ -25,3 +25,12 @@ export interface AgeBasedRebate {
25
25
  ageMin: number;
26
26
  amount: number;
27
27
  }
28
+ export interface BracketAllocation {
29
+ bracketIndex: number;
30
+ bracketName: string;
31
+ from: number;
32
+ to: number | null;
33
+ rate: number;
34
+ amountInBracket: number;
35
+ taxOnAmount: number;
36
+ }
@@ -1,5 +1,5 @@
1
1
  import { RuleMeta } from "../../../shared/domain/types";
2
- import { RuleInput, RuleOutput, TaxBracket } from "../../domain/types";
2
+ import { BracketAllocation, RuleInput, RuleOutput, TaxBracket } from "../../domain/types";
3
3
  export interface IncomeTaxRules {
4
4
  taxBrackets: TaxBracket[];
5
5
  quotientFamilial: QuotientFamilial;
@@ -27,4 +27,5 @@ export interface ComputedIncomeTaxValues {
27
27
  netIncome: number;
28
28
  averageTaxRate: number;
29
29
  marginalTaxRate: number;
30
+ taxBracketBreakdown: BracketAllocation[];
30
31
  }
@@ -7,6 +7,7 @@ export declare class SouthAfricaIncomeTaxServiceImpl implements SouthAfricaIncom
7
7
  private _medicalAidMembers;
8
8
  constructor(income: number, age: number, rules: IncomeTaxRules, medicalAidMembers?: number);
9
9
  calculateNetIncome(): ComputedIncomeTaxValues;
10
+ private calculateBracketTaxWithBreakdown;
10
11
  private calculateBracketTax;
11
12
  private getTaxThreshold;
12
13
  private getRebate;
@@ -1,4 +1,4 @@
1
- import { AgeBasedRebate, TaxBracket } from "../../domain/types";
1
+ import { AgeBasedRebate, BracketAllocation, TaxBracket } from "../../domain/types";
2
2
  export interface IncomeTaxRules {
3
3
  taxBrackets: TaxBracket[];
4
4
  rebates: TaxRebates;
@@ -37,4 +37,5 @@ export interface ComputedIncomeTaxValues {
37
37
  totalDeductions: number;
38
38
  netIncome: number;
39
39
  effectiveTaxRate: number;
40
+ taxBracketBreakdown: BracketAllocation[];
40
41
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@novha/calc-engines",
3
- "version": "1.5.0",
3
+ "version": "1.6.1",
4
4
  "main": "dist/index.js",
5
5
  "types": "dist/types/index.d.ts",
6
6
  "scripts": {
@@ -1,4 +1,4 @@
1
- import { TaxBracket } from "../domain/types";
1
+ import { BracketAllocation, TaxBracket } from "../domain/types";
2
2
  import { CanadaIncomeTaxService } from "./CanadaIncomeTaxService";
3
3
  import {
4
4
  CPPContribution,
@@ -20,7 +20,8 @@ export class CanadaIncomeTaxServiceImpl implements CanadaIncomeTaxService {
20
20
 
21
21
  public calculateNetIncome(): ComputedIncomeTaxValues {
22
22
 
23
- const grossTax = this.computeGrossTax(this._income, this._rules.taxBrackets);
23
+ const bracketBreakdown = this.computeTaxBracketBreakdown(this._income, this._rules.taxBrackets);
24
+ const grossTax = bracketBreakdown.reduce((total, b) => total + b.taxOnAmount, 0);
24
25
  const netTax = this.applyCredits(grossTax, this._rules.credits);
25
26
  const cpp = this.computeCPP(this._income, this._rules.contributions?.cpp);
26
27
  const ei = this.computeEI(this._income, this._rules.contributions?.ei);
@@ -33,9 +34,40 @@ export class CanadaIncomeTaxServiceImpl implements CanadaIncomeTaxService {
33
34
  totalDeductions: netTax + cpp + ei,
34
35
  netIncome: this._income - netTax - cpp - ei,
35
36
  effectiveTaxRate: netTax / this._income,
37
+ taxBracketBreakdown: bracketBreakdown,
36
38
  };
37
39
  }
38
40
 
41
+ private computeTaxBracketBreakdown(income: number, brackets: TaxBracket[]): BracketAllocation[] {
42
+ return brackets.map((b, index) => {
43
+ if (income <= b.from) {
44
+ return {
45
+ bracketIndex: index,
46
+ bracketName: `Bracket ${index + 1}`,
47
+ from: b.from,
48
+ to: b.to ?? null,
49
+ rate: b.rate,
50
+ amountInBracket: 0,
51
+ taxOnAmount: 0,
52
+ };
53
+ }
54
+
55
+ const upper = b.to ?? income;
56
+ const taxable = Math.min(income, upper) - b.from;
57
+ const taxOnAmount = taxable * b.rate;
58
+
59
+ return {
60
+ bracketIndex: index,
61
+ bracketName: `Bracket ${index + 1}`,
62
+ from: b.from,
63
+ to: b.to ?? null,
64
+ rate: b.rate,
65
+ amountInBracket: taxable,
66
+ taxOnAmount: taxOnAmount,
67
+ };
68
+ });
69
+ }
70
+
39
71
  private computeGrossTax(income: number, brackets: TaxBracket[]): number {
40
72
  return brackets.reduce((total, b) => {
41
73
  if (income <= b.from) return total;
@@ -1,4 +1,4 @@
1
- import { TaxBracket } from "../../domain/types";
1
+ import { BracketAllocation, TaxBracket } from "../../domain/types";
2
2
 
3
3
  export interface IncomeTaxRules {
4
4
  taxBrackets: TaxBracket[];
@@ -37,5 +37,6 @@ export interface ComputedIncomeTaxValues {
37
37
  totalDeductions: number;
38
38
  netIncome: number;
39
39
  effectiveTaxRate: number;
40
+ taxBracketBreakdown: BracketAllocation[];
40
41
  }
41
42
 
@@ -27,6 +27,16 @@ export interface IncomeTaxCalculatorSchema<T> {
27
27
  }
28
28
 
29
29
  export interface AgeBasedRebate {
30
- ageMin: number;
31
- amount: number;
30
+ ageMin: number;
31
+ amount: number;
32
+ }
33
+
34
+ export interface BracketAllocation {
35
+ bracketIndex: number;
36
+ bracketName: string;
37
+ from: number;
38
+ to: number | null;
39
+ rate: number;
40
+ amountInBracket: number;
41
+ taxOnAmount: number;
32
42
  }
@@ -1,3 +1,4 @@
1
+ import { BracketAllocation } from "../domain/types";
1
2
  import { ComputedIncomeTaxValues, IncomeTaxRules } from "./domain/types";
2
3
  import { FranceIncomeTaxService } from "./FranceIncomeTaxService";
3
4
 
@@ -15,7 +16,7 @@ export class FranceIncomeTaxServiceImpl implements FranceIncomeTaxService {
15
16
  public calculateNetIncome(): ComputedIncomeTaxValues {
16
17
 
17
18
  const taxablePerPart = this._familyParts * this._income / this._familyParts;
18
- const { tax: taxPerPart, marginalRate } = this.calculateProgressiveTax(taxablePerPart);
19
+ const { tax: taxPerPart, marginalRate, bracketBreakdown } = this.calculateProgressiveTax(taxablePerPart);
19
20
  const incomeTax = taxPerPart * this._familyParts;
20
21
  const socialContributions = this._income * this._rules.socialContributions.employee.rate;
21
22
  const totalDeductions = incomeTax + socialContributions;
@@ -29,21 +30,34 @@ export class FranceIncomeTaxServiceImpl implements FranceIncomeTaxService {
29
30
  netIncome: this.round(netIncome),
30
31
  averageTaxRate: this.round(incomeTax / this._income),
31
32
  marginalTaxRate: marginalRate,
33
+ taxBracketBreakdown: bracketBreakdown,
32
34
  };
33
35
  }
34
36
 
35
37
 
36
38
  private calculateProgressiveTax(income: number): {
37
39
  tax: number;
38
- marginalRate: number
40
+ marginalRate: number;
41
+ bracketBreakdown: BracketAllocation[];
39
42
  } {
40
43
  let tax = 0;
41
44
  let marginalRate = 0;
45
+ const bracketBreakdown: BracketAllocation[] = [];
42
46
 
43
- for (const bracket of this._rules.taxBrackets) {
47
+ for (let index = 0; index < this._rules.taxBrackets.length; index++) {
48
+ const bracket = this._rules.taxBrackets[index];
44
49
  const upperBound = bracket.to ?? income;
45
50
 
46
51
  if (income <= bracket.from) {
52
+ bracketBreakdown.push({
53
+ bracketIndex: index,
54
+ bracketName: `Bracket ${index + 1}`,
55
+ from: bracket.from,
56
+ to: bracket.to ?? null,
57
+ rate: bracket.rate,
58
+ amountInBracket: 0,
59
+ taxOnAmount: 0,
60
+ });
47
61
  break;
48
62
  }
49
63
 
@@ -52,10 +66,29 @@ export class FranceIncomeTaxServiceImpl implements FranceIncomeTaxService {
52
66
  if (taxableAmount > 0) {
53
67
  tax += taxableAmount * bracket.rate;
54
68
  marginalRate = bracket.rate;
69
+ bracketBreakdown.push({
70
+ bracketIndex: index,
71
+ bracketName: `Bracket ${index + 1}`,
72
+ from: bracket.from,
73
+ to: bracket.to ?? null,
74
+ rate: bracket.rate,
75
+ amountInBracket: taxableAmount,
76
+ taxOnAmount: taxableAmount * bracket.rate,
77
+ });
78
+ } else {
79
+ bracketBreakdown.push({
80
+ bracketIndex: index,
81
+ bracketName: `Bracket ${index + 1}`,
82
+ from: bracket.from,
83
+ to: bracket.to ?? null,
84
+ rate: bracket.rate,
85
+ amountInBracket: 0,
86
+ taxOnAmount: 0,
87
+ });
55
88
  }
56
89
  }
57
90
 
58
- return { tax, marginalRate };
91
+ return { tax, marginalRate, bracketBreakdown };
59
92
  }
60
93
 
61
94
  private round(value: number): number {
@@ -1,5 +1,5 @@
1
1
  import { RuleMeta } from "../../../shared/domain/types";
2
- import { RuleInput, RuleOutput, TaxBracket } from "../../domain/types";
2
+ import { BracketAllocation, RuleInput, RuleOutput, TaxBracket } from "../../domain/types";
3
3
 
4
4
  export interface IncomeTaxRules {
5
5
  taxBrackets: TaxBracket[];
@@ -30,4 +30,5 @@ export interface ComputedIncomeTaxValues {
30
30
  netIncome: number;
31
31
  averageTaxRate: number;
32
32
  marginalTaxRate: number;
33
+ taxBracketBreakdown: BracketAllocation[];
33
34
  }
@@ -1,3 +1,4 @@
1
+ import { BracketAllocation } from "../domain/types";
1
2
  import { ComputedIncomeTaxValues, IncomeTaxRules } from "./domain/types";
2
3
  import { SouthAfricaIncomeTaxService } from "./SouthAfricaIncomeTaxService";
3
4
 
@@ -27,10 +28,11 @@ export class SouthAfricaIncomeTaxServiceImpl implements SouthAfricaIncomeTaxServ
27
28
  totalDeductions: 0,
28
29
  netIncome: grossIncome,
29
30
  effectiveTaxRate: 0,
31
+ taxBracketBreakdown: [],
30
32
  };
31
33
  }
32
34
 
33
- const grossTax = this.calculateBracketTax(this._income);
35
+ const { grossTax, bracketBreakdown } = this.calculateBracketTaxWithBreakdown(this._income);
34
36
 
35
37
  const rebate = this.getRebate(this._age);
36
38
  const medicalAidCredit =
@@ -50,9 +52,61 @@ export class SouthAfricaIncomeTaxServiceImpl implements SouthAfricaIncomeTaxServ
50
52
  totalDeductions: this.round(totalDeductions),
51
53
  netIncome: this.round(netIncome),
52
54
  effectiveTaxRate: this.round(effectiveTaxRate, 4),
55
+ taxBracketBreakdown: bracketBreakdown,
53
56
  };
54
57
  }
55
58
 
59
+ private calculateBracketTaxWithBreakdown(income: number): { grossTax: number; bracketBreakdown: BracketAllocation[] } {
60
+ let tax = 0;
61
+ const bracketBreakdown: BracketAllocation[] = [];
62
+
63
+ for (let index = 0; index < this._rules.taxBrackets.length; index++) {
64
+ const bracket = this._rules.taxBrackets[index];
65
+
66
+ if (income <= bracket.from) {
67
+ bracketBreakdown.push({
68
+ bracketIndex: index,
69
+ bracketName: `Bracket ${index + 1}`,
70
+ from: bracket.from,
71
+ to: bracket.to ?? null,
72
+ rate: bracket.rate,
73
+ amountInBracket: 0,
74
+ taxOnAmount: 0,
75
+ });
76
+ break;
77
+ }
78
+
79
+ const upper = bracket.to ?? income;
80
+ const taxableAmount = Math.min(upper, income) - bracket.from;
81
+
82
+ if (taxableAmount > 0) {
83
+ const taxOnAmount = taxableAmount * bracket.rate;
84
+ tax += taxOnAmount;
85
+ bracketBreakdown.push({
86
+ bracketIndex: index,
87
+ bracketName: `Bracket ${index + 1}`,
88
+ from: bracket.from,
89
+ to: bracket.to ?? null,
90
+ rate: bracket.rate,
91
+ amountInBracket: taxableAmount,
92
+ taxOnAmount: taxOnAmount,
93
+ });
94
+ } else {
95
+ bracketBreakdown.push({
96
+ bracketIndex: index,
97
+ bracketName: `Bracket ${index + 1}`,
98
+ from: bracket.from,
99
+ to: bracket.to ?? null,
100
+ rate: bracket.rate,
101
+ amountInBracket: 0,
102
+ taxOnAmount: 0,
103
+ });
104
+ }
105
+ }
106
+
107
+ return { grossTax: tax, bracketBreakdown };
108
+ }
109
+
56
110
  private calculateBracketTax(income: number): number {
57
111
  let tax = 0;
58
112
 
@@ -1,4 +1,4 @@
1
- import { AgeBasedRebate, TaxBracket } from "../../domain/types";
1
+ import { AgeBasedRebate, BracketAllocation, TaxBracket } from "../../domain/types";
2
2
 
3
3
  export interface IncomeTaxRules {
4
4
  taxBrackets: TaxBracket[];
@@ -38,10 +38,11 @@ export interface UifRules {
38
38
  }
39
39
 
40
40
  export interface ComputedIncomeTaxValues {
41
- grossIncome: number;
42
- incomeTax: number;
43
- uif: number;
44
- totalDeductions: number;
45
- netIncome: number;
46
- effectiveTaxRate: number;
41
+ grossIncome: number;
42
+ incomeTax: number;
43
+ uif: number;
44
+ totalDeductions: number;
45
+ netIncome: number;
46
+ effectiveTaxRate: number;
47
+ taxBracketBreakdown: BracketAllocation[];
47
48
  }