@shipstatic/drop 0.3.7 → 1.0.1

package/dist/index.cjs

@@ -9384,7 +9384,7 @@ var require_mime_db = __commonJS({
   }
 });
 
-// node_modules/.pnpm/@shipstatic+types@0.9.8/node_modules/@shipstatic/types/dist/index.js
+// node_modules/.pnpm/@shipstatic+types@1.0.0/node_modules/@shipstatic/types/dist/index.js
 var ErrorType = {
   /** Validation failed (400). Input shape is wrong. */
   Validation: "validation_failed",
@@ -9910,71 +9910,18 @@ function getMimeType(path) {
   const extension = path.includes(".") ? path.substring(path.lastIndexOf(".") + 1).toLowerCase() : "";
   return extensionToMimeMap[extension] || "";
 }
-
-// src/utils/zipExtractor.ts
-async function extractZipToFiles(zipFile) {
-  try {
-    const arrayBuffer = await zipFile.arrayBuffer();
-    const entries = unzipSync(new Uint8Array(arrayBuffer));
-    const files = [];
-    const errors = [];
-    for (const [path, data] of Object.entries(entries)) {
-      if (path.endsWith("/") && data.length === 0) continue;
-      const sanitizedPath = normalizePath(path);
-      if (!sanitizedPath) {
-        errors.push(`Skipped invalid path: ${path}`);
-        continue;
-      }
-      const mimeType = getMimeType(sanitizedPath);
-      const filename = sanitizedPath.split("/").pop() || sanitizedPath;
-      const file = new File([new Uint8Array(data)], filename, {
-        type: mimeType
-      });
-      Object.defineProperty(file, "webkitRelativePath", {
-        value: sanitizedPath,
-        writable: false,
-        configurable: true
-      });
-      files.push(file);
-    }
-    return { files, errors };
-  } catch (error) {
-    return {
-      files: [],
-      errors: [`Failed to load ZIP file: ${error instanceof Error ? error.message : String(error)}`]
-    };
-  }
-}
-function normalizePath(path) {
-  const segments = path.split("/");
-  const normalized = [];
-  for (const segment of segments) {
-    if (segment === "" || segment === ".") {
-      continue;
-    }
-    if (segment === "..") {
-      if (normalized.length > 0) {
-        normalized.pop();
-      }
-      continue;
-    }
-    normalized.push(segment);
-  }
-  return normalized.join("/");
-}
-function isZipFile(file) {
-  return file.type === "application/zip" || file.type === "application/x-zip-compressed" || file.name.toLowerCase().endsWith(".zip");
+function setRelativePath(file, path) {
+  Object.defineProperty(file, "webkitRelativePath", {
+    value: path,
+    writable: false,
+    configurable: true
+  });
 }
-var formatFileSize = ship.formatFileSize;
 function createProcessedFile(file, options) {
-  const webkitPath = file.webkitRelativePath || "";
-  const path = options?.path || (webkitPath && webkitPath.trim() ? webkitPath : file.name);
-  const mimeFromDb = getMimeType(path);
-  const mimeFromBrowser = file.type;
-  const type = mimeFromDb || mimeFromBrowser;
+  const path = options?.path || file.webkitRelativePath?.trim() || file.name;
+  const type = getMimeType(path) || file.type;
   return {
-    // ProcessedFile properties
-    // Note: md5 is intentionally undefined - Ship SDK will calculate it during deployment
+    // md5 is intentionally undefined — Ship SDK calculates it during deployment.
     id: crypto.randomUUID(),
     file,
     path,
@@ -9987,32 +9934,11 @@ function createProcessedFile(file, options) {
 }
 function stripCommonPrefix(files) {
   if (files.length === 0) return files;
-  const paths = files.map((f) => f.path);
-  const segments = paths[0].split("/");
-  let commonDepth = 0;
-  for (let i = 0; i < segments.length - 1; i++) {
-    const segment = segments[i];
-    if (paths.every((p) => p.split("/")[i] === segment)) {
-      commonDepth = i + 1;
-    } else {
-      break;
-    }
-  }
-  if (commonDepth === 0) return files;
-  const prefix = segments.slice(0, commonDepth).join("/") + "/";
-  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
-    };
+  const deployFiles = ship.optimizeDeployPaths(files.map((f) => f.path));
+  return files.map((f, i) => {
+    const newPath = deployFiles[i].path;
+    setRelativePath(f.file, newPath);
+    return { ...f, path: newPath };
   });
 }
 async function traverseFileTree(entry, files, currentPath = "") {
@@ -10022,11 +9948,7 @@ async function traverseFileTree(entry, files, currentPath = "") {
         entry.file(resolve, reject);
       });
       const relativePath = currentPath ? `${currentPath}/${file.name}` : file.name;
-      Object.defineProperty(file, "webkitRelativePath", {
-        value: relativePath,
-        writable: false,
-        configurable: true
-      });
+      setRelativePath(file, relativePath);
       files.push(file);
     } else if (entry.isDirectory) {
       const dirReader = entry.createReader();
@@ -10055,6 +9977,57 @@ async function traverseFileTree(entry, files, currentPath = "") {
     console.warn(`Error traversing file tree for entry ${entry.name}:`, error);
   }
 }
+
+// src/utils/zipExtractor.ts
+async function extractZipToFiles(zipFile) {
+  try {
+    const arrayBuffer = await zipFile.arrayBuffer();
+    const entries = unzipSync(new Uint8Array(arrayBuffer));
+    const files = [];
+    const errors = [];
+    for (const [path, data] of Object.entries(entries)) {
+      if (path.endsWith("/") && data.length === 0) continue;
+      const sanitizedPath = normalizePath(path);
+      if (!sanitizedPath) {
+        errors.push(`Skipped invalid path: ${path}`);
+        continue;
+      }
+      const mimeType = getMimeType(sanitizedPath);
+      const filename = sanitizedPath.split("/").pop() || sanitizedPath;
+      const file = new File([new Uint8Array(data)], filename, {
+        type: mimeType
+      });
+      setRelativePath(file, sanitizedPath);
+      files.push(file);
+    }
+    return { files, errors };
+  } catch (error) {
+    return {
+      files: [],
+      errors: [`Failed to load ZIP file: ${error instanceof Error ? error.message : String(error)}`]
+    };
+  }
+}
+function normalizePath(path) {
+  const segments = path.split("/");
+  const normalized = [];
+  for (const segment of segments) {
+    if (segment === "" || segment === ".") {
+      continue;
+    }
+    if (segment === "..") {
+      if (normalized.length > 0) {
+        normalized.pop();
+      }
+      continue;
+    }
+    normalized.push(segment);
+  }
+  return normalized.join("/");
+}
+function isZipFile(file) {
+  return file.type === "application/zip" || file.type === "application/x-zip-compressed" || file.name.toLowerCase().endsWith(".zip");
+}
 var initialState = {
   value: "idle",
   files: [],
@@ -10124,10 +10097,7 @@ function useDrop(options) {
       } else {
         allFiles.push(...newFiles);
       }
-      const getFilePath = (f) => {
-        const webkitPath = f.webkitRelativePath;
-        return webkitPath && webkitPath.trim() ? webkitPath : f.name;
-      };
+      const getFilePath = (f) => f.webkitRelativePath?.trim() || f.name;
       let filePaths = allFiles.map(getFilePath);
       const needsBuild = filePaths.some((p) => hasUnbuiltMarker(p));
       if (needsBuild) {
@@ -10183,7 +10153,7 @@ function useDrop(options) {
           files: filesWithStatus2,
           sourceName: detectedSourceName,
           needsBuild: true,
-          status: { title: "Ready", details: `${filesWithStatus2.length} file(s) ready \u2014 project will be built` }
+          status: { title: "Ready", details: `${ship.pluralize(filesWithStatus2.length, "file", "files", true)} ready \u2014 project will be built` }
         });
         onFilesReady?.(filesWithStatus2);
         return;
@@ -10211,20 +10181,20 @@ function useDrop(options) {
           needsBuild: false,
           status: {
             title: "Validation Failed",
-            details: `${validation.errors.length} file(s) failed validation`,
+            details: `${ship.pluralize(validation.errors.length, "file", "files", true)} failed validation`,
             errors: errorMessages
           }
         });
         onValidationError?.({
           error: "Validation Failed",
-          details: `${validation.errors.length} error(s)`,
+          details: ship.pluralize(validation.errors.length, "error", "errors", true),
           errors: errorMessages,
           isClientError: true
         });
       } else if (validation.validFiles.length > 0) {
-        let details = `${validation.validFiles.length} file(s) ready`;
+        let details = `${ship.pluralize(validation.validFiles.length, "file", "files", true)} ready`;
         if (validation.warnings.length > 0) {
-          details += ` (${validation.warnings.length} empty file(s) excluded)`;
+          details += ` (${ship.pluralize(validation.warnings.length, "empty file", "empty files", true)} excluded)`;
         }
         setState({
           value: "ready",
@@ -10250,7 +10220,7 @@ function useDrop(options) {
             needsBuild: false,
             status: {
               title: "All files excluded",
-              details: `${validation.warnings.length} file(s) excluded (empty files cannot be deployed)`,
+              details: `${ship.pluralize(validation.warnings.length, "file", "files", true)} excluded (empty files cannot be deployed)`,
               warnings: validation.warnings.map((w) => `${w.file}: ${w.message}`)
             }
           });
@@ -10277,7 +10247,7 @@ function useDrop(options) {
       const clientError = {
         error: isValidation ? "Validation Failed" : "Processing Failed",
         details: isValidation ? message : `Failed to process files: ${message}`,
-        errors: isValidation ? [message] : [],
+        errors: [],
         isClientError: true
       };
       setState({
@@ -10287,8 +10257,7 @@ function useDrop(options) {
         needsBuild: false,
         status: {
           title: clientError.error,
-          details: clientError.details,
-          ...clientError.errors.length > 0 && { errors: clientError.errors }
+          details: clientError.details
         }
       });
       onValidationError?.(clientError);
@@ -10340,11 +10309,7 @@ function useDrop(options) {
           } else {
             const file = item.getAsFile();
             if (file) {
-              Object.defineProperty(file, "webkitRelativePath", {
-                value: file.name,
-                writable: false,
-                configurable: true
-              });
+              setRelativePath(file, file.name);
               files.push(file);
             }
           }
@@ -10432,13 +10397,17 @@ mime-db/index.js:
    *)
 */
 
+Object.defineProperty(exports, "formatFileSize", {
+  enumerable: true,
+  get: function () { return ship.formatFileSize; }
+});
 exports.FILE_STATUSES = FILE_STATUSES;
 exports.createProcessedFile = createProcessedFile;
 exports.extractZipToFiles = extractZipToFiles;
-exports.formatFileSize = formatFileSize;
 exports.getMimeType = getMimeType;
 exports.isZipFile = isZipFile;
 exports.normalizePath = normalizePath;
+exports.setRelativePath = setRelativePath;
 exports.stripCommonPrefix = stripCommonPrefix;
 exports.traverseFileTree = traverseFileTree;
 exports.useDrop = useDrop;