From 41747c5dd08be12a2ff22bd6a1b6e4d8764b3549 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <henning.dieterichs@live.de>
Date: Sat, 22 Aug 2020 15:46:44 +0200
Subject: [PATCH] Fixes types.

---
 data-extraction/src/js/api/DataExtractorApiImpl.ts |  5 +----
 data-extraction/src/js/helpers/createGraph.ts      | 14 +++++++-------
 .../src/js/helpers/createGraphFromPointers.ts      |  6 +++---
 data-extraction/src/js/helpers/markedGrid.ts       |  6 +++---
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/data-extraction/src/js/api/DataExtractorApiImpl.ts b/data-extraction/src/js/api/DataExtractorApiImpl.ts
index 3b74837..3f5d644 100644
--- a/data-extraction/src/js/api/DataExtractorApiImpl.ts
+++ b/data-extraction/src/js/api/DataExtractorApiImpl.ts
@@ -6,10 +6,7 @@ import {
 	DataExtraction,
 	ExtractionCollector,
 } from "./DataExtractorApi";
-import {
-	VisualizationData,
-	DataExtractorInfo,
-} from "../../DataExtractionResult";
+import { DataExtractorInfo } from "../../DataExtractionResult";
 import { registerDefaultExtractors } from "./default-extractors";
 
 /**
diff --git a/data-extraction/src/js/helpers/createGraph.ts b/data-extraction/src/js/helpers/createGraph.ts
index b2d279b..77aa6d4 100644
--- a/data-extraction/src/js/helpers/createGraph.ts
+++ b/data-extraction/src/js/helpers/createGraph.ts
@@ -1,10 +1,10 @@
 import {
-	CommonDataTypes,
-	EdgeGraphData,
-	NodeGraphData,
+	GraphEdge,
+	GraphNode,
+	GraphVisualizationData,
 } from "../../CommonDataTypes";
 
-export type CreateGraphEdge<T> = { to: T } & Omit<EdgeGraphData, "from" | "to">;
+export type CreateGraphEdge<T> = { to: T } & Omit<GraphEdge, "from" | "to">;
 
 /**
  * Given a list of roots, it creates a graph by following their edges recursively.
@@ -17,10 +17,10 @@ export function createGraph<T>(
 	) => {
 		id?: string | number;
 		edges: CreateGraphEdge<T>[];
-	} & Omit<NodeGraphData, "id">,
+	} & Omit<GraphNode, "id">,
 	options: { maxSize?: number } = {}
-): CommonDataTypes.Graph {
-	const r: CommonDataTypes.Graph = {
+): GraphVisualizationData {
+	const r: GraphVisualizationData = {
 		kind: {
 			graph: true,
 		},
diff --git a/data-extraction/src/js/helpers/createGraphFromPointers.ts b/data-extraction/src/js/helpers/createGraphFromPointers.ts
index 09ede33..0bd6c7a 100644
--- a/data-extraction/src/js/helpers/createGraphFromPointers.ts
+++ b/data-extraction/src/js/helpers/createGraphFromPointers.ts
@@ -1,4 +1,4 @@
-import { NodeGraphData, CommonDataTypes } from "../../CommonDataTypes";
+import { GraphNode, GraphVisualizationData } from "../../CommonDataTypes";
 import { CreateGraphEdge, createGraph } from "./createGraph";
 
 /**
@@ -12,8 +12,8 @@ export function createGraphFromPointers<T>(
 	) => {
 		id?: string | number;
 		edges: CreateGraphEdge<T>[];
-	} & Omit<NodeGraphData, "id">
-): CommonDataTypes.Graph {
+	} & Omit<GraphNode, "id">
+): GraphVisualizationData {
 	const marker = {};
 
 	interface Pointer {
diff --git a/data-extraction/src/js/helpers/markedGrid.ts b/data-extraction/src/js/helpers/markedGrid.ts
index 047d0b1..8668501 100644
--- a/data-extraction/src/js/helpers/markedGrid.ts
+++ b/data-extraction/src/js/helpers/markedGrid.ts
@@ -1,11 +1,11 @@
-import { CommonDataTypes } from "../../CommonDataTypes";
+import { GridVisualizationData } from "../../CommonDataTypes";
 
 export function markedGrid(
 	arr: any[],
 	marked: Record<string, number>
-): CommonDataTypes.Grid {
+): GridVisualizationData {
 	return {
-		kind: { array: true },
+		kind: { grid: true },
 		rows: [{ columns: arr.map(d => ({ tag: d })) }],
 		markers: Object.entries(marked).map(([key, val]) => ({
 			id: key,