core-3nweb-client-lib 0.43.20 → 0.44.0

package/build/core-ipc/fs.js

@@ -106,6 +106,7 @@ function makeFSCaller(caller, fsMsg) {
                 startDownload: vsDownload.makeCaller(caller, vsPath),
                 adoptRemote: vsAdoptRemote.makeCaller(caller, vsPath),
                 diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.makeCaller(caller, vsPath),
+                diffCurrentAndRemoteFileVersions: vsDiffCurrentAndRemoteFileVersions.makeCaller(caller, vsPath),
                 statRemoteItem: vsStatRemoteItem.makeCaller(caller, vsPath),
                 listRemoteFolderItem: vsListRemoteFolderItem.makeCaller(caller, vsPath),
                 getRemoteFileItem: vsGetRemoteFileItem.makeCaller(caller, vsPath),
@@ -115,7 +116,7 @@ function makeFSCaller(caller, fsMsg) {
                 fs.v.sync.startUpload = vsStartUpload.makeCaller(caller, vsPath);
                 fs.v.sync.upload = vsUpload.makeCaller(caller, vsPath);
                 fs.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.makeCaller(caller, vsPath);
-                fs.v.sync.adoptAllRemoteItems = vsAdoptAllRemoteItems.makeCaller(caller, vsPath);
+                fs.v.sync.mergeFolderCurrentAndRemoteVersions = vsMergeFolderCurrentAndRemoteVersions.makeCaller(caller, vsPath);
             }
         }
     }
@@ -193,13 +194,14 @@ function exposeFSService(fs, expServices) {
                 listRemoteFolderItem: vsListRemoteFolderItem.wrapService(fs.v.sync.listRemoteFolderItem),
                 getRemoteFileItem: vsGetRemoteFileItem.wrapService(fs.v.sync.getRemoteFileItem, expServices),
                 getRemoteFolderItem: vsGetRemoteFolderItem.wrapService(fs.v.sync.getRemoteFolderItem, expServices),
-                diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFolderVersions)
+                diffCurrentAndRemoteFolderVersions: vsDiffCurrentAndRemoteFolderVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFolderVersions),
+                diffCurrentAndRemoteFileVersions: vsDiffCurrentAndRemoteFileVersions.wrapService(fs.v.sync.diffCurrentAndRemoteFileVersions)
             };
             if (fs.writable) {
                 implExp.v.sync.startUpload = vsStartUpload.wrapService(fs.v.sync.startUpload);
                 implExp.v.sync.upload = vsUpload.wrapService(fs.v.sync.upload);
                 implExp.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.wrapService(fs.v.sync.adoptRemoteFolderItem);
-                implExp.v.sync.adoptAllRemoteItems = vsAdoptAllRemoteItems.wrapService(fs.v.sync.adoptAllRemoteItems);
+                implExp.v.sync.mergeFolderCurrentAndRemoteVersions = vsMergeFolderCurrentAndRemoteVersions.wrapService(fs.v.sync.mergeFolderCurrentAndRemoteVersions);
             }
         }
     }
@@ -1975,9 +1977,9 @@ var vsAdoptRemoteFolderItem;
     vsAdoptRemoteFolderItem.makeCaller = makeCaller;
 })(vsAdoptRemoteFolderItem || (vsAdoptRemoteFolderItem = {}));
 Object.freeze(vsAdoptRemoteFolderItem);
-var vsAdoptAllRemoteItems;
-(function (vsAdoptAllRemoteItems) {
-    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AdoptAllRemoteFolderItemsRequestBody);
+var vsMergeFolderCurrentAndRemoteVersions;
+(function (vsMergeFolderCurrentAndRemoteVersions) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MergeFolderCurrentAndRemoteVersionsRequestBody);
     function optionsFromMsg(msg) {
         if (!msg) {
             return;
@@ -1998,7 +2000,7 @@ var vsAdoptAllRemoteItems;
             postfixForNameOverlaps: (0, protobuf_msg_1.toOptVal)(opts.postfixForNameOverlaps),
         };
     }
-    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AdoptAllRemoteFolderItemsReplyBody);
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MergeFolderCurrentAndRemoteVersionsReplyBody);
     function wrapService(fn) {
         return buf => {
             const { path, opts } = requestType.unpack(buf);
@@ -2007,16 +2009,16 @@ var vsAdoptAllRemoteItems;
             return { promise };
         };
     }
-    vsAdoptAllRemoteItems.wrapService = wrapService;
+    vsMergeFolderCurrentAndRemoteVersions.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'adoptAllRemoteItems');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'mergeFolderCurrentAndRemoteVersions');
         return (path, opts) => caller
             .startPromiseCall(ipcPath, requestType.pack({ path, opts: optionsToMsg(opts) }))
             .then(buf => (0, protobuf_msg_1.valOfOptInt)(replyType.unpack(buf).newVersion));
     }
-    vsAdoptAllRemoteItems.makeCaller = makeCaller;
-})(vsAdoptAllRemoteItems || (vsAdoptAllRemoteItems = {}));
-Object.freeze(vsAdoptAllRemoteItems);
+    vsMergeFolderCurrentAndRemoteVersions.makeCaller = makeCaller;
+})(vsMergeFolderCurrentAndRemoteVersions || (vsMergeFolderCurrentAndRemoteVersions = {}));
+Object.freeze(vsMergeFolderCurrentAndRemoteVersions);
 var vsAdoptRemote;
 (function (vsAdoptRemote) {
     const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AdoptRemoteRequestBody);
@@ -2181,35 +2183,45 @@ var vArchiveCurrent;
     vArchiveCurrent.makeCaller = makeCaller;
 })(vArchiveCurrent || (vArchiveCurrent = {}));
 Object.freeze(vArchiveCurrent);
+var vsDiffCurrentAndRemoteFileVersions;
+(function (vsDiffCurrentAndRemoteFileVersions) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteFileVersionsRequestBody);
+    const replyType = file.vsDiffCurrentAndRemoteVersions.replyType;
+    function wrapService(fn) {
+        return buf => {
+            const { path, opts } = requestType.unpack(buf);
+            const promise = fn(path, file.vsDiffCurrentAndRemoteVersions.optsFromMsg(opts))
+                .then(diff => replyType.pack({ diff: file.fileDiffToMsg(diff) }));
+            return { promise };
+        };
+    }
+    vsDiffCurrentAndRemoteFileVersions.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'diffCurrentAndRemoteFileVersions');
+        return (path, opts) => caller
+            .startPromiseCall(ipcPath, requestType.pack({
+            path, opts: file.vsDiffCurrentAndRemoteVersions.optsToMsg(opts)
+        }))
+            .then(buf => file.fileDiffFromMsg(replyType.unpack(buf).diff));
+    }
+    vsDiffCurrentAndRemoteFileVersions.makeCaller = makeCaller;
+})(vsDiffCurrentAndRemoteFileVersions || (vsDiffCurrentAndRemoteFileVersions = {}));
+Object.freeze(vsDiffCurrentAndRemoteFileVersions);
 function folderDiffToMsg(diff) {
-    var _a, _b, _c, _d;
     if (!diff) {
         return;
     }
     return {
-        remoteVersion: (0, protobuf_msg_1.toOptVal)(diff.remoteVersion),
-        currentVersion: diff.currentVersion,
-        isCurrentLocal: diff.isCurrentLocal,
-        isRemoteRemoved: diff.isRemoteRemoved,
-        inCurrent: (_a = diff.inCurrent) === null || _a === void 0 ? void 0 : _a.map(lsEntryToMsg),
-        inRemote: (_b = diff.inRemote) === null || _b === void 0 ? void 0 : _b.map(lsEntryToMsg),
-        nameOverlaps: diff.nameOverlaps,
-        differentKeys: diff.differentKeys,
-        differentNames: diff.differentNames,
-        ctime: diffTStoMsg(diff.ctime),
-        mtime: diffTStoMsg(diff.mtime),
-        xattrs: (diff.xattrs ? {
-            inCurrent: (_c = diff.xattrs.inCurrent) === null || _c === void 0 ? void 0 : _c.map(({ name, value }) => file.xattrToMsg(name, value)),
-            inRemote: (_d = diff.xattrs.inRemote) === null || _d === void 0 ? void 0 : _d.map(({ name, value }) => file.xattrToMsg(name, value)),
-            nameOverlaps: diff.xattrs.nameOverlaps
-        } : undefined)
-    };
-}
-function diffTStoMsg(diffTS) {
-    var _a;
-    return {
-        current: diffTS.current.valueOf(),
-        remote: (0, protobuf_msg_1.toOptVal)((_a = diffTS.remote) === null || _a === void 0 ? void 0 : _a.valueOf())
+        ...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),
+        renamed: (diff.renamed && (diff.renamed.length > 0) ?
+            diff.renamed.map(({ local, remote, renamedIn }) => ({ local, remote, renamedIn })) : undefined),
+        rekeyed: (diff.rekeyed && (diff.rekeyed.length > 0) ?
+            diff.rekeyed.map(({ local, remote, rekeyedIn }) => ({ local, remote, rekeyedIn })) : undefined),
+        nameOverlaps: (diff.nameOverlaps && (diff.nameOverlaps.length > 0) ? diff.nameOverlaps.concat() : undefined)
     };
 }
 function folderDiffFromMsg(msg) {
@@ -2217,36 +2229,17 @@ function folderDiffFromMsg(msg) {
         return;
     }
     return {
-        remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion),
-        currentVersion: (0, protobuf_msg_1.fixInt)(msg.currentVersion),
-        isCurrentLocal: msg.isCurrentLocal,
-        isRemoteRemoved: msg.isRemoteRemoved,
-        inCurrent: ((msg.inCurrent && (msg.inCurrent.length > 0)) ? msg.inCurrent.map(lsEntryFromMsg) : undefined),
-        inRemote: ((msg.inRemote && (msg.inRemote.length > 0)) ? msg.inRemote.map(lsEntryFromMsg) : undefined),
-        nameOverlaps: ((msg.nameOverlaps && (msg.nameOverlaps.length > 0)) ? msg.nameOverlaps : undefined),
-        differentKeys: ((msg.differentKeys && (msg.differentKeys.length > 0)) ? msg.differentKeys : undefined),
-        differentNames: ((msg.differentNames && (msg.differentNames.length > 0)) ? msg.differentNames : undefined),
-        ctime: diffTSfromMsg(msg.ctime),
-        mtime: diffTSfromMsg(msg.mtime),
-        xattrs: (msg.xattrs ? {
-            inCurrent: ((msg.xattrs.inCurrent && (msg.xattrs.inCurrent.length > 0)) ?
-                msg.xattrs.inCurrent.map(file.xattrFromMsg) : undefined),
-            inRemote: ((msg.xattrs.inRemote && (msg.xattrs.inRemote.length > 0)) ?
-                msg.xattrs.inRemote.map(file.xattrFromMsg) : undefined),
-            nameOverlaps: ((msg.xattrs.nameOverlaps && (msg.xattrs.nameOverlaps.length > 0)) ?
-                msg.xattrs.nameOverlaps : undefined)
-        } : undefined)
-    };
-}
-function diffTSfromMsg(m) {
-    return {
-        current: new Date((0, protobuf_msg_1.fixInt)(m.current)),
-        remote: (m.remote ? new Date((0, protobuf_msg_1.intValOf)(m.remote)) : undefined)
+        ...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),
     };
 }
 var vsDiffCurrentAndRemoteFolderVersions;
 (function (vsDiffCurrentAndRemoteFolderVersions) {
-    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteRequestBody);
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteFolderVersionsRequestBody);
     const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.DiffCurrentAndRemoteReplyBody);
     function wrapService(fn) {
         return buf => {