@eggjs/multipart 5.0.0-beta.19 → 5.0.0-beta.21

package/dist/lib/utils.js

@@ -1,71 +1,91 @@
-import path from "node:path";
-import assert from "node:assert";
-import bytes from "bytes";
-
-//#region src/lib/utils.ts
-const whitelist = [
-	".jpg",
-	".jpeg",
-	".png",
-	".gif",
-	".bmp",
-	".wbmp",
-	".webp",
-	".tif",
-	".psd",
-	".svg",
-	".js",
-	".jsx",
-	".json",
-	".css",
-	".less",
-	".html",
-	".htm",
-	".xml",
-	".zip",
-	".gz",
-	".tgz",
-	".gzip",
-	".mp3",
-	".mp4",
-	".avi"
+import path from 'node:path';
+import assert from 'node:assert';
+import bytes from 'bytes';
+export const whitelist = [
+    // images
+    '.jpg',
+    '.jpeg', // image/jpeg
+    '.png', // image/png, image/x-png
+    '.gif', // image/gif
+    '.bmp', // image/bmp
+    '.wbmp', // image/vnd.wap.wbmp
+    '.webp',
+    '.tif',
+    '.psd',
+    // text
+    '.svg',
+    '.js',
+    '.jsx',
+    '.json',
+    '.css',
+    '.less',
+    '.html',
+    '.htm',
+    '.xml',
+    // tar
+    '.zip',
+    '.gz',
+    '.tgz',
+    '.gzip',
+    // video
+    '.mp3',
+    '.mp4',
+    '.avi',
 ];
-function humanizeBytes(size) {
-	if (typeof size === "number") return size;
-	return bytes(size);
+export function humanizeBytes(size) {
+    if (typeof size === 'number') {
+        return size;
+    }
+    return bytes(size);
 }
-function normalizeOptions(options) {
-	options.fileSize = humanizeBytes(options.fileSize);
-	options.fieldSize = humanizeBytes(options.fieldSize);
-	options.fieldNameSize = humanizeBytes(options.fieldNameSize);
-	options.mode = options.mode || "stream";
-	assert(["stream", "file"].includes(options.mode), `Expect mode to be 'stream' or 'file', but got '${options.mode}'`);
-	if (options.mode === "file") assert(!options.fileModeMatch, "`fileModeMatch` options only work on stream mode, please remove it");
-	if (Array.isArray(options.whitelist)) options.whitelist = options.whitelist.map((extname) => extname.toLowerCase());
-	if (Array.isArray(options.fileExtensions)) options.fileExtensions = options.fileExtensions.map((extname) => {
-		return extname.startsWith(".") || extname === "" ? extname.toLowerCase() : `.${extname.toLowerCase()}`;
-	});
-	function checkExt(fileName) {
-		if (typeof options.whitelist === "function") return options.whitelist(fileName);
-		const extname = path.extname(fileName).toLowerCase();
-		if (Array.isArray(options.whitelist)) return options.whitelist.includes(extname);
-		return whitelist.includes(extname) || options.fileExtensions.includes(extname);
-	}
-	options.checkFile = (_fieldName, fileStream, fileName) => {
-		if (!fileStream || !fileName) return;
-		try {
-			if (!checkExt(fileName)) {
-				const err = /* @__PURE__ */ new Error("Invalid filename: " + fileName);
-				Reflect.set(err, "status", 400);
-				return err;
-			}
-		} catch (err) {
-			err.status = 400;
-			return err;
-		}
-	};
-	return options;
+export function normalizeOptions(options) {
+    // make sure to cast the value of config **Size to number
+    options.fileSize = humanizeBytes(options.fileSize);
+    options.fieldSize = humanizeBytes(options.fieldSize);
+    options.fieldNameSize = humanizeBytes(options.fieldNameSize);
+    // validate mode
+    options.mode = options.mode || 'stream';
+    assert(['stream', 'file'].includes(options.mode), `Expect mode to be 'stream' or 'file', but got '${options.mode}'`);
+    if (options.mode === 'file') {
+        assert(!options.fileModeMatch, '`fileModeMatch` options only work on stream mode, please remove it');
+    }
+    // normalize whitelist
+    if (Array.isArray(options.whitelist)) {
+        options.whitelist = options.whitelist.map(extname => extname.toLowerCase());
+    }
+    // normalize fileExtensions
+    if (Array.isArray(options.fileExtensions)) {
+        options.fileExtensions = options.fileExtensions.map(extname => {
+            return extname.startsWith('.') || extname === '' ? extname.toLowerCase() : `.${extname.toLowerCase()}`;
+        });
+    }
+    function checkExt(fileName) {
+        if (typeof options.whitelist === 'function') {
+            return options.whitelist(fileName);
+        }
+        const extname = path.extname(fileName).toLowerCase();
+        if (Array.isArray(options.whitelist)) {
+            return options.whitelist.includes(extname);
+        }
+        // only if user don't provide whitelist, we will use default whitelist + fileExtensions
+        return whitelist.includes(extname) || options.fileExtensions.includes(extname);
+    }
+    options.checkFile = (_fieldName, fileStream, fileName) => {
+        // just ignore, if no file
+        if (!fileStream || !fileName)
+            return;
+        try {
+            if (!checkExt(fileName)) {
+                const err = new Error('Invalid filename: ' + fileName);
+                Reflect.set(err, 'status', 400);
+                return err;
+            }
+        }
+        catch (err) {
+            err.status = 400;
+            return err;
+        }
+    };
+    return options;
 }
-
-//#endregion
-export { humanizeBytes, normalizeOptions, whitelist };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUM3QixPQUFPLE1BQU0sTUFBTSxhQUFhLENBQUM7QUFFakMsT0FBTyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBRzFCLE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRztJQUN2QixTQUFTO0lBQ1QsTUFBTTtJQUNOLE9BQU8sRUFBRSxhQUFhO0lBQ3RCLE1BQU0sRUFBRSx5QkFBeUI7SUFDakMsTUFBTSxFQUFFLFlBQVk7SUFDcEIsTUFBTSxFQUFFLFlBQVk7SUFDcEIsT0FBTyxFQUFFLHFCQUFxQjtJQUM5QixPQUFPO0lBQ1AsTUFBTTtJQUNOLE1BQU07SUFDTixPQUFPO0lBQ1AsTUFBTTtJQUNOLEtBQUs7SUFDTCxNQUFNO0lBQ04sT0FBTztJQUNQLE1BQU07SUFDTixPQUFPO0lBQ1AsT0FBTztJQUNQLE1BQU07SUFDTixNQUFNO0lBQ04sTUFBTTtJQUNOLE1BQU07SUFDTixLQUFLO0lBQ0wsTUFBTTtJQUNOLE9BQU87SUFDUCxRQUFRO0lBQ1IsTUFBTTtJQUNOLE1BQU07SUFDTixNQUFNO0NBQ1AsQ0FBQztBQUVGLE1BQU0sVUFBVSxhQUFhLENBQUMsSUFBcUI7SUFDakQsSUFBSSxPQUFPLElBQUksS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM3QixPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQVcsQ0FBQztBQUMvQixDQUFDO0FBRUQsTUFBTSxVQUFVLGdCQUFnQixDQUFDLE9BQXdCO0lBQ3ZELHlEQUF5RDtJQUN6RCxPQUFPLENBQUMsUUFBUSxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDbkQsT0FBTyxDQUFDLFNBQVMsR0FBRyxhQUFhLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FB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

package/dist/types.d.ts

@@ -1,24 +1,22 @@
-import { EggFile, MultipartFileStream, MultipartOptions } from "./app/extend/context.js";
-import { MultipartConfig } from "./config/config.default.js";
-
-//#region src/types.d.ts
+import type { MultipartConfig } from './config/config.default.ts';
+import type { EggFile, MultipartFileStream, MultipartOptions } from './app/extend/context.ts';
 declare module 'egg' {
-  interface EggAppConfig {
-    /**
-     * multipart parser options
-     * @member Config#multipart
-     */
-    multipart: MultipartConfig;
-  }
-  interface Request {
-    /**
-     * Files Object Array
-     */
-    files?: EggFile[];
-  }
-  interface Context {
-    saveRequestFiles(options?: MultipartOptions): Promise<void>;
-    getFileStream(options?: MultipartOptions): Promise<MultipartFileStream>;
-    cleanupRequestFiles(files?: EggFile[]): Promise<void>;
-  }
-}
+    interface EggAppConfig {
+        /**
+         * multipart parser options
+         * @member Config#multipart
+         */
+        multipart: MultipartConfig;
+    }
+    interface Request {
+        /**
+         * Files Object Array
+         */
+        files?: EggFile[];
+    }
+    interface Context {
+        saveRequestFiles(options?: MultipartOptions): Promise<void>;
+        getFileStream(options?: MultipartOptions): Promise<MultipartFileStream>;
+        cleanupRequestFiles(files?: EggFile[]): Promise<void>;
+    }
+}

package/dist/types.js

@@ -1 +1,2 @@
-export {  };
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/multipart",
-  "version": "5.0.0-beta.19",
+  "version": "5.0.0-beta.21",
   "description": "multipart plugin for egg",
   "eggPlugin": {
     "name": "multipart",
@@ -52,7 +52,7 @@
     "egg-path-matching": "^2.0.0"
   },
   "peerDependencies": {
-    "egg": "4.1.0-beta.19"
+    "egg": "4.1.0-beta.21"
   },
   "devDependencies": {
     "@types/bytes": "^3.1.5",
@@ -64,9 +64,9 @@
     "typescript": "^5.9.3",
     "urllib": "^4.8.2",
     "vitest": "4.0.0-beta.16",
-    "@eggjs/tsconfig": "3.1.0-beta.19",
-    "@eggjs/schedule": "6.0.0-beta.19",
-    "@eggjs/mock": "7.0.0-beta.19"
+    "@eggjs/mock": "7.0.0-beta.21",
+    "@eggjs/schedule": "6.0.0-beta.21",
+    "@eggjs/tsconfig": "3.1.0-beta.21"
   },
   "files": [
     "dist"
@@ -75,7 +75,7 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsdown",
+    "build": "tsdown && rimraf dist && tsc -b --clean && tsc",
     "typecheck": "tsc --noEmit",
     "lint": "oxlint --type-aware",
     "lint:fix": "npm run lint -- --fix",