axe-api 1.0.0-rc6 → 1.0.0-rc8

package/build/src/Interfaces.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="express" />
 import { Knex } from "knex";
+import { Options as FormOptions } from "formidable";
 import { Column } from "knex-schema-inspector/lib/types/column";
 import { HandlerTypes, HttpMethods, HookFunctionTypes, Extensions, Relationships, SortTypes, ConditionTypes, DependencyTypes, QueryFeature, QueryFeatureType } from "./Enums";
 import Model from "./Model";
@@ -64,6 +65,7 @@ export interface IVersionConfig {
     supportedLanguages: string[];
     defaultLanguage: string;
     query: IQueryConfig;
+    formidable: FormOptions;
 }
 export interface IApplicationConfig extends IConfig {
     env: string;
@@ -234,7 +236,7 @@ export interface AxeRequestResponsePair {
     axeResponse: AxeResponse;
 }
 export interface MiddlewareResolution {
-    middlewares: MiddlewareFunction[];
+    middlewares: (MiddlewareFunction | HandlerFunction)[];
     handler: HandlerFunction;
 }
 export {};

package/build/src/Services/APIService.js

@@ -65,6 +65,7 @@ class APIService {
                 query: {
                     limits: [],
                 },
+                formidable: {},
             },
             folders: {
                 root,

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

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 /// <reference types="express" />
+import formidable, { Options as FormOptions } from "formidable";
 import { IncomingMessage } from "http";
 import { ILanguage } from "../Interfaces";
 declare class AxeRequest {
@@ -19,6 +20,7 @@ declare class AxeRequest {
     get currentLanguage(): ILanguage;
     set currentLanguage(language: ILanguage);
     header(key: string): string | string[] | undefined;
+    files(options?: FormOptions): Promise<[formidable.Fields, formidable.Files]>;
     get original(): IncomingMessage;
 }
 export default AxeRequest;

package/build/src/Services/AxeRequest.js

@@ -1,7 +1,21 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const formidable_1 = __importDefault(require("formidable"));
 const Helpers_1 = require("../Helpers");
 const Resolvers_1 = require("../Resolvers");
+const LogService_1 = __importDefault(require("./LogService"));
 class AxeRequest {
     constructor(request) {
         this.privateParams = {};
@@ -52,6 +66,18 @@ class AxeRequest {
     header(key) {
         return this.request.headers[key];
     }
+    files(options) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!((_a = this.header("content-type")) === null || _a === void 0 ? void 0 : _a.includes("multipart/form-data"))) {
+                LogService_1.default.warn(`Content-type must be 'multipart/form-data'.`);
+                throw new Error(`Content-type must be 'multipart/form-data'.`);
+            }
+            LogService_1.default.debug(`Form data is parsing`);
+            const form = (0, formidable_1.default)(options || ((_b = this.version) === null || _b === void 0 ? void 0 : _b.config.formidable) || {});
+            return yield form.parse(this.request);
+        });
+    }
     get original() {
         return this.request;
     }

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/build/src/constants.js

@@ -116,6 +116,7 @@ exports.DEFAULT_VERSION_CONFIG = {
             maxPerPage: 100,
         },
     },
+    formidable: {},
 };
 exports.NUMERIC_PRIMARY_KEY_TYPES = ["integer", "bigint"];
 exports.HANDLER_METHOD_MAP = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-api",
-  "version": "1.0.0-rc6",
+  "version": "1.0.0-rc8",
   "description": "AXE API is a simple tool to create Rest APIs quickly.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -68,6 +68,7 @@
     "@types/accept-language-parser": "^1.5.3",
     "@types/aws-lambda": "^8.10.119",
     "@types/cors": "^2.8.13",
+    "@types/formidable": "^3.4.1",
     "@types/multer": "^1.4.7",
     "@types/pluralize": "^0.0.30",
     "@types/validatorjs": "^3.15.0",
@@ -82,6 +83,7 @@
     "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-unicorn": "^33.0.1",
     "eslint-watch": "^7.0.0",
+    "formidable": "^3.5.1",
     "glob": "^9.3.5",
     "husky": "^8.0.3",
     "jest": "^29.6.2",