@autofleet/sheilta 1.3.2-6 → 1.3.2-8

package/lib/formatter/index.d.ts

@@ -4,6 +4,7 @@ declare type SequelizeOrder = string | OrderItem[];
 export declare type FormatPayloadOptions = {
     includeRawPayload?: boolean;
     literalAttributes?: Attribute[];
+    DBFormatter?: any;
 };
 declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
     order?: any[];

package/lib/formatter/index.js

@@ -8,14 +8,20 @@ const common_types_1 = require("@autofleet/common-types");
 const utils_1 = require("../utils");
 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 getAttributeFromOrder = (order, literalAttributes) => {
+const getAttributeFromOrder = (order, options = {}) => {
+    const { literalAttributes = [], DBFormatter = undefined } = options;
     const [formattedOrder, attributes] = order.reduce((acc, o) => {
-        const [item, itemOrder = ASCENDING_KEY] = Array.isArray(o) ? o : [o];
+        const [item, orderStyle = 'ASC'] = Array.isArray(o) ? o : [o];
         const found = literalAttributes === null || literalAttributes === void 0 ? void 0 : literalAttributes.find(obj => obj.attribute === item);
-        (found ? acc[1] : acc[0]).push(found ? [`${found.literal} ${itemOrder}`] : o);
+        if (found) {
+            acc[1].push(found.literal);
+            acc[0].push([DBFormatter ? DBFormatter(`${found.attribute} ${orderStyle}`) : `${found.attribute} ${orderStyle}`]);
+        }
+        else {
+            acc[0].push(o);
+        }
         return acc;
     }, [[], []]);
     return [formattedOrder, attributes];
@@ -84,7 +90,7 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
         order: [...order, DEFAULT_ORDER],
         associationModels,
     });
-    const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options === null || options === void 0 ? void 0 : options.literalAttributes);
+    const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options);
     const allAttributes = [...filteredLiteralAttributes, ...(attributes || [])];
     const formattedAttribute = allAttributes.length ? { include: allAttributes } : null;
     const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);

package/lib/formatter/index.test.js

@@ -190,7 +190,7 @@ describe('formatting test', () => {
             expect(JSON.stringify(order)).toBe(JSON.stringify([['status.name', 'DESC'], ['id']]));
         });
         it('by literal field ascending', () => {
-            const literalAttribute = { attribute: 'genericField', literal: 'void' };
+            const literalAttribute = { attribute: 'genericField', literal: [{ 0: e => `${e}0` }] };
             const { order, attributes } = _1.default({
                 order: [literalAttribute.attribute],
             }, {
@@ -200,11 +200,13 @@ describe('formatting test', () => {
             }, {
                 literalAttributes: [literalAttribute],
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['id']]));
-            expect(JSON.stringify(attributes)).toBe(JSON.stringify({ include: [[`${literalAttribute.literal} ASC`]] }));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} ASC`], ['id']]));
+            console.log({ attributes });
+            expect(JSON.stringify(attributes))
+                .toBe(JSON.stringify({ include: [literalAttribute.literal] }));
         });
         it('by literal field descending', () => {
-            const literalAttribute = { attribute: 'genericField', literal: 'void' };
+            const literalAttribute = { attribute: 'genericField', literal: ['void', 'field'] };
             const { order, attributes } = _1.default({
                 order: [`-${literalAttribute.attribute}`, 'currencySymbol'],
             }, {
@@ -214,8 +216,11 @@ describe('formatting test', () => {
             }, {
                 literalAttributes: [literalAttribute],
             });
-            expect(JSON.stringify(order)).toBe(JSON.stringify([['currencySymbol'], ['id']]));
-            expect(JSON.stringify(attributes)).toBe(JSON.stringify({ include: [[`${literalAttribute.literal} DESC`]] }));
+            expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} DESC`], ['currencySymbol'], ['id']]));
+            expect(JSON.stringify(attributes))
+                .toBe(JSON.stringify({
+                include: [[literalAttribute.literal[0], literalAttribute.literal[1]]],
+            }));
         });
         it('by literal field - not found', () => {
             const literalAttribute = { attribute: 'genericField', literal: 'void' };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.3.2-6",
+  "version": "1.3.2-8",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,6 +29,7 @@
   "dependencies": {
     "@autofleet/common-types": "^1.7.29",
     "@autofleet/errors": "^1.0.10",
+    "@autofleet/sheilta": "^1.3.2-6",
     "joi": "^17.9.2",
     "lodash": "^4.17.21"
   },