@pax2pay/model-banking 0.1.244 → 0.1.246
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Client/Labels.ts +19 -0
- package/Client/index.ts +3 -2
- package/Label.ts +19 -0
- package/Transaction/index.ts +6 -0
- package/dist/Client/Labels.d.ts +12 -0
- package/dist/Client/Labels.js +19 -0
- package/dist/Client/Labels.js.map +1 -0
- package/dist/Client/index.d.ts +3 -2
- package/dist/Client/index.js +3 -2
- package/dist/Client/index.js.map +1 -1
- package/dist/Label.d.ts +18 -0
- package/dist/Label.js +15 -0
- package/dist/Label.js.map +1 -0
- package/dist/Transaction/index.d.ts +3 -2
- package/dist/Transaction/index.js +5 -2
- package/dist/Transaction/index.js.map +1 -1
- package/dist/pax2pay.d.ts +1 -1
- package/dist/pax2pay.js +1 -1
- package/dist/pax2pay.js.map +1 -1
- package/package.json +1 -1
- package/pax2pay.ts +1 -1
- package/Client/Flags.ts +0 -19
- package/Flag.ts +0 -8
- package/dist/Client/Flags.d.ts +0 -11
- package/dist/Client/Flags.js +0 -18
- package/dist/Client/Flags.js.map +0 -1
- package/dist/Flag.d.ts +0 -7
- package/dist/Flag.js +0 -3
- package/dist/Flag.js.map +0 -1
package/Client/Labels.ts
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { gracely } from "gracely"
|
|
2
|
+
import { http } from "cloudly-http"
|
|
3
|
+
import { Label } from "../Label"
|
|
4
|
+
|
|
5
|
+
export class Labels {
|
|
6
|
+
constructor(private readonly client: http.Client, readonly type: Label.Type) {}
|
|
7
|
+
async create(label: Label): Promise<Label | gracely.Error> {
|
|
8
|
+
return this.client.post<Label>(`/label/${this.type}`, label)
|
|
9
|
+
}
|
|
10
|
+
async replace(label: Label): Promise<Label | gracely.Error> {
|
|
11
|
+
return this.client.put<Label>(`/label/${this.type}`, label)
|
|
12
|
+
}
|
|
13
|
+
async list(): Promise<Label[] | gracely.Error> {
|
|
14
|
+
return this.client.get<Label[]>(`/label/${this.type}`)
|
|
15
|
+
}
|
|
16
|
+
async remove(name: string): Promise<Label | gracely.Error> {
|
|
17
|
+
return this.client.delete(`/label/${this.type}/${name}`)
|
|
18
|
+
}
|
|
19
|
+
}
|
package/Client/index.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { rest } from "cloudly-rest"
|
|
|
5
5
|
import { Accounts } from "./Accounts"
|
|
6
6
|
import { Cards } from "./Cards"
|
|
7
7
|
import { Exchanges } from "./Exchanges"
|
|
8
|
-
import {
|
|
8
|
+
import { Labels } from "./Labels"
|
|
9
9
|
import { Operations } from "./Operations"
|
|
10
10
|
import { Organizations } from "./Organizations"
|
|
11
11
|
import { Reports } from "./Reports"
|
|
@@ -28,7 +28,8 @@ export class Client extends rest.Client<gracely.Error> {
|
|
|
28
28
|
readonly settlements = new Settlements(this.client)
|
|
29
29
|
readonly transactions = new Transactions(this.client)
|
|
30
30
|
readonly treasury = new Treasury(this.client)
|
|
31
|
-
readonly flags = new
|
|
31
|
+
readonly flags = new Labels(this.client, "flag")
|
|
32
|
+
readonly groups = new Labels(this.client, "group")
|
|
32
33
|
readonly userwidgets = (server: string, application: string) =>
|
|
33
34
|
new userwidgets.ClientCollection(new http.Client(server), { application })
|
|
34
35
|
readonly version = new Version(this.client)
|
package/Label.ts
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { isly } from "isly"
|
|
2
|
+
|
|
3
|
+
export interface Label {
|
|
4
|
+
name: string
|
|
5
|
+
color: string
|
|
6
|
+
description: string
|
|
7
|
+
}
|
|
8
|
+
export namespace Label {
|
|
9
|
+
export const type = isly.object<Label>({ name: isly.string(), color: isly.string(), description: isly.string() })
|
|
10
|
+
export const is = type.is
|
|
11
|
+
export const flaw = type.flaw
|
|
12
|
+
export type Type = typeof Type.values[number]
|
|
13
|
+
export namespace Type {
|
|
14
|
+
export const values = ["flag", "group"] as const
|
|
15
|
+
export const type = isly.string(values)
|
|
16
|
+
export const is = type.is
|
|
17
|
+
export const flaw = type.flaw
|
|
18
|
+
}
|
|
19
|
+
}
|
package/Transaction/index.ts
CHANGED
|
@@ -14,6 +14,7 @@ import { Status as TransactionStatus } from "./Status"
|
|
|
14
14
|
export interface Transaction extends Transaction.Creatable {
|
|
15
15
|
organization: string
|
|
16
16
|
accountId: string
|
|
17
|
+
accountName?: string
|
|
17
18
|
account: Rail.Address
|
|
18
19
|
readonly id: cryptly.Identifier
|
|
19
20
|
readonly reference?: Transaction.Reference
|
|
@@ -54,6 +55,7 @@ export namespace Transaction {
|
|
|
54
55
|
export const type = Creatable.type.extend<Transaction>({
|
|
55
56
|
organization: isly.string(),
|
|
56
57
|
accountId: isly.string(),
|
|
58
|
+
accountName: isly.string().optional(),
|
|
57
59
|
account: isly.fromIs("Rail", Rail.Address.is),
|
|
58
60
|
id: isly.fromIs("cryptly.Identifier", cryptly.Identifier.is).readonly(),
|
|
59
61
|
reference: Reference.type.readonly().optional(),
|
|
@@ -78,6 +80,7 @@ export namespace Transaction {
|
|
|
78
80
|
export function fromCreatable(
|
|
79
81
|
organization: string,
|
|
80
82
|
accountId: string,
|
|
83
|
+
accountName: string,
|
|
81
84
|
account: Rail.Address,
|
|
82
85
|
rail: Rail,
|
|
83
86
|
transaction: Creatable,
|
|
@@ -94,6 +97,7 @@ export namespace Transaction {
|
|
|
94
97
|
...transaction,
|
|
95
98
|
organization,
|
|
96
99
|
accountId,
|
|
100
|
+
accountName,
|
|
97
101
|
account,
|
|
98
102
|
id,
|
|
99
103
|
posted: isoly.DateTime.now(),
|
|
@@ -110,6 +114,7 @@ export namespace Transaction {
|
|
|
110
114
|
export function fromIncoming(
|
|
111
115
|
organization: string,
|
|
112
116
|
accountId: string,
|
|
117
|
+
accountName: string,
|
|
113
118
|
transaction: Incoming,
|
|
114
119
|
operations: Operation.Creatable[],
|
|
115
120
|
balance: {
|
|
@@ -123,6 +128,7 @@ export namespace Transaction {
|
|
|
123
128
|
...transaction,
|
|
124
129
|
organization,
|
|
125
130
|
accountId,
|
|
131
|
+
accountName,
|
|
126
132
|
balance,
|
|
127
133
|
id,
|
|
128
134
|
operations: operations.map(o => Operation.fromCreatable(id, o)),
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { gracely } from "gracely";
|
|
2
|
+
import { http } from "cloudly-http";
|
|
3
|
+
import { Label } from "../Label";
|
|
4
|
+
export declare class Labels {
|
|
5
|
+
private readonly client;
|
|
6
|
+
readonly type: Label.Type;
|
|
7
|
+
constructor(client: http.Client, type: Label.Type);
|
|
8
|
+
create(label: Label): Promise<Label | gracely.Error>;
|
|
9
|
+
replace(label: Label): Promise<Label | gracely.Error>;
|
|
10
|
+
list(): Promise<Label[] | gracely.Error>;
|
|
11
|
+
remove(name: string): Promise<Label | gracely.Error>;
|
|
12
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
export class Labels {
|
|
2
|
+
constructor(client, type) {
|
|
3
|
+
this.client = client;
|
|
4
|
+
this.type = type;
|
|
5
|
+
}
|
|
6
|
+
async create(label) {
|
|
7
|
+
return this.client.post(`/label/${this.type}`, label);
|
|
8
|
+
}
|
|
9
|
+
async replace(label) {
|
|
10
|
+
return this.client.put(`/label/${this.type}`, label);
|
|
11
|
+
}
|
|
12
|
+
async list() {
|
|
13
|
+
return this.client.get(`/label/${this.type}`);
|
|
14
|
+
}
|
|
15
|
+
async remove(name) {
|
|
16
|
+
return this.client.delete(`/label/${this.type}/${name}`);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=Labels.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Labels.js","sourceRoot":"../","sources":["Client/Labels.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,MAAM;IAClB,YAA6B,MAAmB,EAAW,IAAgB;QAA9C,WAAM,GAAN,MAAM,CAAa;QAAW,SAAI,GAAJ,IAAI,CAAY;IAAG,CAAC;IAC/E,KAAK,CAAC,MAAM,CAAC,KAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAQ,UAAU,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAA;IAC7D,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,KAAY;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAQ,UAAU,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAA;IAC5D,CAAC;IACD,KAAK,CAAC,IAAI;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAU,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACvD,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAA;IACzD,CAAC;CACD"}
|
package/dist/Client/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { rest } from "cloudly-rest";
|
|
|
5
5
|
import { Accounts } from "./Accounts";
|
|
6
6
|
import { Cards } from "./Cards";
|
|
7
7
|
import { Exchanges } from "./Exchanges";
|
|
8
|
-
import {
|
|
8
|
+
import { Labels } from "./Labels";
|
|
9
9
|
import { Operations } from "./Operations";
|
|
10
10
|
import { Organizations } from "./Organizations";
|
|
11
11
|
import { Reports } from "./Reports";
|
|
@@ -27,7 +27,8 @@ export declare class Client extends rest.Client<gracely.Error> {
|
|
|
27
27
|
readonly settlements: Settlements;
|
|
28
28
|
readonly transactions: Transactions;
|
|
29
29
|
readonly treasury: Treasury;
|
|
30
|
-
readonly flags:
|
|
30
|
+
readonly flags: Labels;
|
|
31
|
+
readonly groups: Labels;
|
|
31
32
|
readonly userwidgets: (server: string, application: string) => userwidgets.ClientCollection;
|
|
32
33
|
readonly version: Version;
|
|
33
34
|
static create<T = Record<string, any>>(server: string, key?: string, load?: (client: http.Client) => T): Client & T;
|
package/dist/Client/index.js
CHANGED
|
@@ -4,7 +4,7 @@ import { rest } from "cloudly-rest";
|
|
|
4
4
|
import { Accounts } from "./Accounts";
|
|
5
5
|
import { Cards } from "./Cards";
|
|
6
6
|
import { Exchanges } from "./Exchanges";
|
|
7
|
-
import {
|
|
7
|
+
import { Labels } from "./Labels";
|
|
8
8
|
import { Operations } from "./Operations";
|
|
9
9
|
import { Organizations } from "./Organizations";
|
|
10
10
|
import { Reports } from "./Reports";
|
|
@@ -26,7 +26,8 @@ export class Client extends rest.Client {
|
|
|
26
26
|
this.settlements = new Settlements(this.client);
|
|
27
27
|
this.transactions = new Transactions(this.client);
|
|
28
28
|
this.treasury = new Treasury(this.client);
|
|
29
|
-
this.flags = new
|
|
29
|
+
this.flags = new Labels(this.client, "flag");
|
|
30
|
+
this.groups = new Labels(this.client, "group");
|
|
30
31
|
this.userwidgets = (server, application) => new userwidgets.ClientCollection(new http.Client(server), { application });
|
|
31
32
|
this.version = new Version(this.client);
|
|
32
33
|
}
|
package/dist/Client/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/index.ts"],"names":[],"mappings":"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"}
|
package/dist/Label.d.ts
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { isly } from "isly";
|
|
2
|
+
export interface Label {
|
|
3
|
+
name: string;
|
|
4
|
+
color: string;
|
|
5
|
+
description: string;
|
|
6
|
+
}
|
|
7
|
+
export declare namespace Label {
|
|
8
|
+
const type: isly.object.ExtendableType<Label>;
|
|
9
|
+
const is: isly.Type.IsFunction<Label>;
|
|
10
|
+
const flaw: isly.Type.FlawFunction;
|
|
11
|
+
type Type = typeof Type.values[number];
|
|
12
|
+
namespace Type {
|
|
13
|
+
const values: readonly ["flag", "group"];
|
|
14
|
+
const type: isly.Type<"group" | "flag">;
|
|
15
|
+
const is: isly.Type.IsFunction<"group" | "flag">;
|
|
16
|
+
const flaw: isly.Type.FlawFunction;
|
|
17
|
+
}
|
|
18
|
+
}
|
package/dist/Label.js
ADDED
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { isly } from "isly";
|
|
2
|
+
export var Label;
|
|
3
|
+
(function (Label) {
|
|
4
|
+
Label.type = isly.object({ name: isly.string(), color: isly.string(), description: isly.string() });
|
|
5
|
+
Label.is = Label.type.is;
|
|
6
|
+
Label.flaw = Label.type.flaw;
|
|
7
|
+
let Type;
|
|
8
|
+
(function (Type) {
|
|
9
|
+
Type.values = ["flag", "group"];
|
|
10
|
+
Type.type = isly.string(Type.values);
|
|
11
|
+
Type.is = Type.type.is;
|
|
12
|
+
Type.flaw = Type.type.flaw;
|
|
13
|
+
})(Type = Label.Type || (Label.Type = {}));
|
|
14
|
+
})(Label || (Label = {}));
|
|
15
|
+
//# sourceMappingURL=Label.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Label.js","sourceRoot":"../","sources":["Label.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAO3B,MAAM,KAAW,KAAK,CAWrB;AAXD,WAAiB,KAAK;IACR,UAAI,GAAG,IAAI,CAAC,MAAM,CAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACpG,QAAE,GAAG,MAAA,IAAI,CAAC,EAAE,CAAA;IACZ,UAAI,GAAG,MAAA,IAAI,CAAC,IAAI,CAAA;IAE7B,IAAiB,IAAI,CAKpB;IALD,WAAiB,IAAI;QACP,WAAM,GAAG,CAAC,MAAM,EAAE,OAAO,CAAU,CAAA;QACnC,SAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAA,MAAM,CAAC,CAAA;QAC1B,OAAE,GAAG,KAAA,IAAI,CAAC,EAAE,CAAA;QACZ,SAAI,GAAG,KAAA,IAAI,CAAC,IAAI,CAAA;IAC9B,CAAC,EALgB,IAAI,GAAJ,UAAI,KAAJ,UAAI,QAKpB;AACF,CAAC,EAXgB,KAAK,KAAL,KAAK,QAWrB"}
|
|
@@ -12,6 +12,7 @@ import { Status as TransactionStatus } from "./Status";
|
|
|
12
12
|
export interface Transaction extends Transaction.Creatable {
|
|
13
13
|
organization: string;
|
|
14
14
|
accountId: string;
|
|
15
|
+
accountName?: string;
|
|
15
16
|
account: Rail.Address;
|
|
16
17
|
readonly id: cryptly.Identifier;
|
|
17
18
|
readonly reference?: Transaction.Reference;
|
|
@@ -53,12 +54,12 @@ export declare namespace Transaction {
|
|
|
53
54
|
const is: isly.Type.IsFunction<Transaction>;
|
|
54
55
|
const flaw: isly.Type.FlawFunction;
|
|
55
56
|
const get: isly.Type.GetFunction<Transaction>;
|
|
56
|
-
function fromCreatable(organization: string, accountId: string, account: Rail.Address, rail: Rail, transaction: Creatable, operations: Operation.Creatable[], balance: {
|
|
57
|
+
function fromCreatable(organization: string, accountId: string, accountName: string, account: Rail.Address, rail: Rail, transaction: Creatable, operations: Operation.Creatable[], balance: {
|
|
57
58
|
actual: number;
|
|
58
59
|
reserved: number;
|
|
59
60
|
available: number;
|
|
60
61
|
}, by?: string): Transaction;
|
|
61
|
-
function fromIncoming(organization: string, accountId: string, transaction: Incoming, operations: Operation.Creatable[], balance: {
|
|
62
|
+
function fromIncoming(organization: string, accountId: string, accountName: string, transaction: Incoming, operations: Operation.Creatable[], balance: {
|
|
62
63
|
actual: number;
|
|
63
64
|
reserved: number;
|
|
64
65
|
available: number;
|
|
@@ -21,6 +21,7 @@ export var Transaction;
|
|
|
21
21
|
Transaction.type = Transaction.Creatable.type.extend({
|
|
22
22
|
organization: isly.string(),
|
|
23
23
|
accountId: isly.string(),
|
|
24
|
+
accountName: isly.string().optional(),
|
|
24
25
|
account: isly.fromIs("Rail", Rail.Address.is),
|
|
25
26
|
id: isly.fromIs("cryptly.Identifier", cryptly.Identifier.is).readonly(),
|
|
26
27
|
reference: Transaction.Reference.type.readonly().optional(),
|
|
@@ -42,12 +43,13 @@ export var Transaction;
|
|
|
42
43
|
Transaction.is = Transaction.type.is;
|
|
43
44
|
Transaction.flaw = Transaction.type.flaw;
|
|
44
45
|
Transaction.get = Transaction.type.get;
|
|
45
|
-
function fromCreatable(organization, accountId, account, rail, transaction, operations, balance, by) {
|
|
46
|
+
function fromCreatable(organization, accountId, accountName, account, rail, transaction, operations, balance, by) {
|
|
46
47
|
const id = Identifier.generate();
|
|
47
48
|
return {
|
|
48
49
|
...transaction,
|
|
49
50
|
organization,
|
|
50
51
|
accountId,
|
|
52
|
+
accountName,
|
|
51
53
|
account,
|
|
52
54
|
id,
|
|
53
55
|
posted: isoly.DateTime.now(),
|
|
@@ -62,12 +64,13 @@ export var Transaction;
|
|
|
62
64
|
};
|
|
63
65
|
}
|
|
64
66
|
Transaction.fromCreatable = fromCreatable;
|
|
65
|
-
function fromIncoming(organization, accountId, transaction, operations, balance) {
|
|
67
|
+
function fromIncoming(organization, accountId, accountName, transaction, operations, balance) {
|
|
66
68
|
const id = Identifier.generate();
|
|
67
69
|
return {
|
|
68
70
|
...transaction,
|
|
69
71
|
organization,
|
|
70
72
|
accountId,
|
|
73
|
+
accountName,
|
|
71
74
|
balance,
|
|
72
75
|
id,
|
|
73
76
|
operations: operations.map(o => Operation.fromCreatable(id, o)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"../","sources":["Transaction/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAA;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,WAAW,CAAA;AACzD,OAAO,EAAE,SAAS,IAAI,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,QAAQ,IAAI,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAC5D,OAAO,EAAE,IAAI,IAAI,eAAe,EAAE,MAAM,QAAQ,CAAA;AAChD,OAAO,EAAE,SAAS,IAAI,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAC/D,OAAO,EAAE,MAAM,IAAI,iBAAiB,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"../","sources":["Transaction/index.ts"],"names":[],"mappings":"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"}
|
package/dist/pax2pay.d.ts
CHANGED
|
@@ -20,7 +20,7 @@ export { Identifier } from "./Identifier";
|
|
|
20
20
|
export { Amount } from "./Amount";
|
|
21
21
|
export { Amounts } from "./Amounts";
|
|
22
22
|
export { Report } from "./Report";
|
|
23
|
-
export {
|
|
23
|
+
export { Label } from "./Label";
|
|
24
24
|
export { Identity } from "./Identity";
|
|
25
25
|
export { Key } from "./Key";
|
|
26
26
|
export { Exchange } from "./Exchange";
|
package/dist/pax2pay.js
CHANGED
|
@@ -20,7 +20,7 @@ export { Identifier } from "./Identifier";
|
|
|
20
20
|
export { Amount } from "./Amount";
|
|
21
21
|
export { Amounts } from "./Amounts";
|
|
22
22
|
export { Report } from "./Report";
|
|
23
|
-
export {
|
|
23
|
+
export { Label } from "./Label";
|
|
24
24
|
export { Identity } from "./Identity";
|
|
25
25
|
export { Key } from "./Key";
|
|
26
26
|
export { Exchange } from "./Exchange";
|
package/dist/pax2pay.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pax2pay.js","sourceRoot":"../","sources":["pax2pay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pax2pay.js","sourceRoot":"../","sources":["pax2pay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA"}
|
package/package.json
CHANGED
package/pax2pay.ts
CHANGED
|
@@ -20,7 +20,7 @@ export { Identifier } from "./Identifier"
|
|
|
20
20
|
export { Amount } from "./Amount"
|
|
21
21
|
export { Amounts } from "./Amounts"
|
|
22
22
|
export { Report } from "./Report"
|
|
23
|
-
export {
|
|
23
|
+
export { Label } from "./Label"
|
|
24
24
|
export { Identity } from "./Identity"
|
|
25
25
|
export { Key } from "./Key"
|
|
26
26
|
export { Exchange } from "./Exchange"
|
package/Client/Flags.ts
DELETED
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import { gracely } from "gracely"
|
|
2
|
-
import { http } from "cloudly-http"
|
|
3
|
-
import { Flag } from "../Flag"
|
|
4
|
-
|
|
5
|
-
export class Flags {
|
|
6
|
-
constructor(private readonly client: http.Client) {}
|
|
7
|
-
async create(flag: Flag): Promise<Flag | gracely.Error> {
|
|
8
|
-
return this.client.post<Flag>("/flag", flag)
|
|
9
|
-
}
|
|
10
|
-
async replace(flag: Flag): Promise<Flag | gracely.Error> {
|
|
11
|
-
return this.client.put<Flag>("/flag", flag)
|
|
12
|
-
}
|
|
13
|
-
async list(): Promise<Flag[] | gracely.Error> {
|
|
14
|
-
return this.client.get<Flag[]>("/flag")
|
|
15
|
-
}
|
|
16
|
-
async remove(name: string): Promise<Flag | gracely.Error> {
|
|
17
|
-
return this.client.delete(`/flag/${name}`)
|
|
18
|
-
}
|
|
19
|
-
}
|
package/Flag.ts
DELETED
package/dist/Client/Flags.d.ts
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { gracely } from "gracely";
|
|
2
|
-
import { http } from "cloudly-http";
|
|
3
|
-
import { Flag } from "../Flag";
|
|
4
|
-
export declare class Flags {
|
|
5
|
-
private readonly client;
|
|
6
|
-
constructor(client: http.Client);
|
|
7
|
-
create(flag: Flag): Promise<Flag | gracely.Error>;
|
|
8
|
-
replace(flag: Flag): Promise<Flag | gracely.Error>;
|
|
9
|
-
list(): Promise<Flag[] | gracely.Error>;
|
|
10
|
-
remove(name: string): Promise<Flag | gracely.Error>;
|
|
11
|
-
}
|
package/dist/Client/Flags.js
DELETED
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export class Flags {
|
|
2
|
-
constructor(client) {
|
|
3
|
-
this.client = client;
|
|
4
|
-
}
|
|
5
|
-
async create(flag) {
|
|
6
|
-
return this.client.post("/flag", flag);
|
|
7
|
-
}
|
|
8
|
-
async replace(flag) {
|
|
9
|
-
return this.client.put("/flag", flag);
|
|
10
|
-
}
|
|
11
|
-
async list() {
|
|
12
|
-
return this.client.get("/flag");
|
|
13
|
-
}
|
|
14
|
-
async remove(name) {
|
|
15
|
-
return this.client.delete(`/flag/${name}`);
|
|
16
|
-
}
|
|
17
|
-
}
|
|
18
|
-
//# sourceMappingURL=Flags.js.map
|
package/dist/Client/Flags.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Flags.js","sourceRoot":"../","sources":["Client/Flags.ts"],"names":[],"mappings":"AAIA,MAAM,OAAO,KAAK;IACjB,YAA6B,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;IAAG,CAAC;IACpD,KAAK,CAAC,MAAM,CAAC,IAAU;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAO,OAAO,EAAE,IAAI,CAAC,CAAA;IAC7C,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,IAAU;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAO,OAAO,EAAE,IAAI,CAAC,CAAA;IAC5C,CAAC;IACD,KAAK,CAAC,IAAI;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAS,OAAO,CAAC,CAAA;IACxC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IAC3C,CAAC;CACD"}
|
package/dist/Flag.d.ts
DELETED
package/dist/Flag.js
DELETED
package/dist/Flag.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Flag.js","sourceRoot":"../","sources":["Flag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAO3B,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA"}
|