From 0393409e898d4c462110c35190a192bb17ed1696 Mon Sep 17 00:00:00 2001
From: Peter <p.korcsak@googlemail.com>
Date: Tue, 28 Nov 2023 13:03:50 +0100
Subject: [PATCH] fix(system) exportet Optional type, fix(svelte) adjusted
 exported edge types

---
 .../svelte/src/routes/examples/customnode/CustomNode.svelte   | 2 +-
 packages/svelte/src/lib/components/edges/BezierEdge.svelte    | 4 ++--
 .../svelte/src/lib/components/edges/SmoothStepEdge.svelte     | 4 ++--
 packages/svelte/src/lib/components/edges/StepEdge.svelte      | 4 ++--
 packages/svelte/src/lib/components/edges/StraightEdge.svelte  | 3 ++-
 packages/system/src/types/utils.ts                            | 2 ++
 packages/system/src/utils/index.ts                            | 1 +
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/examples/svelte/src/routes/examples/customnode/CustomNode.svelte b/examples/svelte/src/routes/examples/customnode/CustomNode.svelte
index 25d37d32..51ba33ea 100644
--- a/examples/svelte/src/routes/examples/customnode/CustomNode.svelte
+++ b/examples/svelte/src/routes/examples/customnode/CustomNode.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Writable } from 'svelte/store';
-	import { Handle, Position, type NodeProps } from '@xyflow/svelte';
+	import { Handle, Position, type NodeProps, BezierEdge, SmoothStepEdge } from '@xyflow/svelte';
 
 	type $$Props = NodeProps;
 
diff --git a/packages/svelte/src/lib/components/edges/BezierEdge.svelte b/packages/svelte/src/lib/components/edges/BezierEdge.svelte
index 56ccaf31..ef5fd3db 100644
--- a/packages/svelte/src/lib/components/edges/BezierEdge.svelte
+++ b/packages/svelte/src/lib/components/edges/BezierEdge.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import { getBezierPath } from '@xyflow/system';
+  import { getBezierPath, type Optional } from '@xyflow/system';
 
   import type { EdgeProps } from '$lib/types';
   import { BaseEdge } from '$lib/components/BaseEdge';
 
-  type $$Props = Partial<EdgeProps>;
+  type $$Props = Optional<EdgeProps, 'id' | 'target' | 'source'>;
 
   $: [path, labelX, labelY] = getBezierPath({
     sourceX: $$props.sourceX,
diff --git a/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte b/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte
index 39acb6e6..f528da0e 100644
--- a/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte
+++ b/packages/svelte/src/lib/components/edges/SmoothStepEdge.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import { getSmoothStepPath } from '@xyflow/system';
+  import { getSmoothStepPath, type Optional } from '@xyflow/system';
 
   import type { EdgeProps } from '$lib/types';
   import { BaseEdge } from '$lib/components/BaseEdge';
 
-  type $$Props = Partial<EdgeProps>;
+  type $$Props = Optional<EdgeProps, 'id' | 'target' | 'source'>;
 
   $: [path, labelX, labelY] = getSmoothStepPath({
     sourceX: $$props.sourceX,
diff --git a/packages/svelte/src/lib/components/edges/StepEdge.svelte b/packages/svelte/src/lib/components/edges/StepEdge.svelte
index ac6118ca..b0860d03 100644
--- a/packages/svelte/src/lib/components/edges/StepEdge.svelte
+++ b/packages/svelte/src/lib/components/edges/StepEdge.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-  import { getSmoothStepPath } from '@xyflow/system';
+  import { getSmoothStepPath, type Optional } from '@xyflow/system';
 
   import type { EdgeProps } from '$lib/types';
   import { BaseEdge } from '$lib/components/BaseEdge';
 
-  type $$Props = Partial<EdgeProps>;
+  type $$Props = Optional<EdgeProps, 'id' | 'target' | 'source'>;
 
   $: [path, labelX, labelY] = getSmoothStepPath({
     sourceX: $$props.sourceX,
diff --git a/packages/svelte/src/lib/components/edges/StraightEdge.svelte b/packages/svelte/src/lib/components/edges/StraightEdge.svelte
index 9e6c88da..b83424a0 100644
--- a/packages/svelte/src/lib/components/edges/StraightEdge.svelte
+++ b/packages/svelte/src/lib/components/edges/StraightEdge.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { getStraightPath } from '@xyflow/system';
+  import type { Optional } from '@xyflow/system/dist/esm/utils/types';
 
   import type { EdgeProps } from '$lib/types';
   import { BaseEdge } from '$lib/components/BaseEdge';
 
-  type $$Props = Partial<EdgeProps>;
+  type $$Props = Optional<EdgeProps, 'id' | 'target' | 'source'>;
 
   $: [path, labelX, labelY] = getStraightPath({
     sourceX: $$props.sourceX,
diff --git a/packages/system/src/types/utils.ts b/packages/system/src/types/utils.ts
index 908e95f1..6ebb0744 100644
--- a/packages/system/src/types/utils.ts
+++ b/packages/system/src/types/utils.ts
@@ -1,3 +1,5 @@
+import type { Optional } from '../utils/types';
+
 export enum Position {
   Left = 'left',
   Top = 'top',
diff --git a/packages/system/src/utils/index.ts b/packages/system/src/utils/index.ts
index 380b7658..4937033c 100644
--- a/packages/system/src/utils/index.ts
+++ b/packages/system/src/utils/index.ts
@@ -5,3 +5,4 @@ export * from './general';
 export * from './marker';
 export * from './node-toolbar';
 export * from './store';
+export * from './types';