@visactor/vseed 0.0.16 → 0.0.17

package/dist/index.cjs

@@ -26,42 +26,45 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     registerBar: ()=>registerBar,
     isVChart: ()=>isVChart,
+    funnelAdvancedPipeline: ()=>funnelAdvancedPipeline,
     autoFormatter: ()=>autoFormatter,
     roseParallelAdvancedPipeline: ()=>roseParallelAdvancedPipeline,
-    zBaseConfig: ()=>zBaseConfig,
     pieAdvancedPipeline: ()=>pieAdvancedPipeline,
     execPipeline: ()=>execPipeline,
     areaSpecPipeline: ()=>areaSpecPipeline,
     registerCustomTheme: ()=>registerCustomTheme,
     registerLine: ()=>registerLine,
+    zBaseConfig: ()=>zBaseConfig,
     zColor: ()=>zColor,
+    findFirstMeasure: ()=>findFirstMeasure,
+    scatterAdvancedPipeline: ()=>scatterAdvancedPipeline,
     zMeasureGroup: ()=>zMeasureGroup,
-    zStackCornerRadius: ()=>zStackCornerRadius,
-    zTooltip: ()=>zTooltip,
-    zUnfoldInfo: ()=>zUnfoldInfo,
     zMeasures: ()=>zMeasures,
+    zUnfoldInfo: ()=>zUnfoldInfo,
     zCrosshairRect: ()=>zCrosshairRect,
     FoldMeasureName: ()=>FoldMeasureName,
     intl: ()=>intl,
     darkTheme: ()=>darkTheme,
     createNumFormatter: ()=>createNumFormatter,
     columnPercentAdvancedPipeline: ()=>columnPercentAdvancedPipeline,
-    zAxis: ()=>zAxis,
+    scatterSpecPipeline: ()=>scatterSpecPipeline,
     isVTable: ()=>isVTable,
     zAnnotation: ()=>zAnnotation,
+    zAxis: ()=>zAxis,
     zCrosshairLine: ()=>zCrosshairLine,
     columnSpecPipeline: ()=>columnSpecPipeline,
     UnfoldDimensionGroup: ()=>UnfoldDimensionGroup,
     zDatasetReshapeInfo: ()=>zDatasetReshapeInfo,
     zFoldInfo: ()=>zFoldInfo,
-    zYBandAxis: ()=>zYBandAxis,
+    zStackCornerRadius: ()=>zStackCornerRadius,
     zAreaStyle: ()=>zAreaStyle,
     ORIGINAL_DATA: ()=>ORIGINAL_DATA,
-    zAnnotationHorizontalLine: ()=>zAnnotationHorizontalLine,
+    dataReshapeFor1D2M: ()=>dataReshapeFor1D2M,
     zAnnotationArea: ()=>zAnnotationArea,
+    zAnnotationHorizontalLine: ()=>zAnnotationHorizontalLine,
     zMarkStyle: ()=>zMarkStyle,
-    zYLinearAxis: ()=>zYLinearAxis,
     Separator: ()=>Separator,
+    zTooltip: ()=>zTooltip,
     columnAdvancedPipeline: ()=>columnAdvancedPipeline,
     columnParallelSpecPipeline: ()=>columnParallelSpecPipeline,
     zLabel: ()=>zLabel,
@@ -71,7 +74,10 @@ __webpack_require__.d(__webpack_exports__, {
     lightTheme: ()=>lightTheme,
     registerColumnParallel: ()=>registerColumnParallel,
     zDimension: ()=>zDimension,
+    funnelSpecPipeline: ()=>funnelSpecPipeline,
     zPointStyle: ()=>zPointStyle,
+    zYBandAxis: ()=>zYBandAxis,
+    zYLinearAxis: ()=>zYLinearAxis,
     isPivotChart: ()=>isPivotChart,
     zCustomTheme: ()=>zCustomTheme,
     roseParallelSpecPipeline: ()=>roseParallelSpecPipeline,
@@ -282,7 +288,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
@@ -293,7 +299,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
@@ -590,6 +611,60 @@ const dataReshapeFor1D1M = (dataset, dimensions, measures, options)=>{
         };
     }
 };
+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,
+                alias: i18n`指标值`
+            }
+        ], 0, unfoldDimensionGroup, unfoldDimensionGroupId, foldMeasureId);
+        return {
+            dataset: finalDataset,
+            foldInfo,
+            unfoldInfo
+        };
+    }
+};
 const reshapeTo2D1M = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -636,6 +711,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
@@ -675,6 +772,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
@@ -858,6 +994,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 = {
@@ -933,6 +1100,7 @@ const pieConfig = (advancedVSeed, context)=>{
 };
 const areaConfig = lineConfig;
 const areaPercentConfig = lineConfig;
+const scatterConfig = lineConfig;
 const barConfig = columnConfig;
 const barParallelConfig = columnConfig;
 const barPercentConfig = columnConfig;
@@ -941,6 +1109,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;
@@ -1225,12 +1394,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
         }
     };
 };
@@ -1482,7 +1735,7 @@ const initRose = (spec, context)=>{
         state: {
             hover: {
                 lineWidth: 1,
-                fillOpacity: 0.75
+                fillOpacity: 0.6
             }
         }
     };
@@ -1518,6 +1771,12 @@ const initRoseParallel = (spec, context)=>{
         style: {
             stroke: '#ffffff',
             lineWidth: 1
+        },
+        state: {
+            hover: {
+                lineWidth: 1,
+                fillOpacity: 0.6
+            }
         }
     };
     result.region = [
@@ -1544,6 +1803,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
@@ -1712,7 +2007,7 @@ const xLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            right: LINEAR_AXIS_INNER_OFFSET_TOP
         }
     };
     result.axes = [
@@ -2023,6 +2318,9 @@ const tooltip_tooltip = (spec, context)=>{
     result.tooltip = {
         visible: enable,
         mark: {
+            title: {
+                value: (datum)=>datum && datum[groupName] || ''
+            },
             content: [
                 {
                     visible: true,
@@ -2266,11 +2564,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: {
@@ -2322,8 +2620,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
@@ -2654,19 +2952,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
                 }
             }
@@ -2722,14 +3018,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 : [
@@ -2775,6 +3064,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;
@@ -3488,6 +3818,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,
@@ -3500,6 +3870,7 @@ const line_line = [
     verticalCrosshairLine,
     discreteLegend,
     pointStyle_pointStyle,
+    pointStateDimensionHover,
     lineStyle_lineStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
@@ -3522,6 +3893,7 @@ const pivotLine = [
         tooltip_tooltip,
         verticalCrosshairLine,
         pointStyle_pointStyle,
+        pointStateDimensionHover,
         lineStyle_lineStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
@@ -3838,6 +4210,7 @@ const area_area = [
     verticalCrosshairLine,
     discreteLegend,
     pointStyle_pointStyle,
+    pointStateDimensionHover,
     lineStyle_lineStyle,
     areaStyle_areaStyle,
     annotationPoint_annotationPoint,
@@ -3862,6 +4235,7 @@ const pivotArea = [
         tooltip_tooltip,
         verticalCrosshairLine,
         pointStyle_pointStyle,
+        pointStateDimensionHover,
         lineStyle_lineStyle,
         areaStyle_areaStyle,
         annotationPoint_annotationPoint,
@@ -4054,7 +4428,6 @@ const roseParallel = [
     tooltip_tooltip,
     discreteLegend,
     verticalCrosshairRect,
-    barStyle_barStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
@@ -4076,7 +4449,6 @@ const pivotRoseParallel = [
         label_label,
         tooltip_tooltip,
         verticalCrosshairRect,
-        barStyle_barStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -4089,6 +4461,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');
@@ -4219,6 +4698,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 lightTheme = ()=>{
     const linearAxis = {
         nice: true,
@@ -4444,6 +4931,23 @@ const lightTheme = ()=>{
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine
+            },
+            scatter: {
+                xAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                yAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                crosshairLine
             }
         }
     };
@@ -4672,6 +5176,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
             }
         }
     };
@@ -4703,6 +5224,8 @@ const registerAll = ()=>{
     registerDonut();
     registerRose();
     registerRoseParallel();
+    registerFunnel();
+    registerScatter();
     registerLightTheme();
     registerDarkTheme();
 };
@@ -4723,7 +5246,9 @@ const zChartType = external_zod_namespaceObject.z["enum"]([
     'roseParallel',
     'pie',
     'donut',
-    'dualAxis'
+    'dualAxis',
+    'scatter',
+    'funnel'
 ]);
 const zDatum = external_zod_namespaceObject.z.record(external_zod_namespaceObject.z.string().or(external_zod_namespaceObject.z.number()), external_zod_namespaceObject.z.any());
 const zDataset = external_zod_namespaceObject.z.array(zDatum);
@@ -4796,7 +5321,8 @@ const zEncoding = external_zod_namespaceObject.z.array(external_zod_namespaceObj
     group: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).optional(),
     angle: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).optional(),
     radius: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).optional(),
-    tooltip: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).optional()
+    tooltip: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).optional(),
+    size: external_zod_namespaceObject.z.array(external_zod_namespaceObject.z.string()).optional()
 }));
 const zBackgroundColor = external_zod_namespaceObject.z.string().default('transparent').optional();
 const zLabel = external_zod_namespaceObject.z.object({
@@ -5029,6 +5555,8 @@ const zStackCornerRadius = external_zod_namespaceObject.z.number().or(external_z
     0
 ]);
 const zConfig = external_zod_namespaceObject.z.object({
+    table: external_zod_namespaceObject.z.object({}).optional(),
+    pivotTable: external_zod_namespaceObject.z.object({}).optional(),
     line: external_zod_namespaceObject.z.object({
         xAxis: zXBandAxis.optional(),
         yAxis: zYLinearAxis.optional(),
@@ -5085,8 +5613,12 @@ const zConfig = external_zod_namespaceObject.z.object({
     pie: external_zod_namespaceObject.z.object({}).optional(),
     donut: external_zod_namespaceObject.z.object({}).optional(),
     dualAxis: external_zod_namespaceObject.z.object({}).optional(),
-    table: external_zod_namespaceObject.z.object({}).optional(),
-    pivotTable: external_zod_namespaceObject.z.object({}).optional()
+    scatter: external_zod_namespaceObject.z.object({
+        xAxis: zXLinearAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairLine: zCrosshairLine.optional()
+    }).optional(),
+    funnel: external_zod_namespaceObject.z.object({}).optional()
 });
 const zSelector = external_zod_namespaceObject.z.union([
     external_zod_namespaceObject.z.string(),
@@ -5535,6 +6067,19 @@ const zLine = external_zod_namespaceObject.z.object({
     annotationArea: zAnnotationArea.optional(),
     locale: zLocale.optional()
 });
+const zRose = external_zod_namespaceObject.z.object({
+    chartType: external_zod_namespaceObject.z.literal('rose'),
+    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 zBarPercent = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('barPercent'),
     dataset: zDataset.optional(),
@@ -5570,6 +6115,19 @@ const zPie = external_zod_namespaceObject.z.object({
     theme: zTheme.optional(),
     locale: zLocale.optional()
 });
+const zDonut = external_zod_namespaceObject.z.object({
+    chartType: external_zod_namespaceObject.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 zArea = external_zod_namespaceObject.z.object({
     chartType: external_zod_namespaceObject.z.literal('area'),
     dataset: zDataset.optional(),
@@ -5616,6 +6174,53 @@ const zAreaPercent = external_zod_namespaceObject.z.object({
     annotationArea: zAnnotationArea.optional(),
     locale: zLocale.optional()
 });
+const zRoseParallel = external_zod_namespaceObject.z.object({
+    chartType: external_zod_namespaceObject.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 zScatter = external_zod_namespaceObject.z.object({
+    chartType: external_zod_namespaceObject.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(),
+    annotationPoint: zAnnotationPoint.optional(),
+    annotationVerticalLine: zAnnotationVerticalLine.optional(),
+    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
+    annotationArea: zAnnotationArea.optional(),
+    locale: zLocale.optional()
+});
+const zFunnel = external_zod_namespaceObject.z.object({
+    chartType: external_zod_namespaceObject.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 = external_zod_namespaceObject.z.discriminatedUnion('chartType', [
     zLine,
     zColumn,
@@ -5626,7 +6231,12 @@ const zVSeed = external_zod_namespaceObject.z.discriminatedUnion('chartType', [
     zBarPercent,
     zArea,
     zAreaPercent,
-    zPie
+    zPie,
+    zRose,
+    zRoseParallel,
+    zScatter,
+    zDonut,
+    zFunnel
 ]);
 exports.Builder = __webpack_exports__.Builder;
 exports.FoldMeasureId = __webpack_exports__.FoldMeasureId;
@@ -5658,12 +6268,16 @@ exports.createFormatter = __webpack_exports__.createFormatter;
 exports.createNumFormatter = __webpack_exports__.createNumFormatter;
 exports.darkTheme = __webpack_exports__.darkTheme;
 exports.dataReshapeFor1D1M = __webpack_exports__.dataReshapeFor1D1M;
+exports.dataReshapeFor1D2M = __webpack_exports__.dataReshapeFor1D2M;
 exports.dataReshapeFor2D1M = __webpack_exports__.dataReshapeFor2D1M;
 exports.donutAdvancedPipeline = __webpack_exports__.donutAdvancedPipeline;
 exports.donutSpecPipeline = __webpack_exports__.donutSpecPipeline;
 exports.execPipeline = __webpack_exports__.execPipeline;
+exports.findFirstMeasure = __webpack_exports__.findFirstMeasure;
 exports.findMeasureById = __webpack_exports__.findMeasureById;
 exports.foldMeasures = __webpack_exports__.foldMeasures;
+exports.funnelAdvancedPipeline = __webpack_exports__.funnelAdvancedPipeline;
+exports.funnelSpecPipeline = __webpack_exports__.funnelSpecPipeline;
 exports.i18n = __webpack_exports__.i18n;
 exports.intl = __webpack_exports__.intl;
 exports.isPivotChart = __webpack_exports__.isPivotChart;
@@ -5691,6 +6305,8 @@ exports.roseAdvancedPipeline = __webpack_exports__.roseAdvancedPipeline;
 exports.roseParallelAdvancedPipeline = __webpack_exports__.roseParallelAdvancedPipeline;
 exports.roseParallelSpecPipeline = __webpack_exports__.roseParallelSpecPipeline;
 exports.roseSpecPipeline = __webpack_exports__.roseSpecPipeline;
+exports.scatterAdvancedPipeline = __webpack_exports__.scatterAdvancedPipeline;
+exports.scatterSpecPipeline = __webpack_exports__.scatterSpecPipeline;
 exports.unfoldDimensions = __webpack_exports__.unfoldDimensions;
 exports.zAnnotation = __webpack_exports__.zAnnotation;
 exports.zAnnotationArea = __webpack_exports__.zAnnotationArea;
@@ -5765,12 +6381,16 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "createNumFormatter",
     "darkTheme",
     "dataReshapeFor1D1M",
+    "dataReshapeFor1D2M",
     "dataReshapeFor2D1M",
     "donutAdvancedPipeline",
     "donutSpecPipeline",
     "execPipeline",
+    "findFirstMeasure",
     "findMeasureById",
     "foldMeasures",
+    "funnelAdvancedPipeline",
+    "funnelSpecPipeline",
     "i18n",
     "intl",
     "isPivotChart",
@@ -5798,6 +6418,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "roseParallelAdvancedPipeline",
     "roseParallelSpecPipeline",
     "roseSpecPipeline",
+    "scatterAdvancedPipeline",
+    "scatterSpecPipeline",
     "unfoldDimensions",
     "zAnnotation",
     "zAnnotationArea",