Node positions are now persisted correctly when re-generating the grpahs.

Author: CoderAllan

src/commands/generateDependencyInjectionGraph.ts

@@ -99,10 +99,11 @@ export class GenerateDependencyInjectionGraph extends ShowHierarchyBase {
     project.components.forEach(component => {
       let componentFilename = component.filename.replace(this.workspaceDirectory, '.');
       componentFilename = componentFilename.split('\\').join('/');
-      const position = this.graphState.nodePositions[component.name];
-      appendNodes([new Node(component.name, this.generatedComponentNode(component), componentFilename, false, NodeType.component, position)]);
+      const componentPosition = this.graphState.nodePositions[component.name];
+      appendNodes([new Node(component.name, this.generatedComponentNode(component), componentFilename, false, NodeType.component, componentPosition)]);
       component.dependencyInjections.forEach(injectable => {
-        appendNodes([new Node(injectable.name, injectable.name, injectable.filename.replace(this.workspaceDirectory, ''), false, NodeType.injectable)]);
+        const injectablePosition = this.graphState.nodePositions[injectable.name];
+        appendNodes([new Node(injectable.name, injectable.name, injectable.filename.replace(this.workspaceDirectory, ''), false, NodeType.injectable, injectablePosition)]);
         appendEdges([new Edge((this.edges.length + 1).toString(), injectable.name, component.name, ArrowType.injectable)]);
       });
     });

src/commands/showComponentHierarchy.ts

@@ -83,7 +83,8 @@ export class ShowComponentHierarchy extends ShowHierarchyBase {
   private generateDirectedGraphNodes(components: Component[], component: Component, isRoot: boolean, parentSelector: string, appendNodes: (nodeList: Node[]) => void) {
     let componentFilename = component.tsFilename.replace(this.directoryPath, '.');
     componentFilename = componentFilename.split('\\').join('/');
-    appendNodes([new Node(component.selector, component.selector, componentFilename, isRoot, isRoot ? NodeType.rootNode : NodeType.component)]);
+    const componentPosition = this.graphState.nodePositions[component.selector];
+    appendNodes([new Node(component.selector, component.selector, componentFilename, isRoot, isRoot ? NodeType.rootNode : NodeType.component, componentPosition)]);
     if (components.length > 0) {
       components.forEach((subComponent) => {
         if (parentSelector !== subComponent.selector) {

src/commands/showHierarchyBase.ts

@@ -129,10 +129,7 @@ export class ShowHierarchyBase extends CommandBase {
 
   protected setGraphState(jsContent: string): string {
     if (this.graphState.networkSeed !== undefined) {
-      // console.log(this.graphState.networkSeed);
-      // const seedParts = this.graphState.networkSeed.indexOf(':') > 0 ? this.graphState.networkSeed.split(':') : [this.graphState.networkSeed, ''];
-      // console.log(seedParts);
-      // jsContent = jsContent.replace('var seed = network.getSeed();', `var seed = ${seedParts[0]};`);
+      jsContent = jsContent.replace('var seed = network.getSeed();', `var seed = '${this.graphState.networkSeed}';`);
     }
     return jsContent;
   }

src/commands/showModuleHierarchy.ts

@@ -70,15 +70,18 @@ export class ShowModuleHierarchy extends ShowHierarchyBase {
     project.modules.forEach(module => {
       let moduleFilename = module.filename.replace(this.workspaceDirectory, '.');
       moduleFilename = moduleFilename.split('\\').join('/');
-      appendNodes([new Node(module.moduleName, module.moduleName, moduleFilename, false, NodeType.module)]);
+      const modulePosition = this.graphState.nodePositions[module.moduleName];
+      appendNodes([new Node(module.moduleName, module.moduleName, moduleFilename, false, NodeType.module, modulePosition)]);
       module.imports.forEach(_import => {
         const nodeType = Node.getNodeType(project, _import);
-        appendNodes([new Node(_import, _import, this.getNodeFilename(_import, nodeType, project), false, nodeType)]);
+        const importPosition = this.graphState.nodePositions[_import];
+        appendNodes([new Node(_import, _import, this.getNodeFilename(_import, nodeType, project), false, nodeType, importPosition)]);
         appendEdges([new Edge((this.edges.length + 1).toString(), _import, module.moduleName, ArrowType.import)]);
       });
       module.exports.forEach(_export => {
         const nodeType = Node.getNodeType(project, _export);
-        appendNodes([new Node(_export, _export, this.getNodeFilename(_export, nodeType, project), false, nodeType)]);
+        const exportPosition = this.graphState.nodePositions[_export];
+        appendNodes([new Node(_export, _export, this.getNodeFilename(_export, nodeType, project), false, nodeType, exportPosition)]);
         appendEdges([new Edge((this.edges.length + 1).toString(), module.moduleName, _export, ArrowType.export)]);
       });
     });