core-3nweb-client-lib 0.44.1 → 0.44.2

package/build/api-defs/files.d.ts

@@ -1559,16 +1559,16 @@ declare namespace web3n.files {
 	interface FolderDiff extends CommonDiff {
 
 		/**
-		 * Items that were removed. Pointing to where removal is done in remote (r), or local (l) branches.
+		 * Items that were removed.
 		 * 
 		 * Consider the following example.
 		 * Item that is removed in local version is present in both remote and synced versions.
 		 * Hence, difference between local and remote versions is due to removal in local branch.
 		 */
 		removed?: {
-			name: string;
-			removedIn: 'l'|'r';
-		}[];
+			inRemote?: string[];
+			inLocal?: string[];
+		};
 
 		/**
 		 * Items that were renamed. Pointing to where renaming is done in remote (r), or local (l) branches.
@@ -1583,15 +1583,15 @@ declare namespace web3n.files {
 		}[];
 
 		/**
-		 * Items that were added. Pointing to where addition is done in remote (r), or local (l) branches.
+		 * Items that were added.
 		 * 
 		 * When item added in remote branch, then it is present in remote version under the referenced name.
 		 * Synced (older) state of folder doesn't have it, and neither does local.
 		 */
 		added?: {
-			name: string;
-			addedIn: 'l'|'r';
-		}[];
+			inRemote?: string[];
+			inLocal?: string[];
+		};
 
 		/**
 		 * Items that reencrypted and now have different keys.

package/build/core-ipc/fs.js

@@ -2213,10 +2213,8 @@ function folderDiffToMsg(diff) {
     }
     return {
         ...file.commonDiffToMsg(diff),
-        added: (diff.added && (diff.added.length > 0) ?
-            diff.added.map(({ name, addedIn }) => ({ name, addedIn })) : undefined),
-        removed: (diff.removed && (diff.removed.length > 0) ?
-            diff.removed.map(({ name, removedIn }) => ({ name, removedIn })) : undefined),
+        added: diff.added,
+        removed: diff.removed,
         renamed: (diff.renamed && (diff.renamed.length > 0) ?
             diff.renamed.map(({ local, remote, renamedIn }) => ({ local, remote, renamedIn })) : undefined),
         rekeyed: (diff.rekeyed && (diff.rekeyed.length > 0) ?
@@ -2230,13 +2228,37 @@ function folderDiffFromMsg(msg) {
     }
     return {
         ...file.commonDiffFromMsg(msg),
-        added: (msg.added ? msg.added : undefined),
-        removed: (msg.removed ? msg.removed : undefined),
-        renamed: (msg.renamed ? msg.renamed : undefined),
-        rekeyed: (msg.rekeyed ? msg.rekeyed : undefined),
-        nameOverlaps: (msg.nameOverlaps ? msg.nameOverlaps : undefined),
+        added: reduceEmptyIn(msg.added),
+        removed: reduceEmptyIn(msg.removed),
+        renamed: reduceEmptyArr(msg.renamed),
+        rekeyed: reduceEmptyArr(msg.rekeyed),
+        nameOverlaps: reduceEmptyArr(msg.nameOverlaps),
     };
 }
+function reduceEmptyIn(c) {
+    if (!c) {
+        return;
+    }
+    if (c.inLocal && (c.inLocal.length > 0)) {
+        if (c.inRemote && (c.inRemote.length > 0)) {
+            return c;
+        }
+        else {
+            return { inLocal: c.inLocal };
+        }
+    }
+    else {
+        if (c.inRemote && (c.inRemote.length > 0)) {
+            return { inRemote: c.inRemote };
+        }
+        else {
+            return;
+        }
+    }
+}
+function reduceEmptyArr(arr) {
+    return (arr && (arr.length > 0) ? arr : undefined);
+}
 var vsDiffCurrentAndRemoteFolderVersions;
 (function (vsDiffCurrentAndRemoteFolderVersions) {
     const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteFolderVersionsRequestBody);