@visactor/vchart 1.7.5 → 1.8.0-alpha.0

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

@@ -10,3 +10,4 @@ export declare class LinkPathMark extends BaseMark<ILinkPathMarkSpec> implements
     protected _getDefaultStyle(): IMarkStyle<ILinkPathMarkSpec>;
     protected _initProduct(group?: string | IGroupMark): void;
 }
+export declare const registerLinkPathMark: () => void;

package/cjs/mark/link-path.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.LinkPathMark = void 0;
+}), exports.registerLinkPathMark = exports.LinkPathMark = void 0;
 
-const 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"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class LinkPathMark extends base_mark_1.BaseMark {
     constructor() {
@@ -23,7 +23,6 @@ class LinkPathMark extends base_mark_1.BaseMark {
         });
     }
     _initProduct(group) {
-        (0, vgrammar_core_1.registerLinkPathGlyph)();
         const view = this.getVGrammarView(), id = this.getProductId(), direction = this.getStyle("direction");
         this._product = view.glyph("linkPath", null != group ? group : view.rootMark).id(id).configureGlyph({
             direction: direction
@@ -32,4 +31,10 @@ class LinkPathMark extends base_mark_1.BaseMark {
 }
 
 exports.LinkPathMark = LinkPathMark, LinkPathMark.type = type_1.MarkTypeEnum.linkPath;
+
+const registerLinkPathMark = () => {
+    (0, vgrammar_core_1.registerLinkPathGlyph)(), factory_1.Factory.registerMark(LinkPathMark.type, LinkPathMark);
+};
+
+exports.registerLinkPathMark = registerLinkPathMark;
 //# 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,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"]}
+{"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"]}

package/cjs/mark/path.d.ts

@@ -8,3 +8,4 @@ export declare class PathMark extends BaseMark<IPathMarkSpec> implements IPathMa
     readonly type = MarkTypeEnum.path;
     protected _getDefaultStyle(): IMarkStyle<IPathMarkSpec>;
 }
+export declare const registerPathMark: () => void;

package/cjs/mark/path.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.PathMark = void 0;
+}), exports.registerPathMark = exports.PathMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
+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");
 
 class PathMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,4 +19,10 @@ class PathMark extends base_mark_1.BaseMark {
 }
 
 exports.PathMark = PathMark, PathMark.type = type_1.MarkTypeEnum.path;
+
+const registerPathMark = () => {
+    factory_1.Factory.registerMark(PathMark.type, PathMark), (0, vgrammar_core_1.registerPathGraphic)();
+};
+
+exports.registerPathMark = registerPathMark;
 //# sourceMappingURL=path.js.map

package/cjs/mark/path.js.map

@@ -1 +1 @@
-{"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"]}
+{"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"]}

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

@@ -8,3 +8,4 @@ export declare class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> imple
     readonly type = MarkTypeEnum.polygon;
     protected _getDefaultStyle(): IMarkStyle<IPolygonMarkSpec>;
 }
+export declare const registerPolygonMark: () => void;

package/cjs/mark/polygon/polygon.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.PolygonMark = void 0;
+}), exports.registerPolygonMark = exports.PolygonMark = void 0;
 
-const base_polygon_1 = require("./base-polygon"), type_1 = require("../interface/type");
+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");
 
 class PolygonMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -18,4 +18,11 @@ class PolygonMark extends base_polygon_1.BasePolygonMark {
 }
 
 exports.PolygonMark = PolygonMark, PolygonMark.type = type_1.MarkTypeEnum.polygon;
+
+const registerPolygonMark = () => {
+    factory_1.Factory.registerMark(PolygonMark.type, PolygonMark), (0, vgrammar_core_1.registerPolygonGraphic)(), 
+    (0, config_1.registerVGrammarPolygonAnimation)();
+};
+
+exports.registerPolygonMark = registerPolygonMark;
 //# 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,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"]}
+{"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"]}

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

@@ -7,3 +7,4 @@ export declare class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> i
     static readonly type = MarkTypeEnum.pyramid3d;
     readonly type = MarkTypeEnum.pyramid3d;
 }
+export declare const registerPyramid3dMark: () => void;

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

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Pyramid3dMark = void 0;
+}), exports.registerPyramid3dMark = exports.Pyramid3dMark = void 0;
 
-const type_1 = require("../interface/type"), base_polygon_1 = require("./base-polygon");
+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");
 
 class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
     constructor() {
@@ -13,4 +13,11 @@ class Pyramid3dMark extends base_polygon_1.BasePolygonMark {
 }
 
 exports.Pyramid3dMark = Pyramid3dMark, Pyramid3dMark.type = type_1.MarkTypeEnum.pyramid3d;
+
+const registerPyramid3dMark = () => {
+    factory_1.Factory.registerMark(Pyramid3dMark.type, Pyramid3dMark), (0, vgrammar_core_1.registerPyramid3dGraphic)(), 
+    (0, config_1.registerVGrammarPolygonAnimation)();
+};
+
+exports.registerPyramid3dMark = registerPyramid3dMark;
 //# 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,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"]}
+{"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"]}

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

@@ -11,3 +11,4 @@ export declare class ProgressArcMark extends BaseArcMark<IProgressArcMarkSpec> i
     protected _getDefaultStyle(): IMarkStyle<IProgressArcMarkSpec>;
     protected _filterStyle(style: Partial<IMarkStyle<IProgressArcMarkSpec>>, state: StateValueType, level: number, stateStyle?: IMarkStateStyle<IProgressArcMarkSpec>): Partial<ConvertToMarkStyleSpec<IProgressArcMarkSpec>> | Partial<IMarkStyle<IProgressArcMarkSpec>>;
 }
+export declare const registerProgressArcMark: () => void;

package/cjs/mark/progress-arc.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.ProgressArcMark = void 0;
+}), exports.registerProgressArcMark = exports.ProgressArcMark = void 0;
 
-const vutils_1 = require("@visactor/vutils"), type_1 = require("./interface/type"), arc_1 = require("./arc");
+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");
 
 class ProgressArcMark extends arc_1.BaseArcMark {
     constructor() {
@@ -46,4 +46,11 @@ class ProgressArcMark extends arc_1.BaseArcMark {
 
 exports.ProgressArcMark = ProgressArcMark, ProgressArcMark.type = type_1.MarkTypeEnum.arc, 
 ProgressArcMark.constructorType = type_1.MarkTypeEnum.progressArc;
+
+const registerProgressArcMark = () => {
+    (0, vgrammar_core_1.registerArcGraphic)(), (0, config_1.registerVGrammarArcAnimation)(), 
+    factory_1.Factory.registerMark(ProgressArcMark.constructorType, ProgressArcMark);
+};
+
+exports.registerProgressArcMark = registerProgressArcMark;
 //# 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/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"]}
+{"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.d.ts

@@ -8,3 +8,4 @@ export declare class Rect3dMark extends BaseMark<IRect3dMarkSpec> implements IRe
     readonly type = MarkTypeEnum.rect3d;
     protected _getDefaultStyle(): IMarkStyle<IRect3dMarkSpec>;
 }
+export declare const registerRect3dMark: () => void;

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

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.Rect3dMark = void 0;
+}), exports.registerRect3dMark = exports.Rect3dMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
+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");
 
 class Rect3dMark extends base_mark_1.BaseMark {
     constructor() {
@@ -20,4 +20,11 @@ class Rect3dMark extends base_mark_1.BaseMark {
 }
 
 exports.Rect3dMark = Rect3dMark, Rect3dMark.type = type_1.MarkTypeEnum.rect3d;
+
+const registerRect3dMark = () => {
+    factory_1.Factory.registerMark(Rect3dMark.type, Rect3dMark), (0, vgrammar_core_1.registerRect3dGraphic)(), 
+    (0, config_1.registerVGrammarRectAnimation)();
+};
+
+exports.registerRect3dMark = registerRect3dMark;
 //# 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,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"]}
+{"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"]}

package/cjs/mark/rect.d.ts

@@ -8,3 +8,4 @@ export declare class RectMark extends BaseMark<IRectMarkSpec> implements IRectMa
     readonly type = MarkTypeEnum.rect;
     protected _getDefaultStyle(): IMarkStyle<IRectMarkSpec>;
 }
+export declare const registerRectMark: () => void;

package/cjs/mark/rect.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.RectMark = void 0;
+}), exports.registerRectMark = exports.RectMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
+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");
 
 class RectMark extends base_mark_1.BaseMark {
     constructor() {
@@ -20,4 +20,11 @@ class RectMark extends base_mark_1.BaseMark {
 }
 
 exports.RectMark = RectMark, RectMark.type = type_1.MarkTypeEnum.rect;
+
+const registerRectMark = () => {
+    factory_1.Factory.registerMark(RectMark.type, RectMark), (0, vgrammar_core_1.registerRectGraphic)(), 
+    (0, config_1.registerVGrammarRectAnimation)();
+};
+
+exports.registerRectMark = registerRectMark;
 //# sourceMappingURL=rect.js.map

package/cjs/mark/rect.js.map

@@ -1 +1 @@
-{"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"]}
+{"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"]}

package/cjs/mark/ripple.d.ts

@@ -10,3 +10,4 @@ export declare class RippleMark extends BaseMark<IRippleMarkSpec> implements IRi
     protected _getDefaultStyle(): IMarkStyle<IRippleMarkSpec>;
     protected _initProduct(group?: string | IGroupMark): void;
 }
+export declare const registerRippleMark: () => void;

package/cjs/mark/ripple.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.RippleMark = void 0;
+}), exports.registerRippleMark = exports.RippleMark = void 0;
 
-const 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"), type_1 = require("./interface/type"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class RippleMark extends base_mark_1.BaseMark {
     constructor() {
@@ -18,7 +18,6 @@ class RippleMark extends base_mark_1.BaseMark {
         });
     }
     _initProduct(group) {
-        (0, vgrammar_core_1.registerRippleGlyph)();
         const view = this.getVGrammarView(), id = this.getProductId();
         this._product = view.glyph("ripplePoint", null != group ? group : view.rootMark).id(id), 
         this._compiledProductId = id;
@@ -26,4 +25,10 @@ class RippleMark extends base_mark_1.BaseMark {
 }
 
 exports.RippleMark = RippleMark, RippleMark.type = type_1.MarkTypeEnum.ripple;
+
+const registerRippleMark = () => {
+    factory_1.Factory.registerMark(RippleMark.type, RippleMark), (0, vgrammar_core_1.registerRippleGlyph)();
+};
+
+exports.registerRippleMark = registerRippleMark;
 //# sourceMappingURL=ripple.js.map

package/cjs/mark/ripple.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/ripple.ts"],"names":[],"mappings":";;;AAAA,gDAA4C;AAI5C,2CAAgD;AAChD,2DAA8D;AAM9D,MAAa,UAAW,SAAQ,oBAAyB;IAAzD;;QAEW,SAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAuBlC,CAAC;IArBW,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,IAAA,mCAAmB,GAAE,CAAC;QAEtB,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;;AAxBH,gCAyBC;AAxBiB,eAAI,GAAG,mBAAY,CAAC,MAAM,CAAC","file":"ripple.js","sourcesContent":["import { 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    registerRippleGlyph();\n\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"]}
+{"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"]}

package/cjs/mark/rule.d.ts

@@ -8,3 +8,4 @@ export declare class RuleMark extends BaseMark<IRuleMarkSpec> implements IRuleMa
     readonly type = MarkTypeEnum.rule;
     protected _getDefaultStyle(): IMarkStyle<IRuleMarkSpec>;
 }
+export declare const registerRuleMark: () => void;

package/cjs/mark/rule.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.RuleMark = void 0;
+}), exports.registerRuleMark = exports.RuleMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
+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");
 
 class RuleMark extends base_mark_1.BaseMark {
     constructor() {
@@ -19,4 +19,10 @@ class RuleMark extends base_mark_1.BaseMark {
 }
 
 exports.RuleMark = RuleMark, RuleMark.type = type_1.MarkTypeEnum.rule;
+
+const registerRuleMark = () => {
+    factory_1.Factory.registerMark(RuleMark.type, RuleMark), (0, vgrammar_core_1.registerRuleGraphic)();
+};
+
+exports.registerRuleMark = registerRuleMark;
 //# sourceMappingURL=rule.js.map

package/cjs/mark/rule.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/rule.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAAgD;AAIhD,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","file":"rule.js","sourcesContent":["import 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';\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"]}
+{"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"]}

package/cjs/mark/symbol.d.ts

@@ -10,3 +10,4 @@ export declare class SymbolMark extends BaseSymbolMark<ISymbolMarkSpec> implemen
     static readonly type = MarkTypeEnum.symbol;
     readonly type = MarkTypeEnum.symbol;
 }
+export declare const registerSymbolMark: () => void;

package/cjs/mark/symbol.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.SymbolMark = exports.BaseSymbolMark = void 0;
+}), exports.registerSymbolMark = exports.SymbolMark = exports.BaseSymbolMark = void 0;
 
-const typings_1 = require("../typings"), base_mark_1 = require("./base/base-mark"), type_1 = require("./interface/type");
+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");
 
 class BaseSymbolMark extends base_mark_1.BaseMark {
     _getDefaultStyle() {
@@ -26,4 +26,10 @@ class SymbolMark extends BaseSymbolMark {
 }
 
 exports.SymbolMark = SymbolMark, SymbolMark.type = type_1.MarkTypeEnum.symbol;
+
+const registerSymbolMark = () => {
+    factory_1.Factory.registerMark(SymbolMark.type, SymbolMark), (0, vgrammar_core_1.registerSymbolGraphic)();
+};
+
+exports.registerSymbolMark = registerSymbolMark;
 //# sourceMappingURL=symbol.js.map

package/cjs/mark/symbol.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/symbol.ts"],"names":[],"mappings":";;;AAAA,wCAA2C;AAE3C,gDAA4C;AAG5C,2CAAgD;AAIhD,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","file":"symbol.js","sourcesContent":["import { 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';\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"]}
+{"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"]}

package/cjs/mark/text.d.ts

@@ -10,3 +10,4 @@ export declare class TextMark extends BaseMark<ITextMarkSpec> implements ITextMa
     protected _getDefaultStyle(): IMarkStyle<ITextMarkSpec>;
     protected _initProduct(group?: string | IGroupMark): void;
 }
+export declare const registerTextMark: () => void;

package/cjs/mark/text.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.TextMark = void 0;
+}), exports.registerTextMark = exports.TextMark = void 0;
 
-const 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"), interface_1 = require("./interface"), vgrammar_core_1 = require("@visactor/vgrammar-core");
 
 class TextMark extends base_mark_1.BaseMark {
     constructor() {
@@ -26,4 +26,10 @@ class TextMark extends base_mark_1.BaseMark {
 }
 
 exports.TextMark = TextMark, TextMark.type = interface_1.MarkTypeEnum.text;
+
+const registerTextMark = () => {
+    factory_1.Factory.registerMark(TextMark.type, TextMark), (0, vgrammar_core_1.registerTextGraphic)();
+};
+
+exports.registerTextMark = registerTextMark;
 //# sourceMappingURL=text.js.map

package/cjs/mark/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2CAA2C;AAC3C,2DAA0D;AAK1D,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IA4BhC,CAAC;IA1BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,EAAE,GACf,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;QAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,MAAM,EAAE;YACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,+BAAe,CAAC,QAA2B,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACvG;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,+BAAe,CAAC,IAAuB,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACnG;QAED,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AA7BH,4BA8BC;AA7BiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import type { ITextMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkRaw, IMarkStyle, IMarkOption } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type ITextMark = IMarkRaw<ITextMarkSpec>;\n\nexport class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ITextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0,\n      textConfig: []\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\n    if (this.getStyle('textType') === 'rich') {\n      this._product = view.mark(GrammarMarkType.richtext as GrammarMarkType, group ?? view.rootMark).id(id);\n    } else {\n      this._product = view.mark(GrammarMarkType.text as GrammarMarkType, group ?? view.rootMark).id(id);\n    }\n\n    this._compiledProductId = id;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/text.ts"],"names":[],"mappings":";;;AAAA,+CAA4C;AAE5C,gDAA4C;AAG5C,2CAA2C;AAC3C,2DAA+E;AAK/E,MAAa,QAAS,SAAQ,oBAAuB;IAArD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IA4BhC,CAAC;IA1BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAE3B,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,QAAQ,EACnB,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,EAAE,GACf,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;QAE/B,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,MAAM,EAAE;YACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,+BAAe,CAAC,QAA2B,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACvG;aAAM;YACL,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,+BAAe,CAAC,IAAuB,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACnG;QAED,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AA7BH,4BA8BC;AA7BiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC;AA+BpC,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":"text.js","sourcesContent":["import { Factory } from './../core/factory';\nimport type { ITextMarkSpec } 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';\nimport { GrammarMarkType, registerTextGraphic } from '@visactor/vgrammar-core';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n\nexport type ITextMark = IMarkRaw<ITextMarkSpec>;\n\nexport class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {\n  static readonly type = MarkTypeEnum.text;\n  readonly type = TextMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ITextMarkSpec> = {\n      ...super._getDefaultStyle(),\n      // TODO: 删除后会有显示问题，待排查\n      angle: 0,\n      textAlign: 'center',\n      lineWidth: 0,\n      textConfig: []\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\n    if (this.getStyle('textType') === 'rich') {\n      this._product = view.mark(GrammarMarkType.richtext as GrammarMarkType, group ?? view.rootMark).id(id);\n    } else {\n      this._product = view.mark(GrammarMarkType.text as GrammarMarkType, group ?? view.rootMark).id(id);\n    }\n\n    this._compiledProductId = id;\n  }\n}\n\nexport const registerTextMark = () => {\n  Factory.registerMark(TextMark.type, TextMark);\n  registerTextGraphic();\n};\n"]}

package/cjs/model/base-model.d.ts

@@ -68,9 +68,7 @@ export declare abstract class BaseModel<T extends IModelSpec> extends Compilable
     protected _initTheme(theme?: any): void;
     protected _getTheme(): any;
     protected _mergeThemeToSpec(): void;
-    protected _getDefaultSpecFromChart(chartSpec: any): Partial<T>;
     protected _shouldMergeThemeToSpec(): boolean;
-    protected _prepareSpecBeforeMergingTheme(obj?: any): any;
     setCurrentTheme(): void;
     updateLayoutAttribute(): void;
     setAttrFromSpec(): void;

package/cjs/model/base-model.js

@@ -106,20 +106,13 @@ class BaseModel extends compilable_base_1.CompilableBase {
     _getTheme() {}
     _mergeThemeToSpec() {
         if (this._shouldMergeThemeToSpec()) {
-            const specFromChart = this._getDefaultSpecFromChart(this.getChart().getSpec()), merge = originalSpec => (0, 
-            merge_spec_1.mergeSpec)({}, this._theme, this._prepareSpecBeforeMergingTheme(specFromChart), this._prepareSpecBeforeMergingTheme(originalSpec)), baseSpec = this._originalSpec;
+            const merge = originalSpec => (0, merge_spec_1.mergeSpec)({}, this._theme, originalSpec), baseSpec = this._originalSpec;
             (0, vutils_1.isArray)(baseSpec) ? this._spec = baseSpec.map((spec => merge(spec))) : this._spec = merge(baseSpec);
         }
     }
-    _getDefaultSpecFromChart(chartSpec) {
-        return {};
-    }
     _shouldMergeThemeToSpec() {
         return !0;
     }
-    _prepareSpecBeforeMergingTheme(obj) {
-        return obj;
-    }
     setCurrentTheme() {
         this.reInit(this._getTheme());
     }