@muhgholy/next-drive 4.6.0 → 4.8.0

package/dist/{chunk-I3AR7V7Z.cjs → chunk-TAG5UMWA.cjs}

@@ -370,70 +370,58 @@ var extractImageMetadata = async (filePath) => {
   }
 };
 var DISPLAY_PRESETS = {
-  "article-header": 0.9,
-  // Hero/banner images - high quality
-  "article-image": 0.85,
-  // In-content images
-  "thumbnail": 0.7,
-  // Small previews - lower quality ok
-  "avatar": 0.8,
-  // Profile pictures
-  "logo": 0.95,
-  // Branding - needs clarity
-  "card": 0.8,
-  // Card components
-  "gallery": 0.85,
-  // Gallery/grid images
-  "og": 0.9,
-  // Open Graph/social sharing
-  "icon": 0.75,
-  // Small icons
-  "cover": 0.9,
-  // Full-width covers
-  "story": 0.85
-  // Story/vertical format
+  "article-header": { ratio: [16, 9], baseWidth: 1200, qualityFactor: 0.9 },
+  "article-image": { ratio: [16, 9], baseWidth: 800, qualityFactor: 0.85 },
+  "thumbnail": { ratio: [1, 1], baseWidth: 150, qualityFactor: 0.7 },
+  "avatar": { ratio: [1, 1], baseWidth: 128, qualityFactor: 0.8 },
+  "logo": { ratio: [2, 1], baseWidth: 200, qualityFactor: 0.95 },
+  "card": { ratio: [4, 3], baseWidth: 400, qualityFactor: 0.8 },
+  "gallery": { ratio: [1, 1], baseWidth: 600, qualityFactor: 0.85 },
+  "og": { ratio: [1200, 630], baseWidth: 1200, qualityFactor: 0.9 },
+  "icon": { ratio: [1, 1], baseWidth: 48, qualityFactor: 0.75 },
+  "cover": { ratio: [16, 9], baseWidth: 1920, qualityFactor: 0.9 },
+  "story": { ratio: [9, 16], baseWidth: 1080, qualityFactor: 0.85 },
+  "video": { ratio: [16, 9], baseWidth: 1280, qualityFactor: 0.85 },
+  "banner": { ratio: [3, 1], baseWidth: 1200, qualityFactor: 0.9 },
+  "portrait": { ratio: [3, 4], baseWidth: 600, qualityFactor: 0.85 },
+  "landscape": { ratio: [4, 3], baseWidth: 800, qualityFactor: 0.85 }
 };
-var SIZE_PRESETS = {
-  // Square sizes
+var SIZE_SCALES = {
+  "xs": 0.25,
+  "sm": 0.5,
+  "md": 1,
+  "lg": 1.5,
+  "xl": 2,
+  "2xl": 2.5
+};
+var STANDALONE_SIZES = {
   "xs": { width: 64, height: 64 },
   "sm": { width: 128, height: 128 },
   "md": { width: 256, height: 256 },
   "lg": { width: 512, height: 512 },
   "xl": { width: 1024, height: 1024 },
   "2xl": { width: 1600, height: 1600 },
-  // Named squares
   "icon": { width: 48, height: 48 },
   "thumb": { width: 150, height: 150 },
   "square": { width: 600, height: 600 },
   "avatar-sm": { width: 64, height: 64 },
   "avatar-md": { width: 128, height: 128 },
   "avatar-lg": { width: 256, height: 256 },
-  // Landscape (16:9)
   "landscape-sm": { width: 480, height: 270 },
   "landscape": { width: 800, height: 450 },
   "landscape-lg": { width: 1280, height: 720 },
   "landscape-xl": { width: 1920, height: 1080 },
-  // Portrait (9:16)
   "portrait-sm": { width: 270, height: 480 },
   "portrait": { width: 450, height: 800 },
   "portrait-lg": { width: 720, height: 1280 },
-  // Wide/Banner (OG, social)
   "wide": { width: 1200, height: 630 },
-  // Open Graph standard
   "banner": { width: 1200, height: 400 },
-  // Banner/header
   "banner-sm": { width: 800, height: 200 },
-  // Classic photo ratios
   "photo-4x3": { width: 800, height: 600 },
-  // 4:3
   "photo-3x2": { width: 900, height: 600 },
-  // 3:2
-  // Story/vertical (9:16)
   "story": { width: 1080, height: 1920 },
-  // Video thumbnails
   "video": { width: 1280, height: 720 },
   "video-sm": { width: 640, height: 360 },
-  // Card sizes
   "card-sm": { width: 300, height: 200 },
   "card": { width: 400, height: 300 },
   "card-lg": { width: 600, height: 400 }
@@ -447,8 +435,24 @@ var getImageSettings = (fileSizeInBytes, qualityPreset, display, size) => {
     const n = parseInt(qualityPreset, 10);
     if (!isNaN(n)) baseQuality = Math.min(100, Math.max(1, n));
   }
-  const displayFactor = display && DISPLAY_PRESETS[display] ? DISPLAY_PRESETS[display] : 1;
-  baseQuality = Math.round(baseQuality * displayFactor);
+  let width;
+  let height;
+  let qualityFactor = 1;
+  const displayPreset = display ? DISPLAY_PRESETS[display] : void 0;
+  if (displayPreset) {
+    qualityFactor = displayPreset.qualityFactor;
+    const [ratioW, ratioH] = displayPreset.ratio;
+    const scale = size && SIZE_SCALES[size] ? SIZE_SCALES[size] : 1;
+    width = Math.round(displayPreset.baseWidth * scale);
+    height = Math.round(width * ratioH / ratioW);
+  } else if (size) {
+    const standalone = STANDALONE_SIZES[size];
+    if (standalone) {
+      width = standalone.width;
+      height = standalone.height;
+    }
+  }
+  baseQuality = Math.round(baseQuality * qualityFactor);
   let quality = baseQuality;
   let effort = 4;
   let pngCompression = 6;
@@ -476,12 +480,11 @@ var getImageSettings = (fileSizeInBytes, qualityPreset, display, size) => {
       pngCompression = 7;
     }
   }
-  const dimensions = size && SIZE_PRESETS[size] ? SIZE_PRESETS[size] : void 0;
   return {
     quality: Math.max(1, Math.min(100, quality)),
     effort,
     pngCompression,
-    ...dimensions && { width: dimensions.width, height: dimensions.height }
+    ...width && height && { width, height }
   };
 };
 var objectIdSchema = zod.z.string().refine((val) => mongoose.isValidObjectId(val), {
@@ -1430,6 +1433,46 @@ var driveDelete = async (source, options) => {
   const owner = drive.owner;
   await provider.delete([driveId], owner, accountId);
 };
+var resolveFolderByPath = async (folderPath, owner, accountId) => {
+  const normalizedPath = folderPath.replace(/^\/+|\/+$/g, "");
+  if (!normalizedPath) {
+    throw new Error("Folder path cannot be empty");
+  }
+  const segments = normalizedPath.split("/").filter((s) => s.length > 0);
+  if (segments.length === 0) {
+    throw new Error("Invalid folder path");
+  }
+  let providerName = "LOCAL";
+  if (accountId && accountId !== "LOCAL") {
+    const account = await drive_default.db.model("StorageAccount").findOne({ _id: accountId, owner });
+    if (!account) {
+      throw new Error("Invalid Storage Account");
+    }
+    if (account.metadata.provider === "GOOGLE") {
+      providerName = "GOOGLE";
+    }
+  }
+  let currentParentId = null;
+  for (const segmentName of segments) {
+    const existingFolder = await drive_default.findOne({
+      owner,
+      "provider.type": providerName,
+      storageAccountId: accountId || null,
+      parentId: currentParentId,
+      name: segmentName,
+      "information.type": "FOLDER",
+      trashedAt: null
+    });
+    if (existingFolder) {
+      currentParentId = String(existingFolder._id);
+    } else {
+      const provider = providerName === "GOOGLE" ? GoogleDriveProvider : LocalStorageProvider;
+      const newFolder = await provider.createFolder(segmentName, currentParentId, owner, accountId);
+      currentParentId = newFolder.id;
+    }
+  }
+  return currentParentId;
+};
 var driveUpload = async (source, key, options) => {
   const config = getDriveConfig();
   let provider = LocalStorageProvider;
@@ -1519,12 +1562,20 @@ var driveUpload = async (source, key, options) => {
         throw new Error("Storage quota exceeded");
       }
     }
+    let resolvedParentId = null;
+    if (options.folder && "path" in options.folder) {
+      resolvedParentId = await resolveFolderByPath(options.folder.path, key, accountId);
+    } else if (options.folder && "id" in options.folder && options.folder.id !== "root") {
+      resolvedParentId = options.folder.id;
+    } else if (options.parentId && options.parentId !== "root") {
+      resolvedParentId = options.parentId;
+    }
     const drive = new drive_default({
       owner: key,
       storageAccountId: accountId || null,
       provider: { type: provider.name },
       name: options.name,
-      parentId: options.parentId === "root" || !options.parentId ? null : options.parentId,
+      parentId: resolvedParentId,
       order: await getNextOrderValue(key),
       information: { type: "FILE", sizeInBytes: fileSize, mime: mimeType, path: "" },
       status: "UPLOADING"
@@ -1685,6 +1736,9 @@ var driveAPIHandler = async (req, res) => {
             const settings = getImageSettings(fileSize, quality, display, sizePreset);
             let targetFormat = format || mime.split("/")[1];
             if (targetFormat === "jpg") targetFormat = "jpeg";
+            if (!["jpeg", "png", "webp", "avif"].includes(targetFormat)) {
+              targetFormat = format || "webp";
+            }
             const cacheDir = path__default.default.join(config.storage.path, "file", drive._id.toString(), "cache");
             const cacheKey = [
               "opt",
@@ -1721,13 +1775,17 @@ var driveAPIHandler = async (req, res) => {
               pipeline = pipeline.png({ compressionLevel: settings.pngCompression, adaptiveFiltering: true });
               res.setHeader("Content-Type", "image/png");
             } else if (targetFormat === "webp") {
-              pipeline = pipeline.webp({ quality: settings.quality, effort: settings.effort });
+              const webpEffort = Math.min(settings.effort, 6);
+              pipeline = pipeline.webp({ quality: settings.quality, effort: webpEffort });
               res.setHeader("Content-Type", "image/webp");
             } else if (targetFormat === "avif") {
               pipeline = pipeline.avif({ quality: settings.quality, effort: settings.effort });
               res.setHeader("Content-Type", "image/avif");
             }
             res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
+            pipeline.on("error", (err) => {
+              console.error("[next-drive] Pipeline error:", err);
+            });
             stream.pipe(pipeline);
             pipeline.clone().toFile(cachePath).catch((e) => console.error("[next-drive] Cache write failed:", e));
             pipeline.clone().pipe(res);
@@ -2282,5 +2340,5 @@ exports.driveReadFile = driveReadFile;
 exports.driveUpload = driveUpload;
 exports.getDriveConfig = getDriveConfig;
 exports.getDriveInformation = getDriveInformation;
-//# sourceMappingURL=chunk-I3AR7V7Z.cjs.map
-//# sourceMappingURL=chunk-I3AR7V7Z.cjs.map
+//# sourceMappingURL=chunk-TAG5UMWA.cjs.map
+//# sourceMappingURL=chunk-TAG5UMWA.cjs.map