@autofleet/sheilta 1.0.0-beta-test-4 → 1.0.0

package/lib/formatter/index.js

@@ -1,228 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateOrderReplacements = exports.generateFilterReplacements = void 0;
-const lodash_1 = __importDefault(require("lodash"));
-const common_types_1 = require("@autofleet/common-types");
+exports.formatOrder = void 0;
 const utils_1 = require("../utils");
-const operators_1 = require("../operators");
-const DEFAULT_ORDER = 'id';
 const DESCENDING_KEY = 'DESC';
-const ASCENDING_KEY = 'ASC';
-const CUSTOM_FIELDS_QUERY_PREFIX = 'customFields.';
-const { CUSTOM_FIELDS_FILTER_SCOPE, CUSTOM_FIELDS_SORT_SCOPE } = common_types_1.customFields;
-const parseCustomFieldScopeQueryValue = (value) => {
-    if (['string', 'number'].includes(typeof value) || Array.isArray(value)) {
-        return value;
+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 Object.entries(value).map(([operator, conditionValue]) => ({
-        operator: operators_1.OPERATORS_TO_SQL[operator],
-        value: conditionValue,
-    }));
-};
-const getAttributeFromOrder = (order, options = {}) => {
-    const { literalAttributes = [], DBFormatter = undefined } = options;
-    const [formattedOrder, attributes] = order.reduce((acc, o) => {
-        const [item, orderStyle = 'ASC'] = Array.isArray(o) ? o : [o];
-        const found = literalAttributes === null || literalAttributes === void 0 ? void 0 : literalAttributes.find(obj => obj.attribute === item);
-        if (found) {
-            acc[1].push(found.literal);
-            acc[0].push([DBFormatter ? DBFormatter(`"${found.attribute}" ${orderStyle}`) : `${found.attribute} ${orderStyle}`]);
-        }
-        else {
-            acc[0].push(o);
-        }
-        return acc;
-    }, [[], []]);
-    return [formattedOrder, attributes];
-};
-/**
- * Generates replacements for the given conditions.
- *
- * @param conditions - The conditions to generate replacements for.
- * @returns The replacements object.
- */
-exports.generateFilterReplacements = (conditions) => {
-    const replacements = {};
-    Object.entries(conditions).forEach(([key, condition]) => {
-        const replacementKey = utils_1.generateRandomString();
-        // eslint-disable-next-line prefer-destructuring
-        replacements[replacementKey] = key.split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
-        if (Array.isArray(condition)) {
-            condition.forEach((value) => {
-                const valueKey = utils_1.generateRandomString();
-                replacements[valueKey] = typeof value === 'string' ? value : value.value;
-            });
-        }
-        else if (typeof condition === 'string' || typeof condition === 'number') {
-            const conditionKey = utils_1.generateRandomString();
-            replacements[conditionKey] = condition;
-        }
-        else if (condition === null || condition === void 0 ? void 0 : condition.operator) {
-            const operatorKey = utils_1.generateRandomString();
-            replacements[operatorKey] = condition.value;
-        }
-    });
-    return replacements;
-};
-/**
- * Generates replacements for the given order array.
- *
- * @param order - The order array to generate replacements for.
- * @returns The replacements object.
- */
-exports.generateOrderReplacements = (order) => {
-    const replacementMap = {};
-    order.forEach((o) => {
-        if (o.startsWith(CUSTOM_FIELDS_QUERY_PREFIX)) {
-            const rand = utils_1.generateRandomString();
-            // eslint-disable-next-line prefer-destructuring
-            replacementMap[rand] = o.split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
-        }
-        else if (o.substring(1).startsWith(CUSTOM_FIELDS_QUERY_PREFIX)) {
-            const rand = utils_1.generateRandomString();
-            // eslint-disable-next-line prefer-destructuring
-            replacementMap[rand] = o.substring(1).split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
-        }
-    });
-    return replacementMap;
-};
-/**
- * Creates a combined replacement map from order and query.
- *
- * @param order - The order array.
- * @param query - The query object.
- * @returns The combined replacements object.
- */
-const createReplacementMap = (order, query) => (Object.assign(Object.assign({}, exports.generateOrderReplacements(order)), exports.generateFilterReplacements(query)));
-const formatOrder = ({ order, associationModels = [], replacementsMap = {}, }) => {
-    const formattedOrders = [];
-    const orderScopesMap = new Map();
-    order.forEach((o) => {
-        if ([o, o.substring(1)].some(t => t.startsWith(CUSTOM_FIELDS_QUERY_PREFIX))) {
-            if (!orderScopesMap.has(CUSTOM_FIELDS_SORT_SCOPE)) {
-                orderScopesMap.set(CUSTOM_FIELDS_SORT_SCOPE, {});
-            }
-            const scopeKey = o.split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
-            orderScopesMap.get(CUSTOM_FIELDS_SORT_SCOPE)[scopeKey] = (utils_1.isOrderDesc(o) ?
-                DESCENDING_KEY :
-                ASCENDING_KEY);
-            return;
-        }
-        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);
-        }
-        formattedOrders.push(formattedOrder);
-    });
-    return {
-        formattedOrders,
-        replacementsMap,
-        orderScopes: Array.from(orderScopesMap.entries()).map(([scopeName, scopeValue]) => {
-            if (!scopeValue) {
-                return scopeName;
-            }
-            return {
-                method: [scopeName, {
-                        replacementsMap,
-                        scopeValue,
-                    }],
-            };
-        }),
-    };
-};
-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) => {
-        var _a;
-        const includedAssociation = associationsMap[typeof i === 'string' ? i : (i.association || i.model)];
-        return Object.assign(Object.assign(Object.assign({}, i), { association: includedAssociation, required: i.required !== false }), (i.include && {
-            include: formatInclude(i.include, (_a = includedAssociation === null || includedAssociation === void 0 ? void 0 : includedAssociation.target) === null || _a === void 0 ? void 0 : _a.associations),
-        }));
-    });
-    formattedInclude = formattedInclude.map(i => lodash_1.default.omit(i, ['model']));
-    return formattedInclude;
-};
-const formatQuery = (query, associationModels, replacementsMap) => {
-    const formattedQuery = {};
-    const formattedScopeMap = new Map();
-    Object.entries(query).forEach(([queryItemKey, queryItemValue]) => {
-        if (queryItemKey.startsWith(CUSTOM_FIELDS_QUERY_PREFIX)) {
-            if (!formattedScopeMap.has(CUSTOM_FIELDS_FILTER_SCOPE)) {
-                formattedScopeMap.set(CUSTOM_FIELDS_FILTER_SCOPE, {});
-            }
-            const scopeKey = queryItemKey.split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
-            formattedScopeMap.get(CUSTOM_FIELDS_FILTER_SCOPE)[scopeKey] =
-                parseCustomFieldScopeQueryValue(queryItemValue);
-            return;
-        }
-        const key = utils_1.isAttributeByAssociation(queryItemKey, associationModels)
-            ? utils_1.wrapAttributeWithOperator(queryItemKey)
-            : queryItemKey;
-        formattedQuery[key] = queryItemValue;
-    });
-    const formattedScopes = Array.from(formattedScopeMap.entries()).map(([scopeName, scopeValue]) => {
-        if (!scopeValue) {
-            return scopeName;
-        }
-        return {
-            method: [scopeName, {
-                    replacementsMap,
-                    scopeValue,
-                }],
-        };
-    });
-    return {
-        formattedQuery,
-        formattedScopes,
-    };
-};
-const formatSearchTerm = (searchTerm, attributesToSend, rawAttributes) => ({
-    $and: searchTerm.split(' ').map(term => ({
-        $or: attributesToSend.filter(attrKey => rawAttributes[attrKey].type.key === 'STRING').map(attr => ({
-            [attr]: {
-                $iLike: `%${term}%`,
-            },
-        })),
-    })),
+    return [column];
 });
-const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, attributes = null, searchTerm = null, }, model, options) => {
-    const replacementsMap = createReplacementMap(order, query);
-    const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
-    const { formattedOrders, orderScopes } = formatOrder({
-        order: [...order, DEFAULT_ORDER],
-        associationModels,
-        replacementsMap,
-    });
-    const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrders, options);
-    const allAttributes = [...filteredLiteralAttributes, ...(attributes || [])];
-    const formattedAttribute = (attributes === null || attributes === void 0 ? void 0 : attributes.length) ? allAttributes : { include: allAttributes };
-    const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);
-    const formattedPage = formatPage(page);
-    const formattedPerPage = formatPerPage(perPage);
-    const result = formatQuery(query, associationModels, replacementsMap);
-    const queryScopes = result.formattedScopes;
-    let { formattedQuery } = result;
-    if (searchTerm && !(options === null || options === void 0 ? void 0 : options.skipSearchTermFormat)) {
-        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 Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: [...queryScopes, ...orderScopes] }, (formattedAttribute && { attributes: formattedAttribute }));
-};
-exports.default = formatPayload;
+//# sourceMappingURL=index.js.map

package/lib/formatter/index.js.map

@@ -0,0 +1 @@
+{"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

@@ -1,267 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = __importDefault(require("."));
+const _1 = require(".");
 describe('formatting test', () => {
-    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]}%`,
-                                        },
-                                    }],
-                            }],
-                    }],
-            }));
-        });
-    });
-    describe('order formatting', () => {
-        it('simple check', () => {
-            const { order } = _1.default({
-                order: ['startTime', '-endTime'],
-            });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime', 'DESC'], ['id']]));
-        });
-        it('simple check asc', () => {
-            const { order } = _1.default({
-                order: ['startTime', 'endTime'],
-            });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['startTime'], ['endTime'], ['id']]));
-        });
-        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'], ['id']]));
-        });
-        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'], ['id']]));
-        });
-        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'], ['id']]));
-        });
-        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'], ['id']]));
-        });
-        it('by literal field ascending', () => {
-            const literalAttribute = { attribute: 'genericField', literal: [{ 0: e => `${e}0` }] };
-            const { order, attributes } = _1.default({
-                order: [literalAttribute.attribute],
-            }, {
-                rawAttributes: {
-                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
-                },
-            }, {
-                literalAttributes: [literalAttribute],
-            });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} ASC`], ['id']]));
-            expect(JSON.stringify(attributes))
-                .toBe(JSON.stringify({ include: [literalAttribute.literal] }));
-        });
-        it('by literal field descending', () => {
-            const literalAttribute = { attribute: 'genericField', literal: ['void', 'field'] };
-            const { order, attributes } = _1.default({
-                order: [`-${literalAttribute.attribute}`, 'currencySymbol'],
-                attributes: ['endTime'],
-            }, {
-                rawAttributes: {
-                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
-                },
-            }, {
-                literalAttributes: [literalAttribute],
-            });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} DESC`], ['currencySymbol'], ['id']]));
-            expect(JSON.stringify(attributes))
-                .toBe(JSON.stringify([[literalAttribute.literal[0], literalAttribute.literal[1]], 'endTime']));
-        });
-        it('by literal field - not found', () => {
-            const literalAttribute = { attribute: 'genericField', literal: 'void' };
-            const { order, attributes } = _1.default({
-                order: [`-O${literalAttribute.attribute}`],
-            }, {
-                rawAttributes: {
-                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '',
-                },
-            }, {
-                literalAttributes: [literalAttribute],
-            });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([[`O${literalAttribute.attribute}`, 'DESC'], ['id']]));
-            expect(JSON.stringify(attributes)).toBe(JSON.stringify({ include: [] }));
+    it('check order formatting', () => {
+        const payload = _1.formatOrder({
+            order: ['startTime', '-endTime'],
         });
+        expect(JSON.stringify(payload)).toBe(JSON.stringify([['startTime'], ['endTime', 'DESC']]));
     });
-    describe('include formatting', () => {
-        it('include required should be true', () => {
-            const { include } = _1.default({
-                order: [],
-                include: [{
-                        model: 'status',
-                    }],
-            }, {
-                associations: {
-                    status: {},
-                },
-            });
-            expect(include[0].required).toBe(true);
-        });
-        it('include required should be false', () => {
-            const { include } = _1.default({
-                order: [],
-                include: [{
-                        model: 'status',
-                        required: false,
-                    }],
-            }, {
-                associations: {
-                    status: {},
-                },
-            });
-            expect(include[0].required).toBe(false);
+    it('check order formatting', () => {
+        const payload = _1.formatOrder({
+            order: ['startTime', 'endTime'],
         });
+        expect(JSON.stringify(payload)).toBe(JSON.stringify([['startTime'], ['endTime']]));
     });
 });
+//# sourceMappingURL=index.test.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -6,3 +6,4 @@ 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/index.js.map

@@ -0,0 +1 @@
+{"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

@@ -8,41 +8,19 @@ 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 = exports.newQueryFormatMiddleware = exports.newQueryValidationMiddleware = void 0;
+exports.queryFormatMiddleware = exports.queryValidationMiddleware = void 0;
 const errors_1 = require("@autofleet/errors");
-const joi_1 = require("joi");
-const formatter_1 = __importDefault(require("../formatter"));
+const formatter_1 = require("../formatter");
 const validations_1 = require("../validations");
-const querySchema = joi_1.object({
-    query: joi_1.object(),
-    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()),
-    searchTerm: joi_1.string(),
-    enrichments: joi_1.array().items(joi_1.string()),
-});
-exports.newQueryValidationMiddleware = (inner = 'body') => (model, options = {}) => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-    const { query, attributes, order, page, perPage, include, enrichments, } = req[inner];
+exports.queryValidationMiddleware = model => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    const { query, attributes, order, } = req.body;
     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,
-            enrichments,
-        }, model, options);
+        }, model);
         return next();
     }
     catch (error) {
@@ -57,36 +35,12 @@ exports.newQueryValidationMiddleware = (inner = 'body') => (model, options = {})
         });
     }
 });
-exports.newQueryFormatMiddleware = (inner = 'body') => (model, options = {}) => (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, scopes: formattedScopes, attributes: formattedAttribute, } = formatter_1.default({
-        query,
+exports.queryFormatMiddleware = () => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
+    const { order, } = req.body;
+    const formattedOrder = formatter_1.formatOrder({
         order,
-        page,
-        perPage,
-        include,
-        attributes,
-        searchTerm,
-    }, model, options);
-    req[inner].query = formattedQuery;
-    req[inner].order = formattedOrder;
-    req[inner].attributes = formattedAttribute;
-    req[inner].page = formattedPage;
-    req[inner].perPage = formattedPerPage;
-    req[inner].include = formattedInclude;
-    req[inner].scopes = formattedScopes;
-    if (options.includeRawPayload) {
-        req[inner].rawPayload = {
-            order,
-            page,
-            perPage,
-            include,
-            query,
-            attributes,
-            searchTerm,
-        };
-    }
+    });
+    req.body.order = formattedOrder;
     return next();
 });
-exports.queryValidationMiddleware = exports.newQueryValidationMiddleware();
-exports.queryFormatMiddleware = exports.newQueryFormatMiddleware();
+//# sourceMappingURL=index.js.map

package/lib/middleware/index.js.map

@@ -0,0 +1 @@
+{"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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatOperators = exports.OPERATORS_TO_SQL = exports.OPERATOR_PREFIX = exports.OPERATORS = void 0;
+exports.formatOperators = exports.OPERATOR_PREFIX = exports.OPERATORS = void 0;
 exports.OPERATORS = [
     'eq',
     'ne',
@@ -13,37 +13,16 @@ exports.OPERATORS = [
     'notIn',
     'is',
     'like',
-    'iLike',
     'notLike',
     'between',
     'and',
     'or',
-    'overlap',
-    'contains',
 ];
 exports.OPERATOR_PREFIX = '$';
-exports.OPERATORS_TO_SQL = {
-    $eq: '=',
-    $ne: '!=',
-    $gte: '>=',
-    $gt: '>',
-    $lte: '<=',
-    $lt: '<',
-    $not: 'NOT',
-    $in: 'IN',
-    $notIn: 'NOT IN',
-    $is: 'IS',
-    $like: 'LIKE',
-    $iLike: 'ILIKE',
-    $notLike: 'NOT LIKE',
-    $and: 'AND',
-    $or: 'OR',
-};
 exports.formatOperators = (Sequelize) => {
     const { Op } = Sequelize;
-    return exports.OPERATORS.reduce((map, o) => {
-        // eslint-disable-next-line no-param-reassign
-        map[`${exports.OPERATOR_PREFIX + o}`] = Op[o];
-        return map;
-    }, {});
+    return exports.OPERATORS.map(o => ({
+        [`${exports.OPERATOR_PREFIX + o}`]: Op[o],
+    }));
 };
+//# sourceMappingURL=index.js.map

package/lib/operators/index.js.map

@@ -0,0 +1 @@
+{"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

@@ -1,36 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateRandomString = 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");
-const randomInt = max => Math.floor(Math.random() * Math.floor(max));
+exports.isOrderDesc = exports.extractAttributeNameFromOrder = exports.ORDER_PREFIX = void 0;
 exports.ORDER_PREFIX = '-';
-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.extractAttributeNameFromOrder = (order) => order.split(exports.ORDER_PREFIX)[1];
 exports.isOrderDesc = (order) => order.includes(exports.ORDER_PREFIX);
-exports.throwBadRequestError = (message) => {
-    throw new errors_1.BadRequest([{ message }], null);
-};
-exports.extractAssociatedAttributeNameFromOrder = (order) => order.split(exports.ASSOCIATION_PREFIX)[1];
-exports.generateRandomString = (length = 5) => {
-    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
-    return Array.from({ length }, () => characters.charAt(randomInt(characters.length))).join('');
-};
+//# sourceMappingURL=utils.js.map

package/lib/utils.js.map

@@ -0,0 +1 @@
+{"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

@@ -4,108 +4,56 @@ 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 = [], associationModels = []) => [...modelAttributes, ...associationModels]
-    .includes(attribute.includes(utils_1.ASSOCIATION_PREFIX)
-    ? attribute.split(utils_1.ASSOCIATION_PREFIX)[0] : attribute);
-const validateSingleOrder = (currentOrder, rawAttributes, associationModels, options = {}) => {
-    var _a, _b;
+const validateQueryAttribute = (attribute, modelAttributes) => modelAttributes.includes(attribute);
+const validateSingleOrder = (currentOrder, rawAttributes) => {
     const isOrderDescOrder = utils_1.isOrderDesc(currentOrder);
     if (isOrderDescOrder && currentOrder[0] !== utils_1.ORDER_PREFIX) {
-        utils_1.throwBadRequestError(`${utils_1.ORDER_PREFIX} must be only at the beginning of the word`);
+        throw new errors_1.BadRequest(`${utils_1.ORDER_PREFIX} must be only at the beginning of the word`, 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);
-    const isLiteralAttribute = (_b = (_a = options === null || options === void 0 ? void 0 : options.literalAttributes) === null || _a === void 0 ? void 0 : _a.map(la => la.attribute)) === null || _b === void 0 ? void 0 : _b.includes(orderStringWithoutDesc);
-    if (!isOrderAssociation && formattedOrderString.includes(utils_1.ASSOCIATION_PREFIX)) {
-        [formattedOrderString] = formattedOrderString.split(utils_1.ASSOCIATION_PREFIX);
-    }
-    if (!(rawAttributes.includes(formattedOrderString) || isOrderAssociation || isLiteralAttribute)) {
-        utils_1.throwBadRequestError(`${currentOrder} is invalid. isLiteralAttribute: ${isLiteralAttribute}`);
+    const formattedOrderString = isOrderDescOrder ?
+        utils_1.extractAttributeNameFromOrder(currentOrder) :
+        currentOrder;
+    if (!rawAttributes.includes(formattedOrderString)) {
+        throw new errors_1.BadRequest(`${currentOrder} is invalid`, null);
     }
 };
 const validateSingleAttribute = (currentAttribute, rawAttributes) => {
     if (!rawAttributes.includes(currentAttribute)) {
-        utils_1.throwBadRequestError(`${currentAttribute} is invalid`);
+        throw new errors_1.BadRequest(`${currentAttribute} is invalid`, null);
     }
 };
-const validateOrderAttributes = (order, rawAttributes, associationModels = [], options = {}) => {
-    order.map(o => validateSingleOrder(o, rawAttributes, associationModels, options));
+const validateOrderAttributes = (order, rawAttributes) => {
+    order.map(o => validateSingleOrder(o, rawAttributes));
 };
 const validateAttributes = (attributes, rawAttributes) => {
     attributes.map(a => validateSingleAttribute(a, rawAttributes));
 };
-const validateEnrichments = (enrichments, options) => {
-    if (!(enrichments === null || enrichments === void 0 ? void 0 : enrichments.length)) {
-        return;
-    }
-    const invalidEnrichment = enrichments
-        .find(enrichment => { var _a; return !((_a = options === null || options === void 0 ? void 0 : options.enrichmentAttributes) === null || _a === void 0 ? void 0 : _a.includes(enrichment)); });
-    if (invalidEnrichment) {
-        utils_1.throwBadRequestError(`enrichment attribute ${invalidEnrichment} is invalid`);
-    }
-};
-const validateQueryPayload = (query, rawAttributes, associationModels = []) => {
+const validateQueryPayload = (query, rawAttributes) => {
     // eslint-disable-next-line array-callback-return
     Object.keys(query).map((key) => {
         const value = query[key];
-        if (Array.isArray(value)) {
+        if (lodash_1.default.isArray(value)) {
             if (lodash_1.default.isObject(value[0])) {
-                value.map(v => validateQueryPayload(v, rawAttributes, associationModels));
+                value.map(v => validateQueryPayload(v, rawAttributes));
             }
         }
-        else if (validateOperator(key)
-            || validateQueryAttribute(key, rawAttributes, associationModels)) {
+        else if (validateOperator(key) || validateQueryAttribute(key, rawAttributes)) {
             if (lodash_1.default.isObject(value)) {
                 validateQueryPayload(value, rawAttributes);
             }
         }
         else {
-            utils_1.throwBadRequestError(`invalid key: ${key}`);
+            throw new errors_1.BadRequest(`invalid key: ${key}`, null);
         }
     });
 };
-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;
-        const attributeKeys = Object.keys(rawAttributes);
-        if (i.where) {
-            validateQueryPayload(i.where, attributeKeys);
-        }
-        if (i.order) {
-            validateOrderAttributes(i.order, attributeKeys);
-        }
-        if (i.attributes) {
-            validateAttributes(i.attributes, attributeKeys);
-        }
-        if (!lodash_1.default.isNil(i.required) && !lodash_1.default.isBoolean(i.required)) {
-            utils_1.throwBadRequestError('include.required must be a boolean');
-        }
-    });
-};
-exports.validatePayload = ({ query = {}, order = [], attributes = [], include = [], page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, enrichments = [], }, model, options = {}) => {
-    const rawAttributes = Object.keys(model.rawAttributes);
-    const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
+exports.validatePayload = ({ query = {}, order = [], attributes = [], }, model) => {
+    const { rawAttributes } = model;
     if (!attributes || attributes.length === 0) {
         // eslint-disable-next-line no-param-reassign
         attributes = rawAttributes;
@@ -113,18 +61,8 @@ exports.validatePayload = ({ query = {}, order = [], attributes = [], include =
     else {
         validateAttributes(attributes, rawAttributes);
     }
-    validateOrderAttributes(order, rawAttributes, associationModels, options);
-    validateQueryPayload(query, rawAttributes, associationModels);
-    validateEnrichments(enrichments, options);
-    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,
-    });
+    validateOrderAttributes(order, rawAttributes);
+    validateQueryPayload(query, rawAttributes);
     return true;
 };
+//# sourceMappingURL=index.js.map

package/lib/validations/index.js.map

@@ -0,0 +1 @@
+{"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

@@ -38,182 +38,29 @@ const query = {
 };
 const order = ['startTime', '-endTime'];
 describe('validations test', () => {
-    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 query validation', () => {
+        const payload = _1.validatePayload({ query }, { rawAttributes: ['startTime', 'endTime', 'currencySymbol', 'currencyCode', 'startStationId'] });
+        expect(payload).toBe(true);
     });
-    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);
-            }
-        });
-        it('try order by literal field that exist', () => {
-            const literalAttribute = { attribute: 'genericField', literal: 'void' };
-            const payload = _1.validatePayload({ order: [literalAttribute.attribute] }, {
-                rawAttributes: {
-                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', status: '',
-                },
-            }, {
-                literalAttributes: [literalAttribute],
-            });
-            expect(payload).toBe(true);
-        });
-        it('try order by literal field that exist - desc', () => {
-            const literalAttribute = { attribute: 'genericField', literal: 'void' };
-            const payload = _1.validatePayload({ order: [`-${literalAttribute.attribute}`] }, {
-                rawAttributes: {
-                    startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', status: '',
-                },
-            }, {
-                literalAttributes: [literalAttribute],
-            });
-            expect(payload).toBe(true);
-        });
-        it('try order by literal field that doesnt exist', () => {
-            const literalAttribute = { attribute: 'genericField', literal: 'void' };
-            try {
-                _1.validatePayload({ order: ['here'] }, {
-                    rawAttributes: {
-                        startTime: '', endTime: '', currencySymbol: '', currencyCode: '', startStationId: '', status: '',
-                    },
-                }, { literalAttributes: [literalAttribute] });
-            }
-            catch (error) {
-                expect(error.statusCode).toBe(400);
-            }
-        });
+    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);
+        }
+    });
+    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);
+        }
     });
 });
+//# sourceMappingURL=index.test.js.map

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

@@ -0,0 +1 @@
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.0.0-beta-test-4",
+  "version": "1.0.0",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -10,24 +10,7 @@
     "coverage": "jest --coverage --forceExit --runInBand",
     "test": "jest --forceExit --runInBand",
     "test-auto": "jest --watch --runInBand",
-    "linter": "./node_modules/.bin/eslint src/**/*.ts",
-    "build-to-local-repo": "npm run build && cp -r lib/* ../$REPO/node_modules/$npm_package_name/lib",
-    "watch": "npm-watch build-to-local-repo"
-  },
-  "watch": {
-    "build-to-local-repo": {
-      "extensions": [
-        "js",
-        "jsx",
-        "ts",
-        "tsx",
-        "css"
-      ],
-      "patterns": [
-        "src"
-      ],
-      "quiet": false
-    }
+    "linter": "./node_modules/.bin/eslint src/**/*.ts"
   },
   "jest": {
     "setupTestFrameworkScriptFile": "jest-extended",
@@ -44,24 +27,21 @@
   },
   "homepage": "https://github.com/Autofleet/sheilta",
   "dependencies": {
-    "@autofleet/common-types": "^1.7.42",
     "@autofleet/errors": "^1.0.10",
-    "joi": "^17.9.2",
+    "@types/node": "^14.14.20",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/jest": "^24.9.0",
-    "@types/node": "^16.11.68",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.23.0",
+    "typescript": "^3.9.5",
     "eslint": "^6.8.0",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-plugin-import": "^2.20.1",
-    "jest": "^25.1.0",
-    "ts-jest": "^25.0.0",
-    "typescript": "^3.9.5",
+    "@typescript-eslint/eslint-plugin": "^2.34.0",
+    "@typescript-eslint/parser": "^2.23.0",
     "typescript-eslint": "0.0.1-alpha.0",
-    "npm-watch": "^0.13.0"
+    "ts-jest": "^25.0.0",
+    "jest": "^25.1.0",
+    "@types/jest": "^24.9.0"
   },
   "files": [
     "lib/**/*"

package/lib/formatter/index.d.ts

@@ -1,48 +0,0 @@
-import type { LiteralAttribute } from '../middleware';
-declare type OrderItem = string | [string, string];
-declare type SequelizeOrder = string | OrderItem[];
-export declare type FormatPayloadOptions = {
-    includeRawPayload?: boolean;
-    literalAttributes?: LiteralAttribute[];
-    DBFormatter?: any;
-    skipSearchTermFormat?: boolean;
-};
-declare type ConditionWithOperator = {
-    operator: string;
-    value: string;
-};
-export declare type ConditionValue = ConditionWithOperator | ConditionWithOperator[] | string | string[];
-/**
- * Generates replacements for the given conditions.
- *
- * @param conditions - The conditions to generate replacements for.
- * @returns The replacements object.
- */
-export declare const generateFilterReplacements: (conditions: Record<string, ConditionValue>) => Record<string, string>;
-/**
- * Generates replacements for the given order array.
- *
- * @param order - The order array to generate replacements for.
- * @returns The replacements object.
- */
-export declare const generateOrderReplacements: (order: string[]) => Record<string, string>;
-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, options?: any) => {
-    attributes: any[] | {
-        include: any[];
-    };
-    query: {};
-    order: SequelizeOrder[];
-    page: any;
-    perPage: any;
-    include: any;
-    scopes: any[];
-};
-export default formatPayload;

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

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

package/lib/index.d.ts

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

package/lib/middleware/index.d.ts

@@ -1,16 +0,0 @@
-import { FormatPayloadOptions } from '../formatter';
-declare type literal = any;
-declare type LiteralQuery = (literal | string)[] | literal;
-export declare type LiteralAttribute = {
-    attribute: string;
-    literal: LiteralQuery;
-};
-export declare type MiddlewareValidationOption = {
-    literalAttributes?: LiteralAttribute[];
-    enrichmentAttributes?: string[];
-};
-export declare const newQueryValidationMiddleware: (inner?: string) => (model: any, options?: MiddlewareValidationOption) => (req: any, res: any, next: any) => Promise<void>;
-export declare const newQueryFormatMiddleware: (inner?: string) => (model: any, options?: FormatPayloadOptions) => (req: any, res: any, next: any) => Promise<void>;
-export declare const queryValidationMiddleware: (model: any, options?: MiddlewareValidationOption) => (req: any, res: any, next: any) => Promise<void>;
-export declare const queryFormatMiddleware: (model: any, options?: FormatPayloadOptions) => (req: any, res: any, next: any) => Promise<void>;
-export {};

package/lib/operators/index.d.ts

@@ -1,20 +0,0 @@
-export declare const OPERATORS: string[];
-export declare const OPERATOR_PREFIX = "$";
-export declare const OPERATORS_TO_SQL: {
-    $eq: string;
-    $ne: string;
-    $gte: string;
-    $gt: string;
-    $lte: string;
-    $lt: string;
-    $not: string;
-    $in: string;
-    $notIn: string;
-    $is: string;
-    $like: string;
-    $iLike: string;
-    $notLike: string;
-    $and: string;
-    $or: string;
-};
-export declare const formatOperators: (Sequelize: any) => {};

package/lib/utils.d.ts

@@ -1,14 +0,0 @@
-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;
-export declare const generateRandomString: (length?: number) => string;

package/lib/validations/index.d.ts

@@ -1,10 +0,0 @@
-import type { MiddlewareValidationOption } from '../middleware';
-export declare const validatePayload: ({ query, order, attributes, include, page, perPage, enrichments, }: {
-    query?: {};
-    order?: any[];
-    attributes?: any[];
-    include?: any[];
-    page?: number;
-    perPage?: number;
-    enrichments?: any[];
-}, model?: any, options?: MiddlewareValidationOption) => boolean;

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

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