@muhgholy/next-drive 4.6.0 → 4.7.0

package/README.md

@@ -269,18 +269,28 @@ Upload files programmatically from server-side code:
 ```typescript
 import { driveUpload } from "@muhgholy/next-drive/server";
 
-// Upload from file path
+// Upload to specific folder by ID
 const file = await driveUpload(
 	"/tmp/photo.jpg",
 	{ userId: "123" },
 	{
 		name: "photo.jpg",
-		parentId: "folderId", // Optional: folder ID or null for root
+		folder: { id: "folderId" }, // Optional: folder ID
 		accountId: "LOCAL", // Optional: storage account ID
 		enforce: false, // Optional: bypass quota check
 	}
 );
 
+// Upload to folder by path (creates folders if not exist)
+const file = await driveUpload(
+	"/tmp/photo.jpg",
+	{ userId: "123" },
+	{
+		name: "photo.jpg",
+		folder: { path: "images/2024/january" }, // Creates folders recursively
+	}
+);
+
 // Upload from stream
 import fs from "fs";
 const stream = fs.createReadStream("/tmp/video.mp4");
@@ -307,13 +317,14 @@ const file = await driveUpload(
 
 **Options:**
 
-| Option      | Type             | Required | Description                                              |
-| ----------- | ---------------- | -------- | -------------------------------------------------------- |
-| `name`      | `string`         | Yes      | File name with extension                                 |
-| `parentId`  | `string \| null` | No       | Parent folder ID (null or 'root' for root)               |
-| `accountId` | `string`         | No       | Storage account ID ('LOCAL' for local storage)           |
-| `mime`      | `string`         | No       | MIME type (auto-detected from extension if not provided) |
-| `enforce`   | `boolean`        | No       | Bypass quota check (default: false)                      |
+| Option       | Type                              | Required | Description                                              |
+| ------------ | --------------------------------- | -------- | -------------------------------------------------------- |
+| `name`       | `string`                          | Yes      | File name with extension                                 |
+| `folder.id`  | `string`                          | No       | Parent folder ID                                         |
+| `folder.path`| `string`                          | No       | Folder path (e.g., `images/2024`) - creates if not exist |
+| `accountId`  | `string`                          | No       | Storage account ID ('LOCAL' for local storage)           |
+| `mime`       | `string`                          | No       | MIME type (auto-detected from extension if not provided) |
+| `enforce`    | `boolean`                         | No       | Bypass quota check (default: false)                      |
 
 ### Get Signed URL
 

package/dist/{chunk-UT2XCOS7.js → chunk-OWKTTRQC.js}

@@ -1417,6 +1417,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;
@@ -1506,12 +1546,20 @@ var driveUpload = async (source, key, options) => {
         throw new Error("Storage quota exceeded");
       }
     }
+    let resolvedParentId = null;
+    if (options.folder?.path) {
+      resolvedParentId = await resolveFolderByPath(options.folder.path, key, accountId);
+    } else if (options.folder?.id && 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"
@@ -2258,5 +2306,5 @@ var driveAPIHandler = async (req, res) => {
 };
 
 export { driveAPIHandler, driveConfiguration, driveDelete, driveFilePath, driveFileSchemaZod, driveGetUrl, driveInfo, driveList, driveReadFile, driveUpload, getDriveConfig, getDriveInformation };
-//# sourceMappingURL=chunk-UT2XCOS7.js.map
-//# sourceMappingURL=chunk-UT2XCOS7.js.map
+//# sourceMappingURL=chunk-OWKTTRQC.js.map
+//# sourceMappingURL=chunk-OWKTTRQC.js.map