@autofleet/sheilta 1.3.4-beta.2 → 1.3.4

package/lib/formatter/index.d.ts

@@ -5,7 +5,6 @@ export declare type FormatPayloadOptions = {
     includeRawPayload?: boolean;
     literalAttributes?: LiteralAttribute[];
     DBFormatter?: any;
-    skipSearchTermFormat?: boolean;
 };
 declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
     order?: any[];

package/lib/formatter/index.js

@@ -43,7 +43,13 @@ const formatOrder = ({ order, associationModels = [], }) => order.map((o) => {
 const formatPage = page => page || utils_1.PAGE_DEFAULT;
 const formatPerPage = perPage => perPage || utils_1.PER_PAGE_DEFAULT;
 const formatInclude = (include, associationsMap = {}) => {
-    let formattedInclude = include.map(i => (Object.assign(Object.assign({}, i), { association: associationsMap[i.association || i.model], required: i.required !== false })));
+    let formattedInclude = include.map((i) => {
+        var _a;
+        const includedAssociation = associationsMap[i.association || i.model];
+        return Object.assign(Object.assign(Object.assign({}, i), { association: includedAssociation, required: i.required !== false }), (i.include && {
+            include: formatInclude(i.include, (_a = includedAssociation === null || includedAssociation === void 0 ? void 0 : includedAssociation.target) === null || _a === void 0 ? void 0 : _a.associations),
+        }));
+    });
     formattedInclude = formattedInclude.map(i => lodash_1.default.omit(i, ['model']));
     return formattedInclude;
 };
@@ -59,9 +65,9 @@ const formatQuery = (query, associationModels) => {
             formattedScopeMap.get(CUSTOM_FIELDS_FILTER_SCOPE)[scopeKey] = queryItemValue;
             return;
         }
-        const key = utils_1.isAttributeByAssociation(queryItemKey, associationModels)
-            ? utils_1.wrapAttributeWithOperator(queryItemKey)
-            : queryItemKey;
+        const key = utils_1.isAttributeByAssociation(queryItemKey, associationModels) ?
+            utils_1.wrapAttributeWithOperator(queryItemKey) :
+            queryItemKey;
         formattedQuery[key] = queryItemValue;
     });
     const formattedScopes = Array.from(formattedScopeMap.entries()).map(([scopeName, scopeValue]) => {
@@ -98,7 +104,7 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
     const formattedPerPage = formatPerPage(perPage);
     const result = formatQuery(query, associationModels);
     let { formattedQuery } = result;
-    if (searchTerm && !(options === null || options === void 0 ? void 0 : options.skipSearchTermFormat)) {
+    if (searchTerm) {
         const attributesToSend = (attributes === null || attributes === void 0 ? void 0 : attributes.length) ? attributes : Object.keys(model.rawAttributes);
         const queryWithSearchTerm = formatSearchTerm(searchTerm, attributesToSend, model.rawAttributes);
         formattedQuery = lodash_1.default.isEmpty(formattedQuery) ? queryWithSearchTerm : {

package/package.json

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