@milaboratories/miplots4 1.0.131 → 1.0.133

package/dist/scatterplot/getLayersData.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLayersData.js","sources":["../../src/scatterplot/getLayersData.ts"],"sourcesContent":["import type { DataFrame } from '../DataFrame';\nimport type { ColumnName, ScatterplotLayer } from '../types';\nimport { exhaustive } from '../utils';\nimport type { Dot, GroupedDots } from './dots';\nimport type { CurveLayer, DotsLayer } from './ScatterplotSettingsImpl';\n\nexport type DotsLayerData  = {\n    type: 'dots',\n    info: DotsLayer,\n    geoms: Dot[]\n}\n\nexport type CurveData = {\n    dots: Dot[],\n}\nexport type CurveLayerData  = {\n    type: 'curve',\n    info: CurveLayer,\n    geoms: CurveData[]\n}\n\nexport type ScatterplotLayerData = DotsLayerData | CurveLayerData;\n\nexport function getLayersData(\n    dataFrame: DataFrame,\n    layers: ScatterplotLayer[],\n    facetKeys: string[],\n    dotsByFacets: GroupedDots,\n    categoryGroupingCombinations: string[][],\n    grouping: ColumnName[]\n): Record<string, ScatterplotLayerData[]> {\n    return facetKeys.reduce((res:Record<string, ScatterplotLayerData[]>, key) => {\n        const facetDots = dotsByFacets[key].dots;\n        res[key] = layers.map(layer => {\n            if (layer.type === 'curve') {\n                return {\n                    type: 'curve',\n                    info: layer,\n                    geoms: categoryGroupingCombinations.map(values => {\n                        const dots = facetDots.filter(dot =>\n                            grouping.every((column, idx) => String(dataFrame.getColumnValue(column.value, dot.idx)) === values[idx])\n                        );\n                        return {dots};\n                    }).filter(item => item.dots.length > 0)\n                } as CurveLayerData;\n            }\n            if (layer.type === 'dots') {\n                return {\n                    type: 'dots',\n                    info: layer,\n                    geoms: facetDots,\n                } as DotsLayerData;\n            }\n            exhaustive(layer, 'Unknown scatterplot layer type');\n        });\n        return res;\n    }, {});\n}\n"],"names":["getLayersData","dataFrame","layers","facetKeys","dotsByFacets","categoryGroupingCombinations","grouping","res","key","facetDots","layer","values","column","idx","dot","item","exhaustive"],"mappings":";AAuBO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACAC,GACsC;AACtC,SAAOH,EAAU,OAAO,CAACI,GAA4CC,MAAQ;AACzE,UAAMC,IAAYL,EAAaI,CAAG,EAAE;AACpC,WAAAD,EAAIC,CAAG,IAAIN,EAAO,IAAI,CAAAQ,MAAS;AAC3B,UAAIA,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAA,UACN,OAAOL,EAA6B,IAAI,CAAAM,OAI7B,EAAC,MAHKF,EAAU;AAAA,YAAO,OAC1BH,EAAS,MAAM,CAACM,GAAQC,MAAQ,OAAOZ,EAAU,eAAeW,EAAO,OAAOE,EAAI,GAAG,CAAC,MAAMH,EAAOE,CAAG,CAAC;AAAA,UAAA,EAEnG,EACX,EAAE,OAAO,OAAQE,EAAK,KAAK,SAAS,CAAC;AAAA,QAAA;AAG9C,UAAIL,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAA,UACN,OAAOD;AAAA,QAAA;AAGf,MAAAO,EAAWN,GAAO,gCAAgC;AAAA,IACtD,CAAC,GACMH;AAAA,EACX,GAAG,CAAA,CAAE;AACT;"}
+{"version":3,"file":"getLayersData.js","sources":["../../src/scatterplot/getLayersData.ts"],"sourcesContent":["import type { DataFrame } from '../DataFrame';\nimport type { ColumnName, ScatterplotLayer } from '../types';\nimport { exhaustive } from '../utils';\nimport type { Dot, GroupedDots } from './dots';\nimport type { CurveLayer, DotsLayer } from './ScatterplotSettingsImpl';\n\nexport type DotsLayerData  = {\n    type: 'dots',\n    info: DotsLayer,\n    geoms: Dot[]\n}\n\nexport type CurveData = {\n    dots: Dot[],\n}\nexport type CurveLayerData  = {\n    type: 'curve',\n    info: CurveLayer,\n    geoms: CurveData[]\n}\n\nexport type ScatterplotLayerData = DotsLayerData | CurveLayerData;\n\nexport function getLayersData(\n    dataFrame: DataFrame,\n    layers: ScatterplotLayer[],\n    facetKeys: string[],\n    dotsByFacets: GroupedDots,\n    categoryGroupingCombinations: string[][],\n    grouping: ColumnName[]\n): Record<string, ScatterplotLayerData[]> {\n    return facetKeys.reduce((res:Record<string, ScatterplotLayerData[]>, key) => {\n        const facetDots = dotsByFacets[key].dots;\n        res[key] = layers.map(layer => {\n            if (layer.type === 'curve') {\n                return {\n                    type: 'curve',\n                    info: layer,\n                    geoms: categoryGroupingCombinations.map(values => {\n                        const dots = facetDots.filter(dot =>\n                            grouping.every((column, idx) => String(dataFrame.getColumnValue(column.value, dot.idx)) === values[idx])\n                        );\n                        dots.sort((d1, d2) => d1.x - d2.x);\n                        return {dots};\n                    }).filter(item => item.dots.length > 0)\n                } as CurveLayerData;\n            }\n            if (layer.type === 'dots') {\n                return {\n                    type: 'dots',\n                    info: layer,\n                    geoms: facetDots,\n                } as DotsLayerData;\n            }\n            exhaustive(layer, 'Unknown scatterplot layer type');\n        });\n        return res;\n    }, {});\n}\n"],"names":["getLayersData","dataFrame","layers","facetKeys","dotsByFacets","categoryGroupingCombinations","grouping","res","key","facetDots","layer","values","dots","column","idx","dot","d1","d2","item","exhaustive"],"mappings":";AAuBO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACAC,GACsC;AACtC,SAAOH,EAAU,OAAO,CAACI,GAA4CC,MAAQ;AACzE,UAAMC,IAAYL,EAAaI,CAAG,EAAE;AACpC,WAAAD,EAAIC,CAAG,IAAIN,EAAO,IAAI,CAAAQ,MAAS;AAC3B,UAAIA,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAA,UACN,OAAOL,EAA6B,IAAI,CAAAM,MAAU;AAC9C,kBAAMC,IAAOH,EAAU;AAAA,cAAO,OAC1BH,EAAS,MAAM,CAACO,GAAQC,MAAQ,OAAOb,EAAU,eAAeY,EAAO,OAAOE,EAAI,GAAG,CAAC,MAAMJ,EAAOG,CAAG,CAAC;AAAA,YAAA;AAE3G,mBAAAF,EAAK,KAAK,CAACI,GAAIC,MAAOD,EAAG,IAAIC,EAAG,CAAC,GAC1B,EAAC,MAAAL,EAAA;AAAA,UACZ,CAAC,EAAE,OAAO,OAAQM,EAAK,KAAK,SAAS,CAAC;AAAA,QAAA;AAG9C,UAAIR,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAA,UACN,OAAOD;AAAA,QAAA;AAGf,MAAAU,EAAWT,GAAO,gCAAgC;AAAA,IACtD,CAAC,GACMH;AAAA,EACX,GAAG,CAAA,CAAE;AACT;"}

package/dist/scatterplot/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/scatterplot/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAIR,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACtB,MAAM,UAAU,CAAC;AAClB,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAuBpE,qBAAa,gBAAiB,SAAQ,aAAa;IAC/C,QAAQ,EAAE,uBAAuB,CAAC;IAClC,aAAa,EAAE,aAAa,CAAC;IAE7B,mBAAmB,EAAE,CAAC,CAAC,EAAC,OAAO,KAAK,IAAI,CAAmB;IAC3D,cAAc,EAAE;QACZ,YAAY,EAAE;YAAC,CAAC,EAAE,OAAO,CAAC;YAAC,CAAC,EAAE,OAAO,CAAA;SAAC,CAAC;QACvC,YAAY,EAAE,WAAW,CAAC;QAC1B,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,qBAAqB,EAAE,MAAM,EAAE,EAAE,CAAC;QAClC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;QAC9B,YAAY,EAAE,qBAAqB,CAAC;QACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;KACtD,GAAG,IAAI,CAAQ;gBAEJ,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,EAAC,wBAAwB;IAUnG,KAAK,CAAC,IAAI,EAAE,WAAW;IAcvB,OAAO;IAIP,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,mBAAmB;IAwBpE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,MAAM,IAAI,MAAM;IAKhB,mCAAmC,CAAC,YAAY,EAAE,uBAAuB,EAAE,QAAQ,EAAE,uBAAuB;IAY5G,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAUpE,WAAW;IA4CX,gBAAgB;IA8ChB,YAAY;CAwBf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/scatterplot/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAIR,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACtB,MAAM,UAAU,CAAC;AAGlB,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE1C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAE5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAOpE,qBAAa,gBAAiB,SAAQ,aAAa;IAC/C,QAAQ,EAAE,uBAAuB,CAAC;IAClC,aAAa,EAAE,aAAa,CAAC;IAE7B,mBAAmB,EAAE,CAAC,CAAC,EAAC,OAAO,KAAK,IAAI,CAAmB;IAC3D,cAAc,EAAE;QACZ,YAAY,EAAE;YAAC,CAAC,EAAE,OAAO,CAAC;YAAC,CAAC,EAAE,OAAO,CAAA;SAAC,CAAC;QACvC,YAAY,EAAE,WAAW,CAAC;QAC1B,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,qBAAqB,EAAE,MAAM,EAAE,EAAE,CAAC;QAClC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;QAC9B,YAAY,EAAE,qBAAqB,CAAC;QACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;KACtD,GAAG,IAAI,CAAQ;gBAEJ,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,EAAC,wBAAwB;IAUnG,KAAK,CAAC,IAAI,EAAE,WAAW;IAgBvB,OAAO;IAIP,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,mBAAmB;IA0BpE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,MAAM,IAAI,MAAM;IAKhB,mCAAmC,CAAC,YAAY,EAAE,uBAAuB,EAAE,QAAQ,EAAE,uBAAuB;IAgB5G,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAUpE,WAAW;IA4CX,gBAAgB;IA8ChB,YAAY;CAwBf"}

package/dist/scatterplot/index.js

@@ -1,43 +1,34 @@
 var K = Object.defineProperty;
-var S = (l, c, t) => c in l ? K(l, c, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[c] = t;
-var p = (l, c, t) => S(l, typeof c != "symbol" ? c + "" : c, t);
+var v = (h, d, t) => d in h ? K(h, d, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[d] = t;
+var f = (h, d, t) => v(h, typeof d != "symbol" ? d + "" : d, t);
 import { renderToString as L } from "../node_modules/react-dom/server.browser.js";
-import { AbstractChart as j } from "../AbstractChart.js";
-import x from "./ChartRenderer.js";
+import { AbstractChart as S } from "../AbstractChart.js";
+import { arraysAreDifferent as C } from "../utils/arraysAreDifferent.js";
+import { getKeysCombinations as _ } from "../utils/getKeysCombination.js";
+import j from "./ChartRenderer.js";
 import { getDots as T } from "./dots.js";
-import { getLayersData as k } from "./getLayersData.js";
+import { getLayersData as x } from "./getLayersData.js";
 import { getRegressionData as O } from "./linearRegression.js";
-import { ScatterplotSettingsImpl as _ } from "./ScatterplotSettingsImpl.js";
-import { createLegendInfo as G, addPalettesToAesMapping as I } from "./utils/createLegendInfo.js";
-function v(l) {
-  if (!l.length)
-    return [];
-  let c = [[]];
-  return l.forEach((t) => {
-    const e = [];
-    t.forEach((a) => {
-      e.push(...c.map((r) => [...r, a]));
-    }), c = e;
-  }), c;
+import { ScatterplotSettingsImpl as E } from "./ScatterplotSettingsImpl.js";
+import { createLegendInfo as k, addPalettesToAesMapping as G } from "./utils/createLegendInfo.js";
+function I(h) {
+  return typeof h == "object" && "type" in h && h.type === "grouping";
 }
-function P(l) {
-  return typeof l == "object" && "type" in l && l.type === "grouping";
-}
-class Q extends j {
+class W extends S {
   constructor(t, e, a) {
     super(t, e);
-    p(this, "settings");
-    p(this, "chartRenderer");
-    p(this, "onTooltipHintSwitch", () => {
+    f(this, "settings");
+    f(this, "chartRenderer");
+    f(this, "onTooltipHintSwitch", () => {
     });
-    p(this, "calculatedData", null);
-    this.chartRenderer = new x(), this.settings = new _(e), a && (this.onTooltipHintSwitch = a.onTooltipHintSwitch);
+    f(this, "calculatedData", null);
+    this.chartRenderer = new j(), this.settings = new E(e), a && (this.onTooltipHintSwitch = a.onTooltipHintSwitch);
   }
   mount(t) {
     try {
-      this.chartRenderer.init(t), this._updateData(), this._updateChart();
+      this.chartRenderer.init(t), this._updateData(), this._updateChart(), this.hasError = !1;
     } catch (e) {
-      console.error(e), e instanceof Error && (this.chartRenderer.renderError(e.message), console.error(e));
+      this.hasError = !0, console.error(e), e instanceof Error && (this.chartRenderer.renderError(e.message), console.error(e));
     }
   }
   unmount() {
@@ -45,10 +36,10 @@ class Q extends j {
   }
   updateSettingsAndData(t, e) {
     try {
-      const a = this.settings, r = this.data;
-      this.settings = new _(e), this.data = t, this._needUpdateCalculatedDataBySettings(a, this.settings) || this._needUpdateCalculatedDataByData(r, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart();
+      const a = this.settings, o = this.data;
+      this.settings = new E(e), this.data = t, this._needUpdateCalculatedDataBySettings(a, this.settings) || this._needUpdateCalculatedDataByData(o, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart(), this.hasError = !1;
     } catch (a) {
-      console.error(a), a instanceof Error && (this.chartRenderer.renderError(a.message), console.error(a));
+      this.hasError = !0, console.error(a), a instanceof Error && (this.chartRenderer.renderError(a.message), console.error(a));
     }
   }
   updateChartState(t, e) {
@@ -58,60 +49,63 @@ class Q extends j {
     return this._updateChart(), L(this.chartRenderer.component);
   }
   _needUpdateCalculatedDataBySettings(t, e) {
-    var a, r, h, d;
-    return t.facetBy.some((i, n) => {
-      var s;
-      return i.value !== ((s = e.facetBy[n]) == null ? void 0 : s.value);
-    }) || t.grouping.length !== e.grouping.length || t.grouping.some((i, n) => {
-      var s;
-      return i.value !== ((s = e.grouping[n]) == null ? void 0 : s.value);
-    }) || (((a = t.label) == null ? void 0 : a.value) || ((r = e.label) == null ? void 0 : r.value)) && ((h = t.label) == null ? void 0 : h.value) !== ((d = e.label) == null ? void 0 : d.value) || t.layers.length !== e.layers.length || t.layers.some((i, n) => i.type !== e.layers[n].type) || !!t.trend != !!e.trend;
+    var a, o, l, i;
+    return t.facetBy.some((r, s) => {
+      var c;
+      return r.value !== ((c = e.facetBy[s]) == null ? void 0 : c.value);
+    }) || t.grouping.length !== e.grouping.length || C(
+      t.grouping.map((r) => r.columnName.value),
+      e.grouping.map((r) => r.columnName.value)
+    ) || t.grouping.some((r, s) => {
+      var c;
+      return C(r.order, (c = e.grouping) == null ? void 0 : c[s].order);
+    }) || (((a = t.label) == null ? void 0 : a.value) || ((o = e.label) == null ? void 0 : o.value)) && ((l = t.label) == null ? void 0 : l.value) !== ((i = e.label) == null ? void 0 : i.value) || t.layers.length !== e.layers.length || t.layers.some((r, s) => r.type !== e.layers[s].type) || !!t.trend != !!e.trend;
   }
   _needUpdateCalculatedDataByData(t, e) {
-    const a = Object.keys(t.data), r = Object.keys(e.data);
-    return t.id !== e.id || a.length !== r.length || a.some((h) => {
-      var d;
-      return t.data[h].length !== ((d = e.data[h]) == null ? void 0 : d.length);
+    const a = Object.keys(t.data), o = Object.keys(e.data);
+    return t.id !== e.id || a.length !== o.length || a.some((l) => {
+      var i;
+      return t.data[l].length !== ((i = e.data[l]) == null ? void 0 : i.length);
     });
   }
   _updateData() {
-    const { x: t, y: e, facetBy: a, grouping: r, keyColumn: h, trend: d, layers: i, inheritedAes: n, label: s, highlight: f } = this.settings, y = this.data.getColumnCategories(h.value), g = a.map((o) => this.data.getColumnCategories(o.value)).filter((o) => o.length > 0), u = r.map((o) => this.data.getColumnCategories(o.value)).filter((o) => o.length > 0), C = g.length ? v(g) : [["null"]], b = u.length ? v(u) : [["null"]], E = a.map((o) => o.value) ?? null;
-    this.data.setGrouping([...E, h.value]);
+    const { x: t, y: e, facetBy: a, grouping: o, trend: l, layers: i, label: r, highlight: s } = this.settings, c = a.map((n) => this.data.getColumnCategories(n.value)).filter((n) => n.length > 0), p = o.map(({ columnName: n }) => this.data.getColumnCategories(n.value)).filter((n) => n.length > 0), g = c.length ? _(c) : [["null"]], m = p.length ? _(p) : [["null"]], u = a.map((n) => n.value) ?? null;
+    this.data.setGrouping([...u]);
     const B = {
-      x: this.data.getColumn(t.value).every((o) => o === null || !(Number(o) < 0)),
-      y: this.data.getColumn(e.value).every((o) => o === null || !(Number(o) < 0))
-    }, m = T(this.data, C, t, e, s, f, y), D = Object.keys(m), R = O(this.data, m, D, b, r, d), A = G(this.data, r, i, n), w = k(this.data, i, D, m, b, r);
+      x: this.data.getColumn(t.value).every((n) => n === null || !(Number(n) < 0)),
+      y: this.data.getColumn(e.value).every((n) => n === null || !(Number(n) < 0))
+    }, b = o.map((n) => n.columnName), y = T(this.data, g, t, e, r, s, o), D = Object.keys(y), R = O(this.data, y, D, m, b, l), w = k(this.data, o, i), A = x(this.data, i, D, y, m, b);
     this.calculatedData = {
       onlyPositive: B,
-      dotsByFacets: m,
+      dotsByFacets: y,
       facetKeys: D,
-      facetKeysCombinations: C,
+      facetKeysCombinations: g,
       trendsData: R,
-      legendLabels: A,
-      layersData: w
+      legendLabels: w,
+      layersData: A
     };
   }
   _updateAesInData() {
     const t = this.calculatedData;
     if (!t)
       return;
-    const { grouping: e, trend: a, layers: r, inheritedAes: h } = this.settings, { facetKeys: d, trendsData: i } = t;
-    d.forEach((n) => {
-      for (let s = 0; s < r.length; s++)
-        t.layersData[n][s].info = r[s];
-    }), e.forEach((n) => {
-      const s = /* @__PURE__ */ new Set(), f = {};
-      r.forEach((y) => {
-        y.aes && Object.entries(y.aes).forEach(([g, u]) => {
-          P(u) && u.value === n.value && (s.add(g), u.palette && (f[g] = u.palette));
+    const { grouping: e, trend: a, layers: o } = this.settings, { facetKeys: l, trendsData: i } = t;
+    l.forEach((r) => {
+      for (let s = 0; s < o.length; s++)
+        t.layersData[r][s].info = o[s];
+    }), e.forEach(({ columnName: r, inheritedAes: s }) => {
+      const c = /* @__PURE__ */ new Set(), p = {};
+      o.forEach((g) => {
+        g.aes && Object.entries(g.aes).forEach(([m, u]) => {
+          I(u) && u.value === r.value && (c.add(m), u.palette && (p[m] = u.palette));
         });
-      }), t.legendLabels[n.value].usedAes = [...s], t.legendLabels[n.value].aesMap = I(
-        n,
-        f,
-        h[n.value]
+      }), t.legendLabels[r.value].usedAes = [...c], t.legendLabels[r.value].aesMap = G(
+        r,
+        p,
+        s
       );
-    }), i && a && Object.keys(i).forEach((n) => {
-      i[n].forEach((s) => {
+    }), i && a && Object.keys(i).forEach((r) => {
+      i[r].forEach((s) => {
         s.color = a.color, s.bounded = a.bounded;
       });
     });
@@ -119,7 +113,7 @@ class Q extends j {
   _updateChart() {
     if (!this.calculatedData)
       return;
-    const { id: t, chartSettings: e, facetSettings: a, grouping: r, keyColumn: h, layers: d, trend: i } = this.settings;
+    const { id: t, chartSettings: e, facetSettings: a, grouping: o, keyColumn: l, layers: i, trend: r } = this.settings;
     this.chartRenderer.render(
       this.data,
       t,
@@ -130,18 +124,18 @@ class Q extends j {
       //for titles, if facet by more than 1 column
       this.calculatedData.dotsByFacets,
       this.calculatedData.trendsData,
-      h,
+      l,
       this.calculatedData.onlyPositive,
       this.calculatedData.legendLabels,
       this.calculatedData.layersData,
-      r,
-      d,
+      o.map((s) => s.columnName),
       i,
+      r,
       this.onTooltipHintSwitch
     );
   }
 }
 export {
-  Q as ChartScatterplot
+  W as ChartScatterplot
 };
 //# sourceMappingURL=index.js.map

package/dist/scatterplot/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/scatterplot/index.ts"],"sourcesContent":["import { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type {\n    AesItem,\n    ContinuousAesFromColumn,\n    InheritAesScatterplot,\n    ScatterplotEventHandlers,\n    ScatterplotLegendInfo,\n    ScatterplotSettings,\n} from '../types';\nimport ChartRenderer from './ChartRenderer';\nimport type { GroupedDots } from './dots';\nimport { getDots } from './dots';\nimport type { ScatterplotLayerData } from './getLayersData';\nimport { getLayersData } from './getLayersData';\nimport type { TrendsData } from './linearRegression';\nimport { getRegressionData } from './linearRegression';\nimport { ScatterplotSettingsImpl } from './ScatterplotSettingsImpl';\nimport { addPalettesToAesMapping, createLegendInfo } from './utils/createLegendInfo';\n\n// all combinations with 1 key from each list\nfunction getKeysCombinations(keysLists: string[][]) {\n    if (!keysLists.length) {\n        return [];\n    }\n    let result: string[][] = [[]];\n    keysLists.forEach(keys => {\n        const nextResult: string[][] = [];\n        keys.forEach(key => {\n            nextResult.push(...result.map(resultItem => [...resultItem, key]));\n        });\n        result = nextResult;\n    });\n    return result;\n}\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\n\nexport class ChartScatterplot extends AbstractChart {\n    settings: ScatterplotSettingsImpl;\n    chartRenderer: ChartRenderer;\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        onlyPositive: {x: boolean; y: boolean};\n        dotsByFacets: GroupedDots;\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        trendsData: TrendsData | null;\n        legendLabels: ScatterplotLegendInfo;\n        layersData: Record<string, ScatterplotLayerData[]>;\n    } | null = null;\n\n    constructor(data: DataFrame, settings: ScatterplotSettings, eventHandlers?:ScatterplotEventHandlers) {\n        super(data, settings);\n\n        this.chartRenderer = new ChartRenderer();\n        this.settings = new ScatterplotSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers.onTooltipHintSwitch;\n        }\n    }\n\n    mount(node: HTMLElement) {\n        try {\n            this.chartRenderer.init(node);\n            this._updateData();\n            this._updateChart();\n        } catch (err) {\n            console.error(err);\n            if (err instanceof Error) {\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: ScatterplotSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new ScatterplotSettingsImpl(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        } catch (err) {\n            console.error(err);\n            if (err instanceof Error) {\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 scatterplot');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: ScatterplotSettingsImpl, settings: ScatterplotSettingsImpl) {\n        return (\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping.length !== settings.grouping.length ||\n            prevSettings.grouping.some((el, idx) => el.value !== settings.grouping[idx]?.value) ||\n            (prevSettings.label?.value || settings.label?.value) && prevSettings.label?.value !== settings.label?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            Boolean(prevSettings.trend) !== Boolean(settings.trend)\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 {x, y, facetBy, grouping, keyColumn, trend, layers, inheritedAes, label, highlight} = this.settings;\n        const keys = this.data.getColumnCategories(keyColumn.value);\n\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value)).filter(v => v.length > 0);\n        const categoryGroupingKeysLists = grouping.map(column => this.data.getColumnCategories(column.value)).filter(v => v.length > 0);\n\n        const facetKeysCombinations = facetKeysLists.length\n            ? getKeysCombinations(facetKeysLists)\n            : [['null']];\n        const categoryGroupingCombinations = categoryGroupingKeysLists.length\n            ? getKeysCombinations(categoryGroupingKeysLists)\n            : [['null']];\n\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n\n        this.data.setGrouping([...facetGroupingValues, keyColumn.value]);\n        const onlyPositive = {\n            x: this.data.getColumn(x.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n            y: this.data.getColumn(y.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n        };\n\n        const dotsByFacets = getDots(this.data, facetKeysCombinations, x, y, label, highlight, keys);\n        const facetKeys = Object.keys(dotsByFacets);\n        const trendsData = getRegressionData(this.data, dotsByFacets, facetKeys, categoryGroupingCombinations, grouping, trend);\n\n        const legendLabels = createLegendInfo(this.data, grouping, layers, inheritedAes);\n        const layersData = getLayersData(this.data, layers, facetKeys, dotsByFacets, categoryGroupingCombinations, grouping);\n\n        this.calculatedData = {\n            onlyPositive,\n            dotsByFacets,\n            facetKeys,\n            facetKeysCombinations,\n            trendsData,\n            legendLabels,\n            layersData,\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n        const {grouping, trend, layers, inheritedAes} = this.settings;\n        const {facetKeys, trendsData} = calculated;\n\n        facetKeys.forEach(facetKey => {\n            for (let i = 0; i < layers.length; i++) {\n                calculated.layersData[facetKey][i].info = layers[i];\n            }\n        });\n\n        grouping.forEach(column => {\n            const usedAes = new Set<keyof AesItem>();\n            const usedAesFromPalettes:Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n            layers.forEach(layer => {\n                if (layer.aes) {\n                    Object.entries(layer.aes).forEach(([key, value]) => {\n                        if (isInheritMapping(value) && value.value === column.value) {\n                            usedAes.add(key as keyof AesItem);\n                            if (value.palette) {\n                                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n                            }\n                        }\n                    });\n                }\n            });\n            calculated.legendLabels[column.value].usedAes = [...usedAes];\n            calculated.legendLabels[column.value].aesMap = addPalettesToAesMapping(\n                column,\n                usedAesFromPalettes,\n                inheritedAes[column.value]\n            );\n        });\n        if (trendsData && trend) {\n            Object.keys(trendsData).forEach((key) => {\n                trendsData[key].forEach(trendInfo => {\n                    trendInfo.color = trend.color;\n                    trendInfo.bounded = trend.bounded;\n                });\n            });\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {id, chartSettings, facetSettings, grouping, keyColumn, layers, trend} = this.settings;\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.dotsByFacets,\n            this.calculatedData.trendsData,\n            keyColumn,\n            this.calculatedData.onlyPositive,\n            this.calculatedData.legendLabels,\n            this.calculatedData.layersData,\n            grouping,\n            layers,\n            trend,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["getKeysCombinations","keysLists","result","keys","nextResult","key","resultItem","isInheritMapping","value","ChartScatterplot","AbstractChart","data","settings","eventHandlers","__publicField","ChartRenderer","ScatterplotSettingsImpl","node","err","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","_b","_c","_d","l","prevData","prevKeys","x","y","facetBy","grouping","keyColumn","trend","layers","inheritedAes","label","highlight","facetKeysLists","column","v","categoryGroupingKeysLists","facetKeysCombinations","categoryGroupingCombinations","facetGroupingValues","onlyPositive","dotsByFacets","getDots","facetKeys","trendsData","getRegressionData","legendLabels","createLegendInfo","layersData","getLayersData","calculated","facetKey","i","usedAes","usedAesFromPalettes","layer","addPalettesToAesMapping","trendInfo","id","chartSettings","facetSettings"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../src/scatterplot/index.ts"],"sourcesContent":["import { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type {\n    AesItem,\n    ContinuousAesFromColumn,\n    InheritAesScatterplot,\n    ScatterplotEventHandlers,\n    ScatterplotLegendInfo,\n    ScatterplotSettings,\n} from '../types';\nimport { arraysAreDifferent } from '../utils/arraysAreDifferent';\nimport { getKeysCombinations } from '../utils/getKeysCombination';\nimport ChartRenderer from './ChartRenderer';\nimport type { GroupedDots } from './dots';\nimport { getDots } from './dots';\nimport type { ScatterplotLayerData } from './getLayersData';\nimport { getLayersData } from './getLayersData';\nimport type { TrendsData } from './linearRegression';\nimport { getRegressionData } from './linearRegression';\nimport { ScatterplotSettingsImpl } from './ScatterplotSettingsImpl';\nimport { addPalettesToAesMapping, createLegendInfo } from './utils/createLegendInfo';\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\n\nexport class ChartScatterplot extends AbstractChart {\n    settings: ScatterplotSettingsImpl;\n    chartRenderer: ChartRenderer;\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        onlyPositive: {x: boolean; y: boolean};\n        dotsByFacets: GroupedDots;\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        trendsData: TrendsData | null;\n        legendLabels: ScatterplotLegendInfo;\n        layersData: Record<string, ScatterplotLayerData[]>;\n    } | null = null;\n\n    constructor(data: DataFrame, settings: ScatterplotSettings, eventHandlers?:ScatterplotEventHandlers) {\n        super(data, settings);\n\n        this.chartRenderer = new ChartRenderer();\n        this.settings = new ScatterplotSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers.onTooltipHintSwitch;\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        } catch (err) {\n            this.hasError = true;\n            console.error(err);\n            if (err instanceof Error) {\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: ScatterplotSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new ScatterplotSettingsImpl(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        } catch (err) {\n            this.hasError = true;\n            console.error(err);\n            if (err instanceof Error) {\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 scatterplot');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: ScatterplotSettingsImpl, settings: ScatterplotSettingsImpl) {\n        return (\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping.length !== settings.grouping.length ||\n            arraysAreDifferent(\n                prevSettings.grouping.map(v => v.columnName.value),\n                settings.grouping.map(v => v.columnName.value),\n            ) ||\n            prevSettings.grouping.some((v, idx) => arraysAreDifferent(v.order, settings.grouping?.[idx].order)) ||\n            (prevSettings.label?.value || settings.label?.value) && prevSettings.label?.value !== settings.label?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            Boolean(prevSettings.trend) !== Boolean(settings.trend)\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 {x, y, facetBy, grouping, trend, layers, label, highlight} = this.settings;\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value)).filter(v => v.length > 0);\n        const categoryGroupingKeysLists = grouping.map(({columnName}) => this.data.getColumnCategories(columnName.value)).filter(v => v.length > 0);\n\n        const facetKeysCombinations = facetKeysLists.length\n            ? getKeysCombinations(facetKeysLists)\n            : [['null']];\n        const categoryGroupingCombinations = categoryGroupingKeysLists.length\n            ? getKeysCombinations(categoryGroupingKeysLists)\n            : [['null']];\n\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n\n        this.data.setGrouping([...facetGroupingValues]);\n        const onlyPositive = {\n            x: this.data.getColumn(x.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n            y: this.data.getColumn(y.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n        };\n\n        const groupingColumns = grouping.map(v => v.columnName);\n\n        const dotsByFacets = getDots(this.data, facetKeysCombinations, x, y, label, highlight, grouping);\n        const facetKeys = Object.keys(dotsByFacets);\n        const trendsData = getRegressionData(this.data, dotsByFacets, facetKeys, categoryGroupingCombinations, groupingColumns, trend);\n\n        const legendLabels = createLegendInfo(this.data, grouping, layers);\n        const layersData = getLayersData(this.data, layers, facetKeys, dotsByFacets, categoryGroupingCombinations, groupingColumns);\n\n        this.calculatedData = {\n            onlyPositive,\n            dotsByFacets,\n            facetKeys,\n            facetKeysCombinations,\n            trendsData,\n            legendLabels,\n            layersData,\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n        const {grouping, trend, layers} = this.settings;\n        const {facetKeys, trendsData} = calculated;\n\n        facetKeys.forEach(facetKey => {\n            for (let i = 0; i < layers.length; i++) {\n                calculated.layersData[facetKey][i].info = layers[i];\n            }\n        });\n\n        grouping.forEach(({columnName, inheritedAes}) => {\n            const usedAes = new Set<keyof AesItem>();\n            const usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n            layers.forEach(layer => {\n                if (layer.aes) {\n                    Object.entries(layer.aes).forEach(([key, value]) => {\n                        if (isInheritMapping(value) && value.value === columnName.value) {\n                            usedAes.add(key as keyof AesItem);\n                            if (value.palette) {\n                                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n                            }\n                        }\n                    });\n                }\n            });\n            calculated.legendLabels[columnName.value].usedAes = [...usedAes];\n            calculated.legendLabels[columnName.value].aesMap = addPalettesToAesMapping(\n                columnName,\n                usedAesFromPalettes,\n                inheritedAes\n            );\n        });\n        if (trendsData && trend) {\n            Object.keys(trendsData).forEach((key) => {\n                trendsData[key].forEach(trendInfo => {\n                    trendInfo.color = trend.color;\n                    trendInfo.bounded = trend.bounded;\n                });\n            });\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {id, chartSettings, facetSettings, grouping, keyColumn, layers, trend} = this.settings;\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.dotsByFacets,\n            this.calculatedData.trendsData,\n            keyColumn,\n            this.calculatedData.onlyPositive,\n            this.calculatedData.legendLabels,\n            this.calculatedData.layersData,\n            grouping.map(v => v.columnName),\n            layers,\n            trend,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["isInheritMapping","value","ChartScatterplot","AbstractChart","data","settings","eventHandlers","__publicField","ChartRenderer","ScatterplotSettingsImpl","node","err","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","arraysAreDifferent","v","_b","_c","_d","l","prevData","prevKeys","keys","key","x","y","facetBy","grouping","trend","layers","label","highlight","facetKeysLists","column","categoryGroupingKeysLists","columnName","facetKeysCombinations","getKeysCombinations","categoryGroupingCombinations","facetGroupingValues","onlyPositive","groupingColumns","dotsByFacets","getDots","facetKeys","trendsData","getRegressionData","legendLabels","createLegendInfo","layersData","getLayersData","calculated","facetKey","i","inheritedAes","usedAes","usedAesFromPalettes","layer","addPalettesToAesMapping","trendInfo","id","chartSettings","facetSettings","keyColumn"],"mappings":"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"}

package/dist/scatterplot/utils/createLegendInfo.d.ts

@@ -1,6 +1,6 @@
 import { DataFrame } from '../../DataFrame';
-import { AesItem, Category, ColumnName, ScatterplotLayer, ScatterplotLegendInfo } from '../../types';
+import { AesRecord, AesItem, Category, ColumnName, ScatterplotLayer, ScatterplotLegendInfo } from '../../types';
 import { ScatterplotSettingsImpl } from '../ScatterplotSettingsImpl';
-export declare function addPalettesToAesMapping(columnName: ColumnName, usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>>, inheritedAes?: ScatterplotSettingsImpl['inheritedAes'][string]): (category: Category, field: keyof AesItem) => string | number | undefined;
-export declare function createLegendInfo(data: DataFrame, grouping: ColumnName[], layers: ScatterplotLayer[], inheritedAes: ScatterplotSettingsImpl['inheritedAes']): ScatterplotLegendInfo;
+export declare function addPalettesToAesMapping(columnName: ColumnName, usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>>, inheritedAes?: AesRecord): (category: Category, field: keyof AesItem) => string | number | undefined;
+export declare function createLegendInfo(data: DataFrame, grouping: ScatterplotSettingsImpl['grouping'], layers: ScatterplotLayer[]): ScatterplotLegendInfo;
 //# sourceMappingURL=createLegendInfo.d.ts.map

package/dist/scatterplot/utils/createLegendInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createLegendInfo.d.ts","sourceRoot":"","sources":["../../../src/scatterplot/utils/createLegendInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EACR,OAAO,EACP,QAAQ,EACR,UAAU,EAGV,gBAAgB,EAChB,qBAAqB,EACxB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAyB1E,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,EAC7D,YAAY,CAAC,EAAE,uBAAuB,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,cAQ/B,QAAQ,SAAS,MAAM,OAAO,iCAchE;AAKD,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,UAAU,EAAE,EACtB,MAAM,EAAE,gBAAgB,EAAE,EAC1B,YAAY,EAAE,uBAAuB,CAAC,cAAc,CAAC,GACtD,qBAAqB,CA4CvB"}
+{"version":3,"file":"createLegendInfo.d.ts","sourceRoot":"","sources":["../../../src/scatterplot/utils/createLegendInfo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,EACR,OAAO,EACP,QAAQ,EACR,UAAU,EAGV,gBAAgB,EAChB,qBAAqB,EACxB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAyB1E,wBAAgB,uBAAuB,CACnC,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,EAC7D,YAAY,CAAC,EAAE,SAAS,cAQO,QAAQ,SAAS,MAAM,OAAO,iCAchE;AAKD,wBAAgB,gBAAgB,CAC5B,IAAI,EAAE,SAAS,EACf,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,EAC7C,MAAM,EAAE,gBAAgB,EAAE,GAC3B,qBAAqB,CAuDvB"}

package/dist/scatterplot/utils/createLegendInfo.js

@@ -1,57 +1,62 @@
-import { MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as v } from "../../constants.js";
-const h = /* @__PURE__ */ (() => {
+import { MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as x } from "../../constants.js";
+const I = /* @__PURE__ */ (() => {
   const t = /* @__PURE__ */ new Map();
   return {
     clear: () => t.clear(),
-    getIndex: (g, o) => {
-      let e = t.get(g.value);
-      e === void 0 && (e = /* @__PURE__ */ new Map(), t.set(g.value, e));
-      let r = e.get(o);
-      return r === void 0 && (r = e.size, e.set(o, r)), r;
+    getIndex: (u, l) => {
+      let e = t.get(u.value);
+      e === void 0 && (e = /* @__PURE__ */ new Map(), t.set(u.value, e));
+      let n = e.get(l);
+      return n === void 0 && (n = e.size, e.set(l, n)), n;
     }
   };
 })();
-function C(t, c, u) {
-  h.clear();
-  const g = u && Object.keys(u).length > 0, o = c.dotFill, e = o && o.length > 0, r = c.lineColor, d = r && r.length > 0;
-  return (s, a) => {
-    var l;
-    const n = g ? (l = u[s]) == null ? void 0 : l[a] : void 0;
-    return a === "dotFill" && e ? o[h.getIndex(t, s) % o.length] ?? n : a === "lineColor" && d ? r[h.getIndex(t, s) % r.length] ?? n : n;
+function v(t, h, d) {
+  I.clear();
+  const u = d && Object.keys(d).length > 0, l = h.dotFill, e = l && l.length > 0, n = h.lineColor, C = n && n.length > 0;
+  return (g, i) => {
+    var o;
+    const c = u ? (o = d[g]) == null ? void 0 : o[i] : void 0;
+    return i === "dotFill" && e ? l[I.getIndex(t, g) % l.length] ?? c : i === "lineColor" && C ? n[I.getIndex(t, g) % n.length] ?? c : c;
   };
 }
-function I(t) {
+function A(t) {
   return typeof t == "object" && "type" in t && t.type === "grouping";
 }
-function L(t, c, u, g) {
-  return c.reduce((o, e) => {
-    const r = (n) => e.valueLabels ? t.getColumnValueCategory(e.valueLabels, n) : void 0, d = /* @__PURE__ */ new Set(), f = {};
-    u.forEach((n) => {
-      n.aes && Object.entries(n.aes).forEach(([l, i]) => {
-        I(i) && i.value === e.value && (d.add(l), f[l] = i.palette);
+function F(t, h, d) {
+  return h.reduce((u, l) => {
+    const e = l.columnName, n = l.order, C = (o) => e.valueLabels ? t.getColumnValueCategory(e.valueLabels, o) : void 0, f = /* @__PURE__ */ new Set(), g = {};
+    d.forEach((o) => {
+      o.aes && Object.entries(o.aes).forEach(([a, r]) => {
+        A(r) && r.value === e.value && (f.add(a), g[a] = r.palette);
       });
     });
-    let s = {}, a = [];
-    if (d.has("dotFill") || d.has("dotShape")) {
-      const n = t.getColumnCategories(e.value);
-      n.length < v ? (s = n.reduce((l, i) => {
-        const p = t.getColumnCategoryRowIndex(e.value, i);
-        return l[i] = r(p) ?? i, l;
-      }, s), a = n.sort((l, i) => {
-        var p;
-        return ((p = s[l]) == null ? void 0 : p.localeCompare(s[i] ?? "", "en", { numeric: !0 })) ?? 0;
-      })) : a = n;
+    let i = {}, c = [];
+    if (f.has("dotFill") || f.has("dotShape")) {
+      const o = t.getColumnCategories(e.value);
+      if (o.length < x) {
+        i = o.reduce((r, s) => {
+          const p = t.getColumnCategoryRowIndex(e.value, s);
+          return r[s] = C(p) ?? s, r;
+        }, i);
+        const a = o.reduce((r, s) => (r[s] = (n == null ? void 0 : n.indexOf(s)) ?? -1, r), {});
+        c = o.sort((r, s) => {
+          var p;
+          return a[r] !== a[s] ? a[r] - a[s] : ((p = i[r]) == null ? void 0 : p.localeCompare(i[s] ?? "", "en", { numeric: !0 })) ?? 0;
+        });
+      } else
+        c = o;
     }
-    return o[e.value] = {
-      values: a,
-      usedAes: [...d],
-      aesMap: C(e, f, g[e.value]),
-      labels: s
-    }, o;
+    return u[e.value] = {
+      values: c,
+      usedAes: [...f],
+      aesMap: v(e, g, l.inheritedAes),
+      labels: i
+    }, u;
   }, {});
 }
 export {
-  C as addPalettesToAesMapping,
-  L as createLegendInfo
+  v as addPalettesToAesMapping,
+  F as createLegendInfo
 };
 //# sourceMappingURL=createLegendInfo.js.map

package/dist/scatterplot/utils/createLegendInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"createLegendInfo.js","sources":["../../../src/scatterplot/utils/createLegendInfo.ts"],"sourcesContent":["import { MAX_SHOWN_UNIQUE_VALUES_IN_LABELS } from '../../constants';\nimport type { DataFrame } from '../../DataFrame';\nimport type {\n    AesItem,\n    Category,\n    ColumnName,\n    ContinuousAesFromColumn,\n    InheritAesScatterplot,\n    ScatterplotLayer,\n    ScatterplotLegendInfo\n} from '../../types';\nimport type { ScatterplotSettingsImpl } from '../ScatterplotSettingsImpl';\n\nconst categoryIndexer = (() => {\n    const map = new Map<string, Map<Category, number>>();\n    const clear = () => map.clear();\n    const getIndex = (columnName: ColumnName, category: Category): number => {\n        let categoryMap = map.get(columnName.value);\n        if (categoryMap === undefined) {\n            categoryMap = new Map();\n            map.set(columnName.value, categoryMap);\n        }\n        let index = categoryMap.get(category);\n        if (index === undefined) {\n            index = categoryMap.size;\n            categoryMap.set(category, index);\n        }\n        return index;\n    };\n\n    return {\n        clear,\n        getIndex,\n    };\n})();\n\nexport function addPalettesToAesMapping(\n    columnName: ColumnName,\n    usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>>,\n    inheritedAes?: ScatterplotSettingsImpl['inheritedAes'][string],\n) {\n    categoryIndexer.clear();\n    const hasIngeritedAes = inheritedAes && Object.keys(inheritedAes).length > 0;\n    const dotFill = usedAesFromPalettes['dotFill'];\n    const hasDotFill = dotFill && dotFill.length > 0;\n    const lineColor = usedAesFromPalettes['lineColor'];\n    const hasLineColor = lineColor && lineColor.length > 0;\n    const getAesField = (category: Category, field: keyof AesItem) => {\n        const inheritedResult = hasIngeritedAes ? inheritedAes[category]?.[field] : undefined;\n        \n        if (field === 'dotFill' && hasDotFill) {\n            return dotFill[categoryIndexer.getIndex(columnName, category) % dotFill.length] ?? inheritedResult;\n        }\n        if (field === 'lineColor' && hasLineColor) {\n            return lineColor[categoryIndexer.getIndex(columnName, category) % lineColor.length] ?? inheritedResult;\n        }\n        \n        return inheritedResult;\n    };\n\n    return getAesField;\n}\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\nexport function createLegendInfo(\n    data: DataFrame,\n    grouping: ColumnName[],\n    layers: ScatterplotLayer[],\n    inheritedAes: ScatterplotSettingsImpl['inheritedAes']\n): ScatterplotLegendInfo {\n    return grouping.reduce((res: ScatterplotLegendInfo, column) => {\n        // TODO: remove String conversion\n        const getValueLabel = (index: number) => {\n            return column.valueLabels\n            ? data.getColumnValueCategory(column.valueLabels, index)\n            : undefined;\n        };\n\n        const usedAes = new Set<keyof AesItem>();\n        const usedAesFromPalettes:Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n        layers.forEach(layer => {\n            if (!layer.aes)  return;\n            \n            Object.entries(layer.aes).forEach(([key, value]) => {\n                if (!(isInheritMapping(value) && value.value === column.value)) return;\n                \n                usedAes.add(key as keyof AesItem);\n                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n            });\n        });\n        let labels: Record<Category, string> = {};\n        let values: Category[] = [];\n        if (usedAes.has('dotFill') || usedAes.has('dotShape')) {\n            const categories = data.getColumnCategories(column.value);\n            if (categories.length < MAX_SHOWN_UNIQUE_VALUES_IN_LABELS) {\n                labels = categories.reduce((res, category) => {\n                    const index = data.getColumnCategoryRowIndex(column.value, category);\n                    res[category] = getValueLabel(index) ?? category;\n                    return res;\n                }, labels);\n                values = categories.sort((a, b) => labels[a]?.localeCompare(labels[b] ?? '', 'en', {numeric: true}) ?? 0);\n            } else {\n                values = categories;\n            }\n        }\n        res[column.value] = {\n            values,\n            usedAes: [...usedAes],\n            aesMap: addPalettesToAesMapping(column, usedAesFromPalettes, inheritedAes[column.value]),\n            labels,\n        };\n        return res;\n    }, {});\n}"],"names":["categoryIndexer","map","columnName","category","categoryMap","index","addPalettesToAesMapping","usedAesFromPalettes","inheritedAes","hasIngeritedAes","dotFill","hasDotFill","lineColor","hasLineColor","field","inheritedResult","_a","isInheritMapping","value","createLegendInfo","data","grouping","layers","res","column","getValueLabel","usedAes","layer","key","labels","values","categories","MAX_SHOWN_UNIQUE_VALUES_IN_LABELS","a","b"],"mappings":"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"}
+{"version":3,"file":"createLegendInfo.js","sources":["../../../src/scatterplot/utils/createLegendInfo.ts"],"sourcesContent":["import { MAX_SHOWN_UNIQUE_VALUES_IN_LABELS } from '../../constants';\nimport type { DataFrame } from '../../DataFrame';\nimport type {AesRecord} from '../../types';\nimport type {\n    AesItem,\n    Category,\n    ColumnName,\n    ContinuousAesFromColumn,\n    InheritAesScatterplot,\n    ScatterplotLayer,\n    ScatterplotLegendInfo\n} from '../../types';\nimport type { ScatterplotSettingsImpl } from '../ScatterplotSettingsImpl';\n\nconst categoryIndexer = (() => {\n    const map = new Map<string, Map<Category, number>>();\n    const clear = () => map.clear();\n    const getIndex = (columnName: ColumnName, category: Category): number => {\n        let categoryMap = map.get(columnName.value);\n        if (categoryMap === undefined) {\n            categoryMap = new Map();\n            map.set(columnName.value, categoryMap);\n        }\n        let index = categoryMap.get(category);\n        if (index === undefined) {\n            index = categoryMap.size;\n            categoryMap.set(category, index);\n        }\n        return index;\n    };\n\n    return {\n        clear,\n        getIndex,\n    };\n})();\n\nexport function addPalettesToAesMapping(\n    columnName: ColumnName,\n    usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>>,\n    inheritedAes?: AesRecord\n) {\n    categoryIndexer.clear();\n    const hasInheritedAes = inheritedAes && Object.keys(inheritedAes).length > 0;\n    const dotFill = usedAesFromPalettes['dotFill'];\n    const hasDotFill = dotFill && dotFill.length > 0;\n    const lineColor = usedAesFromPalettes['lineColor'];\n    const hasLineColor = lineColor && lineColor.length > 0;\n    const getAesField = (category: Category, field: keyof AesItem) => {\n        const inheritedResult = hasInheritedAes ? inheritedAes[category]?.[field] : undefined;\n        \n        if (field === 'dotFill' && hasDotFill) {\n            return dotFill[categoryIndexer.getIndex(columnName, category) % dotFill.length] ?? inheritedResult;\n        }\n        if (field === 'lineColor' && hasLineColor) {\n            return lineColor[categoryIndexer.getIndex(columnName, category) % lineColor.length] ?? inheritedResult;\n        }\n        \n        return inheritedResult;\n    };\n\n    return getAesField;\n}\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\nexport function createLegendInfo(\n    data: DataFrame,\n    grouping: ScatterplotSettingsImpl['grouping'],\n    layers: ScatterplotLayer[],\n): ScatterplotLegendInfo {\n    return grouping.reduce((res: ScatterplotLegendInfo, groupingElement) => {\n        // TODO: remove String conversion\n        const column = groupingElement.columnName;\n        const order = groupingElement.order;\n        const getValueLabel = (index: number) => {\n            return column.valueLabels\n            ? data.getColumnValueCategory(column.valueLabels, index)\n            : undefined;\n        };\n\n        const usedAes = new Set<keyof AesItem>();\n        const usedAesFromPalettes:Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n        layers.forEach(layer => {\n            if (!layer.aes)  return;\n            \n            Object.entries(layer.aes).forEach(([key, value]) => {\n                if (!(isInheritMapping(value) && value.value === column.value)) return;\n                \n                usedAes.add(key as keyof AesItem);\n                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n            });\n        });\n        let labels: Record<Category, string> = {};\n        let values: Category[] = [];\n        if (usedAes.has('dotFill') || usedAes.has('dotShape')) {\n            const categories = data.getColumnCategories(column.value);\n            if (categories.length < MAX_SHOWN_UNIQUE_VALUES_IN_LABELS) {\n                labels = categories.reduce((res, category) => {\n                    const index = data.getColumnCategoryRowIndex(column.value, category);\n                    res[category] = getValueLabel(index) ?? category;\n                    return res;\n                }, labels);\n                const sortWeights = categories.reduce((res, v) => {\n                    res[v] = order?.indexOf(v) ?? -1;\n                    return res;\n                }, {} as Record<string, number>);\n                values = categories.sort((a, b) => {\n                    if (sortWeights[a] !== sortWeights[b]) {\n                        return sortWeights[a] - sortWeights[b];\n                    }\n                    return labels[a]?.localeCompare(labels[b] ?? '', 'en', {numeric: true}) ?? 0;\n                });\n            } else {\n                values = categories;\n            }\n        }\n        res[column.value] = {\n            values,\n            usedAes: [...usedAes],\n            aesMap: addPalettesToAesMapping(column, usedAesFromPalettes, groupingElement.inheritedAes),\n            labels,\n        };\n        return res;\n    }, {});\n}"],"names":["categoryIndexer","map","columnName","category","categoryMap","index","addPalettesToAesMapping","usedAesFromPalettes","inheritedAes","hasInheritedAes","dotFill","hasDotFill","lineColor","hasLineColor","field","inheritedResult","_a","isInheritMapping","value","createLegendInfo","data","grouping","layers","res","groupingElement","column","order","getValueLabel","usedAes","layer","key","labels","values","categories","MAX_SHOWN_UNIQUE_VALUES_IN_LABELS","sortWeights","v","a","b"],"mappings":"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"}

package/dist/scatterplot/utils/sortDotsByGrouping.d.ts

@@ -0,0 +1,8 @@
+import { DataFrame } from '../../DataFrame';
+import { ColumnName, DataValue } from '../../types';
+import { Dot } from '../dots';
+export declare function sortDotsByGrouping(dataFrame: DataFrame, dots: Dot[], grouping: {
+    columnName: ColumnName;
+    order?: DataValue[];
+}[], highlight: ColumnName | null): void;
+//# sourceMappingURL=sortDotsByGrouping.d.ts.map

package/dist/scatterplot/utils/sortDotsByGrouping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortDotsByGrouping.d.ts","sourceRoot":"","sources":["../../../src/scatterplot/utils/sortDotsByGrouping.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,SAAS,CAAC;AAEjC,wBAAgB,kBAAkB,CAC9B,SAAS,EAAE,SAAS,EACpB,IAAI,EAAC,GAAG,EAAE,EACV,QAAQ,EAAE;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;CAAC,EAAE,EAC1D,SAAS,EAAE,UAAU,GAAG,IAAI,QA2B/B"}

package/dist/scatterplot/utils/sortDotsByGrouping.js

@@ -0,0 +1,18 @@
+function v(r, s, i, f) {
+  const c = i.reduce((t, { columnName: n, order: e }) => (e && (t[n.value] = e.reduce((o, u, l) => (o[u] = e.length - l, o), {})), t), {});
+  s.sort((t, n) => {
+    var e, o;
+    if (f && n.dimmed !== t.dimmed)
+      return n.dimmed ? 1 : -1;
+    for (const { columnName: u } of i) {
+      const l = r.getColumnValue(u.value, t.idx), d = r.getColumnValue(u.value, n.idx), m = (e = c[u.value]) == null ? void 0 : e[l], a = (o = c[u.value]) == null ? void 0 : o[d];
+      if (m !== a)
+        return m - a;
+    }
+    return 0;
+  });
+}
+export {
+  v as sortDotsByGrouping
+};
+//# sourceMappingURL=sortDotsByGrouping.js.map

package/dist/scatterplot/utils/sortDotsByGrouping.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sortDotsByGrouping.js","sources":["../../../src/scatterplot/utils/sortDotsByGrouping.ts"],"sourcesContent":["import type {DataFrame} from '../../DataFrame';\nimport type {ColumnName, DataValue} from '../../types';\nimport type {Dot} from '../dots';\n\nexport function sortDotsByGrouping(\n    dataFrame: DataFrame,\n    dots:Dot[],\n    grouping: {columnName: ColumnName; order?: DataValue[];}[],\n    highlight: ColumnName | null\n) {\n    const weightsByColumnByOrder = grouping.reduce((res, {columnName, order}) => {\n        if (order) {\n            res[columnName.value] = order.reduce((weights, orderEl, idx) => {\n                weights[orderEl as string] = order.length - idx;\n                return weights;\n            }, {} as Record<string, number>);\n        }\n        return res;\n    }, {} as Record<string, Record<string, number>>);\n\n    dots.sort((d1, d2) => {\n        if (highlight && d2.dimmed !== d1.dimmed) {\n            return d2.dimmed ? 1 : -1;\n        }\n        for (const {columnName} of grouping) {\n            const aValue = dataFrame.getColumnValue(columnName.value, d1.idx);\n            const bValue = dataFrame.getColumnValue(columnName.value, d2.idx);\n            const aWeight = weightsByColumnByOrder[columnName.value]?.[aValue as string];\n            const bWeight = weightsByColumnByOrder[columnName.value]?.[bValue as string];\n            if (aWeight !== bWeight) {\n                return aWeight - bWeight;\n            }\n        }\n        return 0;\n    });\n}"],"names":["sortDotsByGrouping","dataFrame","dots","grouping","highlight","weightsByColumnByOrder","res","columnName","order","weights","orderEl","idx","d1","d2","_a","_b","aValue","bValue","aWeight","bWeight"],"mappings":"AAIO,SAASA,EACZC,GACAC,GACAC,GACAC,GACF;AACE,QAAMC,IAAyBF,EAAS,OAAO,CAACG,GAAK,EAAC,YAAAC,GAAY,OAAAC,SAC1DA,MACAF,EAAIC,EAAW,KAAK,IAAIC,EAAM,OAAO,CAACC,GAASC,GAASC,OACpDF,EAAQC,CAAiB,IAAIF,EAAM,SAASG,GACrCF,IACR,CAAA,CAA4B,IAE5BH,IACR,CAAA,CAA4C;AAE/C,EAAAJ,EAAK,KAAK,CAACU,GAAIC,MAAO;AAhBnB,QAAAC,GAAAC;AAiBC,QAAIX,KAAaS,EAAG,WAAWD,EAAG;AAC9B,aAAOC,EAAG,SAAS,IAAI;AAE3B,eAAW,EAAC,YAAAN,EAAA,KAAeJ,GAAU;AACjC,YAAMa,IAASf,EAAU,eAAeM,EAAW,OAAOK,EAAG,GAAG,GAC1DK,IAAShB,EAAU,eAAeM,EAAW,OAAOM,EAAG,GAAG,GAC1DK,KAAUJ,IAAAT,EAAuBE,EAAW,KAAK,MAAvC,gBAAAO,EAA2CE,IACrDG,KAAUJ,IAAAV,EAAuBE,EAAW,KAAK,MAAvC,gBAAAQ,EAA2CE;AAC3D,UAAIC,MAAYC;AACZ,eAAOD,IAAUC;AAAA,IAEzB;AACA,WAAO;AAAA,EACX,CAAC;AACL;"}

package/dist/scatterplot-umap/SettingsImpl.d.ts

@@ -1,5 +1,5 @@
 import { ScatterplotAxisSettings } from '../scatterplot/ScatterplotSettingsImpl';
-import { ColumnName, ContinuousAesFromColumn, FrameType, LegendPosition, LineShape, SettingsInterface, TitlePosition, AesRecord, InheritAesScatterplot, PointShape } from '../types';
+import { ColumnName, ContinuousAesFromColumn, DataValue, FrameType, LegendPosition, LineShape, SettingsInterface, TitlePosition, AesRecord, InheritAesScatterplot, PointShape } from '../types';
 import { CurveUmapLayer as OuterCurveLayer, DotsUmapLayer as OuterDotsLayer, ScatterplotUmapSettings } from '../types/scatterplot-umap';
 export declare class DotsLayer {
     readonly type = "dots";
@@ -29,7 +29,11 @@ export declare class ScatterplotUmapSettingsImpl implements SettingsInterface {
     readonly keyColumn: ColumnName | null;
     readonly x: ColumnName;
     readonly y: ColumnName;
-    readonly grouping: ColumnName[];
+    readonly grouping: {
+        columnName: ColumnName;
+        order?: DataValue[];
+        inheritedAes?: AesRecord;
+    }[];
     readonly label: ColumnName | null;
     readonly highlight: ColumnName | null;
     readonly chartSettings: {
@@ -56,7 +60,6 @@ export declare class ScatterplotUmapSettingsImpl implements SettingsInterface {
             content?: ColumnName[];
         };
     };
-    readonly inheritedAes: Record<string, AesRecord>;
     readonly layers: ScatterplotUmapLayer[];
     constructor(settings: ScatterplotUmapSettings);
 }

package/dist/scatterplot-umap/SettingsImpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SettingsImpl.d.ts","sourceRoot":"","sources":["../../src/scatterplot-umap/SettingsImpl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACtF,OAAO,KAAK,EACR,UAAU,EACV,uBAAuB,EACvB,SAAS,EACT,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,aAAa,EAChB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,qBAAqB,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AACvF,OAAO,KAAK,EACR,cAAc,IAAI,eAAe,EACjC,aAAa,IAAI,cAAc,EAC/B,uBAAuB,EAC1B,MAAM,2BAA2B,CAAC;AAGnC,qBAAa,SAAS;IAClB,QAAQ,CAAC,IAAI,UAAU;IACvB,QAAQ,CAAC,GAAG,EAAE;QACV,OAAO,EAAE,MAAM,GAAG,qBAAqB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC1E,QAAQ,EAAE,UAAU,GAAG,qBAAqB,CAAC;QAC7C,OAAO,EAAE,MAAM,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAClD,OAAO,EAAE,MAAM,CAAC;KACnB,CAKC;gBACU,KAAK,EAAE,cAAc;CAMpC;AACD,qBAAa,UAAU;IACnB,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE;QACV,SAAS,EAAE,MAAM,GAAG,qBAAqB,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAC5E,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,SAAS,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;KACnB,CAKC;gBAEU,KAAK,EAAE,eAAe;CAOrC;AAED,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,UAAU,CAAC;AAE1D,qBAAa,2BAA4B,YAAW,iBAAiB;IACjE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,sBAAsB;IACnC,QAAQ,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC;IACvB,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,aAAa,EAAE;QACpB,QAAQ,CAAC,IAAI,EAAE;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAC,CAAC;QAC/C,QAAQ,CAAC,KAAK,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,OAAO,CAAC;YAAC,QAAQ,EAAE,aAAa,CAAA;SAAC,CAAC;QACvE,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;QACxC,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;QACxC,QAAQ,CAAC,KAAK,EAAE;YAAC,IAAI,EAAE,SAAS,CAAA;SAAC,CAAC;QAClC,QAAQ,CAAC,MAAM,EAAE;YAAC,IAAI,EAAE,OAAO,CAAC;YAAC,QAAQ,EAAE,cAAc,CAAA;SAAC,CAAC;QAC3D,QAAQ,CAAC,QAAQ,EAAE;YAAC,IAAI,EAAE,OAAO,CAAC;YAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAA;SAAC,CAAC;KAC9D,CAAC;IACF,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjD,QAAQ,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC;gBAE5B,QAAQ,EAAE,uBAAuB;CA4DhD"}
+{"version":3,"file":"SettingsImpl.d.ts","sourceRoot":"","sources":["../../src/scatterplot-umap/SettingsImpl.ts"],"names":[],"mappings":"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"}