axe-api 1.0.0-rc7 → 1.0.0-rc9

package/build/src/Interfaces.d.ts

@@ -236,7 +236,7 @@ export interface AxeRequestResponsePair {
     axeResponse: AxeResponse;
 }
 export interface MiddlewareResolution {
-    middlewares: MiddlewareFunction[];
+    middlewares: (MiddlewareFunction | HandlerFunction)[];
     handler: HandlerFunction;
 }
 export {};

package/build/src/Phases/Paginate/FetchPhase.js

@@ -9,8 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const Helpers_1 = require("../../Handlers/Helpers");
 exports.default = (context) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
+    if (context.query && context.queryParser && context.conditions) {
+        // Users should be able to select some fields to show.
+        context.queryParser.applyFields(context.query, context.conditions.fields);
+        // Binding parent id if there is.
+        (0, Helpers_1.addForeignKeyQuery)(context.req, context.query, context.relation, context.parentModel);
+        // Users should be able to filter records
+        context.queryParser.applyWheres(context.query, context.conditions.q);
+        // User should be able to select sorting fields and types
+        context.queryParser.applySorting(context.query, context.conditions.sort);
+    }
     context.result = yield context.query.paginate({
         perPage: ((_a = context.conditions) === null || _a === void 0 ? void 0 : _a.per_page) || 10,
         currentPage: ((_b = context.conditions) === null || _b === void 0 ? void 0 : _b.page) || 1,

package/build/src/Phases/Paginate/PreparePhase.js

@@ -19,12 +19,4 @@ exports.default = (context) => __awaiter(void 0, void 0, void 0, function* () {
     context.query = context.database.from(context.model.instance.table);
     // If there is a deletedAtColumn, it means that this table support soft-delete
     (0, Helpers_1.addSoftDeleteQuery)(context.model, context.conditions, context.query);
-    // Users should be able to select some fields to show.
-    context.queryParser.applyFields(context.query, context.conditions.fields);
-    // Binding parent id if there is.
-    (0, Helpers_1.addForeignKeyQuery)(context.req, context.query, context.relation, context.parentModel);
-    // Users should be able to filter records
-    context.queryParser.applyWheres(context.query, context.conditions.q);
-    // User should be able to select sorting fields and types
-    context.queryParser.applySorting(context.query, context.conditions.sort);
 });

package/build/src/Services/URLService.d.ts

@@ -13,7 +13,7 @@ interface Pair {
 declare class URLService {
     private static urls;
     static add(method: string, pattern: string, data: IRouteData, middlewares: StepTypes[]): Promise<void>;
-    static addHandler(method: string, pattern: string, customHandler: HandlerFunction, middlewares: MiddlewareFunction[]): Promise<void>;
+    static addHandler(method: string, pattern: string, customHandler: HandlerFunction, middlewares: (MiddlewareFunction | HandlerFunction)[]): Promise<void>;
     static match(request: AxeRequest): {
         params: any;
         method: string;

package/build/src/Services/URLService.js

@@ -73,8 +73,15 @@ class URLService {
                     isAsync: false,
                     name: `middleware:test`,
                     callback: (pack) => __awaiter(this, void 0, void 0, function* () {
-                        const caller = (0, util_1.promisify)((pack, next) => middleware(pack.req.original, pack.res.original, next));
-                        yield caller(pack);
+                        if ((0, ConverterService_1.isMiddlewareFunction)(middleware)) {
+                            // It should be wrapped
+                            const caller = (0, util_1.promisify)((pack, next) => middleware(pack.req.original, pack.res.original, next));
+                            yield caller(pack);
+                        }
+                        else {
+                            // We call it directly.
+                            yield middleware(pack.req, pack.res);
+                        }
                     }),
                 };
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-api",
-  "version": "1.0.0-rc7",
+  "version": "1.0.0-rc9",
   "description": "AXE API is a simple tool to create Rest APIs quickly.",
   "main": "build/index.js",
   "types": "build/index.d.ts",