@visactor/vseed 0.1.20 → 0.1.22

package/dist/umd/index.js

@@ -67,8 +67,8 @@
         var __webpack_exports__ = {};
         __webpack_require__.r(__webpack_exports__);
         __webpack_require__.d(__webpack_exports__, {
+            zScatter: ()=>zScatter,
             zScatterConfig: ()=>zScatterConfig,
-            zTooltip: ()=>zTooltip,
             funnelAdvancedPipeline: ()=>funnelAdvancedPipeline,
             zHeatmapConfig: ()=>zHeatmapConfig,
             zBar: ()=>zBar,
@@ -92,11 +92,13 @@
             columnPercentAdvancedPipeline: ()=>columnPercentAdvancedPipeline,
             zColumnConfig: ()=>zColumnConfig,
             zAnnotation: ()=>zAnnotation,
+            isRadar: ()=>isRadar,
             selector: ()=>selector_selector,
             zDualMeasure: ()=>zDualMeasure,
-            zSortLegend: ()=>zSortLegend,
             pivotTableAdvancedPipeline: ()=>pivotTableAdvancedPipeline,
+            zSortLegend: ()=>zSortLegend,
             isMeasures: ()=>isMeasures,
+            zTooltip: ()=>zTooltip,
             zYBandAxis: ()=>zYBandAxis,
             zAnnotationHorizontalLine: ()=>zAnnotationHorizontalLine,
             zYLinearAxis: ()=>zYLinearAxis,
@@ -196,20 +198,21 @@
             zAreaConfig: ()=>zAreaConfig,
             zMeasures: ()=>zMeasures,
             isVTable: ()=>isVTable,
+            zPieLabel: ()=>zPieLabel,
             zPivotTable: ()=>zPivotTable,
-            zRadar: ()=>zRadar,
             zLine: ()=>zLine,
             columnSpecPipeline: ()=>columnSpecPipeline,
             zFoldInfo: ()=>zFoldInfo,
             zDatasetReshapeInfo: ()=>zDatasetReshapeInfo,
             zLinearColor: ()=>zLinearColor,
-            zRadarConfig: ()=>zRadarConfig,
+            zRadar: ()=>zRadar,
             zAreaStyle: ()=>zAreaStyle,
             ORIGINAL_DATA: ()=>ORIGINAL_DATA,
-            zStackCornerRadius: ()=>zStackCornerRadius,
+            zRadarConfig: ()=>zRadarConfig,
             zAnnotationArea: ()=>zAnnotationArea,
-            zUnfoldInfo: ()=>zUnfoldInfo,
+            zStackCornerRadius: ()=>zStackCornerRadius,
             DetailEncoding: ()=>DetailEncoding,
+            isPivot: ()=>isPivot,
             zRose: ()=>zRose,
             columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
             zPointStyle: ()=>zPointStyle,
@@ -222,6 +225,7 @@
             isMeasure: ()=>isMeasure,
             FoldSecondaryMeasureValue: ()=>FoldSecondaryMeasureValue,
             zSort: ()=>zSort,
+            zUnfoldInfo: ()=>zUnfoldInfo,
             isPivotChart: ()=>isPivotChart,
             zDualAxisConfig: ()=>zDualAxisConfig,
             zColumn: ()=>zColumn,
@@ -253,13 +257,13 @@
             autoNumFormatter: ()=>autoNumFormatter,
             measureDepth: ()=>measureDepth,
             tableSpecPipeline: ()=>tableSpecPipeline,
+            isCombination: ()=>isCombination,
             zAdvancedVSeed: ()=>zAdvancedVSeed,
-            zConfig: ()=>zConfig,
             zBarStyle: ()=>zBarStyle,
             deleteDimensionTreeByCallback: ()=>deleteDimensionTreeByCallback,
-            zMeasure: ()=>zMeasure,
+            zConfig: ()=>zConfig,
             zAreaPercent: ()=>zAreaPercent,
-            zRoseParallelConfig: ()=>zRoseParallelConfig,
+            zMeasure: ()=>zMeasure,
             columnParallelAdvancedPipeline: ()=>columnParallelAdvancedPipeline,
             isValueSelector: ()=>isValueSelector,
             donutAdvancedPipeline: ()=>donutAdvancedPipeline,
@@ -269,7 +273,7 @@
             isPivotTable: ()=>isPivotTable,
             zDimensionEncoding: ()=>zDimensionEncoding,
             zFunnel: ()=>zFunnel,
-            zScatter: ()=>zScatter,
+            zRoseParallelConfig: ()=>zRoseParallelConfig,
             zBarParallelConfig: ()=>zBarParallelConfig,
             barParallelAdvancedPipeline: ()=>barParallelAdvancedPipeline,
             FoldMeasureValue: ()=>FoldMeasureValue,
@@ -521,6 +525,7 @@
         const DEFAULT_PARENT_ID = '__DefaultParentId__';
         const isTable = (vseed)=>'table' === vseed.chartType;
         const isPivotTable = (vseed)=>'pivotTable' === vseed.chartType;
+        const isRadar = (vseed)=>'radar' === vseed.chartType;
         const isVTable = (vseed)=>[
                 'table',
                 'pivotTable'
@@ -528,14 +533,19 @@
         const isVChart = (vseed)=>!isVTable(vseed);
         const isPivotChart = (vseed)=>{
             if (isVTable(vseed)) return false;
+            if (isPivot(vseed)) return true;
+            return isCombination(vseed);
+        };
+        const isPivot = (vseed)=>{
+            const { dimensions = [] } = vseed;
+            return dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
+        };
+        const isCombination = (vseed)=>{
             if (isMeasureTreeWithParentId(vseed.measures)) {
                 const parentIds = vseed.measures?.map((measure)=>measure.parentId || DEFAULT_PARENT_ID);
                 return parentIds && chunk_QJLMYOTX_i(parentIds).length > 1;
             }
             if ('dualAxis' === vseed.chartType || 'scatter' === vseed.chartType) {
-                const { dimensions = [] } = vseed;
-                const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
-                if (hasRowOrColumnDimension) return true;
                 if ('scatter' === vseed.chartType) {
                     if (isMeasureTreeWithChildren(vseed.measures)) {
                         const depth = measureDepth(vseed.measures);
@@ -553,10 +563,9 @@
                 }
                 return false;
             }
-            const { measures = [], dimensions = [] } = vseed;
-            const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'row' === dimension.encoding || 'column' === dimension.encoding);
+            const { measures = [] } = vseed;
             const hasMeasureGroup = measures && measures.some((measure)=>measure && measure.children);
-            return hasRowOrColumnDimension || hasMeasureGroup;
+            return hasMeasureGroup;
         };
         const getColorItems = (builder)=>{
             const advancedVSeed = builder.advancedVSeed;
@@ -3248,6 +3257,14 @@
             }
             return Object.setPrototypeOf(r, Object.prototype), r;
         };
+        const getCurveType = (vseed, lineSmooth = false)=>{
+            if (!lineSmooth) return 'linear';
+            return isRadar(vseed) ? 'catmullRomClosed' : 'monotone';
+        };
+        const getCurveTension = (vseed, lineSmooth = false)=>{
+            if (!lineSmooth) return 0;
+            return isRadar(vseed) ? 0.4 : 0;
+        };
         const lineStyle_lineStyle = (spec, context)=>{
             const { advancedVSeed } = context;
             const { markStyle, datasetReshapeInfo, dataset } = advancedVSeed;
@@ -3279,7 +3296,8 @@
                     0,
                     0
                 ];
-                const curveType = lineSmooth ? 'monotone' : 'linear';
+                const curveType = getCurveType(context.vseed, lineSmooth);
+                const curveTension = getCurveTension(context.vseed, lineSmooth);
                 return {
                     ...result,
                     [`custom${index + 1}`]: {
@@ -3292,6 +3310,7 @@
                         style: {
                             visible: lineVisible,
                             curveType: curveType,
+                            curveTension: curveTension,
                             strokeOpacity: lineColorOpacity,
                             stroke: lineColor,
                             lineWidth: lineWidth,
@@ -3319,7 +3338,6 @@
             const { chartType, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
             const foldInfo = datasetReshapeInfo[0].foldInfo;
-            if (!baseConfig || chunk_VCYTMP4D_n(baseConfig.label)) return result;
             const { label } = baseConfig;
             result.label = buildLabel(label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, [
                 foldInfo
@@ -3327,7 +3345,6 @@
             return result;
         };
         const generateMeasureValue = (value, measure, labelAutoFormat, numFormat = {})=>{
-            if (!measure) return value;
             const format = chunk_5S4PYKVY_t(numFormat, measure.numFormat || measure.format);
             const mergedMeasure = {
                 ...measure,
@@ -3345,7 +3362,7 @@
             return formatter(percentValue);
         };
         const buildLabel = (label, vseedMeasures = [], vseedDimensions = [], advancedVSeedMeasures, encoding, foldInfoList)=>{
-            const { enable, wrap, showValue, showValuePercent, labelOverlap, labelColorSmartInvert, labelColor, labelFontSize, labelFontWeight, labelBackgroundColor, labelPosition, autoFormat, numFormat = {}, labelLayout } = label;
+            const { enable, wrap, showValue, showValuePercent, labelOverlap, labelColorSmartInvert, labelColor, labelFontSize, labelFontWeight, labelBackgroundColor, labelPosition, autoFormat, numFormat = {} } = label;
             const labelDims = T((vseedDimensions || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
             const labelMeas = T((vseedMeasures || []).filter((item)=>encoding.label?.includes(item.id)), (item)=>item.id);
             const percentFormat = chunk_5S4PYKVY_t(numFormat, {
@@ -3362,19 +3379,18 @@
                     foldInfoList.forEach((foldInfo)=>{
                         const { measureId, measureValue, statistics } = foldInfo;
                         const measure = findMeasureById(advancedVSeedMeasures, datum[measureId]);
-                        const measureValueLabel = generateMeasureValue(datum[measureValue], measure, autoFormat, numFormat);
-                        const measurePercentLabel = generateMeasurePercent(datum[measureValue], statistics.sum, percentFormatter);
-                        if (showValue) result.push(measureValueLabel);
-                        if (showValuePercent) result.push(measurePercentLabel);
+                        if (measure) {
+                            const measureValueLabel = generateMeasureValue(datum[measureValue], measure, autoFormat, numFormat);
+                            const measurePercentLabel = generateMeasurePercent(datum[measureValue], statistics.sum, percentFormatter);
+                            if (showValue) result.push(measureValueLabel);
+                            if (showValuePercent) result.push(measurePercentLabel);
+                        }
                     });
                     result.push(...meaLabels);
                     if (wrap) return result;
                     return result.join(' ');
                 },
                 position: labelPosition,
-                layout: {
-                    align: labelLayout
-                },
                 style: {
                     fill: labelColor,
                     fontSize: labelFontSize,
@@ -3933,7 +3949,9 @@
                 }
             };
         };
-        const pivotGridStyle = (spec)=>{
+        const pivotGridStyle = (spec, context)=>{
+            const { vseed } = context;
+            const onlyCombination = !isPivot(vseed) && isCombination(vseed);
             const result = {
                 ...spec
             };
@@ -3942,8 +3960,8 @@
             const bodyFontColor = '#141414';
             const headerFontColor = '#21252c';
             const headerBackgroundColor = 'rgba(0,0,0,0)';
-            const hoverHeaderBackgroundColor = '#D9DDE4';
-            const hoverHeaderInlineBackgroundColor = '#D9DDE455';
+            const hoverHeaderBackgroundColor = onlyCombination ? transparent : '#D9DDE4';
+            const hoverHeaderInlineBackgroundColor = onlyCombination ? transparent : '#D9DDE455';
             return {
                 ...result,
                 theme: {
@@ -3954,7 +3972,7 @@
                         borderLineWidth: [
                             1,
                             1,
-                            0,
+                            1,
                             1
                         ],
                         bgColor: transparent,
@@ -4744,6 +4762,7 @@
             };
             const markArea = annotationAreaList.flatMap((annotationArea)=>{
                 const { selector: selectorPoint, text = '', textPosition = 'top', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'top', textBackgroundVisible = true, textBackgroundColor = '#191d24', textBackgroundBorderColor = '#191d24', textBackgroundBorderWidth = 1, textBackgroundBorderRadius = 4, textBackgroundPadding = 4, areaColor = '#888888', areaColorOpacity = 0.15, areaBorderColor = '#888888', areaBorderRadius = 4, areaBorderWidth = 1, outerPadding = 4 } = annotationArea;
+                const dy = textPosition?.includes('bottom') ? -1 * textFontSize : textFontSize;
                 const dataset = advancedVSeed.dataset.flat();
                 const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
                 return {
@@ -4752,14 +4771,19 @@
                     positions: (data, context)=>{
                         const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
                         const xyList = positionData.map((datum)=>context.dataToPosition(datum));
+                        const bandPosition = context?._scaleConfig?.bandPosition || 0;
                         const yAxisHelper = context.getYAxisHelper();
                         const xAxisHelper = context.getXAxisHelper();
                         if ('function' == typeof xAxisHelper?.getBandwidth) {
                             const depth = context.fieldX.length ?? 0;
                             const xBandWidth = xAxisHelper?.getBandwidth?.(depth - 1);
                             const yScale = yAxisHelper.getScale();
-                            const minX = Math.min(...xyList.map((item)=>item.x)) - (outerPadding || 4);
-                            const maxX = Math.max(...xyList.map((item)=>item.x)) + xBandWidth + (outerPadding || 4);
+                            const startX = Math.min(...xyList.map((item)=>item.x)) - (outerPadding || 4);
+                            const endX = Math.max(...xyList.map((item)=>item.x)) + (outerPadding || 4);
+                            const width = endX - startX + xBandWidth;
+                            const middleX = (endX + startX) / 2 + xBandWidth * (0.5 - bandPosition);
+                            const minX = middleX - width / 2;
+                            const maxX = middleX + width / 2;
                             const minY = Math.min(...yScale.range());
                             const maxY = Math.max(...yScale.range());
                             return [
@@ -4785,8 +4809,12 @@
                             const depth = context.fieldY.length ?? 0;
                             const yBandWidth = yAxisHelper?.getBandwidth?.(depth - 1);
                             const xScale = xAxisHelper.getScale();
-                            const minY = Math.min(...xyList.map((item)=>item.y)) - (outerPadding || 4);
-                            const maxY = Math.max(...xyList.map((item)=>item.y)) + yBandWidth + (outerPadding || 4);
+                            const startY = Math.min(...xyList.map((item)=>item.y)) - (outerPadding || 4);
+                            const endY = Math.max(...xyList.map((item)=>item.y)) + (outerPadding || 4);
+                            const width = endY - startY + yBandWidth;
+                            const middleY = (endY + startY) / 2 + yBandWidth * (0.5 - bandPosition);
+                            const minY = middleY - width / 2;
+                            const maxY = middleY + width / 2;
                             const minX = Math.min(...xScale.range());
                             const maxX = Math.max(...xScale.range());
                             return [
@@ -4815,7 +4843,7 @@
                         visible: true,
                         text: text,
                         style: {
-                            dy: textFontSize,
+                            dy: dy,
                             textAlign: textAlign,
                             textBaseline: textBaseline,
                             stroke: textBackgroundColor,
@@ -4828,7 +4856,7 @@
                             visible: textBackgroundVisible,
                             padding: textBackgroundPadding,
                             style: {
-                                dy: textFontSize,
+                                dy: dy,
                                 cornerRadius: textBackgroundBorderRadius ?? 4,
                                 fill: textBackgroundColor,
                                 stroke: textBackgroundBorderColor,
@@ -5859,7 +5887,7 @@
         const areaStyle_areaStyle = (spec, context)=>{
             const { advancedVSeed } = context;
             const { markStyle, datasetReshapeInfo, dataset } = advancedVSeed;
-            const { areaStyle } = markStyle;
+            const { areaStyle, lineStyle } = markStyle;
             const { unfoldInfo } = datasetReshapeInfo[0];
             const result = {
                 ...spec,
@@ -5872,10 +5900,15 @@
             const areaStyles = Array.isArray(areaStyle) ? areaStyle : [
                 areaStyle
             ];
+            const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
+                lineStyle
+            ];
             const group = unfoldInfo.encodingColorId;
             const areaGroups = chunk_HVPVHFDT_i(dataset, (d)=>d[group ?? '']);
             const customMap = areaStyles.reduce((result, style, index)=>{
                 const { areaColor, areaColorOpacity, areaVisible = true } = style;
+                const curveType = getCurveType(context.vseed, lineStyles[index]?.lineSmooth);
+                const curveTension = getCurveTension(context.vseed, lineStyles[index]?.lineSmooth);
                 return {
                     ...result,
                     [`custom${index + 1}`]: {
@@ -5886,6 +5919,8 @@
                             return false;
                         },
                         style: {
+                            curveType,
+                            curveTension,
                             visible: areaVisible,
                             fill: areaColor,
                             fillOpacity: areaColorOpacity
@@ -6442,7 +6477,8 @@
             const { advancedVSeed } = context;
             const { chartType, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
-            if (!baseConfig || !baseConfig.sizeRange && !baseConfig.size) return result;
+            const hasSizeEncoding = encoding?.size?.[0];
+            if (!hasSizeEncoding) return result;
             const size = baseConfig.size ?? baseConfig.sizeRange;
             result.size = {
                 type: 'linear',
@@ -6462,7 +6498,6 @@
             const { datasetReshapeInfo } = advancedVSeed;
             const { chartType, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
-            if (!baseConfig || chunk_VCYTMP4D_n(baseConfig.label)) return result;
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             const { label } = baseConfig;
             result.label = buildLabel(label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, foldInfoList);
@@ -7279,7 +7314,6 @@
             const { datasetReshapeInfo, encoding } = advancedVSeed;
             const { chartType } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
-            if (!baseConfig || !baseConfig.label) return result;
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             result.label = buildLabel(baseConfig.label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, [
                 foldInfoList[0]
@@ -7295,8 +7329,6 @@
             const { datasetReshapeInfo, encoding } = advancedVSeed;
             const { chartType } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
-            if (!baseConfig || !baseConfig.label) return result;
-            if (chunk_JK3VNB42_n(datasetReshapeInfo[0].foldInfoList?.[1])) return result;
             const foldInfoList = datasetReshapeInfo[0].foldInfoList;
             result.label = buildLabel(baseConfig.label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, [
                 foldInfoList[1]
@@ -7637,7 +7669,7 @@
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
             annotationHorizontalLine_annotationHorizontalLine,
-            annotationArea_annotationArea
+            annotationAreaBand
         ];
         const pivotDualAxis = [
             initPivot,
@@ -7679,7 +7711,7 @@
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
                 annotationHorizontalLine_annotationHorizontalLine,
-                annotationArea_annotationArea
+                annotationAreaBand
             ]),
             pivotRowDimensions,
             pivotColumnDimensions,
@@ -7842,6 +7874,28 @@
                 }
             };
         };
+        const labelPie = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed, vseed } = context;
+            const { datasetReshapeInfo } = advancedVSeed;
+            const { chartType, encoding } = advancedVSeed;
+            const baseConfig = advancedVSeed.config[chartType];
+            const foldInfo = datasetReshapeInfo[0].foldInfo;
+            const { label } = baseConfig;
+            result.label = buildLabel(label, vseed.measures, vseed.dimensions, advancedVSeed.measures, encoding, [
+                foldInfo
+            ]);
+            if (label.labelLayout) result.label.layout = {
+                align: label.labelLayout
+            };
+            return result;
+        };
+        const pivotHideIndicatorName = (spec)=>({
+                ...spec,
+                hideIndicatorName: true
+            });
         const pie = [
             initPie,
             colorAdapter(color_color, linearColor),
@@ -7850,7 +7904,7 @@
             progressive,
             colorPieStyleFill(pieStyle),
             colorAdapter(discreteLegend, colorLegend),
-            label_label,
+            labelPie,
             tooltip_tooltip,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
@@ -7861,6 +7915,7 @@
             initPivot,
             pivotGridStyle,
             pivotIndicators_pivotIndicatorsAsRow,
+            pivotHideIndicatorName,
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initPie,
@@ -7869,7 +7924,7 @@
                 datasetXY,
                 progressive,
                 colorPieStyleFill(pieStyle),
-                label_label,
+                labelPie,
                 tooltip_tooltip,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
@@ -7940,7 +7995,7 @@
             background_backgroundColor,
             datasetXY,
             progressive,
-            label_label,
+            labelPie,
             colorPieStyleFill(pieStyle),
             colorAdapter(discreteLegend, colorLegend),
             tooltip_tooltip,
@@ -7953,6 +8008,7 @@
             initPivot,
             pivotGridStyle,
             pivotIndicators_pivotIndicatorsAsRow,
+            pivotHideIndicatorName,
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initDonut,
@@ -7960,7 +8016,7 @@
                 background_backgroundColor,
                 datasetXY,
                 progressive,
-                label_label,
+                labelPie,
                 colorPieStyleFill(pieStyle),
                 tooltip_tooltip,
                 annotationPoint_annotationPoint,
@@ -8167,13 +8223,14 @@
             verticalCrosshairRect,
             colorRoseStyleFill(roseStyle),
             colorAdapter(discreteLegend, colorLegend),
-            label_label,
+            labelPie,
             tooltip_tooltip
         ];
         const pivotRose = [
             initPivot,
             pivotGridStyle,
             pivotIndicators_pivotIndicatorsAsRow,
+            pivotHideIndicatorName,
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initRose,
@@ -8186,7 +8243,7 @@
                 radiusAxis,
                 verticalCrosshairRect,
                 colorRoseStyleFill(roseStyle),
-                label_label,
+                labelPie,
                 tooltip_tooltip
             ]),
             pivotRowDimensions,
@@ -8279,7 +8336,7 @@
             radiusAxis,
             colorRoseStyleFill(roseStyle),
             colorAdapter(discreteLegend, colorLegend),
-            label_label,
+            labelPie,
             tooltip_tooltip,
             verticalCrosshairRect,
             annotationPoint_annotationPoint,
@@ -8291,6 +8348,7 @@
             initPivot,
             pivotGridStyle,
             pivotIndicators_pivotIndicatorsAsRow,
+            pivotHideIndicatorName,
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initRoseParallel,
@@ -8302,7 +8360,7 @@
                 radiusAxis,
                 verticalCrosshairRect,
                 colorRoseStyleFill(roseStyle),
-                label_label,
+                labelPie,
                 tooltip_tooltip,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
@@ -8512,6 +8570,7 @@
             initPivot,
             pivotGridStyle,
             pivotIndicators_pivotIndicatorsAsRow,
+            pivotHideIndicatorName,
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initRadar,
@@ -8711,6 +8770,7 @@
             initPivot,
             pivotGridStyle,
             pivotIndicators_pivotIndicatorsAsRow,
+            pivotHideIndicatorName,
             datasetPivot,
             pivotIndicators_pivotIndicators([
                 initFunnel,
@@ -9326,7 +9386,11 @@
                                 visible: true
                             }
                         },
-                        crosshairLine
+                        crosshairLine,
+                        sizeRange: [
+                            8,
+                            24
+                        ]
                     },
                     dualAxis: {
                         ...baseConfig,
@@ -9661,7 +9725,11 @@
                                 visible: true
                             }
                         },
-                        crosshairLine
+                        crosshairLine,
+                        sizeRange: [
+                            8,
+                            24
+                        ]
                     },
                     dualAxis: {
                         ...baseConfig,
@@ -13437,11 +13505,13 @@
             labelColor: schemas_string().nullish(),
             labelColorSmartInvert: schemas_boolean().nullish(),
             labelPosition: schemas_string().nullish(),
-            labelOverlap: schemas_boolean().nullish(),
-            labelLayout: schemas_enum([
-                'arc',
-                'labelLine',
-                'edge'
+            labelOverlap: schemas_boolean().nullish()
+        });
+        const zPieLabel = zLabel.extend({
+            labelLayout: union([
+                literal('arc'),
+                literal('labelLine'),
+                literal('edge')
             ]).nullish()
         });
         const zLegend = schemas_object({
@@ -13611,11 +13681,13 @@
             legend: zLegend.nullish(),
             xAxis: zXLinearAxis.nullish(),
             yAxis: zYLinearAxis.nullish(),
-            crosshairLine: zCrosshairLine.nullish()
+            crosshairLine: zCrosshairLine.nullish(),
+            size: schemas_number().or(schemas_array(schemas_number())).nullish(),
+            sizeRange: schemas_number().or(schemas_array(schemas_number())).nullish()
         });
         const zRoseConfig = schemas_object({
             backgroundColor: zBackgroundColor.nullish(),
-            label: zLabel.nullish(),
+            label: zPieLabel.nullish(),
             color: zColor.nullish(),
             tooltip: zTooltip.nullish(),
             legend: zLegend.nullish()
@@ -13623,15 +13695,15 @@
         const zRoseParallelConfig = zRoseConfig;
         const zPieConfig = schemas_object({
             backgroundColor: zBackgroundColor.nullish(),
-            label: zLabel.nullish(),
+            label: zPieLabel.nullish(),
             color: zColor.nullish(),
             tooltip: zTooltip.nullish(),
             legend: zLegend.nullish()
         });
         const zDonutConfig = zPieConfig;
         const zRadarConfig = zPieConfig;
-        const zFunnelConfig = zPieConfig;
-        const zHeatmapConfig = zPieConfig;
+        const zFunnelConfig = zAreaConfig;
+        const zHeatmapConfig = zAreaConfig;
         const zConfig = schemas_object({
             table: zTableConfig.nullish(),
             pivotTable: zPivotTableConfig.nullish(),
@@ -14037,9 +14109,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXBandAxis.nullish(),
@@ -14064,9 +14134,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXBandAxis.nullish(),
@@ -14089,9 +14157,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXBandAxis.nullish(),
@@ -14114,9 +14180,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXBandAxis.nullish(),
@@ -14139,9 +14203,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXLinearAxis.nullish(),
@@ -14164,9 +14226,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXLinearAxis.nullish(),
@@ -14189,9 +14249,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXLinearAxis.nullish(),
@@ -14214,9 +14272,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXBandAxis.nullish(),
@@ -14240,9 +14296,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXBandAxis.nullish(),
@@ -14269,9 +14323,7 @@
             size: schemas_number().or(schemas_array(schemas_number())).nullish(),
             sizeRange: schemas_number().or(schemas_array(schemas_number())).nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             xAxis: zXLinearAxis.nullish(),
@@ -14298,9 +14350,7 @@
             xAxis: zXBandAxis.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             crosshairRect: zCrosshairRect.nullish(),
@@ -14325,9 +14375,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             theme: zTheme.nullish(),
@@ -14341,9 +14389,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             theme: zTheme.nullish(),
@@ -14357,7 +14403,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.nullish(),
+            label: zPieLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             theme: zTheme.nullish(),
@@ -14371,7 +14417,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.nullish(),
+            label: zPieLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             theme: zTheme.nullish(),
@@ -14385,9 +14431,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zLegend.nullish(),
             tooltip: zTooltip.nullish(),
             theme: zTheme.nullish(),
@@ -14401,9 +14445,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zColorLegend.nullish(),
             tooltip: zTooltip.nullish(),
             theme: zTheme.nullish(),
@@ -14416,9 +14458,7 @@
             measures: zMeasureTree.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
             color: zColor.nullish(),
-            label: zLabel.omit({
-                labelLayout: true
-            }).nullish(),
+            label: zLabel.nullish(),
             legend: zColorLegend.nullish(),
             tooltip: zTooltip.nullish(),
             theme: zTheme.nullish(),