@autofleet/sheilta 1.3.2-4 → 1.3.2-6

package/lib/formatter/index.d.ts

@@ -11,9 +11,22 @@ declare const formatPayload: ({ order, page, perPage, include, query, attributes
     perPage?: number;
     include?: any[];
     query?: {};
-    attributes?: any[];
+    attributes?: any;
     searchTerm?: any;
 }, model?: any, options?: any) => {
+    attributes: {
+        include: any[];
+    };
+    query: {};
+    order: SequelizeOrder[];
+    page: any;
+    perPage: any;
+    include: any;
+    scopes: (string | {
+        method: any[];
+    })[];
+} | {
+    attributes?: undefined;
     query: {};
     order: SequelizeOrder[];
     page: any;
@@ -22,6 +35,5 @@ declare const formatPayload: ({ order, page, perPage, include, query, attributes
     scopes: (string | {
         method: any[];
     })[];
-    attributes: any[];
 };
 export default formatPayload;

package/lib/formatter/index.js

@@ -15,7 +15,7 @@ const getAttributeFromOrder = (order, literalAttributes) => {
     const [formattedOrder, attributes] = order.reduce((acc, o) => {
         const [item, itemOrder = ASCENDING_KEY] = 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);
+        (found ? acc[1] : acc[0]).push(found ? [`${found.literal} ${itemOrder}`] : o);
         return acc;
     }, [[], []]);
     return [formattedOrder, attributes];
@@ -78,14 +78,15 @@ const formatSearchTerm = (searchTerm, attributesToSend, rawAttributes) => ({
         })),
     })),
 });
-const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, attributes = [], searchTerm = null, }, model, options) => {
+const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], query = {}, attributes = null, searchTerm = null, }, model, options) => {
     const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
     const formattedOrder = formatOrder({
         order: [...order, DEFAULT_ORDER],
         associationModels,
     });
     const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options === null || options === void 0 ? void 0 : options.literalAttributes);
-    const formattedAttribute = [...filteredLiteralAttributes, ...attributes];
+    const allAttributes = [...filteredLiteralAttributes, ...(attributes || [])];
+    const formattedAttribute = allAttributes.length ? { include: allAttributes } : null;
     const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);
     const formattedPage = formatPage(page);
     const formattedPerPage = formatPerPage(perPage);
@@ -101,14 +102,7 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
             ],
         };
     }
-    return {
-        query: formattedQuery,
-        order: filteredFormattedOrder,
-        page: formattedPage,
-        perPage: formattedPerPage,
-        include: formattedInclude,
-        scopes: result.formattedScopes,
-        attributes: formattedAttribute,
-    };
+    const selectedAttributes = formattedAttribute ? { attributes: formattedAttribute } : {};
+    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, selectedAttributes);
 };
 exports.default = formatPayload;

package/lib/formatter/index.test.js

@@ -201,7 +201,7 @@ describe('formatting test', () => {
                 literalAttributes: [literalAttribute],
             });
             expect(JSON.stringify(order)).toBe(JSON.stringify([['id']]));
-            expect(JSON.stringify(attributes)).toBe(JSON.stringify([`${literalAttribute.literal} ASC`]));
+            expect(JSON.stringify(attributes)).toBe(JSON.stringify({ include: [[`${literalAttribute.literal} ASC`]] }));
         });
         it('by literal field descending', () => {
             const literalAttribute = { attribute: 'genericField', literal: 'void' };
@@ -215,7 +215,7 @@ describe('formatting test', () => {
                 literalAttributes: [literalAttribute],
             });
             expect(JSON.stringify(order)).toBe(JSON.stringify([['currencySymbol'], ['id']]));
-            expect(JSON.stringify(attributes)).toBe(JSON.stringify([`${literalAttribute.literal} DESC`]));
+            expect(JSON.stringify(attributes)).toBe(JSON.stringify({ include: [[`${literalAttribute.literal} DESC`]] }));
         });
         it('by literal field - not found', () => {
             const literalAttribute = { attribute: 'genericField', literal: 'void' };
@@ -229,7 +229,7 @@ describe('formatting test', () => {
                 literalAttributes: [literalAttribute],
             });
             expect(JSON.stringify(order)).toBe(JSON.stringify([[`O${literalAttribute.attribute}`, 'DESC'], ['id']]));
-            expect(JSON.stringify(attributes)).toBe(JSON.stringify([]));
+            expect(JSON.stringify(attributes)).toBe(JSON.stringify(undefined));
         });
     });
     describe('include formatting', () => {

package/package.json

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