Refactor code; update package version to 3.2.13

CallbackStorage.d.ts

@@ -3,7 +3,7 @@ import { FileInfo } from "busboy";
 import { FileHandler, StorageOption } from "./index";
 
 export declare class CallbackStorage implements StorageOption {
-	callback: FileHandler;
+	#callback: FileHandler;
 	constructor(callback: FileHandler);
 	process(name: string, stream: Readable, info: FileInfo): import("./index").File | Promise<import("./index").File>;
 }

CallbackStorage.js

@@ -1,12 +1,12 @@
 "use strict";
 
 class CallbackStorage {
-	callback;
+	#callback;
 	constructor(callback) {
-		this.callback = callback;
+		this.#callback = callback;
 	}
 	process(name, stream, info) {
-		return this.callback(name, stream, info);
+		return this.#callback(name, stream, info);
 	}
 }
 

DiscStorage.d.ts

@@ -3,7 +3,7 @@ import { Readable } from "stream";
 import { FileInfo } from "busboy";
 
 export declare class DiscStorage implements StorageOption {
-	target: TargetType;
+	#target: TargetType;
 	constructor(target: TargetType);
 	process(name: string, stream: Readable, info: FileInfo): Promise<File>;
 }

DiscStorage.js

@@ -7,12 +7,12 @@ const os = require("os");
 const fs = require("fs");
 
 class DiscStorage {
-	target;
+	#target;
 	constructor(target) {
-		this.target = target;
+		this.#target = target;
 	}
 	process(name, stream, info) {
-		const target = this.target;
+		const target = this.#target;
 		const file = new FileInternal(name, info);
 		const saveLocation = typeof target === "function" ? target(file) : target;
 		const filePath = path.join(saveLocation?.directory || os.tmpdir(), saveLocation?.fileName || file.originalName);

FieldParserNoSchema.d.ts

@@ -0,0 +1,5 @@
+import { FieldParser } from "./index";
+
+export declare class FieldParserNoSchema implements FieldParser {
+	parseField(name: string, value: any): any;
+}

FieldParserNoSchema.js

@@ -0,0 +1,9 @@
+"use strict";
+
+class FieldParserNoSchema {
+	parseField(name, value) {
+		return value;
+	}
+}
+
+exports.FieldParserNoSchema = FieldParserNoSchema;

FieldParserWithSchema.d.ts

@@ -0,0 +1,7 @@
+import { Dictionary, FieldParser } from "./index";
+
+export declare class FieldParserWithSchema implements FieldParser {
+	#props: Dictionary;
+	constructor(props: Dictionary);
+	parseField(name: string, value: any): any;
+}

FieldParserWithSchema.js

@@ -0,0 +1,20 @@
+"use strict";
+
+class FieldParserWithSchema {
+	#props;
+	constructor(props) {
+		this.#props = props;
+	}
+	parseField(name, value) {
+		if (this.#props[name]?.type !== "string") {
+			try {
+				return JSON.parse(value);
+			} catch {
+				void 0;
+			}
+		}
+		return value;
+	}
+}
+
+exports.FieldParserWithSchema = FieldParserWithSchema;

index.d.ts

@@ -15,20 +15,23 @@ export interface File {
 	data: Buffer | undefined;
 	error: Error | undefined;
 }
-export declare type FileHandler = (name: string, stream: Readable, info: FileInfo) => File | Promise<File>;
+export type FileHandler = (name: string, stream: Readable, info: FileInfo) => File | Promise<File>;
 export interface StorageOption {
 	process: FileHandler;
 }
 export interface FileSaveTarget {
 	directory?: string;
 	fileName?: string;
 }
-export declare type TargetType = FileSaveTarget | ((source: File) => FileSaveTarget);
+export type TargetType = FileSaveTarget | ((source: File) => FileSaveTarget);
 export interface FormDataParserPluginOptions extends FastifyPluginOptions {
 	limits?: Limits;
 	storage?: StorageOption;
 }
-export declare type FormDataParserPlugin = FastifyPluginAsync<FormDataParserPluginOptions> & Dictionary;
+export type FormDataParserPlugin = FastifyPluginAsync<FormDataParserPluginOptions> & Dictionary;
+export interface FieldParser {
+	parseField(name: string, value: any): any;
+}
 declare module "fastify" {
 	interface FastifyRequest {
 		__files__?: Array<File>;

index.js

@@ -1,23 +1,18 @@
 "use strict";
 
 const { StreamStorage } = require("./StreamStorage");
+const { FieldParserNoSchema } = require("./FieldParserNoSchema");
+const { FieldParserWithSchema } = require("./FieldParserWithSchema");
 const busboy = require("busboy");
 const { finished } = require("stream");
 
-const tryParse = value => {
-	try {
-		return JSON.parse(value);
-	} catch {
-		return value;
-	}
-};
 const formDataParser = async (instance, options) => {
 	const { limits, storage = new StreamStorage() } = options;
 	instance.addContentTypeParser("multipart/form-data", (request, message, done) => {
 		const results = [];
 		const body = new Map();
 		const props = request.routeOptions.schema?.body?.properties;
-		const parseField = props ? (name, value) => (props[name]?.type === "string" ? value : tryParse(value)) : (name, value) => value;
+		const parser = props ? new FieldParserWithSchema(props) : new FieldParserNoSchema();
 		const bus = busboy({ headers: message.headers, limits, defParamCharset: "utf8" });
 		bus.on("file", (name, stream, info) => {
 			results.push(storage.process(name, stream, info));
@@ -33,7 +28,7 @@ const formDataParser = async (instance, options) => {
 			body.set(name, [fileProp, JSON.stringify(info)]);
 		});
 		bus.on("field", (name, value) => {
-			body.set(name, parseField(name, value));
+			body.set(name, parser.parseField(name, value));
 		});
 		finished(bus, (err = null) => {
 			Promise.all(results).then(files => {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "formzilla",
-	"version": "3.2.12",
+	"version": "3.2.13",
 	"description": "Fastify plugin for parsing multipart/form data",
 	"main": "index.js",
 	"scripts": {
@@ -32,8 +32,8 @@
 		"@fastify/swagger"
 	],
 	"devDependencies": {
-		"@types/busboy": "^1.5.3",
-		"ava": "^6.1.2",
+		"@types/busboy": "^1.5.4",
+		"ava": "^6.1.3",
 		"form-data": "^4.0.0"
 	},
 	"ava": {