@lacrous/omnicloud 0.2.10 → 0.2.12

package/dist/index.cjs

@@ -1998,6 +1998,23 @@ var FileService = class {
   }
 };
 
+// ../core/src/utils/folder-order.ts
+function deepestFirst(folderIds, folders) {
+  const byId = new Map(folders.map((folder) => [folder.id, folder]));
+  const depthOf = (id) => {
+    let depth = 0;
+    const seen = /* @__PURE__ */ new Set();
+    let cursor = byId.get(id)?.parentId ?? null;
+    while (cursor !== null && !seen.has(cursor)) {
+      seen.add(cursor);
+      depth += 1;
+      cursor = byId.get(cursor)?.parentId ?? null;
+    }
+    return depth;
+  };
+  return [...folderIds].sort((a, b) => depthOf(b) - depthOf(a));
+}
+
 // ../core/src/services/folder-service.ts
 var FolderService = class {
   constructor(folders, files, engineFor, activity = noopActivityRecorder) {
@@ -2204,7 +2221,10 @@ var FolderService = class {
     const remainingFolderIds = new Set(
       affected.filter((file) => !removedFileIds.includes(file.id)).map((file) => file.folderId)
     );
-    const deletable = folderIds.filter((folderId) => !remainingFolderIds.has(folderId));
+    const deletable = deepestFirst(
+      folderIds.filter((folderId) => !remainingFolderIds.has(folderId)),
+      subtree
+    );
     if (deletable.length > 0) {
       await this.folders.deleteMany(deletable);
     }
@@ -2385,22 +2405,13 @@ var TrashService = class {
     }
     const allFolders = await this.folders.listByUser(userId);
     const trashedFolders = allFolders.filter((folder) => folder.deletedAt !== null);
-    const depth = (folder) => {
-      let level = 0;
-      let cursor = folder.parentId;
-      const seen = /* @__PURE__ */ new Set();
-      while (cursor !== null && !seen.has(cursor)) {
-        seen.add(cursor);
-        const parent = allFolders.find((candidate) => candidate.id === cursor);
-        if (!parent) break;
-        level += 1;
-        cursor = parent.parentId;
-      }
-      return level;
-    };
-    trashedFolders.sort((a, b) => depth(a) - depth(b));
+    const orderedIds = deepestFirst(
+      trashedFolders.map((folder) => folder.id),
+      allFolders
+    );
     let deletedFolders = 0;
-    for (const folder of trashedFolders) {
+    for (const folderId of orderedIds) {
+      const folder = trashedFolders.find((candidate) => candidate.id === folderId);
       const stillHasFiles = await this.files.query(
         userId,
         { folderId: folder.id, trashed: true },