@autofleet/sheilta 1.3.11 → 1.4.0-beta.1

package/lib/formatter/index.d.ts

@@ -7,6 +7,19 @@ export declare type FormatPayloadOptions = {
     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.
+ * @param name - The model type name used to join custom_field_definitions.
+ * @returns The replacements object.
+ */
+export declare const generateFilterReplacements: (conditions: Record<string, ConditionValue>) => Record<string, string>;
 declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
     order?: any[];
     page?: number;

package/lib/formatter/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateFilterReplacements = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const common_types_1 = require("@autofleet/common-types");
 const utils_1 = require("../utils");
@@ -37,7 +38,61 @@ const getAttributeFromOrder = (order, options = {}) => {
     }, [[], []]);
     return [formattedOrder, attributes];
 };
-const formatOrder = ({ order, associationModels = [], }) => {
+/**
+ * Generates replacements for the given conditions.
+ *
+ * @param conditions - The conditions to generate replacements for.
+ * @param name - The model type name used to join custom_field_definitions.
+ * @returns The replacements object.
+ */
+exports.generateFilterReplacements = (conditions) => {
+    const replacements = {};
+    console.log('sheilta - conditions:', conditions);
+    Object.entries(conditions).forEach(([key, condition]) => {
+        const replacemetKey = utils_1.generateRandomString();
+        replacements[replacemetKey] = `${key.split(CUSTOM_FIELDS_QUERY_PREFIX)[1]}`;
+        if (Array.isArray(condition)) {
+            condition.forEach((value) => {
+                if (typeof value === 'string') {
+                    const valRandom = utils_1.generateRandomString();
+                    replacements[`${valRandom}`] = `${value}`;
+                }
+                else {
+                    const valRep = utils_1.generateRandomString();
+                    replacements[valRep] = `${value.value}`;
+                }
+            });
+        }
+        else if (typeof condition === 'string') {
+            const conditionRep = utils_1.generateRandomString();
+            replacements[conditionRep] = `${condition}`;
+        }
+        else if (condition === null || condition === void 0 ? void 0 : condition.operator) {
+            const valueRep = utils_1.generateRandomString();
+            replacements[valueRep] = `${condition.value}`;
+        }
+    });
+    return replacements;
+};
+const createReplacementMap = (order, query) => {
+    const replacementMap = {};
+    order.forEach((o) => {
+        if (o.startsWith(CUSTOM_FIELDS_QUERY_PREFIX)) {
+            const rand = utils_1.generateRandomString();
+            replacementMap[o.split(CUSTOM_FIELDS_QUERY_PREFIX)[1]] = rand;
+        }
+        else if (o.substring(1).startsWith(CUSTOM_FIELDS_QUERY_PREFIX)) {
+            const rand = utils_1.generateRandomString();
+            replacementMap[o.substring(1).split(CUSTOM_FIELDS_QUERY_PREFIX)[1]] = rand;
+        }
+    });
+    console.log('🐶');
+    console.log('query:', query);
+    const queryReplacements = exports.generateFilterReplacements(query);
+    console.log('queryReplacements:', queryReplacements);
+    return Object.assign(Object.assign({}, replacementMap), queryReplacements);
+};
+const formatOrder = ({ order, associationModels = [], replacementsMap = {}, }) => {
     const formattedOrders = [];
     const orderScopesMap = new Map();
     order.forEach((o) => {
@@ -66,11 +121,17 @@ const formatOrder = ({ order, associationModels = [], }) => {
     });
     return {
         formattedOrders,
+        replacementsMap,
         orderScopes: Array.from(orderScopesMap.entries()).map(([scopeName, scopeValue]) => {
             if (!scopeValue) {
                 return scopeName;
             }
-            return { method: [scopeName, scopeValue] };
+            return {
+                method: [scopeName, {
+                        replacementsMap,
+                        scopeValue,
+                    }],
+            };
         }),
     };
 };
@@ -87,7 +148,7 @@ const formatInclude = (include, associationsMap = {}) => {
     formattedInclude = formattedInclude.map(i => lodash_1.default.omit(i, ['model']));
     return formattedInclude;
 };
-const formatQuery = (query, associationModels) => {
+const formatQuery = (query, associationModels, replacementsMap) => {
     const formattedQuery = {};
     const formattedScopeMap = new Map();
     Object.entries(query).forEach(([queryItemKey, queryItemValue]) => {
@@ -109,7 +170,12 @@ const formatQuery = (query, associationModels) => {
         if (!scopeValue) {
             return scopeName;
         }
-        return { method: [scopeName, scopeValue] };
+        return {
+            method: [scopeName, {
+                    replacementsMap,
+                    scopeValue,
+                }],
+        };
     });
     return {
         formattedQuery,
@@ -126,10 +192,12 @@ 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 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 || [])];
@@ -137,7 +205,7 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
     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 result = formatQuery(query, associationModels, replacementsMap);
     const queryScopes = result.formattedScopes;
     let { formattedQuery } = result;
     if (searchTerm && !(options === null || options === void 0 ? void 0 : options.skipSearchTermFormat)) {
@@ -150,6 +218,12 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
             ],
         };
     }
+    console.log('🐶');
+    console.log('scopes:', [...orderScopes, ...queryScopes]);
+    [...orderScopes, ...queryScopes].map((scope) => {
+        console.log('scope:', scope.method[0]);
+        console.log('scope:', scope.method[1]);
+    });
     return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: [...queryScopes, ...orderScopes] }, (formattedAttribute && { attributes: formattedAttribute }));
 };
 exports.default = formatPayload;

package/lib/utils.d.ts

@@ -11,3 +11,4 @@ export declare const extractAttributeNameFromOrder: (order: any, associationMode
 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/utils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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 node_crypto_1 = require("node:crypto");
 exports.ORDER_PREFIX = '-';
 exports.ASSOCIATION_PREFIX = '.';
 exports.PER_PAGE_DEFAULT = 20;
@@ -29,3 +30,7 @@ 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(node_crypto_1.randomInt(characters.length))).join('');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.3.11",
+  "version": "1.4.0-beta.1",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,7 +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",
+    "build-to-local-repo": "npm run build && cp -r lib/* ../task-ms/node_modules/@autofleet/sheilta/lib",
     "watch": "npm-watch build-to-local-repo"
   },
   "watch": {