@visactor/vchart 1.3.0-beta.9 → 1.3.0

package/cjs/util/spec/merge-spec.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.mergeSpec = void 0;
+
+const vutils_1 = require("@visactor/vutils");
+
+function baseMerge(target, source, shallowArray = !1) {
+    if (source) {
+        if (target === source) return;
+        if ((0, vutils_1.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];
+                (0, vutils_1.isValid)(iterable[key]) && "object" == typeof iterable[key] && !(0, 
+                vutils_1.isArray)(target[key]) ? baseMergeDeep(target, source, key, shallowArray) : assignMergeValue(target, key, iterable[key]);
+            }
+        }
+    }
+}
+
+function baseMergeDeep(target, source, key, shallowArray = !1) {
+    const objValue = target[key], srcValue = source[key];
+    let newValue = source[key], isCommon = !0;
+    if ((0, vutils_1.isArray)(srcValue)) {
+        if (shallowArray) newValue = []; else if ((0, vutils_1.isArray)(objValue)) newValue = objValue; else if ((0, 
+        vutils_1.isArrayLike)(objValue)) {
+            newValue = new Array(objValue.length);
+            let index = -1;
+            const length = objValue.length;
+            for (;++index < length; ) newValue[index] = objValue[index];
+        }
+    } else (0, vutils_1.isPlainObject)(srcValue) ? (newValue = objValue, "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
+    isCommon && baseMerge(newValue, srcValue, shallowArray), 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 mergeSpec(target, ...sources) {
+    let sourceIndex = -1;
+    const length = sources.length;
+    for (;++sourceIndex < length; ) {
+        baseMerge(target, sources[sourceIndex], !0);
+    }
+    return target;
+}
+
+exports.mergeSpec = mergeSpec;
+//# sourceMappingURL=merge-spec.js.map

package/cjs/util/spec/merge-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/spec/merge-spec.ts"],"names":[],"mappings":"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","file":"merge-spec.js","sourcesContent":["import { isArray, isArrayLike, isPlainObject, isValid } from '@visactor/vutils';\n\nfunction baseMerge(target: any, source: any, shallowArray: boolean = false) {\n  if (source) {\n    if (target === source) {\n      return;\n    }\n    if (isValid(source) && typeof source === 'object') {\n      // baseFor\n      const iterable = Object(source);\n      const props = [];\n      // keysIn\n      for (const key in iterable) {\n        props.push(key);\n      }\n      let { length } = props;\n      let propIndex = -1;\n      while (length--) {\n        const key = props[++propIndex];\n        if (\n          isValid(iterable[key]) &&\n          typeof iterable[key] === 'object' &&\n          !isArray(target[key]) // VChart 特有逻辑\n        ) {\n          baseMergeDeep(target, source, key, shallowArray);\n        } else {\n          assignMergeValue(target, key, iterable[key]);\n        }\n      }\n    }\n  }\n}\n\n// 由于目前 VChart 内部对 spec 会先执行一次深拷贝，merge 暂时不考虑 source 中有环的问题\nfunction baseMergeDeep(target: object, source: object, key: string, shallowArray: boolean = false) {\n  const objValue = target[key];\n  const srcValue = source[key];\n  let newValue = source[key];\n  let isCommon = true;\n  // 不考虑 buffer / typedArray 类型\n  if (isArray(srcValue)) {\n    if (shallowArray) {\n      // 依据参数对数组做浅拷贝\n      newValue = [];\n    } else if (isArray(objValue)) {\n      newValue = objValue;\n    } else if (isArrayLike(objValue)) {\n      // 如果 source 为数组，则 target 的 arrayLike 对象也视作为数组处理\n      newValue = new Array(objValue.length);\n      let index = -1;\n      const length = objValue.length;\n      while (++index < length) {\n        newValue[index] = objValue[index];\n      }\n    }\n  }\n  // else if (isArray(srcValue) && shallowArray) {\n  //   newValue = [];\n  // }\n  // 不考虑 argument 类型\n  else if (isPlainObject(srcValue)) {\n    newValue = objValue;\n    // 不考虑 prototype 的额外处理\n    if (typeof objValue === 'function' || typeof objValue !== 'object') {\n      newValue = {};\n    }\n  } else {\n    isCommon = false;\n  }\n  // 对 class 等复杂对象或者浅拷贝的 array 不做拷贝处理\n  if (isCommon) {\n    baseMerge(newValue, srcValue, shallowArray);\n  }\n  assignMergeValue(target, key, newValue);\n}\n\nfunction assignMergeValue(target: object, key: string, value: any) {\n  if ((value !== undefined && !eq(target[key], value)) || (value === undefined && !(key in target))) {\n    // 不考虑 __proto__ 的赋值处理\n    target[key] = value;\n  }\n}\n\nfunction eq(value: any, other: any) {\n  return value === other || (Number.isNaN(value) && Number.isNaN(other));\n}\n\n/* 与原生的 lodash merge 差异在于对数组是否应用最后一个 source 的结果\n * 以及对一些特殊情况的处理，比如对数组类型 padding 和对象类型的 padding 的 merge\n */\nexport function mergeSpec(target: any, ...sources: any[]): any {\n  let sourceIndex = -1;\n  const length = sources.length;\n  while (++sourceIndex < length) {\n    const source = sources[sourceIndex];\n    baseMerge(target, source, true);\n  }\n  return target;\n}\n"]}

package/cjs/util/spec/merge-theme.d.ts

@@ -0,0 +1,3 @@
+import { type Maybe } from '@visactor/vutils';
+import type { ITheme } from '../../theme';
+export declare function mergeTheme(target: Maybe<ITheme>, ...sources: Maybe<ITheme>[]): Maybe<ITheme>;

package/cjs/util/spec/merge-theme.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.mergeTheme = void 0;
+
+const vutils_1 = require("@visactor/vutils"), util_1 = require("../../theme/color-scheme/util"), interface_1 = require("../../series/interface"), merge_spec_1 = require("./merge-spec");
+
+function mergeTheme(target, ...sources) {
+    return (0, merge_spec_1.mergeSpec)(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));
+}
+
+function transformThemeToMerge(theme) {
+    if (!theme) return theme;
+    let {colorScheme: colorScheme} = theme;
+    colorScheme && (colorScheme = Object.keys(colorScheme).reduce(((scheme, key) => {
+        const value = colorScheme[key];
+        return scheme[key] = (0, util_1.transformColorSchemeToStandardStruct)(value), scheme;
+    }), {}));
+    let {series: series} = theme;
+    const {mark: markByType, markByName: markByName} = theme;
+    return (markByType || markByName) && (series = Object.keys(interface_1.seriesMarkInfoMap).reduce(((newSeriesTheme, key) => {
+        var _a;
+        const value = null !== (_a = null == series ? void 0 : series[key]) && void 0 !== _a ? _a : {}, newValue = {};
+        return Object.values(interface_1.seriesMarkInfoMap[key]).forEach((({type: type, name: name}) => {
+            var _a, _b;
+            newValue[name] = (0, merge_spec_1.mergeSpec)({}, null !== (_a = null == markByType ? void 0 : markByType[(0, 
+            vutils_1.array)(type)[0]]) && void 0 !== _a ? _a : {}, null !== (_b = null == markByName ? void 0 : markByName[name]) && void 0 !== _b ? _b : {}, value[name]);
+        })), newSeriesTheme[key] = Object.assign(Object.assign({}, value), newValue), newSeriesTheme;
+    }), {})), Object.assign(Object.assign({}, theme), {
+        colorScheme: colorScheme,
+        series: series
+    });
+}
+
+exports.mergeTheme = mergeTheme;
+//# sourceMappingURL=merge-theme.js.map

package/cjs/util/spec/merge-theme.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/spec/merge-theme.ts"],"names":[],"mappings":";;;AAAA,6CAAqD;AAErD,wDAAqF;AAIrF,sDAAiF;AACjF,6CAAyC;AAEzC,SAAgB,UAAU,CAAC,MAAqB,EAAE,GAAG,OAAwB;IAC3E,OAAO,IAAA,sBAAS,EAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC;AACzF,CAAC;AAFD,gCAEC;AAED,SAAS,qBAAqB,CAAC,KAAqB;IAClD,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IAGD,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC5B,IAAI,WAAW,EAAE;QACf,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAoB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YAC/E,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,2CAAoC,EAAC,KAAK,CAAC,CAAC;YAC1D,OAAO,MAAM,CAAC;QAChB,CAAC,EAAE,EAAuB,CAAC,CAAC;KAC7B;IAGD,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACvB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC/C,IAAI,UAAU,IAAI,UAAU,EAAE;QAC5B,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,6BAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE;;YACrE,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,GAAG,CAAC,mCAAI,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,MAAM,CAAC,MAAM,CAAkB,6BAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;;gBAChF,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAS,EAAC,EAAE,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,mCAAI,EAAE,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAI,CAAC,mCAAI,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5G,CAAC,CAAC,CAAC;YACH,cAAc,CAAC,GAAG,CAAC,mCACd,KAAK,GACL,QAAQ,CACZ,CAAC;YACF,OAAO,cAAc,CAAC;QACxB,CAAC,EAAE,EAAkB,CAAC,CAAC;KACxB;IAED,uCACK,KAAK,KACR,WAAW;QACX,MAAM,IACN;AACJ,CAAC","file":"merge-theme.js","sourcesContent":["import { type Maybe, array } from '@visactor/vutils';\nimport type { ITheme } from '../../theme';\nimport { transformColorSchemeToStandardStruct } from '../../theme/color-scheme/util';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport type { ISeriesTheme } from '../../series/interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { seriesMarkInfoMap, type ISeriesMarkInfo } from '../../series/interface';\nimport { mergeSpec } from './merge-spec';\n\nexport function mergeTheme(target: Maybe<ITheme>, ...sources: Maybe<ITheme>[]): Maybe<ITheme> {\n  return mergeSpec(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));\n}\n\nfunction transformThemeToMerge(theme?: Maybe<ITheme>): Maybe<ITheme> {\n  if (!theme) {\n    return theme;\n  }\n\n  // 将色板转化为标准形式\n  let { colorScheme } = theme;\n  if (colorScheme) {\n    colorScheme = Object.keys(colorScheme).reduce<IThemeColorScheme>((scheme, key) => {\n      const value = colorScheme[key];\n      scheme[key] = transformColorSchemeToStandardStruct(value);\n      return scheme;\n    }, {} as IThemeColorScheme);\n  }\n\n  // 将全局 mark 主题 merge 进系列主题\n  let { series } = theme;\n  const { mark: markByType, markByName } = theme;\n  if (markByType || markByName) {\n    series = Object.keys(seriesMarkInfoMap).reduce((newSeriesTheme, key) => {\n      const value = series?.[key] ?? {};\n      const newValue = {};\n      Object.values<ISeriesMarkInfo>(seriesMarkInfoMap[key]).forEach(({ type, name }) => {\n        newValue[name] = mergeSpec({}, markByType?.[array(type)[0]] ?? {}, markByName?.[name] ?? {}, value[name]);\n      });\n      newSeriesTheme[key] = {\n        ...value,\n        ...newValue\n      };\n      return newSeriesTheme;\n    }, {} as ISeriesTheme);\n  }\n\n  return {\n    ...theme,\n    colorScheme,\n    series\n  };\n}\n"]}

package/cjs/util/spec/preprocess.d.ts

@@ -0,0 +1,3 @@
+import type { SeriesTypeEnum } from '../../series/interface';
+import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
+export declare function preprocessSpecOrTheme(obj: any, colorScheme?: IThemeColorScheme, seriesType?: SeriesTypeEnum): any;

package/cjs/util/spec/preprocess.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.preprocessSpecOrTheme = void 0;
+
+const vutils_1 = require("@visactor/vutils"), common_1 = require("./common"), util_1 = require("../../theme/color-scheme/util"), space_1 = require("../space");
+
+function preprocessSpecOrTheme(obj, colorScheme, seriesType) {
+    if ((0, vutils_1.isArray)(obj)) return obj.map((element => (0, vutils_1.isObject)(element) && !(0, 
+    vutils_1.isFunction)(element) ? preprocessSpecOrTheme(element, colorScheme, seriesType) : element));
+    const newObj = {};
+    return Object.keys(obj).forEach((key => {
+        const value = obj[key];
+        if (key.includes("data")) newObj[key] = value; else if ((0, vutils_1.isObject)(value)) {
+            if ((0, vutils_1.isFunction)(value) || (0, common_1.isDataView)(value) || (0, common_1.isHTMLElement)(value)) return void (newObj[key] = value);
+            (0, util_1.isColorKey)(value) ? newObj[key] = (0, util_1.getActualColor)(value, colorScheme, seriesType) : newObj[key] = "padding" === key ? (0, 
+            space_1.normalizeLayoutPaddingSpec)(value) : preprocessSpecOrTheme(value, colorScheme, seriesType);
+        } else newObj[key] = value;
+    })), newObj;
+}
+
+exports.preprocessSpecOrTheme = preprocessSpecOrTheme;
+//# sourceMappingURL=preprocess.js.map

package/cjs/util/spec/preprocess.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/spec/preprocess.ts"],"names":[],"mappings":";;;AAAA,6CAAiE;AAGjE,qCAAqD;AACrD,wDAA2E;AAC3E,oCAAsD;AAGtD,SAAgB,qBAAqB,CAAC,GAAQ,EAAE,WAA+B,EAAE,UAA2B;IAC1G,IAAI,IAAA,gBAAO,EAAC,GAAG,CAAC,EAAE;QAChB,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACvB,IAAI,IAAA,iBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,mBAAU,EAAC,OAAO,CAAC,EAAE;gBAC7C,OAAO,qBAAqB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;aAChE;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC7B,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvB,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACpB,OAAO;SACR;QACD,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YAEnB,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,IAAI,IAAA,sBAAa,EAAC,KAAK,CAAC,EAAE;gBAClE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,OAAO;aACR;YACD,IAAI,IAAA,iBAAU,EAAC,KAAK,CAAC,EAAE;gBAErB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,qBAAc,EAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;aAC9D;iBAAM,IAAI,GAAG,KAAK,SAAS,EAAE;gBAE5B,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,kCAA0B,EAAC,KAAK,CAAC,CAAC;aACjD;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;aACrE;SACF;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAvCD,sDAuCC","file":"preprocess.js","sourcesContent":["import { isArray, isFunction, isObject } from '@visactor/vutils';\nimport type { SeriesTypeEnum } from '../../series/interface';\nimport type { IThemeColorScheme } from '../../theme/color-scheme/interface';\nimport { isDataView, isHTMLElement } from './common';\nimport { getActualColor, isColorKey } from '../../theme/color-scheme/util';\nimport { normalizeLayoutPaddingSpec } from '../space';\n\n/** 对 spec 或者类 spec 配置（如 theme）进行预处理，如进行语义化颜色的转换等 */\nexport function preprocessSpecOrTheme(obj: any, colorScheme?: IThemeColorScheme, seriesType?: SeriesTypeEnum): any {\n  if (isArray(obj)) {\n    return obj.map(element => {\n      if (isObject(element) && !isFunction(element)) {\n        return preprocessSpecOrTheme(element, colorScheme, seriesType);\n      }\n      return element;\n    });\n  }\n\n  const newObj = {};\n  Object.keys(obj).forEach(key => {\n    const value = obj[key];\n    // 绕过数据\n    if (key.includes('data')) {\n      newObj[key] = value;\n      return;\n    }\n    if (isObject(value)) {\n      // 绕过不可深拷贝的对象\n      if (isFunction(value) || isDataView(value) || isHTMLElement(value)) {\n        newObj[key] = value;\n        return;\n      }\n      if (isColorKey(value)) {\n        // 查询、替换语义化颜色\n        newObj[key] = getActualColor(value, colorScheme, seriesType);\n      } else if (key === 'padding') {\n        // 标准化 padding\n        newObj[key] = normalizeLayoutPaddingSpec(value);\n      } else {\n        newObj[key] = preprocessSpecOrTheme(value, colorScheme, seriesType);\n      }\n    } else {\n      newObj[key] = value;\n    }\n  });\n\n  return newObj;\n}\n"]}

package/cjs/util/spec/transform.d.ts

@@ -0,0 +1,3 @@
+export declare function specTransform(spec: unknown, special?: {
+    [key: string]: (v: unknown) => unknown;
+}): unknown;

package/cjs/util/spec/transform.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.specTransform = void 0;
+
+const vutils_1 = require("@visactor/vutils");
+
+function specTransform(spec, special = {
+    data: v => v
+}) {
+    if (!spec) return spec;
+    if (spec.constructor === Object) {
+        const result = {};
+        for (const key in spec) if (Object.prototype.hasOwnProperty.call(spec, key)) {
+            if (special[key]) {
+                result[key] = special[key](spec[key]);
+                continue;
+            }
+            result[key] = specTransform(spec[key], special);
+        }
+        return result;
+    }
+    return (0, vutils_1.isArray)(spec) ? spec.map((s => specTransform(s, special))) : spec;
+}
+
+exports.specTransform = specTransform;
+//# sourceMappingURL=transform.js.map

package/cjs/util/spec/transform.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/util/spec/transform.ts"],"names":[],"mappings":";;;AAAA,6CAA2C;AAI3C,SAAgB,aAAa,CAC3B,IAAa,EACb,UAEI;IACF,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;CACb;IAED,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IAED,IAAI,IAAI,CAAC,WAAW,KAAK,MAAM,EAAE;QAC/B,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,IAAW,EAAE;YAC7B,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE;gBAEnD,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;oBAChB,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtC,SAAS;iBACV;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;aACjD;SACF;QACD,OAAO,MAAM,CAAC;KACf;IAED,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,EAAE;QACjB,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;KACjD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AA/BD,sCA+BC","file":"transform.js","sourcesContent":["import { isArray } from '@visactor/vutils';\n\n// todo 以目前的场景来看，并没有递归的需要。\n// 考虑到不确定性，还是递归处理spec对象，时间消耗很少\nexport function specTransform(\n  spec: unknown,\n  special: {\n    [key: string]: (v: unknown) => unknown;\n  } = {\n    data: v => v\n  }\n): unknown {\n  if (!spec) {\n    return spec;\n  }\n  // 如果是普通对象\n  if (spec.constructor === Object) {\n    const result: any = {};\n    for (const key in spec as any) {\n      if (Object.prototype.hasOwnProperty.call(spec, key)) {\n        // todo 特殊处理怎样更合理?\n        if (special[key]) {\n          result[key] = special[key](spec[key]);\n          continue;\n        }\n        result[key] = specTransform(spec[key], special);\n      }\n    }\n    return result;\n  }\n  // 如果是数组\n  if (isArray(spec)) {\n    return spec.map(s => specTransform(s, special));\n  }\n  return spec;\n}\n"]}

package/cjs/util/text.d.ts

@@ -1,5 +1,4 @@
 import type { ITextMeasureOption } from '@visactor/vutils';
-import { TextMeasure, TestTextMeasure } from '@visactor/vutils';
+import { TextMeasure } from '@visactor/vutils';
 import type { ITextMarkSpec } from '../typings';
 export declare const initTextMeasure: (textSpec?: Partial<ITextMarkSpec>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => TextMeasure<ITextMarkSpec>;
-export declare const testTextMeasure: (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean) => TestTextMeasure<any>;

package/cjs/util/text.js

@@ -2,26 +2,16 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.testTextMeasure = exports.initTextMeasure = void 0;
+}), exports.initTextMeasure = void 0;
 
-const vutils_1 = require("@visactor/vutils"), vrender_1 = require("@visactor/vrender"), constant_1 = require("../theme/builtin/constant"), initTextMeasure = (textSpec, option, useNaiveCanvas) => new vutils_1.TextMeasure(Object.assign({
+const vutils_1 = require("@visactor/vutils"), vrender_1 = require("@visactor/vrender"), constants_1 = require("../theme/builtin/common/constants"), initTextMeasure = (textSpec, option, useNaiveCanvas) => new vutils_1.TextMeasure(Object.assign({
     defaultFontParams: {
-        fontFamily: constant_1.DEFAULT_TEXT_FONT_FAMILY,
-        fontSize: constant_1.DEFAULT_TEXT_FONT_SIZE
+        fontFamily: constants_1.THEME_CONSTANTS.defaultFontFamily,
+        fontSize: constants_1.THEME_CONSTANTS.defaultFontSize
     },
     getTextBounds: useNaiveCanvas ? void 0 : vrender_1.getTextBounds,
     specialCharSet: "-/: .,@%'\"~" + vutils_1.TextMeasure.ALPHABET_CHAR_SET + vutils_1.TextMeasure.ALPHABET_CHAR_SET.toUpperCase()
 }, null != option ? option : {}), textSpec);
 
 exports.initTextMeasure = initTextMeasure;
-
-const testTextMeasure = (textSpec, useVRender) => new vutils_1.TestTextMeasure({
-    defaultFontParams: {
-        fontFamily: constant_1.DEFAULT_TEXT_FONT_FAMILY,
-        fontSize: constant_1.DEFAULT_TEXT_FONT_SIZE
-    },
-    getTextBounds: useVRender ? vrender_1.getTextBounds : void 0
-}, textSpec);
-
-exports.testTextMeasure = testTextMeasure;
 //# sourceMappingURL=text.js.map

package/cjs/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":";;;AAEA,6CAAgE;AAChE,+CAAkD;AAElD,wDAA6F;AAEtF,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,OAAO,IAAI,oBAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,mCAAwB;YACpC,QAAQ,EAAE,iCAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAa,EACzD,cAAc,EAAE,cAAc,GAAG,oBAAW,CAAC,iBAAiB,GAAG,oBAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,eAAe,mBAiB1B;AAGK,MAAM,eAAe,GAAG,CAAC,QAAiC,EAAE,UAAoB,EAAwB,EAAE;IAC/G,OAAO,IAAI,wBAAe,CACxB;QACE,iBAAiB,EAAE;YACjB,UAAU,EAAE,mCAAwB;YACpC,QAAQ,EAAE,iCAAsB;SACjC;QACD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,uBAAa,CAAC,CAAC,CAAC,SAAS;KACtD,EACD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,eAAe,mBAW1B","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, TestTextMeasure } from '@visactor/vutils';\nimport { getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../theme/builtin/constant';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n/** 测试方法 */\nexport const testTextMeasure = (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean): TestTextMeasure<any> => {\n  return new TestTextMeasure(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useVRender ? getTextBounds : undefined\n    },\n    textSpec\n  );\n};\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":";;;AAEA,6CAA+C;AAC/C,+CAAkD;AAElD,iEAAoE;AAE7D,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,OAAO,IAAI,oBAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,2BAAe,CAAC,iBAAiB;YAC7C,QAAQ,EAAE,2BAAe,CAAC,eAAe;SAC1C,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAa,EACzD,cAAc,EAAE,cAAc,GAAG,oBAAW,CAAC,iBAAiB,GAAG,oBAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,eAAe,mBAiB1B","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure } from '@visactor/vutils';\nimport { getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { THEME_CONSTANTS } from '../theme/builtin/common/constants';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\n    {\n      defaultFontParams: {\n        fontFamily: THEME_CONSTANTS.defaultFontFamily,\n        fontSize: THEME_CONSTANTS.defaultFontSize\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n"]}

package/cjs/vchart-all.js

@@ -16,6 +16,6 @@ Object.defineProperty(exports, "VChart", {
 const chart_1 = require("./chart"), component_1 = require("./component"), layout_1 = require("./layout"), vrender_components_1 = require("@visactor/vrender-components");
 
 (0, vrender_components_1.loadPoptip)({}), core_1.VChart.useChart([ chart_1.AreaChart, chart_1.LineChart, chart_1.BarChart, chart_1.Bar3dChart, chart_1.ScatterChart, chart_1.MapChart, chart_1.PieChart, chart_1.Pie3dChart, chart_1.RoseChart, chart_1.RadarChart, chart_1.CommonChart, chart_1.SequenceChart, chart_1.HistogramChart, chart_1.Histogram3dChart, chart_1.CircularProgressChart, chart_1.WordCloudChart, chart_1.WordCloud3dChart, chart_1.FunnelChart, chart_1.Funnel3dChart, chart_1.LinearProgressChart, chart_1.RangeColumnChart, chart_1.RangeColumn3dChart, chart_1.SunburstChart, chart_1.CirclePackingChart, chart_1.TreemapChart, chart_1.WaterfallChart, chart_1.BoxPlotChart, chart_1.SankeyChart, chart_1.GaugeChart, chart_1.RangeAreaChart, chart_1.HeatmapChart ]), 
-core_1.VChart.useComponent([ component_1.CartesianLinearAxis, component_1.CartesianBandAxis, component_1.CartesianTimeAxis, component_1.CartesianLogAxis, component_1.PolarBandAxis, component_1.PolarLinearAxis, component_1.DiscreteLegend, component_1.ContinuousLegend, component_1.Tooltip, component_1.CartesianCrossHair, component_1.PolarCrossHair, component_1.DataZoom, component_1.ScrollBar, component_1.Indicator, component_1.GeoCoordinate, component_1.MarkLine, component_1.Title, component_1.MarkArea, component_1.Player, component_1.TotalLabel, component_1.Label, component_1.MarkPoint, component_1.Brush, component_1.CustomMark, component_1.MapLabelComponent ]), 
+core_1.VChart.useComponent([ component_1.CartesianLinearAxis, component_1.CartesianBandAxis, component_1.CartesianTimeAxis, component_1.CartesianLogAxis, component_1.CartesianSymlogAxis, component_1.PolarBandAxis, component_1.PolarLinearAxis, component_1.DiscreteLegend, component_1.ContinuousLegend, component_1.Tooltip, component_1.CartesianCrossHair, component_1.PolarCrossHair, component_1.DataZoom, component_1.ScrollBar, component_1.Indicator, component_1.GeoCoordinate, component_1.MarkLine, component_1.Title, component_1.MarkArea, component_1.Player, component_1.TotalLabel, component_1.Label, component_1.MarkPoint, component_1.Brush, component_1.CustomMark, component_1.MapLabelComponent ]), 
 core_1.Factory.registerLayout("grid", layout_1.GridLayout), core_1.Factory.registerLayout("layout3d", layout_1.Layout3d);
 //# sourceMappingURL=vchart-all.js.map

package/cjs/vchart-all.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":";;;AAAA,iCAAyC;AAwIhC,uFAxIA,aAAM,OAwIA;AAvIf,mCAgCiB;AAEjB,2CA0BqB;AACrB,qCAAgD;AAChD,qEAA0D;AAG1D,IAAA,+BAAU,EAAC,EAAE,CAAC,CAAC;AAGf,aAAM,CAAC,QAAQ,CAAC;IACd,iBAAS;IACT,iBAAS;IACT,gBAAQ;IACR,kBAAU;IACV,oBAAY;IACZ,gBAAQ;IACR,gBAAQ;IACR,kBAAU;IACV,iBAAS;IACT,kBAAU;IACV,mBAAW;IACX,qBAAa;IACb,sBAAc;IACd,wBAAgB;IAChB,6BAAqB;IACrB,sBAAc;IACd,wBAAgB;IAChB,mBAAW;IACX,qBAAa;IACb,2BAAmB;IACnB,wBAAgB;IAChB,0BAAkB;IAClB,qBAAa;IACb,0BAAkB;IAClB,oBAAY;IACZ,sBAAc;IACd,oBAAY;IACZ,mBAAW;IACX,kBAAU;IACV,sBAAc;IACd,oBAAY;CACb,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC;IAClB,+BAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,4BAAgB;IAChB,yBAAa;IACb,2BAAe;IACf,0BAAc;IACd,4BAAgB;IAChB,mBAAO;IACP,8BAAkB;IAClB,0BAAc;IACd,oBAAQ;IACR,qBAAS;IACT,qBAAS;IACT,yBAAa;IACb,oBAAQ;IACR,iBAAK;IACL,oBAAQ;IACR,kBAAM;IACN,sBAAU;IACV,iBAAK;IACL,qBAAS;IACT,iBAAK;IACL,sBAAU;IACV,6BAAiB;CAClB,CAAC,CAAC;AAGH,cAAO,CAAC,cAAc,CAAC,MAAM,EAAE,mBAAiB,CAAC,CAAC;AAClD,cAAO,CAAC,cAAc,CAAC,UAAU,EAAE,iBAAe,CAAC,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart, Factory } from './core';\nimport {\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreemapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n} from './chart';\n\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  PolarBandAxis,\n  CartesianLogAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent,\n  TotalLabel\n} from './component';\nimport { GridLayout, Layout3d } from './layout';\nimport { loadPoptip } from '@visactor/vrender-components';\n\n// 装载 poptip\nloadPoptip({});\n\n// charts\nVChart.useChart([\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreemapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  CartesianLogAxis,\n  PolarBandAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  TotalLabel,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n]);\n\n// layout\nFactory.registerLayout('grid', GridLayout as any);\nFactory.registerLayout('layout3d', Layout3d as any);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":";;;AAAA,iCAAyC;AA0IhC,uFA1IA,aAAM,OA0IA;AAzIf,mCAgCiB;AAEjB,2CA2BqB;AACrB,qCAAgD;AAChD,qEAA0D;AAG1D,IAAA,+BAAU,EAAC,EAAE,CAAC,CAAC;AAGf,aAAM,CAAC,QAAQ,CAAC;IACd,iBAAS;IACT,iBAAS;IACT,gBAAQ;IACR,kBAAU;IACV,oBAAY;IACZ,gBAAQ;IACR,gBAAQ;IACR,kBAAU;IACV,iBAAS;IACT,kBAAU;IACV,mBAAW;IACX,qBAAa;IACb,sBAAc;IACd,wBAAgB;IAChB,6BAAqB;IACrB,sBAAc;IACd,wBAAgB;IAChB,mBAAW;IACX,qBAAa;IACb,2BAAmB;IACnB,wBAAgB;IAChB,0BAAkB;IAClB,qBAAa;IACb,0BAAkB;IAClB,oBAAY;IACZ,sBAAc;IACd,oBAAY;IACZ,mBAAW;IACX,kBAAU;IACV,sBAAc;IACd,oBAAY;CACb,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC;IAClB,+BAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,4BAAgB;IAChB,+BAAmB;IACnB,yBAAa;IACb,2BAAe;IACf,0BAAc;IACd,4BAAgB;IAChB,mBAAO;IACP,8BAAkB;IAClB,0BAAc;IACd,oBAAQ;IACR,qBAAS;IACT,qBAAS;IACT,yBAAa;IACb,oBAAQ;IACR,iBAAK;IACL,oBAAQ;IACR,kBAAM;IACN,sBAAU;IACV,iBAAK;IACL,qBAAS;IACT,iBAAK;IACL,sBAAU;IACV,6BAAiB;CAClB,CAAC,CAAC;AAGH,cAAO,CAAC,cAAc,CAAC,MAAM,EAAE,mBAAiB,CAAC,CAAC;AAClD,cAAO,CAAC,cAAc,CAAC,UAAU,EAAE,iBAAe,CAAC,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart, Factory } from './core';\nimport {\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreemapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n} from './chart';\n\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  PolarBandAxis,\n  CartesianLogAxis,\n  CartesianSymlogAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent,\n  TotalLabel\n} from './component';\nimport { GridLayout, Layout3d } from './layout';\nimport { loadPoptip } from '@visactor/vrender-components';\n\n// 装载 poptip\nloadPoptip({});\n\n// charts\nVChart.useChart([\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreemapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  CartesianLogAxis,\n  CartesianSymlogAxis,\n  PolarBandAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  TotalLabel,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n]);\n\n// layout\nFactory.registerLayout('grid', GridLayout as any);\nFactory.registerLayout('layout3d', Layout3d as any);\n\nexport { VChart };\n"]}

package/cjs/vchart-simple.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.VChart = void 0;
 
-const core_1 = require("./core");
+const label_1 = require("./component/label/label"), cartesian_1 = require("./component/crosshair/cartesian"), tooltip_1 = require("./component/tooltip/tooltip"), legend_1 = require("./component/legend/discrete/legend"), time_axis_1 = require("./component/axis/cartesian/time-axis"), band_axis_1 = require("./component/axis/cartesian/band-axis"), linear_axis_1 = require("./component/axis/cartesian/linear-axis"), core_1 = require("./core");
 
 Object.defineProperty(exports, "VChart", {
     enumerable: !0,
@@ -13,8 +13,7 @@ Object.defineProperty(exports, "VChart", {
     }
 });
 
-const chart_1 = require("./chart"), component_1 = require("./component");
+const line_1 = require("./chart/line"), pie_1 = require("./chart/pie"), bar_1 = require("./chart/bar");
 
-core_1.VChart.useChart([ chart_1.LineChart, chart_1.BarChart, chart_1.PieChart ]), 
-core_1.VChart.useComponent([ component_1.CartesianLinearAxis, component_1.CartesianBandAxis, component_1.CartesianTimeAxis, component_1.DiscreteLegend, component_1.Tooltip, component_1.CartesianCrossHair, component_1.Label ]);
+core_1.VChart.useChart([ line_1.LineChart, bar_1.BarChart, pie_1.PieChart ]), core_1.VChart.useComponent([ linear_axis_1.CartesianLinearAxis, band_axis_1.CartesianBandAxis, time_axis_1.CartesianTimeAxis, legend_1.DiscreteLegend, tooltip_1.Tooltip, cartesian_1.CartesianCrossHair, label_1.Label ]);
 //# sourceMappingURL=vchart-simple.js.map

package/cjs/vchart-simple.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":";;;AAGA,iCAAgC;AA0BvB,uFA1BA,aAAM,OA0BA;AAzBf,mCAAwD;AACxD,2CAQqB;AAGrB,aAAM,CAAC,QAAQ,CAAC,CAAC,iBAAS,EAAE,gBAAQ,EAAE,gBAAQ,CAAC,CAAC,CAAC;AAGjD,aAAM,CAAC,YAAY,CAAC;IAClB,+BAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,0BAAc;IACd,mBAAO;IACP,8BAAkB;IAClB,iBAAK;CACN,CAAC,CAAC","file":"vchart-simple.js","sourcesContent":["/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { LineChart, BarChart, PieChart } from './chart';\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n} from './component';\n\n// charts\nVChart.useChart([LineChart, BarChart, PieChart]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n]);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,+DAAqE;AACrE,yDAAsD;AACtD,+DAAoE;AACpE,oEAAyE;AACzE,oEAAyE;AACzE,wEAA6E;AAI7E,iCAAgC;AAmBvB,uFAnBA,aAAM,OAmBA;AAlBf,uCAAyC;AACzC,qCAAuC;AACvC,qCAAuC;AAGvC,aAAM,CAAC,QAAQ,CAAC,CAAC,gBAAS,EAAE,cAAQ,EAAE,cAAQ,CAAC,CAAC,CAAC;AAGjD,aAAM,CAAC,YAAY,CAAC;IAClB,iCAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,uBAAc;IACd,iBAAO;IACP,8BAAkB;IAClB,aAAK;CACN,CAAC,CAAC","file":"vchart-simple.js","sourcesContent":["import { Label } from './component/label/label';\nimport { CartesianCrossHair } from './component/crosshair/cartesian';\nimport { Tooltip } from './component/tooltip/tooltip';\nimport { DiscreteLegend } from './component/legend/discrete/legend';\nimport { CartesianTimeAxis } from './component/axis/cartesian/time-axis';\nimport { CartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { CartesianLinearAxis } from './component/axis/cartesian/linear-axis';\n/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { LineChart } from './chart/line';\nimport { PieChart } from './chart/pie';\nimport { BarChart } from './chart/bar';\n\n// charts\nVChart.useChart([LineChart, BarChart, PieChart]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n]);\n\nexport { VChart };\n"]}

package/esm/animation/utils.js

@@ -1,5 +1,3 @@
-import { merge } from "../util";
-
 import { isFunction, isValidNumber } from "../util/type";
 
 import { DEFAULT_DATA_INDEX } from "../constant";
@@ -8,6 +6,8 @@ import { DEFAULT_ANIMATION_CONFIG } from "./config";
 
 import { isArray, isValid } from "@visactor/vutils";
 
+import { mergeSpec } from "../util/spec";
+
 export const AnimationStates = [ "appear", "enter", "update", "exit", "disappear", "normal" ];
 
 export function animationConfig(defaultConfig, userConfig, params) {
@@ -26,7 +26,7 @@ export function animationConfig(defaultConfig, userConfig, params) {
             stopWhenStateChange: !0
         })), null == userConfig ? void 0 : userConfig[state]) {
             if (isArray(userConfig[state])) stateConfig = userConfig[state]; else {
-                let singleConfig = merge({}, defaultStateConfig[0], userConfig[state]);
+                let singleConfig = mergeSpec({}, defaultStateConfig[0], userConfig[state]);
                 isChannelAnimation(singleConfig) && delete singleConfig.type, singleConfig.oneByOne && (singleConfig = produceOneByOne(singleConfig, null !== (_a = null == params ? void 0 : params.dataIndex) && void 0 !== _a ? _a : defaultDataIndex)), 
                 stateConfig = [ singleConfig ];
             }

package/esm/animation/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import { merge } from '../util';\nimport type { IAnimationConfig } from '@visactor/vgrammar';\nimport type { IElement, IAnimationTypeConfig, IStateAnimationConfig, IAnimationTimeline } from '@visactor/vgrammar';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec, IMorphSeriesSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { isArray, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface';\n\nexport const AnimationStates = ['appear', 'enter', 'update', 'exit', 'disappear', 'normal'];\n\nexport function animationConfig<Preset extends string>(\n  defaultConfig: MarkAnimationSpec,\n  userConfig?: Partial<\n    Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>\n  >,\n  params?: {\n    dataIndex: (datum: any) => number;\n  }\n) {\n  const config = {} as MarkAnimationSpec;\n\n  for (let i = 0; i < AnimationStates.length; i++) {\n    const state = AnimationStates[i];\n\n    if (userConfig?.[state] === false) {\n      continue;\n    }\n\n    if (state === 'normal') {\n      userConfig.normal && (config.normal = userConfig.normal as IAnimationTypeConfig);\n      continue;\n    }\n    // 开始处理默认动画逻辑\n    let defaultStateConfig: IAnimationConfig[];\n    if (isArray(defaultConfig[state])) {\n      defaultStateConfig = defaultConfig[state] as IAnimationConfig[];\n    } else {\n      defaultStateConfig = [{ ...DEFAULT_ANIMATION_CONFIG[state], ...defaultConfig[state] } as any];\n      // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n      // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n      if (state === 'exit') {\n        defaultStateConfig[0].controlOptions = { stopWhenStateChange: true };\n      }\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      let singleConfig: IAnimationConfig = merge({}, defaultStateConfig[0], userConfig[state]) as IAnimationConfig;\n\n      if (isChannelAnimation(singleConfig)) {\n        // `type` and `channel` is conflict, and `type` has a higher priority.\n        // here if user configured `channel`, we should remove `type` which will come from default animation config\n        delete (singleConfig as IAnimationTypeConfig).type;\n      }\n\n      if (singleConfig.oneByOne) {\n        singleConfig = produceOneByOne(singleConfig as IAnimationTypeConfig, params?.dataIndex ?? defaultDataIndex);\n      }\n\n      stateConfig = [singleConfig];\n    }\n\n    config[state] = stateConfig;\n  }\n\n  // 将 update copy 到 state 保证 useState 效果与 update 对齐\n  config.state = config.update as IStateAnimationConfig;\n  return config;\n}\n\nexport function userAnimationConfig<M extends string, Preset extends string>(\n  markName: SeriesMarkNameEnum | string,\n  spec: IAnimationSpec<M, Preset>\n) {\n  return {\n    appear: spec.animationAppear?.[markName] ?? spec.animationAppear,\n    disappear: spec.animationDisappear?.[markName] ?? spec.animationDisappear,\n    enter: spec.animationEnter?.[markName] ?? spec.animationEnter,\n    exit: spec.animationExit?.[markName] ?? spec.animationExit,\n    update: spec.animationUpdate?.[markName] ?? spec.animationUpdate,\n    normal: spec.animationNormal?.[markName]\n  };\n}\n\n/**\n * oneByOne\n */\nfunction produceOneByOne(stateConfig: IAnimationTypeConfig, dataIndex: (datum: any) => number) {\n  const { oneByOne, duration } = stateConfig;\n  stateConfig.delay = (datum: any, element: IElement, params: any) => {\n    const _index = dataIndex(datum);\n    const _durationTime = isFunction(duration)\n      ? duration(datum, element, params)\n      : isValidNumber(duration)\n      ? duration\n      : 0;\n    let _oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (_oneByOneTime === false) {\n      return 0;\n    }\n    _oneByOneTime = _oneByOneTime === true ? 0 : _oneByOneTime;\n    return _index * (_durationTime + _oneByOneTime);\n  };\n  delete stateConfig.oneByOne;\n  return stateConfig;\n}\n\nfunction defaultDataIndex(datum: any) {\n  return datum?.[DEFAULT_DATA_INDEX];\n}\n\nexport function shouldDoMorph(\n  hasAnimation: boolean,\n  morphConfig?: IMorphSeriesSpec,\n  animationConfig?: ReturnType<typeof userAnimationConfig>\n) {\n  if (hasAnimation === false) {\n    return false;\n  }\n\n  if (animationConfig?.appear === false || animationConfig?.update === false) {\n    return false;\n  }\n\n  if (morphConfig?.enable === false) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function isTimeLineAnimation(animationConfig: IAnimationConfig) {\n  return isValid((animationConfig as IAnimationTimeline).timeSlices);\n}\n\nexport function isChannelAnimation(animationConfig: IAnimationConfig) {\n  return !isTimeLineAnimation(animationConfig) && isValid((animationConfig as IAnimationTypeConfig).channel);\n}\n"]}
+{"version":3,"sources":["../src/animation/utils.ts"],"names":[],"mappings":"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","file":"utils.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IElement, IAnimationTypeConfig, IStateAnimationConfig, IAnimationTimeline } from '@visactor/vgrammar';\nimport type { MarkAnimationSpec, IAnimationState } from './interface';\nimport type { IStateAnimateSpec, IAnimationSpec, IMorphSeriesSpec } from './spec';\nimport { isFunction, isValidNumber } from '../util/type';\nimport { DEFAULT_DATA_INDEX } from '../constant';\nimport { DEFAULT_ANIMATION_CONFIG } from './config';\nimport { isArray, isValid } from '@visactor/vutils';\nimport type { SeriesMarkNameEnum } from '../series/interface';\nimport { mergeSpec } from '../util/spec';\n\nexport const AnimationStates = ['appear', 'enter', 'update', 'exit', 'disappear', 'normal'];\n\nexport function animationConfig<Preset extends string>(\n  defaultConfig: MarkAnimationSpec,\n  userConfig?: Partial<\n    Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>\n  >,\n  params?: {\n    dataIndex: (datum: any) => number;\n  }\n) {\n  const config = {} as MarkAnimationSpec;\n\n  for (let i = 0; i < AnimationStates.length; i++) {\n    const state = AnimationStates[i];\n\n    if (userConfig?.[state] === false) {\n      continue;\n    }\n\n    if (state === 'normal') {\n      userConfig.normal && (config.normal = userConfig.normal as IAnimationTypeConfig);\n      continue;\n    }\n    // 开始处理默认动画逻辑\n    let defaultStateConfig: IAnimationConfig[];\n    if (isArray(defaultConfig[state])) {\n      defaultStateConfig = defaultConfig[state] as IAnimationConfig[];\n    } else {\n      defaultStateConfig = [{ ...DEFAULT_ANIMATION_CONFIG[state], ...defaultConfig[state] } as any];\n      // FIXME: 用来控制当动画状态发生变更时是否清除正在执行的动画。\n      // 现在 vrender 对于同一个视觉通道的 tween 不会做覆盖的处理。若不做动画清空同时 exit 动画比 update 动画时间长的情况下，效果会不正确\n      if (state === 'exit') {\n        defaultStateConfig[0].controlOptions = { stopWhenStateChange: true };\n      }\n    }\n\n    if (!userConfig?.[state]) {\n      config[state] = defaultStateConfig;\n      continue;\n    }\n\n    // 开始处理用户配置的动画逻辑\n    let stateConfig: IAnimationConfig[];\n\n    if (isArray(userConfig[state])) {\n      stateConfig = userConfig[state];\n    } else {\n      let singleConfig: IAnimationConfig = mergeSpec({}, defaultStateConfig[0], userConfig[state]) as IAnimationConfig;\n\n      if (isChannelAnimation(singleConfig)) {\n        // `type` and `channel` is conflict, and `type` has a higher priority.\n        // here if user configured `channel`, we should remove `type` which will come from default animation config\n        delete (singleConfig as IAnimationTypeConfig).type;\n      }\n\n      if (singleConfig.oneByOne) {\n        singleConfig = produceOneByOne(singleConfig as IAnimationTypeConfig, params?.dataIndex ?? defaultDataIndex);\n      }\n\n      stateConfig = [singleConfig];\n    }\n\n    config[state] = stateConfig;\n  }\n\n  // 将 update copy 到 state 保证 useState 效果与 update 对齐\n  config.state = config.update as IStateAnimationConfig;\n  return config;\n}\n\nexport function userAnimationConfig<M extends string, Preset extends string>(\n  markName: SeriesMarkNameEnum | string,\n  spec: IAnimationSpec<M, Preset>\n) {\n  return {\n    appear: spec.animationAppear?.[markName] ?? spec.animationAppear,\n    disappear: spec.animationDisappear?.[markName] ?? spec.animationDisappear,\n    enter: spec.animationEnter?.[markName] ?? spec.animationEnter,\n    exit: spec.animationExit?.[markName] ?? spec.animationExit,\n    update: spec.animationUpdate?.[markName] ?? spec.animationUpdate,\n    normal: spec.animationNormal?.[markName]\n  };\n}\n\n/**\n * oneByOne\n */\nfunction produceOneByOne(stateConfig: IAnimationTypeConfig, dataIndex: (datum: any) => number) {\n  const { oneByOne, duration } = stateConfig;\n  stateConfig.delay = (datum: any, element: IElement, params: any) => {\n    const _index = dataIndex(datum);\n    const _durationTime = isFunction(duration)\n      ? duration(datum, element, params)\n      : isValidNumber(duration)\n      ? duration\n      : 0;\n    let _oneByOneTime = isFunction(oneByOne) ? oneByOne(datum, element, params) : oneByOne;\n    if (_oneByOneTime === false) {\n      return 0;\n    }\n    _oneByOneTime = _oneByOneTime === true ? 0 : _oneByOneTime;\n    return _index * (_durationTime + _oneByOneTime);\n  };\n  delete stateConfig.oneByOne;\n  return stateConfig;\n}\n\nfunction defaultDataIndex(datum: any) {\n  return datum?.[DEFAULT_DATA_INDEX];\n}\n\nexport function shouldDoMorph(\n  hasAnimation: boolean,\n  morphConfig?: IMorphSeriesSpec,\n  animationConfig?: ReturnType<typeof userAnimationConfig>\n) {\n  if (hasAnimation === false) {\n    return false;\n  }\n\n  if (animationConfig?.appear === false || animationConfig?.update === false) {\n    return false;\n  }\n\n  if (morphConfig?.enable === false) {\n    return false;\n  }\n\n  return true;\n}\n\nexport function isTimeLineAnimation(animationConfig: IAnimationConfig) {\n  return isValid((animationConfig as IAnimationTimeline).timeSlices);\n}\n\nexport function isChannelAnimation(animationConfig: IAnimationConfig) {\n  return !isTimeLineAnimation(animationConfig) && isValid((animationConfig as IAnimationTypeConfig).channel);\n}\n"]}

package/esm/chart/area/area.js

@@ -1,14 +1,14 @@
+import { AreaSeries } from "./../../series/area/area";
+
 import { SeriesTypeEnum } from "../../series/interface";
 
 import { CartesianChart } from "../cartesian/cartesian";
 
 import { ChartTypeEnum } from "../interface";
 
-import { setDefaultCrosshairForCartesianChart } from "../util";
-
 import { VChart } from "../../core/vchart";
 
-import { AreaSeries } from "../../series";
+import { setDefaultCrosshairForCartesianChart } from "../util";
 
 VChart.useSeries([ AreaSeries ]);
 

package/esm/chart/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/B,MAAM,OAAO,SAAU,SAAQ,cAAc;IAA7C;;QAGW,SAAI,GAAW,aAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,cAAc,CAAC,IAAI,CAAC;IAiBpD,CAAC;IAfW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAnBe,cAAI,GAAW,aAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC","file":"area.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport type { IAreaChartSpec } from './interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport { AreaSeries } from '../../series';\nVChart.useSeries([AreaSeries]);\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/B,MAAM,OAAO,SAAU,SAAQ,cAAc;IAA7C;;QAGW,SAAI,GAAW,aAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,cAAc,CAAC,IAAI,CAAC;IAiBpD,CAAC;IAfW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAnBe,cAAI,GAAW,aAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC","file":"area.js","sourcesContent":["import { AreaSeries } from './../../series/area/area';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport type { IAreaChartSpec } from './interface';\nimport { VChart } from '../../core/vchart';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nVChart.useSeries([AreaSeries]);\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}

package/esm/chart/bar/bar-3d.js

@@ -1,3 +1,5 @@
+import { Bar3dSeries } from "./../../series/bar/bar-3d";
+
 import { SeriesTypeEnum } from "../../series/interface";
 
 import { CartesianChart } from "../cartesian/cartesian";
@@ -6,8 +8,6 @@ import { ChartTypeEnum } from "../interface";
 
 import { VChart } from "../../core/vchart";
 
-import { Bar3dSeries } from "../../series";
-
 VChart.useSeries([ Bar3dSeries ]);
 
 export class Bar3dChart extends CartesianChart {

package/esm/chart/bar/bar-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAEhC,MAAM,OAAO,UAAW,SAAQ,cAAc;IAA9C;;QAGW,SAAI,GAAW,aAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,cAAc,CAAC,KAAK,CAAC;IAWrD,CAAC;IATW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAoB,IAAK,CAAC,QAAQ,EAC1C,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,aAAa,EAAoB,IAAK,CAAC,aAAa,IACpD;IACJ,CAAC;;AAbe,eAAI,GAAW,aAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC","file":"bar-3d.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { VChart } from '../../core/vchart';\nimport { Bar3dSeries } from '../../series';\nimport type { IBar3dChartSpec } from './interface';\nVChart.useSeries([Bar3dSeries]);\n\nexport class Bar3dChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar3d;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar3d;\n  readonly seriesType: string = SeriesTypeEnum.bar3d;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBar3dChartSpec>spec).barWidth,\n      barMaxWidth: (<IBar3dChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBar3dChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBar3dChartSpec>spec).barGapInGroup\n    };\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAEhC,MAAM,OAAO,UAAW,SAAQ,cAAc;IAA9C;;QAGW,SAAI,GAAW,aAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,cAAc,CAAC,KAAK,CAAC;IAWrD,CAAC;IATW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAoB,IAAK,CAAC,QAAQ,EAC1C,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,aAAa,EAAoB,IAAK,CAAC,aAAa,IACpD;IACJ,CAAC;;AAbe,eAAI,GAAW,aAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC","file":"bar-3d.js","sourcesContent":["import { Bar3dSeries } from './../../series/bar/bar-3d';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { VChart } from '../../core/vchart';\nimport type { IBar3dChartSpec } from './interface';\nVChart.useSeries([Bar3dSeries]);\n\nexport class Bar3dChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar3d;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar3d;\n  readonly seriesType: string = SeriesTypeEnum.bar3d;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBar3dChartSpec>spec).barWidth,\n      barMaxWidth: (<IBar3dChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBar3dChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBar3dChartSpec>spec).barGapInGroup\n    };\n  }\n}\n"]}

package/esm/chart/bar/bar.js

@@ -1,3 +1,5 @@
+import { BarSeries } from "./../../series/bar/bar";
+
 import { SeriesTypeEnum } from "../../series/interface";
 
 import { CartesianChart } from "../cartesian/cartesian";
@@ -8,8 +10,6 @@ import { setDefaultCrosshairForCartesianChart } from "../util";
 
 import { VChart } from "../../core/vchart";
 
-import { BarSeries } from "../../series";
-
 VChart.useSeries([ BarSeries ]);
 
 export class BarChart extends CartesianChart {

package/esm/chart/bar/bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/bar/bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAE9B,MAAM,OAAO,QAAS,SAAQ,cAAc;IAA5C;;QAGW,SAAI,GAAW,aAAa,CAAC,GAAG,CAAC;QACjC,eAAU,GAAW,cAAc,CAAC,GAAG,CAAC;IAgBnD,CAAC;IAdW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAkB,IAAK,CAAC,QAAQ,EACxC,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,aAAa,EAAkB,IAAK,CAAC,aAAa,IAClD;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAlBe,aAAI,GAAW,aAAa,CAAC,GAAG,CAAC;AACjC,aAAI,GAAW,eAAe,CAAC","file":"bar.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport { BarSeries } from '../../series';\nimport type { IBarChartSpec } from './interface';\nVChart.useSeries([BarSeries]);\n\nexport class BarChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar;\n  readonly seriesType: string = SeriesTypeEnum.bar;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBarChartSpec>spec).barWidth,\n      barMaxWidth: (<IBarChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBarChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBarChartSpec>spec).barGapInGroup\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/bar/bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAE9B,MAAM,OAAO,QAAS,SAAQ,cAAc;IAA5C;;QAGW,SAAI,GAAW,aAAa,CAAC,GAAG,CAAC;QACjC,eAAU,GAAW,cAAc,CAAC,GAAG,CAAC;IAgBnD,CAAC;IAdW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAkB,IAAK,CAAC,QAAQ,EACxC,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,aAAa,EAAkB,IAAK,CAAC,aAAa,IAClD;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAlBe,aAAI,GAAW,aAAa,CAAC,GAAG,CAAC;AACjC,aAAI,GAAW,eAAe,CAAC","file":"bar.js","sourcesContent":["import { BarSeries } from './../../series/bar/bar';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport type { IBarChartSpec } from './interface';\nVChart.useSeries([BarSeries]);\n\nexport class BarChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar;\n  readonly seriesType: string = SeriesTypeEnum.bar;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBarChartSpec>spec).barWidth,\n      barMaxWidth: (<IBarChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBarChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBarChartSpec>spec).barGapInGroup\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}

package/esm/chart/base-chart.d.ts

@@ -127,6 +127,7 @@ export declare class BaseChart extends CompilableBase implements IChart {
     protected setRegionTheme(): void;
     protected setComponentTheme(theme: ITheme): void;
     protected setSeriesTheme(theme: ITheme): void;
+    clear(): void;
     compile(): void;
     afterCompile(): void;
     compileLayout(): void;

package/esm/chart/base-chart.js

@@ -425,12 +425,12 @@ export class BaseChart extends CompilableBase {
         if (this.setLayoutTag(!0, morphConfig), spec.type !== this.type) return result.reMake = !0, 
         result;
         this.transformSpec(spec);
-        const currentKeys = Object.keys(this._spec), nextKeys = Object.keys(spec);
+        const currentKeys = Object.keys(this._spec).sort(), nextKeys = Object.keys(spec).sort();
         return JSON.stringify(currentKeys) !== JSON.stringify(nextKeys) ? (result.reMake = !0, 
-        result) : (this._spec = spec, this.updateGlobalScale(result), result.reMake ? result : (this.updateDataSpec(result), 
-        result.reMake ? result : (this.updateGlobalScaleDomain(), this.updateRegionSpec(result), 
-        result.reMake ? result : (this.updateComponentSpec(result), result.reMake || this.updateSeriesSpec(result), 
-        result))));
+        result) : (this._spec = spec, this.updateGlobalScale(result), result.reMake ? result : (this.updateRegionSpec(result), 
+        result.reMake ? result : (this.updateComponentSpec(result), result.reMake ? result : (this.updateSeriesSpec(result), 
+        result.reMake ? result : (this.updateDataSpec(result), result.reMake || this.updateGlobalScaleDomain(), 
+        result)))));
     }
     updateDataSpec(result) {
         this._spec.data && array(this._spec.data).forEach(((d, i) => {
@@ -453,7 +453,7 @@ export class BaseChart extends CompilableBase {
             isArray(cmpSpec) ? (componentCache[c.specKey] = componentCache[c.specKey] || {
                 specCount: cmpSpec.length,
                 componentCount: 0
-            }, componentCache[c.specKey].componentCount++, this._mergeUpdateResult(result, c.updateSpec(cmpSpec[c.getSpecIndex()]))) : this._mergeUpdateResult(result, c.updateSpec(cmpSpec)), 
+            }, componentCache[c.specKey].componentCount++, this._mergeUpdateResult(result, c.updateSpec(cmpSpec[c.getSpecIndex()], cmpSpec))) : this._mergeUpdateResult(result, c.updateSpec(cmpSpec)), 
             c.reInit();
         }));
         for (const key in componentCache) if (Object.prototype.hasOwnProperty.call(componentCache, key)) {
@@ -553,6 +553,12 @@ export class BaseChart extends CompilableBase {
             yield s.setCurrentTheme(theme.series[s.type], !0);
         }))));
     }
+    clear() {
+        this.getLayoutElements().forEach((i => {
+            var _a;
+            return null === (_a = i.clear) || void 0 === _a ? void 0 : _a.call(i);
+        }));
+    }
     compile() {
         this.compileBackground(), this.compileLayout(), this.compileRegions(), this.compileSeries(), 
         this.compileComponents();
@@ -603,7 +609,7 @@ export class BaseChart extends CompilableBase {
         })), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterComponentCompile) || void 0 === _d || _d.call(_c);
     }
     release() {
-        super.release(), [ ...this._components, ...this._regions, ...this._series ].forEach((m => {
+        super.release(), this.clear(), [ ...this._components, ...this._regions, ...this._series ].forEach((m => {
             m.release();
         })), this._components = this._regions = this._series = [], this._spec = {}, this._dataSet = this._globalScale = this._layoutFunc = null, 
         this._layoutTag = !1, this._idMap.clear();
@@ -715,7 +721,7 @@ export class BaseChart extends CompilableBase {
                 if (tooltip.getVisible()) {
                     const dataFilter = {};
                     dimensionInfo.forEach((d => {
-                        const {axis: axis, value: value, data: data} = d, isY = "left" === axis.orient || "right" === axis.orient;
+                        const {axis: axis, value: value, data: data} = d, isY = "left" === axis.getOrient() || "right" === axis.getOrient();
                         data.forEach((d => {
                             isY ? dataFilter[d.series.fieldY[0]] = value : dataFilter[d.series.fieldX[0]] = value;
                         }));