@visactor/vgrammar-core 0.13.5 → 0.13.7-alpha.0

package/es/interactions/toggle-state-mixin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/toggle-state-mixin.ts"],"names":[],"mappings":"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","file":"toggle-state-mixin.js","sourcesContent":["import type { IElement, IGlyphElement, IMark, IToggleStateMixin } from '../types';\n\nexport class ToggleStateMixin implements IToggleStateMixin {\n  protected _statedElements?: (IElement | IGlyphElement)[];\n  protected _marks?: IMark[];\n  protected _stateMarks: Record<string, IMark[]>;\n\n  updateStates(\n    newStatedElements: (IElement | IGlyphElement)[],\n    prevStatedElements?: (IElement | IGlyphElement)[],\n    state?: string,\n    reverseState?: string\n  ) {\n    if (!newStatedElements || !newStatedElements.length) {\n      return null;\n    }\n    if (state && reverseState) {\n      if (prevStatedElements && prevStatedElements.length) {\n        // toggle\n        this.toggleReverseStateOfElements(newStatedElements, prevStatedElements, reverseState);\n        this.toggleStateOfElements(newStatedElements, prevStatedElements, state);\n      } else {\n        // update all the elements\n        this.addBothStateOfElements(newStatedElements, state, reverseState);\n      }\n    } else if (state) {\n      if (prevStatedElements && prevStatedElements.length) {\n        this.toggleStateOfElements(newStatedElements, prevStatedElements, state);\n      } else {\n        this.addStateOfElements(newStatedElements, state);\n      }\n    }\n\n    return newStatedElements;\n  }\n\n  protected toggleReverseStateOfElements(\n    newStatedElements: (IElement | IGlyphElement)[],\n    prevStatedElements: (IElement | IGlyphElement)[],\n    reverseState: string\n  ) {\n    prevStatedElements.forEach(element => {\n      const hasReverse =\n        reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(element.mark);\n\n      if (hasReverse) {\n        element.addState(reverseState);\n      }\n    });\n\n    newStatedElements.forEach(element => {\n      const hasReverse =\n        reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(element.mark);\n\n      if (hasReverse) {\n        element.removeState(reverseState);\n      }\n    });\n  }\n\n  protected toggleStateOfElements(\n    newStatedElements: (IElement | IGlyphElement)[],\n    prevStatedElements: (IElement | IGlyphElement)[],\n    state: string\n  ) {\n    prevStatedElements.forEach(element => {\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(element.mark);\n\n      if (hasState) {\n        element.removeState(state);\n      }\n    });\n\n    newStatedElements.forEach(element => {\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(element.mark);\n\n      if (hasState) {\n        element.addState(state);\n      }\n    });\n  }\n\n  protected addBothStateOfElements(statedElements: (IElement | IGlyphElement)[], state: string, reverseState: string) {\n    this._marks.forEach(mark => {\n      const hasReverse =\n        reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(mark);\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(mark);\n\n      if (!hasReverse && !hasState) {\n        return;\n      }\n\n      mark.elements.forEach(el => {\n        const isStated = statedElements && statedElements.includes(el);\n\n        if (isStated) {\n          if (hasState) {\n            el.addState(state);\n          }\n        } else {\n          if (hasReverse) {\n            el.addState(reverseState);\n          }\n        }\n      });\n    });\n  }\n\n  protected addStateOfElements(statedElements: (IElement | IGlyphElement)[], state: string) {\n    this._marks.forEach(mark => {\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(mark);\n\n      if (!hasState) {\n        return;\n      }\n\n      mark.elements.forEach(el => {\n        const isStated = statedElements && statedElements.includes(el);\n\n        if (isStated) {\n          if (hasState) {\n            el.addState(state);\n          }\n        }\n      });\n    });\n  }\n\n  clearAllStates(state?: string, reverseState?: string) {\n    if (!this._statedElements || !this._statedElements.length) {\n      return;\n    }\n\n    this._marks.forEach(mark => {\n      if (reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(mark)) {\n        mark.elements.forEach(el => {\n          el.removeState(reverseState);\n        });\n      }\n\n      if (state && this._stateMarks[state] && this._stateMarks[state].includes(mark)) {\n        mark.elements.forEach(el => {\n          if (this._statedElements.includes(el)) {\n            el.removeState(state);\n          }\n        });\n      }\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/interactions/toggle-state-mixin.ts"],"names":[],"mappings":"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","file":"toggle-state-mixin.js","sourcesContent":["import type { IElement, IGlyphElement, IMark, IToggleStateMixin } from '../types';\n\nexport class ToggleStateMixin implements IToggleStateMixin {\n  protected _statedElements?: (IElement | IGlyphElement)[];\n  protected _marks?: IMark[];\n  protected _stateMarks: Record<string, IMark[]>;\n\n  updateStates(\n    newStatedElements: (IElement | IGlyphElement)[],\n    prevStatedElements?: (IElement | IGlyphElement)[],\n    state?: string,\n    reverseState?: string\n  ) {\n    if (!newStatedElements || !newStatedElements.length) {\n      return null;\n    }\n    if (state && reverseState) {\n      if (prevStatedElements && prevStatedElements.length) {\n        // toggle\n        this.toggleReverseStateOfElements(newStatedElements, prevStatedElements, reverseState);\n        this.toggleStateOfElements(newStatedElements, prevStatedElements, state);\n      } else {\n        // update all the elements\n        this.addBothStateOfElements(newStatedElements, state, reverseState);\n      }\n    } else if (state) {\n      if (prevStatedElements && prevStatedElements.length) {\n        this.toggleStateOfElements(newStatedElements, prevStatedElements, state);\n      } else {\n        this.addStateOfElements(newStatedElements, state);\n      }\n    }\n\n    return newStatedElements;\n  }\n\n  protected toggleReverseStateOfElements(\n    newStatedElements: (IElement | IGlyphElement)[],\n    prevStatedElements: (IElement | IGlyphElement)[],\n    reverseState: string\n  ) {\n    prevStatedElements.forEach(element => {\n      const hasReverse =\n        reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(element.mark);\n\n      if (hasReverse) {\n        element.addState(reverseState);\n      }\n    });\n\n    newStatedElements.forEach(element => {\n      const hasReverse =\n        reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(element.mark);\n\n      if (hasReverse) {\n        element.removeState(reverseState);\n      }\n    });\n  }\n\n  protected toggleStateOfElements(\n    newStatedElements: (IElement | IGlyphElement)[],\n    prevStatedElements: (IElement | IGlyphElement)[],\n    state: string\n  ) {\n    prevStatedElements.forEach(element => {\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(element.mark);\n\n      if (hasState) {\n        element.removeState(state);\n      }\n    });\n\n    newStatedElements.forEach(element => {\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(element.mark);\n\n      if (hasState) {\n        element.addState(state);\n      }\n    });\n  }\n\n  protected addBothStateOfElements(statedElements: (IElement | IGlyphElement)[], state: string, reverseState: string) {\n    this._marks.forEach(mark => {\n      const hasReverse =\n        reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(mark);\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(mark);\n\n      if (!hasReverse && !hasState) {\n        return;\n      }\n\n      mark.elements?.forEach(el => {\n        const isStated = statedElements && statedElements.includes(el);\n\n        if (isStated) {\n          if (hasState) {\n            el.addState(state);\n          }\n        } else {\n          if (hasReverse) {\n            el.addState(reverseState);\n          }\n        }\n      });\n    });\n  }\n\n  protected addStateOfElements(statedElements: (IElement | IGlyphElement)[], state: string) {\n    this._marks.forEach(mark => {\n      const hasState = state && this._stateMarks[state] && this._stateMarks[state].includes(mark);\n\n      if (!hasState) {\n        return;\n      }\n\n      mark.elements?.forEach(el => {\n        const isStated = statedElements && statedElements.includes(el);\n\n        if (isStated) {\n          if (hasState) {\n            el.addState(state);\n          }\n        }\n      });\n    });\n  }\n\n  clearAllStates(state?: string, reverseState?: string) {\n    if (!this._statedElements || !this._statedElements.length) {\n      return;\n    }\n\n    this._marks.forEach(mark => {\n      if (mark && mark.elements) {\n        if (reverseState && this._stateMarks[reverseState] && this._stateMarks[reverseState].includes(mark)) {\n          mark.elements.forEach(el => {\n            el.removeState(reverseState);\n          });\n        }\n\n        if (state && this._stateMarks[state] && this._stateMarks[state].includes(mark)) {\n          mark.elements.forEach(el => {\n            if (this._statedElements.includes(el)) {\n              el.removeState(state);\n            }\n          });\n        }\n      }\n    });\n  }\n}\n"]}

package/es/interactions/tooltip.js

@@ -56,4 +56,4 @@ Tooltip.type = "tooltip", Tooltip.defaultOptions = {
     trigger: "pointermove",
     triggerOff: "pointerleave"
 };
-//# sourceMappingURL=tooltip.js.map
+//# sourceMappingURL=tooltip.js.map

package/es/parse/coordinate.js

@@ -62,4 +62,4 @@ export function configureCoordinate(spec, coordinate, parameters) {
     }
     coordinate.applyTransforms(transforms);
 }
-//# sourceMappingURL=coordinate.js.map
+//# sourceMappingURL=coordinate.js.map

package/es/parse/event.d.ts

@@ -5,6 +5,4 @@ export declare const parseHandler: (callback: EventCallback, config: {
     debounce?: number;
     throttle?: number;
 }) => (...args: any[]) => any;
-export declare const NAME_PREFIX = "@";
-export declare const ID_PREFIX = "#";
 export declare const parseEventSelector: (selector: string, source?: EventSourceType) => Partial<ParsedViewEventSpec | ParsedWindowEventSpec>;

package/es/parse/event.js

@@ -2,26 +2,22 @@ import { debounce, isNil, throttle } from "@visactor/vutils";
 
 import { isMarkType } from "../graph/util/graphic";
 
-import { EVENT_SOURCE_VIEW, EVENT_SOURCE_WINDOW } from "../view/constants";
+import { EVENT_SOURCE_VIEW, EVENT_SOURCE_WINDOW, ID_PREFIX, NAME_PREFIX } from "../view/constants";
 
-export const generateFilterByMark = evtSpec => isNil(evtSpec.markId) ? el => el && el.mark.id() === evtSpec.markId : isNil(evtSpec.markName) ? el => el && el.mark.name() === evtSpec.markName : isNil(evtSpec.type) ? el => el && el.mark.markType === evtSpec.type : () => !0;
+export const generateFilterByMark = evtSpec => isNil(evtSpec.markId) ? isNil(evtSpec.markName) ? isNil(evtSpec.markType) ? () => !0 : el => el && el.mark.markType === evtSpec.markType : el => el && el.mark.name() === evtSpec.markName : el => el && el.mark.id() === evtSpec.markId;
 
 export const parseHandler = (callback, config) => config && config.debounce ? debounce(callback, config.debounce) : config && config.throttle ? throttle(callback, config.throttle) : callback;
 
 const JOIN_SYMBOL = ":";
 
-export const NAME_PREFIX = "@";
-
-export const ID_PREFIX = "#";
-
 export const parseEventSelector = (selector, source = EVENT_SOURCE_VIEW) => {
     const spec = {}, splitArr = selector.split(":");
     if (2 === splitArr.length) {
         const [space, eventType] = splitArr;
-        "#" === space[0] ? (spec.markId = space.slice(1), spec.source = source) : "@" === space[0] ? (spec.markName = space.slice(1), 
+        space[0] === ID_PREFIX ? (spec.markId = space.slice(1), spec.source = source) : space[0] === NAME_PREFIX ? (spec.markName = space.slice(1), 
         spec.source = source) : isMarkType(space) ? (spec.markType = space, spec.source = source) : spec.source = space === EVENT_SOURCE_WINDOW ? EVENT_SOURCE_WINDOW : source, 
         spec.type = eventType;
     } else 1 === splitArr.length && (spec.type = selector, spec.source = source);
     return spec;
 };
-//# sourceMappingURL=event.js.map
+//# sourceMappingURL=event.js.map

package/es/parse/event.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/parse/event.ts"],"names":[],"mappings":"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","file":"event.js","sourcesContent":["import { debounce, isNil, throttle } from '@visactor/vutils';\nimport type {\n  EventSourceType,\n  ParsedViewEventSpec,\n  ParsedWindowEventSpec,\n  EventCallback,\n  MarkType,\n  IElement\n} from '../types';\nimport { isMarkType } from '../graph/util/graphic';\nimport { EVENT_SOURCE_VIEW, EVENT_SOURCE_WINDOW } from '../view/constants';\n\nexport const generateFilterByMark = (evtSpec: Partial<ParsedViewEventSpec | ParsedWindowEventSpec>) => {\n  if (isNil(evtSpec.markId)) {\n    return (el: IElement) => {\n      return el && el.mark.id() === evtSpec.markId;\n    };\n  }\n\n  if (isNil(evtSpec.markName)) {\n    return (el: IElement) => {\n      return el && el.mark.name() === evtSpec.markName;\n    };\n  }\n\n  if (isNil(evtSpec.type)) {\n    return (el: IElement) => {\n      return el && el.mark.markType === evtSpec.type;\n    };\n  }\n\n  return () => true;\n};\n\nexport const parseHandler = (callback: EventCallback, config: { debounce?: number; throttle?: number }) => {\n  if (config && config.debounce) {\n    return debounce(callback, config.debounce);\n  }\n\n  if (config && config.throttle) {\n    return throttle(callback, config.throttle);\n  }\n\n  return callback;\n};\n\nconst JOIN_SYMBOL = ':';\nexport const NAME_PREFIX = '@';\nexport const ID_PREFIX = '#';\n\n/**\n * Parse an event selector string.\n * Supported rules:\n * 1. mousedown\n * 2. rect:mousedown\n * 3. window:mousemove\n * 4. @foo:mousedown\n * Returns an event stream definitions.\n */\nexport const parseEventSelector = (\n  selector: string,\n  source: EventSourceType = EVENT_SOURCE_VIEW\n): Partial<ParsedViewEventSpec | ParsedWindowEventSpec> => {\n  const spec: Partial<ParsedViewEventSpec | ParsedWindowEventSpec> = {};\n\n  const splitArr = selector.split(JOIN_SYMBOL);\n\n  if (splitArr.length === 2) {\n    const [space, eventType] = splitArr;\n\n    if (space[0] === ID_PREFIX) {\n      // events on marks id\n      spec.markId = space.slice(1);\n      spec.source = source;\n    } else if (space[0] === NAME_PREFIX) {\n      // events on marks name\n      spec.markName = space.slice(1);\n      spec.source = source;\n    } else if (isMarkType(space)) {\n      spec.markType = space as MarkType;\n      spec.source = source;\n    } else if (space === EVENT_SOURCE_WINDOW) {\n      spec.source = EVENT_SOURCE_WINDOW;\n    } else {\n      spec.source = source;\n    }\n\n    spec.type = eventType;\n  } else if (splitArr.length === 1) {\n    spec.type = selector;\n    spec.source = source;\n  }\n\n  return spec;\n};\n"]}
+{"version":3,"sources":["../src/parse/event.ts"],"names":[],"mappings":"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","file":"event.js","sourcesContent":["import { debounce, isNil, throttle } from '@visactor/vutils';\nimport type {\n  EventSourceType,\n  ParsedViewEventSpec,\n  ParsedWindowEventSpec,\n  EventCallback,\n  MarkType,\n  IElement\n} from '../types';\nimport { isMarkType } from '../graph/util/graphic';\nimport { EVENT_SOURCE_VIEW, EVENT_SOURCE_WINDOW, ID_PREFIX, NAME_PREFIX } from '../view/constants';\n\nexport const generateFilterByMark = (evtSpec: Partial<ParsedViewEventSpec | ParsedWindowEventSpec>) => {\n  if (!isNil(evtSpec.markId)) {\n    return (el: IElement) => {\n      return el && el.mark.id() === evtSpec.markId;\n    };\n  }\n\n  if (!isNil(evtSpec.markName)) {\n    return (el: IElement) => {\n      return el && el.mark.name() === evtSpec.markName;\n    };\n  }\n\n  if (!isNil(evtSpec.markType)) {\n    return (el: IElement) => {\n      return el && el.mark.markType === evtSpec.markType;\n    };\n  }\n\n  return () => true;\n};\n\nexport const parseHandler = (callback: EventCallback, config: { debounce?: number; throttle?: number }) => {\n  if (config && config.debounce) {\n    return debounce(callback, config.debounce);\n  }\n\n  if (config && config.throttle) {\n    return throttle(callback, config.throttle);\n  }\n\n  return callback;\n};\n\nconst JOIN_SYMBOL = ':';\n\n/**\n * Parse an event selector string.\n * Supported rules:\n * 1. mousedown\n * 2. rect:mousedown\n * 3. window:mousemove\n * 4. @foo:mousedown\n * Returns an event stream definitions.\n */\nexport const parseEventSelector = (\n  selector: string,\n  source: EventSourceType = EVENT_SOURCE_VIEW\n): Partial<ParsedViewEventSpec | ParsedWindowEventSpec> => {\n  const spec: Partial<ParsedViewEventSpec | ParsedWindowEventSpec> = {};\n\n  const splitArr = selector.split(JOIN_SYMBOL);\n\n  if (splitArr.length === 2) {\n    const [space, eventType] = splitArr;\n\n    if (space[0] === ID_PREFIX) {\n      // events on marks id\n      spec.markId = space.slice(1);\n      spec.source = source;\n    } else if (space[0] === NAME_PREFIX) {\n      // events on marks name\n      spec.markName = space.slice(1);\n      spec.source = source;\n    } else if (isMarkType(space)) {\n      spec.markType = space as MarkType;\n      spec.source = source;\n    } else if (space === EVENT_SOURCE_WINDOW) {\n      spec.source = EVENT_SOURCE_WINDOW;\n    } else {\n      spec.source = source;\n    }\n\n    spec.type = eventType;\n  } else if (splitArr.length === 1) {\n    spec.type = selector;\n    spec.source = source;\n  }\n\n  return spec;\n};\n"]}

package/es/parse/mark.js

@@ -16,4 +16,4 @@ export function parseEncodeType(encoder, view) {
     return encoder.scale && (dependencies = isGrammar(encoder.scale) ? [ encoder.scale ] : array(view.getScaleById(encoder.scale))), 
     dependencies.concat(parseFunctionType(encoder, view));
 }
-//# sourceMappingURL=mark.js.map
+//# sourceMappingURL=mark.js.map

package/es/parse/option.js

@@ -7,5 +7,4 @@ export const parseOptionValue = (value, params) => isGrammar(value) ? value.outp
 export const parseOptions = (options, params) => options ? isObject(options) ? Object.keys(options).reduce(((res, key) => {
     const option = options[key];
     return res[key] = parseOptionValue(option, params), res;
-}), {}) : options.map((option => parseOptionValue(option, params))) : options;
-//# sourceMappingURL=option.js.map
+}), {}) : options.map((option => parseOptionValue(option, params))) : options;

package/es/parse/scale.js

@@ -344,4 +344,4 @@ export function configureScale(spec, scale, parameters) {
         scale.rescale();
     }
 }
-//# sourceMappingURL=scale.js.map
+//# sourceMappingURL=scale.js.map

package/es/parse/transform.js

@@ -99,4 +99,4 @@ export const parseTransformSpec = (spec, view) => {
     }
     return null;
 };
-//# sourceMappingURL=transform.js.map
+//# sourceMappingURL=transform.js.map

package/es/parse/util.js

@@ -62,4 +62,4 @@ export const isGrammar = el => el && !isNil(el.grammarType);
 export const parseField = field => isFunction(field) ? field : datum => datum[field];
 
 export const parseColor = color => isString(color) && Color.parseColorString(color) ? color : null;
-//# sourceMappingURL=util.js.map
+//# sourceMappingURL=util.js.map

package/es/parse/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/parse/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isString, isFunction, isNil, array, Color } from '@visactor/vutils';\nimport type { IElement } from '../types/element';\nimport type {\n  FunctionCallback,\n  SignalDependency,\n  SignalReference,\n  IView,\n  GenericFunctionType,\n  SignalFunction,\n  ParameterFunctionType,\n  ParameterCallback,\n  Nil\n} from '../types';\nimport type { IGrammarBase } from '../types/grammar';\n\nexport function parseReference(dependency: SignalDependency | SignalDependency[], view: IView): IGrammarBase[] {\n  const dependencies: SignalDependency[] = array(dependency);\n  return dependencies.reduce((refs: IGrammarBase[], dep: string | IGrammarBase) => {\n    const ref = (isString(dep) ? view.getGrammarById(dep as string) : dep) as IGrammarBase;\n\n    if (ref) {\n      refs.push(ref);\n    }\n    return refs;\n  }, []);\n}\n\nfunction isSignalReferenceType(signal: any): signal is SignalReference {\n  return !isFunction(signal) && !!(signal as SignalReference)?.signal;\n}\n\nfunction isSignalFunctionType<Callback extends FunctionCallback<T>, T>(\n  signal: any\n): signal is SignalFunction<Callback, T> {\n  return !isFunction(signal) && !!(signal as SignalFunction<Callback, T>)?.callback;\n}\n\nexport function parseFunctionType<Callback extends FunctionCallback<T>, T>(\n  spec: GenericFunctionType<Callback, T> | Nil,\n  view: IView\n): IGrammarBase[] {\n  if (isNil(spec)) {\n    return [];\n  }\n  if (isSignalReferenceType(spec)) {\n    const signal = spec.signal;\n    if (isString(signal)) {\n      return array<IGrammarBase>(view.getGrammarById(signal as string) as IGrammarBase);\n    } else if ((signal as IGrammarBase)?.grammarType === 'signal') {\n      return [signal as IGrammarBase];\n    }\n  } else if (isSignalFunctionType(spec)) {\n    return parseReference((spec as SignalFunction<Callback, T>).dependency, view);\n  }\n  return [];\n}\n\nexport function isFunctionType<Callback extends FunctionCallback<T>, T>(\n  spec: any\n): spec is Callback | SignalReference | SignalFunction<Callback, T> {\n  return isFunction(spec) || spec?.signal || !!(spec as SignalFunction<Callback, T>)?.callback;\n}\n\nexport function invokeFunctionType<Callback extends FunctionCallback<T>, T>(\n  spec: GenericFunctionType<Callback, T> | Nil,\n  parameters: any,\n  datumOrGrammarInstance?: any | IGrammarBase,\n  element?: IElement | any\n): T {\n  if (isNil(spec)) {\n    return spec as T;\n  }\n\n  if (isFunction(spec)) {\n    if (element) {\n      return (spec as Callback).call(null, datumOrGrammarInstance, element, parameters);\n    }\n    return (spec as Callback).call(null, datumOrGrammarInstance, parameters);\n  } else if ((spec as SignalReference).signal) {\n    const signal = (spec as SignalReference).signal;\n    if (isString(signal)) {\n      return parameters?.[signal as string];\n    }\n    return (signal as IGrammarBase).output();\n  } else if ((spec as SignalFunction<Callback, T>).callback) {\n    if (element) {\n      return (spec as SignalFunction<Callback, T>).callback.call(null, datumOrGrammarInstance, element, parameters);\n    }\n    return (spec as SignalFunction<Callback, T>).callback.call(null, datumOrGrammarInstance, parameters);\n  }\n  return spec as T;\n}\n\nexport function invokeParameterFunctionType<T>(spec: ParameterFunctionType<T>, parameters: any): T {\n  if (isNil(spec)) {\n    return spec as T;\n  }\n\n  if (isFunction(spec)) {\n    return spec.call(null, parameters);\n  } else if ((spec as SignalReference).signal) {\n    const signal = (spec as SignalReference).signal;\n    if (isString(signal)) {\n      return parameters?.[signal as string];\n    }\n    return (signal as IGrammarBase).output();\n  } else if ((spec as SignalFunction<ParameterCallback<T>, T>).callback) {\n    return (spec as SignalFunction<ParameterCallback<T>, T>).callback.call(null, parameters);\n  }\n  return spec as T;\n}\n\nexport function getGrammarOutput(grammar: IGrammarBase | string, parameters: any) {\n  return isGrammar(grammar) ? grammar.output() : parameters[grammar];\n}\n\n/**\n * 判断是否是依赖signal\n */\nexport function isSignal(obj: any) {\n  return obj && (obj.signal || obj.callback);\n}\n\nexport const isGrammar = (el: any): el is IGrammarBase => {\n  return el && !isNil(el.grammarType);\n};\n\nexport const parseField = <T>(field: ((datum: T) => symbol | string) | string | symbol) => {\n  if (isFunction(field)) {\n    return field;\n  }\n  return (datum: T) => datum[field];\n};\n\nexport const parseColor = (color: any): string | null => {\n  if (isString(color) && Color.parseColorString(color)) {\n    return color;\n  }\n  return null;\n};\n"]}
+{"version":3,"sources":["../src/parse/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import { isString, isFunction, isNil, array, Color } from '@visactor/vutils';\nimport type { IElement } from '../types/element';\nimport type {\n  FunctionCallback,\n  SignalDependency,\n  SignalReference,\n  IView,\n  GenericFunctionType,\n  SignalFunction,\n  ParameterFunctionType,\n  ParameterCallback,\n  Nil\n} from '../types';\nimport type { IGrammarBase } from '../types/grammar';\n\nexport function parseReference(dependency: SignalDependency | SignalDependency[], view: IView): IGrammarBase[] {\n  const dependencies: SignalDependency[] = array(dependency);\n  return dependencies.reduce((refs: IGrammarBase[], dep: string | IGrammarBase) => {\n    const ref = (isString(dep) ? view.getGrammarById(dep as string) : dep) as IGrammarBase;\n\n    if (ref) {\n      refs.push(ref);\n    }\n    return refs;\n  }, []);\n}\n\nfunction isSignalReferenceType(signal: any): signal is SignalReference {\n  return !isFunction(signal) && !!(signal as SignalReference)?.signal;\n}\n\nfunction isSignalFunctionType<Callback extends FunctionCallback<T>, T>(\n  signal: any\n): signal is SignalFunction<Callback, T> {\n  return !isFunction(signal) && !!(signal as SignalFunction<Callback, T>)?.callback;\n}\n\nexport function parseFunctionType<Callback extends FunctionCallback<T>, T>(\n  spec: GenericFunctionType<Callback, T> | Nil,\n  view: IView\n): IGrammarBase[] {\n  if (isNil(spec)) {\n    return [];\n  }\n  if (isSignalReferenceType(spec)) {\n    const signal = spec.signal;\n    if (isString(signal)) {\n      return array<IGrammarBase>(view.getGrammarById(signal as string) as IGrammarBase);\n    } else if ((signal as IGrammarBase)?.grammarType === 'signal') {\n      return [signal as IGrammarBase];\n    }\n  } else if (isSignalFunctionType(spec)) {\n    return parseReference((spec as SignalFunction<Callback, T>).dependency, view);\n  }\n  return [];\n}\n\nexport function isFunctionType<Callback extends FunctionCallback<T>, T>(\n  spec: any\n): spec is Callback | SignalReference | SignalFunction<Callback, T> {\n  return isFunction(spec) || spec?.signal || !!(spec as SignalFunction<Callback, T>)?.callback;\n}\n\nexport function invokeFunctionType<Callback extends FunctionCallback<T>, T>(\n  spec: GenericFunctionType<Callback, T> | Nil,\n  parameters: any,\n  datumOrGrammarInstance?: any | IGrammarBase,\n  element?: IElement | any\n): T {\n  if (isNil(spec)) {\n    return spec as T;\n  }\n\n  if (isFunction(spec)) {\n    if (element) {\n      return (spec as Callback).call(null, datumOrGrammarInstance, element, parameters);\n    }\n    return (spec as Callback).call(null, datumOrGrammarInstance, parameters);\n  } else if ((spec as SignalReference).signal) {\n    const signal = (spec as SignalReference).signal;\n    if (isString(signal)) {\n      return parameters?.[signal as string];\n    }\n    return (signal as IGrammarBase).output();\n  } else if ((spec as SignalFunction<Callback, T>).callback) {\n    if (element) {\n      return (spec as SignalFunction<Callback, T>).callback.call(null, datumOrGrammarInstance, element, parameters);\n    }\n    return (spec as SignalFunction<Callback, T>).callback.call(null, datumOrGrammarInstance, parameters);\n  }\n  return spec as T;\n}\n\nexport function invokeParameterFunctionType<T>(spec: ParameterFunctionType<T>, parameters: any): T {\n  if (isNil(spec)) {\n    return spec as T;\n  }\n\n  if (isFunction(spec)) {\n    return spec.call(null, parameters);\n  } else if ((spec as SignalReference).signal) {\n    const signal = (spec as SignalReference).signal;\n    if (isString(signal)) {\n      return parameters?.[signal as string];\n    }\n    return (signal as IGrammarBase).output();\n  } else if ((spec as SignalFunction<ParameterCallback<T>, T>).callback) {\n    return (spec as SignalFunction<ParameterCallback<T>, T>).callback.call(null, parameters);\n  }\n  return spec as T;\n}\n\nexport function getGrammarOutput(grammar: IGrammarBase | string, parameters: any) {\n  return isGrammar(grammar) ? grammar.output() : parameters[grammar];\n}\n\n/**\n * 判断是否是依赖signal\n */\nexport function isSignal(obj: any) {\n  return obj && (obj.signal || obj.callback);\n}\n\nexport const isGrammar = (el: any): el is IGrammarBase => {\n  return el && !isNil(el.grammarType);\n};\n\nexport const parseField = <T>(field: ((datum: T) => symbol | string) | string | symbol) => {\n  if (isFunction(field)) {\n    return field as (datum: T) => symbol | string;\n  }\n  return (datum: T) => datum[field as string | symbol];\n};\n\nexport const parseColor = (color: any): string | null => {\n  if (isString(color) && Color.parseColorString(color)) {\n    return color;\n  }\n  return null;\n};\n"]}

package/es/parse/view.js

@@ -96,4 +96,4 @@ export const normalizeRunningConfig = runningConfig => {
         enableExitAnimation: enableExitAnimation
     };
 };
-//# sourceMappingURL=view.js.map
+//# sourceMappingURL=view.js.map

package/es/semantic-marks/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/semantic-marks/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,MAAM,OAAO,IAAK,SAAQ,IAAI;IAK5B,cAAc,CAAC,SAAc,EAAE,QAAiB;QAC9C,MAAM,aAAa,GAAG,SAAS,IAAI,SAAS,CAAC,UAAU,CAAC;QAExD,MAAM,MAAM,GACV,aAAa;YACb,CAAC,aAAa,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;QAEpG,MAAM,WAAW,GAAG,iBAAiB,CACnC,IAAa,EACb,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EACxD,SAAS,CACV,CAAC;QAEF,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;;AAtBM,aAAQ,GAAG,eAAe,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import { GrammarMarkType } from '../graph/enums';\nimport type { IMark, MarkSpec } from '../types';\nimport { Mark } from '../view/mark';\nimport { createGraphicItem } from '../graph/util/graphic';\nimport { transformsByType } from '../graph/attributes/transform';\n\nexport class Text extends Mark {\n  static markType = GrammarMarkType.text;\n  declare markType: GrammarMarkType.text;\n  protected declare spec: MarkSpec;\n\n  addGraphicItem(initAttrs: any, groupKey?: string) {\n    const originalAttrs = initAttrs && initAttrs.limitAttrs;\n\n    const isRich =\n      originalAttrs &&\n      (originalAttrs.textType === 'rich' || (originalAttrs.text && originalAttrs.text.type === 'rich'));\n\n    const graphicItem = createGraphicItem(\n      this as IMark,\n      isRich ? GrammarMarkType.richtext : GrammarMarkType.text,\n      initAttrs\n    );\n\n    return super.addGraphicItem(initAttrs, groupKey, graphicItem);\n  }\n\n  release(): void {\n    super.release();\n  }\n}\n"]}
+{"version":3,"sources":["../src/semantic-marks/text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,MAAM,OAAO,IAAK,SAAQ,IAAI;IAK5B,cAAc,CAAC,SAAc,EAAE,QAAiB;QAC9C,MAAM,aAAa,GAAG,SAAS,IAAI,SAAS,CAAC,UAAU,CAAC;QAExD,MAAM,MAAM,GACV,aAAa;YACb,CAAC,aAAa,CAAC,QAAQ,KAAK,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC;QAEpG,MAAM,WAAW,GAAG,iBAAiB,CACnC,IAAa,EACb,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EACxD,SAAS,CACV,CAAC;QAEF,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;;AAtBM,aAAQ,GAAG,eAAe,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import { GrammarMarkType } from '../graph/enums';\nimport type { IMark, MarkSpec } from '../types';\nimport { Mark } from '../view/mark';\nimport { createGraphicItem } from '../graph/util/graphic';\n\nexport class Text extends Mark {\n  static markType = GrammarMarkType.text;\n  declare markType: GrammarMarkType.text;\n  protected declare spec: MarkSpec;\n\n  addGraphicItem(initAttrs: any, groupKey?: string) {\n    const originalAttrs = initAttrs && initAttrs.limitAttrs;\n\n    const isRich =\n      originalAttrs &&\n      (originalAttrs.textType === 'rich' || (originalAttrs.text && originalAttrs.text.type === 'rich'));\n\n    const graphicItem = createGraphicItem(\n      this as IMark,\n      isRich ? GrammarMarkType.richtext : GrammarMarkType.text,\n      initAttrs\n    );\n\n    return super.addGraphicItem(initAttrs, groupKey, graphicItem);\n  }\n\n  release(): void {\n    super.release();\n  }\n}\n"]}

package/es/transforms/data/pie.js

@@ -1,4 +1,4 @@
-import { computeQuadrant } from "../util/util";
+import { computeQuadrant } from "@visactor/vutils";
 
 export const transform = (options, upstreamData) => {
     var _a, _b;

package/es/transforms/data/pie.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/transforms/data/pie.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAA2B,EAAE,YAAmB,EAAE,EAAE;;IAC5E,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,OAAO,YAAY,CAAC;KACrB;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;IAEjD,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAEhG,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;IACpF,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAE/F,MAAM,aAAa,GAAG,QAAQ,GAAG,UAAU,CAAC;IAC5C,IAAI,SAAS,GAAG,UAAU,CAAC;IAC3B,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC;QACtD,MAAM,MAAM,GAAG,KAAK,GAAG,aAAa,CAAC;QAErC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;QACpC,YAAY,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,CAAC;QAClD,UAAU,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC;QACvD,aAAa,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,SAAS,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC;QACjE,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAC;QACvC,UAAU,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,SAAS,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5E,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QAE5D,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IAC7C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC","file":"pie.js","sourcesContent":["import type { PieTransformOption } from '../../types';\nimport { computeQuadrant } from '../util/util';\n\nexport const transform = (options: PieTransformOption, upstreamData: any[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return upstreamData;\n  }\n  const field = options.field;\n  const startAngle = options.startAngle ?? 0;\n  const endAngle = options.endAngle ?? Math.PI * 2;\n\n  const { asStartAngle, asEndAngle, asMiddleAngle, asRadian, asRatio, asQuadrant, asK } = options;\n\n  const total = upstreamData.reduce((sum, d) => Number.parseFloat(d[field]) + sum, 0);\n  const max = upstreamData.reduce((m, d) => Math.max(m, Number.parseFloat(d[field])), -Infinity);\n\n  const intervalAngle = endAngle - startAngle;\n  let lastAngle = startAngle;\n  const data = upstreamData.map(originDatum => {\n    const datum = Object.assign({}, originDatum);\n    const ratio = Number.parseFloat(datum[field]) / total;\n    const radian = ratio * intervalAngle;\n\n    asRatio && (datum[asRatio] = ratio);\n    asStartAngle && (datum[asStartAngle] = lastAngle);\n    asEndAngle && (datum[asEndAngle] = lastAngle + radian);\n    asMiddleAngle && (datum[asMiddleAngle] = lastAngle + radian / 2);\n    asRadian && (datum[asRadian] = radian);\n    asQuadrant && (datum[asQuadrant] = computeQuadrant(lastAngle + radian / 2));\n    asK && (datum[asK] = Number.parseFloat(datum[field]) / max);\n\n    lastAngle = datum[asEndAngle];\n    return datum;\n  });\n  data[data.length - 1][asEndAngle] = endAngle;\n  return data;\n};\n"]}
+{"version":3,"sources":["../src/transforms/data/pie.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAA2B,EAAE,YAAmB,EAAE,EAAE;;IAC5E,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9C,OAAO,YAAY,CAAC;KACrB;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,UAAU,mCAAI,CAAC,CAAC;IAC3C,MAAM,QAAQ,GAAG,MAAA,OAAO,CAAC,QAAQ,mCAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;IAEjD,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;IAEhG,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;IACpF,MAAM,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAE/F,MAAM,aAAa,GAAG,QAAQ,GAAG,UAAU,CAAC;IAC5C,IAAI,SAAS,GAAG,UAAU,CAAC;IAC3B,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC;QACtD,MAAM,MAAM,GAAG,KAAK,GAAG,aAAa,CAAC;QAErC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC;QACpC,YAAY,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,CAAC;QAClD,UAAU,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,MAAM,CAAC,CAAC;QACvD,aAAa,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,SAAS,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC;QACjE,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAC;QACvC,UAAU,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,eAAe,CAAC,SAAS,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5E,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;QAE5D,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IAC7C,OAAO,IAAI,CAAC;AACd,CAAC,CAAC","file":"pie.js","sourcesContent":["import { computeQuadrant } from '@visactor/vutils';\nimport type { PieTransformOption } from '../../types';\n\nexport const transform = (options: PieTransformOption, upstreamData: any[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return upstreamData;\n  }\n  const field = options.field;\n  const startAngle = options.startAngle ?? 0;\n  const endAngle = options.endAngle ?? Math.PI * 2;\n\n  const { asStartAngle, asEndAngle, asMiddleAngle, asRadian, asRatio, asQuadrant, asK } = options;\n\n  const total = upstreamData.reduce((sum, d) => Number.parseFloat(d[field]) + sum, 0);\n  const max = upstreamData.reduce((m, d) => Math.max(m, Number.parseFloat(d[field])), -Infinity);\n\n  const intervalAngle = endAngle - startAngle;\n  let lastAngle = startAngle;\n  const data = upstreamData.map(originDatum => {\n    const datum = Object.assign({}, originDatum);\n    const ratio = Number.parseFloat(datum[field]) / total;\n    const radian = ratio * intervalAngle;\n\n    asRatio && (datum[asRatio] = ratio);\n    asStartAngle && (datum[asStartAngle] = lastAngle);\n    asEndAngle && (datum[asEndAngle] = lastAngle + radian);\n    asMiddleAngle && (datum[asMiddleAngle] = lastAngle + radian / 2);\n    asRadian && (datum[asRadian] = radian);\n    asQuadrant && (datum[asQuadrant] = computeQuadrant(lastAngle + radian / 2));\n    asK && (datum[asK] = Number.parseFloat(datum[field]) / max);\n\n    lastAngle = datum[asEndAngle];\n    return datum;\n  });\n  data[data.length - 1][asEndAngle] = endAngle;\n  return data;\n};\n"]}

package/es/transforms/mark/mark-overlap.js

@@ -1,11 +1,11 @@
 import { isNil } from "@visactor/vutils";
 
-const HIDE_KEY = "_mo_hide_";
+import { MARK_OVERLAP_HIDE_KEY } from "../../graph/constants";
 
 function reset(elements) {
     return elements.forEach((element => {
-        element.getGraphicAttribute(HIDE_KEY) && (element.setGraphicAttribute("visible", !0), 
-        element.setGraphicAttribute(HIDE_KEY, !1));
+        element.getGraphicAttribute(MARK_OVERLAP_HIDE_KEY) && (element.setGraphicAttribute("visible", !0), 
+        element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !1));
     })), elements;
 }
 
@@ -17,7 +17,7 @@ function overlapX(elements, delta, deltaMul, useRadius) {
         elements.forEach((element => {
             if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentX = element.getGraphicAttribute("x");
-            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentX - lastX) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !0), 
             element.setGraphicAttribute("visible", !1)) : lastX = currentX, lastR = r;
         }));
     }
@@ -31,7 +31,7 @@ function overlapY(elements, delta, deltaMul, useRadius) {
         elements.forEach((element => {
             if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentY = element.getGraphicAttribute("y");
-            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            useDeltaMul && (itemDelta = (r + lastR) * deltaMul), Math.abs(currentY - lastY) < itemDelta + lastR + r ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !0), 
             element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         }));
     }
@@ -47,7 +47,7 @@ function overlapXY(elements, delta, deltaMul, useRadius) {
             if (!1 === element.getGraphicAttribute("visible")) return;
             const r = element.getGraphicAttribute("size") / 2, currentX = element.getGraphicAttribute("x"), currentY = element.getGraphicAttribute("y");
             useDeltaMul && (itemDelta = (r + lastR) * deltaMul), dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2, 
-            dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(HIDE_KEY, !0), 
+            dis < (itemDelta + lastR + r) ** 2 ? element.getGraphicAttribute("forceShow") || (element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, !0), 
             element.setGraphicAttribute("visible", !1)) : lastY = currentY, lastR = r;
         }));
     }

package/es/transforms/mark/mark-overlap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/transforms/mark/mark-overlap.ts"],"names":[],"mappings":"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","file":"mark-overlap.js","sourcesContent":["import { isNil } from '@visactor/vutils';\nimport type { IElement, MarkOverlapTransformOptions } from '../../types';\n\nconst HIDE_KEY = '_mo_hide_';\n\nfunction reset(elements: IElement[]) {\n  elements.forEach(element => {\n    const hide = element.getGraphicAttribute(HIDE_KEY);\n\n    if (hide) {\n      element.setGraphicAttribute('visible', true);\n      element.setGraphicAttribute(HIDE_KEY, false);\n    }\n  });\n  return elements;\n}\n\nfunction overlapX(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastX = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentX - lastX) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastX = currentX;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastY = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentY = element.getGraphicAttribute('y');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentY - lastY) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapXY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    const lastX = -Infinity;\n    let lastY = -Infinity;\n    let lastR = 0;\n    let dis = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      const currentY = element.getGraphicAttribute('y');\n\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2;\n      if (dis < (itemDelta + lastR + r) ** 2) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\n/**\n * 针对mark的防重叠\n * @param {object} options - The parameters for this operator.\n * @param {data} [options.followMark]\n * @constructor\n */\nexport const transform = (options: MarkOverlapTransformOptions, upstreamData: IElement[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return;\n  }\n  let { radius } = options;\n  if (isNil(radius)) {\n    if (upstreamData[0].mark.markType === 'symbol') {\n      radius = true;\n    }\n  }\n\n  const { direction, delta, deltaMul = 1, groupBy } = options;\n\n  const handleOverlap = (elements: IElement[]) => {\n    reset(elements);\n\n    const sortedElements = options.sort\n      ? elements.slice().sort((a, b) => {\n          return a.getGraphicAttribute('x') - b.getGraphicAttribute('x');\n        })\n      : elements;\n\n    if (direction === 0) {\n      overlapXY(sortedElements, delta, deltaMul, radius);\n    } else if (direction === 1) {\n      overlapX(sortedElements, delta, deltaMul, radius);\n    } else {\n      overlapY(sortedElements, delta, deltaMul, radius);\n    }\n  };\n\n  if (!groupBy) {\n    handleOverlap(upstreamData);\n  } else {\n    // 分组\n    const map = upstreamData.reduce((res: { [key: string]: IElement[] }, element: IElement) => {\n      const groupName = element.getDatum()[groupBy];\n\n      if (res[groupName]) {\n        res[groupName].push(element);\n      } else {\n        res[groupName] = [element];\n      }\n\n      return res;\n    }, {});\n\n    Object.keys(map).forEach(key => {\n      handleOverlap(map[key]);\n    });\n  }\n\n  return upstreamData;\n};\n"]}
+{"version":3,"sources":["../src/transforms/mark/mark-overlap.ts"],"names":[],"mappings":"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","file":"mark-overlap.js","sourcesContent":["import { isNil } from '@visactor/vutils';\nimport type { IElement, MarkOverlapTransformOptions } from '../../types';\nimport { MARK_OVERLAP_HIDE_KEY } from '../../graph/constants';\n\nfunction reset(elements: IElement[]) {\n  elements.forEach(element => {\n    const hide = element.getGraphicAttribute(MARK_OVERLAP_HIDE_KEY);\n\n    if (hide) {\n      element.setGraphicAttribute('visible', true);\n      element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, false);\n    }\n  });\n  return elements;\n}\n\nfunction overlapX(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastX = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentX - lastX) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastX = currentX;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    let lastY = -Infinity;\n    let lastR = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentY = element.getGraphicAttribute('y');\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      if (Math.abs(currentY - lastY) < itemDelta + lastR + r) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\nfunction overlapXY(elements: IElement[], delta: number, deltaMul: number, useRadius: boolean) {\n  if (useRadius) {\n    const lastX = -Infinity;\n    let lastY = -Infinity;\n    let lastR = 0;\n    let dis = 0;\n    const useDeltaMul = isNil(delta);\n    let itemDelta = delta;\n\n    elements.forEach(element => {\n      if (element.getGraphicAttribute('visible') === false) {\n        // skip hidden points\n        return;\n      }\n\n      const r = element.getGraphicAttribute('size') / 2;\n      const currentX = element.getGraphicAttribute('x');\n      const currentY = element.getGraphicAttribute('y');\n\n      if (useDeltaMul) {\n        itemDelta = (r + lastR) * deltaMul;\n      }\n      dis = (lastX - currentX) ** 2 + (lastY - currentY) ** 2;\n      if (dis < (itemDelta + lastR + r) ** 2) {\n        if (!element.getGraphicAttribute('forceShow')) {\n          element.setGraphicAttribute(MARK_OVERLAP_HIDE_KEY, true);\n          element.setGraphicAttribute('visible', false);\n        }\n      } else {\n        lastY = currentY;\n      }\n\n      lastR = r;\n    });\n  }\n}\n\n/**\n * 针对mark的防重叠\n * @param {object} options - The parameters for this operator.\n * @param {data} [options.followMark]\n * @constructor\n */\nexport const transform = (options: MarkOverlapTransformOptions, upstreamData: IElement[]) => {\n  if (!upstreamData || upstreamData.length === 0) {\n    return;\n  }\n  let { radius } = options;\n  if (isNil(radius)) {\n    if (upstreamData[0].mark.markType === 'symbol') {\n      radius = true;\n    }\n  }\n\n  const { direction, delta, deltaMul = 1, groupBy } = options;\n\n  const handleOverlap = (elements: IElement[]) => {\n    reset(elements);\n\n    const sortedElements = options.sort\n      ? elements.slice().sort((a, b) => {\n          return a.getGraphicAttribute('x') - b.getGraphicAttribute('x');\n        })\n      : elements;\n\n    if (direction === 0) {\n      overlapXY(sortedElements, delta, deltaMul, radius);\n    } else if (direction === 1) {\n      overlapX(sortedElements, delta, deltaMul, radius);\n    } else {\n      overlapY(sortedElements, delta, deltaMul, radius);\n    }\n  };\n\n  if (!groupBy) {\n    handleOverlap(upstreamData);\n  } else {\n    // 分组\n    const map = upstreamData.reduce((res: { [key: string]: IElement[] }, element: IElement) => {\n      const groupName = element.getDatum()[groupBy];\n\n      if (res[groupName]) {\n        res[groupName].push(element);\n      } else {\n        res[groupName] = [element];\n      }\n\n      return res;\n    }, {});\n\n    Object.keys(map).forEach(key => {\n      handleOverlap(map[key]);\n    });\n  }\n\n  return upstreamData;\n};\n"]}

package/es/transforms/util/util.d.ts

@@ -1,7 +1,5 @@
 import type { FieldGetterFunction } from '@visactor/vgrammar-util';
 export declare function fieldNames(fields: string[] | FieldGetterFunction[], as?: string[]): string[];
 export declare function partition(data?: any[], groupBy?: FieldGetterFunction[], field?: FieldGetterFunction): any[];
-export declare function normalizeAngle(angle: number): number;
-export declare function computeQuadrant(angle: number): 1 | 2 | 3 | 4;
 export declare function sum(arr: any[]): any;
 export declare function average(arr: any[]): number;

package/es/transforms/util/util.js

@@ -21,16 +21,6 @@ export function partition(data, groupBy, field) {
     })), groups;
 }
 
-export function normalizeAngle(angle) {
-    for (;angle < 0; ) angle += 2 * Math.PI;
-    for (;angle >= 2 * Math.PI; ) angle -= 2 * Math.PI;
-    return angle;
-}
-
-export function computeQuadrant(angle) {
-    return (angle = normalizeAngle(angle)) > 0 && angle <= Math.PI / 2 ? 2 : angle > Math.PI / 2 && angle <= Math.PI ? 3 : angle > Math.PI && angle <= 3 * Math.PI / 2 ? 4 : 1;
-}
-
 export function sum(arr) {
     return arr.reduce(((accumulator, currentValue) => accumulator + currentValue), 0);
 }

package/es/transforms/util/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/transforms/util/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["/* Adapted from vega by University of Washington Interactive Data Lab\n * https://vega.github.io/vega/\n * Licensed under the BSD-3-Clause\n\n * url: https://github.com/vega/vega/blob/main/packages/vega-transforms/src/util/util.js\n * License: https://github.com/vega/vega/blob/main/LICENSE\n * @license\n */\n\nimport { isNil, isString } from '@visactor/vutils';\nimport type { FieldGetterFunction } from '@visactor/vgrammar-util';\nimport { accessorName } from '@visactor/vgrammar-util';\n\n// use either provided alias or accessor field name\nexport function fieldNames(fields: string[] | FieldGetterFunction[], as?: string[]) {\n  if (!fields) {\n    return null;\n  }\n  return fields.map((f, i) => {\n    return as[i] ?? (isString(f) ? f : accessorName(f));\n  });\n}\n\nexport function partition(data?: any[], groupBy?: FieldGetterFunction[], field?: FieldGetterFunction) {\n  // partition data points into groups\n  if (isNil(groupBy)) {\n    return [data.map(field)];\n  }\n\n  const groups: any[] = [];\n  const map: Record<string, any> = {};\n  data.forEach((entry: any) => {\n    const groupKey = groupBy.map((groupFunc: (arg: any) => any) => groupFunc(entry)).toString();\n\n    if (!map[groupKey]) {\n      const groupItem: any[] = [];\n      (groupItem as any).dims = groupKey;\n      groups.push(groupItem);\n      map[groupKey] = groupItem;\n    } else {\n      map[groupKey].push(field(entry));\n    }\n  });\n\n  return groups;\n}\n\nexport function normalizeAngle(angle: number): number {\n  while (angle < 0) {\n    angle += Math.PI * 2;\n  }\n  while (angle >= Math.PI * 2) {\n    angle -= Math.PI * 2;\n  }\n  return angle;\n}\n\nexport function computeQuadrant(angle: number): 1 | 2 | 3 | 4 {\n  angle = normalizeAngle(angle);\n  if (angle > 0 && angle <= Math.PI / 2) {\n    return 2;\n  } else if (angle > Math.PI / 2 && angle <= Math.PI) {\n    return 3;\n  } else if (angle > Math.PI && angle <= (3 * Math.PI) / 2) {\n    return 4;\n  }\n  return 1;\n}\n\nexport function sum(arr: any[]) {\n  return arr.reduce((accumulator, currentValue) => accumulator + currentValue, 0);\n}\n\nexport function average(arr: any[]) {\n  if (arr.length === 0) {\n    return 0;\n  }\n  const total = sum(arr);\n  return total / arr.length;\n}\n"]}
+{"version":3,"sources":["../src/transforms/util/util.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,MAAM,UAAU,UAAU,CAAC,MAAwC,EAAE,EAAa;IAChF,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;QACzB,OAAO,MAAA,EAAE,CAAC,CAAC,CAAC,mCAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,OAA+B,EAAE,KAA2B;IAElG,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;QAClB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;KAC1B;IAED,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,MAAM,GAAG,GAAwB,EAAE,CAAC;IACpC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;QAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,SAA4B,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAE5F,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAClB,MAAM,SAAS,GAAU,EAAE,CAAC;YAC3B,SAAiB,CAAC,IAAI,GAAG,QAAQ,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACvB,GAAG,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;SAC3B;aAAM;YACL,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;SAClC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,GAAG,CAAC,GAAU;IAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,EAAE,CAAC,WAAW,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,GAAU;IAChC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,CAAC,CAAC;KACV;IACD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC;AAC5B,CAAC","file":"util.js","sourcesContent":["/* Adapted from vega by University of Washington Interactive Data Lab\n * https://vega.github.io/vega/\n * Licensed under the BSD-3-Clause\n\n * url: https://github.com/vega/vega/blob/main/packages/vega-transforms/src/util/util.js\n * License: https://github.com/vega/vega/blob/main/LICENSE\n * @license\n */\n\nimport { isNil, isString } from '@visactor/vutils';\nimport type { FieldGetterFunction } from '@visactor/vgrammar-util';\nimport { accessorName } from '@visactor/vgrammar-util';\n\n// use either provided alias or accessor field name\nexport function fieldNames(fields: string[] | FieldGetterFunction[], as?: string[]) {\n  if (!fields) {\n    return null;\n  }\n  return fields.map((f, i) => {\n    return as[i] ?? (isString(f) ? f : accessorName(f));\n  });\n}\n\nexport function partition(data?: any[], groupBy?: FieldGetterFunction[], field?: FieldGetterFunction) {\n  // partition data points into groups\n  if (isNil(groupBy)) {\n    return [data.map(field)];\n  }\n\n  const groups: any[] = [];\n  const map: Record<string, any> = {};\n  data.forEach((entry: any) => {\n    const groupKey = groupBy.map((groupFunc: (arg: any) => any) => groupFunc(entry)).toString();\n\n    if (!map[groupKey]) {\n      const groupItem: any[] = [];\n      (groupItem as any).dims = groupKey;\n      groups.push(groupItem);\n      map[groupKey] = groupItem;\n    } else {\n      map[groupKey].push(field(entry));\n    }\n  });\n\n  return groups;\n}\n\nexport function sum(arr: any[]) {\n  return arr.reduce((accumulator, currentValue) => accumulator + currentValue, 0);\n}\n\nexport function average(arr: any[]) {\n  if (arr.length === 0) {\n    return 0;\n  }\n  const total = sum(arr);\n  return total / arr.length;\n}\n"]}

package/es/types/animate.d.ts

@@ -48,6 +48,7 @@ export interface IMoveAnimationOptions {
         x?: number;
         y?: number;
     }>;
+    excludeChannels?: string[];
 }
 export interface IRotateAnimationOptions {
     orient?: 'clockwise' | 'anticlockwise';
@@ -128,6 +129,7 @@ export interface IAnimationEffect {
 export interface IAnimationControlOptions {
     stopWhenStateChange?: boolean;
     immediatelyApply?: boolean;
+    ignoreLoopFinalAttributes?: boolean;
 }
 export interface IAnimationUnit {
     initialDelay: number;
@@ -177,7 +179,7 @@ export interface IAnimator {
     isAnimating: boolean;
     animate: (animationParameters: IAnimationParameters, parameters: any) => this;
     callback: (callbackFunction: (...args: any[]) => void) => this;
-    stop: (stopState?: 'start' | 'end', invokeCallback?: boolean) => this;
+    stop: (stopState: 'start' | 'end' | null, invokeCallback?: boolean) => this;
     pause: () => this;
     resume: () => this;
     startAt: (startTime: number) => this;

package/es/types/animate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types/animate.ts"],"names":[],"mappings":"","file":"animate.js","sourcesContent":["import type { IGraphic, ACustomAnimate, EasingType } from '@visactor/vrender-core';\nimport type { IPointLike } from '@visactor/vutils';\nimport type { MarkFunctionCallback, MarkFunctionType } from './mark';\nimport type { IMark } from './grammar';\nimport type { IElement } from './element';\nimport type { FunctionCallback } from './signal';\n\nexport type TypeAnimation<T extends IElement> = (\n  element: T,\n  options: any,\n  animationParameters: IAnimationParameters\n) => { from?: { [channel: string]: any }; to?: { [channel: string]: any } };\n\nexport interface IClipAnimationOptions {\n  clipDimension?: 'x' | 'y' | 'auto' | 'default';\n}\n\nexport interface IGrowCartesianAnimationOptions {\n  orient?: 'positive' | 'negative';\n  overall?: boolean | number;\n  direction?: 'x' | 'y' | 'xy';\n}\n\nexport interface IGrowAngleAnimationOptions {\n  orient?: 'clockwise' | 'anticlockwise';\n  overall?: boolean | number;\n}\n\nexport interface IGrowRadiusAnimationOptions {\n  orient?: 'inside' | 'outside';\n  overall?: boolean | number;\n}\n\nexport interface IGrowPointsAnimationOptions {\n  orient?: 'positive' | 'negative';\n}\n\nexport interface IGrowPointsOverallAnimationOptions extends IGrowPointsAnimationOptions {\n  center?: IPointLike;\n}\n\nexport interface IScaleAnimationOptions {\n  direction?: 'x' | 'y' | 'xy';\n}\n\nexport interface IMoveAnimationOptions {\n  direction?: 'x' | 'y' | 'xy';\n  orient?: 'positive' | 'negative';\n  offset?: number;\n  point?: { x?: number; y?: number } | FunctionCallback<{ x?: number; y?: number }>;\n}\n\nexport interface IRotateAnimationOptions {\n  orient?: 'clockwise' | 'anticlockwise';\n  angle?: number;\n}\n\n/** VGrammar 层提供的图元text上的图形属性，现在暂时会和VRender不一致 */\nexport interface TextItemAttributes {\n  fontSize?: number;\n  lineHeight?: number;\n  font?: string;\n  fontStyle?: string;\n  fontVariant?: string;\n  fontWeight?: string | number;\n  lineBreak?: string;\n  text?: string | string[];\n  limit?: number;\n  align?: string;\n  baseline?: string;\n  ellipsis?: string | boolean;\n  dir?: string;\n}\n\n/** animation */\nexport type MarkFunctionValueType<T> = MarkFunctionCallback<T> | T;\n\nexport type IAnimationConfig = IAnimationTimeline | IAnimationTypeConfig;\n\n/**\n * state动画，暂时只支持简单配置\n */\nexport interface IStateAnimationConfig {\n  duration?: number;\n  easing?: EasingType;\n}\n\n/**\n * 动画 config 简化配置\n */\nexport interface IAnimationTypeConfig {\n  type?: string;\n  channel?: IAnimationChannelAttrs | IAnimationChannelAttributes;\n  custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor;\n  customParameters?: MarkFunctionValueType<any>;\n  easing?: EasingType;\n  delay?: MarkFunctionValueType<number>;\n  delayAfter?: MarkFunctionValueType<number>;\n  duration?: MarkFunctionValueType<number>;\n  oneByOne?: MarkFunctionValueType<boolean | number>;\n  startTime?: MarkFunctionValueType<number>;\n  totalTime?: MarkFunctionValueType<number>;\n  /** loop: true 无限循环; loop: 正整数，表示循环的次数 */\n  loop?: boolean | number;\n  /** 动画 effect 配置项 */\n  options?: MarkFunctionValueType<any>;\n  /** 动画执行相关控制配置项 */\n  controlOptions?: IAnimationControlOptions;\n}\n\n/**\n * 动画 timeline 完整配置，一条时间线内的动画单元只能串行\n * 多个timeline是可以并行的\n * 考虑到同一图元不能在多个timeline上，所以timeline不应该提供数组配置的能力\n */\nexport interface IAnimationTimeline {\n  /** 为了方便动画编排，用户可以设置 id 用于识别时间线 */\n  id?: string;\n  /** 时间切片 */\n  timeSlices: IAnimationTimeSlice | IAnimationTimeSlice[];\n  /** 动画开始的相对时间，可以为负数 */\n  startTime?: MarkFunctionValueType<number>;\n  /** 动画时长 */\n  totalTime?: MarkFunctionValueType<number>;\n  /** 动画依次执行的延迟 */\n  oneByOne?: MarkFunctionValueType<number | boolean>;\n  /** loop: true 无限循环; loop: 正整数，表示循环的次数 */\n  loop?: MarkFunctionValueType<number | boolean>;\n  /** 对图元元素进行划分，和过滤类似，但是不同时间线不能同时作用在相同的元素上 */\n  partitioner?: MarkFunctionCallback<boolean>;\n  /** 对同一时间线上的元素进行排序 */\n  sort?: (datumA: any, datumB: any, elementA: IElement, elementB: IElement, parameters: any) => number;\n  /** 动画执行相关控制配置项 */\n  controlOptions?: IAnimationControlOptions;\n}\n\nexport interface IAnimationTimeSlice {\n  effects: IAnimationEffect | IAnimationEffect[];\n  duration?: MarkFunctionValueType<number>;\n  delay?: MarkFunctionValueType<number>;\n  delayAfter?: MarkFunctionValueType<number>;\n}\n\nexport type IAnimationChannelFunction = (datum: any, element: IElement, parameters: IAnimationParameters) => any;\nexport type IAnimationChannelAttrs = Record<\n  string,\n  {\n    from?: any | IAnimationChannelFunction;\n    to?: any | IAnimationChannelFunction;\n  }\n>;\nexport type IAnimationChannelAttributes = string[];\nexport type IAnimationChannelInterpolator = (\n  ratio: number,\n  from: any,\n  to: any,\n  nextAttributes: any,\n  datum: any,\n  element: IElement,\n  parameters: IAnimationParameters\n) => boolean | void;\n\n// TODO: fix ACustomAnimate<any>\nexport interface IAnimationCustomConstructor {\n  new (from: any, to: any, duration: number, ease: EasingType, parameters?: any): ACustomAnimate<any>;\n}\n\nexport interface IAnimationEffect {\n  type?: string;\n  channel?: IAnimationChannelAttrs | IAnimationChannelAttributes;\n  custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor;\n  customParameters?: MarkFunctionValueType<any>;\n  easing?: EasingType;\n  /** options暂时没有处理 */\n  options?: MarkFunctionValueType<any>;\n}\n\nexport interface IAnimationControlOptions {\n  /** 当动画状态变更时清空动画 */\n  stopWhenStateChange?: boolean;\n  /** 是否立即应用动画初始状态 */\n  immediatelyApply?: boolean;\n}\n\n/**\n * Animation timeline should be parsed into animation units,\n * which record all necessary configs for animator to execute animation.\n *\n * animation unit time:\n * |<--initialDelay-->| |<--loopDelay--><--Slices--><--looDelayAfter-->| |<--loopDuration-->|\n *                      |<-----------------loopDuration--------------->|\n */\nexport interface IAnimationUnit {\n  /**\n   * initial delay time before any animation loop\n   */\n  initialDelay: number;\n  /**\n   * total time for one animation loop\n   */\n  loopDuration: number;\n  /**\n   * delay time before time slices\n   */\n  loopDelay: number;\n  /**\n   * delay time after time slices\n   */\n  loopDelayAfter: number;\n  /**\n   * animating time in one animation loop\n   */\n  loopAnimateDuration: number;\n  loopCount: number;\n  totalTime: number;\n  timeSlices: IAnimationTimeSlice[];\n}\n\nexport interface IAnimationRecord {\n  start: IGraphic;\n  end: IGraphic;\n  changes: any[];\n}\n\nexport interface IAnimationParameters {\n  width: number;\n  height: number;\n  mark: IMark;\n  group: IMark | null;\n  elementIndex: number;\n  elementCount: number;\n  view: any;\n}\n\nexport interface IParsedAnimationConfig {\n  state: string;\n  timeline: IAnimationTimeline;\n  originConfig: IAnimationConfig;\n  id: string;\n}\n\nexport interface IParsedAnimationAttrs {\n  from?: any;\n  to?: any;\n  custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor;\n  customParameters?: any;\n}\n\n// animate structure\n\nexport interface IAnimatorOptions {\n  state: string;\n  timeline: IAnimationTimeline;\n  id: string;\n}\n\nexport interface IAnimator {\n  id: number;\n  element: IElement;\n  animationOptions: IAnimatorOptions;\n  isAnimating: boolean;\n\n  /** execute animation */\n  animate: (animationParameters: IAnimationParameters, parameters: any) => this;\n  /** set animation callback */\n  callback: (callbackFunction: (...args: any[]) => void) => this;\n\n  // animation control\n  stop: (stopState?: 'start' | 'end', invokeCallback?: boolean) => this;\n  pause: () => this;\n  resume: () => this;\n\n  /** set additional initial animation delay */\n  startAt: (startTime: number) => this;\n  /** get total animation execution time */\n  getTotalAnimationTime: () => number;\n\n  getEndAttributes: () => Record<string, any>;\n}\n\nexport interface IAnimateArranger {\n  // animation control api\n  parallel: (arranger: IAnimateArranger) => this;\n  after: (arranger: IAnimateArranger) => this;\n\n  // internal properties\n  afterArranger: IAnimateArranger;\n  parallelArrangers: IAnimateArranger[];\n  animators: IAnimator[];\n  totalTime: number;\n  startTime: number;\n  endTime: number;\n  arrangeTime: () => void;\n}\n\nexport interface IBaseAnimate {\n  // animation control\n  stop: () => this;\n  pause: () => this;\n  resume: () => this;\n\n  // internal animation process api\n  animate: () => this;\n  enable: () => this;\n  disable: () => this;\n  enableAnimationState: (state: string | string[]) => this;\n  disableAnimationState: (state: string | string[]) => this;\n  isAnimating: () => boolean;\n\n  release: () => void;\n}\n\nexport interface IViewAnimate extends IBaseAnimate {\n  animateAddition: (mark: IMark) => this;\n}\n\nexport interface IAnimate extends IBaseAnimate {\n  mark: IMark;\n\n  // additional animation control\n  run: (config: IAnimationConfig | IAnimationConfig[]) => IAnimateArranger;\n  runAnimationByState: (animationState: string) => IAnimateArranger;\n  stopAnimationByState: (animationState: string) => this;\n  pauseAnimationByState: (animationState: string) => this;\n  resumeAnimationByState: (animationState: string) => this;\n  reverse: () => this;\n  restart: () => this;\n  record: () => this;\n  recordEnd: () => this;\n\n  // internal animation process api\n  getAnimationConfigs: (animationState: string) => IParsedAnimationConfig[];\n  updateConfig: (config: Record<string, IAnimationConfig | IAnimationConfig[]>) => void;\n  updateState: (state: MarkFunctionType<string> | null) => void;\n  isElementAnimating: (element: IElement) => boolean;\n  getAnimatorCount: () => number;\n  getElementAnimators: (element: IElement | IElement[], animationState?: string) => IAnimator[];\n  release: () => void;\n}\n"]}
+{"version":3,"sources":["../src/types/animate.ts"],"names":[],"mappings":"","file":"animate.js","sourcesContent":["import type { IGraphic, ACustomAnimate, EasingType } from '@visactor/vrender-core';\nimport type { IPointLike } from '@visactor/vutils';\nimport type { MarkFunctionCallback, MarkFunctionType } from './mark';\nimport type { IMark } from './grammar';\nimport type { IElement } from './element';\nimport type { FunctionCallback } from './signal';\n\nexport type TypeAnimation<T extends IElement> = (\n  element: T,\n  options: any,\n  animationParameters: IAnimationParameters\n) => { from?: { [channel: string]: any }; to?: { [channel: string]: any } };\n\nexport interface IClipAnimationOptions {\n  clipDimension?: 'x' | 'y' | 'auto' | 'default';\n}\n\nexport interface IGrowCartesianAnimationOptions {\n  orient?: 'positive' | 'negative';\n  overall?: boolean | number;\n  direction?: 'x' | 'y' | 'xy';\n}\n\nexport interface IGrowAngleAnimationOptions {\n  orient?: 'clockwise' | 'anticlockwise';\n  overall?: boolean | number;\n}\n\nexport interface IGrowRadiusAnimationOptions {\n  orient?: 'inside' | 'outside';\n  overall?: boolean | number;\n}\n\nexport interface IGrowPointsAnimationOptions {\n  orient?: 'positive' | 'negative';\n}\n\nexport interface IGrowPointsOverallAnimationOptions extends IGrowPointsAnimationOptions {\n  center?: IPointLike;\n}\n\nexport interface IScaleAnimationOptions {\n  direction?: 'x' | 'y' | 'xy';\n}\n\nexport interface IMoveAnimationOptions {\n  direction?: 'x' | 'y' | 'xy';\n  orient?: 'positive' | 'negative';\n  offset?: number;\n  point?: { x?: number; y?: number } | FunctionCallback<{ x?: number; y?: number }>;\n  excludeChannels?: string[];\n}\n\nexport interface IRotateAnimationOptions {\n  orient?: 'clockwise' | 'anticlockwise';\n  angle?: number;\n}\n\n/** VGrammar 层提供的图元text上的图形属性，现在暂时会和VRender不一致 */\nexport interface TextItemAttributes {\n  fontSize?: number;\n  lineHeight?: number;\n  font?: string;\n  fontStyle?: string;\n  fontVariant?: string;\n  fontWeight?: string | number;\n  lineBreak?: string;\n  text?: string | string[];\n  limit?: number;\n  align?: string;\n  baseline?: string;\n  ellipsis?: string | boolean;\n  dir?: string;\n}\n\n/** animation */\nexport type MarkFunctionValueType<T> = MarkFunctionCallback<T> | T;\n\nexport type IAnimationConfig = IAnimationTimeline | IAnimationTypeConfig;\n\n/**\n * state动画，暂时只支持简单配置\n */\nexport interface IStateAnimationConfig {\n  /**\n   * 状态动画的动画时长\n   */\n  duration?: number;\n  /**\n   * 状态动画的缓动函数类型\n   */\n  easing?: EasingType;\n}\n\n/**\n * 动画 config 简化配置\n */\nexport interface IAnimationTypeConfig {\n  type?: string;\n  channel?: IAnimationChannelAttrs | IAnimationChannelAttributes;\n  custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor;\n  customParameters?: MarkFunctionValueType<any>;\n  easing?: EasingType;\n  delay?: MarkFunctionValueType<number>;\n  delayAfter?: MarkFunctionValueType<number>;\n  duration?: MarkFunctionValueType<number>;\n  oneByOne?: MarkFunctionValueType<boolean | number>;\n  startTime?: MarkFunctionValueType<number>;\n  totalTime?: MarkFunctionValueType<number>;\n  /** loop: true 无限循环; loop: 正整数，表示循环的次数 */\n  loop?: boolean | number;\n  /** 动画 effect 配置项 */\n  options?: MarkFunctionValueType<any>;\n  /** 动画执行相关控制配置项 */\n  controlOptions?: IAnimationControlOptions;\n}\n\n/**\n * 动画 timeline 完整配置，一条时间线内的动画单元只能串行\n * 多个timeline是可以并行的\n * 考虑到同一图元不能在多个timeline上，所以timeline不应该提供数组配置的能力\n */\nexport interface IAnimationTimeline {\n  /** 为了方便动画编排，用户可以设置 id 用于识别时间线 */\n  id?: string;\n  /** 时间切片 */\n  timeSlices: IAnimationTimeSlice | IAnimationTimeSlice[];\n  /** 动画开始的相对时间，可以为负数 */\n  startTime?: MarkFunctionValueType<number>;\n  /** 动画时长 */\n  totalTime?: MarkFunctionValueType<number>;\n  /** 动画依次执行的延迟 */\n  oneByOne?: MarkFunctionValueType<number | boolean>;\n  /** loop: true 无限循环; loop: 正整数，表示循环的次数 */\n  loop?: MarkFunctionValueType<number | boolean>;\n  /** 对图元元素进行划分，和过滤类似，但是不同时间线不能同时作用在相同的元素上 */\n  partitioner?: MarkFunctionCallback<boolean>;\n  /** 对同一时间线上的元素进行排序 */\n  sort?: (datumA: any, datumB: any, elementA: IElement, elementB: IElement, parameters: any) => number;\n  /** 动画执行相关控制配置项 */\n  controlOptions?: IAnimationControlOptions;\n}\n\nexport interface IAnimationTimeSlice {\n  effects: IAnimationEffect | IAnimationEffect[];\n  duration?: MarkFunctionValueType<number>;\n  delay?: MarkFunctionValueType<number>;\n  delayAfter?: MarkFunctionValueType<number>;\n}\n\nexport type IAnimationChannelFunction = (datum: any, element: IElement, parameters: IAnimationParameters) => any;\nexport type IAnimationChannelAttrs = Record<\n  string,\n  {\n    from?: any | IAnimationChannelFunction;\n    to?: any | IAnimationChannelFunction;\n  }\n>;\nexport type IAnimationChannelAttributes = string[];\nexport type IAnimationChannelInterpolator = (\n  ratio: number,\n  from: any,\n  to: any,\n  nextAttributes: any,\n  datum: any,\n  element: IElement,\n  parameters: IAnimationParameters\n) => boolean | void;\n\n// TODO: fix ACustomAnimate<any>\nexport interface IAnimationCustomConstructor {\n  new (from: any, to: any, duration: number, ease: EasingType, parameters?: any): ACustomAnimate<any>;\n}\n\nexport interface IAnimationEffect {\n  type?: string;\n  channel?: IAnimationChannelAttrs | IAnimationChannelAttributes;\n  custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor;\n  customParameters?: MarkFunctionValueType<any>;\n  easing?: EasingType;\n  /** options暂时没有处理 */\n  options?: MarkFunctionValueType<any>;\n}\n\nexport interface IAnimationControlOptions {\n  /** 当动画状态变更时清空动画 */\n  stopWhenStateChange?: boolean;\n  /** 是否立即应用动画初始状态 */\n  immediatelyApply?: boolean;\n  /** encode 计算图元最终状态时是否忽略循环动画 */\n  ignoreLoopFinalAttributes?: boolean;\n}\n\n/**\n * Animation timeline should be parsed into animation units,\n * which record all necessary configs for animator to execute animation.\n *\n * animation unit time:\n * |<--initialDelay-->| |<--loopDelay--><--Slices--><--looDelayAfter-->| |<--loopDuration-->|\n *                      |<-----------------loopDuration--------------->|\n */\nexport interface IAnimationUnit {\n  /**\n   * initial delay time before any animation loop\n   */\n  initialDelay: number;\n  /**\n   * total time for one animation loop\n   */\n  loopDuration: number;\n  /**\n   * delay time before time slices\n   */\n  loopDelay: number;\n  /**\n   * delay time after time slices\n   */\n  loopDelayAfter: number;\n  /**\n   * animating time in one animation loop\n   */\n  loopAnimateDuration: number;\n  loopCount: number;\n  totalTime: number;\n  timeSlices: IAnimationTimeSlice[];\n}\n\nexport interface IAnimationRecord {\n  start: IGraphic;\n  end: IGraphic;\n  changes: any[];\n}\n\nexport interface IAnimationParameters {\n  width: number;\n  height: number;\n  mark: IMark;\n  group: IMark | null;\n  elementIndex: number;\n  elementCount: number;\n  view: any;\n}\n\nexport interface IParsedAnimationConfig {\n  state: string;\n  timeline: IAnimationTimeline;\n  originConfig: IAnimationConfig;\n  id: string;\n}\n\nexport interface IParsedAnimationAttrs {\n  from?: any;\n  to?: any;\n  custom?: IAnimationChannelInterpolator | IAnimationCustomConstructor;\n  customParameters?: any;\n}\n\n// animate structure\n\nexport interface IAnimatorOptions {\n  state: string;\n  timeline: IAnimationTimeline;\n  id: string;\n}\n\nexport interface IAnimator {\n  id: number;\n  element: IElement;\n  animationOptions: IAnimatorOptions;\n  isAnimating: boolean;\n\n  /** execute animation */\n  animate: (animationParameters: IAnimationParameters, parameters: any) => this;\n  /** set animation callback */\n  callback: (callbackFunction: (...args: any[]) => void) => this;\n\n  // animation control\n  stop: (stopState: 'start' | 'end' | null, invokeCallback?: boolean) => this;\n  pause: () => this;\n  resume: () => this;\n\n  /** set additional initial animation delay */\n  startAt: (startTime: number) => this;\n  /** get total animation execution time */\n  getTotalAnimationTime: () => number;\n\n  getEndAttributes: () => Record<string, any>;\n}\n\nexport interface IAnimateArranger {\n  // animation control api\n  parallel: (arranger: IAnimateArranger) => this;\n  after: (arranger: IAnimateArranger) => this;\n\n  // internal properties\n  afterArranger: IAnimateArranger;\n  parallelArrangers: IAnimateArranger[];\n  animators: IAnimator[];\n  totalTime: number;\n  startTime: number;\n  endTime: number;\n  arrangeTime: () => void;\n}\n\nexport interface IBaseAnimate {\n  // animation control\n  stop: () => this;\n  pause: () => this;\n  resume: () => this;\n\n  // internal animation process api\n  animate: () => this;\n  enable: () => this;\n  disable: () => this;\n  enableAnimationState: (state: string | string[]) => this;\n  disableAnimationState: (state: string | string[]) => this;\n  isAnimating: () => boolean;\n\n  release: () => void;\n}\n\nexport interface IViewAnimate extends IBaseAnimate {\n  animateAddition: (mark: IMark) => this;\n}\n\nexport interface IAnimate extends IBaseAnimate {\n  mark: IMark;\n\n  // additional animation control\n  run: (config: IAnimationConfig | IAnimationConfig[]) => IAnimateArranger;\n  runAnimationByState: (animationState: string) => IAnimateArranger;\n  stopAnimationByState: (animationState: string) => this;\n  pauseAnimationByState: (animationState: string) => this;\n  resumeAnimationByState: (animationState: string) => this;\n  reverse: () => this;\n  restart: () => this;\n  record: () => this;\n  recordEnd: () => this;\n\n  // internal animation process api\n  getAnimationConfigs: (animationState: string) => IParsedAnimationConfig[];\n  updateConfig: (config: Record<string, IAnimationConfig | IAnimationConfig[]>) => void;\n  updateState: (state: MarkFunctionType<string> | null) => void;\n  isElementAnimating: (element: IElement) => boolean;\n  getAnimatorCount: () => number;\n  getElementAnimators: (element: IElement | IElement[], animationState?: string) => IAnimator[];\n  release: () => void;\n}\n"]}

package/es/types/element.d.ts

@@ -1,7 +1,7 @@
 import type { IArc, IArc3d, IArea, ICircle, IGlyph, IGraphic, IGroup, IImage, ILine, IPath, IPolygon, IPyramid3d, IRect, IRect3d, IRichText, ISymbol, IText } from '@visactor/vrender-core';
 import type { DiffState } from '../graph/enums';
 import type { IMark, IGlyphMark } from './grammar';
-import type { BaseEncodeSpec, MarkFunctionType, MarkKeySpec, MarkType } from './mark';
+import type { BaseEncodeSpec, BaseSingleEncodeSpec, MarkFunctionType, MarkKeySpec, MarkType } from './mark';
 export interface ElementGraphicMap {
     circle: ICircle;
     arc: IArc;
@@ -69,7 +69,7 @@ export interface IElement {
     setItemAttributes: (attributes: {
         [channel: string]: any;
     } | any[]) => void;
-    updateData: (groupKey: string, data: any[], keyGenerator: MarkKeySpec, view: any) => void;
+    updateData: (groupKey: string, data: any[], keyGenerator: MarkKeySpec) => void;
     state: (markState: MarkFunctionType<string | string[]>, parameters?: any) => void;
     encodeItems: (items: MarkElementItem[], encoders: BaseEncodeSpec, isReentered?: boolean, parameters?: any) => void;
     encodeGraphic: (attributes?: any) => void;
@@ -85,6 +85,10 @@ export interface IElement {
     getNextGraphicAttributes: () => {
         [key: string]: any;
     };
+    getFinalAnimationAttribute: (channel: string) => any;
+    getFinalAnimationAttributes: () => {
+        [key: string]: any;
+    };
     clearChangedGraphicAttributes: () => void;
     clearGraphicAttributes: () => void;
     getStates: () => string[];
@@ -93,6 +97,7 @@ export interface IElement {
     addState: (state: string | string[], attrs?: any) => boolean;
     removeState: (state: string | string[]) => boolean;
     useStates: (states: string[], noAnimation?: boolean) => boolean;
+    updateStates: (states: Record<string, boolean | BaseSingleEncodeSpec>) => any;
 }
 export interface IGlyphElement<P = any> extends IElement {
     mark: IGlyphMark;

package/es/types/element.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types/element.ts"],"names":[],"mappings":"","file":"element.js","sourcesContent":["import type {\n  IArc,\n  IArc3d,\n  IArea,\n  ICircle,\n  IGlyph,\n  IGraphic,\n  IGroup,\n  IImage,\n  ILine,\n  IPath,\n  IPolygon,\n  IPyramid3d,\n  IRect,\n  IRect3d,\n  IRichText,\n  ISymbol,\n  IText\n} from '@visactor/vrender-core';\nimport type { DiffState } from '../graph/enums';\nimport type { IMark, IGlyphMark } from './grammar';\nimport type { BaseEncodeSpec, IMarkConfig, MarkFunctionType, MarkKeySpec, MarkType } from './mark';\n\nexport interface ElementGraphicMap {\n  circle: ICircle;\n  arc: IArc;\n  area: IArea;\n  image: IImage;\n  line: ILine;\n  path: IPath;\n  rule: ILine;\n  shape: IPath;\n  symbol: ISymbol;\n  text: IText;\n  richtext: IRichText;\n  polygon: IPolygon;\n  cell: ISymbol;\n  interval: IGraphic;\n  rect: IRect;\n  rect3d: IRect3d;\n  arc3d: IArc3d;\n  pyramid3d: IPyramid3d;\n  group: IGroup;\n  glyph: IGlyph;\n  linkPath: IGlyph;\n  treePath: IGlyph;\n  wave: IGlyph;\n  ripplePoint: IGlyph;\n  barBoxplot: IGlyph;\n  boxPlot: IGlyph;\n  component: IGroup;\n  axis: IGroup;\n  legend: IGroup;\n  corsshair: IGroup;\n  slider: IGroup;\n  datazoom: IGroup;\n  label: IGroup;\n  player: IGroup;\n}\n\nexport type GetGraphicByType<T> = T extends keyof ElementGraphicMap ? ElementGraphicMap[T] : IGraphic;\n\n/**\n * 保存graphicItem状态\n */\nexport interface MarkElementItem {\n  /** 唯一key */\n  key: string;\n  /** 原始数据 */\n  datum: any;\n  /** VGrammar view */\n  view: any;\n  /** 当前渲染帧下graphicItem对应的最新属性 */\n  nextAttrs?: any;\n  /** 是否初始化过，用于解决collection mark对应的item，可能跳过enter状态的问题 */\n  // hasEntered: boolean;\n}\nexport interface IElement {\n  mark: IMark;\n  isReserved: boolean;\n  diffState: DiffState;\n  key: string;\n  groupKey?: string;\n  data?: any[];\n  /**\n   * 不推荐使用，但是collection图元暂时可能回涉及到相关修改\n   */\n  items: MarkElementItem[];\n\n  initGraphicItem: (attrs?: any) => void;\n  updateGraphicItem: () => void;\n\n  getDatum: () => any;\n  getBounds: () => any;\n  getGraphicItem: () => IGraphic;\n  removeGraphicItem: () => void;\n  resetGraphicItem: () => void;\n\n  /**\n   * 获取 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param prev 是否从之前的 graphic 属性上获取，默认为 false\n   * @returns 视觉通道值\n   */\n  getGraphicAttribute: (channel: string, prev?: boolean) => any;\n  /**\n   * 设置 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param value 视觉通道属性\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttribute: (channel: string, value: any, final?: boolean) => void;\n  /**\n   * 设置一系列 graphic 视觉通道属性\n   * @param attributes 视觉通道键值对\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean) => void;\n\n  /**\n   * 【慎重使用】获取 VGrammar 自身的视觉通道属性\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   */\n  getItemAttribute: (channel?: string) => any;\n  /**\n   * 【慎重使用】设置 VGrammar 自身的视觉通道\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   * @param attributes\n   * @returns\n   */\n  setItemAttributes: (attributes: { [channel: string]: any } | any[]) => void;\n\n  // element 执行流程相关接口\n  updateData: (groupKey: string, data: any[], keyGenerator: MarkKeySpec, view: any) => void;\n  state: (markState: MarkFunctionType<string | string[]>, parameters?: any) => void;\n  encodeItems: (items: MarkElementItem[], encoders: BaseEncodeSpec, isReentered?: boolean, parameters?: any) => void;\n  encodeGraphic: (attributes?: any) => void;\n  transformElementItems: (items: MarkElementItem[], markType: MarkType, computePoints?: boolean) => Record<string, any>;\n  remove: () => void;\n  release: () => void;\n\n  // 动画相关接口\n\n  getFinalGraphicAttributes: () => { [key: string]: any };\n  getPrevGraphicAttributes: () => { [key: string]: any };\n  getNextGraphicAttributes: () => { [key: string]: any };\n  clearChangedGraphicAttributes: () => void;\n  clearGraphicAttributes: () => void;\n\n  // state相关接口\n  getStates: () => string[];\n  hasState: (state: string) => boolean;\n  clearStates: (noAnimation?: boolean) => void;\n  addState: (state: string | string[], attrs?: any) => boolean;\n  removeState: (state: string | string[]) => boolean;\n  useStates: (states: string[], noAnimation?: boolean) => boolean;\n}\n\nexport interface IGlyphElement<P = any> extends IElement {\n  mark: IGlyphMark;\n\n  getGlyphGraphicItems: () => { [markName: string]: any };\n\n  getGraphicAttribute: (channel: string, prev?: boolean, markName?: any) => any;\n  setGraphicAttribute: (channel: string, value: any, final?: boolean, markName?: any) => void;\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean, markName?: any) => void;\n\n  getFinalGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getPrevGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getNextGraphicAttributes: (markName?: string) => { [key: string]: any };\n\n  encodeCustom: (nextAttrs?: any) => { [markName: string]: any };\n}\n"]}
+{"version":3,"sources":["../src/types/element.ts"],"names":[],"mappings":"","file":"element.js","sourcesContent":["import type {\n  IArc,\n  IArc3d,\n  IArea,\n  ICircle,\n  IGlyph,\n  IGraphic,\n  IGroup,\n  IImage,\n  ILine,\n  IPath,\n  IPolygon,\n  IPyramid3d,\n  IRect,\n  IRect3d,\n  IRichText,\n  ISymbol,\n  IText\n} from '@visactor/vrender-core';\nimport type { DiffState } from '../graph/enums';\nimport type { IMark, IGlyphMark } from './grammar';\nimport type {\n  BaseEncodeSpec,\n  BaseSingleEncodeSpec,\n  IMarkConfig,\n  MarkFunctionType,\n  MarkKeySpec,\n  MarkType\n} from './mark';\n\nexport interface ElementGraphicMap {\n  circle: ICircle;\n  arc: IArc;\n  area: IArea;\n  image: IImage;\n  line: ILine;\n  path: IPath;\n  rule: ILine;\n  shape: IPath;\n  symbol: ISymbol;\n  text: IText;\n  richtext: IRichText;\n  polygon: IPolygon;\n  cell: ISymbol;\n  interval: IGraphic;\n  rect: IRect;\n  rect3d: IRect3d;\n  arc3d: IArc3d;\n  pyramid3d: IPyramid3d;\n  group: IGroup;\n  glyph: IGlyph;\n  linkPath: IGlyph;\n  treePath: IGlyph;\n  wave: IGlyph;\n  ripplePoint: IGlyph;\n  barBoxplot: IGlyph;\n  boxPlot: IGlyph;\n  component: IGroup;\n  axis: IGroup;\n  legend: IGroup;\n  corsshair: IGroup;\n  slider: IGroup;\n  datazoom: IGroup;\n  label: IGroup;\n  player: IGroup;\n}\n\nexport type GetGraphicByType<T> = T extends keyof ElementGraphicMap ? ElementGraphicMap[T] : IGraphic;\n\n/**\n * 保存graphicItem状态\n */\nexport interface MarkElementItem {\n  /** 唯一key */\n  key: string;\n  /** 原始数据 */\n  datum: any;\n  /** VGrammar view */\n  view: any;\n  /** 当前渲染帧下graphicItem对应的最新属性 */\n  nextAttrs?: any;\n  /** 是否初始化过，用于解决collection mark对应的item，可能跳过enter状态的问题 */\n  // hasEntered: boolean;\n}\nexport interface IElement {\n  mark: IMark;\n  isReserved: boolean;\n  diffState: DiffState;\n  key: string;\n  groupKey?: string;\n  data?: any[];\n  /**\n   * 不推荐使用，但是collection图元暂时可能回涉及到相关修改\n   */\n  items: MarkElementItem[];\n\n  initGraphicItem: (attrs?: any) => void;\n  updateGraphicItem: () => void;\n\n  getDatum: () => any;\n  getBounds: () => any;\n  getGraphicItem: () => IGraphic;\n  removeGraphicItem: () => void;\n  resetGraphicItem: () => void;\n\n  /**\n   * 获取 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param prev 是否从之前的 graphic 属性上获取，默认为 false\n   * @returns 视觉通道值\n   */\n  getGraphicAttribute: (channel: string, prev?: boolean) => any;\n  /**\n   * 设置 graphic 视觉通道属性\n   * @param channel 视觉通道\n   * @param value 视觉通道属性\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttribute: (channel: string, value: any, final?: boolean) => void;\n  /**\n   * 设置一系列 graphic 视觉通道属性\n   * @param attributes 视觉通道键值对\n   * @param final 是否更新 graphic 最终变更的视觉通道结果，默认为 false\n   */\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean) => void;\n\n  /**\n   * 【慎重使用】获取 VGrammar 自身的视觉通道属性\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   */\n  getItemAttribute: (channel?: string) => any;\n  /**\n   * 【慎重使用】设置 VGrammar 自身的视觉通道\n   * 只有在 'afterEncodeItems' 时机的mark transform中才能调用\n   * @param attributes\n   * @returns\n   */\n  setItemAttributes: (attributes: { [channel: string]: any } | any[]) => void;\n\n  // element 执行流程相关接口\n  updateData: (groupKey: string, data: any[], keyGenerator: MarkKeySpec) => void;\n  state: (markState: MarkFunctionType<string | string[]>, parameters?: any) => void;\n  encodeItems: (items: MarkElementItem[], encoders: BaseEncodeSpec, isReentered?: boolean, parameters?: any) => void;\n  encodeGraphic: (attributes?: any) => void;\n  transformElementItems: (items: MarkElementItem[], markType: MarkType, computePoints?: boolean) => Record<string, any>;\n  remove: () => void;\n  release: () => void;\n\n  // 动画相关接口\n\n  getFinalGraphicAttributes: () => { [key: string]: any };\n  getPrevGraphicAttributes: () => { [key: string]: any };\n  getNextGraphicAttributes: () => { [key: string]: any };\n  getFinalAnimationAttribute: (channel: string) => any;\n  getFinalAnimationAttributes: () => { [key: string]: any };\n  clearChangedGraphicAttributes: () => void;\n  clearGraphicAttributes: () => void;\n\n  // state相关接口\n  getStates: () => string[];\n  hasState: (state: string) => boolean;\n  clearStates: (noAnimation?: boolean) => void;\n  addState: (state: string | string[], attrs?: any) => boolean;\n  removeState: (state: string | string[]) => boolean;\n  useStates: (states: string[], noAnimation?: boolean) => boolean;\n  updateStates: (states: Record<string, boolean | BaseSingleEncodeSpec>) => any;\n}\n\nexport interface IGlyphElement<P = any> extends IElement {\n  mark: IGlyphMark;\n\n  getGlyphGraphicItems: () => { [markName: string]: any };\n\n  getGraphicAttribute: (channel: string, prev?: boolean, markName?: any) => any;\n  setGraphicAttribute: (channel: string, value: any, final?: boolean, markName?: any) => void;\n  setGraphicAttributes: (attributes: { [channel: string]: any }, final?: boolean, markName?: any) => void;\n\n  getFinalGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getPrevGraphicAttributes: (markName?: string) => { [key: string]: any };\n  getNextGraphicAttributes: (markName?: string) => { [key: string]: any };\n\n  encodeCustom: (nextAttrs?: any) => { [markName: string]: any };\n}\n"]}

package/es/types/grammar.d.ts

@@ -124,6 +124,7 @@ export interface IProgressiveGrammar {
     clearProgressive: () => void;
     restartProgressive: () => void;
     evaluateProgressive: () => void;
+    canAnimateAfterProgressive: () => boolean;
 }
 export interface IMark extends IGrammarBase, IProgressiveGrammar {
     group?: IGroupMark;