From 18a399b465b79b9097453444ca76c54d360b98e3 Mon Sep 17 00:00:00 2001 From: Rikkert Koppes Date: Fri, 20 Mar 2020 15:31:53 +0000 Subject: [PATCH] Make graph generic (#43160) * Make graph generic * change Node[] to Array> * fix missing semicolon * fix missing whitespace --- types/dagre/index.d.ts | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/types/dagre/index.d.ts b/types/dagre/index.d.ts index 33c74b2e73..2f41e65d02 100644 --- a/types/dagre/index.d.ts +++ b/types/dagre/index.d.ts @@ -10,7 +10,7 @@ export as namespace dagre; export namespace graphlib { - class Graph { + class Graph { constructor(opt?: {directed?: boolean, multigraph?: boolean, compound?: boolean}); graph(): GraphLabel; @@ -33,19 +33,19 @@ export namespace graphlib { children(parentName: string): string|undefined; hasNode(name: string): boolean; - neighbors(name: string): Node[]|undefined; - node(id: string|Label): Node; + neighbors(name: string): Array>|undefined; + node(id: string|Label): Node; nodeCount(): number; nodes(): string[]; parent(childName: string): string|undefined; - predecessors(name: string): Node[]|undefined; + predecessors(name: string): Array>|undefined; removeNode(name: string): Graph; setDefaultNodeLabel(callback: string|((nodeId: string) => string|Label)): Graph; setNode(name: string, label: string|Label): Graph; setParent(childName: string, parentName: string): void; - sinks(): Node[]; - sources(): Node[]; - successors(name: string): Node[]|undefined; + sinks(): Array>; + sources(): Array>; + successors(name: string): Array>|undefined; } namespace json { @@ -116,10 +116,9 @@ export interface GraphEdge { [key: string]: any; } -export interface Node { +export type Node = T & { x: number; y: number; width: number; height: number; - [key: string]: any; -} +};