@zag-js/file-utils 2.0.0-next.2 → 2.0.0-next.3

package/dist/index.d.mts

@@ -4,8 +4,8 @@ export { DownloadFileOptions, downloadFile } from './download-file.mjs';
 export { getAcceptAttrString } from './get-accept-attr.mjs';
 export { getFileDataUrl } from './get-file-data-url.mjs';
 export { getTotalFileSize } from './get-total-file-size.mjs';
-export { isFileEqual } from './is-file-equal.mjs';
+export { getFileKey, isFileEqual } from './is-file-equal.mjs';
 export { isValidFileSize } from './is-valid-file-size.mjs';
-export { isValidFileType } from './is-valid-file-type.mjs';
+export { createFileTypeValidator, isValidFileType } from './is-valid-file-type.mjs';
 export { getFileMimeType } from './get-file-mime-type.mjs';
 export { ApplicationFileMimeType, AudioFileMimeType, FileError, FileMimeType, FileMimeTypeGroup, FontFileMimeType, ImageFileMimeType, TextFileMimeType, VideoFileMimeType } from './types.mjs';

package/dist/index.d.ts

@@ -4,8 +4,8 @@ export { DownloadFileOptions, downloadFile } from './download-file.js';
 export { getAcceptAttrString } from './get-accept-attr.js';
 export { getFileDataUrl } from './get-file-data-url.js';
 export { getTotalFileSize } from './get-total-file-size.js';
-export { isFileEqual } from './is-file-equal.js';
+export { getFileKey, isFileEqual } from './is-file-equal.js';
 export { isValidFileSize } from './is-valid-file-size.js';
-export { isValidFileType } from './is-valid-file-type.js';
+export { createFileTypeValidator, isValidFileType } from './is-valid-file-type.js';
 export { getFileMimeType } from './get-file-mime-type.js';
 export { ApplicationFileMimeType, AudioFileMimeType, FileError, FileMimeType, FileMimeTypeGroup, FontFileMimeType, ImageFileMimeType, TextFileMimeType, VideoFileMimeType } from './types.js';

package/dist/is-file-equal.d.mts

@@ -1,3 +1,4 @@
 declare const isFileEqual: (file1: File, file2: File) => boolean;
+declare const getFileKey: (file: File) => string;
 
-export { isFileEqual };
+export { getFileKey, isFileEqual };

package/dist/is-file-equal.d.ts

@@ -1,3 +1,4 @@
 declare const isFileEqual: (file1: File, file2: File) => boolean;
+declare const getFileKey: (file: File) => string;
 
-export { isFileEqual };
+export { getFileKey, isFileEqual };

package/dist/is-file-equal.js

@@ -20,13 +20,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/is-file-equal.ts
 var is_file_equal_exports = {};
 __export(is_file_equal_exports, {
+  getFileKey: () => getFileKey,
   isFileEqual: () => isFileEqual
 });
 module.exports = __toCommonJS(is_file_equal_exports);
 var isFileEqual = (file1, file2) => {
   return file1.name === file2.name && file1.size === file2.size && file1.type === file2.type;
 };
+var getFileKey = (file) => {
+  return `${file.name}|${file.size}|${file.type}`;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getFileKey,
   isFileEqual
 });

package/dist/is-file-equal.mjs

@@ -2,6 +2,10 @@
 var isFileEqual = (file1, file2) => {
   return file1.name === file2.name && file1.size === file2.size && file1.type === file2.type;
 };
+var getFileKey = (file) => {
+  return `${file.name}|${file.size}|${file.type}`;
+};
 export {
+  getFileKey,
   isFileEqual
 };

package/dist/is-valid-file-type.d.mts

@@ -1,5 +1,9 @@
 import { FileError } from './types.mjs';
 
+/**
+ * Parses `accept` once and returns a validator, so checking many files does not re-parse it per file.
+ */
+declare function createFileTypeValidator(accept: string[] | string | undefined): (file: File) => [boolean, FileError | null];
 declare function isValidFileType(file: File, accept: string | undefined): [boolean, FileError | null];
 
-export { isValidFileType };
+export { createFileTypeValidator, isValidFileType };

package/dist/is-valid-file-type.d.ts

@@ -1,5 +1,9 @@
 import { FileError } from './types.js';
 
+/**
+ * Parses `accept` once and returns a validator, so checking many files does not re-parse it per file.
+ */
+declare function createFileTypeValidator(accept: string[] | string | undefined): (file: File) => [boolean, FileError | null];
 declare function isValidFileType(file: File, accept: string | undefined): [boolean, FileError | null];
 
-export { isValidFileType };
+export { createFileTypeValidator, isValidFileType };

package/dist/is-valid-file-type.js

@@ -20,35 +20,50 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/is-valid-file-type.ts
 var is_valid_file_type_exports = {};
 __export(is_valid_file_type_exports, {
+  createFileTypeValidator: () => createFileTypeValidator,
   isValidFileType: () => isValidFileType
 });
 module.exports = __toCommonJS(is_valid_file_type_exports);
 var import_get_file_mime_type = require("./get-file-mime-type.js");
-function isFileAccepted(file, accept) {
-  if (file && accept) {
-    const types = Array.isArray(accept) ? accept : typeof accept === "string" ? accept.split(",") : [];
-    if (types.length === 0) return true;
-    const fileName = file.name || "";
-    const mimeType = (file.type || (0, import_get_file_mime_type.getFileMimeType)(fileName) || "").toLowerCase();
-    const baseMimeType = mimeType.replace(/\/.*$/, "");
-    return types.some((type) => {
-      const validType = type.trim().toLowerCase();
-      if (validType.charAt(0) === ".") {
-        return fileName.toLowerCase().endsWith(validType);
-      }
-      if (validType.endsWith("/*")) {
-        return baseMimeType === validType.replace(/\/.*$/, "");
-      }
-      return mimeType === validType;
-    });
+function parseAccept(accept) {
+  if (!accept) return null;
+  const types = Array.isArray(accept) ? accept : accept.split(",");
+  const matchers = { extensions: [], baseMimes: [], mimes: [] };
+  for (const type of types) {
+    const validType = type.trim().toLowerCase();
+    if (validType.charAt(0) === ".") matchers.extensions.push(validType);
+    else if (validType.endsWith("/*")) matchers.baseMimes.push(validType.slice(0, validType.indexOf("/")));
+    else matchers.mimes.push(validType);
   }
-  return true;
+  if (!matchers.extensions.length && !matchers.baseMimes.length && !matchers.mimes.length) return null;
+  return matchers;
+}
+function matches(matchers, file) {
+  const fileName = file.name || "";
+  const mimeType = (file.type || (0, import_get_file_mime_type.getFileMimeType)(fileName) || "").toLowerCase();
+  if (matchers.mimes.includes(mimeType)) return true;
+  if (matchers.baseMimes.length) {
+    const slash = mimeType.indexOf("/");
+    if (matchers.baseMimes.includes(slash === -1 ? mimeType : mimeType.slice(0, slash))) return true;
+  }
+  if (matchers.extensions.length) {
+    const lowerName = fileName.toLowerCase();
+    if (matchers.extensions.some((ext) => lowerName.endsWith(ext))) return true;
+  }
+  return false;
+}
+function createFileTypeValidator(accept) {
+  const matchers = parseAccept(accept);
+  return function isValidFileType2(file) {
+    const isAcceptable = file.type === "application/x-moz-file" || !matchers || matches(matchers, file);
+    return [isAcceptable, isAcceptable ? null : "FILE_INVALID_TYPE"];
+  };
 }
 function isValidFileType(file, accept) {
-  const isAcceptable = file.type === "application/x-moz-file" || isFileAccepted(file, accept);
-  return [isAcceptable, isAcceptable ? null : "FILE_INVALID_TYPE"];
+  return createFileTypeValidator(accept)(file);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  createFileTypeValidator,
   isValidFileType
 });

package/dist/is-valid-file-type.mjs

@@ -1,29 +1,43 @@
 // src/is-valid-file-type.ts
 import { getFileMimeType } from "./get-file-mime-type.mjs";
-function isFileAccepted(file, accept) {
-  if (file && accept) {
-    const types = Array.isArray(accept) ? accept : typeof accept === "string" ? accept.split(",") : [];
-    if (types.length === 0) return true;
-    const fileName = file.name || "";
-    const mimeType = (file.type || getFileMimeType(fileName) || "").toLowerCase();
-    const baseMimeType = mimeType.replace(/\/.*$/, "");
-    return types.some((type) => {
-      const validType = type.trim().toLowerCase();
-      if (validType.charAt(0) === ".") {
-        return fileName.toLowerCase().endsWith(validType);
-      }
-      if (validType.endsWith("/*")) {
-        return baseMimeType === validType.replace(/\/.*$/, "");
-      }
-      return mimeType === validType;
-    });
+function parseAccept(accept) {
+  if (!accept) return null;
+  const types = Array.isArray(accept) ? accept : accept.split(",");
+  const matchers = { extensions: [], baseMimes: [], mimes: [] };
+  for (const type of types) {
+    const validType = type.trim().toLowerCase();
+    if (validType.charAt(0) === ".") matchers.extensions.push(validType);
+    else if (validType.endsWith("/*")) matchers.baseMimes.push(validType.slice(0, validType.indexOf("/")));
+    else matchers.mimes.push(validType);
   }
-  return true;
+  if (!matchers.extensions.length && !matchers.baseMimes.length && !matchers.mimes.length) return null;
+  return matchers;
+}
+function matches(matchers, file) {
+  const fileName = file.name || "";
+  const mimeType = (file.type || getFileMimeType(fileName) || "").toLowerCase();
+  if (matchers.mimes.includes(mimeType)) return true;
+  if (matchers.baseMimes.length) {
+    const slash = mimeType.indexOf("/");
+    if (matchers.baseMimes.includes(slash === -1 ? mimeType : mimeType.slice(0, slash))) return true;
+  }
+  if (matchers.extensions.length) {
+    const lowerName = fileName.toLowerCase();
+    if (matchers.extensions.some((ext) => lowerName.endsWith(ext))) return true;
+  }
+  return false;
+}
+function createFileTypeValidator(accept) {
+  const matchers = parseAccept(accept);
+  return function isValidFileType2(file) {
+    const isAcceptable = file.type === "application/x-moz-file" || !matchers || matches(matchers, file);
+    return [isAcceptable, isAcceptable ? null : "FILE_INVALID_TYPE"];
+  };
 }
 function isValidFileType(file, accept) {
-  const isAcceptable = file.type === "application/x-moz-file" || isFileAccepted(file, accept);
-  return [isAcceptable, isAcceptable ? null : "FILE_INVALID_TYPE"];
+  return createFileTypeValidator(accept)(file);
 }
 export {
+  createFileTypeValidator,
   isValidFileType
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zag-js/file-utils",
-  "version": "2.0.0-next.2",
+  "version": "2.0.0-next.3",
   "description": "JS File API utilities",
   "keywords": [
     "js",
@@ -27,10 +27,11 @@
   },
   "clean-package": "../../../clean-package.config.json",
   "dependencies": {
-    "@zag-js/i18n-utils": "2.0.0-next.2"
+    "@zag-js/i18n-utils": "2.0.0-next.3"
   },
   "devDependencies": {
-    "clean-package": "2.2.0"
+    "clean-package": "2.2.0",
+    "vitest": "^4.1.2"
   },
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -49,6 +50,7 @@
   },
   "scripts": {
     "build": "tsup",
+    "test": "vitest",
     "lint": "oxlint src",
     "typecheck": "tsc --noEmit",
     "mime": "node script/mime-types.mjs"