@visactor/vseed 0.0.15 → 0.0.17

package/dist/index.js

@@ -2,7 +2,7 @@ import { clone as external_remeda_clone, groupBy, isArray, isEmpty, isNullish, i
 import { z } from "zod";
 const initAdvancedVSeed = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const { chartType = 'table' } = vseed;
+    const { chartType } = vseed;
     return {
         ...advancedVSeed,
         chartType
@@ -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
@@ -458,6 +473,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
@@ -504,6 +573,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 +634,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
@@ -588,9 +718,9 @@ const encodingXY = (advancedVSeed)=>{
     };
     const { datasetReshapeInfo, dimensions } = advancedVSeed;
     if (!datasetReshapeInfo || !dimensions) return result;
+    const isZeroDimension = 0 === dimensions.length;
     const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
         const { foldInfo, unfoldInfo } = cur;
-        const isZeroDimension = 0 === dimensions.length;
         const x = [
             isZeroDimension ? foldInfo.measureName : dimensions[0].id
         ];
@@ -624,9 +754,9 @@ const encodingYX = (advancedVSeed)=>{
     };
     const { datasetReshapeInfo, dimensions } = advancedVSeed;
     if (!datasetReshapeInfo || !dimensions) return result;
+    const isZeroDimension = 0 === dimensions.length;
     const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
         const { foldInfo, unfoldInfo } = cur;
-        const isZeroDimension = 0 === dimensions.length;
         const y = [
             isZeroDimension ? foldInfo.measureName : dimensions[0].id
         ];
@@ -654,7 +784,44 @@ const encodingYX = (advancedVSeed)=>{
         encoding
     };
 };
-const encodingPolar = (advancedVSeed)=>{
+const encodingRose = (advancedVSeed)=>{
+    const result = {
+        ...advancedVSeed
+    };
+    const { datasetReshapeInfo, dimensions, measures } = advancedVSeed;
+    if (!datasetReshapeInfo || !dimensions || !measures) return result;
+    const is1D1M = 1 === dimensions.length && 1 === measures.length;
+    const isZeroDimension = 0 === dimensions.length;
+    const encoding = datasetReshapeInfo.reduce((prev, cur)=>{
+        const { foldInfo, unfoldInfo } = cur;
+        const radius = [
+            foldInfo.measureValue
+        ];
+        const angle = [
+            isZeroDimension ? foldInfo.measureName : dimensions[0].id
+        ];
+        const group = [
+            is1D1M ? dimensions[0].id : unfoldInfo.groupId
+        ];
+        const color = [
+            is1D1M ? dimensions[0].id : unfoldInfo.groupId
+        ];
+        return [
+            ...prev,
+            {
+                angle,
+                radius,
+                group,
+                color
+            }
+        ];
+    }, []);
+    return {
+        ...result,
+        encoding
+    };
+};
+const encodingPie = (advancedVSeed)=>{
     const result = {
         ...advancedVSeed
     };
@@ -689,6 +856,37 @@ const encodingPolar = (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 = {
@@ -764,11 +962,16 @@ const pieConfig = (advancedVSeed, context)=>{
 };
 const areaConfig = lineConfig;
 const areaPercentConfig = lineConfig;
+const scatterConfig = lineConfig;
 const barConfig = columnConfig;
 const barParallelConfig = columnConfig;
 const barPercentConfig = columnConfig;
 const columnParallelConfig = columnConfig;
 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;
@@ -997,42 +1200,176 @@ const pieAdvancedPipeline = [
     ], [
         pivotReshapeTo1D1M
     ]),
-    encodingPolar,
+    encodingPie,
     pieConfig,
     vchartBaseConfig,
     vchartTheme,
     annotation_annotation
 ];
-const dataset_dataset = (spec, context)=>{
-    const { advancedVSeed } = context;
-    return {
-        ...spec,
-        data: {
-            values: advancedVSeed.dataset
-        }
-    };
-};
-const datasetPivot = (spec, context)=>{
+const donutAdvancedPipeline = [
+    initAdvancedVSeed,
+    locale_locale,
+    autoMeasures,
+    autoDimensions,
+    pivotAdapter([
+        reshapeTo1D1M
+    ], [
+        pivotReshapeTo1D1M
+    ]),
+    encodingPie,
+    donutConfig,
+    vchartBaseConfig,
+    vchartTheme,
+    annotation_annotation
+];
+const roseAdvancedPipeline = [
+    initAdvancedVSeed,
+    locale_locale,
+    autoMeasures,
+    autoDimensions,
+    pivotAdapter([
+        reshapeTo2D1M
+    ], [
+        pivotReshapeTo2D1M
+    ]),
+    encodingRose,
+    roseConfig,
+    vchartBaseConfig,
+    vchartTheme,
+    markStyle_markStyle,
+    annotation_annotation
+];
+const roseParallelAdvancedPipeline = [
+    initAdvancedVSeed,
+    locale_locale,
+    autoMeasures,
+    autoDimensions,
+    pivotAdapter([
+        reshapeTo2D1M
+    ], [
+        pivotReshapeTo2D1M
+    ]),
+    encodingRose,
+    roseParallelConfig,
+    vchartBaseConfig,
+    vchartTheme,
+    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 = {
-        ...spec
-    };
-    const { advancedVSeed } = context;
-    const { dataset, datasetReshapeInfo } = advancedVSeed;
-    const records = dataset.reduce((pre, cur, index)=>{
-        const id = datasetReshapeInfo[index].id;
-        pre[id] = cur;
-        return pre;
-    }, {});
-    return {
-        ...result,
-        records: records
+        ...advancedVSeed
     };
-};
-const datasetPivotPlaceholder = (spec)=>({
-        ...spec,
-        data: {
-            id: 'placeholderDataId'
-        }
+    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,
+            fields: fields
+        }
+    };
+};
+const datasetPivot = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { dataset, datasetReshapeInfo } = advancedVSeed;
+    const records = dataset.reduce((pre, cur, index)=>{
+        const id = datasetReshapeInfo[index].id;
+        pre[id] = cur;
+        return pre;
+    }, {});
+    return {
+        ...result,
+        records: records
+    };
+};
+const datasetPivotPlaceholder = (spec)=>({
+        ...spec,
+        data: {
+            id: 'placeholderDataId'
+        }
     });
 const initColumn = (spec, context)=>{
     const result = {
@@ -1052,6 +1389,7 @@ const initColumn = (spec, context)=>{
             clip: true
         }
     ];
+    result.animation = true;
     return result;
 };
 const initBar = (spec, context)=>{
@@ -1072,6 +1410,7 @@ const initBar = (spec, context)=>{
             clip: true
         }
     ];
+    result.animation = true;
     return result;
 };
 const initBarParallel = (spec, context)=>{
@@ -1096,6 +1435,7 @@ const initBarParallel = (spec, context)=>{
             clip: true
         }
     ];
+    result.animation = true;
     return result;
 };
 const initArea = (spec, context)=>{
@@ -1116,6 +1456,7 @@ const initArea = (spec, context)=>{
             clip: true
         }
     ];
+    result.animation = true;
     return result;
 };
 const initLine = (spec, context)=>{
@@ -1136,6 +1477,7 @@ const initLine = (spec, context)=>{
             clip: true
         }
     ];
+    result.animation = true;
     return result;
 };
 const initColumnParallel = (spec, context)=>{
@@ -1160,6 +1502,7 @@ const initColumnParallel = (spec, context)=>{
             clip: true
         }
     ];
+    result.animation = true;
     return result;
 };
 const initPie = (spec, context)=>{
@@ -1181,6 +1524,129 @@ const initPie = (spec, context)=>{
             clip: true
         }
     ];
+    result.pie = {
+        style: {
+            stroke: '#ffffff',
+            lineWidth: 1
+        },
+        state: {
+            hover: {
+                centerOffset: 5,
+                outerRadius: 1.1 * result.outerRadius
+            }
+        }
+    };
+    result.animation = true;
+    return result;
+};
+const initDonut = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { encoding } = advancedVSeed;
+    if (!encoding[0].angle || !encoding[0].radius || !encoding[0].group) return result;
+    result.type = 'pie';
+    result.outerRadius = 0.8;
+    result.innerRadius = 0.8 * result.outerRadius;
+    result.valueField = encoding[0].radius[0];
+    result.categoryField = encoding[0].angle[0];
+    result.seriesField = encoding[0].group[0];
+    result.padding = 0;
+    result.region = [
+        {
+            clip: true
+        }
+    ];
+    result.pie = {
+        style: {
+            stroke: '#ffffff',
+            lineWidth: 1
+        },
+        state: {
+            hover: {
+                outerRadius: 1.1 * result.outerRadius
+            }
+        }
+    };
+    result.animation = true;
+    return result;
+};
+const initRose = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { encoding, dataset, datasetReshapeInfo } = advancedVSeed;
+    const { foldInfo } = datasetReshapeInfo[0];
+    if (!encoding[0].radius || !encoding[0].angle || !encoding[0].group) return result;
+    result.type = 'rose';
+    result.categoryField = encoding[0].angle[0];
+    result.valueField = encoding[0].radius[0];
+    result.seriesField = encoding[0].group[0];
+    result.padding = 0;
+    result.outerRadius = 0.9;
+    result.innerRadius = 0;
+    const hasNegativeValue = dataset.flat().find((d)=>d[foldInfo.measureValue] < 0);
+    if (hasNegativeValue) result.innerRadius = 0.05;
+    result.rose = {
+        style: {
+            stroke: '#ffffff',
+            lineWidth: 1
+        },
+        state: {
+            hover: {
+                lineWidth: 1,
+                fillOpacity: 0.6
+            }
+        }
+    };
+    result.region = [
+        {
+            clip: true
+        }
+    ];
+    result.animation = true;
+    return result;
+};
+const initRoseParallel = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { encoding, datasetReshapeInfo, dataset } = advancedVSeed;
+    const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
+    if (!encoding[0].radius || !encoding[0].angle || !encoding[0].group) return result;
+    result.type = 'rose';
+    result.categoryField = [
+        encoding[0].angle[0],
+        unfoldInfo.groupName
+    ];
+    result.valueField = encoding[0].radius[0];
+    result.seriesField = encoding[0].group[0];
+    result.padding = 0;
+    result.outerRadius = 0.9;
+    result.innerRadius = 0;
+    const hasNegativeValue = dataset.flat().find((d)=>d[foldInfo.measureValue] < 0);
+    if (hasNegativeValue) result.innerRadius = 0.05;
+    result.rose = {
+        style: {
+            stroke: '#ffffff',
+            lineWidth: 1
+        },
+        state: {
+            hover: {
+                lineWidth: 1,
+                fillOpacity: 0.6
+            }
+        }
+    };
+    result.region = [
+        {
+            clip: true
+        }
+    ];
+    result.animation = true;
     return result;
 };
 const initPivot = (spec)=>{
@@ -1189,6 +1655,7 @@ const initPivot = (spec)=>{
     };
     return {
         ...result,
+        animation: true,
         rows: [],
         columns: [],
         indicators: [],
@@ -1198,6 +1665,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
@@ -1366,7 +1869,7 @@ const xLinear = (spec, context)=>{
             }
         },
         innerOffset: {
-            top: LINEAR_AXIS_INNER_OFFSET_TOP
+            right: LINEAR_AXIS_INNER_OFFSET_TOP
         }
     };
     result.axes = [
@@ -1551,6 +2054,79 @@ const yLinear = (spec, context)=>{
     ];
     return result;
 };
+const radiusAxis = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { dimensions, measures } = advancedVSeed;
+    if (!dimensions || !measures) return spec;
+    const is0D = 0 === dimensions.length;
+    const is1M1D = 1 === dimensions.length && 1 === measures.length;
+    const showAxis = !(is0D || is1M1D);
+    if (!result.axes) result.axes = [];
+    result.axes.push({
+        orient: 'radius',
+        visible: showAxis,
+        zero: true,
+        nice: !!showAxis,
+        grid: {
+            visible: showAxis
+        },
+        tick: {
+            visible: showAxis
+        },
+        label: {
+            visible: showAxis
+        },
+        domainLine: {
+            visible: showAxis
+        }
+    });
+    return result;
+};
+const angleAxis = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed } = context;
+    const { dimensions, measures } = advancedVSeed;
+    if (!dimensions || !measures) return spec;
+    const is0D = 0 === dimensions.length;
+    const is1M1D = 1 === dimensions.length && 1 === measures.length;
+    const showAxis = !(is0D || is1M1D);
+    if (!result.axes) result.axes = [];
+    result.axes.push({
+        orient: 'angle',
+        visible: showAxis,
+        zero: true,
+        nice: !!showAxis,
+        paddingInner: showAxis ? [
+            0.15,
+            0.1
+        ] : [
+            0,
+            0
+        ],
+        paddingOuter: showAxis ? [
+            0.075,
+            0.1
+        ] : [
+            0,
+            0
+        ],
+        grid: {
+            visible: showAxis
+        },
+        domainLine: {
+            visible: showAxis
+        },
+        tick: {
+            visible: showAxis
+        }
+    });
+    return result;
+};
 const percent = (spec, context)=>{
     const result = {
         ...spec
@@ -1604,6 +2180,9 @@ const tooltip_tooltip = (spec, context)=>{
     result.tooltip = {
         visible: enable,
         mark: {
+            title: {
+                value: (datum)=>datum && datum[groupName] || ''
+            },
             content: [
                 {
                     visible: true,
@@ -1847,11 +2426,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: {
@@ -1903,8 +2482,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
@@ -2235,19 +2814,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
                 }
             }
@@ -2303,14 +2880,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 : [
@@ -2356,25 +2926,66 @@ const pointStyle_pointStyle = (spec, context)=>{
         }
     };
 };
-const lineStyle_lineStyle = (spec, context)=>{
-    const { advancedVSeed } = context;
-    const { markStyle, encoding, dataset } = advancedVSeed;
-    const { lineStyle } = markStyle;
-    if (!lineStyle) return spec;
+const pointStateDimensionHover = (spec)=>{
+    const point = spec.point || {};
     const result = {
-        ...spec
+        ...spec,
+        point: {
+            ...point,
+            state: {
+                dimension_hover: {
+                    scaleX: 1.4,
+                    scaleY: 1.4
+                }
+            }
+        }
     };
-    const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
-        lineStyle
-    ];
-    const group = encoding[0]?.group?.[0];
-    const lineGroups = groupBy(dataset, (d)=>d[group ?? '']);
-    const customMap = lineStyles.reduce((result, style, index)=>{
-        const { lineColor, lineColorOpacity, lineSmooth, lineStyle, lineWidth } = style;
-        const dashSegment = (lineWidth ?? 2) * 2;
-        const dashGap = lineWidth ?? 2;
-        const lineDash = 'dashed' === lineStyle ? [
-            dashSegment,
+    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;
+    const { lineStyle } = markStyle;
+    if (!lineStyle) return spec;
+    const result = {
+        ...spec
+    };
+    const lineStyles = Array.isArray(lineStyle) ? lineStyle : [
+        lineStyle
+    ];
+    const group = encoding[0]?.group?.[0];
+    const lineGroups = groupBy(dataset, (d)=>d[group ?? '']);
+    const customMap = lineStyles.reduce((result, style, index)=>{
+        const { lineColor, lineColorOpacity, lineSmooth, lineStyle, lineWidth } = style;
+        const dashSegment = (lineWidth ?? 2) * 2;
+        const dashGap = lineWidth ?? 2;
+        const lineDash = 'dashed' === lineStyle ? [
+            dashSegment,
             dashSegment
         ] : 'dotted' === lineStyle ? [
             dashGap / 2,
@@ -3069,6 +3680,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,
@@ -3081,6 +3732,7 @@ const line_line = [
     verticalCrosshairLine,
     discreteLegend,
     pointStyle_pointStyle,
+    pointStateDimensionHover,
     lineStyle_lineStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
@@ -3103,6 +3755,7 @@ const pivotLine = [
         tooltip_tooltip,
         verticalCrosshairLine,
         pointStyle_pointStyle,
+        pointStateDimensionHover,
         lineStyle_lineStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
@@ -3254,250 +3907,447 @@ const pivotColumnPercent = [
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
-        annotationAreaBand
+        annotationAreaBand
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const columnPercentSpecPipeline = [
+    pivotAdapter_pivotAdapter(columnPercent, pivotColumnPercent)
+];
+const bar = [
+    initBar,
+    stackCornerRadius_stackCornerRadius,
+    color_color,
+    background_backgroundColor,
+    dataset_dataset,
+    xLinear,
+    yBand,
+    label_label,
+    tooltip_tooltip,
+    horizontalCrosshairRect,
+    discreteLegend,
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
+];
+const pivotBar = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsCol,
+    datasetPivot,
+    pivotIndicators([
+        initBar,
+        stackCornerRadius_stackCornerRadius,
+        color_color,
+        background_backgroundColor,
+        datasetPivotPlaceholder,
+        yBand,
+        label_label,
+        label_label,
+        tooltip_tooltip,
+        horizontalCrosshairRect,
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const barSpecPipeline = [
+    pivotAdapter_pivotAdapter(bar, pivotBar)
+];
+const barParallel = [
+    initBarParallel,
+    stackCornerRadius_stackCornerRadius,
+    color_color,
+    background_backgroundColor,
+    dataset_dataset,
+    xLinear,
+    yBand,
+    label_label,
+    tooltip_tooltip,
+    horizontalCrosshairRect,
+    discreteLegend,
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
+];
+const pivotBarParallel = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsCol,
+    datasetPivot,
+    pivotIndicators([
+        initBarParallel,
+        stackCornerRadius_stackCornerRadius,
+        color_color,
+        background_backgroundColor,
+        datasetPivotPlaceholder,
+        yBand,
+        xLinear,
+        label_label,
+        tooltip_tooltip,
+        horizontalCrosshairRect,
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const barParallelSpecPipeline = [
+    pivotAdapter_pivotAdapter(barParallel, pivotBarParallel)
+];
+const barPercent = [
+    initBar,
+    stackCornerRadius_stackCornerRadius,
+    color_color,
+    background_backgroundColor,
+    percent,
+    dataset_dataset,
+    xLinear,
+    yBand,
+    label_label,
+    tooltip_tooltip,
+    horizontalCrosshairRect,
+    discreteLegend,
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
+];
+const pivotBarPercent = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsCol,
+    datasetPivot,
+    pivotIndicators([
+        initBar,
+        stackCornerRadius_stackCornerRadius,
+        color_color,
+        background_backgroundColor,
+        percent,
+        datasetPivotPlaceholder,
+        yBand,
+        xLinear,
+        label_label,
+        tooltip_tooltip,
+        horizontalCrosshairRect,
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const barPercentSpecPipeline = [
+    pivotAdapter_pivotAdapter(barPercent, pivotBarPercent)
+];
+const area_area = [
+    initArea,
+    stackInverse,
+    color_color,
+    background_backgroundColor,
+    dataset_dataset,
+    xBand,
+    yLinear,
+    label_label,
+    tooltip_tooltip,
+    verticalCrosshairLine,
+    discreteLegend,
+    pointStyle_pointStyle,
+    pointStateDimensionHover,
+    lineStyle_lineStyle,
+    areaStyle_areaStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
+];
+const pivotArea = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsRow,
+    datasetPivot,
+    pivotIndicators([
+        initArea,
+        color_color,
+        background_backgroundColor,
+        stackInverse,
+        datasetPivotPlaceholder,
+        xBand,
+        yLinear,
+        label_label,
+        tooltip_tooltip,
+        verticalCrosshairLine,
+        pointStyle_pointStyle,
+        pointStateDimensionHover,
+        lineStyle_lineStyle,
+        areaStyle_areaStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const areaSpecPipeline = [
+    pivotAdapter_pivotAdapter(area_area, pivotArea)
+];
+const areaPercent = [
+    initArea,
+    stackInverse,
+    color_color,
+    background_backgroundColor,
+    percent,
+    dataset_dataset,
+    xBand,
+    yLinear,
+    label_label,
+    tooltip_tooltip,
+    verticalCrosshairLine,
+    discreteLegend,
+    pointStyle_pointStyle,
+    lineStyle_lineStyle,
+    areaStyle_areaStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
+];
+const pivotAreaPercent = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsRow,
+    datasetPivot,
+    pivotIndicators([
+        initArea,
+        stackInverse,
+        color_color,
+        background_backgroundColor,
+        percent,
+        datasetPivotPlaceholder,
+        xBand,
+        yLinear,
+        label_label,
+        tooltip_tooltip,
+        verticalCrosshairLine,
+        pointStyle_pointStyle,
+        lineStyle_lineStyle,
+        areaStyle_areaStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
     pivotDiscreteLegend
 ];
-const columnPercentSpecPipeline = [
-    pivotAdapter_pivotAdapter(columnPercent, pivotColumnPercent)
+const areaPercentSpecPipeline = [
+    pivotAdapter_pivotAdapter(areaPercent, pivotAreaPercent)
 ];
-const bar = [
-    initBar,
-    stackCornerRadius_stackCornerRadius,
+const pie = [
+    initPie,
     color_color,
     background_backgroundColor,
     dataset_dataset,
-    xLinear,
-    yBand,
     label_label,
     tooltip_tooltip,
-    horizontalCrosshairRect,
     discreteLegend,
-    barStyle_barStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
-    annotationAreaBand
+    annotationArea_annotationArea
 ];
-const pivotBar = [
+const pivotPie = [
     initPivot,
     pivotGridStyle,
-    pivotIndicators_pivotIndicatorsAsCol,
+    pivotIndicators_pivotIndicatorsAsRow,
     datasetPivot,
     pivotIndicators([
-        initBar,
-        stackCornerRadius_stackCornerRadius,
+        initPie,
         color_color,
         background_backgroundColor,
         datasetPivotPlaceholder,
-        yBand,
-        label_label,
         label_label,
         tooltip_tooltip,
-        horizontalCrosshairRect,
-        barStyle_barStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
-        annotationAreaBand
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
     pivotDiscreteLegend
 ];
-const barSpecPipeline = [
-    pivotAdapter_pivotAdapter(bar, pivotBar)
+const pieSpecPipeline = [
+    pivotAdapter_pivotAdapter(pie, pivotPie)
 ];
-const barParallel = [
-    initBarParallel,
-    stackCornerRadius_stackCornerRadius,
+const donut = [
+    initDonut,
     color_color,
     background_backgroundColor,
     dataset_dataset,
-    xLinear,
-    yBand,
     label_label,
     tooltip_tooltip,
-    horizontalCrosshairRect,
     discreteLegend,
-    barStyle_barStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
-    annotationAreaBand
+    annotationArea_annotationArea
 ];
-const pivotBarParallel = [
+const pivotDonut = [
     initPivot,
     pivotGridStyle,
-    pivotIndicators_pivotIndicatorsAsCol,
+    pivotIndicators_pivotIndicatorsAsRow,
     datasetPivot,
     pivotIndicators([
-        initBarParallel,
-        stackCornerRadius_stackCornerRadius,
+        initDonut,
         color_color,
         background_backgroundColor,
         datasetPivotPlaceholder,
-        yBand,
-        xLinear,
         label_label,
         tooltip_tooltip,
-        horizontalCrosshairRect,
-        barStyle_barStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
-        annotationAreaBand
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
     pivotDiscreteLegend
 ];
-const barParallelSpecPipeline = [
-    pivotAdapter_pivotAdapter(barParallel, pivotBarParallel)
+const donutSpecPipeline = [
+    pivotAdapter_pivotAdapter(donut, pivotDonut)
 ];
-const barPercent = [
-    initBar,
+const rose = [
+    initRose,
     stackCornerRadius_stackCornerRadius,
+    stackInverse,
     color_color,
     background_backgroundColor,
-    percent,
     dataset_dataset,
-    xLinear,
-    yBand,
+    radiusAxis,
+    angleAxis,
     label_label,
     tooltip_tooltip,
-    horizontalCrosshairRect,
-    discreteLegend,
-    barStyle_barStyle,
-    annotationPoint_annotationPoint,
-    annotationVerticalLine_annotationVerticalLine,
-    annotationHorizontalLine_annotationHorizontalLine,
-    annotationAreaBand
+    verticalCrosshairRect,
+    discreteLegend
 ];
-const pivotBarPercent = [
+const pivotRose = [
     initPivot,
     pivotGridStyle,
-    pivotIndicators_pivotIndicatorsAsCol,
+    pivotIndicators_pivotIndicatorsAsRow,
     datasetPivot,
     pivotIndicators([
-        initBar,
+        initRose,
         stackCornerRadius_stackCornerRadius,
+        stackInverse,
         color_color,
         background_backgroundColor,
-        percent,
         datasetPivotPlaceholder,
-        yBand,
-        xLinear,
+        radiusAxis,
+        angleAxis,
         label_label,
         tooltip_tooltip,
-        horizontalCrosshairRect,
-        barStyle_barStyle,
-        annotationPoint_annotationPoint,
-        annotationVerticalLine_annotationVerticalLine,
-        annotationHorizontalLine_annotationHorizontalLine,
-        annotationAreaBand
+        verticalCrosshairRect
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
     pivotDiscreteLegend
 ];
-const barPercentSpecPipeline = [
-    pivotAdapter_pivotAdapter(barPercent, pivotBarPercent)
+const roseSpecPipeline = [
+    pivotAdapter_pivotAdapter(rose, pivotRose)
 ];
-const area_area = [
-    initArea,
-    stackInverse,
+const roseParallel = [
+    initRoseParallel,
+    stackCornerRadius_stackCornerRadius,
     color_color,
     background_backgroundColor,
     dataset_dataset,
-    xBand,
-    yLinear,
+    radiusAxis,
+    angleAxis,
     label_label,
     tooltip_tooltip,
-    verticalCrosshairLine,
     discreteLegend,
-    pointStyle_pointStyle,
-    lineStyle_lineStyle,
-    areaStyle_areaStyle,
+    verticalCrosshairRect,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
-    annotationArea_annotationArea
+    annotationAreaBand
 ];
-const pivotArea = [
+const pivotRoseParallel = [
     initPivot,
     pivotGridStyle,
     pivotIndicators_pivotIndicatorsAsRow,
     datasetPivot,
     pivotIndicators([
-        initArea,
+        initRoseParallel,
+        stackCornerRadius_stackCornerRadius,
         color_color,
         background_backgroundColor,
-        stackInverse,
         datasetPivotPlaceholder,
-        xBand,
-        yLinear,
+        radiusAxis,
+        angleAxis,
         label_label,
         tooltip_tooltip,
-        verticalCrosshairLine,
-        pointStyle_pointStyle,
-        lineStyle_lineStyle,
-        areaStyle_areaStyle,
+        verticalCrosshairRect,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
-        annotationArea_annotationArea
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
     pivotDiscreteLegend
 ];
-const areaSpecPipeline = [
-    pivotAdapter_pivotAdapter(area_area, pivotArea)
+const roseParallelSpecPipeline = [
+    pivotAdapter_pivotAdapter(roseParallel, pivotRoseParallel)
 ];
-const areaPercent = [
-    initArea,
-    stackInverse,
+const funnel = [
+    initFunnel,
     color_color,
     background_backgroundColor,
-    percent,
     dataset_dataset,
-    xBand,
-    yLinear,
     label_label,
     tooltip_tooltip,
-    verticalCrosshairLine,
     discreteLegend,
-    pointStyle_pointStyle,
-    lineStyle_lineStyle,
-    areaStyle_areaStyle,
     annotationPoint_annotationPoint,
     annotationVerticalLine_annotationVerticalLine,
     annotationHorizontalLine_annotationHorizontalLine,
     annotationArea_annotationArea
 ];
-const pivotAreaPercent = [
+const pivotFunnel = [
     initPivot,
     pivotGridStyle,
     pivotIndicators_pivotIndicatorsAsRow,
     datasetPivot,
     pivotIndicators([
-        initArea,
-        stackInverse,
+        initFunnel,
         color_color,
         background_backgroundColor,
-        percent,
         datasetPivotPlaceholder,
-        xBand,
-        yLinear,
         label_label,
         tooltip_tooltip,
-        verticalCrosshairLine,
-        pointStyle_pointStyle,
-        lineStyle_lineStyle,
-        areaStyle_areaStyle,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -3507,34 +4357,67 @@ const pivotAreaPercent = [
     pivotColumnDimensions,
     pivotDiscreteLegend
 ];
-const areaPercentSpecPipeline = [
-    pivotAdapter_pivotAdapter(areaPercent, pivotAreaPercent)
+const funnelSpecPipeline = [
+    pivotAdapter_pivotAdapter(funnel, pivotFunnel)
 ];
-const pie = [
-    initPie,
+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 pivotPie = [
+const pivotScatter = [
     initPivot,
     pivotGridStyle,
     pivotIndicators_pivotIndicatorsAsRow,
     datasetPivot,
     pivotIndicators([
-        initPie,
+        initScatter,
         color_color,
         background_backgroundColor,
         datasetPivotPlaceholder,
+        xLinear,
+        yLinear,
         label_label,
         tooltip_tooltip,
+        verticalCrosshairLine,
+        horizontalCrosshairLine,
+        pointStyle_pointStyle,
+        pointStateHover,
         annotationPoint_annotationPoint,
         annotationVerticalLine_annotationVerticalLine,
         annotationHorizontalLine_annotationHorizontalLine,
@@ -3544,8 +4427,8 @@ const pivotPie = [
     pivotColumnDimensions,
     pivotDiscreteLegend
 ];
-const pieSpecPipeline = [
-    pivotAdapter_pivotAdapter(pie, pivotPie)
+const scatterSpecPipeline = [
+    pivotAdapter_pivotAdapter(scatter, pivotScatter)
 ];
 const buildAdvanced = (builder)=>{
     const { chartType } = builder.vseed;
@@ -3665,6 +4548,26 @@ const registerPie = ()=>{
     Builder._advancedPipelineMap.pie = pieAdvancedPipeline;
     Builder._specPipelineMap.pie = pieSpecPipeline;
 };
+const registerDonut = ()=>{
+    Builder._advancedPipelineMap.donut = donutAdvancedPipeline;
+    Builder._specPipelineMap.donut = donutSpecPipeline;
+};
+const registerRose = ()=>{
+    Builder._advancedPipelineMap.rose = roseAdvancedPipeline;
+    Builder._specPipelineMap.rose = roseSpecPipeline;
+};
+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,
@@ -3889,6 +4792,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
             }
         }
     };
@@ -4118,6 +5038,23 @@ const lightTheme = ()=>{
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine
+            },
+            scatter: {
+                xAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                yAxis: {
+                    ...linearAxis,
+                    line: {
+                        ...linearAxis.line,
+                        visible: true
+                    }
+                },
+                crosshairLine
             }
         }
     };
@@ -4135,7 +5072,7 @@ const registerLightTheme = ()=>{
 const registerDarkTheme = ()=>{
     registerCustomTheme('dark', darkTheme());
 };
-const all_registerAll = ()=>{
+const registerAll = ()=>{
     registerLine();
     registerColumn();
     registerColumnParallel();
@@ -4146,6 +5083,11 @@ const all_registerAll = ()=>{
     registerArea();
     registerAreaPercent();
     registerPie();
+    registerDonut();
+    registerRose();
+    registerRoseParallel();
+    registerFunnel();
+    registerScatter();
     registerLightTheme();
     registerDarkTheme();
 };
@@ -4162,9 +5104,12 @@ const zChartType = z["enum"]([
     'area',
     'areaPercent',
     'rose',
+    'roseParallel',
     'pie',
     'donut',
-    'dualAxis'
+    'dualAxis',
+    'scatter',
+    'funnel'
 ]);
 const zDatum = z.record(z.string().or(z.number()), z.any());
 const zDataset = z.array(zDatum);
@@ -4237,7 +5182,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({
@@ -4470,6 +5416,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(),
@@ -4521,12 +5469,17 @@ const zConfig = z.object({
         yAxis: zYLinearAxis.optional(),
         crosshairLine: zCrosshairLine.optional()
     }).optional(),
+    rose: z.object({}).optional(),
+    roseParallel: z.object({}).optional(),
     pie: z.object({}).optional(),
     donut: z.object({}).optional(),
-    rose: 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(),
@@ -4975,6 +5928,19 @@ const zLine = z.object({
     annotationArea: zAnnotationArea.optional(),
     locale: zLocale.optional()
 });
+const zRose = z.object({
+    chartType: 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 = z.object({
     chartType: z.literal('barPercent'),
     dataset: zDataset.optional(),
@@ -5010,6 +5976,19 @@ const zPie = z.object({
     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 zArea = z.object({
     chartType: z.literal('area'),
     dataset: zDataset.optional(),
@@ -5056,6 +6035,53 @@ const zAreaPercent = z.object({
     annotationArea: zAnnotationArea.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 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(),
+    annotationPoint: zAnnotationPoint.optional(),
+    annotationVerticalLine: zAnnotationVerticalLine.optional(),
+    annotationHorizontalLine: zAnnotationHorizontalLine.optional(),
+    annotationArea: 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', [
     zLine,
     zColumn,
@@ -5066,8 +6092,13 @@ 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, execPipeline, findMeasureById, foldMeasures, i18n, intl, isPivotChart, isVChart, isVTable, lightTheme, lineAdvancedPipeline, lineSpecPipeline, pieAdvancedPipeline, pieSpecPipeline, all_registerAll as registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerLightTheme, registerLine, 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 };
+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, 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 };
 
 //# sourceMappingURL=index.js.map