@shipstatic/drop 0.1.8 → 0.1.10

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;
@@ -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);
@@ -11827,10 +11826,20 @@ function stripCommonPrefix(files) {
   }
   if (commonDepth === 0) return files;
   const prefix = segments.slice(0, commonDepth).join("/") + "/";
-  return files.map((f) => ({
-    ...f,
-    path: f.path.startsWith(prefix) ? f.path.slice(prefix.length) : f.path
-  }));
+  return files.map((f) => {
+    const newPath = f.path.startsWith(prefix) ? f.path.slice(prefix.length) : f.path;
+    if (f.file) {
+      Object.defineProperty(f.file, "webkitRelativePath", {
+        value: newPath,
+        writable: false,
+        configurable: true
+      });
+    }
+    return {
+      ...f,
+      path: newPath
+    };
+  });
 }
 async function traverseFileTree(entry, files, currentPath = "") {
   try {
@@ -11841,7 +11850,8 @@ async function traverseFileTree(entry, files, currentPath = "") {
       const relativePath = currentPath ? `${currentPath}/${file.name}` : file.name;
       Object.defineProperty(file, "webkitRelativePath", {
         value: relativePath,
-        writable: false
+        writable: false,
+        configurable: true
       });
       files.push(file);
     } else if (entry.isDirectory) {
@@ -11886,6 +11896,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.");
@@ -11951,7 +11962,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) {
@@ -11996,9 +12011,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,
@@ -12028,21 +12040,21 @@ function useDrop(options) {
     e.preventDefault();
     const items = Array.from(e.dataTransfer.items);
     const files = [];
-    let hasEntries = false;
+    const entriesToTraverse = [];
     for (const item of items) {
       if (item.kind === "file") {
         try {
           const entry = item.webkitGetAsEntry?.();
-          if (entry) {
-            hasEntries = true;
-            await traverseFileTree(
-              entry,
-              files,
-              entry.isDirectory ? entry.name : ""
-            );
+          if (entry && entry.isDirectory) {
+            entriesToTraverse.push({ entry, path: entry.name });
           } else {
             const file = item.getAsFile();
             if (file) {
+              Object.defineProperty(file, "webkitRelativePath", {
+                value: file.name,
+                writable: false,
+                configurable: true
+              });
               files.push(file);
             }
           }
@@ -12055,7 +12067,12 @@ function useDrop(options) {
         }
       }
     }
-    if (!hasEntries && e.dataTransfer.files.length > 0) {
+    if (entriesToTraverse.length > 0) {
+      await Promise.all(entriesToTraverse.map(
+        (item) => traverseFileTree(item.entry, files, item.path)
+      ));
+    }
+    if (files.length === 0 && e.dataTransfer.files.length > 0) {
       files.push(...Array.from(e.dataTransfer.files));
     }
     if (files.length > 0) {
@@ -12089,10 +12106,13 @@ function useDrop(options) {
   }), [handleInputChange]);
   return {
     // State machine
-    state,
     // 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,
@@ -12101,7 +12121,7 @@ function useDrop(options) {
     processFiles,
     clearAll,
     // Helpers
-    getValidFiles: getValidFilesCallback,
+    validFiles,
     updateFileStatus
   };
 }
@@ -12129,6 +12149,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