@pax2pay/model-banking 0.1.299 → 0.1.301

package/Client/Treasury.ts

@@ -16,7 +16,7 @@ export class Treasury {
 	async listTransactions(accountId: string): Promise<TreasuryModel.Transaction[] | gracely.Error> {
 		return this.client.get<TreasuryModel.Transaction[]>(`/treasury/account/${accountId}/transaction`)
 	}
-	async listAccounts(): Promise<TreasuryModel.Account[] | gracely.Error> {
-		return this.client.get<TreasuryModel.Account[]>(`/treasury/account`)
+	async listAccounts(): Promise<TreasuryModel.Account.Listable[] | gracely.Error> {
+		return this.client.get<TreasuryModel.Account.Listable[]>(`/treasury/account`)
 	}
 }

package/Treasury/Account/index.ts

@@ -5,6 +5,7 @@ import { Rail } from "../../Rail"
 import { Realm } from "../../Realm"
 import { Supplier } from "../../Supplier"
 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"
@@ -24,35 +25,24 @@ export interface Account {
 	rail: Rail.Address[]
 	balance: Balance
 }
-
 export namespace Account {
 	export const type = isly.object<Account>({
 		id: isly.string(),
 		created: isly.fromIs("Treasury.Account.Created", isoly.DateTime.is),
 		name: isly.string(),
-		realm: isly.fromIs("realm", Realm.is),
-		supplier: isly.fromIs("supplier", Supplier.is),
+		realm: Realm.type,
+		supplier: Supplier.type,
 		reference: isly.string(),
 		currencies: isly.fromIs("Treasury.Account.currencies", isoly.Currency.is).array(),
 		type: AccountCategory.type,
 		conditions: AccountConditions.type,
-		rail: isly.fromIs("Treasury.Account.rail", Rail.Address.is).array(),
+		rail: Rail.Address.type.array(),
 		balance: isly.fromIs("Treasury.Account.balance", Balance.is),
 	})
-	export const is = type.is
-	export const flaw = type.flaw
-	export function isIdentifier(value: cryptly.Identifier | any): value is cryptly.Identifier {
-		return cryptly.Identifier.is(value, 8)
-	}
-
-	export type Creatable = AccountCreatable
-	export const Creatable = AccountCreatable
-	export type Storable = AccountStorable
-	export const Storable = AccountStorable
-	export type Fetchable = AccountFetchable
-	export const Fetchable = AccountFetchable
-	export type Category = AccountCategory
-	export const Category = AccountCategory
-	export type Conditions = AccountConditions
-	export const Conditions = AccountConditions
+	export type Listable = Account & { transactions: Transaction[] }
+	export import Creatable = AccountCreatable
+	export import Storable = AccountStorable
+	export import Fetchable = AccountFetchable
+	export import Category = AccountCategory
+	export import Conditions = AccountConditions
 }

package/Treasury/Transaction/Creatable.ts

@@ -1,4 +1,5 @@
 import { isoly } from "isoly"
+import { isly } from "isly"
 import { Rail } from "../../Rail"
 
 export interface Creatable {
@@ -6,18 +7,14 @@ export interface Creatable {
 	currency: isoly.Currency
 	amount: number
 	description: string
+	external?: string
 }
-
 export namespace Creatable {
-	export function is(value: Creatable | any): value is Creatable {
-		return (
-			value &&
-			typeof value == "object" &&
-			value.creditor &&
-			Rail.Address.is(value.creditor) &&
-			isoly.Currency.is(value.currency) &&
-			typeof value.amount == "number" &&
-			typeof value.description == "string"
-		)
-	}
+	export const type = isly.object<Creatable>({
+		creditor: Rail.Address.type,
+		currency: isly.fromIs("transaction.currency", isoly.Currency.is),
+		amount: isly.number(),
+		description: isly.string(),
+		external: isly.string().optional(),
+	})
 }

package/Treasury/Transaction/index.ts

@@ -1,25 +1,17 @@
 import { cryptly } from "cryptly"
 import { isoly } from "isoly"
+import { isly } from "isly"
 import { Rail } from "../../Rail"
 import { Creatable as TransactionCreatable } from "./Creatable"
 
 export interface Transaction extends TransactionCreatable {
+	id: cryptly.Identifier
+	created: string
 	debtor: Rail.Address
-	readonly id: cryptly.Identifier
-	readonly created: isoly.DateTime
 }
 export namespace Transaction {
-	export function is(value: any | Transaction): value is Transaction {
-		return (
-			value &&
-			typeof value == "object" &&
-			Rail.Address.is(value.debtor) &&
-			cryptly.Identifier.is(value.id) &&
-			isoly.DateTime.is(value.created) &&
-			Creatable.is({ ...value })
-		)
-	}
-	export function fromCreatable(transaction: TransactionCreatable, debtor: Rail.Address): Transaction {
+	export import Creatable = TransactionCreatable
+	export function fromCreatable(transaction: Creatable, debtor: Rail.Address): Transaction {
 		return {
 			debtor,
 			id: cryptly.Identifier.generate(8),
@@ -27,7 +19,9 @@ export namespace Transaction {
 			...transaction,
 		}
 	}
-
-	export const Creatable = TransactionCreatable
-	export type Creatable = TransactionCreatable
+	export const type = Creatable.type.extend<Transaction>({
+		id: isly.string(),
+		created: isly.string(),
+		debtor: Rail.Address.type,
+	})
 }

package/Treasury/index.ts

@@ -13,22 +13,9 @@ export namespace Treasury {
 			"hours"
 		)
 	}
-	export type Account = TreasuryAccount
-	export type Transaction = TreasuryTransaction
+	export import Transaction = TreasuryTransaction
+	export import Snapshot = TreasurySnapshot
+	export import Account = TreasuryAccount
 	export type Balance = TreasuryBalance
 	export const Balance = TreasuryBalance
-	export import Snapshot = TreasurySnapshot
-	export namespace Account {
-		export type Creatable = TreasuryAccount.Creatable
-		export const Creatable = TreasuryAccount.Creatable
-		export type Storable = TreasuryAccount.Storable
-		export const Storable = TreasuryAccount.Storable
-		export type Fetchable = TreasuryAccount.Fetchable
-		export const Fetchable = TreasuryAccount.Fetchable
-		export type Conditions = TreasuryAccount.Conditions
-		export const Conditions = TreasuryAccount.Conditions
-		export type Category = TreasuryAccount.Category
-		export const Category = TreasuryAccount.Category
-		export const is = TreasuryAccount.is
-	}
 }

package/dist/Client/Treasury.d.ts

@@ -9,5 +9,5 @@ export declare class Treasury {
     change(currency: isoly.Currency, changes: Result[]): Promise<gracely.Result>;
     fetch(hour?: isoly.DateTime): Promise<TreasuryModel.Snapshot | gracely.Error>;
     listTransactions(accountId: string): Promise<TreasuryModel.Transaction[] | gracely.Error>;
-    listAccounts(): Promise<TreasuryModel.Account[] | gracely.Error>;
+    listAccounts(): Promise<TreasuryModel.Account.Listable[] | gracely.Error>;
 }

package/dist/Client/Treasury.js.map

@@ -1 +1 @@
-{"version":3,"file":"Treasury.js","sourceRoot":"../","sources":["Client/Treasury.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAK7B,MAAM,OAAO,QAAQ;IACpB,YAA6B,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;IAAG,CAAC;IACpD,KAAK,CAAC,MAAM,CAAC,QAAwB,EAAE,OAAiB;QACvD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,IAAqB;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACrE,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAyB,qBAAqB,IAAI,EAAE,CAAC,CAAA;IAC5E,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,SAAiB;QACvC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAA8B,qBAAqB,SAAS,cAAc,CAAC,CAAA;IAClG,CAAC;IACD,KAAK,CAAC,YAAY;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAA0B,mBAAmB,CAAC,CAAA;IACrE,CAAC;CACD"}
+{"version":3,"file":"Treasury.js","sourceRoot":"../","sources":["Client/Treasury.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAK7B,MAAM,OAAO,QAAQ;IACpB,YAA6B,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;IAAG,CAAC;IACpD,KAAK,CAAC,MAAM,CAAC,QAAwB,EAAE,OAAiB;QACvD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAA;IAC3D,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,IAAqB;QAChC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QACrE,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAyB,qBAAqB,IAAI,EAAE,CAAC,CAAA;IAC5E,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,SAAiB;QACvC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAA8B,qBAAqB,SAAS,cAAc,CAAC,CAAA;IAClG,CAAC;IACD,KAAK,CAAC,YAAY;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAmC,mBAAmB,CAAC,CAAA;IAC9E,CAAC;CACD"}

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

@@ -5,6 +5,7 @@ import { Rail } from "../../Rail";
 import { Realm } from "../../Realm";
 import { Supplier } from "../../Supplier";
 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";
@@ -27,17 +28,12 @@ export interface Account {
 }
 export declare namespace Account {
     const type: isly.object.ExtendableType<Account>;
-    const is: isly.Type.IsFunction<Account>;
-    const flaw: isly.Type.FlawFunction;
-    function isIdentifier(value: cryptly.Identifier | any): value is cryptly.Identifier;
-    type Creatable = AccountCreatable;
-    const Creatable: typeof AccountCreatable;
-    type Storable = AccountStorable;
-    const Storable: typeof AccountStorable;
-    type Fetchable = AccountFetchable;
-    const Fetchable: typeof AccountFetchable;
-    type Category = AccountCategory;
-    const Category: typeof AccountCategory;
-    type Conditions = AccountConditions;
-    const Conditions: typeof AccountConditions;
+    type Listable = Account & {
+        transactions: Transaction[];
+    };
+    export import Creatable = AccountCreatable;
+    export import Storable = AccountStorable;
+    export import Fetchable = AccountFetchable;
+    export import Category = AccountCategory;
+    export import Conditions = AccountConditions;
 }

package/dist/Treasury/Account/index.js

@@ -1,4 +1,3 @@
-import { cryptly } from "cryptly";
 import { isoly } from "isoly";
 import { isly } from "isly";
 import { Rail } from "../../Rail";
@@ -16,21 +15,15 @@ export var Account;
         id: isly.string(),
         created: isly.fromIs("Treasury.Account.Created", isoly.DateTime.is),
         name: isly.string(),
-        realm: isly.fromIs("realm", Realm.is),
-        supplier: isly.fromIs("supplier", Supplier.is),
+        realm: Realm.type,
+        supplier: Supplier.type,
         reference: isly.string(),
         currencies: isly.fromIs("Treasury.Account.currencies", isoly.Currency.is).array(),
         type: AccountCategory.type,
         conditions: AccountConditions.type,
-        rail: isly.fromIs("Treasury.Account.rail", Rail.Address.is).array(),
+        rail: Rail.Address.type.array(),
         balance: isly.fromIs("Treasury.Account.balance", Balance.is),
     });
-    Account.is = Account.type.is;
-    Account.flaw = Account.type.flaw;
-    function isIdentifier(value) {
-        return cryptly.Identifier.is(value, 8);
-    }
-    Account.isIdentifier = isIdentifier;
     Account.Creatable = AccountCreatable;
     Account.Storable = AccountStorable;
     Account.Fetchable = AccountFetchable;

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Treasury/Account/index.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;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;AACpC,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;AAgBxD,MAAM,KAAW,OAAO,CA8BvB;AA9BD,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,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC;QACrC,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,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,MAAM,CAAC,uBAAuB,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE;QACnE,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,OAAO,CAAC,EAAE,CAAC;KAC5D,CAAC,CAAA;IACW,UAAE,GAAG,QAAA,IAAI,CAAC,EAAE,CAAA;IACZ,YAAI,GAAG,QAAA,IAAI,CAAC,IAAI,CAAA;IAC7B,SAAgB,YAAY,CAAC,KAA+B;QAC3D,OAAO,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;IACvC,CAAC;IAFe,oBAAY,eAE3B,CAAA;IAGY,iBAAS,GAAG,gBAAgB,CAAA;IAE5B,gBAAQ,GAAG,eAAe,CAAA;IAE1B,iBAAS,GAAG,gBAAgB,CAAA;IAE5B,gBAAQ,GAAG,eAAe,CAAA;IAE1B,kBAAU,GAAG,iBAAiB,CAAA;AAC5C,CAAC,EA9BgB,OAAO,KAAP,OAAO,QA8BvB"}
+{"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"}

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

@@ -1,11 +1,13 @@
 import { isoly } from "isoly";
+import { isly } from "isly";
 import { Rail } from "../../Rail";
 export interface Creatable {
     creditor: Rail.Address;
     currency: isoly.Currency;
     amount: number;
     description: string;
+    external?: string;
 }
 export declare namespace Creatable {
-    function is(value: Creatable | any): value is Creatable;
+    const type: isly.object.ExtendableType<Creatable>;
 }

package/dist/Treasury/Transaction/Creatable.js

@@ -1,16 +1,14 @@
 import { isoly } from "isoly";
+import { isly } from "isly";
 import { Rail } from "../../Rail";
 export var Creatable;
 (function (Creatable) {
-    function is(value) {
-        return (value &&
-            typeof value == "object" &&
-            value.creditor &&
-            Rail.Address.is(value.creditor) &&
-            isoly.Currency.is(value.currency) &&
-            typeof value.amount == "number" &&
-            typeof value.description == "string");
-    }
-    Creatable.is = is;
+    Creatable.type = isly.object({
+        creditor: Rail.Address.type,
+        currency: isly.fromIs("transaction.currency", isoly.Currency.is),
+        amount: isly.number(),
+        description: isly.string(),
+        external: isly.string().optional(),
+    });
 })(Creatable || (Creatable = {}));
 //# sourceMappingURL=Creatable.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Creatable.js","sourceRoot":"../","sources":["Treasury/Transaction/Creatable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AASjC,MAAM,KAAW,SAAS,CAYzB;AAZD,WAAiB,SAAS;IACzB,SAAgB,EAAE,CAAC,KAAsB;QACxC,OAAO,CACN,KAAK;YACL,OAAO,KAAK,IAAI,QAAQ;YACxB,KAAK,CAAC,QAAQ;YACd,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC/B,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC;YACjC,OAAO,KAAK,CAAC,MAAM,IAAI,QAAQ;YAC/B,OAAO,KAAK,CAAC,WAAW,IAAI,QAAQ,CACpC,CAAA;IACF,CAAC;IAVe,YAAE,KAUjB,CAAA;AACF,CAAC,EAZgB,SAAS,KAAT,SAAS,QAYzB"}
+{"version":3,"file":"Creatable.js","sourceRoot":"../","sources":["Treasury/Transaction/Creatable.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;AASjC,MAAM,KAAW,SAAS,CAQzB;AARD,WAAiB,SAAS;IACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;QAC1C,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;QAC3B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QACrB,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE;QAC1B,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAClC,CAAC,CAAA;AACH,CAAC,EARgB,SAAS,KAAT,SAAS,QAQzB"}

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

@@ -1,15 +1,14 @@
 import { cryptly } from "cryptly";
-import { isoly } from "isoly";
+import { isly } from "isly";
 import { Rail } from "../../Rail";
 import { Creatable as TransactionCreatable } from "./Creatable";
 export interface Transaction extends TransactionCreatable {
+    id: cryptly.Identifier;
+    created: string;
     debtor: Rail.Address;
-    readonly id: cryptly.Identifier;
-    readonly created: isoly.DateTime;
 }
 export declare namespace Transaction {
-    function is(value: any | Transaction): value is Transaction;
-    function fromCreatable(transaction: TransactionCreatable, debtor: Rail.Address): Transaction;
-    const Creatable: typeof TransactionCreatable;
-    type Creatable = TransactionCreatable;
+    export import Creatable = TransactionCreatable;
+    function fromCreatable(transaction: Creatable, debtor: Rail.Address): Transaction;
+    const type: isly.object.ExtendableType<Transaction>;
 }

package/dist/Treasury/Transaction/index.js

@@ -1,18 +1,11 @@
 import { cryptly } from "cryptly";
 import { isoly } from "isoly";
+import { isly } from "isly";
 import { Rail } from "../../Rail";
 import { Creatable as TransactionCreatable } from "./Creatable";
 export var Transaction;
 (function (Transaction) {
-    function is(value) {
-        return (value &&
-            typeof value == "object" &&
-            Rail.Address.is(value.debtor) &&
-            cryptly.Identifier.is(value.id) &&
-            isoly.DateTime.is(value.created) &&
-            Transaction.Creatable.is({ ...value }));
-    }
-    Transaction.is = is;
+    Transaction.Creatable = TransactionCreatable;
     function fromCreatable(transaction, debtor) {
         return {
             debtor,
@@ -22,6 +15,10 @@ export var Transaction;
         };
     }
     Transaction.fromCreatable = fromCreatable;
-    Transaction.Creatable = TransactionCreatable;
+    Transaction.type = Transaction.Creatable.type.extend({
+        id: isly.string(),
+        created: isly.string(),
+        debtor: Rail.Address.type,
+    });
 })(Transaction || (Transaction = {}));
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Treasury/Transaction/index.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,YAAY,CAAA;AACjC,OAAO,EAAE,SAAS,IAAI,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAO/D,MAAM,KAAW,WAAW,CAsB3B;AAtBD,WAAiB,WAAW;IAC3B,SAAgB,EAAE,CAAC,KAAwB;QAC1C,OAAO,CACN,KAAK;YACL,OAAO,KAAK,IAAI,QAAQ;YACxB,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;YAC7B,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;YAChC,YAAA,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAC1B,CAAA;IACF,CAAC;IATe,cAAE,KASjB,CAAA;IACD,SAAgB,aAAa,CAAC,WAAiC,EAAE,MAAoB;QACpF,OAAO;YACN,MAAM;YACN,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,GAAG,WAAW;SACd,CAAA;IACF,CAAC;IAPe,yBAAa,gBAO5B,CAAA;IAEY,qBAAS,GAAG,oBAAoB,CAAA;AAE9C,CAAC,EAtBgB,WAAW,KAAX,WAAW,QAsB3B"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Treasury/Transaction/index.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;AAC3B,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,SAAS,IAAI,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAO/D,MAAM,KAAW,WAAW,CAe3B;AAfD,WAAiB,WAAW;IACb,qBAAS,GAAG,oBAAoB,CAAA;IAC9C,SAAgB,aAAa,CAAC,WAAsB,EAAE,MAAoB;QACzE,OAAO;YACN,MAAM;YACN,EAAE,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;YAC7B,GAAG,WAAW;SACd,CAAA;IACF,CAAC;IAPe,yBAAa,gBAO5B,CAAA;IACY,gBAAI,GAAG,YAAA,SAAS,CAAC,IAAI,CAAC,MAAM,CAAc;QACtD,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACjB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;QACtB,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;KACzB,CAAC,CAAA;AACH,CAAC,EAfgB,WAAW,KAAX,WAAW,QAe3B"}

package/dist/Treasury/index.d.ts

@@ -5,22 +5,9 @@ import { Snapshot as TreasurySnapshot } from "./Snapshot";
 import { Transaction as TreasuryTransaction } from "./Transaction";
 export declare namespace Treasury {
     function key(hour?: isoly.DateTime): isoly.DateTime;
-    type Account = TreasuryAccount;
-    type Transaction = TreasuryTransaction;
+    export import Transaction = TreasuryTransaction;
+    export import Snapshot = TreasurySnapshot;
+    export import Account = TreasuryAccount;
     type Balance = TreasuryBalance;
     const Balance: typeof TreasuryBalance;
-    export import Snapshot = TreasurySnapshot;
-    namespace Account {
-        type Creatable = TreasuryAccount.Creatable;
-        const Creatable: typeof import("./Account/Creatable").Creatable;
-        type Storable = TreasuryAccount.Storable;
-        const Storable: typeof import("./Account/Storable").Storable;
-        type Fetchable = TreasuryAccount.Fetchable;
-        const Fetchable: typeof import("./Account/Fetchable").Fetchable;
-        type Conditions = TreasuryAccount.Conditions;
-        const Conditions: typeof import("./Account/Conditions").Conditions;
-        type Category = TreasuryAccount.Category;
-        const Category: typeof import("./Account/Category").Category;
-        const is: import("isly/dist/cjs/Type").Type.IsFunction<TreasuryAccount>;
-    }
 }

package/dist/Treasury/index.js

@@ -2,6 +2,7 @@ import { isoly } from "isoly";
 import { Account as TreasuryAccount } from "./Account";
 import { Balance as TreasuryBalance } from "./Balance";
 import { Snapshot as TreasurySnapshot } from "./Snapshot";
+import { Transaction as TreasuryTransaction } from "./Transaction";
 export var Treasury;
 (function (Treasury) {
     function key(hour) {
@@ -10,16 +11,9 @@ export var Treasury;
         return isoly.DateTime.truncate(isoly.DateTime.invert(hour && isoly.DateTime.epoch(latest) > isoly.DateTime.epoch(hour) ? hour : latest), "hours");
     }
     Treasury.key = key;
-    Treasury.Balance = TreasuryBalance;
+    Treasury.Transaction = TreasuryTransaction;
     Treasury.Snapshot = TreasurySnapshot;
-    let Account;
-    (function (Account) {
-        Account.Creatable = TreasuryAccount.Creatable;
-        Account.Storable = TreasuryAccount.Storable;
-        Account.Fetchable = TreasuryAccount.Fetchable;
-        Account.Conditions = TreasuryAccount.Conditions;
-        Account.Category = TreasuryAccount.Category;
-        Account.is = TreasuryAccount.is;
-    })(Account = Treasury.Account || (Treasury.Account = {}));
+    Treasury.Account = TreasuryAccount;
+    Treasury.Balance = TreasuryBalance;
 })(Treasury || (Treasury = {}));
 //# sourceMappingURL=index.js.map

package/dist/Treasury/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Treasury/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AACtD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AACtD,OAAO,EAAE,QAAQ,IAAI,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAGzD,MAAM,KAAW,QAAQ,CA2BxB;AA3BD,WAAiB,QAAQ;IACxB,SAAgB,GAAG,CAAC,IAAqB;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QAC1F,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAC7B,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EACxG,OAAO,CACP,CAAA;IACF,CAAC;IAPe,YAAG,MAOlB,CAAA;IAIY,gBAAO,GAAG,eAAe,CAAA;IACxB,iBAAQ,GAAG,gBAAgB,CAAA;IACzC,IAAiB,OAAO,CAYvB;IAZD,WAAiB,OAAO;QAEV,iBAAS,GAAG,eAAe,CAAC,SAAS,CAAA;QAErC,gBAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;QAEnC,iBAAS,GAAG,eAAe,CAAC,SAAS,CAAA;QAErC,kBAAU,GAAG,eAAe,CAAC,UAAU,CAAA;QAEvC,gBAAQ,GAAG,eAAe,CAAC,QAAQ,CAAA;QACnC,UAAE,GAAG,eAAe,CAAC,EAAE,CAAA;IACrC,CAAC,EAZgB,OAAO,GAAP,gBAAO,KAAP,gBAAO,QAYvB;AACF,CAAC,EA3BgB,QAAQ,KAAR,QAAQ,QA2BxB"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Treasury/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AACtD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAA;AACtD,OAAO,EAAE,QAAQ,IAAI,gBAAgB,EAAE,MAAM,YAAY,CAAA;AACzD,OAAO,EAAE,WAAW,IAAI,mBAAmB,EAAE,MAAM,eAAe,CAAA;AAElE,MAAM,KAAW,QAAQ,CAcxB;AAdD,WAAiB,QAAQ;IACxB,SAAgB,GAAG,CAAC,IAAqB;QACxC,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;QAChC,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QAC1F,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAC7B,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,EACxG,OAAO,CACP,CAAA;IACF,CAAC;IAPe,YAAG,MAOlB,CAAA;IACa,oBAAW,GAAG,mBAAmB,CAAA;IACjC,iBAAQ,GAAG,gBAAgB,CAAA;IAC3B,gBAAO,GAAG,eAAe,CAAA;IAE1B,gBAAO,GAAG,eAAe,CAAA;AACvC,CAAC,EAdgB,QAAQ,KAAR,QAAQ,QAcxB"}

package/package.json

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