@visactor/vgrammar-core 0.8.1 → 0.8.2

package/cjs/interactions/player-filter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/player-filter.ts"],"names":[],"mappings":";;;AACA,oCAA2D;AAC3D,6CAA4C;AAC5C,qCAAkC;AAClC,qEAA+D;AAE/D,MAAa,YAAa,SAAQ,eAAM;IAOtC,YAAY,IAAW,EAAE,OAA2B;QAClD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QANvB,SAAI,GAAW,YAAY,CAAC,IAAI,CAAC;QAO/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,GAAG,IAAI;aACf,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;aACvC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,uBAAe,CAAC,SAAS,IAAK,IAAmB,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC;QAClH,IAAI,CAAC,KAAK,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/B,CAAC;IAES,SAAS;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5C,OAAO,EAAE,CAAC;SACX;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAY,CAAC;QAEzC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,CAAC;SACX;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QAEhD,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAClG,MAAM,aAAa,GAAG,CAAC,IAAW,EAAE,WAA8B,EAAE,EAAE;YACpE,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC;QACtE,CAAC,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAc,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAEtG,OAAO;YACL;gBACE,IAAI,EAAE,oCAAe,CAAC,QAAQ;gBAC9B,OAAO,EAAE,IAAI,CAAC,YAAY;aAC3B;SACF,CAAC;IACJ,CAAC;;AA7CH,oCA8CC;AA7CQ,iBAAI,GAAW,eAAe,CAAC;AAG/B,2BAAc,GAAsC,EAAE,CAAC","file":"player-filter.js","sourcesContent":["import type { DataFilterOptions, IComponent, IPlayer, IView, PlayerFilterValue } from '../types';\nimport { DataFilterRank, GrammarMarkType } from '../graph';\nimport { isString } from '@visactor/vutils';\nimport { Filter } from './filter';\nimport { PlayerEventEnum } from '@visactor/vrender-components';\n\nexport class PlayerFilter extends Filter {\n  static type: string = 'player-filter';\n  type: string = PlayerFilter.type;\n\n  static defaultOptions: Omit<DataFilterOptions, 'target'> = {};\n  options: DataFilterOptions;\n\n  constructor(view: IView, options?: DataFilterOptions) {\n    super(view, options);\n    this.options = Object.assign({}, PlayerFilter.defaultOptions, options);\n\n    this._marks = view\n      .getMarksBySelector(this.options.source)\n      .filter(mark => mark.markType === GrammarMarkType.component && (mark as IComponent).componentType === 'player');\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    const player = this._marks[0] as IPlayer;\n\n    if (!this._data || !player) {\n      return [];\n    }\n\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: any) => ({ index: event.detail.index, value: event.detail.value });\n    const dataTransform = (data: any[], filterValue: PlayerFilterValue) => {\n      return transform ? transform(data, filterValue) : filterValue.value;\n    };\n\n    this._filterData(this._data, player, DataFilterRank.player, getFilterValue, undefined, dataTransform);\n\n    return [\n      {\n        type: PlayerEventEnum.OnChange,\n        handler: this.handleFilter\n      }\n    ];\n  }\n}\n"]}
+{"version":3,"sources":["../src/interactions/player-filter.ts"],"names":[],"mappings":";;;AACA,0CAAiE;AACjE,6CAA4C;AAC5C,qCAAkC;AAClC,qEAA+D;AAE/D,MAAa,YAAa,SAAQ,eAAM;IAOtC,YAAY,IAAW,EAAE,OAA2B;QAClD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QANvB,SAAI,GAAW,YAAY,CAAC,IAAI,CAAC;QAO/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,GAAG,IAAI;aACf,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;aACvC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,uBAAe,CAAC,SAAS,IAAK,IAAmB,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC;QAClH,IAAI,CAAC,KAAK,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/B,CAAC;IAES,SAAS;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5C,OAAO,EAAE,CAAC;SACX;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAY,CAAC;QAEzC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,CAAC;SACX;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QAEhD,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAClG,MAAM,aAAa,GAAG,CAAC,IAAW,EAAE,WAA8B,EAAE,EAAE;YACpE,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC;QACtE,CAAC,CAAC;QAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAc,CAAC,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAEtG,OAAO;YACL;gBACE,IAAI,EAAE,oCAAe,CAAC,QAAQ;gBAC9B,OAAO,EAAE,IAAI,CAAC,YAAY;aAC3B;SACF,CAAC;IACJ,CAAC;;AA7CH,oCA8CC;AA7CQ,iBAAI,GAAW,eAAe,CAAC;AAG/B,2BAAc,GAAsC,EAAE,CAAC","file":"player-filter.js","sourcesContent":["import type { DataFilterOptions, IComponent, IPlayer, IView, PlayerFilterValue } from '../types';\nimport { DataFilterRank, GrammarMarkType } from '../graph/enums';\nimport { isString } from '@visactor/vutils';\nimport { Filter } from './filter';\nimport { PlayerEventEnum } from '@visactor/vrender-components';\n\nexport class PlayerFilter extends Filter {\n  static type: string = 'player-filter';\n  type: string = PlayerFilter.type;\n\n  static defaultOptions: Omit<DataFilterOptions, 'target'> = {};\n  options: DataFilterOptions;\n\n  constructor(view: IView, options?: DataFilterOptions) {\n    super(view, options);\n    this.options = Object.assign({}, PlayerFilter.defaultOptions, options);\n\n    this._marks = view\n      .getMarksBySelector(this.options.source)\n      .filter(mark => mark.markType === GrammarMarkType.component && (mark as IComponent).componentType === 'player');\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    const player = this._marks[0] as IPlayer;\n\n    if (!this._data || !player) {\n      return [];\n    }\n\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: any) => ({ index: event.detail.index, value: event.detail.value });\n    const dataTransform = (data: any[], filterValue: PlayerFilterValue) => {\n      return transform ? transform(data, filterValue) : filterValue.value;\n    };\n\n    this._filterData(this._data, player, DataFilterRank.player, getFilterValue, undefined, dataTransform);\n\n    return [\n      {\n        type: PlayerEventEnum.OnChange,\n        handler: this.handleFilter\n      }\n    ];\n  }\n}\n"]}

package/cjs/interactions/roll-up.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.RollUp = void 0;
 
-const graph_1 = require("../graph"), vutils_1 = require("@visactor/vutils"), filter_1 = require("./filter");
+const enums_1 = require("../graph/enums"), vutils_1 = require("@visactor/vutils"), filter_1 = require("./filter");
 
 class RollUp extends filter_1.Filter {
     constructor(view, options) {
@@ -25,7 +25,7 @@ class RollUp extends filter_1.Filter {
         if (!this._marks || 0 === this._marks.length) return [];
         if (!this._data) return [];
         const transform = this.options.target.transform;
-        this._filterData(this._data, null, graph_1.DataFilterRank.rollUp, (event => {
+        this._filterData(this._data, null, enums_1.DataFilterRank.rollUp, (event => {
             var _a, _b;
             return null === (_b = null === (_a = null == event ? void 0 : event.element) || void 0 === _a ? void 0 : _a.getDatum) || void 0 === _b ? void 0 : _b.call(_a);
         }), void 0, ((data, filterValue) => transform(data, filterValue)));

package/cjs/interactions/roll-up.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/roll-up.ts"],"names":[],"mappings":"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","file":"roll-up.js","sourcesContent":["import type { EventType, IView, InteractionEvent, RollUpOptions } from '../types';\nimport { DataFilterRank } from '../graph';\nimport { isArray, isString } from '@visactor/vutils';\nimport { Filter } from './filter';\n\nexport class RollUp extends Filter {\n  static type: string = 'roll-up';\n  type: string = RollUp.type;\n\n  static defaultOptions: Omit<RollUpOptions, 'target'> = {\n    trigger: 'click',\n    resetTrigger: 'empty'\n  };\n  options: RollUpOptions;\n\n  protected _isToggle: boolean = false;\n\n  constructor(view: IView, options?: RollUpOptions) {\n    super(view, options);\n    this.options = Object.assign({}, RollUp.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.source);\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    if (!this._data) {\n      return [];\n    }\n\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: InteractionEvent) => event?.element?.getDatum?.();\n    const dataTransform = (data: any[], filterValue: any) => {\n      return transform(data, filterValue);\n    };\n\n    this._filterData(this._data, null, DataFilterRank.rollUp, getFilterValue, undefined, dataTransform);\n\n    const events = [\n      {\n        type: this.options.trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    const eventName =\n      this.options.resetTrigger === 'empty'\n        ? this.options.trigger\n        : this.options.resetTrigger.includes('view:')\n        ? this.options.resetTrigger.replace('view:', '')\n        : this.options.resetTrigger;\n\n    if (eventName !== this.options.trigger) {\n      events.push({\n        type: eventName as EventType,\n        handler: this.handleReset\n      });\n      this._isToggle = false;\n    } else {\n      this._isToggle = true;\n    }\n\n    return events;\n  }\n\n  protected handleStart = (event: InteractionEvent) => {\n    const element = event.element;\n    if (element && this._marks && this._marks.includes(element.mark)) {\n      const filterValue = event.element?.getDatum?.();\n\n      const isEqualFilterValue =\n        filterValue === this._filterData ||\n        (isArray(filterValue) &&\n          isArray(this._filterValue) &&\n          filterValue.length === this._filterValue.length &&\n          filterValue.every(datum => !this._filterValue.includes(datum)));\n\n      if (isEqualFilterValue) {\n        // reset filter value when toggle is enabled\n        if (this._isToggle) {\n          this._filterValue = null;\n          this.handleFilter(event);\n        }\n      } else {\n        this.handleFilter(event);\n      }\n    }\n  };\n\n  protected handleReset = (event: InteractionEvent) => {\n    if (this._filterValue) {\n      this._filterValue = null;\n      this.handleFilter(event);\n    }\n  };\n}\n"]}
+{"version":3,"sources":["../src/interactions/roll-up.ts"],"names":[],"mappings":"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","file":"roll-up.js","sourcesContent":["import type { EventType, IView, InteractionEvent, RollUpOptions } from '../types';\nimport { DataFilterRank } from '../graph/enums';\nimport { isArray, isString } from '@visactor/vutils';\nimport { Filter } from './filter';\n\nexport class RollUp extends Filter {\n  static type: string = 'roll-up';\n  type: string = RollUp.type;\n\n  static defaultOptions: Omit<RollUpOptions, 'target'> = {\n    trigger: 'click',\n    resetTrigger: 'empty'\n  };\n  options: RollUpOptions;\n\n  protected _isToggle: boolean = false;\n\n  constructor(view: IView, options?: RollUpOptions) {\n    super(view, options);\n    this.options = Object.assign({}, RollUp.defaultOptions, options);\n\n    this._marks = view.getMarksBySelector(this.options.source);\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    if (!this._data) {\n      return [];\n    }\n\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: InteractionEvent) => event?.element?.getDatum?.();\n    const dataTransform = (data: any[], filterValue: any) => {\n      return transform(data, filterValue);\n    };\n\n    this._filterData(this._data, null, DataFilterRank.rollUp, getFilterValue, undefined, dataTransform);\n\n    const events = [\n      {\n        type: this.options.trigger,\n        handler: this.handleStart\n      }\n    ];\n\n    const eventName =\n      this.options.resetTrigger === 'empty'\n        ? this.options.trigger\n        : this.options.resetTrigger.includes('view:')\n        ? this.options.resetTrigger.replace('view:', '')\n        : this.options.resetTrigger;\n\n    if (eventName !== this.options.trigger) {\n      events.push({\n        type: eventName as EventType,\n        handler: this.handleReset\n      });\n      this._isToggle = false;\n    } else {\n      this._isToggle = true;\n    }\n\n    return events;\n  }\n\n  protected handleStart = (event: InteractionEvent) => {\n    const element = event.element;\n    if (element && this._marks && this._marks.includes(element.mark)) {\n      const filterValue = event.element?.getDatum?.();\n\n      const isEqualFilterValue =\n        filterValue === this._filterData ||\n        (isArray(filterValue) &&\n          isArray(this._filterValue) &&\n          filterValue.length === this._filterValue.length &&\n          filterValue.every(datum => !this._filterValue.includes(datum)));\n\n      if (isEqualFilterValue) {\n        // reset filter value when toggle is enabled\n        if (this._isToggle) {\n          this._filterValue = null;\n          this.handleFilter(event);\n        }\n      } else {\n        this.handleFilter(event);\n      }\n    }\n  };\n\n  protected handleReset = (event: InteractionEvent) => {\n    if (this._filterValue) {\n      this._filterValue = null;\n      this.handleFilter(event);\n    }\n  };\n}\n"]}

package/cjs/interactions/scrollbar-filter.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ScrollbarFilter = void 0;
 
-const graph_1 = require("../graph"), vutils_1 = require("@visactor/vutils"), filter_1 = require("./filter");
+const enums_1 = require("../graph/enums"), vutils_1 = require("@visactor/vutils"), filter_1 = require("./filter");
 
 class ScrollbarFilter extends filter_1.Filter {
     constructor(view, options) {
         super(view, options), this.type = ScrollbarFilter.type, this.options = Object.assign({}, ScrollbarFilter.defaultOptions, options), 
-        this._marks = view.getMarksBySelector(this.options.source).filter((mark => mark.markType === graph_1.GrammarMarkType.component && "scrollbar" === mark.componentType)), 
+        this._marks = view.getMarksBySelector(this.options.source).filter((mark => mark.markType === enums_1.GrammarMarkType.component && "scrollbar" === mark.componentType)), 
         this._data = (0, vutils_1.isString)(this.options.target.data) ? view.getDataById(this.options.target.data) : this.options.target.data;
     }
     getEvents() {
@@ -21,7 +21,7 @@ class ScrollbarFilter extends filter_1.Filter {
             const scale = scrollbar.getScale().getScale(), range = scale.range(), datumRatio = (scale.scale(datum[filter]) - range[0]) / (range[range.length - 1] - range[0]);
             return filterValue.startRatio <= datumRatio && filterValue.endRatio >= datumRatio;
         } : filter;
-        return this._filterData(this._data, scrollbar, graph_1.DataFilterRank.scrollbar, (event => {
+        return this._filterData(this._data, scrollbar, enums_1.DataFilterRank.scrollbar, (event => {
             if ((0, vutils_1.isString)(filter)) {
                 const range = event.detail.value, scaleGrammar = scrollbar.getScale();
                 if (scaleGrammar) {

package/cjs/interactions/scrollbar-filter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/scrollbar-filter.ts"],"names":[],"mappings":"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","file":"scrollbar-filter.js","sourcesContent":["import type { DataFilterOptions, IComponent, IScrollbar, IView, ScrollbarFilterValue } from '../types';\nimport { DataFilterRank, GrammarMarkType } from '../graph';\nimport { isString } from '@visactor/vutils';\nimport { Filter } from './filter';\n\nexport class ScrollbarFilter extends Filter {\n  static type: string = 'scrollbar-filter';\n  type: string = ScrollbarFilter.type;\n\n  static defaultOptions: Omit<DataFilterOptions, 'target'> = {};\n  options: DataFilterOptions;\n\n  constructor(view: IView, options?: DataFilterOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ScrollbarFilter.defaultOptions, options);\n\n    this._marks = view\n      .getMarksBySelector(this.options.source)\n      .filter(\n        mark => mark.markType === GrammarMarkType.component && (mark as IComponent).componentType === 'scrollbar'\n      );\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    const scrollbar = this._marks[0] as IScrollbar;\n\n    if (!this._data || !scrollbar) {\n      return [];\n    }\n\n    const filter = this.options.target.filter;\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: any) => {\n      if (isString(filter)) {\n        const range = event.detail.value;\n        const scaleGrammar = scrollbar.getScale();\n        if (scaleGrammar) {\n          const scale = scaleGrammar.getScale();\n          const scaleRange = scale.range();\n          const start = scale.invert(range[0] * (scaleRange[1] - scaleRange[0]) + scaleRange[0]);\n          const end = scale.invert(range[1] * (scaleRange[1] - scaleRange[0]) + scaleRange[0]);\n          return { start, end, startRatio: range[0], endRatio: range[1] };\n        }\n        return { startRatio: range[0], endRatio: range[1] };\n      }\n      return { startRatio: event.detail.value[0], endRatio: event.detail.value[1] };\n    };\n    const dataFilter = isString(filter)\n      ? (datum: any, filterValue: ScrollbarFilterValue) => {\n          const scaleGrammar = scrollbar.getScale();\n          const scale = scaleGrammar.getScale();\n          const range = scale.range();\n          const datumRatio = (scale.scale(datum[filter]) - range[0]) / (range[range.length - 1] - range[0]);\n          return filterValue.startRatio <= datumRatio && filterValue.endRatio >= datumRatio;\n        }\n      : filter;\n\n    this._filterData(this._data, scrollbar, DataFilterRank.scrollbar, getFilterValue, dataFilter, transform);\n\n    return [\n      {\n        type: 'scroll',\n        handler: this.handleFilter\n      }\n    ];\n  }\n}\n"]}
+{"version":3,"sources":["../src/interactions/scrollbar-filter.ts"],"names":[],"mappings":"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","file":"scrollbar-filter.js","sourcesContent":["import type { DataFilterOptions, IComponent, IScrollbar, IView, ScrollbarFilterValue } from '../types';\nimport { DataFilterRank, GrammarMarkType } from '../graph/enums';\nimport { isString } from '@visactor/vutils';\nimport { Filter } from './filter';\n\nexport class ScrollbarFilter extends Filter {\n  static type: string = 'scrollbar-filter';\n  type: string = ScrollbarFilter.type;\n\n  static defaultOptions: Omit<DataFilterOptions, 'target'> = {};\n  options: DataFilterOptions;\n\n  constructor(view: IView, options?: DataFilterOptions) {\n    super(view, options);\n    this.options = Object.assign({}, ScrollbarFilter.defaultOptions, options);\n\n    this._marks = view\n      .getMarksBySelector(this.options.source)\n      .filter(\n        mark => mark.markType === GrammarMarkType.component && (mark as IComponent).componentType === 'scrollbar'\n      );\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    const scrollbar = this._marks[0] as IScrollbar;\n\n    if (!this._data || !scrollbar) {\n      return [];\n    }\n\n    const filter = this.options.target.filter;\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: any) => {\n      if (isString(filter)) {\n        const range = event.detail.value;\n        const scaleGrammar = scrollbar.getScale();\n        if (scaleGrammar) {\n          const scale = scaleGrammar.getScale();\n          const scaleRange = scale.range();\n          const start = scale.invert(range[0] * (scaleRange[1] - scaleRange[0]) + scaleRange[0]);\n          const end = scale.invert(range[1] * (scaleRange[1] - scaleRange[0]) + scaleRange[0]);\n          return { start, end, startRatio: range[0], endRatio: range[1] };\n        }\n        return { startRatio: range[0], endRatio: range[1] };\n      }\n      return { startRatio: event.detail.value[0], endRatio: event.detail.value[1] };\n    };\n    const dataFilter = isString(filter)\n      ? (datum: any, filterValue: ScrollbarFilterValue) => {\n          const scaleGrammar = scrollbar.getScale();\n          const scale = scaleGrammar.getScale();\n          const range = scale.range();\n          const datumRatio = (scale.scale(datum[filter]) - range[0]) / (range[range.length - 1] - range[0]);\n          return filterValue.startRatio <= datumRatio && filterValue.endRatio >= datumRatio;\n        }\n      : filter;\n\n    this._filterData(this._data, scrollbar, DataFilterRank.scrollbar, getFilterValue, dataFilter, transform);\n\n    return [\n      {\n        type: 'scroll',\n        handler: this.handleFilter\n      }\n    ];\n  }\n}\n"]}

package/cjs/interactions/slider-filter.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.SliderFilter = void 0;
 
-const graph_1 = require("../graph"), vutils_1 = require("@visactor/vutils"), filter_1 = require("./filter");
+const enums_1 = require("../graph/enums"), vutils_1 = require("@visactor/vutils"), filter_1 = require("./filter");
 
 class SliderFilter extends filter_1.Filter {
     constructor(view, options) {
         super(view, options), this.type = SliderFilter.type, this.options = Object.assign({}, SliderFilter.defaultOptions, options), 
-        this._marks = view.getMarksBySelector(this.options.source).filter((mark => mark.markType === graph_1.GrammarMarkType.component && "slider" === mark.componentType)), 
+        this._marks = view.getMarksBySelector(this.options.source).filter((mark => mark.markType === enums_1.GrammarMarkType.component && "slider" === mark.componentType)), 
         this._data = (0, vutils_1.isString)(this.options.target.data) ? view.getDataById(this.options.target.data) : this.options.target.data;
     }
     getEvents() {
@@ -18,7 +18,7 @@ class SliderFilter extends filter_1.Filter {
         if (!this._data || !slider) return [];
         const filter = this.options.target.filter, transform = this.options.target.transform, dataFilter = (0, 
         vutils_1.isString)(filter) ? (datum, filterValue) => datum[filter] >= filterValue.start && datum[filter] <= filterValue.end : filter;
-        return this._filterData(this._data, slider, graph_1.DataFilterRank.slider, (event => ({
+        return this._filterData(this._data, slider, enums_1.DataFilterRank.slider, (event => ({
             start: event.detail.value[0],
             end: event.detail.value[1]
         })), dataFilter, transform), [ {

package/cjs/interactions/slider-filter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/slider-filter.ts"],"names":[],"mappings":";;;AACA,oCAA2D;AAC3D,6CAA4C;AAC5C,qCAAkC;AAElC,MAAa,YAAa,SAAQ,eAAM;IAOtC,YAAY,IAAW,EAAE,OAA2B;QAClD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QANvB,SAAI,GAAW,YAAY,CAAC,IAAI,CAAC;QAO/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,GAAG,IAAI;aACf,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;aACvC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,uBAAe,CAAC,SAAS,IAAK,IAAmB,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC;QAClH,IAAI,CAAC,KAAK,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/B,CAAC;IAES,SAAS;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5C,OAAO,EAAE,CAAC;SACX;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAY,CAAC;QAEzC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,CAAC;SACX;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QAEhD,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtG,MAAM,UAAU,GAAG,IAAA,iBAAQ,EAAC,MAAM,CAAC;YACjC,CAAC,CAAC,CAAC,KAAU,EAAE,WAA8B,EAAE,EAAE,CAC7C,KAAK,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,GAAG;YAC1E,CAAC,CAAC,MAAM,CAAC;QAEX,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAc,CAAC,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAEnG,OAAO;YACL;gBACE,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,IAAI,CAAC,YAAY;aAC3B;SACF,CAAC;IACJ,CAAC;;AA/CH,oCAgDC;AA/CQ,iBAAI,GAAW,eAAe,CAAC;AAG/B,2BAAc,GAAsC,EAAE,CAAC","file":"slider-filter.js","sourcesContent":["import type { DataFilterOptions, IComponent, ISlider, IView, SliderFilterValue } from '../types';\nimport { DataFilterRank, GrammarMarkType } from '../graph';\nimport { isString } from '@visactor/vutils';\nimport { Filter } from './filter';\n\nexport class SliderFilter extends Filter {\n  static type: string = 'slider-filter';\n  type: string = SliderFilter.type;\n\n  static defaultOptions: Omit<DataFilterOptions, 'target'> = {};\n  options: DataFilterOptions;\n\n  constructor(view: IView, options?: DataFilterOptions) {\n    super(view, options);\n    this.options = Object.assign({}, SliderFilter.defaultOptions, options);\n\n    this._marks = view\n      .getMarksBySelector(this.options.source)\n      .filter(mark => mark.markType === GrammarMarkType.component && (mark as IComponent).componentType === 'slider');\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    const slider = this._marks[0] as ISlider;\n\n    if (!this._data || !slider) {\n      return [];\n    }\n\n    const filter = this.options.target.filter;\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: any) => ({ start: event.detail.value[0], end: event.detail.value[1] });\n    const dataFilter = isString(filter)\n      ? (datum: any, filterValue: SliderFilterValue) =>\n          datum[filter] >= filterValue.start && datum[filter] <= filterValue.end\n      : filter;\n\n    this._filterData(this._data, slider, DataFilterRank.slider, getFilterValue, dataFilter, transform);\n\n    return [\n      {\n        type: 'change',\n        handler: this.handleFilter\n      }\n    ];\n  }\n}\n"]}
+{"version":3,"sources":["../src/interactions/slider-filter.ts"],"names":[],"mappings":";;;AACA,0CAAiE;AACjE,6CAA4C;AAC5C,qCAAkC;AAElC,MAAa,YAAa,SAAQ,eAAM;IAOtC,YAAY,IAAW,EAAE,OAA2B;QAClD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QANvB,SAAI,GAAW,YAAY,CAAC,IAAI,CAAC;QAO/B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAEvE,IAAI,CAAC,MAAM,GAAG,IAAI;aACf,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;aACvC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,uBAAe,CAAC,SAAS,IAAK,IAAmB,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC;QAClH,IAAI,CAAC,KAAK,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC7C,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;YAC5C,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/B,CAAC;IAES,SAAS;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5C,OAAO,EAAE,CAAC;SACX;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAY,CAAC;QAEzC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;YAC1B,OAAO,EAAE,CAAC;SACX;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;QAEhD,MAAM,cAAc,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACtG,MAAM,UAAU,GAAG,IAAA,iBAAQ,EAAC,MAAM,CAAC;YACjC,CAAC,CAAC,CAAC,KAAU,EAAE,WAA8B,EAAE,EAAE,CAC7C,KAAK,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,GAAG;YAC1E,CAAC,CAAC,MAAM,CAAC;QAEX,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAc,CAAC,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAEnG,OAAO;YACL;gBACE,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,IAAI,CAAC,YAAY;aAC3B;SACF,CAAC;IACJ,CAAC;;AA/CH,oCAgDC;AA/CQ,iBAAI,GAAW,eAAe,CAAC;AAG/B,2BAAc,GAAsC,EAAE,CAAC","file":"slider-filter.js","sourcesContent":["import type { DataFilterOptions, IComponent, ISlider, IView, SliderFilterValue } from '../types';\nimport { DataFilterRank, GrammarMarkType } from '../graph/enums';\nimport { isString } from '@visactor/vutils';\nimport { Filter } from './filter';\n\nexport class SliderFilter extends Filter {\n  static type: string = 'slider-filter';\n  type: string = SliderFilter.type;\n\n  static defaultOptions: Omit<DataFilterOptions, 'target'> = {};\n  options: DataFilterOptions;\n\n  constructor(view: IView, options?: DataFilterOptions) {\n    super(view, options);\n    this.options = Object.assign({}, SliderFilter.defaultOptions, options);\n\n    this._marks = view\n      .getMarksBySelector(this.options.source)\n      .filter(mark => mark.markType === GrammarMarkType.component && (mark as IComponent).componentType === 'slider');\n    this._data = isString(this.options.target.data)\n      ? view.getDataById(this.options.target.data)\n      : this.options.target.data;\n  }\n\n  protected getEvents() {\n    if (!this._marks || this._marks.length === 0) {\n      return [];\n    }\n\n    const slider = this._marks[0] as ISlider;\n\n    if (!this._data || !slider) {\n      return [];\n    }\n\n    const filter = this.options.target.filter;\n    const transform = this.options.target.transform;\n\n    const getFilterValue = (event: any) => ({ start: event.detail.value[0], end: event.detail.value[1] });\n    const dataFilter = isString(filter)\n      ? (datum: any, filterValue: SliderFilterValue) =>\n          datum[filter] >= filterValue.start && datum[filter] <= filterValue.end\n      : filter;\n\n    this._filterData(this._data, slider, DataFilterRank.slider, getFilterValue, dataFilter, transform);\n\n    return [\n      {\n        type: 'change',\n        handler: this.handleFilter\n      }\n    ];\n  }\n}\n"]}

package/cjs/parse/view.js

@@ -20,7 +20,7 @@ const builtInSignals = (option, config, theme) => {
         value: null !== (_b = option[constants_2.SIGNAL_HEIGHT]) && void 0 !== _b ? _b : 0
     }, {
         id: constants_2.SIGNAL_PADDING,
-        value: (0, exports.normalizePadding)(null !== (_d = null !== (_c = option[constants_2.SIGNAL_PADDING]) && void 0 !== _c ? _c : config[constants_2.SIGNAL_PADDING]) && void 0 !== _d ? _d : theme.padding)
+        value: (0, exports.normalizePadding)(null !== (_d = null !== (_c = option[constants_2.SIGNAL_PADDING]) && void 0 !== _c ? _c : config[constants_2.SIGNAL_PADDING]) && void 0 !== _d ? _d : null == theme ? void 0 : theme.padding)
     }, {
         id: constants_2.SIGNAL_VIEW_WIDTH,
         update: {

package/cjs/parse/view.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/parse/view.ts"],"names":[],"mappings":"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","file":"view.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport { isNumber, Bounds } from '@visactor/vutils';\nimport {\n  DefaultAnimationDelay,\n  DefaultAnimationDuration,\n  DefaultAnimationEasing,\n  DefaultAnimationOneByOne,\n  DefaultEnableExitAnimation,\n  DefaultMorph,\n  DefaultMorphAll,\n  DefaultReuse,\n  DefaultSplitPath\n} from '../graph/constants';\nimport type { GroupMarkSpec, IRunningConfig, ITheme, MarkSpec, SignalSpec } from '../types';\nimport type { IViewOptions, IViewThemeConfig, ViewSpec } from '../types/view';\nimport {\n  SIGNAL_AUTOFIT,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_WIDTH,\n  SIGNAL_VIEW_BOX\n} from '../view/constants';\n\nlet markBaseId = -1;\n\nexport const BuiltInSignalID = [\n  SIGNAL_WIDTH,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_BOX,\n  SIGNAL_AUTOFIT\n];\n\nexport const builtInSignals = (option: IViewOptions, config: IViewThemeConfig, theme: ITheme): SignalSpec<any>[] => {\n  return [\n    { id: SIGNAL_WIDTH, value: option[SIGNAL_WIDTH] ?? 0 },\n    { id: SIGNAL_HEIGHT, value: option[SIGNAL_HEIGHT] ?? 0 },\n    { id: SIGNAL_PADDING, value: normalizePadding(option[SIGNAL_PADDING] ?? config[SIGNAL_PADDING] ?? theme.padding) },\n    {\n      id: SIGNAL_VIEW_WIDTH,\n      update: {\n        callback: (signal: number, params: any) => {\n          const padding = normalizePadding(params[SIGNAL_PADDING]);\n          return params[SIGNAL_WIDTH] - padding.left - padding.right;\n        },\n        dependency: [SIGNAL_WIDTH, SIGNAL_PADDING]\n      }\n    },\n    {\n      id: SIGNAL_VIEW_HEIGHT,\n      update: {\n        callback: (signal: number, params: any) => {\n          const padding = normalizePadding(params[SIGNAL_PADDING]);\n          return params[SIGNAL_HEIGHT] - padding.top - padding.bottom;\n        },\n        dependency: [SIGNAL_HEIGHT, SIGNAL_PADDING]\n      }\n    },\n    {\n      id: SIGNAL_VIEW_BOX,\n      update: {\n        callback: (signal: IBounds, params: any) => {\n          const padding = normalizePadding(params[SIGNAL_PADDING]);\n          return (signal ? signal : new Bounds()).setValue(\n            padding.left,\n            padding.top,\n            padding.left + params[SIGNAL_VIEW_WIDTH],\n            padding.top + params[SIGNAL_VIEW_HEIGHT]\n          );\n        },\n        dependency: [SIGNAL_VIEW_WIDTH, SIGNAL_VIEW_HEIGHT, SIGNAL_PADDING]\n      }\n    },\n    {\n      id: SIGNAL_AUTOFIT,\n      value: option[SIGNAL_AUTOFIT] ?? config[SIGNAL_AUTOFIT]\n    }\n  ];\n};\n\nexport const normalizePadding = (\n  value: number | { top?: number; left?: number; right?: number; bottom?: number }\n): { top: number; left: number; right: number; bottom: number } => {\n  if (isNumber(value)) {\n    return { top: value, bottom: value, left: value, right: value };\n  }\n  return { top: value?.top ?? 0, bottom: value?.bottom ?? 0, left: value?.left ?? 0, right: value?.right ?? 0 };\n};\n\nexport const normalizeMarkTree = (spec: ViewSpec) => {\n  const traverse = (spec: MarkSpec, group: string) => {\n    spec.group = group;\n    const id = spec.id ?? `VGRAMMAR_MARK_${++markBaseId}`;\n    spec.id = id;\n    ((spec as GroupMarkSpec).marks ?? []).forEach(child => traverse(child, id));\n  };\n  (spec.marks ?? []).forEach(mark => traverse(mark, 'root'));\n  return spec;\n};\n\nexport const normalizeRunningConfig = (runningConfig: IRunningConfig): IRunningConfig => {\n  return {\n    reuse: runningConfig?.reuse ?? DefaultReuse,\n    morph: runningConfig?.morph ?? DefaultMorph,\n    morphAll: runningConfig?.morphAll ?? DefaultMorphAll,\n    animation: {\n      easing: runningConfig?.animation?.easing ?? DefaultAnimationEasing,\n      delay: runningConfig?.animation?.delay ?? DefaultAnimationDelay,\n      duration: runningConfig?.animation?.duration ?? DefaultAnimationDuration,\n      oneByOne: runningConfig?.animation?.oneByOne ?? DefaultAnimationOneByOne,\n      splitPath: runningConfig?.animation?.splitPath ?? DefaultSplitPath\n    },\n    enableExitAnimation: runningConfig?.enableExitAnimation ?? DefaultEnableExitAnimation\n  };\n};\n"]}
+{"version":3,"sources":["../src/parse/view.ts"],"names":[],"mappings":"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","file":"view.js","sourcesContent":["import type { IBounds } from '@visactor/vutils';\nimport { isNumber, Bounds } from '@visactor/vutils';\nimport {\n  DefaultAnimationDelay,\n  DefaultAnimationDuration,\n  DefaultAnimationEasing,\n  DefaultAnimationOneByOne,\n  DefaultEnableExitAnimation,\n  DefaultMorph,\n  DefaultMorphAll,\n  DefaultReuse,\n  DefaultSplitPath\n} from '../graph/constants';\nimport type { GroupMarkSpec, IRunningConfig, ITheme, MarkSpec, SignalSpec } from '../types';\nimport type { IViewOptions, IViewThemeConfig, ViewSpec } from '../types/view';\nimport {\n  SIGNAL_AUTOFIT,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_WIDTH,\n  SIGNAL_VIEW_BOX\n} from '../view/constants';\n\nlet markBaseId = -1;\n\nexport const BuiltInSignalID = [\n  SIGNAL_WIDTH,\n  SIGNAL_HEIGHT,\n  SIGNAL_PADDING,\n  SIGNAL_VIEW_WIDTH,\n  SIGNAL_VIEW_HEIGHT,\n  SIGNAL_VIEW_BOX,\n  SIGNAL_AUTOFIT\n];\n\nexport const builtInSignals = (option: IViewOptions, config: IViewThemeConfig, theme: ITheme): SignalSpec<any>[] => {\n  return [\n    { id: SIGNAL_WIDTH, value: option[SIGNAL_WIDTH] ?? 0 },\n    { id: SIGNAL_HEIGHT, value: option[SIGNAL_HEIGHT] ?? 0 },\n    { id: SIGNAL_PADDING, value: normalizePadding(option[SIGNAL_PADDING] ?? config[SIGNAL_PADDING] ?? theme?.padding) },\n    {\n      id: SIGNAL_VIEW_WIDTH,\n      update: {\n        callback: (signal: number, params: any) => {\n          const padding = normalizePadding(params[SIGNAL_PADDING]);\n          return params[SIGNAL_WIDTH] - padding.left - padding.right;\n        },\n        dependency: [SIGNAL_WIDTH, SIGNAL_PADDING]\n      }\n    },\n    {\n      id: SIGNAL_VIEW_HEIGHT,\n      update: {\n        callback: (signal: number, params: any) => {\n          const padding = normalizePadding(params[SIGNAL_PADDING]);\n          return params[SIGNAL_HEIGHT] - padding.top - padding.bottom;\n        },\n        dependency: [SIGNAL_HEIGHT, SIGNAL_PADDING]\n      }\n    },\n    {\n      id: SIGNAL_VIEW_BOX,\n      update: {\n        callback: (signal: IBounds, params: any) => {\n          const padding = normalizePadding(params[SIGNAL_PADDING]);\n          return (signal ? signal : new Bounds()).setValue(\n            padding.left,\n            padding.top,\n            padding.left + params[SIGNAL_VIEW_WIDTH],\n            padding.top + params[SIGNAL_VIEW_HEIGHT]\n          );\n        },\n        dependency: [SIGNAL_VIEW_WIDTH, SIGNAL_VIEW_HEIGHT, SIGNAL_PADDING]\n      }\n    },\n    {\n      id: SIGNAL_AUTOFIT,\n      value: option[SIGNAL_AUTOFIT] ?? config[SIGNAL_AUTOFIT]\n    }\n  ];\n};\n\nexport const normalizePadding = (\n  value: number | { top?: number; left?: number; right?: number; bottom?: number }\n): { top: number; left: number; right: number; bottom: number } => {\n  if (isNumber(value)) {\n    return { top: value, bottom: value, left: value, right: value };\n  }\n  return { top: value?.top ?? 0, bottom: value?.bottom ?? 0, left: value?.left ?? 0, right: value?.right ?? 0 };\n};\n\nexport const normalizeMarkTree = (spec: ViewSpec) => {\n  const traverse = (spec: MarkSpec, group: string) => {\n    spec.group = group;\n    const id = spec.id ?? `VGRAMMAR_MARK_${++markBaseId}`;\n    spec.id = id;\n    ((spec as GroupMarkSpec).marks ?? []).forEach(child => traverse(child, id));\n  };\n  (spec.marks ?? []).forEach(mark => traverse(mark, 'root'));\n  return spec;\n};\n\nexport const normalizeRunningConfig = (runningConfig: IRunningConfig): IRunningConfig => {\n  return {\n    reuse: runningConfig?.reuse ?? DefaultReuse,\n    morph: runningConfig?.morph ?? DefaultMorph,\n    morphAll: runningConfig?.morphAll ?? DefaultMorphAll,\n    animation: {\n      easing: runningConfig?.animation?.easing ?? DefaultAnimationEasing,\n      delay: runningConfig?.animation?.delay ?? DefaultAnimationDelay,\n      duration: runningConfig?.animation?.duration ?? DefaultAnimationDuration,\n      oneByOne: runningConfig?.animation?.oneByOne ?? DefaultAnimationOneByOne,\n      splitPath: runningConfig?.animation?.splitPath ?? DefaultSplitPath\n    },\n    enableExitAnimation: runningConfig?.enableExitAnimation ?? DefaultEnableExitAnimation\n  };\n};\n"]}

package/cjs/semantic-marks/cell.d.ts

@@ -1,7 +1,8 @@
-import type { GrammarMarkType } from '../graph/enums';
+import { GrammarMarkType } from '../graph/enums';
 import type { StateEncodeSpec, MarkSpec, MarkFunctionType, AttributeTransform, BaseSignleEncodeSpec } from '../types';
 import { Mark } from '../view/mark';
 export declare class Cell extends Mark {
+    static markType: GrammarMarkType;
     markType: GrammarMarkType.cell;
     protected spec: MarkSpec;
     protected _encoders: StateEncodeSpec | null;
@@ -11,3 +12,4 @@ export declare class Cell extends Mark {
     getAttributeTransforms(): AttributeTransform[];
     release(): void;
 }
+export declare const registerCellMark: () => void;

package/cjs/semantic-marks/cell.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Cell = void 0;
+}), exports.registerCellMark = exports.Cell = void 0;
 
-const encode_1 = require("../graph/mark/encode"), mark_1 = require("../parse/mark"), util_1 = require("../parse/util"), mark_2 = require("../view/mark"), vutils_1 = require("@visactor/vutils"), attributes_1 = require("../graph/attributes"), scale_1 = require("../util/scale");
+const enums_1 = require("../graph/enums"), encode_1 = require("../graph/mark/encode"), mark_1 = require("../parse/mark"), util_1 = require("../parse/util"), mark_2 = require("../view/mark"), vutils_1 = require("@visactor/vutils"), transform_1 = require("../graph/attributes/transform"), scale_1 = require("../util/scale"), factory_1 = require("../core/factory");
 
 class Cell extends mark_2.Mark {
     encodeState(state, channel, value) {
@@ -50,12 +50,18 @@ class Cell extends mark_2.Mark {
                 } else graphicAttributes.size = storedAttrs.size;
             },
             storedAttrs: "paddingAttrs"
-        } ].concat(attributes_1.transformsByType.symbol);
+        } ].concat(transform_1.transformsByType.symbol);
     }
     release() {
         super.release(), this._encoders = null;
     }
 }
 
-exports.Cell = Cell;
+exports.Cell = Cell, Cell.markType = enums_1.GrammarMarkType.cell;
+
+const registerCellMark = () => {
+    factory_1.Factory.registerMark(enums_1.GrammarMarkType.cell, Cell);
+};
+
+exports.registerCellMark = registerCellMark;
 //# sourceMappingURL=cell.js.map

package/cjs/semantic-marks/cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/semantic-marks/cell.ts"],"names":[],"mappings":"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","file":"cell.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport type { GrammarMarkType } from '../graph/enums';\nimport { invokeEncoder } from '../graph/mark/encode';\nimport { isScaleEncode } from '../parse/mark';\nimport { getGrammarOutput, isFunctionType } from '../parse/util';\nimport type {\n  StateEncodeSpec,\n  MarkSpec,\n  IElement,\n  MarkFunctionType,\n  AttributeTransform,\n  GetSignleEncodeSpecByType,\n  BaseSignleEncodeSpec\n} from '../types';\nimport { Mark } from '../view/mark';\nimport { isArray, isNil, isNumber } from '@visactor/vutils';\nimport { transformsByType } from '../graph/attributes';\nimport { getBandWidthOfScale } from '../util/scale';\n\nexport class Cell extends Mark {\n  declare markType: GrammarMarkType.cell;\n  protected declare spec: MarkSpec;\n\n  protected _encoders: StateEncodeSpec | null;\n\n  encodeState(state: string, channel: string | BaseSignleEncodeSpec, value?: MarkFunctionType<any>) {\n    super.encodeState(state, channel, value);\n\n    this._updateComponentEncoders(state);\n\n    return this;\n  }\n\n  protected _updateComponentEncoders(state: string) {\n    if (!this._encoders) {\n      this._encoders = {};\n    }\n\n    const userEncoder = this.spec.encode[state] as GetSignleEncodeSpecByType<'cell'>;\n\n    if (userEncoder && state === 'update') {\n      const params = this.parameters();\n      const scales: Record<string, IBaseScale> = isFunctionType(userEncoder)\n        ? null\n        : Object.keys(userEncoder).reduce((res, channel) => {\n            if (isScaleEncode(userEncoder[channel])) {\n              res[channel] = getGrammarOutput(userEncoder[channel].scale, params);\n            }\n            return res;\n          }, {});\n\n      this._encoders[state] = {\n        callback: (datum: any, element: IElement, parameters: any) => {\n          const userEncodeRes = invokeEncoder(userEncoder, datum, element, parameters);\n\n          if (isNil(userEncodeRes.size)) {\n            const sizeX = scales.x ? getBandWidthOfScale(scales.x) : undefined;\n            const sizeY = scales.y ? getBandWidthOfScale(scales.y) : undefined;\n\n            if (isNil(sizeX) && isNil(sizeY)) {\n              userEncodeRes.size = 10;\n            } else if (isNil(sizeX)) {\n              userEncodeRes.size = sizeY;\n            } else if (isNil(sizeY)) {\n              userEncodeRes.size = sizeX;\n            }\n\n            userEncodeRes.size = [sizeX, sizeY];\n          }\n\n          if (isNil(userEncodeRes.shape)) {\n            userEncodeRes.shape = 'rect';\n          }\n\n          return userEncodeRes;\n        }\n      } as GetSignleEncodeSpecByType<'cell'>;\n    } else {\n      this._encoders[state] = userEncoder;\n    }\n  }\n\n  protected _getEncoders() {\n    return this._encoders ?? {};\n  }\n\n  getAttributeTransforms() {\n    return (\n      [\n        {\n          channels: ['size', 'padding'],\n          transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n            if (isNumber(storedAttrs.padding) && storedAttrs.padding > 0) {\n              graphicAttributes.size = isArray(storedAttrs.size)\n                ? storedAttrs.size.map((entry: number) => Math.max(entry - storedAttrs.padding, 1))\n                : Math.max(storedAttrs.size - storedAttrs.padding, 1);\n            } else if (isArray(storedAttrs.padding) && storedAttrs.padding.length === 2) {\n              const arraySize = isArray(storedAttrs.size) ? storedAttrs.size : [storedAttrs.size, storedAttrs.size];\n\n              graphicAttributes.size = [\n                Math.max(arraySize[0] - storedAttrs.padding[0], 1),\n                Math.max(arraySize[1] - storedAttrs.padding[1], 1)\n              ];\n            } else {\n              graphicAttributes.size = storedAttrs.size;\n            }\n          },\n          storedAttrs: 'paddingAttrs'\n        }\n      ] as AttributeTransform[]\n    ).concat(transformsByType.symbol);\n  }\n\n  release(): void {\n    super.release();\n    this._encoders = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/semantic-marks/cell.ts"],"names":[],"mappings":"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","file":"cell.js","sourcesContent":["import type { IBaseScale } from '@visactor/vscale';\nimport { GrammarMarkType } from '../graph/enums';\nimport { invokeEncoder } from '../graph/mark/encode';\nimport { isScaleEncode } from '../parse/mark';\nimport { getGrammarOutput, isFunctionType } from '../parse/util';\nimport type {\n  StateEncodeSpec,\n  MarkSpec,\n  IElement,\n  MarkFunctionType,\n  AttributeTransform,\n  GetSignleEncodeSpecByType,\n  BaseSignleEncodeSpec\n} from '../types';\nimport { Mark } from '../view/mark';\nimport { isArray, isNil, isNumber } from '@visactor/vutils';\nimport { transformsByType } from '../graph/attributes/transform';\nimport { getBandWidthOfScale } from '../util/scale';\nimport { Factory } from '../core/factory';\n\nexport class Cell extends Mark {\n  static markType = GrammarMarkType.cell;\n  declare markType: GrammarMarkType.cell;\n  protected declare spec: MarkSpec;\n\n  protected _encoders: StateEncodeSpec | null;\n\n  encodeState(state: string, channel: string | BaseSignleEncodeSpec, value?: MarkFunctionType<any>) {\n    super.encodeState(state, channel, value);\n\n    this._updateComponentEncoders(state);\n\n    return this;\n  }\n\n  protected _updateComponentEncoders(state: string) {\n    if (!this._encoders) {\n      this._encoders = {};\n    }\n\n    const userEncoder = this.spec.encode[state] as GetSignleEncodeSpecByType<'cell'>;\n\n    if (userEncoder && state === 'update') {\n      const params = this.parameters();\n      const scales: Record<string, IBaseScale> = isFunctionType(userEncoder)\n        ? null\n        : Object.keys(userEncoder).reduce((res, channel) => {\n            if (isScaleEncode(userEncoder[channel])) {\n              res[channel] = getGrammarOutput(userEncoder[channel].scale, params);\n            }\n            return res;\n          }, {});\n\n      this._encoders[state] = {\n        callback: (datum: any, element: IElement, parameters: any) => {\n          const userEncodeRes = invokeEncoder(userEncoder, datum, element, parameters);\n\n          if (isNil(userEncodeRes.size)) {\n            const sizeX = scales.x ? getBandWidthOfScale(scales.x) : undefined;\n            const sizeY = scales.y ? getBandWidthOfScale(scales.y) : undefined;\n\n            if (isNil(sizeX) && isNil(sizeY)) {\n              userEncodeRes.size = 10;\n            } else if (isNil(sizeX)) {\n              userEncodeRes.size = sizeY;\n            } else if (isNil(sizeY)) {\n              userEncodeRes.size = sizeX;\n            }\n\n            userEncodeRes.size = [sizeX, sizeY];\n          }\n\n          if (isNil(userEncodeRes.shape)) {\n            userEncodeRes.shape = 'rect';\n          }\n\n          return userEncodeRes;\n        }\n      } as GetSignleEncodeSpecByType<'cell'>;\n    } else {\n      this._encoders[state] = userEncoder;\n    }\n  }\n\n  protected _getEncoders() {\n    return this._encoders ?? {};\n  }\n\n  getAttributeTransforms() {\n    return (\n      [\n        {\n          channels: ['size', 'padding'],\n          transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n            if (isNumber(storedAttrs.padding) && storedAttrs.padding > 0) {\n              graphicAttributes.size = isArray(storedAttrs.size)\n                ? storedAttrs.size.map((entry: number) => Math.max(entry - storedAttrs.padding, 1))\n                : Math.max(storedAttrs.size - storedAttrs.padding, 1);\n            } else if (isArray(storedAttrs.padding) && storedAttrs.padding.length === 2) {\n              const arraySize = isArray(storedAttrs.size) ? storedAttrs.size : [storedAttrs.size, storedAttrs.size];\n\n              graphicAttributes.size = [\n                Math.max(arraySize[0] - storedAttrs.padding[0], 1),\n                Math.max(arraySize[1] - storedAttrs.padding[1], 1)\n              ];\n            } else {\n              graphicAttributes.size = storedAttrs.size;\n            }\n          },\n          storedAttrs: 'paddingAttrs'\n        }\n      ] as AttributeTransform[]\n    ).concat(transformsByType.symbol);\n  }\n\n  release(): void {\n    super.release();\n    this._encoders = null;\n  }\n}\n\nexport const registerCellMark = () => {\n  Factory.registerMark(GrammarMarkType.cell, Cell);\n};\n"]}

package/cjs/semantic-marks/interval.d.ts

@@ -2,6 +2,7 @@ import { GrammarMarkType } from '../graph/enums';
 import type { StateEncodeSpec, MarkSpec, MarkFunctionType, AttributeTransform, BaseSignleEncodeSpec } from '../types';
 import { Mark } from '../view/mark';
 export declare class Interval extends Mark {
+    static markType: GrammarMarkType;
     markType: GrammarMarkType.interval;
     protected spec: MarkSpec;
     protected _encoders: StateEncodeSpec;
@@ -12,3 +13,4 @@ export declare class Interval extends Mark {
     addGraphicItem(attrs: any, groupKey?: string): any;
     release(): void;
 }
+export declare const registerIntervalMark: () => void;

package/cjs/semantic-marks/interval.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Interval = void 0;
+}), exports.registerIntervalMark = exports.Interval = void 0;
 
-const vscale_1 = require("@visactor/vscale"), enums_1 = require("../graph/enums"), encode_1 = require("../graph/mark/encode"), mark_1 = require("../parse/mark"), util_1 = require("../parse/util"), mark_2 = require("../view/mark"), vutils_1 = require("@visactor/vutils"), graphic_1 = require("../graph/util/graphic"), attributes_1 = require("../graph/attributes");
+const vscale_1 = require("@visactor/vscale"), enums_1 = require("../graph/enums"), encode_1 = require("../graph/mark/encode"), mark_1 = require("../parse/mark"), util_1 = require("../parse/util"), mark_2 = require("../view/mark"), vutils_1 = require("@visactor/vutils"), graphic_1 = require("../graph/util/graphic"), transform_1 = require("../graph/attributes/transform"), factory_1 = require("../core/factory");
 
 class Interval extends mark_2.Mark {
     encodeState(state, channel, value) {
@@ -65,7 +65,7 @@ class Interval extends mark_2.Mark {
                 graphicAttributes.outerRadius = storedAttrs.y1);
             },
             storedAttrs: "sizeAttrs"
-        } ] : attributes_1.transformsByType.rect;
+        } ] : transform_1.transformsByType.rect;
     }
     addGraphicItem(attrs, groupKey) {
         const graphicItem = (0, graphic_1.createGraphicItem)(this, this.coord && "polar" === this.coord.output().type ? enums_1.GrammarMarkType.arc : enums_1.GrammarMarkType.rect, attrs);
@@ -76,5 +76,11 @@ class Interval extends mark_2.Mark {
     }
 }
 
-exports.Interval = Interval;
+exports.Interval = Interval, Interval.markType = enums_1.GrammarMarkType.interval;
+
+const registerIntervalMark = () => {
+    factory_1.Factory.registerMark(enums_1.GrammarMarkType.interval, Interval);
+};
+
+exports.registerIntervalMark = registerIntervalMark;
 //# sourceMappingURL=interval.js.map

package/cjs/semantic-marks/interval.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/semantic-marks/interval.ts"],"names":[],"mappings":"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","file":"interval.js","sourcesContent":["import type { IBandLikeScale, IBaseScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { ScaleEnum } from '@visactor/vscale';\nimport { GrammarMarkType } from '../graph/enums';\nimport { invokeEncoder } from '../graph/mark/encode';\nimport { isScaleEncode } from '../parse/mark';\nimport { getGrammarOutput, isFunctionType } from '../parse/util';\nimport type {\n  StateEncodeSpec,\n  MarkSpec,\n  IElement,\n  MarkFunctionType,\n  AttributeTransform,\n  GetSignleEncodeSpecByType,\n  BaseSignleEncodeSpec\n} from '../types';\nimport { Mark } from '../view/mark';\nimport { isNil } from '@visactor/vutils';\nimport { createGraphicItem } from '../graph/util/graphic';\nimport type { IPolarCoordinate } from '@visactor/vgrammar-coordinate';\nimport { transformsByType } from '../graph/attributes';\n\nexport class Interval extends Mark {\n  declare markType: GrammarMarkType.interval;\n  protected declare spec: MarkSpec;\n\n  protected _encoders: StateEncodeSpec;\n\n  encodeState(state: string, channel: string | BaseSignleEncodeSpec, value?: MarkFunctionType<any>) {\n    super.encodeState(state, channel, value);\n\n    this._updateComponentEncoders(state);\n\n    return this;\n  }\n\n  protected _updateComponentEncoders(state: string) {\n    if (!this._encoders) {\n      this._encoders = {};\n    }\n\n    const userEncoder = this.spec.encode[state] as GetSignleEncodeSpecByType<'interval'>;\n\n    if (userEncoder && state === 'update') {\n      const params = this.parameters();\n      const scales: Record<string, IBaseScale> = isFunctionType(userEncoder)\n        ? null\n        : Object.keys(userEncoder).reduce((res, channel) => {\n            if (isScaleEncode(userEncoder[channel])) {\n              res[channel] = getGrammarOutput(userEncoder[channel].scale, params);\n            }\n            return res;\n          }, {});\n\n      this._encoders[state] = {\n        callback: (datum: any, element: IElement, parameters: any) => {\n          const userEncodeRes = invokeEncoder(userEncoder, datum, element, parameters);\n\n          this.disableCoordinateTransform = false;\n          if (scales && scales.x && scales.x.type === ScaleEnum.Band) {\n            if (!isNil(scales.y)) {\n              const domain = scales.y.domain();\n              const min = Math.min.apply(null, domain);\n              const max = Math.max.apply(null, domain);\n              const baseValue = min > 0 ? min : max < 0 ? max : 0;\n\n              userEncodeRes.y1 = scales.y.scale(baseValue);\n            }\n            const bandWidth = (scales.x as IBandLikeScale).bandwidth();\n\n            // TODO: handle bandWidth dynamically\n            userEncodeRes.x = userEncodeRes.x + bandWidth / 4;\n            userEncodeRes.x1 = userEncodeRes.x + bandWidth / 2;\n          } else if (scales && scales.y && scales.y.type === ScaleEnum.Band) {\n            if (!isNil(scales.x)) {\n              const domain = scales.x.domain();\n              const min = Math.min.apply(null, domain);\n              const max = Math.max.apply(null, domain);\n              const baseValue = min > 0 ? min : max < 0 ? max : 0;\n\n              userEncodeRes.x1 = scales.x.scale(baseValue);\n            }\n            const bandWidth = (scales.y as IBandLikeScale).bandwidth();\n\n            userEncodeRes.y = userEncodeRes.y + bandWidth / 4;\n            userEncodeRes.y1 = userEncodeRes.y + bandWidth / 2;\n          }\n\n          if (scales) {\n            const scaleGrammar =\n              this.view.getScaleById((userEncoder as any).x?.scale) ??\n              this.view.getScaleById((userEncoder as any).y?.scale);\n            const coord = scaleGrammar.getCoordinate();\n\n            if (coord && coord.type === 'polar') {\n              this.disableCoordinateTransform = true;\n              const origin = (coord as IPolarCoordinate).origin();\n              userEncodeRes.cx = origin.x;\n              userEncodeRes.cy = origin.y;\n            }\n          }\n\n          return userEncodeRes;\n        }\n      } as GetSignleEncodeSpecByType<'interval'>;\n    } else {\n      this._encoders[state] = userEncoder;\n    }\n  }\n\n  protected _getEncoders() {\n    return this._encoders ?? {};\n  }\n\n  getAttributeTransforms() {\n    if (this.coord && this.coord.output().type === 'polar') {\n      return [\n        {\n          channels: ['x', 'y', 'x1', 'y1', 'cx', 'cy'],\n          transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n            graphicAttributes.x = storedAttrs.cx;\n            graphicAttributes.y = storedAttrs.cy;\n            if (this.coord.output().isTransposed()) {\n              graphicAttributes.startAngle = storedAttrs.y;\n              graphicAttributes.endAngle = storedAttrs.y1;\n              graphicAttributes.innerRadius = storedAttrs.x;\n              graphicAttributes.outerRadius = storedAttrs.x1;\n            } else {\n              //\n              graphicAttributes.startAngle = storedAttrs.x;\n              graphicAttributes.endAngle = storedAttrs.x1;\n              graphicAttributes.innerRadius = storedAttrs.y;\n              graphicAttributes.outerRadius = storedAttrs.y1;\n            }\n          },\n          storedAttrs: 'sizeAttrs'\n        }\n      ] as AttributeTransform[];\n    }\n\n    return transformsByType.rect;\n  }\n\n  addGraphicItem(attrs: any, groupKey?: string) {\n    const graphicItem = createGraphicItem(\n      this,\n      this.coord && this.coord.output().type === 'polar' ? GrammarMarkType.arc : GrammarMarkType.rect,\n      attrs\n    );\n\n    return super.addGraphicItem(attrs, groupKey, graphicItem);\n  }\n\n  release(): void {\n    super.release();\n    this._encoders = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/semantic-marks/interval.ts"],"names":[],"mappings":"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","file":"interval.js","sourcesContent":["import type { IBandLikeScale, IBaseScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport { ScaleEnum } from '@visactor/vscale';\nimport { GrammarMarkType } from '../graph/enums';\nimport { invokeEncoder } from '../graph/mark/encode';\nimport { isScaleEncode } from '../parse/mark';\nimport { getGrammarOutput, isFunctionType } from '../parse/util';\nimport type {\n  StateEncodeSpec,\n  MarkSpec,\n  IElement,\n  MarkFunctionType,\n  AttributeTransform,\n  GetSignleEncodeSpecByType,\n  BaseSignleEncodeSpec\n} from '../types';\nimport { Mark } from '../view/mark';\nimport { isNil } from '@visactor/vutils';\nimport { createGraphicItem } from '../graph/util/graphic';\nimport type { IPolarCoordinate } from '@visactor/vgrammar-coordinate';\nimport { transformsByType } from '../graph/attributes/transform';\nimport { Factory } from '../core/factory';\n\nexport class Interval extends Mark {\n  static markType = GrammarMarkType.interval;\n  declare markType: GrammarMarkType.interval;\n  protected declare spec: MarkSpec;\n\n  protected _encoders: StateEncodeSpec;\n\n  encodeState(state: string, channel: string | BaseSignleEncodeSpec, value?: MarkFunctionType<any>) {\n    super.encodeState(state, channel, value);\n\n    this._updateComponentEncoders(state);\n\n    return this;\n  }\n\n  protected _updateComponentEncoders(state: string) {\n    if (!this._encoders) {\n      this._encoders = {};\n    }\n\n    const userEncoder = this.spec.encode[state] as GetSignleEncodeSpecByType<'interval'>;\n\n    if (userEncoder && state === 'update') {\n      const params = this.parameters();\n      const scales: Record<string, IBaseScale> = isFunctionType(userEncoder)\n        ? null\n        : Object.keys(userEncoder).reduce((res, channel) => {\n            if (isScaleEncode(userEncoder[channel])) {\n              res[channel] = getGrammarOutput(userEncoder[channel].scale, params);\n            }\n            return res;\n          }, {});\n\n      this._encoders[state] = {\n        callback: (datum: any, element: IElement, parameters: any) => {\n          const userEncodeRes = invokeEncoder(userEncoder, datum, element, parameters);\n\n          this.disableCoordinateTransform = false;\n          if (scales && scales.x && scales.x.type === ScaleEnum.Band) {\n            if (!isNil(scales.y)) {\n              const domain = scales.y.domain();\n              const min = Math.min.apply(null, domain);\n              const max = Math.max.apply(null, domain);\n              const baseValue = min > 0 ? min : max < 0 ? max : 0;\n\n              userEncodeRes.y1 = scales.y.scale(baseValue);\n            }\n            const bandWidth = (scales.x as IBandLikeScale).bandwidth();\n\n            // TODO: handle bandWidth dynamically\n            userEncodeRes.x = userEncodeRes.x + bandWidth / 4;\n            userEncodeRes.x1 = userEncodeRes.x + bandWidth / 2;\n          } else if (scales && scales.y && scales.y.type === ScaleEnum.Band) {\n            if (!isNil(scales.x)) {\n              const domain = scales.x.domain();\n              const min = Math.min.apply(null, domain);\n              const max = Math.max.apply(null, domain);\n              const baseValue = min > 0 ? min : max < 0 ? max : 0;\n\n              userEncodeRes.x1 = scales.x.scale(baseValue);\n            }\n            const bandWidth = (scales.y as IBandLikeScale).bandwidth();\n\n            userEncodeRes.y = userEncodeRes.y + bandWidth / 4;\n            userEncodeRes.y1 = userEncodeRes.y + bandWidth / 2;\n          }\n\n          if (scales) {\n            const scaleGrammar =\n              this.view.getScaleById((userEncoder as any).x?.scale) ??\n              this.view.getScaleById((userEncoder as any).y?.scale);\n            const coord = scaleGrammar.getCoordinate();\n\n            if (coord && coord.type === 'polar') {\n              this.disableCoordinateTransform = true;\n              const origin = (coord as IPolarCoordinate).origin();\n              userEncodeRes.cx = origin.x;\n              userEncodeRes.cy = origin.y;\n            }\n          }\n\n          return userEncodeRes;\n        }\n      } as GetSignleEncodeSpecByType<'interval'>;\n    } else {\n      this._encoders[state] = userEncoder;\n    }\n  }\n\n  protected _getEncoders() {\n    return this._encoders ?? {};\n  }\n\n  getAttributeTransforms() {\n    if (this.coord && this.coord.output().type === 'polar') {\n      return [\n        {\n          channels: ['x', 'y', 'x1', 'y1', 'cx', 'cy'],\n          transform: (graphicAttributes: any, nextAttrs: any, storedAttrs: any) => {\n            graphicAttributes.x = storedAttrs.cx;\n            graphicAttributes.y = storedAttrs.cy;\n            if (this.coord.output().isTransposed()) {\n              graphicAttributes.startAngle = storedAttrs.y;\n              graphicAttributes.endAngle = storedAttrs.y1;\n              graphicAttributes.innerRadius = storedAttrs.x;\n              graphicAttributes.outerRadius = storedAttrs.x1;\n            } else {\n              //\n              graphicAttributes.startAngle = storedAttrs.x;\n              graphicAttributes.endAngle = storedAttrs.x1;\n              graphicAttributes.innerRadius = storedAttrs.y;\n              graphicAttributes.outerRadius = storedAttrs.y1;\n            }\n          },\n          storedAttrs: 'sizeAttrs'\n        }\n      ] as AttributeTransform[];\n    }\n\n    return transformsByType.rect;\n  }\n\n  addGraphicItem(attrs: any, groupKey?: string) {\n    const graphicItem = createGraphicItem(\n      this,\n      this.coord && this.coord.output().type === 'polar' ? GrammarMarkType.arc : GrammarMarkType.rect,\n      attrs\n    );\n\n    return super.addGraphicItem(attrs, groupKey, graphicItem);\n  }\n\n  release(): void {\n    super.release();\n    this._encoders = null;\n  }\n}\n\nexport const registerIntervalMark = () => {\n  Factory.registerMark(GrammarMarkType.interval, Interval);\n};\n"]}

package/cjs/semantic-marks/text.d.ts

@@ -2,6 +2,7 @@ import { GrammarMarkType } from '../graph/enums';
 import type { MarkSpec } from '../types';
 import { Mark } from '../view/mark';
 export declare class Text extends Mark {
+    static markType: GrammarMarkType;
     markType: GrammarMarkType.text;
     protected spec: MarkSpec;
     addGraphicItem(initAttrs: any, groupKey?: string): any;

package/cjs/semantic-marks/text.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Text = void 0;
 
-const enums_1 = require("../graph/enums"), mark_1 = require("../view/mark"), graphic_1 = require("../graph/util/graphic"), attributes_1 = require("../graph/attributes");
+const enums_1 = require("../graph/enums"), mark_1 = require("../view/mark"), graphic_1 = require("../graph/util/graphic"), transform_1 = require("../graph/attributes/transform");
 
 class Text extends mark_1.Mark {
     addGraphicItem(initAttrs, groupKey) {
@@ -14,12 +14,12 @@ class Text extends mark_1.Mark {
     }
     getAttributeTransforms() {
         var _a;
-        return "richtext" === (null === (_a = this.getGroupGraphicItem()) || void 0 === _a ? void 0 : _a.type) ? attributes_1.transformsByType.richtext : attributes_1.transformsByType.text;
+        return "richtext" === (null === (_a = this.getGroupGraphicItem()) || void 0 === _a ? void 0 : _a.type) ? transform_1.transformsByType.richtext : transform_1.transformsByType.text;
     }
     release() {
         super.release();
     }
 }
 
-exports.Text = Text;
+exports.Text = Text, Text.markType = enums_1.GrammarMarkType.text;
 //# sourceMappingURL=text.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/semantic-marks/text.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AAEjD,uCAAoC;AACpC,mDAA0D;AAC1D,oDAAuD;AAEvD,MAAa,IAAK,SAAQ,WAAI;IAI5B,cAAc,CAAC,SAAc,EAAE,QAAiB;QAC9C,MAAM,UAAU,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC;QACnC,MAAM,MAAM,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,MAAK,MAAM,CAAC;QAC3C,MAAM,WAAW,GAAG,IAAA,2BAAiB,EACnC,IAAa,EACb,MAAM,CAAC,CAAC,CAAC,uBAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,uBAAe,CAAC,IAAI,EACxD,SAAS,CACV,CAAC;QAEF,IAAI,MAAM,EAAE;YACV,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC;SAC3B;QAED,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,sBAAsB;;QACpB,OAAO,CAAA,MAAA,IAAI,CAAC,mBAAmB,EAAE,0CAAE,IAAI,MAAK,UAAU,CAAC,CAAC,CAAC,6BAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,6BAAgB,CAAC,IAAI,CAAC;IAC7G,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AA3BD,oBA2BC","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';\n\nexport class Text extends Mark {\n  declare markType: GrammarMarkType.text;\n  protected declare spec: MarkSpec;\n\n  addGraphicItem(initAttrs: any, groupKey?: string) {\n    const textConfig = initAttrs?.text;\n    const isRich = textConfig?.type === 'rich';\n    const graphicItem = createGraphicItem(\n      this as IMark,\n      isRich ? GrammarMarkType.richtext : GrammarMarkType.text,\n      initAttrs\n    );\n\n    if (isRich) {\n      initAttrs.textConfig = [];\n    }\n\n    return super.addGraphicItem(initAttrs, groupKey, graphicItem);\n  }\n\n  getAttributeTransforms() {\n    return this.getGroupGraphicItem()?.type === 'richtext' ? transformsByType.richtext : transformsByType.text;\n  }\n\n  release(): void {\n    super.release();\n  }\n}\n"]}
+{"version":3,"sources":["../src/semantic-marks/text.ts"],"names":[],"mappings":";;;AAAA,0CAAiD;AAEjD,uCAAoC;AACpC,mDAA0D;AAC1D,6DAAiE;AAEjE,MAAa,IAAK,SAAQ,WAAI;IAK5B,cAAc,CAAC,SAAc,EAAE,QAAiB;QAC9C,MAAM,UAAU,GAAG,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC;QACnC,MAAM,MAAM,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,MAAK,MAAM,CAAC;QAC3C,MAAM,WAAW,GAAG,IAAA,2BAAiB,EACnC,IAAa,EACb,MAAM,CAAC,CAAC,CAAC,uBAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,uBAAe,CAAC,IAAI,EACxD,SAAS,CACV,CAAC;QAEF,IAAI,MAAM,EAAE;YACV,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC;SAC3B;QAED,OAAO,KAAK,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,sBAAsB;;QACpB,OAAO,CAAA,MAAA,IAAI,CAAC,mBAAmB,EAAE,0CAAE,IAAI,MAAK,UAAU,CAAC,CAAC,CAAC,4BAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,4BAAgB,CAAC,IAAI,CAAC;IAC7G,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;;AA3BH,oBA4BC;AA3BQ,aAAQ,GAAG,uBAAe,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 textConfig = initAttrs?.text;\n    const isRich = textConfig?.type === 'rich';\n    const graphicItem = createGraphicItem(\n      this as IMark,\n      isRich ? GrammarMarkType.richtext : GrammarMarkType.text,\n      initAttrs\n    );\n\n    if (isRich) {\n      initAttrs.textConfig = [];\n    }\n\n    return super.addGraphicItem(initAttrs, groupKey, graphicItem);\n  }\n\n  getAttributeTransforms() {\n    return this.getGroupGraphicItem()?.type === 'richtext' ? transformsByType.richtext : transformsByType.text;\n  }\n\n  release(): void {\n    super.release();\n  }\n}\n"]}

package/cjs/types/animate.d.ts

@@ -3,6 +3,7 @@ import type { IPointLike } from '@visactor/vutils';
 import type { MarkFunctionCallback, MarkFunctionType } from './mark';
 import type { IMark } from './grammar';
 import type { IElement } from './element';
+import type { FunctionCallback } from './signal';
 export type TypeAnimation<T extends IElement> = (element: T, options: any, animationParameters: IAnimationParameters) => {
     from?: {
         [channel: string]: any;
@@ -43,7 +44,10 @@ export interface IMoveAnimationOptions {
     point?: {
         x?: number;
         y?: number;
-    };
+    } | FunctionCallback<{
+        x?: number;
+        y?: number;
+    }>;
 }
 export interface IRotateAnimationOptions {
     orient?: 'clockwise' | 'anticlockwise';

package/cjs/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';\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 };\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  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}\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}\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  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}\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"]}

package/cjs/types/grammar.d.ts

@@ -134,7 +134,7 @@ export interface IMark extends IGrammarBase, IProgressiveGrammar {
     elementMap: Map<string, IElement>;
     graphicIndex: number;
     graphicItem?: IGroup;
-    animate: IAnimate;
+    animate?: IAnimate;
     join: (data: IData | string | Nil, key?: MarkKeySpec, sort?: MarkSortSpec, groupBy?: MarkKeySpec, groupSort?: MarkSortSpec) => this;
     coordinate: (coordinate: ICoordinate | string | Nil) => this;
     state: (state: MarkFunctionType<string | string[]> | Nil) => this;