@milaboratories/graph-maker 1.2.0 → 1.2.1

package/dist/utils/createChartSettingsForRender/composeHeatmapSettings.js

@@ -1,44 +1,46 @@
-import { PALETTE_MAP as s } from "../../constantsAesthetic.js";
-import { getAxesDataFromForms as f } from "./getAxesDataFromForms.js";
-function T(o, l, a) {
-  var r, u, h;
-  const n = {}, d = (r = l.dataBindAes[o.valueColumn.value]) == null ? void 0 : r.palette;
+import { PALETTE_MAP as u } from "../../constantsAesthetic.js";
+import { getAxesDataFromForms as s } from "./getAxesDataFromForms.js";
+function T(o, l, n) {
+  var m, p, x;
+  const r = {}, d = (m = l.dataBindAes[o.valueColumn.value]) == null ? void 0 : m.palette;
   if ((o == null ? void 0 : o.valueType) !== "discrete") {
     if (l.template === "heatmapClustered") {
-      const i = l.layersSettings.heatmapClustered;
-      i.disableClusteringX || (o.dendrogramX = {
+      const a = l.layersSettings.heatmapClustered;
+      a.disableClusteringX || (o.dendrogramX = {
         fillNA: 0,
         showNodes: !1,
-        hidden: !i.dendrogramX
-      }), i.disableClusteringY || (o.dendrogramY = {
+        hidden: !a.dendrogramX
+      }), a.disableClusteringY || (o.dendrogramY = {
         fillNA: 0,
         position: "right",
         showNodes: !1,
-        hidden: !i.dendrogramY
+        hidden: !a.dendrogramY
       });
     }
-    n.colorsList = s[d ?? a.continuous].colors;
+    r.colorsList = u[d ?? n.continuous].colors;
   } else
-    n.colorsList = s[d ?? "bright"].colors;
-  o.aes = n, (u = o.annotations) == null || u.forEach((i) => {
-    var x;
-    const m = i.valueColumn.value, c = (x = l.dataBindAes[m]) == null ? void 0 : x.palette;
-    i.colors = s[c ?? (i.type === "discrete" ? a.categorical : a.continuous)].colors;
+    r.colorsList = u[d ?? "bright"].colors;
+  o.aes = r, (p = o.annotations) == null || p.forEach((a) => {
+    var y;
+    const h = a.valueColumn.value, c = (y = l.dataBindAes[h]) == null ? void 0 : y.palette;
+    a.colors = u[c ?? (a.type === "discrete" ? n.categorical : n.continuous)].colors;
   }), Object.assign(
     o,
-    f(l.axesSettings, l.chartType)
+    s(l.axesSettings, l.chartType)
   ), l.axesSettings.axisX.cellSize !== null && o.size && (o.size.cellWidth = l.axesSettings.axisX.cellSize * (l.chartScale / 100)), l.axesSettings.axisY.cellSize !== null && o.size && (o.size.cellHeight = l.axesSettings.axisY.cellSize * (l.chartScale / 100)), l.template === "heatmapClustered" && (o == null ? void 0 : o.valueType) !== "discrete" && (o.facetSettings.sharedX = !1, o.facetSettings.sharedY = !1);
-  const p = l.template, e = l.layersSettings[p];
-  return o.NAValueAs = e.NAValueAs, o.valueType === "continuous" && e.normalizationDirection && (o.normalization = {
+  const f = l.template, e = l.layersSettings[f];
+  o.NAValueAs = e.NAValueAs, o.valueType === "continuous" && e.normalizationDirection && (o.normalization = {
     method: e.normalizationMethod,
     direction: e.normalizationDirection
   }), o.valueType === "continuous" && (e.aggregateByX || e.aggregateByY) && (o.aggregation = {
     x: e.aggregateByX && o.xGroupBy && o.xGroupBy.length > 0,
     y: e.aggregateByY && o.yGroupBy && o.yGroupBy.length > 0,
     method: e.aggregationMethod
-  }), (h = o.annotations) == null || h.forEach((i) => {
-    i.axis === "x" ? (i.titlePosition = l.axesSettings.axisX.annotationTitlePosition === "hidden" ? void 0 : l.axesSettings.axisX.annotationTitlePosition, i.showTitle = l.axesSettings.axisX.annotationTitlePosition !== "hidden") : (i.titlePosition = l.axesSettings.axisY.annotationTitlePosition === "hidden" ? void 0 : l.axesSettings.axisY.annotationTitlePosition, i.showTitle = l.axesSettings.axisY.annotationTitlePosition !== "hidden");
-  }), l.axesSettings.other.canvasRenderMode && (o.cellsRenderingMode = "canvas"), o;
+  }), (x = o.annotations) == null || x.forEach((a) => {
+    a.axis === "x" ? (a.titlePosition = l.axesSettings.axisX.annotationTitlePosition === "hidden" ? void 0 : l.axesSettings.axisX.annotationTitlePosition, a.showTitle = l.axesSettings.axisX.annotationTitlePosition !== "hidden") : (a.titlePosition = l.axesSettings.axisY.annotationTitlePosition === "hidden" ? void 0 : l.axesSettings.axisY.annotationTitlePosition, a.showTitle = l.axesSettings.axisY.annotationTitlePosition !== "hidden");
+  }), l.axesSettings.other.canvasRenderMode && (o.cellsRenderingMode = "canvas");
+  const i = l.axesSettings.other.nullValueLabel;
+  return o.xColumn && (o.xColumn = { ...o.xColumn, nullValueLabel: i }), o.yColumn && (o.yColumn = { ...o.yColumn, nullValueLabel: i }), o.xGroupBy && (o.xGroupBy = o.xGroupBy.map((a) => ({ ...a, nullValueLabel: i }))), o.yGroupBy && (o.yGroupBy = o.yGroupBy.map((a) => ({ ...a, nullValueLabel: i }))), o.facetBy && (o.facetBy = o.facetBy.map((a) => ({ ...a, nullValueLabel: i }))), o.annotations && (o.annotations = o.annotations.map((a) => ({ ...a, valueColumn: { ...a.valueColumn, nullValueLabel: i } }))), o;
 }
 export {
   T as composeHeatmapSettings

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

@@ -1 +1 @@
-{"version":3,"file":"composeHeatmapSettings.js","sources":["../../../src/utils/createChartSettingsForRender/composeHeatmapSettings.ts"],"sourcesContent":["import type { HeatmapSettings } from '@milaboratories/miplots4';\nimport { PALETTE_MAP } from '../../constantsAesthetic';\nimport type { DefaultPalettes, HeatmapLayerTemplate, ReactiveState } from '../../types';\nimport { getAxesDataFromForms } from '../index';\n\nexport function composeHeatmapSettings(\n  settings: HeatmapSettings,\n  reactiveState: ReactiveState,\n  defaultPalette: DefaultPalettes,\n) {\n  const aes = {} as Record<string, unknown>;\n  const palette = reactiveState.dataBindAes[settings.valueColumn.value]?.palette;\n  if (settings?.valueType !== 'discrete') {\n    if (reactiveState.template === 'heatmapClustered') {\n      const layer = reactiveState.layersSettings.heatmapClustered;\n      if (!layer.disableClusteringX) {\n        settings.dendrogramX = {\n          fillNA: 0,\n          showNodes: false,\n          hidden: !layer.dendrogramX,\n        };\n      }\n      if (!layer.disableClusteringY) {\n        settings.dendrogramY = {\n          fillNA: 0,\n          position: 'right',\n          showNodes: false,\n          hidden: !layer.dendrogramY,\n        };\n      }\n    }\n    aes.colorsList = PALETTE_MAP[palette ?? defaultPalette.continuous].colors;\n  } else {\n    aes.colorsList = PALETTE_MAP[palette ?? 'bright'].colors;\n  }\n\n  settings.aes = aes;\n\n  settings.annotations?.forEach((annotationSchema) => {\n    const source = annotationSchema.valueColumn.value;\n    const palette = reactiveState.dataBindAes[source]?.palette;\n\n    annotationSchema.colors = PALETTE_MAP[palette ?? (annotationSchema.type === 'discrete' ? defaultPalette.categorical : defaultPalette.continuous)].colors;\n  });\n  Object.assign(\n    settings,\n    getAxesDataFromForms(reactiveState.axesSettings, reactiveState.chartType),\n  );\n\n  if (reactiveState.axesSettings.axisX.cellSize !== null && settings.size) {\n    settings.size.cellWidth = reactiveState.axesSettings.axisX.cellSize * (reactiveState.chartScale / 100);\n  }\n  if (reactiveState.axesSettings.axisY.cellSize !== null && settings.size) {\n    settings.size.cellHeight = reactiveState.axesSettings.axisY.cellSize * (reactiveState.chartScale / 100);\n  }\n  if (reactiveState.template === 'heatmapClustered' && settings?.valueType !== 'discrete') {\n    (settings.facetSettings as HeatmapSettings['facetSettings'])!.sharedX = false;\n    (settings.facetSettings as HeatmapSettings['facetSettings'])!.sharedY = false;\n  }\n\n  const template = reactiveState.template as HeatmapLayerTemplate;\n  const layerSettings = reactiveState.layersSettings[template];\n\n  settings.NAValueAs = layerSettings.NAValueAs;\n  if (settings.valueType === 'continuous' && layerSettings.normalizationDirection) {\n    settings.normalization = {\n      method: layerSettings.normalizationMethod,\n      direction: layerSettings.normalizationDirection,\n    };\n  }\n\n  if (settings.valueType === 'continuous' && (layerSettings.aggregateByX || layerSettings.aggregateByY)) {\n    settings.aggregation = {\n      x: layerSettings.aggregateByX && settings.xGroupBy && settings.xGroupBy.length > 0,\n      y: layerSettings.aggregateByY && settings.yGroupBy && settings.yGroupBy.length > 0,\n      method: layerSettings.aggregationMethod,\n    };\n  }\n\n  settings.annotations?.forEach((annotation) => {\n    if (annotation.axis === 'x') {\n      annotation.titlePosition = reactiveState.axesSettings.axisX.annotationTitlePosition === 'hidden' ? undefined : reactiveState.axesSettings.axisX.annotationTitlePosition;\n      annotation.showTitle = reactiveState.axesSettings.axisX.annotationTitlePosition !== 'hidden';\n    } else {\n      annotation.titlePosition = reactiveState.axesSettings.axisY.annotationTitlePosition === 'hidden' ? undefined : reactiveState.axesSettings.axisY.annotationTitlePosition;\n      annotation.showTitle = reactiveState.axesSettings.axisY.annotationTitlePosition !== 'hidden';\n    }\n  });\n\n  if (reactiveState.axesSettings.other.canvasRenderMode) {\n    settings.cellsRenderingMode = 'canvas';\n  }\n\n  return settings;\n}\n"],"names":["composeHeatmapSettings","settings","reactiveState","defaultPalette","aes","palette","_a","layer","PALETTE_MAP","_b","annotationSchema","source","getAxesDataFromForms","template","layerSettings","_c","annotation"],"mappings":";;AAKO,SAASA,EACdC,GACAC,GACAC,GACA;;AACA,QAAMC,IAAM,CAAA,GACNC,KAAUC,IAAAJ,EAAc,YAAYD,EAAS,YAAY,KAAK,MAApD,gBAAAK,EAAuD;AACvE,OAAIL,KAAA,gBAAAA,EAAU,eAAc,YAAY;AACtC,QAAIC,EAAc,aAAa,oBAAoB;AACjD,YAAMK,IAAQL,EAAc,eAAe;AAC3C,MAAKK,EAAM,uBACTN,EAAS,cAAc;AAAA,QACrB,QAAQ;AAAA,QACR,WAAW;AAAA,QACX,QAAQ,CAACM,EAAM;AAAA,MAAA,IAGdA,EAAM,uBACTN,EAAS,cAAc;AAAA,QACrB,QAAQ;AAAA,QACR,UAAU;AAAA,QACV,WAAW;AAAA,QACX,QAAQ,CAACM,EAAM;AAAA,MAAA;AAAA,IAGrB;AACA,IAAAH,EAAI,aAAaI,EAAYH,KAAWF,EAAe,UAAU,EAAE;AAAA,EACrE;AACE,IAAAC,EAAI,aAAaI,EAAYH,KAAW,QAAQ,EAAE;AAGpD,EAAAJ,EAAS,MAAMG,IAEfK,IAAAR,EAAS,gBAAT,QAAAQ,EAAsB,QAAQ,CAACC,MAAqB;;AAClD,UAAMC,IAASD,EAAiB,YAAY,OACtCL,KAAUC,IAAAJ,EAAc,YAAYS,CAAM,MAAhC,gBAAAL,EAAmC;AAEnD,IAAAI,EAAiB,SAASF,EAAYH,MAAYK,EAAiB,SAAS,aAAaP,EAAe,cAAcA,EAAe,WAAW,EAAE;AAAA,EACpJ,IACA,OAAO;AAAA,IACLF;AAAA,IACAW,EAAqBV,EAAc,cAAcA,EAAc,SAAS;AAAA,EAAA,GAGtEA,EAAc,aAAa,MAAM,aAAa,QAAQD,EAAS,SACjEA,EAAS,KAAK,YAAYC,EAAc,aAAa,MAAM,YAAYA,EAAc,aAAa,OAEhGA,EAAc,aAAa,MAAM,aAAa,QAAQD,EAAS,SACjEA,EAAS,KAAK,aAAaC,EAAc,aAAa,MAAM,YAAYA,EAAc,aAAa,OAEjGA,EAAc,aAAa,uBAAsBD,KAAA,gBAAAA,EAAU,eAAc,eAC1EA,EAAS,cAAoD,UAAU,IACvEA,EAAS,cAAoD,UAAU;AAG1E,QAAMY,IAAWX,EAAc,UACzBY,IAAgBZ,EAAc,eAAeW,CAAQ;AAE3D,SAAAZ,EAAS,YAAYa,EAAc,WAC/Bb,EAAS,cAAc,gBAAgBa,EAAc,2BACvDb,EAAS,gBAAgB;AAAA,IACvB,QAAQa,EAAc;AAAA,IACtB,WAAWA,EAAc;AAAA,EAAA,IAIzBb,EAAS,cAAc,iBAAiBa,EAAc,gBAAgBA,EAAc,kBACtFb,EAAS,cAAc;AAAA,IACrB,GAAGa,EAAc,gBAAgBb,EAAS,YAAYA,EAAS,SAAS,SAAS;AAAA,IACjF,GAAGa,EAAc,gBAAgBb,EAAS,YAAYA,EAAS,SAAS,SAAS;AAAA,IACjF,QAAQa,EAAc;AAAA,EAAA,KAI1BC,IAAAd,EAAS,gBAAT,QAAAc,EAAsB,QAAQ,CAACC,MAAe;AAC5C,IAAIA,EAAW,SAAS,OACtBA,EAAW,gBAAgBd,EAAc,aAAa,MAAM,4BAA4B,WAAW,SAAYA,EAAc,aAAa,MAAM,yBAChJc,EAAW,YAAYd,EAAc,aAAa,MAAM,4BAA4B,aAEpFc,EAAW,gBAAgBd,EAAc,aAAa,MAAM,4BAA4B,WAAW,SAAYA,EAAc,aAAa,MAAM,yBAChJc,EAAW,YAAYd,EAAc,aAAa,MAAM,4BAA4B;AAAA,EAExF,IAEIA,EAAc,aAAa,MAAM,qBACnCD,EAAS,qBAAqB,WAGzBA;AACT;"}
+{"version":3,"file":"composeHeatmapSettings.js","sources":["../../../src/utils/createChartSettingsForRender/composeHeatmapSettings.ts"],"sourcesContent":["import type { HeatmapSettings } from '@milaboratories/miplots4';\nimport { PALETTE_MAP } from '../../constantsAesthetic';\nimport type { DefaultPalettes, HeatmapLayerTemplate, ReactiveState } from '../../types';\nimport { getAxesDataFromForms } from '../index';\n\nexport function composeHeatmapSettings(\n  settings: HeatmapSettings,\n  reactiveState: ReactiveState,\n  defaultPalette: DefaultPalettes,\n) {\n  const aes = {} as Record<string, unknown>;\n  const palette = reactiveState.dataBindAes[settings.valueColumn.value]?.palette;\n  if (settings?.valueType !== 'discrete') {\n    if (reactiveState.template === 'heatmapClustered') {\n      const layer = reactiveState.layersSettings.heatmapClustered;\n      if (!layer.disableClusteringX) {\n        settings.dendrogramX = {\n          fillNA: 0,\n          showNodes: false,\n          hidden: !layer.dendrogramX,\n        };\n      }\n      if (!layer.disableClusteringY) {\n        settings.dendrogramY = {\n          fillNA: 0,\n          position: 'right',\n          showNodes: false,\n          hidden: !layer.dendrogramY,\n        };\n      }\n    }\n    aes.colorsList = PALETTE_MAP[palette ?? defaultPalette.continuous].colors;\n  } else {\n    aes.colorsList = PALETTE_MAP[palette ?? 'bright'].colors;\n  }\n\n  settings.aes = aes;\n\n  settings.annotations?.forEach((annotationSchema) => {\n    const source = annotationSchema.valueColumn.value;\n    const palette = reactiveState.dataBindAes[source]?.palette;\n\n    annotationSchema.colors = PALETTE_MAP[palette ?? (annotationSchema.type === 'discrete' ? defaultPalette.categorical : defaultPalette.continuous)].colors;\n  });\n  Object.assign(\n    settings,\n    getAxesDataFromForms(reactiveState.axesSettings, reactiveState.chartType),\n  );\n\n  if (reactiveState.axesSettings.axisX.cellSize !== null && settings.size) {\n    settings.size.cellWidth = reactiveState.axesSettings.axisX.cellSize * (reactiveState.chartScale / 100);\n  }\n  if (reactiveState.axesSettings.axisY.cellSize !== null && settings.size) {\n    settings.size.cellHeight = reactiveState.axesSettings.axisY.cellSize * (reactiveState.chartScale / 100);\n  }\n  if (reactiveState.template === 'heatmapClustered' && settings?.valueType !== 'discrete') {\n    (settings.facetSettings as HeatmapSettings['facetSettings'])!.sharedX = false;\n    (settings.facetSettings as HeatmapSettings['facetSettings'])!.sharedY = false;\n  }\n\n  const template = reactiveState.template as HeatmapLayerTemplate;\n  const layerSettings = reactiveState.layersSettings[template];\n\n  settings.NAValueAs = layerSettings.NAValueAs;\n  if (settings.valueType === 'continuous' && layerSettings.normalizationDirection) {\n    settings.normalization = {\n      method: layerSettings.normalizationMethod,\n      direction: layerSettings.normalizationDirection,\n    };\n  }\n\n  if (settings.valueType === 'continuous' && (layerSettings.aggregateByX || layerSettings.aggregateByY)) {\n    settings.aggregation = {\n      x: layerSettings.aggregateByX && settings.xGroupBy && settings.xGroupBy.length > 0,\n      y: layerSettings.aggregateByY && settings.yGroupBy && settings.yGroupBy.length > 0,\n      method: layerSettings.aggregationMethod,\n    };\n  }\n\n  settings.annotations?.forEach((annotation) => {\n    if (annotation.axis === 'x') {\n      annotation.titlePosition = reactiveState.axesSettings.axisX.annotationTitlePosition === 'hidden' ? undefined : reactiveState.axesSettings.axisX.annotationTitlePosition;\n      annotation.showTitle = reactiveState.axesSettings.axisX.annotationTitlePosition !== 'hidden';\n    } else {\n      annotation.titlePosition = reactiveState.axesSettings.axisY.annotationTitlePosition === 'hidden' ? undefined : reactiveState.axesSettings.axisY.annotationTitlePosition;\n      annotation.showTitle = reactiveState.axesSettings.axisY.annotationTitlePosition !== 'hidden';\n    }\n  });\n\n  if (reactiveState.axesSettings.other.canvasRenderMode) {\n    settings.cellsRenderingMode = 'canvas';\n  }\n\n  const nullValueLabel = reactiveState.axesSettings.other.nullValueLabel;\n  if (settings.xColumn) {\n    settings.xColumn = { ...settings.xColumn, nullValueLabel: nullValueLabel };\n  }\n  if (settings.yColumn) {\n    settings.yColumn = { ...settings.yColumn, nullValueLabel: nullValueLabel };\n  }\n  if (settings.xGroupBy) {\n    settings.xGroupBy = settings.xGroupBy.map((column) => {\n      return { ...column, nullValueLabel: nullValueLabel };\n    });\n  }\n  if (settings.yGroupBy) {\n    settings.yGroupBy = settings.yGroupBy.map((column) => {\n      return { ...column, nullValueLabel: nullValueLabel };\n    });\n  }\n  if (settings.facetBy) {\n    settings.facetBy = settings.facetBy.map((column) => {\n      return { ...column, nullValueLabel: nullValueLabel };\n    });\n  }\n  if (settings.annotations) {\n    settings.annotations = settings.annotations.map((annotation) => {\n      return { ...annotation, valueColumn: { ...annotation.valueColumn, nullValueLabel: nullValueLabel } };\n    });\n  }\n  return settings;\n}\n"],"names":["composeHeatmapSettings","settings","reactiveState","defaultPalette","aes","palette","_a","layer","PALETTE_MAP","_b","annotationSchema","source","getAxesDataFromForms","template","layerSettings","_c","annotation","nullValueLabel","column"],"mappings":"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"}

package/dist/utils/createChartSettingsForRender/composeHistogramSettings.d.ts

@@ -32,6 +32,7 @@ export declare function composeHistogramSettings(settings: HistogramSettings, re
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     };
     size?: {
         width?: number | undefined;
@@ -45,6 +46,7 @@ export declare function composeHistogramSettings(settings: HistogramSettings, re
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     } | undefined;
     legend?: {
         show?: boolean | undefined;
@@ -66,6 +68,7 @@ export declare function composeHistogramSettings(settings: HistogramSettings, re
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         } | undefined;
         scale?: "linear" | "log" | undefined;
         showGrid?: boolean | undefined;
@@ -93,6 +96,7 @@ export declare function composeHistogramSettings(settings: HistogramSettings, re
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     }[] | undefined;
     binsCount?: number | undefined;
     groupingStack?: "vertical" | "horizontal" | undefined;

package/dist/utils/createChartSettingsForRender/composeHistogramSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"composeHistogramSettings.d.ts","sourceRoot":"","sources":["../../../src/utils/createChartSettingsForRender/composeHistogramSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAMlE,OAAO,KAAK,EACV,eAAe,EAEf,aAAa,EACb,uBAAuB,EACxB,MAAM,aAAa,CAAC;AAarB,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,iBAAiB,EAC3B,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,uBAAuB,EACzC,cAAc,EAAE,eAAe;;;;YAqCiyiB,CAAC;gBAAuC,CAAC;;;;WAAkG,CAAC;qBAAyB,CAAC;mBAAyC,CAAC;qBAA2C,CAAC;;;uBAAqG,CAAC;;;oBAA+F,CAAC;sBAAsD,CAAC;;;;;WAAyH,CAAC;;;;;cAA4G,CAAC;aAAmC,CAAC;mBAAyC,CAAC;;;aAAuD,CAAC;cAAoC,CAAC;mBAAyC,CAAC;mBAAyC,CAAC;;;;;cAAuH,CAAC;aAAmC,CAAC;mBAAyC,CAAC;;;YAAoE,CAAC;gBAAuC,CAAC;;;YAAkG,CAAC;;;eAA4H,CAAC;eAAsC,CAAC;aAAoC,CAAC;aAAmC,CAAC;;;aAAoE,CAAC;;;kBAAsF,CAAC;iBAAuC,CAAC;uBAA6C,CAAC;;aAA0D,CAAC;gBAAgD,CAAC;iBAAwC,CAAC;oBAA2C,CAAC;;;aAAqE,CAAC;gBAAgD,CAAC;iBAAwC,CAAC;oBAA2C,CAAC;;;eAA4G,CAAC;gBAAsC,CAAC;eAAiM,CAAC;iBAAuC,CAAC;iBAAuC,CAAC;iBAAmG,CAAC;iBAAuC,CAAC;;;;;cAAwH,CAAC;aAAmC,CAAC;mBAAyC,CAAC;;;;;;EAD3xoB"}
+{"version":3,"file":"composeHistogramSettings.d.ts","sourceRoot":"","sources":["../../../src/utils/createChartSettingsForRender/composeHistogramSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAMlE,OAAO,KAAK,EACV,eAAe,EAEf,aAAa,EACb,uBAAuB,EACxB,MAAM,aAAa,CAAC;AAarB,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,iBAAiB,EAC3B,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,uBAAuB,EACzC,cAAc,EAAE,eAAe;;;;YA0C2wjB,CAAC;gBAAuC,CAAC;;;;WAAkG,CAAC;qBAAyB,CAAC;mBAAyC,CAAC;qBAA2C,CAAC;;;uBAAqG,CAAC;;;oBAA+F,CAAC;sBAAsD,CAAC;;;;;WAAyH,CAAC;;;;;cAA4G,CAAC;aAAmC,CAAC;mBAAyC,CAAC;sBAA4C,CAAC;;;aAAuD,CAAC;cAAoC,CAAC;mBAAyC,CAAC;mBAAyC,CAAC;;;;;cAAuH,CAAC;aAAmC,CAAC;mBAAyC,CAAC;sBAA4C,CAAC;;;YAAoE,CAAC;gBAAuC,CAAC;;;YAAkG,CAAC;;;eAA4H,CAAC;eAAsC,CAAC;aAAoC,CAAC;aAAmC,CAAC;;;aAAoE,CAAC;;;kBAAsF,CAAC;iBAAuC,CAAC;uBAA6C,CAAC;0BAAgD,CAAC;;aAA0D,CAAC;gBAAgD,CAAC;iBAAwC,CAAC;oBAA2C,CAAC;;;aAAqE,CAAC;gBAAgD,CAAC;iBAAwC,CAAC;oBAA2C,CAAC;;;eAA4G,CAAC;gBAAsC,CAAC;eAAiM,CAAC;iBAAuC,CAAC;iBAAuC,CAAC;iBAAmG,CAAC;iBAAuC,CAAC;;;;;cAAwH,CAAC;aAAmC,CAAC;mBAAyC,CAAC;sBAA4C,CAAC;;;;;;EAD77pB"}

package/dist/utils/createChartSettingsForRender/composeHistogramSettings.js

@@ -1,38 +1,40 @@
-import { HISTOGRAM_TEMPLATES_MAP as g } from "../../constantsCommon.js";
+import { HISTOGRAM_TEMPLATES_MAP as c } from "../../constantsCommon.js";
 import { getHistogramAes as a } from "../../dataBindAes.js";
-import { getAxesDataFromForms as u } from "./getAxesDataFromForms.js";
-function f(o, e, r) {
-  return e.length ? { type: "grouping", value: e[0] } : typeof o == "object" ? r : o;
+import { getAxesDataFromForms as f } from "./getAxesDataFromForms.js";
+function m(o, e, s) {
+  return e.length ? { type: "grouping", value: e[0] } : typeof o == "object" ? s : o;
 }
-function h(o, e, r, l) {
-  const n = e.optionsState.components.grouping;
-  if (n.selectorStates.length) {
-    const t = n.selectorStates[0].selectedSource, { inheritedAes: s, order: i } = a(
-      t,
+function d(o, e, s, p) {
+  const t = e.optionsState.components.grouping;
+  if (t.selectorStates.length) {
+    const r = t.selectorStates[0].selectedSource, { inheritedAes: n, order: i } = a(
       r,
+      s,
       e.dataBindAes,
-      l.categorical
+      p.categorical
     );
-    Object.assign(o, { inheritedAes: { [t]: s }, groupingOrder: i });
+    Object.assign(o, { inheritedAes: { [r]: n }, groupingOrder: i });
   }
-  const p = g[e.template], c = [];
-  return p.forEach((t) => {
-    if (t === "bins") {
-      const s = e.layersSettings[t];
-      c.push({
+  const u = c[e.template], l = [];
+  u.forEach((r) => {
+    if (r === "bins") {
+      const n = e.layersSettings[r];
+      l.push({
         type: "bins",
         aes: {
-          opacity: s.opacity,
-          fillColor: f(s.fillColor, n.selectorStates.map((i) => i.selectedSource), "white")
+          opacity: n.opacity,
+          fillColor: m(n.fillColor, t.selectorStates.map((i) => i.selectedSource), "white")
         }
       });
     }
-  }), o.layers = c, Object.assign(
+  }), o.layers = l, Object.assign(
     o,
-    u(e.axesSettings, e.chartType)
-  ), o.binsCount = e.axesSettings.other.binsCount, o;
+    f(e.axesSettings, e.chartType)
+  ), o.binsCount = e.axesSettings.other.binsCount;
+  const g = e.axesSettings.other.nullValueLabel;
+  return o.grouping && (o.grouping = { ...o.grouping, nullValueLabel: g }), o;
 }
 export {
-  h as composeHistogramSettings
+  d as composeHistogramSettings
 };
 //# sourceMappingURL=composeHistogramSettings.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"composeHistogramSettings.js","sources":["../../../src/utils/createChartSettingsForRender/composeHistogramSettings.ts"],"sourcesContent":["import type { HistogramSettings } from '@milaboratories/miplots4';\nimport type { MappingLink } from '../../constantsCommon';\nimport { HISTOGRAM_TEMPLATES_MAP } from '../../constantsCommon';\nimport {\n  getHistogramAes,\n} from '../../dataBindAes';\nimport type {\n  DefaultPalettes,\n  HistogramLayerTemplate,\n  ReactiveState,\n  UniqueValuesBySourceMap,\n} from '../../types';\nimport type { ChartLayerSettings } from '../index';\nimport { getAxesDataFromForms } from '../index';\n\nfunction useDefault<T extends string>(value: T | MappingLink | null, columns: string[], defaultValue: T): T | {\n  type: 'grouping';\n  value: string;\n} {\n  if (columns.length) {\n    return { type: 'grouping', value: columns[0] } as { type: 'grouping'; value: string };\n  }\n  return typeof value === 'object' ? defaultValue : value as T;\n}\nexport function composeHistogramSettings(\n  settings: HistogramSettings,\n  reactiveState: ReactiveState,\n  uniqueValuesData: UniqueValuesBySourceMap,\n  defaultPalette: DefaultPalettes,\n) {\n  const grouping = reactiveState.optionsState.components.grouping;\n  if (grouping.selectorStates.length) {\n    const selectedSource = grouping.selectorStates[0].selectedSource;\n    const { inheritedAes, order } = getHistogramAes(\n      selectedSource,\n      uniqueValuesData,\n      reactiveState.dataBindAes,\n      defaultPalette.categorical,\n    );\n    Object.assign(settings, { inheritedAes: { [selectedSource]: inheritedAes }, groupingOrder: order });\n  }\n\n  const layersKeys = HISTOGRAM_TEMPLATES_MAP[reactiveState.template as HistogramLayerTemplate];\n  const layers: ChartLayerSettings[] = [];\n  layersKeys.forEach((layer) => {\n    if (layer === 'bins') {\n      const layerSettings = reactiveState.layersSettings[layer];\n      layers.push({\n        type: 'bins',\n        aes: {\n          opacity: layerSettings.opacity,\n          fillColor: useDefault(layerSettings.fillColor, grouping.selectorStates.map((v) => v.selectedSource), 'white'),\n        },\n      });\n    }\n  });\n  settings.layers = layers as HistogramSettings['layers'];\n  Object.assign(\n    settings,\n    getAxesDataFromForms(reactiveState.axesSettings, reactiveState.chartType),\n  );\n  settings.binsCount = reactiveState.axesSettings.other.binsCount;\n\n  return settings;\n}\n"],"names":["useDefault","value","columns","defaultValue","composeHistogramSettings","settings","reactiveState","uniqueValuesData","defaultPalette","grouping","selectedSource","inheritedAes","order","getHistogramAes","layersKeys","HISTOGRAM_TEMPLATES_MAP","layers","layer","layerSettings","v","getAxesDataFromForms"],"mappings":";;;AAeA,SAASA,EAA6BC,GAA+BC,GAAmBC,GAGtF;AACA,SAAID,EAAQ,SACH,EAAE,MAAM,YAAY,OAAOA,EAAQ,CAAC,EAAA,IAEtC,OAAOD,KAAU,WAAWE,IAAeF;AACpD;AACO,SAASG,EACdC,GACAC,GACAC,GACAC,GACA;AACA,QAAMC,IAAWH,EAAc,aAAa,WAAW;AACvD,MAAIG,EAAS,eAAe,QAAQ;AAClC,UAAMC,IAAiBD,EAAS,eAAe,CAAC,EAAE,gBAC5C,EAAE,cAAAE,GAAc,OAAAC,EAAA,IAAUC;AAAA,MAC9BH;AAAA,MACAH;AAAA,MACAD,EAAc;AAAA,MACdE,EAAe;AAAA,IAAA;AAEjB,WAAO,OAAOH,GAAU,EAAE,cAAc,EAAE,CAACK,CAAc,GAAGC,EAAA,GAAgB,eAAeC,GAAO;AAAA,EACpG;AAEA,QAAME,IAAaC,EAAwBT,EAAc,QAAkC,GACrFU,IAA+B,CAAA;AACrC,SAAAF,EAAW,QAAQ,CAACG,MAAU;AAC5B,QAAIA,MAAU,QAAQ;AACpB,YAAMC,IAAgBZ,EAAc,eAAeW,CAAK;AACxD,MAAAD,EAAO,KAAK;AAAA,QACV,MAAM;AAAA,QACN,KAAK;AAAA,UACH,SAASE,EAAc;AAAA,UACvB,WAAWlB,EAAWkB,EAAc,WAAWT,EAAS,eAAe,IAAI,CAACU,MAAMA,EAAE,cAAc,GAAG,OAAO;AAAA,QAAA;AAAA,MAC9G,CACD;AAAA,IACH;AAAA,EACF,CAAC,GACDd,EAAS,SAASW,GAClB,OAAO;AAAA,IACLX;AAAA,IACAe,EAAqBd,EAAc,cAAcA,EAAc,SAAS;AAAA,EAAA,GAE1ED,EAAS,YAAYC,EAAc,aAAa,MAAM,WAE/CD;AACT;"}
+{"version":3,"file":"composeHistogramSettings.js","sources":["../../../src/utils/createChartSettingsForRender/composeHistogramSettings.ts"],"sourcesContent":["import type { HistogramSettings } from '@milaboratories/miplots4';\nimport type { MappingLink } from '../../constantsCommon';\nimport { HISTOGRAM_TEMPLATES_MAP } from '../../constantsCommon';\nimport {\n  getHistogramAes,\n} from '../../dataBindAes';\nimport type {\n  DefaultPalettes,\n  HistogramLayerTemplate,\n  ReactiveState,\n  UniqueValuesBySourceMap,\n} from '../../types';\nimport type { ChartLayerSettings } from '../index';\nimport { getAxesDataFromForms } from '../index';\n\nfunction useDefault<T extends string>(value: T | MappingLink | null, columns: string[], defaultValue: T): T | {\n  type: 'grouping';\n  value: string;\n} {\n  if (columns.length) {\n    return { type: 'grouping', value: columns[0] } as { type: 'grouping'; value: string };\n  }\n  return typeof value === 'object' ? defaultValue : value as T;\n}\nexport function composeHistogramSettings(\n  settings: HistogramSettings,\n  reactiveState: ReactiveState,\n  uniqueValuesData: UniqueValuesBySourceMap,\n  defaultPalette: DefaultPalettes,\n) {\n  const grouping = reactiveState.optionsState.components.grouping;\n  if (grouping.selectorStates.length) {\n    const selectedSource = grouping.selectorStates[0].selectedSource;\n    const { inheritedAes, order } = getHistogramAes(\n      selectedSource,\n      uniqueValuesData,\n      reactiveState.dataBindAes,\n      defaultPalette.categorical,\n    );\n    Object.assign(settings, { inheritedAes: { [selectedSource]: inheritedAes }, groupingOrder: order });\n  }\n\n  const layersKeys = HISTOGRAM_TEMPLATES_MAP[reactiveState.template as HistogramLayerTemplate];\n  const layers: ChartLayerSettings[] = [];\n  layersKeys.forEach((layer) => {\n    if (layer === 'bins') {\n      const layerSettings = reactiveState.layersSettings[layer];\n      layers.push({\n        type: 'bins',\n        aes: {\n          opacity: layerSettings.opacity,\n          fillColor: useDefault(layerSettings.fillColor, grouping.selectorStates.map((v) => v.selectedSource), 'white'),\n        },\n      });\n    }\n  });\n  settings.layers = layers as HistogramSettings['layers'];\n  Object.assign(\n    settings,\n    getAxesDataFromForms(reactiveState.axesSettings, reactiveState.chartType),\n  );\n  settings.binsCount = reactiveState.axesSettings.other.binsCount;\n\n  const nullValueLabel = reactiveState.axesSettings.other.nullValueLabel;\n  if (settings.grouping) {\n    settings.grouping = { ...settings.grouping, nullValueLabel: nullValueLabel };\n  }\n\n  return settings;\n}\n"],"names":["useDefault","value","columns","defaultValue","composeHistogramSettings","settings","reactiveState","uniqueValuesData","defaultPalette","grouping","selectedSource","inheritedAes","order","getHistogramAes","layersKeys","HISTOGRAM_TEMPLATES_MAP","layers","layer","layerSettings","v","getAxesDataFromForms","nullValueLabel"],"mappings":";;;AAeA,SAASA,EAA6BC,GAA+BC,GAAmBC,GAGtF;AACA,SAAID,EAAQ,SACH,EAAE,MAAM,YAAY,OAAOA,EAAQ,CAAC,EAAA,IAEtC,OAAOD,KAAU,WAAWE,IAAeF;AACpD;AACO,SAASG,EACdC,GACAC,GACAC,GACAC,GACA;AACA,QAAMC,IAAWH,EAAc,aAAa,WAAW;AACvD,MAAIG,EAAS,eAAe,QAAQ;AAClC,UAAMC,IAAiBD,EAAS,eAAe,CAAC,EAAE,gBAC5C,EAAE,cAAAE,GAAc,OAAAC,EAAA,IAAUC;AAAA,MAC9BH;AAAA,MACAH;AAAA,MACAD,EAAc;AAAA,MACdE,EAAe;AAAA,IAAA;AAEjB,WAAO,OAAOH,GAAU,EAAE,cAAc,EAAE,CAACK,CAAc,GAAGC,EAAA,GAAgB,eAAeC,GAAO;AAAA,EACpG;AAEA,QAAME,IAAaC,EAAwBT,EAAc,QAAkC,GACrFU,IAA+B,CAAA;AACrC,EAAAF,EAAW,QAAQ,CAACG,MAAU;AAC5B,QAAIA,MAAU,QAAQ;AACpB,YAAMC,IAAgBZ,EAAc,eAAeW,CAAK;AACxD,MAAAD,EAAO,KAAK;AAAA,QACV,MAAM;AAAA,QACN,KAAK;AAAA,UACH,SAASE,EAAc;AAAA,UACvB,WAAWlB,EAAWkB,EAAc,WAAWT,EAAS,eAAe,IAAI,CAACU,MAAMA,EAAE,cAAc,GAAG,OAAO;AAAA,QAAA;AAAA,MAC9G,CACD;AAAA,IACH;AAAA,EACF,CAAC,GACDd,EAAS,SAASW,GAClB,OAAO;AAAA,IACLX;AAAA,IACAe,EAAqBd,EAAc,cAAcA,EAAc,SAAS;AAAA,EAAA,GAE1ED,EAAS,YAAYC,EAAc,aAAa,MAAM;AAEtD,QAAMe,IAAiBf,EAAc,aAAa,MAAM;AACxD,SAAID,EAAS,aACXA,EAAS,WAAW,EAAE,GAAGA,EAAS,UAAU,gBAAAgB,EAAA,IAGvChB;AACT;"}

package/dist/utils/createChartSettingsForRender/composeScatterplotSettings.d.ts

@@ -18,6 +18,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     };
     x: {
         type: "column";
@@ -25,6 +26,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     };
     y: {
         type: "column";
@@ -32,6 +34,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     };
     layers: ({
         type: "dots";
@@ -47,6 +50,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
                     format?: string | undefined;
                     label?: string | undefined;
                     valueLabels?: string | undefined;
+                    nullValueLabel?: string | undefined;
                 };
                 domain: number[];
                 range: string[];
@@ -64,6 +68,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
                     format?: string | undefined;
                     label?: string | undefined;
                     valueLabels?: string | undefined;
+                    nullValueLabel?: string | undefined;
                 };
                 domain: number[];
                 range: number[];
@@ -86,6 +91,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
                     format?: string | undefined;
                     label?: string | undefined;
                     valueLabels?: string | undefined;
+                    nullValueLabel?: string | undefined;
                 };
                 domain: number[];
                 range: string[];
@@ -105,6 +111,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     } | undefined;
     grouping?: {
         columnName: {
@@ -113,6 +120,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         };
         order?: (string | number | null)[] | undefined;
         inheritedAes?: Record<string, {
@@ -133,6 +141,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         };
         order?: (string | number | null)[] | undefined;
         inheritedAes?: Record<string, {
@@ -152,6 +161,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         };
     }[] | undefined;
     legend?: {
@@ -166,6 +176,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         }[] | undefined;
     } | undefined;
     frame?: {
@@ -185,6 +196,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         } | undefined;
         scale?: "discrete" | undefined;
         labels?: Record<string, string> | undefined;
@@ -200,6 +212,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         } | undefined;
         scale?: "linear" | "log" | undefined;
         showGrid?: boolean | undefined;
@@ -219,6 +232,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         } | undefined;
         scale?: "discrete" | undefined;
         labels?: Record<string, string> | undefined;
@@ -234,6 +248,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
             format?: string | undefined;
             label?: string | undefined;
             valueLabels?: string | undefined;
+            nullValueLabel?: string | undefined;
         } | undefined;
         scale?: "linear" | "log" | undefined;
         showGrid?: boolean | undefined;
@@ -251,6 +266,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     }[] | undefined;
     highlight?: {
         type: "column";
@@ -258,6 +274,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
         format?: string | undefined;
         label?: string | undefined;
         valueLabels?: string | undefined;
+        nullValueLabel?: string | undefined;
     } | undefined;
     trend?: {
         color?: string | {
@@ -271,6 +288,7 @@ export declare function composeScatterplotSettings(settings: ScatterplotSettings
                 format?: string | undefined;
                 label?: string | undefined;
                 valueLabels?: string | undefined;
+                nullValueLabel?: string | undefined;
             };
             domain: number[];
             range: string[];

package/dist/utils/createChartSettingsForRender/composeScatterplotSettings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"composeScatterplotSettings.d.ts","sourceRoot":"","sources":["../../../src/utils/createChartSettingsForRender/composeScatterplotSettings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"composeScatterplotSettings.d.ts","sourceRoot":"","sources":["../../../src/utils/createChartSettingsForRender/composeScatterplotSettings.ts"],"names":[],"mappings":"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"}

package/dist/utils/createChartSettingsForRender/composeScatterplotSettings.js

@@ -1,115 +1,120 @@
-import { UNKNOWN_COLOR as U, PALETTE_MAP as F, DEFAULT_BLACK as w } from "../../constantsAesthetic.js";
-import { SCATTERPLOT_TEMPLATES_MAP as P, isMappedAes as G } from "../../constantsCommon.js";
-import { DEFAULT_LINE_WIDTH as K, DEFAULT_DOT_SIZE as M, DEFAULT_DOT_SHAPE as j, getScatterplotAes as k } from "../../dataBindAes.js";
-import { readAnnotation as d, Annotation as S } from "@platforma-sdk/model";
-import { getScatterplotLayersSettings as V } from "./getLayersDataFromForms.js";
+import { UNKNOWN_COLOR as w, PALETTE_MAP as R, DEFAULT_BLACK as B } from "../../constantsAesthetic.js";
+import { SCATTERPLOT_TEMPLATES_MAP as P, isMappedAes as V } from "../../constantsCommon.js";
+import { DEFAULT_LINE_WIDTH as G, DEFAULT_DOT_SIZE as K, DEFAULT_DOT_SHAPE as M, getScatterplotAes as j } from "../../dataBindAes.js";
+import { readAnnotation as S, Annotation as h } from "@platforma-sdk/model";
+import { getScatterplotLayersSettings as k } from "./getLayersDataFromForms.js";
 import { getAxesDataFromFormsScatterplot as W } from "./getAxesDataFromForms.js";
-function z(o, y, e, A, l) {
-  var t, b, E, x, N;
-  const m = (t = y.selectorStates[0]) == null ? void 0 : t.selectedSource, L = (b = e.selectorStates[0]) == null ? void 0 : b.selectedSource, a = (E = A.selectorStates[0]) == null ? void 0 : E.selectedSource, r = l.getSourceInfo(L), n = l.getSourceInfo(a);
-  o.grouping = [...o.grouping ?? []].map((i) => ({ ...i }));
-  const c = o.xAxis, s = o.yAxis;
-  if (y.selectorStates.length) {
-    const i = l.getSourceInfo(m).spec, p = d(i, S.Graph.Thresholds);
-    p && (JSON.parse(p) ?? []).forEach((D) => {
-      var g;
-      const { columnId: u, value: T } = D;
-      u && r.kind === "column" && r.type === u.valueType && r.name === u.name && ((g = o.xAxis) == null ? void 0 : g.scale) === "discrete" && (c.significantLines || (c.significantLines = []), c.significantLines.push(Number(T))), u && n.kind === "column" && n.type === u.valueType && n.name === u.name && (s.significantLines || (s.significantLines = []), s.significantLines.push(Number(T)));
+function z(o, L, e, y, m) {
+  var f, N, r, b, E;
+  const u = (f = L.selectorStates[0]) == null ? void 0 : f.selectedSource, x = (N = e.selectorStates[0]) == null ? void 0 : N.selectedSource, p = (r = y.selectorStates[0]) == null ? void 0 : r.selectedSource, n = m.getSourceInfo(x), a = m.getSourceInfo(p);
+  o.grouping = [...o.grouping ?? []].map((l) => ({ ...l }));
+  const c = o.xAxis, t = o.yAxis;
+  if (L.selectorStates.length) {
+    const l = m.getSourceInfo(u).spec, i = S(l, h.Graph.Thresholds);
+    i && (JSON.parse(i) ?? []).forEach((I) => {
+      var D;
+      const { columnId: d, value: T } = I;
+      d && n.kind === "column" && n.type === d.valueType && n.name === d.name && ((D = o.xAxis) == null ? void 0 : D.scale) === "discrete" && (c.significantLines || (c.significantLines = []), c.significantLines.push(Number(T))), d && a.kind === "column" && a.type === d.valueType && a.name === d.name && (t.significantLines || (t.significantLines = []), t.significantLines.push(Number(T)));
     });
-    const f = d(i, S.Graph.Palette);
-    if (f) {
-      const O = JSON.parse(f), { mapping: D = {}, name: u = "" } = O;
-      o.layers.forEach((h) => {
-        h.type === "dots" && (h.aes || (h.aes = {}), h.aes.dotFill = { type: "grouping", value: m });
+    const s = S(l, h.Graph.Palette);
+    if (s) {
+      const _ = JSON.parse(s), { mapping: I = {}, name: d = "" } = _;
+      o.layers.forEach((A) => {
+        A.type === "dots" && (A.aes || (A.aes = {}), A.aes.dotFill = { type: "grouping", value: u });
       });
-      const T = [...Object.entries(D), ["null", U]], g = ((x = F[u]) == null ? void 0 : x.colors) ?? [];
-      (N = o.grouping) == null || N.forEach((h) => {
-        h.columnName.value === m && (h.inheritedAes = T.reduce((_, [R, C]) => {
-          const I = g[Number(C)] ?? w;
-          return _[R] = {
-            fillColor: I,
-            lineColor: I,
-            dotFill: I,
-            dotShape: j,
-            dotSize: M,
-            lineWidth: K
-          }, _;
+      const T = [...Object.entries(I), ["null", w]], D = ((b = R[d]) == null ? void 0 : b.colors) ?? [];
+      (E = o.grouping) == null || E.forEach((A) => {
+        A.columnName.value === u && (A.inheritedAes = T.reduce((F, [C, U]) => {
+          const O = D[Number(U)] ?? B;
+          return F[C] = {
+            fillColor: O,
+            lineColor: O,
+            dotFill: O,
+            dotShape: M,
+            dotSize: K,
+            lineWidth: G
+          }, F;
         }, {}));
       });
     }
   }
-  if (r.annotations) {
-    const i = d(r, S.Graph.Axis.UpperLimit), p = d(r, S.Graph.Axis.LowerLimit), f = d(r, S.Graph.Axis.SymmetricRange);
-    i && (c.upperValue = Number(i)), p && (c.lowerValue = Number(p)), f && (c.symmetricRange = Number(f));
-  }
   if (n.annotations) {
-    const i = d(n, S.Graph.Axis.UpperLimit), p = d(n, S.Graph.Axis.LowerLimit), f = d(n, S.Graph.Axis.SymmetricRange);
-    i && (s.upperValue = Number(i)), p && (s.lowerValue = Number(p)), f && (s.symmetricRange = Number(f));
+    const l = S(n, h.Graph.Axis.UpperLimit), i = S(n, h.Graph.Axis.LowerLimit), s = S(n, h.Graph.Axis.SymmetricRange);
+    l && (c.upperValue = Number(l)), i && (c.lowerValue = Number(i)), s && (c.symmetricRange = Number(s));
+  }
+  if (a.annotations) {
+    const l = S(a, h.Graph.Axis.UpperLimit), i = S(a, h.Graph.Axis.LowerLimit), s = S(a, h.Graph.Axis.SymmetricRange);
+    l && (t.upperValue = Number(l)), i && (t.lowerValue = Number(i)), s && (t.symmetricRange = Number(s));
   }
 }
-function B(o, y, e, A, l, m) {
-  function L(a) {
-    a && a.forEach((r) => {
-      const n = r.columnName.value, c = k(n, A, l, m);
-      c.order.length ? (r.order = c.order, r.inheritedAes = c.inheritedAes) : o.layers.forEach((s) => {
-        const t = s.aes;
-        if (!t)
+function H(o, L, e, y, m, u) {
+  function x(p) {
+    p && p.forEach((n) => {
+      const a = n.columnName.value, c = j(a, y, m, u);
+      c.order.length ? (n.order = c.order, n.inheritedAes = c.inheritedAes) : o.layers.forEach((t) => {
+        const f = t.aes;
+        if (!f)
           return;
-        Object.keys(t).forEach((E) => {
-          var N, i;
-          const x = t[E];
-          if (G(x) && x.value === n) {
-            const p = ((i = F[((N = l[n]) == null ? void 0 : N.palette) ?? m]) == null ? void 0 : i.colors) ?? [];
-            x.palette = p;
+        Object.keys(f).forEach((r) => {
+          var E, l;
+          const b = f[r];
+          if (V(b) && b.value === a) {
+            const i = ((l = R[((E = m[a]) == null ? void 0 : E.palette) ?? u]) == null ? void 0 : l.colors) ?? [];
+            b.palette = i;
           }
         });
       });
     });
   }
-  (y.selectorStates.length || e != null && e.selectorStates.length) && (o.grouping = [...o.grouping ?? []].map((a) => ({ ...a })), L(o.grouping)), o.type === "scatterplot" && (e != null && e.selectorStates.length) && (o.dotShape = [...o.dotShape ?? []].map((a) => ({ ...a })), L(o.dotShape));
+  (L.selectorStates.length || e != null && e.selectorStates.length) && (o.grouping = [...o.grouping ?? []].map((p) => ({ ...p })), x(o.grouping)), o.type === "scatterplot" && (e != null && e.selectorStates.length) && (o.dotShape = [...o.dotShape ?? []].map((p) => ({ ...p })), x(o.dotShape));
 }
-function $(o, y, e, A, l, m) {
-  var r, n, c, s;
-  o.layers = V(
+function $(o, L, e, y, m, u) {
+  var a, c, t, f, N;
+  o.layers = k(
     P[e.template],
     e.layersSettings,
-    y,
+    L,
     e.optionsState,
     e.dataBindAes,
-    A,
+    y,
     [
-      ...((r = o == null ? void 0 : o.grouping) == null ? void 0 : r.map((t) => t.columnName)) ?? [],
-      ...((n = o == null ? void 0 : o.dotSize) == null ? void 0 : n.map((t) => t.columnName)) ?? [],
-      ...((c = o == null ? void 0 : o.dotShape) == null ? void 0 : c.map((t) => t.columnName)) ?? []
+      ...((a = o == null ? void 0 : o.grouping) == null ? void 0 : a.map((r) => r.columnName)) ?? [],
+      ...((c = o == null ? void 0 : o.dotSize) == null ? void 0 : c.map((r) => r.columnName)) ?? [],
+      ...((t = o == null ? void 0 : o.dotShape) == null ? void 0 : t.map((r) => r.columnName)) ?? []
     ],
     void 0,
-    m.continuous
-  ), B(
+    u.continuous
+  ), H(
     o,
     e.optionsState.components.grouping,
     e.optionsState.components.shape,
-    l,
+    m,
     e.dataBindAes,
-    m.categorical
+    u.categorical
   );
-  const L = e.statisticsSettings, a = o.layers.find((t) => t.type === "dots");
-  return L.trend.on && a && (o.trend = {
-    color: (s = a.aes) == null ? void 0 : s.dotFill,
+  const x = e.statisticsSettings, p = o.layers.find((r) => r.type === "dots");
+  x.trend.on && p && (o.trend = {
+    color: (f = p.aes) == null ? void 0 : f.dotFill,
     bounded: !1
   }), Object.assign(
     o,
-    W(e.axesSettings, l, e.optionsState, A)
+    W(e.axesSettings, m, e.optionsState, y)
   ), z(
     o,
     e.optionsState.components.grouping,
     e.optionsState.components.x,
     e.optionsState.components.y,
-    A
-  ), o;
+    y
+  );
+  const n = e.axesSettings.other.nullValueLabel;
+  return o.x && (o.x = { ...o.x, nullValueLabel: n }), o.y && (o.y = { ...o.y, nullValueLabel: n }), o.label && (o.label = { ...o.label, nullValueLabel: n }), o.grouping && (o.grouping = o.grouping.map((r) => ({
+    ...r,
+    columnName: { ...r.columnName, nullValueLabel: n }
+  }))), o.facetBy && (o.facetBy = o.facetBy.map((r) => ({ ...r, nullValueLabel: n }))), o.dotShape && (o.dotShape = o.dotShape.map((r) => ({ ...r, columnName: { ...r.columnName, nullValueLabel: n } }))), (N = o.tooltips) != null && N.content && (o.tooltips.content = o.tooltips.content.map((r) => ({ ...r, nullValueLabel: n }))), o;
 }
 export {
   z as applyChartInfoFromAnnotations,
-  B as applyInheritedAes,
+  H as applyInheritedAes,
   $ as composeScatterplotSettings
 };
 //# sourceMappingURL=composeScatterplotSettings.js.map