@autofleet/sheilta 1.3.8-beta.1 → 1.3.9

package/lib/formatter/index.js

@@ -6,11 +6,21 @@ 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, CUSTOM_FIELDS_SORT_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 getAttributeFromOrder = (order, options = {}) => {
     const { literalAttributes = [], DBFormatter = undefined } = options;
     const [formattedOrder, attributes] = order.reduce((acc, o) => {
@@ -31,8 +41,7 @@ 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 ([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, {});
             }
@@ -87,7 +96,8 @@ 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] = queryItemValue;
+            formattedScopeMap.get(CUSTOM_FIELDS_FILTER_SCOPE)[scopeKey] =
+                parseCustomFieldScopeQueryValue(queryItemValue);
             return;
         }
         const key = utils_1.isAttributeByAssociation(queryItemKey, associationModels)

package/lib/operators/index.d.ts

@@ -1,3 +1,20 @@
 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.OPERATOR_PREFIX = exports.OPERATORS = void 0;
+exports.formatOperators = exports.OPERATORS_TO_SQL = exports.OPERATOR_PREFIX = exports.OPERATORS = void 0;
 exports.OPERATORS = [
     'eq',
     'ne',
@@ -22,6 +22,23 @@ 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.1",
+  "version": "1.3.9",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,7 +11,23 @@
     "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/* ../task-ms/node_modules/$npm_package_name/lib"
+    "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
+    }
   },
   "jest": {
     "setupTestFrameworkScriptFile": "jest-extended",