@visactor/vseed 0.0.16 → 0.0.18

package/dist/index.js

@@ -150,7 +150,7 @@ const NUMBER_FORMAT_RULES = {
 };
 const createFormatter = (format)=>createNumFormatter(format);
 const autoFormatter = (value, locale)=>autoNumFormatter(value, locale);
-function findMeasureById(measures, id) {
+const findMeasureById = (measures, id)=>{
     if (!measures) return;
     const stack = [
         ...measures
@@ -161,7 +161,22 @@ function findMeasureById(measures, id) {
         if (current.id === id && !('children' in current)) return current;
         if ('children' in current && current.children) stack.push(...current.children);
     }
-}
+};
+const findFirstMeasure = (measures)=>{
+    if (!measures) return;
+    const stack = [
+        ...measures
+    ].reverse();
+    while(stack.length > 0){
+        const current = stack.pop();
+        if (!current) continue;
+        if (!('children' in current)) return current;
+        if ('children' in current && current.children) {
+            const children = (current.children || []).reverse();
+            stack.push(...children);
+        }
+    }
+};
 const autoMeasures = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -379,14 +394,17 @@ const dataReshapeFor2D1M = (dataset, dimensions, measures, options)=>{
         };
     }
     {
-        const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
-            ...dimensions,
-            {
-                id: foldMeasureName,
-                alias: i18n`指标名称`,
-                location: 'dimension'
-            }
-        ], [
+        const onlyOneMeasure = 1 === measures.length;
+        const onlyOneDimension = 1 === dimensions.length;
+        const dims = [
+            ...dimensions
+        ];
+        if (!onlyOneMeasure || onlyOneDimension) dims.push({
+            id: foldMeasureName,
+            alias: i18n`指标名称`,
+            location: 'dimension'
+        });
+        const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dims, [
             {
                 id: foldMeasureValue,
                 alias: i18n`指标值`
@@ -438,13 +456,70 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
         };
     }
     {
-        const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
+        const dims = 1 === measures.length ? [
+            ...dimensions
+        ] : [
             ...dimensions,
             {
                 id: foldMeasureName,
                 alias: i18n`指标名称`,
                 location: 'dimension'
             }
+        ];
+        const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, dims, [
+            {
+                id: foldMeasureValue,
+                alias: i18n`指标值`
+            }
+        ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
+        return {
+            dataset: finalDataset,
+            foldInfo,
+            unfoldInfo
+        };
+    }
+};
+const dataReshapeFor1D2M_emptyReshapeResult = {
+    dataset: [],
+    foldInfo: {
+        foldMap: {},
+        measureId: '',
+        measureName: '',
+        measureValue: ''
+    },
+    unfoldInfo: {
+        groupName: '',
+        groupId: '',
+        colorItems: [],
+        colorIdMap: {}
+    }
+};
+const dataReshapeFor1D2M = (dataset, dimensions, measures, options)=>{
+    const { foldMeasureId = FoldMeasureId, foldMeasureName = FoldMeasureName, foldMeasureValue = FoldMeasureValue, unfoldDimensionGroup = UnfoldDimensionGroup, unfoldDimensionGroupId = UnfoldDimensionGroupId } = options || {};
+    if (0 === dimensions.length && 0 === measures.length) return dataReshapeFor1D2M_emptyReshapeResult;
+    const { dataset: foldedDataset, foldInfo } = foldMeasures(dataset, measures.length > 1 ? measures.slice(1) : measures, foldMeasureId, foldMeasureName, foldMeasureValue);
+    if (0 === dimensions.length) {
+        const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
+            {
+                id: foldMeasureValue,
+                alias: i18n`指标值`,
+                location: 'dimension'
+            }
+        ], [
+            {
+                id: foldMeasureValue,
+                alias: i18n`指标值`
+            }
+        ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
+        return {
+            dataset: finalDataset,
+            foldInfo,
+            unfoldInfo
+        };
+    }
+    {
+        const { dataset: finalDataset, unfoldInfo } = unfoldDimensions(foldedDataset, [
+            ...dimensions
         ], [
             {
                 id: foldMeasureValue,
@@ -504,6 +579,28 @@ const reshapeTo1D1M = (advancedVSeed, context)=>{
         ]
     };
 };
+const reshapeTo1D2M = (advancedVSeed, context)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const { vseed } = context;
+    const { dataset } = vseed;
+    const { dimensions, measures } = advancedVSeed;
+    if (!measures || !dimensions || !dataset) return result;
+    if (0 === measures.length) throw new Error('measures can not be empty');
+    const { dataset: newDatasets, foldInfo, unfoldInfo } = dataReshapeFor1D2M(dataset, dimensions, measures);
+    return {
+        ...result,
+        dataset: newDatasets,
+        datasetReshapeInfo: [
+            {
+                id: '1D2M',
+                foldInfo,
+                unfoldInfo
+            }
+        ]
+    };
+};
 const pivotReshapeTo1D1M = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -543,6 +640,45 @@ const pivotReshapeTo1D1M = (advancedVSeed, context)=>{
         datasetReshapeInfo: datasetReshapeInfo
     };
 };
+const pivotReshapeTo1D2M = (advancedVSeed, context)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const { vseed } = context;
+    const { dataset } = vseed;
+    const { dimensions, measures } = advancedVSeed;
+    if (!measures || !dimensions) return result;
+    const measureGroups = [];
+    if (measures) measures.forEach((measure)=>{
+        if (measure.children && measure.children.length > 0) measureGroups.push(measure);
+    });
+    const newDatasets = [];
+    const datasetReshapeInfo = [];
+    measureGroups.forEach((measureGroup)=>{
+        const measures = measureGroup.children;
+        if (!measures) return;
+        const commonDimensions = dimensions.filter((dim)=>'dimension' === dim.location);
+        const groupId = measureGroup.id;
+        const { dataset: newSubDataset, foldInfo, unfoldInfo } = dataReshapeFor1D2M(dataset, commonDimensions, measures, {
+            foldMeasureId: FoldMeasureId,
+            foldMeasureName: FoldMeasureName,
+            foldMeasureValue: FoldMeasureValue + groupId,
+            unfoldDimensionGroup: UnfoldDimensionGroup
+        });
+        const reshapeInfo = {
+            id: groupId,
+            foldInfo,
+            unfoldInfo
+        };
+        newDatasets.push(newSubDataset);
+        datasetReshapeInfo.push(reshapeInfo);
+    });
+    return {
+        ...result,
+        dataset: newDatasets,
+        datasetReshapeInfo: datasetReshapeInfo
+    };
+};
 const pivotReshapeTo2D1M = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -726,6 +862,37 @@ const encodingPie = (advancedVSeed)=>{
         encoding
     };
 };
+const encodingFunnel = (advancedVSeed)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const { datasetReshapeInfo, dimensions } = advancedVSeed;
+    if (!datasetReshapeInfo || !dimensions) return result;
+    const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
+        const { foldInfo, unfoldInfo } = cur;
+        const size = [
+            foldInfo.measureValue
+        ];
+        const group = [
+            unfoldInfo.groupId
+        ];
+        const color = [
+            unfoldInfo.groupId
+        ];
+        return [
+            ...prev,
+            {
+                size,
+                group,
+                color
+            }
+        ];
+    }, []);
+    return {
+        ...result,
+        encoding
+    };
+};
 const vchartBaseConfig = (advancedVSeed, context)=>{
     const { vseed } = context;
     const result = {
@@ -801,6 +968,7 @@ const pieConfig = (advancedVSeed, context)=>{
 };
 const areaConfig = lineConfig;
 const areaPercentConfig = lineConfig;
+const scatterConfig = lineConfig;
 const barConfig = columnConfig;
 const barParallelConfig = columnConfig;
 const barPercentConfig = columnConfig;
@@ -809,6 +977,7 @@ const columnPercentConfig = columnConfig;
 const donutConfig = pieConfig;
 const roseConfig = pieConfig;
 const roseParallelConfig = pieConfig;
+const funnelConfig = pieConfig;
 const vchartTheme = (advancedVSeed, context)=>{
     const { customTheme, vseed } = context;
     const { theme = 'light', chartType } = vseed;
@@ -1093,12 +1262,96 @@ const roseParallelAdvancedPipeline = [
     markStyle_markStyle,
     annotation_annotation
 ];
+const funnelAdvancedPipeline = [
+    initAdvancedVSeed,
+    locale_locale,
+    autoMeasures,
+    autoDimensions,
+    pivotAdapter([
+        reshapeTo1D1M
+    ], [
+        pivotReshapeTo1D1M
+    ]),
+    encodingFunnel,
+    funnelConfig,
+    vchartBaseConfig,
+    vchartTheme,
+    annotation_annotation
+];
+const encodingYY = (advancedVSeed)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const { datasetReshapeInfo, measures } = advancedVSeed;
+    if (!datasetReshapeInfo || !measures) return result;
+    const firstMeasure = findFirstMeasure(measures);
+    const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
+        const { foldInfo, unfoldInfo } = cur;
+        const x = [
+            firstMeasure?.id
+        ];
+        const y = [
+            foldInfo.measureValue
+        ];
+        const group = [
+            unfoldInfo.groupId
+        ];
+        const color = [
+            unfoldInfo.groupId
+        ];
+        return [
+            ...prev,
+            {
+                x,
+                y,
+                group,
+                color
+            }
+        ];
+    }, []);
+    return {
+        ...result,
+        encoding
+    };
+};
+const scatterAdvancedPipeline = [
+    initAdvancedVSeed,
+    locale_locale,
+    autoMeasures,
+    autoDimensions,
+    pivotAdapter([
+        reshapeTo1D2M
+    ], [
+        pivotReshapeTo1D2M
+    ]),
+    encodingYY,
+    vchartBaseConfig,
+    scatterConfig,
+    vchartTheme,
+    markStyle_markStyle,
+    annotation_annotation
+];
 const dataset_dataset = (spec, context)=>{
     const { advancedVSeed } = context;
+    const { encoding } = advancedVSeed;
+    const angle = encoding[0]?.angle?.[0];
+    const x = encoding[0]?.x?.[0];
+    const group = encoding[0]?.group?.[0];
+    const fields = {};
+    if (angle) fields[angle] = {
+        sortIndex: 0
+    };
+    if (x) fields[x] = {
+        sortIndex: 0
+    };
+    if (group) fields[group] = {
+        sortIndex: 1
+    };
     return {
         ...spec,
         data: {
-            values: advancedVSeed.dataset
+            values: advancedVSeed.dataset,
+            fields: fields
         }
     };
 };
@@ -1280,7 +1533,8 @@ const initPie = (spec, context)=>{
     result.pie = {
         style: {
             stroke: '#ffffff',
-            lineWidth: 1
+            lineWidth: 1,
+            centerOffset: 0
         },
         state: {
             hover: {
@@ -1350,7 +1604,7 @@ const initRose = (spec, context)=>{
         state: {
             hover: {
                 lineWidth: 1,
-                fillOpacity: 0.75
+                fillOpacity: 0.6
             }
         }
     };
@@ -1386,6 +1640,12 @@ const initRoseParallel = (spec, context)=>{
         style: {
             stroke: '#ffffff',
             lineWidth: 1
+        },
+        state: {
+            hover: {
+                lineWidth: 1,
+                fillOpacity: 0.6
+            }
         }
     };
     result.region = [
@@ -1412,6 +1672,42 @@ const initPivot = (spec)=>{
         indicatorsAsCol: false
     };
 };
+const initFunnel = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { encoding } = advancedVSeed;
+    if (!encoding[0].size || !encoding[0].group || !encoding[0].color) return result;
+    result.type = 'funnel';
+    result.valueField = encoding[0].size[0];
+    result.categoryField = encoding[0].group[0];
+    result.padding = 0;
+    result.isTransform = true;
+    result.shape = 'rect';
+    result.maxSize = '75%';
+    result.minSize = '10%';
+    result.region = [
+        {
+            clip: true
+        }
+    ];
+    result.funnel = {
+        style: {
+            cornerRadius: 4
+        },
+        state: {
+            hover: {
+                fillOpacity: 0.6
+            }
+        }
+    };
+    result.transformLabel = {
+        visible: true
+    };
+    result.animation = true;
+    return result;
+};
 const xBand = (spec, context)=>{
     const result = {
         ...spec
@@ -1580,7 +1876,7 @@ const xLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            right: LINEAR_AXIS_INNER_OFFSET_TOP
         }
     };
     result.axes = [
@@ -1891,6 +2187,9 @@ const tooltip_tooltip = (spec, context)=>{
     result.tooltip = {
         visible: enable,
         mark: {
+            title: {
+                value: (datum)=>datum && datum[groupName] || ''
+            },
             content: [
                 {
                     visible: true,
@@ -2134,11 +2433,11 @@ const pivotDiscreteLegend = (spec, context)=>{
                 label: d,
                 shape: {
                     outerBorder: border ? {
-                        stroke: colorScheme[index],
+                        stroke: colorScheme?.[index],
                         distance: 3,
                         lineWidth: 1
                     } : void 0,
-                    fill: colorScheme[index]
+                    fill: colorScheme?.[index]
                 }
             })),
         item: {
@@ -2190,8 +2489,8 @@ const color_color = (spec, context)=>{
     const { color } = baseConfig;
     const { colorScheme, colorMapping } = color;
     const mappingList = [];
-    if (colorMapping) Object.entries(colorMapping).forEach(([key, value])=>{
-        const idMap = Object.entries(unfoldInfo.colorIdMap).filter(([_, v])=>key === v);
+    if (colorMapping) Object.entries(colorMapping).sort((a, b)=>a[0].split(Separator).length - b[0].split(Separator).length).forEach(([key, value])=>{
+        const idMap = Object.entries(unfoldInfo.colorIdMap).filter(([_, v])=>v.includes(key));
         for (const [colorId] of idMap)mappingList.push([
             colorId,
             value
@@ -2522,19 +2821,17 @@ const isDimensionSelector = (selector)=>'object' == typeof selector && null !==
     ].includes(selector.op));
 const barStyle_barStyle = (spec, context)=>{
     const { advancedVSeed } = context;
-    const { markStyle, encoding } = advancedVSeed;
+    const { markStyle } = advancedVSeed;
     const { barStyle } = markStyle;
     const result = {
         ...spec,
         bar: {
+            style: {
+                stroke: '#fff',
+                lineWidth: 1
+            },
             state: {
                 hover: {
-                    stroke: (datum, context)=>{
-                        const field = encoding[0]?.group?.[0];
-                        const color = context.seriesColor(datum[field]);
-                        return color;
-                    },
-                    lineWidth: 4,
                     fillOpacity: 0.6
                 }
             }
@@ -2590,14 +2887,7 @@ const pointStyle_pointStyle = (spec, context)=>{
     const { pointStyle } = markStyle;
     const result = {
         ...spec,
-        point: {
-            state: {
-                dimension_hover: {
-                    scaleX: 1.4,
-                    scaleY: 1.4
-                }
-            }
-        }
+        point: {}
     };
     if (!pointStyle) return result;
     const pointStyles = Array.isArray(pointStyle) ? pointStyle : [
@@ -2643,6 +2933,47 @@ const pointStyle_pointStyle = (spec, context)=>{
         }
     };
 };
+const pointStateDimensionHover = (spec)=>{
+    const point = spec.point || {};
+    const result = {
+        ...spec,
+        point: {
+            ...point,
+            state: {
+                dimension_hover: {
+                    scaleX: 1.4,
+                    scaleY: 1.4
+                }
+            }
+        }
+    };
+    return result;
+};
+const pointStateHover = (spec, context)=>{
+    const point = spec.point || {};
+    const { advancedVSeed } = context;
+    const { encoding } = advancedVSeed;
+    const result = {
+        ...spec,
+        point: {
+            ...point,
+            state: {
+                hover: {
+                    scaleX: 1.4,
+                    scaleY: 1.4,
+                    stroke: (datum, context)=>{
+                        const field = encoding[0]?.group?.[0];
+                        const color = context.seriesColor(datum[field]);
+                        return color;
+                    },
+                    fillOpacity: 0.6,
+                    lineWidth: 1
+                }
+            }
+        }
+    };
+    return result;
+};
 const lineStyle_lineStyle = (spec, context)=>{
     const { advancedVSeed } = context;
     const { markStyle, encoding, dataset } = advancedVSeed;
@@ -2821,7 +3152,7 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
         insideEnd: 'insideEndTop'
     };
     const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine)=>{
-        const { selector: selectorPoint, xValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'right', textBaseline = 'top', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 2, backgroundVisible = true, offsetX = 0, offsetY = 0, lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1 } = annotationVerticalLine;
+        const { selector: selectorPoint, xValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'right', textBaseline = 'top', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 2, backgroundVisible = true, lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1 } = annotationVerticalLine;
         const dataset = advancedVSeed.dataset.flat();
         const generateOneMarkLine = (x)=>({
                 x: x,
@@ -2829,8 +3160,6 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
                 line: {
                     visible: lineVisible,
                     style: {
-                        offsetX,
-                        offsetY,
                         stroke: lineColor,
                         lineStyle: lineStyle,
                         lineWidth: lineWidth,
@@ -2849,8 +3178,6 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
                     text: text,
                     position: positionMap[textPosition],
                     style: {
-                        offsetX,
-                        offsetY,
                         visible: true,
                         textAlign: textAlign,
                         textBaseline: textBaseline,
@@ -2862,8 +3189,6 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
                         visible: backgroundVisible,
                         padding: backgroundPadding,
                         style: {
-                            offsetX,
-                            offsetY,
                             cornerRadius: backgroundBorderRadius ?? 4,
                             fill: backgroundColor,
                             stroke: backgroundBorderColor,
@@ -2918,7 +3243,7 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         insideEnd: 'insideEndTop'
     };
     const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine)=>{
-        const { selector: selectorPoint, yValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'bottom', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 2, backgroundVisible = true, offsetX = 0, offsetY = 0, lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1 } = annotationVerticalLine;
+        const { selector: selectorPoint, yValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'bottom', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 2, backgroundVisible = true, lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1 } = annotationVerticalLine;
         const dataset = advancedVSeed.dataset.flat();
         const generateOneMarkLine = (y)=>({
                 y,
@@ -2926,8 +3251,6 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
                 line: {
                     visible: lineVisible,
                     style: {
-                        offsetX,
-                        offsetY,
                         stroke: lineColor,
                         lineStyle: lineStyle,
                         lineWidth: lineWidth,
@@ -2946,8 +3269,6 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
                     text: text,
                     position: positionMap[textPosition],
                     style: {
-                        offsetX,
-                        offsetY,
                         visible: true,
                         textAlign: textAlign,
                         textBaseline: textBaseline,
@@ -2959,8 +3280,6 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
                         visible: backgroundVisible,
                         padding: backgroundPadding,
                         style: {
-                            offsetX,
-                            offsetY,
                             cornerRadius: backgroundBorderRadius ?? 4,
                             fill: backgroundColor,
                             stroke: backgroundBorderColor,
@@ -3356,6 +3675,46 @@ const horizontalCrosshairRect = (spec, context)=>{
     };
     return result;
 };
+const horizontalCrosshairLine = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed, vseed } = context;
+    const { chartType } = vseed;
+    const config = advancedVSeed.config?.[chartType]?.crosshairLine;
+    if (!config) return result;
+    if (!result.crosshair) result.crosshair = {};
+    const { visible = true, lineColor, labelColor, labelVisible, labelBackgroundColor } = config;
+    const crosshair = result.crosshair;
+    crosshair.yField = {
+        visible,
+        line: {
+            type: 'line',
+            style: {
+                lineWidth: 1,
+                opacity: 1,
+                stroke: lineColor,
+                lineDash: [
+                    4,
+                    2
+                ]
+            }
+        },
+        label: {
+            visible: labelVisible,
+            labelBackground: {
+                visible: labelVisible,
+                style: {
+                    fill: labelBackgroundColor
+                }
+            },
+            style: {
+                fill: labelColor
+            }
+        }
+    };
+    return result;
+};
 const line_line = [
     initLine,
     color_color,
@@ -3368,6 +3727,7 @@ const line_line = [
     verticalCrosshairLine,
     discreteLegend,
     pointStyle_pointStyle,
+    pointStateDimensionHover,
     lineStyle_lineStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
@@ -3390,6 +3750,7 @@ const pivotLine = [
         tooltip_tooltip,
         verticalCrosshairLine,
         pointStyle_pointStyle,
+        pointStateDimensionHover,
         lineStyle_lineStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
@@ -3706,6 +4067,7 @@ const area_area = [
     verticalCrosshairLine,
     discreteLegend,
     pointStyle_pointStyle,
+    pointStateDimensionHover,
     lineStyle_lineStyle,
     areaStyle_areaStyle,
     annotationPoint_annotationPoint,
@@ -3730,6 +4092,7 @@ const pivotArea = [
         tooltip_tooltip,
         verticalCrosshairLine,
         pointStyle_pointStyle,
+        pointStateDimensionHover,
         lineStyle_lineStyle,
         areaStyle_areaStyle,
         annotationPoint_annotationPoint,
@@ -3922,7 +4285,6 @@ const roseParallel = [
     tooltip_tooltip,
     discreteLegend,
     verticalCrosshairRect,
-    barStyle_barStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -3944,7 +4306,6 @@ const pivotRoseParallel = [
         label_label,
         tooltip_tooltip,
         verticalCrosshairRect,
-        barStyle_barStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -3957,6 +4318,113 @@ const pivotRoseParallel = [
 const roseParallelSpecPipeline = [
     pivotAdapter_pivotAdapter(roseParallel, pivotRoseParallel)
 ];
+const funnel = [
+    initFunnel,
+    color_color,
+    background_backgroundColor,
+    dataset_dataset,
+    label_label,
+    tooltip_tooltip,
+    discreteLegend,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
+];
+const pivotFunnel = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsRow,
+    datasetPivot,
+    pivotIndicators([
+        initFunnel,
+        color_color,
+        background_backgroundColor,
+        datasetPivotPlaceholder,
+        label_label,
+        tooltip_tooltip,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const funnelSpecPipeline = [
+    pivotAdapter_pivotAdapter(funnel, pivotFunnel)
+];
+const initScatter = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { encoding } = advancedVSeed;
+    if (!encoding[0].y || !encoding[0].x || !encoding[0].group) return result;
+    result.type = 'scatter';
+    result.direction = 'vertical';
+    result.xField = encoding[0].x[0];
+    result.yField = encoding[0].y[0];
+    result.seriesField = encoding[0].group[0];
+    result.padding = 0;
+    result.region = [
+        {
+            clip: true
+        }
+    ];
+    result.animation = true;
+    return result;
+};
+const scatter = [
+    initScatter,
+    color_color,
+    background_backgroundColor,
+    dataset_dataset,
+    xLinear,
+    yLinear,
+    label_label,
+    tooltip_tooltip,
+    verticalCrosshairLine,
+    horizontalCrosshairLine,
+    discreteLegend,
+    pointStyle_pointStyle,
+    pointStateHover,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
+];
+const pivotScatter = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsRow,
+    datasetPivot,
+    pivotIndicators([
+        initScatter,
+        color_color,
+        background_backgroundColor,
+        datasetPivotPlaceholder,
+        xLinear,
+        yLinear,
+        label_label,
+        tooltip_tooltip,
+        verticalCrosshairLine,
+        horizontalCrosshairLine,
+        pointStyle_pointStyle,
+        pointStateHover,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const scatterSpecPipeline = [
+    pivotAdapter_pivotAdapter(scatter, pivotScatter)
+];
 const buildAdvanced = (builder)=>{
     const { chartType } = builder.vseed;
     if (!chartType) throw new Error('chartType is nil in buildAdvanced');
@@ -4087,6 +4555,14 @@ const registerRoseParallel = ()=>{
     Builder._advancedPipelineMap.roseParallel = roseParallelAdvancedPipeline;
     Builder._specPipelineMap.roseParallel = roseParallelSpecPipeline;
 };
+const registerFunnel = ()=>{
+    Builder._advancedPipelineMap.funnel = funnelAdvancedPipeline;
+    Builder._specPipelineMap.funnel = funnelSpecPipeline;
+};
+const registerScatter = ()=>{
+    Builder._advancedPipelineMap.scatter = scatterAdvancedPipeline;
+    Builder._specPipelineMap.scatter = scatterSpecPipeline;
+};
 const darkTheme = ()=>{
     const linearAxis = {
         nice: true,
@@ -4311,6 +4787,23 @@ const darkTheme = ()=>{
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine: crosshairLine
+            },
+            scatter: {
+                xAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                yAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                crosshairLine
             }
         }
     };
@@ -4540,6 +5033,23 @@ const lightTheme = ()=>{
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine
+            },
+            scatter: {
+                xAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                yAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                crosshairLine
             }
         }
     };
@@ -4571,6 +5081,8 @@ const registerAll = ()=>{
     registerDonut();
     registerRose();
     registerRoseParallel();
+    registerFunnel();
+    registerScatter();
     registerLightTheme();
     registerDarkTheme();
 };
@@ -4590,7 +5102,9 @@ const zChartType = z["enum"]([
     'roseParallel',
     'pie',
     'donut',
-    'dualAxis'
+    'dualAxis',
+    'scatter',
+    'funnel'
 ]);
 const zDatum = z.record(z.string().or(z.number()), z.any());
 const zDataset = z.array(zDatum);
@@ -4602,7 +5116,7 @@ const zDimension = z.object({
         'dimension',
         'rowDimension',
         'columnDimension'
-    ])
+    ]).default('dimension').optional()
 });
 const zDimensions = z.array(zDimension).optional();
 const zNumFormat = z.object({
@@ -4663,7 +5177,8 @@ const zEncoding = z.array(z.object({
     group: z.array(z.string()).optional(),
     angle: z.array(z.string()).optional(),
     radius: z.array(z.string()).optional(),
-    tooltip: z.array(z.string()).optional()
+    tooltip: z.array(z.string()).optional(),
+    size: z.array(z.string()).optional()
 }));
 const zBackgroundColor = z.string().default('transparent').optional();
 const zLabel = z.object({
@@ -4896,6 +5411,8 @@ const zStackCornerRadius = z.number().or(z.array(z.number())).default([
     0
 ]);
 const zConfig = z.object({
+    table: z.object({}).optional(),
+    pivotTable: z.object({}).optional(),
     line: z.object({
         xAxis: zXBandAxis.optional(),
         yAxis: zYLinearAxis.optional(),
@@ -4952,8 +5469,12 @@ const zConfig = z.object({
     pie: z.object({}).optional(),
     donut: z.object({}).optional(),
     dualAxis: z.object({}).optional(),
-    table: z.object({}).optional(),
-    pivotTable: z.object({}).optional()
+    scatter: z.object({
+        xAxis: zXLinearAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairLine: zCrosshairLine.optional()
+    }).optional(),
+    funnel: z.object({}).optional()
 });
 const zSelector = z.union([
     z.string(),
@@ -5086,9 +5607,7 @@ const zAnnotationVerticalLine = z.object({
     backgroundBorderColor: z.string().optional(),
     backgroundBorderWidth: z.number().default(1).optional(),
     backgroundBorderRadius: z.number().default(4).optional(),
-    backgroundPadding: z.number().optional(),
-    offsetY: z.number().default(0).optional(),
-    offsetX: z.number().default(0).optional()
+    backgroundPadding: z.number().optional()
 });
 const zAnnotationHorizontalLine = z.object({
     selector: z.union([
@@ -5138,9 +5657,7 @@ const zAnnotationHorizontalLine = z.object({
     backgroundBorderColor: z.string().optional(),
     backgroundBorderWidth: z.number().default(1).optional(),
     backgroundBorderRadius: z.number().default(4).optional(),
-    backgroundPadding: z.number().optional(),
-    offsetY: z.number().default(0).optional(),
-    offsetX: z.number().default(0).optional()
+    backgroundPadding: z.number().optional()
 });
 const zAnnotationArea = z.object({
     selector: z.union([
@@ -5270,8 +5787,8 @@ const zLocale = z["enum"]([
     'zh-CN',
     'en-US'
 ]).default('zh-CN');
-const zBar = z.object({
-    chartType: z.literal('bar'),
+const zLine = z.object({
+    chartType: z.literal('line'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5280,20 +5797,20 @@ const zBar = z.object({
     label: zLabel.optional(),
     legend: zLegend.optional(),
     tooltip: zTooltip.optional(),
-    xAxis: zXLinearAxis.optional(),
-    yAxis: zYBandAxis.optional(),
-    crosshairRect: zCrosshairRect.optional(),
-    stackCornerRadius: zStackCornerRadius.optional(),
+    xAxis: zXBandAxis.optional(),
+    yAxis: zYLinearAxis.optional(),
+    crosshairLine: zCrosshairLine.optional(),
     theme: zTheme.optional(),
-    barStyle: zBarStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    pointStyle: zPointStyle.optional(),
+    lineStyle: zLineStyle.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zBarParallel = z.object({
-    chartType: z.literal('barParallel'),
+const zColumn = z.object({
+    chartType: z.literal('column'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5302,20 +5819,20 @@ const zBarParallel = z.object({
     label: zLabel.optional(),
     legend: zLegend.optional(),
     tooltip: zTooltip.optional(),
-    xAxis: zXLinearAxis.optional(),
-    yAxis: zYBandAxis.optional(),
+    xAxis: zXBandAxis.optional(),
+    yAxis: zYLinearAxis.optional(),
     crosshairRect: zCrosshairRect.optional(),
     stackCornerRadius: zStackCornerRadius.optional(),
     theme: zTheme.optional(),
     barStyle: zBarStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zColumn = z.object({
-    chartType: z.literal('column'),
+const zColumnParallel = z.object({
+    chartType: z.literal('columnParallel'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5330,14 +5847,14 @@ const zColumn = z.object({
     stackCornerRadius: zStackCornerRadius.optional(),
     theme: zTheme.optional(),
     barStyle: zBarStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zColumnParallel = z.object({
-    chartType: z.literal('columnParallel'),
+const zColumnPercent = z.object({
+    chartType: z.literal('columnPercent'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5352,14 +5869,14 @@ const zColumnParallel = z.object({
     stackCornerRadius: zStackCornerRadius.optional(),
     theme: zTheme.optional(),
     barStyle: zBarStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zColumnPercent = z.object({
-    chartType: z.literal('columnPercent'),
+const zBar = z.object({
+    chartType: z.literal('bar'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5368,20 +5885,20 @@ const zColumnPercent = z.object({
     label: zLabel.optional(),
     legend: zLegend.optional(),
     tooltip: zTooltip.optional(),
-    xAxis: zXBandAxis.optional(),
-    yAxis: zYLinearAxis.optional(),
+    xAxis: zXLinearAxis.optional(),
+    yAxis: zYBandAxis.optional(),
     crosshairRect: zCrosshairRect.optional(),
     stackCornerRadius: zStackCornerRadius.optional(),
     theme: zTheme.optional(),
     barStyle: zBarStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zLine = z.object({
-    chartType: z.literal('line'),
+const zBarParallel = z.object({
+    chartType: z.literal('barParallel'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5390,16 +5907,16 @@ const zLine = z.object({
     label: zLabel.optional(),
     legend: zLegend.optional(),
     tooltip: zTooltip.optional(),
-    xAxis: zXBandAxis.optional(),
-    yAxis: zYLinearAxis.optional(),
-    crosshairLine: zCrosshairLine.optional(),
+    xAxis: zXLinearAxis.optional(),
+    yAxis: zYBandAxis.optional(),
+    crosshairRect: zCrosshairRect.optional(),
+    stackCornerRadius: zStackCornerRadius.optional(),
     theme: zTheme.optional(),
-    pointStyle: zPointStyle.optional(),
-    lineStyle: zLineStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    barStyle: zBarStyle.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
 const zBarPercent = z.object({
@@ -5418,14 +5935,14 @@ const zBarPercent = z.object({
     stackCornerRadius: zStackCornerRadius.optional(),
     theme: zTheme.optional(),
     barStyle: zBarStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zPie = z.object({
-    chartType: z.literal('pie'),
+const zArea = z.object({
+    chartType: z.literal('area'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5434,11 +5951,21 @@ const zPie = z.object({
     label: zLabel.optional(),
     legend: zLegend.optional(),
     tooltip: zTooltip.optional(),
+    xAxis: zXBandAxis.optional(),
+    yAxis: zYLinearAxis.optional(),
+    crosshairLine: zCrosshairLine.optional(),
     theme: zTheme.optional(),
+    pointStyle: zPointStyle.optional(),
+    lineStyle: zLineStyle.optional(),
+    areaStyle: zAreaStyle.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zArea = z.object({
-    chartType: z.literal('area'),
+const zAreaPercent = z.object({
+    chartType: z.literal('areaPercent'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5454,14 +5981,14 @@ const zArea = z.object({
     pointStyle: zPointStyle.optional(),
     lineStyle: zLineStyle.optional(),
     areaStyle: zAreaStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
     locale: zLocale.optional()
 });
-const zAreaPercent = z.object({
-    chartType: z.literal('areaPercent'),
+const zRose = z.object({
+    chartType: z.literal('rose'),
     dataset: zDataset.optional(),
     dimensions: zDimensions.optional(),
     measures: zMeasures.optional(),
@@ -5470,17 +5997,80 @@ const zAreaPercent = z.object({
     label: zLabel.optional(),
     legend: zLegend.optional(),
     tooltip: zTooltip.optional(),
-    xAxis: zXBandAxis.optional(),
+    theme: zTheme.optional(),
+    locale: zLocale.optional()
+});
+const zRoseParallel = z.object({
+    chartType: z.literal('roseParallel'),
+    dataset: zDataset.optional(),
+    dimensions: zDimensions.optional(),
+    measures: zMeasures.optional(),
+    backgroundColor: zBackgroundColor.optional(),
+    color: zColor.optional(),
+    label: zLabel.optional(),
+    legend: zLegend.optional(),
+    tooltip: zTooltip.optional(),
+    theme: zTheme.optional(),
+    locale: zLocale.optional()
+});
+const zPie = z.object({
+    chartType: z.literal('pie'),
+    dataset: zDataset.optional(),
+    dimensions: zDimensions.optional(),
+    measures: zMeasures.optional(),
+    backgroundColor: zBackgroundColor.optional(),
+    color: zColor.optional(),
+    label: zLabel.optional(),
+    legend: zLegend.optional(),
+    tooltip: zTooltip.optional(),
+    theme: zTheme.optional(),
+    locale: zLocale.optional()
+});
+const zDonut = z.object({
+    chartType: z.literal('donut'),
+    dataset: zDataset.optional(),
+    dimensions: zDimensions.optional(),
+    measures: zMeasures.optional(),
+    backgroundColor: zBackgroundColor.optional(),
+    color: zColor.optional(),
+    label: zLabel.optional(),
+    legend: zLegend.optional(),
+    tooltip: zTooltip.optional(),
+    theme: zTheme.optional(),
+    locale: zLocale.optional()
+});
+const zScatter = z.object({
+    chartType: z.literal('scatter'),
+    dataset: zDataset.optional(),
+    dimensions: zDimensions.optional(),
+    measures: zMeasures.optional(),
+    backgroundColor: zBackgroundColor.optional(),
+    color: zColor.optional(),
+    label: zLabel.optional(),
+    legend: zLegend.optional(),
+    tooltip: zTooltip.optional(),
+    xAxis: zXLinearAxis.optional(),
     yAxis: zYLinearAxis.optional(),
     crosshairLine: zCrosshairLine.optional(),
     theme: zTheme.optional(),
     pointStyle: zPointStyle.optional(),
-    lineStyle: zLineStyle.optional(),
-    areaStyle: zAreaStyle.optional(),
-    annotationPoint: zAnnotationPoint.optional(),
-    annotationVerticalLine: zAnnotationVerticalLine.optional(),
-    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
-    annotationArea: zAnnotationArea.optional(),
+    annotationPoint: z.array(zAnnotationPoint).or(zAnnotationPoint).optional(),
+    annotationVerticalLine: z.array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).optional(),
+    annotationHorizontalLine: z.array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).optional(),
+    annotationArea: z.array(zAnnotationArea).or(zAnnotationArea).optional(),
+    locale: zLocale.optional()
+});
+const zFunnel = z.object({
+    chartType: z.literal('funnel'),
+    dataset: zDataset.optional(),
+    dimensions: zDimensions.optional(),
+    measures: zMeasures.optional(),
+    backgroundColor: zBackgroundColor.optional(),
+    color: zColor.optional(),
+    label: zLabel.optional(),
+    legend: zLegend.optional(),
+    tooltip: zTooltip.optional(),
+    theme: zTheme.optional(),
     locale: zLocale.optional()
 });
 const zVSeed = z.discriminatedUnion('chartType', [
@@ -5493,8 +6083,28 @@ const zVSeed = z.discriminatedUnion('chartType', [
     zBarPercent,
     zArea,
     zAreaPercent,
-    zPie
+    zPie,
+    zRose,
+    zRoseParallel,
+    zScatter,
+    zDonut,
+    zFunnel
 ]);
-export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, UnfoldDimensionGroupId, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D1M, dataReshapeFor2D1M, donutAdvancedPipeline, donutSpecPipeline, execPipeline, findMeasureById, foldMeasures, i18n, intl, isPivotChart, isVChart, isVTable, lightTheme, lineAdvancedPipeline, lineSpecPipeline, pieAdvancedPipeline, pieSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerLightTheme, registerLine, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, unfoldDimensions, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zAreaStyle, zAxis, zBackgroundColor, zBarStyle, zBaseConfig, zChartType, zColor, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensions, zEncoding, zFoldInfo, zLabel, zLegend, zLineStyle, zMarkStyle, zMeasure, zMeasureGroup, zMeasures, zNumFormat, zPointStyle, zStackCornerRadius, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
+const zAdvancedVSeed = z.object({
+    chartType: zChartType,
+    dataset: zDataset,
+    datasetReshapeInfo: zDatasetReshapeInfo,
+    dimensions: zDimensions,
+    measures: zMeasures,
+    encoding: zEncoding,
+    baseConfig: zBaseConfig,
+    config: zConfig,
+    theme: zTheme,
+    markStyle: zMarkStyle,
+    customTheme: zCustomTheme,
+    annotation: zAnnotation,
+    locale: zLocale
+});
+export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, UnfoldDimensionGroupId, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D1M, dataReshapeFor1D2M, dataReshapeFor2D1M, donutAdvancedPipeline, donutSpecPipeline, execPipeline, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, i18n, intl, isPivotChart, isVChart, isVTable, lightTheme, lineAdvancedPipeline, lineSpecPipeline, pieAdvancedPipeline, pieSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerLightTheme, registerLine, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, unfoldDimensions, zAdvancedVSeed, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaPercent, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarParallel, zBarPercent, zBarStyle, zBaseConfig, zChartType, zColor, zColumn, zColumnParallel, zColumnPercent, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensions, zDonut, zEncoding, zFoldInfo, zFunnel, zLabel, zLegend, zLine, zLineStyle, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasures, zNumFormat, zPie, zPointStyle, zRose, zRoseParallel, zScatter, zStackCornerRadius, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
 
 //# sourceMappingURL=index.js.map