@visactor/vseed 0.0.18 → 0.0.19

package/dist/index.js

@@ -1,4 +1,4 @@
-import { clone as external_remeda_clone, groupBy, isArray, isEmpty, isNullish, isNumber, isString, mergeDeep as external_remeda_mergeDeep, omit, pick as external_remeda_pick, unique } from "remeda";
+import { clone, groupBy, isArray, isEmpty, isNullish, isNumber, isString, mergeDeep, omit, pick, unique } from "remeda";
 import { z } from "zod";
 const initAdvancedVSeed = (advancedVSeed, context)=>{
     const { vseed } = context;
@@ -12,11 +12,11 @@ const execPipeline = (pipeline, context, initialValue = {})=>{
     const result = pipeline.reduce((prev, cur)=>cur(prev, context), initialValue);
     return result;
 };
-const isVTable = (chartType)=>[
+const isVTable = (vseed)=>[
         'table',
         'pivotTable'
-    ].includes(chartType);
-const isVChart = (chartType)=>!isVTable(chartType);
+    ].includes(vseed.chartType);
+const isVChart = (vseed)=>!isVTable(vseed);
 const isPivotChart = (vseed)=>{
     const { measures, dimensions } = vseed;
     const hasRowOrColumnDimension = dimensions && dimensions.some((dimension)=>'rowDimension' === dimension.location || 'columnDimension' === dimension.location);
@@ -24,7 +24,7 @@ const isPivotChart = (vseed)=>{
     return hasRowOrColumnDimension || hasMeasureGroup;
 };
 var i18n_namespaceObject = JSON.parse('{"指标名称":{"en-US":"MeasureName","zh-CN":"指标名称"},"指标Id":{"en-US":"MeasureId","zh-CN":"指标Id"},"指标值":{"en-US":"MeasureValue","zh-CN":"指标值"}}');
-class Intl {
+class i18n_Intl {
     static instance;
     translateMap = i18n_namespaceObject;
     locale = 'zh-CN';
@@ -43,14 +43,34 @@ class Intl {
     };
     getLocale = ()=>this.locale;
     static getInstance() {
-        if (!Intl.instance) Intl.instance = new Intl();
-        return Intl.instance;
+        if (!i18n_Intl.instance) i18n_Intl.instance = new i18n_Intl();
+        return i18n_Intl.instance;
     }
 }
-const intl = Intl.getInstance();
+const intl = i18n_Intl.getInstance();
 const i18n = intl.i18n;
-const createNumFormatter = (format)=>{
-    const { type = 'number', ratio = 1, symbol = '', thousandSeparator = true, decimalPlaces = 2, round = 'round', prefix = '', suffix = '' } = format || {};
+const createNumFormatter = (format, locale = intl.getLocale())=>{
+    const { type = 'number', ratio = 1, symbol = '', thousandSeparator = true, prefix = '', suffix = '', fractionDigits = 2, significantDigits, roundingMode = 'halfExpand', roundingPriority = 'auto' } = format || {};
+    const numFormatterOptions = {
+        style: 'decimal',
+        notation: 'scientific' === type ? 'scientific' : 'standard',
+        roundingMode,
+        roundingPriority
+    };
+    console.log('debug roundingMode', roundingMode);
+    if (isNumber(fractionDigits)) {
+        if (fractionDigits >= 0) {
+            numFormatterOptions.minimumFractionDigits = fractionDigits;
+            numFormatterOptions.maximumFractionDigits = fractionDigits;
+        }
+    }
+    if (isNumber(significantDigits) && significantDigits > 0) {
+        if (significantDigits > 0) {
+            numFormatterOptions.minimumSignificantDigits = significantDigits;
+            numFormatterOptions.maximumSignificantDigits = significantDigits;
+        }
+    }
+    const numFormatter = new Intl.NumberFormat(locale, numFormatterOptions);
     return (value)=>{
         let num = Number(value);
         let typeSymbol = '';
@@ -62,9 +82,7 @@ const createNumFormatter = (format)=>{
             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);
+        let numStr = numFormatter.format(num);
         if (thousandSeparator) {
             const parts = numStr.split('.');
             parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
@@ -77,80 +95,20 @@ const autoNumFormatter = (value, locale = intl.getLocale())=>{
     if (null == value) return String(value);
     const num = Number(value);
     if (Number.isNaN(num)) return String(value);
-    const countDecimalPlaces = (num)=>{
-        if (Number.isInteger(num)) return 0;
-        const str = num.toString();
-        if (str.indexOf('e-') > -1) return parseInt(str.split('e-')[1]);
-        const decimalPart = str.split('.')[1];
-        if (!decimalPart) return 0;
-        const decimalPlaces = decimalPart.replace(/0+$/, '').length;
-        return Math.max(2, decimalPlaces);
-    };
-    const numFormat = {
-        type: 'number',
-        decimalPlaces: countDecimalPlaces(num),
-        round: 'round',
-        thousandSeparator: true
-    };
-    const rules = NUMBER_FORMAT_RULES[locale] || NUMBER_FORMAT_RULES['default'];
-    for (const rule of rules)if (num >= rule.threshold) {
-        numFormat.ratio = rule.ratio;
-        numFormat.symbol = rule.symbol;
-        break;
-    }
-    return createNumFormatter(numFormat)(value);
-};
-const NUMBER_FORMAT_RULES = {
-    'zh-CN': [
-        {
-            threshold: 100000000,
-            ratio: 100000000,
-            symbol: "\u4EBF"
-        },
-        {
-            threshold: 10000,
-            ratio: 10000,
-            symbol: "\u4E07"
-        }
-    ],
-    'en-US': [
-        {
-            threshold: 1000000000,
-            ratio: 1000000000,
-            symbol: 'B'
-        },
-        {
-            threshold: 1000000,
-            ratio: 1000000,
-            symbol: 'M'
-        },
-        {
-            threshold: 1000,
-            ratio: 1000,
-            symbol: 'K'
-        }
-    ],
-    default: [
-        {
-            threshold: 1000000000,
-            ratio: 1000000000,
-            symbol: 'B'
-        },
-        {
-            threshold: 1000000,
-            ratio: 1000000,
-            symbol: 'M'
-        },
-        {
-            threshold: 1000,
-            ratio: 1000,
-            symbol: 'K'
-        }
-    ]
+    const numFormatterOptions = {
+        style: 'decimal',
+        notation: 'compact'
+    };
+    numFormatterOptions.minimumFractionDigits = 0;
+    numFormatterOptions.maximumFractionDigits = 2;
+    const numFormatter = new Intl.NumberFormat(locale, {
+        ...numFormatterOptions
+    });
+    return numFormatter.format(Number(value));
 };
 const createFormatter = (format)=>createNumFormatter(format);
 const autoFormatter = (value, locale)=>autoNumFormatter(value, locale);
-const findMeasureById = (measures, id)=>{
+const findMeasureById = (measures = [], id)=>{
     if (!measures) return;
     const stack = [
         ...measures
@@ -162,7 +120,7 @@ const findMeasureById = (measures, id)=>{
         if ('children' in current && current.children) stack.push(...current.children);
     }
 };
-const findFirstMeasure = (measures)=>{
+const findFirstMeasure = (measures = [])=>{
     if (!measures) return;
     const stack = [
         ...measures
@@ -893,32 +851,18 @@ const encodingFunnel = (advancedVSeed)=>{
         encoding
     };
 };
-const vchartBaseConfig = (advancedVSeed, context)=>{
+const lineConfig = (advancedVSeed, context)=>{
     const { vseed } = context;
+    const { chartType } = vseed;
     const result = {
         ...advancedVSeed
     };
-    const config = external_remeda_pick(vseed, [
+    const config = pick(vseed, [
         'backgroundColor',
         'color',
         'label',
         'legend',
-        'tooltip'
-    ]);
-    result.baseConfig = {
-        vchart: {
-            ...config
-        }
-    };
-    return result;
-};
-const lineConfig = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    const { chartType } = vseed;
-    const result = {
-        ...advancedVSeed
-    };
-    const config = external_remeda_pick(vseed, [
+        'tooltip',
         'xAxis',
         'yAxis',
         'crosshairLine'
@@ -937,7 +881,12 @@ const columnConfig = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
     };
-    const config = external_remeda_pick(vseed, [
+    const config = pick(vseed, [
+        'backgroundColor',
+        'color',
+        'label',
+        'legend',
+        'tooltip',
         'xAxis',
         'yAxis',
         'crosshairRect',
@@ -957,7 +906,13 @@ const pieConfig = (advancedVSeed, context)=>{
     const result = {
         ...advancedVSeed
     };
-    const config = external_remeda_pick(vseed, []);
+    const config = pick(vseed, [
+        'backgroundColor',
+        'color',
+        'label',
+        'legend',
+        'tooltip'
+    ]);
     result.config = {
         ...result.config || {},
         [chartType]: {
@@ -978,29 +933,27 @@ const donutConfig = pieConfig;
 const roseConfig = pieConfig;
 const roseParallelConfig = pieConfig;
 const funnelConfig = pieConfig;
-const vchartTheme = (advancedVSeed, context)=>{
+const theme_theme = (advancedVSeed, context)=>{
     const { customTheme, vseed } = context;
     const { theme = 'light', chartType } = vseed;
     const result = {
         ...advancedVSeed
     };
     if (!customTheme || !customTheme[theme]) return result;
-    const baseConfigVChartTheme = customTheme?.[theme].baseConfig?.vchart;
-    if (baseConfigVChartTheme) {
-        const baseConfigVChart = result.baseConfig?.vchart || {};
-        const mergedConfig = external_remeda_mergeDeep(baseConfigVChartTheme, external_remeda_clone(baseConfigVChart));
-        result.baseConfig = {
-            vchart: mergedConfig
-        };
-    }
     const chartConfigTheme = customTheme?.[theme].config?.[chartType];
     if (chartConfigTheme) {
         const chartConfig = result.config?.[chartType] || {};
-        const mergedConfig = external_remeda_mergeDeep(chartConfigTheme, external_remeda_clone(chartConfig));
+        const mergedConfig = mergeDeep(chartConfigTheme, clone(chartConfig));
         result.config = {
             [chartType]: mergedConfig
         };
     }
+    const chartCustomTheme = customTheme?.[theme]?.config?.[chartType];
+    result.customTheme = {
+        config: {
+            [chartType]: chartCustomTheme
+        }
+    };
     return result;
 };
 const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
@@ -1011,7 +964,7 @@ const pivotAdapter = (pipeline, pivotPipeline)=>(advancedVSeed, context)=>{
     };
 const markStyle_markStyle = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const markStyle = external_remeda_pick(vseed, [
+    const markStyle = pick(vseed, [
         'barStyle',
         'pointStyle',
         'lineStyle',
@@ -1024,7 +977,7 @@ const markStyle_markStyle = (advancedVSeed, context)=>{
 };
 const annotation_annotation = (advancedVSeed, context)=>{
     const { vseed } = context;
-    const annotation = external_remeda_pick(vseed, [
+    const annotation = pick(vseed, [
         'annotationPoint',
         'annotationHorizontalLine',
         'annotationVerticalLine',
@@ -1054,9 +1007,8 @@ const lineAdvancedPipeline = [
         pivotReshapeTo2D1M
     ]),
     encodingXY,
-    vchartBaseConfig,
     lineConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1072,8 +1024,7 @@ const barAdvancedPipeline = [
     ]),
     encodingYX,
     barConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1089,8 +1040,7 @@ const barParallelAdvancedPipeline = [
     ]),
     encodingYX,
     barParallelConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1106,8 +1056,7 @@ const barPercentAdvancedPipeline = [
     ]),
     encodingYX,
     barPercentConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1123,8 +1072,7 @@ const columnAdvancedPipeline = [
     ]),
     encodingXY,
     columnConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1140,8 +1088,7 @@ const columnParallelAdvancedPipeline = [
     ]),
     encodingXY,
     columnParallelConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1157,8 +1104,7 @@ const columnPercentAdvancedPipeline = [
     ]),
     encodingXY,
     columnPercentConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1174,8 +1120,7 @@ const areaAdvancedPipeline = [
     ]),
     encodingXY,
     areaConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1191,8 +1136,7 @@ const areaPercentAdvancedPipeline = [
     ]),
     encodingXY,
     areaPercentConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1208,8 +1152,7 @@ const pieAdvancedPipeline = [
     ]),
     encodingPie,
     pieConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     annotation_annotation
 ];
 const donutAdvancedPipeline = [
@@ -1224,8 +1167,7 @@ const donutAdvancedPipeline = [
     ]),
     encodingPie,
     donutConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     annotation_annotation
 ];
 const roseAdvancedPipeline = [
@@ -1240,8 +1182,7 @@ const roseAdvancedPipeline = [
     ]),
     encodingRose,
     roseConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1257,8 +1198,7 @@ const roseParallelAdvancedPipeline = [
     ]),
     encodingRose,
     roseParallelConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1274,8 +1214,7 @@ const funnelAdvancedPipeline = [
     ]),
     encodingFunnel,
     funnelConfig,
-    vchartBaseConfig,
-    vchartTheme,
+    theme_theme,
     annotation_annotation
 ];
 const encodingYY = (advancedVSeed)=>{
@@ -1325,9 +1264,8 @@ const scatterAdvancedPipeline = [
         pivotReshapeTo1D2M
     ]),
     encodingYY,
-    vchartBaseConfig,
     scatterConfig,
-    vchartTheme,
+    theme_theme,
     markStyle_markStyle,
     annotation_annotation
 ];
@@ -1824,13 +1762,14 @@ const xLinear = (spec, context)=>{
         ];
         return result;
     }
-    const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min } = config;
+    const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = config;
     const linearAxis = {
         visible,
-        type: 'linear',
+        type: log ? 'log' : 'linear',
+        base: logBase,
         orient: 'bottom',
         nice,
-        zero,
+        zero: log ? false : zero,
         inverse,
         max,
         min,
@@ -2000,13 +1939,14 @@ const yLinear = (spec, context)=>{
         ];
         return result;
     }
-    const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min } = config;
+    const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10 } = config;
     const linearAxis = {
         visible,
-        type: 'linear',
+        type: log ? 'log' : 'linear',
+        base: logBase,
         orient: 'left',
         nice,
-        zero,
+        zero: log ? false : zero,
         inverse,
         max,
         min,
@@ -2162,25 +2102,22 @@ const background_backgroundColor = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { baseConfig } = advancedVSeed;
-    if (!baseConfig?.vchart) return result;
-    const { backgroundColor } = baseConfig.vchart;
+    const { chartType } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    const { backgroundColor } = baseConfig;
     return {
         ...result,
         background: backgroundColor
     };
 };
-const defaultTooltip = {
-    enable: true
-};
 const tooltip_tooltip = (spec, context)=>{
     const result = {
         ...spec
     };
     const { advancedVSeed } = context;
-    const { measures, datasetReshapeInfo } = advancedVSeed;
-    const baseConfig = advancedVSeed.baseConfig.vchart;
-    const { tooltip = defaultTooltip } = baseConfig;
+    const { measures, datasetReshapeInfo, chartType } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
+    const { tooltip } = baseConfig;
     const { enable } = tooltip;
     const { measureId, measureValue } = datasetReshapeInfo[0].foldInfo;
     const { groupName } = datasetReshapeInfo[0].unfoldInfo;
@@ -2242,7 +2179,8 @@ const label_label = (spec, context)=>{
     };
     const { advancedVSeed } = context;
     const { measures, datasetReshapeInfo, locale } = advancedVSeed;
-    const baseConfig = advancedVSeed.baseConfig.vchart;
+    const { chartType } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.label) return result;
     const { measureId, measureValue } = datasetReshapeInfo[0].foldInfo;
     const { label } = baseConfig;
@@ -2274,9 +2212,9 @@ const discreteLegend = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { datasetReshapeInfo } = advancedVSeed;
+    const { datasetReshapeInfo, chartType } = advancedVSeed;
     const { unfoldInfo } = datasetReshapeInfo[0];
-    const baseConfig = advancedVSeed.baseConfig.vchart;
+    const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.legend) return result;
     const { legend } = baseConfig;
     const { enable, position = 'bottom', labelFontColor, labelFontSize = 12, labelFontWeight, maxSize, border, shapeType = 'rectRound' } = legend || {};
@@ -2373,7 +2311,8 @@ const pivotDiscreteLegend = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const baseConfig = advancedVSeed.baseConfig.vchart;
+    const { chartType } = advancedVSeed;
+    const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.legend) return result;
     const { datasetReshapeInfo } = advancedVSeed;
     const colorItems = unique(datasetReshapeInfo.flatMap((d)=>d.unfoldInfo.colorItems));
@@ -2482,9 +2421,9 @@ const color_color = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed } = context;
-    const { datasetReshapeInfo } = advancedVSeed;
+    const { datasetReshapeInfo, chartType } = advancedVSeed;
     const { unfoldInfo } = datasetReshapeInfo[0];
-    const baseConfig = advancedVSeed.baseConfig.vchart;
+    const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.color) return result;
     const { color } = baseConfig;
     const { colorScheme, colorMapping } = color;
@@ -2886,8 +2825,7 @@ const pointStyle_pointStyle = (spec, context)=>{
     const { markStyle } = advancedVSeed;
     const { pointStyle } = markStyle;
     const result = {
-        ...spec,
-        point: {}
+        ...spec
     };
     if (!pointStyle) return result;
     const pointStyles = Array.isArray(pointStyle) ? pointStyle : [
@@ -2940,6 +2878,7 @@ const pointStateDimensionHover = (spec)=>{
         point: {
             ...point,
             state: {
+                ...point.state || {},
                 dimension_hover: {
                     scaleX: 1.4,
                     scaleY: 1.4
@@ -2958,6 +2897,7 @@ const pointStateHover = (spec, context)=>{
         point: {
             ...point,
             state: {
+                ...point.state || {},
                 hover: {
                     scaleX: 1.4,
                     scaleY: 1.4,
@@ -4667,52 +4607,49 @@ const darkTheme = ()=>{
         labelColor: '#4B4F54',
         labelBackgroundColor: '#ffffff'
     };
-    return {
-        baseConfig: {
-            vtable: {
-                backgroundColor: 'transparent'
-            },
-            vchart: {
-                backgroundColor: 'transparent',
-                color: {
-                    colorScheme: [
-                        '#2E62F1',
-                        '#4DC36A',
-                        '#FF8406',
-                        '#FFCC00',
-                        '#4F44CF',
-                        '#5AC8FA',
-                        '#003A8C',
-                        '#B08AE2',
-                        '#FF6341',
-                        '#98DD62'
-                    ]
-                },
-                label: {
-                    enable: true
-                },
-                tooltip: {
-                    enable: true
-                },
-                legend: {
-                    enable: true,
-                    border: true,
-                    maxSize: 1,
-                    position: 'rt',
-                    shapeType: 'rectRound',
-                    labelFontColor: '#FDFDFD',
-                    labelFontSize: 12,
-                    labelFontWeight: 400
-                }
-            }
+    const baseConfig = {
+        backgroundColor: 'transparent',
+        color: {
+            colorScheme: [
+                '#2E62F1',
+                '#4DC36A',
+                '#FF8406',
+                '#FFCC00',
+                '#4F44CF',
+                '#5AC8FA',
+                '#003A8C',
+                '#B08AE2',
+                '#FF6341',
+                '#98DD62'
+            ]
+        },
+        label: {
+            enable: true
+        },
+        tooltip: {
+            enable: true
         },
+        legend: {
+            enable: true,
+            border: true,
+            maxSize: 1,
+            position: 'rt',
+            shapeType: 'rectRound',
+            labelFontColor: '#FDFDFD',
+            labelFontSize: 12,
+            labelFontWeight: 400
+        }
+    };
+    return {
         config: {
             line: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine: crosshairLine
             },
             column: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairRect: crosshairRect,
@@ -4724,6 +4661,7 @@ const darkTheme = ()=>{
                 ]
             },
             columnParallel: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairRect: crosshairRect,
@@ -4735,6 +4673,7 @@ const darkTheme = ()=>{
                 ]
             },
             columnPercent: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairRect: crosshairRect,
@@ -4746,6 +4685,7 @@ const darkTheme = ()=>{
                 ]
             },
             bar: {
+                ...baseConfig,
                 xAxis: linearAxis,
                 yAxis: barBandAxis,
                 crosshairRect: crosshairRect,
@@ -4757,6 +4697,7 @@ const darkTheme = ()=>{
                 ]
             },
             barParallel: {
+                ...baseConfig,
                 xAxis: linearAxis,
                 yAxis: barBandAxis,
                 crosshairRect: crosshairRect,
@@ -4768,6 +4709,7 @@ const darkTheme = ()=>{
                 ]
             },
             barPercent: {
+                ...baseConfig,
                 xAxis: linearAxis,
                 yAxis: barBandAxis,
                 crosshairRect: crosshairRect,
@@ -4779,16 +4721,19 @@ const darkTheme = ()=>{
                 ]
             },
             area: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine: crosshairLine
             },
             areaPercent: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine: crosshairLine
             },
             scatter: {
+                ...baseConfig,
                 xAxis: {
                     ...linearAxis,
                     line: {
@@ -4804,6 +4749,35 @@ const darkTheme = ()=>{
                     }
                 },
                 crosshairLine
+            },
+            pie: {
+                ...baseConfig
+            },
+            donut: {
+                ...baseConfig
+            },
+            rose: {
+                ...baseConfig
+            },
+            roseParallel: {
+                ...baseConfig
+            },
+            funnel: {
+                ...baseConfig,
+                color: {
+                    colorScheme: [
+                        '#2E62F1',
+                        '#3A6EF6',
+                        '#4780FA',
+                        '#548CFE',
+                        '#6198FF',
+                        '#6FA3FF',
+                        '#7CACFF',
+                        '#88B7FF',
+                        '#94C2FF',
+                        '#A0CEFF'
+                    ]
+                }
             }
         }
     };
@@ -4913,52 +4887,49 @@ const lightTheme = ()=>{
         labelColor: '#ffffff',
         labelBackgroundColor: '#364159'
     };
-    return {
-        baseConfig: {
-            vtable: {
-                backgroundColor: 'transparent'
-            },
-            vchart: {
-                backgroundColor: 'transparent',
-                color: {
-                    colorScheme: [
-                        '#8D72F6',
-                        '#5766EC',
-                        '#66A3FE',
-                        '#51D5E6',
-                        '#4EC0B3',
-                        '#F9DF90',
-                        '#F9AD71',
-                        '#ED8888',
-                        '#E9A0C3',
-                        '#D77DD3'
-                    ]
-                },
-                label: {
-                    enable: true
-                },
-                tooltip: {
-                    enable: true
-                },
-                legend: {
-                    enable: true,
-                    border: true,
-                    maxSize: 1,
-                    shapeType: 'rectRound',
-                    position: 'rt',
-                    labelFontColor: '#646A73',
-                    labelFontSize: 12,
-                    labelFontWeight: 400
-                }
-            }
+    const baseConfig = {
+        backgroundColor: 'transparent',
+        color: {
+            colorScheme: [
+                '#8D72F6',
+                '#5766EC',
+                '#66A3FE',
+                '#51D5E6',
+                '#4EC0B3',
+                '#F9DF90',
+                '#F9AD71',
+                '#ED8888',
+                '#E9A0C3',
+                '#D77DD3'
+            ]
+        },
+        label: {
+            enable: true
         },
+        tooltip: {
+            enable: true
+        },
+        legend: {
+            enable: true,
+            border: true,
+            maxSize: 1,
+            shapeType: 'rectRound',
+            position: 'rt',
+            labelFontColor: '#646A73',
+            labelFontSize: 12,
+            labelFontWeight: 400
+        }
+    };
+    return {
         config: {
             line: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine
             },
             column: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairRect,
@@ -4970,6 +4941,7 @@ const lightTheme = ()=>{
                 ]
             },
             columnParallel: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairRect,
@@ -4981,6 +4953,7 @@ const lightTheme = ()=>{
                 ]
             },
             columnPercent: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairRect,
@@ -4992,6 +4965,7 @@ const lightTheme = ()=>{
                 ]
             },
             bar: {
+                ...baseConfig,
                 xAxis: linearAxis,
                 yAxis: barBandAxis,
                 crosshairRect,
@@ -5003,6 +4977,7 @@ const lightTheme = ()=>{
                 ]
             },
             barParallel: {
+                ...baseConfig,
                 xAxis: linearAxis,
                 yAxis: barBandAxis,
                 crosshairRect,
@@ -5014,6 +4989,7 @@ const lightTheme = ()=>{
                 ]
             },
             barPercent: {
+                ...baseConfig,
                 xAxis: linearAxis,
                 yAxis: barBandAxis,
                 crosshairRect,
@@ -5025,16 +5001,19 @@ const lightTheme = ()=>{
                 ]
             },
             area: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine
             },
             areaPercent: {
+                ...baseConfig,
                 xAxis: bandAxis,
                 yAxis: linearAxis,
                 crosshairLine
             },
             scatter: {
+                ...baseConfig,
                 xAxis: {
                     ...linearAxis,
                     line: {
@@ -5050,6 +5029,35 @@ const lightTheme = ()=>{
                     }
                 },
                 crosshairLine
+            },
+            pie: {
+                ...baseConfig
+            },
+            donut: {
+                ...baseConfig
+            },
+            rose: {
+                ...baseConfig
+            },
+            roseParallel: {
+                ...baseConfig
+            },
+            funnel: {
+                ...baseConfig,
+                color: {
+                    colorScheme: [
+                        '#5766EC',
+                        '#6372F0',
+                        '#7080F4',
+                        '#7C8CFA',
+                        '#8998FF',
+                        '#95A3FF',
+                        '#A0AEFF',
+                        '#ACB9FF',
+                        '#B7C4FF',
+                        '#C2CEFF'
+                    ]
+                }
             }
         }
     };
@@ -5123,31 +5131,41 @@ const zNumFormat = z.object({
     type: z["enum"]([
         'number',
         'percent',
-        'permille'
+        'permille',
+        'scientific'
     ]).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()
+    suffix: z.string().default('').optional(),
+    fractionDigits: z.number().default(2).optional(),
+    significantDigits: z.number().default(0).optional(),
+    roundingPriority: z["enum"]([
+        'morePrecision',
+        'lessPrecision'
+    ]).default('morePrecision').optional(),
+    roundingMode: z["enum"]([
+        'floor',
+        'ceil',
+        'halfEven',
+        'expand',
+        'trunc',
+        'halfFloor',
+        'halfCeil',
+        'halfExpand',
+        'halfTrunc'
+    ]).default('halfCeil').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: zNumFormat["default"]({}).optional()
 });
 const zMeasureGroup = z.object({
     id: z.string(),
     alias: z.string().optional(),
-    visible: z.boolean().default(true).optional(),
     get children () {
         return z.array(zMeasureGroup.or(zMeasure)).optional();
     }
@@ -5180,133 +5198,6 @@ const zEncoding = z.array(z.object({
     tooltip: z.array(z.string()).optional(),
     size: z.array(z.string()).optional()
 }));
-const zBackgroundColor = z.string().default('transparent').optional();
-const zLabel = z.object({
-    enable: z.boolean().default(true).optional()
-});
-const zColor = z.object({
-    colorScheme: z.array(z.string()).optional(),
-    colorMapping: z.record(z.string(), z.string()).optional()
-});
-const zTooltip = z.object({
-    enable: z.boolean().default(true).optional()
-});
-const zLegend = z.object({
-    enable: z.boolean().default(true).optional(),
-    border: z.boolean().default(true).optional(),
-    maxSize: z.number().default(1).optional(),
-    shapeType: z["enum"]([
-        'circle',
-        'cross',
-        'diamond',
-        'square',
-        'arrow',
-        'arrow2Left',
-        'arrow2Right',
-        'wedge',
-        'thinTriangle',
-        'triangle',
-        'triangleUp',
-        'triangleDown',
-        'triangleRight',
-        'triangleLeft',
-        'stroke',
-        'star',
-        'wye',
-        'rect',
-        'arrowLeft',
-        'arrowRight',
-        'rectRound',
-        'roundLine'
-    ]).default('rectRound').optional(),
-    position: z["enum"]([
-        'left',
-        'leftTop',
-        'leftBottom',
-        'lt',
-        'lb',
-        'top',
-        'topLeft',
-        'topRight',
-        'tl',
-        'tr',
-        'right',
-        'rightTop',
-        'rightBottom',
-        'rt',
-        'rb',
-        'bottom',
-        'bottomLeft',
-        'bottomRight',
-        'bl',
-        'br'
-    ]).default('bottom').optional(),
-    labelFontSize: z.number().default(12).optional(),
-    labelFontColor: z.string().default('#fff').optional(),
-    labelFontWeight: z.number().or(z.string()).default(400).optional()
-});
-const zVChartBaseConfig = z.object({
-    backgroundColor: zBackgroundColor,
-    label: zLabel.optional(),
-    color: zColor.optional(),
-    tooltip: zTooltip.optional(),
-    legend: zLegend.optional()
-});
-const zVTableBaseConfig = z.object({
-    backgroundColor: zBackgroundColor
-});
-const zBaseConfig = z.object({
-    vchart: zVChartBaseConfig.optional(),
-    vtable: zVTableBaseConfig.optional()
-});
-const zAxis = z.object({
-    visible: z.boolean().default(true).optional(),
-    min: z.number().optional(),
-    max: z.number().optional(),
-    nice: z.boolean().default(true).optional(),
-    zero: z.boolean().default(true).optional(),
-    inverse: z.boolean().default(false).optional(),
-    labelAutoHide: z.boolean().default(true).optional(),
-    labelAutoHideGap: z.number().default(4).optional(),
-    labelAutoRotate: z.boolean().default(true).optional(),
-    labelAutoRotateAngleRange: z.array(z.number()).default([
-        0,
-        -45,
-        -90
-    ]).optional(),
-    labelAutoLimit: z.boolean().default(true).optional(),
-    labelAutoLimitLength: z.number().default(100).optional(),
-    label: z.object({
-        visible: z.boolean().default(true).optional(),
-        labelColor: z.string().default('#797B85').optional(),
-        labelFontSize: z.number().default(12).optional(),
-        labelFontWeight: z.number().default(400).optional(),
-        labelAngle: z.number().default(0).optional()
-    }).optional(),
-    line: z.object({
-        visible: z.boolean().default(true).optional(),
-        lineColor: z.string().default('rgba(54, 65, 89, 0.30)').optional(),
-        lineWidth: z.number().default(1).optional()
-    }).optional(),
-    tick: z.object({
-        visible: z.boolean().default(true).optional(),
-        tickInside: z.boolean().default(false).optional(),
-        tickColor: z.string().default('rgba(54, 65, 89, 0.30)').optional(),
-        tickSize: z.number().default(4).optional()
-    }).optional(),
-    title: z.object({
-        visible: z.boolean().default(false).optional(),
-        titleText: z.string().default('').optional(),
-        titleColor: z.string().default('#646A73').optional(),
-        titleFontSize: z.number().default(12).optional(),
-        titleFontWeight: z.number().default(400).optional()
-    }).optional(),
-    grid: z.object({
-        visible: z.boolean().default(false).optional(),
-        gridColor: z.string().default('rgba(54, 65, 89, 0.15)').optional(),
-        gridWidth: z.number().default(0.5).optional()
-    }).optional()
-});
 const zXBandAxis = z.object({
     visible: z.boolean().default(true).optional(),
     labelAutoHide: z.boolean().default(true).optional(),
@@ -5357,6 +5248,8 @@ const zXLinearAxis = z.object({
     max: z.number().optional(),
     nice: z.boolean().default(true).optional(),
     zero: z.boolean().default(true).optional(),
+    log: z.boolean().default(false).optional(),
+    logBase: z.number().default(10).optional(),
     inverse: z.boolean().default(false).optional(),
     label: z.object({
         visible: z.boolean().default(true).optional(),
@@ -5410,72 +5303,233 @@ const zStackCornerRadius = z.number().or(z.array(z.number())).default([
     0,
     0
 ]);
-const zConfig = z.object({
-    table: z.object({}).optional(),
-    pivotTable: z.object({}).optional(),
-    line: z.object({
-        xAxis: zXBandAxis.optional(),
-        yAxis: zYLinearAxis.optional(),
-        crosshairLine: zCrosshairLine.optional()
-    }).optional(),
-    column: z.object({
-        xAxis: zXBandAxis.optional(),
-        yAxis: zYLinearAxis.optional(),
-        crosshairRect: zCrosshairRect.optional(),
-        stackCornerRadius: zStackCornerRadius.optional()
-    }).optional(),
-    columnParallel: z.object({
-        xAxis: zXBandAxis.optional(),
-        yAxis: zYLinearAxis.optional(),
-        crosshairRect: zCrosshairRect.optional(),
-        stackCornerRadius: zStackCornerRadius.optional()
-    }).optional(),
-    columnPercent: z.object({
-        xAxis: zXBandAxis.optional(),
-        yAxis: zYLinearAxis.optional(),
-        crosshairRect: zCrosshairRect.optional(),
-        stackCornerRadius: zStackCornerRadius.optional()
-    }).optional(),
-    bar: z.object({
-        xAxis: zXLinearAxis.optional(),
-        yAxis: zYBandAxis.optional(),
-        crosshairRect: zCrosshairRect.optional(),
-        stackCornerRadius: zStackCornerRadius.optional()
-    }).optional(),
-    barParallel: z.object({
-        xAxis: zXLinearAxis.optional(),
-        yAxis: zYBandAxis.optional(),
-        crosshairRect: zCrosshairRect.optional(),
-        stackCornerRadius: zStackCornerRadius.optional()
-    }).optional(),
-    barPercent: z.object({
-        xAxis: zXLinearAxis.optional(),
-        yAxis: zYBandAxis.optional(),
-        crosshairRect: zCrosshairRect.optional(),
-        stackCornerRadius: zStackCornerRadius.optional()
-    }).optional(),
-    area: z.object({
-        xAxis: zXBandAxis.optional(),
-        yAxis: zYLinearAxis.optional(),
-        crosshairLine: zCrosshairLine.optional()
-    }).optional(),
-    areaPercent: z.object({
-        xAxis: zXBandAxis.optional(),
-        yAxis: zYLinearAxis.optional(),
-        crosshairLine: zCrosshairLine.optional()
+const zBackgroundColor = z.string().default('transparent').optional();
+const zColor = z.object({
+    colorScheme: z.array(z.string()).optional(),
+    colorMapping: z.record(z.string(), z.string()).optional()
+});
+const zLabel = z.object({
+    enable: z.boolean().default(true).optional()
+});
+const zLegend = z.object({
+    enable: z.boolean().default(true).optional(),
+    border: z.boolean().default(true).optional(),
+    maxSize: z.number().default(1).optional(),
+    shapeType: z["enum"]([
+        'circle',
+        'cross',
+        'diamond',
+        'square',
+        'arrow',
+        'arrow2Left',
+        'arrow2Right',
+        'wedge',
+        'thinTriangle',
+        'triangle',
+        'triangleUp',
+        'triangleDown',
+        'triangleRight',
+        'triangleLeft',
+        'stroke',
+        'star',
+        'wye',
+        'rect',
+        'arrowLeft',
+        'arrowRight',
+        'rectRound',
+        'roundLine'
+    ]).default('rectRound').optional(),
+    position: z["enum"]([
+        'left',
+        'leftTop',
+        'leftBottom',
+        'lt',
+        'lb',
+        'top',
+        'topLeft',
+        'topRight',
+        'tl',
+        'tr',
+        'right',
+        'rightTop',
+        'rightBottom',
+        'rt',
+        'rb',
+        'bottom',
+        'bottomLeft',
+        'bottomRight',
+        'bl',
+        'br'
+    ]).default('bottom').optional(),
+    labelFontSize: z.number().default(12).optional(),
+    labelFontColor: z.string().default('#fff').optional(),
+    labelFontWeight: z.number().or(z.string()).default(400).optional()
+});
+const zTooltip = z.object({
+    enable: z.boolean().default(true).optional()
+});
+const zLineConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional(),
+    xAxis: zXBandAxis.optional(),
+    yAxis: zYLinearAxis.optional(),
+    crosshairLine: zCrosshairLine.optional()
+});
+const zColumnConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional(),
+    xAxis: zXBandAxis.optional(),
+    yAxis: zYLinearAxis.optional(),
+    crosshairRect: zCrosshairRect.optional(),
+    stackCornerRadius: zStackCornerRadius.optional()
+});
+const zColumnParallelConfig = zColumnConfig;
+const zColumnPercentConfig = zColumnConfig;
+const zBarConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional(),
+    xAxis: zXLinearAxis.optional(),
+    yAxis: zYBandAxis.optional(),
+    crosshairRect: zCrosshairRect.optional(),
+    stackCornerRadius: zStackCornerRadius.optional()
+});
+const zBarParallelConfig = zBarConfig;
+const zBarPercentConfig = zBarConfig;
+const zAreaConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional(),
+    xAxis: zXBandAxis.optional(),
+    yAxis: zYLinearAxis.optional(),
+    crosshairLine: zCrosshairLine.optional()
+});
+const zAreaPercentConfig = zAreaConfig;
+const zRoseConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional()
+});
+const zRoseParallelConfig = zRoseConfig;
+const zPieConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional()
+});
+const zDonutConfig = zPieConfig;
+const zDualAxisConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional()
+});
+const zScatterConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    label: zLabel.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    legend: zLegend.optional(),
+    xAxis: zXLinearAxis.optional(),
+    yAxis: zYLinearAxis.optional(),
+    crosshairLine: zCrosshairLine.optional()
+});
+const zFunnelConfig = z.object({
+    backgroundColor: zBackgroundColor.optional(),
+    color: zColor.optional(),
+    tooltip: zTooltip.optional(),
+    label: zLabel.optional(),
+    legend: zLegend.optional()
+});
+const zConfig = z.object({
+    table: z.object({}).optional(),
+    pivotTable: z.object({}).optional(),
+    line: zLineConfig.optional(),
+    column: zColumnConfig.optional(),
+    columnParallel: zColumnParallelConfig.optional(),
+    columnPercent: zColumnPercentConfig.optional(),
+    bar: zBarConfig.optional(),
+    barParallel: zBarParallelConfig.optional(),
+    barPercent: zBarPercentConfig.optional(),
+    area: zAreaConfig.optional(),
+    areaPercent: zAreaPercentConfig.optional(),
+    rose: zRoseConfig.optional(),
+    roseParallel: zRoseParallelConfig.optional(),
+    pie: zPieConfig.optional(),
+    donut: zDonutConfig.optional(),
+    dualAxis: zDualAxisConfig.optional(),
+    scatter: zScatterConfig.optional(),
+    funnel: zFunnelConfig.optional()
+});
+const zAxis = z.object({
+    visible: z.boolean().default(true).optional(),
+    min: z.number().optional(),
+    max: z.number().optional(),
+    nice: z.boolean().default(true).optional(),
+    zero: z.boolean().default(true).optional(),
+    inverse: z.boolean().default(false).optional(),
+    log: z.boolean().default(false).optional(),
+    logBase: z.number().default(10).optional(),
+    labelAutoHide: z.boolean().default(true).optional(),
+    labelAutoHideGap: z.number().default(4).optional(),
+    labelAutoRotate: z.boolean().default(true).optional(),
+    labelAutoRotateAngleRange: z.array(z.number()).default([
+        0,
+        -45,
+        -90
+    ]).optional(),
+    labelAutoLimit: z.boolean().default(true).optional(),
+    labelAutoLimitLength: z.number().default(100).optional(),
+    label: z.object({
+        visible: z.boolean().default(true).optional(),
+        labelColor: z.string().default('#797B85').optional(),
+        labelFontSize: z.number().default(12).optional(),
+        labelFontWeight: z.number().default(400).optional(),
+        labelAngle: z.number().default(0).optional()
+    }).optional(),
+    line: z.object({
+        visible: z.boolean().default(true).optional(),
+        lineColor: z.string().default('rgba(54, 65, 89, 0.30)').optional(),
+        lineWidth: z.number().default(1).optional()
     }).optional(),
-    rose: z.object({}).optional(),
-    roseParallel: z.object({}).optional(),
-    pie: z.object({}).optional(),
-    donut: z.object({}).optional(),
-    dualAxis: z.object({}).optional(),
-    scatter: z.object({
-        xAxis: zXLinearAxis.optional(),
-        yAxis: zYLinearAxis.optional(),
-        crosshairLine: zCrosshairLine.optional()
+    tick: z.object({
+        visible: z.boolean().default(true).optional(),
+        tickInside: z.boolean().default(false).optional(),
+        tickColor: z.string().default('rgba(54, 65, 89, 0.30)').optional(),
+        tickSize: z.number().default(4).optional()
     }).optional(),
-    funnel: z.object({}).optional()
+    title: z.object({
+        visible: z.boolean().default(false).optional(),
+        titleText: z.string().default('').optional(),
+        titleColor: z.string().default('#646A73').optional(),
+        titleFontSize: z.number().default(12).optional(),
+        titleFontWeight: z.number().default(400).optional()
+    }).optional(),
+    grid: z.object({
+        visible: z.boolean().default(false).optional(),
+        gridColor: z.string().default('rgba(54, 65, 89, 0.15)').optional(),
+        gridWidth: z.number().default(0.5).optional()
+    }).optional()
 });
+const zCustomThemeConfig = z.object({
+    config: zConfig.optional()
+});
+const zCustomTheme = z.record(z.string(), zCustomThemeConfig).optional();
+const zTheme = z.string();
 const zSelector = z.union([
     z.string(),
     z.number(),
@@ -5531,6 +5585,74 @@ const zSelector = z.union([
     })
 ]);
 const zSelectors = z.array(zSelector);
+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()
+});
+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 zAnnotationPoint = z.object({
     selector: z.union([
         zSelector,
@@ -5707,82 +5829,6 @@ const zAnnotation = z.object({
     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()
-});
-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();
 const zLocale = z["enum"]([
     'zh-CN',
     'en-US'
@@ -6097,14 +6143,13 @@ const zAdvancedVSeed = z.object({
     dimensions: zDimensions,
     measures: zMeasures,
     encoding: zEncoding,
-    baseConfig: zBaseConfig,
     config: zConfig,
     theme: zTheme,
     markStyle: zMarkStyle,
-    customTheme: zCustomTheme,
+    customTheme: zCustomThemeConfig,
     annotation: zAnnotation,
     locale: zLocale
 });
-export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, UnfoldDimensionGroupId, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D1M, dataReshapeFor1D2M, dataReshapeFor2D1M, donutAdvancedPipeline, donutSpecPipeline, execPipeline, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, i18n, intl, isPivotChart, isVChart, isVTable, lightTheme, lineAdvancedPipeline, lineSpecPipeline, pieAdvancedPipeline, pieSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerLightTheme, registerLine, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, unfoldDimensions, zAdvancedVSeed, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaPercent, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarParallel, zBarPercent, zBarStyle, zBaseConfig, zChartType, zColor, zColumn, zColumnParallel, zColumnPercent, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensions, zDonut, zEncoding, zFoldInfo, zFunnel, zLabel, zLegend, zLine, zLineStyle, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasures, zNumFormat, zPie, zPointStyle, zRose, zRoseParallel, zScatter, zStackCornerRadius, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
+export { Builder, FoldMeasureId, FoldMeasureName, FoldMeasureValue, ORIGINAL_DATA, Separator, UnfoldDimensionGroup, UnfoldDimensionGroupId, areaAdvancedPipeline, areaPercentAdvancedPipeline, areaPercentSpecPipeline, areaSpecPipeline, autoFormatter, autoNumFormatter, barAdvancedPipeline, barParallelAdvancedPipeline, barParallelSpecPipeline, barPercentAdvancedPipeline, barPercentSpecPipeline, barSpecPipeline, columnAdvancedPipeline, columnParallelAdvancedPipeline, columnParallelSpecPipeline, columnPercentAdvancedPipeline, columnPercentSpecPipeline, columnSpecPipeline, createFormatter, createNumFormatter, darkTheme, dataReshapeFor1D1M, dataReshapeFor1D2M, dataReshapeFor2D1M, donutAdvancedPipeline, donutSpecPipeline, execPipeline, findFirstMeasure, findMeasureById, foldMeasures, funnelAdvancedPipeline, funnelSpecPipeline, i18n, intl, isPivotChart, isVChart, isVTable, lightTheme, lineAdvancedPipeline, lineSpecPipeline, pieAdvancedPipeline, pieSpecPipeline, registerAll, registerArea, registerAreaPercent, registerBar, registerBarParallel, registerBarPercent, registerColumn, registerColumnParallel, registerColumnPercent, registerCustomTheme, registerDarkTheme, registerLightTheme, registerLine, roseAdvancedPipeline, roseParallelAdvancedPipeline, roseParallelSpecPipeline, roseSpecPipeline, scatterAdvancedPipeline, scatterSpecPipeline, unfoldDimensions, zAdvancedVSeed, zAnnotation, zAnnotationArea, zAnnotationHorizontalLine, zAnnotationPoint, zAnnotationVerticalLine, zArea, zAreaConfig, zAreaPercent, zAreaPercentConfig, zAreaStyle, zAxis, zBackgroundColor, zBar, zBarConfig, zBarParallel, zBarParallelConfig, zBarPercent, zBarPercentConfig, zBarStyle, zChartType, zColor, zColumn, zColumnConfig, zColumnParallel, zColumnParallelConfig, zColumnPercent, zColumnPercentConfig, zConfig, zCrosshairLine, zCrosshairRect, zCustomTheme, zCustomThemeConfig, zDataset, zDatasetReshapeInfo, zDatum, zDimension, zDimensions, zDonut, zDonutConfig, zDualAxisConfig, zEncoding, zFoldInfo, zFunnel, zFunnelConfig, zLabel, zLegend, zLine, zLineConfig, zLineStyle, zLocale, zMarkStyle, zMeasure, zMeasureGroup, zMeasures, zNumFormat, zPie, zPieConfig, zPointStyle, zRose, zRoseConfig, zRoseParallel, zRoseParallelConfig, zScatter, zScatterConfig, zStackCornerRadius, zTheme, zTooltip, zUnfoldInfo, zVSeed, zXBandAxis, zXLinearAxis, zYBandAxis, zYLinearAxis };
 
 //# sourceMappingURL=index.js.map