@visactor/vgrammar-core 0.11.0 → 0.11.2

package/cjs/graph/canvas-renderer.js

@@ -100,7 +100,9 @@ class CanvasRenderer {
             autoRender: !0,
             pluginList: viewOptions.pluginList,
             enableHtmlAttribute: viewOptions.enableHtmlAttribute,
-            optimize: viewOptions.optimize
+            optimize: viewOptions.optimize,
+            supportsTouchEvents: viewOptions.supportsTouchEvents,
+            supportsPointerEvents: viewOptions.supportsPointerEvents
         });
         (null === (_b = viewOptions.options3d) || void 0 === _b ? void 0 : _b.enable) && stage.set3dOptions(viewOptions.options3d), 
         stage.enableIncrementalAutoRender(), this._viewBox = viewOptions.viewBox, this._view.emit(enums_1.HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE), 

package/cjs/graph/canvas-renderer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/graph/canvas-renderer.ts"],"names":[],"mappings":"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","file":"canvas-renderer.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isObject } from '@visactor/vutils';\nimport type { IEventTarget, IColor, ILayer, Stage } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { createStage, waitForAllSubLayers } from '@visactor/vrender-core';\nimport { DragNDrop, Gesture } from '@visactor/vrender-kits';\nimport type { IViewOptions, IView, IMark, IViewEventConfig } from '../types';\nimport type { IRenderer } from '../types/renderer';\nimport { HOOK_EVENT } from './enums';\n\nexport default class CanvasRenderer implements IRenderer {\n  private _width: number;\n  private _height: number;\n\n  private _view: IView;\n  private _viewOptions: IViewOptions;\n  private _eventConfig: IViewEventConfig;\n  private _stage: Stage;\n  private _layer: ILayer;\n  private _dragController: DragNDrop;\n  private _gestureController: Gesture;\n  private _viewBox: IBoundsLike;\n\n  constructor(view: IView) {\n    this._view = view;\n  }\n\n  initialize(width: number, height: number, options: IViewOptions, eventConfig: IViewEventConfig) {\n    this._width = width;\n    this._height = height;\n    this._viewOptions = options;\n    this._eventConfig = eventConfig;\n\n    this.initStage();\n\n    // this method will invoke resize to size the canvas appropriately\n    return this;\n  }\n\n  stage() {\n    return this._stage ?? null;\n  }\n\n  gestureController() {\n    return this._gestureController ?? null;\n  }\n\n  canvas() {\n    if (this._stage) {\n      return this._stage.window.getNativeHandler().nativeCanvas;\n    }\n    return null;\n  }\n\n  context() {\n    if (this._stage) {\n      return this._stage.window.getContext().nativeContext;\n    }\n    return null;\n  }\n\n  combineIncrementalLayers() {\n    if (this._stage) {\n      waitForAllSubLayers(this._stage as any).then(() => {\n        // stage might be null in current tick\n        if (this._stage) {\n          this._stage.defaultLayer.combineSubLayer();\n        }\n      });\n    }\n    return this;\n  }\n\n  background(color: IColor) {\n    if (this._stage) {\n      this._stage.background = color;\n      return this;\n    }\n  }\n\n  setDpr(resolution: number, redraw: boolean) {\n    this._stage?.setDpr?.(resolution);\n    if (redraw) {\n      this.renderNextFrame();\n    }\n    return this;\n  }\n\n  shouldResize(width: number, height: number) {\n    return width !== this._width || height !== this._height;\n  }\n\n  resize(width: number, height: number) {\n    this._view.emit(HOOK_EVENT.BEFORE_STAGE_RESIZE);\n    if (this.shouldResize(width, height)) {\n      this._width = width;\n      this._height = height;\n      this._stage && this._stage.resize(width, height);\n    }\n\n    this._view.emit(HOOK_EVENT.AFTER_STAGE_RESIZE);\n\n    return this;\n  }\n\n  setViewBox(viewBox: IBoundsLike, rerender: boolean = true) {\n    if (!this._stage) {\n      return this;\n    }\n    if (\n      viewBox &&\n      (!this._viewBox ||\n        viewBox.x1 !== this._viewBox.x1 ||\n        viewBox.x2 !== this._viewBox.x2 ||\n        viewBox.y1 !== this._viewBox.y1 ||\n        viewBox.y2 !== this._viewBox.y2)\n    ) {\n      this._viewBox = viewBox;\n\n      // FIXME: vRender\n      this._stage.setViewBox(viewBox.x1, viewBox.y1, viewBox.x2 - viewBox.x1, viewBox.y2 - viewBox.y1, rerender);\n    }\n    return this;\n  }\n\n  render(immediately: boolean = false) {\n    this._view.emit(HOOK_EVENT.BEFORE_VRENDER_DRAW);\n\n    this.initStage();\n\n    // disable dirty bounds when render is called\n    this._stage.disableDirtyBounds();\n    this._stage.afterNextRender(this.handleAfterNextRender);\n\n    // render immediately and skip render in next frame\n    if (immediately) {\n      this._stage.render();\n\n      this._view.emit(HOOK_EVENT.AFTER_VRENDER_DRAW);\n    }\n    return this;\n  }\n\n  renderNextFrame() {\n    this.initStage();\n\n    this._stage.renderNextFrame();\n\n    return this;\n  }\n\n  toCanvas() {\n    if (this._stage) {\n      return this._stage.toCanvas();\n    }\n    return null;\n  }\n\n  preventRender(tag: boolean) {\n    if (this._stage) {\n      this._stage.preventRender(tag);\n    }\n  }\n\n  // toImageData() {\n  //   if (this._stage) {\n  //     return this._stage.toImageData();\n  //   }\n  //   return null;\n  // }\n\n  release() {\n    this._view.traverseMarkTree((mark: IMark) => {\n      mark.release();\n    });\n\n    if (this._dragController) {\n      this._dragController.release();\n    }\n    if (this._gestureController) {\n      this._gestureController.release();\n    }\n\n    if (this._stage !== (this._viewOptions?.stage as unknown as Stage)) {\n      // don't release the stage created by outside\n      this._stage.release();\n    }\n\n    this._stage = null;\n    this._layer = null;\n    this._dragController = null;\n    this._gestureController = null;\n  }\n\n  private createStage() {\n    this._view.emit(HOOK_EVENT.BEFORE_CREATE_VRENDER_STAGE);\n\n    const viewOptions = this._viewOptions;\n\n    const stage =\n      (viewOptions.stage as unknown as Stage) ??\n      createStage({\n        width: this._width,\n        height: this._height,\n        renderStyle: viewOptions.renderStyle,\n        viewBox: viewOptions.viewBox,\n        dpr: viewOptions.dpr,\n        canvas: viewOptions.renderCanvas,\n        canvasControled: viewOptions.canvasControled,\n        container: viewOptions.container,\n        title: viewOptions.rendererTitle,\n        beforeRender: viewOptions.beforeRender,\n        afterRender: viewOptions.afterRender,\n        disableDirtyBounds: true,\n        autoRender: true,\n        pluginList: viewOptions.pluginList,\n        enableHtmlAttribute: viewOptions.enableHtmlAttribute,\n        optimize: viewOptions.optimize\n      });\n\n    if (viewOptions.options3d?.enable) {\n      stage.set3dOptions(viewOptions.options3d);\n    }\n\n    stage.enableIncrementalAutoRender();\n\n    this._viewBox = viewOptions.viewBox;\n    this._view.emit(HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE);\n\n    this._view.emit(HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER);\n    const layer = viewOptions.layer ?? (stage.defaultLayer as ILayer);\n    this._view.emit(HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER);\n\n    if (this._eventConfig?.drag) {\n      // 允许 drag 事件\n      this._dragController = new DragNDrop(stage as unknown as IEventTarget);\n    }\n    if (this._eventConfig?.gesture) {\n      const gestureConfig = isObject(this._eventConfig.gesture) ? this._eventConfig.gesture : {};\n      // 允许手势\n      this._gestureController = new Gesture(stage as unknown as IEventTarget, gestureConfig);\n    }\n\n    return {\n      stage,\n      layer\n    };\n  }\n\n  private initStage() {\n    if (!this._stage) {\n      const { stage, layer } = this.createStage();\n\n      this._stage = stage;\n      this._layer = layer;\n\n      const background = this._view.background();\n      this.background(background);\n    }\n  }\n\n  private handleAfterNextRender = () => {\n    if (this._stage && !this._viewOptions.disableDirtyBounds) {\n      this._stage.enableDirtyBounds();\n    }\n\n    this._view.emit(HOOK_EVENT.AFTER_VRENDER_DRAW);\n    this._view.emit(HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER);\n  };\n}\n"]}
+{"version":3,"sources":["../src/graph/canvas-renderer.ts"],"names":[],"mappings":"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","file":"canvas-renderer.js","sourcesContent":["import type { IBoundsLike } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { isObject } from '@visactor/vutils';\nimport type { IEventTarget, IColor, ILayer, Stage } from '@visactor/vrender-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { createStage, waitForAllSubLayers } from '@visactor/vrender-core';\nimport { DragNDrop, Gesture } from '@visactor/vrender-kits';\nimport type { IViewOptions, IView, IMark, IViewEventConfig } from '../types';\nimport type { IRenderer } from '../types/renderer';\nimport { HOOK_EVENT } from './enums';\n\nexport default class CanvasRenderer implements IRenderer {\n  private _width: number;\n  private _height: number;\n\n  private _view: IView;\n  private _viewOptions: IViewOptions;\n  private _eventConfig: IViewEventConfig;\n  private _stage: Stage;\n  private _layer: ILayer;\n  private _dragController: DragNDrop;\n  private _gestureController: Gesture;\n  private _viewBox: IBoundsLike;\n\n  constructor(view: IView) {\n    this._view = view;\n  }\n\n  initialize(width: number, height: number, options: IViewOptions, eventConfig: IViewEventConfig) {\n    this._width = width;\n    this._height = height;\n    this._viewOptions = options;\n    this._eventConfig = eventConfig;\n\n    this.initStage();\n\n    // this method will invoke resize to size the canvas appropriately\n    return this;\n  }\n\n  stage() {\n    return this._stage ?? null;\n  }\n\n  gestureController() {\n    return this._gestureController ?? null;\n  }\n\n  canvas() {\n    if (this._stage) {\n      return this._stage.window.getNativeHandler().nativeCanvas;\n    }\n    return null;\n  }\n\n  context() {\n    if (this._stage) {\n      return this._stage.window.getContext().nativeContext;\n    }\n    return null;\n  }\n\n  combineIncrementalLayers() {\n    if (this._stage) {\n      waitForAllSubLayers(this._stage as any).then(() => {\n        // stage might be null in current tick\n        if (this._stage) {\n          this._stage.defaultLayer.combineSubLayer();\n        }\n      });\n    }\n    return this;\n  }\n\n  background(color: IColor) {\n    if (this._stage) {\n      this._stage.background = color;\n      return this;\n    }\n  }\n\n  setDpr(resolution: number, redraw: boolean) {\n    this._stage?.setDpr?.(resolution);\n    if (redraw) {\n      this.renderNextFrame();\n    }\n    return this;\n  }\n\n  shouldResize(width: number, height: number) {\n    return width !== this._width || height !== this._height;\n  }\n\n  resize(width: number, height: number) {\n    this._view.emit(HOOK_EVENT.BEFORE_STAGE_RESIZE);\n    if (this.shouldResize(width, height)) {\n      this._width = width;\n      this._height = height;\n      this._stage && this._stage.resize(width, height);\n    }\n\n    this._view.emit(HOOK_EVENT.AFTER_STAGE_RESIZE);\n\n    return this;\n  }\n\n  setViewBox(viewBox: IBoundsLike, rerender: boolean = true) {\n    if (!this._stage) {\n      return this;\n    }\n    if (\n      viewBox &&\n      (!this._viewBox ||\n        viewBox.x1 !== this._viewBox.x1 ||\n        viewBox.x2 !== this._viewBox.x2 ||\n        viewBox.y1 !== this._viewBox.y1 ||\n        viewBox.y2 !== this._viewBox.y2)\n    ) {\n      this._viewBox = viewBox;\n\n      // FIXME: vRender\n      this._stage.setViewBox(viewBox.x1, viewBox.y1, viewBox.x2 - viewBox.x1, viewBox.y2 - viewBox.y1, rerender);\n    }\n    return this;\n  }\n\n  render(immediately: boolean = false) {\n    this._view.emit(HOOK_EVENT.BEFORE_VRENDER_DRAW);\n\n    this.initStage();\n\n    // disable dirty bounds when render is called\n    this._stage.disableDirtyBounds();\n    this._stage.afterNextRender(this.handleAfterNextRender);\n\n    // render immediately and skip render in next frame\n    if (immediately) {\n      this._stage.render();\n\n      this._view.emit(HOOK_EVENT.AFTER_VRENDER_DRAW);\n    }\n    return this;\n  }\n\n  renderNextFrame() {\n    this.initStage();\n\n    this._stage.renderNextFrame();\n\n    return this;\n  }\n\n  toCanvas() {\n    if (this._stage) {\n      return this._stage.toCanvas();\n    }\n    return null;\n  }\n\n  preventRender(tag: boolean) {\n    if (this._stage) {\n      this._stage.preventRender(tag);\n    }\n  }\n\n  // toImageData() {\n  //   if (this._stage) {\n  //     return this._stage.toImageData();\n  //   }\n  //   return null;\n  // }\n\n  release() {\n    this._view.traverseMarkTree((mark: IMark) => {\n      mark.release();\n    });\n\n    if (this._dragController) {\n      this._dragController.release();\n    }\n    if (this._gestureController) {\n      this._gestureController.release();\n    }\n\n    if (this._stage !== (this._viewOptions?.stage as unknown as Stage)) {\n      // don't release the stage created by outside\n      this._stage.release();\n    }\n\n    this._stage = null;\n    this._layer = null;\n    this._dragController = null;\n    this._gestureController = null;\n  }\n\n  private createStage() {\n    this._view.emit(HOOK_EVENT.BEFORE_CREATE_VRENDER_STAGE);\n\n    const viewOptions = this._viewOptions;\n\n    const stage =\n      (viewOptions.stage as unknown as Stage) ??\n      createStage({\n        width: this._width,\n        height: this._height,\n        renderStyle: viewOptions.renderStyle,\n        viewBox: viewOptions.viewBox,\n        dpr: viewOptions.dpr,\n        canvas: viewOptions.renderCanvas,\n        canvasControled: viewOptions.canvasControled,\n        container: viewOptions.container,\n        title: viewOptions.rendererTitle,\n        beforeRender: viewOptions.beforeRender,\n        afterRender: viewOptions.afterRender,\n        disableDirtyBounds: true,\n        autoRender: true,\n        pluginList: viewOptions.pluginList,\n        enableHtmlAttribute: viewOptions.enableHtmlAttribute,\n        optimize: viewOptions.optimize,\n        supportsTouchEvents: viewOptions.supportsTouchEvents,\n        supportsPointerEvents: viewOptions.supportsPointerEvents\n      });\n\n    if (viewOptions.options3d?.enable) {\n      stage.set3dOptions(viewOptions.options3d);\n    }\n\n    stage.enableIncrementalAutoRender();\n\n    this._viewBox = viewOptions.viewBox;\n    this._view.emit(HOOK_EVENT.AFTER_CREATE_VRENDER_STAGE);\n\n    this._view.emit(HOOK_EVENT.BEFORE_CREATE_VRENDER_LAYER);\n    const layer = viewOptions.layer ?? (stage.defaultLayer as ILayer);\n    this._view.emit(HOOK_EVENT.AFTER_CREATE_VRENDER_LAYER);\n\n    if (this._eventConfig?.drag) {\n      // 允许 drag 事件\n      this._dragController = new DragNDrop(stage as unknown as IEventTarget);\n    }\n    if (this._eventConfig?.gesture) {\n      const gestureConfig = isObject(this._eventConfig.gesture) ? this._eventConfig.gesture : {};\n      // 允许手势\n      this._gestureController = new Gesture(stage as unknown as IEventTarget, gestureConfig);\n    }\n\n    return {\n      stage,\n      layer\n    };\n  }\n\n  private initStage() {\n    if (!this._stage) {\n      const { stage, layer } = this.createStage();\n\n      this._stage = stage;\n      this._layer = layer;\n\n      const background = this._view.background();\n      this.background(background);\n    }\n  }\n\n  private handleAfterNextRender = () => {\n    if (this._stage && !this._viewOptions.disableDirtyBounds) {\n      this._stage.enableDirtyBounds();\n    }\n\n    this._view.emit(HOOK_EVENT.AFTER_VRENDER_DRAW);\n    this._view.emit(HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER);\n  };\n}\n"]}

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.11.0";
+export declare const version = "0.11.2";
 export * from './graph';
 export * from './interactions';
 export { View } from './view';

package/cjs/index.js

@@ -18,7 +18,7 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.vglobal = exports.ThemeManager = exports.SIGNAL_VIEW_BOX = exports.SIGNAL_WIDTH = exports.SIGNAL_VIEW_WIDTH = exports.SIGNAL_VIEW_HEIGHT = exports.SIGNAL_PADDING = exports.SIGNAL_HEIGHT = exports.SIGNAL_AUTOFIT = exports.Factory = exports.GrammarBase = exports.invokeFunctionType = exports.parseFunctionType = exports.registerCoordinate = exports.Coordinate = exports.registerScale = exports.Scale = exports.View = exports.version = void 0, 
-exports.version = "0.11.0", __exportStar(require("./graph"), exports), __exportStar(require("./interactions"), exports);
+exports.version = "0.11.2", __exportStar(require("./graph"), exports), __exportStar(require("./interactions"), exports);
 
 var view_1 = require("./view");
 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,0CAAwB;AAExB,iDAA+B;AAE/B,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,sCAAoD;AAA3C,8FAAA,KAAK,OAAA;AAAE,sGAAA,aAAa,OAAA;AAC7B,gDAAmE;AAA1D,wGAAA,UAAU,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AACvC,qCAAqE;AAA5D,yGAAA,iBAAiB,OAAA;AAAE,0GAAA,kBAAkB,OAAA;AAC9C,oDAAkD;AAAzC,2GAAA,WAAW,OAAA;AACpB,8CAA4B;AAC5B,0CAAwB;AACxB,0CAAyC;AAAhC,kGAAA,OAAO,OAAA;AAChB,8CAQ0B;AAPxB,2GAAA,cAAc,OAAA;AACd,0GAAA,aAAa,OAAA;AACb,2GAAA,cAAc,OAAA;AACd,+GAAA,kBAAkB,OAAA;AAClB,8GAAA,iBAAiB,OAAA;AACjB,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AAGjB,uDAAqD;AAA5C,6GAAA,YAAY,OAAA;AAErB,0CAAwB;AACxB,8CAA4B;AAC5B,+CAA6B;AAC7B,8DAA4C;AAE5C,uDAAiD;AAAxC,uGAAA,OAAO,OAAA;AAChB,wCAAsB;AACtB,iDAA+B;AAC/B,wDAAsC;AACtC,4DAA0C;AAC1C,uDAAqC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.11.0\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\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\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,0CAAwB;AAExB,iDAA+B;AAE/B,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,sCAAoD;AAA3C,8FAAA,KAAK,OAAA;AAAE,sGAAA,aAAa,OAAA;AAC7B,gDAAmE;AAA1D,wGAAA,UAAU,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AACvC,qCAAqE;AAA5D,yGAAA,iBAAiB,OAAA;AAAE,0GAAA,kBAAkB,OAAA;AAC9C,oDAAkD;AAAzC,2GAAA,WAAW,OAAA;AACpB,8CAA4B;AAC5B,0CAAwB;AACxB,0CAAyC;AAAhC,kGAAA,OAAO,OAAA;AAChB,8CAQ0B;AAPxB,2GAAA,cAAc,OAAA;AACd,0GAAA,aAAa,OAAA;AACb,2GAAA,cAAc,OAAA;AACd,+GAAA,kBAAkB,OAAA;AAClB,8GAAA,iBAAiB,OAAA;AACjB,yGAAA,YAAY,OAAA;AACZ,4GAAA,eAAe,OAAA;AAGjB,uDAAqD;AAA5C,6GAAA,YAAY,OAAA;AAErB,0CAAwB;AACxB,8CAA4B;AAC5B,+CAA6B;AAC7B,8DAA4C;AAE5C,uDAAiD;AAAxC,uGAAA,OAAO,OAAA;AAChB,wCAAsB;AACtB,iDAA+B;AAC/B,wDAAsC;AACtC,4DAA0C;AAC1C,uDAAqC","file":"index.js","sourcesContent":["// -- Exports -----\nexport const version = \"0.11.2\";\n\nexport * from './graph';\n\nexport * from './interactions';\n\nexport { View } from './view';\nexport { Scale, registerScale } from './view/scale';\nexport { Coordinate, registerCoordinate } from './view/coordinate';\nexport { parseFunctionType, invokeFunctionType } from './parse/util';\nexport { GrammarBase } from './view/grammar-base';\nexport * from './util/text';\nexport * from './types';\nexport { Factory } from './core/factory';\nexport {\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\nexport { ThemeManager } from './theme/theme-manager';\n\nexport * from './glyph';\nexport * from './component';\nexport * from './transforms';\nexport * from './graph/animation/animation';\n\nexport { vglobal } from '@visactor/vrender-core';\nexport * from './env';\nexport * from './interactions';\nexport * from './semantic-marks/cell';\nexport * from './semantic-marks/interval';\nexport * from './graph/mark/graphic';\n"]}

package/cjs/interactions/utils.js

@@ -15,7 +15,7 @@ const groupMarksByState = (marks, states) => {
     if (!states || !marks) return null;
     const res = {};
     return marks.forEach((mark => {
-        const encode = mark.getSpec().encode;
+        const markSpec = mark && mark.getSpec(), encode = markSpec && markSpec.encode;
         encode && states.forEach((state => {
             state && encode[state] && (res[state] || (res[state] = []), res[state].push(mark));
         }));

package/cjs/interactions/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interactions/utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,mBAAmB,GAAG,CAAC,OAA6B,EAAE,EAAE;IACnE,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,OAAO,CAAC,EAAY,EAAE,EAAE;;YACtB,OAAO,MAAA,EAAE,CAAC,QAAQ,EAAE,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9C,CAAC,CAAC;KACH;IAED,OAAO,CAAC,EAAY,EAAE,EAAE;QACtB,OAAO,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,mBAAmB,uBAU9B;AAEK,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAE,MAAgB,EAA2B,EAAE;IAC7F,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,GAAG,EAAE,CAAC;IAEf,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,MAAM,MAAM,GAAI,IAAI,CAAC,OAAO,EAAe,CAAC,MAAM,CAAC;QAEnD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;oBACf,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;iBACjB;gBAED,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA1BW,QAAA,iBAAiB,qBA0B5B","file":"utils.js","sourcesContent":["import type { ElementFilterOptions, IElement, IMark, MarkSpec } from '../types';\n\nexport const generateFilterValue = (options: ElementFilterOptions) => {\n  if (options.filterField) {\n    return (el: IElement) => {\n      return el.getDatum()?.[options.filterField];\n    };\n  }\n\n  return (el: IElement) => {\n    return el[options.filterType];\n  };\n};\n\nexport const groupMarksByState = (marks: IMark[], states: string[]): Record<string, IMark[]> => {\n  if (!states || !marks) {\n    return null;\n  }\n\n  const res = {};\n\n  marks.forEach(mark => {\n    const encode = (mark.getSpec() as MarkSpec).encode;\n\n    if (!encode) {\n      return;\n    }\n\n    states.forEach(state => {\n      if (state && encode[state]) {\n        if (!res[state]) {\n          res[state] = [];\n        }\n\n        res[state].push(mark);\n      }\n    });\n  });\n\n  return res;\n};\n"]}
+{"version":3,"sources":["../src/interactions/utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,mBAAmB,GAAG,CAAC,OAA6B,EAAE,EAAE;IACnE,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,OAAO,CAAC,EAAY,EAAE,EAAE;;YACtB,OAAO,MAAA,EAAE,CAAC,QAAQ,EAAE,0CAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAC9C,CAAC,CAAC;KACH;IAED,OAAO,CAAC,EAAY,EAAE,EAAE;QACtB,OAAO,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,mBAAmB,uBAU9B;AAEK,MAAM,iBAAiB,GAAG,CAAC,KAAc,EAAE,MAAgB,EAA2B,EAAE;IAC7F,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,GAAG,GAAG,EAAE,CAAC;IAEf,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,MAAM,QAAQ,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAa,CAAC;QACtD,MAAM,MAAM,GAAG,QAAQ,IAAI,QAAQ,CAAC,MAAM,CAAC;QAE3C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QAED,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACrB,IAAI,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;oBACf,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;iBACjB;gBAED,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACvB;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B","file":"utils.js","sourcesContent":["import type { ElementFilterOptions, IElement, IMark, MarkSpec } from '../types';\n\nexport const generateFilterValue = (options: ElementFilterOptions) => {\n  if (options.filterField) {\n    return (el: IElement) => {\n      return el.getDatum()?.[options.filterField];\n    };\n  }\n\n  return (el: IElement) => {\n    return el[options.filterType];\n  };\n};\n\nexport const groupMarksByState = (marks: IMark[], states: string[]): Record<string, IMark[]> => {\n  if (!states || !marks) {\n    return null;\n  }\n\n  const res = {};\n\n  marks.forEach(mark => {\n    const markSpec = (mark && mark.getSpec()) as MarkSpec;\n    const encode = markSpec && markSpec.encode;\n\n    if (!encode) {\n      return;\n    }\n\n    states.forEach(state => {\n      if (state && encode[state]) {\n        if (!res[state]) {\n          res[state] = [];\n        }\n\n        res[state].push(mark);\n      }\n    });\n  });\n\n  return res;\n};\n"]}

package/cjs/types/grammar.d.ts

@@ -56,6 +56,7 @@ export interface IGrammarBase {
     reuse: (grammar: IGrammarBase) => this;
     clear: () => void;
     release: () => void;
+    evaluate: (upstream: any, parameters: any) => this;
 }
 export interface IData extends IGrammarBase {
     values: (values: any | Nil, format?: ParameterFunctionType<DataFormatSpec>, load?: boolean) => this;

package/cjs/types/grammar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/types/grammar.ts"],"names":[],"mappings":"","file":"grammar.js","sourcesContent":["import type { EventEmitter, IBounds, IPointLike } from '@visactor/vutils';\nimport type { IGraphic, IGroup } from '@visactor/vrender-core';\nimport type { IBaseScale, ScaleFishEyeOptions, TickData } from '@visactor/vscale';\nimport type { ITransform, TransformSpec } from './transform';\nimport type { DataFormatSpec, IDataFilter } from './data';\nimport type { ParameterFunctionType, SignalFunctionType } from './signal';\nimport type { IAnimate } from './animate';\nimport type { IGlyphMeta } from './glyph';\nimport type { GrammarTypeEnum } from '../graph/enums';\nimport type { Nil } from './base';\nimport type { CoordinateFunctionType } from './coordinate';\nimport type { IElement } from './element';\nimport type {\n  MarkFunctionType,\n  MarkAnimationSpec,\n  MarkType,\n  MarkLayoutSpec,\n  MarkLayoutCallback,\n  MarkSortSpec,\n  MarkKeySpec,\n  IMarkConfig,\n  ChannelEncodeType,\n  AttributeTransform,\n  BaseSingleEncodeSpec\n} from './mark';\nimport type { ScaleConfigureSpec, ScaleData, ScaleFunctionType, GrammarScaleType, MultiScaleData } from './scale';\nimport type { IView } from './view';\nimport type { BaseEventHandler } from './event';\nimport type { ICartesianCoordinate, IPolarCoordinate } from '@visactor/vgrammar-coordinate';\n\nexport type BuiltInGrammarType = keyof typeof GrammarTypeEnum;\nexport type GrammarType = BuiltInGrammarType | string;\n\n/** 语法元素内置运行的任务 */\nexport interface IGrammarTask extends ITransform {\n  /**\n   * 参数依赖\n   * 只做一级解析\n   */\n  options?: Record<string, any | IGrammarBase> | (IGrammarBase | any)[];\n  /**\n   * 依赖的语法元素\n   */\n  references?: IGrammarBase[];\n  /**\n   * 是否只支持简单的options配置，不支持在options引用语法元素\n   */\n  isRawOptions?: boolean;\n}\n\nexport interface GrammarSpec {\n  id?: string;\n  dependency?: IGrammarBase[] | IGrammarBase | string[] | string;\n}\n\nexport interface IGrammarBase {\n  readonly grammarType: GrammarType;\n  readonly view: IView;\n  readonly uid: number;\n  /**\n   * 执行的上游节点\n   */\n  grammarSource: IGrammarBase;\n  /**\n   * 影响的下游节点\n   */\n  targets: IGrammarBase[];\n  /**\n   * 依赖的上游节点，由于不同 spec 配置项中可能引用同一个节点，需要进行计数\n   */\n  references: Map<IGrammarBase, number>;\n\n  depend: (grammar: IGrammarBase[] | IGrammarBase | string[] | string) => this;\n\n  addEventListener: (type: string, handler: BaseEventHandler, options?: any) => this;\n  removeEventListener: (type: string, handler: BaseEventHandler) => this;\n\n  // extended from EventEmitter\n  emit: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n  emitGrammarEvent: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n\n  tasks?: IGrammarTask[];\n  // value?: any;\n  /** FIXME: operator执行顺序，改造后，dataflow执行元素，应该抽象出来 */\n  rank?: number;\n  // todo\n  set: (value: any) => boolean;\n  id: (() => string) & ((id: string) => this);\n  name: (() => string) & ((name: string) => this);\n  attach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detachAll: () => void;\n  commit: () => void;\n  output: () => any;\n  parse: (spec: any) => this;\n  parameters: () => { [key: string]: any };\n  getSpec: () => any;\n  reuse: (grammar: IGrammarBase) => this;\n  /** clear references */\n  clear: () => void;\n  /** release all memory storage */\n  release: () => void;\n}\n\nexport interface IData extends IGrammarBase {\n  values: (values: any | Nil, format?: ParameterFunctionType<DataFormatSpec>, load?: boolean) => this;\n  url: (\n    url: ParameterFunctionType<string> | Nil,\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  source: (\n    source: string | string[] | IData | IData[],\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  // only used in VGrammar\n  addDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n  removeDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n\n  // data util methods\n  field: (field: string) => any[];\n  getValue: () => any[];\n  getInput: () => any[];\n  getDataIDKey: () => string;\n}\n\n/** 语法元素,TODO */\nexport interface ISignal<T> extends IGrammarBase {\n  value: (value: T | Nil) => this;\n  update: (update: SignalFunctionType<T> | Nil) => this;\n\n  getValue: () => T;\n}\n\n/** 语法元素,TODO */\nexport interface IScale extends IGrammarBase {\n  domain: (domain: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  range: (range: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  configure: (config: ScaleConfigureSpec | Nil) => this;\n  tickCount: (tickCount: ScaleFunctionType<number> | Nil) => this;\n\n  // only used in VGrammar\n  getRangeFactor: () => [number, number] | Nil;\n  setRangeFactor: (range?: [number, number]) => this;\n  getFishEye: () => ScaleFishEyeOptions | Nil;\n  setFishEye: (option?: ScaleFishEyeOptions) => this;\n\n  // scale util methods\n  getScaleType: () => GrammarScaleType;\n  getScale: () => IBaseScale;\n  ticks: (count?: number) => TickData[];\n  getCoordinateAxisPoints: (baseValue?: number) => [IPointLike, IPointLike];\n  getCoordinate: () => IPolarCoordinate | ICartesianCoordinate;\n  getCoordinateAxisPosition: () => 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'outside' | 'start' | 'end';\n}\n\nexport interface ICoordinate extends IGrammarBase {\n  start: (start: CoordinateFunctionType<[number, number]> | Nil) => this;\n  end: (end: CoordinateFunctionType<[number, number]> | Nil) => this;\n  origin: (origin: CoordinateFunctionType<[number, number]> | Nil) => this;\n\n  translate: (offset: CoordinateFunctionType<[number, number]> | Nil) => this;\n  rotate: (angle: CoordinateFunctionType<number> | Nil) => this;\n  scale: (ratio: CoordinateFunctionType<[number, number]> | Nil) => this;\n  transpose: (isTransposed: CoordinateFunctionType<boolean> | Nil) => this;\n\n  // coordinate util methods\n}\n\n/** 语法元素,TODO */\n\n/** group mark */\nexport interface IGroupMark extends IMark {\n  children: (IMark | IGroupMark | IGlyphMark)[];\n\n  layoutChildren?: (IMark | IGroupMark | IGlyphMark)[];\n\n  appendChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  removeChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  includesChild: (mark: IMark, descendant?: boolean) => boolean;\n\n  updateLayoutChildren: () => this;\n}\n\nexport interface IGlyphMark extends IMark {\n  glyphType: string;\n  getGlyphMeta: () => IGlyphMeta;\n  configureGlyph: (config: any) => this;\n  getGlyphConfig: () => any;\n}\n\nexport interface IComponent extends IMark {\n  componentType: string;\n  configureComponent: (config: any) => this;\n}\n\nexport interface IProgressiveGrammar {\n  /** 是否启动了增量渲染模式 */\n  isProgressive: () => boolean;\n  /** 是否正在执行增量渲染 */\n  isDoingProgressive: () => boolean;\n  /** 清除增量渲染相关状态 */\n  clearProgressive: () => void;\n  /** 从第一帧开始增量计算 */\n  restartProgressive: () => void;\n  /** 分片执行 */\n  evaluateProgressive: () => void;\n}\n\nexport interface IMark extends IGrammarBase, IProgressiveGrammar {\n  group?: IGroupMark;\n\n  markType: MarkType;\n  coord: ICoordinate;\n  /**\n   * disable coordinate transform when need\n   */\n  disableCoordinateTransform?: boolean;\n  elements: IElement[];\n  elementMap: Map<string, IElement>;\n  graphicIndex: number;\n  graphicItem?: IGroup;\n  animate?: IAnimate;\n\n  join: (\n    data: IData | string | Nil,\n    key?: MarkKeySpec,\n    sort?: MarkSortSpec,\n    groupBy?: MarkKeySpec,\n    groupSort?: MarkSortSpec\n  ) => this;\n  coordinate: (coordinate: ICoordinate | string | Nil) => this;\n  state: (state: MarkFunctionType<string | string[]> | Nil) => this;\n  encode: ((encoders: BaseSingleEncodeSpec, clear?: boolean) => this) &\n    ((channel: string, value: ChannelEncodeType, clear?: boolean) => this);\n  encodeState: ((state: string, channel: string, value: ChannelEncodeType, clear?: boolean) => this) &\n    ((state: string, encoders: BaseSingleEncodeSpec, clear?: boolean) => this);\n  animation: (animationConfig: MarkAnimationSpec | Nil) => this;\n  animationState: (animationState: MarkFunctionType<string> | Nil) => this;\n  layout: (layout: MarkLayoutSpec | MarkLayoutCallback | Nil) => this;\n  configure: (config: IMarkConfig | Nil) => this;\n  context: (context: any) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  needAnimate: () => boolean;\n  getBounds: () => IBounds;\n  isCollectionMark: () => boolean;\n  getAllElements: () => IElement[];\n  getContext: () => any;\n\n  // position: () => this;\n  // color: () => this;\n  // shape: () => this;\n\n  // mark 执行流程相关接口\n\n  isUpdated: boolean;\n  getGroupGraphicItem: () => any;\n  cleanExitElements: () => void;\n  addGraphicItem: (attrs: any, groupKey?: string) => IGraphic;\n  getMorphConfig: () => { morph: boolean; morphKey: string | undefined; morphElementKey: string | undefined };\n  prepareRelease: () => void;\n\n  layoutBounds?: IBounds;\n  relativePosition?: { top?: number; bottom?: number; left?: number; right?: number };\n  needLayout: () => boolean;\n  handleLayoutEnd: () => void;\n  handleRenderEnd: () => void;\n  isLargeMode: () => boolean;\n  getAttributeTransforms: () => AttributeTransform[];\n\n  getScalesByChannel: () => Record<string, IBaseScale> | undefined;\n  getFieldsByChannel: () => Record<string, string> | undefined;\n  getScales: () => Record<string, IBaseScale> | undefined;\n}\n\nexport interface IGrammarBaseConstructor<T extends string = any> {\n  new (view: IView, grammarType: T): IGrammarBase;\n}\n\nexport interface ProgressiveContext {\n  currentIndex: number;\n  totalStep: number;\n  step: number;\n  data: any[];\n  groupKeys?: string[];\n  groupedData?: Map<string, any[]>;\n}\n"]}
+{"version":3,"sources":["../src/types/grammar.ts"],"names":[],"mappings":"","file":"grammar.js","sourcesContent":["import type { EventEmitter, IBounds, IPointLike } from '@visactor/vutils';\nimport type { IGraphic, IGroup } from '@visactor/vrender-core';\nimport type { IBaseScale, ScaleFishEyeOptions, TickData } from '@visactor/vscale';\nimport type { ITransform, TransformSpec } from './transform';\nimport type { DataFormatSpec, IDataFilter } from './data';\nimport type { ParameterFunctionType, SignalFunctionType } from './signal';\nimport type { IAnimate } from './animate';\nimport type { IGlyphMeta } from './glyph';\nimport type { GrammarTypeEnum } from '../graph/enums';\nimport type { Nil } from './base';\nimport type { CoordinateFunctionType } from './coordinate';\nimport type { IElement } from './element';\nimport type {\n  MarkFunctionType,\n  MarkAnimationSpec,\n  MarkType,\n  MarkLayoutSpec,\n  MarkLayoutCallback,\n  MarkSortSpec,\n  MarkKeySpec,\n  IMarkConfig,\n  ChannelEncodeType,\n  AttributeTransform,\n  BaseSingleEncodeSpec\n} from './mark';\nimport type { ScaleConfigureSpec, ScaleData, ScaleFunctionType, GrammarScaleType, MultiScaleData } from './scale';\nimport type { IView } from './view';\nimport type { BaseEventHandler } from './event';\nimport type { ICartesianCoordinate, IPolarCoordinate } from '@visactor/vgrammar-coordinate';\n\nexport type BuiltInGrammarType = keyof typeof GrammarTypeEnum;\nexport type GrammarType = BuiltInGrammarType | string;\n\n/** 语法元素内置运行的任务 */\nexport interface IGrammarTask extends ITransform {\n  /**\n   * 参数依赖\n   * 只做一级解析\n   */\n  options?: Record<string, any | IGrammarBase> | (IGrammarBase | any)[];\n  /**\n   * 依赖的语法元素\n   */\n  references?: IGrammarBase[];\n  /**\n   * 是否只支持简单的options配置，不支持在options引用语法元素\n   */\n  isRawOptions?: boolean;\n}\n\nexport interface GrammarSpec {\n  id?: string;\n  dependency?: IGrammarBase[] | IGrammarBase | string[] | string;\n}\n\nexport interface IGrammarBase {\n  readonly grammarType: GrammarType;\n  readonly view: IView;\n  readonly uid: number;\n  /**\n   * 执行的上游节点\n   */\n  grammarSource: IGrammarBase;\n  /**\n   * 影响的下游节点\n   */\n  targets: IGrammarBase[];\n  /**\n   * 依赖的上游节点，由于不同 spec 配置项中可能引用同一个节点，需要进行计数\n   */\n  references: Map<IGrammarBase, number>;\n\n  depend: (grammar: IGrammarBase[] | IGrammarBase | string[] | string) => this;\n\n  addEventListener: (type: string, handler: BaseEventHandler, options?: any) => this;\n  removeEventListener: (type: string, handler: BaseEventHandler) => this;\n\n  // extended from EventEmitter\n  emit: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n  emitGrammarEvent: <T extends EventEmitter.EventNames<string | symbol>>(\n    event: T,\n    ...args: EventEmitter.EventArgs<string | symbol, T>\n  ) => boolean;\n\n  tasks?: IGrammarTask[];\n  // value?: any;\n  /** FIXME: operator执行顺序，改造后，dataflow执行元素，应该抽象出来 */\n  rank?: number;\n  // todo\n  set: (value: any) => boolean;\n  id: (() => string) & ((id: string) => this);\n  name: (() => string) & ((name: string) => this);\n  attach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detach: (reference: IGrammarBase | IGrammarBase[], count?: number) => this;\n  detachAll: () => void;\n  commit: () => void;\n  output: () => any;\n  parse: (spec: any) => this;\n  parameters: () => { [key: string]: any };\n  getSpec: () => any;\n  reuse: (grammar: IGrammarBase) => this;\n  /** clear references */\n  clear: () => void;\n  /** release all memory storage */\n  release: () => void;\n  evaluate: (upstream: any, parameters: any) => this;\n}\n\nexport interface IData extends IGrammarBase {\n  values: (values: any | Nil, format?: ParameterFunctionType<DataFormatSpec>, load?: boolean) => this;\n  url: (\n    url: ParameterFunctionType<string> | Nil,\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  source: (\n    source: string | string[] | IData | IData[],\n    format?: ParameterFunctionType<DataFormatSpec>,\n    load?: boolean\n  ) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  // only used in VGrammar\n  addDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n  removeDataFilter: (filter: IDataFilter | IDataFilter[]) => this;\n\n  // data util methods\n  field: (field: string) => any[];\n  getValue: () => any[];\n  getInput: () => any[];\n  getDataIDKey: () => string;\n}\n\n/** 语法元素,TODO */\nexport interface ISignal<T> extends IGrammarBase {\n  value: (value: T | Nil) => this;\n  update: (update: SignalFunctionType<T> | Nil) => this;\n\n  getValue: () => T;\n}\n\n/** 语法元素,TODO */\nexport interface IScale extends IGrammarBase {\n  domain: (domain: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  range: (range: ScaleFunctionType<any[]> | ScaleData | MultiScaleData | Nil) => this;\n  configure: (config: ScaleConfigureSpec | Nil) => this;\n  tickCount: (tickCount: ScaleFunctionType<number> | Nil) => this;\n\n  // only used in VGrammar\n  getRangeFactor: () => [number, number] | Nil;\n  setRangeFactor: (range?: [number, number]) => this;\n  getFishEye: () => ScaleFishEyeOptions | Nil;\n  setFishEye: (option?: ScaleFishEyeOptions) => this;\n\n  // scale util methods\n  getScaleType: () => GrammarScaleType;\n  getScale: () => IBaseScale;\n  ticks: (count?: number) => TickData[];\n  getCoordinateAxisPoints: (baseValue?: number) => [IPointLike, IPointLike];\n  getCoordinate: () => IPolarCoordinate | ICartesianCoordinate;\n  getCoordinateAxisPosition: () => 'top' | 'bottom' | 'left' | 'right' | 'inside' | 'outside' | 'start' | 'end';\n}\n\nexport interface ICoordinate extends IGrammarBase {\n  start: (start: CoordinateFunctionType<[number, number]> | Nil) => this;\n  end: (end: CoordinateFunctionType<[number, number]> | Nil) => this;\n  origin: (origin: CoordinateFunctionType<[number, number]> | Nil) => this;\n\n  translate: (offset: CoordinateFunctionType<[number, number]> | Nil) => this;\n  rotate: (angle: CoordinateFunctionType<number> | Nil) => this;\n  scale: (ratio: CoordinateFunctionType<[number, number]> | Nil) => this;\n  transpose: (isTransposed: CoordinateFunctionType<boolean> | Nil) => this;\n\n  // coordinate util methods\n}\n\n/** 语法元素,TODO */\n\n/** group mark */\nexport interface IGroupMark extends IMark {\n  children: (IMark | IGroupMark | IGlyphMark)[];\n\n  layoutChildren?: (IMark | IGroupMark | IGlyphMark)[];\n\n  appendChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  removeChild: (mark: IMark | IGroupMark | IGlyphMark) => this;\n  includesChild: (mark: IMark, descendant?: boolean) => boolean;\n\n  updateLayoutChildren: () => this;\n}\n\nexport interface IGlyphMark extends IMark {\n  glyphType: string;\n  getGlyphMeta: () => IGlyphMeta;\n  configureGlyph: (config: any) => this;\n  getGlyphConfig: () => any;\n}\n\nexport interface IComponent extends IMark {\n  componentType: string;\n  configureComponent: (config: any) => this;\n}\n\nexport interface IProgressiveGrammar {\n  /** 是否启动了增量渲染模式 */\n  isProgressive: () => boolean;\n  /** 是否正在执行增量渲染 */\n  isDoingProgressive: () => boolean;\n  /** 清除增量渲染相关状态 */\n  clearProgressive: () => void;\n  /** 从第一帧开始增量计算 */\n  restartProgressive: () => void;\n  /** 分片执行 */\n  evaluateProgressive: () => void;\n}\n\nexport interface IMark extends IGrammarBase, IProgressiveGrammar {\n  group?: IGroupMark;\n\n  markType: MarkType;\n  coord: ICoordinate;\n  /**\n   * disable coordinate transform when need\n   */\n  disableCoordinateTransform?: boolean;\n  elements: IElement[];\n  elementMap: Map<string, IElement>;\n  graphicIndex: number;\n  graphicItem?: IGroup;\n  animate?: IAnimate;\n\n  join: (\n    data: IData | string | Nil,\n    key?: MarkKeySpec,\n    sort?: MarkSortSpec,\n    groupBy?: MarkKeySpec,\n    groupSort?: MarkSortSpec\n  ) => this;\n  coordinate: (coordinate: ICoordinate | string | Nil) => this;\n  state: (state: MarkFunctionType<string | string[]> | Nil) => this;\n  encode: ((encoders: BaseSingleEncodeSpec, clear?: boolean) => this) &\n    ((channel: string, value: ChannelEncodeType, clear?: boolean) => this);\n  encodeState: ((state: string, channel: string, value: ChannelEncodeType, clear?: boolean) => this) &\n    ((state: string, encoders: BaseSingleEncodeSpec, clear?: boolean) => this);\n  animation: (animationConfig: MarkAnimationSpec | Nil) => this;\n  animationState: (animationState: MarkFunctionType<string> | Nil) => this;\n  layout: (layout: MarkLayoutSpec | MarkLayoutCallback | Nil) => this;\n  configure: (config: IMarkConfig | Nil) => this;\n  context: (context: any) => this;\n  transform: (transform: TransformSpec[] | Nil) => this;\n\n  needAnimate: () => boolean;\n  getBounds: () => IBounds;\n  isCollectionMark: () => boolean;\n  getAllElements: () => IElement[];\n  getContext: () => any;\n\n  // position: () => this;\n  // color: () => this;\n  // shape: () => this;\n\n  // mark 执行流程相关接口\n\n  isUpdated: boolean;\n  getGroupGraphicItem: () => any;\n  cleanExitElements: () => void;\n  addGraphicItem: (attrs: any, groupKey?: string) => IGraphic;\n  getMorphConfig: () => { morph: boolean; morphKey: string | undefined; morphElementKey: string | undefined };\n  prepareRelease: () => void;\n\n  layoutBounds?: IBounds;\n  relativePosition?: { top?: number; bottom?: number; left?: number; right?: number };\n  needLayout: () => boolean;\n  handleLayoutEnd: () => void;\n  handleRenderEnd: () => void;\n  isLargeMode: () => boolean;\n  getAttributeTransforms: () => AttributeTransform[];\n\n  getScalesByChannel: () => Record<string, IBaseScale> | undefined;\n  getFieldsByChannel: () => Record<string, string> | undefined;\n  getScales: () => Record<string, IBaseScale> | undefined;\n}\n\nexport interface IGrammarBaseConstructor<T extends string = any> {\n  new (view: IView, grammarType: T): IGrammarBase;\n}\n\nexport interface ProgressiveContext {\n  currentIndex: number;\n  totalStep: number;\n  step: number;\n  data: any[];\n  groupKeys?: string[];\n  groupedData?: Map<string, any[]>;\n}\n"]}

package/cjs/view/View.js

@@ -70,12 +70,18 @@ class View extends vutils_1.EventEmitter {
     }
     getMarksBySelector(selector) {
         if (!selector) return null;
-        const selectors = (0, vutils_1.array)(selector);
-        let res = [];
+        const selectors = (0, vutils_1.array)(selector), res = [];
         return selectors.forEach((selectorStr => {
-            (0, util_1.isGrammar)(selectorStr) ? res = res.concat(selectorStr) : (selectorStr[0] === event_1.ID_PREFIX && (res = res.concat(this.getMarkById(selectorStr.slice(1)))), 
-            selectorStr[0] === event_1.NAME_PREFIX && (res = res.concat(this.getMarksByName(selectorStr.slice(1)))), 
-            (0, graphic_1.isMarkType)(selectorStr) && (res = res.concat(this.getMarksByType(selectorStr))));
+            if ((0, util_1.isGrammar)(selectorStr)) return void res.push(selectorStr);
+            if (selectorStr[0] === event_1.ID_PREFIX) {
+                const mark = this.getMarkById(selectorStr.slice(1));
+                return void (mark && res.push(mark));
+            }
+            const marks = selectorStr[0] === event_1.NAME_PREFIX ? this.getMarksByName(selectorStr.slice(1)) : (0, 
+            graphic_1.isMarkType)(selectorStr) ? this.getMarksByType(selectorStr) : null;
+            marks && marks.length && marks.forEach((mark => {
+                res.push(mark);
+            }));
         })), res;
     }
     updateSignal(signal, value) {
@@ -395,18 +401,17 @@ class View extends vutils_1.EventEmitter {
         this.renderer.render(immediately), this.handleRenderEnd()), this.emit(enums_1.HOOK_EVENT.AFTER_DO_RENDER);
     }
     evaluate(runningConfig) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const normalizedRunningConfig = (0, view_1.normalizeRunningConfig)(runningConfig), grammarWillDetach = this._cachedGrammars.size() > 0;
         grammarWillDetach && (this.reuseCachedGrammars(normalizedRunningConfig), this.detachCachedGrammar());
         const hasResize = this._resizeRenderer(), hasUpdate = this._dataflow.hasCommitted();
         return grammarWillDetach || hasUpdate || this._layoutState || hasResize ? (this.clearProgressive(), 
-        null === (_a = this.renderer) || void 0 === _a || _a.preventRender(!0), this._dataflow.evaluate(), 
-        this._needBuildLayoutTree && (this.buildLayoutTree(), this._needBuildLayoutTree = !1), 
-        this._layoutState && (this._layoutState = enums_1.LayoutState.layouting, this.doLayout(), 
-        this._dataflow.hasCommitted() && (this._layoutState = enums_1.LayoutState.reevaluate, 
-        this._dataflow.evaluate()), this._layoutState = enums_1.LayoutState.after, (null === (_b = this._layoutMarks) || void 0 === _b ? void 0 : _b.length) && this.handleLayoutEnd()), 
-        null === (_c = this.renderer) || void 0 === _c || _c.preventRender(!1), this._layoutState = null, 
-        this.findProgressiveMarks(), this._resizeRenderer(), this.doRender(!1), null === (_d = this._willMorphMarks) || void 0 === _d || _d.forEach((morphMarks => {
+        this._dataflow.evaluate(), this._needBuildLayoutTree && (this.buildLayoutTree(), 
+        this._needBuildLayoutTree = !1), this._layoutState && (this._layoutState = enums_1.LayoutState.layouting, 
+        this.doLayout(), this._dataflow.hasCommitted() && (this._layoutState = enums_1.LayoutState.reevaluate, 
+        this._dataflow.evaluate()), this._layoutState = enums_1.LayoutState.after, (null === (_a = this._layoutMarks) || void 0 === _a ? void 0 : _a.length) && this.handleLayoutEnd()), 
+        this._layoutState = null, this.findProgressiveMarks(), this._resizeRenderer(), this.doRender(!0), 
+        null === (_b = this._willMorphMarks) || void 0 === _b || _b.forEach((morphMarks => {
             this._morph.morph(morphMarks.prev, morphMarks.next, normalizedRunningConfig);
         })), this._willMorphMarks = null, this.releaseCachedGrammars(normalizedRunningConfig), 
         this.doPreProgressive(), this) : this;