@pax2pay/model-banking 0.1.359 → 0.1.361

package/Analytics/Configuration/Base.ts

@@ -1,14 +1,15 @@
 import { filter, listener } from "cloudly-analytics-common"
 import { Event } from "../Event"
+import type { FlattenKeys } from ".";
 
 export namespace Base {
-	export type Selectors = keyof Required<Omit<Event.Base<any>, "value">>
+	export type Selectors = FlattenKeys<Required<Omit<Event.Base<any>, "value">>>
 		| "version"
 		| "source"
 	export const mapping = {
 		realm: "realm",
-		entityType: "entityType",
-		entity: "entity",
+		entityType: "entity.type",
+		entity: "entity.id",
 		action: "action",
 		created: "created",
 		isError: { selector: "isError", transform: "boolean" },

package/Analytics/Configuration/Ledger/Base.ts

@@ -1,9 +1,10 @@
 import { filter, listener } from "cloudly-analytics-common"
 import { Event } from "../../Event"
+import { FlattenKeys } from ".."
 import { Base as ConfigBase } from "../Base"
 
 export namespace Base {
-	export type Selectors = keyof Required<Event.Ledger.Base<any>>
+	export type Selectors = FlattenKeys<Required<Event.Ledger.Base<any>>>
 		| "version"
 		| "source"
 	export const mapping = {

package/Analytics/Event/AuditLog.ts

@@ -4,15 +4,14 @@ import { Realm } from "../../Realm"
 import { Base } from "./Base"
 
 export type AuditLog = Base<Audit> & {
-	entityType: "auditLog"
+	entity: { type: "auditLog"; id: string }
 	action: "created"
 }
 export namespace AuditLog {
 	export function create(value: Audit, realm: Realm, action: AuditLog["action"]): AuditLog {
 		return {
 			realm,
-			entityType: "auditLog",
-			entity: value.id,
+			entity: { type: "auditLog", id: value.id },
 			action,
 			created: isoly.DateTime.now(),
 			value,

package/Analytics/Event/Base.ts

@@ -3,8 +3,7 @@ import { Realm } from "../../Realm"
 
 export type Base<T> = {
 	realm: Realm
-	entity: string
-	entityType: string
+	entity: { type: string; id: string }
 	action: string
 	created: isoly.DateTime
 	isError?: true

package/Analytics/Event/Ledger/Account.ts

@@ -4,7 +4,7 @@ import { Realm } from "../../../Realm"
 import { Base } from "./Base"
 
 export interface Account extends Base<modelAccount> {
-	entityType: "account"
+	entity: { type: "account"; id: string }
 	action: "created" | "updated"
 	meta: { accountKey: string }
 }
@@ -12,8 +12,7 @@ export namespace Account {
 	export function create(value: modelAccount, organization: string, realm: Realm, action: Account["action"]): Account {
 		return {
 			realm,
-			entity: value.id,
-			entityType: "account",
+			entity: { type: "account", id: value.id },
 			organization,
 			action,
 			created: isoly.DateTime.now(),

package/Analytics/Event/Ledger/Operation.ts

@@ -4,7 +4,7 @@ import { Realm } from "../../../Realm"
 import { Base } from "./Base"
 
 export interface Operation extends Base<modelOperation> {
-	entityType: "operation"
+	entity: { type: "operation"; id: string }
 	action: "created"
 }
 export namespace Operation {
@@ -17,8 +17,7 @@ export namespace Operation {
 	): Operation {
 		return {
 			realm,
-			entityType: "operation",
-			entity: value.signature ?? "",
+			entity: { type: "operation", id: value.signature ?? "" },
 			organization,
 			account,
 			action,

package/Analytics/Event/Ledger/Organization.ts

@@ -4,15 +4,14 @@ import { Realm } from "../../../Realm"
 import { Base } from "./Base"
 
 export interface Organization extends Base<modelOrganization> {
-	entityType: "organization"
+	entity: { type: "organization"; id: string }
 	action: "created" | "updated"
 }
 export namespace Organization {
 	export function create(value: modelOrganization, realm: Realm, action: Organization["action"]): Organization {
 		return {
 			realm,
-			entityType: "organization",
-			entity: value.code,
+			entity: { type: "organization", id: value.code },
 			action,
 			created: isoly.DateTime.now(),
 			value,

package/Analytics/Event/Ledger/Rule.ts

@@ -4,7 +4,7 @@ import { Rule as modelRule } from "../../../Rule"
 import { Base } from "./Base"
 
 export interface Rule extends Base<modelRule> {
-	entityType: "rule"
+	entity: { type: "rule"; id: string }
 	action: "created" | "updated" | "removed"
 	meta: {
 		ruleType: modelRule.Kind
@@ -22,8 +22,7 @@ export namespace Rule {
 	): Rule {
 		return {
 			realm,
-			entityType: "rule",
-			entity: value.code,
+			entity: { type: "rule", id: value.code },
 			organization,
 			account,
 			action,

package/Analytics/Event/Ledger/Transaction.ts

@@ -4,7 +4,7 @@ import { Transaction as modelTransaction } from "../../../Transaction"
 import { Base } from "./Base"
 
 export interface Transaction extends Base<modelTransaction> {
-	entityType: "transaction"
+	entity: { type: "transaction"; id: string }
 	action: "created" | "finalized" | "cancelled" | "failed"
 	isError?: true
 }
@@ -12,8 +12,7 @@ export namespace Transaction {
 	export function create(value: modelTransaction, realm: Realm, action: Transaction["action"]): Transaction {
 		return {
 			realm,
-			entityType: "transaction",
-			entity: value.id,
+			entity: { type: "transaction", id: value.id },
 			action,
 			...(action == "failed" ? { isError: true } : {}),
 			created: isoly.DateTime.now(),

package/Operation/Changes.ts

@@ -4,19 +4,68 @@ import { Balances } from "../Balances"
 import { Counterbalance as CounterbalanceOperation } from "../Counterbalance"
 import { Change } from "./Change"
 
-export type Changes = Partial<Record<Balances.Balance.Entry, Change>> & Record<Changes.Entry.Counterbalance, Change>
-
+export type Changes = Partial<Record<Changes.Entry.Balance, Change>> & Record<Changes.Entry.Counterbalance, Change>
 export namespace Changes {
+	export function available(changes: Changes, currency: isoly.Currency): number {
+		return Object.entries(changes).reduce(
+			(r, [entry, change]) =>
+				isoly.Currency.add(
+					currency,
+					r,
+					Balances.Balance.Entry.is(entry) || Entry.Balance.type.is(entry)
+						? (entry == "actual" || entry == "available" ? 1 : -1) *
+								(change.type == "subtract" ? -1 : 1) *
+								(change.amount ?? 0)
+						: 0
+				),
+			0
+		)
+	}
+	export function reserved(changes: Changes, currency: isoly.Currency): number {
+		return Object.entries(changes).reduce(
+			(r, [entry, change]) =>
+				isoly.Currency.add(
+					currency,
+					r,
+					entry == "actual" ||
+						entry == "available" ||
+						(!Balances.Balance.Entry.is(entry) && !Entry.Balance.type.is(entry))
+						? 0
+						: (change.type == "subtract" ? -1 : 1) * (change.amount ?? 0)
+				),
+			0
+		)
+	}
+	export type Sum = Partial<Record<Changes.Entry.Balance, number>> & Record<Changes.Entry.Counterbalance, number>
+	export type MaybeLegacy = Changes | Legacy
+	export const type = isly.record<Legacy>(isly.string(), Change.type)
+	export type Legacy = Partial<Record<Balances.Balance.Entry, Change>> & Record<Changes.Entry.Counterbalance, Change>
+	export namespace Legacy {
+		export const type = isly.record<Legacy>(isly.string(), Change.type)
+		export const is = type.is
+		export const flaw = type.flaw
+		export type Entry = Balances.Balance.Entry | Legacy.Entry.Counterbalance
+		export namespace Entry {
+			export type Balance = typeof Balances.Balance.Entry.values[number]
+			export namespace Balance {
+				export const type = Balances.Balance.Entry.type
+			}
+			export type Counterbalance = `${CounterbalanceOperation.Link}-${isoly.DateTime}`
+		}
+	}
+	export type Entry = Changes.Entry.Balance | Changes.Entry.Counterbalance
 	export namespace Entry {
+		export const type = isly.string<Entry>()
 		export type Counterbalance = `${CounterbalanceOperation.Link}-${isoly.DateTime}`
 		export function split(counterbalance: Counterbalance): [CounterbalanceOperation.Link, isoly.DateTime] {
 			const split = counterbalance.split("-")
 			const [realm, supplier, account, hour] = [split[0], split[1], split[2], split.slice(3).join("-")]
 			return [`${realm}-${supplier}-${account}`, hour]
 		}
+		export type Balance = typeof Balance.values[number]
+		export namespace Balance {
+			export const values = ["available", "incomingReserved", "outgoingReserved", "bufferReserved"] as const
+			export const type = isly.string<Balance>(values)
+		}
 	}
-	export type Entry = Balances.Balance.Entry | Entry.Counterbalance
-	export const type = isly.record<Changes>(isly.string(), Change.type)
-	export const is = type.is
-	export const flaw = type.flaw
 }

package/Operation/Creatable.ts

@@ -49,15 +49,6 @@ export namespace Creatable {
 			currency,
 			type: "refund",
 			changes: {
-				actual: {
-					type: "add",
-					amount: isoly.Currency.subtract(
-						currency,
-						isoly.Currency.add(currency, operationAmount, operationFee),
-						Math.abs(charge)
-					),
-					status: "pending",
-				},
 				incomingReserved: {
 					type: "add",
 					amount: isoly.Currency.add(currency, operationAmount, operationFee),

package/Operation/index.ts

@@ -12,17 +12,23 @@ export interface Operation extends OperationCreatable {
 	previous?: string
 }
 export namespace Operation {
+	export function sum(operations: Operation[]): Changes.Sum {
+		const result: Changes.Sum = {}
+		for (const operation of operations) {
+			Object.entries(operation.changes).forEach(([entry, change]) => {
+				result[entry as Changes.Entry.Balance] = isoly.Currency[change.type](
+					operation.currency,
+					result[entry as Changes.Entry.Balance] ?? 0,
+					change.amount
+				)
+			})
+		}
+		return result
+	}
 	export const Signer = OperationSigner
 	export type Creatable = OperationCreatable
 	export const Creatable = OperationCreatable
-	export type Changes = OperationChanges
-	export const Changes = OperationChanges
-	export namespace Changes {
-		export type Entry = OperationChanges.Entry
-		export namespace Entry {
-			export type Counterbalance = OperationChanges.Entry.Counterbalance
-		}
-	}
+	export import Changes = OperationChanges
 	export const type = OperationCreatable.type.extend<Operation>({
 		transaction: isly.string(),
 		counter: isly.number(),

package/dist/Analytics/Configuration/Base.d.ts

@@ -1,11 +1,12 @@
 import { listener } from "cloudly-analytics-common";
 import { Event } from "../Event";
+import type { FlattenKeys } from ".";
 export declare namespace Base {
-    type Selectors = keyof Required<Omit<Event.Base<any>, "value">> | "version" | "source";
+    type Selectors = FlattenKeys<Required<Omit<Event.Base<any>, "value">>> | "version" | "source";
     const mapping: {
         readonly realm: "realm";
-        readonly entityType: "entityType";
-        readonly entity: "entity";
+        readonly entityType: "entity.type";
+        readonly entity: "entity.id";
         readonly action: "action";
         readonly created: "created";
         readonly isError: {

package/dist/Analytics/Configuration/Base.js

@@ -2,8 +2,8 @@ export var Base;
 (function (Base) {
     Base.mapping = {
         realm: "realm",
-        entityType: "entityType",
-        entity: "entity",
+        entityType: "entity.type",
+        entity: "entity.id",
         action: "action",
         created: "created",
         isError: { selector: "isError", transform: "boolean" },

package/dist/Analytics/Configuration/Base.js.map

@@ -1 +1 @@
-{"version":3,"file":"Base.js","sourceRoot":"../","sources":["Analytics/Configuration/Base.ts"],"names":[],"mappings":"AAGA,MAAM,KAAW,IAAI,CA0BpB;AA1BD,WAAiB,IAAI;IAIP,YAAO,GAAG;QACtB,KAAK,EAAE,OAAO;QACd,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;QACtD,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;KAEgD,CAAC;IAErD,WAAM,GAA6C;QAC/D,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;QACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE;QACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;QACtD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;KACnC,CAAA;AACF,CAAC,EA1BgB,IAAI,KAAJ,IAAI,QA0BpB"}
+{"version":3,"file":"Base.js","sourceRoot":"../","sources":["Analytics/Configuration/Base.ts"],"names":[],"mappings":"AAIA,MAAM,KAAW,IAAI,CA0BpB;AA1BD,WAAiB,IAAI;IAIP,YAAO,GAAG;QACtB,KAAK,EAAE,OAAO;QACd,UAAU,EAAE,aAAa;QACzB,MAAM,EAAE,WAAW;QACnB,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;QACtD,OAAO,EAAE,SAAS;QAClB,MAAM,EAAE,QAAQ;KAEgD,CAAC;IAErD,WAAM,GAA6C;QAC/D,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;QACjC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;QACtC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE;QACtC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE;QACtD,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;QAClC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE;KACnC,CAAA;AACF,CAAC,EA1BgB,IAAI,KAAJ,IAAI,QA0BpB"}

package/dist/Analytics/Configuration/Ledger/Base.d.ts

@@ -1,7 +1,8 @@
 import { listener } from "cloudly-analytics-common";
 import { Event } from "../../Event";
+import { FlattenKeys } from "..";
 export declare namespace Base {
-    type Selectors = keyof Required<Event.Ledger.Base<any>> | "version" | "source";
+    type Selectors = FlattenKeys<Required<Event.Ledger.Base<any>>> | "version" | "source";
     const mapping: {
         readonly organization: "organization";
         readonly account: "account";
@@ -14,8 +15,8 @@ export declare namespace Base {
             readonly transform: "stringify";
         };
         readonly realm: "realm";
-        readonly entityType: "entityType";
-        readonly entity: "entity";
+        readonly entityType: "entity.type";
+        readonly entity: "entity.id";
         readonly action: "action";
         readonly created: "created";
         readonly isError: {

package/dist/Analytics/Configuration/Ledger/Base.js.map

@@ -1 +1 @@
-{"version":3,"file":"Base.js","sourceRoot":"../","sources":["Analytics/Configuration/Ledger/Base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,SAAS,CAAA;AAE5C,MAAM,KAAW,IAAI,CAuBpB;AAvBD,WAAiB,IAAI;IAIP,YAAO,GAAG;QACtB,GAAG,UAAU,CAAC,OAAO;QACrB,YAAY,EAAE,cAAc;QAC5B,OAAO,EAAE,SAAS;QAClB,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE;QAC9C,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE;KAEY,CAAC;IAErD,WAAM,GAA6C;QAC/D,GAAG,UAAU,CAAC,MAAM;QACpB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE;QAC1D,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE;QACrD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE;gBACzD,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;aACjC,EAAC;QACF,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;KACjC,CAAA;AACF,CAAC,EAvBgB,IAAI,KAAJ,IAAI,QAuBpB"}
+{"version":3,"file":"Base.js","sourceRoot":"../","sources":["Analytics/Configuration/Ledger/Base.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,SAAS,CAAA;AAE5C,MAAM,KAAW,IAAI,CAuBpB;AAvBD,WAAiB,IAAI;IAIP,YAAO,GAAG;QACtB,GAAG,UAAU,CAAC,OAAO;QACrB,YAAY,EAAE,cAAc;QAC5B,OAAO,EAAE,SAAS;QAClB,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE;QAC9C,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE;KAEY,CAAC;IAErD,WAAM,GAA6C;QAC/D,GAAG,UAAU,CAAC,MAAM;QACpB,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE;QAC1D,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE;QACrD,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE;gBACzD,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;aACjC,EAAC;QACF,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE;KACjC,CAAA;AACF,CAAC,EAvBgB,IAAI,KAAJ,IAAI,QAuBpB"}

package/dist/Analytics/Configuration/Transaction.d.ts

@@ -101,8 +101,8 @@ export declare namespace Transaction {
             readonly transform: "stringify";
         };
         readonly realm: "realm";
-        readonly entityType: "entityType";
-        readonly entity: "entity";
+        readonly entityType: "entity.type";
+        readonly entity: "entity.id";
         readonly action: "action";
         readonly created: "created";
         readonly isError: {

package/dist/Analytics/Event/AuditLog.d.ts

@@ -2,7 +2,10 @@ import { Audit } from "../../Audit";
 import { Realm } from "../../Realm";
 import { Base } from "./Base";
 export type AuditLog = Base<Audit> & {
-    entityType: "auditLog";
+    entity: {
+        type: "auditLog";
+        id: string;
+    };
     action: "created";
 };
 export declare namespace AuditLog {

package/dist/Analytics/Event/AuditLog.js

@@ -4,8 +4,7 @@ export var AuditLog;
     function create(value, realm, action) {
         return {
             realm,
-            entityType: "auditLog",
-            entity: value.id,
+            entity: { type: "auditLog", id: value.id },
             action,
             created: isoly.DateTime.now(),
             value,

package/dist/Analytics/Event/AuditLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"AuditLog.js","sourceRoot":"../","sources":["Analytics/Event/AuditLog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAS7B,MAAM,KAAW,QAAQ,CAWxB;AAXD,WAAiB,QAAQ;IACxB,SAAgB,MAAM,CAAC,KAAY,EAAE,KAAY,EAAE,MAA0B;QAC5E,OAAO;YACN,KAAK;YACL,UAAU,EAAE,UAAU;YACtB,MAAM,EAAE,KAAK,CAAC,EAAE;YAChB,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IATe,eAAM,SASrB,CAAA;AACF,CAAC,EAXgB,QAAQ,KAAR,QAAQ,QAWxB"}
+{"version":3,"file":"AuditLog.js","sourceRoot":"../","sources":["Analytics/Event/AuditLog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAS7B,MAAM,KAAW,QAAQ,CAUxB;AAVD,WAAiB,QAAQ;IACxB,SAAgB,MAAM,CAAC,KAAY,EAAE,KAAY,EAAE,MAA0B;QAC5E,OAAO;YACN,KAAK;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YAC1C,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IARe,eAAM,SAQrB,CAAA;AACF,CAAC,EAVgB,QAAQ,KAAR,QAAQ,QAUxB"}

package/dist/Analytics/Event/Base.d.ts

@@ -2,8 +2,10 @@ import { isoly } from "isoly";
 import { Realm } from "../../Realm";
 export type Base<T> = {
     realm: Realm;
-    entity: string;
-    entityType: string;
+    entity: {
+        type: string;
+        id: string;
+    };
     action: string;
     created: isoly.DateTime;
     isError?: true;

package/dist/Analytics/Event/Ledger/Account.d.ts

@@ -2,7 +2,10 @@ import { Account as modelAccount } from "../../../Account";
 import { Realm } from "../../../Realm";
 import { Base } from "./Base";
 export interface Account extends Base<modelAccount> {
-    entityType: "account";
+    entity: {
+        type: "account";
+        id: string;
+    };
     action: "created" | "updated";
     meta: {
         accountKey: string;

package/dist/Analytics/Event/Ledger/Account.js

@@ -4,8 +4,7 @@ export var Account;
     function create(value, organization, realm, action) {
         return {
             realm,
-            entity: value.id,
-            entityType: "account",
+            entity: { type: "account", id: value.id },
             organization,
             action,
             created: isoly.DateTime.now(),

package/dist/Analytics/Event/Ledger/Account.js.map

@@ -1 +1 @@
-{"version":3,"file":"Account.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAU7B,MAAM,KAAW,OAAO,CAavB;AAbD,WAAiB,OAAO;IACvB,SAAgB,MAAM,CAAC,KAAmB,EAAE,YAAoB,EAAE,KAAY,EAAE,MAAyB;QACxG,OAAO;YACN,KAAK;YACL,MAAM,EAAE,KAAK,CAAC,EAAE;YAChB,UAAU,EAAE,SAAS;YACrB,YAAY;YACZ,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,IAAI,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI,EAAE,EAAE;YACrC,KAAK;SACL,CAAA;IACF,CAAC;IAXe,cAAM,SAWrB,CAAA;AACF,CAAC,EAbgB,OAAO,KAAP,OAAO,QAavB"}
+{"version":3,"file":"Account.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAU7B,MAAM,KAAW,OAAO,CAYvB;AAZD,WAAiB,OAAO;IACvB,SAAgB,MAAM,CAAC,KAAmB,EAAE,YAAoB,EAAE,KAAY,EAAE,MAAyB;QACxG,OAAO;YACN,KAAK;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YACzC,YAAY;YACZ,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,IAAI,EAAE,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,IAAI,EAAE,EAAE;YACrC,KAAK;SACL,CAAA;IACF,CAAC;IAVe,cAAM,SAUrB,CAAA;AACF,CAAC,EAZgB,OAAO,KAAP,OAAO,QAYvB"}

package/dist/Analytics/Event/Ledger/Operation.d.ts

@@ -2,7 +2,10 @@ import { Operation as modelOperation } from "../../../Operation";
 import { Realm } from "../../../Realm";
 import { Base } from "./Base";
 export interface Operation extends Base<modelOperation> {
-    entityType: "operation";
+    entity: {
+        type: "operation";
+        id: string;
+    };
     action: "created";
 }
 export declare namespace Operation {

package/dist/Analytics/Event/Ledger/Operation.js

@@ -4,8 +4,7 @@ export var Operation;
     function create(value, realm, action, organization, account) {
         return {
             realm,
-            entityType: "operation",
-            entity: value.signature ?? "",
+            entity: { type: "operation", id: value.signature ?? "" },
             organization,
             account,
             action,

package/dist/Analytics/Event/Ledger/Operation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Operation.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAS7B,MAAM,KAAW,SAAS,CAmBzB;AAnBD,WAAiB,SAAS;IACzB,SAAgB,MAAM,CACrB,KAAqB,EACrB,KAAY,EACZ,MAA2B,EAC3B,YAAqB,EACrB,OAAgB;QAEhB,OAAO;YACN,KAAK;YACL,UAAU,EAAE,WAAW;YACvB,MAAM,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE;YAC7B,YAAY;YACZ,OAAO;YACP,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IAjBe,gBAAM,SAiBrB,CAAA;AACF,CAAC,EAnBgB,SAAS,KAAT,SAAS,QAmBzB"}
+{"version":3,"file":"Operation.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Operation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAS7B,MAAM,KAAW,SAAS,CAkBzB;AAlBD,WAAiB,SAAS;IACzB,SAAgB,MAAM,CACrB,KAAqB,EACrB,KAAY,EACZ,MAA2B,EAC3B,YAAqB,EACrB,OAAgB;QAEhB,OAAO;YACN,KAAK;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE,EAAE;YACxD,YAAY;YACZ,OAAO;YACP,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IAhBe,gBAAM,SAgBrB,CAAA;AACF,CAAC,EAlBgB,SAAS,KAAT,SAAS,QAkBzB"}

package/dist/Analytics/Event/Ledger/Organization.d.ts

@@ -2,7 +2,10 @@ import { Organization as modelOrganization } from "../../../Organization";
 import { Realm } from "../../../Realm";
 import { Base } from "./Base";
 export interface Organization extends Base<modelOrganization> {
-    entityType: "organization";
+    entity: {
+        type: "organization";
+        id: string;
+    };
     action: "created" | "updated";
 }
 export declare namespace Organization {

package/dist/Analytics/Event/Ledger/Organization.js

@@ -4,8 +4,7 @@ export var Organization;
     function create(value, realm, action) {
         return {
             realm,
-            entityType: "organization",
-            entity: value.code,
+            entity: { type: "organization", id: value.code },
             action,
             created: isoly.DateTime.now(),
             value,

package/dist/Analytics/Event/Ledger/Organization.js.map

@@ -1 +1 @@
-{"version":3,"file":"Organization.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Organization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAS7B,MAAM,KAAW,YAAY,CAW5B;AAXD,WAAiB,YAAY;IAC5B,SAAgB,MAAM,CAAC,KAAwB,EAAE,KAAY,EAAE,MAA8B;QAC5F,OAAO;YACN,KAAK;YACL,UAAU,EAAE,cAAc;YAC1B,MAAM,EAAE,KAAK,CAAC,IAAI;YAClB,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IATe,mBAAM,SASrB,CAAA;AACF,CAAC,EAXgB,YAAY,KAAZ,YAAY,QAW5B"}
+{"version":3,"file":"Organization.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Organization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAS7B,MAAM,KAAW,YAAY,CAU5B;AAVD,WAAiB,YAAY;IAC5B,SAAgB,MAAM,CAAC,KAAwB,EAAE,KAAY,EAAE,MAA8B;QAC5F,OAAO;YACN,KAAK;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE;YAChD,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IARe,mBAAM,SAQrB,CAAA;AACF,CAAC,EAVgB,YAAY,KAAZ,YAAY,QAU5B"}

package/dist/Analytics/Event/Ledger/Rule.d.ts

@@ -2,7 +2,10 @@ import { Realm } from "../../../Realm";
 import { Rule as modelRule } from "../../../Rule";
 import { Base } from "./Base";
 export interface Rule extends Base<modelRule> {
-    entityType: "rule";
+    entity: {
+        type: "rule";
+        id: string;
+    };
     action: "created" | "updated" | "removed";
     meta: {
         ruleType: modelRule.Kind;

package/dist/Analytics/Event/Ledger/Rule.js

@@ -4,8 +4,7 @@ export var Rule;
     function create(value, realm, action, organization, account) {
         return {
             realm,
-            entityType: "rule",
-            entity: value.code,
+            entity: { type: "rule", id: value.code },
             organization,
             account,
             action,

package/dist/Analytics/Event/Ledger/Rule.js.map

@@ -1 +1 @@
-{"version":3,"file":"Rule.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAc7B,MAAM,KAAW,IAAI,CAwBpB;AAxBD,WAAiB,IAAI;IACpB,SAAgB,MAAM,CACrB,KAAgB,EAChB,KAAY,EACZ,MAAsB,EACtB,YAAqB,EACrB,OAAgB;QAEhB,OAAO;YACN,KAAK;YACL,UAAU,EAAE,MAAM;YAClB,MAAM,EAAE,KAAK,CAAC,IAAI;YAClB,YAAY;YACZ,OAAO;YACP,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,IAAI,EAAE;gBACL,QAAQ,EAAE,KAAK,CAAC,IAAI;gBACpB,YAAY,EAAE,KAAK,CAAC,QAAQ;gBAC5B,UAAU,EAAE,KAAK,CAAC,MAAM;aACxB;YACD,KAAK;SACL,CAAA;IACF,CAAC;IAtBe,WAAM,SAsBrB,CAAA;AACF,CAAC,EAxBgB,IAAI,KAAJ,IAAI,QAwBpB"}
+{"version":3,"file":"Rule.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAc7B,MAAM,KAAW,IAAI,CAuBpB;AAvBD,WAAiB,IAAI;IACpB,SAAgB,MAAM,CACrB,KAAgB,EAChB,KAAY,EACZ,MAAsB,EACtB,YAAqB,EACrB,OAAgB;QAEhB,OAAO;YACN,KAAK;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,EAAE;YACxC,YAAY;YACZ,OAAO;YACP,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,IAAI,EAAE;gBACL,QAAQ,EAAE,KAAK,CAAC,IAAI;gBACpB,YAAY,EAAE,KAAK,CAAC,QAAQ;gBAC5B,UAAU,EAAE,KAAK,CAAC,MAAM;aACxB;YACD,KAAK;SACL,CAAA;IACF,CAAC;IArBe,WAAM,SAqBrB,CAAA;AACF,CAAC,EAvBgB,IAAI,KAAJ,IAAI,QAuBpB"}

package/dist/Analytics/Event/Ledger/Transaction.d.ts

@@ -2,7 +2,10 @@ import { Realm } from "../../../Realm";
 import { Transaction as modelTransaction } from "../../../Transaction";
 import { Base } from "./Base";
 export interface Transaction extends Base<modelTransaction> {
-    entityType: "transaction";
+    entity: {
+        type: "transaction";
+        id: string;
+    };
     action: "created" | "finalized" | "cancelled" | "failed";
     isError?: true;
 }

package/dist/Analytics/Event/Ledger/Transaction.js

@@ -4,8 +4,7 @@ export var Transaction;
     function create(value, realm, action) {
         return {
             realm,
-            entityType: "transaction",
-            entity: value.id,
+            entity: { type: "transaction", id: value.id },
             action,
             ...(action == "failed" ? { isError: true } : {}),
             created: isoly.DateTime.now(),

package/dist/Analytics/Event/Ledger/Transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"Transaction.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAU7B,MAAM,KAAW,WAAW,CAY3B;AAZD,WAAiB,WAAW;IAC3B,SAAgB,MAAM,CAAC,KAAuB,EAAE,KAAY,EAAE,MAA6B;QAC1F,OAAO;YACN,KAAK;YACL,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE,KAAK,CAAC,EAAE;YAChB,MAAM;YACN,GAAG,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IAVe,kBAAM,SAUrB,CAAA;AACF,CAAC,EAZgB,WAAW,KAAX,WAAW,QAY3B"}
+{"version":3,"file":"Transaction.js","sourceRoot":"../","sources":["Analytics/Event/Ledger/Transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAU7B,MAAM,KAAW,WAAW,CAW3B;AAXD,WAAiB,WAAW;IAC3B,SAAgB,MAAM,CAAC,KAAuB,EAAE,KAAY,EAAE,MAA6B;QAC1F,OAAO;YACN,KAAK;YACL,MAAM,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE;YAC7C,MAAM;YACN,GAAG,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChD,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,KAAK;SACL,CAAA;IACF,CAAC;IATe,kBAAM,SASrB,CAAA;AACF,CAAC,EAXgB,WAAW,KAAX,WAAW,QAW3B"}

package/dist/Operation/Changes.d.ts

@@ -3,14 +3,36 @@ import { isly } from "isly";
 import { Balances } from "../Balances";
 import { Counterbalance as CounterbalanceOperation } from "../Counterbalance";
 import { Change } from "./Change";
-export type Changes = Partial<Record<Balances.Balance.Entry, Change>> & Record<Changes.Entry.Counterbalance, Change>;
+export type Changes = Partial<Record<Changes.Entry.Balance, Change>> & Record<Changes.Entry.Counterbalance, Change>;
 export declare namespace Changes {
+    function available(changes: Changes, currency: isoly.Currency): number;
+    function reserved(changes: Changes, currency: isoly.Currency): number;
+    type Sum = Partial<Record<Changes.Entry.Balance, number>> & Record<Changes.Entry.Counterbalance, number>;
+    type MaybeLegacy = Changes | Legacy;
+    const type: isly.Type<Legacy>;
+    type Legacy = Partial<Record<Balances.Balance.Entry, Change>> & Record<Changes.Entry.Counterbalance, Change>;
+    namespace Legacy {
+        const type: isly.Type<Legacy>;
+        const is: isly.Type.IsFunction<Legacy>;
+        const flaw: isly.Type.FlawFunction;
+        type Entry = Balances.Balance.Entry | Legacy.Entry.Counterbalance;
+        namespace Entry {
+            type Balance = typeof Balances.Balance.Entry.values[number];
+            namespace Balance {
+                const type: isly.Type<"actual" | "incomingReserved" | "outgoingReserved" | "bufferReserved">;
+            }
+            type Counterbalance = `${CounterbalanceOperation.Link}-${isoly.DateTime}`;
+        }
+    }
+    type Entry = Changes.Entry.Balance | Changes.Entry.Counterbalance;
     namespace Entry {
+        const type: isly.Type<Entry>;
         type Counterbalance = `${CounterbalanceOperation.Link}-${isoly.DateTime}`;
         function split(counterbalance: Counterbalance): [CounterbalanceOperation.Link, isoly.DateTime];
+        type Balance = typeof Balance.values[number];
+        namespace Balance {
+            const values: readonly ["available", "incomingReserved", "outgoingReserved", "bufferReserved"];
+            const type: isly.Type<"incomingReserved" | "outgoingReserved" | "bufferReserved" | "available">;
+        }
     }
-    type Entry = Balances.Balance.Entry | Entry.Counterbalance;
-    const type: isly.Type<Changes>;
-    const is: isly.Type.IsFunction<Changes>;
-    const flaw: isly.Type.FlawFunction;
 }

package/dist/Operation/Changes.js

@@ -1,18 +1,53 @@
+import { isoly } from "isoly";
 import { isly } from "isly";
+import { Balances } from "../Balances";
 import { Change } from "./Change";
 export var Changes;
 (function (Changes) {
+    function available(changes, currency) {
+        return Object.entries(changes).reduce((r, [entry, change]) => isoly.Currency.add(currency, r, Balances.Balance.Entry.is(entry) || Entry.Balance.type.is(entry)
+            ? (entry == "actual" || entry == "available" ? 1 : -1) *
+                (change.type == "subtract" ? -1 : 1) *
+                (change.amount ?? 0)
+            : 0), 0);
+    }
+    Changes.available = available;
+    function reserved(changes, currency) {
+        return Object.entries(changes).reduce((r, [entry, change]) => isoly.Currency.add(currency, r, entry == "actual" ||
+            entry == "available" ||
+            (!Balances.Balance.Entry.is(entry) && !Entry.Balance.type.is(entry))
+            ? 0
+            : (change.type == "subtract" ? -1 : 1) * (change.amount ?? 0)), 0);
+    }
+    Changes.reserved = reserved;
+    Changes.type = isly.record(isly.string(), Change.type);
+    let Legacy;
+    (function (Legacy) {
+        Legacy.type = isly.record(isly.string(), Change.type);
+        Legacy.is = Legacy.type.is;
+        Legacy.flaw = Legacy.type.flaw;
+        let Entry;
+        (function (Entry) {
+            let Balance;
+            (function (Balance) {
+                Balance.type = Balances.Balance.Entry.type;
+            })(Balance = Entry.Balance || (Entry.Balance = {}));
+        })(Entry = Legacy.Entry || (Legacy.Entry = {}));
+    })(Legacy = Changes.Legacy || (Changes.Legacy = {}));
     let Entry;
     (function (Entry) {
+        Entry.type = isly.string();
         function split(counterbalance) {
             const split = counterbalance.split("-");
             const [realm, supplier, account, hour] = [split[0], split[1], split[2], split.slice(3).join("-")];
             return [`${realm}-${supplier}-${account}`, hour];
         }
         Entry.split = split;
+        let Balance;
+        (function (Balance) {
+            Balance.values = ["available", "incomingReserved", "outgoingReserved", "bufferReserved"];
+            Balance.type = isly.string(Balance.values);
+        })(Balance = Entry.Balance || (Entry.Balance = {}));
     })(Entry = Changes.Entry || (Changes.Entry = {}));
-    Changes.type = isly.record(isly.string(), Change.type);
-    Changes.is = Changes.type.is;
-    Changes.flaw = Changes.type.flaw;
 })(Changes || (Changes = {}));
 //# sourceMappingURL=Changes.js.map

package/dist/Operation/Changes.js.map

@@ -1 +1 @@
-{"version":3,"file":"Changes.js","sourceRoot":"../","sources":["Operation/Changes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AAIjC,MAAM,KAAW,OAAO,CAavB;AAbD,WAAiB,OAAO;IACvB,IAAiB,KAAK,CAOrB;IAPD,WAAiB,KAAK;QAErB,SAAgB,KAAK,CAAC,cAA8B;YACnD,MAAM,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACvC,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;YACjG,OAAO,CAAC,GAAG,KAAK,IAAI,QAAQ,IAAI,OAAO,EAAE,EAAE,IAAI,CAAC,CAAA;QACjD,CAAC;QAJe,WAAK,QAIpB,CAAA;IACF,CAAC,EAPgB,KAAK,GAAL,aAAK,KAAL,aAAK,QAOrB;IAEY,YAAI,GAAG,IAAI,CAAC,MAAM,CAAU,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;IACvD,UAAE,GAAG,QAAA,IAAI,CAAC,EAAE,CAAA;IACZ,YAAI,GAAG,QAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EAbgB,OAAO,KAAP,OAAO,QAavB"}
+{"version":3,"file":"Changes.js","sourceRoot":"../","sources":["Operation/Changes.ts"],"names":[],"mappings":"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"}

package/dist/Operation/Creatable.js

@@ -38,11 +38,6 @@ export var Creatable;
             currency,
             type: "refund",
             changes: {
-                actual: {
-                    type: "add",
-                    amount: isoly.Currency.subtract(currency, isoly.Currency.add(currency, operationAmount, operationFee), Math.abs(charge)),
-                    status: "pending",
-                },
                 incomingReserved: {
                     type: "add",
                     amount: isoly.Currency.add(currency, operationAmount, operationFee),

package/dist/Operation/Creatable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Creatable.js","sourceRoot":"../","sources":["Operation/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AASnC,MAAM,KAAW,SAAS,CAuDzB;AAvDD,WAAiB,SAAS;IACZ,eAAK,GAAG;QACpB,UAAU;QACV,kBAAkB;QAClB,UAAU;QACV,kBAAkB;QAClB,eAAe;QACf,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,cAAc;KACL,CAAA;IAEG,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACjE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,UAAA,KAAK,CAAC;KACxB,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;IAC7B,SAAgB,UAAU,CAAC,OAAe,EAAE,KAAwC,EAAE,MAAc;QAGnG,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,MAAM,CAAA;QAC5C,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7D,OAAO;YACN,OAAO,EAAE,OAAO;YAChB,QAAQ;YACR,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE;gBACR,MAAM,EAAE;oBACP,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAC9B,QAAQ,EACR,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,YAAY,CAAC,EAC3D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAChB;oBACD,MAAM,EAAE,SAAS;iBACjB;gBACD,gBAAgB,EAAE;oBACjB,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,YAAY,CAAC;oBACnE,MAAM,EAAE,SAAS;iBACjB;aACD;SACD,CAAA;IACF,CAAC;IA3Be,oBAAU,aA2BzB,CAAA;AACF,CAAC,EAvDgB,SAAS,KAAT,SAAS,QAuDzB"}
+{"version":3,"file":"Creatable.js","sourceRoot":"../","sources":["Operation/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AASnC,MAAM,KAAW,SAAS,CA8CzB;AA9CD,WAAiB,SAAS;IACZ,eAAK,GAAG;QACpB,UAAU;QACV,kBAAkB;QAClB,UAAU;QACV,kBAAkB;QAClB,eAAe;QACf,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,cAAc;KACL,CAAA;IAEG,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACjE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,UAAA,KAAK,CAAC;KACxB,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;IAC7B,SAAgB,UAAU,CAAC,OAAe,EAAE,KAAwC,EAAE,MAAc;QAGnG,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC,MAAM,CAAA;QAC5C,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7D,OAAO;YACN,OAAO,EAAE,OAAO;YAChB,QAAQ;YACR,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE;gBACR,gBAAgB,EAAE;oBACjB,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,EAAE,YAAY,CAAC;oBACnE,MAAM,EAAE,SAAS;iBACjB;aACD;SACD,CAAA;IACF,CAAC;IAlBe,oBAAU,aAkBzB,CAAA;AACF,CAAC,EA9CgB,SAAS,KAAT,SAAS,QA8CzB"}

package/dist/Operation/index.d.ts

@@ -11,17 +11,11 @@ export interface Operation extends OperationCreatable {
     previous?: string;
 }
 export declare namespace Operation {
+    function sum(operations: Operation[]): Changes.Sum;
     const Signer: typeof OperationSigner;
     type Creatable = OperationCreatable;
     const Creatable: typeof OperationCreatable;
-    type Changes = OperationChanges;
-    const Changes: typeof OperationChanges;
-    namespace Changes {
-        type Entry = OperationChanges.Entry;
-        namespace Entry {
-            type Counterbalance = OperationChanges.Entry.Counterbalance;
-        }
-    }
+    export import Changes = OperationChanges;
     const type: isly.object.ExtendableType<Operation>;
     const is: isly.Type.IsFunction<Operation>;
     const flaw: isly.Type.FlawFunction;

package/dist/Operation/index.js

@@ -5,6 +5,16 @@ import { Creatable as OperationCreatable } from "./Creatable";
 import { Signer as OperationSigner } from "./Signer";
 export var Operation;
 (function (Operation) {
+    function sum(operations) {
+        const result = {};
+        for (const operation of operations) {
+            Object.entries(operation.changes).forEach(([entry, change]) => {
+                result[entry] = isoly.Currency[change.type](operation.currency, result[entry] ?? 0, change.amount);
+            });
+        }
+        return result;
+    }
+    Operation.sum = sum;
     Operation.Signer = OperationSigner;
     Operation.Creatable = OperationCreatable;
     Operation.Changes = OperationChanges;

package/dist/Operation/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Operation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,WAAW,CAAA;AACvD,OAAO,EAAE,SAAS,IAAI,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAC7D,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,UAAU,CAAA;AASpD,MAAM,KAAW,SAAS,CA6BzB;AA7BD,WAAiB,SAAS;IACZ,gBAAM,GAAG,eAAe,CAAA;IAExB,mBAAS,GAAG,kBAAkB,CAAA;IAE9B,iBAAO,GAAG,gBAAgB,CAAA;IAO1B,cAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAY;QAC7D,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE;QAC1B,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;QACtB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACnC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAClC,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;IAC7B,SAAgB,aAAa,CAAC,WAAmB,EAAE,SAAoB;QACtE,OAAO;YACN,GAAG,SAAS;YACZ,WAAW;YACX,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;SAC7B,CAAA;IACF,CAAC;IAPe,uBAAa,gBAO5B,CAAA;AACF,CAAC,EA7BgB,SAAS,KAAT,SAAS,QA6BzB"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Operation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,WAAW,CAAA;AACvD,OAAO,EAAE,SAAS,IAAI,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAC7D,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,UAAU,CAAA;AASpD,MAAM,KAAW,SAAS,CAmCzB;AAnCD,WAAiB,SAAS;IACzB,SAAgB,GAAG,CAAC,UAAuB;QAC1C,MAAM,MAAM,GAAgB,EAAE,CAAA;QAC9B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACpC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE;gBAC7D,MAAM,CAAC,KAA8B,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CACnE,SAAS,CAAC,QAAQ,EAClB,MAAM,CAAC,KAA8B,CAAC,IAAI,CAAC,EAC3C,MAAM,CAAC,MAAM,CACb,CAAA;YACF,CAAC,CAAC,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IAZe,aAAG,MAYlB,CAAA;IACY,gBAAM,GAAG,eAAe,CAAA;IAExB,mBAAS,GAAG,kBAAkB,CAAA;IAC7B,iBAAO,GAAG,gBAAgB,CAAA;IAC3B,cAAI,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAY;QAC7D,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE;QAC1B,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;QACtB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACnC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAClC,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;IAC7B,SAAgB,aAAa,CAAC,WAAmB,EAAE,SAAoB;QACtE,OAAO;YACN,GAAG,SAAS;YACZ,WAAW;YACX,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;SAC7B,CAAA;IACF,CAAC;IAPe,uBAAa,gBAO5B,CAAA;AACF,CAAC,EAnCgB,SAAS,KAAT,SAAS,QAmCzB"}

package/package.json

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