@milaboratories/graph-maker 1.1.138 → 1.1.140

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/components/ChartTrendsData.js

@@ -1,23 +1,23 @@
 import { j as n } from "../../node_modules/react/jsx-runtime.js";
-import $ from "../../node_modules/lodash/lodash.js";
+import { l as $ } from "../../node_modules/lodash/lodash.js";
 import { r as g } from "../../_virtual/index.js";
 import { numberFormat as i } from "../../utils/numberFormat.js";
 const k = g.memo(({
-  width: t,
-  scales: e,
+  width: e,
+  scales: t,
   trendsData: r,
   aesGetters: s
-}) => r && r.map(({ predict: o, getArea: f, data: m, bounded: h, xBounds: j, stats: y }, c) => {
-  const [l, a] = h ? j : e.x.domain(), x = (a - l) / 15, d = o(l), u = o(a);
-  if (isNaN(d) || isNaN(u))
+}) => r && r.map(({ idx: a, predict: c, getArea: m, bounded: h, xBounds: j, stats: y }, d) => {
+  const [l, o] = h ? j : t.x.domain(), u = (o - l) / 15, x = c(l), f = c(o);
+  if (isNaN(x) || isNaN(f))
     return null;
-  const p = s.trendColor(m);
+  const p = s.trendColor(a);
   return /* @__PURE__ */ n.jsxs("g", { children: [
-    /* @__PURE__ */ n.jsx("text", { y: c * 20 + 20, fill: p, x: t - 8, textAnchor: "end", children: C(y) }),
+    /* @__PURE__ */ n.jsx("text", { y: d * 20 + 20, fill: p, x: e - 8, textAnchor: "end", children: C(y) }),
     /* @__PURE__ */ n.jsx(
       "path",
       {
-        d: f(e.x, e.y, $.range(l, a + x / 2, x)),
+        d: m(t.x, t.y, $.range(l, o + u / 2, u)),
         fill: p,
         opacity: 0.2
       }
@@ -25,38 +25,38 @@ const k = g.memo(({
     /* @__PURE__ */ n.jsx(
       "line",
       {
-        x1: e.x(l),
-        x2: e.x(a),
-        y1: e.y(d),
-        y2: e.y(u),
+        x1: t.x(l),
+        x2: t.x(o),
+        y1: t.y(x),
+        y2: t.y(f),
         stroke: p
       }
     )
-  ] }, c);
+  ] }, d);
 }));
-function N(t) {
-  return typeof t.r2 > "u" ? null : /* @__PURE__ */ n.jsxs(n.Fragment, { children: [
+function N(e) {
+  return typeof e.r2 > "u" ? null : /* @__PURE__ */ n.jsxs(n.Fragment, { children: [
     /* @__PURE__ */ n.jsx("tspan", { children: "R" }),
     /* @__PURE__ */ n.jsx("tspan", { fontSize: "10px", dy: "-8", children: "2" }),
-    /* @__PURE__ */ n.jsx("tspan", { dy: "8", children: ` = ${i(t.r2)}` })
+    /* @__PURE__ */ n.jsx("tspan", { dy: "8", children: ` = ${i(e.r2)}` })
   ] });
 }
-function F(t) {
-  return typeof t.pValue > "u" ? null : /* @__PURE__ */ n.jsx("tspan", { children: `p-value = ${i(t.pValue)}` });
+function F(e) {
+  return typeof e.pValue > "u" ? null : /* @__PURE__ */ n.jsx("tspan", { children: `p-value = ${i(e.pValue)}` });
 }
-function b(t) {
-  if (typeof t.coefficients > "u")
+function b(e) {
+  if (typeof e.coefficients > "u")
     return null;
-  const { slope: e, slopeError: r, intercept: s, interceptError: o } = t.coefficients;
-  return /* @__PURE__ */ n.jsx("tspan", { children: /* @__PURE__ */ n.jsx("tspan", { children: `slope = ${i(e)} ± ${i(r)}, intercept = ${i(s)} ± ${i(o)}` }) });
+  const { slope: t, slopeError: r, intercept: s, interceptError: a } = e.coefficients;
+  return /* @__PURE__ */ n.jsx("tspan", { children: /* @__PURE__ */ n.jsx("tspan", { children: `slope = ${i(t)} ± ${i(r)}, intercept = ${i(s)} ± ${i(a)}` }) });
 }
-function C(t) {
-  const e = [N(t), F(t), b(t)].filter(
+function C(e) {
+  const t = [N(e), F(e), b(e)].filter(
     (r) => r !== null
   );
-  return /* @__PURE__ */ n.jsx(n.Fragment, { children: e.map((r, s) => /* @__PURE__ */ n.jsxs("tspan", { children: [
+  return /* @__PURE__ */ n.jsx(n.Fragment, { children: t.map((r, s) => /* @__PURE__ */ n.jsxs("tspan", { children: [
     r,
-    /* @__PURE__ */ n.jsx("tspan", { children: s < e.length - 1 && ", " })
+    /* @__PURE__ */ n.jsx("tspan", { children: s < t.length - 1 && ", " })
   ] }, s)) });
 }
 export {

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/components/ChartTrendsData.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChartTrendsData.js","sources":["../../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/components/ChartTrendsData.tsx"],"sourcesContent":["import lodash from 'lodash';\nimport { memo, type ReactElement } from 'react';\nimport { numberFormat } from '../../utils/numberFormat';\nimport type { TrendsData } from '../linearRegression';\nimport type {\n    AesGetters,\n    ChartScales\n} from './types';\n\ninterface Props {\n    trendsData: TrendsData[keyof TrendsData] | null;\n    width: number;\n    scales: ChartScales;\n    aesGetters: AesGetters;\n}\n\nexport const ChartTrendsData = memo(({\n    width,\n    scales,\n    trendsData,\n    aesGetters,\n}: Props) => {\n    return (trendsData &&\n        trendsData.map(({predict, getArea, data, bounded, xBounds, stats}, idx) => {\n            const [minX, maxX] = bounded ? xBounds : scales.x.domain();\n            const step = (maxX - minX) / 15;\n            const p1 = predict(minX);\n            const p2 = predict(maxX);\n            if (isNaN(p1) || isNaN(p2)) {\n                return null;\n            }\n            const fillColor = aesGetters.trendColor(data);\n            return (\n                <g key={idx}>\n                    <text y={idx * 20 + 20} fill={fillColor} x={width - 8} textAnchor=\"end\">\n                        {formatStats(stats)}\n                    </text>\n                    <path\n                        d={getArea(scales.x, scales.y, lodash.range(minX, maxX + step / 2, step))}\n                        fill={fillColor}\n                        opacity={0.2}\n                    />\n                    <line\n                        x1={scales.x(minX)}\n                        x2={scales.x(maxX)}\n                        y1={scales.y(p1)}\n                        y2={scales.y(p2)}\n                        stroke={fillColor}\n                    />\n                </g>\n            );\n        })\n    );\n});\n\nfunction formatR2(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    if (typeof stats.r2 === 'undefined') {\n        return null;\n    }\n    return (\n        <>\n            <tspan>R</tspan>\n            <tspan fontSize=\"10px\" dy=\"-8\">\n                2\n            </tspan>\n            <tspan dy=\"8\">{` = ${numberFormat(stats.r2)}`}</tspan>\n        </>\n    );\n}\n\nfunction formatPValue(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    if (typeof stats.pValue === 'undefined') {\n        return null;\n    }\n    return <tspan>{`p-value = ${numberFormat(stats.pValue)}`}</tspan>;\n}\n\nfunction formatCoefficients(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    if (typeof stats.coefficients === 'undefined') {\n        return null;\n    }\n    const {slope, slopeError, intercept, interceptError} = stats.coefficients;\n    return (\n        <tspan>\n            <tspan>\n                {`slope = ${numberFormat(slope)} ± ${numberFormat(slopeError)}, intercept = ${numberFormat(intercept)} ± ${numberFormat(interceptError)}`}\n            </tspan>\n        </tspan>\n    );\n}\n\nfunction formatStats(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    const items = [formatR2(stats), formatPValue(stats), formatCoefficients(stats)].filter(\n        value => value !== null\n    ) as unknown as ReactElement[];\n    return (\n        <>\n            {items.map((item, idx) => (\n                <tspan key={idx}>\n                    {item}\n                    <tspan>{idx < items.length - 1 && ', '}</tspan>\n                </tspan>\n            ))}\n        </>\n    );\n}\n\n"],"names":["ChartTrendsData","memo","width","scales","trendsData","aesGetters","predict","getArea","data","bounded","xBounds","stats","idx","minX","maxX","step","p1","p2","fillColor","n","jsx","formatStats","lodash","formatR2","jsxs","Fragment","numberFormat","formatPValue","formatCoefficients","slope","slopeError","intercept","interceptError","items","value","item"],"mappings":";;;;AAgBO,MAAMA,IAAkBC,EAAAA,KAAK,CAAC;AAAA,EACjC,OAAAC;AAAAA,EACA,QAAAC;AAAAA,EACA,YAAAC;AAAAA,EACA,YAAAC;AACJ,MACYD,KACJA,EAAW,IAAI,CAAC,EAAC,SAAAE,GAAS,SAAAC,GAAS,MAAAC,GAAM,SAAAC,GAAS,SAAAC,GAAS,OAAAC,EAAAA,GAAQC,MAAQ;AACvE,QAAM,CAACC,GAAMC,CAAI,IAAIL,IAAUC,IAAUP,EAAO,EAAE,UAC5CY,KAAQD,IAAOD,KAAQ,IACvBG,IAAKV,EAAQO,CAAI,GACjBI,IAAKX,EAAQQ,CAAI;AACvB,MAAI,MAAME,CAAE,KAAK,MAAMC,CAAE;AACrB,WAAO;AAEX,QAAMC,IAAYb,EAAW,WAAWG,CAAI;AAC5C,SAAAW,gBAAAA,EAAA,KACK,KAAA,EACG,UAAA;AAAA,IAAAC,gBAAAA,EAAAA,IAAC,QAAA,EAAK,GAAGR,IAAM,KAAK,IAAI,MAAMM,GAAW,GAAGhB,IAAQ,GAAG,YAAW,OAC7D,UAAAmB,EAAYV,CAAK,GACtB;AAAA,IACAS,gBAAAA,EAAAA;AAAAA,MAAC;AAAA,MAAA;AAAA,QACG,GAAGb,EAAQJ,EAAO,GAAGA,EAAO,GAAGmB,EAAO,MAAMT,GAAMC,IAAOC,IAAO,GAAGA,CAAI,CAAC;AAAA,QACxE,MAAMG;AAAAA,QACN,SAAS;AAAA,MAAA;AAAA,IAAA;AAAA,IAEbE,gBAAAA,EAAAA;AAAAA,MAAC;AAAA,MAAA;AAAA,QACG,IAAIjB,EAAO,EAAEU,CAAI;AAAA,QACjB,IAAIV,EAAO,EAAEW,CAAI;AAAA,QACjB,IAAIX,EAAO,EAAEa,CAAE;AAAA,QACf,IAAIb,EAAO,EAAEc,CAAE;AAAA,QACf,QAAQC;AAAAA,MAAA;AAAA,IAAA;AAAA,EAAA,EACZ,GAfIN,CAgBR;AAER,CAAC,CAER;AAED,SAASW,EAASZ,GAAsD;AACpE,SAAI,OAAOA,EAAM,KAAO,MACb,OAGPa,gBAAAA,EAAAA,KAAAC,EAAAA,UAAA,EACI,UAAA;AAAA,IAAAL,gBAAAA,EAAAA,IAAC,SAAA,EAAM,UAAA,KAAC;AAAA,IAAAD,gBAAAA,EAAA,IACP,SAAA,EAAM,UAAS,QAAO,IAAG,MAAK,UAAA,KAE/B;AAAA,IACAC,gBAAAA,EAAAA,IAAC,SAAA,EAAM,IAAG,KAAK,UAAA,MAAMM,EAAaf,EAAM,EAAE,CAAC,GAAA,CAAG;AAAA,EAAA,GAClD;AAER;AAEA,SAASgB,EAAahB,GAAsD;AACxE,SAAI,OAAOA,EAAM,SAAW,MACjB,OAAAQ,gBAAAA,EAAA,IAEH,SAAA,EAAO,UAAA,aAAaO,EAAaf,EAAM,MAAM,CAAC,IAAG;AAC7D;AAEA,SAASiB,EAAmBjB,GAAsD;AAC9E,MAAI,OAAOA,EAAM,eAAiB;AAC9B,WAAO;AAEX,QAAM,EAAC,OAAAkB,GAAO,YAAAC,GAAY,WAAAC,GAAW,gBAAAC,EAAAA,IAAkBrB,EAAM;AAC7D,SACIS,gBAAAA,EAAAA,IAAC,SAAA,EACG,UAAAA,gBAAAA,EAAAA,IAAC,SAAA,EACI,UAAA,WAAWM,EAAaG,CAAK,CAAC,MAAMH,EAAaI,CAAU,CAAC,iBAAiBJ,EAAaK,CAAS,CAAC,MAAML,EAAaM,CAAc,CAAC,GAAA,CAC3I,EAAA,CACJ;AAER;AAEA,SAASX,EAAYV,GAAsD;AACvE,QAAMsB,IAAQ,CAACV,EAASZ,CAAK,GAAGgB,EAAahB,CAAK,GAAGiB,EAAmBjB,CAAK,CAAC,EAAE;AAAA,IAC5E,OAASuB,MAAU;AAAA,EAAA;AAEvB,SAAAf,gBAAAA,EAAA,IAAAA,EAAA,UAAA,EAES,UAAAc,EAAM,IAAI,CAACE,GAAMvB,MAAAA,gBAAAA,EAAAA,KACb,SAAA,EACI,UAAA;AAAA,IAAAuB;AAAAA,IAAAhB,gBAAAA,EAAA,IACA,SAAA,EAAO,UAAAP,IAAMqB,EAAM,SAAS,KAAK,MAAK;AAAA,EAAA,KAF/BrB,CAGZ,CACH,GACL;AAER;","x_google_ignoreList":[0]}
+{"version":3,"file":"ChartTrendsData.js","sources":["../../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/components/ChartTrendsData.tsx"],"sourcesContent":["import { range } from 'lodash';\nimport { memo, type ReactElement } from 'react';\nimport { numberFormat } from '../../utils/numberFormat';\nimport type { TrendsData } from '../linearRegression';\nimport type {\n    AesGetters,\n    ChartScales\n} from './types';\n\ninterface Props {\n    trendsData: TrendsData[keyof TrendsData] | null;\n    width: number;\n    scales: ChartScales;\n    aesGetters: AesGetters;\n}\n\nexport const ChartTrendsData = memo(({\n    width,\n    scales,\n    trendsData,\n    aesGetters,\n}: Props) => {\n    return (trendsData &&\n        trendsData.map(({ idx, predict, getArea, bounded, xBounds, stats}, i) => {\n            const [minX, maxX] = bounded ? xBounds : scales.x.domain();\n            const step = (maxX - minX) / 15;\n            const p1 = predict(minX);\n            const p2 = predict(maxX);\n            if (isNaN(p1) || isNaN(p2)) {\n                return null;\n            }\n            const fillColor = aesGetters.trendColor(idx);\n            return (\n                <g key={i}>\n                    <text y={i * 20 + 20} fill={fillColor} x={width - 8} textAnchor=\"end\">\n                        {formatStats(stats)}\n                    </text>\n                    <path\n                        d={getArea(scales.x, scales.y, range(minX, maxX + step / 2, step))}\n                        fill={fillColor}\n                        opacity={0.2}\n                    />\n                    <line\n                        x1={scales.x(minX)}\n                        x2={scales.x(maxX)}\n                        y1={scales.y(p1)}\n                        y2={scales.y(p2)}\n                        stroke={fillColor}\n                    />\n                </g>\n            );\n        })\n    );\n});\n\nfunction formatR2(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    if (typeof stats.r2 === 'undefined') {\n        return null;\n    }\n    return (\n        <>\n            <tspan>R</tspan>\n            <tspan fontSize=\"10px\" dy=\"-8\">\n                2\n            </tspan>\n            <tspan dy=\"8\">{` = ${numberFormat(stats.r2)}`}</tspan>\n        </>\n    );\n}\n\nfunction formatPValue(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    if (typeof stats.pValue === 'undefined') {\n        return null;\n    }\n    return <tspan>{`p-value = ${numberFormat(stats.pValue)}`}</tspan>;\n}\n\nfunction formatCoefficients(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    if (typeof stats.coefficients === 'undefined') {\n        return null;\n    }\n    const {slope, slopeError, intercept, interceptError} = stats.coefficients;\n    return (\n        <tspan>\n            <tspan>\n                {`slope = ${numberFormat(slope)} ± ${numberFormat(slopeError)}, intercept = ${numberFormat(intercept)} ± ${numberFormat(interceptError)}`}\n            </tspan>\n        </tspan>\n    );\n}\n\nfunction formatStats(stats: TrendsData[keyof TrendsData][number]['stats']) {\n    const items = [formatR2(stats), formatPValue(stats), formatCoefficients(stats)].filter(\n        value => value !== null\n    ) as unknown as ReactElement[];\n    return (\n        <>\n            {items.map((item, idx) => (\n                <tspan key={idx}>\n                    {item}\n                    <tspan>{idx < items.length - 1 && ', '}</tspan>\n                </tspan>\n            ))}\n        </>\n    );\n}\n\n"],"names":["ChartTrendsData","memo","width","scales","trendsData","aesGetters","idx","predict","getArea","bounded","xBounds","stats","i","minX","maxX","step","p1","p2","fillColor","n","jsx","formatStats","range","formatR2","jsxs","Fragment","numberFormat","formatPValue","formatCoefficients","slope","slopeError","intercept","interceptError","items","value","item"],"mappings":"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","x_google_ignoreList":[0]}

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/components/ChartsGroup.js

@@ -1,8 +1,8 @@
 import { j as s } from "../../node_modules/react/jsx-runtime.js";
 import { r as P } from "../../_virtual/index.js";
-import { ChartsTitle as b } from "../../common/ChartsTitle.js";
-import { ErrorBoundary as A } from "../../common/ErrorBoundary.js";
-import $ from "../../common/fonts.js";
+import { ChartsTitle as $ } from "../../common/ChartsTitle.js";
+import { ErrorBoundary as b } from "../../common/ErrorBoundary.js";
+import A from "../../common/fonts.js";
 import { Legend as B } from "../../common/Legend.js";
 import { useTooltip as I } from "../../common/Tooltip.js";
 import { LEGEND_OFFSET as k } from "../constants.js";
@@ -21,19 +21,19 @@ function Z({
   trendsData: l,
   columnsCount: y,
   margins: n,
-  keyColumn: D,
-  mainTitle: w,
+  keyColumn: w,
+  mainTitle: D,
   facetTitles: j,
   captionsSizes: S,
-  onlyPositive: T,
-  layersData: v,
+  onlyPositive: v,
+  layersData: T,
   aesGetters: h,
   onTooltipHintSwitch: C
 }) {
   const i = I(C), { xAxis: E, yAxis: M, title: m, frame: W, legend: H, tooltips: z } = g, d = o[a[0]].padding, F = o[a[y - 1]].padding, G = e.chartsWidth + k, L = d.top, p = P.useMemo(() => Object.fromEntries(
     a.map((t) => [t, { x: r.x[t], y: r.y[t] }])
   ), [r.x, r.y, a]);
-  return /* @__PURE__ */ s.jsx(A, { dataId: c, children: /* @__PURE__ */ s.jsx("div", { style: { position: "relative", width: e.totalWidth, height: e.totalHeight }, children: /* @__PURE__ */ s.jsxs(
+  return /* @__PURE__ */ s.jsx(b, { dataId: c, children: /* @__PURE__ */ s.jsx("div", { style: { position: "relative", width: e.totalWidth, height: e.totalHeight }, children: /* @__PURE__ */ s.jsxs(
     "svg",
     {
       xmlns: "http://www.w3.org/2000/svg",
@@ -42,12 +42,12 @@ function Z({
       height: e.totalHeight,
       style: { position: "absolute", top: 0, left: 0, zIndex: 0 },
       children: [
-        /* @__PURE__ */ s.jsx("defs", { children: $ }),
+        /* @__PURE__ */ s.jsx("defs", { children: A }),
         /* @__PURE__ */ s.jsxs("g", { transform: `translate(${n.left},${n.top})`, fontFamily: "Manrope", children: [
           /* @__PURE__ */ s.jsx(
-            b,
+            $,
             {
-              title: w,
+              title: D,
               show: m.show,
               position: m.position,
               leftPadding: d.left,
@@ -71,8 +71,8 @@ function Z({
               trendsData: l ? l[t] : null,
               facetTitle: j[t],
               captionsSizes: S,
-              layersData: v[t],
-              onlyPositive: T,
+              layersData: T[t],
+              onlyPositive: v,
               aesGetters: h,
               onMouseEnterDot: i.onMouseEnter,
               onMouseLeaveDot: i.onMouseLeave
@@ -86,7 +86,7 @@ function Z({
               tooltipsData: i,
               dimensions: o[i.currentFacet],
               scales: p[i.currentFacet],
-              keyColumn: D,
+              keyColumn: w,
               margins: n,
               chartSizes: e,
               tooltips: z,

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/constants.ts"],"sourcesContent":["import {BLACK} from '../constants';\nimport type {DotAesItem} from '../common/types';\nimport type {AesItem} from '../types';\n\n// inner paddings in chart area\nexport const PADDINGS = {\n    TOP: 30,\n    BOTTOM: 30,\n    LEFT: 30,\n    RIGHT: 30\n};\n\nexport const DEFAULT_COMMON_AES:AesItem = {\n    fillColor: 'white',\n    lineColor: BLACK,\n    lineWidth: 1,\n    lineShape: 'solid',\n    dotSize: 3,\n    dotFill: BLACK,\n    dotShape: '21',\n};\nexport const DEFAULT_DOT_AES:DotAesItem = {\n    color: '#929BAD',\n    size: 6,\n    shape: '21',\n};\n\nexport const FACET_TITLE_LINE = 20;\nexport const FACET_TITLE_OFFSET = 6;\nexport const FACET_AXIS_OFFSET = 8;\nexport const MIN_MARGIN = 24;\nexport const MIN_PADDING = 12;\n\nexport const TITLE_LINE = 20;\nexport const DEFAULT_TICKS_SIZE = 4;\nexport const TICK_OFFSET = 6;\n\nexport const LEGEND_OFFSET = 10;\n"],"names":["PADDINGS","DEFAULT_COMMON_AES","BLACK","DEFAULT_DOT_AES","FACET_TITLE_LINE","FACET_TITLE_OFFSET","FACET_AXIS_OFFSET","MIN_MARGIN","MIN_PADDING","TITLE_LINE","DEFAULT_TICKS_SIZE","TICK_OFFSET","LEGEND_OFFSET"],"mappings":";AAKO,MAAMA,IAAW;AAAA,EACpB,KAAK;AAAA,EACL,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AACX,GAEaC,IAA6B;AAAA,EACtC,WAAW;AAAA,EACX,WAAWC;AAAAA,EACX,WAAW;AAAA,EACX,WAAW;AAAA,EACX,SAAS;AAAA,EACT,SAASA;AAAAA,EACT,UAAU;AACd,GACaC,IAA6B;AAAA,EACtC,OAAO;AAAA,EACP,MAAM;AAAA,EACN,OAAO;AACX,GAEaC,IAAmB,IACnBC,IAAqB,GACrBC,IAAoB,GACpBC,IAAa,IACbC,IAAc,IAEdC,IAAa,IACbC,IAAqB,GACrBC,IAAc,GAEdC,IAAgB;","x_google_ignoreList":[0]}
+{"version":3,"file":"constants.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/constants.ts"],"sourcesContent":["import type { DotAesItem } from '../common/types';\nimport { BLACK } from '../constants';\nimport type { AesItem } from '../types';\n\n// inner paddings in chart area\nexport const PADDINGS = {\n    TOP: 30,\n    BOTTOM: 30,\n    LEFT: 30,\n    RIGHT: 30\n};\n\nexport const DEFAULT_COMMON_AES: Required<AesItem> = {\n    fillColor: 'white',\n    lineColor: BLACK,\n    lineWidth: 1,\n    lineShape: 'solid',\n    dotSize: 3,\n    dotFill: BLACK,\n    dotShape: '21',\n};\nexport const DEFAULT_DOT_AES:DotAesItem = {\n    color: '#929BAD',\n    size: 6,\n    shape: '21',\n};\n\nexport const FACET_TITLE_LINE = 20;\nexport const FACET_TITLE_OFFSET = 6;\nexport const FACET_AXIS_OFFSET = 8;\nexport const MIN_MARGIN = 24;\nexport const MIN_PADDING = 12;\n\nexport const TITLE_LINE = 20;\nexport const DEFAULT_TICKS_SIZE = 4;\nexport const TICK_OFFSET = 6;\n\nexport const LEGEND_OFFSET = 10;\n"],"names":["PADDINGS","DEFAULT_COMMON_AES","BLACK","DEFAULT_DOT_AES","FACET_TITLE_LINE","FACET_TITLE_OFFSET","FACET_AXIS_OFFSET","MIN_MARGIN","MIN_PADDING","TITLE_LINE","DEFAULT_TICKS_SIZE","TICK_OFFSET","LEGEND_OFFSET"],"mappings":";AAKO,MAAMA,IAAW;AAAA,EACpB,KAAK;AAAA,EACL,QAAQ;AAAA,EACR,MAAM;AAAA,EACN,OAAO;AACX,GAEaC,IAAwC;AAAA,EACjD,WAAW;AAAA,EACX,WAAWC;AAAAA,EACX,WAAW;AAAA,EACX,WAAW;AAAA,EACX,SAAS;AAAA,EACT,SAASA;AAAAA,EACT,UAAU;AACd,GACaC,IAA6B;AAAA,EACtC,OAAO;AAAA,EACP,MAAM;AAAA,EACN,OAAO;AACX,GAEaC,IAAmB,IACnBC,IAAqB,GACrBC,IAAoB,GACpBC,IAAa,IACbC,IAAc,IAEdC,IAAa,IACbC,IAAqB,GACrBC,IAAc,GAEdC,IAAgB;","x_google_ignoreList":[0]}

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/dots.js

@@ -1,34 +1,33 @@
-function X(v, d, M, p, a, f, b) {
-  const h = {};
-  for (const g of d) {
+import { formatColumnValue as V } from "./utils/formatColumnValue.js";
+import { sortDotsByGrouping as y } from "./utils/sortDotsByGrouping.js";
+import { format as D } from "../node_modules/d3-format/src/defaultLocale.js";
+function Y(o, x, h, d, a, l, v) {
+  const c = {}, C = a != null && a.format ? D(a.format) : void 0;
+  for (const g of x) {
     const e = [];
-    let s = 1 / 0, u = 1 / 0, c = -1 / 0, m = -1 / 0;
-    const i = g.concat([""]);
-    for (const r of b) {
-      i[i.length - 1] = r;
-      const n = v.getRowsByGrouping(i);
-      for (let x = 0; x < n.length; x++) {
-        const t = n[x], o = t[M.value], l = t[p.value];
-        o === null && l === null || (s = Math.min(s, o), u = Math.min(u, l), c = Math.max(c, o), m = Math.max(m, l), e.push({
-          x: o,
-          y: l,
-          label: a ? t[a.valueLabels ?? a.value] : null,
-          dimmed: f ? !t[f.value] : !1,
-          data: t
-        }));
-      }
+    let u = 1 / 0, s = 1 / 0, r = -1 / 0, i = -1 / 0;
+    const M = g.concat([""]), p = o.getRowsByGrouping(M);
+    for (let f = 0; f < p.length; f++) {
+      const t = p[f], m = o.getColumnValue(h.value, t), n = o.getColumnValue(d.value, t);
+      m === null && n === null || (u = Math.min(u, m), s = Math.min(s, n), r = Math.max(r, m), i = Math.max(i, n), e.push({
+        x: m,
+        y: n,
+        label: V(o, t, a, C),
+        dimmed: l ? !o.getColumnValue(l.value, t) : !1,
+        idx: t
+      }));
     }
-    e.sort((r, n) => r.x - n.x), h[g.join("_")] = {
-      minX: s,
-      maxX: c,
-      minY: u,
-      maxY: m,
+    y(o, e, v, l), c[g.join("_")] = {
+      minX: u,
+      maxX: r,
+      minY: s,
+      maxY: i,
       dots: e
     };
   }
-  return h;
+  return c;
 }
 export {
-  X as getDots
+  Y as getDots
 };
 //# sourceMappingURL=dots.js.map

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/dots.js.map

@@ -1 +1 @@
-{"version":3,"file":"dots.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/dots.ts"],"sourcesContent":["import type { DataFrame } from '../DataFrame';\nimport type { ColumnName, DataValue, Row } from '../types';\n\nexport type Dot = {\n    x: number;\n    y: number;\n    label: DataValue | null;\n    dimmed: boolean;\n    data: Row\n};\n\nexport type GroupedDots = Record<\n    string,\n    {\n        minX: number;\n        maxX: number;\n        minY: number;\n        maxY: number;\n        dots: Dot[];\n    }\n>;\n\nexport function getDots(\n    data: DataFrame,\n    facetKeysCombinations: string[][],\n    x: ColumnName,\n    y: ColumnName,\n    label: ColumnName | null,\n    highlight: ColumnName | null,\n    keys: string[]\n): GroupedDots {\n    const result: GroupedDots = {};\n\n    for (const facetKeys of facetKeysCombinations) {\n        const dots: Dot[] = [];\n        let minX = Infinity;\n        let minY = Infinity;\n        let maxX = -Infinity;\n        let maxY = -Infinity;\n\n        const templateGroupPath = facetKeys.concat(['']);\n\n        for (const primaryKey of keys) {\n            templateGroupPath[templateGroupPath.length - 1] = primaryKey;\n            const rows = data.getRowsByGrouping(templateGroupPath);\n\n            for (let i = 0; i < rows.length; i++) {\n                const row = rows[i];\n                const valueX = row[x.value] as number;\n                const valueY = row[y.value] as number;\n\n                if (valueX === null && valueY === null) continue;\n\n                minX = Math.min(minX, valueX);\n                minY = Math.min(minY, valueY);\n                maxX = Math.max(maxX, valueX);\n                maxY = Math.max(maxY, valueY);\n                \n                dots.push({\n                    x: valueX,\n                    y: valueY,\n                    label: label ? row[label.valueLabels ?? label.value] : null,\n                    dimmed: highlight ? !row[highlight.value] : false,\n                    data: row\n                });\n            }\n        }\n\n        dots.sort((d1, d2) => d1.x - d2.x);\n\n        result[facetKeys.join('_')] = {\n            minX,\n            maxX,\n            minY,\n            maxY,\n            dots,\n        };\n    }\n\n    return result;\n}\n"],"names":["getDots","data","facetKeysCombinations","x","y","label","highlight","keys","result","facetKeys","dots","minX","minY","maxX","maxY","templateGroupPath","primaryKey","rows","i","row","valueX","valueY","d1","d2"],"mappings":"AAsBO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACW;AACX,QAAMC,IAAsB,CAAA;AAE5B,aAAWC,KAAaP,GAAuB;AAC3C,UAAMQ,IAAc,CAAA;AACpB,QAAIC,IAAO,OACPC,IAAO,OACPC,IAAO,QACPC,IAAO;AAEX,UAAMC,IAAoBN,EAAU,OAAO,CAAC,EAAE,CAAC;AAE/C,eAAWO,KAAcT,GAAM;AAC3BQ,MAAAA,EAAkBA,EAAkB,SAAS,CAAC,IAAIC;AAClD,YAAMC,IAAOhB,EAAK,kBAAkBc,CAAiB;AAErD,eAASG,IAAI,GAAGA,IAAID,EAAK,QAAQC,KAAK;AAClC,cAAMC,IAAMF,EAAKC,CAAC,GACZE,IAASD,EAAIhB,EAAE,KAAK,GACpBkB,IAASF,EAAIf,EAAE,KAAK;AAEtBgB,QAAAA,MAAW,QAAQC,MAAW,SAElCV,IAAO,KAAK,IAAIA,GAAMS,CAAM,GAC5BR,IAAO,KAAK,IAAIA,GAAMS,CAAM,GAC5BR,IAAO,KAAK,IAAIA,GAAMO,CAAM,GAC5BN,IAAO,KAAK,IAAIA,GAAMO,CAAM,GAE5BX,EAAK,KAAK;AAAA,UACN,GAAGU;AAAAA,UACH,GAAGC;AAAAA,UACH,OAAOhB,IAAQc,EAAId,EAAM,eAAeA,EAAM,KAAK,IAAI;AAAA,UACvD,QAAQC,IAAY,CAACa,EAAIb,EAAU,KAAK,IAAI;AAAA,UAC5C,MAAMa;AAAAA,QAAA,CACT;AAAA,MACL;AAAA,IACJ;AAEAT,IAAAA,EAAK,KAAK,CAACY,GAAIC,MAAOD,EAAG,IAAIC,EAAG,CAAC,GAEjCf,EAAOC,EAAU,KAAK,GAAG,CAAC,IAAI;AAAA,MAC1B,MAAAE;AAAAA,MACA,MAAAE;AAAAA,MACA,MAAAD;AAAAA,MACA,MAAAE;AAAAA,MACA,MAAAJ;AAAAA,IAAA;AAAA,EAER;AAEA,SAAOF;AACX;","x_google_ignoreList":[0]}
+{"version":3,"file":"dots.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/dots.ts"],"sourcesContent":["import {format} from 'd3-format';\nimport type { DataFrame } from '../DataFrame';\nimport type { ColumnName, DataValue } from '../types';\nimport type { ScatterplotSettingsImpl } from './ScatterplotSettingsImpl';\nimport {formatColumnValue} from './utils/formatColumnValue';\nimport {sortDotsByGrouping} from './utils/sortDotsByGrouping';\n\nexport type Dot = {\n    idx: number;\n    x: number;\n    y: number;\n    label: DataValue | null;\n    dimmed: boolean;\n};\n\nexport type GroupedDots = Record<\n    string,\n    {\n        minX: number;\n        maxX: number;\n        minY: number;\n        maxY: number;\n        dots: Dot[];\n    }\n>;\n\nexport function getDots(\n    data: DataFrame,\n    facetKeysCombinations: string[][],\n    x: ColumnName,\n    y: ColumnName,\n    label: ColumnName | null,\n    highlight: ColumnName | null,\n    grouping: ScatterplotSettingsImpl['grouping']\n): GroupedDots {\n    const result: GroupedDots = {};\n\n    const labelFormatter = label?.format ? format(label.format) : undefined;\n\n    for (const facetKeys of facetKeysCombinations) {\n        const dots: Dot[] = [];\n        let minX = Infinity;\n        let minY = Infinity;\n        let maxX = -Infinity;\n        let maxY = -Infinity;\n\n        const templateGroupPath = facetKeys.concat(['']);\n        const rows = data.getRowsByGrouping(templateGroupPath);\n\n        for (let i = 0; i < rows.length; i++) {\n            const rowIdx = rows[i];\n            const valueX = data.getColumnValue(x.value, rowIdx) as number;\n            const valueY = data.getColumnValue(y.value, rowIdx) as number;\n\n            if (valueX === null && valueY === null) continue;\n\n            minX = Math.min(minX, valueX);\n            minY = Math.min(minY, valueY);\n            maxX = Math.max(maxX, valueX);\n            maxY = Math.max(maxY, valueY);\n\n            dots.push({\n                x: valueX,\n                y: valueY,\n                label: formatColumnValue(data, rowIdx, label, labelFormatter),\n                dimmed: highlight ? !data.getColumnValue(highlight.value, rowIdx) : false,\n                idx: rowIdx\n            });\n        }\n\n        sortDotsByGrouping(data, dots, grouping, highlight);\n\n        result[facetKeys.join('_')] = {\n            minX,\n            maxX,\n            minY,\n            maxY,\n            dots,\n        };\n    }\n\n    return result;\n}\n"],"names":["getDots","data","facetKeysCombinations","x","y","label","highlight","grouping","result","labelFormatter","format","facetKeys","dots","minX","minY","maxX","maxY","templateGroupPath","rows","i","rowIdx","valueX","valueY","formatColumnValue","sortDotsByGrouping"],"mappings":";;;AA0BO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACW;AACX,QAAMC,IAAsB,CAAA,GAEtBC,IAAiBJ,KAAA,QAAAA,EAAO,SAASK,EAAOL,EAAM,MAAM,IAAI;AAE9D,aAAWM,KAAaT,GAAuB;AAC3C,UAAMU,IAAc,CAAA;AACpB,QAAIC,IAAO,OACPC,IAAO,OACPC,IAAO,QACPC,IAAO;AAEX,UAAMC,IAAoBN,EAAU,OAAO,CAAC,EAAE,CAAC,GACzCO,IAAOjB,EAAK,kBAAkBgB,CAAiB;AAErD,aAASE,IAAI,GAAGA,IAAID,EAAK,QAAQC,KAAK;AAClC,YAAMC,IAASF,EAAKC,CAAC,GACfE,IAASpB,EAAK,eAAeE,EAAE,OAAOiB,CAAM,GAC5CE,IAASrB,EAAK,eAAeG,EAAE,OAAOgB,CAAM;AAE9CC,MAAAA,MAAW,QAAQC,MAAW,SAElCT,IAAO,KAAK,IAAIA,GAAMQ,CAAM,GAC5BP,IAAO,KAAK,IAAIA,GAAMQ,CAAM,GAC5BP,IAAO,KAAK,IAAIA,GAAMM,CAAM,GAC5BL,IAAO,KAAK,IAAIA,GAAMM,CAAM,GAE5BV,EAAK,KAAK;AAAA,QACN,GAAGS;AAAAA,QACH,GAAGC;AAAAA,QACH,OAAOC,EAAkBtB,GAAMmB,GAAQf,GAAOI,CAAc;AAAA,QAC5D,QAAQH,IAAY,CAACL,EAAK,eAAeK,EAAU,OAAOc,CAAM,IAAI;AAAA,QACpE,KAAKA;AAAAA,MAAA,CACR;AAAA,IACL;AAEAI,IAAAA,EAAmBvB,GAAMW,GAAML,GAAUD,CAAS,GAElDE,EAAOG,EAAU,KAAK,GAAG,CAAC,IAAI;AAAA,MAC1B,MAAAE;AAAAA,MACA,MAAAE;AAAAA,MACA,MAAAD;AAAAA,MACA,MAAAE;AAAAA,MACA,MAAAJ;AAAAA,IAAA;AAAA,EAER;AAEA,SAAOJ;AACX;","x_google_ignoreList":[0]}

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/getLayersData.js

@@ -1,18 +1,18 @@
-import { exhaustive as v } from "../utils/index.js";
-function g(c, d, i, y, a) {
-  return d.reduce((n, s) => {
-    const u = i[s].dots;
-    return n[s] = c.map((e) => {
+import { exhaustive as m } from "../utils/index.js";
+function v(i, p, l, f, y, c) {
+  return l.reduce((n, s) => {
+    const u = f[s].dots;
+    return n[s] = p.map((e) => {
       if (e.type === "curve")
         return {
           type: "curve",
           info: e,
-          geoms: y.map((p) => {
-            const f = u.filter(
-              (t) => a.every((r, o) => t.data[r.value] === p[o])
-            ), m = a.reduce((t, r, o) => (t[r.value] = p[o], t), {});
-            return { dots: f, data: m };
-          })
+          geoms: y.map((t) => {
+            const a = u.filter(
+              (r) => c.every((o, d) => String(i.getColumnValue(o.value, r.idx)) === t[d])
+            );
+            return a.sort((r, o) => r.x - o.x), { dots: a };
+          }).filter((t) => t.dots.length > 0)
         };
       if (e.type === "dots")
         return {
@@ -20,11 +20,11 @@ function g(c, d, i, y, a) {
           info: e,
           geoms: u
         };
-      v(e, "Unknown scatterplot layer type");
+      m(e, "Unknown scatterplot layer type");
     }), n;
   }, {});
 }
 export {
-  g as getLayersData
+  v as getLayersData
 };
 //# sourceMappingURL=getLayersData.js.map

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/getLayersData.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLayersData.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/getLayersData.ts"],"sourcesContent":["import type {Dot, GroupedDots} from './dots';\nimport type {CurveLayer, DotsLayer} from './ScatterplotSettingsImpl';\nimport type {ColumnName, DataValue, ScatterplotLayer} from '../types';\nimport {exhaustive} from '../utils';\n\nexport type DotsLayerData  = {\n    type: 'dots',\n    info: DotsLayer,\n    geoms: Dot[]\n}\n\nexport type CurveData = {\n    dots: Dot[],\n    data: Record<string, DataValue>\n}\nexport type CurveLayerData  = {\n    type: 'curve',\n    info: CurveLayer,\n    geoms:  CurveData[]\n}\n\nexport type ScatterplotLayerData = DotsLayerData | CurveLayerData;\n\nexport function getLayersData(\n    layers: ScatterplotLayer[],\n    facetKeys: string[],\n    dotsByFacets: GroupedDots,\n    categoryGroupingCombinations: string[][],\n    grouping: ColumnName[]\n): Record<string, ScatterplotLayerData[]> {\n    return facetKeys.reduce((res:Record<string, ScatterplotLayerData[]>, key) => {\n        const facetDots = dotsByFacets[key].dots;\n        res[key] = layers.map(layer => {\n            if (layer.type === 'curve') {\n                return {\n                    type: 'curve',\n                    info: layer,\n                    geoms: categoryGroupingCombinations.map(values => {\n                        const dots = facetDots.filter(dot =>\n                            grouping.every((column, idx) => dot.data[column.value] === values[idx])\n                        );\n                        const data = grouping.reduce((res:Record<string, DataValue>, column, idx) => {\n                            res[column.value] = values[idx];\n                            return res;\n                        }, {});\n                        return {dots, data};\n                    })\n                } as CurveLayerData;\n            }\n            if (layer.type === 'dots') {\n                return {\n                    type: 'dots',\n                    info: layer,\n                    geoms: facetDots,\n                } as DotsLayerData;\n            }\n            exhaustive(layer, 'Unknown scatterplot layer type');\n        });\n        return res;\n    }, {});\n}\n"],"names":["getLayersData","layers","facetKeys","dotsByFacets","categoryGroupingCombinations","grouping","res","key","facetDots","layer","values","dots","dot","column","idx","data","exhaustive"],"mappings":";AAuBO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACsC;AACtC,SAAOH,EAAU,OAAO,CAACI,GAA4CC,MAAQ;AACzE,UAAMC,IAAYL,EAAaI,CAAG,EAAE;AACpC,WAAAD,EAAIC,CAAG,IAAIN,EAAO,IAAI,CAAAQ,MAAS;AAC3B,UAAIA,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAAA,UACN,OAAOL,EAA6B,IAAI,CAAAM,MAAU;AAC9C,kBAAMC,IAAOH,EAAU;AAAA,cAAO,CAAAI,MAC1BP,EAAS,MAAM,CAACQ,GAAQC,MAAQF,EAAI,KAAKC,EAAO,KAAK,MAAMH,EAAOI,CAAG,CAAC;AAAA,YAAA,GAEpEC,IAAOV,EAAS,OAAO,CAACC,GAA+BO,GAAQC,OACjER,EAAIO,EAAO,KAAK,IAAIH,EAAOI,CAAG,GACvBR,IACR,EAAE;AACL,mBAAO,EAAC,MAAAK,GAAM,MAAAI,EAAAA;AAAAA,UAClB,CAAC;AAAA,QAAA;AAGT,UAAIN,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAAA,UACN,OAAOD;AAAAA,QAAA;AAGfQ,MAAAA,EAAWP,GAAO,gCAAgC;AAAA,IACtD,CAAC,GACMH;AAAAA,EACX,GAAG,CAAA,CAAE;AACT;","x_google_ignoreList":[0]}
+{"version":3,"file":"getLayersData.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/scatterplot/getLayersData.ts"],"sourcesContent":["import type { DataFrame } from '../DataFrame';\nimport type { ColumnName, ScatterplotLayer } from '../types';\nimport { exhaustive } from '../utils';\nimport type { Dot, GroupedDots } from './dots';\nimport type { CurveLayer, DotsLayer } from './ScatterplotSettingsImpl';\n\nexport type DotsLayerData  = {\n    type: 'dots',\n    info: DotsLayer,\n    geoms: Dot[]\n}\n\nexport type CurveData = {\n    dots: Dot[],\n}\nexport type CurveLayerData  = {\n    type: 'curve',\n    info: CurveLayer,\n    geoms: CurveData[]\n}\n\nexport type ScatterplotLayerData = DotsLayerData | CurveLayerData;\n\nexport function getLayersData(\n    dataFrame: DataFrame,\n    layers: ScatterplotLayer[],\n    facetKeys: string[],\n    dotsByFacets: GroupedDots,\n    categoryGroupingCombinations: string[][],\n    grouping: ColumnName[]\n): Record<string, ScatterplotLayerData[]> {\n    return facetKeys.reduce((res:Record<string, ScatterplotLayerData[]>, key) => {\n        const facetDots = dotsByFacets[key].dots;\n        res[key] = layers.map(layer => {\n            if (layer.type === 'curve') {\n                return {\n                    type: 'curve',\n                    info: layer,\n                    geoms: categoryGroupingCombinations.map(values => {\n                        const dots = facetDots.filter(dot =>\n                            grouping.every((column, idx) => String(dataFrame.getColumnValue(column.value, dot.idx)) === values[idx])\n                        );\n                        dots.sort((d1, d2) => d1.x - d2.x);\n                        return {dots};\n                    }).filter(item => item.dots.length > 0)\n                } as CurveLayerData;\n            }\n            if (layer.type === 'dots') {\n                return {\n                    type: 'dots',\n                    info: layer,\n                    geoms: facetDots,\n                } as DotsLayerData;\n            }\n            exhaustive(layer, 'Unknown scatterplot layer type');\n        });\n        return res;\n    }, {});\n}\n"],"names":["getLayersData","dataFrame","layers","facetKeys","dotsByFacets","categoryGroupingCombinations","grouping","res","key","facetDots","layer","values","dots","column","idx","dot","d1","d2","item","exhaustive"],"mappings":";AAuBO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACAC,GACsC;AACtC,SAAOH,EAAU,OAAO,CAACI,GAA4CC,MAAQ;AACzE,UAAMC,IAAYL,EAAaI,CAAG,EAAE;AACpC,WAAAD,EAAIC,CAAG,IAAIN,EAAO,IAAI,CAAAQ,MAAS;AAC3B,UAAIA,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAAA,UACN,OAAOL,EAA6B,IAAI,CAAAM,MAAU;AAC9C,kBAAMC,IAAOH,EAAU;AAAA,cAAO,OAC1BH,EAAS,MAAM,CAACO,GAAQC,MAAQ,OAAOb,EAAU,eAAeY,EAAO,OAAOE,EAAI,GAAG,CAAC,MAAMJ,EAAOG,CAAG,CAAC;AAAA,YAAA;AAE3G,mBAAAF,EAAK,KAAK,CAACI,GAAIC,MAAOD,EAAG,IAAIC,EAAG,CAAC,GAC1B,EAAC,MAAAL,EAAAA;AAAAA,UACZ,CAAC,EAAE,OAAO,OAAQM,EAAK,KAAK,SAAS,CAAC;AAAA,QAAA;AAG9C,UAAIR,EAAM,SAAS;AACf,eAAO;AAAA,UACH,MAAM;AAAA,UACN,MAAMA;AAAAA,UACN,OAAOD;AAAAA,QAAA;AAGfU,MAAAA,EAAWT,GAAO,gCAAgC;AAAA,IACtD,CAAC,GACMH;AAAAA,EACX,GAAG,CAAA,CAAE;AACT;","x_google_ignoreList":[0]}

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/index.js

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