@tsed/platform-multer 8.7.0 → 8.8.0-beta.1

package/lib/esm/adapters/fastify/MulterModule.js

@@ -0,0 +1,54 @@
+import { promisify } from "node:util";
+import { injectable } from "@tsed/di";
+import fp from "fastify-plugin";
+import { MULTER_MODULE } from "../../common/index.js";
+const kMultipart = Symbol("multipart");
+function setMultipart(req, _payload, done) {
+    // nothing to do, it will be done by multer in beforeHandler method
+    req[kMultipart] = true;
+    done(null);
+}
+function fastifyMulter(fastify, _options, next) {
+    fastify.addContentTypeParser("multipart/form-data", setMultipart);
+    next();
+}
+const multerPlugin = fp(fastifyMulter, {
+    fastify: ">= 5.0.0",
+    name: "fastify-multer"
+});
+async function factory() {
+    const { default: multer } = await import("multer");
+    return {
+        multer,
+        get(options) {
+            const instance = multer(options);
+            const makePromise = (multer, name) => {
+                // istanbul ignore next
+                if (!multer[name])
+                    return;
+                const fn = multer[name];
+                multer[name] = function apply(...args) {
+                    const middleware = Reflect.apply(fn, this, args);
+                    return async (req, res) => {
+                        await promisify(middleware)(req.raw, res.raw);
+                        req.files = req.raw.files;
+                        req.body = req.raw.body;
+                    };
+                };
+            };
+            makePromise(instance, "any");
+            makePromise(instance, "array");
+            makePromise(instance, "fields");
+            makePromise(instance, "none");
+            makePromise(instance, "single");
+            return instance;
+        }
+    };
+}
+injectable(MULTER_MODULE)
+    .asyncFactory(factory)
+    .configuration({
+    plugins: [multerPlugin]
+})
+    .token();
+//# sourceMappingURL=MulterModule.js.map

package/lib/esm/adapters/fastify/MulterModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MulterModule.js","sourceRoot":"","sources":["../../../../src/adapters/fastify/MulterModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAyB,MAAM,gBAAgB,CAAC;AAIvD,OAAO,EAAC,aAAa,EAA0B,MAAM,uBAAuB,CAAC;AAE7E,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AASvC,SAAS,YAAY,CAAC,GAAmB,EAAE,QAAyB,EAAE,IAAiC;IACrG,mEAAmE;IAClE,GAAW,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;IAChC,IAAI,CAAC,IAAI,CAAC,CAAC;AACb,CAAC;AAED,SAAS,aAAa,CAAC,OAAwB,EAAE,QAAwB,EAAE,IAA2B;IACpG,OAAO,CAAC,oBAAoB,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;IAClE,IAAI,EAAE,CAAC;AACT,CAAC;AAED,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,EAAE;IACrC,OAAO,EAAE,UAAU;IACnB,IAAI,EAAE,gBAAgB;CACvB,CAAC,CAAC;AAEH,KAAK,UAAU,OAAO;IACpB,MAAM,EAAC,OAAO,EAAE,MAAM,EAAC,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEjD,OAAO;QACL,MAAM;QACN,GAAG,CAAC,OAAgB;YAClB,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAEjC,MAAM,WAAW,GAAG,CAAC,MAAW,EAAE,IAAY,EAAE,EAAE;gBAChD,uBAAuB;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;oBAAE,OAAO;gBAE1B,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;gBAExB,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,KAAK,CAAC,GAAG,IAAW;oBAC1C,MAAM,UAAU,GAAQ,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBAEtD,OAAO,KAAK,EAAE,GAAmB,EAAE,GAAiB,EAAE,EAAE;wBACtD,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;wBAC9C,GAAG,CAAC,KAAK,GAAI,GAAG,CAAC,GAAW,CAAC,KAAK,CAAC;wBACnC,GAAG,CAAC,IAAI,GAAI,GAAG,CAAC,GAAW,CAAC,IAAI,CAAC;oBACnC,CAAC,CAAC;gBACJ,CAAC,CAAC;YACJ,CAAC,CAAC;YAEF,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC7B,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC/B,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAChC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC9B,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAEhC,OAAO,QAAQ,CAAC;QAClB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,UAAU,CAAC,aAAa,CAAC;KACtB,YAAY,CAAC,OAAO,CAAC;KACrB,aAAa,CAAC;IACb,OAAO,EAAE,CAAC,YAAY,CAAC;CACxB,CAAC;KACD,KAAK,EAAE,CAAC"}

package/lib/types/adapters/fastify/MulterModule.d.ts

@@ -0,0 +1,11 @@
+import { type PlatformMulterFile } from "../../common/index.js";
+declare const kMultipart: unique symbol;
+declare module "fastify" {
+    interface FastifyRequest {
+        files?: {
+            [key: string]: PlatformMulterFile | PlatformMulterFile[];
+        };
+        [kMultipart]: boolean;
+    }
+}
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/platform-multer",
   "description": "Multer adapter package for Ts.ED framework",
   "type": "module",
-  "version": "8.7.0",
+  "version": "8.8.0-beta.1",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -25,6 +25,12 @@
       "types": "./lib/types/adapters/koa/MulterModule.d.ts",
       "import": "./lib/esm/adapters/koa/MulterModule.js",
       "default": "./lib/esm/adapters/koa/MulterModule.js"
+    },
+    "./fastify": {
+      "tsed-source": "./src/adapters/fastify/MulterModule.ts",
+      "types": "./lib/types/adapters/fastify/MulterModule.d.ts",
+      "import": "./lib/esm/adapters/fastify/MulterModule.js",
+      "default": "./lib/esm/adapters/fastify/MulterModule.js"
     }
   },
   "scripts": {
@@ -53,11 +59,11 @@
   "homepage": "https://github.com/tsedio/tsed/tree/production/packages/platform/platform-multer",
   "repository": "https://github.com/tsedio/tsed",
   "devDependencies": {
-    "@tsed/barrels": "8.7.0",
-    "@tsed/core": "8.7.0",
-    "@tsed/di": "8.7.0",
-    "@tsed/platform-middlewares": "8.7.0",
-    "@tsed/typescript": "8.7.0",
+    "@tsed/barrels": "8.8.0-beta.1",
+    "@tsed/core": "8.8.0-beta.1",
+    "@tsed/di": "8.8.0-beta.1",
+    "@tsed/platform-middlewares": "8.8.0-beta.1",
+    "@tsed/typescript": "8.8.0-beta.1",
     "eslint": "9.12.0",
     "typescript": "5.4.5",
     "vitest": "3.0.9"
@@ -67,13 +73,13 @@
     "tslib": "2.7.0"
   },
   "peerDependencies": {
-    "@tsed/core": ">=8.7.0",
-    "@tsed/di": ">=8.7.0",
-    "@tsed/json-mapper": ">=8.7.0",
+    "@tsed/core": ">=8.8.0-beta.1",
+    "@tsed/di": ">=8.8.0-beta.1",
+    "@tsed/json-mapper": ">=8.8.0-beta.1",
     "@tsed/logger": ">=7.0.1",
-    "@tsed/openspec": ">=8.7.0",
-    "@tsed/platform-middlewares": ">=8.7.0",
-    "@tsed/schema": ">=8.7.0",
+    "@tsed/openspec": ">=8.8.0-beta.1",
+    "@tsed/platform-middlewares": ">=8.8.0-beta.1",
+    "@tsed/schema": ">=8.8.0-beta.1",
     "cross-env": "7.0.3"
   },
   "peerDependenciesMeta": {
@@ -98,5 +104,8 @@
     "@tsed/schema": {
       "optional": false
     }
+  },
+  "publishConfig": {
+    "tag": "beta"
   }
 }

package/src/adapters/express/MulterModule.integration.spec.ts

@@ -0,0 +1,19 @@
+import {PlatformExpress} from "@tsed/platform-express";
+import {PlatformTestSdk} from "@tsed/platform-test-sdk";
+
+import {rootDir, Server} from "./__mock__/Server.js";
+
+const utils = PlatformTestSdk.create({
+  rootDir,
+  adapter: PlatformExpress as any,
+  server: Server,
+  logger: {
+    level: "off"
+  }
+});
+
+describe("PlatformExpress", () => {
+  describe("Plugin: Multer", () => {
+    utils.test("multer");
+  });
+});

package/src/adapters/fastify/MulterModule.integration.spec.ts

@@ -0,0 +1,19 @@
+import {PlatformFastify} from "@tsed/platform-fastify";
+import {PlatformTestSdk} from "@tsed/platform-test-sdk";
+
+import {rootDir, Server} from "./__mock__/Server.js";
+
+const utils = PlatformTestSdk.create({
+  rootDir,
+  adapter: PlatformFastify as any,
+  server: Server,
+  logger: {
+    level: "error"
+  }
+});
+
+describe("PlatformFastify", () => {
+  describe("Plugin: Multer", () => {
+    utils.test("multer");
+  });
+});

package/src/adapters/fastify/MulterModule.ts

@@ -0,0 +1,77 @@
+import {promisify} from "node:util";
+
+import {injectable} from "@tsed/di";
+import type {FastifyInstance, FastifyReply, FastifyRequest} from "fastify";
+import fp, {type PluginMetadata} from "fastify-plugin";
+import type {IncomingMessage} from "http";
+import type {Options} from "multer";
+
+import {MULTER_MODULE, type PlatformMulterFile} from "../../common/index.js";
+
+const kMultipart = Symbol("multipart");
+
+declare module "fastify" {
+  export interface FastifyRequest {
+    files?: {[key: string]: PlatformMulterFile | PlatformMulterFile[]};
+    [kMultipart]: boolean;
+  }
+}
+
+function setMultipart(req: FastifyRequest, _payload: IncomingMessage, done: (err: Error | null) => void) {
+  // nothing to do, it will be done by multer in beforeHandler method
+  (req as any)[kMultipart] = true;
+  done(null);
+}
+
+function fastifyMulter(fastify: FastifyInstance, _options: PluginMetadata, next: (err?: Error) => void) {
+  fastify.addContentTypeParser("multipart/form-data", setMultipart);
+  next();
+}
+
+const multerPlugin = fp(fastifyMulter, {
+  fastify: ">= 5.0.0",
+  name: "fastify-multer"
+});
+
+async function factory() {
+  const {default: multer} = await import("multer");
+
+  return {
+    multer,
+    get(options: Options) {
+      const instance = multer(options);
+
+      const makePromise = (multer: any, name: string) => {
+        // istanbul ignore next
+        if (!multer[name]) return;
+
+        const fn = multer[name];
+
+        multer[name] = function apply(...args: any[]) {
+          const middleware: any = Reflect.apply(fn, this, args);
+
+          return async (req: FastifyRequest, res: FastifyReply) => {
+            await promisify(middleware)(req.raw, res.raw);
+            req.files = (req.raw as any).files;
+            req.body = (req.raw as any).body;
+          };
+        };
+      };
+
+      makePromise(instance, "any");
+      makePromise(instance, "array");
+      makePromise(instance, "fields");
+      makePromise(instance, "none");
+      makePromise(instance, "single");
+
+      return instance;
+    }
+  };
+}
+
+injectable(MULTER_MODULE)
+  .asyncFactory(factory)
+  .configuration({
+    plugins: [multerPlugin]
+  })
+  .token();

package/src/adapters/koa/MulterModule.integration.spec.ts

@@ -0,0 +1,19 @@
+import {PlatformKoa} from "@tsed/platform-koa";
+import {PlatformTestSdk} from "@tsed/platform-test-sdk";
+
+import {rootDir, Server} from "./__mock__/Server.js";
+
+const utils = PlatformTestSdk.create({
+  rootDir,
+  adapter: PlatformKoa as any,
+  server: Server,
+  logger: {
+    level: "off"
+  }
+});
+
+describe("PlatformKoa", () => {
+  describe("Plugin: Multer", () => {
+    utils.test("multer");
+  });
+});

package/vitest.config.mts

@@ -18,4 +18,4 @@ export default defineConfig(
       }
     }
   }
-);
+);