svelteplot 0.10.3-pr-484.0 → 0.10.3-pr-485.0

package/dist/marks/Link.svelte

@@ -60,8 +60,8 @@
     import Mark from '../Mark.svelte';
     import MarkerPath from './helpers/MarkerPath.svelte';
     import { replaceChannels } from '../transforms/rename.js';
-    import { line, type CurveFactory } from 'd3-shape';
-    import callWithProps from '../helpers/callWithProps.js';
+    import { line, type CurveFactory, type Line as D3Line } from 'd3-shape';
+    import type { MarkerShape } from './helpers/Marker.svelte';
     import { maybeCurve } from '../helpers/curves.js';
     import { geoPath } from 'd3-geo';
     import { pick } from 'es-toolkit';
@@ -93,9 +93,9 @@
     const args = $derived(
         replaceChannels(
             sort({
-                data: indexData(data),
+                data: indexData(data as object[]) as DataRecord[],
                 stroke: 'currentColor',
-                ...options
+                ...(options as BaseMarkProps<DataRecord>)
             }),
             { y: ['y1', 'y2'], x: ['x1', 'x2'] }
         )
@@ -103,42 +103,44 @@
 
     const sphericalLine = $derived(plot.scales.projection && curve === 'auto');
 
-    const linePath: (d: ScaledDataRecord, reversed: boolean) => string = $derived.by(() => {
-        const fn = callWithProps(line, [], {
-            curve: maybeCurve(
-                curve === 'auto' ? 'linear' : curve,
-                bend === true ? 0.6 : bend === false ? 0 : (bend ?? tension)
-            ),
-            x: (d) => d[0],
-            y: (d) => d[1]
-        });
+    const linePath: (d: ScaledDataRecord, reversed?: boolean) => string | null = $derived.by(() => {
+        const fn: D3Line<[number, number]> = line<[number, number]>()
+            .curve(
+                maybeCurve(
+                    curve === 'auto' ? 'linear' : curve,
+                    bend === true ? 0.6 : bend === false ? 0 : (bend ?? tension ?? 0)
+                )
+            )
+            .x((d) => d[0])
+            .y((d) => d[1]);
 
         return (d: ScaledDataRecord, reversed = false) =>
             fn(
                 reversed
                     ? [
-                          [d.x2, d.y2],
-                          [d.x1, d.y1]
+                          [d.x2 as number, d.y2 as number],
+                          [d.x1 as number, d.y1 as number]
                       ]
                     : [
-                          [d.x1, d.y1],
-                          [d.x2, d.y2]
+                          [d.x1 as number, d.y1 as number],
+                          [d.x2 as number, d.y2 as number]
                       ]
             );
     });
 
-    const sphericalLinePath: (d: ScaledDataRecord, reversed: boolean) => string = $derived.by(
-        () => {
+    const sphericalLinePath: (d: ScaledDataRecord, reversed?: boolean) => string | null =
+        $derived.by(() => {
             const fn = sphereLine(plot.scales.projection);
             return (d: ScaledDataRecord, reversed = false) => {
                 const x1 = resolveChannel('x1', d.datum, args);
                 const y1 = resolveChannel('y1', d.datum, args);
                 const x2 = resolveChannel('x2', d.datum, args);
                 const y2 = resolveChannel('y2', d.datum, args);
-                return reversed ? fn(x2, y2, x1, y1) : fn(x1, y1, x2, y2);
+                return reversed
+                    ? fn(x2 as number, y2 as number, x1 as number, y1 as number)
+                    : fn(x1 as number, y1 as number, x2 as number, y2 as number);
             };
-        }
-    );
+        });
     //     sphericalLine
     //         ?
 
@@ -146,7 +148,7 @@
     //         :
     // );
 
-    function sphereLine(projection) {
+    function sphereLine(projection: any) {
         const path = geoPath(projection);
         return (x1: number, y1: number, x2: number, y2: number) => {
             return path({
@@ -181,10 +183,10 @@
                         d,
                         {
                             textAnchor: 'middle',
-                            ...pick(args, ['fontSize', 'fontWeight', 'fontStyle', 'textAnchor']),
-                            fill: args.textFill || args.stroke,
-                            stroke: args.textStroke,
-                            strokeWidth: args.textStrokeWidth
+                            ...pick(args, ['fontSize', 'fontWeight', 'fontStyle']),
+                            fill: options.textFill || args.stroke,
+                            stroke: options.textStroke,
+                            strokeWidth: options.textStrokeWidth
                         },
                         'fill',
                         usedScales
@@ -192,21 +194,27 @@
 
                     <MarkerPath
                         mark={{ ...mark, options: args }}
+                        transform=""
                         scales={plot.scales}
-                        markerStart={args.markerStart}
-                        markerEnd={args.markerEnd}
-                        marker={args.marker}
-                        markerScale={args.markerScale}
-                        class={styleClass}
-                        strokeWidth={args.strokeWidth}
-                        datum={d.datum}
-                        color={d.stroke}
-                        d={sphericalLine ? sphericalLinePath(d) : linePath(d)}
-                        dInv={sphericalLine ? sphericalLinePath(d, true) : linePath(d, true)}
-                        {style}
-                        text={text ? resolveProp(text, d.datum) : null}
-                        startOffset={resolveProp(args.textStartOffset, d.datum, '50%')}
-                        {textStyle}
+                        markerStart={options.markerStart as boolean | MarkerShape | undefined}
+                        markerEnd={options.markerEnd as boolean | MarkerShape | undefined}
+                        marker={options.marker as boolean | MarkerShape | undefined}
+                        markerScale={options.markerScale}
+                        class={styleClass ?? undefined}
+                        strokeWidth={options.strokeWidth as ConstantAccessor<number>}
+                        datum={d.datum as DataRecord}
+                        color={d.stroke ?? 'currentColor'}
+                        d={(sphericalLine ? sphericalLinePath(d) : linePath(d)) ?? ''}
+                        dInv={(sphericalLine ? sphericalLinePath(d, true) : linePath(d, true)) ??
+                            undefined}
+                        style={style ?? ''}
+                        text={text ? ((resolveProp(text, d.datum as Datum) as string) ?? '') : ''}
+                        startOffset={(resolveProp(
+                            options.textStartOffset,
+                            d.datum as Datum,
+                            '50%'
+                        ) as string) ?? '50%'}
+                        textStyle={textStyle ?? ''}
                         {textStyleClass} />
                 {/if}
             {/each}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.10.3-pr-484.0",
+    "version": "0.10.3-pr-485.0",
     "description": "A Svelte-native data visualization framework based on the layered grammar of graphics principles.",
     "keywords": [
         "svelte",