From 46ee5188e91a8fe0bfd393fc493ae4123f34e72c Mon Sep 17 00:00:00 2001
From: andrmaz <60042277+andrmaz@users.noreply.github.com>
Date: Sun, 9 Oct 2022 11:13:23 +0200
Subject: [PATCH] feat(curve): deduplicate curve factory type

Signed-off-by: andrmaz <60042277+andrmaz@users.noreply.github.com>
---
 packages/core-components/api-report.md                 |  6 +-----
 .../src/components/DependencyGraph/DependencyGraph.tsx |  3 +--
 .../src/components/DependencyGraph/Edge.test.tsx       |  4 ++--
 .../src/components/DependencyGraph/Edge.tsx            |  3 +--
 .../src/components/DependencyGraph/types.ts            | 10 ----------
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/packages/core-components/api-report.md b/packages/core-components/api-report.md
index 6d6079bf8e..78574e71a3 100644
--- a/packages/core-components/api-report.md
+++ b/packages/core-components/api-report.md
@@ -203,9 +203,6 @@ export type CreateButtonProps = {
   title: string;
 } & Partial<Pick<LinkProps_3, 'to'>>;
 
-// @public
-type Curve = 'curveStepBefore' | 'curveMonotoneX';
-
 // @public (undocumented)
 export type CustomProviderClassKey = 'form' | 'button';
 
@@ -242,7 +239,7 @@ export interface DependencyGraphProps<NodeData, EdgeData>
   acyclicer?: 'greedy';
   // Warning: (ae-unresolved-link) The @link reference could not be resolved: This type of declaration is not supported yet by the resolver
   align?: Alignment;
-  curve?: Curve;
+  curve?: 'curveStepBefore' | 'curveMonotoneX';
   defs?: SVGDefsElement | SVGDefsElement[];
   // Warning: (ae-unresolved-link) The @link reference could not be resolved: This type of declaration is not supported yet by the resolver
   direction?: Direction;
@@ -273,7 +270,6 @@ declare namespace DependencyGraphTypes {
     DependencyNode,
     RenderNodeProps,
     RenderNodeFunction,
-    Curve,
     Direction,
     Alignment,
     Ranker,
diff --git a/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx b/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx
index 3457a83d7d..5159f67d9e 100644
--- a/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx
+++ b/packages/core-components/src/components/DependencyGraph/DependencyGraph.tsx
@@ -30,7 +30,6 @@ import {
   RenderNodeFunction,
   RenderLabelFunction,
   LabelPosition,
-  Curve,
 } from './types';
 import { Node } from './Node';
 import { Edge, GraphEdge } from './Edge';
@@ -170,7 +169,7 @@ export interface DependencyGraphProps<NodeData, EdgeData>
    *
    * Default: 'curveMonotoneX'
    */
-  curve?: Curve;
+  curve?: 'curveStepBefore' | 'curveMonotoneX';
 }
 
 const WORKSPACE_ID = 'workspace';
diff --git a/packages/core-components/src/components/DependencyGraph/Edge.test.tsx b/packages/core-components/src/components/DependencyGraph/Edge.test.tsx
index ccb7bd7a9f..a44f25fbfc 100644
--- a/packages/core-components/src/components/DependencyGraph/Edge.test.tsx
+++ b/packages/core-components/src/components/DependencyGraph/Edge.test.tsx
@@ -17,11 +17,11 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import { Edge } from './Edge';
-import { Curve, RenderLabelProps } from './types';
+import { RenderLabelProps } from './types';
 
 const fromNode = 'node';
 const toNode = 'other-node';
-const curve: Curve = 'curveMonotoneX';
+const curve: 'curveStepBefore' | 'curveMonotoneX' = 'curveMonotoneX';
 
 const edge = {
   points: [
diff --git a/packages/core-components/src/components/DependencyGraph/Edge.tsx b/packages/core-components/src/components/DependencyGraph/Edge.tsx
index ea526827bf..aae737b9ea 100644
--- a/packages/core-components/src/components/DependencyGraph/Edge.tsx
+++ b/packages/core-components/src/components/DependencyGraph/Edge.tsx
@@ -24,7 +24,6 @@ import {
   RenderLabelFunction,
   DependencyEdge,
   LabelPosition,
-  Curve,
 } from './types';
 import { EDGE_TEST_ID, LABEL_TEST_ID } from './constants';
 import { DefaultLabel } from './DefaultLabel';
@@ -71,7 +70,7 @@ export type EdgeComponentProps<T = unknown> = {
     id: dagre.Edge,
     edge: DependencyEdge<T>,
   ) => dagre.graphlib.Graph<{}>;
-  curve: Curve;
+  curve: 'curveStepBefore' | 'curveMonotoneX';
 };
 
 const renderDefault = (props: RenderLabelProps<unknown>) => (
diff --git a/packages/core-components/src/components/DependencyGraph/types.ts b/packages/core-components/src/components/DependencyGraph/types.ts
index 55226eb91d..4ae6057bd7 100644
--- a/packages/core-components/src/components/DependencyGraph/types.ts
+++ b/packages/core-components/src/components/DependencyGraph/types.ts
@@ -75,16 +75,6 @@ export type RenderNodeFunction<T = {}> = (
   props: RenderNodeProps<T>,
 ) => React.ReactNode;
 
-/**
- *  Graph curve factory
- *
- * @public
- *
- * @see {@link @types/d3-shape/index.d.ts#curveMonotoneX}
- * @see {@link @types/d3-shape/index.d.ts#curveStepBefore}
- */
-export type Curve = 'curveStepBefore' | 'curveMonotoneX';
-
 /**
  * Graph direction
  *