Added missing properties to generated dgml file. Removed unused properties.

Changed property TsFilename to TypescriptFilepath and made it a reference attribute.

Author: CoderAllan

src/commands/generateDependencyInjectionGraph.ts

@@ -90,7 +90,8 @@ export class GenerateDependencyInjectionGraph extends ShowHierarchyBase {
 
   addNodesAndEdges(project: Project, appendNodes: (nodeList: Node[]) => void, appendEdges: (edgeList: Edge[]) => void) {
     project.components.forEach(component => {
-      const componentFilename = component.filename.replace(this.workspaceDirectory, '');
+      let componentFilename = component.filename.replace(this.workspaceDirectory, '.');
+      componentFilename = componentFilename.split('\\').join('/');
       appendNodes([new Node(component.name, this.generatedComponentNode(component), componentFilename, false, NodeType.component)]);
       component.dependencyInjections.forEach(injectable => {
         appendNodes([new Node(injectable.name, injectable.name, injectable.filename.replace(this.workspaceDirectory, ''), false, NodeType.injectable)]);

src/commands/showComponentHierarchy.ts

@@ -73,7 +73,8 @@ export class ShowComponentHierarchy extends ShowHierarchyBase {
   }
 
   private generateDirectedGraphNodes(components: Component[], component: Component, isRoot: boolean, parentSelector: string, appendNodes: (nodeList: Node[]) => void) {
-    const componentFilename = component.tsFilename.replace(this.directoryPath, '');
+    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)]);
     if (components.length > 0) {
       components.forEach((subComponent) => {

src/commands/showModuleHierarchy.ts

@@ -60,7 +60,8 @@ export class ShowModuleHierarchy extends ShowHierarchyBase {
 
   private addNodesAndEdges(project: Project, appendNodes: (nodeList: Node[]) => void, appendEdges: (edgeList: Edge[]) => void) {
     project.modules.forEach(module => {
-      const moduleFilename = module.filename.replace(this.workspaceDirectory, '');
+      let moduleFilename = module.filename.replace(this.workspaceDirectory, '.');
+      moduleFilename = moduleFilename.split('\\').join('/');
       appendNodes([new Node(module.moduleName, module.moduleName, moduleFilename, false, NodeType.module)]);
       module.imports.forEach(_import => {
         const nodeType = Node.getNodeType(project, _import);

src/dgmlManager.ts

@@ -123,7 +123,7 @@ export class DgmlManager {
       });
     }
     if (node.tsFilename) {
-      nodeElement.setAttribute("TsFilename", node.tsFilename);
+      nodeElement.setAttribute("TypescriptFilepath", node.tsFilename);
     }
     this.addNode(nodesElement, nodeElement);
   }
@@ -164,20 +164,26 @@ export class DgmlManager {
 
   private addProperties(xmlDoc: Document) {
     const propertiesElement = this.addNodeToRoot(xmlDoc, "Properties");
-    this.addProperty(xmlDoc, propertiesElement, "TsFilename", "System.String");
+    this.addProperty(xmlDoc, propertiesElement, "TypescriptFilepath", "System.String", "Typescript filepath", true);
     this.addProperty(xmlDoc, propertiesElement, "Background", "System.Windows.Media.Brush");
     this.addProperty(xmlDoc, propertiesElement, "GraphDirection", "Microsoft.VisualStudio.Diagrams.Layout.LayoutOrientation");
-    this.addProperty(xmlDoc, propertiesElement, "IsTag", "System.Boolean");
+    this.addProperty(xmlDoc, propertiesElement, "UseManualLocation", "System.Boolean");
     this.addProperty(xmlDoc, propertiesElement, "Label", "System.String");
     this.addProperty(xmlDoc, propertiesElement, "Layout", "System.String");
     this.addProperty(xmlDoc, propertiesElement, "ZoomLevel", "System.String");
-    this.addProperty(xmlDoc, propertiesElement, "Expression", "System.String");
+    this.addProperty(xmlDoc, propertiesElement, "Bounds", "System.Windows.Rect");
   }
 
-  private addProperty(xmlDoc: Document, propertiesElement: Element | null, idValue: string, datatypeValue: string) {
+  private addProperty(xmlDoc: Document, propertiesElement: Element | null, idValue: string, datatypeValue: string, label: string | undefined = undefined, isReference: boolean | undefined = undefined) {
     const propertyElement = xmlDoc.createElement("Property");
     propertyElement.setAttribute("Id", idValue);
     propertyElement.setAttribute("DataType", datatypeValue);
+    if ( label !== undefined && label.length > 0) {
+      propertyElement.setAttribute("Label", label);
+    }
+    if (isReference !== undefined && isReference) {
+      propertyElement.setAttribute("IsReference", isReference.toString());
+    }
     this.addNode(propertiesElement, propertyElement);
   }
-}
+}