@visactor/vseed 0.0.10 → 0.0.12

package/dist/index.js

@@ -1,4 +1,4 @@
-import { clone as external_remeda_clone, mergeDeep as external_remeda_mergeDeep, omit, pick as external_remeda_pick, unique } from "remeda";
+import { clone as external_remeda_clone, groupBy, isArray, isNumber, isString, mergeDeep as external_remeda_mergeDeep, omit, pick as external_remeda_pick, unique } from "remeda";
 import { z } from "zod";
 const initAdvancedVSeed = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -23,6 +23,43 @@ const isPivotChart = (vseed)=>{
     const hasMeasureGroup = measures && measures.find((measure)=>measure && measure.children);
     return hasRowOrColumnDimension || hasMeasureGroup;
 };
+const createNumFormatter = (format)=>{
+    const { type = 'number', ratio = 1, symbol = '', thousandSeparator = true, decimalPlaces = 2, round = 'round', prefix = '', suffix = '' } = format || {};
+    return (value)=>{
+        let num = Number(value);
+        let typeSymbol = '';
+        if (Number.isNaN(num)) return num.toString();
+        if ('percent' === type) {
+            num *= 100;
+            typeSymbol = '%';
+        } else if ('permille' === type) {
+            num *= 1000;
+            typeSymbol = "\u2030";
+        } else if ('number' === type) num /= ratio || 1;
+        const multiplier = 10 ** decimalPlaces;
+        num = Math[round](num * multiplier) / multiplier;
+        let numStr = num.toFixed(decimalPlaces);
+        if (thousandSeparator) {
+            const parts = numStr.split('.');
+            parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+            numStr = parts.join('.');
+        }
+        return `${prefix}${numStr}${typeSymbol}${symbol}${suffix}`;
+    };
+};
+const createFormatter = (format)=>createNumFormatter(format);
+function findMeasureById(measures, id) {
+    if (!measures) return;
+    const stack = [
+        ...measures
+    ];
+    while(stack.length > 0){
+        const current = stack.pop();
+        if (!current) continue;
+        if (current.id === id && !('children' in current)) return current;
+        if ('children' in current && current.children) stack.push(...current.children);
+    }
+}
 const autoMeasures = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
@@ -73,16 +110,16 @@ const autoMeasureGroup = (advancedVSeed, context)=>{
     const measureGroups = [];
     for (const measure of measures)if ('children' in measure) {
         if (currentGroup.children?.length) {
-            currentGroup.id = currentGroup.children.map((item)=>item.id).join('-');
             currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+            currentGroup.id = currentGroup.alias + currentGroup.children.map((item)=>item.id).join('-');
             measureGroups.push(currentGroup);
             currentGroup = createEmptyMeasureGroup();
         }
         measureGroups.push(measure);
     } else currentGroup.children?.push(measure);
     if (currentGroup.children?.length) {
-        currentGroup.id = currentGroup.children.map((item)=>item.id).join('-');
         currentGroup.alias = currentGroup.children.map((item)=>item.alias).join('-');
+        currentGroup.id = currentGroup.alias + currentGroup.children.map((item)=>item.id).join('-');
         measureGroups.push(currentGroup);
         currentGroup = createEmptyMeasureGroup();
     }
@@ -565,7 +602,28 @@ const lineConfig = (advancedVSeed, context)=>{
     };
     const config = external_remeda_pick(vseed, [
         'xAxis',
-        'yAxis'
+        'yAxis',
+        'crosshairLine'
+    ]);
+    result.config = {
+        ...result.config || {},
+        [chartType]: {
+            ...config
+        }
+    };
+    return result;
+};
+const columnConfig = (advancedVSeed, context)=>{
+    const { vseed } = context;
+    const { chartType } = vseed;
+    const result = {
+        ...advancedVSeed
+    };
+    const config = external_remeda_pick(vseed, [
+        'xAxis',
+        'yAxis',
+        'crosshairRect',
+        'stackCornerRadius'
     ]);
     result.config = {
         ...result.config || {},
@@ -590,14 +648,13 @@ const pieConfig = (advancedVSeed, context)=>{
     };
     return result;
 };
-const barConfig = lineConfig;
-const barParallelConfig = lineConfig;
-const barPercentConfig = lineConfig;
-const columnConfig = lineConfig;
-const columnParallelConfig = lineConfig;
-const columnPercentConfig = lineConfig;
 const areaConfig = lineConfig;
 const areaPercentConfig = lineConfig;
+const barConfig = columnConfig;
+const barParallelConfig = columnConfig;
+const barPercentConfig = columnConfig;
+const columnParallelConfig = columnConfig;
+const columnPercentConfig = columnConfig;
 const vchartTheme = (advancedVSeed, context)=>{
     const { customTheme, vseed } = context;
     const { theme = 'light', chartType } = vseed;
@@ -632,7 +689,10 @@ const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
 const markStyle_markStyle = (advancedVSeed, context)=>{
     const { vseed } = context;
     const markStyle = external_remeda_pick(vseed, [
-        'barStyle'
+        'barStyle',
+        'pointStyle',
+        'lineStyle',
+        'areaStyle'
     ]);
     return {
         ...advancedVSeed,
@@ -642,7 +702,10 @@ const markStyle_markStyle = (advancedVSeed, context)=>{
 const annotation_annotation = (advancedVSeed, context)=>{
     const { vseed } = context;
     const annotation = external_remeda_pick(vseed, [
-        'annotationPoint'
+        'annotationPoint',
+        'annotationHorizontalLine',
+        'annotationVerticalLine',
+        'annotationArea'
     ]);
     return {
         ...advancedVSeed,
@@ -662,6 +725,7 @@ const lineAdvancedPipeline = [
     vchartBaseConfig,
     lineConfig,
     vchartTheme,
+    markStyle_markStyle,
     annotation_annotation
 ];
 const barAdvancedPipeline = [
@@ -773,6 +837,7 @@ const areaAdvancedPipeline = [
     areaConfig,
     vchartBaseConfig,
     vchartTheme,
+    markStyle_markStyle,
     annotation_annotation
 ];
 const areaPercentAdvancedPipeline = [
@@ -788,6 +853,7 @@ const areaPercentAdvancedPipeline = [
     areaPercentConfig,
     vchartBaseConfig,
     vchartTheme,
+    markStyle_markStyle,
     annotation_annotation
 ];
 const pieAdvancedPipeline = [
@@ -1078,7 +1144,15 @@ const xBand = (spec, context)=>{
                 lineWidth: line?.lineWidth,
                 stroke: line?.lineColor
             }
-        }
+        },
+        paddingInner: [
+            0.15,
+            0.1
+        ],
+        paddingOuter: [
+            0.075,
+            0.1
+        ]
     };
     result.axes = [
         ...result.axes,
@@ -1086,6 +1160,8 @@ const xBand = (spec, context)=>{
     ];
     return result;
 };
+const ANNOTATION_Z_INDEX = 1000;
+const LINEAR_AXIS_INNER_OFFSET_TOP = 5;
 const xLinear = (spec, context)=>{
     const result = {
         ...spec
@@ -1154,6 +1230,9 @@ const xLinear = (spec, context)=>{
                 lineWidth: line?.lineWidth,
                 stroke: line?.lineColor
             }
+        },
+        innerOffset: {
+            top: LINEAR_AXIS_INNER_OFFSET_TOP
         }
     };
     result.axes = [
@@ -1241,7 +1320,15 @@ const yBand = (spec, context)=>{
                 lineWidth: line?.lineWidth,
                 stroke: line?.lineColor
             }
-        }
+        },
+        paddingInner: [
+            0.15,
+            0.1
+        ],
+        paddingOuter: [
+            0.075,
+            0.1
+        ]
     };
     result.axes = [
         ...result.axes,
@@ -1317,6 +1404,9 @@ const yLinear = (spec, context)=>{
                 lineWidth: line?.lineWidth,
                 stroke: line?.lineColor
             }
+        },
+        innerOffset: {
+            top: LINEAR_AXIS_INNER_OFFSET_TOP
         }
     };
     result.axes = [
@@ -1339,6 +1429,15 @@ const stackInverse = (spec)=>{
     result.stackInverse = true;
     return result;
 };
+const stackCornerRadius_stackCornerRadius = (spec, context)=>{
+    const { advancedVSeed, vseed } = context;
+    const { chartType } = vseed;
+    const stackCornerRadius = advancedVSeed.config?.[chartType]?.stackCornerRadius;
+    return {
+        ...spec,
+        stackCornerRadius
+    };
+};
 const background_backgroundColor = (spec, context)=>{
     const result = {
         ...spec
@@ -1360,11 +1459,55 @@ const tooltip_tooltip = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
+    const { measures, datasetReshapeInfo } = advancedVSeed;
     const baseConfig = advancedVSeed.baseConfig.vchart;
     const { tooltip = defaultTooltip } = baseConfig;
     const { enable } = tooltip;
+    const { measureId, measureName, measureValue } = datasetReshapeInfo[0].foldInfo;
     result.tooltip = {
-        visible: enable
+        visible: enable,
+        mark: {
+            content: [
+                {
+                    visible: true,
+                    key: (datum)=>datum && datum[measureName] || '',
+                    value: (datum)=>{
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (format || autoFormat) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        return String(value);
+                    }
+                }
+            ]
+        },
+        dimension: {
+            content: [
+                {
+                    visible: true,
+                    key: (datum)=>datum && datum[measureName] || '',
+                    value: (datum)=>{
+                        if (!datum) return '';
+                        const value = datum[measureValue];
+                        const id = datum[measureId];
+                        const measure = findMeasureById(measures, id);
+                        if (!measure) return String(value);
+                        const { format = {}, autoFormat = true } = measure;
+                        if (format || autoFormat) {
+                            const formatter = createFormatter(format);
+                            return formatter(value);
+                        }
+                        return String(value);
+                    }
+                }
+            ]
+        }
     };
     return result;
 };
@@ -1373,12 +1516,24 @@ const label_label = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
+    const { measures, datasetReshapeInfo } = advancedVSeed;
     const baseConfig = advancedVSeed.baseConfig.vchart;
     if (!baseConfig || !baseConfig.label) return result;
+    const { measureId } = datasetReshapeInfo[0].foldInfo;
     const { label } = baseConfig;
     const { enable } = label;
     result.label = {
-        visible: enable
+        visible: enable,
+        formatMethod: (value, datum)=>{
+            const id = datum[measureId];
+            const measure = findMeasureById(measures, id);
+            if (!measure) return value;
+            const { format = {}, autoFormat = true } = measure;
+            if (format || autoFormat) {
+                const formatter = createFormatter(format);
+                return formatter(value);
+            }
+        }
     };
     return result;
 };
@@ -1681,6 +1836,7 @@ const pivotGridStyle = (spec)=>{
         ...spec
     };
     const transparent = 'rgba(0,0,0,0)';
+    const hoverBackgroundColor = 'rgba(178,186,207, 0.2)';
     return {
         ...result,
         theme: {
@@ -1699,7 +1855,10 @@ const pivotGridStyle = (spec)=>{
                     0,
                     1,
                     0
-                ]
+                ],
+                hover: {
+                    cellBgColor: 'transparent'
+                }
             },
             headerStyle: {
                 borderColor: 'rgba(0,4,20,0.2)',
@@ -1709,7 +1868,7 @@ const pivotGridStyle = (spec)=>{
                 borderLineWidth: 0,
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: 'rgba(178,186,207, 0.2)'
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             rowHeaderStyle: {
@@ -1719,7 +1878,7 @@ const pivotGridStyle = (spec)=>{
                 borderLineWidth: 0,
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: 'rgba(178,186,207, 0.2)'
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             cornerHeaderStyle: {
@@ -1736,7 +1895,7 @@ const pivotGridStyle = (spec)=>{
                 ],
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: ''
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             cornerRightTopCellStyle: {
@@ -1744,7 +1903,7 @@ const pivotGridStyle = (spec)=>{
                 borderLineWidth: 0,
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: ''
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             cornerLeftBottomCellStyle: {
@@ -1752,7 +1911,7 @@ const pivotGridStyle = (spec)=>{
                 borderLineWidth: 0,
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: ''
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             cornerRightBottomCellStyle: {
@@ -1760,7 +1919,7 @@ const pivotGridStyle = (spec)=>{
                 borderLineWidth: 0,
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: ''
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             rightFrozenStyle: {
@@ -1768,7 +1927,7 @@ const pivotGridStyle = (spec)=>{
                 borderLineWidth: 0,
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: 'rgba(178,186,207, 0.2)'
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             bottomFrozenStyle: {
@@ -1776,7 +1935,7 @@ const pivotGridStyle = (spec)=>{
                 borderLineWidth: 0,
                 bgColor: transparent,
                 hover: {
-                    cellBgColor: 'rgba(178,186,207, 0.2)'
+                    cellBgColor: hoverBackgroundColor
                 }
             },
             selectionStyle: {
@@ -1824,19 +1983,23 @@ const pivotRowDimensions = (spec, context)=>{
         rows: rows
     };
 };
-const selector_selector = (datum, selector)=>{
+const selector_selector = (vchartDatum, selector)=>{
     if (!selector) return true;
+    const vchartKeys = Object.keys(vchartDatum).filter((k)=>k.toLocaleLowerCase().startsWith('__vchart'));
+    const datum = omit(vchartDatum, vchartKeys);
     const selectors = Array.isArray(selector) ? selector : [
         selector
     ];
     for (const selector of selectors)if (isValueSelector(selector)) {
         if (Object.values(datum).find((v)=>v === selector)) return true;
     } else if (isMeasureSelector(selector)) {
+        const op = selector.operator || selector.op;
         const selectorValueArr = Array.isArray(selector.value) ? selector.value : [
             selector.value
         ];
-        switch(selector.operator){
+        switch(op){
             case '=':
+            case '==':
                 if (datum[selector.field] === selectorValueArr[0]) return true;
                 break;
             case '!=':
@@ -1861,11 +2024,20 @@ const selector_selector = (datum, selector)=>{
                 break;
         }
     } else if (isDimensionSelector(selector)) {
+        const op = selector.operator || selector.op;
         const selectorValueArr = Array.isArray(selector.value) ? selector.value : [
             selector.value
         ];
-        if ('in' === selector.operator && selectorValueArr.includes(datum[selector.field])) return true;
-        if ('not in' === selector.operator && !selectorValueArr.includes(datum[selector.field])) return true;
+        switch(op){
+            case 'in':
+                if (selectorValueArr.includes(datum[selector.field])) return true;
+                break;
+            case 'not in':
+                if (!selectorValueArr.includes(datum[selector.field])) return true;
+                break;
+            default:
+                break;
+        }
     } else if (isPartialDatumSelector(selector)) {
         if (Object.keys(selector).every((key)=>datum[key] === selector[key])) return true;
     }
@@ -1873,73 +2045,257 @@ const selector_selector = (datum, selector)=>{
 };
 const isValueSelector = (selector)=>'string' == typeof selector || 'number' == typeof selector;
 const isPartialDatumSelector = (selector)=>'object' == typeof selector && null !== selector;
-const isMeasureSelector = (selector)=>'object' == typeof selector && null !== selector && 'field' in selector && 'operator' in selector && 'value' in selector && [
+const isMeasureSelector = (selector)=>'object' == typeof selector && null !== selector && 'field' in selector && ('operator' in selector || 'op' in selector) && 'value' in selector && ([
         '=',
+        '==',
         '!=',
         '>',
         '<',
         '>=',
         '<=',
         'between'
-    ].includes(selector.operator);
-const isDimensionSelector = (selector)=>'object' == typeof selector && null !== selector && 'field' in selector && 'operator' in selector && 'value' in selector && [
+    ].includes(selector.operator) || [
+        '=',
+        '==',
+        '!=',
+        '>',
+        '<',
+        '>=',
+        '<=',
+        'between'
+    ].includes(selector.op));
+const isDimensionSelector = (selector)=>'object' == typeof selector && null !== selector && 'field' in selector && ('operator' in selector || 'op' in selector) && 'value' in selector && ([
+        'in',
+        'not in'
+    ].includes(selector.operator) || [
         'in',
         'not in'
-    ].includes(selector.operator);
+    ].includes(selector.op));
 const barStyle_barStyle = (spec, context)=>{
     const { advancedVSeed } = context;
     const { markStyle, encoding } = advancedVSeed;
     const { barStyle } = markStyle;
-    if (!barStyle) return spec;
     const result = {
-        ...spec
+        ...spec,
+        bar: {
+            state: {
+                hover: {
+                    stroke: (datum, context)=>{
+                        const field = encoding[0]?.group?.[0];
+                        const color = context.seriesColor(datum[field]);
+                        return color;
+                    },
+                    lineWidth: 4,
+                    fillOpacity: 0.6
+                }
+            }
+        }
     };
-    const { selector: barSelector, barBorderColor, barBorderStyle, barBorderWidth, barColor, barColorOpacity, barRadius } = barStyle;
+    if (!barStyle) return result;
+    const barStyles = Array.isArray(barStyle) ? barStyle : [
+        barStyle
+    ];
+    const customMap = barStyles.reduce((result, style, index)=>{
+        const { barBorderColor, barBorderStyle, barBorderWidth, barColor, barColorOpacity, barRadius } = style;
+        const lineDash = 'dashed' === barBorderStyle ? [
+            5,
+            2
+        ] : 'dotted' === barBorderStyle ? [
+            2,
+            5
+        ] : [
+            0,
+            0
+        ];
+        return {
+            ...result,
+            [`custom${index + 1}`]: {
+                level: index + 1,
+                filter: (datum)=>{
+                    if (selector_selector(datum, style.selector)) return true;
+                    return false;
+                },
+                style: {
+                    fill: barColor,
+                    fillOpacity: barColorOpacity,
+                    stroke: barBorderColor,
+                    lineWidth: barBorderWidth,
+                    lineDash: lineDash,
+                    cornerRadius: barRadius
+                }
+            }
+        };
+    }, {});
     return {
         ...result,
         bar: {
-            style: {
-                fill: barColor ? (datum, context)=>{
-                    if (selector_selector(datum, barSelector)) return barColor;
-                    return context.seriesColor(datum[encoding[0]?.group?.[0]]);
-                } : void 0,
-                fillOpacity: barColorOpacity ? (datum)=>{
-                    if (selector_selector(datum, barSelector)) return barColorOpacity;
-                    return 1;
-                } : void 0,
-                stroke: barBorderColor ? (datum, context)=>{
-                    if (selector_selector(datum, barSelector)) return barBorderColor;
-                    return context.seriesColor(datum[encoding[0]?.group?.[0]]);
-                } : void 0,
-                lineWidth: barBorderWidth ? (datum)=>{
-                    if (selector_selector(datum, barSelector)) return barBorderWidth;
-                    return 0;
-                } : void 0,
-                lineDash: barBorderStyle ? (datum)=>{
-                    if (selector_selector(datum, barSelector)) {
-                        if ('solid' === barBorderStyle) ;
-                        else if ('dashed' === barBorderStyle) return [
-                            5,
-                            5
-                        ];
-                        else if ('dotted' === barBorderStyle) return [
-                            1,
-                            5
-                        ];
-                    }
-                    return [
-                        0,
-                        0
-                    ];
-                } : void 0,
-                cornerRadius: barRadius ? (datum)=>{
-                    if (selector_selector(datum, barSelector)) return barRadius;
-                    return 0;
-                } : void 0
+            state: {
+                ...customMap
+            }
+        }
+    };
+};
+const pointStyle_pointStyle = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { markStyle } = advancedVSeed;
+    const { pointStyle } = markStyle;
+    const result = {
+        ...spec,
+        point: {
+            state: {
+                dimension_hover: {
+                    scaleX: 1.4,
+                    scaleY: 1.4
+                }
+            }
+        }
+    };
+    if (!pointStyle) return result;
+    const pointStyles = Array.isArray(pointStyle) ? pointStyle : [
+        pointStyle
+    ];
+    const customMap = pointStyles.reduce((result, style, index)=>{
+        const { pointBorderColor, pointBorderStyle, pointBorderWidth, pointColor, pointColorOpacity, pointSize } = style;
+        const lineDash = 'dashed' === pointBorderStyle ? [
+            5,
+            2
+        ] : 'dotted' === pointBorderStyle ? [
+            2,
+            5
+        ] : [
+            0,
+            0
+        ];
+        return {
+            ...result,
+            [`custom${index + 1}`]: {
+                level: index + 1,
+                filter: (datum)=>{
+                    if (selector_selector(datum, style.selector)) return true;
+                    return false;
+                },
+                style: {
+                    size: pointSize,
+                    fill: pointColor,
+                    fillOpacity: pointColorOpacity,
+                    stroke: pointBorderColor,
+                    lineWidth: pointBorderWidth,
+                    lineDash: lineDash
+                }
+            }
+        };
+    }, {});
+    return {
+        ...result,
+        point: {
+            state: {
+                ...customMap
+            }
+        }
+    };
+};
+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,
+            2 * dashGap
+        ] : [
+            0,
+            0
+        ];
+        const curveType = lineSmooth ? 'monotone' : 'linear';
+        return {
+            ...result,
+            [`custom${index + 1}`]: {
+                level: index + 1,
+                filter: (datum)=>{
+                    const lineData = lineGroups[datum[group ?? '']];
+                    for (const d of lineData)if (selector_selector(d, style.selector)) return true;
+                    return false;
+                },
+                style: {
+                    curveType: curveType,
+                    fill: lineColor,
+                    fillOpacity: lineColorOpacity,
+                    stroke: lineColor,
+                    lineWidth: lineWidth,
+                    lineDash: lineDash
+                }
+            }
+        };
+    }, {});
+    return {
+        ...result,
+        line: {
+            state: {
+                ...customMap
+            }
+        }
+    };
+};
+const areaStyle_areaStyle = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { markStyle, encoding, dataset } = advancedVSeed;
+    const { areaStyle } = markStyle;
+    if (!areaStyle) return spec;
+    const result = {
+        ...spec
+    };
+    const areaStyles = Array.isArray(areaStyle) ? areaStyle : [
+        areaStyle
+    ];
+    const group = encoding[0]?.group?.[0];
+    const lineGroups = groupBy(dataset, (d)=>d[group ?? '']);
+    const customMap = areaStyles.reduce((result, style, index)=>{
+        const { areaColor, areaColorOpacity } = style;
+        return {
+            ...result,
+            [`custom${index + 1}`]: {
+                level: index + 1,
+                filter: (datum)=>{
+                    const lineData = lineGroups[datum[group ?? '']];
+                    for (const d of lineData)if (selector_selector(d, style.selector)) return true;
+                    return false;
+                },
+                style: {
+                    fill: areaColor,
+                    fillOpacity: areaColorOpacity
+                }
+            }
+        };
+    }, {});
+    return {
+        ...result,
+        area: {
+            state: {
+                ...customMap
             }
         }
     };
 };
+const isSubset = (sub, obj)=>Object.entries(sub).every(([key, value])=>{
+        if ('string' == typeof value) return obj[key] === value;
+        if ('number' == typeof value) return obj[key] === value;
+        return true;
+    });
 const annotationPoint_annotationPoint = (spec, context)=>{
     const { advancedVSeed } = context;
     const { annotation } = advancedVSeed;
@@ -1949,24 +2305,19 @@ const annotationPoint_annotationPoint = (spec, context)=>{
         annotationPoint
     ];
     const markPoint = annotationPointList.flatMap((annotationPoint)=>{
-        const { selector: selectorPoint, text = '', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'middle', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 4, backgroundVisible = true, offsetX = 0, offsetY = 0 } = annotationPoint;
+        const { selector: selectorPoint, text = '', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'middle', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 2, backgroundVisible = true, offsetX = 0, offsetY = 0 } = annotationPoint;
         const dataset = advancedVSeed.dataset.flat();
         const selectedData = dataset.filter((datum)=>selector_selector(datum, selectorPoint));
         return selectedData.map((datum)=>({
+                zIndex: ANNOTATION_Z_INDEX,
                 regionRelative: true,
                 position: (data, context)=>{
                     const targetDatum = data.find((item)=>isSubset(datum, item));
                     if (targetDatum) {
                         const { x, y } = context.dataToPosition(targetDatum);
-                        const xBandWidth = context.scaleX?.bandwidth?.();
-                        const yBandWidth = context.scaleY?.bandwidth?.();
-                        if (xBandWidth) return {
-                            x: x,
-                            y: y
-                        };
-                        if (yBandWidth) return {
+                        return {
                             x,
-                            y: y
+                            y
                         };
                     }
                 },
@@ -2005,77 +2356,646 @@ const annotationPoint_annotationPoint = (spec, context)=>{
         markPoint
     };
 };
-const isSubset = (sub, obj)=>Object.entries(sub).every(([key, value])=>{
-        if ('string' == typeof value) return obj[key] === value;
-        if ('number' == typeof value) return obj[key] === value;
-        return true;
+const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { annotation, encoding } = advancedVSeed;
+    if (!annotation || !annotation.annotationVerticalLine) return spec;
+    const { annotationVerticalLine } = annotation;
+    const annotationVerticalLineList = Array.isArray(annotationVerticalLine) ? annotationVerticalLine : [
+        annotationVerticalLine
+    ];
+    const positionMap = {
+        outsideStart: 'start',
+        outsideEnd: 'end',
+        outsideMiddle: 'middle',
+        insideStart: 'insideStartTop',
+        insideMiddle: 'insideMiddleTop',
+        insideEnd: 'insideEndTop'
+    };
+    const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine)=>{
+        const { selector: selectorPoint, xValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'right', textBaseline = 'top', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 2, backgroundVisible = true, offsetX = 0, offsetY = 0, lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1 } = annotationVerticalLine;
+        const dataset = advancedVSeed.dataset.flat();
+        const generateOneMarkLine = (x)=>({
+                x: x,
+                zIndex: ANNOTATION_Z_INDEX,
+                line: {
+                    visible: lineVisible,
+                    style: {
+                        offsetX,
+                        offsetY,
+                        stroke: lineColor,
+                        lineStyle: lineStyle,
+                        lineWidth: lineWidth,
+                        lineDash: 'dashed' === lineStyle ? [
+                            5,
+                            2
+                        ] : 'dotted' === lineStyle ? [
+                            2,
+                            5
+                        ] : [
+                            0
+                        ]
+                    }
+                },
+                label: {
+                    text: text,
+                    position: positionMap[textPosition],
+                    style: {
+                        offsetX,
+                        offsetY,
+                        visible: true,
+                        textAlign: textAlign,
+                        textBaseline: textBaseline,
+                        fill: textColor,
+                        fontSize: textFontSize,
+                        fontWeight: textFontWeight
+                    },
+                    labelBackground: {
+                        visible: backgroundVisible,
+                        padding: backgroundPadding,
+                        style: {
+                            offsetX,
+                            offsetY,
+                            cornerRadius: backgroundBorderRadius ?? 4,
+                            fill: backgroundColor,
+                            stroke: backgroundBorderColor,
+                            strokeWidth: backgroundBorderWidth
+                        }
+                    }
+                },
+                endSymbol: {
+                    visible: true,
+                    style: {
+                        fill: lineColor
+                    }
+                }
+            });
+        if (!selectorPoint && isArray(xValue) || isString(xValue) || isNumber(xValue)) {
+            const xValueArr = Array.isArray(xValue) ? xValue : [
+                xValue
+            ];
+            return xValueArr.map(generateOneMarkLine);
+        }
+        const selectedData = dataset.filter((datum)=>selector_selector(datum, selectorPoint));
+        return selectedData.map((datum)=>{
+            const x = encoding[0]?.x?.[0];
+            if (!x) return {};
+            return generateOneMarkLine(datum[x]);
+        });
     });
-const line_line = [
-    initLine,
-    color_color,
-    background_backgroundColor,
-    dataset_dataset,
-    xBand,
-    yLinear,
-    label_label,
-    tooltip_tooltip,
-    discreteLegend,
-    annotationPoint_annotationPoint
-];
-const pivotLine = [
-    initPivot,
-    pivotGridStyle,
-    pivotIndicators_pivotIndicatorsAsRow,
-    datasetPivot,
-    pivotIndicators([
-        initLine,
-        color_color,
-        background_backgroundColor,
-        datasetPivotPlaceholder,
-        xBand,
-        yLinear,
-        label_label,
-        tooltip_tooltip,
-        annotationPoint_annotationPoint
-    ]),
-    pivotRowDimensions,
-    pivotColumnDimensions,
-    pivotDiscreteLegend
-];
-const lineSpecPipeline = [
-    pivotAdapter_pivotAdapter(line_line, pivotLine)
-];
-const column = [
-    initColumn,
-    stackInverse,
-    color_color,
-    background_backgroundColor,
-    dataset_dataset,
-    xBand,
-    yLinear,
-    label_label,
-    tooltip_tooltip,
-    discreteLegend,
-    barStyle_barStyle,
-    annotationPoint_annotationPoint
-];
-const pivotColumn = [
-    initPivot,
-    pivotGridStyle,
-    pivotIndicators_pivotIndicatorsAsRow,
-    datasetPivot,
-    pivotIndicators([
-        initColumn,
-        stackInverse,
-        color_color,
-        background_backgroundColor,
-        datasetPivotPlaceholder,
-        xBand,
-        yLinear,
-        label_label,
-        tooltip_tooltip,
-        barStyle_barStyle,
-        annotationPoint_annotationPoint
+    const specMarkLine = spec.markLine || [];
+    const newMarkLine = [
+        ...specMarkLine,
+        ...markLine || []
+    ];
+    return {
+        ...spec,
+        markLine: newMarkLine
+    };
+};
+const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { annotation, encoding } = advancedVSeed;
+    if (!annotation || !annotation.annotationHorizontalLine) return spec;
+    const { annotationHorizontalLine } = annotation;
+    const annotationVerticalLineList = Array.isArray(annotationHorizontalLine) ? annotationHorizontalLine : [
+        annotationHorizontalLine
+    ];
+    const positionMap = {
+        outsideStart: 'start',
+        outsideEnd: 'end',
+        outsideMiddle: 'middle',
+        insideStart: 'insideStartTop',
+        insideMiddle: 'insideMiddleTop',
+        insideEnd: 'insideEndTop'
+    };
+    const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine)=>{
+        const { selector: selectorPoint, yValue, text = '', textPosition = 'insideEnd', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'bottom', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#212121', backgroundPadding = 2, backgroundVisible = true, offsetX = 0, offsetY = 0, lineColor = '#212121', lineStyle = 'dashed', lineVisible = true, lineWidth = 1 } = annotationVerticalLine;
+        const dataset = advancedVSeed.dataset.flat();
+        const generateOneMarkLine = (y)=>({
+                y,
+                zIndex: ANNOTATION_Z_INDEX,
+                line: {
+                    visible: lineVisible,
+                    style: {
+                        offsetX,
+                        offsetY,
+                        stroke: lineColor,
+                        lineStyle: lineStyle,
+                        lineWidth: lineWidth,
+                        lineDash: 'dashed' === lineStyle ? [
+                            5,
+                            2
+                        ] : 'dotted' === lineStyle ? [
+                            2,
+                            5
+                        ] : [
+                            0
+                        ]
+                    }
+                },
+                label: {
+                    text: text,
+                    position: positionMap[textPosition],
+                    style: {
+                        offsetX,
+                        offsetY,
+                        visible: true,
+                        textAlign: textAlign,
+                        textBaseline: textBaseline,
+                        fill: textColor,
+                        fontSize: textFontSize,
+                        fontWeight: textFontWeight
+                    },
+                    labelBackground: {
+                        visible: backgroundVisible,
+                        padding: backgroundPadding,
+                        style: {
+                            offsetX,
+                            offsetY,
+                            cornerRadius: backgroundBorderRadius ?? 4,
+                            fill: backgroundColor,
+                            stroke: backgroundBorderColor,
+                            strokeWidth: backgroundBorderWidth
+                        }
+                    }
+                },
+                endSymbol: {
+                    visible: true,
+                    style: {
+                        fill: lineColor
+                    }
+                }
+            });
+        if (!selectorPoint && isArray(yValue) || isString(yValue) || isNumber(yValue)) {
+            const yValueArr = Array.isArray(yValue) ? yValue : [
+                yValue
+            ];
+            return yValueArr.map(generateOneMarkLine);
+        }
+        const selectedData = dataset.filter((datum)=>selector_selector(datum, selectorPoint));
+        return selectedData.map((datum)=>{
+            const y = encoding[0]?.y?.[0];
+            if (!y) return {};
+            return generateOneMarkLine(datum[y]);
+        });
+    });
+    const specMarkLine = spec.markLine || [];
+    const newMarkLine = [
+        ...specMarkLine,
+        ...markLine || []
+    ];
+    return {
+        ...spec,
+        markLine: newMarkLine
+    };
+};
+const annotationArea_annotationArea = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { annotation } = advancedVSeed;
+    if (!annotation || !annotation.annotationArea) return spec;
+    const { annotationArea } = annotation;
+    const annotationAreaList = Array.isArray(annotationArea) ? annotationArea : [
+        annotationArea
+    ];
+    const positionMap = {
+        top: 'insideTop',
+        topRight: 'insideTopRight',
+        topLeft: 'insideTopLeft',
+        bottom: 'insideBottom',
+        bottomLeft: 'insideBottomLeft',
+        bottomRight: 'insideBottomRight',
+        left: 'insideLeft',
+        right: 'insideRight'
+    };
+    const markArea = annotationAreaList.flatMap((annotationArea)=>{
+        const { selector: selectorPoint, text = '', textPosition = 'top', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'top', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#191d24', backgroundPadding = 4, backgroundVisible = true, outerPadding = 0, areaColor = '#888888', areaColorOpacity = 0.15, areaBorderColor, areaBorderRadius, areaBorderWidth } = annotationArea;
+        const dataset = advancedVSeed.dataset.flat();
+        const selectedData = dataset.filter((datum)=>selector_selector(datum, selectorPoint));
+        return {
+            zIndex: ANNOTATION_Z_INDEX,
+            regionRelative: true,
+            positions: (data, context)=>{
+                const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
+                const xyList = positionData.map((datum)=>context.dataToPosition(datum));
+                const yAxisHelper = context.getYAxisHelper();
+                const xAxisHelper = context.getXAxisHelper();
+                if ('function' == typeof xAxisHelper?.getBandwidth) {
+                    const yScale = yAxisHelper.getScale();
+                    const minX = Math.min(...xyList.map((item)=>item.x)) - outerPadding;
+                    const maxX = Math.max(...xyList.map((item)=>item.x)) + outerPadding;
+                    const minY = Math.min(...yScale.range());
+                    const maxY = Math.max(...yScale.range());
+                    return [
+                        {
+                            x: minX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: maxY
+                        },
+                        {
+                            x: minX,
+                            y: maxY
+                        }
+                    ];
+                }
+                if ('function' == typeof yAxisHelper?.getBandwidth) {
+                    const xScale = xAxisHelper.getScale();
+                    const minY = Math.min(...xyList.map((item)=>item.y)) - outerPadding;
+                    const maxY = Math.max(...xyList.map((item)=>item.y)) + outerPadding;
+                    const minX = Math.min(...xScale.range());
+                    const maxX = Math.max(...xScale.range());
+                    return [
+                        {
+                            x: minX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: maxY
+                        },
+                        {
+                            x: minX,
+                            y: maxY
+                        }
+                    ];
+                }
+                return [];
+            },
+            label: {
+                position: positionMap[textPosition],
+                visible: true,
+                text: text,
+                style: {
+                    textAlign: textAlign,
+                    textBaseline: textBaseline,
+                    fill: textColor,
+                    fontSize: textFontSize,
+                    fontWeight: textFontWeight
+                },
+                labelBackground: {
+                    visible: backgroundVisible,
+                    padding: backgroundPadding,
+                    style: {
+                        cornerRadius: backgroundBorderRadius ?? 4,
+                        fill: backgroundColor,
+                        stroke: backgroundBorderColor,
+                        strokeWidth: backgroundBorderWidth
+                    }
+                }
+            },
+            area: {
+                style: {
+                    visible: true,
+                    fill: areaColor,
+                    fillOpacity: areaColorOpacity,
+                    stroke: areaBorderColor,
+                    strokeWidth: areaBorderWidth,
+                    cornerRadius: areaBorderRadius
+                }
+            }
+        };
+    });
+    return {
+        ...spec,
+        markArea: markArea
+    };
+};
+const annotationAreaBand = (spec, context)=>{
+    const { advancedVSeed } = context;
+    const { annotation } = advancedVSeed;
+    if (!annotation || !annotation.annotationArea) return spec;
+    const { annotationArea } = annotation;
+    const annotationAreaList = Array.isArray(annotationArea) ? annotationArea : [
+        annotationArea
+    ];
+    const positionMap = {
+        top: 'insideTop',
+        topRight: 'insideTopRight',
+        topLeft: 'insideTopLeft',
+        bottom: 'insideBottom',
+        bottomLeft: 'insideBottomLeft',
+        bottomRight: 'insideBottomRight',
+        left: 'insideLeft',
+        right: 'insideRight'
+    };
+    const markArea = annotationAreaList.flatMap((annotationArea)=>{
+        const { selector: selectorPoint, text = '', textPosition = 'top', textColor = '#ffffff', textFontSize = 12, textFontWeight = 400, textAlign = 'center', textBaseline = 'top', backgroundBorderColor, backgroundBorderRadius = 4, backgroundBorderWidth = 1, backgroundColor = '#191d24', backgroundPadding = 4, backgroundVisible = true, outerPadding = 8, areaColor = '#888888', areaColorOpacity = 0.15, areaBorderColor, areaBorderRadius, areaBorderWidth } = annotationArea;
+        const dataset = advancedVSeed.dataset.flat();
+        const selectedData = dataset.filter((datum)=>selector_selector(datum, selectorPoint));
+        return {
+            zIndex: ANNOTATION_Z_INDEX,
+            regionRelative: true,
+            positions: (data, context)=>{
+                const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
+                const xyList = positionData.map((datum)=>context.dataToPosition(datum));
+                const yAxisHelper = context.getYAxisHelper();
+                const xAxisHelper = context.getXAxisHelper();
+                if ('function' == typeof xAxisHelper?.getBandwidth) {
+                    const depth = context.fieldX.length ?? 0;
+                    const xBandWidth = xAxisHelper?.getBandwidth?.(depth - 1);
+                    const yScale = yAxisHelper.getScale();
+                    const minX = Math.min(...xyList.map((item)=>item.x)) - outerPadding;
+                    const maxX = Math.max(...xyList.map((item)=>item.x)) + xBandWidth + outerPadding;
+                    const minY = Math.min(...yScale.range());
+                    const maxY = Math.max(...yScale.range());
+                    return [
+                        {
+                            x: minX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: maxY
+                        },
+                        {
+                            x: minX,
+                            y: maxY
+                        }
+                    ];
+                }
+                if ('function' == typeof yAxisHelper?.getBandwidth) {
+                    const depth = context.fieldY.length ?? 0;
+                    const yBandWidth = yAxisHelper?.getBandwidth?.(depth - 1);
+                    const xScale = xAxisHelper.getScale();
+                    const minY = Math.min(...xyList.map((item)=>item.y)) - outerPadding;
+                    const maxY = Math.max(...xyList.map((item)=>item.y)) + yBandWidth + outerPadding;
+                    const minX = Math.min(...xScale.range());
+                    const maxX = Math.max(...xScale.range());
+                    return [
+                        {
+                            x: minX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: minY
+                        },
+                        {
+                            x: maxX,
+                            y: maxY
+                        },
+                        {
+                            x: minX,
+                            y: maxY
+                        }
+                    ];
+                }
+                return [];
+            },
+            label: {
+                position: positionMap[textPosition],
+                visible: true,
+                text: text,
+                style: {
+                    textAlign: textAlign,
+                    textBaseline: textBaseline,
+                    fill: textColor,
+                    fontSize: textFontSize,
+                    fontWeight: textFontWeight
+                },
+                labelBackground: {
+                    visible: backgroundVisible,
+                    padding: backgroundPadding,
+                    style: {
+                        cornerRadius: backgroundBorderRadius ?? 4,
+                        fill: backgroundColor,
+                        stroke: backgroundBorderColor,
+                        strokeWidth: backgroundBorderWidth
+                    }
+                }
+            },
+            area: {
+                style: {
+                    visible: true,
+                    fill: areaColor,
+                    fillOpacity: areaColorOpacity,
+                    stroke: areaBorderColor,
+                    strokeWidth: areaBorderWidth,
+                    cornerRadius: areaBorderRadius
+                }
+            }
+        };
+    });
+    return {
+        ...spec,
+        markArea: markArea
+    };
+};
+const verticalCrosshairLine = (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.xField = {
+        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 verticalCrosshairRect = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed, vseed } = context;
+    const { chartType } = vseed;
+    const config = advancedVSeed.config?.[chartType]?.crosshairRect;
+    if (!config) return result;
+    if (!result.crosshair) result.crosshair = {};
+    const { visible = true, rectColor, labelColor, labelVisible, labelBackgroundColor } = config;
+    const crosshair = result.crosshair;
+    crosshair.xField = {
+        visible,
+        line: {
+            type: 'rect',
+            style: {
+                lineWidth: 0,
+                opacity: 0.2,
+                fill: rectColor
+            }
+        },
+        label: {
+            visible: labelVisible,
+            labelBackground: {
+                visible: labelVisible,
+                style: {
+                    fill: labelBackgroundColor
+                }
+            },
+            style: {
+                fill: labelColor
+            }
+        }
+    };
+    return result;
+};
+const horizontalCrosshairRect = (spec, context)=>{
+    const result = {
+        ...spec
+    };
+    const { advancedVSeed, vseed } = context;
+    const { chartType } = vseed;
+    const config = advancedVSeed.config?.[chartType]?.crosshairRect;
+    if (!config) return result;
+    if (!result.crosshair) result.crosshair = {};
+    const { visible = true, rectColor, labelColor, labelVisible, labelBackgroundColor } = config;
+    const crosshair = result.crosshair;
+    crosshair.yField = {
+        visible,
+        line: {
+            type: 'rect',
+            style: {
+                lineWidth: 0,
+                opacity: 0.2,
+                fill: rectColor
+            }
+        },
+        label: {
+            visible: labelVisible,
+            labelBackground: {
+                visible: labelVisible,
+                style: {
+                    fill: labelBackgroundColor
+                }
+            },
+            style: {
+                fill: labelColor
+            }
+        }
+    };
+    return result;
+};
+const line_line = [
+    initLine,
+    color_color,
+    background_backgroundColor,
+    dataset_dataset,
+    xBand,
+    yLinear,
+    label_label,
+    tooltip_tooltip,
+    verticalCrosshairLine,
+    discreteLegend,
+    pointStyle_pointStyle,
+    lineStyle_lineStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
+];
+const pivotLine = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsRow,
+    datasetPivot,
+    pivotIndicators([
+        initLine,
+        color_color,
+        background_backgroundColor,
+        datasetPivotPlaceholder,
+        xBand,
+        yLinear,
+        label_label,
+        tooltip_tooltip,
+        verticalCrosshairLine,
+        pointStyle_pointStyle,
+        lineStyle_lineStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
+    ]),
+    pivotRowDimensions,
+    pivotColumnDimensions,
+    pivotDiscreteLegend
+];
+const lineSpecPipeline = [
+    pivotAdapter_pivotAdapter(line_line, pivotLine)
+];
+const column = [
+    initColumn,
+    stackCornerRadius_stackCornerRadius,
+    stackInverse,
+    color_color,
+    background_backgroundColor,
+    dataset_dataset,
+    xBand,
+    yLinear,
+    label_label,
+    tooltip_tooltip,
+    verticalCrosshairRect,
+    discreteLegend,
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
+];
+const pivotColumn = [
+    initPivot,
+    pivotGridStyle,
+    pivotIndicators_pivotIndicatorsAsRow,
+    datasetPivot,
+    pivotIndicators([
+        initColumn,
+        stackCornerRadius_stackCornerRadius,
+        stackInverse,
+        color_color,
+        background_backgroundColor,
+        datasetPivotPlaceholder,
+        xBand,
+        yLinear,
+        label_label,
+        tooltip_tooltip,
+        verticalCrosshairRect,
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2086,6 +3006,7 @@ const columnSpecPipeline = [
 ];
 const columnParallel = [
     initColumnParallel,
+    stackCornerRadius_stackCornerRadius,
     color_color,
     background_backgroundColor,
     dataset_dataset,
@@ -2094,8 +3015,12 @@ const columnParallel = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
+    verticalCrosshairRect,
     barStyle_barStyle,
-    annotationPoint_annotationPoint
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotColumnParallel = [
     initPivot,
@@ -2104,6 +3029,7 @@ const pivotColumnParallel = [
     datasetPivot,
     pivotIndicators([
         initColumnParallel,
+        stackCornerRadius_stackCornerRadius,
         color_color,
         background_backgroundColor,
         datasetPivotPlaceholder,
@@ -2111,8 +3037,12 @@ const pivotColumnParallel = [
         yLinear,
         label_label,
         tooltip_tooltip,
+        verticalCrosshairRect,
         barStyle_barStyle,
-        annotationPoint_annotationPoint
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2123,6 +3053,7 @@ const columnParallelSpecPipeline = [
 ];
 const columnPercent = [
     initColumn,
+    stackCornerRadius_stackCornerRadius,
     stackInverse,
     color_color,
     background_backgroundColor,
@@ -2132,9 +3063,13 @@ const columnPercent = [
     yLinear,
     label_label,
     tooltip_tooltip,
+    verticalCrosshairRect,
     discreteLegend,
     barStyle_barStyle,
-    annotationPoint_annotationPoint
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotColumnPercent = [
     initPivot,
@@ -2143,6 +3078,7 @@ const pivotColumnPercent = [
     datasetPivot,
     pivotIndicators([
         initColumn,
+        stackCornerRadius_stackCornerRadius,
         stackInverse,
         color_color,
         percent,
@@ -2152,8 +3088,12 @@ const pivotColumnPercent = [
         yLinear,
         label_label,
         tooltip_tooltip,
+        verticalCrosshairRect,
         barStyle_barStyle,
-        annotationPoint_annotationPoint
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2164,6 +3104,7 @@ const columnPercentSpecPipeline = [
 ];
 const bar = [
     initBar,
+    stackCornerRadius_stackCornerRadius,
     color_color,
     background_backgroundColor,
     dataset_dataset,
@@ -2171,9 +3112,13 @@ const bar = [
     yBand,
     label_label,
     tooltip_tooltip,
+    horizontalCrosshairRect,
     discreteLegend,
     barStyle_barStyle,
-    annotationPoint_annotationPoint
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotBar = [
     initPivot,
@@ -2182,6 +3127,7 @@ const pivotBar = [
     datasetPivot,
     pivotIndicators([
         initBar,
+        stackCornerRadius_stackCornerRadius,
         color_color,
         background_backgroundColor,
         datasetPivotPlaceholder,
@@ -2189,8 +3135,12 @@ const pivotBar = [
         label_label,
         label_label,
         tooltip_tooltip,
+        horizontalCrosshairRect,
         barStyle_barStyle,
-        annotationPoint_annotationPoint
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2201,6 +3151,7 @@ const barSpecPipeline = [
 ];
 const barParallel = [
     initBarParallel,
+    stackCornerRadius_stackCornerRadius,
     color_color,
     background_backgroundColor,
     dataset_dataset,
@@ -2208,9 +3159,13 @@ const barParallel = [
     yBand,
     label_label,
     tooltip_tooltip,
+    horizontalCrosshairRect,
     discreteLegend,
     barStyle_barStyle,
-    annotationPoint_annotationPoint
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotBarParallel = [
     initPivot,
@@ -2219,6 +3174,7 @@ const pivotBarParallel = [
     datasetPivot,
     pivotIndicators([
         initBarParallel,
+        stackCornerRadius_stackCornerRadius,
         color_color,
         background_backgroundColor,
         datasetPivotPlaceholder,
@@ -2226,8 +3182,12 @@ const pivotBarParallel = [
         xLinear,
         label_label,
         tooltip_tooltip,
+        horizontalCrosshairRect,
         barStyle_barStyle,
-        annotationPoint_annotationPoint
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2238,6 +3198,7 @@ const barParallelSpecPipeline = [
 ];
 const barPercent = [
     initBar,
+    stackCornerRadius_stackCornerRadius,
     color_color,
     background_backgroundColor,
     percent,
@@ -2246,9 +3207,13 @@ const barPercent = [
     yBand,
     label_label,
     tooltip_tooltip,
+    horizontalCrosshairRect,
     discreteLegend,
     barStyle_barStyle,
-    annotationPoint_annotationPoint
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotBarPercent = [
     initPivot,
@@ -2257,6 +3222,7 @@ const pivotBarPercent = [
     datasetPivot,
     pivotIndicators([
         initBar,
+        stackCornerRadius_stackCornerRadius,
         color_color,
         background_backgroundColor,
         percent,
@@ -2265,8 +3231,12 @@ const pivotBarPercent = [
         xLinear,
         label_label,
         tooltip_tooltip,
+        horizontalCrosshairRect,
         barStyle_barStyle,
-        annotationPoint_annotationPoint
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2285,8 +3255,15 @@ const area_area = [
     yLinear,
     label_label,
     tooltip_tooltip,
+    verticalCrosshairLine,
     discreteLegend,
-    annotationPoint_annotationPoint
+    pointStyle_pointStyle,
+    lineStyle_lineStyle,
+    areaStyle_areaStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
 ];
 const pivotArea = [
     initPivot,
@@ -2303,7 +3280,14 @@ const pivotArea = [
         yLinear,
         label_label,
         tooltip_tooltip,
-        annotationPoint_annotationPoint
+        verticalCrosshairLine,
+        pointStyle_pointStyle,
+        lineStyle_lineStyle,
+        areaStyle_areaStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2323,8 +3307,15 @@ const areaPercent = [
     yLinear,
     label_label,
     tooltip_tooltip,
+    verticalCrosshairLine,
     discreteLegend,
-    annotationPoint_annotationPoint
+    pointStyle_pointStyle,
+    lineStyle_lineStyle,
+    areaStyle_areaStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
 ];
 const pivotAreaPercent = [
     initPivot,
@@ -2342,7 +3333,14 @@ const pivotAreaPercent = [
         yLinear,
         label_label,
         tooltip_tooltip,
-        annotationPoint_annotationPoint
+        verticalCrosshairLine,
+        pointStyle_pointStyle,
+        lineStyle_lineStyle,
+        areaStyle_areaStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2359,7 +3357,10 @@ const pie = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
-    annotationPoint_annotationPoint
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
 ];
 const pivotPie = [
     initPivot,
@@ -2373,7 +3374,10 @@ const pivotPie = [
         datasetPivotPlaceholder,
         label_label,
         tooltip_tooltip,
-        annotationPoint_annotationPoint
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2415,17 +3419,17 @@ const buildSpec = (builder, advancedVSeed)=>{
     }
 };
 const build = (builder)=>{
-    console.log('debug vseed', builder.vseed);
     const advancedVSeed = builder.buildAdvanced();
-    console.log('debug advancedVSeed', advancedVSeed);
+    builder.advancedVSeed = advancedVSeed;
     if (!advancedVSeed) throw new Error('advancedVSeed is null');
     const spec = builder.buildSpec(advancedVSeed);
-    console.log('debug spec', spec);
+    builder.spec = spec;
     return spec;
 };
 class Builder {
     _vseed;
     _advancedVSeed = null;
+    _spec = null;
     constructor(vseed){
         this._vseed = vseed;
     }
@@ -2448,6 +3452,12 @@ class Builder {
     set advancedVSeed(value) {
         this._advancedVSeed = value;
     }
+    get spec() {
+        return this._spec;
+    }
+    set spec(value) {
+        this._spec = value;
+    }
     static _advancedPipelineMap = {};
     static _specPipelineMap = {};
     static _themeMap = {};
@@ -2533,7 +3543,7 @@ const darkTheme = ()=>{
         labelAutoHideGap: 4,
         labelAutoLimit: true,
         labelAutoLimitLength: 100,
-        labelAutoRotate: true,
+        labelAutoRotate: false,
         labelAutoRotateAngleRange: [
             0,
             -45,
@@ -2570,6 +3580,33 @@ const darkTheme = ()=>{
             lineWidth: 1
         }
     };
+    const barBandAxis = {
+        ...bandAxis,
+        labelAutoHide: false,
+        labelAutoHideGap: 1,
+        labelAutoLimit: false,
+        labelAutoLimitLength: void 0,
+        labelAutoRotate: false,
+        labelAutoRotateAngleRange: [
+            0,
+            -45,
+            -90
+        ]
+    };
+    const crosshairLine = {
+        visible: true,
+        labelVisible: true,
+        lineColor: '#E2E3E6',
+        labelColor: '#4B4F54',
+        labelBackgroundColor: '#ffffff'
+    };
+    const crosshairRect = {
+        visible: true,
+        labelVisible: true,
+        lineColor: '#E2E3E6',
+        labelColor: '#4B4F54',
+        labelBackgroundColor: '#ffffff'
+    };
     return {
         baseConfig: {
             vtable: {
@@ -2612,39 +3649,84 @@ const darkTheme = ()=>{
         config: {
             line: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairLine: crosshairLine
             },
             column: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairRect: crosshairRect,
+                stackCornerRadius: [
+                    4,
+                    4,
+                    0,
+                    0
+                ]
             },
             columnParallel: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairRect: crosshairRect,
+                stackCornerRadius: [
+                    4,
+                    4,
+                    0,
+                    0
+                ]
             },
             columnPercent: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairRect: crosshairRect,
+                stackCornerRadius: [
+                    4,
+                    4,
+                    0,
+                    0
+                ]
             },
             bar: {
                 xAxis: linearAxis,
-                yAxis: bandAxis
+                yAxis: barBandAxis,
+                crosshairRect: crosshairRect,
+                stackCornerRadius: [
+                    0,
+                    4,
+                    4,
+                    0
+                ]
             },
             barParallel: {
                 xAxis: linearAxis,
-                yAxis: bandAxis
+                yAxis: barBandAxis,
+                crosshairRect: crosshairRect,
+                stackCornerRadius: [
+                    0,
+                    4,
+                    4,
+                    0
+                ]
             },
             barPercent: {
                 xAxis: linearAxis,
-                yAxis: bandAxis
+                yAxis: barBandAxis,
+                crosshairRect: crosshairRect,
+                stackCornerRadius: [
+                    0,
+                    4,
+                    4,
+                    0
+                ]
             },
             area: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairLine: crosshairLine
             },
             areaPercent: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairLine: crosshairLine
             }
         }
     };
@@ -2690,7 +3772,7 @@ const lightTheme = ()=>{
         labelAutoHideGap: 4,
         labelAutoLimit: true,
         labelAutoLimitLength: 100,
-        labelAutoRotate: true,
+        labelAutoRotate: false,
         labelAutoRotateAngleRange: [
             0,
             -45,
@@ -2740,6 +3822,20 @@ const lightTheme = ()=>{
             -90
         ]
     };
+    const crosshairLine = {
+        visible: true,
+        labelVisible: true,
+        lineColor: '#3641594d',
+        labelColor: '#ffffff',
+        labelBackgroundColor: '#364159'
+    };
+    const crosshairRect = {
+        visible: true,
+        labelVisible: true,
+        rectColor: '#3641594d',
+        labelColor: '#ffffff',
+        labelBackgroundColor: '#364159'
+    };
     return {
         baseConfig: {
             vtable: {
@@ -2782,45 +3878,94 @@ const lightTheme = ()=>{
         config: {
             line: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairLine
             },
             column: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairRect,
+                stackCornerRadius: [
+                    4,
+                    4,
+                    0,
+                    0
+                ]
             },
             columnParallel: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairRect,
+                stackCornerRadius: [
+                    4,
+                    4,
+                    0,
+                    0
+                ]
             },
             columnPercent: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairRect,
+                stackCornerRadius: [
+                    4,
+                    4,
+                    0,
+                    0
+                ]
             },
             bar: {
                 xAxis: linearAxis,
-                yAxis: barBandAxis
+                yAxis: barBandAxis,
+                crosshairRect,
+                stackCornerRadius: [
+                    0,
+                    4,
+                    4,
+                    0
+                ]
             },
             barParallel: {
                 xAxis: linearAxis,
-                yAxis: barBandAxis
+                yAxis: barBandAxis,
+                crosshairRect,
+                stackCornerRadius: [
+                    0,
+                    4,
+                    4,
+                    0
+                ]
             },
             barPercent: {
                 xAxis: linearAxis,
-                yAxis: barBandAxis
+                yAxis: barBandAxis,
+                crosshairRect,
+                stackCornerRadius: [
+                    0,
+                    4,
+                    4,
+                    0
+                ]
             },
             area: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairLine
             },
             areaPercent: {
                 xAxis: bandAxis,
-                yAxis: linearAxis
+                yAxis: linearAxis,
+                crosshairLine
             }
         }
     };
 };
 const registerCustomTheme = (key, themeConfig)=>{
-    Builder._themeMap[key] = themeConfig;
+    const customTheme = 'function' == typeof themeConfig ? themeConfig({
+        lightTheme: lightTheme(),
+        darkTheme: darkTheme()
+    }) : themeConfig;
+    Builder._themeMap[key] = customTheme;
 };
 const registerLightTheme = ()=>{
     registerCustomTheme('light', lightTheme());
@@ -2872,29 +4017,30 @@ const zDimension = z.object({
     ])
 });
 const zDimensions = z.array(zDimension).optional();
+const zNumFormat = z.object({
+    type: z["enum"]([
+        'number',
+        'percent',
+        'permille'
+    ]).default('number').optional(),
+    ratio: z.number().default(1).optional(),
+    symbol: z.string().default('').optional(),
+    thousandSeparator: z.boolean().default(false).optional(),
+    decimalPlaces: z.number().default(2).optional(),
+    round: z["enum"]([
+        'round',
+        'floor',
+        'ceil'
+    ]).default('round').optional(),
+    prefix: z.string().default('').optional(),
+    suffix: z.string().default('').optional()
+}).optional();
 const zMeasure = z.object({
     id: z.string(),
     alias: z.string().optional(),
     visible: z.boolean().default(true).optional(),
     autoFormat: z.boolean().default(true).optional(),
-    format: z.object({
-        type: z["enum"]([
-            'number',
-            'percent',
-            'permille'
-        ]).optional().default('number'),
-        ratio: z.number().optional().default(1),
-        symbol: z.string().optional().default(''),
-        thousandSeparator: z.boolean().optional().default(false),
-        decimalPlaces: z.number().optional().default(2),
-        round: z["enum"]([
-            'round',
-            'floor',
-            'ceil'
-        ]).optional().default('round'),
-        prefix: z.string().optional().default(''),
-        suffix: z.string().optional().default('')
-    }).optional()
+    format: zNumFormat.optional()
 });
 const zMeasureGroup = z.object({
     id: z.string(),
@@ -3139,42 +4285,77 @@ const zXLinearAxis = z.object({
     }).optional()
 });
 const zYLinearAxis = zXLinearAxis;
+const zCrosshairLine = z.object({
+    visible: z.boolean().optional(),
+    lineColor: z.string().optional(),
+    labelColor: z.string().optional(),
+    labelVisible: z.boolean().optional(),
+    labelBackgroundColor: z.string().optional()
+});
+const zCrosshairRect = z.object({
+    visible: z.boolean().optional(),
+    rectColor: z.string().optional(),
+    labelColor: z.string().optional(),
+    labelVisible: z.boolean().optional(),
+    labelBackgroundColor: z.string().optional()
+});
+const zStackCornerRadius = z.number().or(z.array(z.number())).default([
+    3,
+    3,
+    0,
+    0
+]);
 const zConfig = z.object({
     line: z.object({
-        xAxis: zXBandAxis,
-        yAxis: zYLinearAxis
+        xAxis: zXBandAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairLine: zCrosshairLine.optional()
     }).optional(),
     column: z.object({
-        xAxis: zXBandAxis,
-        yAxis: zYLinearAxis
+        xAxis: zXBandAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairRect: zCrosshairRect.optional(),
+        stackCornerRadius: zStackCornerRadius.optional()
     }).optional(),
     columnParallel: z.object({
-        xAxis: zXBandAxis,
-        yAxis: zYLinearAxis
+        xAxis: zXBandAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairRect: zCrosshairRect.optional(),
+        stackCornerRadius: zStackCornerRadius.optional()
     }).optional(),
     columnPercent: z.object({
-        xAxis: zXBandAxis,
-        yAxis: zYLinearAxis
+        xAxis: zXBandAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairRect: zCrosshairRect.optional(),
+        stackCornerRadius: zStackCornerRadius.optional()
     }).optional(),
     bar: z.object({
-        xAxis: zXLinearAxis,
-        yAxis: zYBandAxis
+        xAxis: zXLinearAxis.optional(),
+        yAxis: zYBandAxis.optional(),
+        crosshairRect: zCrosshairRect.optional(),
+        stackCornerRadius: zStackCornerRadius.optional()
     }).optional(),
     barParallel: z.object({
-        xAxis: zXLinearAxis,
-        yAxis: zYBandAxis
+        xAxis: zXLinearAxis.optional(),
+        yAxis: zYBandAxis.optional(),
+        crosshairRect: zCrosshairRect.optional(),
+        stackCornerRadius: zStackCornerRadius.optional()
     }).optional(),
     barPercent: z.object({
-        xAxis: zXLinearAxis,
-        yAxis: zYBandAxis
+        xAxis: zXLinearAxis.optional(),
+        yAxis: zYBandAxis.optional(),
+        crosshairRect: zCrosshairRect.optional(),
+        stackCornerRadius: zStackCornerRadius.optional()
     }).optional(),
     area: z.object({
-        xAxis: zXBandAxis,
-        yAxis: zYLinearAxis
+        xAxis: zXBandAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairLine: zCrosshairLine.optional()
     }).optional(),
     areaPercent: z.object({
-        xAxis: zXBandAxis,
-        yAxis: zYLinearAxis
+        xAxis: zXBandAxis.optional(),
+        yAxis: zYLinearAxis.optional(),
+        crosshairLine: zCrosshairLine.optional()
     }).optional(),
     pie: z.object({}).optional(),
     donut: z.object({}).optional(),
@@ -3183,18 +4364,31 @@ const zConfig = z.object({
     table: z.object({}).optional(),
     pivotTable: z.object({}).optional()
 });
-const zCustomThemeConfig = z.object({
-    baseConfig: zBaseConfig.optional(),
-    config: zConfig.optional()
-});
-const zCustomTheme = z.record(z.string(), zCustomThemeConfig).optional();
-const zTheme = z.string();
 const zSelector = z.union([
     z.string(),
     z.number(),
     z.object({
         field: z.string(),
-        operator: z.string(),
+        operator: z["enum"]([
+            '=',
+            '==',
+            '!=',
+            '>',
+            '<',
+            '>=',
+            '<=',
+            'between'
+        ]).optional(),
+        op: z["enum"]([
+            '=',
+            '==',
+            '!=',
+            '>',
+            '<',
+            '>=',
+            '<=',
+            'between'
+        ]).optional(),
         value: z.union([
             z.string(),
             z.number(),
@@ -3206,7 +4400,14 @@ const zSelector = z.union([
     }),
     z.object({
         field: z.string(),
-        operator: z.string(),
+        operator: z["enum"]([
+            'in',
+            'not in'
+        ]).optional(),
+        op: z["enum"]([
+            'in',
+            'not in'
+        ]).optional(),
         value: z.union([
             z.string(),
             z.number(),
@@ -3218,33 +4419,153 @@ const zSelector = z.union([
     })
 ]);
 const zSelectors = z.array(zSelector);
-const zBarStyle = z.object({
+const zAnnotationPoint = z.object({
+    selector: z.union([
+        zSelector,
+        zSelectors
+    ]),
+    text: z.string().or(z.array(z.string())).optional(),
+    textColor: z.string().default('#ffffff').optional(),
+    textFontSize: z.number().default(12).optional(),
+    textFontWeight: z.number().default(400).optional(),
+    textAlign: z["enum"]([
+        'left',
+        'right',
+        'center'
+    ]).default('center').optional(),
+    textBaseline: z["enum"]([
+        'top',
+        'middle',
+        'bottom'
+    ]).default('middle').optional(),
+    backgroundVisible: z.boolean().default(true).optional(),
+    backgroundColor: z.string().default('#212121').optional(),
+    backgroundBorderColor: z.string().optional(),
+    backgroundBorderWidth: z.number().default(1).optional(),
+    backgroundBorderRadius: z.number().default(4).optional(),
+    backgroundPadding: z.number().optional(),
+    offsetY: z.number().default(0).optional(),
+    offsetX: z.number().default(0).optional()
+});
+const zAnnotationVerticalLine = z.object({
     selector: z.union([
         zSelector,
         zSelectors
     ]).optional(),
-    barColor: z.string().optional(),
-    barColorOpacity: z.number().optional(),
-    barBorderColor: z.string().optional(),
-    barBorderWidth: z.number().optional(),
-    barBorderStyle: z.union([
+    xValue: z.union([
+        z.number(),
+        z.string(),
+        z.array(z.union([
+            z.number(),
+            z.string()
+        ]))
+    ]).optional(),
+    text: z.string().or(z.array(z.string())).optional(),
+    textPosition: z["enum"]([
+        'outsideStart',
+        'outsideEnd',
+        'outsideMiddle',
+        'insideStart',
+        'insideMiddle',
+        'insideEnd'
+    ]).default('insideEnd').optional(),
+    textColor: z.string().default('#ffffff').optional(),
+    textFontSize: z.number().default(12).optional(),
+    textFontWeight: z.number().default(400).optional(),
+    textAlign: z["enum"]([
+        'left',
+        'right',
+        'center'
+    ]).default('right').optional(),
+    textBaseline: z["enum"]([
+        'top',
+        'middle',
+        'bottom'
+    ]).default('top').optional(),
+    lineVisible: z.boolean().optional(),
+    lineColor: z.string().optional(),
+    lineWidth: z.number().optional(),
+    lineStyle: z.union([
         z.literal('solid'),
         z.literal('dashed'),
         z.literal('dotted')
     ]).optional(),
-    barRadius: z.union([
-        z.number(),
-        z.array(z.number())
-    ]).optional()
+    backgroundVisible: z.boolean().default(true).optional(),
+    backgroundColor: z.string().default('#212121').optional(),
+    backgroundBorderColor: z.string().optional(),
+    backgroundBorderWidth: z.number().default(1).optional(),
+    backgroundBorderRadius: z.number().default(4).optional(),
+    backgroundPadding: z.number().optional(),
+    offsetY: z.number().default(0).optional(),
+    offsetX: z.number().default(0).optional()
 });
-const zMarkStyle = z.object({
-    barStyle: zBarStyle.optional()
+const zAnnotationHorizontalLine = z.object({
+    selector: z.union([
+        zSelector,
+        zSelectors
+    ]).optional(),
+    yValue: z.union([
+        z.number(),
+        z.string(),
+        z.array(z.union([
+            z.number(),
+            z.string()
+        ]))
+    ]).optional(),
+    text: z.string().or(z.array(z.string())).optional(),
+    textPosition: z["enum"]([
+        'outsideStart',
+        'outsideEnd',
+        'outsideMiddle',
+        'insideStart',
+        'insideMiddle',
+        'insideEnd'
+    ]).default('insideMiddle').optional(),
+    textColor: z.string().default('#ffffff').optional(),
+    textFontSize: z.number().default(12).optional(),
+    textFontWeight: z.number().default(400).optional(),
+    textAlign: z["enum"]([
+        'left',
+        'right',
+        'center'
+    ]).default('center').optional(),
+    textBaseline: z["enum"]([
+        'top',
+        'middle',
+        'bottom'
+    ]).default('bottom').optional(),
+    lineVisible: z.boolean().optional(),
+    lineColor: z.string().optional(),
+    lineWidth: z.number().optional(),
+    lineStyle: z.union([
+        z.literal('solid'),
+        z.literal('dashed'),
+        z.literal('dotted')
+    ]).optional(),
+    backgroundVisible: z.boolean().default(true).optional(),
+    backgroundColor: z.string().default('#212121').optional(),
+    backgroundBorderColor: z.string().optional(),
+    backgroundBorderWidth: z.number().default(1).optional(),
+    backgroundBorderRadius: z.number().default(4).optional(),
+    backgroundPadding: z.number().optional(),
+    offsetY: z.number().default(0).optional(),
+    offsetX: z.number().default(0).optional()
 });
-const zAnnotationPoint = z.object({
+const zAnnotationArea = z.object({
     selector: z.union([
         zSelector,
         zSelectors
     ]),
+    textPosition: z["enum"]([
+        'top',
+        'topRight',
+        'topLeft',
+        'bottom',
+        'bottomLeft',
+        'bottomRight',
+        'left',
+        'right'
+    ]).default('top').optional(),
     text: z.string().or(z.array(z.string())).optional(),
     textColor: z.string().default('#ffffff').optional(),
     textFontSize: z.number().default(12).optional(),
@@ -3265,12 +4586,95 @@ const zAnnotationPoint = z.object({
     backgroundBorderWidth: z.number().default(1).optional(),
     backgroundBorderRadius: z.number().default(4).optional(),
     backgroundPadding: z.number().optional(),
-    offsetY: z.number().default(0).optional(),
-    offsetX: z.number().default(0).optional()
+    areaColor: z.string().default('red').optional(),
+    areaColorOpacity: z.number().default(0.5).optional(),
+    areaBorderColor: z.number().optional(),
+    areaBorderWidth: z.number().default(2).optional(),
+    areaBorderRadius: z.number().default(4).optional(),
+    outerPadding: z.number().optional()
 });
 const zAnnotation = z.object({
-    annotationPoint: zAnnotationPoint.or(z.array(zAnnotationPoint)).optional()
+    annotationPoint: zAnnotationPoint.or(z.array(zAnnotationPoint)).optional(),
+    annotationVerticalLine: zAnnotationVerticalLine.or(z.array(zAnnotationVerticalLine)).optional(),
+    annotationHorizontalLine: zAnnotationHorizontalLine.or(z.array(zAnnotationHorizontalLine)).optional(),
+    annotationArea: zAnnotationArea.or(z.array(zAnnotationArea)).optional()
+});
+const zBarStyle = z.object({
+    selector: z.union([
+        zSelector,
+        zSelectors
+    ]).optional(),
+    barColor: z.string().optional(),
+    barColorOpacity: z.number().optional(),
+    barBorderColor: z.string().optional(),
+    barBorderWidth: z.number().optional(),
+    barBorderStyle: z.union([
+        z.literal('solid'),
+        z.literal('dashed'),
+        z.literal('dotted')
+    ]).optional(),
+    barRadius: z.union([
+        z.number(),
+        z.array(z.number())
+    ]).optional()
+});
+const zPointStyle = z.object({
+    selector: z.union([
+        zSelector,
+        zSelectors
+    ]).optional(),
+    pointSize: z.number().optional(),
+    pointColor: z.string().optional(),
+    pointColorOpacity: z.number().optional(),
+    pointBorderColor: z.string().optional(),
+    pointBorderWidth: z.number().optional(),
+    pointBorderStyle: z.union([
+        z["enum"]([
+            'solid',
+            'dashed',
+            'dotted'
+        ])
+    ]).optional()
+});
+const zLineStyle = z.object({
+    selector: z.union([
+        zSelector,
+        zSelectors
+    ]).optional(),
+    lineSmooth: z.boolean().default(true).optional(),
+    lineColor: z.string().optional(),
+    lineColorOpacity: z.number().optional(),
+    lineWidth: z.number().optional(),
+    lineStyle: z.union([
+        z["enum"]([
+            'solid',
+            'dashed',
+            'dotted'
+        ])
+    ]).optional()
+});
+const zAreaStyle = z.object({
+    selector: z.union([
+        zSelector,
+        zSelectors
+    ]).optional(),
+    areaColor: z.string().optional(),
+    areaColorOpacity: z.number().optional()
 });
-export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, darkTheme, dataReshapeFor1D1M, dataReshapeFor2D1M, execPipeline, foldMeasures, 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, zAnnotationPoint, zAxis, zBackgroundColor, zBarStyle, zBaseConfig, zChartType, zColor, zConfig, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensions, zEncoding, zFoldInfo, zLabel, zLegend, zMarkStyle, zMeasure, zMeasureGroup, zMeasures, zTheme, zTooltip, zUnfoldInfo, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
+const zMarkStyle = z.object({
+    barStyle: zBarStyle.or(z.array(zBarStyle)).optional(),
+    pointStyle: zPointStyle.or(z.array(zPointStyle)).optional(),
+    lineStyle: zLineStyle.or(z.array(zLineStyle)).optional(),
+    areaStyle: zAreaStyle.or(z.array(zAreaStyle)).optional()
+});
+const zCustomThemeConfig = z.object({
+    baseConfig: zBaseConfig.optional(),
+    config: zConfig.optional(),
+    annotation: zAnnotation.optional(),
+    markStyle: zMarkStyle.optional()
+});
+const zCustomTheme = z.record(z.string(), zCustomThemeConfig).optional();
+const zTheme = z.string();
+export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D1M, dataReshapeFor2D1M, execPipeline, findMeasureById, foldMeasures, 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, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
 
 //# sourceMappingURL=index.js.map