Fix bug in external node resolution

Author: Marius Brill

src/processing/graph_generator.ts

@@ -195,7 +195,6 @@ class GraphGenerator {
 
     source = this._resolveSubstitute(source);
     target = this._resolveSubstitute(target);
-
     if (source === target) {
       return undefined;
     }
@@ -362,8 +361,12 @@ class GraphGenerator {
       filteredGraph.nodes = _.filter(graph.nodes, (node) => {
         const id = node.data.id;
 
-        // don't filter connected elements
-        if (_.some(graph.edges, { source: id }) || _.some(graph.edges, { target: id })) {
+        // don't filter connected elements and parents
+        if (
+          _.some(graph.edges, { source: id }) ||
+          _.some(graph.edges, { target: id }) ||
+          node.data.type === EnGraphNodeType.PARENT
+        ) {
           return true;
         }
 
@@ -390,7 +393,6 @@ class GraphGenerator {
     const nodes = this._createNodes(graphData);
 
     const edges = this._createEdges(graphData);
-
     const graph: IntGraph = {
       nodes,
       edges,

src/processing/node_substitutor.ts

@@ -5,29 +5,29 @@ class NodeSubstitutor {
   private _substitutionMap: any;
 
   constructor() {
-    this._substitutionMap = {};
+    this._substitutionMap = new Map();
   }
 
   add(node: IntGraphNode) {
     const nameSpace = node.data.namespace;
     if (nameSpace && nameSpace.length > 0) {
-      var currentValue = nameSpace.pop();
+      var currentValue = nameSpace;
       var currentKey = node.data.label;
-      this._substitutionMap[currentKey] = currentValue;
-      while (nameSpace.length > 0) {
-        currentKey = currentValue;
-        currentValue = nameSpace.pop();
-        this._substitutionMap[currentKey] = currentValue;
-      }
+      this._substitutionMap.set(currentKey, currentValue);
     }
   }
 
   substituteUntilLayer(nodeName: string, layer: number, maxLayer: number) {
-    var currentSubstitution = nodeName;
-    for (let i = maxLayer; i > layer; i--) {
-      currentSubstitution = this._substitutionMap[currentSubstitution];
+    if (!this._substitutionMap.has(nodeName)) {
+      return nodeName;
     }
-    return currentSubstitution;
+    const nameSpace = this._substitutionMap.get(nodeName);
+    const nsLeng = nameSpace.length;
+    if (nsLeng - 1 < layer) {
+      return nodeName;
+    }
+
+    return nameSpace[layer];
   }
 }