svelteplot 0.4.2 → 0.4.3

package/dist/Mark.svelte

@@ -135,11 +135,12 @@
     const resolvedData: ResolvedDataRecord<Datum>[] = $derived(
         data
             .map((d, i) => ({ ...d, [INDEX]: i }))
-            .flatMap((row) => {
+            .flatMap((row, index) => {
                 const channels = options as Record<ChannelName, ChannelAccessor<Datum>>;
                 if (!testFacet(row, channels) || !testFilter(row, channels)) return [];
                 const out: ResolvedDataRecord<Datum> = {
-                    datum: row
+                    datum: row,
+                    index
                 };
                 for (const [channel] of Object.entries(CHANNEL_SCALE) as [
                     ScaledChannelName,
@@ -208,6 +209,7 @@
         resolvedData.flatMap((row) => {
             const out: ScaledDataRecord<Datum> = {
                 datum: row.datum,
+                index: row[INDEX],
                 valid: true
             };
             // compute dx/dy

package/dist/core/Plot.svelte

@@ -499,8 +499,7 @@
             width={fixedWidth || width}
             {height}
             fill="currentColor"
-            viewBox="0 0 {width} {height}"
-            font-family="system-ui, sans-serif">
+            viewBox="0 0 {width} {height}">
             {@render facetAxes?.()}
             <FacetGrid marks={explicitMarks}>
                 {#if children}

package/dist/helpers/index.d.ts

@@ -1,4 +1,4 @@
-import type { ChannelName, Channels, DataRecord, RawValue } from '../types/index.js';
+import type { ChannelName, Channels, RawValue } from '../types/index.js';
 import type { Snippet } from 'svelte';
 /**
  * Returns first argument that is not null or undefined
@@ -8,7 +8,6 @@ export declare function testFilter<T>(datum: T, options: Channels<T>): true | T
 export declare function randomId(): string;
 export declare function isSnippet(value: unknown): value is Snippet;
 export declare function isValid(value: RawValue | undefined): value is number | Date | string;
-export declare function maybeData(data: DataRecord[]): DataRecord[];
 export declare function isObject<T>(option: object | T): option is object;
 export declare function maybeNumber(value: RawValue | null): number | null;
 export declare const constant: <T>(x: T) => () => T;

package/dist/helpers/index.js

@@ -13,8 +13,7 @@ export function coalesce(...args) {
     return null; // Return null if all arguments are null or undefined
 }
 export function testFilter(datum, options) {
-    return (options.filter == null ||
-        resolveProp(options.filter, isObject(datum) && datum.hasOwnProperty(RAW_VALUE) ? datum[RAW_VALUE] : datum));
+    return options.filter == null || resolveProp(options.filter, datum);
 }
 export function randomId() {
     return Math.ceil(1e9 + Math.random() * 1e9).toString(36);
@@ -28,10 +27,6 @@ export function isValid(value) {
         !Number.isNaN(value) &&
         (typeof value !== 'number' || Number.isFinite(value)));
 }
-export function maybeData(data) {
-    // if (data.type === 'FeatureCollection') return data.features;
-    return data;
-}
 export function isObject(option) {
     // doesn't work with Proxies
     return (typeof option === 'object' && !isDate(option) && !Array.isArray(option) && option !== null);

package/dist/helpers/resolve.js

@@ -1,4 +1,4 @@
-import { CHANNEL_SCALE } from '../constants.js';
+import { CHANNEL_SCALE, INDEX } from '../constants.js';
 import isDataRecord from './isDataRecord.js';
 import isRawValue from './isRawValue.js';
 import { isValid } from './index.js';
@@ -11,7 +11,7 @@ export function resolveProp(accessor, datum, _defaultValue = null) {
         // so we're passing the original value to accessor functions instead of our wrapped record
         return datum == null
             ? accessor()
-            : accessor(datum[RAW_VALUE] != null ? datum[RAW_VALUE] : datum);
+            : accessor(datum[RAW_VALUE] != null ? datum[RAW_VALUE] : datum, datum[INDEX]);
     }
     else if ((typeof accessor === 'string' || typeof accessor === 'symbol') &&
         datum &&
@@ -51,7 +51,7 @@ function resolve(datum, accessor, channel, scale) {
             // datum[RAW_VALUE] exists if an array of raw values was used as dataset and got
             // "recordized" by the recordize transform. We want to hide this wrapping to the user
             // so we're passing the original value to accessor functions instead of our wrapped record
-            return accessor(datum[RAW_VALUE] != null ? datum[RAW_VALUE] : datum);
+            return accessor(datum[RAW_VALUE] != null ? datum[RAW_VALUE] : datum, datum?.[INDEX]);
         // use accessor string
         if ((typeof accessor === 'string' || typeof accessor === 'symbol') &&
             datum[accessor] !== undefined)
@@ -69,7 +69,7 @@ function resolve(datum, accessor, channel, scale) {
     else {
         // return single value or accessor
         return typeof accessor === 'function'
-            ? accessor(datum)
+            ? accessor(datum, datum?.[INDEX])
             : accessor !== null && isRawValue(accessor)
                 ? accessor
                 : !Array.isArray(datum) && (scale === 'x' || scale === 'y')

package/dist/marks/Area.svelte

@@ -136,11 +136,11 @@
                                 class={['svelteplot-area', className, styleClass]}
                                 clip-path={options.clipPath}
                                 d={areaPath(areaData)}
-                                use:addEventHandlers={{
+                                {@attach addEventHandlers({
                                     getPlotState,
                                     options,
-                                    datum: datum.datum
-                                }}
+                                    datum: datum?.datum
+                                })}
                                 {style}
                                 >{#if title}<title>{title}</title>{/if}</path>
                         </Anchor>

package/dist/marks/Arrow.svelte

@@ -4,7 +4,9 @@
 <script lang="ts" generics="Datum extends DataRecord">
     interface ArrowMarkProps extends Omit<BaseMarkProps<Datum>, 'fill' | 'fillOpacity'> {
         data: Datum[];
-        sort?: ConstantAccessor<RawValue> | { channel: 'stroke' | 'fill' };
+        sort?:
+            | ConstantAccessor<RawValue>
+            | { channel: 'stroke' | 'fill' | 'x1' | 'y1' | 'x2' | 'y2' };
         x1: ChannelAccessor<Datum>;
         y1: ChannelAccessor<Datum>;
         x2: ChannelAccessor<Datum>;
@@ -46,12 +48,14 @@
         PlotDefaults
     } from '../types/index.js';
     import { resolveChannel, resolveProp, resolveStyles } from '../helpers/resolve.js';
-    import { coalesce, maybeData, maybeNumber } from '../helpers/index.js';
+    import { coalesce, maybeNumber } from '../helpers/index.js';
     import Mark from '../Mark.svelte';
     import { arrowPath, maybeSweep, type SweepOption } from '../helpers/arrowPath.js';
     import { replaceChannels } from '../transforms/rename.js';
     import { addEventHandlers } from './helpers/events.js';
     import GroupMultiple from './helpers/GroupMultiple.svelte';
+    import { sort } from '../transforms/sort.js';
+    import { indexData } from '../transforms/recordize.js';
 
     let markProps: ArrowMarkProps = $props();
 
@@ -74,16 +78,13 @@
     const { getPlotState } = getContext<PlotContext>('svelteplot');
     const plot = $derived(getPlotState());
 
-    const sorted = $derived(
-        options.sort
-            ? maybeData(data).toSorted((a, b) =>
-                  resolveChannel('sort', a, options) > resolveChannel('sort', b, options) ? 1 : -1
-              )
-            : maybeData(data)
-    );
-
     const args: ArrowMarkProps = $derived(
-        replaceChannels({ data: sorted, ...options }, { y: ['y1', 'y2'], x: ['x1', 'x2'] })
+        sort(
+            replaceChannels(
+                { data: indexData(data), ...options },
+                { y: ['y1', 'y2'], x: ['x1', 'x2'] }
+            )
+        )
     );
 </script>
 
@@ -131,11 +132,11 @@
                     )}
                     <g
                         class={[className]}
-                        use:addEventHandlers={{
+                        {@attach addEventHandlers({
                             getPlotState,
-                            options: args,
-                            datum: d.datum
-                        }}>
+                            options,
+                            datum: d?.datum
+                        })}>
                         {#if options.onmouseenter || options.onclick}
                             <!-- add invisible path in bg for easier mouse access -->
                             <path

package/dist/marks/Arrow.svelte.d.ts

@@ -63,7 +63,7 @@ declare class __sveltets_Render<Datum extends DataRecord> {
     }>, "fill" | "fillOpacity"> & {
         data: Datum[];
         sort?: ConstantAccessor<RawValue> | {
-            channel: "stroke" | "fill";
+            channel: "stroke" | "fill" | "x1" | "y1" | "x2" | "y2";
         };
         x1: ChannelAccessor<Datum>;
         y1: ChannelAccessor<Datum>;

package/dist/marks/AxisX.svelte

@@ -39,7 +39,7 @@
             | 'auto'
             | Intl.DateTimeFormatOptions
             | Intl.NumberFormatOptions
-            | ((d: RawValue) => string);
+            | ((d: RawValue, i: number) => string);
         tickClass?: ConstantAccessor<string, Datum>;
         /** ticks is a shorthand for defining data, tickCount or interval */
         ticks?: number | string | Datum[];

package/dist/marks/AxisX.svelte.d.ts

@@ -71,7 +71,7 @@ declare class __sveltets_Render<Datum extends RawValue> {
         tickFontSize?: ConstantAccessor<number, Datum>;
         titleFontSize?: number;
         tickPadding?: number;
-        tickFormat?: "auto" | Intl.NumberFormatOptions | Intl.DateTimeFormatOptions | ((d: RawValue) => string) | undefined;
+        tickFormat?: "auto" | Intl.NumberFormatOptions | Intl.DateTimeFormatOptions | ((d: RawValue, i: number) => string) | undefined;
         tickClass?: ConstantAccessor<string, Datum>;
         /** ticks is a shorthand for defining data, tickCount or interval */
         ticks?: string | number | Datum[] | undefined;

package/dist/marks/Dot.svelte

@@ -28,7 +28,7 @@
     import { sort } from '../index.js';
     import Mark from '../Mark.svelte';
     import DotCanvas from './helpers/DotCanvas.svelte';
-    import { maybeData, isValid } from '../helpers/index.js';
+    import { isValid } from '../helpers/index.js';
     import { recordizeXY } from '../transforms/recordize.js';
     import { addEventHandlers } from './helpers/events.js';
     import Anchor from './helpers/Anchor.svelte';
@@ -58,7 +58,7 @@
         // todo: move sorting to Mark
         sort(
             recordizeXY({
-                data: maybeData(data),
+                data,
                 // sort by descending radius by default
                 ...(options.r ? { sort: { channel: '-r' } } : {}),
                 ...options,
@@ -107,11 +107,11 @@
                                     styleClass
                                 ]}
                                 {style}
-                                use:addEventHandlers={{
+                                {@attach addEventHandlers({
                                     getPlotState,
                                     options: args,
-                                    datum: d.datum
-                                }} />
+                                    datum: d?.datum
+                                })} />
                         </Anchor>
                     {/if}
                 {/each}

package/dist/marks/Geo.svelte

@@ -111,11 +111,11 @@
                                 d={path(geometry)}
                                 {style}
                                 class={[styleClass]}
-                                use:addEventHandlers={{
+                                {@attach addEventHandlers({
                                     getPlotState,
                                     options: args,
-                                    datum: d.datum
-                                }}>
+                                    datum: d?.datum
+                                })}>
                                 {#if title}<title>{title}</title>{/if}
                             </path>
                         </Anchor>

package/dist/marks/GridX.svelte

@@ -5,14 +5,25 @@
     interface GridXMarkProps extends Omit<BaseMarkProps<Datum>, 'fill' | 'fillOpacity'> {
         data?: Datum[];
         automatic?: boolean;
+        y1?: ChannelAccessor<Datum>;
+        y2?: ChannelAccessor<Datum>;
     }
     import { getContext } from 'svelte';
     import Mark from '../Mark.svelte';
-    import type { PlotContext, BaseMarkProps, RawValue, PlotDefaults } from '../types/index.js';
+    import type {
+        PlotContext,
+        BaseMarkProps,
+        RawValue,
+        PlotDefaults,
+        DataRecord,
+        ChannelAccessor
+    } from '../types/index.js';
     import { resolveChannel, resolveProp, resolveStyles } from '../helpers/resolve.js';
     import { autoTicks } from '../helpers/autoTicks.js';
     import { testFilter } from '../helpers/index.js';
     import { RAW_VALUE } from '../transforms/recordize.js';
+    import isDataRecord from '../helpers/isDataRecord';
+    import { INDEX } from '../constants';
 
     let markProps: GridXMarkProps = $props();
 
@@ -37,8 +48,8 @@
         Math.max(3, Math.round(plot.facetWidth / plot.options.x.tickSpacing))
     );
 
-    const ticks: RawValue[] = $derived(
-        data.length > 0
+    const ticks: DataRecord[] = $derived(
+        (data.length > 0
             ? // use custom tick values if user passed any as prop
               data
             : // use custom scale tick values if user passed any as plot scale option
@@ -50,6 +61,9 @@
                   plot.scales.x.fn,
                   autoTickCount
               )
+        ).map((d, i) =>
+            isDataRecord(d) ? { ...d, [INDEX]: i } : { [RAW_VALUE]: d, [INDEX]: i }
+        ) as DataRecord[]
     );
 </script>
 
@@ -64,17 +78,21 @@
             {#each ticks as tick, t (t)}
                 {#if testFilter(tick, options)}
                     {@const x =
-                        plot.scales.x.fn(tick) +
+                        plot.scales.x.fn(tick[RAW_VALUE]) +
                         (plot.scales.x.type === 'band' ? plot.scales.x.fn.bandwidth() * 0.5 : 0)}
                     {@const y1_ = resolveChannel('y1', tick, options)}
                     {@const y2_ = resolveChannel('y2', tick, options)}
                     {@const dx = +resolveProp(options?.dx, tick, 0)}
                     {@const dy = +resolveProp(options?.dy, tick, 0)}
-                    {@const y1 = options.y1 != null ? plot.scales.y.fn(y1_) : 0}
-                    {@const y2 = options.y2 != null ? plot.scales.y.fn(y2_) : plot.facetHeight}
+                    {@const y1 =
+                        options.y1 != null ? plot.scales.y.fn(y1_) : plot.options.marginTop}
+                    {@const y2 =
+                        options.y2 != null
+                            ? plot.scales.y.fn(y2_)
+                            : plot.options.marginTop + plot.facetHeight}
                     {@const [style, styleClass] = resolveStyles(
                         plot,
-                        { datum: { [RAW_VALUE]: tick } },
+                        { datum: tick },
                         options,
                         'stroke',
                         usedScales,
@@ -82,7 +100,7 @@
                     )}
                     <line
                         class={styleClass}
-                        transform="translate({x + dx},{plot.options.marginTop + dy})"
+                        transform="translate({x + dx},{dy})"
                         {style}
                         {y1}
                         {y2} />

package/dist/marks/GridX.svelte.d.ts

@@ -1,25 +1,25 @@
-import type { RawValue } from '../types/index.js';
+import type { RawValue, ChannelAccessor } from '../types/index.js';
 declare class __sveltets_Render<Datum = RawValue> {
     props(): Omit<Partial<{
         filter?: import("../types/index.js").ConstantAccessor<boolean, Datum>;
         facet?: "auto" | "include" | "exclude";
-        fx: import("../types/channel").ChannelAccessor<Datum>;
-        fy: import("../types/channel").ChannelAccessor<Datum>;
+        fx: ChannelAccessor<Datum>;
+        fy: ChannelAccessor<Datum>;
         dx: import("../types/index.js").ConstantAccessor<number, Datum>;
         dy: import("../types/index.js").ConstantAccessor<number, Datum>;
-        fill: import("../types/channel").ChannelAccessor<Datum>;
+        fill: ChannelAccessor<Datum>;
         fillOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
         sort: {
             channel: string;
             order?: "ascending" | "descending";
         } | ((a: RawValue, b: RawValue) => number) | import("../types/index.js").ConstantAccessor<RawValue, Datum>;
-        stroke: import("../types/channel").ChannelAccessor<Datum>;
+        stroke: ChannelAccessor<Datum>;
         strokeWidth: import("../types/index.js").ConstantAccessor<number, Datum>;
         strokeOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
         strokeLinejoin: import("../types/index.js").ConstantAccessor<import("csstype").Property.StrokeLinejoin, Datum>;
         strokeLinecap: import("../types/index.js").ConstantAccessor<import("csstype").Property.StrokeLinecap, Datum>;
         strokeMiterlimit: import("../types/index.js").ConstantAccessor<number, Datum>;
-        opacity: import("../types/channel").ChannelAccessor<Datum>;
+        opacity: ChannelAccessor<Datum>;
         strokeDasharray: import("../types/index.js").ConstantAccessor<string, Datum>;
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, Datum>;
         mixBlendMode: import("../types/index.js").ConstantAccessor<import("csstype").Property.MixBlendMode, Datum>;
@@ -62,6 +62,8 @@ declare class __sveltets_Render<Datum = RawValue> {
     }>, "fill" | "fillOpacity"> & {
         data?: Datum[] | undefined;
         automatic?: boolean;
+        y1?: ChannelAccessor<Datum>;
+        y2?: ChannelAccessor<Datum>;
     };
     events(): {};
     slots(): {};

package/dist/marks/GridY.svelte

@@ -5,10 +5,18 @@
     interface GridYMarkProps extends Omit<BaseMarkProps<Datum>, 'fill' | 'fillOpacity'> {
         data?: Datum[];
         automatic?: boolean;
+        x1?: ChannelAccessor<Datum>;
+        x2?: ChannelAccessor<Datum>;
     }
     import { getContext } from 'svelte';
     import Mark from '../Mark.svelte';
-    import type { PlotContext, BaseMarkProps, RawValue, PlotDefaults } from '../types/index.js';
+    import type {
+        PlotContext,
+        BaseMarkProps,
+        RawValue,
+        PlotDefaults,
+        ChannelAccessor
+    } from '../types/index.js';
     import { resolveChannel, resolveProp, resolveStyles } from '../helpers/resolve.js';
     import { autoTicks } from '../helpers/autoTicks.js';
     import { testFilter } from '../helpers/index.js';
@@ -68,8 +76,12 @@
                         (plot.scales.y.type === 'band' ? plot.scales.y.fn.bandwidth() * 0.5 : 0)}
                     {@const x1_ = resolveChannel('x1', tick, options)}
                     {@const x2_ = resolveChannel('x2', tick, options)}
-                    {@const x1 = options.x1 != null ? plot.scales.x.fn(x1_) : 0}
-                    {@const x2 = options.x2 != null ? plot.scales.x.fn(x2_) : plot.facetWidth}
+                    {@const x1 =
+                        options.x1 != null ? plot.scales.x.fn(x1_) : plot.options.marginLeft}
+                    {@const x2 =
+                        options.x2 != null
+                            ? plot.scales.x.fn(x2_)
+                            : plot.options.marginLeft + plot.facetWidth}
                     {@const dx = +resolveProp(options?.dx, tick, 0)}
                     {@const dy = +resolveProp(options?.dy, tick, 0)}
                     {@const [style, styleClass] = resolveStyles(
@@ -83,7 +95,7 @@
                     <line
                         {style}
                         class={styleClass}
-                        transform="translate({plot.options.marginLeft + dx},{y + dy})"
+                        transform="translate({dx},{y + dy})"
                         {x1}
                         {x2} />
                 {/if}

package/dist/marks/GridY.svelte.d.ts

@@ -1,25 +1,25 @@
-import type { RawValue } from '../types/index.js';
+import type { RawValue, ChannelAccessor } from '../types/index.js';
 declare class __sveltets_Render<Datum = RawValue> {
     props(): Omit<Partial<{
         filter?: import("../types/index.js").ConstantAccessor<boolean, Datum>;
         facet?: "auto" | "include" | "exclude";
-        fx: import("../types/channel").ChannelAccessor<Datum>;
-        fy: import("../types/channel").ChannelAccessor<Datum>;
+        fx: ChannelAccessor<Datum>;
+        fy: ChannelAccessor<Datum>;
         dx: import("../types/index.js").ConstantAccessor<number, Datum>;
         dy: import("../types/index.js").ConstantAccessor<number, Datum>;
-        fill: import("../types/channel").ChannelAccessor<Datum>;
+        fill: ChannelAccessor<Datum>;
         fillOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
         sort: {
             channel: string;
             order?: "ascending" | "descending";
         } | ((a: RawValue, b: RawValue) => number) | import("../types/index.js").ConstantAccessor<RawValue, Datum>;
-        stroke: import("../types/channel").ChannelAccessor<Datum>;
+        stroke: ChannelAccessor<Datum>;
         strokeWidth: import("../types/index.js").ConstantAccessor<number, Datum>;
         strokeOpacity: import("../types/index.js").ConstantAccessor<number, Datum>;
         strokeLinejoin: import("../types/index.js").ConstantAccessor<import("csstype").Property.StrokeLinejoin, Datum>;
         strokeLinecap: import("../types/index.js").ConstantAccessor<import("csstype").Property.StrokeLinecap, Datum>;
         strokeMiterlimit: import("../types/index.js").ConstantAccessor<number, Datum>;
-        opacity: import("../types/channel").ChannelAccessor<Datum>;
+        opacity: ChannelAccessor<Datum>;
         strokeDasharray: import("../types/index.js").ConstantAccessor<string, Datum>;
         strokeDashoffset: import("../types/index.js").ConstantAccessor<number, Datum>;
         mixBlendMode: import("../types/index.js").ConstantAccessor<import("csstype").Property.MixBlendMode, Datum>;
@@ -62,6 +62,8 @@ declare class __sveltets_Render<Datum = RawValue> {
     }>, "fill" | "fillOpacity"> & {
         data?: Datum[] | undefined;
         automatic?: boolean;
+        x1?: ChannelAccessor<Datum>;
+        x2?: ChannelAccessor<Datum>;
     };
     events(): {};
     slots(): {};

package/dist/marks/Link.svelte

@@ -48,7 +48,6 @@
         PlotDefaults
     } from '../types/index.js';
     import { resolveChannel, resolveProp, resolveStyles } from '../helpers/resolve.js';
-    import { maybeData } from '../helpers/index.js';
     import Mark from '../Mark.svelte';
     import MarkerPath from './helpers/MarkerPath.svelte';
     import { replaceChannels } from '../transforms/rename.js';
@@ -57,6 +56,8 @@
     import { maybeCurve } from '../helpers/curves.js';
     import { geoPath } from 'd3-geo';
     import { pick } from 'es-toolkit';
+    import { sort } from '../transforms/sort.js';
+    import { indexData } from '../transforms/recordize.js';
 
     let markProps: LinkMarkProps = $props();
     const DEFAULTS = {
@@ -77,17 +78,13 @@
     const { getPlotState } = getContext<PlotContext>('svelteplot');
     let plot = $derived(getPlotState());
 
-    const sorted = $derived(
-        options.sort
-            ? maybeData(data).toSorted((a, b) =>
-                  resolveChannel('sort', a, options) > resolveChannel('sort', b, options) ? 1 : -1
-              )
-            : maybeData(data)
-    );
-
     const args = $derived(
         replaceChannels(
-            { data: sorted, stroke: 'currentColor', ...options },
+            sort({
+                data: indexData(data),
+                stroke: 'currentColor',
+                ...options
+            }),
             { y: ['y1', 'y2'], x: ['x1', 'x2'] }
         )
     );

package/dist/marks/Pointer.svelte

@@ -30,7 +30,7 @@
     import { quadtree } from 'd3-quadtree';
     import { projectXY } from '../helpers/scales.js';
     import isDataRecord from '../helpers/isDataRecord.js';
-    import { RAW_VALUE } from '../transforms/recordize.js';
+    import { indexData, RAW_VALUE } from '../transforms/recordize.js';
     import { groupFacetsAndZ } from '../helpers/group.js';
 
     const { getPlotState } = getContext<PlotContext>('svelteplot');
@@ -116,7 +116,7 @@
 
     const groups = $derived.by(() => {
         const groups = [];
-        groupFacetsAndZ(data, { x, y, z, fx, fy }, (d) => groups.push(d));
+        groupFacetsAndZ(indexData(data), { x, y, z, fx, fy }, (d) => groups.push(d));
         return groups;
     });
 

package/dist/marks/RuleX.svelte

@@ -3,7 +3,7 @@
 -->
 <script lang="ts" generics="Datum = DataRecord | RawValue">
     interface RuleXMarkProps extends Omit<BaseMarkProps<Datum>, 'fill' | 'fillOpacity'> {
-        data: Datum[];
+        data?: Datum[];
         x?: ChannelAccessor<Datum>;
         y1?: ChannelAccessor<Datum>;
         y2?: ChannelAccessor<Datum>;

package/dist/marks/RuleX.svelte.d.ts

@@ -60,7 +60,7 @@ declare class __sveltets_Render<Datum = DataRecord | RawValue> {
         class: string | null;
         cursor: ConstantAccessor<import("csstype").Property.Cursor, Datum>;
     }>, "fill" | "fillOpacity"> & {
-        data: Datum[];
+        data?: Datum[] | undefined;
         x?: ChannelAccessor<Datum>;
         y1?: ChannelAccessor<Datum>;
         y2?: ChannelAccessor<Datum>;

package/dist/marks/Text.svelte

@@ -71,6 +71,7 @@
     import { sort } from '../index.js';
 
     import MultilineText from './helpers/MultilineText.svelte';
+    import { indexData } from '../transforms/recordize';
 
     const DEFAULTS = {
         fontSize: 12,
@@ -95,7 +96,7 @@
 
     const args = $derived(
         sort({
-            data,
+            data: indexData(data),
             ...options
         })
     ) as TextMarkProps;

package/dist/marks/Vector.svelte

@@ -44,8 +44,9 @@
     import { sort } from '../index.js';
     import Mark from '../Mark.svelte';
     //import DotCanvas from './helpers/DotCanvas.svelte';
-    import { maybeData, testFilter, isValid } from '../helpers/index.js';
+    import { isValid } from '../helpers/index.js';
     import { addEventHandlers } from './helpers/events.js';
+    import { indexData } from '../transforms/recordize.js';
 
     const defaultRadius = 3.5;
 
@@ -145,7 +146,7 @@
 
     const args = $derived(
         sort({
-            data: maybeData(data),
+            data: indexData(data),
             // sort by descending radius by default
             ...options
         })
@@ -201,11 +202,11 @@
                                   ? `translate(0, ${d.length})`
                                   : `translate(0, ${d.length / 2})`}"
                             {style}
-                            use:addEventHandlers={{
+                            {@attach addEventHandlers({
                                 getPlotState,
                                 options: args,
-                                datum: d.datum
-                            }}
+                                datum: d?.datum
+                            })}
                             class={[styleClass]} />
                     {/if}
                 {/each}