@lacrous/omnicloud 0.2.10 → 0.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lacrous/omnicloud",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "SDK and core building blocks for OmniCloud — self-hosted cloud storage powered by your Telegram account.",
   "license": "MIT",
   "type": "module",
@@ -48,9 +48,9 @@
     "prisma": "^6.2.0"
   },
   "devDependencies": {
-    "@omnicloud/core": "0.2.10",
-    "@omnicloud/shared": "0.2.10",
-    "@omnicloud/telegram": "0.2.10",
+    "@omnicloud/core": "0.2.12",
+    "@omnicloud/shared": "0.2.12",
+    "@omnicloud/telegram": "0.2.12",
     "@types/node": "^22.10.0",
     "esbuild": "0.25.12",
     "tsup": "^8.3.0",

package/server/index.js

@@ -935,7 +935,9 @@ var ReconciliationApplier = class {
     const file = (await this.repos.files.listByUser(this.userId)).find(
       (candidate) => candidate.telegramMessageId === action.messageId
     );
-    if (!file) return;
+    if (!file) {
+      throw new Error("No file of yours references this message, so there is nothing to detach");
+    }
     await this.repos.files.update(file.id, { deletedAt: /* @__PURE__ */ new Date(), trashBatchId: null });
   }
   async adopt(action) {
@@ -1591,6 +1593,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) {
@@ -1793,7 +1812,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);
     }
@@ -1967,22 +1989,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 },
@@ -4970,7 +4983,7 @@ function encryptionCheck(configured) {
 }
 
 // ../../apps/api/src/routes/storage.ts
-var VERSION = "0.2.10";
+var VERSION = "0.2.12";
 function registerStorageRoutes(app2, container2) {
   app2.get("/api/health", async () => {
     const database = await probeDatabase(container2);