@pax2pay/model-banking 0.1.594 → 0.1.596

package/Operation/Changes.ts

@@ -1,11 +1,10 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
 import { Balance as AccountBalance } from "../Balance"
-import { Counterbalance as CounterbalanceOperation } from "../Counterbalance"
 import type { Settlement } from "../Settlement"
 import { Change } from "./Change"
 
-export type Changes = Partial<Record<Changes.Entry.Balance, Change>> & Record<Changes.Entry.Counterbalance, Change>
+export type Changes = Partial<Record<Changes.Entry.Balance, Change>>
 export namespace Changes {
 	export function available(changes: MaybeLegacy, currency: isoly.Currency, legacy: boolean = false): number {
 		return legacy
@@ -50,31 +49,23 @@ export namespace Changes {
 			0
 		)
 	}
-	export type Sum = Partial<Record<Changes.Entry.Balance, number>> & Record<Changes.Entry.Counterbalance, number>
+	export type Sum = Partial<Record<Changes.Entry.Balance, number>>
 	export type MaybeLegacy = Changes | Legacy
-	export const type = isly.record<Legacy>(isly.string(), Change.type)
-	export type Legacy = Partial<Record<AccountBalance.Legacy.Entry, Change>> &
-		Record<Changes.Entry.Counterbalance, Change>
+	export const type = isly.record<Changes>(isly.string(), Change.type)
+	export type Legacy = Partial<Record<AccountBalance.Legacy.Entry, Change>>
 	export namespace Legacy {
 		export const type = isly.record<Legacy>(isly.string(), Change.type)
-		export type Entry = AccountBalance.Legacy.Entry | Legacy.Entry.Counterbalance
+		export type Entry = AccountBalance.Legacy.Entry
 		export namespace Entry {
-			export function split(counterbalance: Counterbalance): [isoly.DateTime, CounterbalanceOperation.Link] {
-				const split = counterbalance.split("-")
-				const hour = split.splice(-3, 3).join("-")
-				return [hour, split.join("-")]
-			}
 			export type Balance = typeof AccountBalance.Legacy.Entry.values[number]
 			export namespace Balance {
 				export const type = AccountBalance.Legacy.Entry.type
 			}
-			export type Counterbalance = `${CounterbalanceOperation.Link}-${isoly.DateTime}`
 		}
 	}
-	export type Entry = Entry.Balance | Entry.Counterbalance
+	export type Entry = Entry.Balance
 	export namespace Entry {
 		export const type = isly.string<Entry>()
-		export type Counterbalance = `${isoly.DateTime}-${CounterbalanceOperation.Link}`
 		export function getBalanceType(key: string): string {
 			let result = ""
 			if (key.includes("net") || key.includes("fee") || key.includes("charge"))
@@ -87,13 +78,6 @@ export namespace Changes {
 				result = "fiat"
 			return result
 		}
-		export function split(counterbalance: Counterbalance): [isoly.DateTime, CounterbalanceOperation.Link] {
-			const split = counterbalance.split("-")
-			const hour = split.slice(0, 3).join("-")
-			return isoly.DateTime.is(hour)
-				? [hour, split.slice(3, split.length).join("-")]
-				: Legacy.Entry.split(counterbalance)
-		}
 		export type Balance = typeof Balance.values[number]
 		export namespace Balance {
 			export const values = ["available", "reserved-incoming", "reserved-outgoing", "reserved-buffer"] as const

package/Rail/Address/internal.ts

@@ -6,7 +6,7 @@ import { Realm } from "../../Realm"
 export interface Internal {
 	type: "internal"
 	name?: string
-	identifier: cryptly.Identifier | Operation.Changes.Entry.Counterbalance
+	identifier: cryptly.Identifier
 	organization?: string
 }
 export namespace Internal {

package/Rule/Other.ts

@@ -1,5 +1,4 @@
 import { isoly } from "isoly"
-import { selectively } from "selectively"
 import { isly } from "isly"
 import { isly as isly2 } from "isly2"
 import type { Note } from "../Transaction/Note"
@@ -24,8 +23,7 @@ export namespace Other {
 	export const type2: isly2.Object<Other> = Base.type2.extend<Other>({ action: Action.type2 })
 	export function evaluate(
 		rules: Other[],
-		state: State,
-		macros?: Record<string, selectively.Definition>
+		state: State
 	): { outcomes: Record<Other.Action, Other[]>; notes: Note[]; flags: Set<string> } {
 		const now = isoly.DateTime.now()
 		const result: ReturnType<typeof evaluate> = {
@@ -42,7 +40,7 @@ export namespace Other {
 			["card", "external", "internal"].some(type => type == state.transaction.type)
 		)
 			for (const rule of rules)
-				if (control(rule, state, macros)) {
+				if (control(rule, state)) {
 					result.outcomes[rule.action].push(rule)
 					result.notes.push({ author: "automatic", created: now, text: rule.name, rule })
 					rule.flags.forEach(f => result.flags.add(f))

package/Rule/State/Account.ts

@@ -3,8 +3,8 @@ import { Rail } from "../../Rail"
 
 export interface Account extends ModelAccount {
 	address: Rail.Address
-	transactions: Account.Transactions
-	days: Account.Days
+	transactions?: Account.Transactions
+	days?: Account.Days
 }
 // keep for note so we remember how to store: type Storage = Record<`statistics|currency|${isoly.Currency}`, isoly.DateTime>
 export namespace Account {
@@ -26,7 +26,7 @@ export namespace Account {
 		outgoing: { today: Today }
 		card: { today: Today }
 	}
-	export function from(account: ModelAccount, address: Rail.Address, transactions: Transactions, days: Days): Account {
-		return { ...account, address, transactions, days }
+	export function from(account: ModelAccount, address: Rail.Address): Account {
+		return { ...account, address }
 	}
 }

package/Rule/State/index.ts

@@ -39,8 +39,6 @@ export namespace State {
 	export function from(
 		account: ModelAccount,
 		address: Rail.Address,
-		transactions: Account.Transactions,
-		days: Account.Days,
 		transaction: ModelTransaction.Creatable.Resolved | ModelTransaction,
 		kind: Rule.Base.Kind,
 		stage: "finalize" | "initiate",
@@ -48,7 +46,7 @@ export namespace State {
 		organization?: Organization
 	): State {
 		return {
-			account: Account.from(account, address, transactions, days),
+			account: Account.from(account, address),
 			transaction: Transaction.from(account, transaction, kind, stage),
 			authorization: Authorization.from(transaction),
 			card,
@@ -63,14 +61,12 @@ export namespace State {
 	export function fromPreTransaction(
 		account: ModelAccount,
 		address: Rail.Address,
-		transactions: Account.Transactions,
-		days: Account.Days,
 		transaction: ModelTransaction.PreTransaction,
 		card?: ModelCard & { statistics: Card.Statistics },
 		organization?: Organization
 	): State {
 		return {
-			account: Account.from(account, address, transactions, days),
+			account: Account.from(account, address),
 			transaction: Transaction.from(account, transaction, type[transaction.type], "initiate"),
 			card: card ? Card.from(card, card.statistics) : undefined,
 			organization,

package/Rule/control.ts

@@ -1,8 +1,7 @@
 import { selectively } from "selectively"
 import type { Rule } from "."
-import { definitions } from "./definitions"
 import type { State } from "./State"
 
 export function control(rule: Rule, state: State, macros?: Record<string, selectively.Definition>): boolean {
-	return selectively.resolve({ ...macros, ...definitions }, selectively.parse(rule.condition)).is(state)
+	return selectively.parse(rule.condition).is(state)
 }

package/Rule/index.ts

@@ -1,6 +1,4 @@
-import { selectively } from "selectively"
 import { isly } from "isly"
-import { Exchange } from "../Exchange"
 import type { Note } from "../Transaction/Note"
 import { Base as RuleBase } from "./Base"
 import { control as ruleControl } from "./control"
@@ -23,12 +21,7 @@ export namespace Rule {
 		export const type = isly.string<Action>(values)
 	}
 	export const type = ruleType
-	export function evaluate(
-		rules: Rule[],
-		state: RuleState,
-		macros?: Record<string, selectively.Definition>,
-		table: Exchange.Rates = {}
-	): RuleState.Evaluated {
+	export function evaluate(rules: Rule[], state: RuleState): RuleState.Evaluated {
 		const outcomes: Record<Rule.Action, Rule[]> = {
 			review: [],
 			reject: [],
@@ -37,8 +30,7 @@ export namespace Rule {
 		const notes: Note[] = []
 		const evaluated = Other.evaluate(
 			rules.filter(rule => Base.Kind.is(state.transaction.kind, rule, state.organization?.groups, state.card?.preset)),
-			state,
-			macros
+			state
 		)
 		notes.push(...evaluated.notes)
 		outcomes.flag.push(...evaluated.outcomes.flag)

package/Treasury/Snapshot/Emoney.ts

@@ -1,6 +1,5 @@
 import { isoly } from "isoly"
 import { Balances } from "../../Balances"
-import { Counterbalances } from "../../Counterbalances"
 import { Supplier } from "../../Supplier"
 
 export interface Emoney {
@@ -9,5 +8,4 @@ export interface Emoney {
 	supplier?: Supplier
 	timestamp: isoly.DateTime
 	balances: Balances
-	counterbalances: Counterbalances
 }

package/Treasury/Snapshot/Fiat.ts

@@ -10,7 +10,6 @@ export interface Fiat {
 	type: "safeguarded" | "unsafe" | "other" | "buffer"
 	balances: Balance
 	warnings?: Warning.Snapshot[]
-	counterbalance?: Balance
 	conditions?: { minimum?: Balance }
 	label?: string
 	reference?: string

package/Treasury/Snapshot/index.ts

@@ -13,7 +13,6 @@ export interface Snapshot {
 	emoney: Balance.Extended & { total?: number }
 	currency: isoly.Currency
 	supplier: Supplier
-	counterbalance: Snapshot.Counterbalance
 	fiat: {
 		safe: number
 		unsafe: number
@@ -27,41 +26,14 @@ export namespace Snapshot {
 	export import funding = snapshotFunding
 	export type Emoney = SnapshotEmoney
 	export type Fiat = SnapshotFiat
-	export type Counterbalance = Record<string, { total: number; account: Record<string, { amount: number }> }>
-	export namespace Counterbalance {
-		export const type = isly.record<Counterbalance>(
-			isly.string(),
-			isly.object<Counterbalance[string]>({
-				total: isly.number(),
-				account: isly.record<Counterbalance[string]["account"]>(
-					isly.string(),
-					isly.object<Counterbalance[string]["account"][string]>({ amount: isly.number() })
-				),
-			})
-		)
-		export function sum(currency: isoly.Currency, accounts: Record<string, { amount: number }>): number {
-			return Object.values(accounts).reduce(
-				(result, account) => isoly.Currency.add(currency, result, account.amount),
-				0
-			)
-		}
-		export function validate(currency: isoly.Currency, counterbalances: Counterbalance): boolean {
-			for (const counterbalance of Object.values(counterbalances))
-				if (isoly.Currency.subtract(currency, counterbalance.total, sum(currency, counterbalance.account)))
-					return false
-			return true
-		}
-	}
 	export function validate(snapshot: Snapshot): boolean {
-		const validCounterbalance = Counterbalance.validate(snapshot.currency, snapshot.counterbalance)
 		const issuable = snapshot.fiat.total
 		const actual = snapshot.emoney.actual ?? 0
-		return validCounterbalance && issuable == actual
+		return issuable == actual
 	}
 	export const type = isly.object<Snapshot>({
 		warnings: Warning.Snapshot.type.array(),
 		emoney: Balance.Extended,
-		counterbalance: Counterbalance.type,
 		currency: isly.fromIs("currency", isoly.Currency.is),
 		supplier: Supplier.type,
 		fiat: isly.object({

package/Warning/Snapshot/index.ts

@@ -1,5 +1,4 @@
 import { isly } from "isly"
-import { Counterbalance as WarningCounterbalance } from "./Counterbalance"
 import { MissingBuffer as WarningMissingBuffer } from "./MissingBuffer"
 import { MissingEmoney as WarningMissingEmoney } from "./MissingEmoney"
 import { MissingFiat as WarningMissingFiat } from "./MissingFiat"
@@ -10,7 +9,6 @@ export type Snapshot =
 	| Snapshot.Overdraft
 	| Snapshot.StaleFiat
 	| Snapshot.MissingBuffer
-	| Snapshot.Counterbalance
 	| Snapshot.MissingEmoney
 	| Snapshot.MissingFiat
 
@@ -18,16 +16,13 @@ export namespace Snapshot {
 	export import Overdraft = WarningOverdraft
 	export import StaleFiat = WarningStaleFiat
 	export import MissingBuffer = WarningMissingBuffer
-	export import Counterbalance = WarningCounterbalance
 	export import MissingEmoney = WarningMissingEmoney
 	export import MissingFiat = WarningMissingFiat
-	export const type = isly.union<
-		Snapshot,
-		Overdraft,
-		StaleFiat,
-		MissingBuffer,
-		Counterbalance,
-		MissingEmoney,
-		MissingFiat
-	>(Overdraft.type, StaleFiat.type, MissingBuffer.type, Counterbalance.type, MissingEmoney.type, MissingFiat.type)
+	export const type = isly.union<Snapshot, Overdraft, StaleFiat, MissingBuffer, MissingEmoney, MissingFiat>(
+		Overdraft.type,
+		StaleFiat.type,
+		MissingBuffer.type,
+		MissingEmoney.type,
+		MissingFiat.type
+	)
 }

package/Warning/index.ts

@@ -17,7 +17,6 @@ export namespace Warning {
 			"overdraft",
 			"stale-fiat",
 			"missing-buffer",
-			"counterbalance",
 			"missing-emoney",
 			"missing-fiat",
 		])

package/dist/cjs/Client/Transactions/index.d.ts

@@ -50,8 +50,8 @@ export declare namespace Transactions {
             end: string | undefined;
             currency: string | undefined;
             organization: string | undefined;
-            rail: "paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit" | undefined;
-            type: "internal" | "card" | "external" | "system" | undefined;
+            rail: "paxgiro" | "mastercard" | "diners" | "visa" | "paxgiro-credit" | "internal" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit" | undefined;
+            type: "card" | "internal" | "external" | "system" | undefined;
         }>;
         function parse(query: string | http.Request["search"]): Query;
     }

package/dist/cjs/Operation/Changes.d.ts

@@ -1,36 +1,31 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
 import { Balance as AccountBalance } from "../Balance";
-import { Counterbalance as CounterbalanceOperation } from "../Counterbalance";
 import type { Settlement } from "../Settlement";
 import { Change } from "./Change";
-export type Changes = Partial<Record<Changes.Entry.Balance, Change>> & Record<Changes.Entry.Counterbalance, Change>;
+export type Changes = Partial<Record<Changes.Entry.Balance, Change>>;
 export declare namespace Changes {
     function available(changes: MaybeLegacy, currency: isoly.Currency, legacy?: boolean): number;
     function reserved(changes: MaybeLegacy, currency: isoly.Currency): number;
     function counterbalance(changes: Changes, currency: isoly.Currency): number;
-    type Sum = Partial<Record<Changes.Entry.Balance, number>> & Record<Changes.Entry.Counterbalance, number>;
+    type Sum = Partial<Record<Changes.Entry.Balance, number>>;
     type MaybeLegacy = Changes | Legacy;
-    const type: isly.Type<Legacy>;
-    type Legacy = Partial<Record<AccountBalance.Legacy.Entry, Change>> & Record<Changes.Entry.Counterbalance, Change>;
+    const type: isly.Type<Partial<Record<"available" | "reserved-incoming" | "reserved-outgoing" | "reserved-buffer", Change<"add" | "subtract">>>>;
+    type Legacy = Partial<Record<AccountBalance.Legacy.Entry, Change>>;
     namespace Legacy {
-        const type: isly.Type<Legacy>;
-        type Entry = AccountBalance.Legacy.Entry | Legacy.Entry.Counterbalance;
+        const type: isly.Type<Partial<Record<"actual" | "incomingReserved" | "outgoingReserved" | "bufferReserved", Change<"add" | "subtract">>>>;
+        type Entry = AccountBalance.Legacy.Entry;
         namespace Entry {
-            function split(counterbalance: Counterbalance): [isoly.DateTime, CounterbalanceOperation.Link];
             type Balance = typeof AccountBalance.Legacy.Entry.values[number];
             namespace Balance {
                 const type: isly.Type<"actual" | "incomingReserved" | "outgoingReserved" | "bufferReserved">;
             }
-            type Counterbalance = `${CounterbalanceOperation.Link}-${isoly.DateTime}`;
         }
     }
-    type Entry = Entry.Balance | Entry.Counterbalance;
+    type Entry = Entry.Balance;
     namespace Entry {
-        const type: isly.Type<Entry>;
-        type Counterbalance = `${isoly.DateTime}-${CounterbalanceOperation.Link}`;
+        const type: isly.Type<"available" | "reserved-incoming" | "reserved-outgoing" | "reserved-buffer">;
         function getBalanceType(key: string): string;
-        function split(counterbalance: Counterbalance): [isoly.DateTime, CounterbalanceOperation.Link];
         type Balance = typeof Balance.values[number];
         namespace Balance {
             const values: readonly ["available", "reserved-incoming", "reserved-outgoing", "reserved-buffer"];

package/dist/cjs/Operation/Changes.js

@@ -35,12 +35,6 @@ var Changes;
         Legacy.type = isly_1.isly.record(isly_1.isly.string(), Change_1.Change.type);
         let Entry;
         (function (Entry) {
-            function split(counterbalance) {
-                const split = counterbalance.split("-");
-                const hour = split.splice(-3, 3).join("-");
-                return [hour, split.join("-")];
-            }
-            Entry.split = split;
             let Balance;
             (function (Balance) {
                 Balance.type = Balance_1.Balance.Legacy.Entry.type;
@@ -63,14 +57,6 @@ var Changes;
             return result;
         }
         Entry.getBalanceType = getBalanceType;
-        function split(counterbalance) {
-            const split = counterbalance.split("-");
-            const hour = split.slice(0, 3).join("-");
-            return isoly_1.isoly.DateTime.is(hour)
-                ? [hour, split.slice(3, split.length).join("-")]
-                : Legacy.Entry.split(counterbalance);
-        }
-        Entry.split = split;
         let Balance;
         (function (Balance) {
             Balance.values = ["available", "reserved-incoming", "reserved-outgoing", "reserved-buffer"];

package/dist/cjs/Operation/Changes.js.map

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

package/dist/cjs/Rail/Address/internal.d.ts

@@ -1,10 +1,9 @@
 import { cryptly } from "cryptly";
-import { Operation } from "../../Operation";
 import { Realm } from "../../Realm";
 export interface Internal {
     type: "internal";
     name?: string;
-    identifier: cryptly.Identifier | Operation.Changes.Entry.Counterbalance;
+    identifier: cryptly.Identifier;
     organization?: string;
 }
 export declare namespace Internal {

package/dist/cjs/Rail/index.d.ts

@@ -4,7 +4,7 @@ import { Address as RailAddress } from "./Address";
 export type Rail = typeof Rail.rails[number];
 export declare namespace Rail {
     const rails: readonly ["internal", "paxgiro", "paxgiro-credit", "mastercard", "diners", "visa", "fasterpayments", "chaps", "bacs", "transfer", "credit"];
-    const type: isly.Type<"paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit">;
-    const type2: isly2.String<"paxgiro" | "mastercard" | "diners" | "visa" | "internal" | "paxgiro-credit" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit">;
+    const type: isly.Type<"paxgiro" | "mastercard" | "diners" | "visa" | "paxgiro-credit" | "internal" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit">;
+    const type2: isly2.String<"paxgiro" | "mastercard" | "diners" | "visa" | "paxgiro-credit" | "internal" | "transfer" | "fasterpayments" | "chaps" | "bacs" | "credit">;
     export import Address = RailAddress;
 }

package/dist/cjs/Rule/Other.d.ts

@@ -1,4 +1,3 @@
-import { selectively } from "selectively";
 import { isly } from "isly";
 import { isly as isly2 } from "isly2";
 import type { Note } from "../Transaction/Note";
@@ -16,7 +15,7 @@ export declare namespace Other {
     }
     const type: import("isly/dist/cjs/object").IslyObject<Other, Base>;
     const type2: isly2.Object<Other>;
-    function evaluate(rules: Other[], state: State, macros?: Record<string, selectively.Definition>): {
+    function evaluate(rules: Other[], state: State): {
         outcomes: Record<Other.Action, Other[]>;
         notes: Note[];
         flags: Set<string>;

package/dist/cjs/Rule/Other.js

@@ -19,7 +19,7 @@ var Other;
     })(Action = Other.Action || (Other.Action = {}));
     Other.type = Base_1.Base.type.extend({ action: Action.type });
     Other.type2 = Base_1.Base.type2.extend({ action: Action.type2 });
-    function evaluate(rules, state, macros) {
+    function evaluate(rules, state) {
         const now = isoly_1.isoly.DateTime.now();
         const result = {
             outcomes: {
@@ -33,7 +33,7 @@ var Other;
         if (state.transaction.stage == "initiate" &&
             ["card", "external", "internal"].some(type => type == state.transaction.type))
             for (const rule of rules)
-                if ((0, control_1.control)(rule, state, macros)) {
+                if ((0, control_1.control)(rule, state)) {
                     result.outcomes[rule.action].push(rule);
                     result.notes.push({ author: "automatic", created: now, text: rule.name, rule });
                     rule.flags.forEach(f => result.flags.add(f));

package/dist/cjs/Rule/Other.js.map

@@ -1 +1 @@
-{"version":3,"file":"Other.js","sourceRoot":"","sources":["../../../Rule/Other.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAE7B,+BAA2B;AAC3B,iCAAqC;AAErC,iCAA6B;AAC7B,uCAAmC;AAMnC,IAAiB,KAAK,CAwCrB;AAxCD,WAAiB,KAAK;IAErB,IAAiB,MAAM,CAOtB;IAPD,WAAiB,MAAM;QACT,aAAM,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAU,CAAA;QAC9C,WAAI,GAAG,WAAI,CAAC,MAAM,CAAS,OAAA,MAAM,CAAC,CAAA;QAClC,YAAK,GAAG,YAAK;aACxB,MAAM,CAAS,OAAO,EAAE,GAAG,OAAA,MAAM,CAAC;aAClC,MAAM,CAAC,QAAQ,CAAC;aAChB,QAAQ,CAAC,8CAA8C,CAAC,CAAA;IAC3D,CAAC,EAPgB,MAAM,GAAN,YAAM,KAAN,YAAM,QAOtB;IACY,UAAI,GAAG,WAAI,CAAC,IAAI,CAAC,MAAM,CAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACvD,WAAK,GAAwB,WAAI,CAAC,KAAK,CAAC,MAAM,CAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;IAC5F,SAAgB,QAAQ,CACvB,KAAc,EACd,KAAY,EACZ,MAA+C;QAE/C,MAAM,GAAG,GAAG,aAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;QAChC,MAAM,MAAM,GAAgC;YAC3C,QAAQ,EAAE;gBACT,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,EAAE;aACR;YACD,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,IAAI,GAAG,EAAU;SACxB,CAAA;QACD,IACC,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,UAAU;YACrC,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;YAE7E,KAAK,MAAM,IAAI,IAAI,KAAK;gBACvB,IAAI,IAAA,iBAAO,EAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;oBAClC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;oBAC/E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;oBAC5C,IAAI,CAAC,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;gBACtD,CAAC;QACH,OAAO,MAAM,CAAA;IACd,CAAC;IA3Be,cAAQ,WA2BvB,CAAA;AACF,CAAC,EAxCgB,KAAK,qBAAL,KAAK,QAwCrB"}
+{"version":3,"file":"Other.js","sourceRoot":"","sources":["../../../Rule/Other.ts"],"names":[],"mappings":";;;AAAA,iCAA6B;AAC7B,+BAA2B;AAC3B,iCAAqC;AAErC,iCAA6B;AAC7B,uCAAmC;AAMnC,IAAiB,KAAK,CAuCrB;AAvCD,WAAiB,KAAK;IAErB,IAAiB,MAAM,CAOtB;IAPD,WAAiB,MAAM;QACT,aAAM,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAU,CAAA;QAC9C,WAAI,GAAG,WAAI,CAAC,MAAM,CAAS,OAAA,MAAM,CAAC,CAAA;QAClC,YAAK,GAAG,YAAK;aACxB,MAAM,CAAS,OAAO,EAAE,GAAG,OAAA,MAAM,CAAC;aAClC,MAAM,CAAC,QAAQ,CAAC;aAChB,QAAQ,CAAC,8CAA8C,CAAC,CAAA;IAC3D,CAAC,EAPgB,MAAM,GAAN,YAAM,KAAN,YAAM,QAOtB;IACY,UAAI,GAAG,WAAI,CAAC,IAAI,CAAC,MAAM,CAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACvD,WAAK,GAAwB,WAAI,CAAC,KAAK,CAAC,MAAM,CAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;IAC5F,SAAgB,QAAQ,CACvB,KAAc,EACd,KAAY;QAEZ,MAAM,GAAG,GAAG,aAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAA;QAChC,MAAM,MAAM,GAAgC;YAC3C,QAAQ,EAAE;gBACT,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,EAAE;gBACV,IAAI,EAAE,EAAE;aACR;YACD,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,IAAI,GAAG,EAAU;SACxB,CAAA;QACD,IACC,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,UAAU;YACrC,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;YAE7E,KAAK,MAAM,IAAI,IAAI,KAAK;gBACvB,IAAI,IAAA,iBAAO,EAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;oBAC1B,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACvC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;oBAC/E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;oBAC5C,IAAI,CAAC,MAAM,IAAI,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;gBACtD,CAAC;QACH,OAAO,MAAM,CAAA;IACd,CAAC;IA1Be,cAAQ,WA0BvB,CAAA;AACF,CAAC,EAvCgB,KAAK,qBAAL,KAAK,QAuCrB"}

package/dist/cjs/Rule/State/Account.d.ts

@@ -2,8 +2,8 @@ import type { Account as ModelAccount } from "../../Account";
 import { Rail } from "../../Rail";
 export interface Account extends ModelAccount {
     address: Rail.Address;
-    transactions: Account.Transactions;
-    days: Account.Days;
+    transactions?: Account.Transactions;
+    days?: Account.Days;
 }
 export declare namespace Account {
     type Today = {
@@ -30,6 +30,6 @@ export declare namespace Account {
             today: Today;
         };
     }
-    export function from(account: ModelAccount, address: Rail.Address, transactions: Transactions, days: Days): Account;
+    export function from(account: ModelAccount, address: Rail.Address): Account;
     export {};
 }

package/dist/cjs/Rule/State/Account.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Account = void 0;
 var Account;
 (function (Account) {
-    function from(account, address, transactions, days) {
-        return { ...account, address, transactions, days };
+    function from(account, address) {
+        return { ...account, address };
     }
     Account.from = from;
 })(Account || (exports.Account = Account = {}));

package/dist/cjs/Rule/State/Account.js.map

@@ -1 +1 @@
-{"version":3,"file":"Account.js","sourceRoot":"","sources":["../../../../Rule/State/Account.ts"],"names":[],"mappings":";;;AASA,IAAiB,OAAO,CAsBvB;AAtBD,WAAiB,OAAO;IAmBvB,SAAgB,IAAI,CAAC,OAAqB,EAAE,OAAqB,EAAE,YAA0B,EAAE,IAAU;QACxG,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;IACnD,CAAC;IAFe,YAAI,OAEnB,CAAA;AACF,CAAC,EAtBgB,OAAO,uBAAP,OAAO,QAsBvB"}
+{"version":3,"file":"Account.js","sourceRoot":"","sources":["../../../../Rule/State/Account.ts"],"names":[],"mappings":";;;AASA,IAAiB,OAAO,CAsBvB;AAtBD,WAAiB,OAAO;IAmBvB,SAAgB,IAAI,CAAC,OAAqB,EAAE,OAAqB;QAChE,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAA;IAC/B,CAAC;IAFe,YAAI,OAEnB,CAAA;AACF,CAAC,EAtBgB,OAAO,uBAAP,OAAO,QAsBvB"}

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

@@ -35,9 +35,9 @@ export declare namespace State {
         flags: string[];
         notes: ModelTransaction.Note[];
     }
-    function from(account: ModelAccount, address: Rail.Address, transactions: Account.Transactions, days: Account.Days, transaction: ModelTransaction.Creatable.Resolved | ModelTransaction, kind: Rule.Base.Kind, stage: "finalize" | "initiate", card?: Card, organization?: Organization): State;
+    function from(account: ModelAccount, address: Rail.Address, transaction: ModelTransaction.Creatable.Resolved | ModelTransaction, kind: Rule.Base.Kind, stage: "finalize" | "initiate", card?: Card, organization?: Organization): State;
     const type: Record<ModelTransaction.PreTransaction["type"], Rule.Base.Kind>;
-    function fromPreTransaction(account: ModelAccount, address: Rail.Address, transactions: Account.Transactions, days: Account.Days, transaction: ModelTransaction.PreTransaction, card?: ModelCard & {
+    function fromPreTransaction(account: ModelAccount, address: Rail.Address, transaction: ModelTransaction.PreTransaction, card?: ModelCard & {
         statistics: Card.Statistics;
     }, organization?: Organization): State;
 }

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

@@ -21,9 +21,9 @@ var State;
         Outcome.values = ["approve", "reject", "review"];
         Outcome.type = isly_1.isly.string(Outcome.values);
     })(Outcome = State.Outcome || (State.Outcome = {}));
-    function from(account, address, transactions, days, transaction, kind, stage, card, organization) {
+    function from(account, address, transaction, kind, stage, card, organization) {
         return {
-            account: State.Account.from(account, address, transactions, days),
+            account: State.Account.from(account, address),
             transaction: State.Transaction.from(account, transaction, kind, stage),
             authorization: State.Authorization.from(transaction),
             card,
@@ -36,9 +36,9 @@ var State;
         incoming: "inbound",
         outgoing: "outbound",
     };
-    function fromPreTransaction(account, address, transactions, days, transaction, card, organization) {
+    function fromPreTransaction(account, address, transaction, card, organization) {
         return {
-            account: State.Account.from(account, address, transactions, days),
+            account: State.Account.from(account, address),
             transaction: State.Transaction.from(account, transaction, State.type[transaction.type], "initiate"),
             card: card ? State.Card.from(card, card.statistics) : undefined,
             organization,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../Rule/State/index.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAM3B,uCAAmD;AACnD,mDAAqE;AACrE,iCAA0C;AAC1C,iDAAkE;AAClE,uCAAmD;AACnD,+CAA+D;AAS/D,IAAiB,KAAK,CA0DrB;AA1DD,WAAiB,KAAK;IACP,aAAO,GAAG,iBAAY,CAAA;IACtB,mBAAa,GAAG,6BAAkB,CAAA;IAClC,UAAI,GAAG,WAAS,CAAA;IAChB,aAAO,GAAG,iBAAY,CAAA;IACtB,iBAAW,GAAG,yBAAgB,CAAA;IAC9B,kBAAY,GAAG,2BAAiB,CAAA;IAE9C,IAAiB,OAAO,CAGvB;IAHD,WAAiB,OAAO;QACV,cAAM,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAA;QACjD,YAAI,GAAG,WAAI,CAAC,MAAM,CAAU,QAAA,MAAM,CAAC,CAAA;IACjD,CAAC,EAHgB,OAAO,GAAP,aAAO,KAAP,aAAO,QAGvB;IAOD,SAAgB,IAAI,CACnB,OAAqB,EACrB,OAAqB,EACrB,YAAkC,EAClC,IAAkB,EAClB,WAAmE,EACnE,IAAoB,EACpB,KAA8B,EAC9B,IAAW,EACX,YAA2B;QAE3B,OAAO;YACN,OAAO,EAAE,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC;YAC3D,WAAW,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC;YAChE,aAAa,EAAE,MAAA,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;YAC9C,IAAI;YACJ,YAAY;SACZ,CAAA;IACF,CAAC;IAlBe,UAAI,OAkBnB,CAAA;IACY,UAAI,GAAoE;QACpF,aAAa,EAAE,eAAe;QAC9B,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,UAAU;KACpB,CAAA;IACD,SAAgB,kBAAkB,CACjC,OAAqB,EACrB,OAAqB,EACrB,YAAkC,EAClC,IAAkB,EAClB,WAA4C,EAC5C,IAAkD,EAClD,YAA2B;QAE3B,OAAO;YACN,OAAO,EAAE,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC;YAC3D,WAAW,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;YACvF,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;YACzD,YAAY;SACZ,CAAA;IACF,CAAC;IAfe,wBAAkB,qBAejC,CAAA;AACF,CAAC,EA1DgB,KAAK,qBAAL,KAAK,QA0DrB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../Rule/State/index.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAM3B,uCAAmD;AACnD,mDAAqE;AACrE,iCAA0C;AAC1C,iDAAkE;AAClE,uCAAmD;AACnD,+CAA+D;AAS/D,IAAiB,KAAK,CAsDrB;AAtDD,WAAiB,KAAK;IACP,aAAO,GAAG,iBAAY,CAAA;IACtB,mBAAa,GAAG,6BAAkB,CAAA;IAClC,UAAI,GAAG,WAAS,CAAA;IAChB,aAAO,GAAG,iBAAY,CAAA;IACtB,iBAAW,GAAG,yBAAgB,CAAA;IAC9B,kBAAY,GAAG,2BAAiB,CAAA;IAE9C,IAAiB,OAAO,CAGvB;IAHD,WAAiB,OAAO;QACV,cAAM,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAA;QACjD,YAAI,GAAG,WAAI,CAAC,MAAM,CAAU,QAAA,MAAM,CAAC,CAAA;IACjD,CAAC,EAHgB,OAAO,GAAP,aAAO,KAAP,aAAO,QAGvB;IAOD,SAAgB,IAAI,CACnB,OAAqB,EACrB,OAAqB,EACrB,WAAmE,EACnE,IAAoB,EACpB,KAA8B,EAC9B,IAAW,EACX,YAA2B;QAE3B,OAAO;YACN,OAAO,EAAE,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC;YACvC,WAAW,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC;YAChE,aAAa,EAAE,MAAA,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC;YAC9C,IAAI;YACJ,YAAY;SACZ,CAAA;IACF,CAAC;IAhBe,UAAI,OAgBnB,CAAA;IACY,UAAI,GAAoE;QACpF,aAAa,EAAE,eAAe;QAC9B,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,UAAU;KACpB,CAAA;IACD,SAAgB,kBAAkB,CACjC,OAAqB,EACrB,OAAqB,EACrB,WAA4C,EAC5C,IAAkD,EAClD,YAA2B;QAE3B,OAAO;YACN,OAAO,EAAE,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC;YACvC,WAAW,EAAE,MAAA,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,MAAA,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;YACvF,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;YACzD,YAAY;SACZ,CAAA;IACF,CAAC;IAbe,wBAAkB,qBAajC,CAAA;AACF,CAAC,EAtDgB,KAAK,qBAAL,KAAK,QAsDrB"}

package/dist/cjs/Rule/control.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.control = control;
 const selectively_1 = require("selectively");
-const definitions_1 = require("./definitions");
 function control(rule, state, macros) {
-    return selectively_1.selectively.resolve({ ...macros, ...definitions_1.definitions }, selectively_1.selectively.parse(rule.condition)).is(state);
+    return selectively_1.selectively.parse(rule.condition).is(state);
 }
 //# sourceMappingURL=control.js.map

package/dist/cjs/Rule/control.js.map

@@ -1 +1 @@
-{"version":3,"file":"control.js","sourceRoot":"","sources":["../../../Rule/control.ts"],"names":[],"mappings":";;AAKA,0BAEC;AAPD,6CAAyC;AAEzC,+CAA2C;AAG3C,SAAgB,OAAO,CAAC,IAAU,EAAE,KAAY,EAAE,MAA+C;IAChG,OAAO,yBAAW,CAAC,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,yBAAW,EAAE,EAAE,yBAAW,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;AACvG,CAAC"}
+{"version":3,"file":"control.js","sourceRoot":"","sources":["../../../Rule/control.ts"],"names":[],"mappings":";;AAIA,0BAEC;AAND,6CAAyC;AAIzC,SAAgB,OAAO,CAAC,IAAU,EAAE,KAAY,EAAE,MAA+C;IAChG,OAAO,yBAAW,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;AACnD,CAAC"}

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

@@ -1,6 +1,4 @@
-import { selectively } from "selectively";
 import { isly } from "isly";
-import { Exchange } from "../Exchange";
 import { Base as RuleBase } from "./Base";
 import { control as ruleControl } from "./control";
 import { Other as RuleOther } from "./Other";
@@ -19,7 +17,7 @@ export declare namespace Rule {
         const type: isly.Type<"reject" | "review" | "flag">;
     }
     const type: import("isly/dist/cjs/object").IslyObject<Other, Base>;
-    function evaluate(rules: Rule[], state: RuleState, macros?: Record<string, selectively.Definition>, table?: Exchange.Rates): RuleState.Evaluated;
+    function evaluate(rules: Rule[], state: RuleState): RuleState.Evaluated;
     function isLegacy(rule: Rule): boolean;
     function fromLegacy(rule: Rule): Rule;
 }