@visactor/vseed 0.1.19 → 0.1.21

package/dist/umd/index.js

@@ -196,21 +196,22 @@
             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,
             zRose: ()=>zRose,
+            zUnfoldInfo: ()=>zUnfoldInfo,
             columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
             zPointStyle: ()=>zPointStyle,
             zAnnotationPoint: ()=>zAnnotationPoint,
@@ -3319,7 +3320,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 +3327,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 +3344,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 +3361,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,
@@ -4744,6 +4742,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 +4751,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 +4789,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 +4823,7 @@
                         visible: true,
                         text: text,
                         style: {
-                            dy: textFontSize,
+                            dy: dy,
                             textAlign: textAlign,
                             textBaseline: textBaseline,
                             stroke: textBackgroundColor,
@@ -4828,7 +4836,7 @@
                             visible: textBackgroundVisible,
                             padding: textBackgroundPadding,
                             style: {
-                                dy: textFontSize,
+                                dy: dy,
                                 cornerRadius: textBackgroundBorderRadius ?? 4,
                                 fill: textBackgroundColor,
                                 stroke: textBackgroundBorderColor,
@@ -5086,7 +5094,7 @@
             markStyle_markStyle,
             annotation_annotation
         ];
-        const percent = (spec, context)=>{
+        const percent = (spec)=>{
             const result = {
                 ...spec
             };
@@ -6462,7 +6470,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 +7286,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 +7301,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 +7641,7 @@
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
             annotationHorizontalLine_annotationHorizontalLine,
-            annotationArea_annotationArea
+            annotationAreaBand
         ];
         const pivotDualAxis = [
             initPivot,
@@ -7679,7 +7683,7 @@
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
                 annotationHorizontalLine_annotationHorizontalLine,
-                annotationArea_annotationArea
+                annotationAreaBand
             ]),
             pivotRowDimensions,
             pivotColumnDimensions,
@@ -7842,6 +7846,24 @@
                 }
             };
         };
+        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 pie = [
             initPie,
             colorAdapter(color_color, linearColor),
@@ -7850,7 +7872,7 @@
             progressive,
             colorPieStyleFill(pieStyle),
             colorAdapter(discreteLegend, colorLegend),
-            label_label,
+            labelPie,
             tooltip_tooltip,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
@@ -7869,7 +7891,7 @@
                 datasetXY,
                 progressive,
                 colorPieStyleFill(pieStyle),
-                label_label,
+                labelPie,
                 tooltip_tooltip,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
@@ -7940,7 +7962,7 @@
             background_backgroundColor,
             datasetXY,
             progressive,
-            label_label,
+            labelPie,
             colorPieStyleFill(pieStyle),
             colorAdapter(discreteLegend, colorLegend),
             tooltip_tooltip,
@@ -7960,7 +7982,7 @@
                 background_backgroundColor,
                 datasetXY,
                 progressive,
-                label_label,
+                labelPie,
                 colorPieStyleFill(pieStyle),
                 tooltip_tooltip,
                 annotationPoint_annotationPoint,
@@ -8167,7 +8189,7 @@
             verticalCrosshairRect,
             colorRoseStyleFill(roseStyle),
             colorAdapter(discreteLegend, colorLegend),
-            label_label,
+            labelPie,
             tooltip_tooltip
         ];
         const pivotRose = [
@@ -8186,7 +8208,7 @@
                 radiusAxis,
                 verticalCrosshairRect,
                 colorRoseStyleFill(roseStyle),
-                label_label,
+                labelPie,
                 tooltip_tooltip
             ]),
             pivotRowDimensions,
@@ -8279,7 +8301,7 @@
             radiusAxis,
             colorRoseStyleFill(roseStyle),
             colorAdapter(discreteLegend, colorLegend),
-            label_label,
+            labelPie,
             tooltip_tooltip,
             verticalCrosshairRect,
             annotationPoint_annotationPoint,
@@ -8302,7 +8324,7 @@
                 radiusAxis,
                 verticalCrosshairRect,
                 colorRoseStyleFill(roseStyle),
-                label_label,
+                labelPie,
                 tooltip_tooltip,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
@@ -13437,11 +13459,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({
@@ -13615,7 +13639,7 @@
         });
         const zRoseConfig = schemas_object({
             backgroundColor: zBackgroundColor.nullish(),
-            label: zLabel.nullish(),
+            label: zPieLabel.nullish(),
             color: zColor.nullish(),
             tooltip: zTooltip.nullish(),
             legend: zLegend.nullish()
@@ -13623,15 +13647,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 +14061,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 +14086,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 +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(),
@@ -14114,9 +14132,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 +14155,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 +14178,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 +14201,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 +14224,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 +14248,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 +14275,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 +14302,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 +14327,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 +14341,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 +14355,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 +14369,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 +14383,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 +14397,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 +14410,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(),