@kanun-hq/plugin-file 0.1.3 → 0.1.5

package/dist/index.js

@@ -378,6 +378,12 @@ let installed = false;
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function isBlobLike(value) {
+	return typeof Blob !== "undefined" && value instanceof Blob;
+}
+function isArrayBufferReadable(value) {
+	return isRecord(value) && typeof value.arrayBuffer === "function";
+}
 /**
 * Check if the given value is a file or an array of files.
 * 
@@ -385,17 +391,21 @@ function isRecord(value) {
 * @returns 
 */
 function isFileLike(value) {
+	if (isBlobLike(value)) return true;
 	if (!isRecord(value)) return false;
 	return [
 		"buffer",
+		"fieldname",
 		"filename",
 		"height",
+		"lastModified",
 		"mimetype",
 		"name",
 		"originalname",
 		"path",
 		"size",
 		"type",
+		"arrayBuffer",
 		"width"
 	].some((key) => typeof value[key] !== "undefined");
 }
@@ -409,6 +419,10 @@ function normalizeFiles(value) {
 	if (Array.isArray(value)) return value.filter(isFileLike);
 	return isFileLike(value) ? [value] : [];
 }
+function isResolvedFileCandidate(value) {
+	if (Array.isArray(value)) return value.length > 0 && value.every(isFileLike);
+	return isFileLike(value);
+}
 /**
 * Resolve the candidate files for the given attribute and context. T
 * 
@@ -418,7 +432,8 @@ function normalizeFiles(value) {
 * @returns 
 */
 async function resolveCandidateFiles(value, attribute, context) {
-	if (typeof value !== "undefined") return value;
+	if (isResolvedFileCandidate(value)) return value;
+	let resolvedValue;
 	if (pluginOptions.resolveFiles) {
 		const resolved = await pluginOptions.resolveFiles({
 			attribute,
@@ -426,9 +441,13 @@ async function resolveCandidateFiles(value, attribute, context) {
 			data: context.data,
 			value
 		});
-		if (typeof resolved !== "undefined") return resolved;
+		if (isResolvedFileCandidate(resolved)) return resolved;
+		resolvedValue = resolved;
 	}
-	return deepFind(context.context.requestFiles ?? {}, attribute);
+	const requestScopedValue = deepFind(context.context.requestFiles ?? {}, attribute);
+	if (typeof requestScopedValue !== "undefined") return requestScopedValue;
+	if (typeof resolvedValue !== "undefined") return resolvedValue;
+	return value;
 }
 async function resolveFiles(value, attribute, context) {
 	const candidates = await resolveCandidateFiles(value, attribute, context);
@@ -437,12 +456,6 @@ async function resolveFiles(value, attribute, context) {
 		files: normalizeFiles(candidates)
 	};
 }
-function isBlobLike(value) {
-	return typeof Blob !== "undefined" && value instanceof Blob;
-}
-function isArrayBufferReadable(value) {
-	return isRecord(value) && typeof value.arrayBuffer === "function";
-}
 async function getBuffer(file) {
 	if (file.buffer instanceof Uint8Array || Buffer.isBuffer(file.buffer)) return file.buffer;
 	if (file.buffer instanceof ArrayBuffer) return Buffer.from(file.buffer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kanun-hq/plugin-file",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "File validation plugin for Kanun.",
   "type": "module",
   "publishConfig": {