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

package/lib/formatter/index.d.ts

@@ -16,15 +16,10 @@ 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[];

package/lib/formatter/index.js

@@ -42,54 +42,52 @@ 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 replacementKey = utils_1.generateRandomString();
-        replacements[replacementKey] = key.split(CUSTOM_FIELDS_QUERY_PREFIX)[1];
+        const replacemetKey = utils_1.generateRandomString();
+        replacements[replacemetKey] = `${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;
+                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 conditionKey = utils_1.generateRandomString();
-            replacements[conditionKey] = condition;
+            const conditionRep = utils_1.generateRandomString();
+            replacements[conditionRep] = `${condition}`;
         }
         else if (condition === null || condition === void 0 ? void 0 : condition.operator) {
-            const operatorKey = utils_1.generateRandomString();
-            replacements[operatorKey] = condition.value;
+            const valueRep = utils_1.generateRandomString();
+            replacements[valueRep] = `${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((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;
+    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;
+        }
     });
     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 = [];
@@ -217,6 +215,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.4.0-beta.2",
+  "version": "1.4.0-beta.2.1",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",