@visactor/vseed 0.2.1 → 0.2.2

package/dist/umd/index.js

@@ -119,7 +119,6 @@
             ORIGINAL_DATA: ()=>ORIGINAL_DATA,
             columnAdvancedPipeline: ()=>columnAdvancedPipeline,
             FoldMeasureId: ()=>FoldMeasureId,
-            zBoxplot: ()=>zBoxplot,
             MeasureName: ()=>MeasureName,
             lightTheme: ()=>lightTheme,
             zSort: ()=>zSort,
@@ -209,7 +208,6 @@
             dualAxisSpecPipeline: ()=>dualAxisSpecPipeline,
             unfoldDimensions: ()=>unfoldDimensions,
             zArea: ()=>zArea,
-            registerBoxplot: ()=>registerBoxplot,
             histogramAdvancedPipeline: ()=>histogramAdvancedPipeline,
             registerDarkTheme: ()=>registerDarkTheme,
             ChartTypeEnum: ()=>ChartTypeEnum,
@@ -232,6 +230,7 @@
             registerPivotTable: ()=>registerPivotTable,
             execPipeline: ()=>execPipeline,
             XEncoding: ()=>XEncoding,
+            zBoxPlot: ()=>zBoxPlot,
             zLineStyle: ()=>zLineStyle,
             zRegressionLine: ()=>zRegressionLine,
             findMeasureById: ()=>findMeasureById,
@@ -247,12 +246,13 @@
             registerDonut: ()=>registerDonut,
             findTreeNodesBy: ()=>findTreeNodesBy,
             zRadar: ()=>zRadar,
-            zTable: ()=>zTable,
+            registerBoxPlot: ()=>registerBoxPlot,
             zAnnotation: ()=>zAnnotation,
-            zXBandAxis: ()=>zXBandAxis,
+            zTable: ()=>zTable,
             pieAdvancedPipeline: ()=>pieAdvancedPipeline,
             ANNOTATION_Z_INDEX: ()=>1000,
             zColumnPercent: ()=>zColumnPercent,
+            zXBandAxis: ()=>zXBandAxis,
             createFormatter: ()=>createFormatter,
             columnPercentSpecPipeline: ()=>columnPercentSpecPipeline,
             zSelector: ()=>zSelector,
@@ -3874,33 +3874,39 @@
                 textBaseline: 'middle'
             }
         };
-        const annotationPoint_annotationPoint = (spec, context)=>{
-            const { advancedVSeed, vseed } = context;
-            const { annotation, config } = advancedVSeed;
-            if (!annotation || !annotation.annotationPoint) return spec;
-            const theme = config?.[vseed.chartType]?.annotation?.annotationPoint;
-            const { annotationPoint } = annotation;
-            const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
-                annotationPoint
-            ];
-            const isHorizontalBar = isBarLikeChart(advancedVSeed);
-            const defaultStyle = isHorizontalBar ? {
-                textAlign: 'right',
-                textBaseline: 'middle'
-            } : {
-                textAlign: 'center',
-                textBaseline: 'top'
-            };
-            const markPoint = annotationPointList.flatMap((annotationPoint)=>{
-                const { selector: selectorPoint, text = '', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = defaultStyle.textAlign, textBaseline = defaultStyle.textBaseline, textBackgroundBorderColor = theme?.textBackgroundBorderColor, textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundPadding = theme?.textBackgroundPadding ?? 2, textBackgroundVisible = theme?.textBackgroundVisible ?? true, offsetX = theme?.offsetX ?? 0, offsetY = theme?.offsetY ?? 0 } = annotationPoint;
-                const dataset = advancedVSeed.dataset.flat();
-                const selectedData = selectorPoint ? dataset.filter((datum)=>selector_selector(datum, selectorPoint)) : [];
-                const dx = -10 - (isHorizontalBar ? textFontSize : 0);
-                const dy = isHorizontalBar ? 0 : textFontSize;
-                return selectedData.map((datum)=>({
+        const generateAnnotationPointPipe = (options)=>{
+            const findSelectedDatas = options.findSelectedDatas ?? ((dataset, s)=>dataset.filter((datum)=>selector_selector(datum, s)));
+            const generateMarkPoint = options.generateMarkPoint ?? ((datum)=>[
+                    {
+                        coordinate: (data)=>data.find((item)=>isSubset(datum, item))
+                    }
+                ]);
+            return (spec, context)=>{
+                const { advancedVSeed, vseed } = context;
+                const { annotation, config } = advancedVSeed;
+                if (!annotation || !annotation.annotationPoint) return spec;
+                const theme = config?.[vseed.chartType]?.annotation?.annotationPoint;
+                const { annotationPoint } = annotation;
+                const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
+                    annotationPoint
+                ];
+                const isHorizontalBar = isBarLikeChart(advancedVSeed);
+                const defaultStyle = isHorizontalBar ? {
+                    textAlign: 'right',
+                    textBaseline: 'middle'
+                } : {
+                    textAlign: 'center',
+                    textBaseline: 'top'
+                };
+                const markPoint = annotationPointList.flatMap((annotationPoint)=>{
+                    const { selector: selectorPoint, text = '', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = defaultStyle.textAlign, textBaseline = defaultStyle.textBaseline, textBackgroundBorderColor = theme?.textBackgroundBorderColor, textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundPadding = theme?.textBackgroundPadding ?? 2, textBackgroundVisible = theme?.textBackgroundVisible ?? true, offsetX = theme?.offsetX ?? 0, offsetY = theme?.offsetY ?? 0 } = annotationPoint;
+                    const dataset = advancedVSeed.dataset.flat();
+                    const selectedData = selectorPoint ? findSelectedDatas(dataset, selectorPoint, spec, context) : [];
+                    const dx = -10 - (isHorizontalBar ? textFontSize : 0);
+                    const dy = isHorizontalBar ? 0 : textFontSize;
+                    const markPointStyle = {
                         zIndex: 1000,
                         regionRelative: true,
-                        coordinate: (data)=>data.find((item)=>isSubset(datum, item)),
                         itemLine: {
                             visible: false
                         },
@@ -3938,13 +3944,25 @@
                                 }
                             }
                         }
-                    }));
-            });
-            return {
-                ...spec,
-                markPoint
+                    };
+                    return selectedData.reduce((res, datum)=>{
+                        const marks = generateMarkPoint(datum, spec, context);
+                        if (marks && marks.length) marks.forEach((mark)=>{
+                            res.push({
+                                ...markPointStyle,
+                                ...mark
+                            });
+                        });
+                        return res;
+                    }, []);
+                });
+                return {
+                    ...spec,
+                    markPoint
+                };
             };
         };
+        const annotationPoint_annotationPoint = generateAnnotationPointPipe({});
         function chunk_BO3LQZNF_o(r) {
             return Array.isArray(r);
         }
@@ -9878,90 +9896,23 @@
                 }), match || (result[k] = v);
             }), result;
         }
-        const annotationPointOfDualAxis = (spec, context)=>{
-            const { advancedVSeed, vseed } = context;
-            const { annotation, config } = advancedVSeed;
-            if (!annotation || !annotation.annotationPoint) return spec;
-            const theme = config?.[vseed.chartType]?.annotation?.annotationPoint;
-            const { annotationPoint } = annotation;
-            const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [
-                annotationPoint
-            ];
-            const isHorizontalBar = isBarLikeChart(advancedVSeed);
-            const defaultStyle = isHorizontalBar ? {
-                textAlign: 'right',
-                textBaseline: 'middle'
-            } : {
-                textAlign: 'center',
-                textBaseline: 'top'
-            };
-            const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
-            const markPoint = annotationPointList.flatMap((annotationPoint)=>{
-                const { selector: selectorPoint, text = '', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = defaultStyle.textAlign, textBaseline = defaultStyle.textBaseline, textBackgroundBorderColor = theme?.textBackgroundBorderColor, textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundPadding = theme?.textBackgroundPadding ?? 2, textBackgroundVisible = theme?.textBackgroundVisible ?? true, offsetX = theme?.offsetX ?? 0, offsetY = theme?.offsetY ?? 0 } = annotationPoint;
-                const dataset = advancedVSeed.dataset.flat();
-                const selectedData = selectorPoint ? dataset.reduce((res, d)=>{
+        const annotationPointOfDualAxis = generateAnnotationPointPipe({
+            findSelectedDatas: (dataset, s, spec, context)=>dataset.reduce((res, d)=>{
+                    const { advancedVSeed } = context;
+                    const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
                     const pickedDatum = pickWithout(d, allMeasureIds.filter((id)=>id !== d[MeasureId]));
-                    if (selector_selector(pickedDatum, selectorPoint)) res.push(pickedDatum);
+                    if (selector_selector(pickedDatum, s)) res.push(pickedDatum);
                     return res;
-                }, []) : [];
-                const dx = -10 - (isHorizontalBar ? textFontSize : 0);
-                const dy = isHorizontalBar ? 0 : textFontSize;
-                const baseConfig = {
-                    zIndex: 1000,
-                    itemLine: {
-                        visible: false
-                    },
-                    itemContent: {
-                        offsetY,
-                        offsetX,
-                        confine: true,
-                        text: {
-                            text: text,
-                            style: {
-                                opacity: 0.95,
-                                visible: true,
-                                textAlign: textAlign,
-                                textBaseline: textBaseline,
-                                fill: textColor,
-                                stroke: textBackgroundColor,
-                                lineWidth: 1,
-                                fontSize: textFontSize,
-                                fontWeight: textFontWeight,
-                                dx,
-                                dy
-                            },
-                            labelBackground: {
-                                visible: textBackgroundVisible,
-                                padding: textBackgroundPadding,
-                                style: {
-                                    opacity: 0.95,
-                                    cornerRadius: textBackgroundBorderRadius ?? 4,
-                                    fill: textBackgroundColor,
-                                    stroke: textBackgroundBorderColor,
-                                    lineWidth: textBackgroundBorderWidth,
-                                    dx,
-                                    dy
-                                }
-                            }
-                        }
-                    }
-                };
-                return spec.series?.reduce((res, s, index)=>{
-                    selectedData.forEach((datum)=>{
-                        res.push({
-                            ...baseConfig,
-                            relativeSeriesIndex: index,
-                            coordinate: (data)=>data.find((item)=>isSubset(datum, item, allMeasureIds.filter((id)=>id !== item[MeasureId])))
-                        });
-                    });
-                    return res;
-                }, []);
-            });
-            return {
-                ...spec,
-                markPoint
-            };
-        };
+                }, []),
+            generateMarkPoint: (datum, spec, context)=>{
+                const { advancedVSeed } = context;
+                const allMeasureIds = findAllMeasures(advancedVSeed.reshapeMeasures ?? advancedVSeed.measures).map((m)=>m.id);
+                return spec.series?.map((s, index)=>({
+                        relativeSeriesIndex: index,
+                        coordinate: (data)=>data.find((item)=>isSubset(datum, item, allMeasureIds.filter((id)=>id !== item[MeasureId])))
+                    }));
+            }
+        });
         const dualAxis = [
             seriesDualAxis([
                 initDualAxisPrimary,
@@ -12210,10 +12161,55 @@
         const boxplotSpecPipeline = [
             pivotAdapter_pivotAdapter(boxplot_boxplot, pivotBoxplot)
         ];
-        const registerBoxplot = ()=>{
+        const registerBoxPlot = ()=>{
             Builder._advancedPipelineMap.boxPlot = boxplotAdvancedPipeline;
             Builder._specPipelineMap.boxPlot = boxplotSpecPipeline;
         };
+        const isArrayLike_isArrayLike = function(value) {
+            return null !== value && "function" != typeof value && Number.isFinite(value.length);
+        };
+        const common_isArrayLike = isArrayLike_isArrayLike;
+        function baseMerge(target, source, shallowArray = !1, skipTargetArray = !1) {
+            if (source) {
+                if (target === source) return;
+                if (common_isValid(source) && "object" == typeof source) {
+                    const iterable = Object(source), props = [];
+                    for(const key in iterable)props.push(key);
+                    let { length: length } = props, propIndex = -1;
+                    for(; length--;){
+                        const key = props[++propIndex];
+                        !common_isValid(iterable[key]) || "object" != typeof iterable[key] || skipTargetArray && common_isArray(target[key]) ? assignMergeValue(target, key, iterable[key]) : baseMergeDeep(target, source, key, shallowArray, skipTargetArray);
+                    }
+                }
+            }
+        }
+        function baseMergeDeep(target, source, key, shallowArray = !1, skipTargetArray = !1) {
+            const objValue = target[key], srcValue = source[key];
+            let newValue = source[key], isCommon = !0;
+            if (common_isArray(srcValue)) {
+                if (shallowArray) newValue = [];
+                else if (common_isArray(objValue)) newValue = objValue;
+                else if (common_isArrayLike(objValue)) {
+                    newValue = new Array(objValue.length);
+                    let index = -1;
+                    const length = objValue.length;
+                    for(; ++index < length;)newValue[index] = objValue[index];
+                }
+            } else common_isPlainObject(srcValue) ? (newValue = null != objValue ? objValue : {}, "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
+            isCommon && baseMerge(newValue, srcValue, shallowArray, skipTargetArray), assignMergeValue(target, key, newValue);
+        }
+        function assignMergeValue(target, key, value) {
+            (void 0 === value || eq(target[key], value)) && (void 0 !== value || key in target) || (target[key] = value);
+        }
+        function eq(value, other) {
+            return value === other || Number.isNaN(value) && Number.isNaN(other);
+        }
+        function merge(target, ...sources) {
+            let sourceIndex = -1;
+            const length = sources.length;
+            for(; ++sourceIndex < length;)baseMerge(target, sources[sourceIndex], !0);
+            return target;
+        }
         const histogramConfig = (advancedVSeed, context)=>{
             const { vseed } = context;
             const { chartType } = vseed;
@@ -12236,6 +12232,22 @@
                 'dimensionLinkage'
             ]);
             let config = replaceNullToUndefined(pickedConfig);
+            if (pickedConfig?.binValueType === 'percentage') config = merge({}, {
+                yAxis: {
+                    autoFomat: false,
+                    numFormat: {
+                        type: 'percent',
+                        fractionDigits: 1
+                    }
+                },
+                label: {
+                    autoFormat: false,
+                    numFormat: {
+                        type: 'percent',
+                        fractionDigits: 1
+                    }
+                }
+            }, config);
             if (!hasColorEncoding && !config?.legend?.enable) config = {
                 ...config,
                 legend: {
@@ -12758,6 +12770,10 @@
             const formatter = createNumFormatter(numFormat);
             return (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
         };
+        const getDefaultValueFormatterOfHistogram = (binValueType = 'count')=>'percentage' === binValueType ? createNumFormatter({
+                type: 'percent',
+                fractionDigits: 1
+            }) : (value)=>autoFormatter(value);
         const tooltipHistogram_VCHART_OUTLIER_KEY = '__VCHART_BOX_PLOT_OUTLIER_VALUE';
         const tooltipHistogram = (spec, context)=>{
             const result = {
@@ -12766,11 +12782,12 @@
             const { advancedVSeed } = context;
             const { chartType, dimensions, encoding } = advancedVSeed;
             const baseConfig = advancedVSeed.config[chartType];
-            const { tooltip = {
+            const { binValueType, tooltip = {
                 enable: true
             } } = baseConfig;
             const { enable } = tooltip;
             const defaultXFormatter = getDefaultXFormatterOfHistogram(advancedVSeed);
+            const defaultValueFormatter = getDefaultValueFormatterOfHistogram(binValueType);
             result.tooltip = {
                 style: getTooltipStyle(tooltip),
                 visible: enable,
@@ -12778,18 +12795,18 @@
                     title: {
                         visible: false
                     },
-                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding, defaultXFormatter)
+                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding, defaultXFormatter, defaultValueFormatter)
                 },
                 dimension: {
                     title: {
                         visible: false
                     },
-                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding, defaultXFormatter)
+                    content: tooltipHistogram_createMarkContent(encoding.tooltip || [], dimensions, encoding, defaultXFormatter, defaultValueFormatter)
                 }
             };
             return result;
         };
-        const tooltipHistogram_createMarkContent = (tooltip, dimensions, encoding, dimFormatter)=>{
+        const tooltipHistogram_createMarkContent = (tooltip, dimensions, encoding, dimFormatter, defaultValueFormatter)=>{
             const dims = C(dimensions.filter((item)=>tooltip.includes(item.id)), T((item)=>item.id), T((item)=>item.alias));
             const dimContent = dims.map((item)=>({
                     visible: true,
@@ -12801,7 +12818,7 @@
                             if (encoding.color?.includes(item.id)) return datum?.[ColorEncoding];
                             if (encoding.x?.includes(item.id)) return datum?.[XEncoding];
                         }
-                        return datum?.[item.id];
+                        return defaultValueFormatter(datum?.[item.id]);
                     }
                 }));
             const defaultContent = [
@@ -12815,7 +12832,7 @@
                     },
                     value: (datum)=>{
                         if (!datum) return '';
-                        return datum[FoldMeasureValue];
+                        return defaultValueFormatter(datum[FoldMeasureValue]);
                     }
                 }
             ];
@@ -12845,6 +12862,24 @@
             };
             return result;
         };
+        const annotationPointOfHistogram = generateAnnotationPointPipe({
+            generateMarkPoint: (datum, spec)=>{
+                const histogramSpec = spec;
+                const xField = histogramSpec.xField;
+                const x2Field = histogramSpec.x2Field;
+                return [
+                    {
+                        coordinate: (data)=>{
+                            const d = data.find((item)=>isSubset(datum, item));
+                            return d ? {
+                                ...d,
+                                [xField]: (d[xField] + d[x2Field]) / 2
+                            } : void 0;
+                        }
+                    }
+                ];
+            }
+        });
         const gaussian = (u)=>1 / Math.sqrt(2 * Math.PI) * Math.exp(-0.5 * u * u);
         function scott(n, std, dim = 1) {
             return n <= 0 || 0 === std ? 0 : std * Math.pow(n, -1 / (dim + 4));
@@ -13234,7 +13269,7 @@
             colorAdapter(discreteLegend, colorLegend),
             histogramVerticalCrosshairRect,
             colorBarStyleFill(barStyle_barStyle),
-            annotationPoint_annotationPoint,
+            annotationPointOfHistogram,
             annotationVerticalLine_annotationVerticalLine,
             annotationHorizontalLine_annotationHorizontalLine,
             annotationAreaBand,
@@ -13257,7 +13292,7 @@
                 tooltipHistogram,
                 colorBarStyleFill(barStyle_barStyle),
                 histogramVerticalCrosshairRect,
-                annotationPoint_annotationPoint,
+                annotationPointOfHistogram,
                 annotationVerticalLine_annotationVerticalLine,
                 annotationHorizontalLine_annotationHorizontalLine,
                 annotationAreaBand,
@@ -14392,7 +14427,7 @@
             registerRadar();
             registerFunnel();
             registerHeatmap();
-            registerBoxplot();
+            registerBoxPlot();
             registerHistogram();
             registerLightTheme();
             registerDarkTheme();
@@ -14737,7 +14772,7 @@
             });
             return clone(schema, def);
         }
-        function merge(a, b) {
+        function util_merge(a, b) {
             const def = mergeDefs(a._zod.def, {
                 get shape () {
                     const _shape = {
@@ -17416,7 +17451,7 @@
                     catchall: void 0
                 });
             inst.extend = (incoming)=>extend(inst, incoming);
-            inst.merge = (other)=>merge(inst, other);
+            inst.merge = (other)=>util_merge(inst, other);
             inst.pick = (mask)=>pick(inst, mask);
             inst.omit = (mask)=>omit(inst, mask);
             inst.partial = (...args)=>partial(ZodOptional, inst, args[0]);
@@ -19004,7 +19039,7 @@
             annotationVerticalLine: schemas_array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).nullish(),
             annotationHorizontalLine: schemas_array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).nullish(),
             annotationArea: schemas_array(zAnnotationArea).or(zAnnotationArea).nullish(),
-            polynomialRegressionLine: schemas_array(zPolynomialRegressionLine).or(zPolynomialRegressionLine).or(schemas_boolean()).nullish(),
+            polynomialRegressionLine: schemas_array(zPolynomialRegressionLine).or(zPolynomialRegressionLine).nullish(),
             dimensionLinkage: zDimensionLinkage.nullish(),
             locale: zLocale.nullish()
         });
@@ -19208,10 +19243,10 @@
             annotationVerticalLine: schemas_array(zAnnotationVerticalLine).or(zAnnotationVerticalLine).nullish(),
             annotationHorizontalLine: schemas_array(zAnnotationHorizontalLine).or(zAnnotationHorizontalLine).nullish(),
             annotationArea: schemas_array(zAnnotationArea).or(zAnnotationArea).nullish(),
-            linearRegressionLine: schemas_array(zLinearRegressionLine).or(zLinearRegressionLine).or(schemas_boolean()).nullish(),
-            lowessRegressionLine: schemas_array(zLowessRegressionLine).or(zLowessRegressionLine).or(schemas_boolean()).nullish(),
-            polynomialRegressionLine: schemas_array(zPolynomialRegressionLine).or(zPolynomialRegressionLine).or(schemas_boolean()).nullish(),
-            logisticRegressionLine: schemas_array(zLogisticRegressionLine).or(zLogisticRegressionLine).or(schemas_boolean()).nullish(),
+            linearRegressionLine: schemas_array(zLinearRegressionLine).or(zLinearRegressionLine).nullish(),
+            lowessRegressionLine: schemas_array(zLowessRegressionLine).or(zLowessRegressionLine).nullish(),
+            polynomialRegressionLine: schemas_array(zPolynomialRegressionLine).or(zPolynomialRegressionLine).nullish(),
+            logisticRegressionLine: schemas_array(zLogisticRegressionLine).or(zLogisticRegressionLine).nullish(),
             dimensionLinkage: zDimensionLinkage.nullish(),
             locale: zLocale.nullish()
         });
@@ -19373,7 +19408,7 @@
             theme: zTheme.nullish(),
             locale: zLocale.nullish()
         });
-        const zBoxplot = schemas_object({
+        const zBoxPlot = schemas_object({
             chartType: literal('boxPlot'),
             dataset: zDataset.nullish(),
             encoding: zEncoding.nullish(),
@@ -19423,7 +19458,7 @@
             zRadar,
             zFunnel,
             zHeatmap,
-            zBoxplot,
+            zBoxPlot,
             zHistogram
         ]);
         const zCellStyle = schemas_object({