@visactor/vseed 0.0.16 → 0.0.17

package/dist/umd/index.js

@@ -32,42 +32,45 @@
         __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,
@@ -77,7 +80,10 @@
             lightTheme: ()=>lightTheme,
             registerColumnParallel: ()=>registerColumnParallel,
             zDimension: ()=>zDimension,
+            funnelSpecPipeline: ()=>funnelSpecPipeline,
             zPointStyle: ()=>zPointStyle,
+            zYBandAxis: ()=>zYBandAxis,
+            zYLinearAxis: ()=>zYLinearAxis,
             isPivotChart: ()=>isPivotChart,
             zCustomTheme: ()=>zCustomTheme,
             roseParallelSpecPipeline: ()=>roseParallelSpecPipeline,
@@ -290,7 +296,7 @@
         };
         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
@@ -301,7 +307,22 @@
                 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
@@ -713,6 +734,60 @@
                 };
             }
         };
+        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
@@ -759,6 +834,28 @@
                 ]
             };
         };
+        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
@@ -798,6 +895,45 @@
                 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
@@ -981,6 +1117,37 @@
                 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
+            };
+        };
         function chunk_2T7K3PFL_i(...e) {
             return chunk_WIMGWYZL_u(chunk_2T7K3PFL_o, e);
         }
@@ -1064,6 +1231,7 @@
         };
         const areaConfig = lineConfig;
         const areaPercentConfig = lineConfig;
+        const scatterConfig = lineConfig;
         const barConfig = columnConfig;
         const barParallelConfig = columnConfig;
         const barPercentConfig = columnConfig;
@@ -1072,6 +1240,7 @@
         const donutConfig = pieConfig;
         const roseConfig = pieConfig;
         const roseParallelConfig = pieConfig;
+        const funnelConfig = pieConfig;
         function chunk_BZNENX2T_r(o) {
             if ("object" != typeof o || null === o) return !1;
             let e = Object.getPrototypeOf(o);
@@ -1401,12 +1570,96 @@
             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
                 }
             };
         };
@@ -1658,7 +1911,7 @@
                 state: {
                     hover: {
                         lineWidth: 1,
-                        fillOpacity: 0.75
+                        fillOpacity: 0.6
                     }
                 }
             };
@@ -1694,6 +1947,12 @@
                 style: {
                     stroke: '#ffffff',
                     lineWidth: 1
+                },
+                state: {
+                    hover: {
+                        lineWidth: 1,
+                        fillOpacity: 0.6
+                    }
                 }
             };
             result.region = [
@@ -1720,6 +1979,42 @@
                 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
@@ -1888,7 +2183,7 @@
                     }
                 },
                 innerOffset: {
-                    top: LINEAR_AXIS_INNER_OFFSET_TOP
+                    right: LINEAR_AXIS_INNER_OFFSET_TOP
                 }
             };
             result.axes = [
@@ -2202,6 +2497,9 @@
             result.tooltip = {
                 visible: enable,
                 mark: {
+                    title: {
+                        value: (datum)=>datum && datum[groupName] || ''
+                    },
                     content: [
                         {
                             visible: true,
@@ -2445,11 +2743,11 @@
                         label: d,
                         shape: {
                             outerBorder: border ? {
-                                stroke: colorScheme[index],
+                                stroke: colorScheme?.[index],
                                 distance: 3,
                                 lineWidth: 1
                             } : void 0,
-                            fill: colorScheme[index]
+                            fill: colorScheme?.[index]
                         }
                     })),
                 item: {
@@ -2501,8 +2799,8 @@
             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
@@ -2833,19 +3131,17 @@
             ].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
                         }
                     }
@@ -2901,14 +3197,7 @@
             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 : [
@@ -2954,6 +3243,47 @@
                 }
             };
         };
+        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;
+        };
         function chunk_HVPVHFDT_i(...e) {
             return chunk_WIMGWYZL_u(chunk_HVPVHFDT_p, e);
         }
@@ -3692,6 +4022,46 @@
             };
             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,
@@ -3704,6 +4074,7 @@
             verticalCrosshairLine,
             discreteLegend,
             pointStyle_pointStyle,
+            pointStateDimensionHover,
             lineStyle_lineStyle,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
@@ -3726,6 +4097,7 @@
                 tooltip_tooltip,
                 verticalCrosshairLine,
                 pointStyle_pointStyle,
+                pointStateDimensionHover,
                 lineStyle_lineStyle,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
@@ -4042,6 +4414,7 @@
             verticalCrosshairLine,
             discreteLegend,
             pointStyle_pointStyle,
+            pointStateDimensionHover,
             lineStyle_lineStyle,
             areaStyle_areaStyle,
             annotationPoint_annotationPoint,
@@ -4066,6 +4439,7 @@
                 tooltip_tooltip,
                 verticalCrosshairLine,
                 pointStyle_pointStyle,
+                pointStateDimensionHover,
                 lineStyle_lineStyle,
                 areaStyle_areaStyle,
                 annotationPoint_annotationPoint,
@@ -4258,7 +4632,6 @@
             tooltip_tooltip,
             discreteLegend,
             verticalCrosshairRect,
-            barStyle_barStyle,
             annotationPoint_annotationPoint,
             annotationVerticalLine_annotationVerticalLine,
             annotationHorizontalLine_annotationHorizontalLine,
@@ -4280,7 +4653,6 @@
                 label_label,
                 tooltip_tooltip,
                 verticalCrosshairRect,
-                barStyle_barStyle,
                 annotationPoint_annotationPoint,
                 annotationVerticalLine_annotationVerticalLine,
                 annotationHorizontalLine_annotationHorizontalLine,
@@ -4293,6 +4665,113 @@
         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');
@@ -4423,6 +4902,14 @@
             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,
@@ -4648,6 +5135,23 @@
                         xAxis: bandAxis,
                         yAxis: linearAxis,
                         crosshairLine
+                    },
+                    scatter: {
+                        xAxis: {
+                            ...linearAxis,
+                            line: {
+                                ...linearAxis.line,
+                                visible: true
+                            }
+                        },
+                        yAxis: {
+                            ...linearAxis,
+                            line: {
+                                ...linearAxis.line,
+                                visible: true
+                            }
+                        },
+                        crosshairLine
                     }
                 }
             };
@@ -4876,6 +5380,23 @@
                         xAxis: bandAxis,
                         yAxis: linearAxis,
                         crosshairLine: crosshairLine
+                    },
+                    scatter: {
+                        xAxis: {
+                            ...linearAxis,
+                            line: {
+                                ...linearAxis.line,
+                                visible: true
+                            }
+                        },
+                        yAxis: {
+                            ...linearAxis,
+                            line: {
+                                ...linearAxis.line,
+                                visible: true
+                            }
+                        },
+                        crosshairLine
                     }
                 }
             };
@@ -4907,6 +5428,8 @@
             registerDonut();
             registerRose();
             registerRoseParallel();
+            registerFunnel();
+            registerScatter();
             registerLightTheme();
             registerDarkTheme();
         };
@@ -8209,7 +8732,9 @@
             'roseParallel',
             'pie',
             'donut',
-            'dualAxis'
+            'dualAxis',
+            'scatter',
+            'funnel'
         ]);
         const zDatum = record(schemas_string().or(schemas_number()), any());
         const zDataset = schemas_array(zDatum);
@@ -8282,7 +8807,8 @@
             group: schemas_array(schemas_string()).optional(),
             angle: schemas_array(schemas_string()).optional(),
             radius: schemas_array(schemas_string()).optional(),
-            tooltip: schemas_array(schemas_string()).optional()
+            tooltip: schemas_array(schemas_string()).optional(),
+            size: schemas_array(schemas_string()).optional()
         }));
         const zBackgroundColor = schemas_string().default('transparent').optional();
         const zLabel = schemas_object({
@@ -8515,6 +9041,8 @@
             0
         ]);
         const zConfig = schemas_object({
+            table: schemas_object({}).optional(),
+            pivotTable: schemas_object({}).optional(),
             line: schemas_object({
                 xAxis: zXBandAxis.optional(),
                 yAxis: zYLinearAxis.optional(),
@@ -8571,8 +9099,12 @@
             pie: schemas_object({}).optional(),
             donut: schemas_object({}).optional(),
             dualAxis: schemas_object({}).optional(),
-            table: schemas_object({}).optional(),
-            pivotTable: schemas_object({}).optional()
+            scatter: schemas_object({
+                xAxis: zXLinearAxis.optional(),
+                yAxis: zYLinearAxis.optional(),
+                crosshairLine: zCrosshairLine.optional()
+            }).optional(),
+            funnel: schemas_object({}).optional()
         });
         const zSelector = union([
             schemas_string(),
@@ -9021,6 +9553,19 @@
             annotationArea: zAnnotationArea.optional(),
             locale: zLocale.optional()
         });
+        const zRose = schemas_object({
+            chartType: 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 = schemas_object({
             chartType: literal('barPercent'),
             dataset: zDataset.optional(),
@@ -9056,6 +9601,19 @@
             theme: zTheme.optional(),
             locale: zLocale.optional()
         });
+        const zDonut = schemas_object({
+            chartType: 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 = schemas_object({
             chartType: literal('area'),
             dataset: zDataset.optional(),
@@ -9102,6 +9660,53 @@
             annotationArea: zAnnotationArea.optional(),
             locale: zLocale.optional()
         });
+        const zRoseParallel = schemas_object({
+            chartType: 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 = schemas_object({
+            chartType: 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 = schemas_object({
+            chartType: 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 = discriminatedUnion('chartType', [
             zLine,
             zColumn,
@@ -9112,7 +9717,12 @@
             zBarPercent,
             zArea,
             zAreaPercent,
-            zPie
+            zPie,
+            zRose,
+            zRoseParallel,
+            zScatter,
+            zDonut,
+            zFunnel
         ]);
         return __webpack_exports__;
     })());