@milaboratories/miplots4 1.2.4 → 1.4.0

package/dist/heatmap/HeatmapSettingsImpl.js

@@ -1,15 +1,16 @@
 import { BLACK as e } from "../constants.js";
 import { HeatmapSettingsSchema as t } from "../types/heatmap.js";
 import "../types/index.js";
-import n from "lodash";
-var r = {
+import { joinAxisTitle as n, resolveLabelParts as r } from "./labelParts.js";
+import i from "lodash";
+var a = {
 	lineColor: e,
 	dotShape: "21",
 	dotFill: e,
 	dotSize: 3,
 	lineShape: "solid",
 	lineWidth: 1
-}, i = {
+}, o = {
 	size: 150,
 	distance: "euclidean",
 	linkage: "average",
@@ -17,15 +18,15 @@ var r = {
 	showNodes: !0,
 	hidden: !1,
 	edgeInheritance: "up",
-	aes: r
-}, a = class {
+	aes: a
+}, s = class {
 	id;
 	type = "heatmap";
 	facetSettings;
-	xColumn;
+	x;
 	xGroupBy;
 	xSortBy;
-	yColumn;
+	y;
 	yGroupBy;
 	ySortBy;
 	valueColumn;
@@ -45,7 +46,7 @@ var r = {
 	showEmptyColumns;
 	cellsRenderingMode;
 	constructor(e) {
-		if (t.parse(e), this.id = n.uniqueId("settings"), this.xColumn = e.xColumn, this.xGroupBy = e.xGroupBy ?? [], this.xSortBy = e.xSortBy ?? [], this.yColumn = e.yColumn, this.yGroupBy = e.yGroupBy ?? [], this.ySortBy = e.ySortBy ?? [], this.valueColumn = e.valueColumn, this.facetBy = e.facetBy ?? [], this.chartSettings = {
+		if (t.parse(e), this.id = i.uniqueId("settings"), this.x = e.x, this.xGroupBy = e.xGroupBy ?? [], this.xSortBy = e.xSortBy ?? [], this.y = e.y, this.yGroupBy = e.yGroupBy ?? [], this.ySortBy = e.ySortBy ?? [], this.valueColumn = e.valueColumn, this.facetBy = e.facetBy ?? [], this.chartSettings = {
 			title: {
 				position: "left",
 				show: !0,
@@ -63,7 +64,7 @@ var r = {
 			frame: { type: e.frame?.type ?? "none" },
 			valueType: e.valueType ?? "continuous",
 			yAxis: {
-				title: e.yColumn.label ?? e.yColumn.value,
+				title: n(r(e.y, e.yAxis?.labelParts)),
 				showTicks: !0,
 				showTitle: !0,
 				showAxisLabels: !0,
@@ -73,10 +74,11 @@ var r = {
 				axisLabelsAngle: 90,
 				groupLabelsAngle: 0,
 				sorting: "asc",
+				labelParts: null,
 				...e.yAxis
 			},
 			xAxis: {
-				title: e.xColumn.label ?? e.xColumn.value,
+				title: n(r(e.x, e.xAxis?.labelParts)),
 				showTicks: !0,
 				showTitle: !0,
 				showAxisLabels: !0,
@@ -86,6 +88,7 @@ var r = {
 				axisLabelsAngle: 90,
 				groupLabelsAngle: 0,
 				sorting: "asc",
+				labelParts: null,
 				...e.xAxis
 			},
 			legend: {
@@ -115,7 +118,7 @@ var r = {
 			groupGap: e.aes?.groupGap ?? 3,
 			emptyCellColor: e.aes?.emptyCellColor ?? "white"
 		}, this.annotations = (e.annotations ?? []).map((e) => e.axis === "x" ? {
-			id: n.uniqueId("annotation"),
+			id: i.uniqueId("annotation"),
 			axis: "x",
 			valueColumn: e.valueColumn,
 			position: e.position ?? this.chartSettings.xAxis.position,
@@ -124,7 +127,7 @@ var r = {
 			type: e.type,
 			colors: e.colors ?? ["white", "black"]
 		} : {
-			id: n.uniqueId("annotation"),
+			id: i.uniqueId("annotation"),
 			axis: "y",
 			valueColumn: e.valueColumn,
 			position: e.position ?? this.chartSettings.yAxis.position,
@@ -139,24 +142,24 @@ var r = {
 			method: "min",
 			...e.aggregation
 		}, this.dendrogramX = e.dendrogramX ? {
-			...i,
+			...o,
 			position: "top",
 			...e.dendrogramX,
 			aes: {
-				...r,
+				...a,
 				...e.dendrogramX?.aes
 			}
 		} : null, this.dendrogramY = e.dendrogramY ? {
-			...i,
+			...o,
 			position: "left",
 			...e.dendrogramY,
 			aes: {
-				...r,
+				...a,
 				...e.dendrogramY?.aes
 			}
 		} : null, this.inheritedDendrogramAes = e.inheritedDendrogramAes ?? null, this.cellsRenderingMode = e.cellsRenderingMode ?? null;
 	}
 };
-export { a as HeatmapSettingsImpl };
+export { s as HeatmapSettingsImpl };
 
 //# sourceMappingURL=HeatmapSettingsImpl.js.map

package/dist/heatmap/HeatmapSettingsImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"HeatmapSettingsImpl.js","names":[],"sources":["../../src/heatmap/HeatmapSettingsImpl.ts"],"sourcesContent":["import lodash from 'lodash';\nimport { BLACK, DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL } from '../constants';\nimport type {\n    AesRecord,\n    AggregationMethod,\n    ColumnName, DendrogramDistance, DendrogramLinkage, HeatmapSettings,\n    LegendPosition, LineShape, NormalizationDirection, NormalizationMethod, PointShape,\n    SettingsInterface,\n    TitlePosition\n} from '../types';\nimport { HeatmapSettingsSchema } from '../types';\nimport { MIN_MARGIN, MIN_PADDING } from './constants';\n\nconst DEFAULT_DENDRO_AES = {\n    lineColor: BLACK,\n    dotShape: '21' as PointShape,\n    dotFill: BLACK,\n    dotSize: 3,\n    lineShape: 'solid' as LineShape,\n    lineWidth: 1,\n};\nconst DEFAULT_DENDRO: HeatmapDendrogramSettings = {\n    size: 150,\n    distance: 'euclidean',\n    linkage: 'average',\n    fillNA: 0,\n    showNodes: true,\n    hidden: false,\n    edgeInheritance: 'up',\n    aes: DEFAULT_DENDRO_AES,\n};\n\nexport interface HeatmapDendrogramSettings {\n    size: number;\n    distance: DendrogramDistance;\n    linkage: DendrogramLinkage;\n    fillNA: number;\n    showNodes: boolean;\n    hidden: boolean;\n    edgeInheritance: 'up' | 'down';\n    aes: {\n        lineColor: string | ColumnName;\n        dotFill: string | ColumnName;\n        dotShape: PointShape | ColumnName;\n        dotSize: number | ColumnName;\n        lineShape: LineShape | ColumnName;\n        lineWidth: number | ColumnName;\n    };\n}\n\ninterface HeatmapDendrogramSettingsX extends HeatmapDendrogramSettings {\n    position: 'top' | 'bottom';\n}\ninterface HeatmapDendrogramSettingsY extends HeatmapDendrogramSettings {\n    position: 'left' | 'right';\n}\n\ninterface HeatmapAnnotation {\n    id: string;\n    valueColumn: ColumnName;\n    showTitle: boolean;\n    type: 'discrete' | 'continuous';\n    colors: string[];\n}\n\ninterface HeatmapAnnotationX extends HeatmapAnnotation {\n    axis: 'x';\n    position: 'top' | 'bottom';\n    titlePosition: 'left' | 'right';\n}\ninterface HeatmapAnnotationY extends HeatmapAnnotation {\n    axis: 'y';\n    position: 'left' | 'right';\n    titlePosition: 'top' | 'bottom';\n}\n\nexport class HeatmapSettingsImpl implements SettingsInterface {\n    readonly id: string;\n    readonly type = 'heatmap';\n    readonly facetSettings: {\n        order: string[] | null;\n        sharedX: boolean;\n        sharedY: boolean;\n        nRows?: number;\n        nCols?: number;\n    };\n    readonly xColumn: ColumnName;\n    readonly xGroupBy: ColumnName[];\n    readonly xSortBy: ColumnName[];\n    readonly yColumn: ColumnName;\n    readonly yGroupBy: ColumnName[];\n    readonly ySortBy: ColumnName[];\n    readonly valueColumn: ColumnName;\n    readonly facetBy: ColumnName[];\n    readonly normalization: { direction: NormalizationDirection, method: NormalizationMethod, colorRange?: number[] } | null;\n    readonly chartSettings: {\n        readonly title: { name: string; show: boolean; position: TitlePosition };\n        readonly size: {\n            width: number;\n            height: number;\n            cellWidth: number | null;\n            cellHeight: number | null;\n            innerOffset: number;\n            outerOffset: number;\n        };\n        readonly frame: { type: 'full' | 'groups' | 'none' };\n        readonly valueType: 'discrete' | 'continuous';\n        readonly yAxis: {\n            title: string;\n            showTicks: boolean;\n            showTitle: boolean;\n            showAxisLabels: boolean;\n            showGroupLabels: boolean;\n            position: 'left' | 'right';\n            groupingPosition: 'left' | 'right';\n            axisLabelsAngle: 0 | 45 | 90;\n            groupLabelsAngle: 0 | 45 | 90;\n            sorting: 'asc' | 'desc';\n        };\n        readonly xAxis: {\n            title: string;\n            showTicks: boolean;\n            showTitle: boolean;\n            showAxisLabels: boolean;\n            showGroupLabels: boolean;\n            position: 'bottom' | 'top';\n            groupingPosition: 'bottom' | 'top';\n            axisLabelsAngle: 0 | 45 | 90;\n            groupLabelsAngle: 0 | 45 | 90;\n            sorting: 'asc' | 'desc';\n        };\n        readonly legend: { show: boolean; position: LegendPosition };\n        readonly tooltips: { show: boolean; content?: ColumnName[] };\n    };\n    readonly keysOrder: Record<string, string[]>;\n    readonly aes: {\n        colorsList: string[];\n        colorsMap: Record<string, string> | null;\n        valueColors: string[] | null;\n        valuesByColors: number[] | null;\n        groupGap: number;\n        cellStrokeColor: string;\n        emptyCellColor: string;\n    };\n\n    readonly aggregation: {\n        x: boolean;\n        y: boolean;\n        method: AggregationMethod;\n    };\n\n    readonly annotations: (HeatmapAnnotationX | HeatmapAnnotationY)[];\n\n    readonly dendrogramX: HeatmapDendrogramSettingsX | null;\n    readonly dendrogramY: HeatmapDendrogramSettingsY | null;\n    readonly inheritedDendrogramAes: Record<string, AesRecord> | null;\n    readonly NAValueAs: number | null;\n    readonly transform: 'log' | null;\n    readonly showEmptyRows: boolean;\n    readonly showEmptyColumns: boolean;\n    readonly cellsRenderingMode: 'canvas' | 'svg' | null;\n\n    constructor(settings: HeatmapSettings) {\n        HeatmapSettingsSchema.parse(settings);\n\n        this.id = lodash.uniqueId('settings');\n        this.xColumn = settings.xColumn;\n        this.xGroupBy = settings.xGroupBy ?? [];\n        this.xSortBy = settings.xSortBy ?? [];\n        this.yColumn = settings.yColumn;\n        this.yGroupBy = settings.yGroupBy ?? [];\n        this.ySortBy = settings.ySortBy ?? [];\n        this.valueColumn = settings.valueColumn;\n        this.facetBy = settings.facetBy ?? [];\n        this.chartSettings = {\n            title: {\n                position: 'left',\n                show: true,\n                ...settings.title,\n                name: settings.title?.name ?? 'Chart',\n            },\n            size: {\n                width: settings?.size?.width ?? (this.facetBy.length ? DEFAULT_WIDTH_SMALL : DEFAULT_WIDTH),\n                height: settings?.size?.height ?? (this.facetBy.length ? DEFAULT_HEIGHT_SMALL : DEFAULT_HEIGHT),\n                innerOffset: settings.size?.innerOffset ?? MIN_PADDING,\n                outerOffset: settings.size?.outerOffset ?? MIN_MARGIN,\n                cellWidth: settings?.size?.cellWidth ?? null,\n                cellHeight: settings?.size?.cellHeight ?? null,\n            },\n            frame: { type: settings.frame?.type ?? 'none' },\n            valueType: settings.valueType ?? 'continuous',\n            yAxis: {\n                title: settings.yColumn.label ?? settings.yColumn.value,\n                showTicks: true,\n                showTitle: true,\n                showAxisLabels: true,\n                showGroupLabels: true,\n                position: 'left',\n                groupingPosition: 'left',\n                axisLabelsAngle: 90,\n                groupLabelsAngle: 0,\n                sorting: 'asc',\n                ...settings.yAxis,\n            },\n            xAxis: {\n                title: settings.xColumn.label ?? settings.xColumn.value,\n                showTicks: true,\n                showTitle: true,\n                showAxisLabels: true,\n                showGroupLabels: true,\n                position: 'bottom',\n                groupingPosition: 'bottom',\n                axisLabelsAngle: 90,\n                groupLabelsAngle: 0,\n                sorting: 'asc',\n                ...settings.xAxis,\n            },\n            legend: {\n                show: true,\n                position: 'right',\n                ...settings.legend,\n            },\n            tooltips: {\n                show: true,\n                ...settings.tooltips,\n            },\n        };\n        this.facetSettings = {\n            sharedX: true,\n            sharedY: true,\n            order: settings.facetSettings?.order ?? null,\n            ...settings.facetSettings,\n        };\n        if (this.chartSettings.size.cellWidth && this.facetBy.length > 0) {\n            this.facetSettings.sharedX = true;\n        }\n        if (this.chartSettings.size.cellHeight && this.facetBy.length > 0) {\n            this.facetSettings.sharedY = true;\n        }\n        this.keysOrder = settings.keysOrder ?? {};\n        this.normalization = this.chartSettings.valueType === 'continuous' ? settings.normalization ?? null : null;\n        this.transform = this.chartSettings.valueType === 'continuous' ? settings.transform ?? null : null;\n        this.NAValueAs = settings.NAValueAs ?? null;\n        this.showEmptyRows = settings.showEmptyRows ?? false;\n        this.showEmptyColumns = settings.showEmptyColumns ?? false;\n        this.aes = {\n            colorsList: settings.aes?.colorsList ?? ['black', 'white', 'red'],\n            colorsMap: settings.aes?.colorsMap ?? null,\n            valueColors: settings.aes?.valueColors ?? null,\n            valuesByColors: settings.aes?.valuesByColors ?? null,\n            cellStrokeColor: settings.aes?.cellStrokeColor ?? 'none',\n            groupGap: settings.aes?.groupGap ?? 3,\n            emptyCellColor: settings.aes?.emptyCellColor ?? 'white',\n        };\n\n        this.annotations = (settings.annotations ?? []).map(item => {\n            if (item.axis === 'x') {\n                return {\n                    id: lodash.uniqueId('annotation'),\n                    axis: 'x',\n                    valueColumn: item.valueColumn,\n                    position: item.position ?? this.chartSettings.xAxis.position,\n                    titlePosition: item.titlePosition ?? 'right',\n                    showTitle: item.showTitle ?? true,\n                    type: item.type,\n                    colors: item.colors ?? ['white', 'black'],\n                };\n            }\n            return {\n                id: lodash.uniqueId('annotation'),\n                axis: 'y',\n                valueColumn: item.valueColumn,\n                position: item.position ?? this.chartSettings.yAxis.position,\n                titlePosition: item.titlePosition ?? 'top',\n                showTitle: item.showTitle ?? true,\n                type: item.type,\n                colors: item.colors ?? ['white', 'black'],\n            };\n        });\n\n        if (settings.valueType === 'discrete' && (settings.dendrogramX || settings.dendrogramY)) {\n            throw Error('Dendrogram is not available with discrete cells values');\n        }\n\n        this.aggregation = {\n            x: false,\n            y: false,\n            method: 'min',\n            ...settings.aggregation\n        };\n\n        this.dendrogramX = settings.dendrogramX\n            ? {\n                ...DEFAULT_DENDRO,\n                position: 'top',\n                ...settings.dendrogramX,\n                aes: {\n                    ...DEFAULT_DENDRO_AES,\n                    ...settings.dendrogramX?.aes,\n                },\n            }\n            : null;\n        this.dendrogramY = settings.dendrogramY\n            ? {\n                ...DEFAULT_DENDRO,\n                position: 'left',\n                ...settings.dendrogramY,\n                aes: {\n                    ...DEFAULT_DENDRO_AES,\n                    ...settings.dendrogramY?.aes,\n                },\n            }\n            : null;\n        this.inheritedDendrogramAes = settings.inheritedDendrogramAes ?? null;\n        this.cellsRenderingMode = settings.cellsRenderingMode ?? null;\n    }\n}\n"],"mappings":"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"}
+{"version":3,"file":"HeatmapSettingsImpl.js","names":[],"sources":["../../src/heatmap/HeatmapSettingsImpl.ts"],"sourcesContent":["import lodash from 'lodash';\nimport { BLACK, DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL } from '../constants';\nimport type {\n    AesRecord,\n    AggregationMethod,\n    ColumnName, DendrogramDistance, DendrogramLinkage, HeatmapSettings,\n    LegendPosition, LineShape, NormalizationDirection, NormalizationMethod, PointShape,\n    SettingsInterface,\n    TitlePosition\n} from '../types';\nimport { HeatmapSettingsSchema } from '../types';\nimport { MIN_MARGIN, MIN_PADDING } from './constants';\nimport { joinAxisTitle, resolveLabelParts } from './labelParts';\n\nconst DEFAULT_DENDRO_AES = {\n    lineColor: BLACK,\n    dotShape: '21' as PointShape,\n    dotFill: BLACK,\n    dotSize: 3,\n    lineShape: 'solid' as LineShape,\n    lineWidth: 1,\n};\nconst DEFAULT_DENDRO: HeatmapDendrogramSettings = {\n    size: 150,\n    distance: 'euclidean',\n    linkage: 'average',\n    fillNA: 0,\n    showNodes: true,\n    hidden: false,\n    edgeInheritance: 'up',\n    aes: DEFAULT_DENDRO_AES,\n};\n\nexport interface HeatmapDendrogramSettings {\n    size: number;\n    distance: DendrogramDistance;\n    linkage: DendrogramLinkage;\n    fillNA: number;\n    showNodes: boolean;\n    hidden: boolean;\n    edgeInheritance: 'up' | 'down';\n    aes: {\n        lineColor: string | ColumnName;\n        dotFill: string | ColumnName;\n        dotShape: PointShape | ColumnName;\n        dotSize: number | ColumnName;\n        lineShape: LineShape | ColumnName;\n        lineWidth: number | ColumnName;\n    };\n}\n\ninterface HeatmapDendrogramSettingsX extends HeatmapDendrogramSettings {\n    position: 'top' | 'bottom';\n}\ninterface HeatmapDendrogramSettingsY extends HeatmapDendrogramSettings {\n    position: 'left' | 'right';\n}\n\ninterface HeatmapAnnotation {\n    id: string;\n    valueColumn: ColumnName;\n    showTitle: boolean;\n    type: 'discrete' | 'continuous';\n    colors: string[];\n}\n\ninterface HeatmapAnnotationX extends HeatmapAnnotation {\n    axis: 'x';\n    position: 'top' | 'bottom';\n    titlePosition: 'left' | 'right';\n}\ninterface HeatmapAnnotationY extends HeatmapAnnotation {\n    axis: 'y';\n    position: 'left' | 'right';\n    titlePosition: 'top' | 'bottom';\n}\n\nexport class HeatmapSettingsImpl implements SettingsInterface {\n    readonly id: string;\n    readonly type = 'heatmap';\n    readonly facetSettings: {\n        order: string[] | null;\n        sharedX: boolean;\n        sharedY: boolean;\n        nRows?: number;\n        nCols?: number;\n    };\n    readonly x: ColumnName[];\n    readonly xGroupBy: ColumnName[];\n    readonly xSortBy: ColumnName[];\n    readonly y: ColumnName[];\n    readonly yGroupBy: ColumnName[];\n    readonly ySortBy: ColumnName[];\n    readonly valueColumn: ColumnName;\n    readonly facetBy: ColumnName[];\n    readonly normalization: { direction: NormalizationDirection, method: NormalizationMethod, colorRange?: number[] } | null;\n    readonly chartSettings: {\n        readonly title: { name: string; show: boolean; position: TitlePosition };\n        readonly size: {\n            width: number;\n            height: number;\n            cellWidth: number | null;\n            cellHeight: number | null;\n            innerOffset: number;\n            outerOffset: number;\n        };\n        readonly frame: { type: 'full' | 'groups' | 'none' };\n        readonly valueType: 'discrete' | 'continuous';\n        readonly yAxis: {\n            title: string;\n            showTicks: boolean;\n            showTitle: boolean;\n            showAxisLabels: boolean;\n            showGroupLabels: boolean;\n            position: 'left' | 'right';\n            groupingPosition: 'left' | 'right';\n            axisLabelsAngle: 0 | 45 | 90;\n            groupLabelsAngle: 0 | 45 | 90;\n            sorting: 'asc' | 'desc';\n            labelParts: ColumnName['value'][] | null;\n        };\n        readonly xAxis: {\n            title: string;\n            showTicks: boolean;\n            showTitle: boolean;\n            showAxisLabels: boolean;\n            showGroupLabels: boolean;\n            position: 'bottom' | 'top';\n            groupingPosition: 'bottom' | 'top';\n            axisLabelsAngle: 0 | 45 | 90;\n            groupLabelsAngle: 0 | 45 | 90;\n            sorting: 'asc' | 'desc';\n            labelParts: ColumnName['value'][] | null;\n        };\n        readonly legend: { show: boolean; position: LegendPosition };\n        readonly tooltips: { show: boolean; content?: ColumnName[] };\n    };\n    readonly keysOrder: Record<string, string[]>;\n    readonly aes: {\n        colorsList: string[];\n        colorsMap: Record<string, string> | null;\n        valueColors: string[] | null;\n        valuesByColors: number[] | null;\n        groupGap: number;\n        cellStrokeColor: string;\n        emptyCellColor: string;\n    };\n\n    readonly aggregation: {\n        x: boolean;\n        y: boolean;\n        method: AggregationMethod;\n    };\n\n    readonly annotations: (HeatmapAnnotationX | HeatmapAnnotationY)[];\n\n    readonly dendrogramX: HeatmapDendrogramSettingsX | null;\n    readonly dendrogramY: HeatmapDendrogramSettingsY | null;\n    readonly inheritedDendrogramAes: Record<string, AesRecord> | null;\n    readonly NAValueAs: number | null;\n    readonly transform: 'log' | null;\n    readonly showEmptyRows: boolean;\n    readonly showEmptyColumns: boolean;\n    readonly cellsRenderingMode: 'canvas' | 'svg' | null;\n\n    constructor(settings: HeatmapSettings) {\n        HeatmapSettingsSchema.parse(settings);\n\n        this.id = lodash.uniqueId('settings');\n        this.x = settings.x;\n        this.xGroupBy = settings.xGroupBy ?? [];\n        this.xSortBy = settings.xSortBy ?? [];\n        this.y = settings.y;\n        this.yGroupBy = settings.yGroupBy ?? [];\n        this.ySortBy = settings.ySortBy ?? [];\n        this.valueColumn = settings.valueColumn;\n        this.facetBy = settings.facetBy ?? [];\n        this.chartSettings = {\n            title: {\n                position: 'left',\n                show: true,\n                ...settings.title,\n                name: settings.title?.name ?? 'Chart',\n            },\n            size: {\n                width: settings?.size?.width ?? (this.facetBy.length ? DEFAULT_WIDTH_SMALL : DEFAULT_WIDTH),\n                height: settings?.size?.height ?? (this.facetBy.length ? DEFAULT_HEIGHT_SMALL : DEFAULT_HEIGHT),\n                innerOffset: settings.size?.innerOffset ?? MIN_PADDING,\n                outerOffset: settings.size?.outerOffset ?? MIN_MARGIN,\n                cellWidth: settings?.size?.cellWidth ?? null,\n                cellHeight: settings?.size?.cellHeight ?? null,\n            },\n            frame: { type: settings.frame?.type ?? 'none' },\n            valueType: settings.valueType ?? 'continuous',\n            yAxis: {\n                // Default title joins only the *visible* y parts (labelParts ids\n                // mapped back to y, else the full y); the consumer can still\n                // override via settings.yAxis.title.\n                title: joinAxisTitle(resolveLabelParts(settings.y, settings.yAxis?.labelParts)),\n                showTicks: true,\n                showTitle: true,\n                showAxisLabels: true,\n                showGroupLabels: true,\n                position: 'left',\n                groupingPosition: 'left',\n                axisLabelsAngle: 90,\n                groupLabelsAngle: 0,\n                sorting: 'asc',\n                labelParts: null,\n                ...settings.yAxis,\n            },\n            xAxis: {\n                title: joinAxisTitle(resolveLabelParts(settings.x, settings.xAxis?.labelParts)),\n                showTicks: true,\n                showTitle: true,\n                showAxisLabels: true,\n                showGroupLabels: true,\n                position: 'bottom',\n                groupingPosition: 'bottom',\n                axisLabelsAngle: 90,\n                groupLabelsAngle: 0,\n                sorting: 'asc',\n                labelParts: null,\n                ...settings.xAxis,\n            },\n            legend: {\n                show: true,\n                position: 'right',\n                ...settings.legend,\n            },\n            tooltips: {\n                show: true,\n                ...settings.tooltips,\n            },\n        };\n        this.facetSettings = {\n            sharedX: true,\n            sharedY: true,\n            order: settings.facetSettings?.order ?? null,\n            ...settings.facetSettings,\n        };\n        if (this.chartSettings.size.cellWidth && this.facetBy.length > 0) {\n            this.facetSettings.sharedX = true;\n        }\n        if (this.chartSettings.size.cellHeight && this.facetBy.length > 0) {\n            this.facetSettings.sharedY = true;\n        }\n        this.keysOrder = settings.keysOrder ?? {};\n        this.normalization = this.chartSettings.valueType === 'continuous' ? settings.normalization ?? null : null;\n        this.transform = this.chartSettings.valueType === 'continuous' ? settings.transform ?? null : null;\n        this.NAValueAs = settings.NAValueAs ?? null;\n        this.showEmptyRows = settings.showEmptyRows ?? false;\n        this.showEmptyColumns = settings.showEmptyColumns ?? false;\n        this.aes = {\n            colorsList: settings.aes?.colorsList ?? ['black', 'white', 'red'],\n            colorsMap: settings.aes?.colorsMap ?? null,\n            valueColors: settings.aes?.valueColors ?? null,\n            valuesByColors: settings.aes?.valuesByColors ?? null,\n            cellStrokeColor: settings.aes?.cellStrokeColor ?? 'none',\n            groupGap: settings.aes?.groupGap ?? 3,\n            emptyCellColor: settings.aes?.emptyCellColor ?? 'white',\n        };\n\n        this.annotations = (settings.annotations ?? []).map(item => {\n            if (item.axis === 'x') {\n                return {\n                    id: lodash.uniqueId('annotation'),\n                    axis: 'x',\n                    valueColumn: item.valueColumn,\n                    position: item.position ?? this.chartSettings.xAxis.position,\n                    titlePosition: item.titlePosition ?? 'right',\n                    showTitle: item.showTitle ?? true,\n                    type: item.type,\n                    colors: item.colors ?? ['white', 'black'],\n                };\n            }\n            return {\n                id: lodash.uniqueId('annotation'),\n                axis: 'y',\n                valueColumn: item.valueColumn,\n                position: item.position ?? this.chartSettings.yAxis.position,\n                titlePosition: item.titlePosition ?? 'top',\n                showTitle: item.showTitle ?? true,\n                type: item.type,\n                colors: item.colors ?? ['white', 'black'],\n            };\n        });\n\n        if (settings.valueType === 'discrete' && (settings.dendrogramX || settings.dendrogramY)) {\n            throw Error('Dendrogram is not available with discrete cells values');\n        }\n\n        this.aggregation = {\n            x: false,\n            y: false,\n            method: 'min',\n            ...settings.aggregation\n        };\n\n        this.dendrogramX = settings.dendrogramX\n            ? {\n                ...DEFAULT_DENDRO,\n                position: 'top',\n                ...settings.dendrogramX,\n                aes: {\n                    ...DEFAULT_DENDRO_AES,\n                    ...settings.dendrogramX?.aes,\n                },\n            }\n            : null;\n        this.dendrogramY = settings.dendrogramY\n            ? {\n                ...DEFAULT_DENDRO,\n                position: 'left',\n                ...settings.dendrogramY,\n                aes: {\n                    ...DEFAULT_DENDRO_AES,\n                    ...settings.dendrogramY?.aes,\n                },\n            }\n            : null;\n        this.inheritedDendrogramAes = settings.inheritedDendrogramAes ?? null;\n        this.cellsRenderingMode = settings.cellsRenderingMode ?? null;\n    }\n}\n"],"mappings":"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"}

package/dist/heatmap/fillCellsData.d.ts

@@ -41,12 +41,12 @@ export type GroupedCellsData<T extends string> = {
     }>;
 };
 export declare const sortByColumns: (arr: string[], direction: "asc" | "desc", sortColumns: ColumnName[], dataByKeys: Record<string, Record<string, DataValue>>) => string[];
-export declare function fillCellsData<T extends string>(result: GroupedCellsData<T>, { data, xColumn, yColumn, valueColumns, facetBy, xGroupBy, yGroupBy, facetSettings, annotations, dendrogramX, dendrogramY, normalizationBySource, // separated for color and size for example
+export declare function fillCellsData<T extends string>(result: GroupedCellsData<T>, { data, x, y, valueColumns, facetBy, xGroupBy, yGroupBy, facetSettings, annotations, dendrogramX, dendrogramY, normalizationBySource, // separated for color and size for example
 NAValueAs, transformBySource, // same per-source pattern as normalization
 keysOrder, xAxis, yAxis, xSortBy, ySortBy, aggregation, showEmptyRows, showEmptyColumns, }: {
     data: DataFrame;
-    xColumn: ColumnName;
-    yColumn: ColumnName;
+    x: ColumnName[];
+    y: ColumnName[];
     valueColumns: Record<string, ColumnName>;
     facetBy: ColumnName[];
     xGroupBy: ColumnName[];

package/dist/heatmap/fillCellsData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fillCellsData.d.ts","sourceRoot":"","sources":["../../src/heatmap/fillCellsData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fillCellsData.d.ts","sourceRoot":"","sources":["../../src/heatmap/fillCellsData.ts"],"names":[],"mappings":"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"}

package/dist/heatmap/fillCellsData.js

@@ -3,19 +3,20 @@ import { getFacetStringKey as t } from "../discrete/utils/getFacetStringKey.js";
 import { getFacetLabels as n } from "../discrete/utils/getFacetLabels.js";
 import { getFacetOrGroupKey as r } from "../utils/getFacetOrGroupKey.js";
 import { intersect as i } from "../utils/intersect.js";
-import { deviation as a, extent as o, mean as s, quantileSorted as c, sum as l } from "d3-array";
-function u(e) {
-	let t = a(e), n = s(e);
+import { joinLabel as a, resolveLabelParts as o } from "./labelParts.js";
+import { deviation as s, extent as c, mean as l, quantileSorted as u, sum as d } from "d3-array";
+function f(e) {
+	let t = s(e), n = l(e);
 	return t === void 0 || n === void 0 || t === 0 ? (e) => e : (e) => (e - n) / t;
 }
-function d(e) {
-	let t = s(e), [n, r] = o(e);
+function p(e) {
+	let t = l(e), [n, r] = c(e);
 	return t === void 0 || n === void 0 || r === void 0 || r === n ? (e) => e : (e) => (e - t) / (r - n);
 }
-function f(e, t) {
-	return e === "standardScaling" ? u(t) : e === "meanNormalization" ? d(t) : (e) => e;
+function m(e, t) {
+	return e === "standardScaling" ? f(t) : e === "meanNormalization" ? p(t) : (e) => e;
 }
-function p(t, n) {
+function h(t, n) {
 	switch (t) {
 		case "max": {
 			let e = n[0];
@@ -27,17 +28,17 @@ function p(t, n) {
 			for (let t of n) e = Math.min(e, t);
 			return e;
 		}
-		case "median": return c(n.sort((e, t) => e - t), .5);
-		case "mean": return s(n) ?? n[0];
-		case "sum": return l(n);
+		case "median": return u(n.sort((e, t) => e - t), .5);
+		case "mean": return l(n) ?? n[0];
+		case "sum": return d(n);
 		default: e(t, `Unknown aggregation function ${t}`);
 	}
 }
-function m(e) {
+function g(e) {
 	let t = [...new Set(e)].sort();
 	return t.length > 3 ? [...t.slice(0, 3), "..."].join(", ") : t.join(", ");
 }
-function h(e) {
+function _(e) {
 	if (!e.length) return [];
 	let t = [[]];
 	for (let n of e) {
@@ -47,36 +48,36 @@ function h(e) {
 	}
 	return t;
 }
-var g = (e, t, n = {}) => {
+var v = (e, t, n = {}) => {
 	let r = t === "asc" ? 1 : -1;
 	return e.sort((e, t) => r * (n[e] ?? e).localeCompare(n[t] ?? t, "en", { numeric: !0 }));
 };
-function _(e) {
+function y(e) {
 	return !!(e == null || typeof e == "number" && Number.isNaN(e));
 }
-function v(e, t, n) {
-	let r = _(e), i = _(t);
+function b(e, t, n) {
+	let r = y(e), i = y(t);
 	if (r && i) return 0;
 	if (r) return 1;
 	if (i) return -1;
 	let a = n === "asc" ? 1 : -1;
 	return typeof e == "number" && typeof t == "number" ? a * (e < t ? -1 : e > t ? 1 : 0) : a * String(e).localeCompare(String(t), "en", { numeric: !0 });
 }
-const y = (e, t, n, r) => e.sort((e, i) => {
+const x = (e, t, n, r) => e.sort((e, i) => {
 	for (let a of n) {
-		let n = v(r[a.value]?.[e], r[a.value]?.[i], t);
+		let n = b(r[a.value]?.[e], r[a.value]?.[i], t);
 		if (n !== 0) return n;
 	}
 	return 0;
 });
-function b(e, t, n, r, i) {
+function ee(e, t, n, r, i) {
 	if (t.x || t.y) {
 		let a = e.meta.valueSources.reduce((e, t) => (e[t] = [Infinity, -Infinity], e), {});
 		for (let o of e.meta.facetKeys) {
-			let { xKeys: s, yKeys: c, cells: l, xKeysByGroups: u, yKeysByGroups: d } = e.facets[o], f = t.x ? u : s.reduce((e, t) => (e[t] = [t], e), {}), h = t.y ? d : c.reduce((e, t) => (e[t] = [t], e), {}), g = Object.keys(f), _ = Object.keys(h);
-			for (let n of g) for (let r of _) {
+			let { xKeys: s, yKeys: c, cells: l, xKeysByGroups: u, yKeysByGroups: d } = e.facets[o], f = t.x ? u : s.reduce((e, t) => (e[t] = [t], e), {}), p = t.y ? d : c.reduce((e, t) => (e[t] = [t], e), {}), m = Object.keys(f), _ = Object.keys(p);
+			for (let n of m) for (let r of _) {
 				let i = e.meta.valueSources.reduce((e, t) => (e[t] = [], e), {});
-				for (let t of f[n]) for (let n of h[r]) {
+				for (let t of f[n]) for (let n of p[r]) {
 					for (let r of e.meta.valueSources) {
 						let e = l[t]?.[n]?.value?.[r];
 						e !== void 0 && i[r].push(e);
@@ -86,7 +87,7 @@ function b(e, t, n, r, i) {
 				for (let s of e.meta.valueSources) {
 					let c = i[s];
 					if (c.length > 0) {
-						let i = p(t.method, c);
+						let i = h(t.method, c);
 						e.facets[o].cells[n] || (e.facets[o].cells[n] = {}), e.facets[o].cells[n][r] || (e.facets[o].cells[n][r] = {
 							isCell: !0,
 							idx: 0,
@@ -101,12 +102,12 @@ function b(e, t, n, r, i) {
 					}
 				}
 			}
-			if (t.x) for (let r of g) for (let a of n) {
+			if (t.x) for (let r of m) for (let a of n) {
 				let n = i.find((e) => e.valueColumn.value === a || e.valueColumn.valueLabels === a);
 				if (!n) continue;
 				let o = [];
 				for (let t of f[r]) o.push(e.meta.xDataByKeys[a][t]), delete e.meta.xDataByKeys[a][t];
-				let s = n.type === "continuous" ? p(t.method, o) : m(o);
+				let s = n.type === "continuous" ? h(t.method, o) : g(o);
 				e.meta.xDataByKeys[a][r] = s;
 			}
 			if (t.y) {
@@ -115,8 +116,8 @@ function b(e, t, n, r, i) {
 					let r = i.find((e) => e.valueColumn.value === a || e.valueColumn.valueLabels === a);
 					if (!r) continue;
 					let o = [];
-					for (let t of h[n]) o.push(e.meta.yDataByKeys[a][t]), delete e.meta.yDataByKeys[a][t];
-					let s = r.type === "continuous" ? p(t.method, o) : m(o);
+					for (let t of p[n]) o.push(e.meta.yDataByKeys[a][t]), delete e.meta.yDataByKeys[a][t];
+					let s = r.type === "continuous" ? h(t.method, o) : g(o);
 					e.meta.yDataByKeys[a][n] = s;
 				}
 			}
@@ -125,10 +126,10 @@ function b(e, t, n, r, i) {
 		e.meta.valueExtent = a;
 	}
 }
-function x(e, t) {
+function S(e, t) {
 	for (let n of e.meta.valueSources) e.meta.valueExtent[n][0] = Math.min(t.normalizedValue?.[n], e.meta.valueExtent[n][0]), e.meta.valueExtent[n][1] = Math.max(t.normalizedValue?.[n], e.meta.valueExtent[n][1]);
 }
-function S(e, t) {
+function C(e, t) {
 	if (Object.values(t).length) {
 		let n = e.meta.valueSources.reduce((e, n) => (t[n] && (e[n] = [Infinity, -Infinity]), e), {});
 		for (let r of e.meta.facetKeys) {
@@ -143,7 +144,7 @@ function S(e, t) {
 						let n = l(e, t)?.value?.[r];
 						n !== void 0 && i.push(n);
 					}
-					let a = f(e.method, i);
+					let a = m(e.method, i);
 					for (let e of s) {
 						let i = l(e, t);
 						i !== void 0 && (i.normalizedValue[r] = a(i.value?.[r]), n[r][0] = Math.min(i.normalizedValue?.[r], n[r][0]), n[r][1] = Math.max(i.normalizedValue?.[r], n[r][1]));
@@ -157,102 +158,96 @@ function S(e, t) {
 		};
 	}
 }
-function C(e, { data: a, xColumn: o, yColumn: s, valueColumns: c, facetBy: l, xGroupBy: u, yGroupBy: d, facetSettings: f, annotations: p, dendrogramX: m, dendrogramY: _, normalizationBySource: v, NAValueAs: C, transformBySource: w, keysOrder: T, xAxis: E, yAxis: D, xSortBy: O, ySortBy: k, aggregation: A, showEmptyRows: j = !1, showEmptyColumns: M = !1 }) {
-	let N = l.length ? l.map((e) => T[e.value] ?? a.getColumnCategories(e.value)) : [["null"]], ee = u.length ? u.map((e) => T[e.value] ?? a.getColumnCategories(e.value)) : [["null"]], te = d.length ? d.map((e) => T[e.value] ?? a.getColumnCategories(e.value)) : [["null"]], P = h(N), F = h(ee), I = h(te);
-	f?.order?.length && (P = P.filter((e) => f.order?.includes(t(e))));
-	let L = P.map(r), R = new Set(L), z = F.map(r), B = I.map(r);
-	e.meta.facetKeys = L, e.meta.xGroupKeys = z, e.meta.yGroupKeys = B;
-	let V = n(a, l, L, P);
-	e.meta.facetKeyValues = L.reduce((e, t) => (e[t] = V[t], e), {}), e.meta.xGroupKeyValues = z.reduce((e, t, n) => (e[t] = F[n], e), {}), e.meta.yGroupKeyValues = B.reduce((e, t, n) => (e[t] = I[n], e), {});
-	let H = o.valueLabels ?? o.value, U = s.valueLabels ?? s.value, W = p.filter((e) => e.axis === "x").map((e) => e.valueColumn.valueLabels ?? e.valueColumn.value), G = p.filter((e) => e.axis === "y").map((e) => e.valueColumn.valueLabels ?? e.valueColumn.value), K = Object.values(m ?? {}).map((e) => e.value), q = Object.values(_ ?? {}).map((e) => e.value), J = (O ?? []).map((e) => e.value), Y = (k ?? []).map((e) => e.value), X = [...new Set([
+function w(e, { data: s, x: c, y: l, valueColumns: u, facetBy: d, xGroupBy: f, yGroupBy: p, facetSettings: m, annotations: h, dendrogramX: g, dendrogramY: y, normalizationBySource: b, NAValueAs: w, transformBySource: T, keysOrder: E, xAxis: D, yAxis: O, xSortBy: k, ySortBy: A, aggregation: j, showEmptyRows: M = !1, showEmptyColumns: N = !1 }) {
+	let P = o(c, "labelParts" in D ? D.labelParts : null), F = o(l, "labelParts" in O ? O.labelParts : null), te = d.length ? d.map((e) => E[e.value] ?? s.getColumnCategories(e.value)) : [["null"]], ne = f.length ? f.map((e) => E[e.value] ?? s.getColumnCategories(e.value)) : [["null"]], I = p.length ? p.map((e) => E[e.value] ?? s.getColumnCategories(e.value)) : [["null"]], L = _(te), R = _(ne), z = _(I);
+	m?.order?.length && (L = L.filter((e) => m.order?.includes(t(e))));
+	let B = L.map(r), re = new Set(B), V = R.map(r), H = z.map(r);
+	e.meta.facetKeys = B, e.meta.xGroupKeys = V, e.meta.yGroupKeys = H;
+	let U = n(s, d, B, L);
+	e.meta.facetKeyValues = B.reduce((e, t) => (e[t] = U[t], e), {}), e.meta.xGroupKeyValues = V.reduce((e, t, n) => (e[t] = R[n], e), {}), e.meta.yGroupKeyValues = H.reduce((e, t, n) => (e[t] = z[n], e), {});
+	let W = h.filter((e) => e.axis === "x").map((e) => e.valueColumn.valueLabels ?? e.valueColumn.value), G = h.filter((e) => e.axis === "y").map((e) => e.valueColumn.valueLabels ?? e.valueColumn.value), K = Object.values(g ?? {}).map((e) => e.value), q = Object.values(y ?? {}).map((e) => e.value), J = (k ?? []).map((e) => e.value), Y = (A ?? []).map((e) => e.value), X = [...new Set([
 		...W,
 		...K,
-		...J,
-		H
+		...J
 	])], Z = [...new Set([
 		...G,
 		...q,
-		...Y,
-		U
+		...Y
 	])];
-	for (let t = 0; t < a.rowsCount; t++) {
-		let n = r(l.map((e) => a.getColumnValue(e.value, t)));
-		if (!R.has(n)) continue;
-		let i = r(u.map((e) => a.getColumnValue(e.value, t))), f = r(d.map((e) => a.getColumnValue(e.value, t))), p = u.map((e) => a.getColumnValue(e.valueLabels ?? e.value, t)).join(", "), m = d.map((e) => a.getColumnValue(e.valueLabels ?? e.value, t)).join(", ");
-		e.meta.xGroupLabels[i] = p, e.meta.yGroupLabels[f] = m;
-		let h = String(a.getColumnValue(o.value, t)), g = String(a.getColumnValue(s.value, t)), _ = e.meta.valueSources.reduce((e, n) => {
-			let r = a.getColumnValue(c[n].value, t) ?? C;
-			if (w?.[n] === "log" && typeof r == "number") {
+	for (let t = 0; t < s.rowsCount; t++) {
+		let n = r(d.map((e) => s.getColumnValue(e.value, t)));
+		if (!re.has(n)) continue;
+		let i = r(f.map((e) => s.getColumnValue(e.value, t))), o = r(p.map((e) => s.getColumnValue(e.value, t))), m = a(f, s, t), h = a(p, s, t);
+		e.meta.xGroupLabels[i] = m, e.meta.yGroupLabels[o] = h;
+		let g = r([...c.map((e) => s.getColumnValue(e.value, t)), ...f.map((e) => s.getColumnValue(e.value, t))]), _ = r([...l.map((e) => s.getColumnValue(e.value, t)), ...p.map((e) => s.getColumnValue(e.value, t))]), v = a(P, s, t), y = a(F, s, t), b = e.meta.valueSources.reduce((e, n) => {
+			let r = s.getColumnValue(u[n].value, t) ?? w;
+			if (T?.[n] === "log" && typeof r == "number") {
 				let e = Math.log10(r);
 				r = Number.isFinite(e) ? e : null;
 			}
 			return e[n] = r, e;
 		}, {});
-		if (h === "null" || g === "null") continue;
-		let v = Object.values(_).every((e) => e === null);
-		if (!(v && !j && !M)) {
+		if (g === "null" || _ === "null") continue;
+		let x = Object.values(b).every((e) => e === null);
+		if (!(x && !M && !N)) {
 			if (e.facets[n] || (e.facets[n] = {
 				xKeys: [],
 				yKeys: [],
 				xKeysByGroups: {},
 				yKeysByGroups: {},
 				cells: {}
-			}), e.facets[n].xKeysByGroups[i] || (e.facets[n].xKeysByGroups[i] = []), e.facets[n].yKeysByGroups[f] || (e.facets[n].yKeysByGroups[f] = []), !v || M) {
-				e.facets[n].xKeys.push(h), e.facets[n].xKeysByGroups[i].push(h);
-				let r = a.getColumnValue(H, t);
-				if (e.meta.xLabels[h] && String(r) !== e.meta.xLabels[h]) throw Error(`More than 1 x-label value for x=${h}`);
-				e.meta.xLabels[h] = String(r);
+			}), e.facets[n].xKeysByGroups[i] || (e.facets[n].xKeysByGroups[i] = []), e.facets[n].yKeysByGroups[o] || (e.facets[n].yKeysByGroups[o] = []), !x || N) {
+				if (e.facets[n].xKeys.push(g), e.facets[n].xKeysByGroups[i].push(g), e.meta.xLabels[g] && v !== e.meta.xLabels[g]) throw Error(`More than 1 x-label value for x=${g}`);
+				e.meta.xLabels[g] = v;
 				for (let n of X) {
-					let r = e.meta.xDataByKeys[n] !== void 0, i = r && e.meta.xDataByKeys[n][h] !== void 0;
-					if (r || (e.meta.xDataByKeys[n] = {}), i && e.meta.xDataByKeys[n][h] !== a.getColumnValue(n, t)) throw Error(`More than 1 value for x = ${h} and column = ${n}`);
-					i || (e.meta.xDataByKeys[n][h] = a.getColumnValue(n, t));
+					let r = e.meta.xDataByKeys[n] !== void 0, i = r && e.meta.xDataByKeys[n][g] !== void 0;
+					if (r || (e.meta.xDataByKeys[n] = {}), i && e.meta.xDataByKeys[n][g] !== s.getColumnValue(n, t)) throw Error(`More than 1 value for x = ${g} and column = ${n}`);
+					i || (e.meta.xDataByKeys[n][g] = s.getColumnValue(n, t));
 				}
 			}
-			if (!v || j) {
-				e.facets[n].yKeys.push(g), e.facets[n].yKeysByGroups[f].push(g);
-				let r = a.getColumnValue(U, t);
-				if (e.meta.yLabels[g] && String(r) !== e.meta.yLabels[g]) throw Error(`More than 1 y-label value for y=${g}`);
-				e.meta.yLabels[g] = String(r);
+			if (!x || M) {
+				if (e.facets[n].yKeys.push(_), e.facets[n].yKeysByGroups[o].push(_), e.meta.yLabels[_] && y !== e.meta.yLabels[_]) throw Error(`More than 1 y-label value for y=${_}`);
+				e.meta.yLabels[_] = y;
 				for (let n of Z) {
-					let r = e.meta.yDataByKeys[n] !== void 0, i = r && e.meta.yDataByKeys[n][g] !== void 0;
-					if (r || (e.meta.yDataByKeys[n] = {}), i && e.meta.yDataByKeys[n][g] !== a.getColumnValue(n, t)) throw Error(`More than 1 value for y = ${g} and column = ${n}`);
-					i || (e.meta.yDataByKeys[n][g] = a.getColumnValue(n, t));
+					let r = e.meta.yDataByKeys[n] !== void 0, i = r && e.meta.yDataByKeys[n][_] !== void 0;
+					if (r || (e.meta.yDataByKeys[n] = {}), i && e.meta.yDataByKeys[n][_] !== s.getColumnValue(n, t)) throw Error(`More than 1 value for y = ${_} and column = ${n}`);
+					i || (e.meta.yDataByKeys[n][_] = s.getColumnValue(n, t));
 				}
 			}
-			if (!v) {
-				e.facets[n].cells[h] || (e.facets[n].cells[h] = {});
-				for (let t of e.meta.valueSources) if (e.facets[n].cells[h][g] && e.facets[n].cells[h][g].value[t] !== _[t]) throw Error(`More than 1 value for x=${h}, y=${g}`);
-				e.facets[n].cells[h][g] = {
+			if (!x) {
+				e.facets[n].cells[g] || (e.facets[n].cells[g] = {});
+				for (let t of e.meta.valueSources) if (e.facets[n].cells[g][_] && e.facets[n].cells[g][_].value[t] !== b[t]) throw Error(`More than 1 value for x=${g}, y=${_}`);
+				e.facets[n].cells[g][_] = {
 					isCell: !0,
 					idx: t,
-					id: `${h}_${g}`,
-					x: h,
-					y: g,
-					value: _,
-					normalizedValue: _
-				}, x(e, e.facets[n].cells[h][g]);
+					id: `${g}_${_}`,
+					x: g,
+					y: _,
+					value: b,
+					normalizedValue: b
+				}, S(e, e.facets[n].cells[g][_]);
 			}
 		}
 	}
 	e.meta.facetKeys = e.meta.facetKeys.filter((t) => e.facets[t]);
 	for (let t of e.meta.facetKeys) {
 		let n = e.facets[t], r = [...new Set(n.xKeys)], a = [...new Set(n.yKeys)];
-		n.xKeys = T[o.value] ? i(T[o.value], r) : r, n.yKeys = T[s.value] ? i(T[s.value], a) : a;
-		for (let r of z) e.facets[t].xKeysByGroups[r] = i(n.xKeys, e.facets[t].xKeysByGroups[r]);
-		for (let r of B) e.facets[t].yKeysByGroups[r] = i(n.yKeys, e.facets[t].yKeysByGroups[r]);
+		n.xKeys = E.x ? i(E.x, r) : r, n.yKeys = E.y ? i(E.y, a) : a;
+		for (let r of V) e.facets[t].xKeysByGroups[r] = i(n.xKeys, e.facets[t].xKeysByGroups[r]);
+		for (let r of H) e.facets[t].yKeysByGroups[r] = i(n.yKeys, e.facets[t].yKeysByGroups[r]);
 	}
-	b(e, A, X, Z, p), S(e, v);
-	let ne = u.some((e) => T[e.value]?.length > 0), re = d.some((e) => T[e.value]?.length > 0);
-	ne || (e.meta.xGroupKeys = g([...e.meta.xGroupKeys], E.sorting, e.meta.xGroupLabels)), re || (e.meta.yGroupKeys = g([...e.meta.yGroupKeys], D.sorting, e.meta.yGroupLabels));
-	let Q = !m && !A.x && O?.length ? O : null;
+	ee(e, j, X, Z, h), C(e, b);
+	let ie = f.some((e) => E[e.value]?.length > 0), ae = p.some((e) => E[e.value]?.length > 0);
+	ie || (e.meta.xGroupKeys = v([...e.meta.xGroupKeys], D.sorting, e.meta.xGroupLabels)), ae || (e.meta.yGroupKeys = v([...e.meta.yGroupKeys], O.sorting, e.meta.yGroupLabels));
+	let Q = !g && !j.x && k?.length ? k : null;
 	e.meta.xKeysByGroups = e.meta.xGroupKeys.reduce((t, n) => {
-		let r = [...new Set(e.meta.facetKeys.flatMap((t) => e.facets[t].xKeysByGroups[n]))], a = Q ? y(r, E.sorting, Q, e.meta.xDataByKeys) : g(r, E.sorting, e.meta.xLabels);
-		return t[n] = T[o.value] ? i(T[o.value], a) : a, t;
+		let r = [...new Set(e.meta.facetKeys.flatMap((t) => e.facets[t].xKeysByGroups[n]))], a = Q ? x(r, D.sorting, Q, e.meta.xDataByKeys) : v(r, D.sorting, e.meta.xLabels);
+		return t[n] = E.x ? i(E.x, a) : a, t;
 	}, {}), e.meta.xKeys = e.meta.xGroupKeys.reduce((t, n) => (t = t.concat(e.meta.xKeysByGroups[n]), t), []);
-	let $ = !_ && !A.y && k?.length ? k : null;
+	let $ = !y && !j.y && A?.length ? A : null;
 	e.meta.yKeysByGroups = e.meta.yGroupKeys.reduce((t, n) => {
-		let r = [...new Set(e.meta.facetKeys.flatMap((t) => e.facets[t].yKeysByGroups[n]))], a = $ ? y(r, D.sorting, $, e.meta.yDataByKeys) : g(r, D.sorting, e.meta.yLabels);
-		return t[n] = T[s.value] ? i(T[s.value], a) : a, t;
+		let r = [...new Set(e.meta.facetKeys.flatMap((t) => e.facets[t].yKeysByGroups[n]))], a = $ ? x(r, O.sorting, $, e.meta.yDataByKeys) : v(r, O.sorting, e.meta.yLabels);
+		return t[n] = E.y ? i(E.y, a) : a, t;
 	}, {}), e.meta.yKeys = e.meta.yGroupKeys.reduce((t, n) => (t = t.concat(e.meta.yKeysByGroups[n]), t), []);
 	for (let t of e.meta.facetKeys) {
 		for (let n of e.meta.xGroupKeys) e.facets[t].xKeysByGroups[n] = i(e.meta.xKeysByGroups[n], e.facets[t].xKeysByGroups[n] ?? []);
@@ -261,8 +256,8 @@ function C(e, { data: a, xColumn: o, yColumn: s, valueColumns: c, facetBy: l, xG
 		e.facets[t].yKeys = e.meta.yGroupKeys.flatMap((n) => e.facets[t].yKeysByGroups[n] ?? []);
 	}
 	for (let t of e.meta.valueSources) e.meta.valueExtent[t][0] === Infinity && (e.meta.valueExtent[t][0] = 0), e.meta.valueExtent[t][1] === -Infinity && (e.meta.valueExtent[t][1] = 0);
-	return e.meta.xLabels.null = o.nullValueLabel ?? "NA", e.meta.yLabels.null = s.nullValueLabel ?? "NA", e.meta.xGroupLabels.null = u.map((e) => e.nullValueLabel ?? "NA").join(", "), e.meta.yGroupLabels.null = d.map((e) => e.nullValueLabel ?? "NA").join(", "), e;
+	return e.meta.xLabels.null = P.map((e) => e.nullValueLabel ?? "NA").join(", "), e.meta.yLabels.null = F.map((e) => e.nullValueLabel ?? "NA").join(", "), e.meta.xGroupLabels.null = f.map((e) => e.nullValueLabel ?? "NA").join(", "), e.meta.yGroupLabels.null = p.map((e) => e.nullValueLabel ?? "NA").join(", "), e;
 }
-export { C as fillCellsData };
+export { w as fillCellsData };
 
 //# sourceMappingURL=fillCellsData.js.map