@shipstatic/drop 0.1.7 → 0.1.9

package/dist/index.d.cts

@@ -62,6 +62,7 @@ type DropStateValue = 'idle' | 'dragging' | 'processing' | 'ready' | 'error';
 interface DropStatus {
     title: string;
     details: string;
+    errors?: string[];
 }
 /**
  * State machine state for the drop hook
@@ -84,12 +85,21 @@ interface DropOptions {
     stripPrefix?: boolean;
 }
 interface DropReturn {
-    /** Current state of the drop hook */
-    state: DropState;
+    /** Current phase of the state machine */
+    phase: DropStateValue;
     /** Whether currently processing files (ZIP extraction, etc.) */
     isProcessing: boolean;
     /** Whether user is currently dragging over the dropzone */
     isDragging: boolean;
+    /** Flattened access to files */
+    files: ProcessedFile[];
+    /** Flattened access to source name */
+    sourceName: string;
+    /** Flattened access to status */
+    status: {
+        title: string;
+        details: string;
+    } | null;
     /** Get props to spread on dropzone element (handles drag & drop) */
     getDropzoneProps: () => {
         onDragOver: (e: React.DragEvent) => void;
@@ -115,7 +125,7 @@ interface DropReturn {
     /** Clear all files and reset state */
     clearAll: () => void;
     /** Get only valid files ready for upload */
-    getValidFiles: () => ProcessedFile[];
+    validFiles: ProcessedFile[];
     /** Update upload state for a specific file (status, progress, message) */
     updateFileStatus: (fileId: string, state: {
         status: FileStatus;
@@ -144,7 +154,6 @@ declare function useDrop(options: DropOptions): DropReturn;
  * Unified file processing utilities
  * Converts Files directly to ProcessedFiles
  */
-
 /**
  * Format file size to human-readable string
  * Re-exported from Ship SDK for convenience
@@ -166,16 +175,16 @@ declare function createProcessedFile(file: File, options?: {
     /** Custom path (defaults to webkitRelativePath or file.name) */
     path?: string;
 }): Promise<ProcessedFile>;
-/**
- * Get only the valid files (status: READY) from a list
- * Re-exported from Ship SDK for convenience
- */
-declare const getValidFiles: (files: ProcessedFile[]) => ProcessedFile[];
 /**
  * Strip common directory prefix from file paths
  * Only strips if ALL files share the same prefix
  */
 declare function stripCommonPrefix(files: ProcessedFile[]): ProcessedFile[];
+/**
+ * Recursively traverse FileSystemEntry from drag & drop to collect all files
+ * Properly sets webkitRelativePath to preserve folder structure
+ */
+declare function traverseFileTree(entry: FileSystemEntry, files: File[], currentPath?: string): Promise<void>;
 
 interface ZipExtractionResult {
     /** Extracted files as regular File objects */
@@ -203,4 +212,4 @@ declare function normalizePath(path: string): string;
  */
 declare function isZipFile(file: File): boolean;
 
-export { type ClientError, type DropOptions, type DropReturn, type DropState, type DropStateValue, type DropStatus, FILE_STATUSES, type FileStatus, type ProcessedFile, type ZipExtractionResult, createProcessedFile, extractZipToFiles, formatFileSize, getValidFiles, isZipFile, normalizePath, stripCommonPrefix, useDrop };
+export { type ClientError, type DropOptions, type DropReturn, type DropState, type DropStateValue, type DropStatus, FILE_STATUSES, type FileStatus, type ProcessedFile, type ZipExtractionResult, createProcessedFile, extractZipToFiles, formatFileSize, isZipFile, normalizePath, stripCommonPrefix, traverseFileTree, useDrop };

package/dist/index.d.ts

@@ -62,6 +62,7 @@ type DropStateValue = 'idle' | 'dragging' | 'processing' | 'ready' | 'error';
 interface DropStatus {
     title: string;
     details: string;
+    errors?: string[];
 }
 /**
  * State machine state for the drop hook
@@ -84,12 +85,21 @@ interface DropOptions {
     stripPrefix?: boolean;
 }
 interface DropReturn {
-    /** Current state of the drop hook */
-    state: DropState;
+    /** Current phase of the state machine */
+    phase: DropStateValue;
     /** Whether currently processing files (ZIP extraction, etc.) */
     isProcessing: boolean;
     /** Whether user is currently dragging over the dropzone */
     isDragging: boolean;
+    /** Flattened access to files */
+    files: ProcessedFile[];
+    /** Flattened access to source name */
+    sourceName: string;
+    /** Flattened access to status */
+    status: {
+        title: string;
+        details: string;
+    } | null;
     /** Get props to spread on dropzone element (handles drag & drop) */
     getDropzoneProps: () => {
         onDragOver: (e: React.DragEvent) => void;
@@ -115,7 +125,7 @@ interface DropReturn {
     /** Clear all files and reset state */
     clearAll: () => void;
     /** Get only valid files ready for upload */
-    getValidFiles: () => ProcessedFile[];
+    validFiles: ProcessedFile[];
     /** Update upload state for a specific file (status, progress, message) */
     updateFileStatus: (fileId: string, state: {
         status: FileStatus;
@@ -144,7 +154,6 @@ declare function useDrop(options: DropOptions): DropReturn;
  * Unified file processing utilities
  * Converts Files directly to ProcessedFiles
  */
-
 /**
  * Format file size to human-readable string
  * Re-exported from Ship SDK for convenience
@@ -166,16 +175,16 @@ declare function createProcessedFile(file: File, options?: {
     /** Custom path (defaults to webkitRelativePath or file.name) */
     path?: string;
 }): Promise<ProcessedFile>;
-/**
- * Get only the valid files (status: READY) from a list
- * Re-exported from Ship SDK for convenience
- */
-declare const getValidFiles: (files: ProcessedFile[]) => ProcessedFile[];
 /**
  * Strip common directory prefix from file paths
  * Only strips if ALL files share the same prefix
  */
 declare function stripCommonPrefix(files: ProcessedFile[]): ProcessedFile[];
+/**
+ * Recursively traverse FileSystemEntry from drag & drop to collect all files
+ * Properly sets webkitRelativePath to preserve folder structure
+ */
+declare function traverseFileTree(entry: FileSystemEntry, files: File[], currentPath?: string): Promise<void>;
 
 interface ZipExtractionResult {
     /** Extracted files as regular File objects */
@@ -203,4 +212,4 @@ declare function normalizePath(path: string): string;
  */
 declare function isZipFile(file: File): boolean;
 
-export { type ClientError, type DropOptions, type DropReturn, type DropState, type DropStateValue, type DropStatus, FILE_STATUSES, type FileStatus, type ProcessedFile, type ZipExtractionResult, createProcessedFile, extractZipToFiles, formatFileSize, getValidFiles, isZipFile, normalizePath, stripCommonPrefix, useDrop };
+export { type ClientError, type DropOptions, type DropReturn, type DropState, type DropStateValue, type DropStatus, FILE_STATUSES, type FileStatus, type ProcessedFile, type ZipExtractionResult, createProcessedFile, extractZipToFiles, formatFileSize, isZipFile, normalizePath, stripCommonPrefix, traverseFileTree, useDrop };

package/dist/index.js

@@ -1,5 +1,5 @@
 import { useState, useRef, useMemo, useCallback } from 'react';
-import { formatFileSize as formatFileSize$1, getValidFiles as getValidFiles$1, filterJunk, validateFiles } from '@shipstatic/ship';
+import { formatFileSize as formatFileSize$1, getValidFiles, filterJunk, validateFiles } from '@shipstatic/ship';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -35,9 +35,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // node_modules/.pnpm/jszip@3.10.1/node_modules/jszip/dist/jszip.min.js
 var require_jszip_min = __commonJS({
-  "node_modules/.pnpm/jszip@3.10.1/node_modules/jszip/dist/jszip.min.js"(exports, module) {
+  "node_modules/.pnpm/jszip@3.10.1/node_modules/jszip/dist/jszip.min.js"(exports$1, module) {
     !(function(e) {
-      if ("object" == typeof exports && "undefined" != typeof module) module.exports = e();
+      if ("object" == typeof exports$1 && "undefined" != typeof module) module.exports = e();
       else if ("function" == typeof define && define.amd) define([], e);
       else {
         ("undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : this).JSZip = e();
@@ -2347,7 +2347,7 @@ var require_jszip_min = __commonJS({
 
 // node_modules/.pnpm/mime-db@1.54.0/node_modules/mime-db/db.json
 var require_db = __commonJS({
-  "node_modules/.pnpm/mime-db@1.54.0/node_modules/mime-db/db.json"(exports, module) {
+  "node_modules/.pnpm/mime-db@1.54.0/node_modules/mime-db/db.json"(exports$1, module) {
     module.exports = {
       "application/1d-interleaved-parityfec": {
         source: "iana"
@@ -11695,7 +11695,7 @@ var require_db = __commonJS({
 
 // node_modules/.pnpm/mime-db@1.54.0/node_modules/mime-db/index.js
 var require_mime_db = __commonJS({
-  "node_modules/.pnpm/mime-db@1.54.0/node_modules/mime-db/index.js"(exports, module) {
+  "node_modules/.pnpm/mime-db@1.54.0/node_modules/mime-db/index.js"(exports$1, module) {
     module.exports = require_db();
   }
 });
@@ -11811,7 +11811,6 @@ async function createProcessedFile(file, options) {
     status: FILE_STATUSES.PENDING
   };
 }
-var getValidFiles = getValidFiles$1;
 function stripCommonPrefix(files) {
   if (files.length === 0) return files;
   const paths = files.map((f) => f.path);
@@ -11833,35 +11832,39 @@ function stripCommonPrefix(files) {
   }));
 }
 async function traverseFileTree(entry, files, currentPath = "") {
-  if (entry.isFile) {
-    const file = await new Promise((resolve, reject) => {
-      entry.file(resolve, reject);
-    });
-    const relativePath = currentPath ? `${currentPath}/${file.name}` : file.name;
-    Object.defineProperty(file, "webkitRelativePath", {
-      value: relativePath,
-      writable: false
-    });
-    files.push(file);
-  } else if (entry.isDirectory) {
-    const dirReader = entry.createReader();
-    let allEntries = [];
-    const readEntriesBatch = async () => {
-      const batch = await new Promise(
-        (resolve, reject) => {
-          dirReader.readEntries(resolve, reject);
+  try {
+    if (entry.isFile) {
+      const file = await new Promise((resolve, reject) => {
+        entry.file(resolve, reject);
+      });
+      const relativePath = currentPath ? `${currentPath}/${file.name}` : file.name;
+      Object.defineProperty(file, "webkitRelativePath", {
+        value: relativePath,
+        writable: false
+      });
+      files.push(file);
+    } else if (entry.isDirectory) {
+      const dirReader = entry.createReader();
+      let allEntries = [];
+      const readEntriesBatch = async () => {
+        const batch = await new Promise(
+          (resolve, reject) => {
+            dirReader.readEntries(resolve, reject);
+          }
+        );
+        if (batch.length > 0) {
+          allEntries = allEntries.concat(batch);
+          await readEntriesBatch();
         }
-      );
-      if (batch.length > 0) {
-        allEntries = allEntries.concat(batch);
-        await readEntriesBatch();
+      };
+      await readEntriesBatch();
+      for (const childEntry of allEntries) {
+        const entryPath = childEntry.isDirectory ? currentPath ? `${currentPath}/${childEntry.name}` : childEntry.name : currentPath;
+        await traverseFileTree(childEntry, files, entryPath);
       }
-    };
-    await readEntriesBatch();
-    for (const childEntry of allEntries) {
-      const entryPath = childEntry.isDirectory ? currentPath ? `${currentPath}/${childEntry.name}` : childEntry.name : currentPath;
-      await traverseFileTree(childEntry, files, entryPath);
     }
+  } catch (error) {
+    console.warn(`Error traversing file tree for entry ${entry.name}:`, error);
   }
 }
 function useDrop(options) {
@@ -11882,6 +11885,7 @@ function useDrop(options) {
   const inputRef = useRef(null);
   const isProcessing = useMemo(() => state.value === "processing", [state.value]);
   const isDragging = useMemo(() => state.value === "dragging", [state.value]);
+  const validFiles = useMemo(() => getValidFiles(state.files), [state.files]);
   const processFiles = useCallback(async (newFiles) => {
     if (isProcessingRef.current) {
       console.warn("File processing already in progress. Ignoring duplicate call.");
@@ -11947,7 +11951,11 @@ function useDrop(options) {
           value: "error",
           files: validation.files,
           sourceName: detectedSourceName,
-          status: { title: validation.error.error, details: validation.error.details }
+          status: {
+            title: validation.error.error,
+            details: validation.error.details,
+            errors: validation.error.errors
+          }
         });
         onValidationError?.(validation.error);
       } else if (validation.validFiles.length > 0) {
@@ -11992,9 +12000,6 @@ function useDrop(options) {
     setState(initialState);
     isProcessingRef.current = false;
   }, []);
-  const getValidFilesCallback = useCallback(() => {
-    return getValidFiles(state.files);
-  }, [state.files]);
   const updateFileStatus = useCallback((fileId, fileState) => {
     setState((prev) => ({
       ...prev,
@@ -12027,14 +12032,27 @@ function useDrop(options) {
     let hasEntries = false;
     for (const item of items) {
       if (item.kind === "file") {
-        const entry = item.webkitGetAsEntry?.();
-        if (entry) {
-          hasEntries = true;
-          await traverseFileTree(
-            entry,
-            files,
-            entry.isDirectory ? entry.name : ""
-          );
+        try {
+          const entry = item.webkitGetAsEntry?.();
+          if (entry) {
+            hasEntries = true;
+            await traverseFileTree(
+              entry,
+              files,
+              entry.isDirectory ? entry.name : ""
+            );
+          } else {
+            const file = item.getAsFile();
+            if (file) {
+              files.push(file);
+            }
+          }
+        } catch (error) {
+          console.warn("Error processing drop item:", error);
+          const file = item.getAsFile();
+          if (file) {
+            files.push(file);
+          }
         }
       }
     }
@@ -12072,10 +12090,14 @@ function useDrop(options) {
   }), [handleInputChange]);
   return {
     // State machine
-    state,
+    // state, // REMOVED
     // Convenience getters (computed from state)
+    phase: state.value,
     isProcessing,
     isDragging,
+    files: state.files,
+    sourceName: state.sourceName,
+    status: state.status,
     // Primary API: Prop getters
     getDropzoneProps,
     getInputProps,
@@ -12084,7 +12106,7 @@ function useDrop(options) {
     processFiles,
     clearAll,
     // Helpers
-    getValidFiles: getValidFilesCallback,
+    validFiles,
     updateFileStatus
   };
 }
@@ -12112,6 +12134,6 @@ mime-db/index.js:
    *)
 */
 
-export { FILE_STATUSES, createProcessedFile, extractZipToFiles, formatFileSize, getValidFiles, isZipFile, normalizePath, stripCommonPrefix, useDrop };
+export { FILE_STATUSES, createProcessedFile, extractZipToFiles, formatFileSize, isZipFile, normalizePath, stripCommonPrefix, traverseFileTree, useDrop };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map