runlify 0.0.718 → 0.0.720

package/build/projectsGeneration/generators/graph/utils/serviceModels/getPreparedModelsForGraph.spec.js

@@ -7,15 +7,16 @@ const jest_without_globals_1 = require("jest-without-globals");
 const getPreparedModelsForGraph_1 = require("./getPreparedModelsForGraph");
 const AdditionalServiceBuilder_1 = __importDefault(require("../../../../builders/AdditionalServiceBuilder"));
 const types_1 = require("../../../../../types");
+const log_1 = __importDefault(require("../../../../../log"));
 // yarn test --testPathPattern getPreparedModelsForGraph
 // yarn test --testPathPattern getPreparedModelsForGraph -t 'without args and return'
 // yarn test --testPathPattern getPreparedModelsForGraph -t 'with simple args and no return'
+// yarn test --testPathPattern getPreparedModelsForGraph -t 'without args and double level nested fields in return'
 describe('getPreparedModelsForGraph', () => {
     describe('returns types', () => {
         it('without args and return', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
-            const someMethod = service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
+            service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
             const { inputModels, outputModels, args } = (0, getPreparedModelsForGraph_1.getPreparedModelsForGraph)(service.build());
             (0, jest_without_globals_1.expect)(inputModels).toBeEmpty();
             (0, jest_without_globals_1.expect)(outputModels).toBeEmpty();
@@ -25,7 +26,6 @@ describe('getPreparedModelsForGraph', () => {
         it('with simple args and no return', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
             const someMethod = service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
             const someMethodArgs = someMethod.getArgsModel();
             someMethodArgs.addField('someString').setType('string').setRequired();
             const { inputModels, outputModels, args } = (0, getPreparedModelsForGraph_1.getPreparedModelsForGraph)(service.build());
@@ -37,8 +37,7 @@ describe('getPreparedModelsForGraph', () => {
         it('with no args and simple return', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
             const someMethod = service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
-            const someMethodResult = someMethod.getReturnModel();
+            const someMethodResult = someMethod.setReturnObjectModel('result');
             someMethodResult.addField('someString').setType('string').setRequired();
             const { inputModels, outputModels, args } = (0, getPreparedModelsForGraph_1.getPreparedModelsForGraph)(service.build());
             (0, jest_without_globals_1.expect)(inputModels).toBeEmpty();
@@ -50,10 +49,9 @@ describe('getPreparedModelsForGraph', () => {
         it('with simple args and simple return', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
             const someMethod = service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
             const someMethodArgs = someMethod.getArgsModel();
             someMethodArgs.addField('someString').setType('string').setRequired();
-            const someMethodResult = someMethod.getReturnModel();
+            const someMethodResult = someMethod.setReturnObjectModel('result');
             someMethodResult.addField('someString').setType('string').setRequired();
             const { inputModels, outputModels, args } = (0, getPreparedModelsForGraph_1.getPreparedModelsForGraph)(service.build());
             (0, jest_without_globals_1.expect)(inputModels).toBeEmpty();
@@ -64,13 +62,12 @@ describe('getPreparedModelsForGraph', () => {
         });
         it('with simple args and with inner object someModel in return', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
-            const someModel = service.addGeneralModel('someModel');
+            const someModel = service.createGeneralModel('someModel');
             someModel.addField('fieldOfModel').setType('string').setRequired();
             const someMethod = service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
             const someMethodArgs = someMethod.getArgsModel();
             someMethodArgs.addField('someString').setType('string').setRequired();
-            const someMethodResult = someMethod.getReturnModel();
+            const someMethodResult = someMethod.setReturnObjectModel('result');
             someMethodResult.addModelField('someModel', 'objectField').setRequired();
             const { inputModels, outputModels, args } = (0, getPreparedModelsForGraph_1.getPreparedModelsForGraph)(service.build());
             (0, jest_without_globals_1.expect)(inputModels).toBeEmpty();
@@ -82,13 +79,12 @@ describe('getPreparedModelsForGraph', () => {
         });
         it('with inner object someModel in args and simple return', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
-            const someModel = service.addGeneralModel('someModel');
+            const someModel = service.createGeneralModel('someModel');
             someModel.addField('fieldOfModel').setType('string').setRequired();
             const someMethod = service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
             const someMethodArgs = someMethod.getArgsModel();
             someMethodArgs.addModelField('someModel', 'objectField').setRequired();
-            const someMethodResult = someMethod.getReturnModel();
+            const someMethodResult = someMethod.setReturnObjectModel('result');
             someMethodResult.addField('someString').setType('string').setRequired();
             const { inputModels, outputModels, args } = (0, getPreparedModelsForGraph_1.getPreparedModelsForGraph)(service.build());
             (0, jest_without_globals_1.expect)(inputModels).toBeArrayOfSize(1);
@@ -100,16 +96,21 @@ describe('getPreparedModelsForGraph', () => {
         });
         it('without args and double level nested fields in return', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
-            const anotherModel = service.addGeneralModel('anotherModel');
+            const anotherModel = service.createGeneralModel('anotherModel');
             anotherModel.addField('fieldOfModel').setType('string').setRequired();
-            const someModel = service.addGeneralModel('someModel');
+            const someModel = service.createGeneralModel('someModel');
             someModel.addModelField('anotherModel', 'objectField').setRequired();
             const someMethod = service.addMethod('someMethod', types_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
-            const someMethodResult = someMethod.getReturnModel();
+            const someMethodResult = someMethod.setReturnObjectModel('result');
             someMethodResult.addModelField('someModel', 'objectField').setRequired();
             const { inputModels, outputModels, args } = (0, getPreparedModelsForGraph_1.getPreparedModelsForGraph)(service.build());
             (0, jest_without_globals_1.expect)(inputModels).toBeEmpty();
+            log_1.default.info(`outputModels: ${outputModels.map(m => m.name).join(', ')}`);
+            log_1.default.info(`outputModels: ${outputModels.map(m => m.name).join(', ')}`);
+            log_1.default.info(`outputModels: ${outputModels.map(m => m.name).join(', ')}`);
+            log_1.default.info(`outputModels: ${outputModels.map(m => m.name).join(', ')}`);
+            log_1.default.info(`outputModels: ${outputModels.map(m => m.name).join(', ')}`);
+            log_1.default.info(`outputModels: ${outputModels.map(m => m.name).join(', ')}`);
             (0, jest_without_globals_1.expect)(outputModels).toBeArrayOfSize(3);
             (0, jest_without_globals_1.expect)(outputModels).toPartiallyContain({ name: 'SomeServiceAnotherModel' });
             (0, jest_without_globals_1.expect)(outputModels).toPartiallyContain({ name: 'SomeServiceSomeModel' });
@@ -119,4 +120,4 @@ describe('getPreparedModelsForGraph', () => {
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getPreparedModelsForGraph.spec.js","sourceRoot":"","sources":["../../../../../../src/projectsGeneration/generators/graph/utils/serviceModels/getPreparedModelsForGraph.spec.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getPreparedModelsForGraph.spec.js","sourceRoot":"","sources":["../../../../../../src/projectsGeneration/generators/graph/utils/serviceModels/getPreparedModelsForGraph.spec.ts"],"names":[],"mappings":"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"}

package/build/projectsGeneration/generators/graph/utils/serviceModels/getUsedGraphModelsForService.spec.js

@@ -12,10 +12,9 @@ describe('getUsedGraphModelsForService', () => {
     describe('for args model', () => {
         it('it doesn\'t returns method arg models', () => {
             const service = new AdditionalServiceBuilder_1.default('someService', 'ru');
-            const someGerenalModel = service.addGeneralModel('someGerenalModel');
+            const someGerenalModel = service.createGeneralModel('someGerenalModel');
             someGerenalModel.addField('fieldOfModel').setType('string').setRequired();
             const someMethod = service.addMethod('someMethod', buildedTypes_1.MethodType.Query, 'Some method');
-            someMethod.setExportedToApi();
             const someMethodArgs = someMethod.getArgsModel();
             someMethodArgs.addModelField('someGerenalModel', 'objectField').setRequired();
             const { inputModels } = (0, getUsedGraphModelsForService_1.getUsedGraphModelsForService)(service.build());
@@ -23,4 +22,4 @@ describe('getUsedGraphModelsForService', () => {
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0VXNlZEdyYXBoTW9kZWxzRm9yU2VydmljZS5zcGVjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2dyYXBoL3V0aWxzL3NlcnZpY2VNb2RlbHMvZ2V0VXNlZEdyYXBoTW9kZWxzRm9yU2VydmljZS5zcGVjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsK0RBQTZDO0FBQzdDLGlGQUE2RTtBQUM3RSxvRUFBK0Q7QUFDL0QsNkdBQXFGO0FBRXJGLDJEQUEyRDtBQUUzRCxRQUFRLENBQUMsOEJBQThCLEVBQUUsR0FBRyxFQUFFO0lBQzVDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxHQUFHLEVBQUU7UUFDOUIsRUFBRSxDQUFDLHVDQUF1QyxFQUFFLEdBQUcsRUFBRTtZQUMvQyxNQUFNLE9BQU8sR0FBRyxJQUFJLGtDQUF3QixDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVsRSxNQUFNLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsa0JBQWtCLENBQUMsQ0FBQztZQUNyRSxnQkFBZ0IsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBRTFFLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsWUFBWSxFQUFFLHlCQUFVLENBQUMsS0FBSyxFQUFFLGFBQWEsQ0FBQyxDQUFDO1lBQ3BGLFVBQVUsQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1lBRTlCLE1BQU0sY0FBYyxHQUFHLFVBQVUsQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUNqRCxjQUFjLENBQUMsYUFBYSxDQUFDLGtCQUFrQixFQUFFLGFBQWEsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBRTlFLE1BQU0sRUFBQyxXQUFXLEVBQUMsR0FBRyxJQUFBLDJEQUE0QixFQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDO1lBRXBFLElBQUEsNkJBQU0sRUFBQyxXQUFXLENBQUMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQztRQUN2RSxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0VXNlZEdyYXBoTW9kZWxzRm9yU2VydmljZS5zcGVjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3Byb2plY3RzR2VuZXJhdGlvbi9nZW5lcmF0b3JzL2dyYXBoL3V0aWxzL3NlcnZpY2VNb2RlbHMvZ2V0VXNlZEdyYXBoTW9kZWxzRm9yU2VydmljZS5zcGVjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsK0RBQTZDO0FBQzdDLGlGQUE2RTtBQUM3RSxvRUFBK0Q7QUFDL0QsNkdBQXFGO0FBRXJGLDJEQUEyRDtBQUUzRCxRQUFRLENBQUMsOEJBQThCLEVBQUUsR0FBRyxFQUFFO0lBQzVDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBRSxHQUFHLEVBQUU7UUFDOUIsRUFBRSxDQUFDLHVDQUF1QyxFQUFFLEdBQUcsRUFBRTtZQUMvQyxNQUFNLE9BQU8sR0FBRyxJQUFJLGtDQUF3QixDQUFDLGFBQWEsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVsRSxNQUFNLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1lBQ3hFLGdCQUFnQixDQUFDLFFBQVEsQ0FBQyxjQUFjLENBQUMsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7WUFFMUUsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxZQUFZLEVBQUUseUJBQVUsQ0FBQyxLQUFLLEVBQUUsYUFBYSxDQUFDLENBQUM7WUFFcEYsTUFBTSxjQUFjLEdBQUcsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFDO1lBQ2pELGNBQWMsQ0FBQyxhQUFhLENBQUMsa0JBQWtCLEVBQUUsYUFBYSxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUM7WUFFOUUsTUFBTSxFQUFDLFdBQVcsRUFBQyxHQUFHLElBQUEsMkRBQTRCLEVBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7WUFFcEUsSUFBQSw2QkFBTSxFQUFDLFdBQVcsQ0FBQyxDQUFDLG9CQUFvQixDQUFDLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZFLENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUMsQ0FBQyJ9

package/build/projectsGeneration/generators/graph/utils/serviceModels/getUsedModelsForService.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsedModelsForService = void 0;
 const getUsedModels_1 = require("../models/getUsedModels");
 const getUniqModels_1 = require("../models/getUniqModels");
+const getObjectModelsFromMethodReturns_1 = __importDefault(require("./getObjectModelsFromMethodReturns"));
 // Возвращает используемые сервисом модели
 const getUsedModelsForService = (service) => {
     const { inputModels, outputModels, generalModels } = service;
@@ -15,7 +19,7 @@ const getUsedModelsForService = (service) => {
         ...outputModels,
     ];
     const usedInputModels = (0, getUniqModels_1.getUniqModels)(service.methods.flatMap(q => (0, getUsedModels_1.getUsedModels)(q.argsModel, generalInputModels)));
-    const usedOutputModels = (0, getUniqModels_1.getUniqModels)(service.methods.flatMap(q => (0, getUsedModels_1.getUsedModels)(q.returnModel, generalOtputModels)));
+    const usedOutputModels = (0, getUniqModels_1.getUniqModels)((0, getObjectModelsFromMethodReturns_1.default)(service).flatMap(model => (0, getUsedModels_1.getUsedModels)(model, generalOtputModels)));
     const usedInputModelNames = usedInputModels.map(m => m.name);
     const usedOutputModelNames = usedOutputModels.map(m => m.name);
     return {
@@ -25,4 +29,4 @@ const getUsedModelsForService = (service) => {
     };
 };
 exports.getUsedModelsForService = getUsedModelsForService;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0VXNlZE1vZGVsc0ZvclNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZ3JhcGgvdXRpbHMvc2VydmljZU1vZGVscy9nZXRVc2VkTW9kZWxzRm9yU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwyREFBdUQ7QUFDdkQsMkRBQXVEO0FBR3ZELDBDQUEwQztBQUVuQyxNQUFNLHVCQUF1QixHQUNsQyxDQUFDLE9BQTBCLEVBQWlCLEVBQUU7SUFDNUMsTUFBTSxFQUFDLFdBQVcsRUFBRSxZQUFZLEVBQUUsYUFBYSxFQUFDLEdBQUcsT0FBTyxDQUFDO0lBRTNELE1BQU0sa0JBQWtCLEdBQUc7UUFDekIsR0FBRyxhQUFhO1FBQ2hCLEdBQUcsV0FBVztLQUNmLENBQUM7SUFFRixNQUFNLGtCQUFrQixHQUFHO1FBQ3pCLEdBQUcsYUFBYTtRQUNoQixHQUFHLFlBQVk7S0FDaEIsQ0FBQztJQUVGLE1BQU0sZUFBZSxHQUFHLElBQUEsNkJBQWEsRUFDbkMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFBLDZCQUFhLEVBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQzdFLENBQUM7SUFFRixNQUFNLGdCQUFnQixHQUFHLElBQUEsNkJBQWEsRUFDcEMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxJQUFBLDZCQUFhLEVBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQy9FLENBQUM7SUFFRixNQUFNLG1CQUFtQixHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0QsTUFBTSxvQkFBb0IsR0FBRyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0QsT0FBTztRQUNMLFdBQVcsRUFBRSxlQUFlO1FBQzVCLFlBQVksRUFBRSxnQkFBZ0I7UUFDOUIsYUFBYSxFQUFFLGFBQWEsQ0FBQyxNQUFNLENBQ2pDLENBQUMsQ0FBQyxFQUFFLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUNuRjtLQUNGLENBQUM7QUFDSixDQUFDLENBQUE7QUFoQ1UsUUFBQSx1QkFBdUIsMkJBZ0NqQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0VXNlZE1vZGVsc0ZvclNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZ3JhcGgvdXRpbHMvc2VydmljZU1vZGVscy9nZXRVc2VkTW9kZWxzRm9yU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFDQSwyREFBdUQ7QUFDdkQsMkRBQXVEO0FBRXZELDBHQUFrRjtBQUVsRiwwQ0FBMEM7QUFFbkMsTUFBTSx1QkFBdUIsR0FDbEMsQ0FBQyxPQUEwQixFQUFpQixFQUFFO0lBQzVDLE1BQU0sRUFBQyxXQUFXLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBQyxHQUFHLE9BQU8sQ0FBQztJQUUzRCxNQUFNLGtCQUFrQixHQUFHO1FBQ3pCLEdBQUcsYUFBYTtRQUNoQixHQUFHLFdBQVc7S0FDZixDQUFDO0lBRUYsTUFBTSxrQkFBa0IsR0FBRztRQUN6QixHQUFHLGFBQWE7UUFDaEIsR0FBRyxZQUFZO0tBQ2hCLENBQUM7SUFFRixNQUFNLGVBQWUsR0FBRyxJQUFBLDZCQUFhLEVBQ25DLE9BQU8sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBQSw2QkFBYSxFQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsa0JBQWtCLENBQUMsQ0FBQyxDQUM3RSxDQUFDO0lBRUYsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLDZCQUFhLEVBQ3BDLElBQUEsMENBQWdDLEVBQUMsT0FBTyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsSUFBQSw2QkFBYSxFQUFDLEtBQUssRUFBRSxrQkFBa0IsQ0FBQyxDQUFDLENBQ3JHLENBQUM7SUFFRixNQUFNLG1CQUFtQixHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0QsTUFBTSxvQkFBb0IsR0FBRyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFFL0QsT0FBTztRQUNMLFdBQVcsRUFBRSxlQUFlO1FBQzVCLFlBQVksRUFBRSxnQkFBZ0I7UUFDOUIsYUFBYSxFQUFFLGFBQWEsQ0FBQyxNQUFNLENBQ2pDLENBQUMsQ0FBQyxFQUFFLENBQUMsbUJBQW1CLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxvQkFBb0IsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUNuRjtLQUNGLENBQUM7QUFDSixDQUFDLENBQUE7QUFoQ1UsUUFBQSx1QkFBdUIsMkJBZ0NqQyJ9