@expressots/adapter-express 1.8.0 → 1.8.2

package/lib/CHANGELOG.md

@@ -1,5 +1,24 @@
 
 
+## [1.8.2](https://github.com/expressots/adapter-express/compare/1.8.1...1.8.2) (2024-08-31)
+
+
+### Bug Fixes
+
+* fileupload req and res retrieval ([1bf2465](https://github.com/expressots/adapter-express/commit/1bf246585f3280220f9da96b00f1780f6fe0169d)), closes [#113](https://github.com/expressots/adapter-express/issues/113)
+
+
+### Code Refactoring
+
+* file upload type validation & args res, req optional ([9ae3af4](https://github.com/expressots/adapter-express/commit/9ae3af4c58b2ee2c3c5d89dcc93101b092299b3a))
+
+## [1.8.1](https://github.com/expressots/adapter-express/compare/1.8.0...1.8.1) (2024-08-21)
+
+
+### Bug Fixes
+
+* remove server env export & update core deps ([38e1afd](https://github.com/expressots/adapter-express/commit/38e1afddbfc5f47cb9e65c3ed560f8a551ff2172))
+
 ## [1.8.0](https://github.com/expressots/adapter-express/compare/1.7.0...1.8.0) (2024-08-13)
 
 

package/lib/cjs/adapter-express/express-utils/decorators.js

@@ -339,6 +339,18 @@ function convertToType(value, type) {
     }
     return value;
 }
+/**
+ * Type guard to check if an object is a Request
+ */
+function isRequest(obj) {
+    return (typeof obj === "object" && obj !== null && "method" in obj && "headers" in obj && "url" in obj);
+}
+/**
+ * Type guard to check if an object is a Response
+ */
+function isResponse(obj) {
+    return (typeof obj === "object" && obj !== null && "status" in obj && "json" in obj && "send" in obj);
+}
 /**
  * File upload decorator to handle file uploads
  * @param options
@@ -360,17 +372,22 @@ function FileUpload(options, multerOptions) {
     }
     return function (target, propertyKey, descriptor) {
         const originalMethod = descriptor.value;
-        /* eslint-disable @typescript-eslint/no-explicit-any */
         descriptor.value = function (...args) {
-            const req = args[0];
-            const res = args[1];
-            // const next = args[2] as NextFunction;
+            const req = args.find(isRequest);
+            const res = args.find(isResponse);
             const multerMiddleware = getMulterMiddleware(upload, options, method);
             multerMiddleware(req, res, (err) => {
                 if (err) {
                     return res.status(400).json({ error: err.message });
                 }
-                return originalMethod.apply(this, args);
+                const result = originalMethod.apply(this, args);
+                if (res &&
+                    result &&
+                    typeof result != "undefined" &&
+                    !isRequest(result) &&
+                    !isResponse(result)) {
+                    return res.send(result);
+                }
             });
         };
     };

package/lib/cjs/adapter-express/index.js

@@ -14,10 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerEnvironment = exports.AppExpress = void 0;
+exports.AppExpress = void 0;
 __exportStar(require("./express-utils"), exports);
 var application_express_1 = require("./application-express");
 Object.defineProperty(exports, "AppExpress", { enumerable: true, get: function () { return application_express_1.AppExpress; } });
-var application_express_types_1 = require("./application-express.types");
-Object.defineProperty(exports, "ServerEnvironment", { enumerable: true, get: function () { return application_express_types_1.ServerEnvironment; } });
 __exportStar(require("./render"), exports);

package/lib/cjs/types/adapter-express/express-utils/decorators.d.ts

@@ -1,6 +1,7 @@
 import "reflect-metadata";
 import { PARAMETER_TYPE, HTTP_VERBS_ENUM } from "./constants";
 import type { HandlerDecorator, Middleware } from "./interfaces";
+import { Request } from "express";
 export declare const injectHttpContext: (target: import("inversify/lib/annotation/decorator_utils").DecoratorTarget<unknown>, targetKey?: string | symbol | undefined, indexOrPropertyDescriptor?: number | TypedPropertyDescriptor<unknown>) => void;
 /**
  * Controller decorator to define a new controller
@@ -132,10 +133,16 @@ export declare function getRenderMetadata(target: object, propertyKey: string |
     template?: string;
     defaultData?: Record<string, unknown>;
 };
+/**
+ * Multer storage engine interface
+ */
 export interface StorageEngine {
-    _handleFile(req: unknown, file: MulterFile, callback: (error?: Error | null, info?: Partial<MulterFile>) => void): void;
-    _removeFile(req: unknown, file: MulterFile, callback: (error: Error | null) => void): void;
+    _handleFile(req: Request, file: MulterFile, callback: (error?: Error | null, info?: Partial<MulterFile>) => void): void;
+    _removeFile(req: Request, file: MulterFile, callback: (error: Error | null) => void): void;
 }
+/**
+ * Multer file interface
+ */
 export interface MulterFile {
     fieldname: string;
     originalname: string;
@@ -147,6 +154,9 @@ export interface MulterFile {
     path?: string;
     buffer?: Buffer;
 }
+/**
+ * Multer limits interface
+ */
 export interface MulterLimits {
     fieldNameSize?: number;
     fieldSize?: number;
@@ -156,6 +166,9 @@ export interface MulterLimits {
     parts?: number;
     headerPairs?: number;
 }
+/**
+ * Multer options interface
+ */
 export interface MulterOptions {
     dest?: string;
     storage?: StorageEngine;
@@ -163,7 +176,7 @@ export interface MulterOptions {
     fileFilter?: FileFilter;
 }
 export type FileFilterCallback = (error: Error | null, acceptFile: boolean) => void;
-export type FileFilter = (req: unknown, file: MulterFile, callback: FileFilterCallback) => void;
+export type FileFilter = (req: Request, file: MulterFile, callback: FileFilterCallback) => void;
 type FieldOptions = {
     fieldName: string;
     maxCount?: number;

package/lib/cjs/types/adapter-express/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./express-utils";
 export { AppExpress } from "./application-express";
 export { IWebServerPublic } from "./application-express.interface";
-export { IWebServer, IWebServerConstructor, ServerEnvironment } from "./application-express.types";
+export { IWebServer, IWebServerConstructor } from "./application-express.types";
 export * from "./render";

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/adapter-express",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Expressots - modern, fast, lightweight nodejs web framework (@adapter-express)",
   "author": "",
   "main": "./lib/cjs/index.js",
@@ -75,7 +75,7 @@
     "@codecov/vite-plugin": "^0.0.1-beta.6",
     "@commitlint/cli": "19.2.1",
     "@commitlint/config-conventional": "19.2.2",
-    "@expressots/core": "2.16.0",
+    "@expressots/core": "2.16.1",
     "@release-it/conventional-changelog": "8.0.1",
     "@types/express": "4.17.21",
     "@types/node": "20.14.10",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/adapter-express",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "description": "Expressots - modern, fast, lightweight nodejs web framework (@adapter-express)",
   "author": "",
   "main": "./lib/cjs/index.js",
@@ -75,7 +75,7 @@
     "@codecov/vite-plugin": "^0.0.1-beta.6",
     "@commitlint/cli": "19.2.1",
     "@commitlint/config-conventional": "19.2.2",
-    "@expressots/core": "2.16.0",
+    "@expressots/core": "2.16.1",
     "@release-it/conventional-changelog": "8.0.1",
     "@types/express": "4.17.21",
     "@types/node": "20.14.10",