@autofleet/sheilta 1.3.2-8 → 1.3.2

package/lib/formatter/index.d.ts

@@ -1,4 +1,4 @@
-import type { Attribute } from '../interface';
+import type { Attribute } from '../middleware';
 declare type OrderItem = string | [string, string];
 declare type SequelizeOrder = string | OrderItem[];
 export declare type FormatPayloadOptions = {
@@ -26,15 +26,5 @@ declare const formatPayload: ({ order, page, perPage, include, query, attributes
     scopes: (string | {
         method: any[];
     })[];
-} | {
-    attributes?: undefined;
-    query: {};
-    order: SequelizeOrder[];
-    page: any;
-    perPage: any;
-    include: any;
-    scopes: (string | {
-        method: any[];
-    })[];
 };
 export default formatPayload;

package/lib/formatter/index.js

@@ -17,7 +17,7 @@ const getAttributeFromOrder = (order, options = {}) => {
         const found = literalAttributes === null || literalAttributes === void 0 ? void 0 : literalAttributes.find(obj => obj.attribute === item);
         if (found) {
             acc[1].push(found.literal);
-            acc[0].push([DBFormatter ? DBFormatter(`${found.attribute} ${orderStyle}`) : `${found.attribute} ${orderStyle}`]);
+            acc[0].push([DBFormatter ? DBFormatter(`"${found.attribute}" ${orderStyle}`) : `${found.attribute} ${orderStyle}`]);
         }
         else {
             acc[0].push(o);
@@ -108,7 +108,6 @@ const formatPayload = ({ order = [], page = utils_1.PAGE_DEFAULT, perPage = util
             ],
         };
     }
-    const selectedAttributes = formattedAttribute ? { attributes: formattedAttribute } : {};
-    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, selectedAttributes);
+    return Object.assign({ query: formattedQuery, order: filteredFormattedOrder, page: formattedPage, perPage: formattedPerPage, include: formattedInclude, scopes: result.formattedScopes }, (formattedAttribute && { attributes: formattedAttribute }));
 };
 exports.default = formatPayload;

package/lib/formatter/index.test.js

@@ -201,7 +201,6 @@ describe('formatting test', () => {
                 literalAttributes: [literalAttribute],
             });
             expect(JSON.stringify(order)).toBe(JSON.stringify([[`${literalAttribute.attribute} ASC`], ['id']]));
-            console.log({ attributes });
             expect(JSON.stringify(attributes))
                 .toBe(JSON.stringify({ include: [literalAttribute.literal] }));
         });

package/lib/index.d.ts

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

package/lib/middleware/index.d.ts

@@ -1,5 +1,11 @@
 import { FormatPayloadOptions } from '../formatter';
-import { MiddlewareValidationOption } from '../interface';
+export declare type Attribute = {
+    attribute: string;
+    literal: any;
+};
+export declare type MiddlewareValidationOption = {
+    literalAttributes?: Attribute[];
+};
 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>;

package/lib/validations/index.d.ts

@@ -1,4 +1,4 @@
-import { MiddlewareValidationOption } from '../interface';
+import type { MiddlewareValidationOption } from '../middleware';
 export declare const validatePayload: ({ query, order, attributes, include, page, perPage, }: {
     query?: {};
     order?: any[];

package/lib/validations/index.js

@@ -26,7 +26,7 @@ const validateSingleOrder = (currentOrder, rawAttributes, associationModels, opt
         [formattedOrderString] = formattedOrderString.split(utils_1.ASSOCIATION_PREFIX);
     }
     if (!(rawAttributes.includes(formattedOrderString) || isOrderAssociation || isLiteralAttribute)) {
-        utils_1.throwBadRequestError(`${currentOrder} is invalid isLiteralAttribute: ${isLiteralAttribute}`);
+        utils_1.throwBadRequestError(`${currentOrder} is invalid. isLiteralAttribute: ${isLiteralAttribute}`);
     }
 };
 const validateSingleAttribute = (currentAttribute, rawAttributes) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/sheilta",
-  "version": "1.3.2-8",
+  "version": "1.3.2",
   "description": "manage cache",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,7 +29,6 @@
   "dependencies": {
     "@autofleet/common-types": "^1.7.29",
     "@autofleet/errors": "^1.0.10",
-    "@autofleet/sheilta": "^1.3.2-6",
     "joi": "^17.9.2",
     "lodash": "^4.17.21"
   },

package/lib/interface.d.ts

@@ -1,7 +0,0 @@
-export declare type Attribute = {
-    attribute: string;
-    literal: any;
-};
-export declare type MiddlewareValidationOption = {
-    literalAttributes?: Attribute[];
-};

package/lib/interface.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });