codecharta-visualization 1.114.0 → 1.115.0

package/app/codeCharta/ui/viewCube/viewCube.mouseEvents.service.spec.ts

@@ -4,6 +4,7 @@ import { ViewCubeMouseEventsService } from "./viewCube.mouseEvents.service"
 // eslint-disable-next-line no-duplicate-imports
 import * as Three from "three"
 import oc from "three-orbit-controls"
+import type { OrbitControls } from "three/examples/jsm/controls/OrbitControls"
 import { CursorType } from "../codeMap/codeMap.mouseEvent.service"
 
 describe("ViewCubeMouseEventsService", () => {
@@ -67,8 +68,8 @@ describe("ViewCubeMouseEventsService", () => {
 	describe("initOrbitalControl", () => {
 		it("should initialize controls with parameters", () => {
 			const camera = new PerspectiveCamera()
-			const OrbitControls = oc(Three)
-			const expectedControls = new OrbitControls(camera, webGLRenderer.domElement)
+			const orbitControls = oc(Three)
+			const expectedControls = new orbitControls(camera, webGLRenderer.domElement) as unknown as OrbitControls
 			expectedControls.enableZoom = false
 			expectedControls.enableKeys = false
 			expectedControls.enablePan = false

package/app/codeCharta/ui/viewCube/viewCube.mouseEvents.service.ts

@@ -5,10 +5,10 @@ import { isLeaf } from "../../util/codeMapHelper"
 // eslint-disable-next-line no-duplicate-imports
 import * as Three from "three"
 import oc from "three-orbit-controls"
-import { OrbitControls } from "three/examples/jsm/controls/OrbitControls"
+import type { OrbitControls } from "three/examples/jsm/controls/OrbitControls"
 import { ThreeOrbitControlsService } from "../codeMap/threeViewer/threeOrbitControls.service"
-import { EventEmitter } from "tsee"
-import { Inject, Injectable } from "@angular/core"
+import { Injectable } from "@angular/core"
+import { EventEmitter } from "../../util/EventEmitter"
 
 type ViewCubeEvents = {
 	viewCubeEventPropagation: (data: { event: MouseEvent; type: string }) => void
@@ -28,7 +28,7 @@ export class ViewCubeMouseEventsService {
 	private controls: OrbitControls
 	private isDragging = false
 
-	constructor(@Inject(ThreeOrbitControlsService) private threeOrbitControlsService: ThreeOrbitControlsService) {}
+	constructor(private threeOrbitControlsService: ThreeOrbitControlsService) {}
 
 	init(cubeGroup: Group, camera: PerspectiveCamera, renderer: WebGLRenderer) {
 		this.cubeGroup = cubeGroup
@@ -44,7 +44,7 @@ export class ViewCubeMouseEventsService {
 
 	private initOrbitalControl(camera: PerspectiveCamera, renderer: WebGLRenderer) {
 		const orbitControls = oc(Three)
-		this.controls = new orbitControls(camera, renderer.domElement)
+		this.controls = new orbitControls(camera, renderer.domElement) as unknown as OrbitControls
 		this.controls.enableZoom = false
 		this.controls.enableKeys = false
 		this.controls.enablePan = false
@@ -155,7 +155,7 @@ export class ViewCubeMouseEventsService {
 	private triggerViewCubeUnhoverEvent() {
 		this.currentlyHovered = null
 		CodeMapMouseEventService.changeCursorIndicator(CursorType.Default)
-		this.eventEmitter.emit("viewCubeUnHoveredEvent", undefined)
+		this.eventEmitter.emit("viewCubeUnHoveredEvent")
 	}
 
 	subscribe<Key extends keyof ViewCubeEvents>(key: Key, callback: ViewCubeEvents[Key]) {

package/app/codeCharta/util/EventEmitter.ts

@@ -0,0 +1,22 @@
+type Listener<D = undefined> = (data?: D) => void
+type AbstractEventMap = Record<string, Listener>
+
+export class EventEmitter<EventMap extends AbstractEventMap> {
+	private listeners: Partial<Record<keyof EventMap, Listener[]>> = {}
+
+	on<EventType extends keyof EventMap>(event: EventType, callback: EventMap[EventType]) {
+		this.listeners[event] ??= []
+		this.listeners[event].push(callback)
+	}
+
+	emit<EventType extends keyof EventMap>(event: EventType, data?: Parameters<EventMap[EventType]>[0]) {
+		if (!this.listeners[event]?.length) {
+			return false
+		}
+
+		for (const listener of this.listeners[event]) {
+			listener(data)
+		}
+		return true
+	}
+}

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

@@ -1,60 +1,60 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AggregationGenerator multipleService aggregation of four maps 1`] = `
-Object {
-  "fileMeta": Object {
+exports[`AggregationGenerator aggregation of four maps 1`] = `
+{
+  "fileMeta": {
     "apiVersion": "1.3",
     "exportedFileSize": 1200000,
     "fileChecksum": "md5-file1;md5-file2;md5-file1;md5-file2",
     "fileName": "file_aggregation_of_file1_and_file2_and_file1_and_file2",
     "projectName": "project_aggregation_of_Sample_Project_and_Sample_Project_and_Sample_Project_and_Sample_Project",
   },
-  "map": Object {
-    "attributes": Object {
+  "map": {
+    "attributes": {
       "customMetric": 14,
       "functions": 2460,
       "mcc": 426,
       "rloc": 860,
     },
-    "children": Array [
-      Object {
-        "attributes": Object {
+    "children": [
+      {
+        "attributes": {
           "functions": 1010,
           "mcc": 11,
           "rloc": 170,
         },
-        "children": Array [
-          Object {
-            "attributes": Object {
+        "children": [
+          {
+            "attributes": {
               "functions": 10,
               "mcc": 1,
               "rloc": 100,
             },
             "link": "https://www.google.de",
             "name": "big leaf",
-            "path": "/root/file1/file1/big leaf",
+            "path": "/root/file1/big leaf",
             "type": "File",
           },
-          Object {
-            "attributes": Object {
+          {
+            "attributes": {
               "functions": 1000,
               "mcc": 10,
               "rloc": 70,
             },
-            "children": Array [
-              Object {
-                "attributes": Object {
+            "children": [
+              {
+                "attributes": {
                   "functions": 1000,
                   "mcc": 10,
                   "rloc": 70,
                 },
                 "name": "other small leaf",
-                "path": "/root/file1/file1/Parent Leaf/other small leaf",
+                "path": "/root/file1/Parent Leaf/other small leaf",
                 "type": "File",
               },
             ],
             "name": "Parent Leaf",
-            "path": "/root/file1/file1/Parent Leaf",
+            "path": "/root/file1/Parent Leaf",
             "type": "Folder",
           },
         ],
@@ -62,45 +62,45 @@ Object {
         "path": "/root/file1",
         "type": "Folder",
       },
-      Object {
-        "attributes": Object {
+      {
+        "attributes": {
           "customMetric": 7,
           "functions": 220,
           "mcc": 202,
           "rloc": 260,
         },
-        "children": Array [
-          Object {
-            "attributes": Object {
+        "children": [
+          {
+            "attributes": {
               "functions": 20,
               "mcc": 2,
               "rloc": 200,
             },
             "link": "https://www.google.de",
             "name": "big leaf",
-            "path": "/root/file2/file2/big leaf",
+            "path": "/root/file2/big leaf",
             "type": "File",
           },
-          Object {
-            "attributes": Object {
+          {
+            "attributes": {
               "functions": 200,
               "mcc": 200,
               "rloc": 60,
             },
-            "children": Array [
-              Object {
-                "attributes": Object {
+            "children": [
+              {
+                "attributes": {
                   "functions": 200,
                   "mcc": 200,
                   "rloc": 60,
                 },
                 "name": "small leaf",
-                "path": "/root/file2/file2/Parent Leaf/small leaf",
+                "path": "/root/file2/Parent Leaf/small leaf",
                 "type": "File",
               },
             ],
             "name": "Parent Leaf",
-            "path": "/root/file2/file2/Parent Leaf",
+            "path": "/root/file2/Parent Leaf",
             "type": "Folder",
           },
         ],
@@ -108,44 +108,44 @@ Object {
         "path": "/root/file2",
         "type": "Folder",
       },
-      Object {
-        "attributes": Object {
+      {
+        "attributes": {
           "functions": 1010,
           "mcc": 11,
           "rloc": 170,
         },
-        "children": Array [
-          Object {
-            "attributes": Object {
+        "children": [
+          {
+            "attributes": {
               "functions": 10,
               "mcc": 1,
               "rloc": 100,
             },
             "link": "https://www.google.de",
             "name": "big leaf",
-            "path": "/root/file1/file1/big leaf",
+            "path": "/root/file1/big leaf",
             "type": "File",
           },
-          Object {
-            "attributes": Object {
+          {
+            "attributes": {
               "functions": 1000,
               "mcc": 10,
               "rloc": 70,
             },
-            "children": Array [
-              Object {
-                "attributes": Object {
+            "children": [
+              {
+                "attributes": {
                   "functions": 1000,
                   "mcc": 10,
                   "rloc": 70,
                 },
                 "name": "other small leaf",
-                "path": "/root/file1/file1/Parent Leaf/other small leaf",
+                "path": "/root/file1/Parent Leaf/other small leaf",
                 "type": "File",
               },
             ],
             "name": "Parent Leaf",
-            "path": "/root/file1/file1/Parent Leaf",
+            "path": "/root/file1/Parent Leaf",
             "type": "Folder",
           },
         ],
@@ -153,45 +153,45 @@ Object {
         "path": "/root/file1",
         "type": "Folder",
       },
-      Object {
-        "attributes": Object {
+      {
+        "attributes": {
           "customMetric": 7,
           "functions": 220,
           "mcc": 202,
           "rloc": 260,
         },
-        "children": Array [
-          Object {
-            "attributes": Object {
+        "children": [
+          {
+            "attributes": {
               "functions": 20,
               "mcc": 2,
               "rloc": 200,
             },
             "link": "https://www.google.de",
             "name": "big leaf",
-            "path": "/root/file2/file2/big leaf",
+            "path": "/root/file2/big leaf",
             "type": "File",
           },
-          Object {
-            "attributes": Object {
+          {
+            "attributes": {
               "functions": 200,
               "mcc": 200,
               "rloc": 60,
             },
-            "children": Array [
-              Object {
-                "attributes": Object {
+            "children": [
+              {
+                "attributes": {
                   "functions": 200,
                   "mcc": 200,
                   "rloc": 60,
                 },
                 "name": "small leaf",
-                "path": "/root/file2/file2/Parent Leaf/small leaf",
+                "path": "/root/file2/Parent Leaf/small leaf",
                 "type": "File",
               },
             ],
             "name": "Parent Leaf",
-            "path": "/root/file2/file2/Parent Leaf",
+            "path": "/root/file2/Parent Leaf",
             "type": "Folder",
           },
         ],
@@ -204,47 +204,47 @@ Object {
     "path": "/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": [],
     },
   },
 }
 `;
 
-exports[`AggregationGenerator multipleService aggregation of two maps 1`] = `
-Object {
-  "fileMeta": Object {
+exports[`AggregationGenerator aggregation of two maps 1`] = `
+{
+  "fileMeta": {
     "apiVersion": "1.3",
     "exportedFileSize": 600000,
     "fileChecksum": "md5-file1;md5-file2",
     "fileName": "file_aggregation_of_file1_and_file2",
     "projectName": "project_aggregation_of_Sample_Project_and_Sample_Project",
   },
-  "map": Object {
-    "attributes": Object {
+  "map": {
+    "attributes": {
       "customMetric": 7,
       "functions": 1230,
       "mcc": 213,
       "rloc": 430,
     },
-    "children": Array [
-      Object {
-        "attributes": Object {
+    "children": [
+      {
+        "attributes": {
           "functions": 1010,
           "mcc": 11,
           "rloc": 170,
         },
-        "children": Array [
-          Object {
-            "attributes": Object {
+        "children": [
+          {
+            "attributes": {
               "functions": 10,
               "mcc": 1,
               "rloc": 100,
@@ -254,15 +254,15 @@ Object {
             "path": "/root/file1/big leaf",
             "type": "File",
           },
-          Object {
-            "attributes": Object {
+          {
+            "attributes": {
               "functions": 1000,
               "mcc": 10,
               "rloc": 70,
             },
-            "children": Array [
-              Object {
-                "attributes": Object {
+            "children": [
+              {
+                "attributes": {
                   "functions": 1000,
                   "mcc": 10,
                   "rloc": 70,
@@ -281,16 +281,16 @@ Object {
         "path": "/root/file1",
         "type": "Folder",
       },
-      Object {
-        "attributes": Object {
+      {
+        "attributes": {
           "customMetric": 7,
           "functions": 220,
           "mcc": 202,
           "rloc": 260,
         },
-        "children": Array [
-          Object {
-            "attributes": Object {
+        "children": [
+          {
+            "attributes": {
               "functions": 20,
               "mcc": 2,
               "rloc": 200,
@@ -300,15 +300,15 @@ Object {
             "path": "/root/file2/big leaf",
             "type": "File",
           },
-          Object {
-            "attributes": Object {
+          {
+            "attributes": {
               "functions": 200,
               "mcc": 200,
               "rloc": 60,
             },
-            "children": Array [
-              Object {
-                "attributes": Object {
+            "children": [
+              {
+                "attributes": {
                   "functions": 200,
                   "mcc": 200,
                   "rloc": 60,
@@ -332,39 +332,39 @@ Object {
     "path": "/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": [],
     },
   },
 }
 `;
 
-exports[`AggregationGenerator multipleService aggregation one map 1`] = `
-Object {
-  "fileMeta": Object {
+exports[`AggregationGenerator aggregation one map 1`] = `
+{
+  "fileMeta": {
     "apiVersion": "1.3",
     "exportedFileSize": 300000,
     "fileChecksum": "md5-file1",
     "fileName": "file1",
     "projectName": "Sample Project",
   },
-  "map": Object {
-    "attributes": Object {
+  "map": {
+    "attributes": {
       "functions": 1010,
       "mcc": 11,
       "rloc": 170,
     },
-    "children": Array [
-      Object {
-        "attributes": Object {
+    "children": [
+      {
+        "attributes": {
           "functions": 10,
           "mcc": 1,
           "rloc": 100,
@@ -374,15 +374,15 @@ Object {
         "path": "/root/big leaf",
         "type": "File",
       },
-      Object {
-        "attributes": Object {
+      {
+        "attributes": {
           "functions": 1000,
           "mcc": 10,
           "rloc": 70,
         },
-        "children": Array [
-          Object {
-            "attributes": Object {
+        "children": [
+          {
+            "attributes": {
               "functions": 1000,
               "mcc": 10,
               "rloc": 70,
@@ -401,6 +401,6 @@ Object {
     "path": "/root",
     "type": "Folder",
   },
-  "settings": Object {},
+  "settings": {},
 }
 `;