@autofleet/sheilta 1.3.2 → 1.3.4-beta.0

package/lib/formatter/index.d.ts

@@ -1,10 +1,11 @@
-import type { Attribute } from '../middleware';
+import type { LiteralAttribute } from '../middleware';
 declare type OrderItem = string | [string, string];
 declare type SequelizeOrder = string | OrderItem[];
 export declare type FormatPayloadOptions = {
     includeRawPayload?: boolean;
-    literalAttributes?: Attribute[];
+    literalAttributes?: LiteralAttribute[];
     DBFormatter?: any;
+    skipSearchTermQuery?: boolean;
 };
 declare const formatPayload: ({ order, page, perPage, include, query, attributes, searchTerm, }: {
     order?: any[];

package/lib/formatter/index.js

@@ -59,9 +59,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 +98,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) {
+    if (searchTerm && !(options === null || options === void 0 ? void 0 : options.skipSearchTermQuery)) {
         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/lib/index.d.ts

@@ -1,3 +1,3 @@
 import { formatOperators } from './operators';
-import { queryFormatMiddleware, queryValidationMiddleware, MiddlewareValidationOption } from './middleware';
-export { formatOperators, queryFormatMiddleware, queryValidationMiddleware, MiddlewareValidationOption, };
+import { queryFormatMiddleware, queryValidationMiddleware, MiddlewareValidationOption, LiteralAttribute } from './middleware';
+export { formatOperators, queryFormatMiddleware, queryValidationMiddleware, MiddlewareValidationOption, LiteralAttribute, };

package/lib/middleware/index.d.ts

@@ -1,12 +1,15 @@
 import { FormatPayloadOptions } from '../formatter';
-export declare type Attribute = {
+declare type literal = any;
+declare type LiteralQuery = (literal | string)[] | literal;
+export declare type LiteralAttribute = {
     attribute: string;
-    literal: any;
+    literal: LiteralQuery;
 };
 export declare type MiddlewareValidationOption = {
-    literalAttributes?: Attribute[];
+    literalAttributes?: LiteralAttribute[];
 };
 export declare const newQueryValidationMiddleware: (inner?: string) => (model: any, options?: MiddlewareValidationOption) => (req: any, res: any, next: any) => Promise<void>;
 export declare const newQueryFormatMiddleware: (inner?: string) => (model: any, options?: FormatPayloadOptions) => (req: any, res: any, next: any) => Promise<void>;
 export declare const queryValidationMiddleware: (model: any, options?: MiddlewareValidationOption) => (req: any, res: any, next: any) => Promise<void>;
 export declare const queryFormatMiddleware: (model: any, options?: FormatPayloadOptions) => (req: any, res: any, next: any) => Promise<void>;
+export {};

package/lib/utils.js

@@ -10,7 +10,7 @@ exports.PAGE_DEFAULT = 1;
 exports.PER_PAGE_MAX_LIMIT = 100;
 exports.PER_PAGE_MIN_LIMIT = 1;
 exports.PAGE_MIN = 1;
-exports.wrapAttributeWithOperator = attribute => `${operators_1.OPERATOR_PREFIX}${attribute}${operators_1.OPERATOR_PREFIX}`;
+exports.wrapAttributeWithOperator = (attribute) => `${operators_1.OPERATOR_PREFIX}${attribute}${operators_1.OPERATOR_PREFIX}`;
 exports.isAttributeByAssociation = (attributeName, associatedModels) => attributeName.includes(exports.ASSOCIATION_PREFIX)
     && associatedModels.includes(attributeName.split(exports.ASSOCIATION_PREFIX)[0]);
 exports.extractAttributeNameFromOrder = (order, associationModels) => {
@@ -26,6 +26,6 @@ exports.extractAttributeNameFromOrder = (order, associationModels) => {
 };
 exports.isOrderDesc = (order) => order.includes(exports.ORDER_PREFIX);
 exports.throwBadRequestError = (message) => {
-    throw new errors_1.BadRequest([{ message }], null);
+    throw new errors_1.BadRequest([{ message, name: 'badRequestError' }], null);
 };
 exports.extractAssociatedAttributeNameFromOrder = (order) => order.split(exports.ASSOCIATION_PREFIX)[1];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.3.2",
+  "version": "1.3.4-beta.0",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -48,4 +48,4 @@
   "files": [
     "lib/**/*"
   ]
-}
+}