@pax2pay/model-banking 0.1.261 → 0.1.262

package/Settlement/Amount.ts

@@ -0,0 +1,21 @@
+import { isoly } from "isoly"
+import { isly } from "isly"
+
+export type Amount = {
+	net: number
+	fee: {
+		other: number
+	}
+}
+export namespace Amount {
+	export const type = isly.object<Amount>({
+		net: isly.number(),
+		fee: isly.object<Amount["fee"]>({ other: isly.number() }),
+	})
+	export function add(currency: isoly.Currency, addendee: Amount, addend: Partial<Amount>): Amount {
+		const result = { ...addendee }
+		result.net = isoly.Currency.add(currency, result.net, addend.net ?? 0)
+		result.fee.other = isoly.Currency.add(currency, result.fee.other, addend.fee?.other ?? 0)
+		return result
+	}
+}

package/Settlement/Creatable.ts

@@ -1,10 +1,10 @@
 import { isly } from "isly"
 import { Card } from "../Card"
 import { Batch } from "./Batch"
-import { Total } from "./Total"
+import { Totals } from "./Totals"
 
 export interface Creatable {
-	expected?: Total
+	totals: Totals
 	processor: Card.Stack
 	references?: string[] //File name
 	batch: Batch
@@ -12,7 +12,7 @@ export interface Creatable {
 
 export namespace Creatable {
 	export const type = isly.object<Creatable>({
-		expected: Total.type.optional(),
+		totals: Totals.type,
 		processor: Card.Stack.type,
 		references: isly.string().array().optional(),
 		batch: Batch.type,

package/Settlement/Entry/Capture.ts

@@ -19,7 +19,7 @@ export namespace Capture {
 	export interface Creatable {
 		type: "capture"
 		authorization: Authorization
-		reference: string
+		reference: string // card transaction
 		batch: Batch
 		fee: Fee
 		amount: Amount

package/Settlement/Entry/index.ts

@@ -1,8 +1,6 @@
 import { gracely } from "gracely"
 import { isly } from "isly"
-import { Amount } from "../../Amount"
 import { Transaction } from "../../Transaction"
-import { Total } from "../Total"
 import { Cancel as EntryCancel } from "./Cancel"
 import { Capture as EntryCapture } from "./Capture"
 import { Creatable as EntryCreatable } from "./Creatable"
@@ -38,11 +36,6 @@ export namespace Entry {
 	export const Summary = EntrySummary
 	export type Creatable = EntryCreatable
 	export const Creatable = EntryCreatable
-	export function compile(entry: Entry): Total {
-		return entry.type == "unknown"
-			? Total.initiate()
-			: Total.initiate({ amount: Amount.toAmounts(entry.amount), fee: entry.fee })
-	}
 	export function from(creatable: Entry.Creatable, transaction: Transaction | gracely.Error | string): Entry {
 		let result: Entry
 		if (!Transaction.is(transaction) || transaction.status != "finalized")

package/Settlement/Total.ts

@@ -1,34 +1,82 @@
+import { isoly } from "isoly"
 import { isly } from "isly"
-import { Amounts } from "../Amounts"
-import { Transaction } from "../Transaction"
-import { Fee } from "./Fee"
+import { Amount } from "./Amount"
 
-export type Total = {
-	amount: Amounts
-	fee: Fee
+export interface Total {
+	expected: Amount
+	outcome?: Amount
+	collected?: Amount & { transactions: { net: string; fee: string } }
+	settled?: Total.Settled
 }
 export namespace Total {
-	export function initiate(partial?: Partial<Total>): Total {
-		return { amount: partial?.amount ?? {}, fee: partial?.fee ?? { other: {} } }
+	export type Settled = {
+		net: number
+		transactions: string[]
 	}
-	export function add(addendee: Total, addend: Total): Total {
-		return { amount: Amounts.add(addendee.amount, addend.amount), fee: Fee.add(addendee.fee, addend.fee) }
+	export const Settled = isly.object<Settled>({ net: isly.number(), transactions: isly.string().array() })
+	export const type = isly.object<Total>({
+		expected: Amount.type,
+		outcome: Amount.type.optional(),
+		collected: Amount.type
+			.extend<Required<Total>["collected"]>({
+				transactions: isly.object<Required<Total>["collected"]["transactions"]>({
+					net: isly.string(),
+					fee: isly.string(),
+				}),
+			})
+			.optional(),
+		settled: Settled.optional(),
+	})
+	export function create(): Total {
+		return { expected: { net: 0, fee: { other: 0 } } }
 	}
-	export function compare(expected: Total, outcome: Total): boolean {
-		return Amounts.compare(expected.amount, outcome.amount) && Amounts.compare(expected.fee.other, outcome.fee.other)
-	}
-	export function from(collect: Transaction.Collect, collected: Total = initiate()): Total {
-		let result: Total = collected
-		for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
-			for (const [entry, amount] of Object.entries(counterbalance))
-				if (entry.startsWith("fee"))
-					result = add(result, initiate({ fee: { other: { [currency]: amount } } }))
-				else if (entry.startsWith("settle"))
-					result = add(result, initiate({ amount: { [currency]: amount } }))
+	export function verify(total: Total, type: "outcome" | "collected" | "settled"): boolean {
+		let result: boolean
+		switch (type) {
+			case "outcome":
+				result = total.outcome?.net == total.expected.net && total.outcome.fee.other == total.expected.fee.other
+				break
+			case "collected":
+				result = total.collected?.net == total.outcome?.net && total.collected?.fee.other == total.outcome?.fee.other
+				break
+			case "settled":
+				result = total.settled?.net == total.collected?.net
+				break
 		}
 		return result
 	}
-	export const type = isly.object<Total>({ amount: Amounts.type, fee: Fee.type })
-	export const is = type.is
-	export const flaw = type.flaw
+	export function add(currency: isoly.Currency, addendee: Total, addend: Partial<Total>): Total {
+		const result: Total = { ...addendee }
+		addend.expected && (result.expected = Amount.add(currency, result.expected, addend.expected))
+		if (result.outcome || addend.outcome)
+			result.outcome = Amount.add(currency, result.outcome ?? { net: 0, fee: { other: 0 } }, addend.outcome ?? {})
+		if (result.collected || addend.collected)
+			result.collected = {
+				...Amount.add(currency, result.collected ?? { net: 0, fee: { other: 0 } }, addend.collected ?? {}),
+				transactions: {
+					net: addend.collected?.transactions.net ?? result.collected?.transactions.net ?? "",
+					fee: addend.collected?.transactions.fee ?? result.collected?.transactions.fee ?? "",
+				},
+			}
+		if (result.settled || addend.settled)
+			result.settled = {
+				net: isoly.Currency.add(currency, result.settled?.net ?? 0, addend.settled?.net ?? 0),
+				transactions: (result.settled?.transactions ?? []).concat(addend.settled?.transactions ?? []),
+			}
+		return result
+	}
+	export function collect(
+		currency: isoly.Currency,
+		total: Total,
+		collected: Amount,
+		transactions: { net: string; fee: string }
+	): Total {
+		const result = { ...total }
+		if (result.collected) {
+			result.collected.net = isoly.Currency.add(currency, result.collected.net, collected.net)
+			result.collected.fee.other = isoly.Currency.add(currency, result.collected.fee.other, collected.fee.other)
+		} else
+			result.collected = { ...collected, transactions }
+		return result
+	}
 }

package/Settlement/Totals.ts

@@ -0,0 +1,54 @@
+import { isoly } from "isoly"
+import { isly } from "isly"
+import type { Collect } from "../Transaction/Collect"
+import { Amount } from "./Amount"
+import { Entry } from "./Entry"
+import { Total } from "./Total"
+
+export type Totals = Partial<Record<isoly.Currency, Total>>
+export namespace Totals {
+	export const type = isly.record<isoly.Currency, Total>(isly.string(isoly.Currency.types), Total.type)
+	export function addEntry(totals: Totals, entry: Entry): Totals {
+		const result = { ...totals }
+		if (entry.status == "succeeded" && (entry.type == "capture" || entry.type == "refund")) {
+			result[entry.amount[0]] = Total.add(entry.amount[0], result[entry.amount[0]] ?? Total.create(), {
+				outcome: {
+					net: entry.amount[1],
+					// TODO: other currencies in fees
+					fee: { other: entry.fee.other[entry.amount[0]] ?? 0 },
+				},
+			})
+		}
+		return result
+	}
+	export function verify(totals: Totals, type: "outcome" | "collected" | "settled"): boolean {
+		return Object.values(totals).every(t => Total.verify(t, type))
+	}
+	export function add(addendee: Totals, addends: Partial<Record<isoly.Currency, Partial<Total>>>): Totals {
+		const result = { ...addendee }
+		for (const [currency, addend] of Object.entries(addends) as [isoly.Currency, Partial<Total>][]) {
+			result[currency] = Total.add(currency, result[currency] ?? Total.create(), addend)
+		}
+		return result
+	}
+	// TODO: update this for new collection method
+	export function collect(totals: Totals, collect: Collect): Totals {
+		const result: Totals = { ...totals }
+		for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
+			const collected: Amount = { net: 0, fee: { other: 0 } }
+			for (const [entry, amount] of Object.entries(counterbalance)) {
+				if (entry.startsWith("fee"))
+					collected.fee.other = isoly.Currency.add(currency as isoly.Currency, collected.fee.other, amount ?? 0)
+				else if (entry.startsWith("settle"))
+					collected.net = isoly.Currency.add(currency as isoly.Currency, collected.net, amount ?? 0)
+			}
+			result[currency as isoly.Currency] = Total.collect(
+				currency as isoly.Currency,
+				result[currency as isoly.Currency] ?? Total.create(),
+				collected,
+				{ net: "", fee: "" }
+			)
+		}
+		return result
+	}
+}

package/Settlement/index.ts

@@ -1,30 +1,30 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Card } from "../Card"
+import { Amounts } from "../Amounts"
 import { Identifier } from "../Identifier"
+import { Amount as SettlementAmount } from "./Amount"
 import { Batch as SettlementBatch } from "./Batch"
 import { Creatable as SettlementCreatable } from "./Creatable"
 import { Entry as SettlementEntry } from "./Entry"
 import { Fee as SettlementFee } from "./Fee"
-import { Settled as SettlementSettled } from "./Settled"
 import { Status } from "./Status"
 import { Total as SettlementTotal } from "./Total"
+import { Totals as SettlementTotals } from "./Totals"
 
 export interface Settlement extends Settlement.Creatable {
 	id: string
 	by?: string
 	created: isoly.DateTime
 	status: Status
-	collected?: Settlement.Total
-	outcome: Settlement.Total
-	settled?: Settlement.Settled
 	entries: Settlement.Entry.Summary
 }
 export namespace Settlement {
-	export type Settled = SettlementSettled
-	export const Settled = SettlementSettled
 	export const Total = SettlementTotal
 	export type Total = SettlementTotal
+	export const Totals = SettlementTotals
+	export type Totals = SettlementTotals
+	export const Amount = SettlementAmount
+	export type Amount = SettlementAmount
 	export const Fee = SettlementFee
 	export type Fee = SettlementFee
 	export type Creatable = SettlementCreatable
@@ -53,25 +53,11 @@ export namespace Settlement {
 			export type Creatable = SettlementEntry.Unknown.Creatable
 		}
 	}
-	export function initiate(id: string, by: string, batch: Batch, processor: Card.Stack): Settlement {
+	export function from(creatable: Settlement.Creatable, by: string): Settlement {
 		return {
-			id: id ?? Identifier.generate(),
-			by,
-			created: isoly.DateTime.now(),
-			batch,
-			processor,
-			status: { collected: "pending", settled: "pending" },
-			expected: Total.initiate(),
-			outcome: Total.initiate(),
-			entries: { count: 0 },
-		}
-	}
-	export function from(id: string, creatable: Settlement.Creatable, by: string): Settlement {
-		return {
-			id,
+			id: Identifier.generate(),
 			status: { collected: "pending", settled: "pending" },
 			by,
-			outcome: Total.initiate(),
 			...creatable,
 			created: isoly.DateTime.now(),
 			entries: { count: 0 },
@@ -82,7 +68,7 @@ export namespace Settlement {
 		for (const entry of entries) {
 			switch (entry.status) {
 				case "succeeded":
-					result.outcome = Total.add(result.outcome, Entry.compile(entry))
+					result.totals = Totals.addEntry(result.totals, entry)
 					result.entries.count++
 					break
 				case "failed":
@@ -92,28 +78,52 @@ export namespace Settlement {
 		}
 		return result
 	}
-	export function toFailed(id: string, creatable: Settlement.Creatable, by: string, reason: string): Settlement {
-		return {
-			id,
-			created: isoly.DateTime.now(),
-			status: { collected: "failed", settled: "failed" }, // ["failed", reason],
-			by,
-			processor: creatable.processor,
-			references: creatable.references,
-			batch: creatable.batch,
-			expected: Total.initiate(),
-			outcome: Total.initiate(),
-			entries: { count: 0 },
+	type OldTotal = { amount: Amounts; fee: Fee }
+	export type OldSettlement = Omit<Settlement, "totals"> & {
+		expected?: OldTotal
+		collected?: OldTotal
+		outcome: OldTotal
+		settled?: { paid: Amounts; transactions: string[] }
+	}
+	export type MaybeOld = Settlement | OldSettlement
+	export function fromLegacy(settlement: MaybeOld): Settlement {
+		let result: Settlement
+		if (!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: "" } } } //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.string(),
 		by: isly.string().optional(),
 		created: isly.fromIs("isoly.DateTime", isoly.DateTime.is),
 		status: Status.type,
-		collected: Settlement.Total.type.optional(),
-		outcome: Settlement.Total.type,
-		settled: Settled.type.optional(),
 		entries: Settlement.Entry.Summary.type,
 	})
 	export const is = type.is

package/dist/Settlement/Amount.d.ts

@@ -0,0 +1,12 @@
+import { isoly } from "isoly";
+import { isly } from "isly";
+export type Amount = {
+    net: number;
+    fee: {
+        other: number;
+    };
+};
+export declare namespace Amount {
+    const type: isly.object.ExtendableType<Amount>;
+    function add(currency: isoly.Currency, addendee: Amount, addend: Partial<Amount>): Amount;
+}

package/dist/Settlement/Amount.js

@@ -0,0 +1,17 @@
+import { isoly } from "isoly";
+import { isly } from "isly";
+export var Amount;
+(function (Amount) {
+    Amount.type = isly.object({
+        net: isly.number(),
+        fee: isly.object({ other: isly.number() }),
+    });
+    function add(currency, addendee, addend) {
+        const result = { ...addendee };
+        result.net = isoly.Currency.add(currency, result.net, addend.net ?? 0);
+        result.fee.other = isoly.Currency.add(currency, result.fee.other, addend.fee?.other ?? 0);
+        return result;
+    }
+    Amount.add = add;
+})(Amount || (Amount = {}));
+//# sourceMappingURL=Amount.js.map

package/dist/Settlement/Amount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Amount.js","sourceRoot":"../","sources":["Settlement/Amount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAQ3B,MAAM,KAAW,MAAM,CAWtB;AAXD,WAAiB,MAAM;IACT,WAAI,GAAG,IAAI,CAAC,MAAM,CAAS;QACvC,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;QAClB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAgB,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;KACzD,CAAC,CAAA;IACF,SAAgB,GAAG,CAAC,QAAwB,EAAE,QAAgB,EAAE,MAAuB;QACtF,MAAM,MAAM,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAA;QAC9B,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QACtE,MAAM,CAAC,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC,CAAA;QACzF,OAAO,MAAM,CAAA;IACd,CAAC;IALe,UAAG,MAKlB,CAAA;AACF,CAAC,EAXgB,MAAM,KAAN,MAAM,QAWtB"}

package/dist/Settlement/Creatable.d.ts

@@ -1,9 +1,9 @@
 import { isly } from "isly";
 import { Card } from "../Card";
 import { Batch } from "./Batch";
-import { Total } from "./Total";
+import { Totals } from "./Totals";
 export interface Creatable {
-    expected?: Total;
+    totals: Totals;
     processor: Card.Stack;
     references?: string[];
     batch: Batch;

package/dist/Settlement/Creatable.js

@@ -1,11 +1,11 @@
 import { isly } from "isly";
 import { Card } from "../Card";
 import { Batch } from "./Batch";
-import { Total } from "./Total";
+import { Totals } from "./Totals";
 export var Creatable;
 (function (Creatable) {
     Creatable.type = isly.object({
-        expected: Total.type.optional(),
+        totals: Totals.type,
         processor: Card.Stack.type,
         references: isly.string().array().optional(),
         batch: Batch.type,

package/dist/Settlement/Creatable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Creatable.js","sourceRoot":"../","sources":["Settlement/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAS/B,MAAM,KAAW,SAAS,CASzB;AATD,WAAiB,SAAS;IACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;QAC/B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;QAC1B,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QAC5C,KAAK,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EATgB,SAAS,KAAT,SAAS,QASzB"}
+{"version":3,"file":"Creatable.js","sourceRoot":"../","sources":["Settlement/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AASjC,MAAM,KAAW,SAAS,CASzB;AATD,WAAiB,SAAS;IACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,MAAM,EAAE,MAAM,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI;QAC1B,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;QAC5C,KAAK,EAAE,KAAK,CAAC,IAAI;KACjB,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EATgB,SAAS,KAAT,SAAS,QASzB"}

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

@@ -1,7 +1,6 @@
 import { gracely } from "gracely";
 import { isly } from "isly";
 import { Transaction } from "../../Transaction";
-import { Total } from "../Total";
 import { Cancel as EntryCancel } from "./Cancel";
 import { Capture as EntryCapture } from "./Capture";
 import { Creatable as EntryCreatable } from "./Creatable";
@@ -35,7 +34,6 @@ export declare namespace Entry {
     const Summary: typeof EntrySummary;
     type Creatable = EntryCreatable;
     const Creatable: typeof EntryCreatable;
-    function compile(entry: Entry): Total;
     function from(creatable: Entry.Creatable, transaction: Transaction | gracely.Error | string): Entry;
     const type: isly.Type<Entry>;
     const is: isly.Type.IsFunction<Entry>;

package/dist/Settlement/Entry/index.js

@@ -1,8 +1,6 @@
 import { gracely } from "gracely";
 import { isly } from "isly";
-import { Amount } from "../../Amount";
 import { Transaction } from "../../Transaction";
-import { Total } from "../Total";
 import { Cancel as EntryCancel } from "./Cancel";
 import { Capture as EntryCapture } from "./Capture";
 import { Creatable as EntryCreatable } from "./Creatable";
@@ -17,12 +15,6 @@ export var Entry;
     Entry.Unknown = EntryUnknown;
     Entry.Summary = EntrySummary;
     Entry.Creatable = EntryCreatable;
-    function compile(entry) {
-        return entry.type == "unknown"
-            ? Total.initiate()
-            : Total.initiate({ amount: Amount.toAmounts(entry.amount), fee: entry.fee });
-    }
-    Entry.compile = compile;
     function from(creatable, transaction) {
         let result;
         if (!Transaction.is(transaction) || transaction.status != "finalized")

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Settlement/Entry/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Settlement/Entry/index.ts"],"names":[],"mappings":"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"}

package/dist/Settlement/Total.d.ts

@@ -1,17 +1,29 @@
+import { isoly } from "isoly";
 import { isly } from "isly";
-import { Amounts } from "../Amounts";
-import { Transaction } from "../Transaction";
-import { Fee } from "./Fee";
-export type Total = {
-    amount: Amounts;
-    fee: Fee;
-};
+import { Amount } from "./Amount";
+export interface Total {
+    expected: Amount;
+    outcome?: Amount;
+    collected?: Amount & {
+        transactions: {
+            net: string;
+            fee: string;
+        };
+    };
+    settled?: Total.Settled;
+}
 export declare namespace Total {
-    function initiate(partial?: Partial<Total>): Total;
-    function add(addendee: Total, addend: Total): Total;
-    function compare(expected: Total, outcome: Total): boolean;
-    function from(collect: Transaction.Collect, collected?: Total): Total;
+    type Settled = {
+        net: number;
+        transactions: string[];
+    };
+    const Settled: isly.object.ExtendableType<Settled>;
     const type: isly.object.ExtendableType<Total>;
-    const is: isly.Type.IsFunction<Total>;
-    const flaw: isly.Type.FlawFunction;
+    function create(): Total;
+    function verify(total: Total, type: "outcome" | "collected" | "settled"): boolean;
+    function add(currency: isoly.Currency, addendee: Total, addend: Partial<Total>): Total;
+    function collect(currency: isoly.Currency, total: Total, collected: Amount, transactions: {
+        net: string;
+        fee: string;
+    }): Total;
 }

package/dist/Settlement/Total.js

@@ -1,34 +1,73 @@
+import { isoly } from "isoly";
 import { isly } from "isly";
-import { Amounts } from "../Amounts";
-import { Fee } from "./Fee";
+import { Amount } from "./Amount";
 export var Total;
 (function (Total) {
-    function initiate(partial) {
-        return { amount: partial?.amount ?? {}, fee: partial?.fee ?? { other: {} } };
+    Total.Settled = isly.object({ net: isly.number(), transactions: isly.string().array() });
+    Total.type = isly.object({
+        expected: Amount.type,
+        outcome: Amount.type.optional(),
+        collected: Amount.type
+            .extend({
+            transactions: isly.object({
+                net: isly.string(),
+                fee: isly.string(),
+            }),
+        })
+            .optional(),
+        settled: Total.Settled.optional(),
+    });
+    function create() {
+        return { expected: { net: 0, fee: { other: 0 } } };
     }
-    Total.initiate = initiate;
-    function add(addendee, addend) {
-        return { amount: Amounts.add(addendee.amount, addend.amount), fee: Fee.add(addendee.fee, addend.fee) };
+    Total.create = create;
+    function verify(total, type) {
+        let result;
+        switch (type) {
+            case "outcome":
+                result = total.outcome?.net == total.expected.net && total.outcome.fee.other == total.expected.fee.other;
+                break;
+            case "collected":
+                result = total.collected?.net == total.outcome?.net && total.collected?.fee.other == total.outcome?.fee.other;
+                break;
+            case "settled":
+                result = total.settled?.net == total.collected?.net;
+                break;
+        }
+        return result;
     }
-    Total.add = add;
-    function compare(expected, outcome) {
-        return Amounts.compare(expected.amount, outcome.amount) && Amounts.compare(expected.fee.other, outcome.fee.other);
+    Total.verify = verify;
+    function add(currency, addendee, addend) {
+        const result = { ...addendee };
+        addend.expected && (result.expected = Amount.add(currency, result.expected, addend.expected));
+        if (result.outcome || addend.outcome)
+            result.outcome = Amount.add(currency, result.outcome ?? { net: 0, fee: { other: 0 } }, addend.outcome ?? {});
+        if (result.collected || addend.collected)
+            result.collected = {
+                ...Amount.add(currency, result.collected ?? { net: 0, fee: { other: 0 } }, addend.collected ?? {}),
+                transactions: {
+                    net: addend.collected?.transactions.net ?? result.collected?.transactions.net ?? "",
+                    fee: addend.collected?.transactions.fee ?? result.collected?.transactions.fee ?? "",
+                },
+            };
+        if (result.settled || addend.settled)
+            result.settled = {
+                net: isoly.Currency.add(currency, result.settled?.net ?? 0, addend.settled?.net ?? 0),
+                transactions: (result.settled?.transactions ?? []).concat(addend.settled?.transactions ?? []),
+            };
+        return result;
     }
-    Total.compare = compare;
-    function from(collect, collected = initiate()) {
-        let result = collected;
-        for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
-            for (const [entry, amount] of Object.entries(counterbalance))
-                if (entry.startsWith("fee"))
-                    result = add(result, initiate({ fee: { other: { [currency]: amount } } }));
-                else if (entry.startsWith("settle"))
-                    result = add(result, initiate({ amount: { [currency]: amount } }));
+    Total.add = add;
+    function collect(currency, total, collected, transactions) {
+        const result = { ...total };
+        if (result.collected) {
+            result.collected.net = isoly.Currency.add(currency, result.collected.net, collected.net);
+            result.collected.fee.other = isoly.Currency.add(currency, result.collected.fee.other, collected.fee.other);
         }
+        else
+            result.collected = { ...collected, transactions };
         return result;
     }
-    Total.from = from;
-    Total.type = isly.object({ amount: Amounts.type, fee: Fee.type });
-    Total.is = Total.type.is;
-    Total.flaw = Total.type.flaw;
+    Total.collect = collect;
 })(Total || (Total = {}));
 //# sourceMappingURL=Total.js.map

package/dist/Settlement/Total.js.map

@@ -1 +1 @@
-{"version":3,"file":"Total.js","sourceRoot":"../","sources":["Settlement/Total.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAM3B,MAAM,KAAW,KAAK,CAwBrB;AAxBD,WAAiB,KAAK;IACrB,SAAgB,QAAQ,CAAC,OAAwB;QAChD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAA;IAC7E,CAAC;IAFe,cAAQ,WAEvB,CAAA;IACD,SAAgB,GAAG,CAAC,QAAe,EAAE,MAAa;QACjD,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAA;IACvG,CAAC;IAFe,SAAG,MAElB,CAAA;IACD,SAAgB,OAAO,CAAC,QAAe,EAAE,OAAc;QACtD,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAClH,CAAC;IAFe,aAAO,UAEtB,CAAA;IACD,SAAgB,IAAI,CAAC,OAA4B,EAAE,YAAmB,QAAQ,EAAE;QAC/E,IAAI,MAAM,GAAU,SAAS,CAAA;QAC7B,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;YAClF,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC3D,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC;oBAC1B,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,CAAA;qBACtE,IAAI,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;oBAClC,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;QACrE,CAAC;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IAVe,UAAI,OAUnB,CAAA;IACY,UAAI,GAAG,IAAI,CAAC,MAAM,CAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAClE,QAAE,GAAG,MAAA,IAAI,CAAC,EAAE,CAAA;IACZ,UAAI,GAAG,MAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EAxBgB,KAAK,KAAL,KAAK,QAwBrB"}
+{"version":3,"file":"Total.js","sourceRoot":"../","sources":["Settlement/Total.ts"],"names":[],"mappings":"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"}

package/dist/Settlement/Totals.d.ts

@@ -0,0 +1,13 @@
+import { isoly } from "isoly";
+import { isly } from "isly";
+import type { Collect } from "../Transaction/Collect";
+import { Entry } from "./Entry";
+import { Total } from "./Total";
+export type Totals = Partial<Record<isoly.Currency, Total>>;
+export declare namespace Totals {
+    const type: isly.Type<Record<"BTN" | "CHE" | "MKD" | "AED" | "AFN" | "ALL" | "AMD" | "ANG" | "AOA" | "ARS" | "AUD" | "AWG" | "AZN" | "BAM" | "BBD" | "BDT" | "BGN" | "BHD" | "BIF" | "BMD" | "BND" | "BOB" | "BOV" | "BRL" | "BSD" | "BWP" | "BYN" | "BZD" | "CAD" | "CDF" | "CHF" | "CHW" | "CLF" | "CLP" | "CNY" | "COP" | "COU" | "CRC" | "CUC" | "CUP" | "CVE" | "CZK" | "DJF" | "DKK" | "DOP" | "DZD" | "EGP" | "ERN" | "ETB" | "EUR" | "FJD" | "FKP" | "GBP" | "GEL" | "GHS" | "GIP" | "GMD" | "GNF" | "GTQ" | "GYD" | "HKD" | "HNL" | "HRK" | "HTG" | "HUF" | "IDR" | "ILS" | "INR" | "IQD" | "IRR" | "ISK" | "JMD" | "JOD" | "JPY" | "KES" | "KGS" | "KHR" | "KMF" | "KPW" | "KRW" | "KWD" | "KYD" | "KZT" | "LAK" | "LBP" | "LKR" | "LRD" | "LSL" | "LYD" | "MAD" | "MDL" | "MGA" | "MMK" | "MNT" | "MOP" | "MRU" | "MUR" | "MVR" | "MWK" | "MXN" | "MXV" | "MYR" | "MZN" | "NAD" | "NGN" | "NIO" | "NOK" | "NPR" | "NZD" | "OMR" | "PAB" | "PEN" | "PGK" | "PHP" | "PKR" | "PLN" | "PYG" | "QAR" | "RON" | "RSD" | "RUB" | "RWF" | "SAR" | "SBD" | "SCR" | "SDG" | "SEK" | "SGD" | "SHP" | "SLL" | "SOS" | "SRD" | "SSP" | "STN" | "SVC" | "SYP" | "SZL" | "THB" | "TJS" | "TMT" | "TND" | "TOP" | "TRY" | "TTD" | "TWD" | "TZS" | "UAH" | "UGX" | "USD" | "USN" | "UYI" | "UYU" | "UYW" | "UZS" | "VES" | "VND" | "VUV" | "WST" | "XAF" | "XAG" | "XAU" | "XBA" | "XBB" | "XBC" | "XBD" | "XCD" | "XDR" | "XOF" | "XPD" | "XPF" | "XPT" | "XSU" | "XTS" | "XUA" | "XXX" | "YER" | "ZAR" | "ZMW" | "ZWL", Total>>;
+    function addEntry(totals: Totals, entry: Entry): Totals;
+    function verify(totals: Totals, type: "outcome" | "collected" | "settled"): boolean;
+    function add(addendee: Totals, addends: Partial<Record<isoly.Currency, Partial<Total>>>): Totals;
+    function collect(totals: Totals, collect: Collect): Totals;
+}

package/dist/Settlement/Totals.js

@@ -0,0 +1,48 @@
+import { isoly } from "isoly";
+import { isly } from "isly";
+import { Total } from "./Total";
+export var Totals;
+(function (Totals) {
+    Totals.type = isly.record(isly.string(isoly.Currency.types), Total.type);
+    function addEntry(totals, entry) {
+        const result = { ...totals };
+        if (entry.status == "succeeded" && (entry.type == "capture" || entry.type == "refund")) {
+            result[entry.amount[0]] = Total.add(entry.amount[0], result[entry.amount[0]] ?? Total.create(), {
+                outcome: {
+                    net: entry.amount[1],
+                    fee: { other: entry.fee.other[entry.amount[0]] ?? 0 },
+                },
+            });
+        }
+        return result;
+    }
+    Totals.addEntry = addEntry;
+    function verify(totals, type) {
+        return Object.values(totals).every(t => Total.verify(t, type));
+    }
+    Totals.verify = verify;
+    function add(addendee, addends) {
+        const result = { ...addendee };
+        for (const [currency, addend] of Object.entries(addends)) {
+            result[currency] = Total.add(currency, result[currency] ?? Total.create(), addend);
+        }
+        return result;
+    }
+    Totals.add = add;
+    function collect(totals, collect) {
+        const result = { ...totals };
+        for (const [currency, counterbalance] of Object.entries(collect.counterbalances)) {
+            const collected = { net: 0, fee: { other: 0 } };
+            for (const [entry, amount] of Object.entries(counterbalance)) {
+                if (entry.startsWith("fee"))
+                    collected.fee.other = isoly.Currency.add(currency, collected.fee.other, amount ?? 0);
+                else if (entry.startsWith("settle"))
+                    collected.net = isoly.Currency.add(currency, collected.net, amount ?? 0);
+            }
+            result[currency] = Total.collect(currency, result[currency] ?? Total.create(), collected, { net: "", fee: "" });
+        }
+        return result;
+    }
+    Totals.collect = collect;
+})(Totals || (Totals = {}));
+//# sourceMappingURL=Totals.js.map

package/dist/Settlement/Totals.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Totals.js","sourceRoot":"../","sources":["Settlement/Totals.ts"],"names":[],"mappings":"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"}

package/dist/Settlement/index.d.ts

@@ -1,37 +1,37 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
-import { Card } from "../Card";
+import { Amounts } from "../Amounts";
+import { Amount as SettlementAmount } from "./Amount";
 import { Batch as SettlementBatch } from "./Batch";
 import { Creatable as SettlementCreatable } from "./Creatable";
 import { Entry as SettlementEntry } from "./Entry";
 import { Fee as SettlementFee } from "./Fee";
-import { Settled as SettlementSettled } from "./Settled";
 import { Status } from "./Status";
 import { Total as SettlementTotal } from "./Total";
+import { Totals as SettlementTotals } from "./Totals";
 export interface Settlement extends Settlement.Creatable {
     id: string;
     by?: string;
     created: isoly.DateTime;
     status: Status;
-    collected?: Settlement.Total;
-    outcome: Settlement.Total;
-    settled?: Settlement.Settled;
     entries: Settlement.Entry.Summary;
 }
 export declare namespace Settlement {
-    type Settled = SettlementSettled;
-    const Settled: typeof SettlementSettled;
-    const Total: typeof SettlementTotal;
-    type Total = SettlementTotal;
-    const Fee: typeof SettlementFee;
-    type Fee = SettlementFee;
-    type Creatable = SettlementCreatable;
-    const Creatable: typeof SettlementCreatable;
-    type Entry = SettlementEntry;
-    const Entry: typeof SettlementEntry;
-    type Batch = SettlementBatch;
-    const Batch: typeof SettlementBatch;
-    namespace Entry {
+    export const Total: typeof SettlementTotal;
+    export type Total = SettlementTotal;
+    export const Totals: typeof SettlementTotals;
+    export type Totals = SettlementTotals;
+    export const Amount: typeof SettlementAmount;
+    export type Amount = SettlementAmount;
+    export const Fee: typeof SettlementFee;
+    export type Fee = SettlementFee;
+    export type Creatable = SettlementCreatable;
+    export const Creatable: typeof SettlementCreatable;
+    export type Entry = SettlementEntry;
+    export const Entry: typeof SettlementEntry;
+    export type Batch = SettlementBatch;
+    export const Batch: typeof SettlementBatch;
+    export namespace Entry {
         type Summary = SettlementEntry.Summary;
         type Creatable = SettlementEntry.Creatable;
         type Refund = SettlementEntry.Refund;
@@ -51,11 +51,25 @@ export declare namespace Settlement {
             type Creatable = SettlementEntry.Unknown.Creatable;
         }
     }
-    function initiate(id: string, by: string, batch: Batch, processor: Card.Stack): Settlement;
-    function from(id: string, creatable: Settlement.Creatable, by: string): Settlement;
-    function compile(settlement: Settlement, entries: Settlement.Entry[]): Settlement;
-    function toFailed(id: string, creatable: Settlement.Creatable, by: string, reason: string): Settlement;
-    const type: isly.object.ExtendableType<Settlement>;
-    const is: isly.Type.IsFunction<Settlement>;
-    const flaw: isly.Type.FlawFunction;
+    export function from(creatable: Settlement.Creatable, by: string): Settlement;
+    export function compile(settlement: Settlement, entries: Settlement.Entry[]): Settlement;
+    type OldTotal = {
+        amount: Amounts;
+        fee: Fee;
+    };
+    export type OldSettlement = Omit<Settlement, "totals"> & {
+        expected?: OldTotal;
+        collected?: OldTotal;
+        outcome: OldTotal;
+        settled?: {
+            paid: Amounts;
+            transactions: string[];
+        };
+    };
+    export type MaybeOld = Settlement | OldSettlement;
+    export function fromLegacy(settlement: MaybeOld): Settlement;
+    export const type: isly.object.ExtendableType<Settlement>;
+    export const is: isly.Type.IsFunction<Settlement>;
+    export const flaw: isly.Type.FlawFunction;
+    export {};
 }

package/dist/Settlement/index.js

@@ -1,41 +1,28 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
 import { Identifier } from "../Identifier";
+import { Amount as SettlementAmount } from "./Amount";
 import { Batch as SettlementBatch } from "./Batch";
 import { Creatable as SettlementCreatable } from "./Creatable";
 import { Entry as SettlementEntry } from "./Entry";
 import { Fee as SettlementFee } from "./Fee";
-import { Settled as SettlementSettled } from "./Settled";
 import { Status } from "./Status";
 import { Total as SettlementTotal } from "./Total";
+import { Totals as SettlementTotals } from "./Totals";
 export var Settlement;
 (function (Settlement) {
-    Settlement.Settled = SettlementSettled;
     Settlement.Total = SettlementTotal;
+    Settlement.Totals = SettlementTotals;
+    Settlement.Amount = SettlementAmount;
     Settlement.Fee = SettlementFee;
     Settlement.Creatable = SettlementCreatable;
     Settlement.Entry = SettlementEntry;
     Settlement.Batch = SettlementBatch;
-    function initiate(id, by, batch, processor) {
+    function from(creatable, by) {
         return {
-            id: id ?? Identifier.generate(),
-            by,
-            created: isoly.DateTime.now(),
-            batch,
-            processor,
-            status: { collected: "pending", settled: "pending" },
-            expected: Settlement.Total.initiate(),
-            outcome: Settlement.Total.initiate(),
-            entries: { count: 0 },
-        };
-    }
-    Settlement.initiate = initiate;
-    function from(id, creatable, by) {
-        return {
-            id,
+            id: Identifier.generate(),
             status: { collected: "pending", settled: "pending" },
             by,
-            outcome: Settlement.Total.initiate(),
             ...creatable,
             created: isoly.DateTime.now(),
             entries: { count: 0 },
@@ -47,7 +34,7 @@ export var Settlement;
         for (const entry of entries) {
             switch (entry.status) {
                 case "succeeded":
-                    result.outcome = Settlement.Total.add(result.outcome, Settlement.Entry.compile(entry));
+                    result.totals = Settlement.Totals.addEntry(result.totals, entry);
                     result.entries.count++;
                     break;
                 case "failed":
@@ -58,29 +45,44 @@ export var Settlement;
         return result;
     }
     Settlement.compile = compile;
-    function toFailed(id, creatable, by, reason) {
-        return {
-            id,
-            created: isoly.DateTime.now(),
-            status: { collected: "failed", settled: "failed" },
-            by,
-            processor: creatable.processor,
-            references: creatable.references,
-            batch: creatable.batch,
-            expected: Settlement.Total.initiate(),
-            outcome: Settlement.Total.initiate(),
-            entries: { count: 0 },
-        };
+    function fromLegacy(settlement) {
+        let result;
+        if (!Settlement.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: "" } } }
+                        : {}),
+                    ...(settled ? { settled: { net: settled.paid[currency] ?? 0, transactions: settled.transactions } } : {}),
+                };
+                return total;
+            }, {});
+            result = { ...partialSettlement, totals };
+        }
+        else {
+            result = settlement;
+        }
+        return result;
     }
-    Settlement.toFailed = toFailed;
+    Settlement.fromLegacy = fromLegacy;
     Settlement.type = SettlementCreatable.type.extend({
         id: isly.string(),
         by: isly.string().optional(),
         created: isly.fromIs("isoly.DateTime", isoly.DateTime.is),
         status: Status.type,
-        collected: Settlement.Total.type.optional(),
-        outcome: Settlement.Total.type,
-        settled: Settlement.Settled.type.optional(),
         entries: Settlement.Entry.Summary.type,
     });
     Settlement.is = Settlement.type.is;

package/dist/Settlement/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Settlement/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Settlement/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@pax2pay/model-banking",
-	"version": "0.1.261",
+	"version": "0.1.262",
 	"description": "Library containing data model types and functions for the Pax2Pay Banking API.",
 	"author": "Pax2Pay Ltd",
 	"license": "MIT",

package/Settlement/Settled.ts

@@ -1,16 +0,0 @@
-import { isly } from "isly"
-import { Amounts } from "../Amounts"
-
-export interface Settled {
-	paid: Amounts
-	transactions: string[]
-}
-
-export namespace Settled {
-	export const type = isly.object<Settled>({
-		paid: Amounts.type,
-		transactions: isly.string().array(),
-	})
-	export const is = type.is
-	export const flaw = type.flaw
-}

package/dist/Settlement/Settled.d.ts

@@ -1,11 +0,0 @@
-import { isly } from "isly";
-import { Amounts } from "../Amounts";
-export interface Settled {
-    paid: Amounts;
-    transactions: string[];
-}
-export declare namespace Settled {
-    const type: isly.object.ExtendableType<Settled>;
-    const is: isly.Type.IsFunction<Settled>;
-    const flaw: isly.Type.FlawFunction;
-}

package/dist/Settlement/Settled.js

@@ -1,12 +0,0 @@
-import { isly } from "isly";
-import { Amounts } from "../Amounts";
-export var Settled;
-(function (Settled) {
-    Settled.type = isly.object({
-        paid: Amounts.type,
-        transactions: isly.string().array(),
-    });
-    Settled.is = Settled.type.is;
-    Settled.flaw = Settled.type.flaw;
-})(Settled || (Settled = {}));
-//# sourceMappingURL=Settled.js.map

package/dist/Settlement/Settled.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Settled.js","sourceRoot":"../","sources":["Settlement/Settled.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAOpC,MAAM,KAAW,OAAO,CAOvB;AAPD,WAAiB,OAAO;IACV,YAAI,GAAG,IAAI,CAAC,MAAM,CAAU;QACxC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE;KACnC,CAAC,CAAA;IACW,UAAE,GAAG,QAAA,IAAI,CAAC,EAAE,CAAA;IACZ,YAAI,GAAG,QAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EAPgB,OAAO,KAAP,OAAO,QAOvB"}