@visactor/vchart 1.5.4 → 1.6.0

package/cjs/util/data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/data.ts"],"names":[],"mappings":";;;AAEA,0CAUqB;AACrB,iCAAuC;AACvC,iCAAkC;AAGlC,SAAgB,WAAW,CACzB,YAGG,EACH,WAGG;IAKH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,EAAE;YACZ,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC5B;aAAM;YACL,OAAO,CAAC,UAAU,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAClF;KACF;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAvBD,kCAuBC;AAED,SAAS,UAAU,CACjB,IAGG,EACH,QAAgB;IAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC;AAC5C,CAAC;AAGD,SAAgB,aAAa,CAAC,QAAkB,EAAE,KAAa;;IAC7D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;IACpC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QAClB,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC;KACtB;IACD,OAAO,MAAA,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,mCAAI,KAAK,CAAC;AACtC,CAAC;AAZD,sCAYC;AAkBD,SAAgB,mBAAmB,CACjC,MAAkC,EAClC,eAAwB,EACxB,MAA4B;IAE5B,MAAM,eAAe,GAAuC,EAAE,CAAC;IAE/D,MAAM,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;;QAC7B,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,CAAC,CAAC,kBAAkB,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC/C,IAAI,SAAS,IAAI,eAAe,IAAI,YAAY,EAAE;YAChD,eAAe,CAAC,UAAU,CAAC,GAAG,MAAA,eAAe,CAAC,UAAU,CAAC,mCAAI;gBAC3D,KAAK,EAAE,EAAE;aACV,CAAC;YACF,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,eAAe,CAAC,UAAU,CAAoB,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;SAC5G;IACH,CAAC,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AACzB,CAAC;AApBD,kDAoBC;AAED,SAAgB,UAAU,CAAC,SAA0B,EAAE,UAAkB;IACvE,IAAI,QAAQ,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE;QACpD,MAAM,KAAK,GAAG,IAAA,UAAG,EAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,IAAA,UAAG,EAAC,SAAS,CAAC,MAAM,EAAE,kCAAuB,CAAC,CAAC;QAC/D,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC3B,CAAC,CAAC,4BAAiB,CAAC,GAAG,KAAK,CAAC;YAC7B,CAAC,CAAC,oCAAyB,CAAC,GAAG,OAAO,CAAC;YACvC,OAAO,CAAC,CAAC,gCAAqB,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;YACvD,OAAO,OAAO,CAAC,0BAAe,CAAC,GAAG,GAAG,CAAC,0BAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QACzE,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,gCAAqB,CAAC,GAAG,IAAI,CAAC;QACtC,OAAO;KACR;IACD,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE;QACjC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;KAC9C;AACH,CAAC;AAlBD,gCAkBC;AAED,SAAgB,qBAAqB,CAAC,UAA2B;IAC/D,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE;QAC7B,OAAO;KACR;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,0BAAe,CAAC,GAAG,CAAC,CAAC;IACzF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACjD,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,6CAAkC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,4BAAiB,CAAC,GAAG,WAAW,CAAC;QACjH,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,2CAAgC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,0BAAe,CAAC,GAAG,WAAW,CAAC;KAC9G;AACH,CAAC;AATD,sDASC;AAED,SAAgB,KAAK,CAAC,UAA2B,EAAE,YAAqB;IACtE,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QAEhC,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,aAAa,GAAG,CAAC,CAAC;QAEtB,IAAI,IAAI,GAAG,CAAC,CAAC;QACb,IAAI,KAAK,GAAG,CAAC,CAAC;QAGd,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,EAAE,EAAE;YAC9C,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC1E,KAAK,GAAG,CAAC,CAAC,0BAAe,CAAC,CAAC;YAC3B,IAAI,KAAK,IAAI,CAAC,EAAE;gBACd,CAAC,CAAC,4BAAiB,CAAC,GAAG,aAAa,CAAC;gBACrC,aAAa,IAAI,CAAC,CAAC,0BAAe,CAAC,CAAC;gBACpC,CAAC,CAAC,0BAAe,CAAC,GAAG,aAAa,CAAC;aACpC;iBAAM;gBACL,CAAC,CAAC,4BAAiB,CAAC,GAAG,aAAa,CAAC;gBACrC,aAAa,IAAI,CAAC,CAAC,0BAAe,CAAC,CAAC;gBACpC,CAAC,CAAC,0BAAe,CAAC,GAAG,aAAa,CAAC;aACpC;SACF;QAED,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,SAAS,EAAE,KAAK,EAAE,EAAE;YAC9C,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC1E,KAAK,GAAG,CAAC,CAAC,0BAAe,CAAC,CAAC;YAC3B,MAAM,WAAW,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;YAC/D,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC,CAAC,oCAAyB,CAAC,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,4BAAiB,CAAC,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;YAC9G,CAAC,CAAC,kCAAuB,CAAC,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,0BAAe,CAAC,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;SAC3G;KACF;IAED,KAAK,MAAM,GAAG,IAAI,UAAU,CAAC,KAAK,EAAE;QAClC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;KAC5C;AACH,CAAC;AAtCD,sBAsCC;AAED,SAAgB,UAAU,CACxB,CAAU,EACV,SAA+B,EAC/B,UAA2B,EAC3B,UAAkB,EAClB,eAAwB;IAExB,IAAI,QAAQ,IAAI,SAAS,EAAE;QAEzB,eAAe,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0BAAe,CAAC,GAAG,IAAA,oBAAa,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QACtG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QAC3D,OAAO;KACR;IACD,KAAK,MAAM,GAAG,IAAI,SAAS,CAAC,KAAK,EAAE;QACjC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC;YACpB,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG;gBACvB,MAAM,EAAE,EAAE;gBACV,MAAM,EAAE,EAAE;gBACV,KAAK,EAAE,EAAE;aACV,CAAC,CAAC;QACL,UAAU,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;KACzF;AACH,CAAC;AAvBD,gCAuBC","file":"data.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\nimport {\n  STACK_FIELD_END,\n  STACK_FIELD_START_PERCENT,\n  STACK_FIELD_END_PERCENT,\n  STACK_FIELD_END_OffsetSilhouette,\n  STACK_FIELD_START_OffsetSilhouette,\n  STACK_FIELD_TOTAL,\n  STACK_FIELD_TOTAL_PERCENT,\n  STACK_FIELD_TOTAL_TOP,\n  STACK_FIELD_START\n} from '../constant';\nimport { toValidNumber } from './type';\nimport { max, sum } from './math';\nimport type { ISeries, ISeriesStackDataMeta } from '../series/interface';\n\nexport function mergeFields(\n  targetFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  mergeFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[]\n): {\n  key: string;\n  operations: StatisticOperations;\n}[] {\n  for (let i = 0; i < mergeFields.length; i++) {\n    const element = mergeFields[i];\n    const _target = findFields(targetFields, element.key);\n    if (!_target) {\n      targetFields.push(element);\n    } else {\n      _target.operations = [...new Set(_target.operations.concat(element.operations))];\n    }\n  }\n  return targetFields;\n}\n\nfunction findFields(\n  list: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  fieldKey: string\n) {\n  return list.find(i => i.key === fieldKey);\n}\n\n// 如果不存在别名就返回 field\nexport function getFieldAlias(dataView: DataView, field: string) {\n  if (!dataView) {\n    return field ?? null;\n  }\n  const fields = dataView.getFields();\n  if (!fields) {\n    return field ?? null;\n  }\n  if (!fields[field]) {\n    return field ?? null;\n  }\n  return fields[field].alias ?? field;\n}\n\nexport interface IStackCacheNode {\n  values: any[];\n  series: {\n    s: ISeries;\n    values: any[];\n  }[];\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n}\nexport interface IStackCacheRoot {\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n}\n\nexport function getRegionStackGroup(\n  region: { getSeries: () => any[] },\n  setInitialValue: boolean,\n  filter?: (s: any) => boolean\n) {\n  const stackValueGroup: { [key: string]: IStackCacheRoot } = {};\n  // 分组\n  region.getSeries().forEach(s => {\n    const stackData = s.getStackData();\n    const stackValue = s.getStackValue();\n    const stackValueField = s.getStackValueField();\n    const filterEnable = filter ? filter(s) : true;\n    if (stackData && stackValueField && filterEnable) {\n      stackValueGroup[stackValue] = stackValueGroup[stackValue] ?? {\n        nodes: {}\n      };\n      stackGroup(s, stackData, stackValueGroup[stackValue] as IStackCacheNode, stackValueField, setInitialValue);\n    }\n  });\n  return stackValueGroup;\n}\n\nexport function stackTotal(stackData: IStackCacheNode, valueField: string) {\n  if ('values' in stackData && stackData.values.length) {\n    const total = sum(stackData.values, valueField);\n    const percent = max(stackData.values, STACK_FIELD_END_PERCENT);\n    stackData.values.forEach(v => {\n      v[STACK_FIELD_TOTAL] = total;\n      v[STACK_FIELD_TOTAL_PERCENT] = percent;\n      delete v[STACK_FIELD_TOTAL_TOP];\n    });\n    const maxNode = stackData.values.reduce((max, current) => {\n      return current[STACK_FIELD_END] > max[STACK_FIELD_END] ? current : max;\n    });\n    maxNode[STACK_FIELD_TOTAL_TOP] = true;\n    return;\n  }\n  for (const key in stackData.nodes) {\n    stackTotal(stackData.nodes[key], valueField);\n  }\n}\n\nexport function stackOffsetSilhouette(stackCache: IStackCacheNode) {\n  if (!stackCache.values.length) {\n    return;\n  }\n  const centerValue = stackCache.values[stackCache.values.length - 1][STACK_FIELD_END] / 2;\n  for (let j = 0; j < stackCache.values.length; j++) {\n    stackCache.values[j][STACK_FIELD_START_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_START] - centerValue;\n    stackCache.values[j][STACK_FIELD_END_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_END] - centerValue;\n  }\n}\n\nexport function stack(stackCache: IStackCacheNode, stackInverse: boolean) {\n  if (stackCache.values.length > 0) {\n    // 设置一个小数以保证 log 计算不会报错\n    let positiveStart = 0;\n    let negativeStart = 0;\n    // temp\n    let sign = 1;\n    let value = 0;\n\n    // stack\n    const maxLength = stackCache.values.length;\n    for (let index = 0; index < maxLength; index++) {\n      const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n      value = v[STACK_FIELD_END];\n      if (value >= 0) {\n        v[STACK_FIELD_START] = positiveStart;\n        positiveStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = positiveStart;\n      } else {\n        v[STACK_FIELD_START] = negativeStart;\n        negativeStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = negativeStart;\n      }\n    }\n    // normalize\n    for (let index = 0; index < maxLength; index++) {\n      const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n      value = v[STACK_FIELD_END];\n      const denominator = value >= 0 ? positiveStart : negativeStart;\n      sign = value >= 0 ? 1 : -1;\n      v[STACK_FIELD_START_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_START] / denominator) * sign;\n      v[STACK_FIELD_END_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_END] / denominator) * sign;\n    }\n  }\n\n  for (const key in stackCache.nodes) {\n    stack(stackCache.nodes[key], stackInverse);\n  }\n}\n\nexport function stackGroup(\n  s: ISeries,\n  stackData: ISeriesStackDataMeta,\n  stackCache: IStackCacheNode,\n  valueField: string,\n  setInitialValue: boolean\n) {\n  if ('values' in stackData) {\n    // 初值\n    setInitialValue && stackData.values.forEach(v => (v[STACK_FIELD_END] = toValidNumber(v[valueField])));\n    stackCache.values.push(...stackData.values);\n    stackCache.series.push({ s: s, values: stackData.values });\n    return;\n  }\n  for (const key in stackData.nodes) {\n    !stackCache.nodes[key] &&\n      (stackCache.nodes[key] = {\n        values: [],\n        series: [],\n        nodes: {}\n      });\n    stackGroup(s, stackData.nodes[key], stackCache.nodes[key], valueField, setInitialValue);\n  }\n}\n"]}
+{"version":3,"sources":["../src/util/data.ts"],"names":[],"mappings":"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","file":"data.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { StatisticOperations } from '../data/transforms/dimension-statistics';\nimport {\n  STACK_FIELD_END,\n  STACK_FIELD_START_PERCENT,\n  STACK_FIELD_END_PERCENT,\n  STACK_FIELD_END_OffsetSilhouette,\n  STACK_FIELD_START_OffsetSilhouette,\n  STACK_FIELD_TOTAL,\n  STACK_FIELD_TOTAL_PERCENT,\n  STACK_FIELD_TOTAL_TOP,\n  STACK_FIELD_START\n} from '../constant';\nimport { toValidNumber } from './type';\nimport { max, sum } from './math';\nimport type { ISeries, ISeriesStackDataMeta } from '../series/interface';\n\nexport function mergeFields(\n  targetFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  mergeFields: {\n    key: string;\n    operations: StatisticOperations;\n  }[]\n): {\n  key: string;\n  operations: StatisticOperations;\n}[] {\n  for (let i = 0; i < mergeFields.length; i++) {\n    const element = mergeFields[i];\n    const _target = findFields(targetFields, element.key);\n    if (!_target) {\n      targetFields.push(element);\n    } else {\n      _target.operations = [...new Set(_target.operations.concat(element.operations))];\n    }\n  }\n  return targetFields;\n}\n\nfunction findFields(\n  list: {\n    key: string;\n    operations: StatisticOperations;\n  }[],\n  fieldKey: string\n) {\n  return list.find(i => i.key === fieldKey);\n}\n\n// 如果不存在别名就返回 field\nexport function getFieldAlias(dataView: DataView, field: string) {\n  if (!dataView) {\n    return field ?? null;\n  }\n  const fields = dataView.getFields();\n  if (!fields) {\n    return field ?? null;\n  }\n  if (!fields[field]) {\n    return field ?? null;\n  }\n  return fields[field].alias ?? field;\n}\n\nexport interface IStackCacheNode {\n  values: any[];\n  series: {\n    s: ISeries;\n    values: any[];\n  }[];\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n}\nexport interface IStackCacheRoot {\n  nodes: {\n    [key: string]: IStackCacheNode;\n  };\n}\n\nexport function getRegionStackGroup(\n  region: { getSeries: () => any[] },\n  setInitialValue: boolean,\n  filter?: (s: any) => boolean\n) {\n  const stackValueGroup: { [key: string]: IStackCacheRoot } = {};\n  // 分组\n  region.getSeries().forEach(s => {\n    const stackData = s.getStackData();\n    const stackValue = s.getStackValue();\n    const stackValueField = s.getStackValueField();\n    const filterEnable = filter ? filter(s) : true;\n    if (stackData && stackValueField && filterEnable) {\n      stackValueGroup[stackValue] = stackValueGroup[stackValue] ?? {\n        nodes: {}\n      };\n      stackGroup(s, stackData, stackValueGroup[stackValue] as IStackCacheNode, stackValueField, setInitialValue);\n    }\n  });\n  return stackValueGroup;\n}\n\nexport function stackTotal(stackData: IStackCacheNode, valueField: string) {\n  if ('values' in stackData && stackData.values.length) {\n    const total = sum(stackData.values, valueField);\n    const percent = max(stackData.values, STACK_FIELD_END_PERCENT);\n    stackData.values.forEach(v => {\n      v[STACK_FIELD_TOTAL] = total;\n      v[STACK_FIELD_TOTAL_PERCENT] = percent;\n      delete v[STACK_FIELD_TOTAL_TOP];\n    });\n    const maxNode = stackData.values.reduce((max, current) => {\n      return current[STACK_FIELD_END] > max[STACK_FIELD_END] ? current : max;\n    });\n    maxNode[STACK_FIELD_TOTAL_TOP] = true;\n    return;\n  }\n  for (const key in stackData.nodes) {\n    stackTotal(stackData.nodes[key], valueField);\n  }\n}\n\nexport function stackOffsetSilhouette(stackCache: IStackCacheNode) {\n  if (!stackCache.values.length) {\n    return;\n  }\n  const centerValue = stackCache.values[stackCache.values.length - 1][STACK_FIELD_END] / 2;\n  for (let j = 0; j < stackCache.values.length; j++) {\n    stackCache.values[j][STACK_FIELD_START_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_START] - centerValue;\n    stackCache.values[j][STACK_FIELD_END_OffsetSilhouette] = stackCache.values[j][STACK_FIELD_END] - centerValue;\n  }\n}\n\nexport function stack(stackCache: IStackCacheNode, stackInverse: boolean, hasPercent?: boolean) {\n  if (stackCache.values.length > 0) {\n    // 设置一个小数以保证 log 计算不会报错\n    let positiveStart = 0;\n    let negativeStart = 0;\n    // temp\n    let sign = 1;\n    let value = 0;\n\n    // stack\n    const maxLength = stackCache.values.length;\n    for (let index = 0; index < maxLength; index++) {\n      const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n      value = v[STACK_FIELD_END];\n      if (value >= 0) {\n        v[STACK_FIELD_START] = positiveStart;\n        positiveStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = positiveStart;\n      } else {\n        v[STACK_FIELD_START] = negativeStart;\n        negativeStart += v[STACK_FIELD_END];\n        v[STACK_FIELD_END] = negativeStart;\n      }\n    }\n    if (hasPercent) {\n      // normalize\n      for (let index = 0; index < maxLength; index++) {\n        const v = stackCache.values[stackInverse ? maxLength - 1 - index : index];\n        value = v[STACK_FIELD_END];\n        const denominator = value >= 0 ? positiveStart : negativeStart;\n        sign = value >= 0 ? 1 : -1;\n        v[STACK_FIELD_START_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_START] / denominator) * sign;\n        v[STACK_FIELD_END_PERCENT] = denominator === 0 ? 0 : Math.min(1, v[STACK_FIELD_END] / denominator) * sign;\n      }\n    }\n  }\n\n  for (const key in stackCache.nodes) {\n    stack(stackCache.nodes[key], stackInverse, hasPercent);\n  }\n}\n\nexport function stackGroup(\n  s: ISeries,\n  stackData: ISeriesStackDataMeta,\n  stackCache: IStackCacheNode,\n  valueField: string,\n  setInitialValue: boolean\n) {\n  if ('values' in stackData) {\n    // 初值\n    setInitialValue && stackData.values.forEach(v => (v[STACK_FIELD_END] = toValidNumber(v[valueField])));\n    stackCache.values.push(...stackData.values);\n    stackCache.series.push({ s: s, values: stackData.values });\n    return;\n  }\n  for (const key in stackData.nodes) {\n    !stackCache.nodes[key] &&\n      (stackCache.nodes[key] = {\n        values: [],\n        series: [],\n        nodes: {}\n      });\n    stackGroup(s, stackData.nodes[key], stackCache.nodes[key], valueField, setInitialValue);\n  }\n}\n"]}

package/cjs/util/scale.d.ts

@@ -1,4 +1,3 @@
-import type { DataView } from '@visactor/vdataset';
 import type { IGlobalScale } from '../scale/interface';
 import { type IBaseScale, BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';
 import type { IVisual } from '../typings/visual';
@@ -14,7 +13,7 @@ declare const defaultScaleMap: {
 export declare function createScale(type: keyof typeof defaultScaleMap): IBaseScale | null;
 export declare function createScaleWithSpec(spec: IVisual<any>, context: {
     globalScale: IGlobalScale;
-    dataStatistics: DataView;
+    seriesId: number;
 }): IBaseScale | null;
 export declare function valueInScaleRange(v: number, s?: IBaseScale): number;
 export declare function isSpecValueWithScale(specValue: any): boolean;

package/cjs/util/scale.js

@@ -19,7 +19,7 @@ function createScale(type) {
 }
 
 function createScaleWithSpec(spec, context) {
-    if ("scale" in spec && spec.scale) return (0, vutils_1.isString)(spec.scale) && (null == context ? void 0 : context.globalScale) ? context.globalScale.registerMarkAttributeScale(spec, context.dataStatistics) : spec.scale;
+    if ("scale" in spec && spec.scale) return (0, vutils_1.isString)(spec.scale) && (null == context ? void 0 : context.globalScale) ? context.globalScale.registerMarkAttributeScale(spec, context.seriesId) : spec.scale;
     const scale = createScale(spec.type);
     return scale && initScaleWithSpec(scale, spec), scale;
 }

package/cjs/util/scale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/scale.ts"],"names":[],"mappings":";;;AAGA,6CAAqD;AAGrD,6CAAqH;AAErH,sEAAiE;AAEjE,MAAM,eAAe,GAAG;IACtB,MAAM,EAAE,oBAAW;IACnB,IAAI,EAAE,kBAAS;IACf,KAAK,EAAE,mBAAU;IACjB,OAAO,EAAE,qBAAY;IACrB,SAAS,EAAE,uBAAc;IACzB,YAAY,EAAE,uCAAiB;CAChC,CAAC;AAEF,SAAgB,WAAW,CAAC,IAAkC;IAC5D,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,gBAAgB,EAAE;QACpB,OAAO,IAAI,gBAAgB,EAAE,CAAC;KAC/B;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,kCAOC;AAED,SAAgB,mBAAmB,CACjC,IAAkB,EAClB,OAGC;IAED,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;QACjC,IAAI,IAAA,iBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,EAAE;YAChD,OAAO,OAAO,CAAC,WAAW,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SACrF;QACD,OAAO,IAAI,CAAC,KAA8B,CAAC;KAC5C;IACD,MAAM,KAAK,GAAG,WAAW,CAAE,IAAkC,CAAC,IAAI,CAAC,CAAC;IACpE,IAAI,KAAK,EAAE;QACT,iBAAiB,CAAC,KAAK,EAAE,IAAiC,CAAC,CAAC;KAC7D;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,kDAkBC;AAGD,SAAS,iBAAiB,CAAC,KAAiB,EAAE,IAA+B;IAC3E,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;QACnB,OAAO;KACR;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC3B;IAED,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACzB;IAED,IAAI,IAAI,CAAC,SAAS,IAAmB,KAAM,CAAC,SAAS,EAAE;QACtC,KAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACjD;AACH,CAAC;AAED,SAAgB,iBAAiB,CAAC,CAAS,EAAE,CAAc;IACzD,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,CAAC,CAAC;KACV;IACD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC;AARD,8CAQC;AAED,SAAgB,oBAAoB,CAAC,SAAc;IACjD,OAAO,IAAA,gBAAO,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,IAAI,IAAA,gBAAO,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,CAAC;AAChE,CAAC;AAFD,oDAEC","file":"scale.js","sourcesContent":["/**\n * @description Scale 相关的工具函数\n */\nimport { isString, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../scale/interface';\nimport { type IBaseScale, BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';\nimport type { IVisual, IVisualSpecBase } from '../typings/visual';\nimport { ColorOrdinalScale } from '../scale/color-ordinal-scale';\n\nconst defaultScaleMap = {\n  linear: LinearScale,\n  band: BandScale,\n  point: PointScale,\n  ordinal: OrdinalScale,\n  threshold: ThresholdScale,\n  colorOrdinal: ColorOrdinalScale\n};\n\nexport function createScale(type: keyof typeof defaultScaleMap): IBaseScale | null {\n  const scaleConstructor = defaultScaleMap[type];\n  if (scaleConstructor) {\n    return new scaleConstructor();\n  }\n\n  return null;\n}\n\nexport function createScaleWithSpec(\n  spec: IVisual<any>,\n  context: {\n    globalScale: IGlobalScale;\n    dataStatistics: DataView;\n  }\n): IBaseScale | null {\n  if ('scale' in spec && spec.scale) {\n    if (isString(spec.scale) && context?.globalScale) {\n      return context.globalScale.registerMarkAttributeScale(spec, context.dataStatistics);\n    }\n    return spec.scale as unknown as IBaseScale;\n  }\n  const scale = createScale((spec as IVisualSpecBase<any, any>).type);\n  if (scale) {\n    initScaleWithSpec(scale, spec as IVisualSpecBase<any, any>);\n  }\n  return scale;\n}\n\n// 需要一个通用的从spec初始化scale的方法，避免在scale属性更新后需要维护多组逻辑\nfunction initScaleWithSpec(scale: IBaseScale, spec: IVisualSpecBase<any, any>) {\n  if (!scale || !spec) {\n    return;\n  }\n\n  if (spec.domain) {\n    scale.domain(spec.domain);\n  }\n\n  if (spec.range) {\n    scale.range(spec.range);\n  }\n\n  if (spec.specified && (<OrdinalScale>scale).specified) {\n    (<OrdinalScale>scale).specified(spec.specified);\n  }\n}\n\nexport function valueInScaleRange(v: number, s?: IBaseScale) {\n  if (!s) {\n    return v;\n  }\n  const range = s.range();\n  const min = Math.min(range[0], range[range.length - 1]);\n  const max = Math.max(range[0], range[range.length - 1]);\n  return Math.min(Math.max(min, v), max);\n}\n\nexport function isSpecValueWithScale(specValue: any) {\n  return isValid(specValue?.field) && isValid(specValue?.scale);\n}\n"]}
+{"version":3,"sources":["../src/util/scale.ts"],"names":[],"mappings":";;;AAGA,6CAAqD;AAGrD,6CAAqH;AAErH,sEAAiE;AAEjE,MAAM,eAAe,GAAG;IACtB,MAAM,EAAE,oBAAW;IACnB,IAAI,EAAE,kBAAS;IACf,KAAK,EAAE,mBAAU;IACjB,OAAO,EAAE,qBAAY;IACrB,SAAS,EAAE,uBAAc;IACzB,YAAY,EAAE,uCAAiB;CAChC,CAAC;AAEF,SAAgB,WAAW,CAAC,IAAkC;IAC5D,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,gBAAgB,EAAE;QACpB,OAAO,IAAI,gBAAgB,EAAE,CAAC;KAC/B;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,kCAOC;AAED,SAAgB,mBAAmB,CACjC,IAAkB,EAClB,OAGC;IAED,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;QACjC,IAAI,IAAA,iBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,EAAE;YAChD,OAAO,OAAO,CAAC,WAAW,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC/E;QACD,OAAO,IAAI,CAAC,KAA8B,CAAC;KAC5C;IACD,MAAM,KAAK,GAAG,WAAW,CAAE,IAAkC,CAAC,IAAI,CAAC,CAAC;IACpE,IAAI,KAAK,EAAE;QACT,iBAAiB,CAAC,KAAK,EAAE,IAAiC,CAAC,CAAC;KAC7D;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,kDAkBC;AAGD,SAAS,iBAAiB,CAAC,KAAiB,EAAE,IAA+B;IAC3E,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;QACnB,OAAO;KACR;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC3B;IAED,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACzB;IAED,IAAI,IAAI,CAAC,SAAS,IAAmB,KAAM,CAAC,SAAS,EAAE;QACtC,KAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACjD;AACH,CAAC;AAED,SAAgB,iBAAiB,CAAC,CAAS,EAAE,CAAc;IACzD,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,CAAC,CAAC;KACV;IACD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC;AARD,8CAQC;AAED,SAAgB,oBAAoB,CAAC,SAAc;IACjD,OAAO,IAAA,gBAAO,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,IAAI,IAAA,gBAAO,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,CAAC;AAChE,CAAC;AAFD,oDAEC","file":"scale.js","sourcesContent":["/**\n * @description Scale 相关的工具函数\n */\nimport { isString, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../scale/interface';\nimport { type IBaseScale, BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';\nimport type { IVisual, IVisualSpecBase } from '../typings/visual';\nimport { ColorOrdinalScale } from '../scale/color-ordinal-scale';\n\nconst defaultScaleMap = {\n  linear: LinearScale,\n  band: BandScale,\n  point: PointScale,\n  ordinal: OrdinalScale,\n  threshold: ThresholdScale,\n  colorOrdinal: ColorOrdinalScale\n};\n\nexport function createScale(type: keyof typeof defaultScaleMap): IBaseScale | null {\n  const scaleConstructor = defaultScaleMap[type];\n  if (scaleConstructor) {\n    return new scaleConstructor();\n  }\n\n  return null;\n}\n\nexport function createScaleWithSpec(\n  spec: IVisual<any>,\n  context: {\n    globalScale: IGlobalScale;\n    seriesId: number;\n  }\n): IBaseScale | null {\n  if ('scale' in spec && spec.scale) {\n    if (isString(spec.scale) && context?.globalScale) {\n      return context.globalScale.registerMarkAttributeScale(spec, context.seriesId);\n    }\n    return spec.scale as unknown as IBaseScale;\n  }\n  const scale = createScale((spec as IVisualSpecBase<any, any>).type);\n  if (scale) {\n    initScaleWithSpec(scale, spec as IVisualSpecBase<any, any>);\n  }\n  return scale;\n}\n\n// 需要一个通用的从spec初始化scale的方法，避免在scale属性更新后需要维护多组逻辑\nfunction initScaleWithSpec(scale: IBaseScale, spec: IVisualSpecBase<any, any>) {\n  if (!scale || !spec) {\n    return;\n  }\n\n  if (spec.domain) {\n    scale.domain(spec.domain);\n  }\n\n  if (spec.range) {\n    scale.range(spec.range);\n  }\n\n  if (spec.specified && (<OrdinalScale>scale).specified) {\n    (<OrdinalScale>scale).specified(spec.specified);\n  }\n}\n\nexport function valueInScaleRange(v: number, s?: IBaseScale) {\n  if (!s) {\n    return v;\n  }\n  const range = s.range();\n  const min = Math.min(range[0], range[range.length - 1]);\n  const max = Math.max(range[0], range[range.length - 1]);\n  return Math.min(Math.max(min, v), max);\n}\n\nexport function isSpecValueWithScale(specValue: any) {\n  return isValid(specValue?.field) && isValid(specValue?.scale);\n}\n"]}

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

@@ -33,7 +33,8 @@ function baseMergeDeep(target, source, key, shallowArray = !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;
+    } else (0, vutils_1.isPlainObject)(srcValue) ? (newValue = null != objValue ? objValue : {}, 
+    "function" != typeof objValue && "object" == typeof objValue || (newValue = {})) : isCommon = !1;
     isCommon && baseMerge(newValue, srcValue, shallowArray), assignMergeValue(target, key, newValue);
 }
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/spec/merge-spec.ts"],"names":[],"mappings":"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","file":"merge-spec.js","sourcesContent":["import { isArray, isArrayLike, isObject, isPlainObject, isValid } from '@visactor/vutils';\nimport type { StringOrNumber } from '../../typings';\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\nexport function mergeSpecWithFilter(\n  target: any,\n  filter: string | { type: string; index: number },\n  spec: any,\n  forceMerge: boolean\n) {\n  Object.keys(target).forEach(k => {\n    if (isObject(filter)) {\n      if (filter.type === k) {\n        if (isArray(target[k])) {\n          if (target[k].length >= filter.index) {\n            target[k][filter.index] = forceMerge ? mergeSpec({}, target[k][filter.index], spec) : spec;\n          }\n        } else {\n          target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n        }\n      }\n    } else {\n      // filter === user id\n      if (isArray(target[k])) {\n        const index = target[k].findIndex((_s: { id: StringOrNumber }) => _s.id === filter);\n        if (index >= 0) {\n          target[k][index] = forceMerge ? mergeSpec({}, target[k][index], spec) : spec;\n        }\n      } else if (target.id === filter) {\n        target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n      }\n    }\n  });\n}\n"]}
+{"version":3,"sources":["../src/util/spec/merge-spec.ts"],"names":[],"mappings":"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","file":"merge-spec.js","sourcesContent":["import { isArray, isArrayLike, isObject, isPlainObject, isValid } from '@visactor/vutils';\nimport type { StringOrNumber } from '../../typings';\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\nexport function mergeSpecWithFilter(\n  target: any,\n  filter: string | { type: string; index: number },\n  spec: any,\n  forceMerge: boolean\n) {\n  Object.keys(target).forEach(k => {\n    if (isObject(filter)) {\n      if (filter.type === k) {\n        if (isArray(target[k])) {\n          if (target[k].length >= filter.index) {\n            target[k][filter.index] = forceMerge ? mergeSpec({}, target[k][filter.index], spec) : spec;\n          }\n        } else {\n          target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n        }\n      }\n    } else {\n      // filter === user id\n      if (isArray(target[k])) {\n        const index = target[k].findIndex((_s: { id: StringOrNumber }) => _s.id === filter);\n        if (index >= 0) {\n          target[k][index] = forceMerge ? mergeSpec({}, target[k][index], spec) : spec;\n        }\n      } else if (target.id === filter) {\n        target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec;\n      }\n    }\n  });\n}\n"]}

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.transformSeriesThemeToMerge = exports.transformColorSchemeToMerge = 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");
+const vutils_1 = require("@visactor/vutils"), util_1 = require("../../theme/color-scheme/util"), theme_1 = require("../../series/interface/theme"), merge_spec_1 = require("./merge-spec");
 
 function mergeTheme(target, ...sources) {
     return (0, merge_spec_1.mergeSpec)(transformThemeToMerge(target), ...sources.map(transformThemeToMerge));
@@ -12,17 +12,16 @@ function mergeTheme(target, ...sources) {
 
 function transformThemeToMerge(theme) {
     if (!theme) return theme;
-    const colorScheme = transformColorSchemeToMerge(theme.colorScheme);
-    let {series: series} = theme;
-    const {mark: markByType, markByName: markByName} = theme;
-    return (markByType || markByName) && (series = Object.keys(interface_1.seriesMarkInfoMap).reduce(((newSeriesTheme, key) => {
+    const colorScheme = transformColorSchemeToMerge(theme.colorScheme), {series: series} = theme, {mark: markByType, markByName: markByName} = theme;
+    let newSeriesTheme;
+    return (markByType || markByName) && (newSeriesTheme = Object.keys(theme_1.seriesMarkInfoMap).reduce(((newSeriesTheme, key) => {
         var _a;
         const value = null !== (_a = null == series ? void 0 : series[key]) && void 0 !== _a ? _a : {};
         return newSeriesTheme[key] = transformSeriesThemeToMerge(value, key, markByType, markByName), 
         newSeriesTheme;
-    }), {})), Object.assign(Object.assign({}, theme), {
+    }), {})), Object.assign({}, theme, {
         colorScheme: colorScheme,
-        series: series
+        series: Object.assign({}, theme.series, newSeriesTheme)
     });
 }
 
@@ -34,8 +33,9 @@ function transformColorSchemeToMerge(colorScheme) {
 }
 
 function transformSeriesThemeToMerge(seriesTheme, seriesType, markByType, markByName) {
+    if (!theme_1.seriesMarkInfoMap[seriesType]) return seriesTheme;
     const newTheme = {};
-    return Object.values(interface_1.seriesMarkInfoMap[seriesType]).forEach((({type: type, name: name}) => {
+    return Object.values(theme_1.seriesMarkInfoMap[seriesType]).forEach((({type: type, name: name}) => {
         newTheme[name] = (0, merge_spec_1.mergeSpec)({}, null == markByType ? void 0 : markByType[(0, 
         vutils_1.array)(type)[0]], null == markByName ? void 0 : markByName[name], null == seriesTheme ? void 0 : seriesTheme[name]);
     })), Object.assign(Object.assign({}, seriesTheme), newTheme);

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

@@ -1 +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,MAAM,WAAW,GAAG,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAGnE,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,cAAc,CAAC,GAAG,CAAC,GAAG,2BAA2B,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACtF,OAAO,cAAc,CAAC;QACxB,CAAC,EAAE,EAAkB,CAAC,CAAC;KACxB;IAED,uCACK,KAAK,KACR,WAAW;QACX,MAAM,IACN;AACJ,CAAC;AAGD,SAAgB,2BAA2B,CAAC,WAAsC;IAChF,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;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AATD,kEASC;AAGD,SAAgB,2BAA2B,CACzC,WAAgB,EAChB,UAAkB,EAClB,UAAkC,EAClC,UAAkC;IAElC,MAAM,QAAQ,GAAQ,EAAE,CAAC;IACzB,MAAM,CAAC,MAAM,CAAkB,6BAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QACvF,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAS,EAAC,EAAE,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAI,CAAC,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,IAAI,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IACH,uCACK,WAAW,GACX,QAAQ,EACX;AACJ,CAAC;AAdD,kEAcC","file":"merge-theme.js","sourcesContent":["import { type Maybe, array } from '@visactor/vutils';\nimport type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, 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  const colorScheme = transformColorSchemeToMerge(theme.colorScheme);\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      newSeriesTheme[key] = transformSeriesThemeToMerge(value, key, markByType, markByName);\n      return newSeriesTheme;\n    }, {} as ISeriesTheme);\n  }\n\n  return {\n    ...theme,\n    colorScheme,\n    series\n  };\n}\n\n/** 将色板转化为标准形式 */\nexport function transformColorSchemeToMerge(colorScheme?: Maybe<IThemeColorScheme>): Maybe<IThemeColorScheme> {\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  return colorScheme;\n}\n\n/** 将全局 mark 主题 merge 进系列主题 */\nexport function transformSeriesThemeToMerge(\n  seriesTheme: any,\n  seriesType: string,\n  markByType: IGlobalMarkThemeByType,\n  markByName: IGlobalMarkThemeByName\n): any {\n  const newTheme: any = {};\n  Object.values<ISeriesMarkInfo>(seriesMarkInfoMap[seriesType]).forEach(({ type, name }) => {\n    newTheme[name] = mergeSpec({}, markByType?.[array(type)[0]], markByName?.[name], seriesTheme?.[name]);\n  });\n  return {\n    ...seriesTheme,\n    ...newTheme\n  };\n}\n"]}
+{"version":3,"sources":["../src/util/spec/merge-theme.ts"],"names":[],"mappings":";;;AAAA,6CAAqD;AAErD,wDAAqF;AAKrF,wDAAiE;AACjE,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,MAAM,WAAW,GAAG,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAGnE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IAC/C,IAAI,cAAc,CAAC;IACnB,IAAI,UAAU,IAAI,UAAU,EAAE;QAC5B,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,yBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE;;YAC7E,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAG,GAAG,CAAC,mCAAI,EAAE,CAAC;YAClC,cAAc,CAAC,GAAG,CAAC,GAAG,2BAA2B,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YACtF,OAAO,cAAc,CAAC;QACxB,CAAC,EAAE,EAAkB,CAAC,CAAC;KACxB;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE;QAC9B,WAAW;QACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAGD,SAAgB,2BAA2B,CAAC,WAAsC;IAChF,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;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AATD,kEASC;AAGD,SAAgB,2BAA2B,CACzC,WAAgB,EAChB,UAAkB,EAClB,UAAkC,EAClC,UAAkC;IAElC,IAAI,CAAC,yBAAiB,CAAC,UAAU,CAAC,EAAE;QAClC,OAAO,WAAW,CAAC;KACpB;IACD,MAAM,QAAQ,GAAQ,EAAE,CAAC;IACzB,MAAM,CAAC,MAAM,CAAkB,yBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QACvF,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAA,sBAAS,EAAC,EAAE,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAG,IAAI,CAAC,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAG,IAAI,CAAC,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IACH,uCACK,WAAW,GACX,QAAQ,EACX;AACJ,CAAC;AAjBD,kEAiBC","file":"merge-theme.js","sourcesContent":["import { type Maybe, array } from '@visactor/vutils';\nimport type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, 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 type { ISeriesMarkInfo } from '../../series/interface/common';\nimport { seriesMarkInfoMap } from '../../series/interface/theme';\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  const colorScheme = transformColorSchemeToMerge(theme.colorScheme);\n\n  // 将全局 mark 主题 merge 进系列主题\n  const { series } = theme;\n  const { mark: markByType, markByName } = theme;\n  let newSeriesTheme;\n  if (markByType || markByName) {\n    newSeriesTheme = Object.keys(seriesMarkInfoMap).reduce((newSeriesTheme, key) => {\n      const value = series?.[key] ?? {};\n      newSeriesTheme[key] = transformSeriesThemeToMerge(value, key, markByType, markByName);\n      return newSeriesTheme;\n    }, {} as ISeriesTheme);\n  }\n\n  return Object.assign({}, theme, {\n    colorScheme,\n    series: Object.assign({}, theme.series, newSeriesTheme)\n  });\n}\n\n/** 将色板转化为标准形式 */\nexport function transformColorSchemeToMerge(colorScheme?: Maybe<IThemeColorScheme>): Maybe<IThemeColorScheme> {\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  return colorScheme;\n}\n\n/** 将全局 mark 主题 merge 进系列主题 */\nexport function transformSeriesThemeToMerge(\n  seriesTheme: any,\n  seriesType: string,\n  markByType: IGlobalMarkThemeByType,\n  markByName: IGlobalMarkThemeByName\n): any {\n  if (!seriesMarkInfoMap[seriesType]) {\n    return seriesTheme;\n  }\n  const newTheme: any = {};\n  Object.values<ISeriesMarkInfo>(seriesMarkInfoMap[seriesType]).forEach(({ type, name }) => {\n    newTheme[name] = mergeSpec({}, markByType?.[array(type)[0]], markByName?.[name], seriesTheme?.[name]);\n  });\n  return {\n    ...seriesTheme,\n    ...newTheme\n  };\n}\n"]}

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

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

package/cjs/util/spec/preprocess.js

@@ -4,18 +4,18 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.preprocessSpecOrTheme = void 0;
 
-const vutils_1 = require("@visactor/vutils"), interface_1 = require("../../series/interface"), common_1 = require("./common"), util_1 = require("../../theme/color-scheme/util"), space_1 = require("../space");
+const vutils_1 = require("@visactor/vutils"), type_1 = require("../../series/interface/type"), common_1 = require("./common"), util_1 = require("../../theme/color-scheme/util"), space_1 = require("../space");
 
-function preprocessSpecOrTheme(type, obj, colorScheme, seriesType) {
+function preprocessSpecOrTheme(type, obj, colorScheme, seriesSpec) {
     if ((0, vutils_1.isNil)(obj)) return obj;
     if ((0, vutils_1.isArray)(obj)) return obj.map((element => (0, vutils_1.isObject)(element) && !(0, 
-    vutils_1.isFunction)(element) ? preprocessSpecOrTheme(type, element, colorScheme, seriesType) : element));
+    vutils_1.isFunction)(element) ? preprocessSpecOrTheme(type, element, colorScheme, seriesSpec) : 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] = preprocessSpecOrTheme(interface_1.seriesMarkNameSet.has(key) ? type.includes("spec") ? "mark-spec" : "mark-theme" : type, value, colorScheme, seriesType);
+            (0, util_1.isColorKey)(value) ? newObj[key] = (0, util_1.getActualColor)(value, colorScheme, seriesSpec) : newObj[key] = preprocessSpecOrTheme(type_1.seriesMarkNameSet.has(key) ? type.includes("spec") ? "mark-spec" : "mark-theme" : type, value, colorScheme, seriesSpec);
         } else if (type.includes("mark") || "padding" !== key) if (!type.includes("theme") && "lineHeight" === key && (0, 
         vutils_1.isString)(value) && "%" === value[value.length - 1]) {
             if ((0, vutils_1.isValid)(obj.fontSize)) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/spec/preprocess.ts"],"names":[],"mappings":";;;AAAA,6CAA0G;AAC1G,sDAAgF;AAEhF,qCAAqD;AACrD,wDAA2E;AAC3E,oCAAsD;AAUtD,SAAgB,qBAAqB,CACnC,IAAmD,EACnD,GAAQ,EACR,WAA+B,EAC/B,UAA2B;IAE3B,IAAI,IAAA,cAAK,EAAC,GAAG,CAAC,EAAE;QACd,OAAO,GAAG,CAAC;KACZ;IACD,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,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;aACtE;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;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,qBAAqB,CACjC,6BAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,EACxF,KAAK,EACL,WAAW,EACX,UAAU,CACX,CAAC;aACH;SACF;aAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,KAAK,SAAS,EAAE;YAEtD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,kCAA0B,EAAC,KAAK,CAAC,CAAC;SACjD;aAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,KAAK,YAAY,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAChH,IAAI,IAAA,gBAAO,EAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBAGzB,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBAC5E,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtC,IAAI,IAAA,sBAAa,EAAC,QAAQ,CAAC,EAAE;oBAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;iBACxB;aACF;SAEF;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SACrB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AA/DD,sDA+DC","file":"preprocess.js","sourcesContent":["import { isArray, isFunction, isNil, isObject, isString, isValid, isValidNumber } from '@visactor/vutils';\nimport { seriesMarkNameSet, 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/**\n * 对 spec 或者类 spec 配置（如 theme）进行预处理，如进行语义化颜色的转换等\n * @param type 需要转换的对象类型（spec 或者 theme）\n * @param obj 需要转换的对象\n * @param colorScheme 主题色板\n * @param seriesType 当前系列类型\n * @returns\n */\nexport function preprocessSpecOrTheme(\n  type: 'spec' | 'theme' | 'mark-spec' | 'mark-theme',\n  obj: any,\n  colorScheme?: IThemeColorScheme,\n  seriesType?: SeriesTypeEnum\n): any {\n  if (isNil(obj)) {\n    return obj;\n  }\n  if (isArray(obj)) {\n    return obj.map(element => {\n      if (isObject(element) && !isFunction(element)) {\n        return preprocessSpecOrTheme(type, 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 {\n        newObj[key] = preprocessSpecOrTheme(\n          seriesMarkNameSet.has(key) ? (type.includes('spec') ? 'mark-spec' : 'mark-theme') : type,\n          value,\n          colorScheme,\n          seriesType\n        );\n      }\n    } else if (!type.includes('mark') && key === 'padding') {\n      // 标准化 padding\n      newObj[key] = normalizeLayoutPaddingSpec(value);\n    } else if (!type.includes('theme') && key === 'lineHeight' && isString(value) && value[value.length - 1] === '%') {\n      if (isValid(obj.fontSize)) {\n        // 处理 lineHeight 的比例值\n        // FIXME: vrender 支持行高字符串后删掉这段逻辑\n        const scale = Number.parseFloat(value.substring(0, value.length - 1)) / 100;\n        const newValue = obj.fontSize * scale;\n        if (isValidNumber(newValue)) {\n          newObj[key] = newValue;\n        }\n      }\n      // 如果 spec 同级里没有 fontSize 配置，lineHeight 比例值失效\n    } else {\n      newObj[key] = value;\n    }\n  });\n\n  return newObj;\n}\n"]}
+{"version":3,"sources":["../src/util/spec/preprocess.ts"],"names":[],"mappings":"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","file":"preprocess.js","sourcesContent":["import { isArray, isFunction, isNil, isObject, isString, isValid, isValidNumber } from '@visactor/vutils';\nimport type { SeriesTypeEnum } from '../../series/interface/type';\nimport { seriesMarkNameSet } from '../../series/interface/type';\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';\nimport type { ISeriesSpec } from '../../typings';\n\n/**\n * 对 spec 或者类 spec 配置（如 theme）进行预处理，如进行语义化颜色的转换等\n * @param type 需要转换的对象类型（spec 或者 theme）\n * @param obj 需要转换的对象\n * @param colorScheme 主题色板\n * @param seriesType 当前系列类型\n * @returns\n */\nexport function preprocessSpecOrTheme(\n  type: 'spec' | 'theme' | 'mark-spec' | 'mark-theme',\n  obj: any,\n  colorScheme?: IThemeColorScheme,\n  seriesSpec?: ISeriesSpec\n): any {\n  if (isNil(obj)) {\n    return obj;\n  }\n  if (isArray(obj)) {\n    return obj.map(element => {\n      if (isObject(element) && !isFunction(element)) {\n        return preprocessSpecOrTheme(type, element, colorScheme, seriesSpec);\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, seriesSpec);\n      } else {\n        newObj[key] = preprocessSpecOrTheme(\n          seriesMarkNameSet.has(key) ? (type.includes('spec') ? 'mark-spec' : 'mark-theme') : type,\n          value,\n          colorScheme,\n          seriesSpec\n        );\n      }\n    } else if (!type.includes('mark') && key === 'padding') {\n      // 标准化 padding\n      newObj[key] = normalizeLayoutPaddingSpec(value);\n    } else if (!type.includes('theme') && key === 'lineHeight' && isString(value) && value[value.length - 1] === '%') {\n      if (isValid(obj.fontSize)) {\n        // 处理 lineHeight 的比例值\n        // FIXME: vrender 支持行高字符串后删掉这段逻辑\n        const scale = Number.parseFloat(value.substring(0, value.length - 1)) / 100;\n        const newValue = obj.fontSize * scale;\n        if (isValidNumber(newValue)) {\n          newObj[key] = newValue;\n        }\n      }\n      // 如果 spec 同级里没有 fontSize 配置，lineHeight 比例值失效\n    } else {\n      newObj[key] = value;\n    }\n  });\n\n  return newObj;\n}\n"]}

package/cjs/vchart-all.js

@@ -15,6 +15,6 @@ Object.defineProperty(exports, "VChart", {
 
 const line_1 = require("./chart/line"), area_1 = require("./chart/area"), bar_1 = require("./chart/bar"), scatter_1 = require("./chart/scatter"), map_1 = require("./chart/map"), pie_1 = require("./chart/pie"), rose_1 = require("./chart/rose"), radar_1 = require("./chart/radar"), common_1 = require("./chart/common"), sequence_1 = require("./chart/sequence"), histogram_1 = require("./chart/histogram"), circular_1 = require("./chart/progress/circular"), gauge_1 = require("./chart/gauge"), word_cloud_1 = require("./chart/word-cloud"), funnel_1 = require("./chart/funnel"), linear_1 = require("./chart/progress/linear"), range_column_1 = require("./chart/range-column"), sunburst_1 = require("./chart/sunburst"), circle_packing_1 = require("./chart/circle-packing"), treemap_1 = require("./chart/treemap"), waterfall_1 = require("./chart/waterfall"), box_plot_1 = require("./chart/box-plot"), sankey_1 = require("./chart/sankey"), range_area_1 = require("./chart/range-area"), heatmap_1 = require("./chart/heatmap"), correlation_1 = require("./chart/correlation"), cartesian_1 = require("./component/axis/cartesian"), polar_1 = require("./component/axis/polar"), legend_1 = require("./component/legend"), tooltip_1 = require("./component/tooltip"), crosshair_1 = require("./component/crosshair"), data_zoom_1 = require("./component/data-zoom"), indicator_1 = require("./component/indicator"), geo_1 = require("./component/geo"), mark_line_1 = require("./component/marker/mark-line"), title_1 = require("./component/title"), mark_area_1 = require("./component/marker/mark-area"), player_1 = require("./component/player"), label_1 = require("./component/label"), totalLabel_1 = require("./component/label/totalLabel"), mark_point_1 = require("./component/marker/mark-point"), brush_1 = require("./component/brush"), custom_mark_1 = require("./component/custom-mark"), map_label_1 = require("./component/map-label"), grid_layout_1 = require("./layout/grid-layout/grid-layout"), layout3d_1 = require("./layout/layout3d"), poptip_1 = require("./component/poptip"), env_1 = require("./env");
 
-core_1.VChart.useRegisters([ line_1.registerLineChart, area_1.registerAreaChart, bar_1.registerBarChart, scatter_1.registerScatterChart, pie_1.registerPieChart, rose_1.registerRoseChart, radar_1.registerRadarChart, histogram_1.registerHistogramChart, map_1.registerMapChart, gauge_1.registerGaugeChart, word_cloud_1.registerWordCloudChart, word_cloud_1.registerWordCloud3dChart, funnel_1.registerFunnelChart, waterfall_1.registerWaterfallChart, box_plot_1.registerBoxplotChart, circular_1.registerCircularProgressChart, linear_1.registerLinearProgressChart, range_column_1.registerRangeColumnChart, range_area_1.registerRangeAreaChart, sunburst_1.registerSunburstChart, circle_packing_1.registerCirclePackingChart, treemap_1.registerTreemapChart, sankey_1.registerSankeyChart, heatmap_1.registerHeatmapChart, sequence_1.registerSequenceChart, correlation_1.registerCorrelationChart, common_1.registerCommonChart, bar_1.registerBar3dChart, pie_1.registerPie3dChart, histogram_1.registerHistogram3dChart, funnel_1.registerFunnel3dChart, range_column_1.registerRangeColumn3dChart, cartesian_1.registerCartesianLinearAxis, cartesian_1.registerCartesianBandAxis, cartesian_1.registerCartesianTimeAxis, cartesian_1.registerCartesianLogAxis, cartesian_1.registerCartesianSymlogAxis, polar_1.registerPolarBandAxis, polar_1.registerPolarLinearAxis, legend_1.registerDiscreteLegend, legend_1.registerContinuousLegend, tooltip_1.registerTooltip, crosshair_1.registerCartesianCrossHair, crosshair_1.registerPolarCrossHair, data_zoom_1.registerDataZoom, data_zoom_1.registerScrollBar, indicator_1.registerIndicator, geo_1.registerGeoCoordinate, mark_point_1.registerMarkPoint, mark_line_1.registerMarkLine, mark_area_1.registerMarkArea, title_1.registerTitle, player_1.registerPlayer, label_1.registerLabel, totalLabel_1.registerTotalLabel, brush_1.registerBrush, custom_mark_1.registerCustomMark, map_label_1.registerMapLabel, poptip_1.registerPoptip, grid_layout_1.registerGridLayout, layout3d_1.registerLayout3d ]), 
+core_1.VChart.useRegisters([ line_1.registerLineChart, area_1.registerAreaChart, bar_1.registerBarChart, scatter_1.registerScatterChart, pie_1.registerPieChart, rose_1.registerRoseChart, radar_1.registerRadarChart, histogram_1.registerHistogramChart, map_1.registerMapChart, gauge_1.registerGaugeChart, word_cloud_1.registerWordCloudChart, word_cloud_1.registerWordCloudShapeChart, funnel_1.registerFunnelChart, waterfall_1.registerWaterfallChart, box_plot_1.registerBoxplotChart, circular_1.registerCircularProgressChart, linear_1.registerLinearProgressChart, range_column_1.registerRangeColumnChart, range_area_1.registerRangeAreaChart, sunburst_1.registerSunburstChart, circle_packing_1.registerCirclePackingChart, treemap_1.registerTreemapChart, sankey_1.registerSankeyChart, heatmap_1.registerHeatmapChart, sequence_1.registerSequenceChart, correlation_1.registerCorrelationChart, common_1.registerCommonChart, bar_1.registerBar3dChart, pie_1.registerPie3dChart, histogram_1.registerHistogram3dChart, funnel_1.registerFunnel3dChart, range_column_1.registerRangeColumn3dChart, word_cloud_1.registerWordCloud3dChart, word_cloud_1.registerWordCloudShape3dChart, cartesian_1.registerCartesianLinearAxis, cartesian_1.registerCartesianBandAxis, cartesian_1.registerCartesianTimeAxis, cartesian_1.registerCartesianLogAxis, cartesian_1.registerCartesianSymlogAxis, polar_1.registerPolarBandAxis, polar_1.registerPolarLinearAxis, legend_1.registerDiscreteLegend, legend_1.registerContinuousLegend, tooltip_1.registerTooltip, crosshair_1.registerCartesianCrossHair, crosshair_1.registerPolarCrossHair, data_zoom_1.registerDataZoom, data_zoom_1.registerScrollBar, indicator_1.registerIndicator, geo_1.registerGeoCoordinate, mark_point_1.registerMarkPoint, mark_line_1.registerMarkLine, mark_area_1.registerMarkArea, title_1.registerTitle, player_1.registerPlayer, label_1.registerLabel, totalLabel_1.registerTotalLabel, brush_1.registerBrush, custom_mark_1.registerCustomMark, map_label_1.registerMapLabel, poptip_1.registerPoptip, grid_layout_1.registerGridLayout, layout3d_1.registerLayout3d ]), 
 core_1.VChart.useRegisters([ env_1.registerAllEnv ]);
 //# sourceMappingURL=vchart-all.js.map

package/cjs/vchart-all.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAsIvB,uFAtIA,aAAM,OAsIA;AApIf,uCAAiD;AACjD,uCAAiD;AACjD,qCAAmE;AACnE,6CAAuD;AACvD,qCAA+C;AAC/C,qCAAmE;AACnE,uCAAiD;AACjD,yCAAmD;AACnD,2CAAqD;AACrD,+CAAyD;AACzD,iDAAqF;AACrF,wDAA0E;AAC1E,yCAAmD;AACnD,mDAAsF;AACtF,2CAA4E;AAC5E,oDAAsE;AACtE,uDAA4F;AAC5F,+CAAyD;AACzD,2DAAoE;AACpE,6CAAuD;AACvD,iDAA2D;AAC3D,+CAAwD;AACxD,2CAAqD;AACrD,mDAA4D;AAC5D,6CAAuD;AACvD,qDAA+D;AAC/D,0DAMoC;AACpC,kDAAwF;AACxF,+CAAsF;AACtF,iDAAsD;AACtD,qDAA2F;AAC3F,qDAA4E;AAC5E,qDAA0D;AAC1D,yCAAwD;AACxD,4DAAgE;AAChE,6CAAkD;AAClD,4DAAgE;AAChE,+CAAoD;AACpD,6CAAkD;AAClD,6DAAkE;AAClE,8DAAkE;AAClE,6CAAkD;AAClD,yDAA6D;AAC7D,qDAAyD;AACzD,kEAAsE;AACtE,gDAAqD;AACrD,+CAAoD;AACpD,+BAAuC;AAEvC,aAAM,CAAC,YAAY,CAAC;IAElB,wBAAiB;IACjB,wBAAiB;IACjB,sBAAgB;IAChB,8BAAoB;IACpB,sBAAgB;IAChB,wBAAiB;IACjB,0BAAkB;IAClB,kCAAsB;IACtB,sBAAgB;IAChB,0BAAkB;IAClB,mCAAsB;IACtB,qCAAwB;IACxB,4BAAmB;IACnB,kCAAsB;IACtB,+BAAoB;IACpB,wCAA6B;IAC7B,oCAA2B;IAC3B,uCAAwB;IACxB,mCAAsB;IACtB,gCAAqB;IACrB,2CAA0B;IAC1B,8BAAoB;IACpB,4BAAmB;IACnB,8BAAoB;IACpB,gCAAqB;IACrB,sCAAwB;IACxB,4BAAmB;IAGnB,wBAAkB;IAClB,wBAAkB;IAClB,oCAAwB;IACxB,8BAAqB;IACrB,yCAA0B;IAG1B,uCAA2B;IAC3B,qCAAyB;IACzB,qCAAyB;IACzB,oCAAwB;IACxB,uCAA2B;IAC3B,6BAAqB;IACrB,+BAAuB;IAEvB,+BAAsB;IACtB,iCAAwB;IAExB,yBAAe;IACf,sCAA0B;IAC1B,kCAAsB;IAEtB,4BAAgB;IAChB,6BAAiB;IACjB,6BAAiB;IACjB,2BAAqB;IACrB,8BAAiB;IACjB,4BAAgB;IAChB,4BAAgB;IAChB,qBAAa;IACb,uBAAc;IACd,qBAAa;IACb,+BAAkB;IAClB,qBAAa;IACb,gCAAkB;IAClB,4BAAgB;IAChB,uBAAc;IAGd,gCAAkB;IAClB,2BAAgB;CACjB,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC,CAAC,oBAAc,CAAC,CAAC,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart } from './core';\n\nimport { registerLineChart } from './chart/line';\nimport { registerAreaChart } from './chart/area';\nimport { registerBar3dChart, registerBarChart } from './chart/bar';\nimport { registerScatterChart } from './chart/scatter';\nimport { registerMapChart } from './chart/map';\nimport { registerPie3dChart, registerPieChart } from './chart/pie';\nimport { registerRoseChart } from './chart/rose';\nimport { registerRadarChart } from './chart/radar';\nimport { registerCommonChart } from './chart/common';\nimport { registerSequenceChart } from './chart/sequence';\nimport { registerHistogram3dChart, registerHistogramChart } from './chart/histogram';\nimport { registerCircularProgressChart } from './chart/progress/circular';\nimport { registerGaugeChart } from './chart/gauge';\nimport { registerWordCloudChart, registerWordCloud3dChart } from './chart/word-cloud';\nimport { registerFunnel3dChart, registerFunnelChart } from './chart/funnel';\nimport { registerLinearProgressChart } from './chart/progress/linear';\nimport { registerRangeColumn3dChart, registerRangeColumnChart } from './chart/range-column';\nimport { registerSunburstChart } from './chart/sunburst';\nimport { registerCirclePackingChart } from './chart/circle-packing';\nimport { registerTreemapChart } from './chart/treemap';\nimport { registerWaterfallChart } from './chart/waterfall';\nimport { registerBoxplotChart } from './chart/box-plot';\nimport { registerSankeyChart } from './chart/sankey';\nimport { registerRangeAreaChart } from './chart/range-area';\nimport { registerHeatmapChart } from './chart/heatmap';\nimport { registerCorrelationChart } from './chart/correlation';\nimport {\n  registerCartesianBandAxis,\n  registerCartesianLinearAxis,\n  registerCartesianLogAxis,\n  registerCartesianSymlogAxis,\n  registerCartesianTimeAxis\n} from './component/axis/cartesian';\nimport { registerPolarBandAxis, registerPolarLinearAxis } from './component/axis/polar';\nimport { registerContinuousLegend, registerDiscreteLegend } from './component/legend';\nimport { registerTooltip } from './component/tooltip';\nimport { registerCartesianCrossHair, registerPolarCrossHair } from './component/crosshair';\nimport { registerDataZoom, registerScrollBar } from './component/data-zoom';\nimport { registerIndicator } from './component/indicator';\nimport { registerGeoCoordinate } from './component/geo';\nimport { registerMarkLine } from './component/marker/mark-line';\nimport { registerTitle } from './component/title';\nimport { registerMarkArea } from './component/marker/mark-area';\nimport { registerPlayer } from './component/player';\nimport { registerLabel } from './component/label';\nimport { registerTotalLabel } from './component/label/totalLabel';\nimport { registerMarkPoint } from './component/marker/mark-point';\nimport { registerBrush } from './component/brush';\nimport { registerCustomMark } from './component/custom-mark';\nimport { registerMapLabel } from './component/map-label';\nimport { registerGridLayout } from './layout/grid-layout/grid-layout';\nimport { registerLayout3d } from './layout/layout3d';\nimport { registerPoptip } from './component/poptip';\nimport { registerAllEnv } from './env';\n\nVChart.useRegisters([\n  // charts\n  registerLineChart,\n  registerAreaChart,\n  registerBarChart,\n  registerScatterChart,\n  registerPieChart,\n  registerRoseChart,\n  registerRadarChart,\n  registerHistogramChart,\n  registerMapChart,\n  registerGaugeChart,\n  registerWordCloudChart,\n  registerWordCloud3dChart,\n  registerFunnelChart,\n  registerWaterfallChart,\n  registerBoxplotChart,\n  registerCircularProgressChart,\n  registerLinearProgressChart,\n  registerRangeColumnChart,\n  registerRangeAreaChart,\n  registerSunburstChart,\n  registerCirclePackingChart,\n  registerTreemapChart,\n  registerSankeyChart,\n  registerHeatmapChart,\n  registerSequenceChart,\n  registerCorrelationChart,\n  registerCommonChart,\n\n  // 3d charts\n  registerBar3dChart,\n  registerPie3dChart,\n  registerHistogram3dChart,\n  registerFunnel3dChart,\n  registerRangeColumn3dChart,\n\n  // components\n  registerCartesianLinearAxis,\n  registerCartesianBandAxis,\n  registerCartesianTimeAxis,\n  registerCartesianLogAxis,\n  registerCartesianSymlogAxis,\n  registerPolarBandAxis,\n  registerPolarLinearAxis,\n\n  registerDiscreteLegend,\n  registerContinuousLegend,\n\n  registerTooltip,\n  registerCartesianCrossHair,\n  registerPolarCrossHair,\n\n  registerDataZoom,\n  registerScrollBar,\n  registerIndicator,\n  registerGeoCoordinate,\n  registerMarkPoint,\n  registerMarkLine,\n  registerMarkArea,\n  registerTitle,\n  registerPlayer,\n  registerLabel,\n  registerTotalLabel,\n  registerBrush,\n  registerCustomMark,\n  registerMapLabel,\n  registerPoptip,\n\n  // layout\n  registerGridLayout,\n  registerLayout3d\n]);\n\n// load env code\nVChart.useRegisters([registerAllEnv]);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AA6IvB,uFA7IA,aAAM,OA6IA;AA3If,uCAAiD;AACjD,uCAAiD;AACjD,qCAAmE;AACnE,6CAAuD;AACvD,qCAA+C;AAC/C,qCAAmE;AACnE,uCAAiD;AACjD,yCAAmD;AACnD,2CAAqD;AACrD,+CAAyD;AACzD,iDAAqF;AACrF,wDAA0E;AAC1E,yCAAmD;AACnD,mDAK4B;AAC5B,2CAA4E;AAC5E,oDAAsE;AACtE,uDAA4F;AAC5F,+CAAyD;AACzD,2DAAoE;AACpE,6CAAuD;AACvD,iDAA2D;AAC3D,+CAAwD;AACxD,2CAAqD;AACrD,mDAA4D;AAC5D,6CAAuD;AACvD,qDAA+D;AAC/D,0DAMoC;AACpC,kDAAwF;AACxF,+CAAsF;AACtF,iDAAsD;AACtD,qDAA2F;AAC3F,qDAA4E;AAC5E,qDAA0D;AAC1D,yCAAwD;AACxD,4DAAgE;AAChE,6CAAkD;AAClD,4DAAgE;AAChE,+CAAoD;AACpD,6CAAkD;AAClD,6DAAkE;AAClE,8DAAkE;AAClE,6CAAkD;AAClD,yDAA6D;AAC7D,qDAAyD;AACzD,kEAAsE;AACtE,gDAAqD;AACrD,+CAAoD;AACpD,+BAAuC;AAEvC,aAAM,CAAC,YAAY,CAAC;IAElB,wBAAiB;IACjB,wBAAiB;IACjB,sBAAgB;IAChB,8BAAoB;IACpB,sBAAgB;IAChB,wBAAiB;IACjB,0BAAkB;IAClB,kCAAsB;IACtB,sBAAgB;IAChB,0BAAkB;IAClB,mCAAsB;IACtB,wCAA2B;IAC3B,4BAAmB;IACnB,kCAAsB;IACtB,+BAAoB;IACpB,wCAA6B;IAC7B,oCAA2B;IAC3B,uCAAwB;IACxB,mCAAsB;IACtB,gCAAqB;IACrB,2CAA0B;IAC1B,8BAAoB;IACpB,4BAAmB;IACnB,8BAAoB;IACpB,gCAAqB;IACrB,sCAAwB;IACxB,4BAAmB;IAGnB,wBAAkB;IAClB,wBAAkB;IAClB,oCAAwB;IACxB,8BAAqB;IACrB,yCAA0B;IAC1B,qCAAwB;IACxB,0CAA6B;IAG7B,uCAA2B;IAC3B,qCAAyB;IACzB,qCAAyB;IACzB,oCAAwB;IACxB,uCAA2B;IAC3B,6BAAqB;IACrB,+BAAuB;IAEvB,+BAAsB;IACtB,iCAAwB;IAExB,yBAAe;IACf,sCAA0B;IAC1B,kCAAsB;IAEtB,4BAAgB;IAChB,6BAAiB;IACjB,6BAAiB;IACjB,2BAAqB;IACrB,8BAAiB;IACjB,4BAAgB;IAChB,4BAAgB;IAChB,qBAAa;IACb,uBAAc;IACd,qBAAa;IACb,+BAAkB;IAClB,qBAAa;IACb,gCAAkB;IAClB,4BAAgB;IAChB,uBAAc;IAGd,gCAAkB;IAClB,2BAAgB;CACjB,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC,CAAC,oBAAc,CAAC,CAAC,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart } from './core';\n\nimport { registerLineChart } from './chart/line';\nimport { registerAreaChart } from './chart/area';\nimport { registerBar3dChart, registerBarChart } from './chart/bar';\nimport { registerScatterChart } from './chart/scatter';\nimport { registerMapChart } from './chart/map';\nimport { registerPie3dChart, registerPieChart } from './chart/pie';\nimport { registerRoseChart } from './chart/rose';\nimport { registerRadarChart } from './chart/radar';\nimport { registerCommonChart } from './chart/common';\nimport { registerSequenceChart } from './chart/sequence';\nimport { registerHistogram3dChart, registerHistogramChart } from './chart/histogram';\nimport { registerCircularProgressChart } from './chart/progress/circular';\nimport { registerGaugeChart } from './chart/gauge';\nimport {\n  registerWordCloudChart,\n  registerWordCloudShapeChart,\n  registerWordCloud3dChart,\n  registerWordCloudShape3dChart\n} from './chart/word-cloud';\nimport { registerFunnel3dChart, registerFunnelChart } from './chart/funnel';\nimport { registerLinearProgressChart } from './chart/progress/linear';\nimport { registerRangeColumn3dChart, registerRangeColumnChart } from './chart/range-column';\nimport { registerSunburstChart } from './chart/sunburst';\nimport { registerCirclePackingChart } from './chart/circle-packing';\nimport { registerTreemapChart } from './chart/treemap';\nimport { registerWaterfallChart } from './chart/waterfall';\nimport { registerBoxplotChart } from './chart/box-plot';\nimport { registerSankeyChart } from './chart/sankey';\nimport { registerRangeAreaChart } from './chart/range-area';\nimport { registerHeatmapChart } from './chart/heatmap';\nimport { registerCorrelationChart } from './chart/correlation';\nimport {\n  registerCartesianBandAxis,\n  registerCartesianLinearAxis,\n  registerCartesianLogAxis,\n  registerCartesianSymlogAxis,\n  registerCartesianTimeAxis\n} from './component/axis/cartesian';\nimport { registerPolarBandAxis, registerPolarLinearAxis } from './component/axis/polar';\nimport { registerContinuousLegend, registerDiscreteLegend } from './component/legend';\nimport { registerTooltip } from './component/tooltip';\nimport { registerCartesianCrossHair, registerPolarCrossHair } from './component/crosshair';\nimport { registerDataZoom, registerScrollBar } from './component/data-zoom';\nimport { registerIndicator } from './component/indicator';\nimport { registerGeoCoordinate } from './component/geo';\nimport { registerMarkLine } from './component/marker/mark-line';\nimport { registerTitle } from './component/title';\nimport { registerMarkArea } from './component/marker/mark-area';\nimport { registerPlayer } from './component/player';\nimport { registerLabel } from './component/label';\nimport { registerTotalLabel } from './component/label/totalLabel';\nimport { registerMarkPoint } from './component/marker/mark-point';\nimport { registerBrush } from './component/brush';\nimport { registerCustomMark } from './component/custom-mark';\nimport { registerMapLabel } from './component/map-label';\nimport { registerGridLayout } from './layout/grid-layout/grid-layout';\nimport { registerLayout3d } from './layout/layout3d';\nimport { registerPoptip } from './component/poptip';\nimport { registerAllEnv } from './env';\n\nVChart.useRegisters([\n  // charts\n  registerLineChart,\n  registerAreaChart,\n  registerBarChart,\n  registerScatterChart,\n  registerPieChart,\n  registerRoseChart,\n  registerRadarChart,\n  registerHistogramChart,\n  registerMapChart,\n  registerGaugeChart,\n  registerWordCloudChart,\n  registerWordCloudShapeChart,\n  registerFunnelChart,\n  registerWaterfallChart,\n  registerBoxplotChart,\n  registerCircularProgressChart,\n  registerLinearProgressChart,\n  registerRangeColumnChart,\n  registerRangeAreaChart,\n  registerSunburstChart,\n  registerCirclePackingChart,\n  registerTreemapChart,\n  registerSankeyChart,\n  registerHeatmapChart,\n  registerSequenceChart,\n  registerCorrelationChart,\n  registerCommonChart,\n\n  // 3d charts\n  registerBar3dChart,\n  registerPie3dChart,\n  registerHistogram3dChart,\n  registerFunnel3dChart,\n  registerRangeColumn3dChart,\n  registerWordCloud3dChart,\n  registerWordCloudShape3dChart,\n\n  // components\n  registerCartesianLinearAxis,\n  registerCartesianBandAxis,\n  registerCartesianTimeAxis,\n  registerCartesianLogAxis,\n  registerCartesianSymlogAxis,\n  registerPolarBandAxis,\n  registerPolarLinearAxis,\n\n  registerDiscreteLegend,\n  registerContinuousLegend,\n\n  registerTooltip,\n  registerCartesianCrossHair,\n  registerPolarCrossHair,\n\n  registerDataZoom,\n  registerScrollBar,\n  registerIndicator,\n  registerGeoCoordinate,\n  registerMarkPoint,\n  registerMarkLine,\n  registerMarkArea,\n  registerTitle,\n  registerPlayer,\n  registerLabel,\n  registerTotalLabel,\n  registerBrush,\n  registerCustomMark,\n  registerMapLabel,\n  registerPoptip,\n\n  // layout\n  registerGridLayout,\n  registerLayout3d\n]);\n\n// load env code\nVChart.useRegisters([registerAllEnv]);\n\nexport { VChart };\n"]}

package/cjs/vchart-simple.d.ts

@@ -1,2 +1,3 @@
 import { VChart } from './core';
+export * from './core';
 export { VChart };

package/cjs/vchart-simple.js

@@ -1,5 +1,20 @@
 "use strict";
 
+var __createBinding = this && this.__createBinding || (Object.create ? function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k);
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    desc && !("get" in desc ? !m.__esModule : desc.writable || desc.configurable) || (desc = {
+        enumerable: !0,
+        get: function() {
+            return m[k];
+        }
+    }), Object.defineProperty(o, k2, desc);
+} : function(o, m, k, k2) {
+    void 0 === k2 && (k2 = k), o[k2] = m[k];
+}), __exportStar = this && this.__exportStar || function(m, exports) {
+    for (var p in m) "default" === p || Object.prototype.hasOwnProperty.call(exports, p) || __createBinding(exports, m, p);
+};
+
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.VChart = void 0;
@@ -15,6 +30,6 @@ Object.defineProperty(exports, "VChart", {
 
 const line_1 = require("./chart/line"), bar_1 = require("./chart/bar"), pie_1 = require("./chart/pie"), env_1 = require("./env");
 
-core_1.VChart.useRegisters([ line_1.registerLineChart, bar_1.registerBarChart, pie_1.registerPieChart, linear_axis_1.registerCartesianLinearAxis, band_axis_1.registerCartesianBandAxis, time_axis_1.registerCartesianTimeAxis, legend_1.registerDiscreteLegend, tooltip_1.registerTooltip, cartesian_1.registerCartesianCrossHair, label_1.registerLabel ]), 
+__exportStar(require("./core"), exports), core_1.VChart.useRegisters([ line_1.registerLineChart, bar_1.registerBarChart, pie_1.registerPieChart, linear_axis_1.registerCartesianLinearAxis, band_axis_1.registerCartesianBandAxis, time_axis_1.registerCartesianTimeAxis, legend_1.registerDiscreteLegend, tooltip_1.registerTooltip, cartesian_1.registerCartesianCrossHair, label_1.registerLabel ]), 
 core_1.VChart.useRegisters([ env_1.registerAllEnv ]);
 //# sourceMappingURL=vchart-simple.js.map

package/cjs/vchart-simple.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":";;;AAAA,mDAAwD;AACxD,+DAA6E;AAC7E,yDAA8D;AAC9D,+DAA4E;AAC5E,oEAAiF;AACjF,oEAAiF;AACjF,wEAAqF;AAIrF,iCAAgC;AAyBvB,uFAzBA,aAAM,OAyBA;AAxBf,uCAAiD;AACjD,qCAA+C;AAC/C,qCAA+C;AAC/C,+BAAuC;AAEvC,aAAM,CAAC,YAAY,CAAC;IAElB,wBAAiB;IACjB,sBAAgB;IAChB,sBAAgB;IAGhB,yCAA2B;IAC3B,qCAAyB;IACzB,qCAAyB;IACzB,+BAAsB;IACtB,yBAAe;IACf,sCAA0B;IAC1B,qBAAa;CACd,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC,CAAC,oBAAc,CAAC,CAAC,CAAC","file":"vchart-simple.js","sourcesContent":["import { registerLabel } from './component/label/label';\nimport { registerCartesianCrossHair } from './component/crosshair/cartesian';\nimport { registerTooltip } from './component/tooltip/tooltip';\nimport { registerDiscreteLegend } from './component/legend/discrete/legend';\nimport { registerCartesianTimeAxis } from './component/axis/cartesian/time-axis';\nimport { registerCartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { registerCartesianLinearAxis } from './component/axis/cartesian/linear-axis';\n/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { registerLineChart } from './chart/line';\nimport { registerBarChart } from './chart/bar';\nimport { registerPieChart } from './chart/pie';\nimport { registerAllEnv } from './env';\n\nVChart.useRegisters([\n  // charts\n  registerLineChart,\n  registerBarChart,\n  registerPieChart,\n\n  // components\n  registerCartesianLinearAxis,\n  registerCartesianBandAxis,\n  registerCartesianTimeAxis,\n  registerDiscreteLegend,\n  registerTooltip,\n  registerCartesianCrossHair,\n  registerLabel\n]);\n\n// load env code\nVChart.useRegisters([registerAllEnv]);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,mDAAwD;AACxD,+DAA6E;AAC7E,yDAA8D;AAC9D,+DAA4E;AAC5E,oEAAiF;AACjF,oEAAiF;AACjF,wEAAqF;AAIrF,iCAAgC;AA2BvB,uFA3BA,aAAM,OA2BA;AA1Bf,uCAAiD;AACjD,qCAA+C;AAC/C,qCAA+C;AAC/C,+BAAuC;AAEvC,yCAAuB;AAEvB,aAAM,CAAC,YAAY,CAAC;IAElB,wBAAiB;IACjB,sBAAgB;IAChB,sBAAgB;IAGhB,yCAA2B;IAC3B,qCAAyB;IACzB,qCAAyB;IACzB,+BAAsB;IACtB,yBAAe;IACf,sCAA0B;IAC1B,qBAAa;CACd,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC,CAAC,oBAAc,CAAC,CAAC,CAAC","file":"vchart-simple.js","sourcesContent":["import { registerLabel } from './component/label/label';\nimport { registerCartesianCrossHair } from './component/crosshair/cartesian';\nimport { registerTooltip } from './component/tooltip/tooltip';\nimport { registerDiscreteLegend } from './component/legend/discrete/legend';\nimport { registerCartesianTimeAxis } from './component/axis/cartesian/time-axis';\nimport { registerCartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { registerCartesianLinearAxis } from './component/axis/cartesian/linear-axis';\n/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { registerLineChart } from './chart/line';\nimport { registerBarChart } from './chart/bar';\nimport { registerPieChart } from './chart/pie';\nimport { registerAllEnv } from './env';\n\nexport * from './core';\n\nVChart.useRegisters([\n  // charts\n  registerLineChart,\n  registerBarChart,\n  registerPieChart,\n\n  // components\n  registerCartesianLinearAxis,\n  registerCartesianBandAxis,\n  registerCartesianTimeAxis,\n  registerDiscreteLegend,\n  registerTooltip,\n  registerCartesianCrossHair,\n  registerLabel\n]);\n\n// load env code\nVChart.useRegisters([registerAllEnv]);\n\nexport { VChart };\n"]}

package/esm/animation/animate-manager.d.ts

@@ -1,4 +1,4 @@
-import { StateManager } from '../compile/signal';
+import { StateManager } from '../compile/signal/state-manager';
 import type { StateValueMap } from '../compile/signal/interface';
 import type { IAnimate, IAnimateState } from './interface';
 import { AnimationStateEnum } from './interface';

package/esm/animation/animate-manager.js

@@ -1,8 +1,8 @@
-import { StateManager } from "../compile/signal";
+import { StateManager } from "../compile/signal/state-manager";
 
 import { PREFIX } from "../constant";
 
-import { createID } from "../util";
+import { createID } from "../util/id";
 
 import { AnimationStateEnum } from "./interface";
 
@@ -31,7 +31,7 @@ export class AnimateManager extends StateManager {
     _getDefaultStateMap() {
         return {
             animationState: {
-                callback: (datum, element) => "exit" === element.diffState ? AnimationStateEnum.none : AnimationStateEnum.appear
+                callback: (datum, element) => "exit" === element.diffState ? AnimationStateEnum.exit : AnimationStateEnum.appear
             }
         };
     }

package/esm/animation/animate-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/animate-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,OAAO,cAAe,SAAQ,YAAY;IAAhD;;QAGW,OAAE,GAAW,QAAQ,EAAE,CAAC;QAEvB,yBAAoB,GAAG,CAAC,GAAW,EAAE,EAAE;YAC/C,OAAO,GAAG,MAAM,YAAY,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;QAC/C,CAAC,CAAC;IAqDJ,CAAC;IAnDC,2BAA2B;QACzB,OAAO,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IACrD,CAAC;IAED,kBAAkB,CAAC,KAAyB,EAAE,QAAkB;QAE9D,IAAI,KAAK,KAAK,kBAAkB,CAAC,MAAM,EAAE;YACvC,IAAI,CAAC,WAAW,CACd;gBACE,cAAc,EAAE;oBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS;iBAC/D;aACF,EACD,QAAQ,CACT,CAAC;SACH;aAEI,IAAI,KAAK,KAAK,kBAAkB,CAAC,MAAM,EAAE;YAC5C,IAAI,CAAC,WAAW,CACd;gBACE,cAAc,EAAE;oBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE;wBAC1C,OAAO,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC;oBAC5F,CAAC;iBACF;aACF,EACD,QAAQ,CACT,CAAC;SACH;aAEI;YACH,IAAI,CAAC,WAAW,CACd;gBACE,cAAc,EAAE;oBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE,CAAC,KAAK;iBACnD;aACF,EACD,QAAQ,CACT,CAAC;SACH;IACH,CAAC;IAES,mBAAmB;QAC3B,OAAO;YACL,cAAc,EAAE;gBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE;oBAC1C,OAAO,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC;gBAC5F,CAAC;aACF;SACF,CAAC;IACJ,CAAC;CACF","file":"animate-manager.js","sourcesContent":["import type { IElement } from '@visactor/vgrammar-core';\nimport { StateManager } from '../compile/signal';\nimport type { StateValueMap } from '../compile/signal/interface';\nimport { PREFIX } from '../constant';\nimport { createID } from '../util';\nimport type { IAnimate, IAnimateState } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { AnimationStateEnum } from './interface';\n\nexport class AnimateManager extends StateManager implements IAnimate {\n  protected declare _stateMap: IAnimateState & StateValueMap;\n\n  readonly id: number = createID();\n\n  protected stateKeyToSignalName = (key: string) => {\n    return `${PREFIX}_animate_${this.id}_${key}`;\n  };\n\n  getAnimationStateSignalName() {\n    return this.stateKeyToSignalName('animationState');\n  }\n\n  updateAnimateState(state: AnimationStateEnum, noRender?: boolean) {\n    // when animation state is 'update', do animations by element diffState(enter & update & exit)\n    if (state === AnimationStateEnum.update) {\n      this.updateState(\n        {\n          animationState: {\n            callback: (datum: any, element: IElement) => element.diffState\n          }\n        },\n        noRender\n      );\n    }\n    // when animation state is 'appear', all valid elements would do appear animation except from exit elements\n    else if (state === AnimationStateEnum.appear) {\n      this.updateState(\n        {\n          animationState: {\n            callback: (datum: any, element: IElement) => {\n              return element.diffState === 'exit' ? AnimationStateEnum.none : AnimationStateEnum.appear;\n            }\n          }\n        },\n        noRender\n      );\n    }\n    // when animation state is other types, all elements would do animation by state\n    else {\n      this.updateState(\n        {\n          animationState: {\n            callback: (datum: any, element: IElement) => state\n          }\n        },\n        noRender\n      );\n    }\n  }\n\n  protected _getDefaultStateMap(): IAnimateState & StateValueMap {\n    return {\n      animationState: {\n        callback: (datum: any, element: IElement) => {\n          return element.diffState === 'exit' ? AnimationStateEnum.none : AnimationStateEnum.appear;\n        }\n      }\n    };\n  }\n}\n"]}
+{"version":3,"sources":["../src/animation/animate-manager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAGtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,OAAO,cAAe,SAAQ,YAAY;IAAhD;;QAGW,OAAE,GAAW,QAAQ,EAAE,CAAC;QAEvB,yBAAoB,GAAG,CAAC,GAAW,EAAE,EAAE;YAC/C,OAAO,GAAG,MAAM,YAAY,IAAI,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC;QAC/C,CAAC,CAAC;IAqDJ,CAAC;IAnDC,2BAA2B;QACzB,OAAO,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;IACrD,CAAC;IAED,kBAAkB,CAAC,KAAyB,EAAE,QAAkB;QAE9D,IAAI,KAAK,KAAK,kBAAkB,CAAC,MAAM,EAAE;YACvC,IAAI,CAAC,WAAW,CACd;gBACE,cAAc,EAAE;oBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS;iBAC/D;aACF,EACD,QAAQ,CACT,CAAC;SACH;aAEI,IAAI,KAAK,KAAK,kBAAkB,CAAC,MAAM,EAAE;YAC5C,IAAI,CAAC,WAAW,CACd;gBACE,cAAc,EAAE;oBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE;wBAC1C,OAAO,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC;oBAC5F,CAAC;iBACF;aACF,EACD,QAAQ,CACT,CAAC;SACH;aAEI;YACH,IAAI,CAAC,WAAW,CACd;gBACE,cAAc,EAAE;oBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE,CAAC,KAAK;iBACnD;aACF,EACD,QAAQ,CACT,CAAC;SACH;IACH,CAAC;IAES,mBAAmB;QAC3B,OAAO;YACL,cAAc,EAAE;gBACd,QAAQ,EAAE,CAAC,KAAU,EAAE,OAAiB,EAAE,EAAE;oBAC1C,OAAO,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC;gBAC5F,CAAC;aACF;SACF,CAAC;IACJ,CAAC;CACF","file":"animate-manager.js","sourcesContent":["import type { IElement } from '@visactor/vgrammar-core';\nimport { StateManager } from '../compile/signal/state-manager';\nimport type { StateValueMap } from '../compile/signal/interface';\nimport { PREFIX } from '../constant';\nimport { createID } from '../util/id';\nimport type { IAnimate, IAnimateState } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { AnimationStateEnum } from './interface';\n\nexport class AnimateManager extends StateManager implements IAnimate {\n  protected declare _stateMap: IAnimateState & StateValueMap;\n\n  readonly id: number = createID();\n\n  protected stateKeyToSignalName = (key: string) => {\n    return `${PREFIX}_animate_${this.id}_${key}`;\n  };\n\n  getAnimationStateSignalName() {\n    return this.stateKeyToSignalName('animationState');\n  }\n\n  updateAnimateState(state: AnimationStateEnum, noRender?: boolean) {\n    // when animation state is 'update', do animations by element diffState(enter & update & exit)\n    if (state === AnimationStateEnum.update) {\n      this.updateState(\n        {\n          animationState: {\n            callback: (datum: any, element: IElement) => element.diffState\n          }\n        },\n        noRender\n      );\n    }\n    // when animation state is 'appear', all valid elements would do appear animation except from exit elements\n    else if (state === AnimationStateEnum.appear) {\n      this.updateState(\n        {\n          animationState: {\n            callback: (datum: any, element: IElement) => {\n              return element.diffState === 'exit' ? AnimationStateEnum.none : AnimationStateEnum.appear;\n            }\n          }\n        },\n        noRender\n      );\n    }\n    // when animation state is other types, all elements would do animation by state\n    else {\n      this.updateState(\n        {\n          animationState: {\n            callback: (datum: any, element: IElement) => state\n          }\n        },\n        noRender\n      );\n    }\n  }\n\n  protected _getDefaultStateMap(): IAnimateState & StateValueMap {\n    return {\n      animationState: {\n        callback: (datum: any, element: IElement) => {\n          return element.diffState === 'exit' ? AnimationStateEnum.exit : AnimationStateEnum.appear;\n        }\n      }\n    };\n  }\n}\n"]}

package/esm/animation/utils.d.ts

@@ -1,19 +1,17 @@
 import type { IAnimationConfig } from '@visactor/vgrammar-core';
 import type { MarkAnimationSpec, IAnimationState } from './interface';
-import type { IStateAnimateSpec, IAnimationSpec, IMorphSeriesSpec } from './spec';
+import type { IStateAnimateSpec, IAnimationSpec } from './spec';
 import type { SeriesMarkNameEnum } from '../series/interface/type';
+import type { ISeries } from '../series';
+import type { ISeriesSpec } from '../typings';
+import type { ISeriesMarkAttributeContext } from '../compile/mark';
 export declare const AnimationStates: string[];
 export declare function animationConfig<Preset extends string>(defaultConfig?: MarkAnimationSpec, userConfig?: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, params?: {
     dataIndex: (datum: any) => number;
 }): MarkAnimationSpec;
-export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>): {
-    appear: any;
-    disappear: any;
-    enter: any;
-    exit: any;
-    update: any;
-    normal: any;
-};
-export declare function shouldDoMorph(hasAnimation: boolean, morphConfig?: IMorphSeriesSpec, animationConfig?: ReturnType<typeof userAnimationConfig>): boolean;
+export declare function userAnimationConfig<M extends string, Preset extends string>(markName: SeriesMarkNameEnum | string, spec: IAnimationSpec<M, Preset>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<string>>>;
+export declare function shouldMarkDoMorph(spec: ISeriesSpec & IAnimationSpec<string, string>, markName: string): boolean;
 export declare function isTimeLineAnimation(animationConfig: IAnimationConfig): boolean;
 export declare function isChannelAnimation(animationConfig: IAnimationConfig): boolean;
+export declare function uniformAnimationConfig<Preset extends string>(config: Partial<Record<IAnimationState, boolean | IStateAnimateSpec<Preset> | IAnimationConfig | IAnimationConfig[]>>, ctx: ISeriesMarkAttributeContext): Partial<Record<"none" | "state" | "normal" | "update" | "appear" | "enter" | "exit" | "disappear", boolean | IAnimationConfig | IAnimationConfig[] | IStateAnimateSpec<Preset>>>;
+export declare function isAnimationEnabledForSeries(series: ISeries): boolean;

package/esm/animation/utils.js

@@ -4,9 +4,9 @@ import { DEFAULT_DATA_INDEX } from "../constant";
 
 import { DEFAULT_ANIMATION_CONFIG } from "./config";
 
-import { isArray, isValid } from "@visactor/vutils";
+import { cloneDeep, isArray, isObject, isValid } from "@visactor/vutils";
 
-import { mergeSpec } from "../util/spec";
+import { mergeSpec } from "../util/spec/merge-spec";
 
 export const AnimationStates = [ "appear", "enter", "update", "exit", "disappear", "normal" ];
 
@@ -36,16 +36,16 @@ export function animationConfig(defaultConfig = {}, userConfig, params) {
     return config.state = config.update, config;
 }
 
-export function userAnimationConfig(markName, spec) {
+export function userAnimationConfig(markName, spec, ctx) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    return {
+    return uniformAnimationConfig({
         appear: null !== (_b = null === (_a = spec.animationAppear) || void 0 === _a ? void 0 : _a[markName]) && void 0 !== _b ? _b : spec.animationAppear,
         disappear: null !== (_d = null === (_c = spec.animationDisappear) || void 0 === _c ? void 0 : _c[markName]) && void 0 !== _d ? _d : spec.animationDisappear,
         enter: null !== (_f = null === (_e = spec.animationEnter) || void 0 === _e ? void 0 : _e[markName]) && void 0 !== _f ? _f : spec.animationEnter,
         exit: null !== (_h = null === (_g = spec.animationExit) || void 0 === _g ? void 0 : _g[markName]) && void 0 !== _h ? _h : spec.animationExit,
         update: null !== (_k = null === (_j = spec.animationUpdate) || void 0 === _j ? void 0 : _j[markName]) && void 0 !== _k ? _k : spec.animationUpdate,
         normal: null === (_l = spec.animationNormal) || void 0 === _l ? void 0 : _l[markName]
-    };
+    }, ctx);
 }
 
 function produceOneByOne(stateConfig, dataIndex) {
@@ -62,8 +62,12 @@ function defaultDataIndex(datum) {
     return null == datum ? void 0 : datum[DEFAULT_DATA_INDEX];
 }
 
-export function shouldDoMorph(hasAnimation, morphConfig, animationConfig) {
-    return !1 !== hasAnimation && (!1 !== (null == animationConfig ? void 0 : animationConfig.appear) && !1 !== (null == animationConfig ? void 0 : animationConfig.update) && !1 !== (null == morphConfig ? void 0 : morphConfig.enable));
+export function shouldMarkDoMorph(spec, markName) {
+    var _a, _b, _c, _d, _e;
+    if (!1 === spec.animation) return !1;
+    if (!1 === (null === (_a = spec.morph) || void 0 === _a ? void 0 : _a.enable)) return !1;
+    const appearAnimationEnabled = !1 !== (null !== (_c = null === (_b = spec.animationAppear) || void 0 === _b ? void 0 : _b[markName]) && void 0 !== _c ? _c : spec.animationAppear), updateAnimationEnabled = !1 !== (null !== (_e = null === (_d = spec.animationUpdate) || void 0 === _d ? void 0 : _d[markName]) && void 0 !== _e ? _e : spec.animationUpdate);
+    return !(!appearAnimationEnabled || !updateAnimationEnabled);
 }
 
 export function isTimeLineAnimation(animationConfig) {
@@ -73,4 +77,24 @@ export function isTimeLineAnimation(animationConfig) {
 export function isChannelAnimation(animationConfig) {
     return !isTimeLineAnimation(animationConfig) && isValid(animationConfig.channel);
 }
+
+export function uniformAnimationConfig(config, ctx) {
+    return config ? (traverseSpec(config = cloneDeep(config), (node => {
+        if (isFunction(node) && node.prototype.constructor !== node) {
+            return (...args) => node(...args, ctx);
+        }
+        return node;
+    })), config) : config;
+}
+
+function traverseSpec(spec, transform) {
+    if (isArray(spec)) spec.forEach(((i, index) => {
+        spec[index] = transform(spec[index], index), traverseSpec(spec[index], transform);
+    })); else if (isObject(spec)) for (const key in spec) spec[key] = transform(spec[key], key), 
+    traverseSpec(spec[key], transform);
+}
+
+export function isAnimationEnabledForSeries(series) {
+    return !1 !== series.getSpec().animation && isValid(series.getRegion().animate);
+}
 //# sourceMappingURL=utils.js.map