@visactor/vgrammar-core 0.14.0-alpha.3 → 0.14.0-alpha.5

package/cjs/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/cjs/transforms/data/pie.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.transform = void 0;
 
-const util_1 = require("../util/util"), transform = (options, upstreamData) => {
+const vutils_1 = require("@visactor/vutils"), transform = (options, upstreamData) => {
     var _a, _b;
     if (!upstreamData || 0 === upstreamData.length) return upstreamData;
     const field = options.field, startAngle = null !== (_a = options.startAngle) && void 0 !== _a ? _a : 0, endAngle = null !== (_b = options.endAngle) && void 0 !== _b ? _b : 2 * Math.PI, {asStartAngle: asStartAngle, asEndAngle: asEndAngle, asMiddleAngle: asMiddleAngle, asRadian: asRadian, asRatio: asRatio, asQuadrant: asQuadrant, asK: asK} = options, total = upstreamData.reduce(((sum, d) => Number.parseFloat(d[field]) + sum), 0), max = upstreamData.reduce(((m, d) => Math.max(m, Number.parseFloat(d[field]))), -1 / 0), intervalAngle = endAngle - startAngle;
@@ -13,7 +13,7 @@ const util_1 = require("../util/util"), transform = (options, upstreamData) => {
         const datum = Object.assign({}, originDatum), ratio = Number.parseFloat(datum[field]) / total, radian = ratio * intervalAngle;
         return asRatio && (datum[asRatio] = ratio), asStartAngle && (datum[asStartAngle] = lastAngle), 
         asEndAngle && (datum[asEndAngle] = lastAngle + radian), asMiddleAngle && (datum[asMiddleAngle] = lastAngle + radian / 2), 
-        asRadian && (datum[asRadian] = radian), asQuadrant && (datum[asQuadrant] = (0, util_1.computeQuadrant)(lastAngle + radian / 2)), 
+        asRadian && (datum[asRadian] = radian), asQuadrant && (datum[asQuadrant] = (0, vutils_1.computeQuadrant)(lastAngle + radian / 2)), 
         asK && (datum[asK] = Number.parseFloat(datum[field]) / max), lastAngle = datum[asEndAngle], 
         datum;
     }));

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/transforms/data/pie.ts"],"names":[],"mappings":";;;AACA,uCAA+C;AAExC,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,IAAA,sBAAe,EAAC,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;AAjCW,QAAA,SAAS,aAiCpB","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,6CAAmD;AAG5C,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,IAAA,wBAAe,EAAC,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;AAjCW,QAAA,SAAS,aAiCpB","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/cjs/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/cjs/transforms/util/util.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.average = exports.sum = exports.computeQuadrant = exports.normalizeAngle = exports.partition = exports.fieldNames = void 0;
+}), exports.average = exports.sum = exports.partition = exports.fieldNames = void 0;
 
 const vutils_1 = require("@visactor/vutils"), vgrammar_util_1 = require("@visactor/vgrammar-util");
 
@@ -26,16 +26,6 @@ function partition(data, groupBy, field) {
     })), groups;
 }
 
-function normalizeAngle(angle) {
-    for (;angle < 0; ) angle += 2 * Math.PI;
-    for (;angle >= 2 * Math.PI; ) angle -= 2 * Math.PI;
-    return angle;
-}
-
-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;
-}
-
 function sum(arr) {
     return arr.reduce(((accumulator, currentValue) => accumulator + currentValue), 0);
 }
@@ -45,6 +35,6 @@ function average(arr) {
     return sum(arr) / arr.length;
 }
 
-exports.fieldNames = fieldNames, exports.partition = partition, exports.normalizeAngle = normalizeAngle, 
-exports.computeQuadrant = computeQuadrant, exports.sum = sum, exports.average = average;
+exports.fieldNames = fieldNames, exports.partition = partition, exports.sum = sum, 
+exports.average = average;
 //# sourceMappingURL=util.js.map

package/cjs/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,6CAAmD;AAEnD,2DAAuD;AAGvD,SAAgB,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,IAAA,iBAAQ,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,4BAAY,EAAC,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;AACL,CAAC;AAPD,gCAOC;AAED,SAAgB,SAAS,CAAC,IAAY,EAAE,OAA+B,EAAE,KAA2B;IAElG,IAAI,IAAA,cAAK,EAAC,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;AAtBD,8BAsBC;AAED,SAAgB,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;AAFD,kBAEC;AAED,SAAgB,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;AAND,0BAMC","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/cjs/types/element.d.ts

@@ -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;

package/cjs/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 {\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, 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  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"]}
+{"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/cjs/types/morph.d.ts

@@ -22,8 +22,7 @@ export interface IMorphAnimationConfig {
     oneByOne?: MorphFunctionValueType<boolean | number>;
     splitPath?: MorphFunctionValueType<'clone' | Nil>;
 }
-export interface IMorph {
+export interface IViewDiff {
     diffGrammar: <U extends IGrammarBase>(prevGrammars: U[], nextGrammars: U[]) => DiffResult<U, U>;
     diffMark: (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => DiffResult<IMark[], IMark[]>;
-    morph: (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => void;
 }

package/cjs/types/morph.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types/morph.ts"],"names":[],"mappings":"","file":"morph.js","sourcesContent":["import type { EasingType } from '@visactor/vrender-core';\nimport type { DiffResult, Nil } from './base';\nimport type { IElement } from './element';\nimport type { IGrammarBase, IMark } from './grammar';\nimport type { GenericFunctionType } from './signal';\nimport type { IRunningConfig } from './view';\n\nexport type MorphData = { prev: any[]; next: any[] };\nexport type MorphElements = { prev: IElement[]; next: IElement[] };\n\nexport type MorphFunctionCallback<T> = (datum: MorphData, element: MorphElements, parameters: any) => T;\n\nexport type MorphFunctionType<T> = GenericFunctionType<MorphFunctionCallback<T>, T>;\n\nexport type MorphFunctionValueType<T> = MorphFunctionType<T> | T;\n\nexport interface IMorphAnimationConfig {\n  easing?: EasingType;\n  delay?: MorphFunctionValueType<number>;\n  duration?: MorphFunctionValueType<number>;\n  oneByOne?: MorphFunctionValueType<boolean | number>;\n  splitPath?: MorphFunctionValueType<'clone' | Nil>;\n}\n\nexport interface IMorph {\n  diffGrammar: <U extends IGrammarBase>(prevGrammars: U[], nextGrammars: U[]) => DiffResult<U, U>;\n  diffMark: (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => DiffResult<IMark[], IMark[]>;\n\n  morph: (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => void;\n}\n"]}
+{"version":3,"sources":["../src/types/morph.ts"],"names":[],"mappings":"","file":"morph.js","sourcesContent":["import type { EasingType } from '@visactor/vrender-core';\nimport type { DiffResult, Nil } from './base';\nimport type { IElement } from './element';\nimport type { IGrammarBase, IMark } from './grammar';\nimport type { GenericFunctionType } from './signal';\nimport type { IRunningConfig } from './view';\n\nexport type MorphData = { prev: any[]; next: any[] };\nexport type MorphElements = { prev: IElement[]; next: IElement[] };\n\nexport type MorphFunctionCallback<T> = (datum: MorphData, element: MorphElements, parameters: any) => T;\n\nexport type MorphFunctionType<T> = GenericFunctionType<MorphFunctionCallback<T>, T>;\n\nexport type MorphFunctionValueType<T> = MorphFunctionType<T> | T;\n\nexport interface IMorphAnimationConfig {\n  easing?: EasingType;\n  delay?: MorphFunctionValueType<number>;\n  duration?: MorphFunctionValueType<number>;\n  oneByOne?: MorphFunctionValueType<boolean | number>;\n  splitPath?: MorphFunctionValueType<'clone' | Nil>;\n}\n\nexport interface IViewDiff {\n  diffGrammar: <U extends IGrammarBase>(prevGrammars: U[], nextGrammars: U[]) => DiffResult<U, U>;\n  diffMark: (prevMarks: IMark[], nextMarks: IMark[], runningConfig: IRunningConfig) => DiffResult<IMark[], IMark[]>;\n}\n"]}

package/cjs/types/renderer.d.ts

@@ -1,5 +1,5 @@
 import type { IBoundsLike } from '@visactor/vutils';
-import type { IColor, Stage } from '@visactor/vrender-core';
+import type { IColor, IEventTarget, Stage } from '@visactor/vrender-core';
 import type { IViewEventConfig, IViewOptions } from './view';
 export interface IRenderer {
     initialize: (width: number, height: number, options: IViewOptions, eventConfig: IViewEventConfig) => this;
@@ -18,3 +18,8 @@ export interface IRenderer {
     toCanvas: () => HTMLCanvasElement;
     release: () => void;
 }
+export interface IStageEventPlugin<T> {
+    new (taget: IEventTarget, cfg?: T): {
+        release: () => void;
+    };
+}

package/cjs/types/renderer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types/renderer.ts"],"names":[],"mappings":"","file":"renderer.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { IColor, Stage } from '@visactor/vrender-core';\nimport type { IViewEventConfig, IViewOptions } from './view';\n\nexport interface IRenderer {\n  initialize: (width: number, height: number, options: IViewOptions, eventConfig: IViewEventConfig) => this;\n\n  render: (immediately?: boolean) => this;\n  renderNextFrame: () => this;\n  resize: (width: number, height: number) => this;\n  shouldResize: (width: number, height: number) => boolean;\n  combineIncrementalLayers: () => this;\n  preventRender: (tag: boolean) => void;\n\n  setDpr: (resolution: number, redraw: boolean) => this;\n  background: (color: IColor) => this;\n  setViewBox: (viewBox: IBoundsLike, rerender: boolean) => this;\n\n  stage: () => Stage;\n  canvas: () => HTMLCanvasElement;\n  context: () => CanvasRenderingContext2D;\n\n  toCanvas: () => HTMLCanvasElement;\n  // toImageData: () => Promise<ImageData | undefined>;\n\n  release: () => void;\n}\n"]}
+{"version":3,"sources":["../src/types/renderer.ts"],"names":[],"mappings":"","file":"renderer.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\nimport type { IColor, IEventTarget, Stage } from '@visactor/vrender-core';\nimport type { IViewEventConfig, IViewOptions } from './view';\n\nexport interface IRenderer {\n  initialize: (width: number, height: number, options: IViewOptions, eventConfig: IViewEventConfig) => this;\n\n  render: (immediately?: boolean) => this;\n  renderNextFrame: () => this;\n  resize: (width: number, height: number) => this;\n  shouldResize: (width: number, height: number) => boolean;\n  combineIncrementalLayers: () => this;\n  preventRender: (tag: boolean) => void;\n\n  setDpr: (resolution: number, redraw: boolean) => this;\n  background: (color: IColor) => this;\n  setViewBox: (viewBox: IBoundsLike, rerender: boolean) => this;\n\n  stage: () => Stage;\n  canvas: () => HTMLCanvasElement;\n  context: () => CanvasRenderingContext2D;\n\n  toCanvas: () => HTMLCanvasElement;\n  // toImageData: () => Promise<ImageData | undefined>;\n\n  release: () => void;\n}\n\nexport interface IStageEventPlugin<T> {\n  new (taget: IEventTarget, cfg?: T): {\n    release: () => void;\n  };\n}\n"]}

package/cjs/view/View.d.ts

@@ -2,7 +2,7 @@ import type { IBounds, ILogger } from '@visactor/vutils';
 import { EventEmitter } from '@visactor/vutils';
 import type { IColor } from '@visactor/vrender-core';
 import type { CoordinateType } from '@visactor/vgrammar-coordinate';
-import type { IData, ISignal, ViewSpec, IView, IViewOptions, IViewThemeConfig, Hooks, IMark, EventSpec, MarkType, GrammarScaleType, SignalFunctionType, IScale, IGrammarBase, IGroupMark, IGlyphMark, ICoordinate, BaseEventHandler, IRecordedGrammars, IComponent, IRunningConfig, IViewAnimate, ITheme, InteractionSpec, IInteraction } from '../types/';
+import type { IData, ISignal, ViewSpec, IView, IViewOptions, IViewThemeConfig, Hooks, IMark, MarkType, GrammarScaleType, SignalFunctionType, IScale, IGrammarBase, IGroupMark, IGlyphMark, ICoordinate, BaseEventHandler, IRecordedGrammars, IComponent, IRunningConfig, IViewAnimate, ITheme, InteractionSpec, IInteraction } from '../types/';
 import type { IRenderer } from '../types/renderer';
 import { LayoutState } from '../graph/enums';
 import type { IAxis, IDatazoom, IGrid, ILabel, ILegend, IPlayer, IScrollbar, ISlider, ITitle } from '../types/component';
@@ -18,8 +18,7 @@ export default class View extends EventEmitter implements IView {
     private _config;
     private _options;
     private _cachedGrammars;
-    private _willMorphMarks;
-    private _morph;
+    private _differ;
     private _eventConfig;
     private _eventListeners;
     private _theme;
@@ -28,7 +27,6 @@ export default class View extends EventEmitter implements IView {
     private _layoutState?;
     private _layoutMarks?;
     private _background?;
-    private _eventCache;
     private _progressiveMarks?;
     private _progressiveRafId?;
     private _observer;
@@ -122,11 +120,10 @@ export default class View extends EventEmitter implements IView {
     private _onResize;
     resize(width: number, height: number, render?: boolean): this;
     private _resizeRenderer;
-    private bindEvents;
-    event(eventSpec: EventSpec): void;
     interaction(type: string, spec: Partial<InteractionSpec>): IInteraction<any>;
     removeInteraction(type: string | IInteraction, id?: string): this;
     removeAllInteractions(): this;
+    initializeEventConfig(config: any): any;
     private initEvent;
     private releaseStageEvent;
     private delegateEvent;

package/cjs/view/View.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 });
 
-const vutils_1 = require("@visactor/vutils"), vrender_core_1 = require("@visactor/vrender-core"), data_1 = require("./data"), events_1 = require("./events"), dataflow_1 = __importDefault(require("./dataflow")), mark_tree_1 = require("../graph/mark-tree"), constants_1 = require("../graph/constants"), canvas_renderer_1 = __importDefault(require("../graph/canvas-renderer")), events_extend_1 = __importDefault(require("../graph/util/events-extend")), constants_2 = require("./constants"), signal_1 = require("./signal"), view_1 = require("../parse/view"), event_1 = require("../parse/event"), util_1 = require("../parse/util"), env_1 = require("../graph/util/env"), group_1 = require("./group"), mark_1 = require("./mark"), layout_1 = require("../graph/layout/layout"), glyph_1 = require("./glyph"), morph_1 = require("../graph/animation/morph"), grammar_record_1 = require("./grammar-record"), animate_1 = require("./animate"), enums_1 = require("../graph/enums"), text_1 = require("../semantic-marks/text"), theme_manager_1 = require("../theme/theme-manager"), factory_1 = require("../core/factory"), component_1 = require("./component"), graphic_1 = require("../graph/util/graphic");
+const vutils_1 = require("@visactor/vutils"), vrender_core_1 = require("@visactor/vrender-core"), data_1 = require("./data"), dataflow_1 = __importDefault(require("./dataflow")), mark_tree_1 = require("../graph/mark-tree"), constants_1 = require("../graph/constants"), canvas_renderer_1 = __importDefault(require("../graph/canvas-renderer")), events_extend_1 = __importDefault(require("../graph/util/events-extend")), constants_2 = require("./constants"), signal_1 = require("./signal"), view_1 = require("../parse/view"), util_1 = require("../parse/util"), env_1 = require("../graph/util/env"), group_1 = require("./group"), mark_1 = require("./mark"), grammar_record_1 = require("./grammar-record"), enums_1 = require("../graph/enums"), text_1 = require("../semantic-marks/text"), theme_manager_1 = require("../theme/theme-manager"), factory_1 = require("../core/factory"), component_1 = require("./component"), graphic_1 = require("../graph/util/graphic"), view_diff_1 = require("../graph/view-diff");
 
 class View extends vutils_1.EventEmitter {
     static useRegisters(comps) {
@@ -73,11 +73,11 @@ class View extends vutils_1.EventEmitter {
         const selectors = (0, vutils_1.array)(selector), res = [];
         return selectors.forEach((selectorStr => {
             if ((0, util_1.isGrammar)(selectorStr)) return void res.push(selectorStr);
-            if (selectorStr[0] === event_1.ID_PREFIX) {
+            if (selectorStr[0] === constants_2.ID_PREFIX) {
                 const mark = this.getMarkById(selectorStr.slice(1));
                 return void (mark && res.push(mark));
             }
-            const marks = selectorStr[0] === event_1.NAME_PREFIX ? this.getMarksByName(selectorStr.slice(1)) : (0, 
+            const marks = selectorStr[0] === constants_2.NAME_PREFIX ? this.getMarksByName(selectorStr.slice(1)) : (0, 
             graphic_1.isMarkType)(selectorStr) ? this.getMarksByType(selectorStr) : null;
             marks && marks.length && marks.forEach((mark => {
                 res.push(mark);
@@ -115,7 +115,8 @@ class View extends vutils_1.EventEmitter {
             break;
 
           case enums_1.GrammarMarkType.glyph:
-            mark = new glyph_1.GlyphMark(this, null == markOptions ? void 0 : markOptions.glyphType, groupMark);
+            const GlyphMark = factory_1.Factory.getMark(enums_1.GrammarMarkType.glyph);
+            GlyphMark && (mark = new GlyphMark(this, null == markOptions ? void 0 : markOptions.glyphType, groupMark));
             break;
 
           case enums_1.GrammarMarkType.component:
@@ -221,7 +222,7 @@ class View extends vutils_1.EventEmitter {
         })), this;
     }
     parseSpec(spec) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (this.emit(enums_1.HOOK_EVENT.BEFORE_PARSE_VIEW), this._spec = spec, (0, view_1.normalizeMarkTree)(spec), 
         spec.theme ? this.theme(spec.theme) : this.theme(theme_manager_1.ThemeManager.getDefaultTheme()), 
         spec.width && this.width(spec.width), spec.height && this.height(spec.height), this.padding(null !== (_b = null !== (_a = spec.padding) && void 0 !== _a ? _a : this._options.padding) && void 0 !== _b ? _b : this._theme.padding), 
@@ -249,12 +250,13 @@ class View extends vutils_1.EventEmitter {
         })), spec.marks && spec.marks.length && spec.marks.forEach((mark => {
             this.parseMarkSpec(mark);
         })), spec.events && spec.events.length && spec.events.forEach((eventConfig => {
-            this.event(eventConfig);
+            var _b;
+            null === (_b = this.event) || void 0 === _b || _b.call(this, eventConfig);
         })), spec.interactions && spec.interactions.length && spec.interactions.forEach((interaction => {
             this.interaction(interaction.type, interaction);
-        })), !1 === spec.animation ? this.animate.disable() : this.animate.enable(), this.emit(enums_1.HOOK_EVENT.AFTER_PARSE_VIEW), 
-        this._needBuildLayoutTree = !0, this._layoutState = enums_1.LayoutState.before, 
-        this;
+        })), !1 === spec.animation ? null === (_g = this.animate) || void 0 === _g || _g.disable() : null === (_h = this.animate) || void 0 === _h || _h.enable(), 
+        this.emit(enums_1.HOOK_EVENT.AFTER_PARSE_VIEW), this._needBuildLayoutTree = !0, 
+        this._layoutState = enums_1.LayoutState.before, this;
     }
     updateSpec(spec) {
         return this.removeAllInteractions(), this.removeAllGrammars(), this.parseSpec(spec);
@@ -374,7 +376,7 @@ class View extends vutils_1.EventEmitter {
     }
     doLayout() {
         var _a;
-        const doLayout = this._options.doLayout || layout_1.defaultDoLayout;
+        const doLayout = this._options.doLayout || factory_1.Factory.getDefaultLayout();
         doLayout && (null === (_a = this._layoutMarks) || void 0 === _a ? void 0 : _a.length) && (this.emit(enums_1.HOOK_EVENT.BEFORE_DO_LAYOUT), 
         doLayout(this._layoutMarks, this._options, this), this.emit(enums_1.HOOK_EVENT.AFTER_DO_LAYOUT));
     }
@@ -397,11 +399,11 @@ class View extends vutils_1.EventEmitter {
         return this.evaluate(runningConfig), this;
     }
     doRender(immediately) {
-        this.emit(enums_1.HOOK_EVENT.BEFORE_DO_RENDER), this.renderer && (this._progressiveMarks || this.animate.animate(), 
+        this.emit(enums_1.HOOK_EVENT.BEFORE_DO_RENDER), this.renderer && (!this._progressiveMarks && this.animate && this.animate.animate(), 
         this.renderer.render(immediately), this.handleRenderEnd()), this.emit(enums_1.HOOK_EVENT.AFTER_DO_RENDER);
     }
     evaluate(runningConfig) {
-        var _a, _b;
+        var _a, _c;
         const normalizedRunningConfig = (0, view_1.normalizeRunningConfig)(runningConfig), grammarWillDetach = this._cachedGrammars.size() > 0;
         grammarWillDetach && (this.reuseCachedGrammars(normalizedRunningConfig), this.detachCachedGrammar());
         const hasResize = this._resizeRenderer(), hasUpdate = this._dataflow.hasCommitted();
@@ -410,28 +412,28 @@ class View extends vutils_1.EventEmitter {
         this._needBuildLayoutTree = !1), this._layoutState && (this._layoutState = enums_1.LayoutState.layouting, 
         this.doLayout(), this._dataflow.hasCommitted() && (this._layoutState = enums_1.LayoutState.reevaluate, 
         this._dataflow.evaluate()), this._layoutState = enums_1.LayoutState.after, (null === (_a = this._layoutMarks) || void 0 === _a ? void 0 : _a.length) && this.handleLayoutEnd()), 
-        this._layoutState = null, this.findProgressiveMarks(), this._resizeRenderer(), null === (_b = this._willMorphMarks) || void 0 === _b || _b.forEach((morphMarks => {
-            this._morph.morph(morphMarks.prev, morphMarks.next, normalizedRunningConfig);
-        })), this._willMorphMarks = null, this.releaseCachedGrammars(normalizedRunningConfig), 
-        this.doRender(!0), this.doPreProgressive(), this) : this;
+        this._layoutState = null, this.findProgressiveMarks(), this._resizeRenderer(), null === (_c = this.morph) || void 0 === _c || _c.call(this, normalizedRunningConfig), 
+        this.releaseCachedGrammars(normalizedRunningConfig), this.doRender(!0), this.doPreProgressive(), 
+        this) : this;
     }
     reuseCachedGrammars(runningConfig) {
-        if (this._willMorphMarks || (this._willMorphMarks = []), runningConfig.reuse) {
+        if (runningConfig.reuse) {
             const reuseDiffUpdate = diff => {
                 diff.next.reuse(diff.prev), diff.prev.detachAll(), diff.prev.clear(), this._cachedGrammars.unrecord(diff.prev);
             };
-            this._morph.diffGrammar(this._cachedGrammars.getAllSignals(), this.grammars.getAllSignals().filter((signal => !view_1.BuiltInSignalID.includes(signal.id())))).update.forEach(reuseDiffUpdate);
-            this._morph.diffGrammar(this._cachedGrammars.getAllData(), this.grammars.getAllData()).update.forEach(reuseDiffUpdate);
-            this._morph.diffGrammar(this._cachedGrammars.getAllScales(), this.grammars.getAllScales()).update.forEach(reuseDiffUpdate);
-            this._morph.diffGrammar(this._cachedGrammars.getAllCoordinates(), this.grammars.getAllCoordinates()).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllSignals(), this.grammars.getAllSignals().filter((signal => !view_1.BuiltInSignalID.includes(signal.id())))).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllData(), this.grammars.getAllData()).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllScales(), this.grammars.getAllScales()).update.forEach(reuseDiffUpdate);
+            this._differ.diffGrammar(this._cachedGrammars.getAllCoordinates(), this.grammars.getAllCoordinates()).update.forEach(reuseDiffUpdate);
         }
-        this._morph.diffMark(this._cachedGrammars.getAllMarks(), this.grammars.getAllMarks().filter((mark => "root" !== mark.id())), runningConfig).update.forEach((diff => {
+        this._differ.diffMark(this._cachedGrammars.getAllMarks(), this.grammars.getAllMarks().filter((mark => "root" !== mark.id())), runningConfig).update.forEach((diff => {
+            var _b;
             const matched = 1 === diff.prev.length && 1 === diff.next.length && diff.prev[0].markType === diff.next[0].markType, enableMarkMorphConfig = diff.prev.every((mark => mark.getMorphConfig().morph)) && diff.next.every((mark => mark.getMorphConfig().morph));
             matched && runningConfig.reuse ? (diff.next[0].reuse(diff.prev[0]), diff.prev[0].detachAll(), 
-            diff.prev[0].clear(), this._cachedGrammars.unrecord(diff.prev[0])) : (runningConfig.morph && enableMarkMorphConfig || runningConfig.morphAll) && this._willMorphMarks.push({
+            diff.prev[0].clear(), this._cachedGrammars.unrecord(diff.prev[0])) : (runningConfig.morph && enableMarkMorphConfig || runningConfig.morphAll) && (null === (_b = this.addMorphMarks) || void 0 === _b || _b.call(this, {
                 prev: diff.prev,
                 next: diff.next
-            });
+            }));
         }));
     }
     detachCachedGrammar() {
@@ -449,10 +451,11 @@ class View extends vutils_1.EventEmitter {
         }));
         const markNodes = this._cachedGrammars.getAllMarkNodes();
         markNodes.forEach((node => {
-            node.mark.animate.stop(), runningConfig.enableExitAnimation && this.animate.animateAddition(node.mark);
+            var _a;
+            null === (_a = node.mark.animate) || void 0 === _a || _a.stop(), runningConfig.enableExitAnimation && this.animate && this.animate.animateAddition(node.mark);
         }));
         const releaseUp = node => {
-            if (node.mark.view && 0 === node.mark.animate.getAnimatorCount() && (!node.children || 0 === node.children.length)) {
+            if (node.mark.view && (!node.mark.animate || 0 === node.mark.animate.getAnimatorCount()) && (!node.children || 0 === node.children.length)) {
                 node.mark.release();
                 const parent = node.parent;
                 parent && (node.parent.children = node.parent.children.filter((n => n !== node)), 
@@ -461,8 +464,8 @@ class View extends vutils_1.EventEmitter {
         };
         markNodes.forEach((node => {
             const mark = node.mark;
-            0 === mark.animate.getAnimatorCount() ? releaseUp(node) : mark.addEventListener("animationEnd", (() => {
-                0 === mark.animate.getAnimatorCount() && releaseUp(node);
+            mark.animate && 0 === mark.animate.getAnimatorCount() ? releaseUp(node) : mark.addEventListener("animationEnd", (() => {
+                mark.animate && 0 === mark.animate.getAnimatorCount() && releaseUp(node);
             }));
         })), this._cachedGrammars.clear();
     }
@@ -531,75 +534,6 @@ class View extends vutils_1.EventEmitter {
             height: height
         }), !0);
     }
-    bindEvents(eventSpec) {
-        if (this._eventConfig.disable) return;
-        const {type: evtType, filter: filter, callback: callback, throttle: throttle, debounce: debounce, consume: consume, target: target, dependency: dependency} = eventSpec, eventSelector = (0, 
-        event_1.parseEventSelector)(evtType);
-        if (!eventSelector) return;
-        const {source: source, type: type} = eventSelector, markFilter = (0, event_1.generateFilterByMark)(eventSelector), validateSignals = (Array.isArray(target) && target.length ? target.map((entry => ({
-            signal: this.getSignalById(entry.target),
-            callback: entry.callback
-        }))) : [ {
-            signal: (0, vutils_1.isString)(target) ? this.getSignalById(target) : null,
-            callback: callback
-        } ]).filter((entry => entry.signal || entry.callback)), refs = (0, util_1.parseReference)(dependency, this), send = (0, 
-        event_1.parseHandler)(((evt, element) => {
-            const needPreventDefault = source === constants_2.EVENT_SOURCE_VIEW && (0, events_1.prevent)(this._eventConfig, type) || consume && (void 0 === evt.cancelable || evt.cancelable);
-            source === constants_2.EVENT_SOURCE_WINDOW && (evt = (0, events_extend_1.default)(this, evt, element, type, constants_2.EVENT_SOURCE_WINDOW));
-            let hasCommitted = !1;
-            if ((!filter || filter(evt)) && (!markFilter || markFilter(element)) && validateSignals.length) {
-                const params = refs.reduce(((params, ref) => (params[ref.id()] = ref.output(), params)), {});
-                validateSignals.forEach((entry => {
-                    if (entry.callback && entry.signal) {
-                        entry.signal.set(entry.callback(evt, params)) && (this.commit(entry.signal), hasCommitted = !0);
-                    } else entry.callback ? entry.callback(evt, params) : (this.commit(entry.signal), 
-                    hasCommitted = !0);
-                }));
-            }
-            needPreventDefault && evt.preventDefault(), consume && evt.stopPropagation(), hasCommitted && this.run();
-        }), {
-            throttle: throttle,
-            debounce: debounce
-        });
-        if (source === constants_2.EVENT_SOURCE_VIEW) {
-            if ((0, events_1.permit)(this._eventConfig, constants_2.EVENT_SOURCE_VIEW, type)) return this.addEventListener(type, send, constants_2.NO_TRAP), 
-            () => {
-                this.removeEventListener(type, send);
-            };
-        } else if (source === constants_2.EVENT_SOURCE_WINDOW) return vrender_core_1.vglobal.addEventListener(type, send), 
-        this._eventListeners.push({
-            type: type,
-            source: vrender_core_1.vglobal,
-            handler: send
-        }), () => {
-            vrender_core_1.vglobal.removeEventListener(type, send);
-            const index = this._eventListeners.findIndex((entry => entry.type === type && entry.source === vrender_core_1.vglobal && entry.handler === send));
-            index >= 0 && this._eventListeners.splice(index, 1);
-        };
-    }
-    event(eventSpec) {
-        if ("between" in eventSpec) {
-            const [starEvent, endEvent] = eventSpec.between, id = `${starEvent.type}-${eventSpec.type}-${endEvent.type}`;
-            let unbindEndEvent;
-            this.bindEvents(Object.assign({}, starEvent, {
-                callback: () => {
-                    if (this._eventCache || (this._eventCache = {}), !this._eventCache[id]) {
-                        const unbindEvent = this.bindEvents(eventSpec);
-                        this._eventCache[id] = unbindEvent;
-                    }
-                    unbindEndEvent || (unbindEndEvent = this.bindEvents(Object.assign({}, endEvent, {
-                        callback: () => {
-                            this._eventCache[id] && (this._eventCache[id](), this._eventCache[id] = null);
-                        }
-                    })));
-                }
-            }));
-        } else "merge" in eventSpec ? eventSpec.merge.forEach((entry => {
-            const singleEvent = Object.assign({}, eventSpec);
-            (0, vutils_1.isString)(entry) ? singleEvent.type = entry : (0, vutils_1.isObject)(entry) && Object.assign(singleEvent, entry), 
-            singleEvent.debounce = 50, this.bindEvents(singleEvent);
-        })) : this.bindEvents(eventSpec);
-    }
     interaction(type, spec) {
         const interaction = factory_1.Factory.createInteraction(type, this, spec);
         return interaction && (interaction.bind(), this._boundInteractions || (this._boundInteractions = []), 
@@ -622,6 +556,18 @@ class View extends vutils_1.EventEmitter {
             instance.unbind();
         })), this._boundInteractions = null), this;
     }
+    initializeEventConfig(config) {
+        const eventsConfig = Object.assign({
+            defaults: {}
+        }, config), unpack = (obj, keys) => {
+            keys.forEach((k => {
+                (0, vutils_1.isArray)(obj[k]) && (obj[k] = obj[k].reduce(((set, key) => (set[key] = !0, 
+                set)), {}));
+            }));
+        };
+        return unpack(eventsConfig.defaults, [ "prevent", "allow" ]), unpack(eventsConfig, [ constants_2.EVENT_SOURCE_VIEW, constants_2.EVENT_SOURCE_WINDOW ]), 
+        eventsConfig;
+    }
     initEvent() {
         const stage = this.renderer.stage();
         stage && stage.on("*", this.delegateEvent);
@@ -644,15 +590,15 @@ class View extends vutils_1.EventEmitter {
         this.renderer = new canvas_renderer_1.default(this), this.renderer.initialize(width, height, this._options, this._eventConfig).background(this._background);
     }
     initialize() {
-        var _a;
+        var _a, _c;
         this.grammars = new grammar_record_1.RecordedGrammars((grammar => grammar.id()), ((key, grammar) => this.logger.warn(`Grammar id '${key}' has been occupied`, grammar))), 
         this._cachedGrammars = new grammar_record_1.RecordedTreeGrammars((grammar => grammar.id())), 
         this._options.logger && vutils_1.Logger.setInstance(this._options.logger), this.logger = vutils_1.Logger.getInstance(null !== (_a = this._options.logLevel) && void 0 !== _a ? _a : 0), 
-        this._dataflow = new dataflow_1.default, this.animate = new animate_1.ViewAnimate(this), 
-        this._morph = new morph_1.Morph, this._options.hooks && (Object.keys(this._options.hooks).forEach((key => {
+        this._dataflow = new dataflow_1.default, this.animate = null === (_c = this.initAnimate) || void 0 === _c ? void 0 : _c.call(this, this), 
+        this._differ = new view_diff_1.ViewDiff, this._options.hooks && (Object.keys(this._options.hooks).forEach((key => {
             this.on(key, this._options.hooks[key]);
         })), this.hooks = this._options.hooks), this.container = null, this.renderer = null, 
-        this._eventListeners = [], this._eventConfig = (0, events_1.initializeEventConfig)(this._options.eventConfig), 
+        this._eventListeners = [], this._eventConfig = this.initializeEventConfig(this._options.eventConfig), 
         this._theme = this._options.disableTheme ? null : theme_manager_1.ThemeManager.getDefaultTheme(), 
         this.parseBuiltIn(), (0, env_1.configureEnvironment)(this._options), this.initializeRenderer(), 
         this._eventConfig.disable || this.initEvent(), this._bindResizeEvent(), this._needBuildLayoutTree = !0, 
@@ -690,13 +636,14 @@ class View extends vutils_1.EventEmitter {
         })), this._progressiveMarks = null);
     }
     release() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.removeAllInteractions(), this.releaseStageEvent(), this._unBindResizeEvent(), 
         this.clearProgressive(), factory_1.Factory.unregisterRuntimeTransforms(), vutils_1.Logger.setInstance(null), 
-        this.animate.stop(), this.grammars.release(), this._cachedGrammars.release(), this._dataflow.release(), 
-        this._dataflow = null, null === (_b = null === (_a = this.renderer) || void 0 === _a ? void 0 : _a.release) || void 0 === _b || _b.call(_a), 
+        null === (_a = this.animate) || void 0 === _a || _a.stop(), this.grammars.release(), 
+        this._cachedGrammars.release(), this._dataflow.release(), this._dataflow = null, 
+        null === (_c = null === (_b = this.renderer) || void 0 === _b ? void 0 : _b.release) || void 0 === _c || _c.call(_b), 
         this.renderer = null, this._boundInteractions = null, this.removeAllListeners(), 
-        null === (_c = this._eventListeners) || void 0 === _c || _c.forEach((listener => {
+        null === (_d = this._eventListeners) || void 0 === _d || _d.forEach((listener => {
             listener.source.removeEventListener(listener.type, listener.handler);
         })), this._eventListeners = null;
     }