@serene-dev/la-nest-library 0.0.124 → 0.0.125
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/dist/libs/la-library/src/modules/wallet/wallet-transaction.service.js +14 -3
- package/dist/libs/la-library/src/modules/wallet/wallet-transaction.service.js.map +1 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.dto.d.ts +1 -0
- package/dist/libs/la-library/src/modules/wallet/wallet.dto.js +11 -0
- package/dist/libs/la-library/src/modules/wallet/wallet.dto.js.map +1 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.entity.d.ts +1 -0
- package/dist/libs/la-library/src/modules/wallet/wallet.entity.js +8 -4
- package/dist/libs/la-library/src/modules/wallet/wallet.entity.js.map +1 -1
- package/dist/libs/la-library/src/modules/wallet/wallet.service.d.ts +1 -0
- package/dist/libs/la-library/src/modules/wallet/wallet.service.js +3 -0
- package/dist/libs/la-library/src/modules/wallet/wallet.service.js.map +1 -1
- package/package.json +1 -1
|
@@ -22,6 +22,7 @@ const typeorm_2 = require("typeorm");
|
|
|
22
22
|
const search_enum_1 = require("../../enums/search.enum");
|
|
23
23
|
const wallet_service_1 = require("./wallet.service");
|
|
24
24
|
const utility_service_1 = require("../../services/utility.service");
|
|
25
|
+
const wallet_enum_1 = require("./wallet.enum");
|
|
25
26
|
let WalletTransactionService = class WalletTransactionService extends base_service_1.BaseService {
|
|
26
27
|
constructor(repo, walletService) {
|
|
27
28
|
super(repo, base_enum_1.ETableName.wallet);
|
|
@@ -44,16 +45,26 @@ let WalletTransactionService = class WalletTransactionService extends base_servi
|
|
|
44
45
|
];
|
|
45
46
|
}
|
|
46
47
|
async create(walletID, data) {
|
|
47
|
-
const wallet = await this.walletService.
|
|
48
|
+
const wallet = await this.walletService.getComputedById(walletID);
|
|
48
49
|
if (!wallet)
|
|
49
50
|
utility_service_1.UtilityClass.throwError({
|
|
50
51
|
message: `Wallet could not be found`,
|
|
51
52
|
statusCode: 404,
|
|
52
53
|
});
|
|
54
|
+
if (data.type == wallet_enum_1.ETransactionType.debit &&
|
|
55
|
+
data.amount > wallet.grossBalance)
|
|
56
|
+
if (!wallet.allowOverdraft)
|
|
57
|
+
utility_service_1.UtilityClass.throwError({
|
|
58
|
+
message: `You do not have a sufficient balance to fund this transaction`,
|
|
59
|
+
});
|
|
60
|
+
else if (data.amount >= wallet.overdraftLimit + wallet.grossBalance)
|
|
61
|
+
utility_service_1.UtilityClass.throwError({
|
|
62
|
+
message: `You have gone past your overdraft limit and are therefore unable to fund this transaction`,
|
|
63
|
+
});
|
|
53
64
|
const entity = new wallet_entity_1.WalletTransactionEntity({
|
|
54
65
|
...data,
|
|
55
|
-
netBalanceBefore:
|
|
56
|
-
grossBalanceBefore:
|
|
66
|
+
netBalanceBefore: wallet.netBalance,
|
|
67
|
+
grossBalanceBefore: wallet.grossBalance,
|
|
57
68
|
wallet,
|
|
58
69
|
userID: wallet.userID,
|
|
59
70
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-transaction.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet-transaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAA0D;AAC1D,8DAA0D;AAK1D,qDAAmD;AACnD,6CAAmD;AACnD,qCAAqC;AACrC,yDAA2D;AAC3D,qDAAiD;AACjD,oEAA8D;
|
|
1
|
+
{"version":3,"file":"wallet-transaction.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet-transaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAA0D;AAC1D,8DAA0D;AAK1D,qDAAmD;AACnD,6CAAmD;AACnD,qCAAqC;AACrC,yDAA2D;AAC3D,qDAAiD;AACjD,oEAA8D;AAC9D,+CAAiD;AAG1C,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,0BAG7C;IACC,YAEqB,IAAyC,EAClD,aAA4B;QAEtC,KAAK,CAAC,IAAI,EAAE,sBAAU,CAAC,MAAM,CAAC,CAAC;QAHZ,SAAI,GAAJ,IAAI,CAAqC;QAClD,kBAAa,GAAb,aAAa,CAAe;QAGtC,IAAI,CAAC,WAAW,GAAG;YACjB,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE;YACrE,EAAE,KAAK,EAAE,QAAQ,EAAE;YACnB,EAAE,KAAK,EAAE,kBAAkB,EAAE;YAC7B,EAAE,KAAK,EAAE,oBAAoB,EAAE;YAC/B,EAAE,KAAK,EAAE,MAAM,EAAE;YACjB,EAAE,KAAK,EAAE,UAAU,EAAE;YACrB,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,8BAAgB,CAAC,QAAQ,EAAE;YACzD,EAAE,KAAK,EAAE,aAAa,EAAE;YACxB,EAAE,KAAK,EAAE,YAAY,EAAE;YACvB,EAAE,KAAK,EAAE,UAAU,EAAE;YACrB,EAAE,KAAK,EAAE,sBAAsB,EAAE;YACjC,EAAE,KAAK,EAAE,UAAU,EAAE;YACrB,EAAE,KAAK,EAAE,QAAQ,EAAE;SACpB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,IAAgC;QAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM;YACT,8BAAY,CAAC,UAAU,CAAC;gBACtB,OAAO,EAAE,2BAA2B;gBACpC,UAAU,EAAE,GAAG;aAChB,CAAC,CAAC;QAEL,IACE,IAAI,CAAC,IAAI,IAAI,8BAAgB,CAAC,KAAK;YACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY;YAEjC,IAAI,CAAC,MAAM,CAAC,cAAc;gBACxB,8BAAY,CAAC,UAAU,CAAC;oBACtB,OAAO,EAAE,+DAA+D;iBACzE,CAAC,CAAC;iBACA,IAAI,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,YAAY;gBACjE,8BAAY,CAAC,UAAU,CAAC;oBACtB,OAAO,EAAE,2FAA2F;iBACrG,CAAC,CAAC;QAEP,MAAM,MAAM,GAAG,IAAI,uCAAuB,CAAC;YACzC,GAAG,IAAI;YACP,gBAAgB,EAAE,MAAM,CAAC,UAAU;YACnC,kBAAkB,EAAE,MAAM,CAAC,YAAY;YACvC,MAAM;YACN,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AAzDY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,0BAAgB,EAAC,uCAAuB,CAAC,CAAA;qCACjB,oBAAU;QACV,8BAAa;GAP7B,wBAAwB,CAyDpC"}
|
|
@@ -41,6 +41,7 @@ export declare class UpdateWalletTransactionDTO implements Partial<WalletTransac
|
|
|
41
41
|
}
|
|
42
42
|
export declare class CreateWalletTransactionDTO implements Partial<WalletTransactionEntity> {
|
|
43
43
|
amount: number;
|
|
44
|
+
surcharge: number;
|
|
44
45
|
type: ETransactionType;
|
|
45
46
|
currency: ECurrency;
|
|
46
47
|
reason: string;
|
|
@@ -216,13 +216,24 @@ __decorate([
|
|
|
216
216
|
__metadata("design:type", Boolean)
|
|
217
217
|
], UpdateWalletTransactionDTO.prototype, "isFailed", void 0);
|
|
218
218
|
class CreateWalletTransactionDTO {
|
|
219
|
+
constructor() {
|
|
220
|
+
this.surcharge = 0;
|
|
221
|
+
}
|
|
219
222
|
}
|
|
220
223
|
exports.CreateWalletTransactionDTO = CreateWalletTransactionDTO;
|
|
221
224
|
__decorate([
|
|
222
225
|
(0, swagger_1.ApiProperty)(),
|
|
223
226
|
(0, class_validator_1.IsNumber)(),
|
|
227
|
+
(0, class_validator_1.Min)(0),
|
|
224
228
|
__metadata("design:type", Number)
|
|
225
229
|
], CreateWalletTransactionDTO.prototype, "amount", void 0);
|
|
230
|
+
__decorate([
|
|
231
|
+
(0, swagger_1.ApiPropertyOptional)(),
|
|
232
|
+
(0, class_validator_1.IsNumber)(),
|
|
233
|
+
(0, class_validator_1.IsOptional)(),
|
|
234
|
+
(0, class_validator_1.Min)(0),
|
|
235
|
+
__metadata("design:type", Number)
|
|
236
|
+
], CreateWalletTransactionDTO.prototype, "surcharge", void 0);
|
|
226
237
|
__decorate([
|
|
227
238
|
(0, swagger_1.ApiProperty)({ type: 'enum', enum: wallet_enum_1.ETransactionType }),
|
|
228
239
|
(0, class_validator_1.IsEnum)(wallet_enum_1.ETransactionType),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.dto.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmE;AAMnE,
|
|
1
|
+
{"version":3,"file":"wallet.dto.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ export declare class WalletExternalBank extends BaseEntity<WalletExternalBank> {
|
|
|
17
17
|
}
|
|
18
18
|
export declare class WalletTransactionEntity extends BaseEntity<WalletTransactionEntity> {
|
|
19
19
|
amount: number;
|
|
20
|
+
surcharge: number;
|
|
20
21
|
netBalanceBefore: number;
|
|
21
22
|
grossBalanceBefore: number;
|
|
22
23
|
type: ETransactionType;
|
|
@@ -77,6 +77,10 @@ __decorate([
|
|
|
77
77
|
(0, typeorm_1.Column)({ type: 'double' }),
|
|
78
78
|
__metadata("design:type", Number)
|
|
79
79
|
], WalletTransactionEntity.prototype, "amount", void 0);
|
|
80
|
+
__decorate([
|
|
81
|
+
(0, typeorm_1.Column)({ type: 'double', default: 0 }),
|
|
82
|
+
__metadata("design:type", Number)
|
|
83
|
+
], WalletTransactionEntity.prototype, "surcharge", void 0);
|
|
80
84
|
__decorate([
|
|
81
85
|
(0, typeorm_1.Column)({ type: 'double' }),
|
|
82
86
|
__metadata("design:type", Number)
|
|
@@ -158,7 +162,7 @@ __decorate([
|
|
|
158
162
|
exports.WalletBalanceView = WalletBalanceView = __decorate([
|
|
159
163
|
(0, typeorm_1.ViewEntity)({
|
|
160
164
|
expression: `
|
|
161
|
-
|
|
165
|
+
SELECT temp.*,
|
|
162
166
|
temp.grossTotalCredit - temp.grossTotalDebit AS grossBalance,
|
|
163
167
|
temp.netTotalCredit - temp.netTotalDebit AS netBalance
|
|
164
168
|
FROM (SELECT wallet.*,
|
|
@@ -171,7 +175,7 @@ FROM (SELECT wallet.*,
|
|
|
171
175
|
Sum(CASE
|
|
172
176
|
WHEN wallet_transaction.type = 'DEBIT'
|
|
173
177
|
AND wallet_transaction.isFailed = 0 THEN
|
|
174
|
-
wallet_transaction.amount
|
|
178
|
+
wallet_transaction.amount+ wallet_transaction.surcharge
|
|
175
179
|
ELSE 0
|
|
176
180
|
end) AS grossTotalDebit,
|
|
177
181
|
Sum(CASE
|
|
@@ -185,14 +189,14 @@ FROM (SELECT wallet.*,
|
|
|
185
189
|
WHEN wallet_transaction.type = 'DEBIT'
|
|
186
190
|
AND wallet_transaction.isFailed = 0
|
|
187
191
|
AND wallet_transaction.isVerified = 1 THEN
|
|
188
|
-
wallet_transaction.amount
|
|
192
|
+
wallet_transaction.amount+ wallet_transaction.surcharge
|
|
189
193
|
ELSE 0
|
|
190
194
|
end) AS netTotalDebit
|
|
191
195
|
FROM wallet
|
|
192
196
|
LEFT JOIN wallet_transaction
|
|
193
197
|
ON wallet.id = wallet_transaction.walletId
|
|
194
198
|
GROUP BY wallet.id) AS temp;
|
|
195
|
-
|
|
199
|
+
`,
|
|
196
200
|
})
|
|
197
201
|
], WalletBalanceView);
|
|
198
202
|
exports.WalletEntities = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.entity.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAOiB;AACjB,qDAAmD;AACnD,4DAAwD;AACxD,+CAA0E;AAGnE,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,wBAAwB;CAqBzD,CAAA;AArBY,oCAAY;AAEvB;IADC,IAAA,gBAAM,GAAE;;0CACK;AAGd;IADC,IAAA,gBAAM,GAAE;;4CACM;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;;0CAC/B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;oDACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;oDAChB;AAGvB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uBAAuB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;;kDACxB;AAGxC;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kBAAkB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;;yDACjB;uBApB/B,YAAY;IADxB,IAAA,gBAAM,EAAC,sBAAU,CAAC,MAAM,CAAC;GACb,YAAY,CAqBxB;AAGM,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,wBAA8B;CAYrE,CAAA;AAZY,gDAAkB;AAE7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDAClC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACvC;AAGlB;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC;8BAC1D,YAAY;kDAAC;6BAXV,kBAAkB;IAD9B,IAAA,gBAAM,EAAC,sBAAU,CAAC,kBAAkB,CAAC;GACzB,kBAAkB,CAY9B;AAGM,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,wBAAmC;
|
|
1
|
+
{"version":3,"file":"wallet.entity.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,5 +6,6 @@ export declare class WalletService extends BaseService<WalletEntity, WalletSearc
|
|
|
6
6
|
protected repo: Repository<WalletEntity>;
|
|
7
7
|
protected repoWalletBalanceView: Repository<WalletBalanceView>;
|
|
8
8
|
constructor(repo: Repository<WalletEntity>, repoWalletBalanceView: Repository<WalletBalanceView>);
|
|
9
|
+
getComputedById(walletID: string): Promise<WalletBalanceView>;
|
|
9
10
|
searchComputedView({ grossBalance, grossBalanceFrom, grossBalanceTo, grossTotalCredit, grossTotalCreditFrom, grossTotalCreditTo, grossTotalDebit, grossTotalDebitFrom, grossTotalDebitTo, netBalance, netBalanceFrom, netBalanceTo, netTotalCredit, netTotalCreditFrom, netTotalCreditTo, netTotalDebit, netTotalDebitFrom, netTotalDebitTo, overdraftLimit, overdraftLimitFrom, overdraftLimitTo, ...query }: WalletSearchDTO): Promise<import("../..").ISearchResponse<WalletBalanceView>>;
|
|
10
11
|
}
|
|
@@ -26,6 +26,9 @@ let WalletService = class WalletService extends base_service_1.BaseService {
|
|
|
26
26
|
this.repo = repo;
|
|
27
27
|
this.repoWalletBalanceView = repoWalletBalanceView;
|
|
28
28
|
}
|
|
29
|
+
getComputedById(walletID) {
|
|
30
|
+
return this.repoWalletBalanceView.findOneBy({ id: walletID });
|
|
31
|
+
}
|
|
29
32
|
searchComputedView({ grossBalance, grossBalanceFrom, grossBalanceTo, grossTotalCredit, grossTotalCreditFrom, grossTotalCreditTo, grossTotalDebit, grossTotalDebitFrom, grossTotalDebitTo, netBalance, netBalanceFrom, netBalanceTo, netTotalCredit, netTotalCreditFrom, netTotalCreditTo, netTotalDebit, netTotalDebitFrom, netTotalDebitTo, overdraftLimit, overdraftLimitFrom, overdraftLimitTo, ...query }) {
|
|
30
33
|
return utility_service_1.UtilityClass.search(this.repoWalletBalanceView, query, {
|
|
31
34
|
baseOrder: { createdAt: 'desc' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAAkE;AAClE,8DAA0D;AAE1D,qDAAmD;AACnD,6CAAmD;AACnD,qCAAqC;AACrC,oEAA8D;AAGvD,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,0BAA0C;IAC3E,YAEqB,IAA8B,EAEvC,qBAAoD;QAE9D,KAAK,CAAC,IAAI,EAAE,sBAAU,CAAC,MAAM,CAAC,CAAC;QAJZ,SAAI,GAAJ,IAAI,CAA0B;QAEvC,0BAAqB,GAArB,qBAAqB,CAA+B;IAGhE,CAAC;IAED,kBAAkB,CAAC,EACjB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,GAAG,KAAK,EACQ;QAChB,OAAO,8BAAY,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,KAAK,EAAE;YAC5D,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;YAChC,SAAS,EAAE;gBACT,YAAY,EAAE,8BAAY,CAAC,iBAAiB,CAC1C,YAAY,EACZ,gBAAgB,EAChB,cAAc,CACf;gBACD,UAAU,EAAE,8BAAY,CAAC,iBAAiB,CACxC,UAAU,EACV,cAAc,EACd,YAAY,CACb;gBACD,gBAAgB,EAAE,8BAAY,CAAC,iBAAiB,CAC9C,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,CACnB;gBACD,eAAe,EAAE,8BAAY,CAAC,iBAAiB,CAC7C,eAAe,EACf,mBAAmB,EACnB,iBAAiB,CAClB;gBACD,cAAc,EAAE,8BAAY,CAAC,iBAAiB,CAC5C,cAAc,EACd,kBAAkB,EAClB,gBAAgB,CACjB;gBACD,aAAa,EAAE,8BAAY,CAAC,iBAAiB,CAC3C,aAAa,EACb,iBAAiB,EACjB,eAAe,CAChB;gBACD,cAAc,EAAE,8BAAY,CAAC,iBAAiB,CAC5C,cAAc,EACd,kBAAkB,EAClB,gBAAgB,CACjB;aACF;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"wallet.service.js","sourceRoot":"","sources":["../../../../../../libs/la-library/src/modules/wallet/wallet.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAAkE;AAClE,8DAA0D;AAE1D,qDAAmD;AACnD,6CAAmD;AACnD,qCAAqC;AACrC,oEAA8D;AAGvD,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,0BAA0C;IAC3E,YAEqB,IAA8B,EAEvC,qBAAoD;QAE9D,KAAK,CAAC,IAAI,EAAE,sBAAU,CAAC,MAAM,CAAC,CAAC;QAJZ,SAAI,GAAJ,IAAI,CAA0B;QAEvC,0BAAqB,GAArB,qBAAqB,CAA+B;IAGhE,CAAC;IACD,eAAe,CAAC,QAAgB;QAC9B,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,kBAAkB,CAAC,EACjB,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,YAAY,EACZ,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EAChB,GAAG,KAAK,EACQ;QAChB,OAAO,8BAAY,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,KAAK,EAAE;YAC5D,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;YAChC,SAAS,EAAE;gBACT,YAAY,EAAE,8BAAY,CAAC,iBAAiB,CAC1C,YAAY,EACZ,gBAAgB,EAChB,cAAc,CACf;gBACD,UAAU,EAAE,8BAAY,CAAC,iBAAiB,CACxC,UAAU,EACV,cAAc,EACd,YAAY,CACb;gBACD,gBAAgB,EAAE,8BAAY,CAAC,iBAAiB,CAC9C,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,CACnB;gBACD,eAAe,EAAE,8BAAY,CAAC,iBAAiB,CAC7C,eAAe,EACf,mBAAmB,EACnB,iBAAiB,CAClB;gBACD,cAAc,EAAE,8BAAY,CAAC,iBAAiB,CAC5C,cAAc,EACd,kBAAkB,EAClB,gBAAgB,CACjB;gBACD,aAAa,EAAE,8BAAY,CAAC,iBAAiB,CAC3C,aAAa,EACb,iBAAiB,EACjB,eAAe,CAChB;gBACD,cAAc,EAAE,8BAAY,CAAC,iBAAiB,CAC5C,cAAc,EACd,kBAAkB,EAClB,gBAAgB,CACjB;aACF;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA9EY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,4BAAY,CAAC,CAAA;IAE9B,WAAA,IAAA,0BAAgB,EAAC,iCAAiB,CAAC,CAAA;qCADX,oBAAU;QAEF,oBAAU;GALlC,aAAa,CA8EzB"}
|