@solidstarters/solid-core 1.2.88 → 1.2.89
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/controllers/export-template.controller.d.ts +3 -2
- package/dist/controllers/export-template.controller.d.ts.map +1 -1
- package/dist/controllers/export-template.controller.js +23 -10
- package/dist/controllers/export-template.controller.js.map +1 -1
- package/dist/dtos/export.dto.d.ts +5 -0
- package/dist/dtos/export.dto.d.ts.map +1 -0
- package/dist/dtos/export.dto.js +12 -0
- package/dist/dtos/export.dto.js.map +1 -0
- package/dist/entities/export-transaction.entity.js +1 -1
- package/dist/entities/export-transaction.entity.js.map +1 -1
- package/dist/seeders/seed-data/solid-core-metadata.json +1 -1
- package/dist/services/export-template.service.d.ts +3 -2
- package/dist/services/export-template.service.d.ts.map +1 -1
- package/dist/services/export-template.service.js +6 -6
- package/dist/services/export-template.service.js.map +1 -1
- package/dist/services/export-transaction.service.d.ts +6 -3
- package/dist/services/export-transaction.service.d.ts.map +1 -1
- package/dist/services/export-transaction.service.js +101 -22
- package/dist/services/export-transaction.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/controllers/export-template.controller.ts +20 -7
- package/src/dtos/export.dto.ts +5 -0
- package/src/entities/export-transaction.entity.ts +1 -1
- package/src/seeders/seed-data/solid-core-metadata.json +1 -1
- package/src/services/export-template.service.ts +7 -6
- package/src/services/export-transaction.service.ts +136 -25
|
@@ -2,6 +2,7 @@ import { ExportTemplateService } from '../services/export-template.service';
|
|
|
2
2
|
import { CreateExportTemplateDto } from '../dtos/create-export-template.dto';
|
|
3
3
|
import { UpdateExportTemplateDto } from '../dtos/update-export-template.dto';
|
|
4
4
|
import { Response } from 'express';
|
|
5
|
+
import { StartExportSyncDto } from 'src/dtos/export.dto';
|
|
5
6
|
export declare class ExportTemplateController {
|
|
6
7
|
private readonly service;
|
|
7
8
|
constructor(service: ExportTemplateService);
|
|
@@ -30,7 +31,7 @@ export declare class ExportTemplateController {
|
|
|
30
31
|
findOne(id: string, query: any): Promise<import("..").ExportTemplate>;
|
|
31
32
|
deleteMany(ids: number[]): Promise<any>;
|
|
32
33
|
delete(id: number): Promise<import("..").ExportTemplate>;
|
|
33
|
-
startExportSync(
|
|
34
|
-
startExportAsync(
|
|
34
|
+
startExportSync(dto: StartExportSyncDto, res: Response): Promise<void>;
|
|
35
|
+
startExportAsync(dto: StartExportSyncDto): Promise<import("..").ExportTransaction>;
|
|
35
36
|
}
|
|
36
37
|
//# sourceMappingURL=export-template.controller.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-template.controller.d.ts","sourceRoot":"","sources":["../../src/controllers/export-template.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"export-template.controller.d.ts","sourceRoot":"","sources":["../../src/controllers/export-template.controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,qBAEa,wBAAwB;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,qBAAqB;IAK3D,MAAM,CAAS,SAAS,EAAE,uBAAuB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAOrG,UAAU,CAAS,UAAU,EAAE,uBAAuB,EAAE,EAAmB,UAAU,GAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAO;IAQnH,MAAM,CAAc,EAAE,EAAE,MAAM,EAAU,SAAS,EAAE,uBAAuB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAO9H,aAAa,CAAc,EAAE,EAAE,MAAM,EAAU,SAAS,EAAE,uBAAuB,EAAmB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAgB/H,QAAQ,CAAU,KAAK,EAAE,GAAG;;;;;;;;;;;;;;;;;;IAM5B,OAAO,CAAc,EAAE,EAAE,MAAM,EAAW,KAAK,EAAE,GAAG;IAKpD,UAAU,CAAS,GAAG,EAAE,MAAM,EAAE;IAMhC,MAAM,CAAc,EAAE,EAAE,MAAM;IAM9B,eAAe,CAAS,GAAG,EAAE,kBAAkB,EAAS,GAAG,EAAE,QAAQ;IAsBrE,gBAAgB,CAAS,GAAG,EAAE,kBAAkB;CAUvD"}
|
|
@@ -20,6 +20,7 @@ const swagger_1 = require("@nestjs/swagger");
|
|
|
20
20
|
const export_template_service_1 = require("../services/export-template.service");
|
|
21
21
|
const create_export_template_dto_1 = require("../dtos/create-export-template.dto");
|
|
22
22
|
const update_export_template_dto_1 = require("../dtos/update-export-template.dto");
|
|
23
|
+
const export_dto_1 = require("../dtos/export.dto");
|
|
23
24
|
let ExportTemplateController = class ExportTemplateController {
|
|
24
25
|
constructor(service) {
|
|
25
26
|
this.service = service;
|
|
@@ -48,8 +49,14 @@ let ExportTemplateController = class ExportTemplateController {
|
|
|
48
49
|
async delete(id) {
|
|
49
50
|
return this.service.delete(id);
|
|
50
51
|
}
|
|
51
|
-
async startExportSync(
|
|
52
|
-
const
|
|
52
|
+
async startExportSync(dto, res) {
|
|
53
|
+
const { filters, ...rest } = dto;
|
|
54
|
+
let updateDto = { ...rest };
|
|
55
|
+
if (updateDto?.templateName) {
|
|
56
|
+
const newTemplate = await this.service.create(updateDto, []);
|
|
57
|
+
updateDto = { ...updateDto, id: newTemplate.id };
|
|
58
|
+
}
|
|
59
|
+
const exportFileInfo = await this.service.startExportSync(updateDto, filters);
|
|
53
60
|
if (exportFileInfo.exportStream === null) {
|
|
54
61
|
throw new common_1.InternalServerErrorException("Export stream is null");
|
|
55
62
|
}
|
|
@@ -58,8 +65,14 @@ let ExportTemplateController = class ExportTemplateController {
|
|
|
58
65
|
res.setHeader('Access-Control-Expose-Headers', 'Content-Disposition, Content-Type');
|
|
59
66
|
exportFileInfo.exportStream.pipe(res);
|
|
60
67
|
}
|
|
61
|
-
async startExportAsync(
|
|
62
|
-
|
|
68
|
+
async startExportAsync(dto) {
|
|
69
|
+
const { filters, ...rest } = dto;
|
|
70
|
+
let updateDto = { ...rest };
|
|
71
|
+
if (updateDto.templateName) {
|
|
72
|
+
const newTemplate = await this.service.create(updateDto, []);
|
|
73
|
+
updateDto = { ...updateDto, id: newTemplate.id };
|
|
74
|
+
}
|
|
75
|
+
return this.service.startExportAsync(updateDto, filters);
|
|
63
76
|
}
|
|
64
77
|
};
|
|
65
78
|
exports.ExportTemplateController = ExportTemplateController;
|
|
@@ -157,21 +170,21 @@ __decorate([
|
|
|
157
170
|
], ExportTemplateController.prototype, "delete", null);
|
|
158
171
|
__decorate([
|
|
159
172
|
(0, swagger_1.ApiBearerAuth)("jwt"),
|
|
160
|
-
(0, common_1.Post)('
|
|
173
|
+
(0, common_1.Post)('/startExport/sync'),
|
|
161
174
|
openapi.ApiResponse({ status: 201 }),
|
|
162
|
-
__param(0, (0, common_1.
|
|
175
|
+
__param(0, (0, common_1.Body)()),
|
|
163
176
|
__param(1, (0, common_1.Res)()),
|
|
164
177
|
__metadata("design:type", Function),
|
|
165
|
-
__metadata("design:paramtypes", [
|
|
178
|
+
__metadata("design:paramtypes", [export_dto_1.StartExportSyncDto, Object]),
|
|
166
179
|
__metadata("design:returntype", Promise)
|
|
167
180
|
], ExportTemplateController.prototype, "startExportSync", null);
|
|
168
181
|
__decorate([
|
|
169
182
|
(0, swagger_1.ApiBearerAuth)("jwt"),
|
|
170
|
-
(0, common_1.Post)('
|
|
183
|
+
(0, common_1.Post)('/startExport/async'),
|
|
171
184
|
openapi.ApiResponse({ status: 201, type: require("../entities/export-transaction.entity").ExportTransaction }),
|
|
172
|
-
__param(0, (0, common_1.
|
|
185
|
+
__param(0, (0, common_1.Body)()),
|
|
173
186
|
__metadata("design:type", Function),
|
|
174
|
-
__metadata("design:paramtypes", [
|
|
187
|
+
__metadata("design:paramtypes", [export_dto_1.StartExportSyncDto]),
|
|
175
188
|
__metadata("design:returntype", Promise)
|
|
176
189
|
], ExportTemplateController.prototype, "startExportAsync", null);
|
|
177
190
|
exports.ExportTemplateController = ExportTemplateController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-template.controller.js","sourceRoot":"","sources":["../../src/controllers/export-template.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAkK;AAClK,+DAA+D;AAC/D,6CAAmE;AACnE,iFAA4E;AAC5E,mFAA6E;AAC7E,mFAA6E;
|
|
1
|
+
{"version":3,"file":"export-template.controller.js","sourceRoot":"","sources":["../../src/controllers/export-template.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"export.dto.d.ts","sourceRoot":"","sources":["../../src/dtos/export.dto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,qBAAa,kBAAmB,SAAQ,uBAAuB;IAC3D,OAAO,CAAC,EAAE,GAAG,CAAC;CACf"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StartExportSyncDto = void 0;
|
|
4
|
+
const openapi = require("@nestjs/swagger");
|
|
5
|
+
const update_export_template_dto_1 = require("./update-export-template.dto");
|
|
6
|
+
class StartExportSyncDto extends update_export_template_dto_1.UpdateExportTemplateDto {
|
|
7
|
+
static _OPENAPI_METADATA_FACTORY() {
|
|
8
|
+
return { filters: { required: false, type: () => Object } };
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.StartExportSyncDto = StartExportSyncDto;
|
|
12
|
+
//# sourceMappingURL=export.dto.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"export.dto.js","sourceRoot":"","sources":["../../src/dtos/export.dto.ts"],"names":[],"mappings":";;;;AAAA,6EAAuE;AAEvE,MAAa,kBAAmB,SAAQ,oDAAuB;;;;CAE5D;AAFH,gDAEG"}
|
|
@@ -41,7 +41,7 @@ __decorate([
|
|
|
41
41
|
], ExportTransaction.prototype, "error", void 0);
|
|
42
42
|
__decorate([
|
|
43
43
|
(0, typeorm_1.Index)(),
|
|
44
|
-
(0, typeorm_1.ManyToOne)(() => export_template_entity_1.ExportTemplate, { onDelete: "CASCADE", nullable:
|
|
44
|
+
(0, typeorm_1.ManyToOne)(() => export_template_entity_1.ExportTemplate, { onDelete: "CASCADE", nullable: true }),
|
|
45
45
|
__metadata("design:type", export_template_entity_1.ExportTemplate)
|
|
46
46
|
], ExportTransaction.prototype, "exportTemplate", void 0);
|
|
47
47
|
exports.ExportTransaction = ExportTransaction = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-transaction.entity.js","sourceRoot":"","sources":["../../src/entities/export-transaction.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mDAAyD;AACzD,qCAA2D;AAC3D,qEAAoE;AAI7D,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,4BAAY;;;;CAelD,CAAA;AAfY,8CAAiB;AAG1B;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;8BACpB,IAAI;mDAAC;AAGf;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;8DACA;AAG5B;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;iDACb;AAEf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGd;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"export-transaction.entity.js","sourceRoot":"","sources":["../../src/entities/export-transaction.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mDAAyD;AACzD,qCAA2D;AAC3D,qEAAoE;AAI7D,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,4BAAY;;;;CAelD,CAAA;AAfY,8CAAiB;AAG1B;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;8BACpB,IAAI;mDAAC;AAGf;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;8DACA;AAG5B;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;iDACb;AAEf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGd;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAc,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACzD,uCAAc;yDAAC;4BAdtB,iBAAiB;IAF7B,IAAA,gBAAM,EAAC,uBAAuB,CAAC;IAC/B,IAAA,eAAK,EAAC,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;GACtD,iBAAiB,CAe7B"}
|
|
@@ -9,6 +9,7 @@ import { ModuleMetadataService } from 'src/services/module-metadata.service';
|
|
|
9
9
|
import { ExportTransaction } from 'src/entities/export-transaction.entity';
|
|
10
10
|
import { ExportTemplate } from '../entities/export-template.entity';
|
|
11
11
|
import { ExportTransactionFileInfo, ExportTransactionService } from './export-transaction.service';
|
|
12
|
+
import { UpdateExportTemplateDto } from 'src/dtos/update-export-template.dto';
|
|
12
13
|
export declare class ExportTemplateService extends CRUDService<ExportTemplate> {
|
|
13
14
|
readonly modelMetadataService: ModelMetadataService;
|
|
14
15
|
readonly moduleMetadataService: ModuleMetadataService;
|
|
@@ -20,8 +21,8 @@ export declare class ExportTemplateService extends CRUDService<ExportTemplate> {
|
|
|
20
21
|
readonly repo: Repository<ExportTemplate>;
|
|
21
22
|
readonly exportTransactionService: ExportTransactionService;
|
|
22
23
|
readonly moduleRef: ModuleRef;
|
|
23
|
-
startExportSync(
|
|
24
|
-
startExportAsync(
|
|
24
|
+
startExportSync(updateDto: UpdateExportTemplateDto, filters: any): Promise<ExportTransactionFileInfo>;
|
|
25
|
+
startExportAsync(updateDto: UpdateExportTemplateDto, filters: any): Promise<ExportTransaction>;
|
|
25
26
|
constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<ExportTemplate>, exportTransactionService: ExportTransactionService, moduleRef: ModuleRef);
|
|
26
27
|
}
|
|
27
28
|
//# sourceMappingURL=export-template.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-template.service.d.ts","sourceRoot":"","sources":["../../src/services/export-template.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAI7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"export-template.service.d.ts","sourceRoot":"","sources":["../../src/services/export-template.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAI7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACnG,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAE9E,qBACa,qBAAsB,SAAQ,WAAW,CAAC,cAAc,CAAC;IAiClE,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB;IACnD,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB;IACrD,QAAQ,CAAC,aAAa,EAAE,aAAa;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW;IACjC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAE7C,QAAQ,CAAC,aAAa,EAAE,aAAa;IAErC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC;IACzC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB;IAC3D,QAAQ,CAAC,SAAS,EAAE,SAAS;IA3CzB,eAAe,CAAC,SAAS,EAAE,uBAAuB,EAAE,OAAO,EAAC,GAAG,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAepG,gBAAgB,CAAC,SAAS,EAAE,uBAAuB,EAAG,OAAO,EAAC,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC;gBAiBzF,oBAAoB,EAAE,oBAAoB,EAC1C,qBAAqB,EAAE,qBAAqB,EAC5C,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,iBAAiB,EAAE,iBAAiB,EAEpC,aAAa,EAAE,aAAa,EAE5B,IAAI,EAAE,UAAU,CAAC,cAAc,CAAC,EAChC,wBAAwB,EAAE,wBAAwB,EAClD,SAAS,EAAE,SAAS;CAIhC"}
|
|
@@ -26,24 +26,24 @@ const module_metadata_service_1 = require("./module-metadata.service");
|
|
|
26
26
|
const export_template_entity_1 = require("../entities/export-template.entity");
|
|
27
27
|
const export_transaction_service_1 = require("./export-transaction.service");
|
|
28
28
|
let ExportTemplateService = class ExportTemplateService extends crud_service_1.CRUDService {
|
|
29
|
-
async startExportSync(
|
|
29
|
+
async startExportSync(updateDto, filters) {
|
|
30
30
|
const exportTransaction = await this.exportTransactionService.toDto({
|
|
31
31
|
datetime: new Date(),
|
|
32
32
|
status: 'started',
|
|
33
|
-
exportTemplateId: id,
|
|
33
|
+
exportTemplateId: updateDto?.id ? updateDto?.id : null,
|
|
34
34
|
});
|
|
35
35
|
const exportTransactionEntity = await this.exportTransactionService.create(exportTransaction);
|
|
36
|
-
const exportFileInfo = await this.exportTransactionService.triggerExportSync(exportTransactionEntity.id);
|
|
36
|
+
const exportFileInfo = await this.exportTransactionService.triggerExportSync(exportTransactionEntity.id, exportTransactionEntity, updateDto, filters);
|
|
37
37
|
return exportFileInfo;
|
|
38
38
|
}
|
|
39
|
-
async startExportAsync(
|
|
39
|
+
async startExportAsync(updateDto, filters) {
|
|
40
40
|
const exportTransaction = await this.exportTransactionService.toDto({
|
|
41
41
|
datetime: new Date(),
|
|
42
42
|
status: 'started',
|
|
43
|
-
exportTemplateId: id,
|
|
43
|
+
exportTemplateId: updateDto?.id ? updateDto?.id : null,
|
|
44
44
|
});
|
|
45
45
|
const exportTransactionEntity = await this.exportTransactionService.create(exportTransaction);
|
|
46
|
-
this.exportTransactionService.triggerExportAsync(exportTransactionEntity.id);
|
|
46
|
+
this.exportTransactionService.triggerExportAsync(exportTransactionEntity.id, exportTransactionEntity, updateDto, filters);
|
|
47
47
|
return exportTransactionEntity;
|
|
48
48
|
}
|
|
49
49
|
constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, exportTransactionService, moduleRef) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-template.service.js","sourceRoot":"","sources":["../../src/services/export-template.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAA2D;AAC3D,6CAAwE;AACxE,qCAAoD;AAEpD,2CAA+C;AAC/C,+DAAqE;AACrE,iDAAwD;AACxD,iDAAwD;AAGxD,qEAA2E;AAC3E,uEAA6E;AAM7E,+EAAoE;AACpE,6EAAmG;
|
|
1
|
+
{"version":3,"file":"export-template.service.js","sourceRoot":"","sources":["../../src/services/export-template.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ import { ExportTransaction } from '../entities/export-transaction.entity';
|
|
|
13
13
|
import { CsvService } from './csv.service';
|
|
14
14
|
import { ExcelService } from './excel.service';
|
|
15
15
|
import { SolidIntrospectService } from './solid-introspect.service';
|
|
16
|
+
import { ModelMetadata } from 'src/entities/model-metadata.entity';
|
|
17
|
+
import { UpdateExportTemplateDto } from 'src/dtos/update-export-template.dto';
|
|
16
18
|
export interface ExportTransactionFileInfo {
|
|
17
19
|
exportStream: Readable;
|
|
18
20
|
fileName: string;
|
|
@@ -32,11 +34,12 @@ export declare class ExportTransactionService extends CRUDService<ExportTransact
|
|
|
32
34
|
readonly excelService: ExcelService;
|
|
33
35
|
readonly csvService: CsvService;
|
|
34
36
|
readonly fieldRepo: Repository<FieldMetadata>;
|
|
37
|
+
readonly ModelMetadataRepo: Repository<ModelMetadata>;
|
|
35
38
|
readonly moduleRef: ModuleRef;
|
|
36
39
|
private logger;
|
|
37
|
-
constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<ExportTransaction>, introspectService: SolidIntrospectService, excelService: ExcelService, csvService: CsvService, fieldRepo: Repository<FieldMetadata>, moduleRef: ModuleRef);
|
|
38
|
-
triggerExportSync(id: number): Promise<ExportTransactionFileInfo>;
|
|
39
|
-
triggerExportAsync(id: number): Promise<void>;
|
|
40
|
+
constructor(modelMetadataService: ModelMetadataService, moduleMetadataService: ModuleMetadataService, configService: ConfigService, fileService: FileService, discoveryService: DiscoveryService, crudHelperService: CrudHelperService, entityManager: EntityManager, repo: Repository<ExportTransaction>, introspectService: SolidIntrospectService, excelService: ExcelService, csvService: CsvService, fieldRepo: Repository<FieldMetadata>, ModelMetadataRepo: Repository<ModelMetadata>, moduleRef: ModuleRef);
|
|
41
|
+
triggerExportSync(id: number, exportTransactionEntity: any, updateDto: UpdateExportTemplateDto, filters: any): Promise<ExportTransactionFileInfo>;
|
|
42
|
+
triggerExportAsync(id: number, exportTransactionEntity: any, updateDto: UpdateExportTemplateDto, filters: any): Promise<void>;
|
|
40
43
|
private loadExportTransaction;
|
|
41
44
|
private updateExportTransaction;
|
|
42
45
|
private getExportStreamDetails;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-transaction.service.d.ts","sourceRoot":"","sources":["../../src/services/export-transaction.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAO7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AAEpF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"export-transaction.service.d.ts","sourceRoot":"","sources":["../../src/services/export-transaction.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ const csv_service_1 = require("./csv.service");
|
|
|
33
33
|
const excel_service_1 = require("./excel.service");
|
|
34
34
|
const mediaStorageProviders_1 = require("./mediaStorageProviders");
|
|
35
35
|
const solid_introspect_service_1 = require("./solid-introspect.service");
|
|
36
|
+
const model_metadata_entity_1 = require("../entities/model-metadata.entity");
|
|
36
37
|
const EXPORT_CHUNK_SIZE = 100;
|
|
37
38
|
var ExportStatus;
|
|
38
39
|
(function (ExportStatus) {
|
|
@@ -46,7 +47,7 @@ var ExportFormat;
|
|
|
46
47
|
ExportFormat["EXCEL"] = "excel";
|
|
47
48
|
})(ExportFormat || (ExportFormat = {}));
|
|
48
49
|
let ExportTransactionService = ExportTransactionService_1 = class ExportTransactionService extends crud_service_1.CRUDService {
|
|
49
|
-
constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, introspectService, excelService, csvService, fieldRepo, moduleRef) {
|
|
50
|
+
constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, introspectService, excelService, csvService, fieldRepo, ModelMetadataRepo, moduleRef) {
|
|
50
51
|
super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'exportTransaction', 'solid-core', moduleRef);
|
|
51
52
|
this.modelMetadataService = modelMetadataService;
|
|
52
53
|
this.moduleMetadataService = moduleMetadataService;
|
|
@@ -60,16 +61,24 @@ let ExportTransactionService = ExportTransactionService_1 = class ExportTransact
|
|
|
60
61
|
this.excelService = excelService;
|
|
61
62
|
this.csvService = csvService;
|
|
62
63
|
this.fieldRepo = fieldRepo;
|
|
64
|
+
this.ModelMetadataRepo = ModelMetadataRepo;
|
|
63
65
|
this.moduleRef = moduleRef;
|
|
64
66
|
this.logger = new common_1.Logger(ExportTransactionService_1.name);
|
|
65
67
|
}
|
|
66
|
-
async triggerExportSync(id) {
|
|
68
|
+
async triggerExportSync(id, exportTransactionEntity, updateDto, filters) {
|
|
67
69
|
try {
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
+
const modeldata = await this.ModelMetadataRepo.findOne({
|
|
71
|
+
where: { id: updateDto?.modelMetadataId },
|
|
72
|
+
relations: { fields: true },
|
|
73
|
+
});
|
|
74
|
+
const modelName = modeldata?.singularName;
|
|
75
|
+
const modelTemplateName = modelName;
|
|
76
|
+
const fields = JSON.parse(updateDto?.fields);
|
|
77
|
+
const templateFormat = updateDto?.templateFormat;
|
|
78
|
+
const { exportStream, templateName, uuid, exportTransaction } = await this.getExportStreamDetails(modelName, modelTemplateName, fields, modeldata, templateFormat, id, exportTransactionEntity, filters);
|
|
70
79
|
this.updateExportTransaction(id, ExportStatus.COMPLETED);
|
|
71
|
-
const fileName = this.getFileName(templateName, uuid,
|
|
72
|
-
const mimeType = this.getMimeType(
|
|
80
|
+
const fileName = this.getFileName(templateName, uuid, templateFormat);
|
|
81
|
+
const mimeType = this.getMimeType(templateFormat);
|
|
73
82
|
return { exportStream, fileName, mimeType, exportTransaction };
|
|
74
83
|
}
|
|
75
84
|
catch (error) {
|
|
@@ -77,12 +86,18 @@ let ExportTransactionService = ExportTransactionService_1 = class ExportTransact
|
|
|
77
86
|
throw error;
|
|
78
87
|
}
|
|
79
88
|
}
|
|
80
|
-
async triggerExportAsync(id) {
|
|
89
|
+
async triggerExportAsync(id, exportTransactionEntity, updateDto, filters) {
|
|
81
90
|
try {
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
91
|
+
const modeldata = await this.ModelMetadataRepo.findOne({
|
|
92
|
+
where: { id: updateDto?.modelMetadataId },
|
|
93
|
+
relations: { fields: true },
|
|
94
|
+
});
|
|
95
|
+
const modelName = modeldata?.singularName;
|
|
96
|
+
const modelTemplateName = modelName;
|
|
97
|
+
const fields = JSON.parse(updateDto?.fields);
|
|
98
|
+
const templateFormat = updateDto?.templateFormat;
|
|
99
|
+
const { exportStream, templateName, uuid, exportTransaction } = await this.getExportStreamDetails(modelName, modelTemplateName, fields, modeldata, templateFormat, id, exportTransactionEntity, filters);
|
|
100
|
+
await this.storeExportStream(exportStream, exportTransaction, this.getFileName(templateName, uuid, templateFormat));
|
|
86
101
|
this.updateExportTransaction(id, ExportStatus.COMPLETED);
|
|
87
102
|
}
|
|
88
103
|
catch (error) {
|
|
@@ -93,20 +108,17 @@ let ExportTransactionService = ExportTransactionService_1 = class ExportTransact
|
|
|
93
108
|
async loadExportTransaction(id) {
|
|
94
109
|
return await this.repo.findOne({
|
|
95
110
|
where: { id: id },
|
|
96
|
-
relations: { exportTemplate: { modelMetadata: true } },
|
|
111
|
+
relations: { exportTemplate: { modelMetadata: { fields: true } } },
|
|
97
112
|
});
|
|
98
113
|
}
|
|
99
114
|
async updateExportTransaction(id, status, error) {
|
|
100
115
|
await this.repo.update(id, { status, error });
|
|
101
116
|
}
|
|
102
|
-
async getExportStreamDetails(exportTransaction) {
|
|
103
|
-
const fields = JSON.parse(exportTransaction.exportTemplate.fields);
|
|
104
|
-
const modelName = exportTransaction.exportTemplate.modelMetadata.singularName;
|
|
117
|
+
async getExportStreamDetails(modelName, templateName, fields, modelData, templateFormat, id, exportTransaction, filters) {
|
|
105
118
|
const modelService = this.introspectService.getProvider(`${(0, strings_1.classify)(modelName)}Service`);
|
|
106
|
-
const
|
|
107
|
-
const
|
|
108
|
-
|
|
109
|
-
let exportStream = await this.getExportStream(exportTransaction.exportTemplate.templateFormat, dataRecordsFunc);
|
|
119
|
+
const uuid = String(id);
|
|
120
|
+
const dataRecordsFunc = await this.getDataRecordsFunc(fields, modelService, modelData, filters);
|
|
121
|
+
let exportStream = await this.getExportStream(templateFormat, dataRecordsFunc);
|
|
110
122
|
return { exportStream, templateName, uuid, exportTransaction };
|
|
111
123
|
}
|
|
112
124
|
async getExportStream(templateFormat, dataRecordsFunc) {
|
|
@@ -145,17 +157,59 @@ let ExportTransactionService = ExportTransactionService_1 = class ExportTransact
|
|
|
145
157
|
getMimeType(fileFormat) {
|
|
146
158
|
return (fileFormat === ExportFormat.EXCEL) ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' : 'text/csv';
|
|
147
159
|
}
|
|
148
|
-
async getDataRecordsFunc(fields, modelService) {
|
|
160
|
+
async getDataRecordsFunc(fields, modelService, modelMetadata, filters) {
|
|
161
|
+
const relatedFieldNames = modelMetadata?.fields
|
|
162
|
+
.filter((field) => field.relationType !== null)
|
|
163
|
+
.map((field) => field.name);
|
|
164
|
+
const relatedModelsUserKeyMap = new Map();
|
|
165
|
+
for (const field of modelMetadata?.fields || []) {
|
|
166
|
+
if (field.relationType && field.relationCoModelSingularName && fields.includes(field.name)) {
|
|
167
|
+
const relatedModelMetadata = await this.ModelMetadataRepo.findOne({
|
|
168
|
+
where: { singularName: field.relationCoModelSingularName },
|
|
169
|
+
relations: ['userKeyField'],
|
|
170
|
+
});
|
|
171
|
+
if (relatedModelMetadata?.userKeyField?.name) {
|
|
172
|
+
relatedModelsUserKeyMap.set(field.name, relatedModelMetadata.userKeyField.name);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
}
|
|
149
176
|
return async (chunkIndex, chunkSize) => {
|
|
150
177
|
const offset = chunkIndex * chunkSize;
|
|
151
178
|
const recordFilterDto = {
|
|
152
|
-
fields,
|
|
153
179
|
limit: chunkSize,
|
|
154
180
|
offset,
|
|
181
|
+
populate: relatedFieldNames
|
|
155
182
|
};
|
|
183
|
+
const cleanedFilters = cleanNullsFromObject(filters);
|
|
184
|
+
if (cleanedFilters && Object.keys(cleanedFilters).length > 0) {
|
|
185
|
+
recordFilterDto.filters = cleanedFilters;
|
|
186
|
+
}
|
|
187
|
+
const nonRelationalFieldSet = new Set(modelMetadata?.fields
|
|
188
|
+
.filter((field) => fields.includes(field.name) && field.relationType === null)
|
|
189
|
+
.map((field) => field.name));
|
|
156
190
|
const data = await modelService.instance.find(recordFilterDto);
|
|
157
191
|
const records = data.records ?? [];
|
|
158
|
-
|
|
192
|
+
const cleanedRecords = records.map((record) => {
|
|
193
|
+
const newRecord = {};
|
|
194
|
+
for (const key of nonRelationalFieldSet) {
|
|
195
|
+
newRecord[key] = record[key];
|
|
196
|
+
}
|
|
197
|
+
for (const [relatedFieldName, userKeyFieldName] of relatedModelsUserKeyMap.entries()) {
|
|
198
|
+
const relatedData = record[relatedFieldName];
|
|
199
|
+
if (Array.isArray(relatedData)) {
|
|
200
|
+
const values = relatedData.map(item => item?.[userKeyFieldName]).filter(Boolean);
|
|
201
|
+
newRecord[relatedFieldName] = values.join(', ');
|
|
202
|
+
}
|
|
203
|
+
else if (relatedData && typeof relatedData === 'object') {
|
|
204
|
+
newRecord[relatedFieldName] = relatedData?.[userKeyFieldName] ?? null;
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
newRecord[relatedFieldName] = null;
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
return newRecord;
|
|
211
|
+
});
|
|
212
|
+
return cleanedRecords;
|
|
159
213
|
};
|
|
160
214
|
}
|
|
161
215
|
async toDto(data) {
|
|
@@ -174,6 +228,7 @@ exports.ExportTransactionService = ExportTransactionService = ExportTransactionS
|
|
|
174
228
|
__param(6, (0, typeorm_1.InjectEntityManager)()),
|
|
175
229
|
__param(7, (0, typeorm_1.InjectRepository)(export_transaction_entity_1.ExportTransaction, 'default')),
|
|
176
230
|
__param(11, (0, typeorm_1.InjectRepository)(field_metadata_entity_1.FieldMetadata, 'default')),
|
|
231
|
+
__param(12, (0, typeorm_1.InjectRepository)(model_metadata_entity_1.ModelMetadata, 'default')),
|
|
177
232
|
__metadata("design:paramtypes", [model_metadata_service_1.ModelMetadataService,
|
|
178
233
|
module_metadata_service_1.ModuleMetadataService,
|
|
179
234
|
config_1.ConfigService,
|
|
@@ -186,6 +241,30 @@ exports.ExportTransactionService = ExportTransactionService = ExportTransactionS
|
|
|
186
241
|
excel_service_1.ExcelService,
|
|
187
242
|
csv_service_1.CsvService,
|
|
188
243
|
typeorm_2.Repository,
|
|
244
|
+
typeorm_2.Repository,
|
|
189
245
|
core_1.ModuleRef])
|
|
190
246
|
], ExportTransactionService);
|
|
247
|
+
function cleanNullsFromObject(obj) {
|
|
248
|
+
if (Array.isArray(obj)) {
|
|
249
|
+
return obj
|
|
250
|
+
.filter(item => item !== null && item !== undefined)
|
|
251
|
+
.map(cleanNullsFromObject);
|
|
252
|
+
}
|
|
253
|
+
else if (typeof obj === 'object' && obj !== null) {
|
|
254
|
+
const newObj = {};
|
|
255
|
+
for (const key in obj) {
|
|
256
|
+
const value = obj[key];
|
|
257
|
+
if (value !== null && value !== undefined) {
|
|
258
|
+
const cleanedValue = cleanNullsFromObject(value);
|
|
259
|
+
if ((typeof cleanedValue === 'object' && Object.keys(cleanedValue).length > 0) ||
|
|
260
|
+
(Array.isArray(cleanedValue) && cleanedValue.length > 0) ||
|
|
261
|
+
typeof cleanedValue !== 'object') {
|
|
262
|
+
newObj[key] = cleanedValue;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
return newObj;
|
|
267
|
+
}
|
|
268
|
+
return obj;
|
|
269
|
+
}
|
|
191
270
|
//# sourceMappingURL=export-transaction.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export-transaction.service.js","sourceRoot":"","sources":["../../src/services/export-transaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,uCAA2D;AAC3D,6CAAwE;AACxE,qCAAoD;AAEpD,2CAA+C;AAC/C,+DAAqE;AACrE,iDAAwD;AACxD,iDAAwD;AAGxD,qEAA2E;AAC3E,uEAA6E;AAG7E,oEAA6E;AAE7E,qDAA2C;AAE3C,yFAAoF;AAEpF,6EAAmE;AAEnE,qFAA0E;AAC1E,+CAA2C;AAC3C,mDAA+C;AAC/C,mEAAkE;AAClE,yEAAoE;
|
|
1
|
+
{"version":3,"file":"export-transaction.service.js","sourceRoot":"","sources":["../../src/services/export-transaction.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,uCAA2D;AAC3D,6CAAwE;AACxE,qCAAoD;AAEpD,2CAA+C;AAC/C,+DAAqE;AACrE,iDAAwD;AACxD,iDAAwD;AAGxD,qEAA2E;AAC3E,uEAA6E;AAG7E,oEAA6E;AAE7E,qDAA2C;AAE3C,yFAAoF;AAEpF,6EAAmE;AAEnE,qFAA0E;AAC1E,+CAA2C;AAC3C,mDAA+C;AAC/C,mEAAkE;AAClE,yEAAoE;AACpE,6EAAmE;AAGnE,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,IAAK,YAIJ;AAJD,WAAK,YAAY;IACf,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;IACvB,iCAAiB,CAAA;AACnB,CAAC,EAJI,YAAY,KAAZ,YAAY,QAIhB;AAED,IAAK,YAGJ;AAHD,WAAK,YAAY;IACf,2BAAW,CAAA;IACX,+BAAe,CAAA;AACjB,CAAC,EAHI,YAAY,KAAZ,YAAY,QAGhB;AAUM,IAAM,wBAAwB,gCAA9B,MAAM,wBAAyB,SAAQ,0BAA8B;IAG1E,YACW,oBAA0C,EAC1C,qBAA4C,EAC5C,aAA4B,EAC5B,WAAwB,EACxB,gBAAkC,EAClC,iBAAoC,EAE7C,aAAqC,EAErC,IAA4C,EACnC,iBAAyC,EACzC,YAA0B,EAC1B,UAAsB,EAG/B,SAA6C,EAE7C,iBAAsD,EAC7C,SAAoB;QAE7B,KAAK,CAAC,oBAAoB,EAAE,qBAAqB,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,IAAI,EAAE,mBAAmB,EAAE,YAAY,EAAC,SAAS,CAAC,CAAC;QApB7K,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,kBAAa,GAAb,aAAa,CAAe;QAE5B,SAAI,GAAJ,IAAI,CAA+B;QACnC,sBAAiB,GAAjB,iBAAiB,CAAwB;QACzC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QAGtB,cAAS,GAAT,SAAS,CAA2B;QAEpC,sBAAiB,GAAjB,iBAAiB,CAA4B;QAC7C,cAAS,GAAT,SAAS,CAAW;QArBvB,WAAM,GAAG,IAAI,eAAM,CAAC,0BAAwB,CAAC,IAAI,CAAC,CAAC;IAwB3D,CAAC;IAGD,KAAK,CAAC,iBAAiB,CAAC,EAAU,EAAE,uBAA4B,EAAE,SAAkC,EAAG,OAAY;QACjH,IAAI,CAAC;YAGH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;gBACrD,KAAK,EAAE,EAAE,EAAE,EAAG,SAAS,EAAE,eAAe,EAAC;gBACzC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAC;aAC3B,CAAC,CAAA;YACF,MAAM,SAAS,GAAG,SAAS,EAAE,YAAY,CAAC;YAC1C,MAAM,iBAAiB,GAAG,SAAS,CAAC;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,cAAc,GAAG,SAAS,EAAE,cAAc,CAAC;YACjD,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;YACzM,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;YACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;YAClD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;QACjE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACrE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAGD,KAAK,CAAC,kBAAkB,CAAC,EAAU,EAAE,uBAA4B,EAAE,SAAkC,EAAE,OAAW;QAChH,IAAI,CAAC;YAGH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;gBACrD,KAAK,EAAE,EAAE,EAAE,EAAG,SAAS,EAAE,eAAe,EAAC;gBACzC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,EAAC;aAC3B,CAAC,CAAA;YACF,MAAM,SAAS,GAAG,SAAS,EAAE,YAAY,CAAC;YAC1C,MAAM,iBAAiB,GAAG,SAAS,CAAC;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,cAAc,GAAG,SAAS,EAAE,cAAc,CAAC;YACjD,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,iBAAiB,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,EAAE,uBAAuB,EAAE,OAAO,CAAC,CAAC;YAGzM,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YACpH,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,uBAAuB,CAAC,EAAE,EAAE,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACrE,MAAM,KAAK,CAAC;QAEd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,EAAU;QAC5C,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7B,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;YACjB,SAAS,EAAE,EAAE,cAAc,EAAE,EAAE,aAAa,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,EAAE,EAAC;SAChE,CACA,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,EAAU,EAAE,MAAc,EAAE,KAAc;QAC9E,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,SAAiB,EAAE,YAAoB,EAAE,MAAU,EAAE,SAAa,EAAE,cAAqB,EAAE,EAAS,EAAE,iBAAsB,EAAE,OAAY;QAM5K,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,IAAA,kBAAQ,EAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAEzF,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QAKzB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAMhG,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;QAC/E,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;IACjE,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,cAAsB,EAAE,eAA0E;QAC9H,IAAI,YAAY,GAAG,IAAI,CAAC;QACxB,QAAQ,cAAc,EAAE,CAAC;YACvB,KAAK,YAAY,CAAC,KAAK;gBACrB,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;gBAC7F,MAAM;YACR,KAAK,YAAY,CAAC,GAAG;gBACnB,YAAY,GAAG,MAAM,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;gBAC/F,MAAM;YACR;gBACE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,YAAsB,EAAE,iBAAoC,EAAE,QAAgB;QAC5G,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YAC1D,KAAK,EAAE;gBACL,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE;oBACL,YAAY,EAAE,mBAAmB;iBAClC;aACF;YACD,SAAS,EAAE,CAAC,OAAO,EAAE,sBAAsB,CAAC;SAC7C,CAAC,CAAC;QAEH,MAAM,uBAAuB,GAAG,sBAAsB,CAAC,oBAAoB,CAAC;QAG5E,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,IAAgC,CAAC;QAGrF,MAAM,eAAe,GAAG,MAAM,IAAA,+CAAuB,EAAC,IAAI,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;QAG3F,MAAM,eAAe,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,EAAE,iBAAiB,EAAE,sBAAsB,CAAC,CAAA;IAC3G,CAAC;IAEO,WAAW,CAAC,YAAoB,EAAE,qBAA6B,EAAE,UAAkB;QACzF,MAAM,SAAS,GAAG,CAAC,UAAU,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QACvE,OAAO,GAAG,IAAA,mBAAS,EAAC,YAAY,CAAC,IAAI,qBAAqB,IAAI,SAAS,EAAE,CAAC;IAC5E,CAAC;IAEO,WAAW,CAAC,UAAkB;QACpC,OAAO,CAAC,UAAU,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,mEAAmE,CAAC,CAAC,CAAC,UAAU,CAAC;IAChI,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,MAAW,EAAE,YAAkC,EAAE,aAAkB,EAAE,OAAW;QAG/G,MAAM,iBAAiB,GAAG,aAAa,EAAE,MAAM;aAC9C,MAAM,CAAC,CAAC,KAA6B,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC;aACtE,GAAG,CAAC,CAAC,KAAqB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAG5C,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC1D,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,MAAM,IAAI,EAAE,EAAE,CAAC;YAChD,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,2BAA2B,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3F,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;oBAChE,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,2BAA2B,EAAE;oBAC1D,SAAS,EAAE,CAAC,cAAc,CAAC;iBAC5B,CAAC,CAAC;gBAEH,IAAI,oBAAoB,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;oBAC7C,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAClF,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,KAAK,EAAE,UAAkB,EAAE,SAAiB,EAAE,EAAE;YACrD,MAAM,MAAM,GAAG,UAAU,GAAG,SAAS,CAAC;YACtC,MAAM,eAAe,GAAmB;gBACtC,KAAK,EAAE,SAAS;gBAChB,MAAM;gBACN,QAAQ,EAAE,iBAAiB;aAC5B,CAAC;YACF,MAAM,cAAc,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAErD,IAAI,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7D,eAAe,CAAC,OAAO,GAAG,cAAc,CAAC;YAC3C,CAAC;YAGD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CACnC,aAAa,EAAE,MAAM;iBAClB,MAAM,CAAC,CAAC,KAAwC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC;iBAChH,GAAG,CAAC,CAAC,KAAqB,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAC9C,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;YACrC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAA2B,EAAE,EAAE;gBACjE,MAAM,SAAS,GAAwB,EAAE,CAAC;gBAG1C,KAAK,MAAM,GAAG,IAAI,qBAAoC,EAAE,CAAC;oBACvD,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC/B,CAAC;gBAGD,KAAK,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,IAAI,uBAAuB,CAAC,OAAO,EAAE,EAAE,CAAC;oBACrF,MAAM,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;oBAE7C,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;wBAE/B,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;wBACjF,SAAS,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAClD,CAAC;yBAAM,IAAI,WAAW,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;wBAE1D,SAAS,CAAC,gBAAgB,CAAC,GAAG,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC;oBACxE,CAAC;yBAAM,CAAC;wBACN,SAAS,CAAC,gBAAgB,CAAC,GAAG,IAAI,CAAC;oBACrC,CAAC;gBACH,CAAC;gBAED,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC,CAAC;YACH,OAAO,cAAc,CAAA;QACvB,CAAC,CAAA;IACH,CAAC;IAEC,KAAK,CAAC,KAAK,CAAC,IAAyC;QACnD,MAAM,GAAG,GAAG,IAAI,0DAA0B,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,GAAG,CAAC,CAAC;QACnC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF,CAAA;AAhPY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAWR,WAAA,IAAA,6BAAmB,GAAE,CAAA;IAErB,WAAA,IAAA,0BAAgB,EAAC,6CAAiB,EAAE,SAAS,CAAC,CAAA;IAM9C,YAAA,IAAA,0BAAgB,EAAC,qCAAa,EAAE,SAAS,CAAC,CAAA;IAE1C,YAAA,IAAA,0BAAgB,EAAC,qCAAa,EAAE,SAAS,CAAC,CAAA;qCAhBZ,6CAAoB;QACnB,+CAAqB;QAC7B,sBAAa;QACf,0BAAW;QACN,uBAAgB;QACf,uCAAiB;QAErB,uBAAa;QAEtB,oBAAU;QACG,iDAAsB;QAC3B,4BAAY;QACd,wBAAU;QAGX,oBAAU;QAED,oBAAU;QACnB,gBAAS;GAtBpB,wBAAwB,CAgPpC;AAED,SAAS,oBAAoB,CAAC,GAAQ;IACpC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG;aACP,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,CAAC;aACnD,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC/B,CAAC;SAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACnD,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACvB,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1C,MAAM,YAAY,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAEjD,IACE,CAAC,OAAO,YAAY,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;oBAC1E,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;oBACxD,OAAO,YAAY,KAAK,QAAQ,EAChC,CAAC;oBACD,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|