@visactor/vchart 1.8.9 → 1.8.10

package/cjs/mark/component.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerComponentMark = exports.ComponentMark = void 0;
 
-const factory_1 = require("./../core/factory"), vgrammar_core_1 = require("@visactor/vgrammar-core"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
+const factory_1 = require("./../core/factory"), vgrammar_core_1 = require("@visactor/vgrammar-core"), base_mark_1 = require("./base/base-mark");
 
 class ComponentMark extends base_mark_1.BaseMark {
     constructor(name, option) {
@@ -20,7 +20,7 @@ class ComponentMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.ComponentMark = ComponentMark, ComponentMark.type = type_1.MarkTypeEnum.component;
+exports.ComponentMark = ComponentMark, ComponentMark.type = "component";
 
 const registerComponentMark = () => {
     factory_1.Factory.registerMark(ComponentMark.type, ComponentMark);

package/cjs/mark/component.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAG5C,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;AAyBzC,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,iBAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC","file":"component.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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\nexport const registerComponentMark = () => {\n  Factory.registerMark(ComponentMark.type, ComponentMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/component.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAG5C,2DAA0D;AAE1D,gDAA4C;AAO5C,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,eAA0B;AAyBzC,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,iBAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC","file":"component.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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\nexport const registerComponentMark = () => {\n  Factory.registerMark(ComponentMark.type, ComponentMark);\n};\n"]}

package/cjs/mark/group.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerGroupMark = exports.GroupMark = void 0;
 
-const factory_1 = require("./../core/factory"), debug_1 = require("../util/debug"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), debug_1 = require("../util/debug"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class GroupMark extends base_mark_1.BaseMark {
     constructor() {
@@ -50,7 +50,7 @@ class GroupMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.GroupMark = GroupMark, GroupMark.type = type_1.MarkTypeEnum.group;
+exports.GroupMark = GroupMark, GroupMark.type = "group";
 
 const registerGroupMark = () => {
     (0, vgrammar_core_1.registerGroupGraphic)(), factory_1.Factory.registerMark(GroupMark.type, GroupMark);

package/cjs/mark/group.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAG5C,yCAAqC;AAErC,gDAA4C;AAG5C,2CAAgD;AAChD,2DAAsG;AAkBtG,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;AA4ErC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,IAAA,oCAAoB,GAAE,CAAC;IACvB,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;AAClD,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"group.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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 { registerGroupGraphic, 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\nexport const registerGroupMark = () => {\n  registerGroupGraphic();\n  Factory.registerMark(GroupMark.type, GroupMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/group.ts"],"names":[],"mappings":"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","file":"group.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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 { registerGroupGraphic, 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\nexport const registerGroupMark = () => {\n  registerGroupGraphic();\n  Factory.registerMark(GroupMark.type, GroupMark);\n};\n"]}

package/cjs/mark/image.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerImageMark = exports.ImageMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class ImageMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,7 +19,7 @@ class ImageMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.ImageMark = ImageMark, ImageMark.type = type_1.MarkTypeEnum.image;
+exports.ImageMark = ImageMark, ImageMark.type = "image";
 
 const registerImageMark = () => {
     factory_1.Factory.registerMark(ImageMark.type, ImageMark), (0, vgrammar_core_1.registerImageGraphic)();

package/cjs/mark/image.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/image.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAG5C,2CAAgD;AAChD,2DAA+D;AAI/D,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;AAcrC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAChD,IAAA,oCAAoB,GAAE,CAAC;AACzB,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"image.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerImageGraphic } from '@visactor/vgrammar-core';\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\nexport const registerImageMark = () => {\n  Factory.registerMark(ImageMark.type, ImageMark);\n  registerImageGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/image.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAA+D;AAI/D,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,WAAsB;AAcrC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAChD,IAAA,oCAAoB,GAAE,CAAC;AACzB,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"image.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerImageGraphic } from '@visactor/vgrammar-core';\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\nexport const registerImageMark = () => {\n  Factory.registerMark(ImageMark.type, ImageMark);\n  registerImageGraphic();\n};\n"]}

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

@@ -1,5 +1,5 @@
 export type MarkType = keyof typeof MarkTypeEnum | string;
-export declare enum MarkTypeEnum {
+export declare const enum MarkTypeEnum {
     group = "group",
     symbol = "symbol",
     rule = "rule",

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/interface/type.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAwBX;AAxBD,WAAY,YAAY;IACtB,+BAAe,CAAA;IAEf,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,2BAAW,CAAA;IACX,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;IACvB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,6BAAa,CAAA;IACb,iCAAiB,CAAA;IAEjB,uCAAuB,CAAA;IACvB,+BAAe,CAAA;AACjB,CAAC,EAxBW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAwBvB","file":"type.js","sourcesContent":["export type MarkType = keyof typeof MarkTypeEnum | string;\n\nexport enum MarkTypeEnum {\n  group = 'group',\n\n  symbol = 'symbol',\n  rule = 'rule',\n  line = 'line',\n  text = 'text',\n  rect = 'rect',\n  rect3d = 'rect3d',\n  image = 'image',\n  path = 'path',\n  area = 'area',\n  arc = 'arc',\n  arc3d = 'arc3d',\n  polygon = 'polygon',\n  pyramid3d = 'pyramid3d',\n  boxPlot = 'boxPlot',\n  linkPath = 'linkPath',\n  progressArc = 'progressArc',\n  cell = 'cell',\n  ripple = 'ripple',\n\n  component = 'component',\n  label = 'label'\n}\n"]}
+{"version":3,"sources":["../src/mark/interface/type.ts"],"names":[],"mappings":";;;AAEA,IAAkB,YAwBjB;AAxBD,WAAkB,YAAY;IAC5B,+BAAe,CAAA;IAEf,iCAAiB,CAAA;IACjB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,2BAAW,CAAA;IACX,+BAAe,CAAA;IACf,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;IACvB,mCAAmB,CAAA;IACnB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,6BAAa,CAAA;IACb,iCAAiB,CAAA;IAEjB,uCAAuB,CAAA;IACvB,+BAAe,CAAA;AACjB,CAAC,EAxBiB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAwB7B","file":"type.js","sourcesContent":["export type MarkType = keyof typeof MarkTypeEnum | string;\n\nexport const enum MarkTypeEnum {\n  group = 'group',\n\n  symbol = 'symbol',\n  rule = 'rule',\n  line = 'line',\n  text = 'text',\n  rect = 'rect',\n  rect3d = 'rect3d',\n  image = 'image',\n  path = 'path',\n  area = 'area',\n  arc = 'arc',\n  arc3d = 'arc3d',\n  polygon = 'polygon',\n  pyramid3d = 'pyramid3d',\n  boxPlot = 'boxPlot',\n  linkPath = 'linkPath',\n  progressArc = 'progressArc',\n  cell = 'cell',\n  ripple = 'ripple',\n\n  component = 'component',\n  label = 'label'\n}\n"]}

package/cjs/mark/label.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerLabelMark = exports.LabelMark = void 0;
 
-const vgrammar_core_1 = require("@visactor/vgrammar-core"), factory_1 = require("./../core/factory"), type_1 = require("./interface/type"), text_1 = require("./text");
+const vgrammar_core_1 = require("@visactor/vgrammar-core"), factory_1 = require("./../core/factory"), text_1 = require("./text");
 
 class LabelMark extends text_1.TextMark {
     constructor() {
@@ -30,7 +30,7 @@ class LabelMark extends text_1.TextMark {
     }
 }
 
-exports.LabelMark = LabelMark, LabelMark.type = type_1.MarkTypeEnum.text, LabelMark.constructorType = type_1.MarkTypeEnum.label;
+exports.LabelMark = LabelMark, LabelMark.type = "text", LabelMark.constructorType = "label";
 
 const registerLabelMark = () => {
     factory_1.Factory.registerMark(LabelMark.constructorType, LabelMark), (0, vgrammar_core_1.registerTextGraphic)();

package/cjs/mark/label.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/label.ts"],"names":[],"mappings":";;;AAAA,2DAA8D;AAC9D,+CAA4C;AAG5C,2CAAgD;AAChD,iCAAkC;AAElC,MAAa,SAAU,SAAQ,eAAQ;IAAvC;;QAIE,eAAU,GAAG,KAAK,CAAC;IA4BrB,CAAC;IAzBC,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;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;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;;AA/BH,8BAgCC;AA/BiB,cAAI,GAAG,mBAAY,CAAC,IAAI,CAAC;AACzB,yBAAe,GAAG,mBAAY,CAAC,KAAK,CAAC;AA6ChD,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC3D,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"label.js","sourcesContent":["import { registerTextGraphic } from '@visactor/vgrammar-core';\nimport { Factory } from './../core/factory';\nimport 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      this.setRule(target.type);\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\nexport const registerLabelMark = () => {\n  Factory.registerMark(LabelMark.constructorType, LabelMark);\n  registerTextGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/label.ts"],"names":[],"mappings":";;;AAAA,2DAA8D;AAC9D,+CAA4C;AAI5C,iCAAkC;AAElC,MAAa,SAAU,SAAQ,eAAQ;IAAvC;;QAIE,eAAU,GAAG,KAAK,CAAC;IA4BrB,CAAC;IAzBC,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;YACf,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC3B;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;;AA/BH,8BAgCC;AA/BiB,cAAI,UAAqB;AACzB,yBAAe,WAAsB;AA6ChD,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,iBAAO,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC3D,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,iBAAiB,qBAG5B","file":"label.js","sourcesContent":["import { registerTextGraphic } from '@visactor/vgrammar-core';\nimport { Factory } from './../core/factory';\nimport 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      this.setRule(target.type);\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\nexport const registerLabelMark = () => {\n  Factory.registerMark(LabelMark.constructorType, LabelMark);\n  registerTextGraphic();\n};\n"]}

package/cjs/mark/line.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerLineMark = exports.LineMark = void 0;
 
-const factory_1 = require("./../core/factory"), type_1 = require("../series/interface/type"), base_line_1 = require("./base/base-line"), type_2 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../animation/config");
+const factory_1 = require("./../core/factory"), type_1 = require("../series/interface/type"), base_line_1 = require("./base/base-line"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../animation/config");
 
 class LineMark extends base_line_1.BaseLineMark {
     constructor() {
@@ -21,7 +21,7 @@ class LineMark extends base_line_1.BaseLineMark {
     }
 }
 
-exports.LineMark = LineMark, LineMark.type = type_2.MarkTypeEnum.line;
+exports.LineMark = LineMark, LineMark.type = "line";
 
 const registerLineMark = () => {
     factory_1.Factory.registerMark(LineMark.type, LineMark), (0, vgrammar_core_1.registerLineGraphic)(), 

package/cjs/mark/line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/line.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,mDAA0D;AAE1D,gDAAgD;AAGhD,2CAAgD;AAChD,2DAA8D;AAC9D,gDAA0E;AAI1E,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;AAwBpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;IACtB,IAAA,4CAAmC,GAAE,CAAC;AACxC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B","file":"line.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { 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';\nimport { registerLineGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarLineOrAreaAnimation } from '../animation/config';\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\nexport const registerLineMark = () => {\n  Factory.registerMark(LineMark.type, LineMark);\n  registerLineGraphic();\n  registerVGrammarLineOrAreaAnimation();\n};\n"]}
+{"version":3,"sources":["../src/mark/line.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,mDAA0D;AAE1D,gDAAgD;AAIhD,2DAA8D;AAC9D,gDAA0E;AAI1E,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,UAAqB;AAwBpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;IACtB,IAAA,4CAAmC,GAAE,CAAC;AACxC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B","file":"line.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { 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';\nimport { registerLineGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarLineOrAreaAnimation } from '../animation/config';\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\nexport const registerLineMark = () => {\n  Factory.registerMark(LineMark.type, LineMark);\n  registerLineGraphic();\n  registerVGrammarLineOrAreaAnimation();\n};\n"]}

package/cjs/mark/link-path.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerLinkPathMark = exports.LinkPathMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class LinkPathMark extends base_mark_1.BaseMark {
     constructor() {
@@ -30,7 +30,7 @@ class LinkPathMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.LinkPathMark = LinkPathMark, LinkPathMark.type = type_1.MarkTypeEnum.linkPath;
+exports.LinkPathMark = LinkPathMark, LinkPathMark.type = "linkPath";
 
 const registerLinkPathMark = () => {
     (0, vgrammar_core_1.registerLinkPathGlyph)(), factory_1.Factory.registerMark(LinkPathMark.type, LinkPathMark);

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/link-path.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,gDAA4C;AAI5C,2CAAgD;AAChD,2DAAgE;AAMhE,MAAa,YAAa,SAAQ,oBAA2B;IAA7D;;QAEW,SAAI,GAAG,YAAY,CAAC,IAAI,CAAC;IA8BpC,CAAC;IA5BW,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,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;;AA/BH,oCAgCC;AA/BiB,iBAAI,GAAG,mBAAY,CAAC,QAAQ,CAAC;AAiCxC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,IAAA,qCAAqB,GAAE,CAAC;IACxB,iBAAO,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,EAAE,YAAmB,CAAC,CAAC;AAC/D,CAAC,CAAC;AAHW,QAAA,oBAAoB,wBAG/B","file":"link-path.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { 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    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\nexport const registerLinkPathMark = () => {\n  registerLinkPathGlyph();\n  Factory.registerMark(LinkPathMark.type, LinkPathMark as any);\n};\n"]}
+{"version":3,"sources":["../src/mark/link-path.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,gDAA4C;AAK5C,2DAAgE;AAMhE,MAAa,YAAa,SAAQ,oBAA2B;IAA7D;;QAEW,SAAI,GAAG,YAAY,CAAC,IAAI,CAAC;IA8BpC,CAAC;IA5BW,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,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;;AA/BH,oCAgCC;AA/BiB,iBAAI,cAAyB;AAiCxC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,IAAA,qCAAqB,GAAE,CAAC;IACxB,iBAAO,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,EAAE,YAAmB,CAAC,CAAC;AAC/D,CAAC,CAAC;AAHW,QAAA,oBAAoB,wBAG/B","file":"link-path.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { 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    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\nexport const registerLinkPathMark = () => {\n  registerLinkPathGlyph();\n  Factory.registerMark(LinkPathMark.type, LinkPathMark as any);\n};\n"]}

package/cjs/mark/path.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerPathMark = exports.PathMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class PathMark extends base_mark_1.BaseMark {
     constructor() {
@@ -18,7 +18,7 @@ class PathMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.PathMark = PathMark, PathMark.type = type_1.MarkTypeEnum.path;
+exports.PathMark = PathMark, PathMark.type = "path";
 
 const registerPathMark = () => {
     factory_1.Factory.registerMark(PathMark.type, PathMark), (0, vgrammar_core_1.registerPathGraphic)();

package/cjs/mark/path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/path.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAG5C,2CAAgD;AAChD,2DAA8D;AAI9D,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;AAapC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B","file":"path.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerPathGraphic } from '@visactor/vgrammar-core';\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\nexport const registerPathMark = () => {\n  Factory.registerMark(PathMark.type, PathMark);\n  registerPathGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/path.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAA8D;AAI9D,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,UAAqB;AAapC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B","file":"path.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerPathGraphic } from '@visactor/vgrammar-core';\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\nexport const registerPathMark = () => {\n  Factory.registerMark(PathMark.type, PathMark);\n  registerPathGraphic();\n};\n"]}

package/cjs/mark/polygon/polygon.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerPolygonMark = exports.PolygonMark = void 0;
 
-const factory_1 = require("./../../core/factory"), base_polygon_1 = require("./base-polygon"), type_1 = require("../interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../../animation/config");
+const factory_1 = require("./../../core/factory"), base_polygon_1 = require("./base-polygon"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../../animation/config");
 
 class PolygonMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -17,7 +17,7 @@ class PolygonMark extends base_polygon_1.BasePolygonMark {
     }
 }
 
-exports.PolygonMark = PolygonMark, PolygonMark.type = type_1.MarkTypeEnum.polygon;
+exports.PolygonMark = PolygonMark, PolygonMark.type = "polygon";
 
 const registerPolygonMark = () => {
     factory_1.Factory.registerMark(PolygonMark.type, PolygonMark), (0, vgrammar_core_1.registerPolygonGraphic)(), 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/polygon/polygon.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAG/C,iDAAiD;AAEjD,4CAAiD;AACjD,2DAAiE;AACjE,mDAA0E;AAI1E,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;AAYvC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,iBAAO,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACpD,IAAA,sCAAsB,GAAE,CAAC;IACzB,IAAA,yCAAgC,GAAE,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B","file":"polygon.js","sourcesContent":["import { Factory } from './../../core/factory';\n/* 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';\nimport { registerPolygonGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarPolygonAnimation } from '../../animation/config';\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\nexport const registerPolygonMark = () => {\n  Factory.registerMark(PolygonMark.type, PolygonMark);\n  registerPolygonGraphic();\n  registerVGrammarPolygonAnimation();\n};\n"]}
+{"version":3,"sources":["../src/mark/polygon/polygon.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAG/C,iDAAiD;AAGjD,2DAAiE;AACjE,mDAA0E;AAI1E,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,aAAwB;AAYvC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,iBAAO,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACpD,IAAA,sCAAsB,GAAE,CAAC;IACzB,IAAA,yCAAgC,GAAE,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B","file":"polygon.js","sourcesContent":["import { Factory } from './../../core/factory';\n/* 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';\nimport { registerPolygonGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarPolygonAnimation } from '../../animation/config';\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\nexport const registerPolygonMark = () => {\n  Factory.registerMark(PolygonMark.type, PolygonMark);\n  registerPolygonGraphic();\n  registerVGrammarPolygonAnimation();\n};\n"]}

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerPyramid3dMark = exports.Pyramid3dMark = void 0;
 
-const factory_1 = require("./../../core/factory"), type_1 = require("../interface/type"), base_polygon_1 = require("./base-polygon"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../../animation/config");
+const factory_1 = require("./../../core/factory"), base_polygon_1 = require("./base-polygon"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../../animation/config");
 
 class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -12,7 +12,7 @@ class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
     }
 }
 
-exports.Pyramid3dMark = Pyramid3dMark, Pyramid3dMark.type = type_1.MarkTypeEnum.pyramid3d;
+exports.Pyramid3dMark = Pyramid3dMark, Pyramid3dMark.type = "pyramid3d";
 
 const registerPyramid3dMark = () => {
     factory_1.Factory.registerMark(Pyramid3dMark.type, Pyramid3dMark), (0, vgrammar_core_1.registerPyramid3dGraphic)(), 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/polygon/pyramid-3d.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAI/C,4CAAiD;AACjD,iDAAiD;AACjD,2DAAmE;AACnE,mDAA0E;AAI1E,MAAa,aAAc,SAAQ,8BAAmC;IAAtE;;QAEW,SAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IACrC,CAAC;;AAHD,sCAGC;AAFiB,kBAAI,GAAG,mBAAY,CAAC,SAAS,CAAC;AAIzC,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,iBAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACxD,IAAA,wCAAwB,GAAE,CAAC;IAC3B,IAAA,yCAAgC,GAAE,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,qBAAqB,yBAIhC","file":"pyramid-3d.js","sourcesContent":["import { Factory } from './../../core/factory';\n/* 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';\nimport { registerPyramid3dGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarPolygonAnimation } from '../../animation/config';\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\nexport const registerPyramid3dMark = () => {\n  Factory.registerMark(Pyramid3dMark.type, Pyramid3dMark);\n  registerPyramid3dGraphic();\n  registerVGrammarPolygonAnimation();\n};\n"]}
+{"version":3,"sources":["../src/mark/polygon/pyramid-3d.ts"],"names":[],"mappings":";;;AAAA,kDAA+C;AAK/C,iDAAiD;AACjD,2DAAmE;AACnE,mDAA0E;AAI1E,MAAa,aAAc,SAAQ,8BAAmC;IAAtE;;QAEW,SAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IACrC,CAAC;;AAHD,sCAGC;AAFiB,kBAAI,eAA0B;AAIzC,MAAM,qBAAqB,GAAG,GAAG,EAAE;IACxC,iBAAO,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACxD,IAAA,wCAAwB,GAAE,CAAC;IAC3B,IAAA,yCAAgC,GAAE,CAAC;AACrC,CAAC,CAAC;AAJW,QAAA,qBAAqB,yBAIhC","file":"pyramid-3d.js","sourcesContent":["import { Factory } from './../../core/factory';\n/* 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';\nimport { registerPyramid3dGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarPolygonAnimation } from '../../animation/config';\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\nexport const registerPyramid3dMark = () => {\n  Factory.registerMark(Pyramid3dMark.type, Pyramid3dMark);\n  registerPyramid3dGraphic();\n  registerVGrammarPolygonAnimation();\n};\n"]}

package/cjs/mark/progress-arc.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerProgressArcMark = exports.ProgressArcMark = void 0;
 
-const factory_1 = require("./../core/factory"), vutils_1 = require("@visactor/vutils"), type_1 = require("./interface/type"), arc_1 = require("./arc"), config_1 = require("../animation/config"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), vutils_1 = require("@visactor/vutils"), arc_1 = require("./arc"), config_1 = require("../animation/config"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class ProgressArcMark extends arc_1.BaseArcMark {
     constructor() {
@@ -44,8 +44,7 @@ class ProgressArcMark extends arc_1.BaseArcMark {
     }
 }
 
-exports.ProgressArcMark = ProgressArcMark, ProgressArcMark.type = type_1.MarkTypeEnum.arc, 
-ProgressArcMark.constructorType = type_1.MarkTypeEnum.progressArc;
+exports.ProgressArcMark = ProgressArcMark, ProgressArcMark.type = "arc", ProgressArcMark.constructorType = "progressArc";
 
 const registerProgressArcMark = () => {
     (0, vgrammar_core_1.registerArcGraphic)(), (0, config_1.registerVGrammarArcAnimation)(), 

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 { Factory } from './../core/factory';\nimport { 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';\nimport { registerVGrammarArcAnimation } from '../animation/config';\nimport { registerArcGraphic } from '@visactor/vgrammar-core';\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\nexport const registerProgressArcMark = () => {\n  registerArcGraphic();\n  registerVGrammarArcAnimation();\n  Factory.registerMark(ProgressArcMark.constructorType, ProgressArcMark);\n};\n"]}
+{"version":3,"sources":["../src/mark/progress-arc.ts"],"names":[],"mappings":"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","file":"progress-arc.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { 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';\nimport { registerVGrammarArcAnimation } from '../animation/config';\nimport { registerArcGraphic } from '@visactor/vgrammar-core';\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\nexport const registerProgressArcMark = () => {\n  registerArcGraphic();\n  registerVGrammarArcAnimation();\n  Factory.registerMark(ProgressArcMark.constructorType, ProgressArcMark);\n};\n"]}

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRect3dMark = exports.Rect3dMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../animation/config");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../animation/config");
 
 class Rect3dMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,7 +19,7 @@ class Rect3dMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.Rect3dMark = Rect3dMark, Rect3dMark.type = type_1.MarkTypeEnum.rect3d;
+exports.Rect3dMark = Rect3dMark, Rect3dMark.type = "rect3d";
 
 const registerRect3dMark = () => {
     factory_1.Factory.registerMark(Rect3dMark.type, Rect3dMark), (0, vgrammar_core_1.registerRect3dGraphic)(), 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rect-3d.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAG5C,2CAAgD;AAChD,2DAAgE;AAChE,gDAAoE;AAIpE,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;AActC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAClD,IAAA,qCAAqB,GAAE,CAAC;IACxB,IAAA,sCAA6B,GAAE,CAAC;AAClC,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B","file":"rect-3d.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerRect3dGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarRectAnimation } from '../animation/config';\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\nexport const registerRect3dMark = () => {\n  Factory.registerMark(Rect3dMark.type, Rect3dMark);\n  registerRect3dGraphic();\n  registerVGrammarRectAnimation();\n};\n"]}
+{"version":3,"sources":["../src/mark/rect-3d.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAAgE;AAChE,gDAAoE;AAIpE,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,YAAuB;AActC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAClD,IAAA,qCAAqB,GAAE,CAAC;IACxB,IAAA,sCAA6B,GAAE,CAAC;AAClC,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B","file":"rect-3d.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerRect3dGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarRectAnimation } from '../animation/config';\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\nexport const registerRect3dMark = () => {\n  Factory.registerMark(Rect3dMark.type, Rect3dMark);\n  registerRect3dGraphic();\n  registerVGrammarRectAnimation();\n};\n"]}

package/cjs/mark/rect.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRectMark = exports.RectMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../animation/config");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), config_1 = require("../animation/config");
 
 class RectMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,7 +19,7 @@ class RectMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.RectMark = RectMark, RectMark.type = type_1.MarkTypeEnum.rect;
+exports.RectMark = RectMark, RectMark.type = "rect";
 
 const registerRectMark = () => {
     factory_1.Factory.registerMark(RectMark.type, RectMark), (0, vgrammar_core_1.registerRectGraphic)(), 

package/cjs/mark/rect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rect.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAG5C,2CAAgD;AAChD,2DAA8D;AAC9D,gDAAoE;AAIpE,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;AAcpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;IACtB,IAAA,sCAA6B,GAAE,CAAC;AAClC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B","file":"rect.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerRectGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarRectAnimation } from '../animation/config';\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\nexport const registerRectMark = () => {\n  Factory.registerMark(RectMark.type, RectMark);\n  registerRectGraphic();\n  registerVGrammarRectAnimation();\n};\n"]}
+{"version":3,"sources":["../src/mark/rect.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAA8D;AAC9D,gDAAoE;AAIpE,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,UAAqB;AAcpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;IACtB,IAAA,sCAA6B,GAAE,CAAC;AAClC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B","file":"rect.js","sourcesContent":["import { Factory } from './../core/factory';\nimport 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';\nimport { registerRectGraphic } from '@visactor/vgrammar-core';\nimport { registerVGrammarRectAnimation } from '../animation/config';\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\nexport const registerRectMark = () => {\n  Factory.registerMark(RectMark.type, RectMark);\n  registerRectGraphic();\n  registerVGrammarRectAnimation();\n};\n"]}

package/cjs/mark/ripple.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRippleMark = exports.RippleMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class RippleMark extends base_mark_1.BaseMark {
     constructor() {
@@ -24,7 +24,7 @@ class RippleMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.RippleMark = RippleMark, RippleMark.type = type_1.MarkTypeEnum.ripple;
+exports.RippleMark = RippleMark, RippleMark.type = "ripple";
 
 const registerRippleMark = () => {
     factory_1.Factory.registerMark(RippleMark.type, RippleMark), (0, vgrammar_core_1.registerRippleGlyph)();

package/cjs/mark/ripple.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/ripple.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,gDAA4C;AAI5C,2CAAgD;AAChD,2DAA8D;AAM9D,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAqBlC,CAAC;IAnBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,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,MAAM,SAAS,GAAG,aAAa,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAtBH,gCAuBC;AAtBiB,eAAI,GAAG,mBAAY,CAAC,MAAM,CAAC;AAwBtC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAClD,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B","file":"ripple.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { BaseMark } from './base/base-mark';\nimport type { IRippleMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerRippleGlyph } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type IRippleMark = IMarkRaw<IRippleMarkSpec>;\n\nexport class RippleMark extends BaseMark<IRippleMarkSpec> implements IRippleMark {\n  static readonly type = MarkTypeEnum.ripple;\n  readonly type = RippleMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRippleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x: 0,\n      y: 0,\n      ripple: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = 'ripplePoint';\n    this._product = view.glyph(glyphType, group ?? view.rootMark).id(id);\n    this._compiledProductId = id;\n  }\n}\n\nexport const registerRippleMark = () => {\n  Factory.registerMark(RippleMark.type, RippleMark);\n  registerRippleGlyph();\n};\n"]}
+{"version":3,"sources":["../src/mark/ripple.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,gDAA4C;AAK5C,2DAA8D;AAM9D,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAqBlC,CAAC;IAnBW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,CAAC,EAAE,CAAC,EACJ,CAAC,EAAE,CAAC,EACJ,MAAM,EAAE,CAAC,GACV,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,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,MAAM,SAAS,GAAG,aAAa,CAAC;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAtBH,gCAuBC;AAtBiB,eAAI,YAAuB;AAwBtC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAClD,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B","file":"ripple.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { BaseMark } from './base/base-mark';\nimport type { IRippleMarkSpec } from '../typings/visual';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { registerRippleGlyph } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type IRippleMark = IMarkRaw<IRippleMarkSpec>;\n\nexport class RippleMark extends BaseMark<IRippleMarkSpec> implements IRippleMark {\n  static readonly type = MarkTypeEnum.ripple;\n  readonly type = RippleMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRippleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x: 0,\n      y: 0,\n      ripple: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _initProduct(group?: string | IGroupMark) {\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = 'ripplePoint';\n    this._product = view.glyph(glyphType, group ?? view.rootMark).id(id);\n    this._compiledProductId = id;\n  }\n}\n\nexport const registerRippleMark = () => {\n  Factory.registerMark(RippleMark.type, RippleMark);\n  registerRippleGlyph();\n};\n"]}

package/cjs/mark/rule.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerRuleMark = exports.RuleMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class RuleMark extends base_mark_1.BaseMark {
     constructor() {
@@ -18,7 +18,7 @@ class RuleMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.RuleMark = RuleMark, RuleMark.type = type_1.MarkTypeEnum.rule;
+exports.RuleMark = RuleMark, RuleMark.type = "rule";
 
 const registerRuleMark = () => {
     factory_1.Factory.registerMark(RuleMark.type, RuleMark), (0, vgrammar_core_1.registerRuleGraphic)();

package/cjs/mark/rule.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rule.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAG5C,2CAAgD;AAChD,2DAA8D;AAI9D,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAShC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,GACN,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,4BAWC;AAViB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC;AAYpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B","file":"rule.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IRuleMarkSpec } 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';\nimport { registerRuleGraphic } from '@visactor/vgrammar-core';\n\nexport type IRuleMark = IMarkRaw<IRuleMarkSpec>;\n\nexport class RuleMark extends BaseMark<IRuleMarkSpec> implements IRuleMark {\n  static readonly type = MarkTypeEnum.rule;\n  readonly type = RuleMark.type;\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRuleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x1: 0,\n      y1: 0\n    };\n    return defaultStyle;\n  }\n}\n\nexport const registerRuleMark = () => {\n  Factory.registerMark(RuleMark.type, RuleMark);\n  registerRuleGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/rule.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAA8D;AAI9D,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAShC,CAAC;IARW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,EAAE,EAAE,CAAC,EACL,EAAE,EAAE,CAAC,GACN,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,4BAWC;AAViB,aAAI,UAAqB;AAYpC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,iBAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAA,mCAAmB,GAAE,CAAC;AACxB,CAAC,CAAC;AAHW,QAAA,gBAAgB,oBAG3B","file":"rule.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { IRuleMarkSpec } 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';\nimport { registerRuleGraphic } from '@visactor/vgrammar-core';\n\nexport type IRuleMark = IMarkRaw<IRuleMarkSpec>;\n\nexport class RuleMark extends BaseMark<IRuleMarkSpec> implements IRuleMark {\n  static readonly type = MarkTypeEnum.rule;\n  readonly type = RuleMark.type;\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IRuleMarkSpec> = {\n      ...super._getDefaultStyle(),\n      x1: 0,\n      y1: 0\n    };\n    return defaultStyle;\n  }\n}\n\nexport const registerRuleMark = () => {\n  Factory.registerMark(RuleMark.type, RuleMark);\n  registerRuleGraphic();\n};\n"]}

package/cjs/mark/symbol.js

@@ -4,13 +4,13 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerSymbolMark = exports.SymbolMark = exports.BaseSymbolMark = void 0;
 
-const factory_1 = require("./../core/factory"), typings_1 = require("../typings"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class BaseSymbolMark extends base_mark_1.BaseMark {
     _getDefaultStyle() {
         return Object.assign(Object.assign({}, super._getDefaultStyle()), {
             size: 1,
-            symbolType: typings_1.ShapeTypeEnum.circle,
+            symbolType: "circle",
             fill: void 0,
             lineWidth: 0
         });
@@ -25,7 +25,7 @@ class SymbolMark extends BaseSymbolMark {
     }
 }
 
-exports.SymbolMark = SymbolMark, SymbolMark.type = type_1.MarkTypeEnum.symbol;
+exports.SymbolMark = SymbolMark, SymbolMark.type = "symbol";
 
 const registerSymbolMark = () => {
     factory_1.Factory.registerMark(SymbolMark.type, SymbolMark), (0, vgrammar_core_1.registerSymbolGraphic)();

package/cjs/mark/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/symbol.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAC5C,wCAA2C;AAE3C,gDAA4C;AAG5C,2CAAgD;AAChD,2DAAgE;AAIhE,MAAa,cAA0C,SAAQ,oBAAW;IAC9D,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,uBAAa,CAAC,MAAM,EAChC,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAA6B,CAAC;IACvC,CAAC;CACF;AAXD,wCAWC;AAED,MAAa,UAAW,SAAQ,cAA+B;IAA/D;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAClC,CAAC;;AAHD,gCAGC;AAFiB,eAAI,GAAG,mBAAY,CAAC,MAAM,CAAC;AAItC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAClD,IAAA,qCAAqB,GAAE,CAAC;AAC1B,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B","file":"symbol.js","sourcesContent":["import { Factory } from './../core/factory';\nimport { ShapeTypeEnum } from '../typings';\nimport type { ISymbolMarkSpec } 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';\nimport { registerSymbolGraphic } from '@visactor/vgrammar-core';\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ISymbolMarkSpec> = {\n      ...super._getDefaultStyle(),\n      size: 1,\n      symbolType: ShapeTypeEnum.circle,\n      fill: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle as IMarkStyle<T>;\n  }\n}\n\nexport class SymbolMark extends BaseSymbolMark<ISymbolMarkSpec> implements ISymbolMark {\n  static readonly type = MarkTypeEnum.symbol;\n  readonly type = SymbolMark.type;\n}\n\nexport const registerSymbolMark = () => {\n  Factory.registerMark(SymbolMark.type, SymbolMark);\n  registerSymbolGraphic();\n};\n"]}
+{"version":3,"sources":["../src/mark/symbol.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAI5C,2DAAgE;AAIhE,MAAa,cAA0C,SAAQ,oBAAW;IAC9D,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,IAAI,EAAE,CAAC,EACP,UAAU,EAAE,QAAQ,EACpB,IAAI,EAAE,SAAS,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAA6B,CAAC;IACvC,CAAC;CACF;AAXD,wCAWC;AAED,MAAa,UAAW,SAAQ,cAA+B;IAA/D;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAClC,CAAC;;AAHD,gCAGC;AAFiB,eAAI,YAAuB;AAItC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,iBAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAClD,IAAA,qCAAqB,GAAE,CAAC;AAC1B,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B","file":"symbol.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ISymbolMarkSpec } 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';\nimport { registerSymbolGraphic } from '@visactor/vgrammar-core';\n\nexport type ISymbolMark = IMarkRaw<ISymbolMarkSpec>;\n\nexport class BaseSymbolMark<T extends ISymbolMarkSpec> extends BaseMark<T> {\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ISymbolMarkSpec> = {\n      ...super._getDefaultStyle(),\n      size: 1,\n      symbolType: 'circle',\n      fill: undefined,\n      lineWidth: 0\n    };\n    return defaultStyle as IMarkStyle<T>;\n  }\n}\n\nexport class SymbolMark extends BaseSymbolMark<ISymbolMarkSpec> implements ISymbolMark {\n  static readonly type = MarkTypeEnum.symbol;\n  readonly type = SymbolMark.type;\n}\n\nexport const registerSymbolMark = () => {\n  Factory.registerMark(SymbolMark.type, SymbolMark);\n  registerSymbolGraphic();\n};\n"]}

package/cjs/mark/text.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerTextMark = exports.TextMark = void 0;
 
-const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), interface_1 = require("./interface"), vgrammar_core_1 = require("@visactor/vgrammar-core");
+const factory_1 = require("./../core/factory"), base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class TextMark extends base_mark_1.BaseMark {
     constructor() {
@@ -25,7 +25,7 @@ class TextMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.TextMark = TextMark, TextMark.type = interface_1.MarkTypeEnum.text;
+exports.TextMark = TextMark, TextMark.type = "text";
 
 const registerTextMark = () => {
     factory_1.Factory.registerMark(TextMark.type, TextMark), (0, vgrammar_core_1.registerTextGraphic)(),