@autofleet/sheilta 1.3.8-beta.0 → 1.3.8-beta.1

package/lib/formatter/index.d.ts

@@ -24,8 +24,6 @@ declare const formatPayload: ({ order, page, perPage, include, query, attributes
     page: any;
     perPage: any;
     include: any;
-    scopes: (string | {
-        method: any[];
-    })[];
+    scopes: any[];
 };
 export default formatPayload;

package/lib/formatter/index.js

@@ -6,20 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const common_types_1 = require("@autofleet/common-types");
 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 } = common_types_1.customFields;
-const parseCustomFieldScopeQueryValue = (value) => {
-    if (typeof value === 'string') {
-        return value;
-    }
-    return Object.entries(value).map(([operator, conditionValue]) => ({
-        operator: operators_1.OPERATORS_TO_SQL[operator],
-        value: conditionValue,
-    }));
-};
+const { CUSTOM_FIELDS_FILTER_SCOPE, CUSTOM_FIELDS_SORT_SCOPE } = common_types_1.customFields;
 const getAttributeFromOrder = (order, options = {}) => {
     const { literalAttributes = [], DBFormatter = undefined } = options;
     const [formattedOrder, attributes] = order.reduce((acc, o) => {
@@ -36,20 +27,44 @@ const getAttributeFromOrder = (order, options = {}) => {
     }, [[], []]);
     return [formattedOrder, attributes];
 };
-const formatOrder = ({ order, associationModels = [], }) => 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 formatOrder = ({ order, associationModels = [], }) => {
+    const formattedOrders = [];
+    const orderScopesMap = new Map();
+    order.forEach((o) => {
+        if (o.startsWith(CUSTOM_FIELDS_QUERY_PREFIX) ||
+            o.substring(1).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,
+        orderScopes: Array.from(orderScopesMap.entries()).map(([scopeName, scopeValue]) => {
+            if (!scopeValue) {
+                return scopeName;
+            }
+            return { method: [scopeName, scopeValue] };
+        }),
+    };
+};
 const formatPage = page => page || utils_1.PAGE_DEFAULT;
 const formatPerPage = perPage => perPage || utils_1.PER_PAGE_DEFAULT;
 const formatInclude = (include, associationsMap = {}) => {
@@ -72,8 +87,7 @@ const formatQuery = (query, associationModels) => {
                 formattedScopeMap.set(CUSTOM_FIELDS_FILTER_SCOPE, {});
             }
             const scopeKey = queryItemKey.split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
-            formattedScopeMap.get(CUSTOM_FIELDS_FILTER_SCOPE)[scopeKey] =
-                parseCustomFieldScopeQueryValue(queryItemValue);
+            formattedScopeMap.get(CUSTOM_FIELDS_FILTER_SCOPE)[scopeKey] = queryItemValue;
             return;
         }
         const key = utils_1.isAttributeByAssociation(queryItemKey, associationModels)
@@ -103,17 +117,18 @@ const formatSearchTerm = (searchTerm, attributesToSend, rawAttributes) => ({
 });
 const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, attributes = null, searchTerm = null, }, model, options) => {
     const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
-    const formattedOrder = formatOrder({
+    const { formattedOrders, orderScopes } = formatOrder({
         order: [...order, DEFAULT_ORDER],
         associationModels,
     });
-    const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options);
+    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);
+    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);
@@ -125,6 +140,6 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
             ],
         };
     }
-    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, (formattedAttribute && { attributes: formattedAttribute }));
+    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: [...queryScopes, ...orderScopes] }, (formattedAttribute && { attributes: formattedAttribute }));
 };
 exports.default = formatPayload;

package/lib/operators/index.d.ts

@@ -1,20 +1,3 @@
 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/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',
@@ -22,23 +22,6 @@ exports.OPERATORS = [
     '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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.3.8-beta.0",
+  "version": "1.3.8-beta.1",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,23 +11,7 @@
     "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
-    }
+    "build-to-local-repo": "npm run build && cp -r lib/* ../task-ms/node_modules/$npm_package_name/lib"
   },
   "jest": {
     "setupTestFrameworkScriptFile": "jest-extended",
@@ -44,7 +28,7 @@
   },
   "homepage": "https://github.com/Autofleet/sheilta",
   "dependencies": {
-    "@autofleet/common-types": "^1.7.29",
+    "@autofleet/common-types": "^1.7.42",
     "@autofleet/errors": "^1.0.10",
     "joi": "^17.9.2",
     "lodash": "^4.17.21"