svelteplot 0.8.1-pr-283.12 → 0.8.1-pr-298.1

package/dist/marks/BoxX.svelte

@@ -4,14 +4,10 @@
 
 <script lang="ts">
     interface BoxXMarkProps extends ComponentProps<typeof BoxY> {}
-    import GroupMultiple from './helpers/GroupMultiple.svelte';
-    import { BarX, TickX, RuleY, Dot, groupY } from '../index.js';
-    import { resolveChannel } from '../helpers/resolve.js';
     import { type ComponentProps } from 'svelte';
+    import Box from './helpers/Box.svelte';
     import type BoxY from './BoxY.svelte';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
-    import { IS_SORTED } from '../transforms/sort';
-    import { sort } from 'd3-array';
 
     let markProps: BoxXMarkProps = $props();
 
@@ -22,141 +18,10 @@
         ...getPlotDefaults().boxX
     };
 
-    const {
-        data = [{}],
-        bar,
-        rule,
-        tickMedian,
-        tickMinMax,
-        dot,
-        x,
-        y,
-        fx,
-        fy,
-        fill,
-        stroke,
-        class: className = ''
-    }: BoxXMarkProps = $derived({
+    const props: BoxXMarkProps & { class?: string } = $derived({
         ...DEFAULTS,
         ...markProps
     });
-
-    const { data: grouped, ...groupChannels } = $derived(
-        groupY(
-            {
-                data: data.filter((d) => resolveChannel('x', d, { x, y }) != null),
-                x,
-                y,
-                x1: x,
-                x2: x,
-                fx,
-                fy
-            },
-            { x: 'median', x1: 'p25', x2: 'p75', fill: (rows) => rows }
-        )
-    );
-
-    const X = Symbol('x'),
-        Y = Symbol('y'),
-        FX = Symbol('fx'),
-        FY = Symbol('fy'),
-        P25 = Symbol('p25'),
-        P75 = Symbol('p75'),
-        MEDIAN = Symbol('median'),
-        MIN = Symbol('min'),
-        MAX = Symbol('max'),
-        OUTLIERS = Symbol('outliers');
-
-    const facets = $derived({
-        ...(fx != null && { fx: FX }),
-        ...(fy != null && { fy: FY })
-    });
-
-    const sortProps = { [IS_SORTED]: true };
-
-    const boxData = $derived(
-        grouped
-            .map((row) => {
-                const { x: median, x1: p25, x2: p75, fill: fill, y: ry } = groupChannels;
-
-                const iqr = row[p75] - row[p25];
-                const whisker = iqr * 1.5;
-                const lower = row[p25] - whisker;
-                const upper = row[p75] + whisker;
-                const data = row[fill].map((d) => ({
-                    ...d,
-                    [X]: resolveChannel('x', d, { x, y })
-                }));
-                const outliers = data.filter((d) => d[X] < lower || d[X] > upper);
-                const inside = data
-                    .filter((d) => d[X] >= lower && d[X] <= upper)
-                    .sort((a, b) => a[X] - b[X]);
-
-                // if (inside.length === 0) console.log('No data inside boxplot', data, row, lower, upper);
-                return {
-                    ...data[0],
-                    [Y]: row[ry],
-                    [P25]: row[p25],
-                    [MEDIAN]: row[median],
-                    [P75]: row[p75],
-                    [MIN]: inside[0][X],
-                    [MAX]: inside.at(-1)[X],
-                    [FX]: resolveChannel('fx', data[0], { fx }, null),
-                    [FY]: resolveChannel('fy', data[0], { fy }, null),
-                    [OUTLIERS]: outliers
-                };
-            })
-            .sort((a, b) => b[MEDIAN] - a[MEDIAN])
-    );
 </script>
 
-<GroupMultiple class="box-x {className || ''}" length={className ? 2 : grouped.length}>
-    <RuleY
-        data={boxData}
-        y={Y}
-        x1={MIN}
-        x2={P25}
-        {stroke}
-        {...rule || {}}
-        {...facets}
-        {...sortProps} />
-    <RuleY data={boxData} y={Y} x1={P75} x2={MAX} {stroke} {...rule || {}} {...facets} />
-    <BarX data={boxData} y={Y} x1={P25} x2={P75} {fill} {stroke} {...facets} {...bar || {}} />
-    {#if tickMedian}
-        <TickX
-            data={boxData}
-            y={Y}
-            x={MEDIAN}
-            {...facets}
-            {stroke}
-            strokeWidth={2}
-            {...typeof tickMedian === 'object' ? tickMedian : {}} />
-    {/if}
-    {#if tickMinMax}
-        <TickX
-            data={boxData}
-            x={MIN}
-            y={Y}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-        <TickX
-            data={boxData}
-            x={MAX}
-            y={Y}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-    {/if}
-    <Dot
-        data={boxData.map((d) => d[OUTLIERS]).flat()}
-        {x}
-        {y}
-        {fx}
-        {fy}
-        {fill}
-        {stroke}
-        {...dot || {}} />
-</GroupMultiple>
+<Box {...props} orientation="x" />

package/dist/marks/BoxY.svelte

@@ -9,6 +9,10 @@
         data: Datum[];
         x: ChannelAccessor;
         y: ChannelAccessor;
+        /**
+         * Custom sort order for grouped box plot data
+         */
+        sort?: 'min' | 'max' | 'median' | 'p25' | 'p75' | ((d: Datum) => RawValue);
         /**
          * Options for the rule marks that represent the min/max range
          */
@@ -30,12 +34,9 @@
          */
         dot: Record<string, ChannelAccessor<Datum>>;
     }
-    import GroupMultiple from './helpers/GroupMultiple.svelte';
-    import { groupX, BarY, TickY, RuleX, Dot } from '../index.js';
-    import { resolveChannel } from '../helpers/resolve.js';
     import { getPlotDefaults } from '../hooks/plotDefaults.js';
-    import type { BaseMarkProps, ChannelAccessor, DataRecord } from '../types';
-    import { IS_SORTED } from '../transforms/sort';
+    import Box from './helpers/Box.svelte';
+    import type { BaseMarkProps, ChannelAccessor, DataRecord, RawValue } from '../types';
 
     let markProps: BoxYMarkProps = $props();
 
@@ -46,140 +47,10 @@
         ...getPlotDefaults().boxY
     };
 
-    const {
-        data = [{}],
-        bar,
-        rule,
-        tickMedian,
-        tickMinMax,
-        dot,
-        x,
-        y,
-        fx,
-        fy,
-        fill,
-        stroke,
-        class: className = ''
-    }: BoxYMarkProps = $derived({
+    const props: BoxYMarkProps & { class?: string } = $derived({
         ...DEFAULTS,
         ...markProps
     });
-
-    const { data: grouped, ...groupChannels } = $derived(
-        groupX(
-            {
-                data: data.filter((d) => resolveChannel('x', d, { x, y }) != null),
-                x,
-                y,
-                y1: y,
-                y2: y,
-                fx,
-                fy
-            },
-            { y: 'median', y1: 'p25', y2: 'p75', fill: (rows) => rows }
-        )
-    );
-
-    const X = Symbol('x'),
-        Y = Symbol('y'),
-        FX = Symbol('fx'),
-        FY = Symbol('fy'),
-        P25 = Symbol('p25'),
-        P75 = Symbol('p75'),
-        MEDIAN = Symbol('median'),
-        MIN = Symbol('min'),
-        MAX = Symbol('max'),
-        OUTLIERS = Symbol('outliers');
-
-    const facets = $derived({
-        ...(fx != null && { fx: FX }),
-        ...(fy != null && { fy: FY })
-    });
-
-    const sortProps = { [IS_SORTED]: true };
-
-    const boxData = $derived(
-        grouped
-            .map((row) => {
-                const { y: median, y1: p25, y2: p75, fill: fill, x: rx } = groupChannels;
-
-                const iqr = row[p75] - row[p25];
-                const whisker = iqr * 1.5;
-                const lower = row[p25] - whisker;
-                const upper = row[p75] + whisker;
-                const data = row[fill].map((d) => ({
-                    ...d,
-                    [Y]: resolveChannel('y', d, { x, y })
-                }));
-                const outliers = data.filter((d) => d[Y] < lower || d[Y] > upper);
-                const inside = data
-                    .filter((d) => d[Y] >= lower && d[Y] <= upper)
-                    .sort((a, b) => a[Y] - b[Y]);
-
-                return {
-                    ...data[0],
-                    [X]: row[rx],
-                    [P25]: row[p25],
-                    [MEDIAN]: row[median],
-                    [P75]: row[p75],
-                    [MIN]: inside[0][Y],
-                    [MAX]: inside.at(-1)[Y],
-                    [FX]: resolveChannel('fx', data[0], { fx }, null),
-                    [FY]: resolveChannel('fy', data[0], { fy }, null),
-                    [OUTLIERS]: outliers
-                };
-            })
-            .sort((a, b) => b[MEDIAN] - a[MEDIAN])
-    );
 </script>
 
-<GroupMultiple class="box-y {className || ''}" length={className ? 2 : grouped.length}>
-    <RuleX
-        data={boxData}
-        x={X}
-        y1={MIN}
-        y2={P25}
-        {stroke}
-        {...sortProps}
-        {...rule || {}}
-        {...facets} />
-    <RuleX data={boxData} x={X} y1={P75} y2={MAX} {stroke} {...rule || {}} {...facets} />
-    <BarY data={boxData} x={X} y1={P25} y2={P75} {fill} {stroke} {...facets} {...bar || {}} />
-    {#if tickMedian}
-        <TickY
-            data={boxData}
-            x={X}
-            y={MEDIAN}
-            {...facets}
-            {stroke}
-            strokeWidth={2}
-            {...typeof tickMedian === 'object' ? tickMedian : {}} />
-    {/if}
-    {#if tickMinMax}
-        <TickY
-            data={boxData}
-            x={X}
-            y={MIN}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-        <TickY
-            data={boxData}
-            x={X}
-            y={MAX}
-            {stroke}
-            {...facets}
-            inset="20%"
-            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
-    {/if}
-    <Dot
-        data={boxData.map((d) => d[OUTLIERS]).flat()}
-        {x}
-        {y}
-        {fx}
-        {fy}
-        {fill}
-        {stroke}
-        {...dot || {}} />
-</GroupMultiple>
+<Box {...props} orientation="y" />

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

@@ -1,9 +1,13 @@
-import type { ChannelAccessor, DataRecord } from '../types';
+import type { ChannelAccessor, DataRecord, RawValue } from '../types';
 declare function $$render<Datum extends DataRecord>(): {
     props: Pick<BaseMarkProps<Datum>, "fill" | "stroke" | "fx" | "fy" | "class"> & {
         data: Datum[];
         x: ChannelAccessor;
         y: ChannelAccessor;
+        /**
+         * Custom sort order for grouped box plot data
+         */
+        sort?: "min" | "max" | "median" | "p25" | "p75" | ((d: Datum) => RawValue);
         /**
          * Options for the rule marks that represent the min/max range
          */

package/dist/marks/helpers/Box.svelte

@@ -0,0 +1,254 @@
+<!-- @component
+    Internal shared box plot implementation for BoxX and BoxY
+-->
+<script lang="ts" generics="Datum extends DataRecord">
+    type Orientation = 'x' | 'y';
+
+    interface BoxMarkProps extends Pick<
+        BaseMarkProps<Datum>,
+        'class' | 'fill' | 'stroke' | 'fx' | 'fy'
+    > {
+        data: Datum[];
+        x: ChannelAccessor;
+        y: ChannelAccessor;
+        /**
+         * Custom sort order for grouped box plot data
+         */
+        sort?: 'min' | 'max' | 'median' | 'p25' | 'p75' | ((d: Datum) => RawValue);
+        /**
+         * Options for the rule marks that represent the min/max range
+         */
+        rule: Record<string, ChannelAccessor<Datum>>;
+        /**
+         * Options for the bar marks that represent the IQR range
+         */
+        bar: Record<string, ChannelAccessor<Datum>>;
+        /**
+         * Options for the tick marks that represent the median
+         */
+        tickMedian: Record<string, ChannelAccessor<Datum>> | boolean;
+        /**
+         * Options for the tick marks that represent the min/max range
+         */
+        tickMinMax: Record<string, ChannelAccessor<Datum>> | boolean;
+        /**
+         * Options for the dot marks that represent the outliers
+         */
+        dot: Record<string, ChannelAccessor<Datum>>;
+        orientation: Orientation;
+    }
+
+    import GroupMultiple from './GroupMultiple.svelte';
+    import { groupX, groupY, BarY, TickY, RuleX, BarX, TickX, RuleY, Dot } from '../../index.js';
+    import { resolveChannel } from '../../helpers/resolve.js';
+    import type { BaseMarkProps, ChannelAccessor, DataRecord, RawValue } from '../../types';
+    import { IS_SORTED } from '../../transforms/sort';
+
+    let markProps: BoxMarkProps = $props();
+
+    const {
+        data = [{}],
+        bar,
+        rule,
+        tickMedian,
+        tickMinMax,
+        dot,
+        x,
+        y,
+        sort,
+        fx,
+        fy,
+        fill,
+        stroke,
+        orientation,
+        class: className = ''
+    }: BoxMarkProps = $derived(markProps);
+
+    const groupFn = $derived(orientation === 'y' ? groupX : groupY);
+    const BarMark = $derived(orientation === 'y' ? BarY : BarX);
+    const RuleMark = $derived(orientation === 'y' ? RuleX : RuleY);
+    const TickMark = $derived(orientation === 'y' ? TickY : TickX);
+
+    // the channels as if this would be a BoxX
+    const xChannel = $derived(orientation === 'y' ? y : x);
+    const yChannel = $derived(orientation === 'y' ? x : y);
+    const xProp = $derived(orientation === 'x' ? 'x' : 'y');
+    const x1Prop = $derived(`${xProp}1`);
+    const x2Prop = $derived(`${xProp}2`);
+    const yProp = $derived(orientation === 'x' ? 'y' : 'x');
+
+    const { data: grouped, ...groupChannels } = $derived(
+        groupFn(
+            {
+                data: data.filter((d) => resolveChannel(yProp, d, { x, y }) != null),
+                x,
+                y,
+                [x1Prop]: xChannel,
+                [x2Prop]: xChannel,
+                fx,
+                fy
+            },
+            { [xProp]: 'median', [x1Prop]: 'p25', [x2Prop]: 'p75', fill: (rows) => rows }
+        )
+    );
+
+    const X = Symbol('x'),
+        Y = Symbol('y'),
+        FX = Symbol('fx'),
+        FY = Symbol('fy'),
+        P25 = Symbol('p25'),
+        P75 = Symbol('p75'),
+        MEDIAN = Symbol('median'),
+        MIN = Symbol('min'),
+        MAX = Symbol('max'),
+        OUTLIERS = Symbol('outliers'),
+        SORT_REF = Symbol('sortRef');
+
+    const facets = $derived({
+        ...(fx != null && { fx: FX }),
+        ...(fy != null && { fy: FY })
+    });
+
+    const sortProps = { [IS_SORTED]: true };
+
+    const compareValues = (a: RawValue, b: RawValue) =>
+        (typeof a === 'string' && typeof b === 'string'
+            ? a.localeCompare(b)
+            : a > b
+              ? 1
+              : a < b
+                ? -1
+                : 0) || 0;
+
+    const boxData = $derived.by(() => {
+        const boxes = grouped.map((row) => {
+            const medianKey = groupChannels[xProp];
+            const p25Key = groupChannels[x1Prop];
+            const p75Key = groupChannels[x2Prop];
+            const groupKey = groupChannels[yProp];
+
+            const iqr = row[p75Key] - row[p25Key];
+            const whisker = iqr * 1.5;
+            const lower = row[p25Key] - whisker;
+            const upper = row[p75Key] + whisker;
+            const data = row[groupChannels.fill].map((d) => ({
+                ...d,
+                [orientation === 'y' ? Y : X]: resolveChannel(xProp, d, {
+                    x,
+                    y
+                })
+            }));
+            const valueSym = orientation === 'y' ? Y : X;
+            const groupSym = orientation === 'y' ? X : Y;
+            const outliers = data.filter((d) => d[valueSym] < lower || d[valueSym] > upper);
+            const inside = data
+                .filter((d) => d[valueSym] >= lower && d[valueSym] <= upper)
+                .sort((a, b) => a[valueSym] - b[valueSym]);
+
+            return {
+                ...data[0],
+                [SORT_REF]: row[groupChannels.fill]?.[0],
+                [groupSym]: row[groupKey],
+                [P25]: row[p25Key],
+                [MEDIAN]: row[medianKey],
+                [P75]: row[p75Key],
+                [MIN]: inside[0][valueSym],
+                [MAX]: inside.at(-1)[valueSym],
+                [FX]: resolveChannel('fx', data[0], { fx }, null),
+                [FY]: resolveChannel('fy', data[0], { fy }, null),
+                [OUTLIERS]: outliers
+            };
+        });
+
+        const stripSortRef = ({ [SORT_REF]: _, ...rest }) => rest;
+
+        if (!sort) return boxes.map(stripSortRef);
+
+        const sortAccessor =
+            typeof sort === 'function'
+                ? (d) => sort(d[SORT_REF])
+                : (d) => {
+                      switch (sort) {
+                          case 'min':
+                              return d[MIN];
+                          case 'max':
+                              return d[MAX];
+                          case 'p25':
+                              return d[P25];
+                          case 'p75':
+                              return d[P75];
+                          case 'median':
+                          default:
+                              return d[MEDIAN];
+                      }
+                  };
+
+        const direction = typeof sort === 'string' ? -1 : 1;
+
+        return boxes
+            .toSorted((a, b) => compareValues(sortAccessor(a), sortAccessor(b)) * direction)
+            .map(stripSortRef);
+    });
+
+    const valueSymbol = $derived(orientation === 'y' ? Y : X);
+    const groupSymbol = $derived(orientation === 'y' ? X : Y);
+    const length = $derived(className ? 2 : grouped.length);
+    const baseClass = $derived(`box-${orientation} ${className || ''}`);
+</script>
+
+<GroupMultiple class={baseClass} {length}>
+    <RuleMark
+        data={boxData}
+        {...{ [yProp]: groupSymbol, [x1Prop]: MIN, [x2Prop]: P25 }}
+        {stroke}
+        {...rule || {}}
+        {...facets}
+        {...sortProps} />
+    <RuleMark
+        data={boxData}
+        {...{ [yProp]: groupSymbol, [x1Prop]: P75, [x2Prop]: MAX }}
+        {stroke}
+        {...rule || {}}
+        {...facets} />
+    <BarMark
+        data={boxData}
+        {...{ [yProp]: groupSymbol, [x1Prop]: P25, [x2Prop]: P75 }}
+        {fill}
+        {stroke}
+        {...facets}
+        {...bar || {}} />
+    {#if tickMedian}
+        <TickMark
+            data={boxData}
+            {...{ [yProp]: groupSymbol, [xProp]: MEDIAN }}
+            {...facets}
+            {stroke}
+            strokeWidth={2}
+            {...typeof tickMedian === 'object' ? tickMedian : {}} />
+    {/if}
+    {#if tickMinMax}
+        <TickMark
+            data={boxData}
+            {...{ [yProp]: groupSymbol, [xProp]: MIN }}
+            {stroke}
+            {...facets}
+            inset="20%"
+            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
+        <TickMark
+            data={boxData}
+            {...{ [yProp]: groupSymbol, [xProp]: MAX }}
+            {stroke}
+            {...facets}
+            inset="20%"
+            {...typeof tickMinMax === 'object' ? tickMinMax : {}} />
+    {/if}
+    <Dot
+        data={boxData.map((d) => d[OUTLIERS]).flat()}
+        {x}
+        {y}
+        {fx}
+        {fy}
+        {fill}
+        {stroke}
+        {...dot || {}} />
+</GroupMultiple>

package/dist/marks/helpers/Box.svelte.d.ts

@@ -0,0 +1,55 @@
+import type { ChannelAccessor, DataRecord, RawValue } from '../../types';
+declare function $$render<Datum extends DataRecord>(): {
+    props: Pick<BaseMarkProps<Datum>, "fill" | "stroke" | "fx" | "fy" | "class"> & {
+        data: Datum[];
+        x: ChannelAccessor;
+        y: ChannelAccessor;
+        /**
+         * Custom sort order for grouped box plot data
+         */
+        sort?: "min" | "max" | "median" | "p25" | "p75" | ((d: Datum) => RawValue);
+        /**
+         * Options for the rule marks that represent the min/max range
+         */
+        rule: Record<string, ChannelAccessor<Datum>>;
+        /**
+         * Options for the bar marks that represent the IQR range
+         */
+        bar: Record<string, ChannelAccessor<Datum>>;
+        /**
+         * Options for the tick marks that represent the median
+         */
+        tickMedian: Record<string, ChannelAccessor<Datum>> | boolean;
+        /**
+         * Options for the tick marks that represent the min/max range
+         */
+        tickMinMax: Record<string, ChannelAccessor<Datum>> | boolean;
+        /**
+         * Options for the dot marks that represent the outliers
+         */
+        dot: Record<string, ChannelAccessor<Datum>>;
+        orientation: "x" | "y";
+    };
+    exports: {};
+    bindings: "";
+    slots: {};
+    events: {};
+};
+declare class __sveltets_Render<Datum extends DataRecord> {
+    props(): ReturnType<typeof $$render<Datum>>['props'];
+    events(): ReturnType<typeof $$render<Datum>>['events'];
+    slots(): ReturnType<typeof $$render<Datum>>['slots'];
+    bindings(): "";
+    exports(): {};
+}
+interface $$IsomorphicComponent {
+    new <Datum extends DataRecord>(options: import('svelte').ComponentConstructorOptions<ReturnType<__sveltets_Render<Datum>['props']>>): import('svelte').SvelteComponent<ReturnType<__sveltets_Render<Datum>['props']>, ReturnType<__sveltets_Render<Datum>['events']>, ReturnType<__sveltets_Render<Datum>['slots']>> & {
+        $$bindings?: ReturnType<__sveltets_Render<Datum>['bindings']>;
+    } & ReturnType<__sveltets_Render<Datum>['exports']>;
+    <Datum extends DataRecord>(internal: unknown, props: ReturnType<__sveltets_Render<Datum>['props']> & {}): ReturnType<__sveltets_Render<Datum>['exports']>;
+    z_$$bindings?: ReturnType<__sveltets_Render<any>['bindings']>;
+}
+/** Internal shared box plot implementation for BoxX and BoxY */
+declare const Box: $$IsomorphicComponent;
+type Box<Datum extends DataRecord> = InstanceType<typeof Box<Datum>>;
+export default Box;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.8.1-pr-283.12",
+    "version": "0.8.1-pr-298.1",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",