@visactor/vseed 0.2.3 → 0.2.6

package/dist/umd/index.js

@@ -3068,22 +3068,9 @@
             if (!chunk_VCYTMP4D_n(numFormat)) return formatter(value);
             return String(value);
         };
-        const yLinear = (spec, context)=>{
-            const result = {
-                ...spec
-            };
-            const { advancedVSeed, vseed } = context;
-            const { chartType } = vseed;
-            const { measures, dimensions, encoding } = advancedVSeed;
-            const config = advancedVSeed.config?.[chartType]?.yAxis ?? {};
-            if (!result.axes) result.axes = [];
-            const isPivot = chatType_isPivotChart(vseed);
-            const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10, autoFormat, numFormat = {} } = config;
-            const formatter = createNumFormatter(numFormat);
-            const percentFormatter = createNumFormatter({
-                type: 'percent'
-            });
-            const linearAxis = {
+        const linearAxisStyle = (config)=>{
+            const { orient, visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10, formatMethod, titleText, id, seriesId, sync, isPivot = false } = config;
+            const axisConfig = {
                 ...isPivot ? {
                     range: {
                         min,
@@ -3096,17 +3083,14 @@
                 visible,
                 type: log ? 'log' : 'linear',
                 base: logBase,
-                orient: 'left',
+                orient,
                 nice,
                 zero: log ? false : zero,
                 inverse,
                 label: {
                     space: 8,
                     visible: label?.visible,
-                    formatMethod: (value)=>{
-                        if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter);
-                        return createLinearFormat(value, autoFormat, numFormat, formatter);
-                    },
+                    formatMethod,
                     style: {
                         fill: label?.labelColor,
                         angle: label?.labelAngle,
@@ -3116,7 +3100,7 @@
                 },
                 title: {
                     visible: title?.visible,
-                    text: title?.titleText || defaultTitleText(measures, dimensions, encoding.y),
+                    text: titleText,
                     style: {
                         fill: title?.titleColor,
                         fontSize: title?.titleFontSize,
@@ -3145,11 +3129,46 @@
                         lineWidth: line?.lineWidth,
                         stroke: line?.lineColor
                     }
-                },
-                innerOffset: {
-                    top: 12
                 }
             };
+            if ('bottom' === orient || 'top' === orient) axisConfig.innerOffset = {
+                right: 12
+            };
+            else axisConfig.innerOffset = {
+                top: 12
+            };
+            if (id) axisConfig.id = id;
+            if (seriesId) axisConfig.seriesId = seriesId;
+            if (sync) axisConfig.sync = sync;
+            return axisConfig;
+        };
+        const yLinear = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed, vseed } = context;
+            const { chartType } = vseed;
+            const { measures, dimensions, encoding } = advancedVSeed;
+            const config = advancedVSeed.config?.[chartType]?.yAxis ?? {};
+            if (!result.axes) result.axes = [];
+            const isPivot = chatType_isPivotChart(vseed);
+            const { autoFormat, numFormat = {} } = config;
+            const formatter = createNumFormatter(numFormat);
+            const percentFormatter = createNumFormatter({
+                type: 'percent'
+            });
+            const formatMethod = (value)=>{
+                if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter);
+                return createLinearFormat(value, autoFormat, numFormat, formatter);
+            };
+            const titleText = config.title?.titleText || defaultTitleText(measures, dimensions, encoding.y);
+            const linearAxis = linearAxisStyle({
+                ...config,
+                orient: 'left',
+                formatMethod,
+                titleText,
+                isPivot
+            });
             result.axes = [
                 ...result.axes,
                 linearAxis
@@ -5615,8 +5634,8 @@
             });
             spec.chartDimensionLinkage = {
                 showTooltip: config.showTooltip ?? chartSpec?.tooltip?.dimension?.visible ?? true,
-                heightLimitToShowTooltipForEdgeRow: 60,
-                widthLimitToShowTooltipForEdgeColumn: 90,
+                heightLimitToShowTooltipForEdgeRow: spec.defaultRowHeight / 2,
+                widthLimitToShowTooltipForEdgeColumn: spec.defaultColWidth / 2,
                 labelHoverOnAxis
             };
             return spec;
@@ -7157,78 +7176,23 @@
             const config = advancedVSeed.config?.[chartType]?.xAxis ?? {};
             if (!result.axes) result.axes = [];
             const isPivot = chatType_isPivotChart(vseed);
-            const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10, autoFormat, numFormat = {} } = config;
+            const { autoFormat, numFormat = {} } = config;
             const formatter = createNumFormatter(numFormat);
             const percentFormatter = createNumFormatter({
                 type: 'percent'
             });
-            const linearAxis = {
-                ...isPivot ? {
-                    range: {
-                        min,
-                        max
-                    }
-                } : {
-                    min,
-                    max
-                },
-                visible,
-                type: log ? 'log' : 'linear',
-                base: logBase,
-                orient: 'bottom',
-                nice,
-                zero: log ? false : zero,
-                inverse,
-                label: {
-                    space: 8,
-                    visible: label?.visible,
-                    formatMethod: (value)=>{
-                        if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter);
-                        return createLinearFormat(value, autoFormat, numFormat, formatter);
-                    },
-                    style: {
-                        fill: label?.labelColor,
-                        angle: label?.labelAngle,
-                        fontSize: label?.labelFontSize,
-                        fontWeight: label?.labelFontWeight
-                    }
-                },
-                title: {
-                    visible: title?.visible,
-                    text: title?.titleText || defaultTitleText(measures, dimensions, encoding.x),
-                    style: {
-                        fill: title?.titleColor,
-                        fontSize: title?.titleFontSize,
-                        fontWeight: title?.titleFontWeight
-                    }
-                },
-                tick: {
-                    visible: tick?.visible,
-                    tickSize: tick?.tickSize,
-                    inside: tick?.tickInside,
-                    style: {
-                        stroke: tick?.tickColor
-                    }
-                },
-                grid: {
-                    visible: grid?.visible,
-                    style: {
-                        lineWidth: grid?.gridWidth,
-                        stroke: grid?.gridColor,
-                        lineDash: grid?.gridLineDash
-                    }
-                },
-                domainLine: {
-                    visible: line?.visible,
-                    style: {
-                        lineWidth: line?.lineWidth,
-                        stroke: line?.lineColor
-                    }
-                },
-                innerOffset: {
-                    right: 12
-                }
+            const formatMethod = (value)=>{
+                if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter);
+                return createLinearFormat(value, autoFormat, numFormat, formatter);
             };
+            const titleText = config.title?.titleText || defaultTitleText(measures, dimensions, encoding.x);
+            const linearAxis = linearAxisStyle({
+                ...config,
+                orient: 'bottom',
+                formatMethod,
+                titleText,
+                isPivot
+            });
             result.axes = [
                 ...result.axes,
                 linearAxis
@@ -9699,66 +9663,20 @@
             ];
             const seriesId = alignTicksConfig ? seriesIds : seriesIds[0];
             if (!result.axes) result.axes = [];
-            const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10, autoFormat, numFormat = {} } = yAxisConfig ?? {};
+            const { autoFormat, numFormat = {} } = yAxisConfig ?? {};
             const formatter = createNumFormatter(numFormat);
+            const formatMethod = (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
+            const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y);
             const linearAxis = {
-                visible: isEmptySecondary ? false : visible,
-                id,
-                seriesId,
-                type: log ? 'log' : 'linear',
-                base: logBase,
-                orient: 'left',
-                nice,
-                zero: log ? false : zero,
-                inverse,
-                max,
-                min,
-                label: {
-                    space: 8,
-                    visible: label?.visible,
-                    formatMethod: (value)=>createLinearFormat(value, autoFormat, numFormat, formatter),
-                    style: {
-                        fill: label?.labelColor,
-                        angle: label?.labelAngle,
-                        fontSize: label?.labelFontSize,
-                        fontWeight: label?.labelFontWeight
-                    }
-                },
-                title: {
-                    visible: title?.visible,
-                    text: title?.titleText || defaultTitleText(measures, dimensions, encoding.y),
-                    style: {
-                        fill: title?.titleColor,
-                        fontSize: title?.titleFontSize,
-                        fontWeight: title?.titleFontWeight
-                    }
-                },
-                tick: {
-                    visible: tick?.visible,
-                    tickSize: tick?.tickSize,
-                    inside: tick?.tickInside,
-                    style: {
-                        stroke: tick?.tickColor
-                    }
-                },
-                grid: {
-                    visible: grid?.visible,
-                    style: {
-                        lineWidth: grid?.gridWidth,
-                        stroke: grid?.gridColor,
-                        lineDash: grid?.gridLineDash
-                    }
-                },
-                domainLine: {
-                    visible: line?.visible,
-                    style: {
-                        lineWidth: line?.lineWidth,
-                        stroke: line?.lineColor
-                    }
-                },
-                innerOffset: {
-                    top: 12
-                }
+                ...linearAxisStyle({
+                    ...yAxisConfig,
+                    orient: 'left',
+                    formatMethod,
+                    titleText,
+                    id,
+                    seriesId
+                }),
+                visible: isEmptySecondary ? false : yAxisConfig?.visible ?? true
             };
             result.axes = [
                 ...result.axes,
@@ -9792,66 +9710,25 @@
             ];
             const seriesId = alignTicksConfig ? seriesIds : seriesIds[1];
             if (!result.axes) result.axes = [];
-            const { visible = true, label, tick, title, grid, line, zero, nice, inverse, max, min, log, logBase = 10, numFormat = {}, autoFormat } = yAxisConfig ?? {};
+            const { autoFormat, numFormat = {} } = yAxisConfig ?? {};
             const formatter = createNumFormatter(numFormat);
-            const linearAxis = {
-                visible: isEmptySecondary ? false : visible,
+            const formatMethod = (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
+            const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y);
+            const baseStyle = linearAxisStyle({
+                ...yAxisConfig,
+                orient: 'right',
+                formatMethod,
+                titleText,
                 id,
                 seriesId,
-                sync,
-                type: log ? 'log' : 'linear',
-                base: logBase,
-                orient: 'right',
-                nice,
-                zero: log ? false : zero,
-                inverse,
-                max,
-                min,
-                label: {
-                    space: 8,
-                    visible: label?.visible,
-                    formatMethod: (value)=>createLinearFormat(value, autoFormat, numFormat, formatter),
-                    style: {
-                        fill: label?.labelColor,
-                        angle: label?.labelAngle,
-                        fontSize: label?.labelFontSize,
-                        fontWeight: label?.labelFontWeight
-                    }
-                },
-                title: {
-                    visible: title?.visible,
-                    text: title?.titleText || defaultTitleText(measures, dimensions, encoding.y),
-                    style: {
-                        fill: title?.titleColor,
-                        fontSize: title?.titleFontSize,
-                        fontWeight: title?.titleFontWeight
-                    }
-                },
-                tick: {
-                    visible: tick?.visible,
-                    tickSize: tick?.tickSize,
-                    inside: tick?.tickInside,
-                    style: {
-                        stroke: tick?.tickColor
-                    }
-                },
+                sync
+            });
+            const linearAxis = {
+                ...baseStyle,
+                visible: isEmptySecondary ? false : yAxisConfig?.visible ?? true,
                 grid: {
-                    visible: onlySecondary ? true : grid?.visible,
-                    style: {
-                        lineWidth: grid?.gridWidth,
-                        stroke: grid?.gridColor,
-                        lineDash: grid?.gridLineDash
-                    }
-                },
-                domainLine: {
-                    visible: line?.visible,
-                    style: {
-                        lineWidth: line?.lineWidth,
-                        stroke: line?.lineColor
-                    }
-                },
-                innerOffset: {
-                    top: 12
+                    ...baseStyle.grid,
+                    visible: onlySecondary ? true : yAxisConfig?.grid?.visible
                 }
             };
             result.axes = [
@@ -12818,6 +12695,47 @@
                 }
             };
         };
+        const histogramXLinear = (spec, context)=>{
+            const result = {
+                ...spec
+            };
+            const { advancedVSeed, vseed } = context;
+            const { encoding, dimensions, measures, dataset } = advancedVSeed;
+            const { chartType } = vseed;
+            const config = advancedVSeed.config?.[chartType]?.xAxis ?? {};
+            if (!result.axes) result.axes = [];
+            const isPivot = chatType_isPivotChart(vseed);
+            const { autoFormat, numFormat = {} } = config;
+            const formatter = createNumFormatter(numFormat);
+            const percentFormatter = createNumFormatter({
+                type: 'percent'
+            });
+            const formatMethod = (value)=>{
+                if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter);
+                return createLinearFormat(value, autoFormat, numFormat, formatter);
+            };
+            const titleText = config.title?.titleText || defaultTitleText(measures, dimensions, encoding.x);
+            const linearAxis = linearAxisStyle({
+                ...config,
+                orient: 'bottom',
+                formatMethod,
+                titleText,
+                isPivot
+            });
+            linearAxis.tick.tickMode = ()=>{
+                const binValues = [];
+                dataset.forEach((entry)=>{
+                    binValues.push(entry[BinStartMeasureId]);
+                    binValues.push(entry[BinEndMeasureId]);
+                });
+                return chunk_QJLMYOTX_i(binValues);
+            };
+            result.axes = [
+                ...result.axes,
+                linearAxis
+            ];
+            return result;
+        };
         const getDefaultXFormatterOfHistogram = (advancedVSeed)=>{
             const { chartType, config } = advancedVSeed;
             const xConfig = config?.[chartType]?.xAxis;
@@ -13318,7 +13236,7 @@
             background_backgroundColor,
             datasetHistogram,
             progressive,
-            xLinear,
+            histogramXLinear,
             yLinear,
             label_label,
             tooltipHistogram,
@@ -13342,7 +13260,7 @@
                 background_backgroundColor,
                 datasetHistogram,
                 progressive,
-                xLinear,
+                histogramXLinear,
                 pivotAxisStyle(yLinear),
                 label_label,
                 tooltipHistogram,
@@ -14692,6 +14610,9 @@
                 configurable: true
             });
         }
+        function objectClone(obj) {
+            return Object.create(Object.getPrototypeOf(obj), Object.getOwnPropertyDescriptors(obj));
+        }
         function assignProp(target, prop, value) {
             Object.defineProperty(target, prop, {
                 value,
@@ -14734,6 +14655,12 @@
             if (false === Object.prototype.hasOwnProperty.call(prot, "isPrototypeOf")) return false;
             return true;
         }
+        function shallowClone(o) {
+            if (util_isPlainObject(o)) return {
+                ...o
+            };
+            return o;
+        }
         const propertyKeyTypes = new Set([
             "string",
             "number",
@@ -15504,7 +15431,7 @@
         const versions_version = {
             major: 4,
             minor: 0,
-            patch: 14
+            patch: 17
         };
         const $ZodType = /*@__PURE__*/ $constructor("$ZodType", (inst, def)=>{
             var _a;
@@ -15979,7 +15906,7 @@
             $ZodType.init(inst, def);
             const _normalized = cached(()=>{
                 const keys = Object.keys(def.shape);
-                for (const k of keys)if (!(def.shape[k] instanceof $ZodType)) throw new Error(`Invalid element at key "${k}": expected a Zod schema`);
+                for (const k of keys)if (!def.shape[k]._zod.traits.has("$ZodType")) throw new Error(`Invalid element at key "${k}": expected a Zod schema`);
                 const okeys = optionalKeys(def.shape);
                 return {
                     shape: def.shape,
@@ -17535,9 +17462,7 @@
             const def = {
                 type: "object",
                 get shape () {
-                    assignProp(this, "shape", {
-                        ...shape
-                    });
+                    assignProp(this, "shape", shape ? objectClone(shape) : {});
                     return this.shape;
                 },
                 ...normalizeParams(params)
@@ -17718,7 +17643,7 @@
                 type: "default",
                 innerType: innerType,
                 get defaultValue () {
-                    return "function" == typeof defaultValue ? defaultValue() : defaultValue;
+                    return "function" == typeof defaultValue ? defaultValue() : shallowClone(defaultValue);
                 }
             });
         }
@@ -17732,7 +17657,7 @@
                 type: "prefault",
                 innerType: innerType,
                 get defaultValue () {
-                    return "function" == typeof defaultValue ? defaultValue() : defaultValue;
+                    return "function" == typeof defaultValue ? defaultValue() : shallowClone(defaultValue);
                 }
             });
         }