@autofleet/sheilta 1.3.6-hilat-1 → 1.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/formatter/index.d.ts
CHANGED
|
@@ -16,9 +16,7 @@ declare const formatPayload: ({ order, page, perPage, include, query, attributes
|
|
|
16
16
|
attributes?: any;
|
|
17
17
|
searchTerm?: any;
|
|
18
18
|
}, model?: any, options?: any) => {
|
|
19
|
-
attributes: any[]
|
|
20
|
-
include: any[];
|
|
21
|
-
};
|
|
19
|
+
attributes: any[];
|
|
22
20
|
query: {};
|
|
23
21
|
order: SequelizeOrder[];
|
|
24
22
|
page: any;
|
package/lib/formatter/index.js
CHANGED
|
@@ -98,7 +98,6 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
|
|
|
98
98
|
});
|
|
99
99
|
const [filteredFormattedOrder, filteredLiteralAttributes] = getAttributeFromOrder(formattedOrder, options);
|
|
100
100
|
const allAttributes = [...filteredLiteralAttributes, ...(attributes || [])];
|
|
101
|
-
const formattedAttribute = (attributes === null || attributes === void 0 ? void 0 : attributes.length) ? allAttributes : { include: allAttributes };
|
|
102
101
|
const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);
|
|
103
102
|
const formattedPage = formatPage(page);
|
|
104
103
|
const formattedPerPage = formatPerPage(perPage);
|
|
@@ -114,6 +113,6 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
|
|
|
114
113
|
],
|
|
115
114
|
};
|
|
116
115
|
}
|
|
117
|
-
return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, (
|
|
116
|
+
return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, ((allAttributes.length > 0) && { attributes: allAttributes }));
|
|
118
117
|
};
|
|
119
118
|
exports.default = formatPayload;
|
|
@@ -202,7 +202,7 @@ describe('formatting test', () => {
|
|
|
202
202
|
});
|
|
203
203
|
expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} ASC`], ['id']]));
|
|
204
204
|
expect(JSON.stringify(attributes))
|
|
205
|
-
.toBe(JSON.stringify(
|
|
205
|
+
.toBe(JSON.stringify([literalAttribute.literal]));
|
|
206
206
|
});
|
|
207
207
|
it('by literal field descending', () => {
|
|
208
208
|
const literalAttribute = { attribute: 'genericField', literal: ['void', 'field'] };
|