@pax2pay/model-banking 0.1.387 → 0.1.389

package/Rule/State/Transaction.ts

@@ -20,20 +20,31 @@ export interface Transaction extends ModelTransaction.Creatable {
 export namespace Transaction {
 	export function from(
 		accountName: string,
-		transaction: ModelTransaction.Creatable & { counterpart: Address },
+		transaction: (ModelTransaction.Creatable & { counterpart: Address }) | ModelTransaction,
 		kind: Rule.Base.Kind,
 		stage: "finalize" | "initiate"
 	): Transaction {
+		const [amount, total] =
+			"state" in transaction
+				? [
+						transaction.state?.transaction.original.amount ?? transaction.amount,
+						isoly.Currency.subtract(
+							transaction.currency,
+							transaction.state?.transaction.original.total ?? transaction.amount,
+							stage === "finalize" ? transaction.state?.transaction.original.reserve ?? 0 : 0
+						),
+				  ]
+				: [transaction.amount, transaction.amount]
 		return {
 			...transaction,
 			stage,
 			kind,
-			amount: Math.abs(transaction.amount),
+			amount: Math.abs(amount),
 			type: ModelTransaction.getType(transaction.counterpart, accountName),
 			original: {
 				currency: transaction.currency,
-				amount: Math.abs(transaction.amount),
-				total: Math.abs(transaction.amount),
+				amount: Math.abs(amount),
+				total: Math.abs(total),
 			},
 		}
 	}

package/Treasury/Account/Conditions.ts

@@ -4,7 +4,6 @@ import { Amounts } from "../../Amounts"
 export interface Conditions {
 	minimum?: Amounts
 }
-
 export namespace Conditions {
 	export const type = isly.object<Conditions>({ minimum: Amounts.type.optional() })
 	export const is = type.is

package/Treasury/Account/Fetchable.ts

@@ -6,7 +6,7 @@ import { Balance } from "../Balance"
 import { Category } from "./Category"
 
 export interface Fetchable {
-	name: string
+	label: string
 	supplier: Supplier
 	reference: string
 	currencies: isoly.Currency[]
@@ -14,17 +14,14 @@ export interface Fetchable {
 	rail: Rail.Address[]
 	balance: Balance
 }
-
 export namespace Fetchable {
 	export const type = isly.object<Fetchable>({
-		name: isly.string(),
+		label: isly.string(),
 		supplier: isly.fromIs("supplier", Supplier.is),
 		reference: isly.string(),
 		currencies: isly.fromIs("Account.Fetchable.currencies", isoly.Currency.is).array(),
 		type: Category.type,
-		rail: isly.fromIs("Account.Fetchable.rail", Rail.Address.is).array(),
-		balance: isly.fromIs("Account.Fetchable.rail", Balance.is),
+		rail: Rail.Address.type.array(),
+		balance: Balance.type,
 	})
-	export const is = type.is
-	export const flaw = type.flaw
 }

package/Treasury/Account/Storable.ts

@@ -1,4 +1,3 @@
-import { cryptly } from "cryptly"
 import { isoly } from "isoly"
 import { isly } from "isly"
 import { Realm } from "../../Realm"
@@ -7,27 +6,22 @@ import { Category } from "./Category"
 import { Conditions } from "./Conditions"
 
 export interface Storable {
-	id: cryptly.Identifier
+	code: string
 	created: isoly.DateTime
 	realm: Realm
 	supplier: Supplier
-	link: string
 	type: Category
 	reference: string
 	conditions?: Conditions
 }
-
 export namespace Storable {
 	export const type = isly.object<Storable>({
-		id: isly.string(),
+		code: isly.string(),
 		created: isly.fromIs("Treasury.Account.Storable", isoly.DateTime.is),
-		realm: isly.fromIs("realm", Realm.is),
-		supplier: isly.fromIs("supplier", Supplier.is),
-		link: isly.string(),
+		realm: Realm.type,
+		supplier: Supplier.type,
 		type: Category.type,
 		reference: isly.string(),
 		conditions: Conditions.type.optional(),
 	})
-	export const is = type.is
-	export const flaw = type.flaw
 }

package/Treasury/Account/index.ts

@@ -1,4 +1,3 @@
-import { cryptly } from "cryptly"
 import { isoly } from "isoly"
 import { isly } from "isly"
 import { Rail } from "../../Rail"
@@ -8,14 +7,13 @@ import { Balance } from "../Balance"
 import { Transaction } from "../Transaction"
 import { Category as AccountCategory } from "./Category"
 import { Conditions as AccountConditions } from "./Conditions"
-import { Creatable as AccountCreatable } from "./Creatable"
 import { Fetchable as AccountFetchable } from "./Fetchable"
 import { Storable as AccountStorable } from "./Storable"
 
 export interface Account {
-	id: cryptly.Identifier
+	code: string
 	created: isoly.DateTime
-	name: string
+	label: string
 	realm: Realm
 	supplier: Supplier | "external"
 	reference: string
@@ -27,9 +25,9 @@ export interface Account {
 }
 export namespace Account {
 	export const type = isly.object<Account>({
-		id: isly.string(),
+		code: isly.string(),
 		created: isly.fromIs("Treasury.Account.Created", isoly.DateTime.is),
-		name: isly.string(),
+		label: isly.string(),
 		realm: Realm.type,
 		supplier: Supplier.type,
 		reference: isly.string(),
@@ -37,10 +35,9 @@ export namespace Account {
 		type: AccountCategory.type,
 		conditions: AccountConditions.type,
 		rail: Rail.Address.type.array(),
-		balance: isly.fromIs("Treasury.Account.balance", Balance.is),
+		balance: Balance.type,
 	})
 	export type Listable = Account & { transactions: Transaction[] }
-	export import Creatable = AccountCreatable
 	export import Storable = AccountStorable
 	export import Fetchable = AccountFetchable
 	export import Category = AccountCategory

package/Warning/Snapshot/MissingBuffer.ts

@@ -23,7 +23,7 @@ export namespace MissingBuffer {
 			if (typeof minimum != "undefined" && minimum > amount)
 				result.push({
 					type: "missing-buffer",
-					resource: account.id,
+					resource: account.code,
 					currency: currency as isoly.Currency,
 					minimum,
 					balance: amount,

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

@@ -20,7 +20,7 @@ export interface Transaction extends ModelTransaction.Creatable {
     };
 }
 export declare namespace Transaction {
-    function from(accountName: string, transaction: ModelTransaction.Creatable & {
+    function from(accountName: string, transaction: (ModelTransaction.Creatable & {
         counterpart: Address;
-    }, kind: Rule.Base.Kind, stage: "finalize" | "initiate"): Transaction;
+    }) | ModelTransaction, kind: Rule.Base.Kind, stage: "finalize" | "initiate"): Transaction;
 }

package/dist/Rule/State/Transaction.js

@@ -1,17 +1,24 @@
+import { isoly } from "isoly";
 import { Transaction as ModelTransaction } from "../../Transaction";
 export var Transaction;
 (function (Transaction) {
     function from(accountName, transaction, kind, stage) {
+        const [amount, total] = "state" in transaction
+            ? [
+                transaction.state?.transaction.original.amount ?? transaction.amount,
+                isoly.Currency.subtract(transaction.currency, transaction.state?.transaction.original.total ?? transaction.amount, stage === "finalize" ? transaction.state?.transaction.original.reserve ?? 0 : 0),
+            ]
+            : [transaction.amount, transaction.amount];
         return {
             ...transaction,
             stage,
             kind,
-            amount: Math.abs(transaction.amount),
+            amount: Math.abs(amount),
             type: ModelTransaction.getType(transaction.counterpart, accountName),
             original: {
                 currency: transaction.currency,
-                amount: Math.abs(transaction.amount),
-                total: Math.abs(transaction.amount),
+                amount: Math.abs(amount),
+                total: Math.abs(total),
             },
         };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"Transaction.js","sourceRoot":"../","sources":["Rule/State/Transaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAiBnE,MAAM,KAAW,WAAW,CAoB3B;AApBD,WAAiB,WAAW;IAC3B,SAAgB,IAAI,CACnB,WAAmB,EACnB,WAAkE,EAClE,IAAoB,EACpB,KAA8B;QAE9B,OAAO;YACN,GAAG,WAAW;YACd,KAAK;YACL,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,gBAAgB,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,WAAW,CAAC,MAAM,CAAC;gBACpC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;aACnC;SACD,CAAA;IACF,CAAC;IAlBe,gBAAI,OAkBnB,CAAA;AACF,CAAC,EApBgB,WAAW,KAAX,WAAW,QAoB3B"}
+{"version":3,"file":"Transaction.js","sourceRoot":"../","sources":["Rule/State/Transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAE7B,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAiBnE,MAAM,KAAW,WAAW,CA+B3B;AA/BD,WAAiB,WAAW;IAC3B,SAAgB,IAAI,CACnB,WAAmB,EACnB,WAAuF,EACvF,IAAoB,EACpB,KAA8B;QAE9B,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GACpB,OAAO,IAAI,WAAW;YACrB,CAAC,CAAC;gBACA,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM;gBACpE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CACtB,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,KAAK,IAAI,WAAW,CAAC,MAAM,EACnE,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAC/E;aACA;YACH,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;QAC5C,OAAO;YACN,GAAG,WAAW;YACd,KAAK;YACL,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;YACxB,IAAI,EAAE,gBAAgB,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,MAAM,CAAC;gBACxB,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;aACtB;SACD,CAAA;IACF,CAAC;IA7Be,gBAAI,OA6BnB,CAAA;AACF,CAAC,EA/BgB,WAAW,KAAX,WAAW,QA+B3B"}

package/dist/Treasury/Account/Conditions.js.map

@@ -1 +1 @@
-{"version":3,"file":"Conditions.js","sourceRoot":"../","sources":["Treasury/Account/Conditions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAMvC,MAAM,KAAW,UAAU,CAG1B;AAHD,WAAiB,UAAU;IACb,eAAI,GAAG,IAAI,CAAC,MAAM,CAAa,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACpE,aAAE,GAAG,WAAA,IAAI,CAAC,EAAE,CAAA;AAC1B,CAAC,EAHgB,UAAU,KAAV,UAAU,QAG1B"}
+{"version":3,"file":"Conditions.js","sourceRoot":"../","sources":["Treasury/Account/Conditions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAKvC,MAAM,KAAW,UAAU,CAG1B;AAHD,WAAiB,UAAU;IACb,eAAI,GAAG,IAAI,CAAC,MAAM,CAAa,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACpE,aAAE,GAAG,WAAA,IAAI,CAAC,EAAE,CAAA;AAC1B,CAAC,EAHgB,UAAU,KAAV,UAAU,QAG1B"}

package/dist/Treasury/Account/Fetchable.d.ts

@@ -5,7 +5,7 @@ import { Supplier } from "../../Supplier";
 import { Balance } from "../Balance";
 import { Category } from "./Category";
 export interface Fetchable {
-    name: string;
+    label: string;
     supplier: Supplier;
     reference: string;
     currencies: isoly.Currency[];
@@ -15,6 +15,4 @@ export interface Fetchable {
 }
 export declare namespace Fetchable {
     const type: isly.object.ExtendableType<Fetchable>;
-    const is: isly.Type.IsFunction<Fetchable>;
-    const flaw: isly.Type.FlawFunction;
 }

package/dist/Treasury/Account/Fetchable.js

@@ -7,15 +7,13 @@ import { Category } from "./Category";
 export var Fetchable;
 (function (Fetchable) {
     Fetchable.type = isly.object({
-        name: isly.string(),
+        label: isly.string(),
         supplier: isly.fromIs("supplier", Supplier.is),
         reference: isly.string(),
         currencies: isly.fromIs("Account.Fetchable.currencies", isoly.Currency.is).array(),
         type: Category.type,
-        rail: isly.fromIs("Account.Fetchable.rail", Rail.Address.is).array(),
-        balance: isly.fromIs("Account.Fetchable.rail", Balance.is),
+        rail: Rail.Address.type.array(),
+        balance: Balance.type,
     });
-    Fetchable.is = Fetchable.type.is;
-    Fetchable.flaw = Fetchable.type.flaw;
 })(Fetchable || (Fetchable = {}));
 //# sourceMappingURL=Fetchable.js.map

package/dist/Treasury/Account/Fetchable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fetchable.js","sourceRoot":"../","sources":["Treasury/Account/Fetchable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAYrC,MAAM,KAAW,SAAS,CAYzB;AAZD,WAAiB,SAAS;IACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QACnB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9C,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;QACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,8BAA8B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QAClF,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QACpE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,OAAO,CAAC,EAAE,CAAC;KAC1D,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EAZgB,SAAS,KAAT,SAAS,QAYzB"}
+{"version":3,"file":"Fetchable.js","sourceRoot":"../","sources":["Treasury/Account/Fetchable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAWrC,MAAM,KAAW,SAAS,CAUzB;AAVD,WAAiB,SAAS;IACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;QACpB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9C,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;QACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,8BAA8B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QAClF,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;QAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;KACrB,CAAC,CAAA;AACH,CAAC,EAVgB,SAAS,KAAT,SAAS,QAUzB"}

package/dist/Treasury/Account/Storable.d.ts

@@ -1,4 +1,3 @@
-import { cryptly } from "cryptly";
 import { isoly } from "isoly";
 import { isly } from "isly";
 import { Realm } from "../../Realm";
@@ -6,17 +5,14 @@ import { Supplier } from "../../Supplier";
 import { Category } from "./Category";
 import { Conditions } from "./Conditions";
 export interface Storable {
-    id: cryptly.Identifier;
+    code: string;
     created: isoly.DateTime;
     realm: Realm;
     supplier: Supplier;
-    link: string;
     type: Category;
     reference: string;
     conditions?: Conditions;
 }
 export declare namespace Storable {
     const type: isly.object.ExtendableType<Storable>;
-    const is: isly.Type.IsFunction<Storable>;
-    const flaw: isly.Type.FlawFunction;
 }

package/dist/Treasury/Account/Storable.js

@@ -7,16 +7,13 @@ import { Conditions } from "./Conditions";
 export var Storable;
 (function (Storable) {
     Storable.type = isly.object({
-        id: isly.string(),
+        code: isly.string(),
         created: isly.fromIs("Treasury.Account.Storable", isoly.DateTime.is),
-        realm: isly.fromIs("realm", Realm.is),
-        supplier: isly.fromIs("supplier", Supplier.is),
-        link: isly.string(),
+        realm: Realm.type,
+        supplier: Supplier.type,
         type: Category.type,
         reference: isly.string(),
         conditions: Conditions.type.optional(),
     });
-    Storable.is = Storable.type.is;
-    Storable.flaw = Storable.type.flaw;
 })(Storable || (Storable = {}));
 //# sourceMappingURL=Storable.js.map

package/dist/Treasury/Account/Storable.js.map

@@ -1 +1 @@
-{"version":3,"file":"Storable.js","sourceRoot":"../","sources":["Treasury/Account/Storable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAazC,MAAM,KAAW,QAAQ,CAaxB;AAbD,WAAiB,QAAQ;IACX,aAAI,GAAG,IAAI,CAAC,MAAM,CAAW;QACzC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QACrC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9C,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;QACxB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE;KACtC,CAAC,CAAA;IACW,WAAE,GAAG,SAAA,IAAI,CAAC,EAAE,CAAA;IACZ,aAAI,GAAG,SAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EAbgB,QAAQ,KAAR,QAAQ,QAaxB"}
+{"version":3,"file":"Storable.js","sourceRoot":"../","sources":["Treasury/Account/Storable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAWzC,MAAM,KAAW,QAAQ,CAUxB;AAVD,WAAiB,QAAQ;IACX,aAAI,GAAG,IAAI,CAAC,MAAM,CAAW;QACzC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QACnB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,2BAA2B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpE,KAAK,EAAE,KAAK,CAAC,IAAI;QACjB,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;QACxB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE;KACtC,CAAC,CAAA;AACH,CAAC,EAVgB,QAAQ,KAAR,QAAQ,QAUxB"}

package/dist/Treasury/Account/index.d.ts

@@ -1,4 +1,3 @@
-import { cryptly } from "cryptly";
 import { isoly } from "isoly";
 import { isly } from "isly";
 import { Rail } from "../../Rail";
@@ -8,13 +7,12 @@ import { Balance } from "../Balance";
 import { Transaction } from "../Transaction";
 import { Category as AccountCategory } from "./Category";
 import { Conditions as AccountConditions } from "./Conditions";
-import { Creatable as AccountCreatable } from "./Creatable";
 import { Fetchable as AccountFetchable } from "./Fetchable";
 import { Storable as AccountStorable } from "./Storable";
 export interface Account {
-    id: cryptly.Identifier;
+    code: string;
     created: isoly.DateTime;
-    name: string;
+    label: string;
     realm: Realm;
     supplier: Supplier | "external";
     reference: string;
@@ -31,7 +29,6 @@ export declare namespace Account {
     type Listable = Account & {
         transactions: Transaction[];
     };
-    export import Creatable = AccountCreatable;
     export import Storable = AccountStorable;
     export import Fetchable = AccountFetchable;
     export import Category = AccountCategory;

package/dist/Treasury/Account/index.js

@@ -6,15 +6,14 @@ import { Supplier } from "../../Supplier";
 import { Balance } from "../Balance";
 import { Category as AccountCategory } from "./Category";
 import { Conditions as AccountConditions } from "./Conditions";
-import { Creatable as AccountCreatable } from "./Creatable";
 import { Fetchable as AccountFetchable } from "./Fetchable";
 import { Storable as AccountStorable } from "./Storable";
 export var Account;
 (function (Account) {
     Account.type = isly.object({
-        id: isly.string(),
+        code: isly.string(),
         created: isly.fromIs("Treasury.Account.Created", isoly.DateTime.is),
-        name: isly.string(),
+        label: isly.string(),
         realm: Realm.type,
         supplier: Supplier.type,
         reference: isly.string(),
@@ -22,9 +21,8 @@ export var Account;
         type: AccountCategory.type,
         conditions: AccountConditions.type,
         rail: Rail.Address.type.array(),
-        balance: isly.fromIs("Treasury.Account.balance", Balance.is),
+        balance: Balance.type,
     });
-    Account.Creatable = AccountCreatable;
     Account.Storable = AccountStorable;
     Account.Fetchable = AccountFetchable;
     Account.Category = AccountCategory;

package/dist/Treasury/Account/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Treasury/Account/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,OAAO,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,YAAY,CAAA;AAexD,MAAM,KAAW,OAAO,CAoBvB;AApBD,WAAiB,OAAO;IACV,YAAI,GAAG,IAAI,CAAC,MAAM,CAAU;QACxC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QACnB,KAAK,EAAE,KAAK,CAAC,IAAI;QACjB,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;QACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,6BAA6B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QACjF,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,UAAU,EAAE,iBAAiB,CAAC,IAAI;QAClC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;QAC/B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,OAAO,CAAC,EAAE,CAAC;KAC5D,CAAC,CAAA;IAEY,iBAAS,GAAG,gBAAgB,CAAA;IAC5B,gBAAQ,GAAG,eAAe,CAAA;IAC1B,iBAAS,GAAG,gBAAgB,CAAA;IAC5B,gBAAQ,GAAG,eAAe,CAAA;IAC1B,kBAAU,GAAG,iBAAiB,CAAA;AAC7C,CAAC,EApBgB,OAAO,KAAP,OAAO,QAoBvB"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Treasury/Account/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEpC,OAAO,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,UAAU,IAAI,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAC9D,OAAO,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,QAAQ,IAAI,eAAe,EAAE,MAAM,YAAY,CAAA;AAexD,MAAM,KAAW,OAAO,CAmBvB;AAnBD,WAAiB,OAAO;IACV,YAAI,GAAG,IAAI,CAAC,MAAM,CAAU;QACxC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QACnB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;QACpB,KAAK,EAAE,KAAK,CAAC,IAAI;QACjB,QAAQ,EAAE,QAAQ,CAAC,IAAI;QACvB,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;QACxB,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,6BAA6B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QACjF,IAAI,EAAE,eAAe,CAAC,IAAI;QAC1B,UAAU,EAAE,iBAAiB,CAAC,IAAI;QAClC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE;QAC/B,OAAO,EAAE,OAAO,CAAC,IAAI;KACrB,CAAC,CAAA;IAEY,gBAAQ,GAAG,eAAe,CAAA;IAC1B,iBAAS,GAAG,gBAAgB,CAAA;IAC5B,gBAAQ,GAAG,eAAe,CAAA;IAC1B,kBAAU,GAAG,iBAAiB,CAAA;AAC7C,CAAC,EAnBgB,OAAO,KAAP,OAAO,QAmBvB"}

package/dist/Warning/Snapshot/MissingBuffer.js

@@ -16,7 +16,7 @@ export var MissingBuffer;
             if (typeof minimum != "undefined" && minimum > amount)
                 result.push({
                     type: "missing-buffer",
-                    resource: account.id,
+                    resource: account.code,
                     currency: currency,
                     minimum,
                     balance: amount,

package/dist/Warning/Snapshot/MissingBuffer.js.map

@@ -1 +1 @@
-{"version":3,"file":"MissingBuffer.js","sourceRoot":"../","sources":["Warning/Snapshot/MissingBuffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAQ9B,MAAM,KAAW,aAAa,CAuB7B;AAvBD,WAAiB,aAAa;IAChB,kBAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAgB;QACnD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACnC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE;QACvB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;QACtB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;KACtB,CAAC,CAAA;IACF,SAAgB,MAAM,CAAC,OAAyB;QAC/C,MAAM,MAAM,GAAoB,EAAE,CAAA;QAClC,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAClE,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,QAA0B,CAAC,CAAA;YACzE,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,GAAG,MAAM;gBACpD,MAAM,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,gBAAgB;oBACtB,QAAQ,EAAE,OAAO,CAAC,EAAE;oBACpB,QAAQ,EAAE,QAA0B;oBACpC,OAAO;oBACP,OAAO,EAAE,MAAM;oBACf,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IAfe,oBAAM,SAerB,CAAA;AACF,CAAC,EAvBgB,aAAa,KAAb,aAAa,QAuB7B"}
+{"version":3,"file":"MissingBuffer.js","sourceRoot":"../","sources":["Warning/Snapshot/MissingBuffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAE3B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAQ9B,MAAM,KAAW,aAAa,CAuB7B;AAvBD,WAAiB,aAAa;IAChB,kBAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAgB;QACnD,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACnC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE;QACvB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;QACtB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;KACtB,CAAC,CAAA;IACF,SAAgB,MAAM,CAAC,OAAyB;QAC/C,MAAM,MAAM,GAAoB,EAAE,CAAA;QAClC,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAClE,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,QAA0B,CAAC,CAAA;YACzE,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,GAAG,MAAM;gBACpD,MAAM,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,gBAAgB;oBACtB,QAAQ,EAAE,OAAO,CAAC,IAAI;oBACtB,QAAQ,EAAE,QAA0B;oBACpC,OAAO;oBACP,OAAO,EAAE,MAAM;oBACf,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;iBACtB,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,MAAM,CAAA;IACd,CAAC;IAfe,oBAAM,SAerB,CAAA;AACF,CAAC,EAvBgB,aAAa,KAAb,aAAa,QAuB7B"}

package/package.json

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

package/Treasury/Account/Creatable.ts

@@ -1,28 +0,0 @@
-import { isoly } from "isoly"
-import { isly } from "isly"
-import { Realm } from "../../Realm"
-import { Supplier } from "../../Supplier"
-import { Category } from "./Category"
-import { Conditions } from "./Conditions"
-
-export interface Creatable {
-	name: string
-	realm: Realm
-	supplier: Supplier
-	currencies: isoly.Currency[]
-	type: Category
-	conditions?: Conditions
-}
-
-export namespace Creatable {
-	export const type = isly.object<Creatable>({
-		name: isly.string(),
-		realm: isly.fromIs("realm", Realm.is),
-		supplier: isly.fromIs("supplier", Supplier.is),
-		currencies: isly.fromIs("Account.Creatable.currencies", isoly.Currency.is).array(),
-		type: Category.type,
-		conditions: Conditions.type.optional(),
-	})
-	export const is = type.is
-	export const flaw = type.flaw
-}

package/dist/Treasury/Account/Creatable.d.ts

@@ -1,19 +0,0 @@
-import { isoly } from "isoly";
-import { isly } from "isly";
-import { Realm } from "../../Realm";
-import { Supplier } from "../../Supplier";
-import { Category } from "./Category";
-import { Conditions } from "./Conditions";
-export interface Creatable {
-    name: string;
-    realm: Realm;
-    supplier: Supplier;
-    currencies: isoly.Currency[];
-    type: Category;
-    conditions?: Conditions;
-}
-export declare namespace Creatable {
-    const type: isly.object.ExtendableType<Creatable>;
-    const is: isly.Type.IsFunction<Creatable>;
-    const flaw: isly.Type.FlawFunction;
-}

package/dist/Treasury/Account/Creatable.js

@@ -1,20 +0,0 @@
-import { isoly } from "isoly";
-import { isly } from "isly";
-import { Realm } from "../../Realm";
-import { Supplier } from "../../Supplier";
-import { Category } from "./Category";
-import { Conditions } from "./Conditions";
-export var Creatable;
-(function (Creatable) {
-    Creatable.type = isly.object({
-        name: isly.string(),
-        realm: isly.fromIs("realm", Realm.is),
-        supplier: isly.fromIs("supplier", Supplier.is),
-        currencies: isly.fromIs("Account.Creatable.currencies", isoly.Currency.is).array(),
-        type: Category.type,
-        conditions: Conditions.type.optional(),
-    });
-    Creatable.is = Creatable.type.is;
-    Creatable.flaw = Creatable.type.flaw;
-})(Creatable || (Creatable = {}));
-//# sourceMappingURL=Creatable.js.map

package/dist/Treasury/Account/Creatable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Creatable.js","sourceRoot":"../","sources":["Treasury/Account/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAWzC,MAAM,KAAW,SAAS,CAWzB;AAXD,WAAiB,SAAS;IACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QACnB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QACrC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9C,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,8BAA8B,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QAClF,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE;KACtC,CAAC,CAAA;IACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IACZ,cAAI,GAAG,UAAA,IAAI,CAAC,IAAI,CAAA;AAC9B,CAAC,EAXgB,SAAS,KAAT,SAAS,QAWzB"}