refactor: adjust types

Author: Aarebecca

packages/layout/src/d3Force/index.ts

@@ -5,6 +5,7 @@ import {
   Node,
   LayoutMapping,
   OutNode,
+  OutEdge,
   D3ForceLayoutOptions,
   Edge,
   LayoutWithIterations,
@@ -62,7 +63,7 @@ export class D3ForceLayout
   private forceSimulation: d3Force.Simulation<any, any>;
 
   private lastLayoutNodes: CalcNode[];
-  private lastLayoutEdges: Edge[];
+  private lastLayoutEdges: OutEdge[];
   private lastAssign: boolean;
   private lastGraph: Graph;
 
@@ -146,7 +147,7 @@ export class D3ForceLayout
           y: node.data?.y,
         } as CalcNode)
     );
-    const layoutEdges: Edge[] = edges.map((edge) => cloneFormatData(edge));
+    const layoutEdges: OutEdge[] = edges.map((edge) => cloneFormatData(edge));
 
     // Use them later in `tick`.
     this.lastLayoutNodes = layoutNodes;

packages/layout/src/dagre.ts

@@ -68,17 +68,17 @@ export class DagreLayout implements Layout<DagreLayoutOptions> {
   private async genericDagreLayout(
     assign: false,
     graph: IGraph,
-    options?: DagreLayoutOptions
+    options?: DagreLayoutOptions,
   ): Promise<LayoutMapping>;
   private async genericDagreLayout(
     assign: true,
     graph: IGraph,
-    options?: DagreLayoutOptions
+    options?: DagreLayoutOptions,
   ): Promise<void>;
   private async genericDagreLayout(
     assign: boolean,
     graph: IGraph,
-    options?: DagreLayoutOptions
+    options?: DagreLayoutOptions,
   ): Promise<LayoutMapping | void> {
     const mergedOptions = { ...this.options, ...options };
     const {
@@ -192,7 +192,7 @@ export class DagreLayout implements Layout<DagreLayoutOptions> {
         if (minY > node.data.y!) minY = node.data.y!;
       });
       g.getAllEdges().forEach((edge) => {
-        edge.data.points?.forEach((point) => {
+        edge.data.points?.forEach((point: Point) => {
           if (minX > point.x) minX = point.x;
           if (minY > point.y) minY = point.y;
         });
@@ -460,7 +460,7 @@ export class DagreLayout implements Layout<DagreLayoutOptions> {
         // if (i <= -1) return;
         if (edgeLabelSpace && controlPoints && edge.data.type !== 'loop') {
           edge.data.controlPoints = getControlPoints(
-            edge.data.points?.map(({ x, y }) => ({
+            edge.data.points?.map(({ x, y }: Point) => ({
               x: x + layoutTopLeft[0],
               y: y + layoutTopLeft[1],
             })),
@@ -469,7 +469,7 @@ export class DagreLayout implements Layout<DagreLayoutOptions> {
             layerCoordsArr,
             isHorizontal,
             isDifferentLayer,
-            filterControlPointsOutOfBoundary
+            filterControlPointsOutOfBoundary,
           );
         }
       });
@@ -525,8 +525,8 @@ const getControlPoints = (
   filterControlPointsOutOfBoundary: (
     ps: Point[],
     point1: Point,
-    point2: Point
-  ) => Point[]
+    point2: Point,
+  ) => Point[],
 ) => {
   let controlPoints = points?.slice(1, points.length - 1) || []; // 去掉头尾
   // 酌情增加控制点，使折线不穿过跨层的节点
@@ -575,7 +575,7 @@ const getControlPoints = (
         controlPoints = filterControlPointsOutOfBoundary(
           controlPoints,
           sourceNode.data as Point,
-          targetNode.data as Point
+          targetNode.data as Point,
         );
         // one controlPoint at least
         if (!controlPoints.length) {
@@ -588,7 +588,7 @@ const getControlPoints = (
               : {
                   x: sourceX,
                   y: (sourceY! + targetY!) / 2,
-                }) as Point
+                }) as Point,
           );
         }
       } else if (layerDiff > 1) {

packages/layout/src/dagre/coordinate-system.ts

@@ -1,20 +1,20 @@
-import { Node } from "@antv/graphlib";
-import { DagreRankdir, Graph, NodeData } from "../types";
+import { Node } from '@antv/graphlib';
+import type { DagreRankdir, Graph, NodeData, Point } from '../types';
 
 const adjust = (g: Graph, rankdir: DagreRankdir) => {
   const rd = rankdir.toLowerCase();
-  if (rd === "lr" || rd === "rl") {
+  if (rd === 'lr' || rd === 'rl') {
     swapWidthHeight(g);
   }
 };
 
 const undo = (g: Graph, rankdir: DagreRankdir) => {
   const rd = rankdir.toLowerCase();
-  if (rd === "bt" || rd === "rl") {
+  if (rd === 'bt' || rd === 'rl') {
     reverseY(g);
   }
 
-  if (rd === "lr" || rd === "rl") {
+  if (rd === 'lr' || rd === 'rl') {
     swapXY(g);
     swapWidthHeight(g);
   }
@@ -41,14 +41,14 @@ const reverseY = (g: Graph) => {
   });
 
   g.getAllEdges().forEach((edge) => {
-    edge.data.points?.forEach((point) => reverseYOne(point));
-    if (edge.data.hasOwnProperty("y")) {
+    edge.data.points?.forEach((point: Point) => reverseYOne(point));
+    if (edge.data.hasOwnProperty('y')) {
       reverseYOne(edge.data);
     }
   });
 };
 
-const reverseYOne = (node: { x?: number; y?: number }) => {
+const reverseYOne = (node: any) => {
   if (node?.y) {
     node.y = -node.y;
   }
@@ -60,14 +60,14 @@ const swapXY = (g: Graph) => {
   });
 
   g.getAllEdges().forEach((edge) => {
-    edge.data.points?.forEach((point) => swapXYOne(point));
-    if (edge.data.hasOwnProperty("x")) {
+    edge.data.points?.forEach((point: Point) => swapXYOne(point));
+    if (edge.data.hasOwnProperty('x')) {
       swapXYOne(edge.data);
     }
   });
 };
 
-const swapXYOne = (node: { x?: number; y?: number }) => {
+const swapXYOne = (node: any) => {
   const x = node.x;
   node.x = node.y;
   node.y = x;

packages/layout/src/dagre/layout.ts

@@ -1,8 +1,9 @@
-import { Graph, ID } from '@antv/graphlib';
+import { Edge as IEdge, Graph, ID } from '@antv/graphlib';
 import { isNil } from '@antv/util';
 import {
   DagreAlign,
   DagreRankdir,
+  EdgeData,
   Graph as IGraph,
   NodeData,
   Point,
@@ -438,7 +439,7 @@ const translateGraph = (
   });
 
   g.getAllEdges().forEach((edge) => {
-    edge.data.points?.forEach((p) => {
+    edge.data.points?.forEach((p: Point) => {
       p.x -= minX;
       p.y -= minY;
     });
@@ -553,7 +554,7 @@ const insertSelfEdges = (g: IGraph) => {
     layer?.forEach((v: ID, i: number) => {
       const node = g.getNode(v)!;
       node.data.order = i + orderShift;
-      node.data.selfEdges?.forEach((selfEdge) => {
+      node.data.selfEdges?.forEach((selfEdge: IEdge<EdgeData>) => {
         addDummyNode(
           g,
           'selfedge',

packages/layout/src/force/index.ts

@@ -9,6 +9,7 @@ import {
   Point,
   OutNode,
   LayoutWithIterations,
+  OutEdge,
 } from '../types';
 import { formatNumberFn, isArray } from '../util';
 import { forceNBody } from './forceNBody';
@@ -67,7 +68,7 @@ export class ForceLayout implements LayoutWithIterations<ForceLayoutOptions> {
 
   private running: boolean = false;
   private lastLayoutNodes: OutNode[];
-  private lastLayoutEdges: Edge[];
+  private lastLayoutEdges: OutEdge[];
   private lastAssign: boolean;
   private lastCalcGraph: IGraph<CalcNodeData, CalcEdgeData>;
   private lastGraph: Graph;