@milaboratories/miplots4 1.0.166 → 1.0.168

package/dist/scatterplot/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/scatterplot/index.ts"],"sourcesContent":["import { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type {\n    ErrorInfoScatterplotGroupsX,\n    ErrorInfoScatterplotGroupsY} from '../types';\nimport {\n    type AesItem,\n    type AxisSettings,\n    type AxisSettingsDiscrete,\n    type Category,\n    type ColumnName,\n    type ContinuousAesFromColumn,\n    type ErrorInfoFacets,\n    getUnknownErrorInfo,\n    type InheritAesScatterplot,\n    isErrorInfo,\n    type ScatterplotEventHandlers,\n    type ScatterplotLegendInfo,\n    type ScatterplotSettings,\n} from '../types';\nimport { arraysAreDifferent } from '../utils/arraysAreDifferent';\nimport { getKeysCombinations } from '../utils/getKeysCombination';\nimport ChartRenderer from './ChartRenderer';\nimport type { GroupedDots } from './dots';\nimport { getDots } from './dots';\nimport type { ScatterplotLayerData } from './getLayersData';\nimport { getLayersData } from './getLayersData';\nimport type { TrendsData } from './linearRegression';\nimport { getRegressionData } from './linearRegression';\nimport { ScatterplotSettingsImpl } from './ScatterplotSettingsImpl';\nimport { addPalettesToAesMapping, createLegendInfo } from './utils/createLegendInfo';\nimport type { DiscreteAxisData } from './components/types';\nimport { MAX_FACETS_COUNT, MAX_GROUPS_COUNT } from '../constants';\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\n\nfunction getDiscreteAxisData(data: DataFrame, axis: AxisSettings, column: ColumnName): DiscreteAxisData {\n    if (axis.scale === 'discrete') {\n        const keys = axis.keys ? axis.keys : data.getColumnCategories(column.value);\n        return {keys, labels: keys.reduce((res, v) => {\n            const labelsMap = axis.labels ?? {};\n            const labelValue = labelsMap[v] ?? (column.valueLabels ? data.getColumnValue(column.valueLabels, data.getColumnCategoryRowIndex(column.value, v as Category)) : v);\n            res[v] = String(labelValue);\n            return res;\n        }, {} as Record<string, string>)};\n    }\n    return {keys: [], labels: {}};\n}\n\nexport class ChartScatterplot extends AbstractChart {\n    settings: ScatterplotSettingsImpl;\n    chartRenderer: ChartRenderer;\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        onlyPositive: {x: boolean; y: boolean};\n        dotsByFacets: GroupedDots;\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        trendsData: TrendsData | null;\n        legendLabels: ScatterplotLegendInfo;\n        layersData: Record<string, ScatterplotLayerData[]>;\n        discreteAxisDataX: DiscreteAxisData;\n        discreteAxisDataY: DiscreteAxisData;\n    } | null = null;\n\n    constructor(data: DataFrame, settings: ScatterplotSettings, eventHandlers?:ScatterplotEventHandlers) {\n        super(data, settings);\n\n        this.chartRenderer = new ChartRenderer();\n        this.settings = new ScatterplotSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers.onTooltipHintSwitch;\n        }\n    }\n\n    mount(node: HTMLElement) {\n        try {\n            this.chartRenderer.init(node);\n            this._updateData();\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    unmount() {\n        this.chartRenderer.clear();\n    }\n\n    updateSettingsAndData(data: DataFrame, settings: ScatterplotSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new ScatterplotSettingsImpl(settings);\n            this.data = data;\n            if (\n                this._needUpdateCalculatedDataBySettings(previousSettings, this.settings) ||\n                this._needUpdateCalculatedDataByData(previousData, this.data)\n            ) {\n                this._updateData();\n            } else {\n                this._updateAesInData();\n            }\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            console.error(err);\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    updateChartState(_field: string, _value: unknown) {\n        console.warn('no chart state for scatterplot');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: ScatterplotSettingsImpl, settings: ScatterplotSettingsImpl) {\n        return (\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping.length !== settings.grouping.length ||\n            arraysAreDifferent(\n                prevSettings.grouping.map(v => v.columnName.value),\n                settings.grouping.map(v => v.columnName.value),\n            ) ||\n            prevSettings.grouping.some((v, idx) => arraysAreDifferent(v.order, settings.grouping?.[idx].order)) ||\n            arraysAreDifferent((prevSettings.chartSettings.xAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.xAxis as AxisSettingsDiscrete).keys) ||\n            arraysAreDifferent((prevSettings.chartSettings.yAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.yAxis as AxisSettingsDiscrete).keys) ||\n            (prevSettings.label?.value || settings.label?.value) && prevSettings.label?.value !== settings.label?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            Boolean(prevSettings.trend) !== Boolean(settings.trend)\n        );\n    }\n\n    _needUpdateCalculatedDataByData(prevData: DataFrame, data: DataFrame) {\n        const prevKeys = Object.keys(prevData.data);\n        const keys = Object.keys(data.data);\n        return (\n            prevData.id !== data.id ||\n            prevKeys.length !== keys.length ||\n            prevKeys.some(key => prevData.data[key].length !== data.data[key]?.length)\n        );\n    }\n\n    _updateData() {\n        const {x, y, facetBy, grouping, trend, layers, label, highlight, chartSettings} = this.settings;\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value)).filter(v => v.length > 0);\n        const categoryGroupingKeysLists = grouping.map(({columnName}) => this.data.getColumnCategories(columnName.value)).filter(v => v.length > 0);\n\n        const facetKeysCombinations = facetKeysLists.length\n            ? getKeysCombinations(facetKeysLists)\n            : [['null']];\n        const categoryGroupingCombinations = categoryGroupingKeysLists.length\n            ? getKeysCombinations(categoryGroupingKeysLists)\n            : [['null']];\n\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n\n        this.data.setGrouping([...facetGroupingValues]);\n        const onlyPositive = {\n            x: this.data.getColumn(x.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n            y: this.data.getColumn(y.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n        };\n\n        const groupingColumns = grouping.map(v => v.columnName);\n\n        const dotsByFacets = getDots(this.data, facetKeysCombinations, x, y, label, highlight, grouping, chartSettings.xAxis, chartSettings.yAxis, layers.find(l => l.type === 'dots'));\n        const facetKeys = Object.keys(dotsByFacets);\n\n        if (facetKeys.length > MAX_FACETS_COUNT) {\n            const errorInfo: ErrorInfoFacets = {\n                type: 'tooManyFacets',\n                info: {count: facetKeys.length, maxCount: MAX_FACETS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n\n        const trendsData = getRegressionData(this.data, dotsByFacets, facetKeys, categoryGroupingCombinations, groupingColumns, trend);\n\n        const discreteAxisDataX = getDiscreteAxisData(this.data, chartSettings.xAxis, x);\n        const discreteAxisDataY = getDiscreteAxisData(this.data, chartSettings.yAxis, y);\n\n        if (discreteAxisDataX.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsX = {\n                type: 'tooManyScatterplotGroupsX',\n                info: {count: discreteAxisDataX.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        if (discreteAxisDataY.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsY = {\n                type: 'tooManyScatterplotGroupsY',\n                info: {count: discreteAxisDataY.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        const legendLabels = createLegendInfo(this.data, grouping, layers);\n        const layersData = getLayersData(this.data, layers, facetKeys, dotsByFacets, categoryGroupingCombinations, groupingColumns, chartSettings.xAxis, discreteAxisDataX);\n\n        this.calculatedData = {\n            onlyPositive,\n            dotsByFacets,\n            facetKeys,\n            facetKeysCombinations,\n            trendsData,\n            legendLabels,\n            layersData,\n            discreteAxisDataX,\n            discreteAxisDataY\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n        const {grouping, trend, layers} = this.settings;\n        const {facetKeys, trendsData} = calculated;\n\n        facetKeys.forEach(facetKey => {\n            for (let i = 0; i < layers.length; i++) {\n                calculated.layersData[facetKey][i].info = layers[i];\n            }\n        });\n\n        grouping.forEach(({columnName, inheritedAes}) => {\n            const usedAes = new Set<keyof AesItem>();\n            const usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n            layers.forEach(layer => {\n                if (layer.aes) {\n                    Object.entries(layer.aes).forEach(([key, value]) => {\n                        if (isInheritMapping(value) && value.value === columnName.value) {\n                            usedAes.add(key as keyof AesItem);\n                            if (value.palette) {\n                                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n                            }\n                        }\n                    });\n                }\n            });\n            calculated.legendLabels[columnName.value].usedAes = [...usedAes];\n            calculated.legendLabels[columnName.value].aesMap = addPalettesToAesMapping(\n                columnName,\n                usedAesFromPalettes,\n                inheritedAes\n            );\n        });\n        if (trendsData && trend) {\n            Object.keys(trendsData).forEach((key) => {\n                trendsData[key].forEach(trendInfo => {\n                    trendInfo.color = trend.color;\n                    trendInfo.bounded = trend.bounded;\n                });\n            });\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {id, chartSettings, facetSettings, grouping, keyColumn, layers, trend} = this.settings;\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeysCombinations, //for titles, if facet by more than 1 column\n            this.calculatedData.dotsByFacets,\n            this.calculatedData.trendsData,\n            keyColumn,\n            this.calculatedData.onlyPositive,\n            this.calculatedData.legendLabels,\n            this.calculatedData.layersData,\n            grouping.map(v => v.columnName),\n            layers,\n            trend,\n            this.calculatedData.discreteAxisDataX,\n            this.calculatedData.discreteAxisDataY,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["isInheritMapping","value","getDiscreteAxisData","data","axis","column","keys","res","v","labelValue","ChartScatterplot","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","ScatterplotSettingsImpl","node","err","isErrorInfo","getUnknownErrorInfo","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","arraysAreDifferent","_b","_c","_d","l","prevData","prevKeys","key","x","y","facetBy","grouping","trend","layers","label","highlight","chartSettings","facetKeysLists","categoryGroupingKeysLists","columnName","facetKeysCombinations","getKeysCombinations","categoryGroupingCombinations","facetGroupingValues","onlyPositive","groupingColumns","dotsByFacets","getDots","facetKeys","MAX_FACETS_COUNT","errorInfo","trendsData","getRegressionData","discreteAxisDataX","discreteAxisDataY","MAX_GROUPS_COUNT","legendLabels","createLegendInfo","layersData","getLayersData","calculated","facetKey","i","inheritedAes","usedAes","usedAesFromPalettes","layer","addPalettesToAesMapping","trendInfo","id","facetSettings","keyColumn"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../src/scatterplot/index.ts"],"sourcesContent":["import { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type {\n    ErrorInfoScatterplotGroupsX,\n    ErrorInfoScatterplotGroupsY} from '../types';\nimport {\n    type AesItem,\n    type AxisSettings,\n    type AxisSettingsDiscrete,\n    type Category,\n    type ColumnName,\n    type ContinuousAesFromColumn,\n    type ErrorInfoFacets,\n    getUnknownErrorInfo,\n    type InheritAesScatterplot,\n    isErrorInfo,\n    type ScatterplotEventHandlers,\n    type ScatterplotLegendInfo,\n    type ScatterplotSettings,\n} from '../types';\nimport { arraysAreDifferent } from '../utils/arraysAreDifferent';\nimport { getKeysCombinations } from '../utils/getKeysCombination';\nimport ChartRenderer from './ChartRenderer';\nimport type { GroupedDots } from './dots';\nimport { getDots } from './dots';\nimport type { ScatterplotLayerData } from './getLayersData';\nimport { getLayersData } from './getLayersData';\nimport type { TrendsData } from './linearRegression';\nimport { getRegressionData } from './linearRegression';\nimport { ScatterplotSettingsImpl } from './ScatterplotSettingsImpl';\nimport { addPalettesToAesMapping, createLegendInfo } from './utils/createLegendInfo';\nimport type { DiscreteAxisData } from './components/types';\nimport { MAX_FACETS_COUNT, MAX_GROUPS_COUNT } from '../constants';\nimport { getFacetLabels } from '../discrete/utils/getFacetLabels';\n\nfunction isInheritMapping<T extends (string | number)>(value:T | InheritAesScatterplot | ContinuousAesFromColumn<T>):value is InheritAesScatterplot {\n    return typeof value === 'object' && 'type' in value && value.type === 'grouping';\n}\n\nfunction getDiscreteAxisData(data: DataFrame, axis: AxisSettings, column: ColumnName): DiscreteAxisData {\n    if (axis.scale === 'discrete') {\n        const keys = axis.keys ? axis.keys : data.getColumnCategories(column.value);\n        return {keys, labels: keys.reduce((res, v) => {\n            const labelsMap = axis.labels ?? {};\n            const labelValue = labelsMap[v] ?? (column.valueLabels ? data.getColumnValue(column.valueLabels, data.getColumnCategoryRowIndex(column.value, v as Category)) : v);\n            res[v] = String(labelValue);\n            return res;\n        }, {} as Record<string, string>)};\n    }\n    return {keys: [], labels: {}};\n}\n\nexport class ChartScatterplot extends AbstractChart {\n    settings: ScatterplotSettingsImpl;\n    chartRenderer: ChartRenderer;\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        onlyPositive: {x: boolean; y: boolean};\n        dotsByFacets: GroupedDots;\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        facetLabels: Record<string, string[]>;\n        trendsData: TrendsData | null;\n        legendLabels: ScatterplotLegendInfo;\n        layersData: Record<string, ScatterplotLayerData[]>;\n        discreteAxisDataX: DiscreteAxisData;\n        discreteAxisDataY: DiscreteAxisData;\n    } | null = null;\n\n    constructor(data: DataFrame, settings: ScatterplotSettings, eventHandlers?:ScatterplotEventHandlers) {\n        super(data, settings);\n\n        this.chartRenderer = new ChartRenderer();\n        this.settings = new ScatterplotSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers.onTooltipHintSwitch;\n        }\n    }\n\n    mount(node: HTMLElement) {\n        try {\n            this.chartRenderer.init(node);\n            this._updateData();\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    unmount() {\n        this.chartRenderer.clear();\n    }\n\n    updateSettingsAndData(data: DataFrame, settings: ScatterplotSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new ScatterplotSettingsImpl(settings);\n            this.data = data;\n            if (\n                this._needUpdateCalculatedDataBySettings(previousSettings, this.settings) ||\n                this._needUpdateCalculatedDataByData(previousData, this.data)\n            ) {\n                this._updateData();\n            } else {\n                this._updateAesInData();\n            }\n            this._updateChart();\n            this.hasError = false;\n            this.errorInfo = null;\n        } catch (err) {\n            this.hasError = true;\n            console.error(err);\n            if (err instanceof Error) {\n                this.errorInfo = isErrorInfo(err.cause) ? err.cause : getUnknownErrorInfo(err);\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    updateChartState(_field: string, _value: unknown) {\n        console.warn('no chart state for scatterplot');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: ScatterplotSettingsImpl, settings: ScatterplotSettingsImpl) {\n        return (\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping.length !== settings.grouping.length ||\n            arraysAreDifferent(\n                prevSettings.grouping.map(v => v.columnName.value),\n                settings.grouping.map(v => v.columnName.value),\n            ) ||\n            prevSettings.grouping.some((v, idx) => arraysAreDifferent(v.order, settings.grouping?.[idx].order)) ||\n            arraysAreDifferent((prevSettings.chartSettings.xAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.xAxis as AxisSettingsDiscrete).keys) ||\n            arraysAreDifferent((prevSettings.chartSettings.yAxis as AxisSettingsDiscrete).keys, (settings.chartSettings.yAxis as AxisSettingsDiscrete).keys) ||\n            (prevSettings.label?.value || settings.label?.value) && prevSettings.label?.value !== settings.label?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            Boolean(prevSettings.trend) !== Boolean(settings.trend)\n        );\n    }\n\n    _needUpdateCalculatedDataByData(prevData: DataFrame, data: DataFrame) {\n        const prevKeys = Object.keys(prevData.data);\n        const keys = Object.keys(data.data);\n        return (\n            prevData.id !== data.id ||\n            prevKeys.length !== keys.length ||\n            prevKeys.some(key => prevData.data[key].length !== data.data[key]?.length)\n        );\n    }\n\n    _updateData() {\n        const {x, y, facetBy, grouping, dotSize, dotShape, trend, layers, label, highlight, chartSettings} = this.settings;\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value)).filter(v => v.length > 0);\n        const categoryGroupingKeysLists = grouping.map(({columnName}) => this.data.getColumnCategories(columnName.value)).filter(v => v.length > 0);\n\n        const facetKeysCombinations = facetKeysLists.length\n            ? getKeysCombinations(facetKeysLists)\n            : [['null']];\n        const categoryGroupingCombinations = categoryGroupingKeysLists.length\n            ? getKeysCombinations(categoryGroupingKeysLists)\n            : [['null']];\n\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n\n        this.data.setGrouping([...facetGroupingValues]);\n        const onlyPositive = {\n            x: this.data.getColumn(x.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n            y: this.data.getColumn(y.value).every(v => {\n                return v === null || !(Number(v) < 0);\n            }),\n        };\n\n        const groupingColumns = grouping.map(v => v.columnName);\n\n        const dotsByFacets = getDots(this.data, facetKeysCombinations, x, y, label, highlight, grouping, chartSettings.xAxis, chartSettings.yAxis, layers.find(l => l.type === 'dots'));\n        const facetKeys = Object.keys(dotsByFacets);\n\n        if (facetKeys.length > MAX_FACETS_COUNT) {\n            const errorInfo: ErrorInfoFacets = {\n                type: 'tooManyFacets',\n                info: {count: facetKeys.length, maxCount: MAX_FACETS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n\n        const trendsData = getRegressionData(this.data, dotsByFacets, facetKeys, categoryGroupingCombinations, groupingColumns, trend);\n\n        const discreteAxisDataX = getDiscreteAxisData(this.data, chartSettings.xAxis, x);\n        const discreteAxisDataY = getDiscreteAxisData(this.data, chartSettings.yAxis, y);\n\n        if (discreteAxisDataX.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsX = {\n                type: 'tooManyScatterplotGroupsX',\n                info: {count: discreteAxisDataX.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        if (discreteAxisDataY.keys.length > MAX_GROUPS_COUNT) {\n            const errorInfo: ErrorInfoScatterplotGroupsY = {\n                type: 'tooManyScatterplotGroupsY',\n                info: {count: discreteAxisDataY.keys.length, maxCount: MAX_GROUPS_COUNT}\n            };\n            throw Error(errorInfo.type, {cause: errorInfo});\n        }\n        const allAesMappings = [...grouping, ...dotSize, ...dotShape];\n        const legendLabels = createLegendInfo(this.data, allAesMappings, layers);\n        const layersData = getLayersData(this.data, layers, facetKeys, dotsByFacets, categoryGroupingCombinations, groupingColumns, chartSettings.xAxis, discreteAxisDataX);\n        const facetLabels = getFacetLabels(this.data, facetBy, facetKeys, facetKeysCombinations);\n\n        this.calculatedData = {\n            onlyPositive,\n            dotsByFacets,\n            facetKeys,\n            facetKeysCombinations,\n            facetLabels,\n            trendsData,\n            legendLabels,\n            layersData,\n            discreteAxisDataX,\n            discreteAxisDataY\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n        const {grouping, trend, layers, dotSize, dotShape} = this.settings;\n        const {facetKeys, trendsData} = calculated;\n\n        facetKeys.forEach(facetKey => {\n            for (let i = 0; i < layers.length; i++) {\n                calculated.layersData[facetKey][i].info = layers[i];\n            }\n        });\n\n        const allAesMappings = [...grouping, ...dotSize, ...dotShape];\n\n        allAesMappings.forEach(({columnName, inheritedAes}) => {\n            const usedAes = new Set<keyof AesItem>();\n            const usedAesFromPalettes: Partial<Record<keyof AesItem, string[]>> = {}; // if there is palette in mapping then\n            layers.forEach(layer => {\n                if (layer.aes) {\n                    Object.entries(layer.aes).forEach(([key, value]) => {\n                        if (isInheritMapping(value) && value.value === columnName.value) {\n                            usedAes.add(key as keyof AesItem);\n                            if (value.palette) {\n                                usedAesFromPalettes[key as keyof AesItem] = value.palette;\n                            }\n                        }\n                    });\n                }\n            });\n            calculated.legendLabels[columnName.value].usedAes = [...usedAes];\n            calculated.legendLabels[columnName.value].aesMap = addPalettesToAesMapping(\n                columnName,\n                usedAesFromPalettes,\n                inheritedAes\n            );\n        });\n        if (trendsData && trend) {\n            Object.keys(trendsData).forEach((key) => {\n                trendsData[key].forEach(trendInfo => {\n                    trendInfo.color = trend.color;\n                    trendInfo.bounded = trend.bounded;\n                });\n            });\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {facetLabels} = this.calculatedData;\n        const {id, chartSettings, facetSettings, grouping, dotSize, dotShape, keyColumn, layers, trend} = this.settings;\n\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeys.map(v => facetLabels[v]), //for titles, if facet by more than 1 column\n            this.calculatedData.dotsByFacets,\n            this.calculatedData.trendsData,\n            keyColumn,\n            this.calculatedData.onlyPositive,\n            this.calculatedData.legendLabels,\n            this.calculatedData.layersData,\n            [...grouping.map(v => v.columnName), ...dotSize.map(v => v.columnName), ...dotShape.map(v => v.columnName)],\n            layers,\n            trend,\n            this.calculatedData.discreteAxisDataX,\n            this.calculatedData.discreteAxisDataY,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["isInheritMapping","value","getDiscreteAxisData","data","axis","column","keys","res","v","labelValue","ChartScatterplot","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","ScatterplotSettingsImpl","node","err","isErrorInfo","getUnknownErrorInfo","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","arraysAreDifferent","_b","_c","_d","l","prevData","prevKeys","key","x","y","facetBy","grouping","dotSize","dotShape","trend","layers","label","highlight","chartSettings","facetKeysLists","categoryGroupingKeysLists","columnName","facetKeysCombinations","getKeysCombinations","categoryGroupingCombinations","facetGroupingValues","onlyPositive","groupingColumns","dotsByFacets","getDots","facetKeys","MAX_FACETS_COUNT","errorInfo","trendsData","getRegressionData","discreteAxisDataX","discreteAxisDataY","MAX_GROUPS_COUNT","allAesMappings","legendLabels","createLegendInfo","layersData","getLayersData","facetLabels","getFacetLabels","calculated","facetKey","i","inheritedAes","usedAes","usedAesFromPalettes","layer","addPalettesToAesMapping","trendInfo","id","facetSettings","keyColumn"],"mappings":"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"}

package/dist/types/scatterplot.d.ts

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

package/dist/types/scatterplot.js

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

package/dist/types/scatterplot.js.map

@@ -1 +1 @@
-{"version":3,"file":"scatterplot.js","sources":["../../src/types/scatterplot.ts"],"sourcesContent":["import { z } from 'zod';\nimport type { AesItem, categoricalAesMappingFromValueSchema, Category, DataValue } from './common';\nimport {\n    AesRecordSchema, AxisSettingsSchema,\n    ColumnNameSchema,\n    continuousAesMappingFromValueSchema, DataValueSchema,\n    FrameTypeSchema,\n    LegendPositionSchema,\n    LineShapeSchema,\n    PointShapeSchema,\n    TitlePositionSchema,\n    TooltipSettingsSchema,\n} from './common';\n\ntype catAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof categoricalAesMappingFromValueSchema<ValueType>>;\ntype contAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof continuousAesMappingFromValueSchema<ValueType>>;\n\nexport type CategoricalAesFromColumn<ValueType> = z.infer<catAesFromColumn<z.ZodType<ValueType>>>;\nexport type ContinuousAesFromColumn<ValueType> = z.infer<contAesFromColumn<z.ZodType<ValueType>>>;\n\nconst InheritAesSchema = z.object({\n    type: z.literal('grouping'),\n    value: z.string(), // link to aes mapped to column\n    palette: z.optional(z.array(z.string())) // if defined we use palette to create mapping without inheritedAes field\n});\nexport type InheritAesScatterplot = z.infer<typeof InheritAesSchema>;\n\nconst DotsLayerSchema = z.object({\n    type: z.literal('dots'),\n    aes: z.optional(\n        z.object({\n            dotFill: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            dotShape: z.optional(z.union([PointShapeSchema, InheritAesSchema])),\n            dotSize: z.optional(z.union([z.number(), continuousAesMappingFromValueSchema(z.number())])),\n        })\n    ),\n});\nconst CurveLayerSchema = z.object({\n    type: z.literal('curve'),\n    smoothing: z.optional(z.boolean()),\n    aes: z.optional(\n        z.object({\n            lineWidth: z.optional(z.number()),\n            lineShape: z.optional(LineShapeSchema),\n            lineColor: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            opacity: z.optional(z.number()),\n        })\n    ),\n});\nconst ScatterplotLayerSchema = z.union([DotsLayerSchema, CurveLayerSchema]);\n\nexport type DotsLayer = z.infer<typeof DotsLayerSchema>;\nexport type CurveLayer = z.infer<typeof CurveLayerSchema>;\nexport type ScatterplotLayer = z.infer<typeof ScatterplotLayerSchema>;\n\nexport const ScatterplotSettingsSchema = z.object({\n    type: z.literal('scatterplot'),\n    title: z.object({\n        name: z.string(),\n        show: z.optional(z.boolean()),\n        position: z.optional(TitlePositionSchema),\n    }),\n    size: z.optional(\n        z.object({\n            width: z.optional(z.number()),\n            height: z.optional(z.number()),\n        })\n    ),\n    legend: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            position: z.optional(LegendPositionSchema),\n        })\n    ),\n    tooltips: z.optional(TooltipSettingsSchema),\n    frame: z.optional(z.object({type: z.optional(FrameTypeSchema)})),\n    facetSettings: z.optional(\n        z.object({\n            sharedX: z.optional(z.boolean()),\n            sharedY: z.optional(z.boolean()),\n            nRows: z.optional(z.number()),\n            nCols: z.optional(z.number()),\n        })\n    ),\n    keyColumn: ColumnNameSchema,\n    x: ColumnNameSchema,\n    y: ColumnNameSchema,\n    xAxis: z.optional(AxisSettingsSchema),\n    yAxis: z.optional(AxisSettingsSchema),\n    grouping: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n            order: z.optional(z.array(DataValueSchema)),\n            inheritedAes: z.optional(AesRecordSchema),\n            allowNullGroup: z.optional(z.boolean())\n        })\n    )),\n    facetBy: z.optional(z.array(ColumnNameSchema)),\n    label: z.optional(ColumnNameSchema),\n    highlight: z.optional(ColumnNameSchema),\n    trend: z.optional(\n        z.object({\n            color: z.optional(z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())]))),\n            bounded: z.optional(z.boolean()), // if true: line and area bounded with min and max X value; else line bounded by chart bounds\n        })\n    ),\n    layers: z.array(ScatterplotLayerSchema),\n});\n\nexport type ScatterplotSettings = z.infer<typeof ScatterplotSettingsSchema>;\n\nexport type ScatterplotLegendInfo = Record<\n    string,\n    {\n        values: Category[];\n        usedAes: (keyof AesItem)[];\n        aesMap: (value: Category, field: keyof AesItem) => undefined | DataValue;\n        labels: Record<Category, string>;\n    }\n>;\n"],"names":["InheritAesSchema","z.object","z.literal","z.string","z.optional","z.array","DotsLayerSchema","z.union","continuousAesMappingFromValueSchema","PointShapeSchema","z.number","CurveLayerSchema","z.boolean","LineShapeSchema","ScatterplotLayerSchema","ScatterplotSettingsSchema","TitlePositionSchema","LegendPositionSchema","TooltipSettingsSchema","FrameTypeSchema","ColumnNameSchema","AxisSettingsSchema","DataValueSchema","AesRecordSchema"],"mappings":"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"}
+{"version":3,"file":"scatterplot.js","sources":["../../src/types/scatterplot.ts"],"sourcesContent":["import { z } from 'zod';\nimport type { AesItem, categoricalAesMappingFromValueSchema, Category, DataValue } from './common';\nimport {\n    AesRecordSchema, AxisSettingsSchema,\n    ColumnNameSchema,\n    continuousAesMappingFromValueSchema, DataValueSchema,\n    FrameTypeSchema,\n    LegendPositionSchema,\n    LineShapeSchema,\n    PointShapeSchema,\n    TitlePositionSchema,\n    TooltipSettingsSchema,\n} from './common';\n\ntype catAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof categoricalAesMappingFromValueSchema<ValueType>>;\ntype contAesFromColumn<ValueType extends z.ZodType> = ReturnType<typeof continuousAesMappingFromValueSchema<ValueType>>;\n\nexport type CategoricalAesFromColumn<ValueType> = z.infer<catAesFromColumn<z.ZodType<ValueType>>>;\nexport type ContinuousAesFromColumn<ValueType> = z.infer<contAesFromColumn<z.ZodType<ValueType>>>;\n\nconst InheritAesSchema = z.object({\n    type: z.literal('grouping'),\n    value: z.string(), // link to aes mapped to column\n    palette: z.optional(z.array(z.string())) // if defined we use palette to create mapping without inheritedAes field\n});\nexport type InheritAesScatterplot = z.infer<typeof InheritAesSchema>;\n\nconst DotsLayerSchema = z.object({\n    type: z.literal('dots'),\n    aes: z.optional(\n        z.object({\n            dotFill: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            dotShape: z.optional(z.union([PointShapeSchema, InheritAesSchema])),\n            dotSize: z.optional(z.union([z.number(), continuousAesMappingFromValueSchema(z.number())])),\n        })\n    ),\n});\nconst CurveLayerSchema = z.object({\n    type: z.literal('curve'),\n    smoothing: z.optional(z.boolean()),\n    aes: z.optional(\n        z.object({\n            lineWidth: z.optional(z.number()),\n            lineShape: z.optional(LineShapeSchema),\n            lineColor: z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())])),\n            opacity: z.optional(z.number()),\n        })\n    ),\n});\nconst ScatterplotLayerSchema = z.union([DotsLayerSchema, CurveLayerSchema]);\n\nexport type DotsLayer = z.infer<typeof DotsLayerSchema>;\nexport type CurveLayer = z.infer<typeof CurveLayerSchema>;\nexport type ScatterplotLayer = z.infer<typeof ScatterplotLayerSchema>;\n\nexport const ScatterplotSettingsSchema = z.object({\n    type: z.literal('scatterplot'),\n    title: z.object({\n        name: z.string(),\n        show: z.optional(z.boolean()),\n        position: z.optional(TitlePositionSchema),\n    }),\n    size: z.optional(\n        z.object({\n            width: z.optional(z.number()),\n            height: z.optional(z.number()),\n        })\n    ),\n    legend: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            position: z.optional(LegendPositionSchema),\n        })\n    ),\n    tooltips: z.optional(TooltipSettingsSchema),\n    frame: z.optional(z.object({type: z.optional(FrameTypeSchema)})),\n    facetSettings: z.optional(\n        z.object({\n            sharedX: z.optional(z.boolean()),\n            sharedY: z.optional(z.boolean()),\n            nRows: z.optional(z.number()),\n            nCols: z.optional(z.number()),\n        })\n    ),\n    keyColumn: ColumnNameSchema,\n    x: ColumnNameSchema,\n    y: ColumnNameSchema,\n    xAxis: z.optional(AxisSettingsSchema),\n    yAxis: z.optional(AxisSettingsSchema),\n    grouping: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n            order: z.optional(z.array(DataValueSchema)),\n            inheritedAes: z.optional(AesRecordSchema),\n            allowNullGroup: z.optional(z.boolean())\n        })\n    )),\n    dotSize: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n        })\n    )),\n    dotShape: z.optional(z.array(\n        z.object({\n            columnName: ColumnNameSchema,\n            order: z.optional(z.array(DataValueSchema)),\n            inheritedAes: z.optional(AesRecordSchema),\n        })\n    )),\n    facetBy: z.optional(z.array(ColumnNameSchema)),\n    label: z.optional(ColumnNameSchema),\n    highlight: z.optional(ColumnNameSchema),\n    trend: z.optional(\n        z.object({\n            color: z.optional(z.optional(z.union([z.string(), InheritAesSchema, continuousAesMappingFromValueSchema(z.string())]))),\n            bounded: z.optional(z.boolean()), // if true: line and area bounded with min and max X value; else line bounded by chart bounds\n        })\n    ),\n    layers: z.array(ScatterplotLayerSchema),\n});\n\nexport type ScatterplotSettings = z.infer<typeof ScatterplotSettingsSchema>;\n\nexport type ScatterplotLegendInfo = Record<\n    string,\n    {\n        values: Category[];\n        usedAes: (keyof AesItem)[];\n        aesMap: (value: Category, field: keyof AesItem) => undefined | DataValue;\n        labels: Record<Category, string>;\n    }\n>;\n"],"names":["InheritAesSchema","z.object","z.literal","z.string","z.optional","z.array","DotsLayerSchema","z.union","continuousAesMappingFromValueSchema","PointShapeSchema","z.number","CurveLayerSchema","z.boolean","LineShapeSchema","ScatterplotLayerSchema","ScatterplotSettingsSchema","TitlePositionSchema","LegendPositionSchema","TooltipSettingsSchema","FrameTypeSchema","ColumnNameSchema","AxisSettingsSchema","DataValueSchema","AesRecordSchema"],"mappings":"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"}

package/package.json

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