svelteplot 0.3.11-pr-153.6 → 0.3.11-pr-153.8

package/dist/transforms/stack.d.ts

@@ -8,10 +8,10 @@ export type StackOptions = {
 };
 export declare function stackY<T>({ data, ...channels }: T, opts?: Partial<StackOptions>): T;
 export declare function stackX({ data, ...channels }: TransformArg, opts?: Partial<StackOptions>): TransformArg;
-export declare function stackMarimekko<T>({ data, x, y, value, ...rest }: {
+export declare function stackMarimekko<T>(args: {
     data: T[];
     x: ChannelAccessor<T>;
-    y?: ChannelAccessor<T>;
+    y: ChannelAccessor<T>;
     value: ChannelAccessor<T>;
     fx?: ChannelAccessor<T>;
     fy?: ChannelAccessor<T>;
@@ -22,14 +22,4 @@ export declare function stackMarimekko<T>({ data, x, y, value, ...rest }: {
     y?: {
         percent?: boolean;
     };
-}): {
-    data: T[];
-    x: symbol;
-    x1: symbol;
-    x2: symbol;
-    y: symbol;
-    y1: symbol;
-    y2: symbol;
-    fx?: ChannelAccessor<T>;
-    fy?: ChannelAccessor<T>;
-};
+}): any;

package/dist/transforms/stack.js

@@ -1,9 +1,10 @@
 import isDataRecord from '../helpers/isDataRecord.js';
 import { resolveChannel, resolveProp } from '../helpers/resolve.js';
 import { stack, stackOffsetExpand, stackOffsetSilhouette, stackOffsetWiggle, stackOrderAppearance, stackOrderAscending, stackOrderInsideOut, stackOrderNone, stackOffsetDiverging } from 'd3-shape';
-import { index, union, sum, groups as d3Groups } from 'd3-array';
+import { index, union, sum, groups as d3Groups, extent, min } from 'd3-array';
 import { groupFacetsAndZ } from '../helpers/group';
 import { filter } from './filter.js';
+import { sort } from './sort.js';
 const GROUP = Symbol('group');
 const FACET = Symbol('group');
 const DEFAULT_STACK_OPTIONS = {
@@ -114,21 +115,31 @@ function applyDefaults(opts) {
 }
 const X = Symbol('x'), X1 = Symbol('x1'), X2 = Symbol('x2');
 const Y = Symbol('y'), Y1 = Symbol('y1'), Y2 = Symbol('y2');
-export function stackMarimekko({ data, x, y, value, ...rest }, { x: xOpt, y: yOpt } = {}) {
+export function stackMarimekko(args, { x: xOpt, y: yOpt } = {}) {
     const out = [];
-    if (rest.filter) {
-        const d = filter({ data, ...rest });
-        data = d.data;
-    }
+    const { data, x, y, value, ...rest } = sort(filter(args));
+    if (data == null)
+        throw new Error('stackMarimekko: missing data');
+    if (x == null)
+        throw new Error('stackMarimekko: missing x channel');
+    if (y == null)
+        throw new Error('stackMarimekko: missing y channel');
+    if (value == null)
+        throw new Error('stackMarimekko: missing value channel');
+    if (min(data, (d) => resolveProp(d[value], d)) < 0)
+        throw new Error('stackMarimekko: negative values not supported');
     groupFacetsAndZ(data, { ...rest }, (data) => {
         const total = sum(data, (d) => d[value]);
         let xPos = 0;
-        const grouped = d3Groups(data, (d) => resolveProp(d[x], d)).flatMap(([k, items]) => {
+        const grouped = d3Groups(data, (d) => resolveProp(d[x], d));
+        const yOrder = new Map(grouped[0][1].map((d, i) => [d[y], i]));
+        const flat = grouped.flatMap(([k, items], i) => {
             const groupValue = sum(items, (d) => resolveProp(d[value], d));
-            const x1 = xPos, x2 = xPos + groupValue;
+            const x1 = xPos;
+            const x2 = xPos + groupValue;
             xPos = x2;
             let yPos = 0;
-            return items.map((d) => {
+            return (!i ? items : items.sort((a, b) => yOrder.get(a[y]) - yOrder.get(b[y]))).map((d) => {
                 const y1 = yPos, y2 = yPos + resolveProp(d[value], d);
                 yPos = y2;
                 const normX1 = xOpt?.percent ? x1 / total : x1;
@@ -146,7 +157,7 @@ export function stackMarimekko({ data, x, y, value, ...rest }, { x: xOpt, y: yOp
                 };
             });
         });
-        out.push(...grouped);
+        out.push(...flat);
     });
     return { ...rest, data: out, x: X, x1: X1, x2: X2, y: Y, y1: Y1, y2: Y2 };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "svelteplot",
-    "version": "0.3.11-pr-153.6",
+    "version": "0.3.11-pr-153.8",
     "license": "ISC",
     "author": {
         "name": "Gregor Aisch",