@pax2pay/model-banking 0.1.455 → 0.1.456

package/Card/Operation/index.ts

@@ -16,15 +16,23 @@ export namespace Operation {
 			created: isoly.DateTime.now(),
 		}
 	}
-	export function fromEntry(entry: Entry | Entry.Failed): Operation | undefined {
-		return entry.status == "failed"
+	export function fromEntry(entry: Entry): Operation | undefined {
+		return entry.type == "unknown"
 			? undefined
 			: {
 					type: "authorization",
-					id: entry.transaction ?? "unknown",
-					status: entry.type == "capture" ? "captured" : "refunded",
+					id: (entry.type != "refund" ? entry.authorization?.id : entry.transaction?.id) ?? "unknown",
+					status: Operation.fromEntryStatus(entry.type),
 					created: isoly.DateTime.now(),
 			  }
 	}
+	export function fromEntryStatus(status: Exclude<Entry.Type, "unknown">): OperationAuthorization.Status {
+		const statusConverter: Record<Exclude<Entry.Type, "unknown">, OperationAuthorization.Status> = {
+			capture: "captured",
+			cancel: "cancelled",
+			refund: "refunded",
+		}
+		return statusConverter[status]
+	}
 	export const type = isly.union(Card.type, OperationAuthorization.type)
 }

package/Operation/Changes.ts

@@ -114,7 +114,7 @@ export namespace Changes {
 	}
 	export function fromRefund(
 		settlement: string | undefined, // FIXME: remove | undefined when we're sure we send the id
-		refund: Settlement.Entry.Creatable.Refund,
+		refund: Settlement.Entry.Refund.Creatable,
 		charge: number | undefined,
 		sum: Sum
 	): Changes {

package/Operation/Creatable.ts

@@ -36,7 +36,7 @@ export namespace Creatable {
 		changes: Changes.type,
 		type: isly.string(types),
 	})
-	export function fromRefund(account: string, settlement: string, entry: Settlement.Entry.Creatable.Refund): Creatable {
+	export function fromRefund(account: string, settlement: string, entry: Settlement.Entry.Refund.Creatable): Creatable {
 		// The Entry.Refund.Creatable has negative amount and fee
 		// The operation amounts should always be positive
 		const [currency, entryAmount] = entry.amount

package/Settlement/Entry/{Legacy/Cancel.ts → Cancel.ts}

@@ -1,10 +1,10 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Amount } from "../../../Amount"
-import { Authorization } from "../../../Authorization"
-import { Batch } from "../../Batch"
-import { Fee } from "../../Fee"
-import { Identifier as SettlementIdentifier } from "../../Identifier"
+import { Amount } from "../../Amount"
+import { Authorization } from "../../Authorization"
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier"
+import { Batch } from "../Batch"
+import { Fee } from "../Fee"
 
 export interface Cancel extends Omit<Cancel.Creatable, "settlement"> {
 	status: "succeeded" | "failed"

package/Settlement/Entry/{Legacy/Capture.ts → Capture.ts}

@@ -1,10 +1,10 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Amount } from "../../../Amount"
-import { Authorization } from "../../../Authorization"
-import { Batch } from "../../Batch"
-import { Fee } from "../../Fee"
-import { Identifier as SettlementIdentifier } from "../../Identifier"
+import { Amount } from "../../Amount"
+import { Authorization } from "../../Authorization"
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier"
+import { Batch } from "../Batch"
+import { Fee } from "../Fee"
 
 export interface Capture extends Omit<Capture.Creatable, "settlement"> {
 	status: "succeeded" | "failed"

package/Settlement/Entry/Creatable.ts

@@ -1,115 +1,15 @@
 import { isly } from "isly"
-import { Acquirer } from "../../Acquirer"
-import { Amount } from "../../Amount"
-import { Merchant } from "../../Merchant"
-import { Batch } from "../Batch"
-import { Fee } from "../Fee"
-import { Identifier as SettlementIdentifier } from "../Identifier"
-import { Entry as LegacyEntry } from "./Legacy"
+import { Cancel as EntryCancel } from "./Cancel"
+import { Capture as EntryCapture } from "./Capture"
+import { Refund as EntryRefund } from "./Refund"
+import { Unknown as EntryUnknown } from "./Unknown"
 
-export type Creatable = Creatable.Known | Creatable.Unknown
+export type Creatable = EntryCancel.Creatable | EntryCapture.Creatable | EntryRefund.Creatable | EntryUnknown.Creatable
 export namespace Creatable {
-	export interface Base {
-		card: string
-		transaction?: string
-		account: string
-		approvalCode: string
-		merchant: Merchant
-		acquirer: Acquirer
-		reference: string
-		batch: Batch
-		fee: Fee
-		amount: Amount
-		settlement: SettlementIdentifier
-	}
-	export namespace Base {
-		export const type = isly.object<Base>({
-			card: isly.string(),
-			transaction: isly.string().optional(),
-			account: isly.string(),
-			approvalCode: isly.string(),
-			merchant: Merchant.type,
-			acquirer: Acquirer.type,
-			reference: isly.string(),
-			batch: Batch.type,
-			fee: Fee.type,
-			amount: Amount.type,
-			settlement: SettlementIdentifier.type,
-		})
-	}
-	export interface Capture extends Base {
-		type: "capture"
-	}
-	export namespace Capture {
-		export const type = Base.type.extend<Capture>({
-			type: isly.string("capture"),
-		})
-		export function fromLegacy(maybeLegacy: Capture | LegacyEntry.Capture.Creatable): Capture {
-			return type.is(maybeLegacy)
-				? maybeLegacy
-				: {
-						type: maybeLegacy.type,
-						card: maybeLegacy.authorization.card.id,
-						transaction: maybeLegacy.authorization.transaction?.id,
-						account: maybeLegacy.authorization.account || "unknown",
-						approvalCode: maybeLegacy.authorization.approvalCode ?? "unknown",
-						merchant: maybeLegacy.authorization.merchant,
-						acquirer: maybeLegacy.authorization.acquirer,
-						reference: maybeLegacy.reference,
-						batch: maybeLegacy.batch,
-						fee: maybeLegacy.fee,
-						amount: maybeLegacy.amount,
-						settlement: maybeLegacy.settlement ?? "unknown",
-				  }
-		}
-	}
-	export interface Refund extends Base {
-		type: "refund"
-	}
-	export namespace Refund {
-		export const type = Base.type.extend<Refund>({
-			type: isly.string("refund"),
-		})
-		export function fromLegacy(maybeLegacy: Refund | LegacyEntry.Refund.Creatable): Refund {
-			return type.is(maybeLegacy)
-				? maybeLegacy
-				: {
-						type: maybeLegacy.type,
-						card: maybeLegacy.card,
-						account: maybeLegacy.account ?? "unknown",
-						approvalCode: maybeLegacy.authorization.approvalCode ?? "unknown",
-						merchant: maybeLegacy.merchant,
-						acquirer: maybeLegacy.acquirer,
-						reference: maybeLegacy.reference,
-						batch: maybeLegacy.batch,
-						fee: maybeLegacy.fee,
-						amount: maybeLegacy.amount,
-						settlement: maybeLegacy.settlement ?? "unknown",
-				  }
-		}
-	}
-	export type Known = Capture | Refund
-
-	export namespace Known {
-		export const type = isly.union(Capture.type, Refund.type)
-		export function fromLegacy(
-			maybeLegacy: Creatable.Known | LegacyEntry.Capture.Creatable | LegacyEntry.Refund.Creatable
-		): Creatable.Known {
-			return maybeLegacy.type == "capture" ? Capture.fromLegacy(maybeLegacy) : Refund.fromLegacy(maybeLegacy)
-		}
-	}
-	export interface Unknown extends Partial<Base> {
-		type: "unknown"
-		data: Record<string, unknown>
-	}
-	export namespace Unknown {
-		export const type = isly.object<Unknown>({
-			...(Object.fromEntries(
-				Object.entries(Base.type.getProperties()).map(([k, v]) => [k, v.optional()])
-			) as isly.object.Properties<Partial<Base>>), // TODO: Add "Partial" to isly
-			type: isly.string("unknown"),
-			data: isly.record<Record<string, unknown>>(isly.string(), isly.any()),
-		})
-	}
-	export const type = isly.union(Known.type, Unknown.type)
+	export const type = isly.union(
+		EntryCancel.Creatable.type,
+		EntryCapture.Creatable.type,
+		EntryRefund.Creatable.type,
+		EntryUnknown.Creatable.type
+	)
 }

package/Settlement/Entry/{Legacy/Refund.ts → Refund.ts}

@@ -1,13 +1,13 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Acquirer } from "../../../Acquirer"
-import { Amount } from "../../../Amount"
-import { Authorization } from "../../../Authorization"
-import { Merchant } from "../../../Merchant"
-import { Transaction } from "../../../Transaction"
-import { Batch } from "../../Batch"
-import { Fee } from "../../Fee"
-import { Identifier as SettlementIdentifier } from "../../Identifier"
+import { Acquirer } from "../../Acquirer"
+import { Amount } from "../../Amount"
+import { Authorization } from "../../Authorization"
+import { Merchant } from "../../Merchant"
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier"
+import { Transaction } from "../../Transaction"
+import { Batch } from "../Batch"
+import { Fee } from "../Fee"
 
 export interface Refund extends Omit<Refund.Creatable, "settlement"> {
 	status: "succeeded" | "failed"

package/Settlement/Entry/{Legacy/Unknown.ts → Unknown.ts}

@@ -1,8 +1,8 @@
 import { isoly } from "isoly"
 import { isly } from "isly"
-import { Authorization } from "../../../Authorization"
-import { Batch } from "../../Batch"
-import { Identifier as SettlementIdentifier } from "../../Identifier"
+import { Authorization } from "../../Authorization"
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier"
+import { Batch } from "../Batch"
 
 export interface Unknown extends Omit<Unknown.Creatable, "settlement"> {
 	status: "succeeded" | "failed"

package/Settlement/Entry/index.ts

@@ -1,26 +1,57 @@
+import { gracely } from "gracely"
+import { isoly } from "isoly"
+import { isly } from "isly"
+import { Transaction } from "../../Transaction"
+import { Cancel as EntryCancel } from "./Cancel"
+import { Capture as EntryCapture } from "./Capture"
 import { Creatable as EntryCreatable } from "./Creatable"
-import { Failed as EntryFailed } from "./Failed"
-import { fromCreatable } from "./fromCreatable"
-import { fromLegacy as entryFromLegacy } from "./fromLegacy"
-import { Entry as LegacyEntry } from "./Legacy"
-import { Succeeded as EntrySucceeded } from "./Succeeded"
+import { Refund as EntryRefund } from "./Refund"
 import { Summary as EntrySummary } from "./Summary"
-import { type as entryType } from "./type"
+import { Unknown as EntryUnknown } from "./Unknown"
 
-export type Entry = EntrySucceeded | EntryFailed
+export type Entry = Entry.Cancel | Entry.Capture | Entry.Refund | Entry.Unknown
 export namespace Entry {
-	export interface Capture extends EntrySucceeded {
-		type: "capture"
+	export import Cancel = EntryCancel
+	export import Capture = EntryCapture
+	export import Refund = EntryRefund
+	export import Unknown = EntryUnknown
+	export type Type = "unknown" | "refund" | "capture" | "cancel"
+	export import Summary = EntrySummary
+	export import Creatable = EntryCreatable
+	export function from(creatable: Entry.Creatable, transaction: Transaction | gracely.Error | string): Entry {
+		let result: Entry
+		const created = isoly.DateTime.now()
+		if (!Transaction.type.is(transaction) || transaction.status != "finalized")
+			result = { status: "failed", reason: reason(creatable, transaction), ...creatable, created }
+		else
+			switch (creatable.type) {
+				case "capture":
+					result = Capture.from(creatable)
+					break
+				case "refund":
+					result = Refund.from(creatable, transaction)
+					break
+				default:
+					result = { ...creatable, status: "failed", reason: "Entry type not implemented yet.", created }
+					break
+			}
+		return result
 	}
-	export interface Refund extends EntrySucceeded {
-		type: "refund"
+	function reason(creatable: Entry.Creatable, transaction: Transaction | gracely.Error | string): string {
+		const result = []
+		!creatable.authorization && result.push("Missing authorization.")
+		if (gracely.Error.is(transaction))
+			result.push(`gracely error: ${JSON.stringify(transaction)}`)
+		else if (typeof transaction != "string")
+			result.push(`Transaction ${transaction.id} on account ${transaction.accountId} unable to be finalized.`)
+		else
+			result.push(transaction || "No reason provided")
+		return result.join("\n")
 	}
-	export import Creatable = EntryCreatable
-	export import Failed = EntryFailed
-	export import Succeeded = EntrySucceeded
-	export import Summary = EntrySummary
-	export import Legacy = LegacyEntry
-	export const type = entryType
-	export const fromLegacy = entryFromLegacy
-	export const from = fromCreatable
+	export const type = isly.union<Entry, Entry.Cancel, Entry.Capture, Entry.Refund, Entry.Unknown>(
+		Entry.Cancel.type,
+		Entry.Capture.type,
+		Entry.Refund.type,
+		Entry.Unknown.type
+	)
 }

package/Settlement/index.ts

@@ -40,7 +40,7 @@ export namespace Settlement {
 			entries: { count: 0 },
 		}
 	}
-	export function compile(settlement: Settlement, entries: (Settlement.Entry | Settlement.Entry.Failed)[]): Settlement {
+	export function compile(settlement: Settlement, entries: Settlement.Entry[]): Settlement {
 		const result = { ...settlement }
 		for (const entry of entries) {
 			switch (entry.status) {

package/Transaction/Incoming.ts

@@ -26,7 +26,7 @@ export namespace Incoming {
 		reference: TransactionReference.type.optional(),
 	})
 
-	export function fromRefund(entry: Settlement.Entry.Creatable.Refund, card: Rail.Address.Card): Incoming {
+	export function fromRefund(entry: Settlement.Entry.Refund.Creatable, card: Rail.Address.Card): Incoming {
 		const [currency, amount] = entry.amount
 		return {
 			account: card,

package/Transaction/index.ts

@@ -335,7 +335,7 @@ export namespace Transaction {
 		}
 	}
 	export function fromRefund(
-		refund: Settlement.Entry.Creatable.Refund,
+		refund: Settlement.Entry.Refund.Creatable,
 		id: string,
 		account: { id: string; name: string; organization: string },
 		card: Rail.Address.Card,

package/Warning/Settlement/UnknownEntry.ts

@@ -2,16 +2,14 @@ import { cryptly } from "cryptly"
 import { isoly } from "isoly"
 import { isly } from "isly"
 import { Authorization } from "../../Authorization"
-import { Entry } from "../../Settlement/Entry"
+import { Unknown } from "../../Settlement/Entry/Unknown"
 import { Identifier } from "../../Settlement/Identifier"
-import { Transaction } from "../../Transaction"
 import { Base } from "../Base"
 
 export interface UnknownEntry extends Base {
 	type: "unknown-entry"
 	resource: Identifier
 	authorization?: Authorization["id"]
-	transaction?: Transaction["id"]
 }
 
 export namespace UnknownEntry {
@@ -19,13 +17,12 @@ export namespace UnknownEntry {
 		type: isly.string("unknown-entry"),
 		resource: Identifier.type,
 		authorization: isly.fromIs("Authorization.id", cryptly.Identifier.is).optional(),
-		transaction: isly.string().optional(),
 	})
-	export function create(entry: Extract<Entry.Failed, { type: "unknown" }>, resource: Identifier): UnknownEntry {
+	export function create(entry: Unknown, resource: Identifier): UnknownEntry {
 		return {
 			type: "unknown-entry",
 			resource,
-			transaction: entry.transaction,
+			authorization: entry.authorization?.id,
 			date: isoly.Date.now(),
 		}
 	}

package/dist/Card/Operation/index.d.ts

@@ -6,6 +6,7 @@ import { Card } from "./Card";
 export type Operation = Card | OperationAuthorization;
 export declare namespace Operation {
     function fromAuthorization(authorization: Authorization, status: OperationAuthorization.Status): Operation;
-    function fromEntry(entry: Entry | Entry.Failed): Operation | undefined;
+    function fromEntry(entry: Entry): Operation | undefined;
+    function fromEntryStatus(status: Exclude<Entry.Type, "unknown">): OperationAuthorization.Status;
     const type: isly.Type<Card | OperationAuthorization>;
 }

package/dist/Card/Operation/index.js

@@ -14,16 +14,25 @@ export var Operation;
     }
     Operation.fromAuthorization = fromAuthorization;
     function fromEntry(entry) {
-        return entry.status == "failed"
+        return entry.type == "unknown"
             ? undefined
             : {
                 type: "authorization",
-                id: entry.transaction ?? "unknown",
-                status: entry.type == "capture" ? "captured" : "refunded",
+                id: (entry.type != "refund" ? entry.authorization?.id : entry.transaction?.id) ?? "unknown",
+                status: Operation.fromEntryStatus(entry.type),
                 created: isoly.DateTime.now(),
             };
     }
     Operation.fromEntry = fromEntry;
+    function fromEntryStatus(status) {
+        const statusConverter = {
+            capture: "captured",
+            cancel: "cancelled",
+            refund: "refunded",
+        };
+        return statusConverter[status];
+    }
+    Operation.fromEntryStatus = fromEntryStatus;
     Operation.type = isly.union(Card.type, OperationAuthorization.type);
 })(Operation || (Operation = {}));
 //# sourceMappingURL=index.js.map

package/dist/Card/Operation/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Card/Operation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,aAAa,IAAI,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAI7B,MAAM,KAAW,SAAS,CAoBzB;AApBD,WAAiB,SAAS;IACzB,SAAgB,iBAAiB,CAAC,aAA4B,EAAE,MAAqC;QACpG,OAAO;YACN,IAAI,EAAE,eAAe;YACrB,EAAE,EAAE,aAAa,EAAE,EAAE,IAAI,aAAa,CAAC,WAAW,EAAE,EAAE,IAAI,SAAS;YACnE,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;SAC7B,CAAA;IACF,CAAC;IAPe,2BAAiB,oBAOhC,CAAA;IACD,SAAgB,SAAS,CAAC,KAA2B;QACpD,OAAO,KAAK,CAAC,MAAM,IAAI,QAAQ;YAC9B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC;gBACA,IAAI,EAAE,eAAe;gBACrB,EAAE,EAAE,KAAK,CAAC,WAAW,IAAI,SAAS;gBAClC,MAAM,EAAE,KAAK,CAAC,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU;gBACzD,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;aAC5B,CAAA;IACL,CAAC;IATe,mBAAS,YASxB,CAAA;IACY,cAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAA;AACvE,CAAC,EApBgB,SAAS,KAAT,SAAS,QAoBzB"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Card/Operation/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,aAAa,IAAI,sBAAsB,EAAE,MAAM,iBAAiB,CAAA;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAI7B,MAAM,KAAW,SAAS,CA4BzB;AA5BD,WAAiB,SAAS;IACzB,SAAgB,iBAAiB,CAAC,aAA4B,EAAE,MAAqC;QACpG,OAAO;YACN,IAAI,EAAE,eAAe;YACrB,EAAE,EAAE,aAAa,EAAE,EAAE,IAAI,aAAa,CAAC,WAAW,EAAE,EAAE,IAAI,SAAS;YACnE,MAAM;YACN,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;SAC7B,CAAA;IACF,CAAC;IAPe,2BAAiB,oBAOhC,CAAA;IACD,SAAgB,SAAS,CAAC,KAAY;QACrC,OAAO,KAAK,CAAC,IAAI,IAAI,SAAS;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC;gBACA,IAAI,EAAE,eAAe;gBACrB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,SAAS;gBAC3F,MAAM,EAAE,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC7C,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE;aAC5B,CAAA;IACL,CAAC;IATe,mBAAS,YASxB,CAAA;IACD,SAAgB,eAAe,CAAC,MAAsC;QACrE,MAAM,eAAe,GAA0E;YAC9F,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,UAAU;SAClB,CAAA;QACD,OAAO,eAAe,CAAC,MAAM,CAAC,CAAA;IAC/B,CAAC;IAPe,yBAAe,kBAO9B,CAAA;IACY,cAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAA;AACvE,CAAC,EA5BgB,SAAS,KAAT,SAAS,QA4BzB"}

package/dist/Operation/Changes.d.ts

@@ -42,5 +42,5 @@ export declare namespace Changes {
         fee: number;
         charge?: number;
     }): Changes;
-    function fromRefund(settlement: string | undefined, refund: Settlement.Entry.Creatable.Refund, charge: number | undefined, sum: Sum): Changes;
+    function fromRefund(settlement: string | undefined, refund: Settlement.Entry.Refund.Creatable, charge: number | undefined, sum: Sum): Changes;
 }

package/dist/Operation/Creatable.d.ts

@@ -12,5 +12,5 @@ export declare namespace Creatable {
     const types: readonly ["incoming", "finalizeIncoming", "outgoing", "finalizeOutgoing", "authorization", "capture", "charge", "refund", "cancel", "remove", "collect", "manual", "fund", "legacy", "adjustBuffer"];
     type Type = typeof types[number];
     const type: import("isly/dist/cjs/object").IslyObject<Creatable, object>;
-    function fromRefund(account: string, settlement: string, entry: Settlement.Entry.Creatable.Refund): Creatable;
+    function fromRefund(account: string, settlement: string, entry: Settlement.Entry.Refund.Creatable): Creatable;
 }

package/dist/Settlement/Entry/{Legacy/Cancel.d.ts → Cancel.d.ts}

@@ -1,9 +1,9 @@
 import { isoly } from "isoly";
-import { Amount } from "../../../Amount";
-import { Authorization } from "../../../Authorization";
-import { Batch } from "../../Batch";
-import { Fee } from "../../Fee";
-import { Identifier as SettlementIdentifier } from "../../Identifier";
+import { Amount } from "../../Amount";
+import { Authorization } from "../../Authorization";
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier";
+import { Batch } from "../Batch";
+import { Fee } from "../Fee";
 export interface Cancel extends Omit<Cancel.Creatable, "settlement"> {
     status: "succeeded" | "failed";
     reason?: string;

package/dist/Settlement/Entry/{Legacy/Cancel.js → Cancel.js}

@@ -1,10 +1,10 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
-import { Amount } from "../../../Amount";
-import { Authorization } from "../../../Authorization";
-import { Batch } from "../../Batch";
-import { Fee } from "../../Fee";
-import { Identifier as SettlementIdentifier } from "../../Identifier";
+import { Amount } from "../../Amount";
+import { Authorization } from "../../Authorization";
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier";
+import { Batch } from "../Batch";
+import { Fee } from "../Fee";
 export var Cancel;
 (function (Cancel) {
     let Creatable;

package/dist/Settlement/Entry/Cancel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Cancel.js","sourceRoot":"../","sources":["Settlement/Entry/Cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAQ5B,MAAM,KAAW,MAAM,CA2BtB;AA3BD,WAAiB,MAAM;IAUtB,IAAiB,SAAS,CAUzB;IAVD,WAAiB,SAAS;QACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;YAC1C,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;YAC3B,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5C,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACnC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;YACxB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC9B,KAAK,EAAE,KAAK,CAAC,IAAI;YACjB,UAAU,EAAE,oBAAoB,CAAC,IAAI;SACrC,CAAC,CAAA;IACH,CAAC,EAVgB,SAAS,GAAT,gBAAS,KAAT,gBAAS,QAUzB;IACY,WAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAS;QACtE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAChC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzD,UAAU,EAAE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE;KAChD,CAAC,CAAA;AACH,CAAC,EA3BgB,MAAM,KAAN,MAAM,QA2BtB"}

package/dist/Settlement/Entry/{Legacy/Capture.d.ts → Capture.d.ts}

@@ -1,9 +1,9 @@
 import { isoly } from "isoly";
-import { Amount } from "../../../Amount";
-import { Authorization } from "../../../Authorization";
-import { Batch } from "../../Batch";
-import { Fee } from "../../Fee";
-import { Identifier as SettlementIdentifier } from "../../Identifier";
+import { Amount } from "../../Amount";
+import { Authorization } from "../../Authorization";
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier";
+import { Batch } from "../Batch";
+import { Fee } from "../Fee";
 export interface Capture extends Omit<Capture.Creatable, "settlement"> {
     status: "succeeded" | "failed";
     reason?: string;

package/dist/Settlement/Entry/{Legacy/Capture.js → Capture.js}

@@ -1,10 +1,10 @@
 import { isoly } from "isoly";
 import { isly } from "isly";
-import { Amount } from "../../../Amount";
-import { Authorization } from "../../../Authorization";
-import { Batch } from "../../Batch";
-import { Fee } from "../../Fee";
-import { Identifier as SettlementIdentifier } from "../../Identifier";
+import { Amount } from "../../Amount";
+import { Authorization } from "../../Authorization";
+import { Identifier as SettlementIdentifier } from "../../Settlement/Identifier";
+import { Batch } from "../Batch";
+import { Fee } from "../Fee";
 export var Capture;
 (function (Capture) {
     function from(creatable) {

package/dist/Settlement/Entry/Capture.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Capture.js","sourceRoot":"../","sources":["Settlement/Entry/Capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAChF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAA;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AAQ5B,MAAM,KAAW,OAAO,CAgCvB;AAhCD,WAAiB,OAAO;IACvB,SAAgB,IAAI,CAAC,SAAoB;QACxC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAA;IAC5E,CAAC;IAFe,YAAI,OAEnB,CAAA;IAWD,IAAiB,SAAS,CAWzB;IAXD,WAAiB,SAAS;QACZ,cAAI,GAAG,IAAI,CAAC,MAAM,CAAY;YAC1C,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACjC,aAAa,EAAE,aAAa,CAAC,IAAI;YACjC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;YACxB,GAAG,EAAE,GAAG,CAAC,IAAI;YACb,MAAM,EAAE,MAAM,CAAC,IAAI;YACnB,KAAK,EAAE,KAAK,CAAC,IAAI;YACjB,UAAU,EAAE,oBAAoB,CAAC,IAAI;SACrC,CAAC,CAAA;IACH,CAAC,EAXgB,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAWzB;IACY,YAAI,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAU;QACvE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QAChC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;QACpE,UAAU,EAAE,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE;KAChD,CAAC,CAAA;AACH,CAAC,EAhCgB,OAAO,KAAP,OAAO,QAgCvB"}

package/dist/Settlement/Entry/Creatable.d.ts

@@ -1,54 +1,9 @@
 import { isly } from "isly";
-import { Acquirer } from "../../Acquirer";
-import { Amount } from "../../Amount";
-import { Merchant } from "../../Merchant";
-import { Batch } from "../Batch";
-import { Fee } from "../Fee";
-import { Identifier as SettlementIdentifier } from "../Identifier";
-import { Entry as LegacyEntry } from "./Legacy";
-export type Creatable = Creatable.Known | Creatable.Unknown;
+import { Cancel as EntryCancel } from "./Cancel";
+import { Capture as EntryCapture } from "./Capture";
+import { Refund as EntryRefund } from "./Refund";
+import { Unknown as EntryUnknown } from "./Unknown";
+export type Creatable = EntryCancel.Creatable | EntryCapture.Creatable | EntryRefund.Creatable | EntryUnknown.Creatable;
 export declare namespace Creatable {
-    interface Base {
-        card: string;
-        transaction?: string;
-        account: string;
-        approvalCode: string;
-        merchant: Merchant;
-        acquirer: Acquirer;
-        reference: string;
-        batch: Batch;
-        fee: Fee;
-        amount: Amount;
-        settlement: SettlementIdentifier;
-    }
-    namespace Base {
-        const type: import("isly/dist/cjs/object").IslyObject<Base, object>;
-    }
-    interface Capture extends Base {
-        type: "capture";
-    }
-    namespace Capture {
-        const type: import("isly/dist/cjs/object").IslyObject<Capture, Base>;
-        function fromLegacy(maybeLegacy: Capture | LegacyEntry.Capture.Creatable): Capture;
-    }
-    interface Refund extends Base {
-        type: "refund";
-    }
-    namespace Refund {
-        const type: import("isly/dist/cjs/object").IslyObject<Refund, Base>;
-        function fromLegacy(maybeLegacy: Refund | LegacyEntry.Refund.Creatable): Refund;
-    }
-    type Known = Capture | Refund;
-    namespace Known {
-        const type: isly.Type<Capture | Refund>;
-        function fromLegacy(maybeLegacy: Creatable.Known | LegacyEntry.Capture.Creatable | LegacyEntry.Refund.Creatable): Creatable.Known;
-    }
-    interface Unknown extends Partial<Base> {
-        type: "unknown";
-        data: Record<string, unknown>;
-    }
-    namespace Unknown {
-        const type: import("isly/dist/cjs/object").IslyObject<Unknown, object>;
-    }
-    const type: isly.Type<Capture | Refund | Unknown>;
+    const type: isly.Type<EntryCancel.Creatable | EntryCapture.Creatable | EntryRefund.Creatable | EntryUnknown.Creatable>;
 }