clean up

Author: mykalmax

web/common/src/components/Lineage/LineageColumnLevel/help.ts

@@ -1,4 +1,4 @@
-import { toEdgeID, toNodeID, toPortID } from '../help'
+import { toEdgeID, toNodeID, toPortID } from '../utils'
 import {
   type AdjacencyListColumnKey,
   type AdjacencyListKey,

web/common/src/components/Lineage/LineageColumnLevel/useColumns.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { toPortID } from '../help'
+import { toPortID } from '../utils'
 import {
   type AdjacencyListColumnKey,
   type AdjacencyListKey,

web/common/src/components/Lineage/help.ts

@@ -14,6 +14,8 @@ import {
   type LineageNodesMap,
   type NodeId,
   type PortId,
+  toEdgeID,
+  toNodeID,
   type TransformEdgeFn,
   type TransformNodeFn,
 } from './utils'
@@ -167,19 +169,3 @@ export function createEdge<TEdgeData extends LineageEdgeData = LineageEdgeData>(
     zIndex: 1,
   }
 }
-
-export function toID<TReturn extends string>(...args: string[]) {
-  return args.join('.') as TReturn
-}
-
-export function toNodeID(...args: string[]) {
-  return encodeURI(toID(...args)) as NodeId
-}
-
-export function toEdgeID(...args: string[]) {
-  return encodeURI(toID(...args)) as EdgeId
-}
-
-export function toPortID(...args: string[]) {
-  return encodeURI(toID(...args)) as PortId
-}

web/common/src/components/Lineage/layout/dagreLayout.ts

@@ -49,19 +49,24 @@ export async function getLayoutedGraph<
     worker.addEventListener('error', errorHandler)
 
     try {
-      worker.postMessage({ edges, nodesMap })
+      worker.postMessage({ edges, nodesMap } as LayoutedGraph<
+        TNodeData,
+        TEdgeData
+      >)
     } catch (postError) {
       errorHandler(postError as ErrorEvent)
     }
 
     function handler(
-      event: MessageEvent<LayoutedGraph<TNodeData> & { error: ErrorEvent }>,
+      event: MessageEvent<
+        LayoutedGraph<TNodeData, TEdgeData> & { error: ErrorEvent }
+      >,
     ) {
       cleanup()
 
       if (event.data.error) return errorHandler(event.data.error)
 
-      resolve(event.data as LayoutedGraph<TNodeData, TEdgeData>)
+      resolve(event.data)
     }
 
     function errorHandler(error: ErrorEvent) {

web/common/src/components/Lineage/layout/dagreLayout.worker.ts

@@ -3,12 +3,16 @@ import dagre from 'dagre'
 import {
   DEFAULT_NODE_WIDTH,
   type LayoutedGraph,
+  type LineageEdgeData,
   type LineageNodeData,
   type NodeId,
 } from '../utils'
 
-self.onmessage = <TNodeData extends LineageNodeData = LineageNodeData>(
-  event: MessageEvent<LayoutedGraph<TNodeData>>,
+self.onmessage = <
+  TNodeData extends LineageNodeData = LineageNodeData,
+  TEdgeData extends LineageEdgeData = LineageEdgeData,
+>(
+  event: MessageEvent<LayoutedGraph<TNodeData, TEdgeData>>,
 ) => {
   try {
     const { edges, nodesMap } = event.data
@@ -21,7 +25,7 @@ self.onmessage = <TNodeData extends LineageNodeData = LineageNodeData>(
       return self.postMessage({
         edges: [],
         nodesMap: {},
-      })
+      } as LayoutedGraph<TNodeData, TEdgeData>)
 
     const g = new dagre.graphlib.Graph({
       compound: true,
@@ -75,8 +79,8 @@ self.onmessage = <TNodeData extends LineageNodeData = LineageNodeData>(
     self.postMessage({
       edges,
       nodesMap,
-    })
+    } as LayoutedGraph<TNodeData, TEdgeData>)
   } catch (outerError) {
-    self.postMessage({ error: outerError })
+    self.postMessage({ error: outerError } as { error: ErrorEvent })
   }
 }

web/common/src/components/Lineage/node/NodeBase.tsx

@@ -7,7 +7,6 @@ import { cn } from '@/utils'
 export interface NodeBaseProps extends NodeProps {
   className?: string
   children?: React.ReactNode
-  style?: React.CSSProperties
 }
 
 export const NodeBase = React.memo(

web/common/src/components/Lineage/stories/ModelLineage.tsx

@@ -20,15 +20,14 @@ import { LineageControlButton } from '../LineageControlButton'
 import { LineageControlIcon } from '../LineageControlIcon'
 import { LineageLayout } from '../LineageLayout'
 import { FactoryEdgeWithGradient } from '../edge/FactoryEdgeWithGradient'
+import { toNodeID, toPortID } from '../utils'
 import {
   calculateNodeBaseHeight,
   createEdge,
   createNode,
   getOnlySelectedNodes,
   getTransformedModelEdges,
   getTransformedNodes,
-  toNodeID,
-  toPortID,
 } from '../help'
 import {
   cleanupLayoutWorker,

web/common/src/components/Lineage/utils.ts

@@ -70,3 +70,19 @@ export type TransformEdgeFn<
   sourceColumnId?: PortId,
   targetColumnId?: PortId,
 ) => LineageEdge<TEdgeData>
+
+export function toID<TReturn extends string>(...args: string[]) {
+  return args.join('.') as TReturn
+}
+
+export function toNodeID(...args: string[]) {
+  return encodeURI(toID(...args)) as NodeId
+}
+
+export function toEdgeID(...args: string[]) {
+  return encodeURI(toID(...args)) as EdgeId
+}
+
+export function toPortID(...args: string[]) {
+  return encodeURI(toID(...args)) as PortId
+}