@milaboratories/graph-maker 1.1.181 → 1.1.183

package/dist/forms/LayersForm/AesSelector.vue.js

@@ -1,15 +1,15 @@
-import { defineComponent as Z, computed as y, ref as F, watch as q, createElementBlock as _, openBlock as g, Fragment as ee, createElementVNode as O, createBlock as S, createCommentVNode as T, createVNode as R, withModifiers as te, unref as w, withCtx as L, normalizeClass as le } from "vue";
+import { defineComponent as Z, computed as g, ref as F, watch as q, createElementBlock as _, openBlock as y, Fragment as ee, createElementVNode as O, createBlock as S, createCommentVNode as T, createVNode as R, withModifiers as te, unref as A, withCtx as L, normalizeClass as le } from "vue";
 import { PlDropdown as ae } from "@platforma-sdk/ui-vue";
 import { createDefaultMapping as oe, createContinuousMappingFromPalette as ue } from "../../dataBindAes.js";
-import { FIXED_COLORS as A, DEFAULT_LINE_TYPE as ie, DEFAULT_DOT_SHAPE as ne, FIXED_LINE_TYPES as se, FIXES_DOT_SHAPES as re, DEFAULT_CONTINUOUS_PALETTE as pe } from "../../constantsAesthetic.js";
+import { FIXED_COLORS as w, DEFAULT_LINE_TYPE as ie, DEFAULT_DOT_SHAPE as ne, FIXED_LINE_TYPES as se, FIXES_DOT_SHAPES as re, DEFAULT_CONTINUOUS_PALETTE as pe } from "../../constantsAesthetic.js";
 import de from "../../components/AesButton.vue.js";
 import { useStore as ve } from "../../store.js";
 import { isMappedAes as M } from "../../constantsCommon.js";
 import ce from "../../components/Popup.vue.js";
 import fe from "../../components/AesSettings/FixedColorsList.vue.js";
 import me from "../../components/AesSettings/FixedDotShapeList.vue.js";
-import ye from "../../components/AesSettings/FixedLineTypeList.vue.js";
-import ge from "../../components/AesSettings/FormWrapper.vue.js";
+import ge from "../../components/AesSettings/FixedLineTypeList.vue.js";
+import ye from "../../components/AesSettings/FormWrapper.vue.js";
 import Se from "../../components/AesSettings/AesDataMappingDiscrete.vue.js";
 import Te from "../../components/AesSettings/AesDataMappingContinuous.vue.js";
 const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
@@ -27,7 +27,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
   emits: ["aes-update", "aes-selector-close"],
   setup(i, { emit: W }) {
     var P, h;
-    const r = i, p = ve(), o = y(() => p.value.reactive.chartType), D = W, X = {
+    const r = i, p = ve(), o = g(() => p.value.reactive.chartType), $ = W, X = {
       discrete: ["primaryGrouping", "secondaryGrouping"],
       scatterplot: ["grouping"],
       "scatterplot-umap": ["grouping"],
@@ -35,7 +35,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
       heatmap: [],
       histogram: ["grouping"],
       bubble: []
-    }, G = r.possibleAesSourceInputs ?? X[o.value], Y = y(
+    }, G = r.possibleAesSourceInputs ?? X[o.value], Y = g(
       () => p.value.commonHelpersData.usedAesInMapping.value
     );
     function V(l) {
@@ -44,25 +44,25 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
     const s = F(
       M(r.selected) ? V(r.selected) : "fix"
     ), z = {
-      fill: A[0].color,
-      stroke: A[0].color,
+      fill: w[0].color,
+      stroke: w[0].color,
       dotShape: ne,
       lineType: ie,
       size: ""
       // temporary
-    }, K = y(() => p.value.inputGuide.value), j = y(() => p.value.uniqueValuesData.value), H = /* @__PURE__ */ new Set([
+    }, K = g(() => p.value.inputGuide.value), j = g(() => p.value.uniqueValuesData.value), H = /* @__PURE__ */ new Set([
       "scatterplot",
       "scatterplot-umap",
       "heatmap"
-    ]), d = y(() => {
+    ]), d = g(() => {
       const l = {}, e = p.value.reactive.optionsState.components;
       function v(a, t) {
-        const u = K.value.getSourceInfo(t), c = j.value[t], b = (c == null ? void 0 : c.list) ?? [], f = (c == null ? void 0 : c.labels) ?? {}, $ = V({ type: a, value: t });
+        const u = K.value.getSourceInfo(t), c = j.value[t], b = (c == null ? void 0 : c.list) ?? [], f = (c == null ? void 0 : c.labels) ?? {}, D = V({ type: a, value: t });
         if (H.has(o.value) && u.type === "String" || !H.has(o.value)) {
           const C = p.value.reactive.dataBindAes[t] ?? oe(b);
-          l[$] = {
+          l[D] = {
             type: "dataCategorical",
-            value: $,
+            value: D,
             initialData: C,
             inputName: a,
             selectedSource: t,
@@ -75,9 +75,9 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
           };
         } else {
           const C = p.value.reactive.dataBindAes[t] ?? ue(pe);
-          l[$] = {
+          l[D] = {
             type: "dataContinuous",
-            value: $,
+            value: D,
             initialData: C,
             inputName: a,
             selectedSource: t,
@@ -96,14 +96,14 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
         value: "fix",
         initialData: M(r.selected) ? z[r.type] : r.selected
       }), l;
-    }), n = y(
+    }), n = g(
       () => d.value[s.value] ?? null
     );
     function J(l, e) {
       var v, a, t, u;
       return l.type === "fix" ? "Fixed" : e === l.value ? `${(v = l.selectedSourceInfo) == null ? void 0 : v.label}` : o.value === "discrete" ? `${l.value === "primaryGrouping" ? "Primary" : "Secondary"} grouping: ${(a = l.selectedSourceInfo) == null ? void 0 : a.label}` : o.value === "scatterplot" || o.value === "dendro" ? `Grouping: ${(t = l.selectedSourceInfo) == null ? void 0 : t.label}` : ((u = l.selectedSourceInfo) == null ? void 0 : u.label) ?? "";
     }
-    const N = y(() => {
+    const N = g(() => {
       const l = [], e = p.value.reactive.optionsState.components;
       function v(a, t) {
         const u = V({
@@ -136,20 +136,20 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
       () => s.value,
       (l) => {
         const e = d.value[l];
-        e.type === "fix" ? D("aes-update", m.value, e) : e.type === "dataCategorical" ? (x.value = e.initialData, D("aes-update", e.initialData, e)) : e.type === "dataContinuous" && (I.value = e.initialData, D("aes-update", e.initialData, e));
+        e.type === "fix" ? $("aes-update", m.value, e) : e.type === "dataCategorical" ? (x.value = e.initialData, $("aes-update", e.initialData, e)) : e.type === "dataContinuous" && (I.value = e.initialData, $("aes-update", e.initialData, e));
       }
     );
-    const U = F(), Q = y(() => r.type === "lineType" ? se.length * 32 + 32 : r.type === "dotShape" ? Math.ceil(re.length / 6) * 36 + 40 : r.type === "fill" || r.type === "stroke" ? Math.ceil(A.length / 6) * 36 + 40 : 0);
+    const U = F(), Q = g(() => r.type === "lineType" ? se.length * 32 + 32 : r.type === "dotShape" ? Math.ceil(re.length / 6) * 36 + 40 : r.type === "fill" || r.type === "stroke" ? Math.ceil(w.length / 6) * 36 + 40 : 0);
     return (l, e) => {
       var v, a;
-      return g(), _(ee, null, [
+      return y(), _(ee, null, [
         O("div", Ee, [
           O("div", {
             class: "aes-input-select",
             onClick: e[1] || (e[1] = te(() => {
             }, ["stop"]))
           }, [
-            R(w(ae), {
+            R(A(ae), {
               modelValue: s.value,
               "onUpdate:modelValue": e[0] || (e[0] = (t) => s.value = t),
               disabled: i.disabled || N.value.length < 2,
@@ -165,7 +165,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
             onClick: e[2] || (e[2] = (t) => E.value = !E.value),
             onRef: e[3] || (e[3] = (t) => U.value = t)
           }, null, 8, ["data"]),
-          s.value === "fix" && E.value && m.value ? (g(), S(ce, {
+          s.value === "fix" && E.value && m.value ? (y(), S(ce, {
             key: 0,
             height: Q.value,
             targetRef: U.value,
@@ -175,7 +175,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
               O("div", {
                 class: le(["fixed-aes-list", { "fixed-aes-list__rows": i.type === "lineType" }])
               }, [
-                i.type === "fill" || i.type === "stroke" ? (g(), S(fe, {
+                i.type === "fill" || i.type === "stroke" ? (y(), S(fe, {
                   key: 0,
                   modelValue: m.value,
                   "onUpdate:modelValue": [
@@ -184,7 +184,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
                   ],
                   "color-using": i.type
                 }, null, 8, ["modelValue", "color-using"])) : T("", !0),
-                i.type === "dotShape" ? (g(), S(me, {
+                i.type === "dotShape" ? (y(), S(me, {
                   key: 1,
                   modelValue: m.value,
                   "onUpdate:modelValue": [
@@ -192,7 +192,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
                     e[7] || (e[7] = (t) => l.$emit("aes-update", t, d.value.fix))
                   ]
                 }, null, 8, ["modelValue"])) : T("", !0),
-                i.type === "lineType" ? (g(), S(ye, {
+                i.type === "lineType" ? (y(), S(ge, {
                   key: 2,
                   modelValue: m.value,
                   "onUpdate:modelValue": [
@@ -205,7 +205,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
             _: 1
           }, 8, ["height", "targetRef"])) : T("", !0)
         ]),
-        (((v = n.value) == null ? void 0 : v.type) === "dataCategorical" && x.value || ((a = n.value) == null ? void 0 : a.type) === "dataContinuous" && I.value) && E.value ? (g(), S(ge, {
+        (((v = n.value) == null ? void 0 : v.type) === "dataCategorical" && x.value || ((a = n.value) == null ? void 0 : a.type) === "dataContinuous" && I.value) && E.value ? (y(), S(ye, {
           key: 0,
           title: i.formTitle,
           "back-title": i.formBackTitle,
@@ -214,7 +214,7 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
           default: L(() => {
             var t, u, c, b;
             return [
-              ((t = n.value) == null ? void 0 : t.type) === "dataCategorical" && x.value ? (g(), S(Se, {
+              ((t = n.value) == null ? void 0 : t.type) === "dataCategorical" && x.value ? (y(), S(Se, {
                 key: 0,
                 modelValue: x.value,
                 "onUpdate:modelValue": [
@@ -226,9 +226,9 @@ const Ee = { class: "aes-input-row" }, Ne = /* @__PURE__ */ Z({
                 "used-aes-in-mapping": Y.value[n.value.selectedSource],
                 "allow-hiding": o.value === "discrete",
                 "allow-reordering": o.value === "discrete" || o.value === "histogram" || o.value === "scatterplot" || o.value === "scatterplot-umap",
-                "allow-null-option": o.value === "discrete" && (s.value === "primaryGrouping" && w(p).reactive.axesSettings.axisX.allowNullPrimaryGroups || s.value === "secondaryGrouping" && w(p).reactive.axesSettings.axisX.allowNullSecondaryGroups) || o.value === "scatterplot" || o.value === "scatterplot-umap"
+                "allow-null-option": o.value === "discrete" && (s.value === "primaryGrouping" && A(p).reactive.axesSettings.axisX.allowNullPrimaryGroups || s.value === "secondaryGrouping" && A(p).reactive.axesSettings.axisX.allowNullSecondaryGroups) || o.value === "scatterplot" || o.value === "scatterplot-umap"
               }, null, 8, ["modelValue", "column-value-labels", "data-column-label", "used-aes-in-mapping", "allow-hiding", "allow-reordering", "allow-null-option"])) : T("", !0),
-              ((c = n.value) == null ? void 0 : c.type) === "dataContinuous" && I.value ? (g(), S(Te, {
+              ((c = n.value) == null ? void 0 : c.type) === "dataContinuous" && I.value ? (y(), S(Te, {
                 key: 1,
                 modelValue: I.value,
                 "onUpdate:modelValue": [

package/dist/utils/createChartSettingsForRender/composeChartSettings.js

@@ -1,47 +1,47 @@
-import { getControllerByType as d } from "@milaboratories/pf-plots";
+import { getControllerByType as a } from "@milaboratories/pf-plots";
 import { addFixedOptionsToState as T } from "../addFixedOptionsToState.js";
-import { DEFAULT_HEIGHT_SMALL as a, DEFAULT_HEIGHT as g, DEFAULT_WIDTH_SMALL as y, DEFAULT_WIDTH as w } from "../../constantsCommon.js";
-import { composeDiscreteSettings as b } from "./composeDiscreteSettings.js";
-import { composeScatterplotSettings as C } from "./composeScatterplotSettings.js";
-import { composeScatterplotUmapSettings as H } from "./composeScatterplotUmapSettings.js";
-import { composeHeatmapSettings as D } from "./composeHeatmapSettings.js";
-import { composeDendroSettings as E } from "./composeDendroSettings.js";
-import { composeHistogramSettings as F } from "./composeHistogramSettings.js";
-import { composeBubbleSettings as A } from "./composeBubbleSettings.js";
-function L(n, s = 0) {
+import { DEFAULT_HEIGHT_SMALL as g, DEFAULT_HEIGHT as y, DEFAULT_WIDTH_SMALL as b, DEFAULT_WIDTH as w } from "../../constantsCommon.js";
+import { composeDiscreteSettings as C } from "./composeDiscreteSettings.js";
+import { composeScatterplotSettings as H } from "./composeScatterplotSettings.js";
+import { composeScatterplotUmapSettings as D } from "./composeScatterplotUmapSettings.js";
+import { composeHeatmapSettings as E } from "./composeHeatmapSettings.js";
+import { composeDendroSettings as F } from "./composeDendroSettings.js";
+import { composeHistogramSettings as A } from "./composeHistogramSettings.js";
+import { composeBubbleSettings as L } from "./composeBubbleSettings.js";
+function _(s, n = 0) {
   return {
-    width: (s > 0 ? y : w) * (n / 100),
-    height: (s > 0 ? a : g) * (n / 100)
+    width: (n > 0 ? b : w) * (s / 100),
+    height: (n > 0 ? g : y) * (s / 100)
   };
 }
-function _(n, s, r, m) {
+function B(s, n, r, m) {
   var o, t;
-  if (n !== "scatterplot" && n !== "scatterplot-umap" && n !== "discrete" && n !== "heatmap" && n !== "histogram" && n !== "bubble")
+  if (s !== "scatterplot" && s !== "scatterplot-umap" && s !== "discrete" && s !== "heatmap" && s !== "histogram" && s !== "bubble")
     return { name: "", show: !1 };
   if (m.title.mode === "hidden")
     return { name: "", show: !1 };
   if (m.title.mode === "custom")
     return { name: m.title.value, show: !0, position: m.title.position };
   if (m.title.mode === "auto") {
-    const i = [];
+    const e = [], i = ((o = n.components) == null ? void 0 : o.tabBy.selectorStates) ?? [], f = (((t = n.components) == null ? void 0 : t.filters.selectorStates) ?? []).filter((l) => !i.some((p) => p.selectedSource === l.selectedSource));
     return [
-      ...((o = s.components) == null ? void 0 : o.filters.selectorStates) ?? [],
-      ...((t = s.components) == null ? void 0 : t.tabBy.selectorStates) ?? []
-    ].forEach(({ type: l, selectedSource: e, selectedFilterValues: u }) => {
-      if ((!l || l === "equals") && u && r[e]) {
-        const { value: c, label: h } = r[e];
-        i.push(...u.map((f) => c === f ? h : String(f)));
+      ...i,
+      ...f
+    ].forEach(({ type: l, selectedSource: p, selectedFilterValues: u }) => {
+      if ((!l || l === "equals") && u && r[p]) {
+        const { value: h, label: d } = r[p];
+        e.push(...u.map((c) => h === c ? d : String(c)));
       }
-    }), { name: i.join(", "), show: !0, position: m.title.position };
+    }), { name: e.join(", "), show: !0, position: m.title.position };
   }
   return { name: "", show: !1 };
 }
-async function J(n, s, r, m) {
-  if (!n.ready || r === null)
+async function K(s, n, r, m) {
+  if (!s.ready || r === null)
     return null;
   try {
-    const o = d(s.chartType), t = await T(
-      s.optionsState,
+    const o = a(n.chartType), t = await T(
+      n.optionsState,
       r,
       m
     );
@@ -53,19 +53,19 @@ async function J(n, s, r, m) {
     return console.warn("Cant build chart data"), console.warn(o.message), null;
   }
 }
-function K(n, s, r, m, o) {
-  var p;
-  if (!s.ready || n === null)
+function N(s, n, r, m, o) {
+  var i;
+  if (!n.ready || s === null)
     return null;
-  let t = { ...n.settings };
-  const i = n.data.byColumns;
-  return t.title = _(o.chartType, o.optionsState, m, o.axesSettings), t.size = L(o.chartScale, ((p = o.optionsState.components) == null ? void 0 : p.facetBy.selectorStates.length) || 0), o.chartType === "discrete" && (t = b(t, o, r, s)), o.chartType === "scatterplot" && (t = C(t, i, o, s, r)), o.chartType === "scatterplot-umap" && (t = H(t, i, o, s, r)), o.chartType === "heatmap" && (t = D(t, o)), o.chartType === "dendro" && (t = E(t, i, o, s, r)), o.chartType === "histogram" && (t = F(t, o, r)), o.chartType === "bubble" && (t = A(t, o)), {
+  let t = { ...s.settings };
+  const e = s.data.byColumns;
+  return t.title = B(o.chartType, o.optionsState, m, o.axesSettings), t.size = _(o.chartScale, ((i = o.optionsState.components) == null ? void 0 : i.facetBy.selectorStates.length) || 0), o.chartType === "discrete" && (t = C(t, o, r, n)), o.chartType === "scatterplot" && (t = H(t, e, o, n, r)), o.chartType === "scatterplot-umap" && (t = D(t, e, o, n, r)), o.chartType === "heatmap" && (t = E(t, o)), o.chartType === "dendro" && (t = F(t, e, o, n, r)), o.chartType === "histogram" && (t = A(t, o, r)), o.chartType === "bubble" && (t = L(t, o)), {
     settings: t,
-    data: n.data.byColumns
+    data: s.data.byColumns
   };
 }
 export {
-  K as composeChartSettings,
-  J as loadDataForPlot
+  N as composeChartSettings,
+  K as loadDataForPlot
 };
 //# sourceMappingURL=composeChartSettings.js.map

package/dist/utils/createChartSettingsForRender/composeChartSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"composeChartSettings.js","sources":["../../../src/utils/createChartSettingsForRender/composeChartSettings.ts"],"sourcesContent":["import type {\n  ChartType,\n  DemoDataStore,\n  InputGuide,\n  InputState,\n  PlotDataAndSettings,\n  SelectorStateFilter,\n} from '@milaboratories/pf-plots';\nimport {\n  getControllerByType,\n} from '@milaboratories/pf-plots';\nimport type {\n  GraphMakerProps,\n  ReactiveState,\n  TitlePosition,\n  UniqueValuesBySourceMap,\n} from '../../types';\nimport { addFixedOptionsToState } from '../addFixedOptionsToState';\nimport type {\n  AxesState } from '../../constantsCommon';\nimport { DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL,\n} from '../../constantsCommon';\nimport type {\n  BubbleSettings,\n  DataByColumns,\n  DendroSettings,\n  DiscreteSettings,\n  HeatmapSettings,\n  HistogramSettings,\n  ScatterplotSettings,\n  ScatterplotUmapSettings,\n  Settings,\n} from '@milaboratories/miplots4';\nimport { composeDiscreteSettings } from './composeDiscreteSettings';\nimport { composeScatterplotSettings } from './composeScatterplotSettings';\nimport { composeScatterplotUmapSettings } from './composeScatterplotUmapSettings';\nimport { composeHeatmapSettings } from './composeHeatmapSettings';\nimport { composeDendroSettings } from './composeDendroSettings';\nimport { composeHistogramSettings } from './composeHistogramSettings';\nimport { composeBubbleSettings } from './composeBubbleSettings';\nimport type { ListOption } from '@platforma-sdk/ui-vue';\n\nfunction getChartSizes(chartScale: number, facetByLength = 0) {\n  return {\n    width: (facetByLength > 0 ? DEFAULT_WIDTH_SMALL : DEFAULT_WIDTH) * (chartScale / 100),\n    height: (facetByLength > 0 ? DEFAULT_HEIGHT_SMALL : DEFAULT_HEIGHT) * (chartScale / 100),\n  };\n}\n\nfunction getChartTitle(\n  chartType: ChartType,\n  optionsState: InputState,\n  filterLabelsInfo: Record<string, ListOption>,\n  axesSettings: AxesState,\n): {\n    name: string;\n    show: boolean;\n    position?: TitlePosition;\n  } {\n  if (\n    chartType !== 'scatterplot'\n    && chartType !== 'scatterplot-umap'\n    && chartType !== 'discrete'\n    && chartType !== 'heatmap'\n    && chartType !== 'histogram'\n    && chartType !== 'bubble'\n  ) {\n    return { name: '', show: false };\n  }\n  if (axesSettings.title.mode === 'hidden') {\n    return { name: '', show: false };\n  }\n  if (axesSettings.title.mode === 'custom') {\n    return { name: axesSettings.title.value, show: true, position: axesSettings.title.position };\n  }\n  if (axesSettings.title.mode === 'auto') {\n    const selectedFilters: string[] = [];\n    const usedInTitleStates = [\n      ...(optionsState.components?.filters.selectorStates ?? []),\n      ...(optionsState.components?.tabBy.selectorStates ?? []),\n    ] as SelectorStateFilter[];\n    usedInTitleStates.forEach(({ type, selectedSource, selectedFilterValues }) => {\n      if ((!type || type === 'equals') && selectedFilterValues && filterLabelsInfo[selectedSource]) {\n        const { value, label } = filterLabelsInfo[selectedSource] as { value: unknown; label: string };\n        selectedFilters.push(...selectedFilterValues.map((selectedFilterValue) => value === selectedFilterValue ? label : String(selectedFilterValue)));\n      }\n    });\n    const title = selectedFilters.join(', ');\n    return { name: title, show: true, position: axesSettings.title.position };\n  }\n  return { name: '', show: false };\n}\n\nexport async function loadDataForPlot(\n  inputGuide: InputGuide<InputState>,\n  reactiveState: ReactiveState,\n  dataStore: DemoDataStore | null,\n  fixedOptions?: GraphMakerProps['fixedOptions'],\n) {\n  if (!inputGuide.ready || dataStore === null) {\n    return null;\n  }\n  try {\n    const controller = getControllerByType(reactiveState.chartType);\n    const optionsStateWithFixed = await addFixedOptionsToState(\n      reactiveState.optionsState,\n      dataStore,\n      fixedOptions,\n    );\n    return controller.createDataForPlot(\n      dataStore,\n      optionsStateWithFixed,\n    );\n  } catch (err) {\n    console.warn('Cant build chart data');\n    console.warn((err as Error).message);\n    return null;\n  }\n}\nexport function composeChartSettings(\n  chartData: PlotDataAndSettings | null,\n  inputGuide: InputGuide<InputState>,\n  labelsInfo: UniqueValuesBySourceMap,\n  filterLabelsInfo: Record<string, ListOption>,\n  reactiveState: ReactiveState,\n): null | { settings: Settings; data: DataByColumns } {\n  if (!inputGuide.ready || chartData === null) {\n    return null;\n  }\n\n  let settings = { ...chartData.settings };\n  const dataByColumns = chartData.data.byColumns;\n  settings.title = getChartTitle(reactiveState.chartType, reactiveState.optionsState, filterLabelsInfo, reactiveState.axesSettings);\n  settings.size = getChartSizes(reactiveState.chartScale, reactiveState.optionsState.components?.facetBy.selectorStates.length || 0);\n  if (reactiveState.chartType === 'discrete') {\n    settings = composeDiscreteSettings(settings as DiscreteSettings, reactiveState, labelsInfo, inputGuide);\n  }\n  if (reactiveState.chartType === 'scatterplot') {\n    settings = composeScatterplotSettings(settings as ScatterplotSettings, dataByColumns, reactiveState, inputGuide, labelsInfo);\n  }\n  if (reactiveState.chartType === 'scatterplot-umap') {\n    settings = composeScatterplotUmapSettings(settings as ScatterplotUmapSettings, dataByColumns, reactiveState, inputGuide, labelsInfo);\n  }\n  if (reactiveState.chartType === 'heatmap') {\n    settings = composeHeatmapSettings(settings as HeatmapSettings, reactiveState);\n  }\n  if (reactiveState.chartType === 'dendro') {\n    settings = composeDendroSettings(settings as DendroSettings, dataByColumns, reactiveState, inputGuide, labelsInfo);\n  }\n  if (reactiveState.chartType === 'histogram') {\n    settings = composeHistogramSettings(settings as HistogramSettings, reactiveState, labelsInfo);\n  }\n  if (reactiveState.chartType === 'bubble') {\n    settings = composeBubbleSettings(settings as BubbleSettings, reactiveState);\n  }\n  return {\n    settings: settings as Settings,\n    data: chartData.data.byColumns,\n  };\n}\n"],"names":["getChartSizes","chartScale","facetByLength","DEFAULT_WIDTH_SMALL","DEFAULT_WIDTH","DEFAULT_HEIGHT_SMALL","DEFAULT_HEIGHT","getChartTitle","chartType","optionsState","filterLabelsInfo","axesSettings","selectedFilters","_a","_b","type","selectedSource","selectedFilterValues","value","label","selectedFilterValue","loadDataForPlot","inputGuide","reactiveState","dataStore","fixedOptions","controller","getControllerByType","optionsStateWithFixed","addFixedOptionsToState","err","composeChartSettings","chartData","labelsInfo","settings","dataByColumns","composeDiscreteSettings","composeScatterplotSettings","composeScatterplotUmapSettings","composeHeatmapSettings","composeDendroSettings","composeHistogramSettings","composeBubbleSettings"],"mappings":"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"}
+{"version":3,"file":"composeChartSettings.js","sources":["../../../src/utils/createChartSettingsForRender/composeChartSettings.ts"],"sourcesContent":["import type {\n  ChartType,\n  DemoDataStore,\n  InputGuide,\n  InputState,\n  PlotDataAndSettings,\n  SelectorStateFilter,\n} from '@milaboratories/pf-plots';\nimport {\n  getControllerByType,\n} from '@milaboratories/pf-plots';\nimport type {\n  GraphMakerProps,\n  ReactiveState,\n  TitlePosition,\n  UniqueValuesBySourceMap,\n} from '../../types';\nimport { addFixedOptionsToState } from '../addFixedOptionsToState';\nimport type {\n  AxesState } from '../../constantsCommon';\nimport { DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL,\n} from '../../constantsCommon';\nimport type {\n  BubbleSettings,\n  DataByColumns,\n  DendroSettings,\n  DiscreteSettings,\n  HeatmapSettings,\n  HistogramSettings,\n  ScatterplotSettings,\n  ScatterplotUmapSettings,\n  Settings,\n} from '@milaboratories/miplots4';\nimport { composeDiscreteSettings } from './composeDiscreteSettings';\nimport { composeScatterplotSettings } from './composeScatterplotSettings';\nimport { composeScatterplotUmapSettings } from './composeScatterplotUmapSettings';\nimport { composeHeatmapSettings } from './composeHeatmapSettings';\nimport { composeDendroSettings } from './composeDendroSettings';\nimport { composeHistogramSettings } from './composeHistogramSettings';\nimport { composeBubbleSettings } from './composeBubbleSettings';\nimport type { ListOption } from '@platforma-sdk/ui-vue';\n\nfunction getChartSizes(chartScale: number, facetByLength = 0) {\n  return {\n    width: (facetByLength > 0 ? DEFAULT_WIDTH_SMALL : DEFAULT_WIDTH) * (chartScale / 100),\n    height: (facetByLength > 0 ? DEFAULT_HEIGHT_SMALL : DEFAULT_HEIGHT) * (chartScale / 100),\n  };\n}\n\nfunction getChartTitle(\n  chartType: ChartType,\n  optionsState: InputState,\n  filterLabelsInfo: Record<string, ListOption>,\n  axesSettings: AxesState,\n): {\n    name: string;\n    show: boolean;\n    position?: TitlePosition;\n  } {\n  if (\n    chartType !== 'scatterplot'\n    && chartType !== 'scatterplot-umap'\n    && chartType !== 'discrete'\n    && chartType !== 'heatmap'\n    && chartType !== 'histogram'\n    && chartType !== 'bubble'\n  ) {\n    return { name: '', show: false };\n  }\n  if (axesSettings.title.mode === 'hidden') {\n    return { name: '', show: false };\n  }\n  if (axesSettings.title.mode === 'custom') {\n    return { name: axesSettings.title.value, show: true, position: axesSettings.title.position };\n  }\n  if (axesSettings.title.mode === 'auto') {\n    const selectedFilters: string[] = [];\n    const tabByStates = (optionsState.components?.tabBy.selectorStates ?? []);\n    const filterStates = (optionsState.components?.filters.selectorStates ?? []).filter((state) => !tabByStates.some((tabByState) => tabByState.selectedSource === state.selectedSource));\n\n    const usedInTitleStates = [\n      ...tabByStates,\n      ...filterStates,\n    ] as SelectorStateFilter[];\n    usedInTitleStates.forEach(({ type, selectedSource, selectedFilterValues }) => {\n      if ((!type || type === 'equals') && selectedFilterValues && filterLabelsInfo[selectedSource]) {\n        const { value, label } = filterLabelsInfo[selectedSource] as { value: unknown; label: string };\n        selectedFilters.push(...selectedFilterValues.map((selectedFilterValue) => value === selectedFilterValue ? label : String(selectedFilterValue)));\n      }\n    });\n    const title = selectedFilters.join(', ');\n    return { name: title, show: true, position: axesSettings.title.position };\n  }\n  return { name: '', show: false };\n}\n\nexport async function loadDataForPlot(\n  inputGuide: InputGuide<InputState>,\n  reactiveState: ReactiveState,\n  dataStore: DemoDataStore | null,\n  fixedOptions?: GraphMakerProps['fixedOptions'],\n) {\n  if (!inputGuide.ready || dataStore === null) {\n    return null;\n  }\n  try {\n    const controller = getControllerByType(reactiveState.chartType);\n    const optionsStateWithFixed = await addFixedOptionsToState(\n      reactiveState.optionsState,\n      dataStore,\n      fixedOptions,\n    );\n    return controller.createDataForPlot(\n      dataStore,\n      optionsStateWithFixed,\n    );\n  } catch (err) {\n    console.warn('Cant build chart data');\n    console.warn((err as Error).message);\n    return null;\n  }\n}\nexport function composeChartSettings(\n  chartData: PlotDataAndSettings | null,\n  inputGuide: InputGuide<InputState>,\n  labelsInfo: UniqueValuesBySourceMap,\n  filterLabelsInfo: Record<string, ListOption>,\n  reactiveState: ReactiveState,\n): null | { settings: Settings; data: DataByColumns } {\n  if (!inputGuide.ready || chartData === null) {\n    return null;\n  }\n\n  let settings = { ...chartData.settings };\n  const dataByColumns = chartData.data.byColumns;\n  settings.title = getChartTitle(reactiveState.chartType, reactiveState.optionsState, filterLabelsInfo, reactiveState.axesSettings);\n  settings.size = getChartSizes(reactiveState.chartScale, reactiveState.optionsState.components?.facetBy.selectorStates.length || 0);\n  if (reactiveState.chartType === 'discrete') {\n    settings = composeDiscreteSettings(settings as DiscreteSettings, reactiveState, labelsInfo, inputGuide);\n  }\n  if (reactiveState.chartType === 'scatterplot') {\n    settings = composeScatterplotSettings(settings as ScatterplotSettings, dataByColumns, reactiveState, inputGuide, labelsInfo);\n  }\n  if (reactiveState.chartType === 'scatterplot-umap') {\n    settings = composeScatterplotUmapSettings(settings as ScatterplotUmapSettings, dataByColumns, reactiveState, inputGuide, labelsInfo);\n  }\n  if (reactiveState.chartType === 'heatmap') {\n    settings = composeHeatmapSettings(settings as HeatmapSettings, reactiveState);\n  }\n  if (reactiveState.chartType === 'dendro') {\n    settings = composeDendroSettings(settings as DendroSettings, dataByColumns, reactiveState, inputGuide, labelsInfo);\n  }\n  if (reactiveState.chartType === 'histogram') {\n    settings = composeHistogramSettings(settings as HistogramSettings, reactiveState, labelsInfo);\n  }\n  if (reactiveState.chartType === 'bubble') {\n    settings = composeBubbleSettings(settings as BubbleSettings, reactiveState);\n  }\n  return {\n    settings: settings as Settings,\n    data: chartData.data.byColumns,\n  };\n}\n"],"names":["getChartSizes","chartScale","facetByLength","DEFAULT_WIDTH_SMALL","DEFAULT_WIDTH","DEFAULT_HEIGHT_SMALL","DEFAULT_HEIGHT","getChartTitle","chartType","optionsState","filterLabelsInfo","axesSettings","selectedFilters","tabByStates","_a","filterStates","_b","state","tabByState","type","selectedSource","selectedFilterValues","value","label","selectedFilterValue","loadDataForPlot","inputGuide","reactiveState","dataStore","fixedOptions","controller","getControllerByType","optionsStateWithFixed","addFixedOptionsToState","err","composeChartSettings","chartData","labelsInfo","settings","dataByColumns","composeDiscreteSettings","composeScatterplotSettings","composeScatterplotUmapSettings","composeHeatmapSettings","composeDendroSettings","composeHistogramSettings","composeBubbleSettings"],"mappings":"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"}

package/dist/utils/createChartSettingsForRender/getLayersDataFromForms.js

@@ -1,6 +1,6 @@
 import { isContinuousDataMapping as w } from "../../constantsCommon.js";
-import { AMINOACID_COLOR_MAPPING as L, NUCLEOTIDE_COLOR_MAPPING as b, PALETTE_MAP as A, DEFAULT_BLACK as M, DEFAULT_CONTINUOUS_PALETTE as F, DEFAULT_DOT_SHAPE as I } from "../../constantsAesthetic.js";
-import { DEFAULT_DOT_SIZE as V, DEFAULT_DOT_RANGE as _, isAestheticMappingContinuous as P, createContinuousMappingFromPalette as N } from "../../dataBindAes.js";
+import { AMINOACID_COLOR_MAPPING as L, NUCLEOTIDE_COLOR_MAPPING as A, PALETTE_MAP as b, DEFAULT_BLACK as v, DEFAULT_CONTINUOUS_PALETTE as F, DEFAULT_DOT_SHAPE as I } from "../../constantsAesthetic.js";
+import { DEFAULT_DOT_SIZE as _, DEFAULT_DOT_RANGE as P, isAestheticMappingContinuous as N, createContinuousMappingFromPalette as V } from "../../dataBindAes.js";
 function x(t) {
   const r = [];
   if (t.overall.data.testMethod && t.overall.validity.testMethod && r.push({
@@ -8,7 +8,7 @@ function x(t) {
     statType: "overall",
     testMethod: t.overall.data.testMethod
   }), t.referenceGroup.data.testMethod && t.referenceGroup.validity.testMethod && t.referenceGroup.validity.referenceGroup) {
-    const c = {
+    const u = {
       type: "stat",
       statType: "referenceGroup",
       testMethod: t.referenceGroup.data.testMethod,
@@ -16,24 +16,24 @@ function x(t) {
       format: t.referenceGroup.data.format,
       ns: t.referenceGroup.data.ns
     };
-    t.referenceGroup.data.correctionMethod !== "none" && (c.correctionMethod = t.referenceGroup.data.correctionMethod), r.push(c);
+    t.referenceGroup.data.correctionMethod !== "none" && (u.correctionMethod = t.referenceGroup.data.correctionMethod), r.push(u);
   }
   if (t.pairwise.data.testMethod && t.pairwise.validity.testMethod) {
-    const c = {
+    const u = {
       type: "stat",
       statType: "pairwise",
       testMethod: t.pairwise.data.testMethod,
       format: t.pairwise.data.format,
       ns: t.pairwise.data.ns
     };
-    t.referenceGroup.data.correctionMethod !== "none" && (c.correctionMethod = t.referenceGroup.data.correctionMethod), r.push(c);
+    t.referenceGroup.data.correctionMethod !== "none" && (u.correctionMethod = t.referenceGroup.data.correctionMethod), r.push(u);
   }
   return r;
 }
-function B(t, r, c, d, f) {
-  const n = [], h = d.components.primaryGrouping.selectorStates.length > 0, p = d.components.secondaryGrouping.selectorStates.length > 0;
+function B(t, r, u, f, d) {
+  const n = [], h = f.components.primaryGrouping.selectorStates.length > 0, s = f.components.secondaryGrouping.selectorStates.length > 0;
   function i(o, l = !1) {
-    return o === null ? p ? { type: "secondaryGrouping" } : h && !l ? { type: "primaryGrouping" } : { type: "secondaryGrouping" } : o;
+    return o === null ? s ? { type: "secondaryGrouping" } : h && !l ? { type: "primaryGrouping" } : { type: "secondaryGrouping" } : o;
   }
   return t.forEach((o) => {
     var l;
@@ -174,88 +174,85 @@ function B(t, r, c, d, f) {
         }
       });
     }
-    if (o === "logo" && p) {
-      const e = r[o], y = ((l = f.getSourceInfo(d.components.secondaryGrouping.selectorStates[0].selectedSource).spec.domain) == null ? void 0 : l["pl7.app/alphabet"]) === "aminoacid";
+    if (o === "logo" && s) {
+      const e = r[o], y = ((l = d.getSourceInfo(f.components.secondaryGrouping.selectorStates[0].selectedSource).spec.domain) == null ? void 0 : l["pl7.app/alphabet"]) === "aminoacid";
       n.push({
         type: "logo",
         normalize: e.normalize,
         aes: {
           opacity: e.opacity,
-          dotFill: y ? L : b
+          dotFill: y ? L : A
         }
       });
     }
-  }), h && !p && n.push(...x(c)), n;
+  }), h && !s && n.push(...x(u)), n;
 }
-function z(t, r, c, d) {
+function z(t, r, u, f) {
   if (t) {
-    const f = w(r) ? r : { column: t.value, range: _ }, n = [1 / 0, -1 / 0];
-    return c.values[t.value].forEach((h) => {
-      const p = Number(h);
-      p < n[0] && (n[0] = p), p > n[1] && (n[1] = p);
-    }), { columnName: t, domain: n, range: [f.range.min, f.range.max] };
+    const d = w(r) ? r : { column: t.value, range: P }, n = [1 / 0, -1 / 0];
+    return u.values[t.value].forEach((h) => {
+      const s = Number(h);
+      s < n[0] && (n[0] = s), s > n[1] && (n[1] = s);
+    }), { columnName: t, domain: n, range: [d.range.min, d.range.max] };
   }
-  return w(r) ? d : r ?? d;
+  return w(r) ? f : r ?? f;
 }
-function D(t, r, c, d) {
-  const f = c.find((n) => n.value === t);
-  if (f) {
-    console.log("column", f), console.log("value", r);
-    const { range: n, palette: h, midPoint: p, log: i } = r;
+function D(t, r, u, f) {
+  const d = u.find((n) => n.value === t);
+  if (d) {
+    const { range: n, palette: h, midPoint: s, log: i } = r;
     let { minValue: o, maxValue: l } = n ?? {}, e = !1;
-    const m = o == null, y = l == null;
-    console.log("minValueMissed", m), console.log("maxValueMissed", y);
-    const u = [1 / 0, -1 / 0];
-    (m || y) && (d.values[f.value].forEach((s) => {
-      const g = Number(s);
-      g < u[0] && (u[0] = g), g > u[1] && (u[1] = g);
-    }), console.log("bounds", u)), m && y ? (o = u[0], l = u[1]) : m ? o = l > u[0] ? u[0] : u[1] : y && (l = o < u[1] ? u[1] : u[0]), console.log("minValue", o, "maxValue", l), o != null && l !== null && l !== void 0 && o > l && (e = !0, [o, l] = [l, o]);
+    const m = o == null, y = l == null, c = [1 / 0, -1 / 0];
+    (m || y) && f.values[d.value].forEach((p) => {
+      const g = Number(p);
+      g < c[0] && (c[0] = g), g > c[1] && (c[1] = g);
+    }), m && y ? (o = c[0], l = c[1]) : m ? o = l > c[0] ? c[0] : c[1] : y && (l = o < c[1] ? c[1] : c[0]), o != null && l !== null && l !== void 0 && o > l && (e = !0, [o, l] = [l, o]);
     const C = [o, l];
-    if (p != null) {
-      const s = Math.max(Math.abs(p - o), Math.abs(p - l));
-      C[0] = p - s, C[1] = p + s;
+    if (s != null) {
+      const p = Math.max(Math.abs(s - o), Math.abs(s - l));
+      C[0] = s - p, C[1] = s + p;
     }
-    const a = [...A[h].colors];
+    const a = [...b[h].colors];
     return e && a.reverse(), {
-      columnName: f,
+      columnName: d,
       domain: C,
       range: a,
       type: i ? "log" : "linear"
     };
   }
-  return M;
+  return v;
 }
-function R(t, r, c, d, f, n, h = [], p = V) {
-  var u, C;
+function R(t, r, u, f, d, n, h = [], s = _) {
+  var c, C;
   const i = [];
-  function o(a, s, g, v = !1) {
+  function o(a, p, g, M = !1) {
     var G;
-    if (s.length) {
-      const O = s.length ? (G = n.getSourceInfo(s[0])) == null ? void 0 : G.type : void 0, E = O === "String" || !v ? { type: "grouping", value: s[0] } : D(s[0], N(F), h, c), T = f[s[0]];
-      return a === null || O === "String" || !v || !P(T) ? E : D(s[0], T, h, c);
+    if (p.length) {
+      const O = p.length ? (G = n.getSourceInfo(p[0])) == null ? void 0 : G.type : void 0, E = O === "String" || !M ? { type: "grouping", value: p[0] } : D(p[0], V(F), h, u), T = d[p[0]];
+      return a === null || O === "String" || !M || !N(T) ? E : D(p[0], T, h, u);
     }
     return typeof a == "object" ? g : a;
   }
-  const l = d.components.grouping.selectorStates.map((a) => a.selectedSource), e = ((u = d.components.shape) == null ? void 0 : u.selectorStates.map((a) => a.selectedSource)) ?? [], m = (C = d.components.size) == null ? void 0 : C.selectorStates.map((a) => a.selectedSource)[0], y = m ? h.find((a) => a.value === m) : void 0;
+  const l = f.components.grouping.selectorStates.map((a) => a.selectedSource), e = ((c = f.components.shape) == null ? void 0 : c.selectorStates.map((a) => a.selectedSource)) ?? [], m = (C = f.components.size) == null ? void 0 : C.selectorStates.map((a) => a.selectedSource)[0], y = m ? h.find((a) => a.value === m) : void 0;
   return t.forEach((a) => {
     if (a === "dots") {
-      const s = r[a];
+      const p = r[a];
       i.push({
         type: "dots",
         aes: {
-          dotFill: o(s.dotFill, l, M, !0),
-          dotShape: o(s.dotShape, e, I),
-          dotSize: z(y, s.dotSize, c, p)
+          dotFill: o(p.dotFill, l, v, !0),
+          dotShape: o(p.dotShape, e, I),
+          dotSize: z(y, p.dotSize, u, s)
         }
       });
     }
     if (a === "curve") {
-      const s = r[a];
+      const p = r[a];
       i.push({
         type: "curve",
-        smoothing: s.smoothing,
+        smoothing: p.smoothing,
         aes: {
-          lineColor: o(s.lineColor, l, M, !0)
+          lineColor: o(p.lineColor, l, v, !0)
         }
       });
     }