@things-factory/marketplace-base 3.7.10 → 3.8.3
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-server/entities/marketplace-order-item.js +64 -0
- package/dist-server/entities/marketplace-order-item.js.map +1 -1
- package/dist-server/entities/marketplace-order.js +28 -0
- package/dist-server/entities/marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js +17 -0
- package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js +262 -218
- package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js +89 -44
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js +28 -10
- package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js +7 -0
- package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js +33 -3
- package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js.map +1 -1
- package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js +31 -1
- package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js.map +1 -1
- package/package.json +5 -5
- package/server/entities/marketplace-order-item.ts +48 -0
- package/server/entities/marketplace-order.ts +21 -0
- package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts +23 -0
- package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts +337 -299
- package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts +93 -47
- package/server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.ts +35 -14
- package/server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.ts +8 -0
- package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts +33 -3
- package/server/graphql/types/marketplace-report/marketplace-sales-report.ts +31 -1
|
@@ -101,6 +101,70 @@ __decorate([
|
|
|
101
101
|
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
102
102
|
__metadata("design:type", Number)
|
|
103
103
|
], MarketplaceOrderItem.prototype, "paymentFee", void 0);
|
|
104
|
+
__decorate([
|
|
105
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
106
|
+
__metadata("design:type", Number)
|
|
107
|
+
], MarketplaceOrderItem.prototype, "commissionFee", void 0);
|
|
108
|
+
__decorate([
|
|
109
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
110
|
+
__metadata("design:type", Number)
|
|
111
|
+
], MarketplaceOrderItem.prototype, "shippingFeePaidByCustomer", void 0);
|
|
112
|
+
__decorate([
|
|
113
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
114
|
+
__metadata("design:type", Number)
|
|
115
|
+
], MarketplaceOrderItem.prototype, "promotionalCharges", void 0);
|
|
116
|
+
__decorate([
|
|
117
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
118
|
+
__metadata("design:type", Number)
|
|
119
|
+
], MarketplaceOrderItem.prototype, "ordersMarketplaceFeesTotal", void 0);
|
|
120
|
+
__decorate([
|
|
121
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
122
|
+
__metadata("design:type", Number)
|
|
123
|
+
], MarketplaceOrderItem.prototype, "ordersMarketingFeesTotal", void 0);
|
|
124
|
+
__decorate([
|
|
125
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
126
|
+
__metadata("design:type", Number)
|
|
127
|
+
], MarketplaceOrderItem.prototype, "ordersSalesTotal", void 0);
|
|
128
|
+
__decorate([
|
|
129
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
130
|
+
__metadata("design:type", Number)
|
|
131
|
+
], MarketplaceOrderItem.prototype, "ordersLogisticsTotal", void 0);
|
|
132
|
+
__decorate([
|
|
133
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
134
|
+
__metadata("design:type", Number)
|
|
135
|
+
], MarketplaceOrderItem.prototype, "itemPriceCredit", void 0);
|
|
136
|
+
__decorate([
|
|
137
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
138
|
+
__metadata("design:type", Number)
|
|
139
|
+
], MarketplaceOrderItem.prototype, "marketplaceBonus", void 0);
|
|
140
|
+
__decorate([
|
|
141
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
142
|
+
__metadata("design:type", Number)
|
|
143
|
+
], MarketplaceOrderItem.prototype, "marketplaceBonusSeller", void 0);
|
|
144
|
+
__decorate([
|
|
145
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
146
|
+
__metadata("design:type", Number)
|
|
147
|
+
], MarketplaceOrderItem.prototype, "shippingFeeDiscountMarketplace", void 0);
|
|
148
|
+
__decorate([
|
|
149
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
150
|
+
__metadata("design:type", Number)
|
|
151
|
+
], MarketplaceOrderItem.prototype, "shippingFeeDiscountSeller", void 0);
|
|
152
|
+
__decorate([
|
|
153
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
154
|
+
__metadata("design:type", Number)
|
|
155
|
+
], MarketplaceOrderItem.prototype, "promotionalChargesFlexiCombo", void 0);
|
|
156
|
+
__decorate([
|
|
157
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
158
|
+
__metadata("design:type", Number)
|
|
159
|
+
], MarketplaceOrderItem.prototype, "autoShippingSubsidyMarketplace", void 0);
|
|
160
|
+
__decorate([
|
|
161
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
162
|
+
__metadata("design:type", Number)
|
|
163
|
+
], MarketplaceOrderItem.prototype, "originalShippingFee", void 0);
|
|
164
|
+
__decorate([
|
|
165
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
166
|
+
__metadata("design:type", Number)
|
|
167
|
+
], MarketplaceOrderItem.prototype, "taxAmount", void 0);
|
|
104
168
|
__decorate([
|
|
105
169
|
(0, typeorm_1.CreateDateColumn)(),
|
|
106
170
|
__metadata("design:type", Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAAsH;AAEtH,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAqG;AAQrG,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;CA+
|
|
1
|
+
{"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../server/entities/marketplace-order-item.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,6 +135,34 @@ __decorate([
|
|
|
135
135
|
(0, typeorm_1.Column)({ nullable: true }),
|
|
136
136
|
__metadata("design:type", Date)
|
|
137
137
|
], MarketplaceOrder.prototype, "payTime", void 0);
|
|
138
|
+
__decorate([
|
|
139
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
140
|
+
__metadata("design:type", Number)
|
|
141
|
+
], MarketplaceOrder.prototype, "commissionFee", void 0);
|
|
142
|
+
__decorate([
|
|
143
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
144
|
+
__metadata("design:type", Number)
|
|
145
|
+
], MarketplaceOrder.prototype, "serviceFee", void 0);
|
|
146
|
+
__decorate([
|
|
147
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
148
|
+
__metadata("design:type", Number)
|
|
149
|
+
], MarketplaceOrder.prototype, "transactionFee", void 0);
|
|
150
|
+
__decorate([
|
|
151
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
152
|
+
__metadata("design:type", Number)
|
|
153
|
+
], MarketplaceOrder.prototype, "totalRealeasedAmount", void 0);
|
|
154
|
+
__decorate([
|
|
155
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
156
|
+
__metadata("design:type", String)
|
|
157
|
+
], MarketplaceOrder.prototype, "voucherAmount", void 0);
|
|
158
|
+
__decorate([
|
|
159
|
+
(0, typeorm_1.Column)({ nullable: true, type: 'float' }),
|
|
160
|
+
__metadata("design:type", Number)
|
|
161
|
+
], MarketplaceOrder.prototype, "shippingRebate", void 0);
|
|
162
|
+
__decorate([
|
|
163
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
164
|
+
__metadata("design:type", String)
|
|
165
|
+
], MarketplaceOrder.prototype, "shippingMode", void 0);
|
|
138
166
|
__decorate([
|
|
139
167
|
(0, typeorm_1.CreateDateColumn)(),
|
|
140
168
|
__metadata("design:type", Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAAkD;AAQlD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAAkD;AAQlD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CA4H5B,CAAA;AA1HC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,0CAAgB,CAAC;kDAClB,0CAAgB,oBAAhB,0CAAgB;0DAAA;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,+BAAoB,EAAE,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;;+DAC1D;AAG7C;IADC,IAAA,gBAAM,GAAE;;8CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACZ;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACvB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACvB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACf;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,OAAO;oDAAA;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACA;AAG3B;IADC,IAAA,gBAAM,GAAE;;gDACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACL;AAGtB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,2CAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACtC,2CAAiB,oBAAjB,2CAAiB;2DAAA;AAGpC;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACX,IAAI;wDAAA;AAGpB;IADC,IAAA,gBAAM,GAAE;8BACO,IAAI;wDAAA;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClB,IAAI;iDAAA;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;8BAC3B,MAAM;uDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;8BAC9B,MAAM;oDAAA;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;8BAC1B,MAAM;wDAAA;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;8BACpB,MAAM;8DAAA;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;8BAC3B,MAAM;uDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;8BAC1B,MAAM;wDAAA;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACb,MAAM;sDAAA;AAGpB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AA3HF,gBAAgB;IAN5B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,wBAAwB,EACxB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,EACxF,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,gBAAgB,CA4H5B;AA5HY,4CAAgB"}
|
|
@@ -7,7 +7,15 @@ const entities_1 = require("../../../entities");
|
|
|
7
7
|
exports.marketplaceOrdersResolver = {
|
|
8
8
|
async marketplaceOrders(_, params, context) {
|
|
9
9
|
let postCodeSorter = params.sortings.find(sort => sort.name === 'postCode');
|
|
10
|
+
const noOfItemsFilter = params.filters.find(param => param.name === 'itemCount');
|
|
11
|
+
const skuFilter = params.filters.find(param => param.name === 'sku');
|
|
10
12
|
params.sortings = params.sortings.filter(sort => sort.name !== 'postCode');
|
|
13
|
+
if (noOfItemsFilter && noOfItemsFilter.value == 1) {
|
|
14
|
+
params.filters.find(param => param.name === 'itemCount').operator = 'eq';
|
|
15
|
+
}
|
|
16
|
+
if (skuFilter) {
|
|
17
|
+
params.filters = params.filters.filter(param => param.name !== 'sku');
|
|
18
|
+
}
|
|
11
19
|
let qb = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).createQueryBuilder('mo');
|
|
12
20
|
(0, shell_1.buildQuery)(qb, params, context);
|
|
13
21
|
qb.leftJoinAndSelect('mo.domain', 'domain')
|
|
@@ -21,6 +29,15 @@ exports.marketplaceOrdersResolver = {
|
|
|
21
29
|
if (postCodeSorter) {
|
|
22
30
|
qb.addOrderBy('mos.postCode', (postCodeSorter === null || postCodeSorter === void 0 ? void 0 : postCodeSorter.desc) ? 'DESC' : 'ASC');
|
|
23
31
|
}
|
|
32
|
+
if (skuFilter) {
|
|
33
|
+
qb.andWhere(`
|
|
34
|
+
exists (select * from marketplace_order_items moi
|
|
35
|
+
inner join marketplace_product_variations mpv
|
|
36
|
+
on moi.marketplace_product_variation_id = mpv.id
|
|
37
|
+
where moi.marketplace_order_id = mo.id
|
|
38
|
+
and lower(mpv.sku) like :sku)
|
|
39
|
+
`, { sku: skuFilter.value.toLowerCase() });
|
|
40
|
+
}
|
|
24
41
|
let [items, total] = await qb.getManyAndCount();
|
|
25
42
|
return { items, total };
|
|
26
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"marketplace-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/marketplace-orders.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAoD;AAEvC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,iBAAiB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC7D,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAC3E,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAA;QAChF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;QAEpE,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAE1E,IAAI,eAAe,IAAI,eAAe,CAAC,KAAK,IAAI,CAAC,EAAE;YACjD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAA;SACzE;QAED,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,CAAA;SACtE;QAED,IAAI,EAAE,GAAyC,IAAA,uBAAa,EAAC,2BAAgB,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACvG,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;aACxC,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC;aAC9C,iBAAiB,CAAC,0BAA0B,EAAE,IAAI,CAAC;aACnD,iBAAiB,CAAC,gCAAgC,EAAE,KAAK,CAAC;aAC1D,iBAAiB,CAAC,wBAAwB,EAAE,IAAI,CAAC;aACjD,iBAAiB,CAAC,6BAA6B,EAAE,KAAK,CAAC;aACvD,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAA;QAE7C,IAAI,cAAc,EAAE;YAClB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,EAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACrE;QAED,IAAI,SAAS,EAAE;YACb,EAAE,CAAC,QAAQ,CACT;;;;;;OAMD,EACC,EAAE,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CACvC,CAAA;SACF;QAED,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAE/C,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
|