@evara-group/guard 3.0.23 → 3.0.25
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/modules/favourite/favourite.controller.d.ts +7 -7
- package/dist/modules/favourite/favourite.controller.js +45 -37
- package/dist/modules/favourite/favourite.controller.js.map +1 -1
- package/dist/modules/role/role.mapper.js +3 -0
- package/dist/modules/role/role.mapper.js.map +1 -1
- package/dist/modules/user/dtos/user-query.dto.js +6 -2
- package/dist/modules/user/dtos/user-query.dto.js.map +1 -1
- package/dist/modules/user/user.service.js +1 -6
- package/dist/modules/user/user.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { FavouriteService } from
|
|
2
|
-
import { CreateFavouriteDto } from
|
|
3
|
-
import { FavouriteDto } from
|
|
4
|
-
import { UpdateFavouriteDto } from
|
|
5
|
-
import type { Request } from
|
|
6
|
-
import { FavouriteQueryDTO } from
|
|
7
|
-
import { MessageResponseDto } from
|
|
1
|
+
import { FavouriteService } from "./favourite.service";
|
|
2
|
+
import { CreateFavouriteDto } from "./dtos/create-favourite.dto";
|
|
3
|
+
import { FavouriteDto } from "./dtos/favourite.dto";
|
|
4
|
+
import { UpdateFavouriteDto } from "./dtos/update-favourite.dto";
|
|
5
|
+
import type { Request } from "../../core/utils/request";
|
|
6
|
+
import { FavouriteQueryDTO } from "./dtos/favourite-query.dto";
|
|
7
|
+
import { MessageResponseDto } from "../../core/utils/response-message.dto";
|
|
8
8
|
export declare class FavouriteController {
|
|
9
9
|
private readonly favouriteService;
|
|
10
10
|
constructor(favouriteService: FavouriteService);
|
|
@@ -36,19 +36,19 @@ let FavouriteController = class FavouriteController {
|
|
|
36
36
|
const mapped = (0, favourite_mapper_1.mapCreateFavouriteDtoToEntity)(req.user?.id, createFavouriteDto);
|
|
37
37
|
const saved = await this.favouriteService.save(mapped, req.user);
|
|
38
38
|
return (0, favourite_mapper_1.mapFavouritesToDtoSelective)(saved, [
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
39
|
+
"id",
|
|
40
|
+
"user",
|
|
41
|
+
"featureId",
|
|
42
|
+
"featureType",
|
|
43
|
+
"consumeApp",
|
|
44
|
+
"createdAt",
|
|
45
|
+
"createdBy",
|
|
46
|
+
"updatedAt",
|
|
47
|
+
"updatedBy",
|
|
48
48
|
]);
|
|
49
49
|
}
|
|
50
50
|
async getAll(req, query) {
|
|
51
|
-
const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder ||
|
|
51
|
+
const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
|
|
52
52
|
const whereConditions = {};
|
|
53
53
|
whereConditions.user = { id: (0, typeorm_1.Equal)(req.user?.id) };
|
|
54
54
|
whereConditions.consumeApp = (0, typeorm_1.Equal)(consume_app_type_1.ConsumeAppTypes.WATER_HAZARDS);
|
|
@@ -72,21 +72,21 @@ let FavouriteController = class FavouriteController {
|
|
|
72
72
|
const existing = await this.favouriteService.findOneByFields({
|
|
73
73
|
where: {
|
|
74
74
|
user: { id: (0, typeorm_1.Equal)(req.user?.id ?? -1) },
|
|
75
|
-
id: (0, typeorm_1.Equal)(id)
|
|
75
|
+
id: (0, typeorm_1.Equal)(id),
|
|
76
76
|
},
|
|
77
77
|
});
|
|
78
78
|
if (!existing)
|
|
79
79
|
throw new common_1.NotFoundException(`Favourite with id ${id} not found`);
|
|
80
80
|
return (0, favourite_mapper_1.mapFavouritesToDtoSelective)(existing, [
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
81
|
+
"id",
|
|
82
|
+
"user",
|
|
83
|
+
"featureId",
|
|
84
|
+
"featureType",
|
|
85
|
+
"consumeApp",
|
|
86
|
+
"createdAt",
|
|
87
|
+
"createdBy",
|
|
88
|
+
"updatedAt",
|
|
89
|
+
"updatedBy",
|
|
90
90
|
]);
|
|
91
91
|
}
|
|
92
92
|
async delete(req, id) {
|
|
@@ -96,15 +96,19 @@ let FavouriteController = class FavouriteController {
|
|
|
96
96
|
if (!existing)
|
|
97
97
|
throw new common_1.NotFoundException(`Favourite with id ${id} not found`);
|
|
98
98
|
await this.favouriteService.delete(id);
|
|
99
|
-
return { message:
|
|
99
|
+
return { message: "Favourite has been removed successfully." };
|
|
100
100
|
}
|
|
101
101
|
};
|
|
102
102
|
exports.FavouriteController = FavouriteController;
|
|
103
103
|
__decorate([
|
|
104
104
|
(0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_FAVOURITE_CREATE),
|
|
105
|
-
(0, common_1.Post)(
|
|
106
|
-
(0, swagger_1.ApiOperation)({ summary:
|
|
107
|
-
(0, swagger_1.ApiResponse)({
|
|
105
|
+
(0, common_1.Post)("/"),
|
|
106
|
+
(0, swagger_1.ApiOperation)({ summary: "Create a new favourite" }),
|
|
107
|
+
(0, swagger_1.ApiResponse)({
|
|
108
|
+
status: 201,
|
|
109
|
+
description: "Favourite created",
|
|
110
|
+
type: favourite_dto_1.FavouriteDto,
|
|
111
|
+
}),
|
|
108
112
|
__param(0, (0, common_1.Req)()),
|
|
109
113
|
__param(1, (0, common_1.Body)()),
|
|
110
114
|
__metadata("design:type", Function),
|
|
@@ -112,12 +116,12 @@ __decorate([
|
|
|
112
116
|
__metadata("design:returntype", Promise)
|
|
113
117
|
], FavouriteController.prototype, "create", null);
|
|
114
118
|
__decorate([
|
|
115
|
-
(0, common_1.Get)(
|
|
119
|
+
(0, common_1.Get)("/"),
|
|
116
120
|
(0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_FAVOURITE_LIST),
|
|
117
|
-
(0, swagger_1.ApiOperation)({ summary:
|
|
121
|
+
(0, swagger_1.ApiOperation)({ summary: "Get list of favourites (paginated)" }),
|
|
118
122
|
(0, swagger_1.ApiResponse)({
|
|
119
123
|
status: 200,
|
|
120
|
-
description:
|
|
124
|
+
description: "List all user specific favourites.",
|
|
121
125
|
type: favourite_dto_1.FavouriteDto,
|
|
122
126
|
isArray: true,
|
|
123
127
|
}),
|
|
@@ -128,32 +132,36 @@ __decorate([
|
|
|
128
132
|
__metadata("design:returntype", Promise)
|
|
129
133
|
], FavouriteController.prototype, "getAll", null);
|
|
130
134
|
__decorate([
|
|
131
|
-
(0, common_1.Get)(
|
|
135
|
+
(0, common_1.Get)("/:id"),
|
|
132
136
|
(0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_FAVOURITE_READ),
|
|
133
|
-
(0, swagger_1.ApiOperation)({ summary:
|
|
134
|
-
(0, swagger_1.ApiResponse)({
|
|
137
|
+
(0, swagger_1.ApiOperation)({ summary: "Get favourite by id" }),
|
|
138
|
+
(0, swagger_1.ApiResponse)({
|
|
139
|
+
status: 200,
|
|
140
|
+
description: "Favourite found",
|
|
141
|
+
type: favourite_dto_1.FavouriteDto,
|
|
142
|
+
}),
|
|
135
143
|
__param(0, (0, common_1.Req)()),
|
|
136
|
-
__param(1, (0, common_1.Param)(
|
|
144
|
+
__param(1, (0, common_1.Param)("id")),
|
|
137
145
|
__metadata("design:type", Function),
|
|
138
146
|
__metadata("design:paramtypes", [Object, Number]),
|
|
139
147
|
__metadata("design:returntype", Promise)
|
|
140
148
|
], FavouriteController.prototype, "getById", null);
|
|
141
149
|
__decorate([
|
|
142
|
-
(0, common_1.Delete)(
|
|
150
|
+
(0, common_1.Delete)("/:id"),
|
|
143
151
|
(0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_FAVOURITE_DELETE),
|
|
144
|
-
(0, swagger_1.ApiOperation)({ summary:
|
|
145
|
-
(0, swagger_1.ApiResponse)({ status: 200, description:
|
|
152
|
+
(0, swagger_1.ApiOperation)({ summary: "Delete favourite" }),
|
|
153
|
+
(0, swagger_1.ApiResponse)({ status: 200, description: "Favourite deleted" }),
|
|
146
154
|
__param(0, (0, common_1.Req)()),
|
|
147
|
-
__param(1, (0, common_1.Param)(
|
|
155
|
+
__param(1, (0, common_1.Param)("id", common_1.ParseIntPipe)),
|
|
148
156
|
__metadata("design:type", Function),
|
|
149
157
|
__metadata("design:paramtypes", [Object, Number]),
|
|
150
158
|
__metadata("design:returntype", Promise)
|
|
151
159
|
], FavouriteController.prototype, "delete", null);
|
|
152
160
|
exports.FavouriteController = FavouriteController = __decorate([
|
|
153
|
-
(0, common_1.Controller)(
|
|
161
|
+
(0, common_1.Controller)("api/v1/favourite"),
|
|
154
162
|
(0, swagger_1.ApiBearerAuth)(),
|
|
155
163
|
(0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, permission_guard_1.PermissionsGuard),
|
|
156
|
-
(0, swagger_1.ApiTags)(
|
|
164
|
+
(0, swagger_1.ApiTags)("favourites-module"),
|
|
157
165
|
__metadata("design:paramtypes", [favourite_service_1.FavouriteService])
|
|
158
166
|
], FavouriteController);
|
|
159
167
|
//# sourceMappingURL=favourite.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"favourite.controller.js","sourceRoot":"","sources":["../../../src/modules/favourite/favourite.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"favourite.controller.js","sourceRoot":"","sources":["../../../src/modules/favourite/favourite.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,9 @@ const mapCreateRoleDtoToEntity = (dto) => {
|
|
|
43
43
|
role.nameAr = dto.nameAr;
|
|
44
44
|
role.nameEn = dto.nameEn;
|
|
45
45
|
role.isSystemRole = false;
|
|
46
|
+
role.levelOneId = dto.levelOneId;
|
|
47
|
+
role.levelTwoId = dto.levelTwoId;
|
|
48
|
+
role.levelThreeId = dto.levelThreeId;
|
|
46
49
|
if (dto.descriptionAr !== undefined)
|
|
47
50
|
role.descriptionAr = dto.descriptionAr;
|
|
48
51
|
if (dto.descriptionEn !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":";;;AAyCA,8DA2BC;AA9DD,+CAAqC;AACrC,uEAA6D;AAM7D,MAAM,kBAAkB,GAAiD;IACvE,IAAI;IACJ,QAAQ;IACR,QAAQ;IACR,aAAa;IACb,eAAe;IACf,eAAe;IACf,cAAc;IACd,WAAW;IACX,WAAW;IACX,WAAW;IACX,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,cAAc;CACf,CAAC;AAaF,SAAgB,yBAAyB,CACvC,WAA0B,EAC1B,IAAwC;IAExC,MAAM,SAAS,GAAG,CAAC,IAAU,EAAoB,EAAE;QACjD,MAAM,GAAG,GAAqB,EAAE,CAAC;QAEjC,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5D,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,CACjC,CAAC;QAEF,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,IAAI,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,GAAiB,CAAC,KAAK,SAAS,EAAE,CAAC;gBACxD,GAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAiB,CAAC,CAAC;YAC9C,CAAC;YAED,IAAI,GAAG,KAAK,aAAa,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBAC7C,GAAW,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QAC/B,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC;QAC5B,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAC7B,CAAC;AAEM,MAAM,wBAAwB,GAAG,CAAC,GAAkB,EAAQ,EAAE;IACnE,MAAM,IAAI,GAAG,IAAI,kBAAI,EAAE,CAAC;IAExB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IACzB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IACzB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,10 +45,14 @@ __decorate([
|
|
|
45
45
|
example: [1, 2],
|
|
46
46
|
}),
|
|
47
47
|
(0, class_validator_1.IsOptional)(),
|
|
48
|
-
(0, class_transformer_1.Transform)(({ value }) =>
|
|
48
|
+
(0, class_transformer_1.Transform)(({ value }) => {
|
|
49
|
+
if (Array.isArray(value)) {
|
|
50
|
+
return value.map((v) => Number(v));
|
|
51
|
+
}
|
|
52
|
+
return [Number(value)];
|
|
53
|
+
}),
|
|
49
54
|
(0, class_validator_1.IsArray)(),
|
|
50
55
|
(0, class_validator_1.IsInt)({ each: true }),
|
|
51
|
-
(0, class_transformer_1.Type)(() => Number),
|
|
52
56
|
__metadata("design:type", Array)
|
|
53
57
|
], UserQueryDTO.prototype, "roleId", void 0);
|
|
54
58
|
//# sourceMappingURL=user-query.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user-query.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AACtD,mEAA+D;AAC/D,qDAA6D;AAC7D,yDAAoD;AAEpD,MAAa,YAAa,SAAQ,0BAAW;
|
|
1
|
+
{"version":3,"file":"user-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user-query.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AACtD,mEAA+D;AAC/D,qDAA6D;AAC7D,yDAAoD;AAEpD,MAAa,YAAa,SAAQ,0BAAW;CAkC5C;AAlCD,oCAkCC;AA7BC;IAJC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC1D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACC;AAMpB;IAJC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC1D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACC;AAMpB;IAJC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;IAC5D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;kDACG;AAgBtB;IAdC,IAAA,6BAAmB,EAAC;QACnB,WAAW,EAAE,mBAAmB;QAChC,IAAI,EAAE,CAAC,MAAM,CAAC;QACd,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KAChB,CAAC;IACD,IAAA,4BAAU,GAAE;IACZ,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;QACvB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IACD,IAAA,yBAAO,GAAE;IACT,IAAA,uBAAK,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;4CACJ"}
|
|
@@ -26,12 +26,7 @@ let UserService = class UserService {
|
|
|
26
26
|
async findById(id) {
|
|
27
27
|
const result = await this.userRepository.findOne({
|
|
28
28
|
where: { id: (0, typeorm_2.Equal)(id) },
|
|
29
|
-
relations: [
|
|
30
|
-
"roles",
|
|
31
|
-
"roles.permissions",
|
|
32
|
-
"roles.permissions.module",
|
|
33
|
-
"jobs",
|
|
34
|
-
],
|
|
29
|
+
relations: ["roles", "roles.permissions", "roles.permissions.module"],
|
|
35
30
|
});
|
|
36
31
|
return result || undefined;
|
|
37
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,+CAAqC;AACrC,qCAA6E;AAC7E,kEAAmE;AACnE,yCAAwD;AAGjD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAEU,cAAgC;QAAhC,mBAAc,GAAd,cAAc,CAAkB;IACvC,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,eAAK,EAAC,EAAE,CAAC,EAAE;YACxB,SAAS,EAAE
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/modules/user/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,+CAAqC;AACrC,qCAA6E;AAC7E,kEAAmE;AACnE,yCAAwD;AAGjD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAEU,cAAgC;QAAhC,mBAAc,GAAd,cAAc,CAAkB;IACvC,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC/C,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,eAAK,EAAC,EAAE,CAAC,EAAE;YACxB,SAAS,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,CAAC;SACtE,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,OAA6B;QAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1D,OAAO,MAAM,IAAI,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA8B;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,MAAM,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,OAA8B;QAE9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACnE,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,IAAI,CACR,OAAsB,EACtB,OAAgB,EAChB,cAAc,GAAG,KAAK;QAEtB,IAAI,cAAc,EAAE,CAAC;YACnB,MAAM,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;gBACvB,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;YAC9B,CAAC;YACD,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;QAC9B,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAsB,EAAE,OAAgB;QACnD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;QAC9B,CAAC;QACD,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,IAAA,iCAAiB,EAAC,OAAO,CAAC,CAAC;QACnC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,OAAa;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAjEY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,kBAAI,EAAE,iCAAwB,CAAC,CAAA;qCACzB,oBAAU;GAHzB,WAAW,CAiEvB"}
|