@milaboratories/miplots4 1.0.166 → 1.0.168

package/dist/histogram/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/histogram/index.ts"],"sourcesContent":["import {\n    intersection\n} from 'lodash';\nimport { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type { ErrorInfoHistogramGroups} from '../types';\nimport { type Category, type ColumnName, type ErrorInfoFacets, getUnknownErrorInfo, type HistogramEventHandlers, type HistogramSettings, isErrorInfo } from '../types';\nimport { getKeysCombinations } from '../utils/getKeysCombination';\nimport ChartRenderer from './ChartRenderer';\nimport type { HistogramLegendInfo } from './components/types';\nimport type { GroupedHistogramData } from './getHistogramData';\nimport { createHistogramDataByFacets } from './getHistogramData';\nimport { HistogramSettingsImpl } from './HistogramSettingsImpl';\nimport { MAX_FACETS_COUNT, MAX_GROUPS_COUNT } from '../constants';\n\nfunction getLegendInfo(\n    data: DataFrame,\n    grouping: ColumnName[],\n    inheritedAes: HistogramSettingsImpl['inheritedAes']\n): HistogramLegendInfo {\n    return grouping.reduce((res: HistogramLegendInfo, column) => {\n        const categories = data.getColumnCategories(column.value, false);\n        const getValueLabel = (category: Category) => (column.valueLabels\n            ? String(data.getColumnValue(\n                column.valueLabels,\n                data.getColumnCategoryRowIndex(column.value, category)\n            ))\n            : category\n        );\n        const labels = categories.reduce((res: Record<string, string>, category) => {\n            res[category] = getValueLabel(category);\n            return res;\n        }, {});\n        res[column.value] = {\n            values: categories.sort((a, b) => labels[a].localeCompare(labels[b], 'en', {numeric: true})),\n            aesMap: inheritedAes[column.value],\n            labels,\n        };\n        return res;\n    }, {});\n}\n\nexport class ChartHistogram extends AbstractChart {\n    settings: HistogramSettingsImpl;\n    chartRenderer = new ChartRenderer();\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        histogramDataByFacets: Record<string, GroupedHistogramData>\n        legendInfo: HistogramLegendInfo\n    } | null = null;\n\n    constructor(data: DataFrame, settings: HistogramSettings, eventHandlers?: HistogramEventHandlers) {\n        super(data, settings);\n\n        this.settings = new HistogramSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers[0];\n        }\n    }\n\n    mount(node: HTMLElement) {\n        try {\n            this.chartRenderer.init(node);\n            this._updateData();\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    unmount() {\n        this.chartRenderer.clear();\n    }\n\n    updateSettingsAndData(data: DataFrame, settings: HistogramSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new HistogramSettingsImpl(settings);\n            this.data = data;\n            if (\n                this._needUpdateCalculatedDataBySettings(previousSettings, this.settings) ||\n                this._needUpdateCalculatedDataByData(previousData, this.data)\n            ) {\n                this._updateData();\n            } else {\n                this._updateAesInData();\n            }\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    updateChartState(_field: string, _value: unknown) {\n        console.warn('no chart state for histogram');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: HistogramSettingsImpl, settings: HistogramSettingsImpl) {\n        return (\n            prevSettings.valueColumn.value !== settings.valueColumn.value ||\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping?.value !== settings.grouping?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            prevSettings.binsCount !== settings.binsCount ||\n            prevSettings.chartSettings.xAxis.scale !== settings.chartSettings.xAxis.scale ||\n            prevSettings.groupingOrder?.some((key, idx) => key !== settings.groupingOrder?.[idx]) ||\n            settings.groupingOrder?.some((key, idx) => key !== prevSettings.groupingOrder?.[idx])\n        );\n    }\n\n    _needUpdateCalculatedDataByData(prevData: DataFrame, data: DataFrame) {\n        const prevKeys = Object.keys(prevData.data);\n        const keys = Object.keys(data.data);\n        return (\n            prevData.id !== data.id ||\n            prevKeys.length !== keys.length ||\n            prevKeys.some(key => prevData.data[key].length !== data.data[key]?.length)\n        );\n    }\n\n    _updateData() {\n        const {valueColumn, facetBy, grouping, binsCount, chartSettings, inheritedAes, groupingOrder} = this.settings;\n\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value));\n        const facetKeysCombinations = facetKeysLists.length ? getKeysCombinations([...facetKeysLists]) : [['null']];\n\n        if (facetKeysCombinations.length > MAX_FACETS_COUNT) {\n            const errorInfo: ErrorInfoFacets = {\n                type: 'tooManyFacets',\n                info: {count: facetKeysCombinations.length, maxCount: MAX_FACETS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n        const groupingValues = grouping ? [grouping.value] : [];\n        let groupingKeys = grouping ? this.data.getColumnCategories(grouping.value) : ['null'];\n        if (groupingKeys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoHistogramGroups = {\n                type: 'tooManyHistogramGroups',\n                info: {count: groupingKeys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        if (groupingOrder) {\n            groupingKeys = intersection(groupingOrder, groupingKeys);\n        }\n\n        this.data.setGrouping([...facetGroupingValues, ...groupingValues]);\n        const histogramDataByFacets = createHistogramDataByFacets(this.data, facetKeysCombinations, groupingKeys, valueColumn, binsCount, chartSettings.xAxis.scale);\n\n        this.calculatedData = {\n            facetKeys: facetKeysCombinations.map(v => v.join(', ')),\n            facetKeysCombinations,\n            histogramDataByFacets,\n            legendInfo: getLegendInfo(this.data, grouping ? [grouping] : [], inheritedAes)\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {id, chartSettings, facetSettings, inheritedAes, layers, grouping, groupingDirection, groupingStack} = this.settings;\n        this.calculatedData.legendInfo = getLegendInfo(this.data, grouping ? [grouping] : [], inheritedAes);\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeysCombinations, //for titles, if facet by more than 1 column\n            this.calculatedData.histogramDataByFacets,\n            this.calculatedData.legendInfo,\n            layers,\n            inheritedAes,\n            grouping,\n            groupingStack,\n            groupingDirection,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["getLegendInfo","data","grouping","inheritedAes","res","column","categories","getValueLabel","category","labels","a","b","ChartHistogram","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","HistogramSettingsImpl","node","err","isErrorInfo","getUnknownErrorInfo","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","_b","l","_c","key","_d","prevData","prevKeys","keys","valueColumn","facetBy","binsCount","chartSettings","groupingOrder","facetKeysLists","facetKeysCombinations","getKeysCombinations","MAX_FACETS_COUNT","errorInfo","facetGroupingValues","groupingValues","groupingKeys","MAX_GROUPS_COUNT","intersection","histogramDataByFacets","createHistogramDataByFacets","v","id","facetSettings","layers","groupingDirection","groupingStack"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../src/histogram/index.ts"],"sourcesContent":["import {\n    intersection\n} from 'lodash';\nimport { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type { ErrorInfoHistogramGroups} from '../types';\nimport { type Category, type ColumnName, type ErrorInfoFacets, getUnknownErrorInfo, type HistogramEventHandlers, type HistogramSettings, isErrorInfo } from '../types';\nimport { getKeysCombinations } from '../utils/getKeysCombination';\nimport ChartRenderer from './ChartRenderer';\nimport type { HistogramLegendInfo } from './components/types';\nimport type { GroupedHistogramData } from './getHistogramData';\nimport { createHistogramDataByFacets } from './getHistogramData';\nimport { HistogramSettingsImpl } from './HistogramSettingsImpl';\nimport { MAX_FACETS_COUNT, MAX_GROUPS_COUNT } from '../constants';\nimport { getFacetLabels } from '../discrete/utils/getFacetLabels';\n\nfunction getLegendInfo(\n    data: DataFrame,\n    grouping: ColumnName[],\n    inheritedAes: HistogramSettingsImpl['inheritedAes']\n): HistogramLegendInfo {\n    return grouping.reduce((res: HistogramLegendInfo, column) => {\n        const categories = data.getColumnCategories(column.value, false);\n        const getValueLabel = (category: Category) => (column.valueLabels\n            ? String(data.getColumnValue(\n                column.valueLabels,\n                data.getColumnCategoryRowIndex(column.value, category)\n            ))\n            : category\n        );\n        const labels = categories.reduce((res: Record<string, string>, category) => {\n            res[category] = getValueLabel(category);\n            return res;\n        }, {});\n        res[column.value] = {\n            values: categories.sort((a, b) => labels[a].localeCompare(labels[b], 'en', {numeric: true})),\n            aesMap: inheritedAes[column.value],\n            labels,\n        };\n        return res;\n    }, {});\n}\n\nexport class ChartHistogram extends AbstractChart {\n    settings: HistogramSettingsImpl;\n    chartRenderer = new ChartRenderer();\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        histogramDataByFacets: Record<string, GroupedHistogramData>\n        legendInfo: HistogramLegendInfo;\n        facetLabels: Record<string, string[]>;\n    } | null = null;\n\n    constructor(data: DataFrame, settings: HistogramSettings, eventHandlers?: HistogramEventHandlers) {\n        super(data, settings);\n\n        this.settings = new HistogramSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers[0];\n        }\n    }\n\n    mount(node: HTMLElement) {\n        try {\n            this.chartRenderer.init(node);\n            this._updateData();\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    unmount() {\n        this.chartRenderer.clear();\n    }\n\n    updateSettingsAndData(data: DataFrame, settings: HistogramSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new HistogramSettingsImpl(settings);\n            this.data = data;\n            if (\n                this._needUpdateCalculatedDataBySettings(previousSettings, this.settings) ||\n                this._needUpdateCalculatedDataByData(previousData, this.data)\n            ) {\n                this._updateData();\n            } else {\n                this._updateAesInData();\n            }\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    updateChartState(_field: string, _value: unknown) {\n        console.warn('no chart state for histogram');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: HistogramSettingsImpl, settings: HistogramSettingsImpl) {\n        return (\n            prevSettings.valueColumn.value !== settings.valueColumn.value ||\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping?.value !== settings.grouping?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            prevSettings.binsCount !== settings.binsCount ||\n            prevSettings.chartSettings.xAxis.scale !== settings.chartSettings.xAxis.scale ||\n            prevSettings.groupingOrder?.some((key, idx) => key !== settings.groupingOrder?.[idx]) ||\n            settings.groupingOrder?.some((key, idx) => key !== prevSettings.groupingOrder?.[idx])\n        );\n    }\n\n    _needUpdateCalculatedDataByData(prevData: DataFrame, data: DataFrame) {\n        const prevKeys = Object.keys(prevData.data);\n        const keys = Object.keys(data.data);\n        return (\n            prevData.id !== data.id ||\n            prevKeys.length !== keys.length ||\n            prevKeys.some(key => prevData.data[key].length !== data.data[key]?.length)\n        );\n    }\n\n    _updateData() {\n        const {valueColumn, facetBy, grouping, binsCount, chartSettings, inheritedAes, groupingOrder} = this.settings;\n\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value));\n        const facetKeysCombinations = facetKeysLists.length ? getKeysCombinations([...facetKeysLists]) : [['null']];\n\n        if (facetKeysCombinations.length > MAX_FACETS_COUNT) {\n            const errorInfo: ErrorInfoFacets = {\n                type: 'tooManyFacets',\n                info: {count: facetKeysCombinations.length, maxCount: MAX_FACETS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n        const groupingValues = grouping ? [grouping.value] : [];\n        let groupingKeys = grouping ? this.data.getColumnCategories(grouping.value) : ['null'];\n        if (groupingKeys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoHistogramGroups = {\n                type: 'tooManyHistogramGroups',\n                info: {count: groupingKeys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        if (groupingOrder) {\n            groupingKeys = intersection(groupingOrder, groupingKeys);\n        }\n\n        this.data.setGrouping([...facetGroupingValues, ...groupingValues]);\n        const histogramDataByFacets = createHistogramDataByFacets(this.data, facetKeysCombinations, groupingKeys, valueColumn, binsCount, chartSettings.xAxis.scale);\n\n        const facetKeys = facetKeysCombinations.map(v => v.join(', '));\n        const facetLabels = getFacetLabels(this.data, facetBy, facetKeys, facetKeysCombinations);\n        this.calculatedData = {\n            facetKeys,\n            facetKeysCombinations,\n            facetLabels,\n            histogramDataByFacets,\n            legendInfo: getLegendInfo(this.data, grouping ? [grouping] : [], inheritedAes)\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {facetLabels} = this.calculatedData;\n        const {id, chartSettings, facetSettings, inheritedAes, layers, grouping, groupingDirection, groupingStack, facetBy} = this.settings;\n        this.calculatedData.legendInfo = getLegendInfo(this.data, grouping ? [grouping] : [], inheritedAes);\n\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeys.map(key => facetLabels[key]),\n            //for titles, if facet by more than 1 column\n            this.calculatedData.histogramDataByFacets,\n            this.calculatedData.legendInfo,\n            layers,\n            inheritedAes,\n            grouping,\n            groupingStack,\n            groupingDirection,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["getLegendInfo","data","grouping","inheritedAes","res","column","categories","getValueLabel","category","labels","a","b","ChartHistogram","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","HistogramSettingsImpl","node","err","isErrorInfo","getUnknownErrorInfo","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","_b","l","_c","key","_d","prevData","prevKeys","keys","valueColumn","facetBy","binsCount","chartSettings","groupingOrder","facetKeysLists","facetKeysCombinations","getKeysCombinations","MAX_FACETS_COUNT","errorInfo","facetGroupingValues","groupingValues","groupingKeys","MAX_GROUPS_COUNT","intersection","histogramDataByFacets","createHistogramDataByFacets","facetKeys","v","facetLabels","getFacetLabels","id","facetSettings","layers","groupingDirection","groupingStack"],"mappings":"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"}

package/dist/node_modules/.pnpm/scheduler@0.23.2/node_modules/scheduler/index.js

@@ -1,4 +1,4 @@
-import { __module as e } from "../../../../../_virtual/index10.js";
+import { __module as e } from "../../../../../_virtual/index5.js";
 import { __require as o } from "./cjs/scheduler.production.min.js";
 import { __require as u } from "./cjs/scheduler.development.js";
 var r;

package/dist/scatterplot/ScatterplotSettingsImpl.d.ts

@@ -45,6 +45,14 @@ export declare class ScatterplotSettingsImpl implements SettingsInterface {
         order?: DataValue[];
         inheritedAes?: AesRecord;
     }[];
+    readonly dotSize: {
+        columnName: ColumnName;
+        inheritedAes?: AesRecord;
+    }[];
+    readonly dotShape: {
+        columnName: ColumnName;
+        inheritedAes?: AesRecord;
+    }[];
     readonly label: ColumnName | null;
     readonly highlight: ColumnName | null;
     readonly chartSettings: {

package/dist/scatterplot/ScatterplotSettingsImpl.js

@@ -1,8 +1,8 @@
-var d = Object.defineProperty;
-var m = (t, e, r) => e in t ? d(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var o = (t, e, r) => m(t, typeof e != "symbol" ? e + "" : e, r);
+var u = Object.defineProperty;
+var m = (t, e, i) => e in t ? u(t, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : t[e] = i;
+var o = (t, e, i) => m(t, typeof e != "symbol" ? e + "" : e, i);
 import y from "../_virtual/lodash.js";
-import { DEFAULT_HEIGHT_SMALL as f, DEFAULT_HEIGHT as s, DEFAULT_WIDTH_SMALL as n, DEFAULT_WIDTH as S, BLACK as i } from "../constants.js";
+import { DEFAULT_HEIGHT_SMALL as S, DEFAULT_HEIGHT as f, DEFAULT_WIDTH_SMALL as s, DEFAULT_WIDTH as n, BLACK as h } from "../constants.js";
 import "../types/common.js";
 import "../types/discrete.js";
 import { ScatterplotSettingsSchema as x } from "../types/scatterplot.js";
@@ -15,7 +15,7 @@ class A {
   constructor(e) {
     o(this, "type", "dots");
     o(this, "aes", {
-      dotFill: i,
+      dotFill: h,
       dotShape: "21",
       dotSize: 3,
       opacity: 1
@@ -31,7 +31,7 @@ class L {
     o(this, "type", "curve");
     o(this, "smoothing");
     o(this, "aes", {
-      lineColor: i,
+      lineColor: h,
       lineWidth: 1,
       lineShape: "solid",
       opacity: 1
@@ -42,7 +42,7 @@ class L {
     };
   }
 }
-class F {
+class _ {
   constructor(e) {
     o(this, "id");
     o(this, "type", "scatterplot");
@@ -52,16 +52,18 @@ class F {
     o(this, "y");
     o(this, "facetBy");
     o(this, "grouping");
+    o(this, "dotSize");
+    o(this, "dotShape");
     o(this, "label");
     o(this, "highlight");
     o(this, "chartSettings");
     o(this, "trend");
     o(this, "layers");
-    var r, h, a, c, p, u;
-    x.parse(e), this.id = y.uniqueId("settings"), this.keyColumn = e.keyColumn, this.facetSettings = { sharedX: !0, sharedY: !0, titlePosition: "left", ...e.facetSettings }, this.x = e.x, this.y = e.y, this.facetBy = e.facetBy ?? [], this.grouping = e.grouping ?? [], this.label = e.label ?? null, this.highlight = e.highlight ?? null, this.chartSettings = {
+    var i, l, a, c, p, d;
+    x.parse(e), this.id = y.uniqueId("settings"), this.keyColumn = e.keyColumn, this.facetSettings = { sharedX: !0, sharedY: !0, titlePosition: "left", ...e.facetSettings }, this.x = e.x, this.y = e.y, this.facetBy = e.facetBy ?? [], this.grouping = e.grouping ?? [], this.dotSize = e.dotSize ?? [], this.dotShape = e.dotShape ?? [], this.label = e.label ?? null, this.highlight = e.highlight ?? null, this.chartSettings = {
       size: {
-        width: ((r = e == null ? void 0 : e.size) == null ? void 0 : r.width) ?? (this.facetBy.length ? n : S),
-        height: ((h = e == null ? void 0 : e.size) == null ? void 0 : h.height) ?? (this.facetBy.length ? f : s)
+        width: ((i = e == null ? void 0 : e.size) == null ? void 0 : i.width) ?? (this.facetBy.length ? s : n),
+        height: ((l = e == null ? void 0 : e.size) == null ? void 0 : l.height) ?? (this.facetBy.length ? S : f)
       },
       title: {
         position: "center",
@@ -91,23 +93,23 @@ class F {
       },
       tooltips: {
         ...e.tooltips,
-        show: ((p = e.tooltips) == null ? void 0 : p.show) !== !1 && (((u = e.tooltips) == null ? void 0 : u.content) ?? []).length > 0
+        show: ((p = e.tooltips) == null ? void 0 : p.show) !== !1 && (((d = e.tooltips) == null ? void 0 : d.content) ?? []).length > 0
       }
     }, this.trend = e != null && e.trend && this.chartSettings.xAxis.scale !== "discrete" && this.chartSettings.yAxis.scale !== "discrete" ? {
       bounded: e.trend.bounded ?? !1,
-      color: e.trend.color ?? i
-    } : null, this.layers = e.layers.map((l) => {
-      if (l.type === "dots")
-        return new A(l);
-      if (l.type === "curve")
-        return new L(l);
-      w(l, "Unknown layer type");
+      color: e.trend.color ?? h
+    } : null, this.layers = e.layers.map((r) => {
+      if (r.type === "dots")
+        return new A(r);
+      if (r.type === "curve")
+        return new L(r);
+      w(r, "Unknown layer type");
     }).filter(Boolean);
   }
 }
 export {
   L as CurveLayer,
   A as DotsLayer,
-  F as ScatterplotSettingsImpl
+  _ as ScatterplotSettingsImpl
 };
 //# sourceMappingURL=ScatterplotSettingsImpl.js.map

package/dist/scatterplot/ScatterplotSettingsImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScatterplotSettingsImpl.js","sources":["../../src/scatterplot/ScatterplotSettingsImpl.ts"],"sourcesContent":["import lodash from 'lodash';\nimport {BLACK, DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL} from '../constants';\nimport type {\n    AxisSettingsContinuous,\n    AxisSettingsDiscrete,\n    ColumnName,\n    ContinuousAesFromColumn,\n    DataValue,\n    FrameType,\n    InheritAesScatterplot,\n    LegendPosition,\n    LineShape,\n    CurveLayer as OuterCurveLayer,\n    DotsLayer as OuterDotsLayer,\n    PointShape,\n    ScatterplotSettings,\n    SettingsInterface,\n    TitlePosition,\n} from '../types';\nimport {type AesRecord, ScatterplotSettingsSchema} from '../types';\nimport {exhaustive} from '../utils';\n\nexport class DotsLayer {\n    readonly type = 'dots';\n    readonly aes: {\n        dotFill: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        dotShape: PointShape | InheritAesScatterplot;\n        dotSize: number | ContinuousAesFromColumn<number>;\n        opacity: number;\n    } = {\n        dotFill: BLACK,\n        dotShape: '21',\n        dotSize: 3,\n        opacity: 1,\n    };\n\n    constructor(layer: OuterDotsLayer) {\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport class CurveLayer {\n    readonly type = 'curve';\n    readonly smoothing: boolean;\n    readonly aes: {\n        lineColor: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        lineWidth: number;\n        lineShape: LineShape;\n        opacity: number;\n    } = {\n        lineColor: BLACK,\n        lineWidth: 1,\n        lineShape: 'solid',\n        opacity: 1,\n    };\n\n    constructor(layer: OuterCurveLayer) {\n        this.smoothing = layer.smoothing ?? false;\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport type ScatterplotLayer = DotsLayer | CurveLayer;\n\nexport type ScatterplotAxisSettings =\n    AxisSettingsDiscrete & {title: string | ColumnName}\n    | AxisSettingsContinuous & {title: string | ColumnName}\n\nexport class ScatterplotSettingsImpl implements SettingsInterface {\n    readonly id: string;\n    readonly type = 'scatterplot';\n    readonly keyColumn: ColumnName;\n    readonly facetSettings: {\n        sharedX: boolean;\n        sharedY: boolean;\n        nRows?: number;\n        nCols?: number;\n        titlePosition: 'left' | 'center' | 'right';\n    };\n    readonly x: ColumnName;\n    readonly y: ColumnName;\n    readonly facetBy: ColumnName[];\n    readonly grouping: {\n        columnName: ColumnName;\n        order?: DataValue[];\n        inheritedAes?: AesRecord;\n    }[];\n    readonly label: ColumnName | null;\n    readonly highlight: ColumnName | null;\n    readonly chartSettings: {\n        readonly size: {width: number; height: number};\n        readonly title: {name: string; show: boolean; position: TitlePosition};\n        readonly yAxis: ScatterplotAxisSettings;\n        readonly xAxis: ScatterplotAxisSettings;\n        readonly frame: {type: FrameType};\n        readonly legend: {show: boolean; position: LegendPosition};\n        readonly tooltips: {show: boolean; content?: ColumnName[]};\n    };\n\n    readonly trend: {\n        bounded: boolean;\n        color: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n    } | null;\n\n    readonly layers: ScatterplotLayer[];\n\n    constructor(settings: ScatterplotSettings) {\n        ScatterplotSettingsSchema.parse(settings);\n        this.id = lodash.uniqueId('settings');\n        this.keyColumn = settings.keyColumn;\n        this.facetSettings = {sharedX: true, sharedY: true, titlePosition: 'left', ...settings.facetSettings};\n        this.x = settings.x;\n        this.y = settings.y;\n        this.facetBy = settings.facetBy ?? [];\n        this.grouping = settings.grouping ?? [];\n        this.label = settings.label ?? null;\n        this.highlight = settings.highlight ?? null;\n        this.chartSettings = {\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            },\n            title: {\n                position: 'center',\n                show: true,\n                ...settings.title,\n                name: settings.title?.name ?? 'Chart',\n            },\n            yAxis: {\n                title: settings.y.label ?? settings.y.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.yAxis,\n            },\n            xAxis: {\n                title: settings.x.label ?? settings.x.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.xAxis,\n            },\n            frame: {type: settings.frame?.type ?? 'full'},\n            legend: {\n                show: true,\n                position: 'right',\n                ...settings.legend,\n            },\n            tooltips: {\n                ...settings.tooltips,\n                show: !(settings.tooltips?.show === false) && (settings.tooltips?.content ?? []).length > 0,\n            },\n        };\n\n        this.trend = settings?.trend && this.chartSettings.xAxis.scale !== 'discrete' && this.chartSettings.yAxis.scale !== 'discrete'\n            ? {\n                  bounded: settings.trend.bounded ?? false,\n                  color: settings.trend.color ?? BLACK,\n              }\n            : null;\n\n        this.layers = settings.layers\n            .map(layer => {\n                if (layer.type === 'dots') {\n                    return new DotsLayer(layer);\n                }\n                if (layer.type === 'curve') {\n                    return new CurveLayer(layer);\n                }\n                exhaustive(layer, 'Unknown layer type');\n            })\n            .filter(Boolean) as ScatterplotLayer[];\n    }\n}\n"],"names":["DotsLayer","layer","__publicField","BLACK","CurveLayer","ScatterplotSettingsImpl","settings","ScatterplotSettingsSchema","lodash","_a","DEFAULT_WIDTH_SMALL","DEFAULT_WIDTH","_b","DEFAULT_HEIGHT_SMALL","DEFAULT_HEIGHT","_c","_d","_e","_f","exhaustive"],"mappings":"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"}
+{"version":3,"file":"ScatterplotSettingsImpl.js","sources":["../../src/scatterplot/ScatterplotSettingsImpl.ts"],"sourcesContent":["import lodash from 'lodash';\nimport {BLACK, DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL} from '../constants';\nimport type {\n    AxisSettingsContinuous,\n    AxisSettingsDiscrete,\n    ColumnName,\n    ContinuousAesFromColumn,\n    DataValue,\n    FrameType,\n    InheritAesScatterplot,\n    LegendPosition,\n    LineShape,\n    CurveLayer as OuterCurveLayer,\n    DotsLayer as OuterDotsLayer,\n    PointShape,\n    ScatterplotSettings,\n    SettingsInterface,\n    TitlePosition,\n} from '../types';\nimport {type AesRecord, ScatterplotSettingsSchema} from '../types';\nimport {exhaustive} from '../utils';\n\nexport class DotsLayer {\n    readonly type = 'dots';\n    readonly aes: {\n        dotFill: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        dotShape: PointShape | InheritAesScatterplot;\n        dotSize: number | ContinuousAesFromColumn<number>;\n        opacity: number;\n    } = {\n        dotFill: BLACK,\n        dotShape: '21',\n        dotSize: 3,\n        opacity: 1,\n    };\n\n    constructor(layer: OuterDotsLayer) {\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport class CurveLayer {\n    readonly type = 'curve';\n    readonly smoothing: boolean;\n    readonly aes: {\n        lineColor: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        lineWidth: number;\n        lineShape: LineShape;\n        opacity: number;\n    } = {\n        lineColor: BLACK,\n        lineWidth: 1,\n        lineShape: 'solid',\n        opacity: 1,\n    };\n\n    constructor(layer: OuterCurveLayer) {\n        this.smoothing = layer.smoothing ?? false;\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport type ScatterplotLayer = DotsLayer | CurveLayer;\n\nexport type ScatterplotAxisSettings =\n    AxisSettingsDiscrete & {title: string | ColumnName}\n    | AxisSettingsContinuous & {title: string | ColumnName}\n\nexport class ScatterplotSettingsImpl implements SettingsInterface {\n    readonly id: string;\n    readonly type = 'scatterplot';\n    readonly keyColumn: ColumnName;\n    readonly facetSettings: {\n        sharedX: boolean;\n        sharedY: boolean;\n        nRows?: number;\n        nCols?: number;\n        titlePosition: 'left' | 'center' | 'right';\n    };\n    readonly x: ColumnName;\n    readonly y: ColumnName;\n    readonly facetBy: ColumnName[];\n    readonly grouping: {\n        columnName: ColumnName;\n        order?: DataValue[];\n        inheritedAes?: AesRecord;\n    }[];\n    readonly dotSize: {\n        columnName: ColumnName;\n        inheritedAes?: AesRecord;\n    }[];\n    readonly dotShape: {\n        columnName: ColumnName;\n        inheritedAes?: AesRecord;\n    }[];\n    readonly label: ColumnName | null;\n    readonly highlight: ColumnName | null;\n    readonly chartSettings: {\n        readonly size: {width: number; height: number};\n        readonly title: {name: string; show: boolean; position: TitlePosition};\n        readonly yAxis: ScatterplotAxisSettings;\n        readonly xAxis: ScatterplotAxisSettings;\n        readonly frame: {type: FrameType};\n        readonly legend: {show: boolean; position: LegendPosition};\n        readonly tooltips: {show: boolean; content?: ColumnName[]};\n    };\n\n    readonly trend: {\n        bounded: boolean;\n        color: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n    } | null;\n\n    readonly layers: ScatterplotLayer[];\n\n    constructor(settings: ScatterplotSettings) {\n        ScatterplotSettingsSchema.parse(settings);\n        this.id = lodash.uniqueId('settings');\n        this.keyColumn = settings.keyColumn;\n        this.facetSettings = {sharedX: true, sharedY: true, titlePosition: 'left', ...settings.facetSettings};\n        this.x = settings.x;\n        this.y = settings.y;\n        this.facetBy = settings.facetBy ?? [];\n        this.grouping = settings.grouping ?? [];\n        this.dotSize = settings.dotSize ?? [];\n        this.dotShape = settings.dotShape ?? [];\n        this.label = settings.label ?? null;\n        this.highlight = settings.highlight ?? null;\n        this.chartSettings = {\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            },\n            title: {\n                position: 'center',\n                show: true,\n                ...settings.title,\n                name: settings.title?.name ?? 'Chart',\n            },\n            yAxis: {\n                title: settings.y.label ?? settings.y.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.yAxis,\n            },\n            xAxis: {\n                title: settings.x.label ?? settings.x.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.xAxis,\n            },\n            frame: {type: settings.frame?.type ?? 'full'},\n            legend: {\n                show: true,\n                position: 'right',\n                ...settings.legend,\n            },\n            tooltips: {\n                ...settings.tooltips,\n                show: !(settings.tooltips?.show === false) && (settings.tooltips?.content ?? []).length > 0,\n            },\n        };\n\n        this.trend = settings?.trend && this.chartSettings.xAxis.scale !== 'discrete' && this.chartSettings.yAxis.scale !== 'discrete'\n            ? {\n                  bounded: settings.trend.bounded ?? false,\n                  color: settings.trend.color ?? BLACK,\n              }\n            : null;\n\n        this.layers = settings.layers\n            .map(layer => {\n                if (layer.type === 'dots') {\n                    return new DotsLayer(layer);\n                }\n                if (layer.type === 'curve') {\n                    return new CurveLayer(layer);\n                }\n                exhaustive(layer, 'Unknown layer type');\n            })\n            .filter(Boolean) as ScatterplotLayer[];\n    }\n}\n"],"names":["DotsLayer","layer","__publicField","BLACK","CurveLayer","ScatterplotSettingsImpl","settings","ScatterplotSettingsSchema","lodash","_a","DEFAULT_WIDTH_SMALL","DEFAULT_WIDTH","_b","DEFAULT_HEIGHT_SMALL","DEFAULT_HEIGHT","_c","_d","_e","_f","exhaustive"],"mappings":"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"}

package/dist/scatterplot/index.d.ts

@@ -19,6 +19,7 @@ export declare class ChartScatterplot extends AbstractChart {
         dotsByFacets: GroupedDots;
         facetKeys: string[];
         facetKeysCombinations: string[][];
+        facetLabels: Record<string, string[]>;
         trendsData: TrendsData | null;
         legendLabels: ScatterplotLegendInfo;
         layersData: Record<string, ScatterplotLayerData[]>;

package/dist/scatterplot/index.js

@@ -1,52 +1,53 @@
-var v = Object.defineProperty;
-var O = (l, h, t) => h in l ? v(l, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[h] = t;
-var m = (l, h, t) => O(l, typeof h != "symbol" ? h + "" : h, t);
-import { s as U } from "../_virtual/server.browser.js";
-import { AbstractChart as G } from "../AbstractChart.js";
-import { getUnknownErrorInfo as _, isErrorInfo as k } from "../types/common.js";
+var N = Object.defineProperty;
+var j = (l, c, t) => c in l ? N(l, c, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[c] = t;
+var C = (l, c, t) => j(l, typeof c != "symbol" ? c + "" : c, t);
+import { s as F } from "../_virtual/server.browser.js";
+import { AbstractChart as P } from "../AbstractChart.js";
+import { getUnknownErrorInfo as w, isErrorInfo as I } from "../types/common.js";
 import "../types/discrete.js";
 import "../types/scatterplot.js";
 import "../types/heatmap.js";
 import "../types/dendro.js";
 import "../types/histogram.js";
 import "../types/bubble.js";
-import { arraysAreDifferent as b } from "../utils/arraysAreDifferent.js";
-import { getKeysCombinations as S } from "../utils/getKeysCombination.js";
-import j from "./ChartRenderer.js";
-import { getDots as F } from "./dots.js";
-import { getLayersData as N } from "./getLayersData.js";
-import { getRegressionData as P } from "./linearRegression.js";
-import { ScatterplotSettingsImpl as w } from "./ScatterplotSettingsImpl.js";
-import { createLegendInfo as X, addPalettesToAesMapping as H } from "./utils/createLegendInfo.js";
-import { MAX_FACETS_COUNT as I, MAX_GROUPS_COUNT as x } from "../constants.js";
-function V(l) {
+import { arraysAreDifferent as S } from "../utils/arraysAreDifferent.js";
+import { getKeysCombinations as L } from "../utils/getKeysCombination.js";
+import X from "./ChartRenderer.js";
+import { getDots as z } from "./dots.js";
+import { getLayersData as H } from "./getLayersData.js";
+import { getRegressionData as V } from "./linearRegression.js";
+import { ScatterplotSettingsImpl as M } from "./ScatterplotSettingsImpl.js";
+import { createLegendInfo as Y, addPalettesToAesMapping as q } from "./utils/createLegendInfo.js";
+import { MAX_FACETS_COUNT as R, MAX_GROUPS_COUNT as E } from "../constants.js";
+import { getFacetLabels as J } from "../discrete/utils/getFacetLabels.js";
+function Q(l) {
   return typeof l == "object" && "type" in l && l.type === "grouping";
 }
-function R(l, h, t) {
-  if (h.scale === "discrete") {
-    const e = h.keys ? h.keys : l.getColumnCategories(t.value);
-    return { keys: e, labels: e.reduce((a, s) => {
-      const i = (h.labels ?? {})[s] ?? (t.valueLabels ? l.getColumnValue(t.valueLabels, l.getColumnCategoryRowIndex(t.value, s)) : s);
-      return a[s] = String(i), a;
+function B(l, c, t) {
+  if (c.scale === "discrete") {
+    const e = c.keys ? c.keys : l.getColumnCategories(t.value);
+    return { keys: e, labels: e.reduce((a, o) => {
+      const h = (c.labels ?? {})[o] ?? (t.valueLabels ? l.getColumnValue(t.valueLabels, l.getColumnCategoryRowIndex(t.value, o)) : o);
+      return a[o] = String(h), a;
     }, {}) };
   }
   return { keys: [], labels: {} };
 }
-class ut extends G {
+class mt extends P {
   constructor(t, e, a) {
     super(t, e);
-    m(this, "settings");
-    m(this, "chartRenderer");
-    m(this, "onTooltipHintSwitch", () => {
+    C(this, "settings");
+    C(this, "chartRenderer");
+    C(this, "onTooltipHintSwitch", () => {
     });
-    m(this, "calculatedData", null);
-    this.chartRenderer = new j(), this.settings = new w(e), a && (this.onTooltipHintSwitch = a.onTooltipHintSwitch);
+    C(this, "calculatedData", null);
+    this.chartRenderer = new X(), this.settings = new M(e), a && (this.onTooltipHintSwitch = a.onTooltipHintSwitch);
   }
   mount(t) {
     try {
       this.chartRenderer.init(t), this._updateData(), this._updateChart(), this.hasError = !1, this.errorInfo = null;
     } catch (e) {
-      this.hasError = !0, e instanceof Error && (this.errorInfo = k(e.cause) ? e.cause : _(e), this.chartRenderer.renderError(e.message), console.error(e));
+      this.hasError = !0, e instanceof Error && (this.errorInfo = I(e.cause) ? e.cause : w(e), this.chartRenderer.renderError(e.message), console.error(e));
     }
   }
   unmount() {
@@ -54,126 +55,127 @@ class ut extends G {
   }
   updateSettingsAndData(t, e) {
     try {
-      const a = this.settings, s = this.data;
-      this.settings = new w(e), this.data = t, this._needUpdateCalculatedDataBySettings(a, this.settings) || this._needUpdateCalculatedDataByData(s, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart(), this.hasError = !1, this.errorInfo = null;
+      const a = this.settings, o = this.data;
+      this.settings = new M(e), this.data = t, this._needUpdateCalculatedDataBySettings(a, this.settings) || this._needUpdateCalculatedDataByData(o, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart(), this.hasError = !1, this.errorInfo = null;
     } catch (a) {
-      this.hasError = !0, console.error(a), a instanceof Error && (this.errorInfo = k(a.cause) ? a.cause : _(a), this.chartRenderer.renderError(a.message), console.error(a));
+      this.hasError = !0, console.error(a), a instanceof Error && (this.errorInfo = I(a.cause) ? a.cause : w(a), this.chartRenderer.renderError(a.message), console.error(a));
     }
   }
   updateChartState(t, e) {
     console.warn("no chart state for scatterplot");
   }
   export() {
-    return this._updateChart(), U.renderToString(this.chartRenderer.component);
+    return this._updateChart(), F.renderToString(this.chartRenderer.component);
   }
   _needUpdateCalculatedDataBySettings(t, e) {
-    var a, s, u, i;
-    return t.facetBy.some((o, n) => {
-      var c;
-      return o.value !== ((c = e.facetBy[n]) == null ? void 0 : c.value);
-    }) || t.grouping.length !== e.grouping.length || b(
-      t.grouping.map((o) => o.columnName.value),
-      e.grouping.map((o) => o.columnName.value)
-    ) || t.grouping.some((o, n) => {
-      var c;
-      return b(o.order, (c = e.grouping) == null ? void 0 : c[n].order);
-    }) || b(t.chartSettings.xAxis.keys, e.chartSettings.xAxis.keys) || b(t.chartSettings.yAxis.keys, e.chartSettings.yAxis.keys) || (((a = t.label) == null ? void 0 : a.value) || ((s = e.label) == null ? void 0 : s.value)) && ((u = t.label) == null ? void 0 : u.value) !== ((i = e.label) == null ? void 0 : i.value) || t.layers.length !== e.layers.length || t.layers.some((o, n) => o.type !== e.layers[n].type) || !!t.trend != !!e.trend;
+    var a, o, u, h;
+    return t.facetBy.some((n, i) => {
+      var p;
+      return n.value !== ((p = e.facetBy[i]) == null ? void 0 : p.value);
+    }) || t.grouping.length !== e.grouping.length || S(
+      t.grouping.map((n) => n.columnName.value),
+      e.grouping.map((n) => n.columnName.value)
+    ) || t.grouping.some((n, i) => {
+      var p;
+      return S(n.order, (p = e.grouping) == null ? void 0 : p[i].order);
+    }) || S(t.chartSettings.xAxis.keys, e.chartSettings.xAxis.keys) || S(t.chartSettings.yAxis.keys, e.chartSettings.yAxis.keys) || (((a = t.label) == null ? void 0 : a.value) || ((o = e.label) == null ? void 0 : o.value)) && ((u = t.label) == null ? void 0 : u.value) !== ((h = e.label) == null ? void 0 : h.value) || t.layers.length !== e.layers.length || t.layers.some((n, i) => n.type !== e.layers[i].type) || !!t.trend != !!e.trend;
   }
   _needUpdateCalculatedDataByData(t, e) {
-    const a = Object.keys(t.data), s = Object.keys(e.data);
-    return t.id !== e.id || a.length !== s.length || a.some((u) => {
-      var i;
-      return t.data[u].length !== ((i = e.data[u]) == null ? void 0 : i.length);
+    const a = Object.keys(t.data), o = Object.keys(e.data);
+    return t.id !== e.id || a.length !== o.length || a.some((u) => {
+      var h;
+      return t.data[u].length !== ((h = e.data[u]) == null ? void 0 : h.length);
     });
   }
   _updateData() {
-    const { x: t, y: e, facetBy: a, grouping: s, trend: u, layers: i, label: o, highlight: n, chartSettings: c } = this.settings, p = a.map((r) => this.data.getColumnCategories(r.value)).filter((r) => r.length > 0), g = s.map(({ columnName: r }) => this.data.getColumnCategories(r.value)).filter((r) => r.length > 0), y = p.length ? S(p) : [["null"]], d = g.length ? S(g) : [["null"]], B = a.map((r) => r.value) ?? null;
-    this.data.setGrouping([...B]);
-    const L = {
+    const { x: t, y: e, facetBy: a, grouping: o, dotSize: u, dotShape: h, trend: n, layers: i, label: p, highlight: d, chartSettings: s } = this.settings, m = a.map((r) => this.data.getColumnCategories(r.value)).filter((r) => r.length > 0), D = o.map(({ columnName: r }) => this.data.getColumnCategories(r.value)).filter((r) => r.length > 0), g = m.length ? L(m) : [["null"]], b = D.length ? L(D) : [["null"]], y = a.map((r) => r.value) ?? null;
+    this.data.setGrouping([...y]);
+    const K = {
       x: this.data.getColumn(t.value).every((r) => r === null || !(Number(r) < 0)),
       y: this.data.getColumn(e.value).every((r) => r === null || !(Number(r) < 0))
-    }, E = s.map((r) => r.columnName), D = F(this.data, y, t, e, o, n, s, c.xAxis, c.yAxis, i.find((r) => r.type === "dots")), f = Object.keys(D);
-    if (f.length > I) {
+    }, k = o.map((r) => r.columnName), A = z(this.data, g, t, e, p, d, o, s.xAxis, s.yAxis, i.find((r) => r.type === "dots")), f = Object.keys(A);
+    if (f.length > R) {
       const r = {
         type: "tooManyFacets",
-        info: { count: f.length, maxCount: I }
+        info: { count: f.length, maxCount: R }
       };
       throw Error(r.type, { cause: r });
     }
-    const M = P(this.data, D, f, d, E, u), C = R(this.data, c.xAxis, t), A = R(this.data, c.yAxis, e);
-    if (C.keys.length > x) {
+    const T = V(this.data, A, f, b, k, n), x = B(this.data, s.xAxis, t), _ = B(this.data, s.yAxis, e);
+    if (x.keys.length > E) {
       const r = {
         type: "tooManyScatterplotGroupsX",
-        info: { count: C.keys.length, maxCount: x }
+        info: { count: x.keys.length, maxCount: E }
       };
       throw Error(r.type, { cause: r });
     }
-    if (A.keys.length > x) {
+    if (_.keys.length > E) {
       const r = {
         type: "tooManyScatterplotGroupsY",
-        info: { count: A.keys.length, maxCount: x }
+        info: { count: _.keys.length, maxCount: E }
       };
       throw Error(r.type, { cause: r });
     }
-    const K = X(this.data, s, i), T = N(this.data, i, f, D, d, E, c.xAxis, C);
+    const v = [...o, ...u, ...h], O = Y(this.data, v, i), U = H(this.data, i, f, A, b, k, s.xAxis, x), G = J(this.data, a, f, g);
     this.calculatedData = {
-      onlyPositive: L,
-      dotsByFacets: D,
+      onlyPositive: K,
+      dotsByFacets: A,
       facetKeys: f,
-      facetKeysCombinations: y,
-      trendsData: M,
-      legendLabels: K,
-      layersData: T,
-      discreteAxisDataX: C,
-      discreteAxisDataY: A
+      facetKeysCombinations: g,
+      facetLabels: G,
+      trendsData: T,
+      legendLabels: O,
+      layersData: U,
+      discreteAxisDataX: x,
+      discreteAxisDataY: _
     };
   }
   _updateAesInData() {
     const t = this.calculatedData;
     if (!t)
       return;
-    const { grouping: e, trend: a, layers: s } = this.settings, { facetKeys: u, trendsData: i } = t;
-    u.forEach((o) => {
-      for (let n = 0; n < s.length; n++)
-        t.layersData[o][n].info = s[n];
-    }), e.forEach(({ columnName: o, inheritedAes: n }) => {
-      const c = /* @__PURE__ */ new Set(), p = {};
-      s.forEach((g) => {
-        g.aes && Object.entries(g.aes).forEach(([y, d]) => {
-          V(d) && d.value === o.value && (c.add(y), d.palette && (p[y] = d.palette));
+    const { grouping: e, trend: a, layers: o, dotSize: u, dotShape: h } = this.settings, { facetKeys: n, trendsData: i } = t;
+    n.forEach((d) => {
+      for (let s = 0; s < o.length; s++)
+        t.layersData[d][s].info = o[s];
+    }), [...e, ...u, ...h].forEach(({ columnName: d, inheritedAes: s }) => {
+      const m = /* @__PURE__ */ new Set(), D = {};
+      o.forEach((g) => {
+        g.aes && Object.entries(g.aes).forEach(([b, y]) => {
+          Q(y) && y.value === d.value && (m.add(b), y.palette && (D[b] = y.palette));
         });
-      }), t.legendLabels[o.value].usedAes = [...c], t.legendLabels[o.value].aesMap = H(
-        o,
-        p,
-        n
+      }), t.legendLabels[d.value].usedAes = [...m], t.legendLabels[d.value].aesMap = q(
+        d,
+        D,
+        s
       );
-    }), i && a && Object.keys(i).forEach((o) => {
-      i[o].forEach((n) => {
-        n.color = a.color, n.bounded = a.bounded;
+    }), i && a && Object.keys(i).forEach((d) => {
+      i[d].forEach((s) => {
+        s.color = a.color, s.bounded = a.bounded;
       });
     });
   }
   _updateChart() {
     if (!this.calculatedData)
       return;
-    const { id: t, chartSettings: e, facetSettings: a, grouping: s, keyColumn: u, layers: i, trend: o } = this.settings;
+    const { facetLabels: t } = this.calculatedData, { id: e, chartSettings: a, facetSettings: o, grouping: u, dotSize: h, dotShape: n, keyColumn: i, layers: p, trend: d } = this.settings;
     this.chartRenderer.render(
       this.data,
-      t,
       e,
       a,
+      o,
       this.calculatedData.facetKeys,
-      this.calculatedData.facetKeysCombinations,
+      this.calculatedData.facetKeys.map((s) => t[s]),
       //for titles, if facet by more than 1 column
       this.calculatedData.dotsByFacets,
       this.calculatedData.trendsData,
-      u,
+      i,
       this.calculatedData.onlyPositive,
       this.calculatedData.legendLabels,
       this.calculatedData.layersData,
-      s.map((n) => n.columnName),
-      i,
-      o,
+      [...u.map((s) => s.columnName), ...h.map((s) => s.columnName), ...n.map((s) => s.columnName)],
+      p,
+      d,
       this.calculatedData.discreteAxisDataX,
       this.calculatedData.discreteAxisDataY,
       this.onTooltipHintSwitch
@@ -181,6 +183,6 @@ class ut extends G {
   }
 }
 export {
-  ut as ChartScatterplot
+  mt as ChartScatterplot
 };
 //# sourceMappingURL=index.js.map