core-3nweb-client-lib 0.45.1 → 0.45.2

package/build/lib-client/xsp-fs/folder-node.d.ts

@@ -143,6 +143,7 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     createFile(name: string, exclusive: boolean): Promise<FileNode>;
     createLink(name: string, params: LinkParameters<any>): Promise<void>;
     removeChild(f: NodeInFS<any>): Promise<void>;
+    removeChildEntryUnconditionally(name: string): Promise<void>;
     private changeChildName;
     moveChildTo(childName: string, dst: FolderNode, nameInDst: string): Promise<void>;
     private moveChildOut;

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

@@ -612,6 +612,16 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         // stays consistent
         this.callRemoveObjOn('local', f);
     }
+    async removeChildEntryUnconditionally(name) {
+        await this.doTransition(async (state, version) => {
+            const child = state.nodes[name];
+            if (!child) {
+                return [];
+            }
+            delete state.nodes[name];
+            return this.makeEntryRemovalEvent(version, 'local', child);
+        });
+    }
     changeChildName(oldName, newName) {
         return this.doTransition(async (state, version) => {
             const child = state.nodes[oldName];

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

@@ -146,32 +146,62 @@ class XspFS {
         if (typeof folderName !== 'string') {
             throw new Error('Cannot remove root folder');
         }
-        const folder = (await parentFolder.getFolder(folderName)
-            .catch(setExcPath(path)));
-        if (!removeContent && !folder.isEmpty()) {
-            throw (0, file_1.makeFileException)('notEmpty', path);
+        try {
+            const folder = (await parentFolder.getFolder(folderName)
+                .catch(setExcPath(path)));
+            if (!removeContent && !folder.isEmpty()) {
+                throw (0, file_1.makeFileException)('notEmpty', path);
+            }
+            // note that internal folder.delete() removes all children as a matter
+            // of not leaving inaccessible nodes, i.e. content is removed implicitly
+            await parentFolder.removeChild(folder);
+        }
+        catch (exc) {
+            if (exc.type === 'secondary') {
+                await parentFolder.removeChildEntryUnconditionally(folderName);
+            }
+            else {
+                throw exc;
+            }
         }
-        // note that internal folder.delete() removes all children as a matter
-        // of not leaving inaccessible nodes, i.e. content is removed implicitly
-        await parentFolder.removeChild(folder);
     }
     async deleteFile(path) {
         const { fileName, folderPath } = split(path);
         const root = this.v.getRootIfNotClosed(path);
         const parentFolder = await root.getFolderInThisSubTree(folderPath)
             .catch(setExcPath(path));
-        const file = await parentFolder.getFile(fileName)
-            .catch(setExcPath(path));
-        await parentFolder.removeChild(file);
+        try {
+            const file = await parentFolder.getFile(fileName)
+                .catch(setExcPath(path));
+            await parentFolder.removeChild(file);
+        }
+        catch (exc) {
+            if (exc.type === 'secondary') {
+                await parentFolder.removeChildEntryUnconditionally(fileName);
+            }
+            else {
+                throw exc;
+            }
+        }
     }
     async deleteLink(path) {
         const { fileName, folderPath } = split(path);
         const root = this.v.getRootIfNotClosed(path);
         const parentFolder = await root.getFolderInThisSubTree(folderPath)
             .catch(setExcPath(path));
-        const link = await parentFolder.getLink(fileName)
-            .catch(setExcPath(path));
-        await parentFolder.removeChild(link);
+        try {
+            const link = await parentFolder.getLink(fileName)
+                .catch(setExcPath(path));
+            await parentFolder.removeChild(link);
+        }
+        catch (exc) {
+            if (exc.type === 'secondary') {
+                await parentFolder.removeChildEntryUnconditionally(fileName);
+            }
+            else {
+                throw exc;
+            }
+        }
     }
     async move(initPath, newPath) {
         const srcFolderPath = splitPathIntoParts(initPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.45.1",
+  "version": "0.45.2",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -47,8 +47,8 @@
     "@types/node": "^22.13.14",
     "@types/punycode": "^2.1.1",
     "@types/ws": "^8.18.1",
-    "napi-nacl": "^1.2.0",
     "jasmine": "^5.13.0",
+    "napi-nacl": "^1.2.1",
     "protobufjs-cli": "^1.0.2",
     "spec-3nweb-server": "^1.8.5",
     "tsuml2": "^0.17.1",