Merge branch 'main' into feat/rect-canvas

gka · web-flow · commit 0a7db5b76058 · 2026-01-19T00:20:03.000+01:00
diff --git a/src/lib/transforms/normalize.test.ts b/src/lib/transforms/normalize.test.ts
@@ -38,6 +38,35 @@ describe('normalizeY', () => {
         ]);
     });
 
+    it('excepts options as object', () => {
+        const { data: normalized, ...channels } = normalizeY(
+            {
+                data,
+                y: 'y',
+                z: 'group'
+            },
+            { basis: 'sum' }
+        );
+
+        expect(channels.y).toBe('__y');
+        expect(normalized).toHaveLength(data.length);
+
+        const result = normalized.map((d) => ({
+            id: d.id,
+            group: d.group,
+            y: d[channels.y]
+        }));
+
+        // For group A: y values are 2 and 4, sum = 6
+        // For group B: y values are 6 and 8, sum = 14
+        expect(result).toEqual([
+            { id: 'a1', group: 'A', y: 2 / 6 },
+            { id: 'a2', group: 'A', y: 4 / 6 },
+            { id: 'b1', group: 'B', y: 6 / 14 },
+            { id: 'b2', group: 'B', y: 8 / 14 }
+        ]);
+    });
+
     it('normalizes to [0, 1] range using extent as basis', () => {
         const { data: normalized, ...channels } = normalizeY(
             {
diff --git a/src/lib/transforms/normalize.ts b/src/lib/transforms/normalize.ts
@@ -1,8 +1,10 @@
 import { mapX, mapY } from './map.js';
-import type { TransformArg, RawValue, MapIndexObject } from '$lib/types/index.js';
+import type { TransformArg, RawValue, MapIndexObject, MapIndexFunction } from '$lib/types/index.js';
 import { min, max, mean, median, sum, deviation, extent } from 'd3-array';
 import { sort } from './sort.js';
 
+type BasisFunction = (I: number[], S: RawValue[]) => number;
+
 type NormalizeBasis =
     | 'deviation'
     | 'first'
@@ -13,23 +15,33 @@ type NormalizeBasis =
     | 'median'
     | 'sum'
     | 'extent'
+    | BasisFunction
     | MapIndexObject;
 
+type NormalizeOptions = NormalizeBasis | { basis: NormalizeBasis };
+
 /**
  * Normalizes the x values based on the specified basis. Uses mapX.
  */
-export function normalizeX<T>(args: TransformArg<T>, basis: NormalizeBasis) {
-    return mapX(args, normalize(basis));
+export function normalizeX<T>(args: TransformArg<T>, options: NormalizeOptions) {
+    return mapX(args, normalize(options));
 }
 
 /**
  * Normalizes the y values based on the specified basis. Uses mapY.
  */
-export function normalizeY<T>(args: TransformArg<T>, basis: NormalizeBasis) {
-    return mapY(args, normalize(basis));
+export function normalizeY<T>(args: TransformArg<T>, options: NormalizeOptions) {
+    return mapY(args, normalize(options));
 }
 
-function normalize(basis: NormalizeBasis): MapIndexObject {
+function isMapIndex(obj: any): obj is MapIndexObject {
+    return obj && typeof obj.mapIndex === 'function';
+}
+
+function normalize(options: NormalizeOptions): MapIndexObject {
+    if (isMapIndex(options)) return options;
+    if (typeof options === 'object' && isMapIndex(options?.basis)) return options?.basis;
+    const basis = typeof options === 'object' ? options.basis : options;
     if (basis === undefined) return normalizeFirst;
     if (typeof basis === 'function') return normalizeBasis(basis);
     //   if (/^p\d{2}$/i.test(basis)) return normalizeAccessor(percentile(basis));
@@ -56,7 +68,7 @@ function normalize(basis: NormalizeBasis): MapIndexObject {
     throw new Error(`invalid basis: ${basis}`);
 }
 
-function normalizeBasis(basis: (I: number[], S: RawValue[]) => number): MapIndexObject {
+function normalizeBasis(basis: BasisFunction): MapIndexObject {
     return {
         mapIndex(I, S, T) {
             const b = +basis(I, S);
@@ -96,7 +108,7 @@ const normalizeLast = normalizeBasis((I, S) => {
 });
 
 const normalizeDeviation = {
-    mapIndex(I, S, T) {
+    mapIndex(I: number[], S: RawValue[], T: number[]) {
         const m = mean(I, (i) => S[i]);
         const d = deviation(I, (i) => S[i]);
         for (const i of I) {
diff --git a/src/lib/transforms/rename.ts b/src/lib/transforms/rename.ts
@@ -5,7 +5,7 @@ type RenameChannelsOptions = Partial<Record<ScaledChannelName, ScaledChannelName
 type ReplaceChannelsOptions = Partial<Record<ScaledChannelName, ScaledChannelName[]>>;
 
 // using a symbol doesn't work because channels are spread into components
-export const RENAME = '__renamed__';
+export const RENAME = Symbol('renamed');
 
 /**
  * renames a channel without modifying the data
diff --git a/src/lib/types/index.ts b/src/lib/types/index.ts
@@ -69,8 +69,10 @@ export type AutoMarginStores = {
     autoMarginBottom: Writable<Map<string, number>>;
 };
 
+export type MapIndexFunction = (I: number[], S: RawValue[], T: RawValue[]) => void;
+
 export type MapIndexObject = {
-    mapIndex: (I: number[], S: RawValue[], T: RawValue[]) => void;
+    mapIndex: MapIndexFunction;
 };
 
 export type MapMethod =
