@autofleet/sheilta 1.4.0-beta.1 → 1.4.0-beta.2

package/lib/formatter/index.d.ts

@@ -16,10 +16,16 @@ export declare type ConditionValue = ConditionWithOperator | ConditionWithOperat
  * 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>;
+/**
+ * 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;

package/lib/formatter/index.js

@@ -3,7 +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;
+exports.generateOrderReplacements = exports.generateFilterReplacements = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const common_types_1 = require("@autofleet/common-types");
 const utils_1 = require("../utils");
@@ -42,56 +42,55 @@ const getAttributeFromOrder = (order, options = {}) => {
  * 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]}`;
+        const replacementKey = utils_1.generateRandomString();
+        replacements[replacementKey] = 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}`;
-                }
+                const valueKey = utils_1.generateRandomString();
+                replacements[valueKey] = typeof value === 'string' ? value : value.value;
             });
         }
         else if (typeof condition === 'string') {
-            const conditionRep = utils_1.generateRandomString();
-            replacements[conditionRep] = `${condition}`;
+            const conditionKey = utils_1.generateRandomString();
+            replacements[conditionKey] = condition;
         }
         else if (condition === null || condition === void 0 ? void 0 : condition.operator) {
-            const valueRep = utils_1.generateRandomString();
-            replacements[valueRep] = `${condition.value}`;
+            const operatorKey = utils_1.generateRandomString();
+            replacements[operatorKey] = condition.value;
         }
     });
     return replacements;
 };
-const createReplacementMap = (order, query) => {
+/**
+ * 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();
-            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;
-        }
+    order.forEach((item) => {
+        const itemKey = item.startsWith(CUSTOM_FIELDS_QUERY_PREFIX)
+            ? item.split(CUSTOM_FIELDS_QUERY_PREFIX)[1]
+            : item.substring(1).split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
+        const randomValue = utils_1.generateRandomString();
+        replacementMap[itemKey] = randomValue;
     });
-    console.log('🐶');
-    console.log('query:', query);
-    const queryReplacements = exports.generateFilterReplacements(query);
-    console.log('queryReplacements:', queryReplacements);
-    return Object.assign(Object.assign({}, replacementMap), queryReplacements);
+    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();
@@ -218,12 +217,6 @@ 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.js

@@ -1,9 +1,9 @@
 "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 node_crypto_1 = require("node:crypto");
 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.4.0-beta.1",
+  "version": "1.4.0-beta.2",
   "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/* ../task-ms/node_modules/@autofleet/sheilta/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": {