@autofleet/sheilta 1.0.0 → 1.0.1-aaron-test

package/lib/formatter/index.d.ts

@@ -0,0 +1,18 @@
+declare type OrderItem = string | [string, string];
+declare type SequelizeOrder = string | OrderItem[];
+declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
+    order: any;
+    page?: number;
+    perPage?: number;
+    include?: any[];
+    query?: {};
+    attributes?: any;
+    searchTerm?: any;
+}, model?: any) => {
+    query: {};
+    order: SequelizeOrder[];
+    page: any;
+    perPage: any;
+    include: any;
+};
+export default formatPayload;

package/lib/formatter/index.js

@@ -1,15 +1,70 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatOrder = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../utils");
 const DESCENDING_KEY = 'DESC';
-exports.formatOrder = ({ order = [], }) => order.map((o) => {
-    const isOrderDescOrder = utils_1.isOrderDesc(o);
-    let column = o;
-    if (isOrderDescOrder) {
-        column = utils_1.extractAttributeNameFromOrder(o);
-        return [column, DESCENDING_KEY];
-    }
-    return [column];
+const formatOrder = ({ order = [], associationModels = [], }) => (order.length === 0 ? undefined :
+    order.map((o) => {
+        const formattedOrder = [utils_1.extractAttributeNameFromOrder(o, associationModels)];
+        const isOrderDescOrder = utils_1.isOrderDesc(o);
+        const isOrderAssociation = utils_1.isAttributeByAssociation(isOrderDescOrder
+            ? o.split(utils_1.ORDER_PREFIX)[1]
+            : o, associationModels);
+        if (isOrderAssociation) {
+            formattedOrder.push(utils_1.extractAssociatedAttributeNameFromOrder(o));
+        }
+        if (isOrderDescOrder) {
+            formattedOrder.push(DESCENDING_KEY);
+        }
+        return formattedOrder;
+    }));
+const formatPage = page => page || utils_1.PAGE_DEFAULT;
+const formatPerPage = perPage => perPage || utils_1.PER_PAGE_DEFAULT;
+const formatInclude = (include, associationsMap = {}) => {
+    let formattedInclude = include.map(i => (Object.assign(Object.assign({}, i), { association: associationsMap[i.association || i.model], required: i.required !== 'false' })));
+    formattedInclude = formattedInclude.map(i => lodash_1.default.omit(i, ['model']));
+    return formattedInclude;
+};
+const formatQuery = (query, associationModels) => Object.keys(query).reduce((acc, queryItemKey) => (Object.assign(Object.assign({}, acc), { [utils_1.isAttributeByAssociation(queryItemKey, associationModels)
+        ? utils_1.wrapAttributeWithOperator(queryItemKey) : queryItemKey]: query[queryItemKey] })), {});
+const formatSearchTerm = (searchTerm, attributesToSend, rawAttributes) => ({
+    $and: searchTerm.split(' ').map(term => ({
+        $or: attributesToSend.filter(attrKey => rawAttributes[attrKey].type.key === 'STRING').map(attr => ({
+            [attr]: {
+                $iLike: `%${term}%`,
+            },
+        })),
+    })),
 });
-//# sourceMappingURL=index.js.map
+const formatPayload = ({ order, page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, attributes = null, searchTerm = null, }, model) => {
+    const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
+    const formattedOrder = formatOrder({
+        order,
+        associationModels,
+    });
+    const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);
+    const formattedPage = formatPage(page);
+    const formattedPerPage = formatPerPage(perPage);
+    let formattedQuery = formatQuery(query, associationModels);
+    if (searchTerm) {
+        const attributesToSend = (attributes === null || attributes === void 0 ? void 0 : attributes.length) ? attributes : Object.keys(model.rawAttributes);
+        const queryWithSearchTerm = formatSearchTerm(searchTerm, attributesToSend, model.rawAttributes);
+        formattedQuery = lodash_1.default.isEmpty(formattedQuery) ? queryWithSearchTerm : {
+            $and: [
+                formattedQuery,
+                queryWithSearchTerm,
+            ],
+        };
+    }
+    return {
+        query: formattedQuery,
+        order: formattedOrder,
+        page: formattedPage,
+        perPage: formattedPerPage,
+        include: formattedInclude,
+    };
+};
+exports.default = formatPayload;

package/lib/formatter/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/formatter/index.test.js

@@ -1,18 +1,193 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = require(".");
+const _1 = __importDefault(require("."));
 describe('formatting test', () => {
-    it('check order formatting', () => {
-        const payload = _1.formatOrder({
-            order: ['startTime', '-endTime'],
+    describe('query formatting', () => {
+        it('query json field', () => {
+            const { query } = _1.default({
+                order: [],
+                query: {
+                    'json.field': {
+                        $gt: 4,
+                    },
+                },
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', json: '',
+                },
+            });
+            expect(JSON.stringify(query)).toBe(JSON.stringify({ 'json.field': { $gt: 4 } }));
+        });
+        it('query included model field', () => {
+            const { query } = _1.default({
+                order: [],
+                query: {
+                    'status.field': {
+                        $gt: 4,
+                    },
+                },
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+                associations: {
+                    status: {},
+                },
+            });
+            expect(JSON.stringify(query)).toBe(JSON.stringify({ '$status.field$': { $gt: 4 } }));
+        });
+        it('query with searchTerm', () => {
+            const searchTerm = 'aviv';
+            const { query } = _1.default({
+                order: [],
+                query: {
+                    'json.field': {
+                        $gt: 4,
+                    },
+                },
+                searchTerm,
+            }, {
+                rawAttributes: {
+                    startTime: {
+                        type: {
+                            key: 'STRING',
+                        },
+                    },
+                    endTime: {
+                        type: {
+                            key: 'NUMBER',
+                        },
+                    },
+                },
+            });
+            expect(JSON.stringify(query)).toBe(JSON.stringify({
+                $and: [{ 'json.field': { $gt: 4 } }, {
+                        $and: [{
+                                $or: [
+                                    {
+                                        startTime: {
+                                            $iLike: `%${searchTerm}%`,
+                                        },
+                                    },
+                                ],
+                            }],
+                    }],
+            }));
+        });
+        it('query with searchTerm with spaces', () => {
+            const searchTerm = 'aviv good guy';
+            const splitSearch = searchTerm.split(' ');
+            const { query } = _1.default({
+                order: [],
+                query: {
+                    'json.field': {
+                        $gt: 4,
+                    },
+                },
+                searchTerm,
+            }, {
+                rawAttributes: {
+                    startTime: {
+                        type: {
+                            key: 'STRING',
+                        },
+                    },
+                    endTime: {
+                        type: {
+                            key: 'NUMBER',
+                        },
+                    },
+                },
+            });
+            expect(JSON.stringify(query)).toBe(JSON.stringify({
+                $and: [{ 'json.field': { $gt: 4 } }, {
+                        $and: [{
+                                $or: [
+                                    {
+                                        startTime: {
+                                            $iLike: `%${splitSearch[0]}%`,
+                                        },
+                                    }
+                                ],
+                            }, {
+                                $or: [{
+                                        startTime: {
+                                            $iLike: `%${splitSearch[1]}%`,
+                                        },
+                                    }],
+                            },
+                            {
+                                $or: [{
+                                        startTime: {
+                                            $iLike: `%${splitSearch[2]}%`,
+                                        },
+                                    }],
+                            }],
+                    }],
+            }));
         });
-        expect(JSON.stringify(payload)).toBe(JSON.stringify([['startTime'], ['endTime', 'DESC']]));
     });
-    it('check order formatting', () => {
-        const payload = _1.formatOrder({
-            order: ['startTime', 'endTime'],
+    describe('order formatting', () => {
+        it('simple check', () => {
+            const { order } = _1.default({
+                order: ['startTime', '-endTime'],
+            });
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime', 'DESC']]));
+        });
+        it('simple check asc', () => {
+            const { order } = _1.default({
+                order: ['startTime', 'endTime'],
+            });
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime']]));
+        });
+        it('by included model', () => {
+            const { order } = _1.default({
+                order: ['status.name'],
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+                associations: {
+                    status: {},
+                },
+            });
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status', 'name']]));
+        });
+        it('by included model descending', () => {
+            const { order } = _1.default({
+                order: ['-status.name'],
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+                associations: {
+                    status: {},
+                },
+            });
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status', 'name', 'DESC']]));
+        });
+        it('by json field', () => {
+            const { order } = _1.default({
+                order: ['status.name'],
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', json: '',
+                },
+            });
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status.name']]));
+        });
+        it('by json field descending', () => {
+            const { order } = _1.default({
+                order: ['-status.name'],
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', json: '',
+                },
+            });
+            expect(JSON.stringify(order)).toBe(JSON.stringify([['status.name', 'DESC']]));
         });
-        expect(JSON.stringify(payload)).toBe(JSON.stringify([['startTime'], ['endTime']]));
     });
 });
-//# sourceMappingURL=index.test.js.map

package/lib/index.d.ts

@@ -0,0 +1,3 @@
+import { formatOperators } from './operators';
+import { queryFormatMiddleware, queryValidationMiddleware } from './middleware';
+export { formatOperators, queryFormatMiddleware, queryValidationMiddleware, };

package/lib/index.js

@@ -6,4 +6,3 @@ Object.defineProperty(exports, "formatOperators", { enumerable: true, get: funct
 const middleware_1 = require("./middleware");
 Object.defineProperty(exports, "queryFormatMiddleware", { enumerable: true, get: function () { return middleware_1.queryFormatMiddleware; } });
 Object.defineProperty(exports, "queryValidationMiddleware", { enumerable: true, get: function () { return middleware_1.queryValidationMiddleware; } });
-//# sourceMappingURL=index.js.map

package/lib/middleware/index.d.ts

@@ -0,0 +1,4 @@
+export declare const newQueryValidationMiddleware: (inner?: string) => (model: any) => (req: any, res: any, next: any) => Promise<any>;
+export declare const newQueryFormatMiddleware: (inner?: string) => (model: any) => (req: any, res: any, next: any) => Promise<any>;
+export declare const queryValidationMiddleware: (model: any) => (req: any, res: any, next: any) => Promise<any>;
+export declare const queryFormatMiddleware: (model: any) => (req: any, res: any, next: any) => Promise<any>;

package/lib/middleware/index.js

@@ -8,18 +8,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.queryFormatMiddleware = exports.queryValidationMiddleware = void 0;
+exports.queryFormatMiddleware = exports.queryValidationMiddleware = exports.newQueryFormatMiddleware = exports.newQueryValidationMiddleware = void 0;
 const errors_1 = require("@autofleet/errors");
-const formatter_1 = require("../formatter");
+const joi_1 = require("joi");
+const formatter_1 = __importDefault(require("../formatter"));
 const validations_1 = require("../validations");
-exports.queryValidationMiddleware = model => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    const { query, attributes, order, } = req.body;
+const querySchema = joi_1.object({
+    query: joi_1.any(),
+    attributes: joi_1.array().items(joi_1.string()),
+    order: joi_1.array().items(joi_1.string()),
+    page: joi_1.number(),
+    perPage: joi_1.number(),
+    include: joi_1.array().items(joi_1.any()),
+});
+exports.newQueryValidationMiddleware = (inner = 'body') => model => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    const { query, attributes, order, page, perPage, include, } = req[inner];
     try {
+        const result = querySchema.validate(req[inner]);
+        if (result.error) {
+            throw new errors_1.BadRequest([result.error], null);
+        }
         validations_1.validatePayload({
             query,
             attributes,
             order,
+            page,
+            perPage,
+            include,
         }, model);
         return next();
     }
@@ -35,12 +54,23 @@ exports.queryValidationMiddleware = model => (req, res, next) => __awaiter(void
         });
     }
 });
-exports.queryFormatMiddleware = () => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    const { order, } = req.body;
-    const formattedOrder = formatter_1.formatOrder({
+exports.newQueryFormatMiddleware = (inner = 'body') => model => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    const { order, page, perPage, include, query, attributes, searchTerm, } = req[inner];
+    const { query: formattedQuery, order: formattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, } = formatter_1.default({
+        query,
         order,
-    });
-    req.body.order = formattedOrder;
+        page,
+        perPage,
+        include,
+        attributes,
+        searchTerm,
+    }, model);
+    req[inner].query = formattedQuery;
+    req[inner].order = formattedOrder;
+    req[inner].page = formattedPage;
+    req[inner].perPage = formattedPerPage;
+    req[inner].include = formattedInclude;
     return next();
 });
-//# sourceMappingURL=index.js.map
+exports.queryValidationMiddleware = exports.newQueryValidationMiddleware();
+exports.queryFormatMiddleware = exports.newQueryFormatMiddleware();

package/lib/operators/index.d.ts

@@ -0,0 +1,3 @@
+export declare const OPERATORS: string[];
+export declare const OPERATOR_PREFIX = "$";
+export declare const formatOperators: (Sequelize: any) => {};

package/lib/operators/index.js

@@ -13,16 +13,20 @@ exports.OPERATORS = [
     'notIn',
     'is',
     'like',
+    'iLike',
     'notLike',
     'between',
     'and',
     'or',
+    'overlap',
+    'contains',
 ];
 exports.OPERATOR_PREFIX = '$';
 exports.formatOperators = (Sequelize) => {
     const { Op } = Sequelize;
-    return exports.OPERATORS.map(o => ({
-        [`${exports.OPERATOR_PREFIX + o}`]: Op[o],
-    }));
+    return exports.OPERATORS.reduce((map, o) => {
+        // eslint-disable-next-line no-param-reassign
+        map[`${exports.OPERATOR_PREFIX + o}`] = Op[o];
+        return map;
+    }, {});
 };
-//# sourceMappingURL=index.js.map

package/lib/utils.d.ts

@@ -0,0 +1,13 @@
+export declare const ORDER_PREFIX = "-";
+export declare const ASSOCIATION_PREFIX = ".";
+export declare const PER_PAGE_DEFAULT = 20;
+export declare const PAGE_DEFAULT = 1;
+export declare const PER_PAGE_MAX_LIMIT = 100;
+export declare const PER_PAGE_MIN_LIMIT = 1;
+export declare const PAGE_MIN = 1;
+export declare const wrapAttributeWithOperator: (attribute: any) => string;
+export declare const isAttributeByAssociation: (attributeName: any, associatedModels: any) => boolean;
+export declare const extractAttributeNameFromOrder: (order: any, associationModels: any) => string;
+export declare const isOrderDesc: (order: any) => boolean;
+export declare const throwBadRequestError: (message: string) => never;
+export declare const extractAssociatedAttributeNameFromOrder: (order: any) => string;

package/lib/utils.js

@@ -1,7 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOrderDesc = exports.extractAttributeNameFromOrder = exports.ORDER_PREFIX = void 0;
+exports.extractAssociatedAttributeNameFromOrder = exports.throwBadRequestError = exports.isOrderDesc = exports.extractAttributeNameFromOrder = exports.isAttributeByAssociation = exports.wrapAttributeWithOperator = exports.PAGE_MIN = exports.PER_PAGE_MIN_LIMIT = exports.PER_PAGE_MAX_LIMIT = exports.PAGE_DEFAULT = exports.PER_PAGE_DEFAULT = exports.ASSOCIATION_PREFIX = exports.ORDER_PREFIX = void 0;
+const errors_1 = require("@autofleet/errors");
+const operators_1 = require("./operators");
 exports.ORDER_PREFIX = '-';
-exports.extractAttributeNameFromOrder = (order) => order.split(exports.ORDER_PREFIX)[1];
+exports.ASSOCIATION_PREFIX = '.';
+exports.PER_PAGE_DEFAULT = 20;
+exports.PAGE_DEFAULT = 1;
+exports.PER_PAGE_MAX_LIMIT = 100;
+exports.PER_PAGE_MIN_LIMIT = 1;
+exports.PAGE_MIN = 1;
+exports.wrapAttributeWithOperator = attribute => `${operators_1.OPERATOR_PREFIX}${attribute}${operators_1.OPERATOR_PREFIX}`;
+exports.isAttributeByAssociation = (attributeName, associatedModels) => attributeName.includes(exports.ASSOCIATION_PREFIX)
+    && associatedModels.includes(attributeName.split(exports.ASSOCIATION_PREFIX)[0]);
+exports.extractAttributeNameFromOrder = (order, associationModels) => {
+    let formattedOrder = order;
+    if (order.includes(exports.ORDER_PREFIX)) {
+        // eslint-disable-next-line prefer-destructuring
+        formattedOrder = formattedOrder.split(exports.ORDER_PREFIX)[1];
+    }
+    if (exports.isAttributeByAssociation(formattedOrder, associationModels)) {
+        [formattedOrder] = formattedOrder.split(exports.ASSOCIATION_PREFIX);
+    }
+    return formattedOrder;
+};
 exports.isOrderDesc = (order) => order.includes(exports.ORDER_PREFIX);
-//# sourceMappingURL=utils.js.map
+exports.throwBadRequestError = (message) => {
+    throw new errors_1.BadRequest([{ message }], null);
+};
+exports.extractAssociatedAttributeNameFromOrder = (order) => order.split(exports.ASSOCIATION_PREFIX)[1];

package/lib/validations/index.d.ts

@@ -0,0 +1,8 @@
+export declare const validatePayload: ({ query, order, attributes, include, page, perPage, }: {
+    query?: {};
+    order?: any[];
+    attributes?: any[];
+    include?: any[];
+    page?: number;
+    perPage?: number;
+}, model?: any) => boolean;

package/lib/validations/index.js

@@ -4,56 +4,95 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePayload = void 0;
-const errors_1 = require("@autofleet/errors");
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../utils");
 const operators_1 = require("../operators");
 const validateOperator = (operator) => operators_1.OPERATORS.includes(operator.split(operators_1.OPERATOR_PREFIX)[1]);
-const validateQueryAttribute = (attribute, modelAttributes) => modelAttributes.includes(attribute);
-const validateSingleOrder = (currentOrder, rawAttributes) => {
+const validateQueryAttribute = (attribute, modelAttributes = [], associationModels = []) => [...modelAttributes, ...associationModels]
+    .includes(attribute.includes(utils_1.ASSOCIATION_PREFIX)
+    ? attribute.split(utils_1.ASSOCIATION_PREFIX)[0] : attribute);
+const validateSingleOrder = (currentOrder, rawAttributes, associationModels) => {
     const isOrderDescOrder = utils_1.isOrderDesc(currentOrder);
     if (isOrderDescOrder && currentOrder[0] !== utils_1.ORDER_PREFIX) {
-        throw new errors_1.BadRequest(`${utils_1.ORDER_PREFIX} must be only at the beginning of the word`, null);
+        utils_1.throwBadRequestError(`${utils_1.ORDER_PREFIX} must be only at the beginning of the word`);
     }
-    const formattedOrderString = isOrderDescOrder ?
-        utils_1.extractAttributeNameFromOrder(currentOrder) :
-        currentOrder;
-    if (!rawAttributes.includes(formattedOrderString)) {
-        throw new errors_1.BadRequest(`${currentOrder} is invalid`, null);
+    const orderStringWithoutDesc = isOrderDescOrder ?
+        currentOrder.split(utils_1.ORDER_PREFIX)[1] : currentOrder;
+    const isOrderAssociation = utils_1.isAttributeByAssociation(orderStringWithoutDesc, associationModels);
+    let formattedOrderString = utils_1.extractAttributeNameFromOrder(currentOrder, associationModels);
+    if (!isOrderAssociation && formattedOrderString.includes(utils_1.ASSOCIATION_PREFIX)) {
+        [formattedOrderString] = formattedOrderString.split(utils_1.ASSOCIATION_PREFIX);
+    }
+    if (!(rawAttributes.includes(formattedOrderString) || isOrderAssociation)) {
+        utils_1.throwBadRequestError(`${currentOrder} is invalid`);
     }
 };
 const validateSingleAttribute = (currentAttribute, rawAttributes) => {
     if (!rawAttributes.includes(currentAttribute)) {
-        throw new errors_1.BadRequest(`${currentAttribute} is invalid`, null);
+        utils_1.throwBadRequestError(`${currentAttribute} is invalid`);
     }
 };
-const validateOrderAttributes = (order, rawAttributes) => {
-    order.map(o => validateSingleOrder(o, rawAttributes));
+const validateOrderAttributes = (order, rawAttributes, associationModels = []) => {
+    order.map(o => validateSingleOrder(o, rawAttributes, associationModels));
 };
 const validateAttributes = (attributes, rawAttributes) => {
     attributes.map(a => validateSingleAttribute(a, rawAttributes));
 };
-const validateQueryPayload = (query, rawAttributes) => {
+const validateQueryPayload = (query, rawAttributes, associationModels = []) => {
     // eslint-disable-next-line array-callback-return
     Object.keys(query).map((key) => {
         const value = query[key];
         if (lodash_1.default.isArray(value)) {
             if (lodash_1.default.isObject(value[0])) {
-                value.map(v => validateQueryPayload(v, rawAttributes));
+                value.map(v => validateQueryPayload(v, rawAttributes, associationModels));
             }
         }
-        else if (validateOperator(key) || validateQueryAttribute(key, rawAttributes)) {
+        else if (validateOperator(key)
+            || validateQueryAttribute(key, rawAttributes, associationModels)) {
             if (lodash_1.default.isObject(value)) {
                 validateQueryPayload(value, rawAttributes);
             }
         }
         else {
-            throw new errors_1.BadRequest(`invalid key: ${key}`, null);
+            utils_1.throwBadRequestError(`invalid key: ${key}`);
+        }
+    });
+};
+const validatePagination = ({ page, perPage, }) => {
+    if (page < utils_1.PAGE_MIN) {
+        utils_1.throwBadRequestError('Page must be greater than 0');
+    }
+    if (perPage > utils_1.PER_PAGE_MAX_LIMIT || perPage < utils_1.PER_PAGE_MIN_LIMIT) {
+        utils_1.throwBadRequestError(`PerPage must be between ${utils_1.PER_PAGE_MIN_LIMIT} to ${utils_1.PER_PAGE_MAX_LIMIT}`);
+    }
+};
+const validateIncludePayload = (include, associations) => {
+    const associationsKeys = Object.keys(associations);
+    include.forEach((i) => {
+        var _a;
+        validateQueryAttribute(i.model, associationsKeys);
+        const target = (_a = associations[i.model]) === null || _a === void 0 ? void 0 : _a.target;
+        if (!target) {
+            utils_1.throwBadRequestError('model not found in associations');
+        }
+        const { rawAttributes } = target;
+        if (include.where) {
+            validateQueryPayload(i.where, rawAttributes);
+        }
+        if (include.order) {
+            validateOrderAttributes(i.order, rawAttributes);
+        }
+        if (include.attributes) {
+            validateAttributes(i.attributes, rawAttributes);
+        }
+        if (!lodash_1.default.isNil(include.required) && !lodash_1.default.isBoolean(include.required)) {
+            utils_1.throwBadRequestError('include.required must be a boolean');
         }
     });
 };
-exports.validatePayload = ({ query = {}, order = [], attributes = [], }, model) => {
-    const { rawAttributes } = model;
+exports.validatePayload = ({ query = {}, order = [], attributes = [], include = [], page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, }, model) => {
+    const rawAttributes = Object.keys(model.rawAttributes);
+    const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
     if (!attributes || attributes.length === 0) {
         // eslint-disable-next-line no-param-reassign
         attributes = rawAttributes;
@@ -61,8 +100,17 @@ exports.validatePayload = ({ query = {}, order = [], attributes = [], }, model)
     else {
         validateAttributes(attributes, rawAttributes);
     }
-    validateOrderAttributes(order, rawAttributes);
-    validateQueryPayload(query, rawAttributes);
+    validateOrderAttributes(order, rawAttributes, associationModels);
+    validateQueryPayload(query, rawAttributes, associationModels);
+    if (include.length && typeof include === 'object') {
+        validateIncludePayload(include, model === null || model === void 0 ? void 0 : model.associations);
+    }
+    else if (include && typeof include !== 'object') {
+        utils_1.throwBadRequestError('include must be an array');
+    }
+    validatePagination({
+        page,
+        perPage,
+    });
     return true;
 };
-//# sourceMappingURL=index.js.map

package/lib/validations/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/validations/index.test.js

@@ -38,29 +38,147 @@ const query = {
 };
 const order = ['startTime', '-endTime'];
 describe('validations test', () => {
-    it('check query validation', () => {
-        const payload = _1.validatePayload({ query }, { rawAttributes: ['startTime', 'endTime', 'currencySymbol', 'currencyCode', 'startStationId'] });
-        expect(payload).toBe(true);
-    });
-    it('check order validation', () => {
-        const payload = _1.validatePayload({ order }, { rawAttributes: ['startTime', 'endTime', 'currencySymbol', 'currencyCode', 'startStationId'] });
-        expect(payload).toBe(true);
-    });
-    it('check order validation - order does not exist', () => {
-        try {
-            _1.validatePayload({ order: ['aviv'] }, { rawAttributes: ['startTime', 'endTime', 'currencySymbol', 'currencyCode', 'startStationId'] });
-        }
-        catch (error) {
-            expect(error.statusCode).toBe(400);
-        }
+    describe('query validation', () => {
+        it('check query validation', () => {
+            const payload = _1.validatePayload({ query }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('check query by json property field', () => {
+            const payload = _1.validatePayload({
+                query: {
+                    'jsonField.exampleField': {
+                        $eq: 'a',
+                    },
+                },
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', jsonField: {},
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('check query by included model field', () => {
+            const payload = _1.validatePayload({
+                query: {
+                    'status.name': {
+                        $eq: 'a',
+                    },
+                },
+            }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+                associations: {
+                    status: {},
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('check query by non existent field', () => {
+            try {
+                _1.validatePayload({
+                    query: {
+                        nonExistent: {
+                            $eq: 'a',
+                        },
+                    },
+                }, {
+                    rawAttributes: {
+                        startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                    },
+                });
+            }
+            catch (error) {
+                expect(error.statusCode).toBe(400);
+            }
+        });
     });
-    it('check order validation - prefix in the wrong place', () => {
-        try {
-            _1.validatePayload({ order: ['startTime-', 'currencySymbol'] }, { rawAttributes: ['startTime', 'endTime', 'currencySymbol', 'currencyCode', 'startStationId'] });
-        }
-        catch (error) {
-            expect(error.statusCode).toBe(400);
-        }
+    describe('order validation', () => {
+        it('check order validation', () => {
+            const payload = _1.validatePayload({ order }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('order does not exist', () => {
+            try {
+                _1.validatePayload({ order: ['aviv'] }, {
+                    rawAttributes: {
+                        startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                    },
+                });
+            }
+            catch (error) {
+                expect(error.statusCode).toBe(400);
+            }
+        });
+        it('prefix in the wrong place', () => {
+            try {
+                _1.validatePayload({ order: ['startTime-', 'currencySymbol'] }, {
+                    rawAttributes: {
+                        startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                    },
+                });
+            }
+            catch (error) {
+                expect(error.statusCode).toBe(400);
+            }
+        });
+        it('order by included model', () => {
+            const payload = _1.validatePayload({ order: ['status.title'] }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+                associations: {
+                    status: {},
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('order by included model descending', () => {
+            const payload = _1.validatePayload({ order: ['-status.title'] }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
+                },
+                associations: {
+                    status: {},
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('order by json field', () => {
+            const payload = _1.validatePayload({ order: ['status.title'] }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', status: '',
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('order by json field desc', () => {
+            const payload = _1.validatePayload({ order: ['-status.title'] }, {
+                rawAttributes: {
+                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', status: '',
+                },
+            });
+            expect(payload).toBe(true);
+        });
+        it('try order by json field that doesnt exist', () => {
+            try {
+                _1.validatePayload({ order: ['-stas.title'] }, {
+                    rawAttributes: {
+                        startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', status: '',
+                    },
+                });
+            }
+            catch (error) {
+                expect(error.statusCode).toBe(400);
+            }
+        });
     });
 });
-//# sourceMappingURL=index.test.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.0.0",
+  "version": "1.0.1-aaron-test",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,19 +29,20 @@
   "dependencies": {
     "@autofleet/errors": "^1.0.10",
     "@types/node": "^14.14.20",
+    "joi": "^17.9.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "typescript": "^3.9.5",
+    "@types/jest": "^24.9.0",
+    "@typescript-eslint/eslint-plugin": "^2.34.0",
+    "@typescript-eslint/parser": "^2.23.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-plugin-import": "^2.20.1",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.23.0",
-    "typescript-eslint": "0.0.1-alpha.0",
-    "ts-jest": "^25.0.0",
     "jest": "^25.1.0",
-    "@types/jest": "^24.9.0"
+    "ts-jest": "^25.0.0",
+    "typescript": "^3.9.5",
+    "typescript-eslint": "0.0.1-alpha.0"
   },
   "files": [
     "lib/**/*"

package/lib/formatter/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/formatter/index.ts"],"names":[],"mappings":";;;AAAA,oCAAsE;AAEtE,MAAM,cAAc,GAAG,MAAM,CAAC;AAIjB,QAAA,WAAW,GAAG,CAAC,EAC1B,KAAK,GAAG,EAAE,GACX,EAAoB,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAS,EAAkB,EAAE;IAC9D,MAAM,gBAAgB,GAAG,mBAAW,CAAC,CAAC,CAAC,CAAC;IACxC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,IAAI,gBAAgB,EAAE;QACpB,MAAM,GAAG,qCAA6B,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;KACjC;IAED,OAAO,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/lib/formatter/index.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/formatter/index.test.ts"],"names":[],"mappings":";;AAAA,wBAAgC;AAEhC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,OAAO,GAAG,cAAW,CAAC;YAC1B,KAAK,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC;SACjC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,OAAO,GAAG,cAAW,CAAC;YAC1B,KAAK,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;SAChC,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,2CAA8C;AAO5C,gGAPO,2BAAe,OAOP;AANjB,6CAGsB;AAIpB,sGANA,kCAAqB,OAMA;AACrB,0GANA,sCAAyB,OAMA"}

package/lib/middleware/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAgD;AAChD,4CAA2C;AAC3C,gDAAiD;AAEpC,QAAA,yBAAyB,GAAG,KAAK,CAAC,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAgB,EAAE;IACvF,MAAM,EACJ,KAAK,EACL,UAAU,EACV,KAAK,GACN,GAAG,GAAG,CAAC,IAAI,CAAC;IAEb,IAAI;QACF,6BAAe,CAAC;YACd,KAAK;YACL,UAAU;YACV,KAAK;SACN,EAAE,KAAK,CAAC,CAAC;QAEV,OAAO,IAAI,EAAE,CAAC;KACf;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,oBAAW,CAAC,KAAK,EAAE,GAAG,EAAE;YAC7B,OAAO,EAAE,2BAA2B;YACpC,OAAO,EAAE;gBACP,KAAK;gBACL,KAAK;gBACL,UAAU;gBACV,KAAK;aACN;SACF,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC;AAGW,QAAA,qBAAqB,GAAG,GAAG,EAAE,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,IAAI,EAAgB,EAAE;IAChF,MAAM,EACJ,KAAK,GACN,GAAG,GAAG,CAAC,IAAI,CAAC;IAEb,MAAM,cAAc,GAAG,uBAAW,CAAC;QACjC,KAAK;KACN,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC;IAChC,OAAO,IAAI,EAAE,CAAC;AAChB,CAAC,CAAA,CAAC"}

package/lib/operators/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/operators/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,SAAS,GAAG;IACvB,IAAI;IACJ,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,KAAK;IACL,IAAI;IACJ,OAAO;IACP,IAAI;IACJ,MAAM;IACN,SAAS;IACT,SAAS;IACT,KAAK;IACL,IAAI;CACL,CAAC;AAEW,QAAA,eAAe,GAAG,GAAG,CAAC;AAEtB,QAAA,eAAe,GAAG,CAAC,SAAS,EAAE,EAAE;IAC3C,MAAM,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC;IACzB,OAAO,iBAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACzB,CAAC,GAAG,uBAAe,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;KAClC,CAAC,CAAC,CAAC;AACN,CAAC,CAAC"}

package/lib/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,GAAG,CAAC;AAEnB,QAAA,6BAA6B,GAAG,CAAC,KAAK,EAAU,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAEhF,QAAA,WAAW,GAAG,CAAC,KAAK,EAAW,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,oBAAY,CAAC,CAAC"}

package/lib/validations/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validations/index.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA+C;AAC/C,oDAAuB;AACvB,oCAAoF;AACpF,4CAA0D;AAG1D,MAAM,gBAAgB,GAAG,CAAC,QAAgB,EAAW,EAAE,CACrD,qBAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,2BAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzD,MAAM,sBAAsB,GACxB,CAAC,SAAiB,EAAE,eAAyB,EAAW,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;AAEnG,MAAM,mBAAmB,GAAG,CAAC,YAAoB,EAAE,aAAuB,EAAQ,EAAE;IAClF,MAAM,gBAAgB,GAAG,mBAAW,CAAC,YAAY,CAAC,CAAC;IACnD,IAAI,gBAAgB,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,oBAAY,EAAE;QACxD,MAAM,IAAI,mBAAU,CAAC,GAAG,oBAAY,4CAA4C,EAAE,IAAI,CAAC,CAAC;KACzF;IAED,MAAM,oBAAoB,GAC1B,gBAAgB,CAAC,CAAC;QAChB,qCAA6B,CAAC,YAAY,CAAC,CAAC,CAAC;QAC7C,YAAY,CAAC;IAEf,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE;QACjD,MAAM,IAAI,mBAAU,CAAC,GAAG,YAAY,aAAa,EAAE,IAAI,CAAC,CAAC;KAC1D;AACH,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,gBAAwB,EAAE,aAAuB,EAAQ,EAAE;IAC1F,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;QAC7C,MAAM,IAAI,mBAAU,CAAC,GAAG,gBAAgB,aAAa,EAAE,IAAI,CAAC,CAAC;KAC9D;AACH,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,KAAe,EAAE,aAAuB,EAAQ,EAAE;IACjF,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,UAAoB,EAAE,aAAuB,EAAQ,EAAE;IACjF,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AAGF,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,aAAa,EAAQ,EAAE;IAC1D,iDAAiD;IACjD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACpB,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;gBACxB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;aACxD;SACF;aAAM,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,sBAAsB,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE;YAC9E,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACrB,oBAAoB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;aAC5C;SACF;aAAM;YACL,MAAM,IAAI,mBAAU,CAAC,gBAAgB,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;SACnD;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAGW,QAAA,eAAe,GAAG,CAAC,EAC9B,KAAK,GAAG,EAAE,EACV,KAAK,GAAG,EAAE,EACV,UAAU,GAAG,EAAE,GAChB,EAAE,KAAK,EAAW,EAAE;IACnB,MAAM,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAChC,IAAI,CAAC,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1C,6CAA6C;QAC7C,UAAU,GAAG,aAAa,CAAC;KAC5B;SAAM;QACL,kBAAkB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;KAC/C;IAED,uBAAuB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC9C,oBAAoB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/lib/validations/index.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/validations/index.test.ts"],"names":[],"mappings":";;AAAA,wBAAoC;AAEpC,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE;QACJ;YACE,SAAS,EAAE;gBACT,IAAI,EAAE,qBAAqB;aAC5B;SACF;QACD;YACE,OAAO,EAAE;gBACP,GAAG,EAAE,qBAAqB;aAC3B;SACF;KACF;IACD,GAAG,EAAE;QACH;YACE,IAAI,EAAE;gBACJ;oBACE,cAAc,EAAE;wBACd,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC;qBAChB;iBACF;gBACD;oBACE,YAAY,EAAE;wBACZ,GAAG,EAAE,KAAK;qBACX;iBACF;aACF;SACF;QACD;YACE,cAAc,EAAE;gBACd,GAAG,EAAE,GAAG;aACT;SACF;KACF;CACF,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AAExC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,OAAO,GAAG,kBAAe,CAC7B,EAAE,KAAK,EAAE,EACT,EAAE,aAAa,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAAE,CAChG,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,OAAO,GAAG,kBAAe,CAC7B,EAAE,KAAK,EAAE,EACT,EAAE,aAAa,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAAE,CAChG,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,IAAI;YACF,kBAAe,CACb,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,EACnB,EAAE,aAAa,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAAE,CAChG,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;QAC5D,IAAI;YACF,kBAAe,CACb,EAAE,KAAK,EAAE,CAAC,YAAY,EAAE,gBAAgB,CAAC,EAAE,EAC3C,EAAE,aAAa,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,CAAC,EAAE,CAChG,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}