@milaboratories/miplots4 1.0.167 → 1.0.169

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.js

@@ -1,53 +1,53 @@
-var O = Object.defineProperty;
-var U = (c, h, t) => h in c ? O(c, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[h] = t;
-var m = (c, h, t) => U(c, typeof h != "symbol" ? h + "" : h, t);
-import { s as G } from "../_virtual/server.browser.js";
-import { AbstractChart as j } 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 C } from "../utils/arraysAreDifferent.js";
-import { getKeysCombinations as S } from "../utils/getKeysCombination.js";
-import F from "./ChartRenderer.js";
-import { getDots as N } from "./dots.js";
-import { getLayersData as P } from "./getLayersData.js";
-import { getRegressionData as X } from "./linearRegression.js";
-import { ScatterplotSettingsImpl as w } from "./ScatterplotSettingsImpl.js";
-import { createLegendInfo as H, addPalettesToAesMapping as V } from "./utils/createLegendInfo.js";
-import { MAX_FACETS_COUNT as I, MAX_GROUPS_COUNT as x } from "../constants.js";
-import { getFacetLabels as Y } from "../discrete/utils/getFacetLabels.js";
-function q(c) {
-  return typeof c == "object" && "type" in c && c.type === "grouping";
+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 L(c, h, t) {
-  if (h.scale === "discrete") {
-    const e = h.keys ? h.keys : c.getColumnCategories(t.value);
-    return { keys: e, labels: e.reduce((a, s) => {
-      const l = (h.labels ?? {})[s] ?? (t.valueLabels ? c.getColumnValue(t.valueLabels, c.getColumnCategoryRowIndex(t.value, s)) : s);
-      return a[s] = String(l), 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 gt extends j {
+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 F(), 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() {
@@ -55,127 +55,127 @@ class gt extends j {
   }
   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(), G.renderToString(this.chartRenderer.component);
+    return this._updateChart(), F.renderToString(this.chartRenderer.component);
   }
   _needUpdateCalculatedDataBySettings(t, e) {
-    var a, s, u, l;
-    return t.facetBy.some((o, n) => {
-      var i;
-      return o.value !== ((i = e.facetBy[n]) == null ? void 0 : i.value);
-    }) || t.grouping.length !== e.grouping.length || C(
-      t.grouping.map((o) => o.columnName.value),
-      e.grouping.map((o) => o.columnName.value)
-    ) || t.grouping.some((o, n) => {
-      var i;
-      return C(o.order, (i = e.grouping) == null ? void 0 : i[n].order);
-    }) || C(t.chartSettings.xAxis.keys, e.chartSettings.xAxis.keys) || C(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) !== ((l = e.label) == null ? void 0 : l.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 l;
-      return t.data[u].length !== ((l = e.data[u]) == null ? void 0 : l.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: l, label: o, highlight: n, chartSettings: i } = this.settings, y = a.map((r) => this.data.getColumnCategories(r.value)).filter((r) => r.length > 0), f = s.map(({ columnName: r }) => this.data.getColumnCategories(r.value)).filter((r) => r.length > 0), p = y.length ? S(y) : [["null"]], d = f.length ? S(f) : [["null"]], R = a.map((r) => r.value) ?? null;
-    this.data.setGrouping([...R]);
-    const B = {
+    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 = N(this.data, p, t, e, o, n, s, i.xAxis, i.yAxis, l.find((r) => r.type === "dots")), g = Object.keys(D);
-    if (g.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: g.length, maxCount: I }
+        info: { count: f.length, maxCount: R }
       };
       throw Error(r.type, { cause: r });
     }
-    const M = X(this.data, D, g, d, E, u), b = L(this.data, i.xAxis, t), A = L(this.data, i.yAxis, e);
-    if (b.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: b.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 = H(this.data, s, l), T = P(this.data, l, g, D, d, E, i.xAxis, b), v = Y(this.data, a, g, p);
+    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: B,
-      dotsByFacets: D,
-      facetKeys: g,
-      facetKeysCombinations: p,
-      facetLabels: v,
-      trendsData: M,
-      legendLabels: K,
-      layersData: T,
-      discreteAxisDataX: b,
-      discreteAxisDataY: A
+      onlyPositive: K,
+      dotsByFacets: A,
+      facetKeys: f,
+      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: l } = 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 i = /* @__PURE__ */ new Set(), y = {};
-      s.forEach((f) => {
-        f.aes && Object.entries(f.aes).forEach(([p, d]) => {
-          q(d) && d.value === o.value && (i.add(p), d.palette && (y[p] = 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 = [...i], t.legendLabels[o.value].aesMap = V(
-        o,
-        y,
-        n
+      }), t.legendLabels[d.value].usedAes = [...m], t.legendLabels[d.value].aesMap = q(
+        d,
+        D,
+        s
       );
-    }), l && a && Object.keys(l).forEach((o) => {
-      l[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 { facetLabels: t } = this.calculatedData, { id: e, chartSettings: a, facetSettings: s, grouping: u, keyColumn: l, layers: o, trend: n } = 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,
       e,
       a,
-      s,
+      o,
       this.calculatedData.facetKeys,
-      this.calculatedData.facetKeys.map((i) => t[i]),
+      this.calculatedData.facetKeys.map((s) => t[s]),
       //for titles, if facet by more than 1 column
       this.calculatedData.dotsByFacets,
       this.calculatedData.trendsData,
-      l,
+      i,
       this.calculatedData.onlyPositive,
       this.calculatedData.legendLabels,
       this.calculatedData.layersData,
-      u.map((i) => i.columnName),
-      o,
-      n,
+      [...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
@@ -183,6 +183,6 @@ class gt extends j {
   }
 }
 export {
-  gt as ChartScatterplot
+  mt 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    ErrorInfoScatterplotGroupsX,\n    ErrorInfoScatterplotGroupsY} from '../types';\nimport {\n    type AesItem,\n    type AxisSettings,\n    type AxisSettingsDiscrete,\n    type Category,\n    type ColumnName,\n    type ContinuousAesFromColumn,\n    type ErrorInfoFacets,\n    getUnknownErrorInfo,\n    type InheritAesScatterplot,\n    isErrorInfo,\n    type ScatterplotEventHandlers,\n    type ScatterplotLegendInfo,\n    type 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';\nimport type { DiscreteAxisData } from './components/types';\nimport { MAX_FACETS_COUNT, MAX_GROUPS_COUNT } from '../constants';\nimport { getFacetLabels } from '../discrete/utils/getFacetLabels';\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\nfunction getDiscreteAxisData(data: DataFrame, axis: AxisSettings, column: ColumnName): DiscreteAxisData {\n    if (axis.scale === 'discrete') {\n        const keys = axis.keys ? axis.keys : data.getColumnCategories(column.value);\n        return {keys, labels: keys.reduce((res, v) => {\n            const labelsMap = axis.labels ?? {};\n            const labelValue = labelsMap[v] ?? (column.valueLabels ? data.getColumnValue(column.valueLabels, data.getColumnCategoryRowIndex(column.value, v as Category)) : v);\n            res[v] = String(labelValue);\n            return res;\n        }, {} as Record<string, string>)};\n    }\n    return {keys: [], labels: {}};\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        facetLabels: Record<string, string[]>;\n        trendsData: TrendsData | null;\n        legendLabels: ScatterplotLegendInfo;\n        layersData: Record<string, ScatterplotLayerData[]>;\n        discreteAxisDataX: DiscreteAxisData;\n        discreteAxisDataY: DiscreteAxisData;\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            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: 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            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            console.error(err);\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 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            arraysAreDifferent((prevSettings.chartSettings.xAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.xAxis as AxisSettingsDiscrete).keys) ||\n            arraysAreDifferent((prevSettings.chartSettings.yAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.yAxis as AxisSettingsDiscrete).keys) ||\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, chartSettings} = 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, chartSettings.xAxis, chartSettings.yAxis, layers.find(l => l.type === 'dots'));\n        const facetKeys = Object.keys(dotsByFacets);\n\n        if (facetKeys.length > MAX_FACETS_COUNT) {\n            const errorInfo: ErrorInfoFacets = {\n                type: 'tooManyFacets',\n                info: {count: facetKeys.length, maxCount: MAX_FACETS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n\n        const trendsData = getRegressionData(this.data, dotsByFacets, facetKeys, categoryGroupingCombinations, groupingColumns, trend);\n\n        const discreteAxisDataX = getDiscreteAxisData(this.data, chartSettings.xAxis, x);\n        const discreteAxisDataY = getDiscreteAxisData(this.data, chartSettings.yAxis, y);\n\n        if (discreteAxisDataX.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsX = {\n                type: 'tooManyScatterplotGroupsX',\n                info: {count: discreteAxisDataX.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        if (discreteAxisDataY.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsY = {\n                type: 'tooManyScatterplotGroupsY',\n                info: {count: discreteAxisDataY.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        const legendLabels = createLegendInfo(this.data, grouping, layers);\n        const layersData = getLayersData(this.data, layers, facetKeys, dotsByFacets, categoryGroupingCombinations, groupingColumns, chartSettings.xAxis, discreteAxisDataX);\n        const facetLabels = getFacetLabels(this.data, facetBy, facetKeys, facetKeysCombinations);\n\n        this.calculatedData = {\n            onlyPositive,\n            dotsByFacets,\n            facetKeys,\n            facetKeysCombinations,\n            facetLabels,\n            trendsData,\n            legendLabels,\n            layersData,\n            discreteAxisDataX,\n            discreteAxisDataY\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 {facetLabels} = this.calculatedData;\n        const {id, chartSettings, facetSettings, grouping, keyColumn, layers, trend} = this.settings;\n\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeys.map(v => facetLabels[v]), //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.calculatedData.discreteAxisDataX,\n            this.calculatedData.discreteAxisDataY,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["isInheritMapping","value","getDiscreteAxisData","data","axis","column","keys","res","v","labelValue","ChartScatterplot","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","ScatterplotSettingsImpl","node","err","isErrorInfo","getUnknownErrorInfo","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","arraysAreDifferent","_b","_c","_d","l","prevData","prevKeys","key","x","y","facetBy","grouping","trend","layers","label","highlight","chartSettings","facetKeysLists","categoryGroupingKeysLists","columnName","facetKeysCombinations","getKeysCombinations","categoryGroupingCombinations","facetGroupingValues","onlyPositive","groupingColumns","dotsByFacets","getDots","facetKeys","MAX_FACETS_COUNT","errorInfo","trendsData","getRegressionData","discreteAxisDataX","discreteAxisDataY","MAX_GROUPS_COUNT","legendLabels","createLegendInfo","layersData","getLayersData","facetLabels","getFacetLabels","calculated","facetKey","i","inheritedAes","usedAes","usedAesFromPalettes","layer","addPalettesToAesMapping","trendInfo","id","facetSettings","keyColumn"],"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    ErrorInfoScatterplotGroupsX,\n    ErrorInfoScatterplotGroupsY} from '../types';\nimport {\n    type AesItem,\n    type AxisSettings,\n    type AxisSettingsDiscrete,\n    type Category,\n    type ColumnName,\n    type ContinuousAesFromColumn,\n    type ErrorInfoFacets,\n    getUnknownErrorInfo,\n    type InheritAesScatterplot,\n    isErrorInfo,\n    type ScatterplotEventHandlers,\n    type ScatterplotLegendInfo,\n    type 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';\nimport type { DiscreteAxisData } from './components/types';\nimport { MAX_FACETS_COUNT, MAX_GROUPS_COUNT } from '../constants';\nimport { getFacetLabels } from '../discrete/utils/getFacetLabels';\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\nfunction getDiscreteAxisData(data: DataFrame, axis: AxisSettings, column: ColumnName): DiscreteAxisData {\n    if (axis.scale === 'discrete') {\n        const keys = axis.keys ? axis.keys : data.getColumnCategories(column.value);\n        return {keys, labels: keys.reduce((res, v) => {\n            const labelsMap = axis.labels ?? {};\n            const labelValue = labelsMap[v] ?? (column.valueLabels ? data.getColumnValue(column.valueLabels, data.getColumnCategoryRowIndex(column.value, v as Category)) : v);\n            res[v] = String(labelValue);\n            return res;\n        }, {} as Record<string, string>)};\n    }\n    return {keys: [], labels: {}};\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        facetLabels: Record<string, string[]>;\n        trendsData: TrendsData | null;\n        legendLabels: ScatterplotLegendInfo;\n        layersData: Record<string, ScatterplotLayerData[]>;\n        discreteAxisDataX: DiscreteAxisData;\n        discreteAxisDataY: DiscreteAxisData;\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            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: 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            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            console.error(err);\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 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            arraysAreDifferent((prevSettings.chartSettings.xAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.xAxis as AxisSettingsDiscrete).keys) ||\n            arraysAreDifferent((prevSettings.chartSettings.yAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.yAxis as AxisSettingsDiscrete).keys) ||\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, dotSize, dotShape, trend, layers, label, highlight, chartSettings} = 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, chartSettings.xAxis, chartSettings.yAxis, layers.find(l => l.type === 'dots'));\n        const facetKeys = Object.keys(dotsByFacets);\n\n        if (facetKeys.length > MAX_FACETS_COUNT) {\n            const errorInfo: ErrorInfoFacets = {\n                type: 'tooManyFacets',\n                info: {count: facetKeys.length, maxCount: MAX_FACETS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n\n        const trendsData = getRegressionData(this.data, dotsByFacets, facetKeys, categoryGroupingCombinations, groupingColumns, trend);\n\n        const discreteAxisDataX = getDiscreteAxisData(this.data, chartSettings.xAxis, x);\n        const discreteAxisDataY = getDiscreteAxisData(this.data, chartSettings.yAxis, y);\n\n        if (discreteAxisDataX.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsX = {\n                type: 'tooManyScatterplotGroupsX',\n                info: {count: discreteAxisDataX.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        if (discreteAxisDataY.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsY = {\n                type: 'tooManyScatterplotGroupsY',\n                info: {count: discreteAxisDataY.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        const allAesMappings = [...grouping, ...dotSize, ...dotShape];\n        const legendLabels = createLegendInfo(this.data, allAesMappings, layers);\n        const layersData = getLayersData(this.data, layers, facetKeys, dotsByFacets, categoryGroupingCombinations, groupingColumns, chartSettings.xAxis, discreteAxisDataX);\n        const facetLabels = getFacetLabels(this.data, facetBy, facetKeys, facetKeysCombinations);\n\n        this.calculatedData = {\n            onlyPositive,\n            dotsByFacets,\n            facetKeys,\n            facetKeysCombinations,\n            facetLabels,\n            trendsData,\n            legendLabels,\n            layersData,\n            discreteAxisDataX,\n            discreteAxisDataY\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n        const {grouping, trend, layers, dotSize, dotShape} = 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        const allAesMappings = [...grouping, ...dotSize, ...dotShape];\n\n        allAesMappings.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 {facetLabels} = this.calculatedData;\n        const {id, chartSettings, facetSettings, grouping, dotSize, dotShape, keyColumn, layers, trend} = this.settings;\n\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeys.map(v => facetLabels[v]), //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), ...dotSize.map(v => v.columnName), ...dotShape.map(v => v.columnName)],\n            layers,\n            trend,\n            this.calculatedData.discreteAxisDataX,\n            this.calculatedData.discreteAxisDataY,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["isInheritMapping","value","getDiscreteAxisData","data","axis","column","keys","res","v","labelValue","ChartScatterplot","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","ScatterplotSettingsImpl","node","err","isErrorInfo","getUnknownErrorInfo","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","arraysAreDifferent","_b","_c","_d","l","prevData","prevKeys","key","x","y","facetBy","grouping","dotSize","dotShape","trend","layers","label","highlight","chartSettings","facetKeysLists","categoryGroupingKeysLists","columnName","facetKeysCombinations","getKeysCombinations","categoryGroupingCombinations","facetGroupingValues","onlyPositive","groupingColumns","dotsByFacets","getDots","facetKeys","MAX_FACETS_COUNT","errorInfo","trendsData","getRegressionData","discreteAxisDataX","discreteAxisDataY","MAX_GROUPS_COUNT","allAesMappings","legendLabels","createLegendInfo","layersData","getLayersData","facetLabels","getFacetLabels","calculated","facetKey","i","inheritedAes","usedAes","usedAesFromPalettes","layer","addPalettesToAesMapping","trendInfo","id","facetSettings","keyColumn"],"mappings":"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"}

package/dist/scatterplot/utils/createLegendInfo.js

@@ -14,10 +14,10 @@ const I = /* @__PURE__ */ (() => {
 function v(t, f, d) {
   I.clear();
   const u = d && Object.keys(d).length > 0, l = f.dotFill, e = l && l.length > 0, n = f.lineColor, C = n && n.length > 0;
-  return (g, i) => {
+  return (h, i) => {
     var o;
-    const a = u ? (o = d[g]) == null ? void 0 : o[i] : void 0;
-    return i === "dotFill" && e ? l[I.getIndex(t, g) % l.length] ?? a : i === "lineColor" && C ? n[I.getIndex(t, g) % n.length] ?? a : a;
+    const a = u ? (o = d[h]) == null ? void 0 : o[i] : void 0;
+    return i === "dotFill" && e ? l[I.getIndex(t, h) % l.length] ?? a : i === "lineColor" && C ? n[I.getIndex(t, h) % n.length] ?? a : a;
   };
 }
 function A(t) {
@@ -25,14 +25,14 @@ function A(t) {
 }
 function F(t, f, d) {
   return f.reduce((u, l) => {
-    const e = l.columnName, n = l.order, C = (o) => e.valueLabels ? t.getColumnValueCategory(e.valueLabels, o) : void 0, h = /* @__PURE__ */ new Set(), g = {};
+    const e = l.columnName, n = l.order, C = (o) => e.valueLabels ? t.getColumnValueCategory(e.valueLabels, o) : void 0, g = /* @__PURE__ */ new Set(), h = {};
     d.forEach((o) => {
       o.aes && Object.entries(o.aes).forEach(([c, r]) => {
-        A(r) && r.value === e.value && (h.add(c), g[c] = r.palette);
+        A(r) && r.value === e.value && (g.add(c), h[c] = r.palette);
       });
     });
     let i = {}, a = [];
-    if (h.has("dotFill") || h.has("dotShape")) {
+    if (g.has("dotFill") || g.has("dotShape") || g.has("lineColor")) {
       const o = t.getColumnCategories(e.value, !1);
       if (o.length < x) {
         i = o.reduce((r, s) => {
@@ -49,8 +49,8 @@ function F(t, f, d) {
     }
     return u[e.value] = {
       values: a,
-      usedAes: [...h],
-      aesMap: v(e, g, l.inheritedAes),
+      usedAes: [...g],
+      aesMap: v(e, h, l.inheritedAes),
       labels: i
     }, u;
   }, {});

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 {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, false);\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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"}
+{"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') || usedAes.has('lineColor')) {\n            const categories = data.getColumnCategories(column.value, false);\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/types/scatterplot.d.ts

@@ -1347,6 +1347,126 @@ export declare const ScatterplotSettingsSchema: z.ZodObject<{
         }> | undefined;
         allowNullGroup?: boolean | undefined;
     }>, "many">>;
+    dotSize: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        columnName: z.ZodObject<{
+            type: z.ZodLiteral<"column">;
+            value: z.ZodString;
+            format: z.ZodOptional<z.ZodString>;
+            label: z.ZodOptional<z.ZodString>;
+            valueLabels: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        }, {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+    }, {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+    }>, "many">>;
+    dotShape: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        columnName: z.ZodObject<{
+            type: z.ZodLiteral<"column">;
+            value: z.ZodString;
+            format: z.ZodOptional<z.ZodString>;
+            label: z.ZodOptional<z.ZodString>;
+            valueLabels: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        }, {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        }>;
+        order: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodNull]>, "many">>;
+        inheritedAes: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+            fillColor: z.ZodOptional<z.ZodString>;
+            lineColor: z.ZodOptional<z.ZodString>;
+            lineWidth: z.ZodOptional<z.ZodNumber>;
+            lineShape: z.ZodOptional<z.ZodEnum<["solid", "dashed", "dotted", "dotdash", "longdash", "twodash"]>>;
+            dotShape: z.ZodOptional<z.ZodEnum<["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "20", "21", "22", "23", "24", "25"]>>;
+            dotSize: z.ZodOptional<z.ZodNumber>;
+            dotFill: z.ZodOptional<z.ZodString>;
+        }, "strip", z.ZodTypeAny, {
+            dotFill?: string | undefined;
+            dotShape?: "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "20" | "21" | "22" | "23" | "24" | "25" | undefined;
+            dotSize?: number | undefined;
+            lineWidth?: number | undefined;
+            lineShape?: "solid" | "dashed" | "dotted" | "dotdash" | "longdash" | "twodash" | undefined;
+            lineColor?: string | undefined;
+            fillColor?: string | undefined;
+        }, {
+            dotFill?: string | undefined;
+            dotShape?: "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "20" | "21" | "22" | "23" | "24" | "25" | undefined;
+            dotSize?: number | undefined;
+            lineWidth?: number | undefined;
+            lineShape?: "solid" | "dashed" | "dotted" | "dotdash" | "longdash" | "twodash" | undefined;
+            lineColor?: string | undefined;
+            fillColor?: string | undefined;
+        }>>>;
+    }, "strip", z.ZodTypeAny, {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+        order?: (string | number | null)[] | undefined;
+        inheritedAes?: Record<string, {
+            dotFill?: string | undefined;
+            dotShape?: "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "20" | "21" | "22" | "23" | "24" | "25" | undefined;
+            dotSize?: number | undefined;
+            lineWidth?: number | undefined;
+            lineShape?: "solid" | "dashed" | "dotted" | "dotdash" | "longdash" | "twodash" | undefined;
+            lineColor?: string | undefined;
+            fillColor?: string | undefined;
+        }> | undefined;
+    }, {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+        order?: (string | number | null)[] | undefined;
+        inheritedAes?: Record<string, {
+            dotFill?: string | undefined;
+            dotShape?: "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "20" | "21" | "22" | "23" | "24" | "25" | undefined;
+            dotSize?: number | undefined;
+            lineWidth?: number | undefined;
+            lineShape?: "solid" | "dashed" | "dotted" | "dotdash" | "longdash" | "twodash" | undefined;
+            lineColor?: string | undefined;
+            fillColor?: string | undefined;
+        }> | undefined;
+    }>, "many">>;
     facetBy: z.ZodOptional<z.ZodArray<z.ZodObject<{
         type: z.ZodLiteral<"column">;
         value: z.ZodString;
@@ -2040,6 +2160,34 @@ export declare const ScatterplotSettingsSchema: z.ZodObject<{
         }> | undefined;
         allowNullGroup?: boolean | undefined;
     }[] | undefined;
+    dotShape?: {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+        order?: (string | number | null)[] | undefined;
+        inheritedAes?: Record<string, {
+            dotFill?: string | undefined;
+            dotShape?: "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "20" | "21" | "22" | "23" | "24" | "25" | undefined;
+            dotSize?: number | undefined;
+            lineWidth?: number | undefined;
+            lineShape?: "solid" | "dashed" | "dotted" | "dotdash" | "longdash" | "twodash" | undefined;
+            lineColor?: string | undefined;
+            fillColor?: string | undefined;
+        }> | undefined;
+    }[] | undefined;
+    dotSize?: {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+    }[] | undefined;
     legend?: {
         show?: boolean | undefined;
         position?: "right" | "inside" | "top" | "bottom" | undefined;
@@ -2285,6 +2433,34 @@ export declare const ScatterplotSettingsSchema: z.ZodObject<{
         }> | undefined;
         allowNullGroup?: boolean | undefined;
     }[] | undefined;
+    dotShape?: {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+        order?: (string | number | null)[] | undefined;
+        inheritedAes?: Record<string, {
+            dotFill?: string | undefined;
+            dotShape?: "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" | "10" | "11" | "12" | "13" | "14" | "15" | "16" | "17" | "18" | "20" | "21" | "22" | "23" | "24" | "25" | undefined;
+            dotSize?: number | undefined;
+            lineWidth?: number | undefined;
+            lineShape?: "solid" | "dashed" | "dotted" | "dotdash" | "longdash" | "twodash" | undefined;
+            lineColor?: string | undefined;
+            fillColor?: string | undefined;
+        }> | undefined;
+    }[] | undefined;
+    dotSize?: {
+        columnName: {
+            type: "column";
+            value: string;
+            format?: string | undefined;
+            label?: string | undefined;
+            valueLabels?: string | undefined;
+        };
+    }[] | undefined;
     legend?: {
         show?: boolean | undefined;
         position?: "right" | "inside" | "top" | "bottom" | undefined;

package/dist/types/scatterplot.js

@@ -1,84 +1,96 @@
-import { continuousAesMappingFromValueSchema as l, PointShapeSchema as m, LineShapeSchema as S, ColumnNameSchema as i, AesRecordSchema as y, DataValueSchema as u, AxisSettingsSchema as h, FrameTypeSchema as g, TooltipSettingsSchema as d, LegendPositionSchema as T, TitlePositionSchema as b } from "./common.js";
-import { object as t, optional as e, string as o, literal as c, array as r, union as s, number as a, boolean as n } from "../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js";
-const p = t({
+import { continuousAesMappingFromValueSchema as l, PointShapeSchema as y, LineShapeSchema as u, ColumnNameSchema as t, AesRecordSchema as h, DataValueSchema as m, AxisSettingsSchema as S, FrameTypeSchema as d, TooltipSettingsSchema as g, LegendPositionSchema as T, TitlePositionSchema as b } from "./common.js";
+import { object as o, optional as e, string as a, literal as c, array as i, union as r, number as n, boolean as s } from "../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js";
+const p = o({
   type: c("grouping"),
-  value: o(),
+  value: a(),
   // link to aes mapped to column
-  palette: e(r(o()))
+  palette: e(i(a()))
   // if defined we use palette to create mapping without inheritedAes field
-}), A = t({
+}), A = o({
   type: c("dots"),
   aes: e(
-    t({
-      dotFill: e(s([o(), p, l(o())])),
-      dotShape: e(s([m, p])),
-      dotSize: e(s([a(), l(a())]))
+    o({
+      dotFill: e(r([a(), p, l(a())])),
+      dotShape: e(r([y, p])),
+      dotSize: e(r([n(), l(n())]))
     })
   )
-}), x = t({
+}), x = o({
   type: c("curve"),
-  smoothing: e(n()),
+  smoothing: e(s()),
   aes: e(
-    t({
-      lineWidth: e(a()),
-      lineShape: e(S),
-      lineColor: e(s([o(), p, l(o())])),
-      opacity: e(a())
+    o({
+      lineWidth: e(n()),
+      lineShape: e(u),
+      lineColor: e(r([a(), p, l(a())])),
+      opacity: e(n())
     })
   )
-}), f = s([A, x]), L = t({
+}), f = r([A, x]), L = o({
   type: c("scatterplot"),
-  title: t({
-    name: o(),
-    show: e(n()),
+  title: o({
+    name: a(),
+    show: e(s()),
     position: e(b)
   }),
   size: e(
-    t({
-      width: e(a()),
-      height: e(a())
+    o({
+      width: e(n()),
+      height: e(n())
     })
   ),
   legend: e(
-    t({
-      show: e(n()),
+    o({
+      show: e(s()),
       position: e(T)
     })
   ),
-  tooltips: e(d),
-  frame: e(t({ type: e(g) })),
+  tooltips: e(g),
+  frame: e(o({ type: e(d) })),
   facetSettings: e(
-    t({
-      sharedX: e(n()),
-      sharedY: e(n()),
-      nRows: e(a()),
-      nCols: e(a())
+    o({
+      sharedX: e(s()),
+      sharedY: e(s()),
+      nRows: e(n()),
+      nCols: e(n())
     })
   ),
-  keyColumn: i,
-  x: i,
-  y: i,
-  xAxis: e(h),
-  yAxis: e(h),
-  grouping: e(r(
-    t({
-      columnName: i,
-      order: e(r(u)),
-      inheritedAes: e(y),
-      allowNullGroup: e(n())
+  keyColumn: t,
+  x: t,
+  y: t,
+  xAxis: e(S),
+  yAxis: e(S),
+  grouping: e(i(
+    o({
+      columnName: t,
+      order: e(i(m)),
+      inheritedAes: e(h),
+      allowNullGroup: e(s())
     })
   )),
-  facetBy: e(r(i)),
-  label: e(i),
-  highlight: e(i),
+  dotSize: e(i(
+    o({
+      columnName: t
+    })
+  )),
+  dotShape: e(i(
+    o({
+      columnName: t,
+      order: e(i(m)),
+      inheritedAes: e(h)
+    })
+  )),
+  facetBy: e(i(t)),
+  label: e(t),
+  highlight: e(t),
   trend: e(
-    t({
-      color: e(e(s([o(), p, l(o())]))),
-      bounded: e(n())
+    o({
+      color: e(e(r([a(), p, l(a())]))),
+      bounded: e(s())
       // if true: line and area bounded with min and max X value; else line bounded by chart bounds
     })
   ),
-  layers: r(f)
+  layers: i(f)
 });
 export {
   L as ScatterplotSettingsSchema

package/dist/types/scatterplot.js.map

@@ -1 +1 @@
-{"version":3,"file":"scatterplot.js","sources":["../../src/types/scatterplot.ts"],"sourcesContent":["import { z } from 'zod';\nimport type { AesItem, categoricalAesMappingFromValueSchema, Category, DataValue } from './common';\nimport {\n    AesRecordSchema, AxisSettingsSchema,\n    ColumnNameSchema,\n    continuousAesMappingFromValueSchema, DataValueSchema,\n    FrameTypeSchema,\n    LegendPositionSchema,\n    LineShapeSchema,\n    PointShapeSchema,\n    TitlePositionSchema,\n    TooltipSettingsSchema,\n} from './common';\n\ntype catAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof categoricalAesMappingFromValueSchema<ValueType>>;\ntype contAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof continuousAesMappingFromValueSchema<ValueType>>;\n\nexport type CategoricalAesFromColumn<ValueType> = z.infer<catAesFromColumn<z.ZodType<ValueType>>>;\nexport type ContinuousAesFromColumn<ValueType> = z.infer<contAesFromColumn<z.ZodType<ValueType>>>;\n\nconst InheritAesSchema = z.object({\n    type: z.literal('grouping'),\n    value: z.string(), // link to aes mapped to column\n    palette: z.optional(z.array(z.string())) // if defined we use palette to create mapping without inheritedAes field\n});\nexport type InheritAesScatterplot = z.infer<typeof InheritAesSchema>;\n\nconst DotsLayerSchema = z.object({\n    type: z.literal('dots'),\n    aes: z.optional(\n        z.object({\n            dotFill: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            dotShape: z.optional(z.union([PointShapeSchema, InheritAesSchema])),\n            dotSize: z.optional(z.union([z.number(), continuousAesMappingFromValueSchema(z.number())])),\n        })\n    ),\n});\nconst CurveLayerSchema = z.object({\n    type: z.literal('curve'),\n    smoothing: z.optional(z.boolean()),\n    aes: z.optional(\n        z.object({\n            lineWidth: z.optional(z.number()),\n            lineShape: z.optional(LineShapeSchema),\n            lineColor: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            opacity: z.optional(z.number()),\n        })\n    ),\n});\nconst ScatterplotLayerSchema = z.union([DotsLayerSchema, CurveLayerSchema]);\n\nexport type DotsLayer = z.infer<typeof DotsLayerSchema>;\nexport type CurveLayer = z.infer<typeof CurveLayerSchema>;\nexport type ScatterplotLayer = z.infer<typeof ScatterplotLayerSchema>;\n\nexport const ScatterplotSettingsSchema = z.object({\n    type: z.literal('scatterplot'),\n    title: z.object({\n        name: z.string(),\n        show: z.optional(z.boolean()),\n        position: z.optional(TitlePositionSchema),\n    }),\n    size: z.optional(\n        z.object({\n            width: z.optional(z.number()),\n            height: z.optional(z.number()),\n        })\n    ),\n    legend: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            position: z.optional(LegendPositionSchema),\n        })\n    ),\n    tooltips: z.optional(TooltipSettingsSchema),\n    frame: z.optional(z.object({type: z.optional(FrameTypeSchema)})),\n    facetSettings: z.optional(\n        z.object({\n            sharedX: z.optional(z.boolean()),\n            sharedY: z.optional(z.boolean()),\n            nRows: z.optional(z.number()),\n            nCols: z.optional(z.number()),\n        })\n    ),\n    keyColumn: ColumnNameSchema,\n    x: ColumnNameSchema,\n    y: ColumnNameSchema,\n    xAxis: z.optional(AxisSettingsSchema),\n    yAxis: z.optional(AxisSettingsSchema),\n    grouping: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n            order: z.optional(z.array(DataValueSchema)),\n            inheritedAes: z.optional(AesRecordSchema),\n            allowNullGroup: z.optional(z.boolean())\n        })\n    )),\n    facetBy: z.optional(z.array(ColumnNameSchema)),\n    label: z.optional(ColumnNameSchema),\n    highlight: z.optional(ColumnNameSchema),\n    trend: z.optional(\n        z.object({\n            color: z.optional(z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())]))),\n            bounded: z.optional(z.boolean()), // if true: line and area bounded with min and max X value; else line bounded by chart bounds\n        })\n    ),\n    layers: z.array(ScatterplotLayerSchema),\n});\n\nexport type ScatterplotSettings = z.infer<typeof ScatterplotSettingsSchema>;\n\nexport type ScatterplotLegendInfo = Record<\n    string,\n    {\n        values: Category[];\n        usedAes: (keyof AesItem)[];\n        aesMap: (value: Category, field: keyof AesItem) => undefined | DataValue;\n        labels: Record<Category, string>;\n    }\n>;\n"],"names":["InheritAesSchema","z.object","z.literal","z.string","z.optional","z.array","DotsLayerSchema","z.union","continuousAesMappingFromValueSchema","PointShapeSchema","z.number","CurveLayerSchema","z.boolean","LineShapeSchema","ScatterplotLayerSchema","ScatterplotSettingsSchema","TitlePositionSchema","LegendPositionSchema","TooltipSettingsSchema","FrameTypeSchema","ColumnNameSchema","AxisSettingsSchema","DataValueSchema","AesRecordSchema"],"mappings":";;AAoBA,MAAMA,IAAmBC,EAAS;AAAA,EAC9B,MAAMC,EAAU,UAAU;AAAA,EAC1B,OAAOC,EAAE;AAAA;AAAA,EACT,SAASC,EAAWC,EAAQF,GAAU,CAAC;AAAA;AAC3C,CAAC,GAGKG,IAAkBL,EAAS;AAAA,EAC7B,MAAMC,EAAU,MAAM;AAAA,EACtB,KAAKE;AAAAA,IACDH,EAAS;AAAA,MACL,SAASG,EAAWG,EAAQ,CAACJ,EAAE,GAAUH,GAAkBQ,EAAoCL,GAAU,CAAC,CAAC,CAAC;AAAA,MAC5G,UAAUC,EAAWG,EAAQ,CAACE,GAAkBT,CAAgB,CAAC,CAAC;AAAA,MAClE,SAASI,EAAWG,EAAQ,CAACG,EAAE,GAAUF,EAAoCE,EAAE,CAAQ,CAAC,CAAC,CAAC;AAAA,IAAA,CAC7F;AAAA,EAAA;AAET,CAAC,GACKC,IAAmBV,EAAS;AAAA,EAC9B,MAAMC,EAAU,OAAO;AAAA,EACvB,WAAWE,EAAWQ,GAAW;AAAA,EACjC,KAAKR;AAAAA,IACDH,EAAS;AAAA,MACL,WAAWG,EAAWM,GAAU;AAAA,MAChC,WAAWN,EAAWS,CAAe;AAAA,MACrC,WAAWT,EAAWG,EAAQ,CAACJ,EAAE,GAAUH,GAAkBQ,EAAoCL,GAAU,CAAC,CAAC,CAAC;AAAA,MAC9G,SAASC,EAAWM,GAAU;AAAA,IAAA,CACjC;AAAA,EAAA;AAET,CAAC,GACKI,IAAyBP,EAAQ,CAACD,GAAiBK,CAAgB,CAAC,GAM7DI,IAA4Bd,EAAS;AAAA,EAC9C,MAAMC,EAAU,aAAa;AAAA,EAC7B,OAAOD,EAAS;AAAA,IACZ,MAAME,EAAE;AAAA,IACR,MAAMC,EAAWQ,GAAW;AAAA,IAC5B,UAAUR,EAAWY,CAAmB;AAAA,EAAA,CAC3C;AAAA,EACD,MAAMZ;AAAAA,IACFH,EAAS;AAAA,MACL,OAAOG,EAAWM,GAAU;AAAA,MAC5B,QAAQN,EAAWM,GAAU;AAAA,IAAA,CAChC;AAAA,EAAA;AAAA,EAEL,QAAQN;AAAAA,IACJH,EAAS;AAAA,MACL,MAAMG,EAAWQ,GAAW;AAAA,MAC5B,UAAUR,EAAWa,CAAoB;AAAA,IAAA,CAC5C;AAAA,EAAA;AAAA,EAEL,UAAUb,EAAWc,CAAqB;AAAA,EAC1C,OAAOd,EAAWH,EAAS,EAAC,MAAMG,EAAWe,CAAe,EAAA,CAAE,CAAC;AAAA,EAC/D,eAAef;AAAAA,IACXH,EAAS;AAAA,MACL,SAASG,EAAWQ,GAAW;AAAA,MAC/B,SAASR,EAAWQ,GAAW;AAAA,MAC/B,OAAOR,EAAWM,GAAU;AAAA,MAC5B,OAAON,EAAWM,GAAU;AAAA,IAAA,CAC/B;AAAA,EAAA;AAAA,EAEL,WAAWU;AAAA,EACX,GAAGA;AAAA,EACH,GAAGA;AAAA,EACH,OAAOhB,EAAWiB,CAAkB;AAAA,EACpC,OAAOjB,EAAWiB,CAAkB;AAAA,EACpC,UAAUjB,EAAWC;AAAAA,IACjBJ,EAAS;AAAA,MACL,YAAYmB;AAAA,MACZ,OAAOhB,EAAWC,EAAQiB,CAAe,CAAC;AAAA,MAC1C,cAAclB,EAAWmB,CAAe;AAAA,MACxC,gBAAgBnB,EAAWQ,GAAW;AAAA,IAAA,CACzC;AAAA,EAAA,CACJ;AAAA,EACD,SAASR,EAAWC,EAAQe,CAAgB,CAAC;AAAA,EAC7C,OAAOhB,EAAWgB,CAAgB;AAAA,EAClC,WAAWhB,EAAWgB,CAAgB;AAAA,EACtC,OAAOhB;AAAAA,IACHH,EAAS;AAAA,MACL,OAAOG,EAAWA,EAAWG,EAAQ,CAACJ,KAAYH,GAAkBQ,EAAoCL,GAAU,CAAC,CAAC,CAAC,CAAC;AAAA,MACtH,SAASC,EAAWQ,GAAW;AAAA;AAAA,IAAA,CAClC;AAAA,EAAA;AAAA,EAEL,QAAQP,EAAQS,CAAsB;AAC1C,CAAC;"}
+{"version":3,"file":"scatterplot.js","sources":["../../src/types/scatterplot.ts"],"sourcesContent":["import { z } from 'zod';\nimport type { AesItem, categoricalAesMappingFromValueSchema, Category, DataValue } from './common';\nimport {\n    AesRecordSchema, AxisSettingsSchema,\n    ColumnNameSchema,\n    continuousAesMappingFromValueSchema, DataValueSchema,\n    FrameTypeSchema,\n    LegendPositionSchema,\n    LineShapeSchema,\n    PointShapeSchema,\n    TitlePositionSchema,\n    TooltipSettingsSchema,\n} from './common';\n\ntype catAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof categoricalAesMappingFromValueSchema<ValueType>>;\ntype contAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof continuousAesMappingFromValueSchema<ValueType>>;\n\nexport type CategoricalAesFromColumn<ValueType> = z.infer<catAesFromColumn<z.ZodType<ValueType>>>;\nexport type ContinuousAesFromColumn<ValueType> = z.infer<contAesFromColumn<z.ZodType<ValueType>>>;\n\nconst InheritAesSchema = z.object({\n    type: z.literal('grouping'),\n    value: z.string(), // link to aes mapped to column\n    palette: z.optional(z.array(z.string())) // if defined we use palette to create mapping without inheritedAes field\n});\nexport type InheritAesScatterplot = z.infer<typeof InheritAesSchema>;\n\nconst DotsLayerSchema = z.object({\n    type: z.literal('dots'),\n    aes: z.optional(\n        z.object({\n            dotFill: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            dotShape: z.optional(z.union([PointShapeSchema, InheritAesSchema])),\n            dotSize: z.optional(z.union([z.number(), continuousAesMappingFromValueSchema(z.number())])),\n        })\n    ),\n});\nconst CurveLayerSchema = z.object({\n    type: z.literal('curve'),\n    smoothing: z.optional(z.boolean()),\n    aes: z.optional(\n        z.object({\n            lineWidth: z.optional(z.number()),\n            lineShape: z.optional(LineShapeSchema),\n            lineColor: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            opacity: z.optional(z.number()),\n        })\n    ),\n});\nconst ScatterplotLayerSchema = z.union([DotsLayerSchema, CurveLayerSchema]);\n\nexport type DotsLayer = z.infer<typeof DotsLayerSchema>;\nexport type CurveLayer = z.infer<typeof CurveLayerSchema>;\nexport type ScatterplotLayer = z.infer<typeof ScatterplotLayerSchema>;\n\nexport const ScatterplotSettingsSchema = z.object({\n    type: z.literal('scatterplot'),\n    title: z.object({\n        name: z.string(),\n        show: z.optional(z.boolean()),\n        position: z.optional(TitlePositionSchema),\n    }),\n    size: z.optional(\n        z.object({\n            width: z.optional(z.number()),\n            height: z.optional(z.number()),\n        })\n    ),\n    legend: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            position: z.optional(LegendPositionSchema),\n        })\n    ),\n    tooltips: z.optional(TooltipSettingsSchema),\n    frame: z.optional(z.object({type: z.optional(FrameTypeSchema)})),\n    facetSettings: z.optional(\n        z.object({\n            sharedX: z.optional(z.boolean()),\n            sharedY: z.optional(z.boolean()),\n            nRows: z.optional(z.number()),\n            nCols: z.optional(z.number()),\n        })\n    ),\n    keyColumn: ColumnNameSchema,\n    x: ColumnNameSchema,\n    y: ColumnNameSchema,\n    xAxis: z.optional(AxisSettingsSchema),\n    yAxis: z.optional(AxisSettingsSchema),\n    grouping: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n            order: z.optional(z.array(DataValueSchema)),\n            inheritedAes: z.optional(AesRecordSchema),\n            allowNullGroup: z.optional(z.boolean())\n        })\n    )),\n    dotSize: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n        })\n    )),\n    dotShape: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n            order: z.optional(z.array(DataValueSchema)),\n            inheritedAes: z.optional(AesRecordSchema),\n        })\n    )),\n    facetBy: z.optional(z.array(ColumnNameSchema)),\n    label: z.optional(ColumnNameSchema),\n    highlight: z.optional(ColumnNameSchema),\n    trend: z.optional(\n        z.object({\n            color: z.optional(z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())]))),\n            bounded: z.optional(z.boolean()), // if true: line and area bounded with min and max X value; else line bounded by chart bounds\n        })\n    ),\n    layers: z.array(ScatterplotLayerSchema),\n});\n\nexport type ScatterplotSettings = z.infer<typeof ScatterplotSettingsSchema>;\n\nexport type ScatterplotLegendInfo = Record<\n    string,\n    {\n        values: Category[];\n        usedAes: (keyof AesItem)[];\n        aesMap: (value: Category, field: keyof AesItem) => undefined | DataValue;\n        labels: Record<Category, string>;\n    }\n>;\n"],"names":["InheritAesSchema","z.object","z.literal","z.string","z.optional","z.array","DotsLayerSchema","z.union","continuousAesMappingFromValueSchema","PointShapeSchema","z.number","CurveLayerSchema","z.boolean","LineShapeSchema","ScatterplotLayerSchema","ScatterplotSettingsSchema","TitlePositionSchema","LegendPositionSchema","TooltipSettingsSchema","FrameTypeSchema","ColumnNameSchema","AxisSettingsSchema","DataValueSchema","AesRecordSchema"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/miplots4",
-  "version": "1.0.167",
+  "version": "1.0.169",
   "description": "Data visualization library",
   "author": "erohinaelena",
   "license": "ISC",
@@ -68,7 +68,7 @@
     "@types/react-dom": "^18.3.0",
     "@milaboratories/build-configs": "^1.0.5",
     "@milaboratories/ts-configs": "^1.2.0",
-    "@milaboratories/ts-builder": "^1.2.1",
+    "@milaboratories/ts-builder": "^1.2.4",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-import-helpers": "^2.0.1",
     "@typescript-eslint/eslint-plugin": "^8.48.0",