@pax2pay/model-banking 0.1.368 → 0.1.369

package/Rail/Address/Card.ts

@@ -2,7 +2,7 @@ import { isly } from "isly"
 import { Acquirer } from "../../Acquirer"
 import { Card as ModelCard } from "../../Card"
 import { Merchant } from "../../Merchant"
-import { Rule } from "../../Rule"
+import type { Rule } from "../../Rule"
 
 export interface Card {
 	type: "card"

package/Rule/State/Transaction.ts

@@ -1,20 +1,27 @@
 import { isoly } from "isoly"
-import type { Transaction as ModelTransaction } from "../../Transaction"
+import type { Address } from "../../Rail/Address"
+import { Transaction as ModelTransaction } from "../../Transaction"
 import { Rule } from "../Rule"
 
 export interface Transaction extends Omit<ModelTransaction.Creatable, "currency" | "amount"> {
 	kind: Rule.Base.Kind
 	amount: number
+	type: ModelTransaction.Types
 	fee?: number
 	risk?: number
 	original: { currency: isoly.Currency; amount: number }
 }
 export namespace Transaction {
-	export function from(transaction: ModelTransaction.Creatable, kind: Rule.Base.Kind): Transaction {
+	export function from(
+		accountName: string,
+		transaction: ModelTransaction.Creatable & { counterpart: Address },
+		kind: Rule.Base.Kind
+	): Transaction {
 		return {
 			...transaction,
 			kind,
 			amount: Math.abs(transaction.amount),
+			type: ModelTransaction.getType(transaction.counterpart, accountName),
 			original: { currency: transaction.currency, amount: Math.abs(transaction.amount) },
 		}
 	}

package/Rule/State/index.ts

@@ -1,6 +1,7 @@
 import { isly } from "isly"
 import { Account as ModelAccount } from "../../Account"
-import { Transaction as ModelTransaction } from "../../Transaction"
+import type { Address } from "../../Rail/Address"
+import type { Transaction as ModelTransaction } from "../../Transaction"
 import { Rule } from "../Rule"
 import { Account as StateAccount } from "./Account"
 import { Authorization as StateAuthorization } from "./Authorization"
@@ -42,7 +43,7 @@ export namespace State {
 		account: ModelAccount,
 		transactions: Account.Transactions,
 		days: Account.Days,
-		transaction: ModelTransaction.Creatable,
+		transaction: ModelTransaction.Creatable & { counterpart: Address },
 		kind: Rule.Base.Kind,
 		authorization?: Authorization,
 		card?: Card,
@@ -51,7 +52,7 @@ export namespace State {
 		return {
 			data,
 			account: Account.from(account, transactions, days),
-			transaction: Transaction.from(transaction, kind),
+			transaction: Transaction.from(account.name, transaction, kind),
 			authorization,
 			card,
 			organization,

package/Transaction/Note.ts

@@ -1,6 +1,6 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Rule } from "../Rule"
+import type { Rule } from "../Rule"
 
 export interface Note extends Note.Creatable {
 	author: string
@@ -22,7 +22,7 @@ export namespace Note {
 			text: isly.string().optional(),
 			action: isly.string(["approve", "reject"]).optional(),
 			flags: isly.string().array().optional(),
-			rule: Rule.type.optional(),
+			rule: isly.any().optional(),
 		})
 		export const is = type.is
 	}

package/dist/Rail/Address/Card.d.ts

@@ -2,7 +2,7 @@ import { isly } from "isly";
 import { Acquirer } from "../../Acquirer";
 import { Card as ModelCard } from "../../Card";
 import { Merchant } from "../../Merchant";
-import { Rule } from "../../Rule";
+import type { Rule } from "../../Rule";
 export interface Card {
     type: "card";
     scheme: ModelCard.Scheme;

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

@@ -1,9 +1,11 @@
 import { isoly } from "isoly";
-import type { Transaction as ModelTransaction } from "../../Transaction";
+import type { Address } from "../../Rail/Address";
+import { Transaction as ModelTransaction } from "../../Transaction";
 import { Rule } from "../Rule";
 export interface Transaction extends Omit<ModelTransaction.Creatable, "currency" | "amount"> {
     kind: Rule.Base.Kind;
     amount: number;
+    type: ModelTransaction.Types;
     fee?: number;
     risk?: number;
     original: {
@@ -12,5 +14,7 @@ export interface Transaction extends Omit<ModelTransaction.Creatable, "currency"
     };
 }
 export declare namespace Transaction {
-    function from(transaction: ModelTransaction.Creatable, kind: Rule.Base.Kind): Transaction;
+    function from(accountName: string, transaction: ModelTransaction.Creatable & {
+        counterpart: Address;
+    }, kind: Rule.Base.Kind): Transaction;
 }

package/dist/Rule/State/Transaction.js

@@ -1,10 +1,12 @@
+import { Transaction as ModelTransaction } from "../../Transaction";
 export var Transaction;
 (function (Transaction) {
-    function from(transaction, kind) {
+    function from(accountName, transaction, kind) {
         return {
             ...transaction,
             kind,
             amount: Math.abs(transaction.amount),
+            type: ModelTransaction.getType(transaction.counterpart, accountName),
             original: { currency: transaction.currency, amount: Math.abs(transaction.amount) },
         };
     }

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

@@ -1 +1 @@
-{"version":3,"file":"Transaction.js","sourceRoot":"../","sources":["Rule/State/Transaction.ts"],"names":[],"mappings":"AAWA,MAAM,KAAW,WAAW,CAS3B;AATD,WAAiB,WAAW;IAC3B,SAAgB,IAAI,CAAC,WAAuC,EAAE,IAAoB;QACjF,OAAO;YACN,GAAG,WAAW;YACd,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;YACpC,QAAQ,EAAE,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;SAClF,CAAA;IACF,CAAC;IAPe,gBAAI,OAOnB,CAAA;AACF,CAAC,EATgB,WAAW,KAAX,WAAW,QAS3B"}
+{"version":3,"file":"Transaction.js","sourceRoot":"../","sources":["Rule/State/Transaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAWnE,MAAM,KAAW,WAAW,CAc3B;AAdD,WAAiB,WAAW;IAC3B,SAAgB,IAAI,CACnB,WAAmB,EACnB,WAAkE,EAClE,IAAoB;QAEpB,OAAO;YACN,GAAG,WAAW;YACd,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,EAAE,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE;SAClF,CAAA;IACF,CAAC;IAZe,gBAAI,OAYnB,CAAA;AACF,CAAC,EAdgB,WAAW,KAAX,WAAW,QAc3B"}

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

@@ -1,6 +1,7 @@
 import { isly } from "isly";
 import { Account as ModelAccount } from "../../Account";
-import { Transaction as ModelTransaction } from "../../Transaction";
+import type { Address } from "../../Rail/Address";
+import type { Transaction as ModelTransaction } from "../../Transaction";
 import { Rule } from "../Rule";
 import { Account as StateAccount } from "./Account";
 import { Authorization as StateAuthorization } from "./Authorization";
@@ -36,5 +37,7 @@ export declare namespace State {
         flags: string[];
         notes: ModelTransaction.Note[];
     }
-    function from(data: Data, account: ModelAccount, transactions: Account.Transactions, days: Account.Days, transaction: ModelTransaction.Creatable, kind: Rule.Base.Kind, authorization?: Authorization, card?: Card, organization?: Organization): State;
+    function from(data: Data, account: ModelAccount, transactions: Account.Transactions, days: Account.Days, transaction: ModelTransaction.Creatable & {
+        counterpart: Address;
+    }, kind: Rule.Base.Kind, authorization?: Authorization, card?: Card, organization?: Organization): State;
 }

package/dist/Rule/State/index.js

@@ -22,7 +22,7 @@ export var State;
         return {
             data,
             account: State.Account.from(account, transactions, days),
-            transaction: State.Transaction.from(transaction, kind),
+            transaction: State.Transaction.from(account.name, transaction, kind),
             authorization,
             card,
             organization,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Rule/State/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAI3B,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACrE,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,QAAQ,CAAA;AAE1C,OAAO,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAU/D,MAAM,KAAW,KAAK,CAuCrB;AAvCD,WAAiB,KAAK;IACP,aAAO,GAAG,YAAY,CAAA;IACtB,mBAAa,GAAG,kBAAkB,CAAA;IAClC,UAAI,GAAG,SAAS,CAAA;IAChB,aAAO,GAAG,YAAY,CAAA;IACtB,iBAAW,GAAG,gBAAgB,CAAA;IAC9B,kBAAY,GAAG,iBAAiB,CAAA;IAG9C,IAAiB,OAAO,CAGvB;IAHD,WAAiB,OAAO;QACV,cAAM,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAA;QACjD,YAAI,GAAG,IAAI,CAAC,MAAM,CAAU,QAAA,MAAM,CAAC,CAAA;IACjD,CAAC,EAHgB,OAAO,GAAP,aAAO,KAAP,aAAO,QAGvB;IAOD,SAAgB,IAAI,CACnB,IAAU,EACV,OAAqB,EACrB,YAAkC,EAClC,IAAkB,EAClB,WAAuC,EACvC,IAAoB,EACpB,aAA6B,EAC7B,IAAW,EACX,YAA2B;QAE3B,OAAO;YACN,IAAI;YACJ,OAAO,EAAE,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC;YAClD,WAAW,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC;YAChD,aAAa;YACb,IAAI;YACJ,YAAY;SACZ,CAAA;IACF,CAAC;IAnBe,UAAI,OAmBnB,CAAA;AACF,CAAC,EAvCgB,KAAK,KAAL,KAAK,QAuCrB"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Rule/State/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAK3B,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,aAAa,IAAI,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACrE,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,QAAQ,CAAA;AAE1C,OAAO,EAAE,YAAY,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAClE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,WAAW,CAAA;AACnD,OAAO,EAAE,WAAW,IAAI,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAU/D,MAAM,KAAW,KAAK,CAuCrB;AAvCD,WAAiB,KAAK;IACP,aAAO,GAAG,YAAY,CAAA;IACtB,mBAAa,GAAG,kBAAkB,CAAA;IAClC,UAAI,GAAG,SAAS,CAAA;IAChB,aAAO,GAAG,YAAY,CAAA;IACtB,iBAAW,GAAG,gBAAgB,CAAA;IAC9B,kBAAY,GAAG,iBAAiB,CAAA;IAG9C,IAAiB,OAAO,CAGvB;IAHD,WAAiB,OAAO;QACV,cAAM,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAA;QACjD,YAAI,GAAG,IAAI,CAAC,MAAM,CAAU,QAAA,MAAM,CAAC,CAAA;IACjD,CAAC,EAHgB,OAAO,GAAP,aAAO,KAAP,aAAO,QAGvB;IAOD,SAAgB,IAAI,CACnB,IAAU,EACV,OAAqB,EACrB,YAAkC,EAClC,IAAkB,EAClB,WAAkE,EAClE,IAAoB,EACpB,aAA6B,EAC7B,IAAW,EACX,YAA2B;QAE3B,OAAO;YACN,IAAI;YACJ,OAAO,EAAE,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC;YAClD,WAAW,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC;YAC9D,aAAa;YACb,IAAI;YACJ,YAAY;SACZ,CAAA;IACF,CAAC;IAnBe,UAAI,OAmBnB,CAAA;AACF,CAAC,EAvCgB,KAAK,KAAL,KAAK,QAuCrB"}

package/dist/Transaction/Note.d.ts

@@ -1,6 +1,6 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
-import { Rule } from "../Rule";
+import type { Rule } from "../Rule";
 export interface Note extends Note.Creatable {
     author: string;
     created: isoly.DateTime;

package/dist/Transaction/Note.js

@@ -1,6 +1,5 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
-import { Rule } from "../Rule";
 export var Note;
 (function (Note) {
     function fromCreatable(note, author) {
@@ -13,7 +12,7 @@ export var Note;
             text: isly.string().optional(),
             action: isly.string(["approve", "reject"]).optional(),
             flags: isly.string().array().optional(),
-            rule: Rule.type.optional(),
+            rule: isly.any().optional(),
         });
         Creatable.is = Creatable.type.is;
     })(Creatable = Note.Creatable || (Note.Creatable = {}));

package/dist/Transaction/Note.js.map

@@ -1 +1 @@
-{"version":3,"file":"Note.js","sourceRoot":"../","sources":["Transaction/Note.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,SAAS,CAAA;AAO9B,MAAM,KAAW,IAAI,CAwBpB;AAxBD,WAAiB,IAAI;IACpB,SAAgB,aAAa,CAAC,IAAe,EAAE,MAAc;QAC5D,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;IAClE,CAAC;IAFe,kBAAa,gBAE5B,CAAA;IAOD,IAAiB,SAAS,CAQzB;IARD,WAAiB,SAAS;QACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;YAC1C,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC9B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE;YACrD,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;YACvC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;SAC1B,CAAC,CAAA;QACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IAC1B,CAAC,EARgB,SAAS,GAAT,cAAS,KAAT,cAAS,QAQzB;IACY,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAO;QAC/C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QACrB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;KACtB,CAAC,CAAA;IACW,OAAE,GAAG,KAAA,IAAI,CAAC,EAAE,CAAA;AAC1B,CAAC,EAxBgB,IAAI,KAAJ,IAAI,QAwBpB"}
+{"version":3,"file":"Note.js","sourceRoot":"../","sources":["Transaction/Note.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAQ3B,MAAM,KAAW,IAAI,CAwBpB;AAxBD,WAAiB,IAAI;IACpB,SAAgB,aAAa,CAAC,IAAe,EAAE,MAAc;QAC5D,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;IAClE,CAAC;IAFe,kBAAa,gBAE5B,CAAA;IAOD,IAAiB,SAAS,CAQzB;IARD,WAAiB,SAAS;QACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;YAC1C,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC9B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE;YACrD,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;YACvC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE;SAC3B,CAAC,CAAA;QACW,YAAE,GAAG,UAAA,IAAI,CAAC,EAAE,CAAA;IAC1B,CAAC,EARgB,SAAS,GAAT,cAAS,KAAT,cAAS,QAQzB;IACY,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAO;QAC/C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QACrB,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;KACtB,CAAC,CAAA;IACW,OAAE,GAAG,KAAA,IAAI,CAAC,EAAE,CAAA;AAC1B,CAAC,EAxBgB,IAAI,KAAJ,IAAI,QAwBpB"}

package/package.json

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