tycho-components 0.26.0 → 0.26.1

package/dist/features/TreeView/cytoscape/CytoscapeTreeConverter.d.ts

@@ -13,12 +13,14 @@ export default class CytoscapeTreeConverter {
     private isEmptyCategoryInChunk;
     private convertEmptyCategory;
     private convertChunk;
+    private shouldChunkClaimToken;
     private removeTemporaryEdges;
     private generateChunkId;
     private generateTokenId;
     private generateLeafId;
     private findParent;
     private findContainingChunks;
+    private findTightestContainingChunk;
     private tightestChunk;
     private initTree;
     private sortChunks;

package/dist/features/TreeView/cytoscape/CytoscapeTreeConverter.js

@@ -160,12 +160,7 @@ export default class CytoscapeTreeConverter {
         });
         const tokens = this.getTokens(struct, chunk);
         for (const token of tokens) {
-            if (token.ec)
-                continue;
-            if (token.l !== chunk.l)
-                continue;
-            const dominator = this.tightestChunk(this.findContainingChunks(struct, chunk.l, token.p, token.p));
-            if (!dominator || this.generateChunkId(dominator) !== nodeId)
+            if (!this.shouldChunkClaimToken(struct, chunk, token))
                 continue;
             tree.edges.push({
                 data: {
@@ -176,6 +171,20 @@ export default class CytoscapeTreeConverter {
             });
         }
     }
+    shouldChunkClaimToken(struct, chunk, token) {
+        if (token.ec)
+            return false;
+        if (token.l === 0 && chunk.l > 0) {
+            const dominator = this.findTightestContainingChunk(struct, token.p, token.p);
+            return (dominator !== null &&
+                this.generateChunkId(dominator) === this.generateChunkId(chunk));
+        }
+        if (token.l !== chunk.l)
+            return false;
+        const dominator = this.tightestChunk(this.findContainingChunks(struct, chunk.l, token.p, token.p));
+        return (dominator !== null &&
+            this.generateChunkId(dominator) === this.generateChunkId(chunk));
+    }
     removeTemporaryEdges(tree, struct, chunk) {
         let levelCount = 1;
         let leveledChunks = this.getChunksByLevel(struct, chunk, levelCount);
@@ -183,6 +192,8 @@ export default class CytoscapeTreeConverter {
             for (const upperChunk of leveledChunks) {
                 const upperChunkId = this.generateChunkId(upperChunk);
                 for (const token of this.getTokens(struct, chunk)) {
+                    if (!this.shouldChunkClaimToken(struct, chunk, token))
+                        continue;
                     const tokenId = this.generateTokenId(token);
                     tree.edges = [
                         ...tree.edges.filter((e) => !(e.data.source === upperChunkId && e.data.target === tokenId)),
@@ -222,6 +233,9 @@ export default class CytoscapeTreeConverter {
     findContainingChunks(struct, level, i, f) {
         return struct.chunks.filter((c) => c.l === level && i >= c.i && f <= c.f);
     }
+    findTightestContainingChunk(struct, i, f, minLevel = 1) {
+        return this.tightestChunk(struct.chunks.filter((c) => c.l >= minLevel && i >= c.i && f <= c.f));
+    }
     tightestChunk(chunks) {
         if (chunks.length === 0)
             return null;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tycho-components",
   "private": false,
-  "version": "0.26.0",
+  "version": "0.26.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {