core-3nweb-client-lib 0.44.1 → 0.44.2

package/build/lib-client/xsp-fs/folder-node.js

@@ -1096,13 +1096,11 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             const nodes = state.nodes;
             const remoteNodes = remote.folderInfo.nodes;
             const events = [];
-            if (removed) {
-                for (const { name, removedIn } of removed) {
-                    if (removedIn === 'r') {
-                        const node = nodes[name];
-                        delete nodes[name];
-                        events.push(this.makeEntryRemovalEvent(newVersion, 'sync', node));
-                    }
+            if (removed === null || removed === void 0 ? void 0 : removed.inRemote) {
+                for (const name of removed.inRemote) {
+                    const node = nodes[name];
+                    delete nodes[name];
+                    events.push(this.makeEntryRemovalEvent(newVersion, 'sync', node));
                 }
             }
             if (renamed) {
@@ -1122,19 +1120,17 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                     }
                 }
             }
-            if (added) {
-                for (const { name, addedIn } of added) {
-                    if (addedIn === 'r') {
-                        const node = remoteNodes[name];
-                        (0, assert_1.assert)(!!node);
-                        if (nameOverlaps === null || nameOverlaps === void 0 ? void 0 : nameOverlaps.includes(name)) {
-                            while (nodes[node.name]) {
-                                node.name = `${node.name}${opts === null || opts === void 0 ? void 0 : opts.postfixForNameOverlaps}`;
-                            }
+            if (added === null || added === void 0 ? void 0 : added.inRemote) {
+                for (const name of added.inRemote) {
+                    const node = remoteNodes[name];
+                    (0, assert_1.assert)(!!node);
+                    if (nameOverlaps === null || nameOverlaps === void 0 ? void 0 : nameOverlaps.includes(name)) {
+                        while (nodes[node.name]) {
+                            node.name = `${node.name}${opts === null || opts === void 0 ? void 0 : opts.postfixForNameOverlaps}`;
                         }
-                        nodes[node.name] = node;
-                        events.push(this.makeEntryAdditionEvent(newVersion, 'sync', node));
                     }
+                    nodes[node.name] = node;
+                    events.push(this.makeEntryAdditionEvent(newVersion, 'sync', node));
                 }
             }
             return events;
@@ -1188,9 +1184,9 @@ function addToTransitionState(state, f, key) {
 function diffNodes(current, remote, synced) {
     const currentNodesById = orderByIds(current.nodes);
     const syncedNodesById = orderByIds(synced.nodes);
-    const removed = [];
+    const removed = { inLocal: [], inRemote: [] };
     const renamed = [];
-    const added = [];
+    const added = { inLocal: [], inRemote: [] };
     const rekeyed = [];
     const nameOverlaps = [];
     for (const remoteNode of Object.values(remote.nodes)) {
@@ -1229,10 +1225,10 @@ function diffNodes(current, remote, synced) {
         else {
             const syncedNode = syncedNodesById.get(remoteNode.objId);
             if (syncedNode) {
-                removed.push({ name: remoteNode.name, removedIn: 'l' });
+                removed.inLocal.push(remoteNode.name);
             }
             else {
-                added.push({ name: remoteNode.name, addedIn: 'r' });
+                added.inRemote.push(remoteNode.name);
             }
             if (current.nodes[remoteNode.name]) {
                 nameOverlaps.push(remoteNode.name);
@@ -1242,13 +1238,13 @@ function diffNodes(current, remote, synced) {
     for (const localNode of currentNodesById.values()) {
         const syncedNode = syncedNodesById.get(localNode.objId);
         if (!syncedNode) {
-            added.push({ name: localNode.name, addedIn: 'l' });
+            added.inLocal.push(localNode.name);
         }
     }
     return {
-        removed: ((removed.length > 0) ? removed : undefined),
+        removed: reduceEmptyIn(removed),
         renamed: ((renamed.length > 0) ? renamed : undefined),
-        added: ((added.length > 0) ? added : undefined),
+        added: reduceEmptyIn(added),
         rekeyed: ((rekeyed.length > 0) ? rekeyed : undefined),
         nameOverlaps: ((nameOverlaps.length > 0) ? nameOverlaps : undefined),
     };
@@ -1291,4 +1287,22 @@ function identifyChanges(originalNodes, newNodes) {
     }
     return { addedNodes, removedNodes, renamedNodes };
 }
+function reduceEmptyIn(c) {
+    if (c.inLocal.length > 0) {
+        if (c.inRemote.length > 0) {
+            return c;
+        }
+        else {
+            return { inLocal: c.inLocal };
+        }
+    }
+    else {
+        if (c.inRemote.length > 0) {
+            return { inRemote: c.inRemote };
+        }
+        else {
+            return;
+        }
+    }
+}
 Object.freeze(exports);

package/build/lib-client/xsp-fs/fs.js

@@ -859,24 +859,9 @@ class S {
             throw (0, file_1.makeFileException)('notDirectory', `${path}/${remoteItemName}`);
         }
     }
-    // async adoptAllRemoteItems(
-    // 	path: string, opts?: OptionsToAdoptAllRemoteItems
-    // ): Promise<number|undefined> {
-    // 	const folderNode = await this.getFolderNode(path);
-    // 	return await folderNode.adoptItemsFromRemoteVersion(opts);
-    // }
     async mergeFolderCurrentAndRemoteVersions(path, opts) {
         const folderNode = await this.getFolderNode(path);
-        const newLocalVersion = await folderNode.mergeCurrentAndRemoteVersions(opts);
-        if (newLocalVersion && (newLocalVersion < 0)) {
-            const { folderPath } = split(path);
-            if (folderPath.length > 0) {
-                const parent = await this.n.get(folderPath.join('/'));
-                // XXX removing folder in parent -- what happens with children?
-                await parent.removeChild(folderNode);
-            }
-        }
-        return newLocalVersion;
+        return await folderNode.mergeCurrentAndRemoteVersions(opts);
     }
 }
 Object.freeze(S.prototype);