@visactor/vseed 0.1.16 → 0.1.18

package/dist/umd/index.js

@@ -1022,7 +1022,10 @@
                     numFormatterOptions.maximumSignificantDigits = significantDigits;
                 }
             }
-            const numFormatter = new Intl.NumberFormat(locale, numFormatterOptions);
+            const numFormatter = new Intl.NumberFormat(locale, {
+                ...numFormatterOptions,
+                useGrouping: thousandSeparator
+            });
             return (value)=>{
                 let num = Number(value);
                 let typeSymbol = '';
@@ -1963,14 +1966,14 @@
             }
             return measureTree;
         };
-        const deleteTooltipAndLabelMeasure = (advancedVSeed)=>{
-            const deleteBy = (measure)=>'tooltip' === measure.encoding || 'label' === measure.encoding;
-            const measureTree = deleteMeasureTreeByCallback(advancedVSeed.measures, deleteBy);
-            return {
-                ...advancedVSeed,
-                measures: measureTree
+        const deleteEncodingForMeasure = (encodingKeys)=>(advancedVSeed)=>{
+                const deleteBy = (measure)=>encodingKeys.includes(measure.encoding);
+                const measureTree = deleteMeasureTreeByCallback(advancedVSeed.measures, deleteBy);
+                return {
+                    ...advancedVSeed,
+                    measures: measureTree
+                };
             };
-        };
         const deleteDimensionTreeByCallback = (dimensionTree, callback)=>{
             if (!dimensionTree) return dimensionTree;
             const stack = [
@@ -2360,7 +2363,6 @@
         };
         const areaConfig = lineConfig;
         const areaPercentConfig = lineConfig;
-        const scatterConfig = lineConfig;
         const barConfig = columnConfig;
         const barParallelConfig = columnConfig;
         const barPercentConfig = columnConfig;
@@ -2410,7 +2412,10 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -4491,7 +4496,10 @@
             ], [
                 encodingForColumn,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -4862,7 +4870,10 @@
             ], [
                 encodingForColumn,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -4877,14 +4888,54 @@
             markStyle_markStyle,
             annotation_annotation
         ];
+        function chunk_HGKLN5KY_k(...n) {
+            return chunk_WIMGWYZL_u(chunk_HGKLN5KY_u, n);
+        }
+        function chunk_HGKLN5KY_u(n, e) {
+            if (n === e || Object.is(n, e)) return !0;
+            if ("object" != typeof n || "object" != typeof e || null === n || null === e || Object.getPrototypeOf(n) !== Object.getPrototypeOf(e)) return !1;
+            if (Array.isArray(n)) return chunk_HGKLN5KY_l(n, e);
+            if (n instanceof Map) return chunk_HGKLN5KY_a(n, e);
+            if (n instanceof Set) return chunk_HGKLN5KY_c(n, e);
+            if (n instanceof Date) return n.getTime() === e.getTime();
+            if (n instanceof RegExp) return n.toString() === e.toString();
+            if (Object.keys(n).length !== Object.keys(e).length) return !1;
+            for (let [r, t] of Object.entries(n))if (!(r in e) || !chunk_HGKLN5KY_u(t, e[r])) return !1;
+            return !0;
+        }
+        function chunk_HGKLN5KY_l(n, e) {
+            if (n.length !== e.length) return !1;
+            for (let [r, t] of n.entries())if (!chunk_HGKLN5KY_u(t, e[r])) return !1;
+            return !0;
+        }
+        function chunk_HGKLN5KY_a(n, e) {
+            if (n.size !== e.size) return !1;
+            for (let [r, t] of n.entries())if (!e.has(r) || !chunk_HGKLN5KY_u(t, e.get(r))) return !1;
+            return !0;
+        }
+        function chunk_HGKLN5KY_c(n, e) {
+            if (n.size !== e.size) return !1;
+            let r = [
+                ...e
+            ];
+            for (let t of n){
+                let o = !1;
+                for (let [s, f] of r.entries())if (chunk_HGKLN5KY_u(t, f)) {
+                    o = !0, r.splice(s, 1);
+                    break;
+                }
+                if (!o) return !1;
+            }
+            return !0;
+        }
         const initColumnParallel = (spec, context)=>{
             const result = {
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { datasetReshapeInfo, dimensions } = advancedVSeed;
+            const { datasetReshapeInfo, encoding } = advancedVSeed;
             const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
-            const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
+            const sameDimensionsMode = chunk_HGKLN5KY_k(encoding.x, encoding.color);
             result.type = 'bar';
             result.direction = 'vertical';
             result.xField = sameDimensionsMode ? [
@@ -4968,7 +5019,10 @@
             ], [
                 encodingForColumn,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5143,7 +5197,10 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5507,7 +5564,10 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5527,9 +5587,9 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { datasetReshapeInfo, dimensions } = advancedVSeed;
+            const { datasetReshapeInfo, encoding } = advancedVSeed;
             const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
-            const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
+            const sameDimensionsMode = chunk_HGKLN5KY_k(encoding.y, encoding.color);
             result.type = 'bar';
             result.direction = 'horizontal';
             result.yField = sameDimensionsMode ? [
@@ -5612,7 +5672,10 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5692,7 +5755,10 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5859,7 +5925,10 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5991,6 +6060,7 @@
             if (color.length > 0) encoding.color = [
                 color[0]
             ];
+            encoding.size = chunk_QJLMYOTX_i(measures.filter((item)=>'size' === item.encoding).map((item)=>item.id));
             const label = chunk_QJLMYOTX_i(measures.filter((item)=>'label' === item.encoding).map((item)=>item.id));
             encoding.label = chunk_QJLMYOTX_i([
                 ...encoding.label || [],
@@ -6100,6 +6170,33 @@
             });
             return scatterMeasuresToMeasureTree(scatterMeasures);
         };
+        const scatterConfig = (advancedVSeed, context)=>{
+            const { vseed } = context;
+            const { chartType } = vseed;
+            const result = {
+                ...advancedVSeed
+            };
+            const pickedConfig = chunk_2T7K3PFL_i(vseed, [
+                'backgroundColor',
+                'color',
+                'label',
+                'legend',
+                'tooltip',
+                'xAxis',
+                'yAxis',
+                'sizeRange',
+                'size',
+                'crosshairLine'
+            ]);
+            const config = replaceNullToUndefined(pickedConfig);
+            result.config = {
+                ...result.config || {},
+                [chartType]: {
+                    ...config
+                }
+            };
+            return result;
+        };
         const reshapeWithScatterEncoding = (advancedVSeed, context)=>{
             const result = {
                 ...advancedVSeed
@@ -6237,7 +6334,11 @@
             ], [
                 encodingForScatter,
                 buildMeasuresForScatter,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label',
+                    'size'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -6285,6 +6386,25 @@
                 }
             };
         };
+        const scatterSize = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed } = context;
+            const { chartType, encoding } = advancedVSeed;
+            const baseConfig = advancedVSeed.config[chartType];
+            if (!baseConfig || !baseConfig.sizeRange && !baseConfig.size) return result;
+            const size = baseConfig.size ?? baseConfig.sizeRange;
+            result.size = {
+                type: 'linear',
+                range: Array.isArray(size) ? size : [
+                    size,
+                    size
+                ]
+            };
+            result.sizeField = encoding?.size?.[0] || void 0;
+            return result;
+        };
         const labelScatter = (spec, context)=>{
             const result = {
                 ...spec
@@ -6438,6 +6558,7 @@
             progressive,
             xLinear,
             yLinear,
+            scatterSize,
             labelScatter,
             tooltipScatter,
             colorAdapter(discreteLegend, colorLegend),
@@ -6463,6 +6584,7 @@
                 progressive,
                 xLinear,
                 yLinear,
+                scatterSize,
                 labelScatter,
                 tooltipScatter,
                 verticalCrosshairLine,
@@ -6811,7 +6933,10 @@
             ], [
                 encodingForDualAxis,
                 buildMeasuresForDualAxis,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -7594,7 +7719,10 @@
             ], [
                 encodingForPie,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -7721,7 +7849,10 @@
             ], [
                 encodingForPie,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -7879,7 +8010,10 @@
             ], [
                 encodingForRose,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -7916,49 +8050,6 @@
             result.animation = true;
             return result;
         };
-        const angleAxis = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed } = context;
-            const { dimensions, measures } = advancedVSeed;
-            if (!dimensions || !measures) return result;
-            const is0D = 0 === dimensions.length;
-            const is1M1D = 1 === dimensions.length && 1 === measures.length;
-            const showAxis = !(is0D || is1M1D);
-            if (!result.axes) result.axes = [];
-            result.axes.push({
-                type: 'band',
-                orient: 'angle',
-                visible: showAxis,
-                zero: true,
-                nice: !!showAxis,
-                paddingInner: showAxis ? [
-                    0.15,
-                    0.1
-                ] : [
-                    0,
-                    0
-                ],
-                paddingOuter: showAxis ? [
-                    0.075,
-                    0.1
-                ] : [
-                    0,
-                    0
-                ],
-                grid: {
-                    visible: showAxis
-                },
-                domainLine: {
-                    visible: showAxis
-                },
-                tick: {
-                    visible: showAxis
-                }
-            });
-            return result;
-        };
         const radiusAxis = (spec, context)=>{
             const result = {
                 ...spec
@@ -7966,28 +8057,13 @@
             const { advancedVSeed } = context;
             const { dimensions, measures } = advancedVSeed;
             if (!dimensions || !measures) return result;
-            const is0D = 0 === dimensions.length;
-            const is1M1D = 1 === dimensions.length && 1 === measures.length;
-            const showAxis = !(is0D || is1M1D);
             if (!result.axes) result.axes = [];
             result.axes.push({
                 type: 'linear',
                 orient: 'radius',
-                visible: showAxis,
+                visible: false,
                 zero: true,
-                nice: !!showAxis,
-                grid: {
-                    visible: showAxis
-                },
-                tick: {
-                    visible: showAxis
-                },
-                label: {
-                    visible: showAxis
-                },
-                domainLine: {
-                    visible: showAxis
-                }
+                nice: false
             });
             return result;
         };
@@ -8038,7 +8114,6 @@
             background_backgroundColor,
             datasetXY,
             progressive,
-            angleAxis,
             radiusAxis,
             verticalCrosshairRect,
             colorRoseStyleFill(roseStyle),
@@ -8060,7 +8135,6 @@
                 datasetXY,
                 progressive,
                 radiusAxis,
-                angleAxis,
                 verticalCrosshairRect,
                 colorRoseStyleFill(roseStyle),
                 label_label,
@@ -8088,7 +8162,10 @@
             ], [
                 encodingForRose,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -8106,9 +8183,9 @@
                 ...spec
             };
             const { advancedVSeed } = context;
-            const { datasetReshapeInfo, dataset, dimensions } = advancedVSeed;
+            const { datasetReshapeInfo, dataset, encoding } = advancedVSeed;
             const { unfoldInfo, foldInfo } = datasetReshapeInfo[0];
-            const sameDimensionsMode = dimensions.length > 1 && dimensions.every((dim)=>dim.id === dimensions[0].id);
+            const sameDimensionsMode = chunk_HGKLN5KY_k(encoding.angle, encoding.color);
             result.type = 'rose';
             result.angleField = sameDimensionsMode ? [
                 unfoldInfo.encodingAngle
@@ -8151,7 +8228,6 @@
             datasetXY,
             progressive,
             radiusAxis,
-            angleAxis,
             colorRoseStyleFill(roseStyle),
             colorAdapter(discreteLegend, colorLegend),
             label_label,
@@ -8175,7 +8251,6 @@
                 datasetXY,
                 progressive,
                 radiusAxis,
-                angleAxis,
                 verticalCrosshairRect,
                 colorRoseStyleFill(roseStyle),
                 label_label,
@@ -8277,7 +8352,10 @@
             ], [
                 encodingForRadar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -8491,7 +8569,10 @@
             ], [
                 encodingForFunnel,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -8694,7 +8775,10 @@
             ], [
                 encodingForHeatmap,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -13034,14 +13118,26 @@
         const zMeasureTree = schemas_array(zMeasureGroup.or(zMeasure));
         const zDualMeasure = schemas_object({
             id: schemas_string(),
-            primaryMeasures: schemas_array(zMeasure).or(zMeasure).optional(),
+            primaryMeasures: schemas_array(zMeasure.omit({
+                encoding: true,
+                parentId: true
+            })).or(zMeasure.omit({
+                parentId: true,
+                encoding: true
+            })).optional(),
             secondaryMeasures: schemas_array(zMeasure).or(zMeasure).optional()
         });
         const zDualMeasures = schemas_array(zDualMeasure);
         const zScatterMeasure = schemas_object({
             id: schemas_string(),
-            xMeasures: schemas_array(zMeasure).or(zMeasure).optional(),
-            yMeasures: schemas_array(zMeasure).or(zMeasure).optional()
+            xMeasures: schemas_array(zMeasure.omit({
+                parentId: true,
+                encoding: true
+            })).or(zMeasure).optional(),
+            yMeasures: schemas_array(zMeasure.omit({
+                parentId: true,
+                encoding: true
+            })).or(zMeasure).optional()
         });
         const zScatterMeasures = schemas_array(zScatterMeasure);
         const zFoldInfo = schemas_object({
@@ -14087,6 +14183,8 @@
             measures: zMeasureTree.nullish(),
             scatterMeasures: zScatterMeasures.nullish(),
             backgroundColor: zBackgroundColor.nullish(),
+            size: schemas_number().or(schemas_array(schemas_number())).nullish(),
+            sizeRange: schemas_number().or(schemas_array(schemas_number())).nullish(),
             color: zColor.nullish(),
             label: zLabel.nullish(),
             legend: zLegend.nullish(),