@visactor/vseed 0.1.16 → 0.1.17

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([
@@ -4968,7 +4979,10 @@
             ], [
                 encodingForColumn,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5143,7 +5157,10 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5507,7 +5524,10 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5612,7 +5632,10 @@
             ], [
                 encodingForBar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5692,7 +5715,10 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5859,7 +5885,10 @@
             ], [
                 encodingForLine,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -5991,6 +6020,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 +6130,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 +6294,11 @@
             ], [
                 encodingForScatter,
                 buildMeasuresForScatter,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label',
+                    'size'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -6285,6 +6346,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 +6518,7 @@
             progressive,
             xLinear,
             yLinear,
+            scatterSize,
             labelScatter,
             tooltipScatter,
             colorAdapter(discreteLegend, colorLegend),
@@ -6463,6 +6544,7 @@
                 progressive,
                 xLinear,
                 yLinear,
+                scatterSize,
                 labelScatter,
                 tooltipScatter,
                 verticalCrosshairLine,
@@ -6811,7 +6893,10 @@
             ], [
                 encodingForDualAxis,
                 buildMeasuresForDualAxis,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -7594,7 +7679,10 @@
             ], [
                 encodingForPie,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -7721,7 +7809,10 @@
             ], [
                 encodingForPie,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -7879,7 +7970,10 @@
             ], [
                 encodingForRose,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -8088,7 +8182,10 @@
             ], [
                 encodingForRose,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -8277,7 +8374,10 @@
             ], [
                 encodingForRadar,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -8491,7 +8591,10 @@
             ], [
                 encodingForFunnel,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -8694,7 +8797,10 @@
             ], [
                 encodingForHeatmap,
                 buildMeasures,
-                deleteTooltipAndLabelMeasure,
+                deleteEncodingForMeasure([
+                    'tooltip',
+                    'label'
+                ]),
                 deleteTooltipAndLabelDimension
             ]),
             pivotAdapter([
@@ -13034,14 +13140,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 +14205,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(),