@visactor/vseed 0.0.9 → 0.0.11

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, 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;
@@ -639,6 +639,19 @@ const markStyle_markStyle = (advancedVSeed, context)=>{
         markStyle
     };
 };
+const annotation_annotation = (advancedVSeed, context)=>{
+    const { vseed } = context;
+    const annotation = external_remeda_pick(vseed, [
+        'annotationPoint',
+        'annotationHorizontalLine',
+        'annotationVerticalLine',
+        'annotationArea'
+    ]);
+    return {
+        ...advancedVSeed,
+        annotation
+    };
+};
 const lineAdvancedPipeline = [
     initAdvancedVSeed,
     autoMeasures,
@@ -651,7 +664,8 @@ const lineAdvancedPipeline = [
     encodingXY,
     vchartBaseConfig,
     lineConfig,
-    vchartTheme
+    vchartTheme,
+    annotation_annotation
 ];
 const barAdvancedPipeline = [
     initAdvancedVSeed,
@@ -666,7 +680,8 @@ const barAdvancedPipeline = [
     barConfig,
     vchartBaseConfig,
     vchartTheme,
-    markStyle_markStyle
+    markStyle_markStyle,
+    annotation_annotation
 ];
 const barParallelAdvancedPipeline = [
     initAdvancedVSeed,
@@ -681,7 +696,8 @@ const barParallelAdvancedPipeline = [
     barParallelConfig,
     vchartBaseConfig,
     vchartTheme,
-    markStyle_markStyle
+    markStyle_markStyle,
+    annotation_annotation
 ];
 const barPercentAdvancedPipeline = [
     initAdvancedVSeed,
@@ -696,7 +712,8 @@ const barPercentAdvancedPipeline = [
     barPercentConfig,
     vchartBaseConfig,
     vchartTheme,
-    markStyle_markStyle
+    markStyle_markStyle,
+    annotation_annotation
 ];
 const columnAdvancedPipeline = [
     initAdvancedVSeed,
@@ -711,7 +728,8 @@ const columnAdvancedPipeline = [
     columnConfig,
     vchartBaseConfig,
     vchartTheme,
-    markStyle_markStyle
+    markStyle_markStyle,
+    annotation_annotation
 ];
 const columnParallelAdvancedPipeline = [
     initAdvancedVSeed,
@@ -726,7 +744,8 @@ const columnParallelAdvancedPipeline = [
     columnParallelConfig,
     vchartBaseConfig,
     vchartTheme,
-    markStyle_markStyle
+    markStyle_markStyle,
+    annotation_annotation
 ];
 const columnPercentAdvancedPipeline = [
     initAdvancedVSeed,
@@ -741,7 +760,8 @@ const columnPercentAdvancedPipeline = [
     columnPercentConfig,
     vchartBaseConfig,
     vchartTheme,
-    markStyle_markStyle
+    markStyle_markStyle,
+    annotation_annotation
 ];
 const areaAdvancedPipeline = [
     initAdvancedVSeed,
@@ -755,7 +775,8 @@ const areaAdvancedPipeline = [
     encodingXY,
     areaConfig,
     vchartBaseConfig,
-    vchartTheme
+    vchartTheme,
+    annotation_annotation
 ];
 const areaPercentAdvancedPipeline = [
     initAdvancedVSeed,
@@ -769,7 +790,8 @@ const areaPercentAdvancedPipeline = [
     encodingXY,
     areaPercentConfig,
     vchartBaseConfig,
-    vchartTheme
+    vchartTheme,
+    annotation_annotation
 ];
 const pieAdvancedPipeline = [
     initAdvancedVSeed,
@@ -783,7 +805,8 @@ const pieAdvancedPipeline = [
     encodingPolar,
     pieConfig,
     vchartBaseConfig,
-    vchartTheme
+    vchartTheme,
+    annotation_annotation
 ];
 const dataset_dataset = (spec, context)=>{
     const { advancedVSeed } = context;
@@ -1812,11 +1835,13 @@ const selector_selector = (datum, 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 '!=':
@@ -1841,11 +1866,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;
     }
@@ -1853,19 +1887,32 @@ 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;
@@ -1879,23 +1926,23 @@ const barStyle_barStyle = (spec, context)=>{
         ...result,
         bar: {
             style: {
-                fill: (datum, context)=>{
+                fill: barColor ? (datum, context)=>{
                     if (selector_selector(datum, barSelector)) return barColor;
                     return context.seriesColor(datum[encoding[0]?.group?.[0]]);
-                },
-                fillOpacity: (datum)=>{
+                } : void 0,
+                fillOpacity: barColorOpacity ? (datum)=>{
                     if (selector_selector(datum, barSelector)) return barColorOpacity;
                     return 1;
-                },
-                stroke: (datum, context)=>{
+                } : void 0,
+                stroke: barBorderColor ? (datum, context)=>{
                     if (selector_selector(datum, barSelector)) return barBorderColor;
                     return context.seriesColor(datum[encoding[0]?.group?.[0]]);
-                },
-                lineWidth: (datum)=>{
+                } : void 0,
+                lineWidth: barBorderWidth ? (datum)=>{
                     if (selector_selector(datum, barSelector)) return barBorderWidth;
                     return 0;
-                },
-                lineDash: (datum)=>{
+                } : void 0,
+                lineDash: barBorderStyle ? (datum)=>{
                     if (selector_selector(datum, barSelector)) {
                         if ('solid' === barBorderStyle) ;
                         else if ('dashed' === barBorderStyle) return [
@@ -1911,15 +1958,518 @@ const barStyle_barStyle = (spec, context)=>{
                         0,
                         0
                     ];
-                },
-                cornerRadius: (datum)=>{
+                } : void 0,
+                cornerRadius: barRadius ? (datum)=>{
                     if (selector_selector(datum, barSelector)) return barRadius;
                     return 0;
-                }
+                } : void 0
             }
         }
     };
 };
+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;
+    if (!annotation || !annotation.annotationPoint) return spec;
+    const { annotationPoint } = annotation;
+    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
+        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 = 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)=>({
+                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 {
+                            x,
+                            y: y
+                        };
+                    }
+                },
+                itemLine: {
+                    visible: false
+                },
+                itemContent: {
+                    offsetY,
+                    offsetX,
+                    text: {
+                        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
+                            }
+                        }
+                    }
+                }
+            }));
+    });
+    return {
+        ...spec,
+        markPoint
+    };
+};
+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,
+                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 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,
+                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 = 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 {
+            regionRelative: true,
+            positions: (data, context)=>{
+                console.log('debug selectedData', selectedData);
+                const positionData = data.filter((item)=>selectedData.some((datum)=>isSubset(datum, item)));
+                const xyList = positionData.map((datum)=>context.dataToPosition(datum));
+                const xScale = context.scaleX;
+                const yScale = context.scaleY;
+                const xBandWidth = xScale?.bandwidth?.();
+                const yBandWidth = yScale?.bandwidth?.();
+                if (xBandWidth) {
+                    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 (yBandWidth) {
+                    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 {
+            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 xScale = context.scaleX;
+                const yScale = context.scaleY;
+                const xBandWidth = xScale?.bandwidth?.();
+                const yBandWidth = yScale?.bandwidth?.();
+                if (xBandWidth) {
+                    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 (yBandWidth) {
+                    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 line_line = [
     initLine,
     color_color,
@@ -1929,7 +2479,11 @@ const line_line = [
     yLinear,
     label_label,
     tooltip_tooltip,
-    discreteLegend
+    discreteLegend,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
 ];
 const pivotLine = [
     initPivot,
@@ -1944,7 +2498,11 @@ const pivotLine = [
         xBand,
         yLinear,
         label_label,
-        tooltip_tooltip
+        tooltip_tooltip,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -1964,7 +2522,11 @@ const column = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
-    barStyle_barStyle
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotColumn = [
     initPivot,
@@ -1981,7 +2543,11 @@ const pivotColumn = [
         yLinear,
         label_label,
         tooltip_tooltip,
-        barStyle_barStyle
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2000,7 +2566,11 @@ const columnParallel = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
-    barStyle_barStyle
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotColumnParallel = [
     initPivot,
@@ -2016,7 +2586,11 @@ const pivotColumnParallel = [
         yLinear,
         label_label,
         tooltip_tooltip,
-        barStyle_barStyle
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2037,7 +2611,11 @@ const columnPercent = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
-    barStyle_barStyle
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotColumnPercent = [
     initPivot,
@@ -2055,7 +2633,11 @@ const pivotColumnPercent = [
         yLinear,
         label_label,
         tooltip_tooltip,
-        barStyle_barStyle
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2074,7 +2656,11 @@ const bar = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
-    barStyle_barStyle
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotBar = [
     initPivot,
@@ -2090,7 +2676,11 @@ const pivotBar = [
         label_label,
         label_label,
         tooltip_tooltip,
-        barStyle_barStyle
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2109,7 +2699,11 @@ const barParallel = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
-    barStyle_barStyle
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotBarParallel = [
     initPivot,
@@ -2125,7 +2719,11 @@ const pivotBarParallel = [
         xLinear,
         label_label,
         tooltip_tooltip,
-        barStyle_barStyle
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2145,7 +2743,11 @@ const barPercent = [
     label_label,
     tooltip_tooltip,
     discreteLegend,
-    barStyle_barStyle
+    barStyle_barStyle,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationAreaBand
 ];
 const pivotBarPercent = [
     initPivot,
@@ -2162,7 +2764,11 @@ const pivotBarPercent = [
         xLinear,
         label_label,
         tooltip_tooltip,
-        barStyle_barStyle
+        barStyle_barStyle,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationAreaBand
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2181,7 +2787,11 @@ const area_area = [
     yLinear,
     label_label,
     tooltip_tooltip,
-    discreteLegend
+    discreteLegend,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
 ];
 const pivotArea = [
     initPivot,
@@ -2197,7 +2807,11 @@ const pivotArea = [
         xBand,
         yLinear,
         label_label,
-        tooltip_tooltip
+        tooltip_tooltip,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2217,7 +2831,11 @@ const areaPercent = [
     yLinear,
     label_label,
     tooltip_tooltip,
-    discreteLegend
+    discreteLegend,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
 ];
 const pivotAreaPercent = [
     initPivot,
@@ -2234,7 +2852,11 @@ const pivotAreaPercent = [
         xBand,
         yLinear,
         label_label,
-        tooltip_tooltip
+        tooltip_tooltip,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2250,7 +2872,11 @@ const pie = [
     dataset_dataset,
     label_label,
     tooltip_tooltip,
-    discreteLegend
+    discreteLegend,
+    annotationPoint_annotationPoint,
+    annotationVerticalLine_annotationVerticalLine,
+    annotationHorizontalLine_annotationHorizontalLine,
+    annotationArea_annotationArea
 ];
 const pivotPie = [
     initPivot,
@@ -2263,7 +2889,11 @@ const pivotPie = [
         background_backgroundColor,
         datasetPivotPlaceholder,
         label_label,
-        tooltip_tooltip
+        tooltip_tooltip,
+        annotationPoint_annotationPoint,
+        annotationVerticalLine_annotationVerticalLine,
+        annotationHorizontalLine_annotationHorizontalLine,
+        annotationArea_annotationArea
     ]),
     pivotRowDimensions,
     pivotColumnDimensions,
@@ -2305,17 +2935,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;
     }
@@ -2338,6 +2968,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 = {};
@@ -3084,7 +3720,26 @@ const zSelector = z.union([
     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(),
@@ -3096,7 +3751,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(),
@@ -3112,24 +3774,204 @@ const zBarStyle = z.object({
     selector: z.union([
         zSelector,
         zSelectors
-    ]),
-    barColor: z.string(),
-    barColorOpacity: z.number(),
-    barBorderColor: z.string(),
-    barBorderWidth: z.number(),
+    ]).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 zMarkStyle = z.object({
     barStyle: zBarStyle.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, 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 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(),
+    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(),
+    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 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 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(),
+    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(),
+    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(),
+    annotationVerticalLine: zAnnotationVerticalLine.or(z.array(zAnnotationVerticalLine)).optional(),
+    annotationHorizontalLine: zAnnotationHorizontalLine.or(z.array(zAnnotationHorizontalLine)).optional(),
+    annotationArea: zAnnotationArea.or(z.array(zAnnotationArea)).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, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, 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 };
 
 //# sourceMappingURL=index.js.map