@pax2pay/model-banking 0.1.540 → 0.1.542

package/Account/Charge.ts

@@ -2,6 +2,7 @@ import { cryptly } from "cryptly"
 import { isoly } from "isoly"
 import { isly } from "isly"
 import { Card } from "../Card"
+import type { Rail } from "../Rail"
 import { Transaction } from "../Transaction"
 
 export interface Charge extends Charge.Creatable {
@@ -36,22 +37,18 @@ export namespace Charge {
 	}
 	export function evaluate(
 		charges: Charge[] = [],
-		transaction: Transaction.Creatable.Resolved | Transaction
+		counterpart: Rail.Address.Card.Counterpart,
+		currency: isoly.Currency,
+		amount: number
 	): Transaction.Amount.Charge[] {
 		const result: Transaction.Amount.Charge[] = []
-		const counterpart = "merchant" in transaction.counterpart ? transaction.counterpart : undefined
-		if (counterpart)
-			for (const charge of charges)
-				if (charge.applies.to.merchants.some(merchant => Card.Restriction.Merchant.check(merchant, counterpart)))
-					result.push({
-						destination: charge.destination,
-						type: "merchant",
-						amount: isoly.Currency.multiply(
-							transaction.currency,
-							typeof transaction.amount == "number" ? transaction.amount : -transaction.amount.original,
-							charge.rate
-						),
-					})
+		for (const charge of charges)
+			if (charge.applies.to.merchants.some(merchant => Card.Restriction.Merchant.check(merchant, counterpart)))
+				result.push({
+					destination: charge.destination,
+					type: "merchant",
+					amount: isoly.Currency.multiply(currency, amount, charge.rate),
+				})
 		return result
 	}
 	export function sum(charges: Transaction.Amount.Charge[], currency: isoly.Currency): number {

package/Rule/State/Transaction.ts

@@ -12,7 +12,6 @@ export type Transaction = ModelTransaction.Creatable.Resolved & {
 	risk?: number
 	original: {
 		currency: isoly.Currency
-		charges?: ModelTransaction.Amount.Charge[]
 		total: number
 		amount: number
 		charge?: { current: number; total: number } //Legacy
@@ -25,7 +24,6 @@ export namespace Transaction {
 		kind: Rule.Base.Kind,
 		stage: "finalize" | "initiate"
 	): Transaction {
-		const charges = ModelAccount.Charge.evaluate(account.charges, transaction)
 		const amount = Math.abs(typeof transaction.amount == "number" ? transaction.amount : transaction.amount.original)
 		return {
 			...transaction,
@@ -36,9 +34,8 @@ export namespace Transaction {
 			type: ModelTransaction.getType(transaction.counterpart, account.name),
 			original: {
 				currency: transaction.currency,
-				charges,
 				amount,
-				total: isoly.Currency.add(transaction.currency, amount, ModelAccount.Charge.sum(charges, transaction.currency)),
+				total: amount,
 			},
 		}
 	}

package/Settlement/Entry/Creatable.ts

@@ -6,7 +6,6 @@ import { Exchange } from "../../Transaction/Exchange"
 import { Batch } from "../Batch"
 import { Fee } from "../Fee"
 import { Identifier as SettlementIdentifier } from "../Identifier"
-import { Entry as LegacyEntry } from "./Legacy"
 
 export type Creatable = Creatable.Known | Creatable.Unknown
 export namespace Creatable {
@@ -44,62 +43,18 @@ export namespace Creatable {
 		type: "capture"
 	}
 	export namespace Capture {
-		export const type = Base.type.extend<Capture>({
-			type: isly.string("capture"),
-		})
-		export function fromLegacy(maybeLegacy: Capture | LegacyEntry.Capture.Creatable): Capture {
-			return type.is(maybeLegacy)
-				? maybeLegacy
-				: {
-						type: maybeLegacy.type,
-						card: maybeLegacy.authorization.card.id,
-						transaction: maybeLegacy.authorization.transaction?.id,
-						account: maybeLegacy.authorization.account || "unknown",
-						approvalCode: maybeLegacy.authorization.approvalCode ?? "unknown",
-						merchant: maybeLegacy.authorization.merchant,
-						acquirer: maybeLegacy.authorization.acquirer,
-						reference: maybeLegacy.reference,
-						batch: maybeLegacy.batch,
-						fee: maybeLegacy.fee,
-						amount: maybeLegacy.amount,
-						settlement: maybeLegacy.settlement ?? "unknown",
-				  }
-		}
+		export const type = Base.type.extend<Capture>({ type: isly.string("capture") })
 	}
 	export interface Refund extends Base {
 		type: "refund"
 	}
 	export namespace Refund {
-		export const type = Base.type.extend<Refund>({
-			type: isly.string("refund"),
-		})
-		export function fromLegacy(maybeLegacy: Refund | LegacyEntry.Refund.Creatable): Refund {
-			return type.is(maybeLegacy)
-				? maybeLegacy
-				: {
-						type: maybeLegacy.type,
-						card: maybeLegacy.card,
-						account: maybeLegacy.account ?? "unknown",
-						approvalCode: maybeLegacy.authorization.approvalCode ?? "unknown",
-						merchant: maybeLegacy.merchant,
-						acquirer: maybeLegacy.acquirer,
-						reference: maybeLegacy.reference,
-						batch: maybeLegacy.batch,
-						fee: maybeLegacy.fee,
-						amount: maybeLegacy.amount,
-						settlement: maybeLegacy.settlement ?? "unknown",
-				  }
-		}
+		export const type = Base.type.extend<Refund>({ type: isly.string("refund") })
 	}
 	export type Known = Capture | Refund
 
 	export namespace Known {
 		export const type = isly.union(Capture.type, Refund.type)
-		export function fromLegacy(
-			maybeLegacy: Creatable.Known | LegacyEntry.Capture.Creatable | LegacyEntry.Refund.Creatable
-		): Creatable.Known {
-			return maybeLegacy.type == "capture" ? Capture.fromLegacy(maybeLegacy) : Refund.fromLegacy(maybeLegacy)
-		}
 	}
 	export interface Unknown extends Partial<Base> {
 		type: "unknown"

package/Settlement/Entry/index.ts

@@ -1,8 +1,10 @@
+import { isoly } from "isoly"
+import { Account } from "../../Account"
+import type { Rail } from "../../Rail"
+import type { Transaction } from "../../Transaction"
 import { Creatable as EntryCreatable } from "./Creatable"
 import { Failed as EntryFailed } from "./Failed"
 import { fromCreatable } from "./fromCreatable"
-import { fromLegacy as entryFromLegacy } from "./fromLegacy"
-import { Entry as LegacyEntry } from "./Legacy"
 import { Succeeded as EntrySucceeded } from "./Succeeded"
 import { Summary as EntrySummary } from "./Summary"
 import { type as entryType } from "./type"
@@ -19,8 +21,18 @@ export namespace Entry {
 	export import Failed = EntryFailed
 	export import Succeeded = EntrySucceeded
 	export import Summary = EntrySummary
-	export import Legacy = LegacyEntry
 	export const type = entryType
-	export const fromLegacy = entryFromLegacy
 	export const from = fromCreatable
+	export function charge(
+		charges: Account.Charge[] = [],
+		counterpart: Rail.Address.Card.Counterpart,
+		capture: Creatable.Capture
+	): Transaction.Amount.Charge[] {
+		return Account.Charge.evaluate(
+			charges,
+			counterpart,
+			capture.amount[0],
+			isoly.Currency.add(capture.amount[0], capture.amount[1], capture.fee.other[capture.amount[0]] ?? 0)
+		)
+	}
 }

package/Settlement/index.ts

@@ -65,39 +65,6 @@ export namespace Settlement {
 		outcome: OldTotal
 		settled?: { paid: Amounts; transactions: string[] }
 	}
-	export type MaybeOld = Settlement | OldSettlement
-	export function fromLegacy(settlement: MaybeOld): Settlement {
-		let result: Settlement
-		if (!type.is(settlement)) {
-			const totalToAmount: (currency: isoly.Currency, total?: OldTotal) => Amount = (currency, oldTotal) => ({
-				net: oldTotal?.amount[currency] ?? 0,
-				fee: { other: oldTotal?.fee.other[currency] ?? 0 },
-			})
-			const { expected, collected, outcome, settled, ...partialSettlement } = settlement
-			const currencies = Array.from(
-				new Set<isoly.Currency>([
-					...Object.keys(expected?.amount ?? {}),
-					...Object.keys(collected?.amount ?? {}),
-					...Object.keys(settled?.paid ?? {}),
-					...Object.keys(outcome.amount),
-				] as isoly.Currency[])
-			)
-			const totals = currencies.reduce((total, currency) => {
-				total[currency] = {
-					expected: totalToAmount(currency, expected),
-					...(outcome ? { outcome: totalToAmount(currency, outcome) } : {}),
-					...(collected
-						? { collected: { ...totalToAmount(currency, collected), transactions: { net: "", fee: "", charge: "" } } } //TODO: Find transactions?
-						: {}),
-					...(settled ? { settled: { net: settled.paid[currency] ?? 0, transactions: settled.transactions } } : {}), //Find transactions?
-				}
-				return total
-			}, {} as Totals)
-			result = { ...partialSettlement, totals }
-		} else
-			result = settlement
-		return result
-	}
 	export const type = SettlementCreatable.type.extend<Settlement>({
 		id: isly.union(SettlementIdentifier.type, isly.string()),
 		by: isly.string().optional(),

package/Transaction/Amount.ts

@@ -33,15 +33,16 @@ export namespace Amount {
 		total: isly.number(),
 		exchange: Exchange.type.optional(),
 	})
-	export function fromState(state: Rule.State): Amount {
+	export function fromState(state: Rule.State, charges?: Charge[]): Amount {
 		const sign = ["outbound", "authorization", "capture"].some(direction => direction == state.transaction.kind)
 			? -1
 			: 1
+		const charge = Amount.Charge.total(state.transaction.original.currency, charges)
 		return {
 			original: sign * state.transaction.original.amount,
 			charge: sign * (state.transaction.original.charge?.total ?? 0),
-			charges: state.transaction.original.charges,
-			total: sign * state.transaction.original.total,
+			charges,
+			total: sign * isoly.Currency.add(state.transaction.original.currency, state.transaction.original.total, charge),
 			exchange: state?.transaction.exchange ?? state.authorization?.exchange,
 		}
 	}

package/Transaction/Creatable.ts

@@ -1,6 +1,8 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
+import { Account } from "../Account"
 import { Rail } from "../Rail"
+import { Amount } from "./Amount"
 import { Exchange } from "./Exchange"
 
 export interface Creatable {
@@ -34,5 +36,8 @@ export namespace Creatable {
 			reference: isly.object<{ reference: string }>({ reference: isly.string() }),
 			approvalCode: isly.string().optional(),
 		})
+		export function charge(charges: Account.Charge[], creatable: CardTransaction): Amount.Charge[] {
+			return Account.Charge.evaluate(charges, creatable.counterpart, creatable.currency, creatable.amount)
+		}
 	}
 }

package/Transaction/index.ts

@@ -89,9 +89,10 @@ export namespace Transaction {
 		state: isly.any().optional(),
 	})
 	export function amountFromOperations(
-		transaction: Transaction | Transaction.Creatable,
+		transaction: Transaction,
 		operations: Operation[],
-		state?: Rule.State
+		state?: Rule.State,
+		charges?: Amount.Charge[]
 	): Amount {
 		const stateAmount = state && Amount.fromState(state)
 		const changes = Operation.sum(operations)
@@ -103,6 +104,7 @@ export namespace Transaction {
 		return {
 			original: typeof transaction.amount == "number" ? transaction.amount : transaction.amount.original,
 			charge: stateAmount?.charge ?? 0,
+			charges,
 			total: changes.available ?? reserved ?? 0,
 			exchange: state?.transaction.exchange ?? state?.authorization?.exchange,
 		}
@@ -152,6 +154,7 @@ export namespace Transaction {
 		account: { id: string; name: string; organization: string; address: Rail.Address },
 		balance: { actual: number; reserved: number; available: number },
 		operation: Operation | Status.Reason,
+		charges: Amount.Charge[],
 		by: string | undefined
 	): Transaction {
 		const status: Status =
@@ -171,7 +174,7 @@ export namespace Transaction {
 			: "fasterpayments"
 		return {
 			...creatable,
-			amount: Amount.fromState(state),
+			amount: Amount.fromState(state, charges),
 			type: getType(creatable.counterpart, account.name),
 			direction: "outbound",
 			organization: account.organization,

package/dist/cjs/Account/Charge.d.ts

@@ -1,5 +1,6 @@
 import { isoly } from "isoly";
 import { Card } from "../Card";
+import type { Rail } from "../Rail";
 import { Transaction } from "../Transaction";
 export interface Charge extends Charge.Creatable {
     id: string;
@@ -21,6 +22,6 @@ export declare namespace Charge {
     }
     const type: import("isly/dist/cjs/object").IslyObject<Charge, Creatable>;
     function fromCreatable(creatable: Creatable): Charge;
-    function evaluate(charges: Charge[] | undefined, transaction: Transaction.Creatable.Resolved | Transaction): Transaction.Amount.Charge[];
+    function evaluate(charges: Charge[] | undefined, counterpart: Rail.Address.Card.Counterpart, currency: isoly.Currency, amount: number): Transaction.Amount.Charge[];
     function sum(charges: Transaction.Amount.Charge[], currency: isoly.Currency): number;
 }

package/dist/cjs/Account/Charge.js

@@ -26,17 +26,15 @@ var Charge;
         return { ...creatable, id: cryptly_1.cryptly.Identifier.generate(16) };
     }
     Charge.fromCreatable = fromCreatable;
-    function evaluate(charges = [], transaction) {
+    function evaluate(charges = [], counterpart, currency, amount) {
         const result = [];
-        const counterpart = "merchant" in transaction.counterpart ? transaction.counterpart : undefined;
-        if (counterpart)
-            for (const charge of charges)
-                if (charge.applies.to.merchants.some(merchant => Card_1.Card.Restriction.Merchant.check(merchant, counterpart)))
-                    result.push({
-                        destination: charge.destination,
-                        type: "merchant",
-                        amount: isoly_1.isoly.Currency.multiply(transaction.currency, typeof transaction.amount == "number" ? transaction.amount : -transaction.amount.original, charge.rate),
-                    });
+        for (const charge of charges)
+            if (charge.applies.to.merchants.some(merchant => Card_1.Card.Restriction.Merchant.check(merchant, counterpart)))
+                result.push({
+                    destination: charge.destination,
+                    type: "merchant",
+                    amount: isoly_1.isoly.Currency.multiply(currency, amount, charge.rate),
+                });
         return result;
     }
     Charge.evaluate = evaluate;

package/dist/cjs/Account/Charge.js.map

@@ -1 +1 @@
-{"version":3,"file":"Charge.js","sourceRoot":"","sources":["../../../Account/Charge.ts"],"names":[],"mappings":";;;AAAA,qCAAiC;AACjC,iCAA6B;AAC7B,+BAA2B;AAC3B,kCAA8B;AAM9B,IAAiB,MAAM,CAkDtB;AAlDD,WAAiB,MAAM;IAUtB,IAAiB,SAAS,CAUzB;IAVD,WAAiB,SAAS;QACZ,cAAI,GAAG,WAAI,CAAC,MAAM,CAAY;YAC1C,WAAW,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,WAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACpD,IAAI,EAAE,WAAI,CAAC,MAAM,EAAE;YACnB,OAAO,EAAE,WAAI,CAAC,MAAM,CAAC;gBACpB,EAAE,EAAE,WAAI,CAAC,MAAM,CAA6B;oBAC3C,SAAS,EAAE,WAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;iBACjD,CAAC;aACF,CAAC;SACF,CAAC,CAAA;IACH,CAAC,EAVgB,SAAS,GAAT,gBAAS,KAAT,gBAAS,QAUzB;IACY,WAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAS;QACjD,EAAE,EAAE,WAAI,CAAC,MAAM,EAAE;KACjB,CAAC,CAAA;IACF,SAAgB,aAAa,CAAC,SAAoB;QACjD,OAAO,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,iBAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAA;IAC7D,CAAC;IAFe,oBAAa,gBAE5B,CAAA;IACD,SAAgB,QAAQ,CACvB,UAAoB,EAAE,EACtB,WAAyD;QAEzD,MAAM,MAAM,GAAgC,EAAE,CAAA;QAC9C,MAAM,WAAW,GAAG,UAAU,IAAI,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;QAC/F,IAAI,WAAW;YACd,KAAK,MAAM,MAAM,IAAI,OAAO;gBAC3B,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;oBACvG,MAAM,CAAC,IAAI,CAAC;wBACX,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,IAAI,EAAE,UAAU;wBAChB,MAAM,EAAE,aAAK,CAAC,QAAQ,CAAC,QAAQ,CAC9B,WAAW,CAAC,QAAQ,EACpB,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,EACzF,MAAM,CAAC,IAAI,CACX;qBACD,CAAC,CAAA;QACL,OAAO,MAAM,CAAA;IACd,CAAC;IAnBe,eAAQ,WAmBvB,CAAA;IACD,SAAgB,GAAG,CAAC,OAAoC,EAAE,QAAwB;QACjF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,aAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5F,CAAC;IAFe,UAAG,MAElB,CAAA;AACF,CAAC,EAlDgB,MAAM,sBAAN,MAAM,QAkDtB"}
+{"version":3,"file":"Charge.js","sourceRoot":"","sources":["../../../Account/Charge.ts"],"names":[],"mappings":";;;AAAA,qCAAiC;AACjC,iCAA6B;AAC7B,+BAA2B;AAC3B,kCAA8B;AAO9B,IAAiB,MAAM,CA8CtB;AA9CD,WAAiB,MAAM;IAUtB,IAAiB,SAAS,CAUzB;IAVD,WAAiB,SAAS;QACZ,cAAI,GAAG,WAAI,CAAC,MAAM,CAAY;YAC1C,WAAW,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,WAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACpD,IAAI,EAAE,WAAI,CAAC,MAAM,EAAE;YACnB,OAAO,EAAE,WAAI,CAAC,MAAM,CAAC;gBACpB,EAAE,EAAE,WAAI,CAAC,MAAM,CAA6B;oBAC3C,SAAS,EAAE,WAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;iBACjD,CAAC;aACF,CAAC;SACF,CAAC,CAAA;IACH,CAAC,EAVgB,SAAS,GAAT,gBAAS,KAAT,gBAAS,QAUzB;IACY,WAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAS;QACjD,EAAE,EAAE,WAAI,CAAC,MAAM,EAAE;KACjB,CAAC,CAAA;IACF,SAAgB,aAAa,CAAC,SAAoB;QACjD,OAAO,EAAE,GAAG,SAAS,EAAE,EAAE,EAAE,iBAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAA;IAC7D,CAAC;IAFe,oBAAa,gBAE5B,CAAA;IACD,SAAgB,QAAQ,CACvB,UAAoB,EAAE,EACtB,WAA0C,EAC1C,QAAwB,EACxB,MAAc;QAEd,MAAM,MAAM,GAAgC,EAAE,CAAA;QAC9C,KAAK,MAAM,MAAM,IAAI,OAAO;YAC3B,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,WAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBACvG,MAAM,CAAC,IAAI,CAAC;oBACX,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE,aAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;iBAC9D,CAAC,CAAA;QACJ,OAAO,MAAM,CAAA;IACd,CAAC;IAfe,eAAQ,WAevB,CAAA;IACD,SAAgB,GAAG,CAAC,OAAoC,EAAE,QAAwB;QACjF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,aAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IAC5F,CAAC;IAFe,UAAG,MAElB,CAAA;AACF,CAAC,EA9CgB,MAAM,sBAAN,MAAM,QA8CtB"}

package/dist/cjs/Client/Transactions/index.d.ts

@@ -50,7 +50,7 @@ export declare namespace Transactions {
             end: string | undefined;
             currency: string | undefined;
             organization: string | undefined;
-            rail: "paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "fasterpayments" | "chaps" | "bacs" | "transfer" | "credit" | undefined;
+            rail: "paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit" | undefined;
             type: "internal" | "card" | "external" | "system" | undefined;
         }>;
         function parse(query: string | http.Request["search"]): Query;

package/dist/cjs/Rail/index.d.ts

@@ -4,7 +4,7 @@ import { Address as RailAddress } from "./Address";
 export type Rail = typeof Rail.rails[number];
 export declare namespace Rail {
     const rails: readonly ["internal", "paxgiro", "paxgiro-credit", "mastercard", "diners", "visa", "fasterpayments", "chaps", "bacs", "transfer", "credit"];
-    const type: isly.Type<"paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "fasterpayments" | "chaps" | "bacs" | "transfer" | "credit">;
-    const type2: isly2.String<"paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "fasterpayments" | "chaps" | "bacs" | "transfer" | "credit">;
+    const type: isly.Type<"paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit">;
+    const type2: isly2.String<"paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit">;
     export import Address = RailAddress;
 }

package/dist/cjs/Rule/State/Transaction.d.ts

@@ -11,7 +11,6 @@ export type Transaction = ModelTransaction.Creatable.Resolved & {
     risk?: number;
     original: {
         currency: isoly.Currency;
-        charges?: ModelTransaction.Amount.Charge[];
         total: number;
         amount: number;
         charge?: {

package/dist/cjs/Rule/State/Transaction.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Transaction = void 0;
-const isoly_1 = require("isoly");
-const Account_1 = require("../../Account");
 const Transaction_1 = require("../../Transaction");
 var Transaction;
 (function (Transaction) {
     function from(account, transaction, kind, stage) {
-        const charges = Account_1.Account.Charge.evaluate(account.charges, transaction);
         const amount = Math.abs(typeof transaction.amount == "number" ? transaction.amount : transaction.amount.original);
         return {
             ...transaction,
@@ -18,9 +15,8 @@ var Transaction;
             type: Transaction_1.Transaction.getType(transaction.counterpart, account.name),
             original: {
                 currency: transaction.currency,
-                charges,
                 amount,
-                total: isoly_1.isoly.Currency.add(transaction.currency, amount, Account_1.Account.Charge.sum(charges, transaction.currency)),
+                total: amount,
             },
         };
     }

package/dist/cjs/Rule/State/Transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../../../Rule/State/Transaction.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAC7B,2CAAuD;AACvD,mDAAmE;AAkBnE,IAAiB,WAAW,CA4C3B;AA5CD,WAAiB,WAAW;IAC3B,SAAgB,IAAI,CACnB,OAAqB,EACrB,WAAmE,EACnE,IAAoB,EACpB,KAA8B;QAE9B,MAAM,OAAO,GAAG,iBAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACjH,OAAO;YACN,GAAG,WAAW;YACd,EAAE,EAAE,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE;YACjF,KAAK;YACL,IAAI;YACJ,MAAM;YACN,IAAI,EAAE,yBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC;YACrE,QAAQ,EAAE;gBACT,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,OAAO;gBACP,MAAM;gBACN,KAAK,EAAE,aAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAY,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;aAC/G;SACD,CAAA;IACF,CAAC;IAtBe,gBAAI,OAsBnB,CAAA;IACD,SAAgB,kBAAkB,CACjC,WAAmB,EACnB,WAA+D,EAC/D,IAAoB,EACpB,KAA8B;QAE9B,OAAO;YACN,GAAG,WAAW;YACd,EAAE,EAAE,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE;YACjF,KAAK;YACL,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACvG,IAAI,EAAE,yBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC;YACpE,QAAQ,EAAE;gBACT,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC1G,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;aACtG;SACD,CAAA;IACF,CAAC;IAnBe,8BAAkB,qBAmBjC,CAAA;AACF,CAAC,EA5CgB,WAAW,2BAAX,WAAW,QA4C3B"}
+{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../../../../Rule/State/Transaction.ts"],"names":[],"mappings":";;;AAEA,mDAAmE;AAiBnE,IAAiB,WAAW,CA0C3B;AA1CD,WAAiB,WAAW;IAC3B,SAAgB,IAAI,CACnB,OAAqB,EACrB,WAAmE,EACnE,IAAoB,EACpB,KAA8B;QAE9B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACjH,OAAO;YACN,GAAG,WAAW;YACd,EAAE,EAAE,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE;YACjF,KAAK;YACL,IAAI;YACJ,MAAM;YACN,IAAI,EAAE,yBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC;YACrE,QAAQ,EAAE;gBACT,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,MAAM;gBACN,KAAK,EAAE,MAAM;aACb;SACD,CAAA;IACF,CAAC;IApBe,gBAAI,OAoBnB,CAAA;IACD,SAAgB,kBAAkB,CACjC,WAAmB,EACnB,WAA+D,EAC/D,IAAoB,EACpB,KAA8B;QAE9B,OAAO;YACN,GAAG,WAAW;YACd,EAAE,EAAE,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,yBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE;YACjF,KAAK;YACL,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;YACvG,IAAI,EAAE,yBAAgB,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC;YACpE,QAAQ,EAAE;gBACT,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC1G,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,WAAW,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC;aACtG;SACD,CAAA;IACF,CAAC;IAnBe,8BAAkB,qBAmBjC,CAAA;AACF,CAAC,EA1CgB,WAAW,2BAAX,WAAW,QA0C3B"}

package/dist/cjs/Settlement/Entry/Creatable.d.ts

@@ -6,7 +6,6 @@ import { Exchange } from "../../Transaction/Exchange";
 import { Batch } from "../Batch";
 import { Fee } from "../Fee";
 import { Identifier as SettlementIdentifier } from "../Identifier";
-import { Entry as LegacyEntry } from "./Legacy";
 export type Creatable = Creatable.Known | Creatable.Unknown;
 export declare namespace Creatable {
     interface Base {
@@ -31,19 +30,16 @@ export declare namespace Creatable {
     }
     namespace Capture {
         const type: import("isly/dist/cjs/object").IslyObject<Capture, Base>;
-        function fromLegacy(maybeLegacy: Capture | LegacyEntry.Capture.Creatable): Capture;
     }
     interface Refund extends Base {
         type: "refund";
     }
     namespace Refund {
         const type: import("isly/dist/cjs/object").IslyObject<Refund, Base>;
-        function fromLegacy(maybeLegacy: Refund | LegacyEntry.Refund.Creatable): Refund;
     }
     type Known = Capture | Refund;
     namespace Known {
         const type: isly.Type<Capture | Refund>;
-        function fromLegacy(maybeLegacy: Creatable.Known | LegacyEntry.Capture.Creatable | LegacyEntry.Refund.Creatable): Creatable.Known;
     }
     interface Unknown extends Partial<Base> {
         type: "unknown";

package/dist/cjs/Settlement/Entry/Creatable.js

@@ -30,60 +30,15 @@ var Creatable;
     })(Base = Creatable.Base || (Creatable.Base = {}));
     let Capture;
     (function (Capture) {
-        Capture.type = Base.type.extend({
-            type: isly_1.isly.string("capture"),
-        });
-        function fromLegacy(maybeLegacy) {
-            return Capture.type.is(maybeLegacy)
-                ? maybeLegacy
-                : {
-                    type: maybeLegacy.type,
-                    card: maybeLegacy.authorization.card.id,
-                    transaction: maybeLegacy.authorization.transaction?.id,
-                    account: maybeLegacy.authorization.account || "unknown",
-                    approvalCode: maybeLegacy.authorization.approvalCode ?? "unknown",
-                    merchant: maybeLegacy.authorization.merchant,
-                    acquirer: maybeLegacy.authorization.acquirer,
-                    reference: maybeLegacy.reference,
-                    batch: maybeLegacy.batch,
-                    fee: maybeLegacy.fee,
-                    amount: maybeLegacy.amount,
-                    settlement: maybeLegacy.settlement ?? "unknown",
-                };
-        }
-        Capture.fromLegacy = fromLegacy;
+        Capture.type = Base.type.extend({ type: isly_1.isly.string("capture") });
     })(Capture = Creatable.Capture || (Creatable.Capture = {}));
     let Refund;
     (function (Refund) {
-        Refund.type = Base.type.extend({
-            type: isly_1.isly.string("refund"),
-        });
-        function fromLegacy(maybeLegacy) {
-            return Refund.type.is(maybeLegacy)
-                ? maybeLegacy
-                : {
-                    type: maybeLegacy.type,
-                    card: maybeLegacy.card,
-                    account: maybeLegacy.account ?? "unknown",
-                    approvalCode: maybeLegacy.authorization.approvalCode ?? "unknown",
-                    merchant: maybeLegacy.merchant,
-                    acquirer: maybeLegacy.acquirer,
-                    reference: maybeLegacy.reference,
-                    batch: maybeLegacy.batch,
-                    fee: maybeLegacy.fee,
-                    amount: maybeLegacy.amount,
-                    settlement: maybeLegacy.settlement ?? "unknown",
-                };
-        }
-        Refund.fromLegacy = fromLegacy;
+        Refund.type = Base.type.extend({ type: isly_1.isly.string("refund") });
     })(Refund = Creatable.Refund || (Creatable.Refund = {}));
     let Known;
     (function (Known) {
         Known.type = isly_1.isly.union(Capture.type, Refund.type);
-        function fromLegacy(maybeLegacy) {
-            return maybeLegacy.type == "capture" ? Capture.fromLegacy(maybeLegacy) : Refund.fromLegacy(maybeLegacy);
-        }
-        Known.fromLegacy = fromLegacy;
     })(Known = Creatable.Known || (Creatable.Known = {}));
     let Unknown;
     (function (Unknown) {

package/dist/cjs/Settlement/Entry/Creatable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Creatable.js","sourceRoot":"","sources":["../../../../Settlement/Entry/Creatable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Creatable.js","sourceRoot":"","sources":["../../../../Settlement/Entry/Creatable.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAC3B,6CAAyC;AACzC,yCAAqC;AACrC,6CAAyC;AACzC,yDAAqD;AACrD,oCAAgC;AAChC,gCAA4B;AAC5B,8CAAkE;AAGlE,IAAiB,SAAS,CA8DzB;AA9DD,WAAiB,SAAS;IAezB,IAAiB,IAAI,CAepB;IAfD,WAAiB,IAAI;QACP,SAAI,GAAG,WAAI,CAAC,MAAM,CAAO;YACrC,IAAI,EAAE,WAAI,CAAC,MAAM,EAAE;YACnB,WAAW,EAAE,WAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACrC,OAAO,EAAE,WAAI,CAAC,MAAM,EAAE;YACtB,YAAY,EAAE,WAAI,CAAC,MAAM,EAAE;YAC3B,QAAQ,EAAE,mBAAQ,CAAC,IAAI;YACvB,QAAQ,EAAE,mBAAQ,CAAC,IAAI;YACvB,SAAS,EAAE,WAAI,CAAC,MAAM,EAAE;YACxB,KAAK,EAAE,aAAK,CAAC,IAAI;YACjB,GAAG,EAAE,SAAG,CAAC,IAAI;YACb,MAAM,EAAE,eAAM,CAAC,IAAI;YACnB,UAAU,EAAE,uBAAoB,CAAC,IAAI;YACrC,QAAQ,EAAE,mBAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE;SAClC,CAAC,CAAA;IACH,CAAC,EAfgB,IAAI,GAAJ,cAAI,KAAJ,cAAI,QAepB;IAID,IAAiB,OAAO,CAEvB;IAFD,WAAiB,OAAO;QACV,YAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAU,EAAE,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;IAChF,CAAC,EAFgB,OAAO,GAAP,iBAAO,KAAP,iBAAO,QAEvB;IAID,IAAiB,MAAM,CAEtB;IAFD,WAAiB,MAAM;QACT,WAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAS,EAAE,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAC9E,CAAC,EAFgB,MAAM,GAAN,gBAAM,KAAN,gBAAM,QAEtB;IAGD,IAAiB,KAAK,CAErB;IAFD,WAAiB,KAAK;QACR,UAAI,GAAG,WAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC,EAFgB,KAAK,GAAL,eAAK,KAAL,eAAK,QAErB;IAKD,IAAiB,OAAO,CAQvB;IARD,WAAiB,OAAO;QACV,YAAI,GAAG,WAAI,CAAC,MAAM,CAAU;YACxC,GAAI,MAAM,CAAC,WAAW,CACrB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAClC;YAC3C,IAAI,EAAE,WAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YAC5B,IAAI,EAAE,WAAI,CAAC,MAAM,CAA0B,WAAI,CAAC,MAAM,EAAE,EAAE,WAAI,CAAC,GAAG,EAAE,CAAC;SACrE,CAAC,CAAA;IACH,CAAC,EARgB,OAAO,GAAP,iBAAO,KAAP,iBAAO,QAQvB;IACY,cAAI,GAAG,WAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;AACzD,CAAC,EA9DgB,SAAS,yBAAT,SAAS,QA8DzB"}

package/dist/cjs/Settlement/Entry/index.d.ts

@@ -1,8 +1,9 @@
+import { Account } from "../../Account";
+import type { Rail } from "../../Rail";
+import type { Transaction } from "../../Transaction";
 import { Creatable as EntryCreatable } from "./Creatable";
 import { Failed as EntryFailed } from "./Failed";
 import { fromCreatable } from "./fromCreatable";
-import { fromLegacy as entryFromLegacy } from "./fromLegacy";
-import { Entry as LegacyEntry } from "./Legacy";
 import { Succeeded as EntrySucceeded } from "./Succeeded";
 import { Summary as EntrySummary } from "./Summary";
 export type Entry = EntrySucceeded | EntryFailed;
@@ -17,8 +18,7 @@ export declare namespace Entry {
     export import Failed = EntryFailed;
     export import Succeeded = EntrySucceeded;
     export import Summary = EntrySummary;
-    export import Legacy = LegacyEntry;
     const type: import("isly/dist/cjs/Type").Type<Entry>;
-    const fromLegacy: typeof entryFromLegacy;
     const from: typeof fromCreatable;
+    function charge(charges: Account.Charge[] | undefined, counterpart: Rail.Address.Card.Counterpart, capture: Creatable.Capture): Transaction.Amount.Charge[];
 }

package/dist/cjs/Settlement/Entry/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entry = void 0;
+const isoly_1 = require("isoly");
+const Account_1 = require("../../Account");
 const Creatable_1 = require("./Creatable");
 const Failed_1 = require("./Failed");
 const fromCreatable_1 = require("./fromCreatable");
-const fromLegacy_1 = require("./fromLegacy");
-const Legacy_1 = require("./Legacy");
 const Succeeded_1 = require("./Succeeded");
 const Summary_1 = require("./Summary");
 const type_1 = require("./type");
@@ -15,9 +15,11 @@ var Entry;
     Entry.Failed = Failed_1.Failed;
     Entry.Succeeded = Succeeded_1.Succeeded;
     Entry.Summary = Summary_1.Summary;
-    Entry.Legacy = Legacy_1.Entry;
     Entry.type = type_1.type;
-    Entry.fromLegacy = fromLegacy_1.fromLegacy;
     Entry.from = fromCreatable_1.fromCreatable;
+    function charge(charges = [], counterpart, capture) {
+        return Account_1.Account.Charge.evaluate(charges, counterpart, capture.amount[0], isoly_1.isoly.Currency.add(capture.amount[0], capture.amount[1], capture.fee.other[capture.amount[0]] ?? 0));
+    }
+    Entry.charge = charge;
 })(Entry || (exports.Entry = Entry = {}));
 //# sourceMappingURL=index.js.map

package/dist/cjs/Settlement/Entry/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../Settlement/Entry/index.ts"],"names":[],"mappings":";;;AAAA,2CAAyD;AACzD,qCAAgD;AAChD,mDAA+C;AAC/C,6CAA4D;AAC5D,qCAA+C;AAC/C,2CAAyD;AACzD,uCAAmD;AACnD,iCAA0C;AAG1C,IAAiB,KAAK,CAerB;AAfD,WAAiB,KAAK;IAOP,eAAS,GAAG,qBAAc,CAAA;IAC1B,YAAM,GAAG,eAAW,CAAA;IACpB,eAAS,GAAG,qBAAc,CAAA;IAC1B,aAAO,GAAG,iBAAY,CAAA;IACtB,YAAM,GAAG,cAAW,CAAA;IACrB,UAAI,GAAG,WAAS,CAAA;IAChB,gBAAU,GAAG,uBAAe,CAAA;IAC5B,UAAI,GAAG,6BAAa,CAAA;AAClC,CAAC,EAfgB,KAAK,qBAAL,KAAK,QAerB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../Settlement/Entry/index.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAC7B,2CAAuC;AAGvC,2CAAyD;AACzD,qCAAgD;AAChD,mDAA+C;AAC/C,2CAAyD;AACzD,uCAAmD;AACnD,iCAA0C;AAG1C,IAAiB,KAAK,CAyBrB;AAzBD,WAAiB,KAAK;IAOP,eAAS,GAAG,qBAAc,CAAA;IAC1B,YAAM,GAAG,eAAW,CAAA;IACpB,eAAS,GAAG,qBAAc,CAAA;IAC1B,aAAO,GAAG,iBAAY,CAAA;IACvB,UAAI,GAAG,WAAS,CAAA;IAChB,UAAI,GAAG,6BAAa,CAAA;IACjC,SAAgB,MAAM,CACrB,UAA4B,EAAE,EAC9B,WAA0C,EAC1C,OAA0B;QAE1B,OAAO,iBAAO,CAAC,MAAM,CAAC,QAAQ,CAC7B,OAAO,EACP,WAAW,EACX,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EACjB,aAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CACnG,CAAA;IACF,CAAC;IAXe,YAAM,SAWrB,CAAA;AACF,CAAC,EAzBgB,KAAK,qBAAL,KAAK,QAyBrB"}

package/dist/cjs/Settlement/index.d.ts

@@ -43,8 +43,6 @@ export declare namespace Settlement {
             transactions: string[];
         };
     };
-    export type MaybeOld = Settlement | OldSettlement;
-    export function fromLegacy(settlement: MaybeOld): Settlement;
     export const type: import("isly/dist/cjs/object").IslyObject<Settlement, Creatable>;
     export {};
 }

package/dist/cjs/Settlement/index.js

@@ -55,38 +55,6 @@ var Settlement;
         return result;
     }
     Settlement.compile = compile;
-    function fromLegacy(settlement) {
-        let result;
-        if (!Settlement.type.is(settlement)) {
-            const totalToAmount = (currency, oldTotal) => ({
-                net: oldTotal?.amount[currency] ?? 0,
-                fee: { other: oldTotal?.fee.other[currency] ?? 0 },
-            });
-            const { expected, collected, outcome, settled, ...partialSettlement } = settlement;
-            const currencies = Array.from(new Set([
-                ...Object.keys(expected?.amount ?? {}),
-                ...Object.keys(collected?.amount ?? {}),
-                ...Object.keys(settled?.paid ?? {}),
-                ...Object.keys(outcome.amount),
-            ]));
-            const totals = currencies.reduce((total, currency) => {
-                total[currency] = {
-                    expected: totalToAmount(currency, expected),
-                    ...(outcome ? { outcome: totalToAmount(currency, outcome) } : {}),
-                    ...(collected
-                        ? { collected: { ...totalToAmount(currency, collected), transactions: { net: "", fee: "", charge: "" } } }
-                        : {}),
-                    ...(settled ? { settled: { net: settled.paid[currency] ?? 0, transactions: settled.transactions } } : {}),
-                };
-                return total;
-            }, {});
-            result = { ...partialSettlement, totals };
-        }
-        else
-            result = settlement;
-        return result;
-    }
-    Settlement.fromLegacy = fromLegacy;
     Settlement.type = Creatable_1.Creatable.type.extend({
         id: isly_1.isly.union(Identifier_1.Identifier.type, isly_1.isly.string()),
         by: isly_1.isly.string().optional(),