@visactor/vchart 1.6.0-alpha.0 → 1.6.0

package/cjs/mark/component.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ComponentMark = void 0;
 
-const vgrammar_core_1 = require("@visactor/vgrammar-core"), base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const vgrammar_core_1 = require("@visactor/vgrammar-core"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class ComponentMark extends base_mark_1.BaseMark {
     constructor(name, option) {
@@ -20,5 +20,5 @@ class ComponentMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.ComponentMark = ComponentMark, ComponentMark.type = interface_1.MarkTypeEnum.component;
+exports.ComponentMark = ComponentMark, ComponentMark.type = type_1.MarkTypeEnum.component;
 //# sourceMappingURL=component.js.map

package/cjs/mark/component.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":";;;AAEA,2DAA0D;AAE1D,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,aAAc,SAAQ,oBAAqB;IAOtD,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QANtB,SAAI,GAAW,WAAW,CAAC;QAQzB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;IAC3B,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI;aACjB,IAAI,CAAC,+BAAe,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;aACjH,EAAE,CAAC,EAAE,CAAC,CAAC;QACV,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAvBH,sCAwBC;AAvBiB,kBAAI,GAAG,wBAAY,CAAC,SAAS,CAAC","file":"component.js","sourcesContent":["import type { IGroupMark } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport type { ICommonSpec } from '../typings';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkOption, IMarkRaw } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IComponentMark = IMarkRaw<ICommonSpec>;\n\nexport class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {\n  static readonly type = MarkTypeEnum.component;\n  type: string = 'component';\n\n  private _componentType: string;\n  private _mode: '2d' | '3d';\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n    // 这里需要将 type 指定为具体的组件名称，即调用 vgrammar 的 registerComponent API 注册的组件名称\n    this._componentType = option.componentType;\n    this._mode = option.mode;\n  }\n  /** 创建语法元素对象 */\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    this._product = view\n      .mark(GrammarMarkType.component, group ?? view.rootMark, { componentType: this._componentType, mode: this._mode })\n      .id(id);\n    this._compiledProductId = id;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":";;;AAEA,2DAA0D;AAE1D,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,aAAc,SAAQ,oBAAqB;IAOtD,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QANtB,SAAI,GAAW,WAAW,CAAC;QAQzB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,aAAa,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC;IAC3B,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,IAAI;aACjB,IAAI,CAAC,+BAAe,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;aACjH,EAAE,CAAC,EAAE,CAAC,CAAC;QACV,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAvBH,sCAwBC;AAvBiB,kBAAI,GAAG,mBAAY,CAAC,SAAS,CAAC","file":"component.js","sourcesContent":["import type { IGroupMark } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport type { ICommonSpec } from '../typings';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkOption, IMarkRaw } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IComponentMark = IMarkRaw<ICommonSpec>;\n\nexport class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {\n  static readonly type = MarkTypeEnum.component;\n  type: string = 'component';\n\n  private _componentType: string;\n  private _mode: '2d' | '3d';\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n    // 这里需要将 type 指定为具体的组件名称，即调用 vgrammar 的 registerComponent API 注册的组件名称\n    this._componentType = option.componentType;\n    this._mode = option.mode;\n  }\n  /** 创建语法元素对象 */\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    this._product = view\n      .mark(GrammarMarkType.component, group ?? view.rootMark, { componentType: this._componentType, mode: this._mode })\n      .id(id);\n    this._compiledProductId = id;\n  }\n}\n"]}

package/cjs/mark/group.d.ts

@@ -2,7 +2,7 @@ import type { Maybe } from '../typings';
 import type { IGroupMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMark, IMarkRaw, IMarkStyle, MarkType } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 import type { IGroupMark as IVGrammarGroupMark } from '@visactor/vgrammar-core';
 import type { IMarkCompileOption } from '../compile/mark';
 export interface IGroupMark extends IMarkRaw<IGroupMarkSpec> {

package/cjs/mark/group.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.GroupMark = void 0;
 
-const util_1 = require("../util"), base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const debug_1 = require("../util/debug"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class GroupMark extends base_mark_1.BaseMark {
     constructor() {
@@ -22,12 +22,12 @@ class GroupMark extends base_mark_1.BaseMark {
         return void 0 !== this._marks.find((m => m.id === mark.id || m.name === mark.name));
     }
     addMark(mark) {
-        return this.isMarkExist(mark) ? ((0, util_1.warn)("Mark already exists, add mark failed."), 
+        return this.isMarkExist(mark) ? ((0, debug_1.warn)("Mark already exists, add mark failed."), 
         !1) : (this._marks.push(mark), !0);
     }
     removeMark(mark) {
         const index = this._marks.findIndex((m => m.id === mark.id || m.name === mark.name));
-        return -1 === index ? ((0, util_1.warn)("Mark does not exists, removeMark failed."), 
+        return -1 === index ? ((0, debug_1.warn)("Mark does not exists, removeMark failed."), 
         !1) : (this._marks.splice(index, 1), !0);
     }
     getMarkInType(type) {
@@ -50,5 +50,5 @@ class GroupMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.GroupMark = GroupMark, GroupMark.type = interface_1.MarkTypeEnum.group;
+exports.GroupMark = GroupMark, GroupMark.type = type_1.MarkTypeEnum.group;
 //# sourceMappingURL=group.js.map

package/cjs/mark/group.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":";;;AAEA,kCAA+B;AAE/B,gDAA4C;AAG5C,2CAA2C;AAmB3C,MAAa,SAAU,SAAQ,oBAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;QACrB,WAAM,GAAY,EAAE,CAAC;IAwEjC,CAAC;IAvEC,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAKS,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,KAAK,GACZ,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,WAAW,CAAC,IAAW;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;IACvF,CAAC;IAED,OAAO,CAAC,IAAW;QACjB,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAA,WAAI,EAAC,uCAAuC,CAAC,CAAC;YAC9C,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,IAAW;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,IAAA,WAAI,EAAC,0CAA0C,CAAC,CAAC;YACjD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,IAAc;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,WAAW,CAAC,EAAU;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,aAAa,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAChD,CAAC;IAES,eAAe,CAAC,MAA2B;QAEnD,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAG9B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE;SACzB,CAAC,CAAC;QAGH,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,CAAA,EAAE;YAC3B,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAE7B,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;oBACrB,IAAI,CAAC,aAAa,EAAE,CAAC;iBACtB;gBACD,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;;AA1EH,8BA2EC;AA1EiB,cAAI,GAAG,wBAAY,CAAC,KAAK,CAAC","file":"group.js","sourcesContent":["import type { Maybe } from '../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { warn } from '../util';\nimport type { IGroupMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkType } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport type { IGroupMark as IVGrammarGroupMark } from '@visactor/vgrammar-core';\nimport type { IMarkCompileOption } from '../compile/mark';\n\nexport interface IGroupMark extends IMarkRaw<IGroupMarkSpec> {\n  // groupMark的zIndex只能配在外层，encode里不生效，且无法写成signal\n  // {type:'group', zIndex: 100} ✅\n  // {type:'group', encode:{enter:{zIndex:{value:100}}}} ❌\n  // {type:'group', zIndex: {signal: }} ❌\n\n  addMark: (m: IMark) => boolean;\n  removeMark: (m: IMark) => boolean;\n  // TODO: 这里可能会出现mark嵌套的问题\n  getMarks: () => IMark[];\n  getMarkInType: (type: MarkType) => IMark[];\n  getMarkInId: (id: number) => IMark | undefined;\n  getMarkInName: (name: string) => IMark | undefined;\n}\n\nexport class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {\n  static readonly type = MarkTypeEnum.group;\n  readonly type = GroupMark.type;\n  protected _marks: IMark[] = [];\n  getMarks(): IMark[] {\n    return this._marks;\n  }\n\n  protected declare _product: Maybe<IVGrammarGroupMark>;\n  declare getProduct: () => Maybe<IVGrammarGroupMark>;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IGroupMarkSpec> = {\n      ...super._getDefaultStyle(),\n      clip: false\n    };\n    return defaultStyle;\n  }\n\n  protected isMarkExist(mark: IMark): boolean {\n    return this._marks.find(m => m.id === mark.id || m.name === mark.name) !== undefined;\n  }\n\n  addMark(mark: IMark): boolean {\n    if (this.isMarkExist(mark)) {\n      warn('Mark already exists, add mark failed.');\n      return false;\n    }\n\n    this._marks.push(mark);\n    return true;\n  }\n\n  removeMark(mark: IMark): boolean {\n    const index = this._marks.findIndex(m => m.id === mark.id || m.name === mark.name);\n    if (index === -1) {\n      warn('Mark does not exists, removeMark failed.');\n      return false;\n    }\n    this._marks.splice(index, 1);\n    return true;\n  }\n\n  getMarkInType(type: MarkType) {\n    return this._marks.filter(m => m.type === type);\n  }\n\n  getMarkInId(id: number) {\n    return this._marks.find(m => m.id === id);\n  }\n\n  getMarkInName(name: string) {\n    return this._marks.find(m => m.name === name);\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption): void {\n    // 编译自身\n    super._compileProduct(option);\n\n    // 设置zIndex\n    this._product.configure({\n      zIndex: this.getZIndex()\n    });\n\n    // 编译子元素\n    if (!option?.ignoreChildren) {\n      this.getMarks().forEach(mark => {\n        // TODO: 如果语法元素已创建，先删除再重新指定父结点生成。vgrammar 是否可以动态指定 mark 父结点？\n        if (mark.getProduct()) {\n          mark.removeProduct();\n        }\n        mark.compile({ group: this._product });\n      });\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":";;;AAEA,yCAAqC;AAErC,gDAA4C;AAG5C,2CAAgD;AAmBhD,MAAa,SAAU,SAAQ,oBAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;QACrB,WAAM,GAAY,EAAE,CAAC;IAwEjC,CAAC;IAvEC,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAKS,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,KAAK,GACZ,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,WAAW,CAAC,IAAW;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;IACvF,CAAC;IAED,OAAO,CAAC,IAAW;QACjB,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAA,YAAI,EAAC,uCAAuC,CAAC,CAAC;YAC9C,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CAAC,IAAW;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,IAAA,YAAI,EAAC,0CAA0C,CAAC,CAAC;YACjD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,IAAc;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAClD,CAAC;IAED,WAAW,CAAC,EAAU;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,aAAa,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAChD,CAAC;IAES,eAAe,CAAC,MAA2B;QAEnD,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAG9B,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,SAAS,EAAE;SACzB,CAAC,CAAC;QAGH,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,CAAA,EAAE;YAC3B,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBAE7B,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;oBACrB,IAAI,CAAC,aAAa,EAAE,CAAC;iBACtB;gBACD,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;;AA1EH,8BA2EC;AA1EiB,cAAI,GAAG,mBAAY,CAAC,KAAK,CAAC","file":"group.js","sourcesContent":["import type { Maybe } from '../typings';\n// eslint-disable-next-line no-duplicate-imports\nimport { warn } from '../util/debug';\nimport type { IGroupMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMark, IMarkRaw, IMarkStyle, MarkType } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport type { IGroupMark as IVGrammarGroupMark } from '@visactor/vgrammar-core';\nimport type { IMarkCompileOption } from '../compile/mark';\n\nexport interface IGroupMark extends IMarkRaw<IGroupMarkSpec> {\n  // groupMark的zIndex只能配在外层，encode里不生效，且无法写成signal\n  // {type:'group', zIndex: 100} ✅\n  // {type:'group', encode:{enter:{zIndex:{value:100}}}} ❌\n  // {type:'group', zIndex: {signal: }} ❌\n\n  addMark: (m: IMark) => boolean;\n  removeMark: (m: IMark) => boolean;\n  // TODO: 这里可能会出现mark嵌套的问题\n  getMarks: () => IMark[];\n  getMarkInType: (type: MarkType) => IMark[];\n  getMarkInId: (id: number) => IMark | undefined;\n  getMarkInName: (name: string) => IMark | undefined;\n}\n\nexport class GroupMark extends BaseMark<IGroupMarkSpec> implements IGroupMark {\n  static readonly type = MarkTypeEnum.group;\n  readonly type = GroupMark.type;\n  protected _marks: IMark[] = [];\n  getMarks(): IMark[] {\n    return this._marks;\n  }\n\n  protected declare _product: Maybe<IVGrammarGroupMark>;\n  declare getProduct: () => Maybe<IVGrammarGroupMark>;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IGroupMarkSpec> = {\n      ...super._getDefaultStyle(),\n      clip: false\n    };\n    return defaultStyle;\n  }\n\n  protected isMarkExist(mark: IMark): boolean {\n    return this._marks.find(m => m.id === mark.id || m.name === mark.name) !== undefined;\n  }\n\n  addMark(mark: IMark): boolean {\n    if (this.isMarkExist(mark)) {\n      warn('Mark already exists, add mark failed.');\n      return false;\n    }\n\n    this._marks.push(mark);\n    return true;\n  }\n\n  removeMark(mark: IMark): boolean {\n    const index = this._marks.findIndex(m => m.id === mark.id || m.name === mark.name);\n    if (index === -1) {\n      warn('Mark does not exists, removeMark failed.');\n      return false;\n    }\n    this._marks.splice(index, 1);\n    return true;\n  }\n\n  getMarkInType(type: MarkType) {\n    return this._marks.filter(m => m.type === type);\n  }\n\n  getMarkInId(id: number) {\n    return this._marks.find(m => m.id === id);\n  }\n\n  getMarkInName(name: string) {\n    return this._marks.find(m => m.name === name);\n  }\n\n  protected _compileProduct(option?: IMarkCompileOption): void {\n    // 编译自身\n    super._compileProduct(option);\n\n    // 设置zIndex\n    this._product.configure({\n      zIndex: this.getZIndex()\n    });\n\n    // 编译子元素\n    if (!option?.ignoreChildren) {\n      this.getMarks().forEach(mark => {\n        // TODO: 如果语法元素已创建，先删除再重新指定父结点生成。vgrammar 是否可以动态指定 mark 父结点？\n        if (mark.getProduct()) {\n          mark.removeProduct();\n        }\n        mark.compile({ group: this._product });\n      });\n    }\n  }\n}\n"]}

package/cjs/mark/image.d.ts

@@ -1,7 +1,7 @@
 import type { IImageMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IImageMark = IMarkRaw<IImageMarkSpec>;
 export declare class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {
     static readonly type = MarkTypeEnum.image;

package/cjs/mark/image.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ImageMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class ImageMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,5 +19,5 @@ class ImageMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.ImageMark = ImageMark, ImageMark.type = interface_1.MarkTypeEnum.image;
+exports.ImageMark = ImageMark, ImageMark.type = type_1.MarkTypeEnum.image;
 //# sourceMappingURL=image.js.map

package/cjs/mark/image.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/image.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,SAAU,SAAQ,oBAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;IAWjC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,8BAaC;AAZiB,cAAI,GAAG,wBAAY,CAAC,KAAK,CAAC","file":"image.js","sourcesContent":["import type { IImageMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IImageMark = IMarkRaw<IImageMarkSpec>;\n\nexport class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {\n  static readonly type = MarkTypeEnum.image;\n  readonly type = ImageMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IImageMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/image.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,SAAU,SAAQ,oBAAwB;IAAvD;;QAEW,SAAI,GAAG,SAAS,CAAC,IAAI,CAAC;IAWjC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,8BAaC;AAZiB,cAAI,GAAG,mBAAY,CAAC,KAAK,CAAC","file":"image.js","sourcesContent":["import type { IImageMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IImageMark = IMarkRaw<IImageMarkSpec>;\n\nexport class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {\n  static readonly type = MarkTypeEnum.image;\n  readonly type = ImageMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IImageMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/interface/common.d.ts

@@ -1,4 +1,3 @@
-import type { DataView } from '@visactor/vdataset';
 import type { IGlobalScale } from '../../scale/interface';
 import type { ICommonSpec, VisualType, ValueType, FunctionType } from '../../typings/visual';
 import type { IModel } from '../../model/interface';
@@ -47,7 +46,7 @@ export interface IMarkOption extends ICompilableMarkOption {
     model: IModel;
     map: Map<StringOrNumber, IModel | IMark>;
     globalScale: IGlobalScale;
-    dataStatistics?: DataView;
+    seriesId?: number;
     componentType?: string;
     attributeContext?: IModelMarkAttributeContext;
 }
@@ -65,3 +64,14 @@ export type MarkConstructor = IMarkConstructor | IComponentMarkConstructor;
 export interface IMarkDataInitOption extends IMarkOption {
     mark: IMark;
 }
+export type ISamplingMethod = 'lttb' | 'min' | 'max' | 'sum' | 'average';
+export interface IDataSamping {
+    activePoint?: boolean;
+    sampling?: ISamplingMethod;
+    samplingFactor?: number;
+}
+export interface IMarkOverlap {
+    pointDis?: number;
+    pointDisMul?: number;
+    markOverlap?: boolean;
+}

package/cjs/mark/interface/common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../../scale/interface';\nimport type { ICommonSpec, VisualType, ValueType, FunctionType } from '../../typings/visual';\nimport type { IModel } from '../../model/interface';\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { MarkType } from './type';\nimport type {\n  ICompilableMark,\n  ICompilableMarkOption,\n  IModelMarkAttributeContext,\n  StateValueType\n} from '../../compile/mark';\nimport type { StringOrNumber } from '../../typings';\n\nexport interface VisualScaleType {\n  scale: IBaseScale;\n  field: StringOrNumber;\n  changeDomain?: 'none' | 'replace' | 'expand'; //default 'none'\n}\n\nexport type MarkInputStyle<T> = StyleConvert<T> | VisualType<T>;\n\n/** 用户将属性类型转化为 mark-style 中某个属性的 style */\nexport type StyleConvert<T> = ValueType<T> | FunctionType<T> | VisualScaleType;\n\n/** mark-style 中某个属性的样式信息，包含层级等信息 */\nexport interface IAttrConfig<A, R extends ICommonSpec> {\n  level: number;\n  style: StyleConvert<A>;\n  referer?: IMarkRaw<R>;\n  postProcess?: (result: A, ...args: Parameters<FunctionType<A>>) => A;\n}\n/** mark-style 中某状态下的一组样式信息 */\nexport type IAttrs<T extends ICommonSpec> = {\n  [K in keyof T]: IAttrConfig<T[K], T>;\n};\n\nexport type IMarkProgressiveConfig = {\n  /** 是否开启大数据渲染模式，开启后会降低渲染的精度 */\n  large?: boolean;\n  /** 开启大数据渲染优化的阀值，对应的是data的长度;推荐 largeThreshold < progressiveThreshold  */\n  largeThreshold?: number;\n  /** 分片长度 */\n  progressiveStep?: number;\n  /** 开启分片渲染的阀值，对应的是单系列data的长度 */\n  progressiveThreshold?: number;\n};\n\n/** mark-state-style */\nexport type IMarkStateStyle<T extends ICommonSpec> = Record<StateValueType, Partial<IAttrs<T>>>;\n\n/** mark-style 一组style */\nexport type IMarkStyle<T extends ICommonSpec> = {\n  [key in keyof T]: MarkInputStyle<T[key]>;\n};\n/**********   mark  ***************/\nexport interface IMarkRaw<T extends ICommonSpec> extends ICompilableMark {\n  readonly stateStyle: IMarkStateStyle<T>;\n\n  getAttribute: <U extends keyof T>(key: U, datum: any, state?: StateValueType, opt?: any) => unknown;\n  setAttribute: <U extends keyof T>(attr: U, style: StyleConvert<T[U]>, state?: StateValueType, level?: number) => void;\n\n  // 需要支持优先级并且可以使用优先级覆盖\n  /** @deprecated VChart 层尽量使用 IModel.setMarkStyle() */\n  setStyle: (style: Partial<IMarkStyle<T>>, state?: StateValueType, level?: number) => void;\n\n  setReferer: (mark: IMarkRaw<T>, styleKey?: string, state?: StateValueType, stateStyle?: IMarkStateStyle<T>) => void;\n\n  /** @deprecated VChart 层尽量使用 IModel.initMarkStyleWithSpec() */\n  initStyleWithSpec: (spec: any, key?: string) => void;\n\n  created: () => void;\n\n  setPostProcess: <U extends keyof T, A>(\n    key: U,\n    postProcessFunc: IAttrConfig<A, T>['postProcess'],\n    state?: StateValueType\n  ) => void;\n}\n\nexport type IMark = IMarkRaw<ICommonSpec>;\n\nexport interface IMarkOption extends ICompilableMarkOption {\n  model: IModel;\n  map: Map<StringOrNumber, IModel | IMark>;\n\n  globalScale: IGlobalScale;\n  dataStatistics?: DataView;\n\n  /** 组件 mark 的具体类型 */\n  componentType?: string;\n  attributeContext?: IModelMarkAttributeContext;\n}\nexport interface IMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (name: string, options: IMarkOption): IMark;\n}\n\nexport interface IComponentMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (componentType: string, name: string, options: IMarkOption): IMark;\n}\n\nexport type MarkConstructor = IMarkConstructor | IComponentMarkConstructor;\n\nexport interface IMarkDataInitOption extends IMarkOption {\n  mark: IMark;\n}\n"]}
+{"version":3,"sources":["../src/mark/interface/common.ts"],"names":[],"mappings":"","file":"common.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../../scale/interface';\nimport type { ICommonSpec, VisualType, ValueType, FunctionType } from '../../typings/visual';\nimport type { IModel } from '../../model/interface';\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { MarkType } from './type';\nimport type {\n  ICompilableMark,\n  ICompilableMarkOption,\n  IModelMarkAttributeContext,\n  StateValueType\n} from '../../compile/mark';\nimport type { StringOrNumber } from '../../typings';\n\nexport interface VisualScaleType {\n  scale: IBaseScale;\n  field: StringOrNumber;\n  changeDomain?: 'none' | 'replace' | 'expand'; //default 'none'\n}\n\nexport type MarkInputStyle<T> = StyleConvert<T> | VisualType<T>;\n\n/** 用户将属性类型转化为 mark-style 中某个属性的 style */\nexport type StyleConvert<T> = ValueType<T> | FunctionType<T> | VisualScaleType;\n\n/** mark-style 中某个属性的样式信息，包含层级等信息 */\nexport interface IAttrConfig<A, R extends ICommonSpec> {\n  level: number;\n  style: StyleConvert<A>;\n  referer?: IMarkRaw<R>;\n  postProcess?: (result: A, ...args: Parameters<FunctionType<A>>) => A;\n}\n/** mark-style 中某状态下的一组样式信息 */\nexport type IAttrs<T extends ICommonSpec> = {\n  [K in keyof T]: IAttrConfig<T[K], T>;\n};\n\nexport type IMarkProgressiveConfig = {\n  /** 是否开启大数据渲染模式，开启后会降低渲染的精度 */\n  large?: boolean;\n  /** 开启大数据渲染优化的阀值，对应的是data的长度;推荐 largeThreshold < progressiveThreshold  */\n  largeThreshold?: number;\n  /** 分片长度 */\n  progressiveStep?: number;\n  /** 开启分片渲染的阀值，对应的是单系列data的长度 */\n  progressiveThreshold?: number;\n};\n\n/** mark-state-style */\nexport type IMarkStateStyle<T extends ICommonSpec> = Record<StateValueType, Partial<IAttrs<T>>>;\n\n/** mark-style 一组style */\nexport type IMarkStyle<T extends ICommonSpec> = {\n  [key in keyof T]: MarkInputStyle<T[key]>;\n};\n/**********   mark  ***************/\nexport interface IMarkRaw<T extends ICommonSpec> extends ICompilableMark {\n  readonly stateStyle: IMarkStateStyle<T>;\n\n  getAttribute: <U extends keyof T>(key: U, datum: any, state?: StateValueType, opt?: any) => unknown;\n  setAttribute: <U extends keyof T>(attr: U, style: StyleConvert<T[U]>, state?: StateValueType, level?: number) => void;\n\n  // 需要支持优先级并且可以使用优先级覆盖\n  /** @deprecated VChart 层尽量使用 IModel.setMarkStyle() */\n  setStyle: (style: Partial<IMarkStyle<T>>, state?: StateValueType, level?: number) => void;\n\n  setReferer: (mark: IMarkRaw<T>, styleKey?: string, state?: StateValueType, stateStyle?: IMarkStateStyle<T>) => void;\n\n  /** @deprecated VChart 层尽量使用 IModel.initMarkStyleWithSpec() */\n  initStyleWithSpec: (spec: any, key?: string) => void;\n\n  created: () => void;\n\n  setPostProcess: <U extends keyof T, A>(\n    key: U,\n    postProcessFunc: IAttrConfig<A, T>['postProcess'],\n    state?: StateValueType\n  ) => void;\n}\n\nexport type IMark = IMarkRaw<ICommonSpec>;\n\nexport interface IMarkOption extends ICompilableMarkOption {\n  model: IModel;\n  map: Map<StringOrNumber, IModel | IMark>;\n\n  globalScale: IGlobalScale;\n  seriesId?: number;\n\n  /** 组件 mark 的具体类型 */\n  componentType?: string;\n  attributeContext?: IModelMarkAttributeContext;\n}\nexport interface IMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (name: string, options: IMarkOption): IMark;\n}\n\nexport interface IComponentMarkConstructor {\n  type: MarkType;\n  constructorType?: MarkType;\n  new (componentType: string, name: string, options: IMarkOption): IMark;\n}\n\nexport type MarkConstructor = IMarkConstructor | IComponentMarkConstructor;\n\nexport interface IMarkDataInitOption extends IMarkOption {\n  mark: IMark;\n}\n\nexport type ISamplingMethod = 'lttb' | 'min' | 'max' | 'sum' | 'average';\n\nexport interface IDataSamping {\n  /**\n   * 是否使用额外的 activePoint 显示交互点，可以在点隐藏时显示被交互的点\n   * @default false\n   * @since 1.3.0\n   */\n  activePoint?: boolean;\n  /**\n   * 数据采样 - 采样方法\n   * @since 1.6.0\n   */\n  sampling?: ISamplingMethod;\n  /**\n   * 数据采样 - 采样系数\n   * @since 1.6.0\n   * @default 1\n   */\n  samplingFactor?: number;\n}\n\nexport interface IMarkOverlap {\n  /**\n   * 标记点之间的距离，px\n   * @since 1.6.0\n   */\n  pointDis?: number;\n  /**\n   * 标记点之间的距离， pointSize 的倍数\n   * @since 1.6.0\n   * @default 1\n   */\n  pointDisMul?: number;\n  /**\n   * 是否允许标记图形相互覆盖\n   * @since 1.6.0\n   * @default false\n   */\n  markOverlap?: boolean;\n}\n"]}

package/cjs/mark/label.d.ts

@@ -1,5 +1,6 @@
 import type { IComponentMark } from './component';
-import { MarkTypeEnum, type IMark } from './interface';
+import type { IMark } from './interface/common';
+import { MarkTypeEnum } from './interface/type';
 import { TextMark } from './text';
 export declare class LabelMark extends TextMark implements ILabelMark {
     static readonly type = MarkTypeEnum.text;

package/cjs/mark/label.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.LabelMark = void 0;
 
-const interface_1 = require("./interface"), text_1 = require("./text");
+const type_1 = require("./interface/type"), text_1 = require("./text");
 
 class LabelMark extends text_1.TextMark {
     constructor() {
@@ -20,7 +20,10 @@ class LabelMark extends text_1.TextMark {
         return this._target;
     }
     setTarget(target) {
-        this._target = target;
+        if (this._target = target, !this._rule) {
+            const rule = [ "line", "area" ].includes(target.type) ? "lineData" : target.type;
+            this.setRule(rule);
+        }
     }
     getComponent() {
         return this._component;
@@ -30,5 +33,5 @@ class LabelMark extends text_1.TextMark {
     }
 }
 
-exports.LabelMark = LabelMark, LabelMark.type = interface_1.MarkTypeEnum.text, LabelMark.constructorType = interface_1.MarkTypeEnum.label;
+exports.LabelMark = LabelMark, LabelMark.type = type_1.MarkTypeEnum.text, LabelMark.constructorType = type_1.MarkTypeEnum.label;
 //# sourceMappingURL=label.js.map

package/cjs/mark/label.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/label.ts"],"names":[],"mappings":";;;AACA,2CAAuD;AACvD,iCAAkC;AAElC,MAAa,SAAU,SAAQ,eAAQ;IAAvC;;QAIE,eAAU,GAAG,KAAK,CAAC;IAyBrB,CAAC;IAtBC,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAGD,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,MAAa;QACrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAGD,YAAY;QACV,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACD,YAAY,CAAC,SAAgB;QAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;;AA5BH,8BA6BC;AA5BiB,cAAI,GAAG,wBAAY,CAAC,IAAI,CAAC;AACzB,yBAAe,GAAG,wBAAY,CAAC,KAAK,CAAC","file":"label.js","sourcesContent":["import type { IComponentMark } from './component';\nimport { MarkTypeEnum, type IMark } from './interface';\nimport { TextMark } from './text';\n\nexport class LabelMark extends TextMark implements ILabelMark {\n  static readonly type = MarkTypeEnum.text;\n  static readonly constructorType = MarkTypeEnum.label;\n\n  skipEncode = false;\n\n  private _rule: string;\n  getRule() {\n    return this._rule;\n  }\n  setRule(rule: string) {\n    this._rule = rule;\n  }\n\n  private _target: IMark;\n  getTarget() {\n    return this._target;\n  }\n  setTarget(target: IMark) {\n    this._target = target;\n  }\n\n  private _component: IMark;\n  getComponent() {\n    return this._component;\n  }\n  setComponent(component: IMark) {\n    this._component = component;\n  }\n}\n\nexport interface ILabelMark extends IMark {\n  skipEncode: boolean;\n\n  getRule: () => string;\n  setRule: (rule: string) => void;\n\n  getTarget: () => IMark;\n  setTarget: (target: IMark) => void;\n\n  getComponent: () => IComponentMark;\n  setComponent: (component: IComponentMark) => void;\n}\n"]}
+{"version":3,"sources":["../src/mark/label.ts"],"names":[],"mappings":";;;AAEA,2CAAgD;AAChD,iCAAkC;AAElC,MAAa,SAAU,SAAQ,eAAQ;IAAvC;;QAIE,eAAU,GAAG,KAAK,CAAC;IA8BrB,CAAC;IA3BC,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,OAAO,CAAC,IAAY;QAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAGD,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACD,SAAS,CAAC,MAAa;QACrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YAEf,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;YAC/E,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACpB;IACH,CAAC;IAGD,YAAY;QACV,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACD,YAAY,CAAC,SAAgB;QAC3B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;;AAjCH,8BAkCC;AAjCiB,cAAI,GAAG,mBAAY,CAAC,IAAI,CAAC;AACzB,yBAAe,GAAG,mBAAY,CAAC,KAAK,CAAC","file":"label.js","sourcesContent":["import type { IComponentMark } from './component';\nimport type { IMark } from './interface/common';\nimport { MarkTypeEnum } from './interface/type';\nimport { TextMark } from './text';\n\nexport class LabelMark extends TextMark implements ILabelMark {\n  static readonly type = MarkTypeEnum.text;\n  static readonly constructorType = MarkTypeEnum.label;\n\n  skipEncode = false;\n\n  private _rule: string;\n  getRule() {\n    return this._rule;\n  }\n  setRule(rule: string) {\n    this._rule = rule;\n  }\n\n  private _target: IMark;\n  getTarget() {\n    return this._target;\n  }\n  setTarget(target: IMark) {\n    this._target = target;\n    if (!this._rule) {\n      //  接入 line/area 图元标签后这里需要改造\n      const rule = ['line', 'area'].includes(target.type) ? 'lineData' : target.type;\n      this.setRule(rule);\n    }\n  }\n\n  private _component: IMark;\n  getComponent() {\n    return this._component;\n  }\n  setComponent(component: IMark) {\n    this._component = component;\n  }\n}\n\nexport interface ILabelMark extends IMark {\n  skipEncode: boolean;\n\n  getRule: () => string;\n  setRule: (rule: string) => void;\n\n  getTarget: () => IMark;\n  setTarget: (target: IMark) => void;\n\n  getComponent: () => IComponentMark;\n  setComponent: (component: IComponentMark) => void;\n}\n"]}

package/cjs/mark/line.d.ts

@@ -1,7 +1,7 @@
 import type { ILineMarkSpec } from '../typings/visual';
 import { BaseLineMark } from './base/base-line';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type ILineMark = IMarkRaw<ILineMarkSpec>;
 export declare class LineMark extends BaseLineMark<ILineMarkSpec> implements ILineMark {
     static readonly type = MarkTypeEnum.line;

package/cjs/mark/line.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.LineMark = void 0;
 
-const interface_1 = require("../series/interface"), base_line_1 = require("./base/base-line"), interface_2 = require("./interface");
+const type_1 = require("../series/interface/type"), base_line_1 = require("./base/base-line"), type_2 = require("./interface/type");
 
 class LineMark extends base_line_1.BaseLineMark {
     constructor() {
@@ -17,9 +17,9 @@ class LineMark extends base_line_1.BaseLineMark {
     }
     _getIgnoreAttributes() {
         var _a, _b;
-        return (null === (_a = this.model) || void 0 === _a ? void 0 : _a.type) === interface_1.SeriesTypeEnum.radar && "polar" === (null === (_b = this.model) || void 0 === _b ? void 0 : _b.coordinate) ? [] : [ "fill", "fillOpacity" ];
+        return (null === (_a = this.model) || void 0 === _a ? void 0 : _a.type) === type_1.SeriesTypeEnum.radar && "polar" === (null === (_b = this.model) || void 0 === _b ? void 0 : _b.coordinate) ? [] : [ "fill", "fillOpacity" ];
     }
 }
 
-exports.LineMark = LineMark, LineMark.type = interface_2.MarkTypeEnum.line;
+exports.LineMark = LineMark, LineMark.type = type_2.MarkTypeEnum.line;
 //# sourceMappingURL=line.js.map

package/cjs/mark/line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/line.ts"],"names":[],"mappings":";;;AAAA,mDAAqD;AAErD,gDAAgD;AAGhD,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,wBAA2B;IAAzD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAqBhC,CAAC;IAnBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAOS,oBAAoB;;QAC5B,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,IAAI,MAAK,0BAAc,CAAC,KAAK,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,MAAK,OAAO,EAAE;YACnF,OAAO,EAAE,CAAC;SACX;QACD,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACjC,CAAC;;AAtBH,4BAuBC;AAtBiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"line.js","sourcesContent":["import { SeriesTypeEnum } from '../series/interface';\nimport type { ILineMarkSpec } from '../typings/visual';\nimport { BaseLineMark } from './base/base-line';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type ILineMark = IMarkRaw<ILineMarkSpec>;\n\nexport class LineMark extends BaseLineMark<ILineMarkSpec> implements ILineMark {\n  static readonly type = MarkTypeEnum.line;\n  readonly type = LineMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ILineMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 1\n    };\n    return defaultStyle;\n  }\n\n  /**\n   * TODO: SeriesTypeEnum 移到最外层\n   * @override 线不支持填充\n   * @returns\n   */\n  protected _getIgnoreAttributes(): string[] {\n    if (this.model?.type === SeriesTypeEnum.radar && this.model?.coordinate === 'polar') {\n      return [];\n    }\n    return ['fill', 'fillOpacity'];\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/line.ts"],"names":[],"mappings":";;;AAAA,mDAA0D;AAE1D,gDAAgD;AAGhD,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,wBAA2B;IAAzD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAqBhC,CAAC;IAnBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAOS,oBAAoB;;QAC5B,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,IAAI,MAAK,qBAAc,CAAC,KAAK,IAAI,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,MAAK,OAAO,EAAE;YACnF,OAAO,EAAE,CAAC;SACX;QACD,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IACjC,CAAC;;AAtBH,4BAuBC;AAtBiB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"line.js","sourcesContent":["import { SeriesTypeEnum } from '../series/interface/type';\nimport type { ILineMarkSpec } from '../typings/visual';\nimport { BaseLineMark } from './base/base-line';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type ILineMark = IMarkRaw<ILineMarkSpec>;\n\nexport class LineMark extends BaseLineMark<ILineMarkSpec> implements ILineMark {\n  static readonly type = MarkTypeEnum.line;\n  readonly type = LineMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ILineMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 1\n    };\n    return defaultStyle;\n  }\n\n  /**\n   * TODO: SeriesTypeEnum 移到最外层\n   * @override 线不支持填充\n   * @returns\n   */\n  protected _getIgnoreAttributes(): string[] {\n    if (this.model?.type === SeriesTypeEnum.radar && this.model?.coordinate === 'polar') {\n      return [];\n    }\n    return ['fill', 'fillOpacity'];\n  }\n}\n"]}

package/cjs/mark/link-path.d.ts

@@ -1,7 +1,7 @@
 import { BaseMark } from './base/base-mark';
 import type { ILinkPathMarkSpec } from '../typings/visual';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 import type { IGroupMark } from '@visactor/vgrammar-core';
 export type ILinkPathMark = IMarkRaw<ILinkPathMarkSpec>;
 export declare class LinkPathMark extends BaseMark<ILinkPathMarkSpec> implements ILinkPathMark {

package/cjs/mark/link-path.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.LinkPathMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class LinkPathMark extends base_mark_1.BaseMark {
     constructor() {
@@ -31,5 +31,5 @@ class LinkPathMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.LinkPathMark = LinkPathMark, LinkPathMark.type = interface_1.MarkTypeEnum.linkPath;
+exports.LinkPathMark = LinkPathMark, LinkPathMark.type = type_1.MarkTypeEnum.linkPath;
 //# sourceMappingURL=link-path.js.map

package/cjs/mark/link-path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/link-path.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAI5C,2CAA2C;AAC3C,2DAAgE;AAMhE,MAAa,YAAa,SAAQ,oBAA2B;IAA7D;;QAEW,SAAI,GAAG,YAAY,CAAC,IAAI,CAAC;IAgCpC,CAAC;IA9BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,GAAG,EACP,EAAE,EAAE,GAAG,EACP,SAAS,EAAE,CAAC,EACZ,KAAK,EAAE,IAAI,GACZ,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,IAAA,qCAAqB,GAAE,CAAC;QAExB,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,UAAU,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,IAAI;aACjB,KAAK,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC;aACxC,EAAE,CAAC,EAAE,CAAC;aACN,cAAc,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAjCH,oCAkCC;AAjCiB,iBAAI,GAAG,wBAAY,CAAC,QAAQ,CAAC","file":"link-path.js","sourcesContent":["import { BaseMark } from './base/base-mark';\nimport type { ILinkPathMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { registerLinkPathGlyph } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type ILinkPathMark = IMarkRaw<ILinkPathMarkSpec>;\n\nexport class LinkPathMark extends BaseMark<ILinkPathMarkSpec> implements ILinkPathMark {\n  static readonly type = MarkTypeEnum.linkPath;\n  readonly type = LinkPathMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ILinkPathMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x: 0,\n      y: 0,\n      x0: 0,\n      y0: 0,\n      x1: 100,\n      y1: 100,\n      thickness: 1,\n      round: true\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    registerLinkPathGlyph();\n\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = 'linkPath';\n    const direction = this.getStyle('direction');\n    this._product = view\n      .glyph(glyphType, group ?? view.rootMark)\n      .id(id)\n      .configureGlyph({ direction: direction });\n    this._compiledProductId = id;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/link-path.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAI5C,2CAAgD;AAChD,2DAAgE;AAMhE,MAAa,YAAa,SAAQ,oBAA2B;IAA7D;;QAEW,SAAI,GAAG,YAAY,CAAC,IAAI,CAAC;IAgCpC,CAAC;IA9BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,GAAG,EACP,EAAE,EAAE,GAAG,EACP,SAAS,EAAE,CAAC,EACZ,KAAK,EAAE,IAAI,GACZ,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,IAAA,qCAAqB,GAAE,CAAC;QAExB,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,UAAU,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,IAAI;aACjB,KAAK,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC;aACxC,EAAE,CAAC,EAAE,CAAC;aACN,cAAc,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5C,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAjCH,oCAkCC;AAjCiB,iBAAI,GAAG,mBAAY,CAAC,QAAQ,CAAC","file":"link-path.js","sourcesContent":["import { BaseMark } from './base/base-mark';\nimport type { ILinkPathMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerLinkPathGlyph } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type ILinkPathMark = IMarkRaw<ILinkPathMarkSpec>;\n\nexport class LinkPathMark extends BaseMark<ILinkPathMarkSpec> implements ILinkPathMark {\n  static readonly type = MarkTypeEnum.linkPath;\n  readonly type = LinkPathMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ILinkPathMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x: 0,\n      y: 0,\n      x0: 0,\n      y0: 0,\n      x1: 100,\n      y1: 100,\n      thickness: 1,\n      round: true\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    registerLinkPathGlyph();\n\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = 'linkPath';\n    const direction = this.getStyle('direction');\n    this._product = view\n      .glyph(glyphType, group ?? view.rootMark)\n      .id(id)\n      .configureGlyph({ direction: direction });\n    this._compiledProductId = id;\n  }\n}\n"]}

package/cjs/mark/path.d.ts

@@ -1,7 +1,7 @@
 import type { IPathMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IPathMark = IMarkRaw<IPathMarkSpec>;
 export declare class PathMark extends BaseMark<IPathMarkSpec> implements IPathMark {
     static readonly type = MarkTypeEnum.path;

package/cjs/mark/path.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PathMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class PathMark extends base_mark_1.BaseMark {
     constructor() {
@@ -18,5 +18,5 @@ class PathMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.PathMark = PathMark, PathMark.type = interface_1.MarkTypeEnum.path;
+exports.PathMark = PathMark, PathMark.type = type_1.MarkTypeEnum.path;
 //# sourceMappingURL=path.js.map

package/cjs/mark/path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/path.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAUhC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,EACZ,IAAI,EAAE,EAAE,GACT,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAXH,4BAYC;AAXiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"path.js","sourcesContent":["import type { IPathMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IPathMark = IMarkRaw<IPathMarkSpec>;\n\nexport class PathMark extends BaseMark<IPathMarkSpec> implements IPathMark {\n  static readonly type = MarkTypeEnum.path;\n  readonly type = PathMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPathMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0,\n      path: ''\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/path.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAUhC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,EACZ,IAAI,EAAE,EAAE,GACT,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAXH,4BAYC;AAXiB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"path.js","sourcesContent":["import type { IPathMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IPathMark = IMarkRaw<IPathMarkSpec>;\n\nexport class PathMark extends BaseMark<IPathMarkSpec> implements IPathMark {\n  static readonly type = MarkTypeEnum.path;\n  readonly type = PathMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPathMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0,\n      path: ''\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/polygon/polygon.d.ts

@@ -1,7 +1,7 @@
 import type { IPolygonMarkSpec } from '../../typings/visual';
 import { BasePolygonMark } from './base-polygon';
 import type { IMarkRaw, IMarkStyle } from '../interface';
-import { MarkTypeEnum } from '../interface';
+import { MarkTypeEnum } from '../interface/type';
 export type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;
 export declare class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> implements IPolygonMark {
     static readonly type = MarkTypeEnum.polygon;

package/cjs/mark/polygon/polygon.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PolygonMark = void 0;
 
-const base_polygon_1 = require("./base-polygon"), interface_1 = require("../interface");
+const base_polygon_1 = require("./base-polygon"), type_1 = require("../interface/type");
 
 class PolygonMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -17,5 +17,5 @@ class PolygonMark extends base_polygon_1.BasePolygonMark {
     }
 }
 
-exports.PolygonMark = PolygonMark, PolygonMark.type = interface_1.MarkTypeEnum.polygon;
+exports.PolygonMark = PolygonMark, PolygonMark.type = type_1.MarkTypeEnum.polygon;
 //# sourceMappingURL=polygon.js.map

package/cjs/mark/polygon/polygon.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/polygon/polygon.ts"],"names":[],"mappings":";;;AAEA,iDAAiD;AAEjD,4CAA4C;AAI5C,MAAa,WAAY,SAAQ,8BAAiC;IAAlE;;QAEW,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IASnC,CAAC;IAPW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,kCAWC;AAViB,gBAAI,GAAG,wBAAY,CAAC,OAAO,CAAC","file":"polygon.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPolygonMarkSpec } from '../../typings/visual';\nimport { BasePolygonMark } from './base-polygon';\nimport type { IMarkRaw, IMarkStyle } from '../interface';\nimport { MarkTypeEnum } from '../interface';\n\nexport type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;\n\nexport class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> implements IPolygonMark {\n  static readonly type = MarkTypeEnum.polygon;\n  readonly type = PolygonMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPolygonMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/polygon/polygon.ts"],"names":[],"mappings":";;;AAEA,iDAAiD;AAEjD,4CAAiD;AAIjD,MAAa,WAAY,SAAQ,8BAAiC;IAAlE;;QAEW,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IASnC,CAAC;IAPW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,kCAWC;AAViB,gBAAI,GAAG,mBAAY,CAAC,OAAO,CAAC","file":"polygon.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPolygonMarkSpec } from '../../typings/visual';\nimport { BasePolygonMark } from './base-polygon';\nimport type { IMarkRaw, IMarkStyle } from '../interface';\nimport { MarkTypeEnum } from '../interface/type';\n\nexport type IPolygonMark = IMarkRaw<IPolygonMarkSpec>;\n\nexport class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> implements IPolygonMark {\n  static readonly type = MarkTypeEnum.polygon;\n  readonly type = PolygonMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IPolygonMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/polygon/pyramid-3d.d.ts

@@ -1,6 +1,6 @@
 import type { IPyramid3dMarkSpec } from '../../typings/visual';
 import type { IMarkRaw } from '../interface';
-import { MarkTypeEnum } from '../interface';
+import { MarkTypeEnum } from '../interface/type';
 import { BasePolygonMark } from './base-polygon';
 export type IPyramid3dMark = IMarkRaw<IPyramid3dMarkSpec>;
 export declare class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {

package/cjs/mark/polygon/pyramid-3d.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Pyramid3dMark = void 0;
 
-const interface_1 = require("../interface"), base_polygon_1 = require("./base-polygon");
+const type_1 = require("../interface/type"), base_polygon_1 = require("./base-polygon");
 
 class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -12,5 +12,5 @@ class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
     }
 }
 
-exports.Pyramid3dMark = Pyramid3dMark, Pyramid3dMark.type = interface_1.MarkTypeEnum.pyramid3d;
+exports.Pyramid3dMark = Pyramid3dMark, Pyramid3dMark.type = type_1.MarkTypeEnum.pyramid3d;
 //# sourceMappingURL=pyramid-3d.js.map

package/cjs/mark/polygon/pyramid-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/polygon/pyramid-3d.ts"],"names":[],"mappings":";;;AAGA,4CAA4C;AAC5C,iDAAiD;AAIjD,MAAa,aAAc,SAAQ,8BAAmC;IAAtE;;QAEW,SAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IACrC,CAAC;;AAHD,sCAGC;AAFiB,kBAAI,GAAG,wBAAY,CAAC,SAAS,CAAC","file":"pyramid-3d.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPyramid3dMarkSpec } from '../../typings/visual';\nimport type { IMarkRaw } from '../interface';\nimport { MarkTypeEnum } from '../interface';\nimport { BasePolygonMark } from './base-polygon';\n\nexport type IPyramid3dMark = IMarkRaw<IPyramid3dMarkSpec>;\n\nexport class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {\n  static readonly type = MarkTypeEnum.pyramid3d;\n  readonly type = Pyramid3dMark.type;\n}\n"]}
+{"version":3,"sources":["../src/mark/polygon/pyramid-3d.ts"],"names":[],"mappings":";;;AAGA,4CAAiD;AACjD,iDAAiD;AAIjD,MAAa,aAAc,SAAQ,8BAAmC;IAAtE;;QAEW,SAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IACrC,CAAC;;AAHD,sCAGC;AAFiB,kBAAI,GAAG,mBAAY,CAAC,SAAS,CAAC","file":"pyramid-3d.js","sourcesContent":["/* eslint-disable no-duplicate-imports */\nimport type { IPyramid3dMarkSpec } from '../../typings/visual';\nimport type { IMarkRaw } from '../interface';\nimport { MarkTypeEnum } from '../interface/type';\nimport { BasePolygonMark } from './base-polygon';\n\nexport type IPyramid3dMark = IMarkRaw<IPyramid3dMarkSpec>;\n\nexport class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {\n  static readonly type = MarkTypeEnum.pyramid3d;\n  readonly type = Pyramid3dMark.type;\n}\n"]}

package/cjs/mark/progress-arc.d.ts

@@ -1,7 +1,7 @@
 import type { StateValueType } from '../typings/spec';
 import type { ConvertToMarkStyleSpec, IProgressArcMarkSpec } from '../typings/visual';
 import type { IMarkRaw, IMarkStateStyle, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 import { BaseArcMark } from './arc';
 export type IProgressArcMark = IMarkRaw<IProgressArcMarkSpec>;
 export declare class ProgressArcMark extends BaseArcMark<IProgressArcMarkSpec> implements IProgressArcMark {

package/cjs/mark/progress-arc.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.ProgressArcMark = void 0;
 
-const vutils_1 = require("@visactor/vutils"), interface_1 = require("./interface"), arc_1 = require("./arc");
+const vutils_1 = require("@visactor/vutils"), type_1 = require("./interface/type"), arc_1 = require("./arc");
 
 class ProgressArcMark extends arc_1.BaseArcMark {
     constructor() {
@@ -44,6 +44,6 @@ class ProgressArcMark extends arc_1.BaseArcMark {
     }
 }
 
-exports.ProgressArcMark = ProgressArcMark, ProgressArcMark.type = interface_1.MarkTypeEnum.arc, 
-ProgressArcMark.constructorType = interface_1.MarkTypeEnum.progressArc;
+exports.ProgressArcMark = ProgressArcMark, ProgressArcMark.type = type_1.MarkTypeEnum.arc, 
+ProgressArcMark.constructorType = type_1.MarkTypeEnum.progressArc;
 //# sourceMappingURL=progress-arc.js.map

package/cjs/mark/progress-arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/progress-arc.ts"],"names":[],"mappings":"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","file":"progress-arc.js","sourcesContent":["import { isFunction, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { StateValueType } from '../typings/spec';\nimport type { ConvertToMarkStyleSpec, IProgressArcMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStateStyle, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { BaseArcMark } from './arc';\nimport type { IAttributeOpt } from '../compile/mark/interface';\n\nexport type IProgressArcMark = IMarkRaw<IProgressArcMarkSpec>;\n\nexport class ProgressArcMark extends BaseArcMark<IProgressArcMarkSpec> implements IProgressArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  static readonly constructorType = MarkTypeEnum.progressArc;\n\n  protected _cacheStateStyle: IMarkStateStyle<IProgressArcMarkSpec> = {};\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IProgressArcMarkSpec> = {\n      ...super._getDefaultStyle(),\n      innerPadding: 0,\n      outerPadding: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _filterStyle(\n    style: Partial<IMarkStyle<IProgressArcMarkSpec>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<ConvertToMarkStyleSpec<IProgressArcMarkSpec>> | Partial<IMarkStyle<IProgressArcMarkSpec>> {\n    // 记录 radius 缓存\n    if (isValid(style.innerRadius)) {\n      this.setAttribute(\n        'innerRadius',\n        this._styleConvert<'innerRadius'>(style.innerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n    if (isValid(style.outerRadius)) {\n      this.setAttribute(\n        'outerRadius',\n        this._styleConvert<'innerRadius'>(style.outerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n\n    const innerPadding = style.innerPadding ?? stateStyle[state]?.innerPadding?.style;\n    const outerPadding = style.outerPadding ?? stateStyle[state]?.outerPadding?.style;\n    const innerRadius =\n      style.innerRadius ?? this._cacheStateStyle[state]?.innerRadius?.style ?? stateStyle[state]?.innerRadius?.style;\n    const outerRadius =\n      style.outerRadius ?? this._cacheStateStyle[state]?.outerRadius?.style ?? stateStyle[state]?.outerRadius?.style;\n\n    if (innerRadius === 0 && outerRadius === 0) {\n      return style;\n    }\n\n    // 情况一：本次改动了 padding\n    const paddingModified =\n      (isValid(style.innerPadding) && isValid(innerRadius)) || (isValid(style.outerPadding) && isValid(outerRadius));\n\n    // 情况二：本次改动了 radius，但是 padding 已经提前设置且不为 0\n    const radiusModified = (isValid(style.innerRadius) && innerPadding) || (isValid(style.outerRadius) && outerPadding);\n\n    // 如果触发任意一种情况，则重新计算 radius\n    if (paddingModified || radiusModified) {\n      const newStyle = Object.assign({}, style);\n\n      if (innerPadding && isValid(innerRadius)) {\n        // 将 innerPadding 应用到 innerRadius\n        if (isFunction(innerRadius)) {\n          newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = innerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(innerPadding)\n              ? (innerPadding(item, ctx, opt, source) as number)\n              : (innerPadding as number);\n            return result + padding;\n          };\n        } else {\n          if (isFunction(innerPadding)) {\n            newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = innerPadding(item, ctx, opt, source) as number;\n              return (innerRadius as number) + padding;\n            };\n          } else {\n            newStyle.innerRadius = (innerRadius as number) + (innerPadding as number);\n          }\n        }\n      }\n\n      if (outerPadding && isValid(outerRadius)) {\n        // 将 outerPadding 应用到 outerRadius\n        if (isFunction(outerRadius)) {\n          newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = outerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(outerPadding)\n              ? (outerPadding(item, ctx, opt, source) as number)\n              : (outerPadding as number);\n            return result - padding;\n          };\n        } else {\n          if (isFunction(outerPadding)) {\n            newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = outerPadding(item, ctx, opt, source) as number;\n              return (outerRadius as number) - padding;\n            };\n          } else {\n            newStyle.outerRadius = (outerRadius as number) - (outerPadding as number);\n          }\n        }\n      }\n\n      return newStyle;\n    }\n\n    return style;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/progress-arc.ts"],"names":[],"mappings":"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","file":"progress-arc.js","sourcesContent":["import { isFunction, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { StateValueType } from '../typings/spec';\nimport type { ConvertToMarkStyleSpec, IProgressArcMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStateStyle, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { BaseArcMark } from './arc';\nimport type { IAttributeOpt } from '../compile/mark/interface';\n\nexport type IProgressArcMark = IMarkRaw<IProgressArcMarkSpec>;\n\nexport class ProgressArcMark extends BaseArcMark<IProgressArcMarkSpec> implements IProgressArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  static readonly constructorType = MarkTypeEnum.progressArc;\n\n  protected _cacheStateStyle: IMarkStateStyle<IProgressArcMarkSpec> = {};\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IProgressArcMarkSpec> = {\n      ...super._getDefaultStyle(),\n      innerPadding: 0,\n      outerPadding: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _filterStyle(\n    style: Partial<IMarkStyle<IProgressArcMarkSpec>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<ConvertToMarkStyleSpec<IProgressArcMarkSpec>> | Partial<IMarkStyle<IProgressArcMarkSpec>> {\n    // 记录 radius 缓存\n    if (isValid(style.innerRadius)) {\n      this.setAttribute(\n        'innerRadius',\n        this._styleConvert<'innerRadius'>(style.innerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n    if (isValid(style.outerRadius)) {\n      this.setAttribute(\n        'outerRadius',\n        this._styleConvert<'innerRadius'>(style.outerRadius),\n        state,\n        level,\n        this._cacheStateStyle\n      );\n    }\n\n    const innerPadding = style.innerPadding ?? stateStyle[state]?.innerPadding?.style;\n    const outerPadding = style.outerPadding ?? stateStyle[state]?.outerPadding?.style;\n    const innerRadius =\n      style.innerRadius ?? this._cacheStateStyle[state]?.innerRadius?.style ?? stateStyle[state]?.innerRadius?.style;\n    const outerRadius =\n      style.outerRadius ?? this._cacheStateStyle[state]?.outerRadius?.style ?? stateStyle[state]?.outerRadius?.style;\n\n    if (innerRadius === 0 && outerRadius === 0) {\n      return style;\n    }\n\n    // 情况一：本次改动了 padding\n    const paddingModified =\n      (isValid(style.innerPadding) && isValid(innerRadius)) || (isValid(style.outerPadding) && isValid(outerRadius));\n\n    // 情况二：本次改动了 radius，但是 padding 已经提前设置且不为 0\n    const radiusModified = (isValid(style.innerRadius) && innerPadding) || (isValid(style.outerRadius) && outerPadding);\n\n    // 如果触发任意一种情况，则重新计算 radius\n    if (paddingModified || radiusModified) {\n      const newStyle = Object.assign({}, style);\n\n      if (innerPadding && isValid(innerRadius)) {\n        // 将 innerPadding 应用到 innerRadius\n        if (isFunction(innerRadius)) {\n          newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = innerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(innerPadding)\n              ? (innerPadding(item, ctx, opt, source) as number)\n              : (innerPadding as number);\n            return result + padding;\n          };\n        } else {\n          if (isFunction(innerPadding)) {\n            newStyle.innerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = innerPadding(item, ctx, opt, source) as number;\n              return (innerRadius as number) + padding;\n            };\n          } else {\n            newStyle.innerRadius = (innerRadius as number) + (innerPadding as number);\n          }\n        }\n      }\n\n      if (outerPadding && isValid(outerRadius)) {\n        // 将 outerPadding 应用到 outerRadius\n        if (isFunction(outerRadius)) {\n          newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n            const result = outerRadius(item, ctx, opt, source) as number;\n            const padding = isFunction(outerPadding)\n              ? (outerPadding(item, ctx, opt, source) as number)\n              : (outerPadding as number);\n            return result - padding;\n          };\n        } else {\n          if (isFunction(outerPadding)) {\n            newStyle.outerRadius = (item: any, ctx: any, opt?: IAttributeOpt, source?: DataView) => {\n              const padding = outerPadding(item, ctx, opt, source) as number;\n              return (outerRadius as number) - padding;\n            };\n          } else {\n            newStyle.outerRadius = (outerRadius as number) - (outerPadding as number);\n          }\n        }\n      }\n\n      return newStyle;\n    }\n\n    return style;\n  }\n}\n"]}

package/cjs/mark/rect-3d.d.ts

@@ -1,7 +1,7 @@
 import type { IRect3dMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IRect3dMark = IMarkRaw<IRect3dMarkSpec>;
 export declare class Rect3dMark extends BaseMark<IRect3dMarkSpec> implements IRect3dMark {
     static readonly type = MarkTypeEnum.rect3d;

package/cjs/mark/rect-3d.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.Rect3dMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class Rect3dMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,5 +19,5 @@ class Rect3dMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.Rect3dMark = Rect3dMark, Rect3dMark.type = interface_1.MarkTypeEnum.rect3d;
+exports.Rect3dMark = Rect3dMark, Rect3dMark.type = type_1.MarkTypeEnum.rect3d;
 //# sourceMappingURL=rect-3d.js.map

package/cjs/mark/rect-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rect-3d.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAWlC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,gCAaC;AAZiB,eAAI,GAAG,wBAAY,CAAC,MAAM,CAAC","file":"rect-3d.js","sourcesContent":["import type { IRect3dMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IRect3dMark = IMarkRaw<IRect3dMarkSpec>;\n\nexport class Rect3dMark extends BaseMark<IRect3dMarkSpec> implements IRect3dMark {\n  static readonly type = MarkTypeEnum.rect3d;\n  readonly type = Rect3dMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRect3dMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      length: 3\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/rect-3d.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAWlC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,gCAaC;AAZiB,eAAI,GAAG,mBAAY,CAAC,MAAM,CAAC","file":"rect-3d.js","sourcesContent":["import type { IRect3dMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IRect3dMark = IMarkRaw<IRect3dMarkSpec>;\n\nexport class Rect3dMark extends BaseMark<IRect3dMarkSpec> implements IRect3dMark {\n  static readonly type = MarkTypeEnum.rect3d;\n  readonly type = Rect3dMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRect3dMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      length: 3\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/rect.d.ts

@@ -1,7 +1,7 @@
 import type { IRectMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IRectMark = IMarkRaw<IRectMarkSpec>;
 export declare class RectMark extends BaseMark<IRectMarkSpec> implements IRectMark {
     static readonly type = MarkTypeEnum.rect;

package/cjs/mark/rect.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.RectMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface");
+const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
 
 class RectMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,5 +19,5 @@ class RectMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.RectMark = RectMark, RectMark.type = interface_1.MarkTypeEnum.rect;
+exports.RectMark = RectMark, RectMark.type = type_1.MarkTypeEnum.rect;
 //# sourceMappingURL=rect.js.map

package/cjs/mark/rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rect.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAWhC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,4BAaC;AAZiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"rect.js","sourcesContent":["import type { IRectMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IRectMark = IMarkRaw<IRectMarkSpec>;\n\nexport class RectMark extends BaseMark<IRectMarkSpec> implements IRectMark {\n  static readonly type = MarkTypeEnum.rect;\n  readonly type = RectMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRectMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/rect.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAWhC,CAAC;IATW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,SAAS,EACjB,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAZH,4BAaC;AAZiB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"rect.js","sourcesContent":["import type { IRectMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IRectMark = IMarkRaw<IRectMarkSpec>;\n\nexport class RectMark extends BaseMark<IRectMarkSpec> implements IRectMark {\n  static readonly type = MarkTypeEnum.rect;\n  readonly type = RectMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRectMarkSpec> = {\n      ...super._getDefaultStyle(),\n      width: undefined,\n      height: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/ripple.d.ts

@@ -1,7 +1,7 @@
 import { BaseMark } from './base/base-mark';
 import type { IRippleMarkSpec } from '../typings/visual';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 import type { IGroupMark } from '@visactor/vgrammar-core';
 export type IRippleMark = IMarkRaw<IRippleMarkSpec>;
 export declare class RippleMark extends BaseMark<IRippleMarkSpec> implements IRippleMark {