@novha/calc-engines 5.0.0 → 6.1.0

package/dist/types/capital-gains/uk/UKCapitalGainsServiceImpl.d.ts

@@ -1,5 +1,6 @@
+import { Result } from "../domain/types";
 import { UKCapitalGainsService } from "./UKCapitalGainsService";
-import { Input, Result, Rules } from "./domain/types";
+import { Input, Rules } from "./domain/types";
 export declare class UKCapitalGainsServiceImpl implements UKCapitalGainsService {
     private _input;
     private _rules;

package/dist/types/capital-gains/uk/domain/types.d.ts

@@ -1,4 +1,3 @@
-import { Breakdown } from "../../domain/types";
 export interface Rules {
     annualExemption: number;
     basicRate: number;
@@ -9,9 +8,3 @@ export interface Input {
     capitalGain: number;
     totalTaxableIncome: number;
 }
-export interface Result {
-    taxableGain: number;
-    capitalGainsTax: number;
-    effectiveRate: number;
-    breakdowns: Breakdown[];
-}

package/dist/types/capital-gains/usa/USACapitalGainsService.d.ts

@@ -1,4 +1,4 @@
-import { Result } from "./domain/types";
+import { Result } from "../domain/types";
 export interface USACapitalGainsService {
     calculate(): Result;
 }

package/dist/types/capital-gains/usa/USACapitalGainsServiceImpl.d.ts

@@ -1,5 +1,6 @@
+import { Result } from "../domain/types";
 import { USACapitalGainsService } from "./USACapitalGainsService";
-import { Input, Result, Rules } from "./domain/types";
+import { Input, Rules } from "./domain/types";
 export declare class USACapitalGainsServiceImpl implements USACapitalGainsService {
     private _input;
     private _rules;

package/dist/types/corporate/index.d.ts

@@ -0,0 +1,15 @@
+import { USACorporateTaxServiceImpl as USACorporateTaxService } from './usa/USACorporateTaxServiceImpl';
+import { Input as USACorporateTaxInput, Rules as USACorporateTaxRules, Result as USACorporateTaxResult } from './usa/domain/types';
+import { GermanyCorporateTaxServiceImpl as GermanyCorporateTaxService } from './germany/GermanyCorporateTaxServiceImpl';
+import { Input as GermanyCorporateTaxInput, Rules as GermanyCorporateTaxRules, Result as GermanyCorporateTaxResult } from './germany/domain/types';
+import { UKCorporateTaxServiceImpl as UKCorporateTaxService } from './uk/UKCorporateTaxServiceImpl';
+import { Input as UKCorporateTaxInput, Rules as UKCorporateTaxRules, Result as UKCorporateTaxResult } from './uk/domain/types';
+import { AustraliaCorporateTaxServiceImpl as AustraliaCorporateTaxService } from './australia/AustraliaCorporateTaxServiceImpl';
+import { Input as AustraliaCorporateTaxInput, Rules as AustraliaCorporateTaxRules, Result as AustraliaCorporateTaxResult } from './australia/domain/types';
+import { SouthAfricaCorporateTaxServiceImpl as SouthAfricaCorporateTaxService } from './south-africa/SouthAfricaCorporateTaxServiceImpl';
+import { Rules as SouthAfricaCorporateTaxRules, Input as SouthAfricaCorporateTaxInput, Result as SouthAfricaCorporateTaxResult } from './south-africa/domain/types';
+import { FranceCorporateTaxServiceImpl as FranceCorporateTaxService } from './france/FranceCorporateTaxServiceImpl';
+import { Input as FranceCorporateTaxInput, Rules as FranceCorporateTaxRules, Result as FranceCorporateTaxResult } from './france/domain/types';
+import { CanadaCorporateTaxServiceImpl as CanadaCorporateTaxService } from './canada/CanadaCorporateTaxServiceImpl';
+import { Input as CanadaCorporateTaxInput, Rules as CanadaCorporateTaxRules, Result as CanadaCorporateTaxResult } from './canada/domain/types';
+export { USACorporateTaxService, USACorporateTaxInput, USACorporateTaxRules, USACorporateTaxResult, GermanyCorporateTaxService, GermanyCorporateTaxInput, GermanyCorporateTaxRules, GermanyCorporateTaxResult, UKCorporateTaxService, UKCorporateTaxInput, UKCorporateTaxRules, UKCorporateTaxResult, AustraliaCorporateTaxService, AustraliaCorporateTaxInput, AustraliaCorporateTaxRules, AustraliaCorporateTaxResult, SouthAfricaCorporateTaxService, SouthAfricaCorporateTaxInput, SouthAfricaCorporateTaxRules, SouthAfricaCorporateTaxResult, FranceCorporateTaxService, FranceCorporateTaxInput, FranceCorporateTaxRules, FranceCorporateTaxResult, CanadaCorporateTaxService, CanadaCorporateTaxInput, CanadaCorporateTaxRules, CanadaCorporateTaxResult };

package/dist/types/income-tax/index.d.ts

@@ -0,0 +1,15 @@
+import { CanadaIncomeTaxServiceImpl as CanadaIncomeTaxService } from './canada/CanadaIncomeTaxServiceImpl';
+import { ComputedIncomeTaxValues as CanadaComputedIncomeTaxValues, IncomeTaxRules as CanadaIncomeTaxRules } from './canada/domain/types';
+import { FranceIncomeTaxServiceImpl as FranceIncomeTaxService } from './france/FranceIncomeTaxServiceImpl';
+import { ComputedIncomeTaxValues as FranceComputedIncomeTaxValues, IncomeTaxRules as FranceIncomeTaxRules } from './france/domain/types';
+import { SouthAfricaIncomeTaxServiceImpl as SouthAfricaIncomeTaxService } from './south-africa/SouthAfricaIncomeTaxServiceImpl';
+import { ComputedIncomeTaxValues as SouthAfricaComputedIncomeTaxValues, IncomeTaxRules as SouthAfricaIncomeTaxRules } from './south-africa/domain/types';
+import { AustraliaIncomeTaxServiceImpl as AustraliaIncomeTaxService } from './australia/AustraliaIncomeTaxServiceImpl';
+import { ComputedIncomeTaxValues as AustraliaComputedIncomeTaxValues, IncomeTaxRules as AustraliaIncomeTaxRules } from './australia/domain/types';
+import { UKIncomeTaxServiceImpl as UKIncomeTaxService } from './uk/UKIncomeTaxServiceImpl';
+import { ComputedIncomeTaxValues as UKComputedIncomeTaxValues, IncomeTaxRules as UKIncomeTaxRules } from './uk/domain/types';
+import { USAIncomeTaxServiceImpl as USAIncomeTaxService } from './usa/USAIncomeTaxServiceImpl';
+import { ComputedIncomeTaxValues as USAComputedIncomeTaxValues, IncomeTaxRules as USAIncomeTaxRules } from './usa/domain/types';
+import { GermanyIncomeTaxServiceImpl as GermanyIncomeTaxService } from './germany/GermanyIncomeTaxServiceImpl';
+import { ComputedIncomeTaxValues as GermanyComputedIncomeTaxValues, IncomeTaxRules as GermanyIncomeTaxRules } from './germany/domain/types';
+export { CanadaIncomeTaxService, CanadaComputedIncomeTaxValues, CanadaIncomeTaxRules, FranceIncomeTaxService, FranceComputedIncomeTaxValues, FranceIncomeTaxRules, SouthAfricaIncomeTaxService, SouthAfricaComputedIncomeTaxValues, SouthAfricaIncomeTaxRules, AustraliaIncomeTaxService, AustraliaComputedIncomeTaxValues, AustraliaIncomeTaxRules, UKIncomeTaxService, UKComputedIncomeTaxValues, UKIncomeTaxRules, USAIncomeTaxService, USAComputedIncomeTaxValues, USAIncomeTaxRules, GermanyIncomeTaxService, GermanyComputedIncomeTaxValues, GermanyIncomeTaxRules, };

package/dist/types/index.d.ts

@@ -1,59 +1,7 @@
 export { CalculatorType } from './shared/domain/types';
-export { CanadaIncomeTaxServiceImpl as CanadaIncomeTaxService } from './income-tax/canada/CanadaIncomeTaxServiceImpl';
-export { CanadaMortgageServiceImpl as CanadaMortgageService } from './mortgage/canada/CanadaMortgageServiceImpl';
-export { ComputedIncomeTaxValues as CanadaComputedIncomeTaxValues, IncomeTaxRules as CanadaIncomeTaxRules, } from './income-tax/canada/domain/types';
-export { MortgageRules as CanadaMortgageRules, MortgageCalculationInput as CanadaMortgageCalculationInput, MortgageCalculationResult as CanadaMortgageCalculationResult, } from './mortgage/canada/domain/types';
-export { CanadaCorporateTaxServiceImpl as CanadaCorporateTaxService } from './corporate/canada/CanadaCorporateTaxServiceImpl';
-export { Input as CanadaCorporateTaxInput, Rules as CanadaCorporateTaxRules, Result as CanadaCorporateTaxResult, } from './corporate/canada/domain/types';
-export { FranceIncomeTaxServiceImpl as FranceIncomeTaxService } from './income-tax/france/FranceIncomeTaxServiceImpl';
-export { FranceMortgageServiceImpl as FranceMortgageService } from './mortgage/france/FranceMortgageServiceImpl';
-export { ComputedIncomeTaxValues as FranceComputedIncomeTaxValues, IncomeTaxRules as FranceIncomeTaxRules, } from './income-tax/france/domain/types';
-export { MortgageRules as FranceMortgageRules, MortgageInput as FranceMortgageInput, MortgageOutput as FranceMortgageCalculationResult, } from './mortgage/france/domain/types';
-export { FranceCorporateTaxServiceImpl as FranceCorporateTaxService } from './corporate/france/FranceCorporateTaxServiceImpl';
-export { Input as FranceCorporateTaxInput, Rules as FranceCorporateTaxRules, Result as FranceCorporateTaxResult, } from './corporate/france/domain/types';
-export { SouthAfricaIncomeTaxServiceImpl as SouthAfricaIncomeTaxService } from './income-tax/south-africa/SouthAfricaIncomeTaxServiceImpl';
-export { SouthAfricaMortgageServiceImpl as SouthAfricaMortgageService } from './mortgage/south-africa/SouthAfricaMortgageServiceImpl';
-export { ComputedIncomeTaxValues as SouthAfricaComputedIncomeTaxValues, IncomeTaxRules as SouthAfricaIncomeTaxRules, } from './income-tax/south-africa/domain/types';
-export { MortgageRules as SouthAfricaMortgageRules, MortgageInput as SouthAfricaMortgageInput, MortgageOutput as SouthAfricaMortgageOutput, } from './mortgage/south-africa/domain/types';
-export { SouthAfricaCorporateTaxServiceImpl as SouthAfricaCorporateTaxService } from './corporate/south-africa/SouthAfricaCorporateTaxServiceImpl';
-export { Rules as SouthAfricaCorporateTaxRules, Input as SouthAfricaCorporateTaxInput, Result as SouthAfricaCorporateTaxResult, } from './corporate/south-africa/domain/types';
-export { AustraliaIncomeTaxServiceImpl as AustraliaIncomeTaxService } from './income-tax/australia/AustraliaIncomeTaxServiceImpl';
-export { ComputedIncomeTaxValues as AustraliaComputedIncomeTaxValues, IncomeTaxRules as AustraliaIncomeTaxRules, } from './income-tax/australia/domain/types';
-export { AustraliaMortgageServiceImpl as AustraliaMortgageService } from './mortgage/australia/AustraliaMortgageServiceImpl';
-export { MortgageRules as AustraliaMortgageRules, MortgageInput as AustraliaMortgageInput, MortgageOutput as AustraliaMortgageOutput, } from './mortgage/australia/domain/types';
-export { AustraliaCorporateTaxServiceImpl as AustraliaCorporateTaxService } from './corporate/australia/AustraliaCorporateTaxServiceImpl';
-export { Input as AustraliaCorporateTaxInput, Rules as AustraliaCorporateTaxRules, Result as AustraliaCorporateTaxResult, } from './corporate/australia/domain/types';
-export { UKIncomeTaxServiceImpl as UKIncomeTaxService } from './income-tax/uk/UKIncomeTaxServiceImpl';
-export { ComputedIncomeTaxValues as UKComputedIncomeTaxValues, IncomeTaxRules as UKIncomeTaxRules, } from './income-tax/uk/domain/types';
-export { UKCorporateTaxServiceImpl as UKCorporateTaxService } from './corporate/uk/UKCorporateTaxServiceImpl';
-export { Input as UKCorporateTaxInput, Rules as UKCorporateTaxRules, Result as UKCorporateTaxResult, } from './corporate/uk/domain/types';
-export { UKMortgageServiceImpl as UKMortgageService } from './mortgage/uk/UKMortgageServiceImpl';
-export { MortgageRules as UKMortgageRules, MortgageInput as UKMortgageInput, MortgageOutput as UKMortgageOutput, } from './mortgage/uk/domain/types';
-export { USAIncomeTaxServiceImpl as USAIncomeTaxService } from './income-tax/usa/USAIncomeTaxServiceImpl';
-export { ComputedIncomeTaxValues as USAComputedIncomeTaxValues, IncomeTaxRules as USAIncomeTaxRules, } from './income-tax/usa/domain/types';
-export { USAMortgageServiceImpl as USAMortgageService } from './mortgage/usa/USAMortgageServiceImpl';
-export { MortgageRules as USAMortgageRules, MortgageInput as USAMortgageInput, MortgageOutput as USAMortgageOutput, } from './mortgage/usa/domain/types';
-export { USACorporateTaxServiceImpl as USACorporateTaxService } from './corporate/usa/USACorporateTaxServiceImpl';
-export { Input as USACorporateTaxInput, Rules as USACorporateTaxRules, Result as USACorporateTaxResult, } from './corporate/usa/domain/types';
-export { GermanyIncomeTaxServiceImpl as GermanyIncomeTaxService } from './income-tax/germany/GermanyIncomeTaxServiceImpl';
-export { ComputedIncomeTaxValues as GermanyComputedIncomeTaxValues, IncomeTaxRules as GermanyIncomeTaxRules, } from './income-tax/germany/domain/types';
-export { GermanyMortgageServiceImpl as GermanyMortgageService } from './mortgage/germany/GermanyMortgageServiceImpl';
-export { MortgageRules as GermanyMortgageRules, MortgageInput as GermanyMortgageInput, MortgageOutput as GermanyMortgageOutput, } from './mortgage/germany/domain/types';
-export { GermanyCorporateTaxServiceImpl as GermanyCorporateTaxService } from './corporate/germany/GermanyCorporateTaxServiceImpl';
-export { Input as GermanyCorporateTaxInput, Rules as GermanyCorporateTaxRules, Result as GermanyCorporateTaxResult, } from './corporate/germany/domain/types';
-export { CanadaCapitalGainsServiceImpl as CanadaCapitalGainsService } from './capital-gains/canada/CanadaCapitalGainsServiceImpl';
-export { Input as CanadaCapitalGainsInput, Rules as CanadaCapitalGainsRules, Result as CanadaCapitalGainsResult, } from './capital-gains/canada/domain/types';
-export { FranceCapitalGainsServiceImpl as FranceCapitalGainsService } from './capital-gains/france/FranceCapitalGainsServiceImpl';
-export { Input as FranceCapitalGainsInput, Rules as FranceCapitalGainsRules, Result as FranceCapitalGainsResult, } from './capital-gains/france/domain/types';
-export { SouthAfricaCapitalGainsServiceImpl as SouthAfricaCapitalGainsService } from './capital-gains/south-africa/SouthAfricaCapitalGainsServiceImpl';
-export { Input as SouthAfricaCapitalGainsInput, Rules as SouthAfricaCapitalGainsRules, Result as SouthAfricaCapitalGainsResult, } from './capital-gains/south-africa/domain/types';
-export { AustraliaCapitalGainsServiceImpl as AustraliaCapitalGainsService } from './capital-gains/australia/AustraliaCapitalGainsServiceImpl';
-export { Input as AustraliaCapitalGainsInput, Rules as AustraliaCapitalGainsRules, Result as AustraliaCapitalGainsResult, } from './capital-gains/australia/domain/types';
-export { UKCapitalGainsServiceImpl as UKCapitalGainsService } from './capital-gains/uk/UKCapitalGainsServiceImpl';
-export { Input as UKCapitalGainsInput, Rules as UKCapitalGainsRules, Result as UKCapitalGainsResult, } from './capital-gains/uk/domain/types';
-export { USACapitalGainsServiceImpl as USACapitalGainsService } from './capital-gains/usa/USACapitalGainsServiceImpl';
-export { Input as USACapitalGainsInput, Rules as USACapitalGainsRules, Result as USACapitalGainsResult, } from './capital-gains/usa/domain/types';
-export { GermanyCapitalGainsServiceImpl as GermanyCapitalGainsService } from './capital-gains/germany/GermanyCapitalGainsServiceImpl';
-export { Input as GermanyCapitalGainsInput, Rules as GermanyCapitalGainsRules, Result as GermanyCapitalGainsResult, } from './capital-gains/germany/domain/types';
 export { IncomeTaxCalculatorSchema } from './income-tax/domain/types';
 export * from './income-tax/domain/types';
+export * as IncomeTax from './income-tax';
+export * as CorporateTax from './corporate';
+export * as CapitalGain from './capital-gains';
+export * as Mortgage from './mortgage';

package/dist/types/mortgage/france/FranceMortgageService.d.ts

@@ -1,4 +1,4 @@
 import { MortgageRules, MortgageInput, MortgageOutput } from './domain/types';
-export interface SouthAfricaMortgageService {
+export interface FranceMortgageService {
     calculate(input: MortgageInput, rules: MortgageRules): MortgageOutput;
 }

package/dist/types/mortgage/france/FranceMortgageServiceImpl.d.ts

@@ -1,4 +1,4 @@
-import { FranceMortgageService } from '../..';
+import { FranceMortgageService } from './FranceMortgageService';
 import { MortgageRules, MortgageInput, MortgageOutput } from './domain/types';
 export declare class FranceMortgageServiceImpl implements FranceMortgageService {
     private _input;

package/dist/types/mortgage/index.d.ts

@@ -0,0 +1,15 @@
+import { CanadaMortgageServiceImpl as CanadaMortgageService } from './canada/CanadaMortgageServiceImpl';
+import { MortgageRules as CanadaMortgageRules, MortgageCalculationInput as CanadaMortgageCalculationInput, MortgageCalculationResult as CanadaMortgageCalculationResult } from './canada/domain/types';
+import { FranceMortgageServiceImpl as FranceMortgageService } from './france/FranceMortgageServiceImpl';
+import { MortgageRules as FranceMortgageRules, MortgageInput as FranceMortgageInput, MortgageOutput as FranceMortgageCalculationResult } from './france/domain/types';
+import { SouthAfricaMortgageServiceImpl as SouthAfricaMortgageService } from './south-africa/SouthAfricaMortgageServiceImpl';
+import { MortgageRules as SouthAfricaMortgageRules, MortgageInput as SouthAfricaMortgageInput, MortgageOutput as SouthAfricaMortgageOutput } from './south-africa/domain/types';
+import { AustraliaMortgageServiceImpl as AustraliaMortgageService } from './australia/AustraliaMortgageServiceImpl';
+import { MortgageRules as AustraliaMortgageRules, MortgageInput as AustraliaMortgageInput, MortgageOutput as AustraliaMortgageOutput } from './australia/domain/types';
+import { UKMortgageServiceImpl as UKMortgageService } from './uk/UKMortgageServiceImpl';
+import { MortgageRules as UKMortgageRules, MortgageInput as UKMortgageInput, MortgageOutput as UKMortgageOutput } from './uk/domain/types';
+import { USAMortgageServiceImpl as USAMortgageService } from './usa/USAMortgageServiceImpl';
+import { MortgageRules as USAMortgageRules, MortgageInput as USAMortgageInput, MortgageOutput as USAMortgageOutput } from './usa/domain/types';
+import { GermanyMortgageServiceImpl as GermanyMortgageService } from './germany/GermanyMortgageServiceImpl';
+import { MortgageRules as GermanyMortgageRules, MortgageInput as GermanyMortgageInput, MortgageOutput as GermanyMortgageOutput } from './germany/domain/types';
+export { CanadaMortgageService, CanadaMortgageRules, CanadaMortgageCalculationInput, CanadaMortgageCalculationResult, FranceMortgageService, FranceMortgageRules, FranceMortgageInput, FranceMortgageCalculationResult, SouthAfricaMortgageService, SouthAfricaMortgageRules, SouthAfricaMortgageInput, SouthAfricaMortgageOutput, AustraliaMortgageService, AustraliaMortgageRules, AustraliaMortgageInput, AustraliaMortgageOutput, UKMortgageService, UKMortgageRules, UKMortgageInput, UKMortgageOutput, USAMortgageService, USAMortgageRules, USAMortgageInput, USAMortgageOutput, GermanyMortgageService, GermanyMortgageRules, GermanyMortgageInput, GermanyMortgageOutput };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@novha/calc-engines",
-  "version": "5.0.0",
+  "version": "6.1.0",
   "main": "dist/index.js",
   "types": "dist/types/index.d.ts",
   "scripts": {

package/src/capital-gains/australia/AustraliaCapitalGainsService.ts

@@ -1,4 +1,4 @@
-import { Result } from "./domain/types";
+import { Result } from "../domain/types";
 
 export interface AustraliaCapitalGainsService {
     calculate(): Result;

package/src/capital-gains/australia/AustraliaCapitalGainsServiceImpl.ts

@@ -1,6 +1,6 @@
-import { Breakdown } from "../domain/types";
+import { Breakdown, Result } from "../domain/types";
 import { AustraliaCapitalGainsService } from "./AustraliaCapitalGainsService";
-import { Input, Result, Rules, TaxBracket } from "./domain/types";
+import { Input, Rules, TaxBracket } from "./domain/types";
 
 export class AustraliaCapitalGainsServiceImpl implements AustraliaCapitalGainsService {
     private _input: Input;
@@ -15,7 +15,15 @@ export class AustraliaCapitalGainsServiceImpl implements AustraliaCapitalGainsSe
         const gain = this._input.capitalGain;
 
         if (gain <= 0) {
-            return { taxableGain: 0, capitalGainsTax: 0, effectiveRate: 0, breakdowns: [] };
+            return { 
+                taxableGain: 0,
+                capitalGainTax: 0,
+                socialContributions: 0, 
+                totalTax: 0,
+                effectiveRate: 0,
+                netInvestmentIncomeTax: 0,
+                breakdowns: []
+            };
         }
 
         const eligible = this._input.holdingPeriodMonths >= this._rules.cgtDiscountMinMonths;
@@ -26,7 +34,10 @@ export class AustraliaCapitalGainsServiceImpl implements AustraliaCapitalGainsSe
 
         return {
             taxableGain,
-            capitalGainsTax: tax,
+            capitalGainTax: tax,
+            socialContributions: 0,
+            netInvestmentIncomeTax: 0,
+            totalTax: tax,
             effectiveRate: gain > 0 ? (tax / gain) * 100 : 0,
             breakdowns,
         };

package/src/capital-gains/australia/domain/types.ts

@@ -1,5 +1,3 @@
-import { Breakdown } from "../../domain/types";
-
 export interface TaxBracket {
     from: number;
     to: number | null;
@@ -17,10 +15,3 @@ export interface Input {
     totalTaxableIncome: number;
     holdingPeriodMonths: number;
 }
-
-export interface Result {
-    taxableGain: number;
-    capitalGainsTax: number;
-    effectiveRate: number;
-    breakdowns: Breakdown[];
-}

package/src/capital-gains/canada/CanadaCapitalGainsService.ts

@@ -1,4 +1,4 @@
-import { Result } from "./domain/types";
+import { Result } from "../domain/types";
 
 export interface CanadaCapitalGainsService {
     calculate(): Result;

package/src/capital-gains/canada/CanadaCapitalGainsServiceImpl.ts

@@ -1,6 +1,6 @@
-import { Breakdown } from "../domain/types";
+import { Breakdown, Result } from "../domain/types";
 import { CanadaCapitalGainsService } from "./CanadaCapitalGainsService";
-import { Input, Result, Rules, TaxBracket } from "./domain/types";
+import { Input, Rules, TaxBracket } from "./domain/types";
 
 export class CanadaCapitalGainsServiceImpl implements CanadaCapitalGainsService {
     private _input: Input;
@@ -15,7 +15,15 @@ export class CanadaCapitalGainsServiceImpl implements CanadaCapitalGainsService
         const gain = this._input.capitalGain;
 
         if (gain <= 0) {
-            return { taxableGain: 0, capitalGainsTax: 0, effectiveRate: 0, breakdowns: [] };
+            return {
+                taxableGain: 0,
+                capitalGainTax: 0,
+                socialContributions: 0,
+                netInvestmentIncomeTax: 0,
+                totalTax: 0,
+                effectiveRate: 0,
+                breakdowns: []
+            };
         }
 
         const taxableGain = gain * this._rules.inclusionRate;
@@ -24,7 +32,10 @@ export class CanadaCapitalGainsServiceImpl implements CanadaCapitalGainsService
 
         return {
             taxableGain,
-            capitalGainsTax: tax,
+            capitalGainTax: tax,
+            socialContributions: 0,
+            netInvestmentIncomeTax: 0,
+            totalTax: tax,
             effectiveRate: gain > 0 ? (tax / gain) * 100 : 0,
             breakdowns,
         };

package/src/capital-gains/canada/domain/types.ts

@@ -1,5 +1,3 @@
-import { Breakdown } from "../../domain/types";
-
 export interface Rules {
     inclusionRate: number;
     taxBrackets: TaxBracket[];
@@ -15,10 +13,3 @@ export interface Input {
     capitalGain: number;
     totalTaxableIncome: number;
 }
-
-export interface Result {
-    taxableGain: number;
-    capitalGainsTax: number;
-    effectiveRate: number;
-    breakdowns: Breakdown[];
-}

package/src/capital-gains/domain/types.ts

@@ -4,3 +4,12 @@ export interface Breakdown {
     rate: number;
     amount: number;
 }
+export interface Result {
+    taxableGain: number;
+    capitalGainTax: number;
+    socialContributions: number;
+    totalTax: number;
+    netInvestmentIncomeTax: number;
+    effectiveRate: number;
+    breakdowns: Breakdown[];
+}

package/src/capital-gains/france/FranceCapitalGainsService.ts

@@ -1,4 +1,4 @@
-import { Result } from "./domain/types";
+import { Result } from "../domain/types";
 
 export interface FranceCapitalGainsService {
     calculate(): Result;

package/src/capital-gains/france/FranceCapitalGainsServiceImpl.ts

@@ -1,6 +1,6 @@
-import { Breakdown } from "../domain/types";
+import { Breakdown, Result } from "../domain/types";
 import { FranceCapitalGainsService } from "./FranceCapitalGainsService";
-import { Input, Result, Rules } from "./domain/types";
+import { Input, Rules } from "./domain/types";
 
 export class FranceCapitalGainsServiceImpl implements FranceCapitalGainsService {
     private _input: Input;
@@ -15,19 +15,27 @@ export class FranceCapitalGainsServiceImpl implements FranceCapitalGainsService
         const gain = this._input.capitalGain;
 
         if (gain <= 0) {
-            return { incomeTax: 0, socialContributions: 0, totalTax: 0, effectiveRate: 0, breakdowns: [] };
+            return {
+                taxableGain: gain,
+                capitalGainTax: 0,
+                socialContributions: 0,
+                netInvestmentIncomeTax: 0,
+                totalTax: 0,
+                effectiveRate: 0,
+                breakdowns: []
+            };
         }
 
-        const incomeTax = gain * this._rules.flatTaxRate;
+        const capitalGainTax = gain * this._rules.flatTaxRate;
         const socialContributions = gain * this._rules.socialContributionsRate;
-        const totalTax = incomeTax + socialContributions;
+        const totalTax = capitalGainTax + socialContributions;
 
         const breakdowns: Breakdown[] = [
             {
                 from: '0',
                 to: 'All',
                 rate: this._rules.flatTaxRate,
-                amount: incomeTax,
+                amount: capitalGainTax,
             },
             {
                 from: '0',
@@ -38,8 +46,10 @@ export class FranceCapitalGainsServiceImpl implements FranceCapitalGainsService
         ];
 
         return {
-            incomeTax,
+            taxableGain: gain,
+            capitalGainTax,
             socialContributions,
+            netInvestmentIncomeTax: 0,
             totalTax,
             effectiveRate: (totalTax / gain) * 100,
             breakdowns,

package/src/capital-gains/france/domain/types.ts

@@ -1,5 +1,3 @@
-import { Breakdown } from "../../domain/types";
-
 export interface Rules {
     flatTaxRate: number;
     socialContributionsRate: number;
@@ -7,12 +5,4 @@ export interface Rules {
 
 export interface Input {
     capitalGain: number;
-}
-
-export interface Result {
-    incomeTax: number;
-    socialContributions: number;
-    totalTax: number;
-    effectiveRate: number;
-    breakdowns: Breakdown[];
-}
+}

package/src/capital-gains/germany/GermanyCapitalGainsService.ts

@@ -1,4 +1,4 @@
-import { Result } from "./domain/types";
+import { Result } from "../domain/types";
 
 export interface GermanyCapitalGainsService {
     calculate(): Result;

package/src/capital-gains/germany/GermanyCapitalGainsServiceImpl.ts

@@ -1,6 +1,6 @@
-import { Breakdown } from "../domain/types";
+import { Breakdown, Result } from "../domain/types";
 import { GermanyCapitalGainsService } from "./GermanyCapitalGainsService";
-import { Input, Result, Rules } from "./domain/types";
+import { Input, Rules } from "./domain/types";
 
 export class GermanyCapitalGainsServiceImpl implements GermanyCapitalGainsService {
     private _input: Input;
@@ -17,8 +17,9 @@ export class GermanyCapitalGainsServiceImpl implements GermanyCapitalGainsServic
         if (gain <= 0) {
             return {
                 taxableGain: 0,
-                capitalGainsTax: 0,
-                solidaritySurcharge: 0,
+                capitalGainTax: 0,
+                socialContributions: 0,
+                netInvestmentIncomeTax: 0,
                 totalTax: 0,
                 effectiveRate: 0,
                 breakdowns: [],
@@ -30,8 +31,9 @@ export class GermanyCapitalGainsServiceImpl implements GermanyCapitalGainsServic
         if (taxableGain <= 0) {
             return {
                 taxableGain: 0,
-                capitalGainsTax: 0,
-                solidaritySurcharge: 0,
+                capitalGainTax: 0,
+                socialContributions: 0,
+                netInvestmentIncomeTax: 0,
                 totalTax: 0,
                 effectiveRate: 0,
                 breakdowns: [{
@@ -43,29 +45,30 @@ export class GermanyCapitalGainsServiceImpl implements GermanyCapitalGainsServic
             };
         }
 
-        const capitalGainsTax = taxableGain * this._rules.flatTaxRate;
-        const solidaritySurcharge = capitalGainsTax * this._rules.solidaritySurchargeRate;
-        const totalTax = capitalGainsTax + solidaritySurcharge;
+        const capitalGainTax = taxableGain * this._rules.flatTaxRate;
+        const socialContributions = capitalGainTax * this._rules.solidaritySurchargeRate;
+        const totalTax = capitalGainTax + socialContributions;
 
         const breakdowns: Breakdown[] = [
             {
                 from: '0',
                 to: 'All',
                 rate: this._rules.flatTaxRate,
-                amount: capitalGainsTax,
+                amount: capitalGainTax,
             },
             {
                 from: 'CGT',
                 to: 'Solidarity',
                 rate: this._rules.solidaritySurchargeRate,
-                amount: solidaritySurcharge,
+                amount: socialContributions,
             },
         ];
 
         return {
             taxableGain,
-            capitalGainsTax,
-            solidaritySurcharge,
+            capitalGainTax,
+            socialContributions,
+            netInvestmentIncomeTax: 0,
             totalTax,
             effectiveRate: gain > 0 ? (totalTax / gain) * 100 : 0,
             breakdowns,

package/src/capital-gains/germany/domain/types.ts

@@ -1,4 +1,3 @@
-import { Breakdown } from "../../domain/types";
 
 export interface Rules {
     flatTaxRate: number;
@@ -9,12 +8,3 @@ export interface Rules {
 export interface Input {
     capitalGain: number;
 }
-
-export interface Result {
-    taxableGain: number;
-    capitalGainsTax: number;
-    solidaritySurcharge: number;
-    totalTax: number;
-    effectiveRate: number;
-    breakdowns: Breakdown[];
-}

package/src/capital-gains/index.ts

@@ -0,0 +1,74 @@
+// Capital Gains - Canada
+import { CanadaCapitalGainsServiceImpl as CanadaCapitalGainsService } from './canada/CanadaCapitalGainsServiceImpl';
+import {
+    Input as CanadaCapitalGainsInput,
+    Rules as CanadaCapitalGainsRules
+} from './canada/domain/types';
+
+// Capital Gains - France
+import { FranceCapitalGainsServiceImpl as FranceCapitalGainsService } from './france/FranceCapitalGainsServiceImpl';
+import {
+    Input as FranceCapitalGainsInput,
+    Rules as FranceCapitalGainsRules
+} from './france/domain/types';
+
+// Capital Gains - South Africa
+import { SouthAfricaCapitalGainsServiceImpl as SouthAfricaCapitalGainsService } from './south-africa/SouthAfricaCapitalGainsServiceImpl';
+import {
+    Input as SouthAfricaCapitalGainsInput,
+    Rules as SouthAfricaCapitalGainsRules
+} from './south-africa/domain/types';
+
+// Capital Gains - Australia
+import { AustraliaCapitalGainsServiceImpl as AustraliaCapitalGainsService } from './australia/AustraliaCapitalGainsServiceImpl';
+import {
+    Input as AustraliaCapitalGainsInput,
+    Rules as AustraliaCapitalGainsRules
+} from './australia/domain/types';
+
+// Capital Gains - UK
+import { UKCapitalGainsServiceImpl as UKCapitalGainsService } from './uk/UKCapitalGainsServiceImpl';
+import {
+    Input as UKCapitalGainsInput,
+    Rules as UKCapitalGainsRules
+} from './uk/domain/types';
+
+// Capital Gains - USA
+import { USACapitalGainsServiceImpl as USACapitalGainsService } from './usa/USACapitalGainsServiceImpl';
+import {
+    Input as USACapitalGainsInput,
+    Rules as USACapitalGainsRules
+} from './usa/domain/types';
+
+// Capital Gains - Germany
+import { GermanyCapitalGainsServiceImpl as GermanyCapitalGainsService } from './germany/GermanyCapitalGainsServiceImpl';
+import {
+    Input as GermanyCapitalGainsInput,
+    Rules as GermanyCapitalGainsRules
+} from './germany/domain/types';
+import { Result } from './domain/types';
+
+export {
+    CanadaCapitalGainsService,
+    CanadaCapitalGainsInput,
+    CanadaCapitalGainsRules,
+    FranceCapitalGainsService,
+    FranceCapitalGainsInput,
+    FranceCapitalGainsRules,
+    SouthAfricaCapitalGainsService,
+    SouthAfricaCapitalGainsInput,
+    SouthAfricaCapitalGainsRules,
+    AustraliaCapitalGainsService,
+    AustraliaCapitalGainsInput,
+    AustraliaCapitalGainsRules,
+    UKCapitalGainsService,
+    UKCapitalGainsInput,
+    UKCapitalGainsRules,
+    USACapitalGainsService,
+    USACapitalGainsInput,
+    USACapitalGainsRules,
+    GermanyCapitalGainsService,
+    GermanyCapitalGainsInput,
+    GermanyCapitalGainsRules,
+    Result
+};

package/src/capital-gains/south-africa/SouthAfricaCapitalGainsService.ts

@@ -1,4 +1,4 @@
-import { Result } from "./domain/types";
+import { Result } from "../domain/types";
 
 export interface SouthAfricaCapitalGainsService {
     calculate(): Result;

package/src/capital-gains/south-africa/SouthAfricaCapitalGainsServiceImpl.ts

@@ -1,6 +1,6 @@
-import { Breakdown } from "../domain/types";
+import { Breakdown, Result } from "../domain/types";
 import { SouthAfricaCapitalGainsService } from "./SouthAfricaCapitalGainsService";
-import { Input, Result, Rules, TaxBracket } from "./domain/types";
+import { Input, Rules, TaxBracket } from "./domain/types";
 
 export class SouthAfricaCapitalGainsServiceImpl implements SouthAfricaCapitalGainsService {
     private _input: Input;
@@ -15,7 +15,15 @@ export class SouthAfricaCapitalGainsServiceImpl implements SouthAfricaCapitalGai
         const gain = this._input.capitalGain;
 
         if (gain <= 0) {
-            return { taxableGain: 0, capitalGainsTax: 0, effectiveRate: 0, breakdowns: [] };
+            return {
+                taxableGain: 0,
+                capitalGainTax: 0,
+                socialContributions: 0,
+                netInvestmentIncomeTax: 0,
+                totalTax: 0,
+                effectiveRate: 0,
+                breakdowns: []
+            };
         }
 
         const netGain = Math.max(0, gain - this._rules.annualExclusion);
@@ -24,7 +32,10 @@ export class SouthAfricaCapitalGainsServiceImpl implements SouthAfricaCapitalGai
         if (taxableGain <= 0) {
             return {
                 taxableGain: 0,
-                capitalGainsTax: 0,
+                capitalGainTax: 0,
+                socialContributions: 0,
+                netInvestmentIncomeTax: 0,
+                totalTax: 0,
                 effectiveRate: 0,
                 breakdowns: [{
                     from: '0',
@@ -40,7 +51,10 @@ export class SouthAfricaCapitalGainsServiceImpl implements SouthAfricaCapitalGai
 
         return {
             taxableGain,
-            capitalGainsTax: tax,
+            capitalGainTax: tax,
+            socialContributions: 0,
+            netInvestmentIncomeTax: 0,
+            totalTax: tax,
             effectiveRate: gain > 0 ? (tax / gain) * 100 : 0,
             breakdowns,
         };