@autofleet/sheilta 1.2.0 → 1.2.1
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
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
declare type OrderItem = string | [string, string];
|
|
2
2
|
declare type SequelizeOrder = string | OrderItem[];
|
|
3
|
-
declare const formatPayload: ({ order, page, perPage, }: {
|
|
3
|
+
declare const formatPayload: ({ order, page, perPage, include, }: {
|
|
4
4
|
order: any;
|
|
5
5
|
page?: number;
|
|
6
6
|
perPage?: number;
|
|
7
|
+
include?: any[];
|
|
7
8
|
}, model?: any) => {
|
|
8
9
|
order: SequelizeOrder[];
|
|
9
10
|
page: any;
|
|
10
11
|
perPage: any;
|
|
12
|
+
include: any;
|
|
11
13
|
};
|
|
12
14
|
export default formatPayload;
|
package/lib/formatter/index.js
CHANGED
|
@@ -19,18 +19,21 @@ const formatOrder = ({ order = [], associationModels = [], }) => (order.length =
|
|
|
19
19
|
}));
|
|
20
20
|
const formatPage = page => page || utils_1.PAGE_DEFAULT;
|
|
21
21
|
const formatPerPage = perPage => perPage || utils_1.PER_PAGE_DEFAULT;
|
|
22
|
-
const
|
|
22
|
+
const formatInclude = (include, associationsMap = {}) => include.map(i => associationsMap[i.model]);
|
|
23
|
+
const formatPayload = ({ order, page = utils_1.PAGE_DEFAULT, perPage = utils_1.PER_PAGE_DEFAULT, include = [], }, model) => {
|
|
23
24
|
const associationModels = Object.keys((model === null || model === void 0 ? void 0 : model.associations) || {});
|
|
24
25
|
const formattedOrder = formatOrder({
|
|
25
26
|
order,
|
|
26
27
|
associationModels,
|
|
27
28
|
});
|
|
29
|
+
const formattedInclude = formatInclude(include, model === null || model === void 0 ? void 0 : model.associations);
|
|
28
30
|
const formattedPage = formatPage(page);
|
|
29
31
|
const formattedPerPage = formatPerPage(perPage);
|
|
30
32
|
return {
|
|
31
33
|
order: formattedOrder,
|
|
32
34
|
page: formattedPage,
|
|
33
35
|
perPage: formattedPerPage,
|
|
36
|
+
include: formattedInclude,
|
|
34
37
|
};
|
|
35
38
|
};
|
|
36
39
|
exports.default = formatPayload;
|
package/lib/middleware/index.js
CHANGED
|
@@ -42,15 +42,17 @@ exports.newQueryValidationMiddleware = (inner = 'body') => model => (req, res, n
|
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
44
|
exports.newQueryFormatMiddleware = (inner = 'body') => model => (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
|
-
const { order, page, perPage, } = req[inner];
|
|
46
|
-
const { order: formattedOrder, page: formattedPage, perPage: formattedPerPage, } = formatter_1.default({
|
|
45
|
+
const { order, page, perPage, include, } = req[inner];
|
|
46
|
+
const { order: formattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, } = formatter_1.default({
|
|
47
47
|
order,
|
|
48
48
|
page,
|
|
49
49
|
perPage,
|
|
50
|
+
include,
|
|
50
51
|
}, model);
|
|
51
52
|
req[inner].order = formattedOrder;
|
|
52
53
|
req[inner].page = formattedPage;
|
|
53
54
|
req[inner].perPage = formattedPerPage;
|
|
55
|
+
req[inner].include = formattedInclude;
|
|
54
56
|
return next();
|
|
55
57
|
});
|
|
56
58
|
exports.queryValidationMiddleware = exports.newQueryValidationMiddleware();
|