codecharta-visualization 1.113.0 → 1.115.0

package/app/codeCharta/util/__snapshots__/deltaGenerator.spec.ts.snap

@@ -1,21 +1,21 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`deltaGenerator getDeltaFile should result in expected deltaFiles 1`] = `
-Object {
-  "attributes": Object {},
-  "children": Array [
-    Object {
-      "attributes": Object {
+{
+  "attributes": {},
+  "children": [
+    {
+      "attributes": {
         "functions": 10,
         "mcc": 1,
         "rloc": 20,
       },
-      "deltas": Object {
+      "deltas": {
         "functions": 0,
         "mcc": 0,
         "rloc": -80,
       },
-      "fileCount": Object {
+      "fileCount": {
         "added": 0,
         "changed": 1,
         "removed": 0,
@@ -27,18 +27,18 @@ Object {
       "path": "/root/big leaf",
       "type": "File",
     },
-    Object {
-      "attributes": Object {
+    {
+      "attributes": {
         "functions": 11,
         "mcc": 5,
         "rloc": 10,
       },
-      "deltas": Object {
+      "deltas": {
         "functions": 11,
         "mcc": 5,
         "rloc": 10,
       },
-      "fileCount": Object {
+      "fileCount": {
         "added": 1,
         "changed": 0,
         "removed": 0,
@@ -50,23 +50,23 @@ Object {
       "path": "/root/additional leaf",
       "type": "File",
     },
-    Object {
-      "attributes": Object {},
-      "children": Array [
-        Object {
-          "attributes": Object {
+    {
+      "attributes": {},
+      "children": [
+        {
+          "attributes": {
             "functions": 100,
             "mcc": 100,
             "more": 20,
             "rloc": 30,
           },
-          "deltas": Object {
+          "deltas": {
             "functions": 0,
             "mcc": 0,
             "more": 20,
             "rloc": 0,
           },
-          "fileCount": Object {
+          "fileCount": {
             "added": 0,
             "changed": 1,
             "removed": 0,
@@ -77,17 +77,17 @@ Object {
           "path": "/root/Parent Leaf/small leaf",
           "type": "File",
         },
-        Object {
-          "attributes": Object {
+        {
+          "attributes": {
             "functions": 1000,
             "rloc": 70,
           },
-          "deltas": Object {
+          "deltas": {
             "functions": 0,
             "mcc": -10,
             "rloc": 0,
           },
-          "fileCount": Object {
+          "fileCount": {
             "added": 0,
             "changed": 1,
             "removed": 0,
@@ -98,18 +98,18 @@ Object {
           "path": "/root/Parent Leaf/other small leaf",
           "type": "File",
         },
-        Object {
-          "attributes": Object {
+        {
+          "attributes": {
             "functions": 10,
             "mcc": 1,
             "rloc": 20,
           },
-          "deltas": Object {
+          "deltas": {
             "functions": 10,
             "mcc": 1,
             "rloc": 20,
           },
-          "fileCount": Object {
+          "fileCount": {
             "added": 1,
             "changed": 0,
             "removed": 0,
@@ -122,8 +122,8 @@ Object {
           "type": "File",
         },
       ],
-      "deltas": Object {},
-      "fileCount": Object {
+      "deltas": {},
+      "fileCount": {
         "added": 0,
         "changed": 0,
         "removed": 0,
@@ -135,8 +135,8 @@ Object {
       "type": "Folder",
     },
   ],
-  "deltas": Object {},
-  "fileCount": Object {
+  "deltas": {},
+  "fileCount": {
     "added": 0,
     "changed": 0,
     "removed": 0,
@@ -150,21 +150,21 @@ Object {
 `;
 
 exports[`deltaGenerator golden test 1`] = `
-Object {
-  "attributes": Object {},
-  "children": Array [
-    Object {
-      "attributes": Object {
+{
+  "attributes": {},
+  "children": [
+    {
+      "attributes": {
         "functions": 10,
         "mcc": 1,
         "rloc": 20,
       },
-      "deltas": Object {
+      "deltas": {
         "functions": 0,
         "mcc": 0,
         "rloc": -80,
       },
-      "fileCount": Object {
+      "fileCount": {
         "added": 0,
         "changed": 1,
         "removed": 0,
@@ -176,18 +176,18 @@ Object {
       "path": "/root/big leaf",
       "type": "File",
     },
-    Object {
-      "attributes": Object {
+    {
+      "attributes": {
         "functions": 11,
         "mcc": 5,
         "rloc": 10,
       },
-      "deltas": Object {
+      "deltas": {
         "functions": 11,
         "mcc": 5,
         "rloc": 10,
       },
-      "fileCount": Object {
+      "fileCount": {
         "added": 1,
         "changed": 0,
         "removed": 0,
@@ -199,23 +199,23 @@ Object {
       "path": "/root/additional leaf",
       "type": "File",
     },
-    Object {
-      "attributes": Object {},
-      "children": Array [
-        Object {
-          "attributes": Object {
+    {
+      "attributes": {},
+      "children": [
+        {
+          "attributes": {
             "functions": 100,
             "mcc": 100,
             "more": 20,
             "rloc": 30,
           },
-          "deltas": Object {
+          "deltas": {
             "functions": 0,
             "mcc": 0,
             "more": 20,
             "rloc": 0,
           },
-          "fileCount": Object {
+          "fileCount": {
             "added": 0,
             "changed": 1,
             "removed": 0,
@@ -226,17 +226,17 @@ Object {
           "path": "/root/Parent Leaf/small leaf",
           "type": "File",
         },
-        Object {
-          "attributes": Object {
+        {
+          "attributes": {
             "functions": 1000,
             "rloc": 70,
           },
-          "deltas": Object {
+          "deltas": {
             "functions": 0,
             "mcc": -10,
             "rloc": 0,
           },
-          "fileCount": Object {
+          "fileCount": {
             "added": 0,
             "changed": 1,
             "removed": 0,
@@ -247,18 +247,18 @@ Object {
           "path": "/root/Parent Leaf/other small leaf",
           "type": "File",
         },
-        Object {
-          "attributes": Object {
+        {
+          "attributes": {
             "functions": 10,
             "mcc": 1,
             "rloc": 20,
           },
-          "deltas": Object {
+          "deltas": {
             "functions": 10,
             "mcc": 1,
             "rloc": 20,
           },
-          "fileCount": Object {
+          "fileCount": {
             "added": 1,
             "changed": 0,
             "removed": 0,
@@ -271,8 +271,8 @@ Object {
           "type": "File",
         },
       ],
-      "deltas": Object {},
-      "fileCount": Object {
+      "deltas": {},
+      "fileCount": {
         "added": 0,
         "changed": 0,
         "removed": 0,
@@ -283,20 +283,20 @@ Object {
       "path": "/root/Parent Leaf",
       "type": "Folder",
     },
-    Object {
-      "attributes": Object {},
-      "children": Array [
-        Object {
-          "attributes": Object {},
-          "children": Array [
-            Object {
-              "attributes": Object {
+    {
+      "attributes": {},
+      "children": [
+        {
+          "attributes": {},
+          "children": [
+            {
+              "attributes": {
                 "monster": 666,
               },
-              "deltas": Object {
+              "deltas": {
                 "monster": 666,
               },
-              "fileCount": Object {
+              "fileCount": {
                 "added": 1,
                 "changed": 0,
                 "removed": 0,
@@ -307,14 +307,14 @@ Object {
               "path": "/root/onlyA/special/Narwal",
               "type": "File",
             },
-            Object {
-              "attributes": Object {
+            {
+              "attributes": {
                 "special": 42,
               },
-              "deltas": Object {
+              "deltas": {
                 "special": -42,
               },
-              "fileCount": Object {
+              "fileCount": {
                 "added": 0,
                 "changed": 0,
                 "removed": 1,
@@ -325,14 +325,14 @@ Object {
               "path": "/root/onlyA/special/unicorn",
               "type": "File",
             },
-            Object {
-              "attributes": Object {
+            {
+              "attributes": {
                 "special": 10,
               },
-              "deltas": Object {
+              "deltas": {
                 "special": -10,
               },
-              "fileCount": Object {
+              "fileCount": {
                 "added": 0,
                 "changed": 0,
                 "removed": 1,
@@ -344,8 +344,8 @@ Object {
               "type": "File",
             },
           ],
-          "deltas": Object {},
-          "fileCount": Object {
+          "deltas": {},
+          "fileCount": {
             "added": 0,
             "changed": 0,
             "removed": 0,
@@ -357,8 +357,8 @@ Object {
           "type": "Folder",
         },
       ],
-      "deltas": Object {},
-      "fileCount": Object {
+      "deltas": {},
+      "fileCount": {
         "added": 0,
         "changed": 0,
         "removed": 0,
@@ -370,8 +370,8 @@ Object {
       "type": "Folder",
     },
   ],
-  "deltas": Object {},
-  "fileCount": Object {
+  "deltas": {},
+  "fileCount": {
     "added": 0,
     "changed": 0,
     "removed": 0,

package/app/codeCharta/util/__snapshots__/fileHelper.spec.ts.snap

@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FileHelper getCCFile should build a CCFile 1`] = `
-Object {
-  "fileMeta": Object {
+{
+  "fileMeta": {
     "apiVersion": "1.3",
     "exportedFileSize": 30,
     "fileChecksum": "invalid-md5-sample",
@@ -10,11 +10,11 @@ Object {
     "projectName": "Sample Map",
     "repoCreationDate": "",
   },
-  "map": Object {
-    "attributes": Object {},
-    "children": Array [
-      Object {
-        "attributes": Object {
+  "map": {
+    "attributes": {},
+    "children": [
+      {
+        "attributes": {
           "functions": 10,
           "mcc": 1,
           "rloc": 100,
@@ -25,11 +25,11 @@ Object {
         "name": "big leaf",
         "type": "File",
       },
-      Object {
-        "attributes": Object {},
-        "children": Array [
-          Object {
-            "attributes": Object {
+      {
+        "attributes": {},
+        "children": [
+          {
+            "attributes": {
               "functions": 100,
               "mcc": 100,
               "rloc": 30,
@@ -39,8 +39,8 @@ Object {
             "name": "small leaf",
             "type": "File",
           },
-          Object {
-            "attributes": Object {
+          {
+            "attributes": {
               "functions": 1000,
               "mcc": 10,
               "rloc": 70,
@@ -62,16 +62,16 @@ Object {
     "name": "root",
     "type": "Folder",
   },
-  "settings": Object {
-    "fileSettings": Object {
-      "attributeDescriptors": Object {},
-      "attributeTypes": Object {
-        "edges": Object {},
-        "nodes": Object {},
+  "settings": {
+    "fileSettings": {
+      "attributeDescriptors": {},
+      "attributeTypes": {
+        "edges": {},
+        "nodes": {},
       },
-      "blacklist": Array [],
-      "edges": Array [],
-      "markedPackages": Array [],
+      "blacklist": [],
+      "edges": [],
+      "markedPackages": [],
     },
   },
 }

package/app/codeCharta/util/aggregationGenerator.spec.ts

@@ -1,14 +1,16 @@
-import { CCFile, NodeType, Settings } from "../codeCharta.model"
+import { NodeType, Settings } from "../codeCharta.model"
 import { AggregationGenerator } from "./aggregationGenerator"
 import packageJson from "../../../package.json"
+import { FileState } from "../model/files/files"
 
 describe("AggregationGenerator", () => {
-	let file1: CCFile
-	let file2: CCFile
+	let fileState1: Pick<FileState, "file">
+	let fileState2: Pick<FileState, "file">
 
-	describe("multipleService", () => {
-		beforeEach(() => {
-			file1 = {
+	beforeEach(() => {
+		AggregationGenerator["memorizedAggregation"] = { key: undefined, aggregation: undefined }
+		fileState1 = {
+			file: {
 				fileMeta: {
 					fileName: "file1",
 					fileChecksum: "md5-file1",
@@ -47,8 +49,10 @@ describe("AggregationGenerator", () => {
 				},
 				settings: {} as Settings
 			}
+		}
 
-			file2 = {
+		fileState2 = {
+			file: {
 				fileMeta: {
 					fileName: "file2",
 					fileChecksum: "md5-file2",
@@ -87,28 +91,30 @@ describe("AggregationGenerator", () => {
 				},
 				settings: {} as Settings
 			}
-		})
-		it("aggregation of two maps", () => {
-			const aggregationFile = AggregationGenerator.getAggregationFile([file1, file2])
-			expect(aggregationFile).toMatchSnapshot()
-		})
+		}
+	})
 
-		it("aggregation of four maps", () => {
-			const aggregationFile = AggregationGenerator.getAggregationFile([file1, file2, file1, file2])
-			expect(aggregationFile).toMatchSnapshot()
-		})
+	it("aggregation of two maps", () => {
+		const aggregationFile = AggregationGenerator.calculateAggregationFile([fileState1, fileState2])
+		expect(aggregationFile).toMatchSnapshot()
+	})
 
-		it("aggregation one map", () => {
-			const aggregationFile = AggregationGenerator.getAggregationFile([file1])
-			expect(aggregationFile).toMatchSnapshot()
-		})
+	it("aggregation of four maps", () => {
+		const aggregationFile = AggregationGenerator.calculateAggregationFile([fileState1, fileState2, fileState1, fileState2])
+		expect(aggregationFile).toMatchSnapshot()
+	})
+
+	it("aggregation one map", () => {
+		const aggregationFile = AggregationGenerator.calculateAggregationFile([fileState1])
+		expect(aggregationFile).toMatchSnapshot()
+	})
 
-		it("aggregate two aggregated maps should aggregate the attributes to root", () => {
-			const aggregationFile = AggregationGenerator.getAggregationFile([file1, file2])
-			expect(aggregationFile.map.attributes.rloc).toBe(430)
-			expect(aggregationFile.map.attributes.functions).toBe(1230)
-			expect(aggregationFile.map.attributes.mcc).toBe(213)
-			expect(aggregationFile.map.attributes.customMetric).toBe(7)
-		})
+	it("aggregate two aggregated maps should aggregate the attributes to root without manipulating original fileState", () => {
+		const aggregationFile = AggregationGenerator.calculateAggregationFile([fileState1, fileState2])
+		expect(aggregationFile.map.attributes.rloc).toBe(430)
+		expect(aggregationFile.map.attributes.functions).toBe(1230)
+		expect(aggregationFile.map.attributes.mcc).toBe(213)
+		expect(aggregationFile.map.attributes.customMetric).toBe(7)
+		expect(fileState1.file.map.children[0].path).toBe("/root/big leaf")
 	})
 })

package/app/codeCharta/util/aggregationGenerator.ts

@@ -1,8 +1,10 @@
 import { CodeMapNode, CCFile, NodeType } from "../codeCharta.model"
-import { LoadFileService } from "../services/loadFile/loadFile.service"
 import { FileNameHelper } from "./fileNameHelper"
 import { getUpdatedPath } from "./nodePathHelper"
 import packageJson from "../../../package.json"
+import { fileRoot } from "../services/loadFile/fileRoot"
+import { FileState } from "../model/files/files"
+import { clone } from "./clone"
 
 export class AggregationGenerator {
 	private static projectNameArray: string[] = []
@@ -10,7 +12,8 @@ export class AggregationGenerator {
 	private static fileChecksumArray: string[] = []
 	private static fileSizesSum = 0
 
-	static getAggregationFile(inputFiles: CCFile[]) {
+	static calculateAggregationFile(fileStates: Pick<FileState, "file">[]) {
+		const inputFiles = clone(fileStates.map(x => x.file))
 		if (inputFiles.length === 1) {
 			return inputFiles[0]
 		}
@@ -36,11 +39,11 @@ export class AggregationGenerator {
 				exportedFileSize: this.fileSizesSum
 			},
 			map: {
-				name: LoadFileService.ROOT_NAME,
+				name: fileRoot.rootName,
 				type: NodeType.FOLDER,
 				children: [],
 				attributes: {},
-				path: LoadFileService.ROOT_PATH
+				path: fileRoot.rootPath
 			},
 			settings: {
 				fileSettings: {

package/app/codeCharta/util/algorithm/streetLayout/streetLayoutGenerator.ts

@@ -1,4 +1,4 @@
-import { CodeMapNode, Node, State, NodeMetricData, BlacklistType, LayoutAlgorithm } from "../../../codeCharta.model"
+import { CodeMapNode, Node, State, NodeMetricData, LayoutAlgorithm } from "../../../codeCharta.model"
 import BoundingBox from "./boundingBox"
 import VerticalStreet from "./verticalStreet"
 import HorizontalStreet from "./horizontalStreet"
@@ -46,7 +46,7 @@ export class StreetLayoutGenerator {
 		const children: BoundingBox[] = []
 		const areaMetric = state.dynamicSettings.areaMetric
 		for (let child of node.children) {
-			if (isPathBlacklisted(child.path, state.fileSettings.blacklist, BlacklistType.exclude)) {
+			if (isPathBlacklisted(child.path, state.fileSettings.blacklist, "exclude")) {
 				continue
 			}
 			if (isLeaf(child)) {