@servicelabsco/nestjs-utility-services 1.1.91 → 1.1.93
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/app.controller.d.ts +2 -7
- package/dist/app.controller.js +3 -14
- package/dist/app.controller.js.map +1 -1
- package/dist/auth/services/social.service.d.ts +1 -1
- package/dist/auth/services/social.service.js +3 -3
- package/dist/auth/services/social.service.js.map +1 -1
- package/dist/system/dtos/file.upload.spec.dto.d.ts +2 -1
- package/dist/system/dtos/file.upload.spec.dto.js.map +1 -1
- package/dist/system/es6.classes.d.ts +1 -1
- package/dist/system/services/aws.s3.service.d.ts +5 -0
- package/dist/system/services/aws.s3.service.js +38 -0
- package/dist/system/services/aws.s3.service.js.map +1 -1
- package/dist/system/services/upload.service.d.ts +3 -1
- package/dist/system/services/upload.service.js +11 -1
- package/dist/system/services/upload.service.js.map +1 -1
- package/package.json +1 -1
package/dist/app.controller.d.ts
CHANGED
|
@@ -1,18 +1,13 @@
|
|
|
1
1
|
import { Request } from 'express';
|
|
2
2
|
import { QueueService } from './platformUtility/services/queue.service';
|
|
3
|
-
import { MobileValidationService } from './system/services/mobile.validation.service';
|
|
4
|
-
import { MailValidationService } from './system/services/mail.validation.service';
|
|
5
|
-
import { MobileValidationEntity } from './system/entities/mobile.validation.entity';
|
|
6
3
|
export declare class AppController {
|
|
7
4
|
private readonly queueService;
|
|
8
|
-
|
|
9
|
-
private readonly mailValidationService;
|
|
10
|
-
constructor(queueService: QueueService, mobileValidationService: MobileValidationService, mailValidationService: MailValidationService);
|
|
5
|
+
constructor(queueService: QueueService);
|
|
11
6
|
get(): Promise<{
|
|
12
7
|
message: string;
|
|
13
8
|
}>;
|
|
14
9
|
getUserAuthObject(): Promise<any>;
|
|
15
|
-
set(req: Request): Promise<
|
|
10
|
+
set(req: Request): Promise<void>;
|
|
16
11
|
uset(query: any): Promise<void>;
|
|
17
12
|
getQueueInstance(): Promise<any>;
|
|
18
13
|
queue(id: number): Promise<import("bull").Job<any>>;
|
package/dist/app.controller.js
CHANGED
|
@@ -16,14 +16,9 @@ exports.AppController = void 0;
|
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const auth_1 = require("./common/libraries/auth");
|
|
18
18
|
const queue_service_1 = require("./platformUtility/services/queue.service");
|
|
19
|
-
const mobile_validation_service_1 = require("./system/services/mobile.validation.service");
|
|
20
|
-
const mail_validation_service_1 = require("./system/services/mail.validation.service");
|
|
21
|
-
const mobile_validation_entity_1 = require("./system/entities/mobile.validation.entity");
|
|
22
19
|
let AppController = class AppController {
|
|
23
|
-
constructor(queueService
|
|
20
|
+
constructor(queueService) {
|
|
24
21
|
this.queueService = queueService;
|
|
25
|
-
this.mobileValidationService = mobileValidationService;
|
|
26
|
-
this.mailValidationService = mailValidationService;
|
|
27
22
|
}
|
|
28
23
|
async get() {
|
|
29
24
|
return { message: 'Hello World!' };
|
|
@@ -31,11 +26,7 @@ let AppController = class AppController {
|
|
|
31
26
|
async getUserAuthObject() {
|
|
32
27
|
return auth_1.Auth.user();
|
|
33
28
|
}
|
|
34
|
-
async set(req) {
|
|
35
|
-
const r = await mobile_validation_entity_1.MobileValidationEntity.first(10);
|
|
36
|
-
r.attempts += 1;
|
|
37
|
-
return r.save();
|
|
38
|
-
}
|
|
29
|
+
async set(req) { }
|
|
39
30
|
async uset(query) { }
|
|
40
31
|
async getQueueInstance() {
|
|
41
32
|
return this.queueService.data;
|
|
@@ -85,9 +76,7 @@ __decorate([
|
|
|
85
76
|
], AppController.prototype, "queue", null);
|
|
86
77
|
AppController = __decorate([
|
|
87
78
|
(0, common_1.Controller)(),
|
|
88
|
-
__metadata("design:paramtypes", [queue_service_1.QueueService
|
|
89
|
-
mobile_validation_service_1.MobileValidationService,
|
|
90
|
-
mail_validation_service_1.MailValidationService])
|
|
79
|
+
__metadata("design:paramtypes", [queue_service_1.QueueService])
|
|
91
80
|
], AppController);
|
|
92
81
|
exports.AppController = AppController;
|
|
93
82
|
//# sourceMappingURL=app.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoE;AAEpE,kDAA+C;AAC/C,4EAAwE;
|
|
1
|
+
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoE;AAEpE,kDAA+C;AAC/C,4EAAwE;AAGjE,IAAM,aAAa,GAAnB,MAAM,aAAa;IACtB,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAGrD,AAAN,KAAK,CAAC,GAAG;QACL,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACvC,CAAC;IAQK,AAAN,KAAK,CAAC,iBAAiB;QACnB,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CAAQ,GAAY,IAAG,CAAC;IAG3B,AAAN,KAAK,CAAC,IAAI,CAAU,KAAU,IAAG,CAAC;IAG5B,AAAN,KAAK,CAAC,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAc,EAAU;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;CACJ,CAAA;AA7BS;IADL,IAAA,YAAG,GAAE;;;;wCAGL;AAQK;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;;;;sDAGf;AAGK;IADL,IAAA,YAAG,EAAC,KAAK,CAAC;IACA,WAAA,IAAA,YAAG,GAAE,CAAA;;;;wCAAiB;AAG3B;IADL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACF,WAAA,IAAA,cAAK,GAAE,CAAA;;;;yCAAe;AAG5B;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;;;;qDAGZ;AAGK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IACJ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;0CAEvB;AAhCQ,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAEkC,4BAAY;GAD9C,aAAa,CAiCzB;AAjCY,sCAAa"}
|
|
@@ -3,5 +3,5 @@ export declare class SocialService {
|
|
|
3
3
|
private readonly remoteRequestService;
|
|
4
4
|
constructor(remoteRequestService: RemoteRequestService);
|
|
5
5
|
fbLogin(token: string): Promise<any>;
|
|
6
|
-
googleLogin(token: string, oneLogin?:
|
|
6
|
+
googleLogin(token: string, oneLogin?: boolean): Promise<any>;
|
|
7
7
|
}
|
|
@@ -25,9 +25,9 @@ let SocialService = class SocialService {
|
|
|
25
25
|
const response = await this.remoteRequestService.sendThroughAxios(options);
|
|
26
26
|
return response.data;
|
|
27
27
|
}
|
|
28
|
-
async googleLogin(token, oneLogin) {
|
|
29
|
-
let url = oneLogin ? 'https://oauth2.googleapis.com/tokeninfo?id_token
|
|
30
|
-
url = `${url}
|
|
28
|
+
async googleLogin(token, oneLogin = true) {
|
|
29
|
+
let url = oneLogin ? 'https://oauth2.googleapis.com/tokeninfo?id_token' : 'https://www.googleapis.com/oauth2/v3/tokeninfo?access_token';
|
|
30
|
+
url = `${url}=${token}`;
|
|
31
31
|
const options = {
|
|
32
32
|
method: 'get',
|
|
33
33
|
url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"social.service.js","sourceRoot":"","sources":["../../../src/auth/services/social.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oGAA+F;AAUxF,IAAM,aAAa,GAAnB,MAAM,aAAa;IAOtB,YAA6B,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAQ3E,KAAK,CAAC,OAAO,CAAC,KAAa;QACvB,MAAM,GAAG,GAAG,mGAAmG,GAAG,KAAK,CAAC;QACxH,MAAM,OAAO,GAAQ;YACjB,MAAM,EAAE,KAAK;YACb,GAAG;SACN,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3E,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"social.service.js","sourceRoot":"","sources":["../../../src/auth/services/social.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,oGAA+F;AAUxF,IAAM,aAAa,GAAnB,MAAM,aAAa;IAOtB,YAA6B,oBAA0C;QAA1C,yBAAoB,GAApB,oBAAoB,CAAsB;IAAG,CAAC;IAQ3E,KAAK,CAAC,OAAO,CAAC,KAAa;QACvB,MAAM,GAAG,GAAG,mGAAmG,GAAG,KAAK,CAAC;QACxH,MAAM,OAAO,GAAQ;YACjB,MAAM,EAAE,KAAK;YACb,GAAG;SACN,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3E,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzB,CAAC;IAQD,KAAK,CAAC,WAAW,CAAC,KAAa,EAAE,WAAoB,IAAI;QACrD,IAAI,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,kDAAkD,CAAC,CAAC,CAAC,6DAA6D,CAAC;QAExI,GAAG,GAAG,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QAExB,MAAM,OAAO,GAAQ;YACjB,MAAM,EAAE,KAAK;YACb,GAAG;SACN,CAAC;QAEF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;SACpE;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;CACJ,CAAA;AA/CY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAQ0C,6CAAoB;GAP9D,aAAa,CA+CzB;AA/CY,sCAAa"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.upload.spec.dto.js","sourceRoot":"","sources":["../../../src/system/dtos/file.upload.spec.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAiB;
|
|
1
|
+
{"version":3,"file":"file.upload.spec.dto.js","sourceRoot":"","sources":["../../../src/system/dtos/file.upload.spec.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAiB;CAQ7B;AARD,8CAQC"}
|
|
@@ -140,7 +140,7 @@ import { UserGroupRoleSubscriber } from './subscribers/user.group.role.subscribe
|
|
|
140
140
|
declare const es6Classes: {
|
|
141
141
|
commands: (typeof DbScannerCommand | typeof DynamoScannerCommand | typeof EventQueueCommand | typeof JobsScannerCommand | typeof ModelScannerCommand | typeof ReportScannerCommand | typeof ServiceScannerCommand | typeof SyncAllCommand)[];
|
|
142
142
|
controllers: (typeof BaseController | typeof DataController | typeof FormController | typeof MenuController | typeof PreferenceController | typeof UploadController | typeof UserPreferenceController | typeof ReportController)[];
|
|
143
|
-
dtos: (typeof ModelFormPreferenceCreationDto | typeof
|
|
143
|
+
dtos: (typeof ModelFormPreferenceCreationDto | typeof FileUploadSpecDto | typeof S3UploadOptionsDto | typeof LocalFileS3UploadDto | typeof S3ObjectInfoDto | typeof UserPreferenceCreationDto | typeof AddCommentDto | typeof CommentAttributesDto | typeof FileUploadDto | typeof JobRecordParamDto | typeof MailValidationDto | typeof MobileValidationDto | typeof ModelAllowedColumnDto | typeof OtpGenerationDto | typeof ValidationOptionsDto)[];
|
|
144
144
|
entities: (typeof LookupTypeEntity | typeof UserGroupRoleEntity | typeof UserGroupEntity | typeof UserGroupMemberEntity | typeof BusinessRuleRoleEntity | typeof BusinessRuleEntity | typeof ColumnDefinitionEntity | typeof ColumnEntity | typeof ModelEntity | typeof FormPreferenceEntity | typeof ModelColumnEntity | typeof RelationshipEntity | typeof ModelRelationshipEntity | typeof ModelRoleEntity | typeof FormColumnEntity | typeof SystemScriptEntity | typeof UiActionPermissionEntity | typeof UiActionEntity | typeof UiActionRoleEntity | typeof PrimaryAxisEntity | typeof ChartEntity | typeof ClientScriptEntity | typeof CommentEntity | typeof DocumentEntity | typeof DynamoTableEntity | typeof EventDetailEntity | typeof EventQueueEntity | typeof ReportColumnEntity | typeof ReportEntity | typeof ReportRelationshipEntity | typeof ReportRoleEntity | typeof ServiceEntity | typeof SecurityRuleEntity | typeof MailLogEntity | typeof SmsTemplateEntity | typeof SmsMessageEntity | typeof MailValidationEntity | typeof MenuRoleEntity | typeof MenuEntity | typeof ModuleEntity | typeof ModuleMenuEntity | typeof PageDefinitionEntity | typeof ParentMenuEntity | typeof MobileValidationEntity | typeof OpenPropertyEntity | typeof ReportFilterEntity | typeof ScheduledEventEntity | typeof UserGroupPermissionEntity | typeof UserPreferenceEntity | typeof WhatsappTemplateEntity)[];
|
|
145
145
|
jobs: (typeof ModelScannerJob | typeof ReportColumnSyncJob | typeof ScheduledEventJob | typeof CleanScheduledEventJob | typeof ColumnMapperJob | typeof MailValidationJob | typeof MobileValidationJob | typeof RefreshPropertyCacheJob | typeof PropertyJob | typeof RelationshipMapperJob | typeof ScheduledEventsJob | typeof SmsMessageJob | typeof UserGroupMemberJob | typeof UserGroupPermissionJob | typeof UserGroupRoleJob)[];
|
|
146
146
|
libraries: (typeof SyncDynamoTables | typeof ModelSync | typeof SecurityRuleEvaluator | typeof ColumnManager | typeof BusinessRuleFilterValidator | typeof BusinessRuleQueryEvaluator)[];
|
|
@@ -11,4 +11,9 @@ export declare class AwsS3Service {
|
|
|
11
11
|
moveObject(source: S3ObjectInfoDto, destination: S3ObjectInfoDto): Promise<any>;
|
|
12
12
|
copyObject(source: S3ObjectInfoDto, destination: S3ObjectInfoDto): Promise<any>;
|
|
13
13
|
dropObject(object: S3ObjectInfoDto): Promise<any>;
|
|
14
|
+
getS3BucketKeyFromUrl(url: string): {
|
|
15
|
+
bucket: string;
|
|
16
|
+
key: string;
|
|
17
|
+
region: string;
|
|
18
|
+
};
|
|
14
19
|
}
|
|
@@ -85,6 +85,44 @@ let AwsS3Service = class AwsS3Service {
|
|
|
85
85
|
const command = new client_s3_1.DeleteObjectCommand(params);
|
|
86
86
|
return client.send(command);
|
|
87
87
|
}
|
|
88
|
+
getS3BucketKeyFromUrl(url) {
|
|
89
|
+
var _decodedUrl = decodeURIComponent(url);
|
|
90
|
+
var _result = null;
|
|
91
|
+
var _match = _decodedUrl.match(/^https?:\/\/s3.amazonaws.com\/([^\/]+)\/?(.*?)$/);
|
|
92
|
+
if (_match) {
|
|
93
|
+
_result = {
|
|
94
|
+
bucket: _match[1],
|
|
95
|
+
key: _match[2],
|
|
96
|
+
region: '',
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
_match = _decodedUrl.match(/^https?:\/\/s3-([^.]+).amazonaws.com\/([^\/]+)\/?(.*?)$/);
|
|
100
|
+
if (_match) {
|
|
101
|
+
_result = {
|
|
102
|
+
bucket: _match[2],
|
|
103
|
+
key: _match[3],
|
|
104
|
+
region: _match[1],
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
_match = _decodedUrl.match(/^https?:\/\/([^.]+).s3.amazonaws.com\/?(.*?)$/);
|
|
108
|
+
if (_match) {
|
|
109
|
+
_result = {
|
|
110
|
+
bucket: _match[1],
|
|
111
|
+
key: _match[2],
|
|
112
|
+
region: '',
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
_match = _decodedUrl.match(/^https?:\/\/([^.]+).(?:s3-|s3\.)([^.]+).amazonaws.com\/?(.*?)$/);
|
|
116
|
+
if (_match) {
|
|
117
|
+
_result = {
|
|
118
|
+
bucket: _match[1],
|
|
119
|
+
key: _match[3],
|
|
120
|
+
region: _match[2],
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
_result.key = _result.key.split('?')[0];
|
|
124
|
+
return _result;
|
|
125
|
+
}
|
|
88
126
|
};
|
|
89
127
|
AwsS3Service = __decorate([
|
|
90
128
|
(0, common_1.Injectable)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kDAA4H;AAC5H,sDAA8C;AAC9C,wEAA6D;AAC7D,2CAA4C;AAC5C,qDAAqD;AAI9C,IAAM,YAAY,GAAlB,MAAM,YAAY;IAAlB;QAMK,WAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { FileUploadSpecDto } from '../dtos/file.upload.spec.dto';
|
|
1
3
|
import { S3UploadOptionsDto } from '../dtos/s3.upload.options.dto';
|
|
2
4
|
import { LocalFileS3UploadDto } from './../dtos/local.file.s3.upload.dto';
|
|
3
5
|
import { AwsS3Service } from './aws.s3.service';
|
|
4
|
-
import { FileUploadSpecDto } from '../dtos/file.upload.spec.dto';
|
|
5
6
|
export declare class UploadService {
|
|
6
7
|
private readonly awsS3Service;
|
|
7
8
|
constructor(awsS3Service: AwsS3Service);
|
|
8
9
|
upload(file: FileUploadSpecDto, options?: S3UploadOptionsDto): Promise<string>;
|
|
10
|
+
getBufferFromUrl(url: string): Promise<Buffer>;
|
|
9
11
|
uploadFile(params: any): Promise<string>;
|
|
10
12
|
saveLocalFileOnS3(options: LocalFileS3UploadDto): Promise<string>;
|
|
11
13
|
getParam(file: any): Promise<any>;
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.UploadService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
+
const axios_1 = require("axios");
|
|
14
15
|
const fs_1 = require("fs");
|
|
15
16
|
const s3Config = require("../../config/aws.config");
|
|
16
17
|
const aws_s3_service_1 = require("./aws.s3.service");
|
|
@@ -22,14 +23,23 @@ let UploadService = class UploadService {
|
|
|
22
23
|
const folder = options.folder || 'public';
|
|
23
24
|
const fileName = options.file || file.originalname;
|
|
24
25
|
const urlkey = `${folder}/${fileName}`;
|
|
26
|
+
let Body;
|
|
27
|
+
if (file.url)
|
|
28
|
+
Body = await this.getBufferFromUrl(file.url);
|
|
29
|
+
else
|
|
30
|
+
Body = file.buffer;
|
|
25
31
|
const params = {
|
|
26
|
-
Body
|
|
32
|
+
Body,
|
|
27
33
|
Bucket: options.bucket || s3Config.bucket,
|
|
28
34
|
Key: urlkey,
|
|
29
35
|
ACL: options.acl || 'public-read',
|
|
30
36
|
};
|
|
31
37
|
return this.awsS3Service.upload(params);
|
|
32
38
|
}
|
|
39
|
+
async getBufferFromUrl(url) {
|
|
40
|
+
const response = await axios_1.default.get(url, { responseType: 'arraybuffer' });
|
|
41
|
+
return Buffer.from(response.data, 'utf-8');
|
|
42
|
+
}
|
|
33
43
|
async uploadFile(params) {
|
|
34
44
|
return this.awsS3Service.upload(params);
|
|
35
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["../../../src/system/services/upload.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2BAAkC;AAClC,oDAAoD;
|
|
1
|
+
{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["../../../src/system/services/upload.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,iCAA0B;AAC1B,2BAAkC;AAClC,oDAAoD;AAIpD,qDAAgD;AAGzC,IAAM,aAAa,GAAnB,MAAM,aAAa;IACtB,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAS3D,KAAK,CAAC,MAAM,CAAC,IAAuB,EAAE,UAA8B,EAAE;QAClE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC;QAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC;QAEnD,MAAM,MAAM,GAAG,GAAG,MAAM,IAAI,QAAQ,EAAE,CAAC;QAEvC,IAAI,IAAI,CAAC;QACT,IAAI,IAAI,CAAC,GAAG;YAAE,IAAI,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;;YACtD,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;QAExB,MAAM,MAAM,GAAG;YACX,IAAI;YACJ,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM;YACzC,GAAG,EAAE,MAAM;YACX,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,aAAa;SACpC,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,GAAW;QAC9B,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QACvE,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAQD,KAAK,CAAC,UAAU,CAAC,MAAW;QACxB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAQD,KAAK,CAAC,iBAAiB,CAAC,OAA6B;QACjD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,IAAA,iBAAY,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEhD,MAAM,MAAM,GAAG;YACX,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YACjB,GAAG,EAAE,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC;YACtE,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,OAAO,CAAC,UAAU,IAAI,SAAS;SACvC,CAAC;QAEF,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAQD,KAAK,CAAC,QAAQ,CAAC,IAAS;QACpB,MAAM,MAAM,GAAG,UAAU,IAAI,CAAC,YAAY,EAAE,CAAC;QAC7C,OAAO;YACH,IAAI,EAAE,IAAI,CAAC,MAAM;YACjB,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,GAAG,EAAE,MAAM;YACX,GAAG,EAAE,aAAa;SACrB,CAAC;IACN,CAAC;CACJ,CAAA;AAhFY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAEkC,6BAAY;GAD9C,aAAa,CAgFzB;AAhFY,sCAAa"}
|
package/package.json
CHANGED