svelteplot 0.4.2-pr-194.2 → 0.4.2-pr-194.3

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>): any;
 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

@@ -27,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/marks/Arrow.svelte

@@ -48,13 +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();
 
@@ -80,7 +81,7 @@
     const args: ArrowMarkProps = $derived(
         sort(
             replaceChannels(
-                { data: maybeData(data), ...options },
+                { data: indexData(data), ...options },
                 { y: ['y1', 'y2'], x: ['x1', 'x2'] }
             )
         )

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,

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/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
         })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.4.2-pr-194.2",
+    "version": "0.4.2-pr-194.3",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",