@visactor/vchart 1.6.0-alpha.0 → 1.6.0

package/cjs/mark/arc.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/arc.ts"],"names":[],"mappings":";;;AAAA,0CAA+C;AAE/C,uCAAgD;AAEhD,gDAA4C;AAG5C,2CAA2C;AAI3C,MAAa,WAAoC,SAAQ,oBAAW;IAKlE,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QALb,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;QAE3C,sBAAiB,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QA2BrD,uBAAkB,GAAG,CAC7B,GAAW,EACX,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,UAAkB,EACV,EAAE;;YACV,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,mCAAI,CAAC,CAAC;YAC/E,OAAO,UAAU,GAAG,MAAM,CAAC;QAC7B,CAAC,CAAC;QAEQ,kBAAa,GAAG,CACxB,GAAc,EACd,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,MAAc,EACd,EAAE;YACF,MAAM,MAAM,GAAG,IAAA,uBAAgB,EAAC;gBAC9B,KAAK,EAAE,KAAK,CAAC,2BAAgB,CAAC;gBAC9B,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC;aACnE,CAAC,CAAC;YACH,OAAO,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QA5CA,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAmC,CAAC;QAE9E,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAES,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,UAAU,EAAE,CAAC,EACb,QAAQ,EAAE,CAAC,EACX,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,EACd,YAAY,EAAE,CAAC,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;CA0BF;AAtDD,kCAsDC;AAED,MAAa,OAAQ,SAAQ,WAAyB;IAAtD;;QAEW,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;IAC7C,CAAC;;AAHD,0BAGC;AAFiB,YAAI,GAAG,wBAAY,CAAC,GAAG,CAAC","file":"arc.js","sourcesContent":["import { ARC_MIDDLE_ANGLE } from '../constant';\nimport type { IArcMarkSpec, Datum, StateValueType } from '../typings';\nimport { polarToCartesian } from '../util/math';\nimport type { ExChannelCall } from './base/base-mark';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkOption, IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IArcMark = IMarkRaw<IArcMarkSpec>;\n\nexport class BaseArcMark<T extends IArcMarkSpec> extends BaseMark<T> implements IMarkRaw<T> {\n  readonly type: MarkTypeEnum = ArcMark.type;\n\n  _unCompileChannel = { centerOffset: true, radiusOffset: true };\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n\n    // because of set object.function, this setting should be write after object init\n    this._computeExChannel.x = this.computeCenter as ExChannelCall;\n    this._computeExChannel.y = this.computeCenter as ExChannelCall;\n    this._computeExChannel.outerRadius = this.computeOuterRadius as ExChannelCall;\n\n    this._extensionChannel.centerOffset = ['x', 'y'];\n    this._extensionChannel.radiusOffset = ['outerRadius'];\n  }\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<T> = {\n      ...super._getDefaultStyle(),\n      startAngle: 0,\n      endAngle: 0,\n      outerRadius: 0,\n      innerRadius: 0,\n      cornerRadius: 0,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n\n  protected computeOuterRadius = (\n    key: string,\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    superValue: number\n  ): number => {\n    const offset = this._computeAttribute('radiusOffset', datum, states, opt) ?? 0;\n    return superValue + offset;\n  };\n\n  protected computeCenter = (\n    key: 'x' | 'y',\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    center: number\n  ) => {\n    const offset = polarToCartesian({\n      angle: datum[ARC_MIDDLE_ANGLE],\n      radius: this._computeAttribute('centerOffset', datum, states, opt)\n    });\n    return center + offset[key];\n  };\n}\n\nexport class ArcMark extends BaseArcMark<IArcMarkSpec> implements IArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  readonly type: MarkTypeEnum = ArcMark.type;\n}\n"]}
+{"version":3,"sources":["../src/mark/arc.ts"],"names":[],"mappings":";;;AAAA,0CAA+C;AAE/C,uCAAgD;AAEhD,gDAA4C;AAG5C,2CAAgD;AAIhD,MAAa,WAAoC,SAAQ,oBAAW;IAKlE,YAAY,IAAY,EAAE,MAAmB;QAC3C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QALb,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;QAE3C,sBAAiB,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QA2BrD,uBAAkB,GAAG,CAC7B,GAAW,EACX,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,UAAkB,EACV,EAAE;;YACV,MAAM,MAAM,GAAG,MAAC,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAY,mCAAI,CAAC,CAAC;YACtF,OAAO,UAAU,GAAG,MAAM,CAAC;QAC7B,CAAC,CAAC;QAEQ,kBAAa,GAAG,CACxB,GAAc,EACd,KAAY,EACZ,SAAyB,QAAQ,EACjC,GAAQ,EACR,MAAc,EACd,EAAE;YACF,MAAM,MAAM,GAAG,IAAA,uBAAgB,EAAC;gBAC9B,KAAK,EAAE,KAAK,CAAC,2BAAgB,CAAC;gBAC9B,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAW;aACxE,CAAC,CAAC;YACH,OAAO,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC,CAAC;QA5CA,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC,aAA8B,CAAC;QAC/D,IAAI,CAAC,iBAAiB,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAmC,CAAC;QAE9E,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjD,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAES,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,UAAU,EAAE,CAAC,EACb,QAAQ,EAAE,CAAC,EACX,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,EACd,YAAY,EAAE,CAAC,EACf,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;CA0BF;AAtDD,kCAsDC;AAED,MAAa,OAAQ,SAAQ,WAAyB;IAAtD;;QAEW,SAAI,GAAiB,OAAO,CAAC,IAAI,CAAC;IAC7C,CAAC;;AAHD,0BAGC;AAFiB,YAAI,GAAG,mBAAY,CAAC,GAAG,CAAC","file":"arc.js","sourcesContent":["import { ARC_MIDDLE_ANGLE } from '../constant';\nimport type { IArcMarkSpec, Datum, StateValueType } from '../typings';\nimport { polarToCartesian } from '../util/math';\nimport type { ExChannelCall } from './base/base-mark';\nimport { BaseMark } from './base/base-mark';\nimport type { IMarkOption, IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IArcMark = IMarkRaw<IArcMarkSpec>;\n\nexport class BaseArcMark<T extends IArcMarkSpec> extends BaseMark<T> implements IMarkRaw<T> {\n  readonly type: MarkTypeEnum = ArcMark.type;\n\n  _unCompileChannel = { centerOffset: true, radiusOffset: true };\n\n  constructor(name: string, option: IMarkOption) {\n    super(name, option);\n\n    // because of set object.function, this setting should be write after object init\n    this._computeExChannel.x = this.computeCenter as ExChannelCall;\n    this._computeExChannel.y = this.computeCenter as ExChannelCall;\n    this._computeExChannel.outerRadius = this.computeOuterRadius as ExChannelCall;\n\n    this._extensionChannel.centerOffset = ['x', 'y'];\n    this._extensionChannel.radiusOffset = ['outerRadius'];\n  }\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<T> = {\n      ...super._getDefaultStyle(),\n      startAngle: 0,\n      endAngle: 0,\n      outerRadius: 0,\n      innerRadius: 0,\n      cornerRadius: 0,\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n\n  protected computeOuterRadius = (\n    key: string,\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    superValue: number\n  ): number => {\n    const offset = (this.getAttribute('radiusOffset', datum, states, opt) as number) ?? 0;\n    return superValue + offset;\n  };\n\n  protected computeCenter = (\n    key: 'x' | 'y',\n    datum: Datum,\n    states: StateValueType = 'normal',\n    opt: any,\n    center: number\n  ) => {\n    const offset = polarToCartesian({\n      angle: datum[ARC_MIDDLE_ANGLE],\n      radius: this.getAttribute('centerOffset', datum, states, opt) as number\n    });\n    return center + offset[key];\n  };\n}\n\nexport class ArcMark extends BaseArcMark<IArcMarkSpec> implements IArcMark {\n  static readonly type = MarkTypeEnum.arc;\n  readonly type: MarkTypeEnum = ArcMark.type;\n}\n"]}

package/cjs/mark/area.d.ts

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

package/cjs/mark/area.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.AreaMark = void 0;
 
-const base_line_1 = require("./base/base-line"), interface_1 = require("./interface");
+const base_line_1 = require("./base/base-line"), type_1 = require("./interface/type");
 
 class AreaMark extends base_line_1.BaseLineMark {
     constructor() {
@@ -20,5 +20,5 @@ class AreaMark extends base_line_1.BaseLineMark {
     }
 }
 
-exports.AreaMark = AreaMark, AreaMark.type = interface_1.MarkTypeEnum.area;
+exports.AreaMark = AreaMark, AreaMark.type = type_1.MarkTypeEnum.area;
 //# sourceMappingURL=area.js.map

package/cjs/mark/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/area.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAGhD,2CAA2C;AAI3C,MAAa,QAAS,SAAQ,wBAA2B;IAAzD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAahC,CAAC;IAXW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,oBAAoB;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;;AAdH,4BAeC;AAdiB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"area.js","sourcesContent":["import type { IAreaMarkSpec } from '../typings/visual';\nimport { BaseLineMark } from './base/base-line';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\n\nexport type IAreaMark = IMarkRaw<IAreaMarkSpec>;\n\nexport class AreaMark extends BaseLineMark<IAreaMarkSpec> implements IAreaMark {\n  static readonly type = MarkTypeEnum.area;\n  readonly type = AreaMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IAreaMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _getIgnoreAttributes(): string[] {\n    return [];\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/area.ts"],"names":[],"mappings":";;;AACA,gDAAgD;AAGhD,2CAAgD;AAIhD,MAAa,QAAS,SAAQ,wBAA2B;IAAzD;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAahC,CAAC;IAXW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,GACb,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,oBAAoB;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;;AAdH,4BAeC;AAdiB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"area.js","sourcesContent":["import type { IAreaMarkSpec } from '../typings/visual';\nimport { BaseLineMark } from './base/base-line';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\n\nexport type IAreaMark = IMarkRaw<IAreaMarkSpec>;\n\nexport class AreaMark extends BaseLineMark<IAreaMarkSpec> implements IAreaMark {\n  static readonly type = MarkTypeEnum.area;\n  readonly type = AreaMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IAreaMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 0\n    };\n    return defaultStyle;\n  }\n\n  protected _getIgnoreAttributes(): string[] {\n    return [];\n  }\n}\n"]}

package/cjs/mark/base/base-line.js

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseLineMark = void 0;
 
-const vscale_1 = require("@visactor/vscale"), util_1 = require("../../util"), base_mark_1 = require("./base-mark");
+const vscale_1 = require("@visactor/vscale"), vutils_1 = require("@visactor/vutils"), base_mark_1 = require("./base-mark");
 
 class BaseLineMark extends base_mark_1.BaseMark {
     setStyle(style, state = "normal", level = 0, stateStyle = this.stateStyle) {
-        if ((0, util_1.isNil)(style)) return;
+        if ((0, vutils_1.isNil)(style)) return;
         void 0 === stateStyle[state] && (stateStyle[state] = {});
         const ignoreAttributes = this._getIgnoreAttributes(), segmentAttributes = [ "strokeWidth", "lineWidth", "lineDash", "strokeDash", "lineJoin", "stroke", "strokeOpacity", "opacity", "fill", "fillOpacity", "texture", "texturePadding", "textureSize", "textureColor" ], isUserLevel = this.isUserLevel(level);
         let enableSegments = !1;
         Object.keys(style).forEach((attr => {
             const attrStyle = style[attr];
-            if ((0, util_1.isNil)(attrStyle) || ignoreAttributes.includes(attr)) return;
+            if ((0, vutils_1.isNil)(attrStyle) || ignoreAttributes.includes(attr)) return;
             isUserLevel && segmentAttributes.includes(attr) && ((0, vscale_1.isValidScaleType)(null == attrStyle ? void 0 : attrStyle.type) || (null == attrStyle ? void 0 : attrStyle.scale) || (0, 
-            util_1.isFunction)(attrStyle)) && (enableSegments = !0);
+            vutils_1.isFunction)(attrStyle)) && (enableSegments = !0);
             let styleConverter = this._styleConvert(attrStyle);
             isUserLevel && "angle" === attr && (styleConverter = this.convertAngleToRadian(styleConverter)), 
             this.setAttribute(attr, styleConverter, state, level, stateStyle);

package/cjs/mark/base/base-line.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/base/base-line.ts"],"names":[],"mappings":";;;AAAA,6CAAoD;AAGpD,qCAA+C;AAC/C,2CAAuC;AAGvC,MAAsB,YAA8D,SAAQ,oBAAW;IAWrG,QAAQ,CACN,KAAkE,EAClE,QAAwB,QAAQ,EAChC,QAAgB,CAAC,EACjB,UAAU,GAAG,IAAI,CAAC,UAAU;QAE5B,IAAI,IAAA,YAAK,EAAC,KAAK,CAAC,EAAE;YAChB,OAAO;SACR;QAED,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;YACnC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;SACxB;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACrD,MAAM,iBAAiB,GAAG;YACxB,aAAa;YACb,WAAW;YACX,UAAU;YACV,YAAY;YACZ,UAAU;YACV,QAAQ;YACR,eAAe;YACf,SAAS;YACT,MAAM;YACN,aAAa;YACb,SAAS;YACT,gBAAgB;YAChB,aAAa;YACb,cAAc;SACf,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,IAAA,YAAK,EAAC,SAAS,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACvD,OAAO;aACR;YACD,IACE,WAAW;gBACX,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAChC,CAAC,IAAA,yBAAgB,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,KAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAA,IAAI,IAAA,iBAAU,EAAC,SAAS,CAAC,CAAC,EAChF;gBACA,cAAc,GAAG,IAAI,CAAC;aACvB;YAED,IAAI,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEnD,IAAI,WAAW,IAAI,IAAI,KAAK,OAAO,EAAE;gBACnC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAsC,CAAC,CAAC;aACpF;YAED,IAAI,CAAC,YAAY,CAAC,IAAW,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;SACrE;IACH,CAAC;CACF;AAtED,oCAsEC","file":"base-line.js","sourcesContent":["import { isValidScaleType } from '@visactor/vscale';\nimport type { StateValueType } from '../../compile/mark';\nimport type { ConvertToMarkStyleSpec, ILineLikeMarkSpec } from '../../typings/visual';\nimport { isFunction, isNil } from '../../util';\nimport { BaseMark } from './base-mark';\nimport type { IMarkStyle, StyleConvert } from '../interface';\n\nexport abstract class BaseLineMark<T extends ILineLikeMarkSpec = ILineLikeMarkSpec> extends BaseMark<T> {\n  protected abstract _getIgnoreAttributes(): string[];\n\n  /**\n   * @override\n   * 之所以覆写是因为 vgrammar 侧默认都会处理 lineSegments，非常耗性能，所以需要 VChart 给一个标志位用于是否执行。\n   * 由外部series调用，设置markStyle的接口。\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<T>(\n    style: Partial<ConvertToMarkStyleSpec<T>> | Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const ignoreAttributes = this._getIgnoreAttributes();\n    const segmentAttributes = [\n      'strokeWidth',\n      'lineWidth',\n      'lineDash',\n      'strokeDash',\n      'lineJoin',\n      'stroke',\n      'strokeOpacity',\n      'opacity',\n      'fill',\n      'fillOpacity',\n      'texture',\n      'texturePadding',\n      'textureSize',\n      'textureColor'\n    ];\n    const isUserLevel = this.isUserLevel(level);\n    let enableSegments = false;\n    Object.keys(style).forEach(attr => {\n      const attrStyle = style[attr];\n      if (isNil(attrStyle) || ignoreAttributes.includes(attr)) {\n        return;\n      }\n      if (\n        isUserLevel &&\n        segmentAttributes.includes(attr) &&\n        (isValidScaleType(attrStyle?.type) || attrStyle?.scale || isFunction(attrStyle))\n      ) {\n        enableSegments = true;\n      }\n\n      let styleConverter = this._styleConvert(attrStyle);\n\n      if (isUserLevel && attr === 'angle') {\n        styleConverter = this.convertAngleToRadian(styleConverter as StyleConvert<number>);\n      }\n\n      this.setAttribute(attr as any, styleConverter, state, level, stateStyle);\n    });\n\n    if (enableSegments) {\n      this.setAttribute('enableSegments', true, state, level, stateStyle);\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/base/base-line.ts"],"names":[],"mappings":";;;AAAA,6CAAoD;AAGpD,6CAAqD;AACrD,2CAAuC;AAGvC,MAAsB,YAA8D,SAAQ,oBAAW;IAWrG,QAAQ,CACN,KAAkE,EAClE,QAAwB,QAAQ,EAChC,QAAgB,CAAC,EACjB,UAAU,GAAG,IAAI,CAAC,UAAU;QAE5B,IAAI,IAAA,cAAK,EAAC,KAAK,CAAC,EAAE;YAChB,OAAO;SACR;QAED,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;YACnC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;SACxB;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACrD,MAAM,iBAAiB,GAAG;YACxB,aAAa;YACb,WAAW;YACX,UAAU;YACV,YAAY;YACZ,UAAU;YACV,QAAQ;YACR,eAAe;YACf,SAAS;YACT,MAAM;YACN,aAAa;YACb,SAAS;YACT,gBAAgB;YAChB,aAAa;YACb,cAAc;SACf,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,IAAA,cAAK,EAAC,SAAS,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACvD,OAAO;aACR;YACD,IACE,WAAW;gBACX,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC;gBAChC,CAAC,IAAA,yBAAgB,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,KAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAA,IAAI,IAAA,mBAAU,EAAC,SAAS,CAAC,CAAC,EAChF;gBACA,cAAc,GAAG,IAAI,CAAC;aACvB;YAED,IAAI,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEnD,IAAI,WAAW,IAAI,IAAI,KAAK,OAAO,EAAE;gBACnC,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,cAAsC,CAAC,CAAC;aACpF;YAED,IAAI,CAAC,YAAY,CAAC,IAAW,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;SACrE;IACH,CAAC;CACF;AAtED,oCAsEC","file":"base-line.js","sourcesContent":["import { isValidScaleType } from '@visactor/vscale';\nimport type { StateValueType } from '../../compile/mark';\nimport type { ConvertToMarkStyleSpec, ILineLikeMarkSpec } from '../../typings/visual';\nimport { isFunction, isNil } from '@visactor/vutils';\nimport { BaseMark } from './base-mark';\nimport type { IMarkStyle, StyleConvert } from '../interface';\n\nexport abstract class BaseLineMark<T extends ILineLikeMarkSpec = ILineLikeMarkSpec> extends BaseMark<T> {\n  protected abstract _getIgnoreAttributes(): string[];\n\n  /**\n   * @override\n   * 之所以覆写是因为 vgrammar 侧默认都会处理 lineSegments，非常耗性能，所以需要 VChart 给一个标志位用于是否执行。\n   * 由外部series调用，设置markStyle的接口。\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<T>(\n    style: Partial<ConvertToMarkStyleSpec<T>> | Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const ignoreAttributes = this._getIgnoreAttributes();\n    const segmentAttributes = [\n      'strokeWidth',\n      'lineWidth',\n      'lineDash',\n      'strokeDash',\n      'lineJoin',\n      'stroke',\n      'strokeOpacity',\n      'opacity',\n      'fill',\n      'fillOpacity',\n      'texture',\n      'texturePadding',\n      'textureSize',\n      'textureColor'\n    ];\n    const isUserLevel = this.isUserLevel(level);\n    let enableSegments = false;\n    Object.keys(style).forEach(attr => {\n      const attrStyle = style[attr];\n      if (isNil(attrStyle) || ignoreAttributes.includes(attr)) {\n        return;\n      }\n      if (\n        isUserLevel &&\n        segmentAttributes.includes(attr) &&\n        (isValidScaleType(attrStyle?.type) || attrStyle?.scale || isFunction(attrStyle))\n      ) {\n        enableSegments = true;\n      }\n\n      let styleConverter = this._styleConvert(attrStyle);\n\n      if (isUserLevel && attr === 'angle') {\n        styleConverter = this.convertAngleToRadian(styleConverter as StyleConvert<number>);\n      }\n\n      this.setAttribute(attr as any, styleConverter, state, level, stateStyle);\n    });\n\n    if (enableSegments) {\n      this.setAttribute('enableSegments', true, state, level, stateStyle);\n    }\n  }\n}\n"]}

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

@@ -25,12 +25,12 @@ export declare class BaseMark<T extends ICommonSpec> extends CompilableMark impl
     protected _filterAttribute<U extends keyof T>(attr: U, style: MarkInputStyle<T[U]>, state: StateValueType, level: number, isUserLevel: boolean, stateStyle?: IMarkStateStyle<T>): StyleConvert<T[U]>;
     setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle?: IMarkStateStyle<T>): void;
     setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state?: StateValueType): void;
-    getAttribute<U extends keyof T>(key: U, datum: Datum, state?: StateValueType, opt?: IAttributeOpt): any;
+    getAttribute<U extends keyof T>(key: U, datum: Datum, state?: StateValueType, opt?: IAttributeOpt): unknown;
     setAttribute<U extends keyof T>(attr: U, style: MarkInputStyle<T[U]>, state?: StateValueType, level?: number, stateStyle?: IMarkStateStyle<T>): void;
     protected _getDefaultStyle(): IMarkStyle<T>;
     protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined;
-    protected _computeAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType, opt: IAttributeOpt): any;
-    protected _computeStateAttribute<U extends keyof T>(stateStyle: any, key: U, datum: Datum, state: StateValueType, opt: IAttributeOpt): any;
+    protected _computeAttribute<U extends keyof T>(key: U, state: StateValueType): (datum: Datum, opt: IAttributeOpt) => unknown;
+    protected _computeStateAttribute<U extends keyof T>(stateStyle: any, key: U, state: StateValueType): (datum: Datum, opt: IAttributeOpt) => any;
     private _initStyle;
     private _initSpecStyle;
     private _computeGradientAttr;

package/cjs/mark/base/base-mark.js

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseMark = void 0;
 
-const util_1 = require("../../util"), constant_1 = require("../../constant"), vscale_1 = require("@visactor/vscale"), util_2 = require("../../theme/color-scheme/util"), compilable_mark_1 = require("../../compile/mark/compilable-mark"), vutils_1 = require("@visactor/vutils");
+const merge_spec_1 = require("../../util/spec/merge-spec"), color_1 = require("../../util/color"), scale_1 = require("../../util/scale"), constant_1 = require("../../constant"), vscale_1 = require("@visactor/vscale"), util_1 = require("../../theme/color-scheme/util"), compilable_mark_1 = require("../../compile/mark/compilable-mark"), vutils_1 = require("@visactor/vutils");
 
 class BaseMark extends compilable_mark_1.CompilableMark {
     constructor(name, option) {
@@ -26,12 +26,12 @@ class BaseMark extends compilable_mark_1.CompilableMark {
         this._initStyle();
     }
     initStyleWithSpec(spec, key) {
-        spec && ((0, util_1.isValid)(spec.id) && (this._userId = spec.id), (0, util_1.isBoolean)(spec.interactive) && (this._interactive = spec.interactive), 
-        (0, util_1.isValid)(spec.zIndex) && this.setZIndex(spec.zIndex), (0, util_1.isBoolean)(spec.visible) && this.setVisible(spec.visible), 
+        spec && ((0, vutils_1.isValid)(spec.id) && (this._userId = spec.id), (0, vutils_1.isBoolean)(spec.interactive) && (this._interactive = spec.interactive), 
+        (0, vutils_1.isValid)(spec.zIndex) && this.setZIndex(spec.zIndex), (0, vutils_1.isBoolean)(spec.visible) && this.setVisible(spec.visible), 
         this._initSpecStyle(spec, this.stateStyle, key));
     }
     convertAngleToRadian(styleConverter) {
-        if ((0, util_1.isNumber)(styleConverter)) return (0, vutils_1.degreeToRadian)(styleConverter);
+        if ((0, vutils_1.isNumber)(styleConverter)) return (0, vutils_1.degreeToRadian)(styleConverter);
         if (styleConverter.scale) {
             const range = styleConverter.scale.range();
             return styleConverter.scale.range(range.map(vutils_1.degreeToRadian)), styleConverter;
@@ -42,12 +42,12 @@ class BaseMark extends compilable_mark_1.CompilableMark {
         return [ constant_1.AttributeLevel.User_Mark, constant_1.AttributeLevel.User_Series, constant_1.AttributeLevel.User_Chart ].includes(level);
     }
     setStyle(style, state = "normal", level = 0, stateStyle = this.stateStyle) {
-        if ((0, util_1.isNil)(style)) return;
+        if ((0, vutils_1.isNil)(style)) return;
         style = this._filterStyle(style, state, level, stateStyle), void 0 === stateStyle[state] && (stateStyle[state] = {});
         const isUserLevel = this.isUserLevel(level);
         Object.keys(style).forEach((attr => {
             let attrStyle = style[attr];
-            (0, util_1.isNil)(attrStyle) || (attrStyle = this._filterAttribute(attr, attrStyle, state, level, isUserLevel, stateStyle), 
+            (0, vutils_1.isNil)(attrStyle) || (attrStyle = this._filterAttribute(attr, attrStyle, state, level, isUserLevel, stateStyle), 
             this.setAttribute(attr, attrStyle, state, level, stateStyle));
         }));
     }
@@ -83,7 +83,7 @@ class BaseMark extends compilable_mark_1.CompilableMark {
         (null === (_a = this.stateStyle[state]) || void 0 === _a ? void 0 : _a[key]) && (this.stateStyle[state][key].postProcess = postProcessFunc);
     }
     getAttribute(key, datum, state = "normal", opt) {
-        return this._computeAttribute(key, datum, state, opt);
+        return this._computeAttribute(key, state)(datum, opt);
     }
     setAttribute(attr, style, state = "normal", level = 0, stateStyle = this.stateStyle) {
         var _a;
@@ -93,7 +93,7 @@ class BaseMark extends compilable_mark_1.CompilableMark {
             referer: void 0
         });
         const attrLevel = null === (_a = stateStyle[state][attr]) || void 0 === _a ? void 0 : _a.level;
-        (0, util_1.isValid)(attrLevel) && attrLevel <= level && (0, util_1.mergeSpec)(stateStyle[state][attr], {
+        (0, vutils_1.isValid)(attrLevel) && attrLevel <= level && (0, merge_spec_1.mergeSpec)(stateStyle[state][attr], {
             style: style,
             level: level
         }), "normal" !== state && attr in this._extensionChannel && this._extensionChannel[attr].forEach((key => {
@@ -110,9 +110,9 @@ class BaseMark extends compilable_mark_1.CompilableMark {
     _styleConvert(style) {
         if (!style) return style;
         if ((0, vscale_1.isValidScaleType)(style.type) || style.scale) {
-            const scale = (0, util_1.createScaleWithSpec)(style, {
+            const scale = (0, scale_1.createScaleWithSpec)(style, {
                 globalScale: this._option.globalScale,
-                dataStatistics: this._option.dataStatistics
+                seriesId: this._option.seriesId
             });
             if (scale) return {
                 scale: scale,
@@ -122,18 +122,34 @@ class BaseMark extends compilable_mark_1.CompilableMark {
         }
         return style;
     }
-    _computeAttribute(key, datum, state, opt) {
+    _computeAttribute(key, state) {
         var _a;
         let stateStyle = null === (_a = this.stateStyle[state]) || void 0 === _a ? void 0 : _a[key];
         stateStyle || (stateStyle = this.stateStyle.normal[key]);
-        let baseValue = this._computeStateAttribute(stateStyle, key, datum, state, opt);
-        return (0, util_1.isFunction)(null == stateStyle ? void 0 : stateStyle.postProcess) && (baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView())), 
-        key in this._computeExChannel ? this._computeExChannel[key](key, datum, state, opt, baseValue) : baseValue;
+        const baseValueFunctor = this._computeStateAttribute(stateStyle, key, state), hasPostProcess = (0, 
+        vutils_1.isFunction)(null == stateStyle ? void 0 : stateStyle.postProcess), hasExCompute = key in this._computeExChannel;
+        if (hasPostProcess && hasExCompute) {
+            const exCompute = this._computeExChannel[key];
+            return (datum, opt) => {
+                let baseValue = baseValueFunctor(datum, opt);
+                return baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView()), 
+                exCompute(key, datum, state, opt, baseValue);
+            };
+        }
+        if (hasPostProcess) return (datum, opt) => stateStyle.postProcess(baseValueFunctor(datum, opt), datum, this._attributeContext, opt, this.getDataView());
+        if (hasExCompute) {
+            const exCompute = this._computeExChannel[key];
+            return (datum, opt) => exCompute(key, datum, state, opt, baseValueFunctor(datum, opt));
+        }
+        return baseValueFunctor;
     }
-    _computeStateAttribute(stateStyle, key, datum, state, opt) {
+    _computeStateAttribute(stateStyle, key, state) {
         var _a;
-        if (stateStyle) return stateStyle.referer ? stateStyle.referer.getAttribute(key, datum, state, opt) : "function" == typeof stateStyle.style ? stateStyle.style(datum, this._attributeContext, opt, this.getDataView()) : constant_1.GradientType.includes(stateStyle.style.gradient) ? this._computeGradientAttr(stateStyle.style, datum, opt) : [ "outerBorder", "innerBorder" ].includes(key) ? this._computeBorderAttr(stateStyle.style, datum, opt) : (0, 
-        vscale_1.isValidScaleType)(null === (_a = stateStyle.style.scale) || void 0 === _a ? void 0 : _a.type) ? stateStyle.style.scale.scale(datum[stateStyle.style.field]) : stateStyle.style;
+        return stateStyle ? stateStyle.referer ? stateStyle.referer._computeAttribute(key, state) : constant_1.GradientType.includes(stateStyle.style.gradient) ? this._computeGradientAttr(stateStyle.style) : [ "outerBorder", "innerBorder" ].includes(key) ? this._computeBorderAttr(stateStyle.style) : (0, 
+        vscale_1.isValidScaleType)(null === (_a = stateStyle.style.scale) || void 0 === _a ? void 0 : _a.type) ? (datum, opt) => stateStyle.style.scale.scale(datum[stateStyle.style.field]) : (datum, opt) => {
+            var _a;
+            return "function" == typeof stateStyle.style ? null === (_a = stateStyle.style) || void 0 === _a ? void 0 : _a.call(stateStyle, datum, this._attributeContext, opt, this.getDataView()) : stateStyle.style;
+        } : (datum, opt) => {};
     }
     _initStyle() {
         const defaultStyle = this._getDefaultStyle();
@@ -150,51 +166,76 @@ class BaseMark extends compilable_mark_1.CompilableMark {
                     stateValue: key
                 };
                 "level" in stateTemp && (stateInfo.level = stateTemp.level), "filter" in stateTemp && (stateInfo = (0, 
-                util_1.isFunction)(stateTemp.filter) ? Object.assign({
+                vutils_1.isFunction)(stateTemp.filter) ? Object.assign({
                     filter: stateTemp.filter
                 }, stateInfo) : Object.assign(Object.assign({}, stateTemp.filter), stateInfo)), 
                 this.state.addStateInfo(stateInfo), this.setStyle(style, key, constant_1.AttributeLevel.User_Mark, stateStyle);
             } else this.setStyle(stateTemp, key, constant_1.AttributeLevel.User_Mark, stateStyle);
         }));
     }
-    _computeGradientAttr(gradientStyle, data, opt) {
+    _computeGradientAttr(gradientStyle) {
+        var _a, _b;
         const {gradient: gradient, scale: scale, field: field} = gradientStyle, rest = __rest(gradientStyle, [ "gradient", "scale", "field" ]), markData = this.getDataView();
         let colorScale = scale, colorField = field;
         if (!(scale && field || "series" !== this.model.modelType)) {
             const {scale: globalColorScale, field: globalField} = this.model.getColorAttribute();
             scale || (colorScale = globalColorScale), colorField || (colorField = globalField);
         }
-        const themeColor = (0, util_2.computeActualDataScheme)((0, util_2.getDataScheme)(this.model.getColorScheme(), "series" === this.model.modelType ? this.model.type : void 0), this.model.getDefaultColorDomain()), computeStyle = {}, mergedStyle = Object.assign(Object.assign({}, constant_1.DEFAULT_GRADIENT_CONFIG[gradient]), rest);
-        return Object.keys(mergedStyle).forEach((key => {
-            const value = mergedStyle[key];
-            "stops" === key ? computeStyle.stops = value.map((stop => {
-                const {opacity: opacity, color: color, offset: offset} = stop;
-                let computeColor = null != color ? color : null == colorScale ? void 0 : colorScale.scale(data[colorField]);
-                return (0, util_1.isFunction)(color) && (computeColor = color(data, this._attributeContext, opt, markData)), 
-                (0, util_1.isValid)(opacity) && (computeColor = util_1.Color.SetOpacity(computeColor, opacity)), 
-                {
-                    offset: (0, util_1.isFunction)(offset) ? offset(data, this._attributeContext, opt, markData) : offset,
-                    color: computeColor || themeColor[0]
-                };
-            })) : (0, util_1.isFunction)(value) ? computeStyle[key] = value(data, this._attributeContext, opt, markData) : computeStyle[key] = value;
-        })), computeStyle.gradient = gradient, computeStyle;
+        const themeColor = (0, util_1.computeActualDataScheme)((0, util_1.getDataScheme)(this.model.getColorScheme(), "series" === this.model.modelType ? null === (_b = (_a = this.model).getSpec) || void 0 === _b ? void 0 : _b.call(_a) : void 0), this.model.getDefaultColorDomain()), mergedStyle = Object.assign(Object.assign({}, constant_1.DEFAULT_GRADIENT_CONFIG[gradient]), rest);
+        return (data, opt) => {
+            const computeStyle = {};
+            return Object.keys(mergedStyle).forEach((key => {
+                const value = mergedStyle[key];
+                "stops" === key ? computeStyle.stops = value.map((stop => {
+                    const {opacity: opacity, color: color, offset: offset} = stop;
+                    let computeColor = null != color ? color : null == colorScale ? void 0 : colorScale.scale(data[colorField]);
+                    return (0, vutils_1.isFunction)(color) && (computeColor = color(data, this._attributeContext, opt, markData)), 
+                    (0, vutils_1.isValid)(opacity) && (computeColor = color_1.Color.SetOpacity(computeColor, opacity)), 
+                    {
+                        offset: (0, vutils_1.isFunction)(offset) ? offset(data, this._attributeContext, opt, markData) : offset,
+                        color: computeColor || themeColor[0]
+                    };
+                })) : (0, vutils_1.isFunction)(value) ? computeStyle[key] = value(data, this._attributeContext, opt, markData) : computeStyle[key] = value;
+            })), computeStyle.gradient = gradient, computeStyle;
+        };
     }
-    _computeBorderAttr(borderStyle, data, opt) {
-        var _a;
-        const {scale: scale, field: field} = borderStyle, mergedStyle = __rest(borderStyle, [ "scale", "field" ]), computeStyle = {};
-        if (Object.keys(mergedStyle).forEach((key => {
-            const value = mergedStyle[key];
-            (0, util_1.isFunction)(value) ? computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView()) : computeStyle[key] = value;
-        })), "stroke" in computeStyle) constant_1.GradientType.includes(null === (_a = mergedStyle.stroke) || void 0 === _a ? void 0 : _a.gradient) && (computeStyle.stroke = this._computeGradientAttr(mergedStyle.stroke, data, opt)); else {
-            const themeColor = (0, util_2.computeActualDataScheme)((0, util_2.getDataScheme)(this.model.getColorScheme(), "series" === this.model.modelType ? this.model.type : void 0), this.model.getDefaultColorDomain());
+    _computeBorderAttr(borderStyle) {
+        var _a, _b, _c;
+        const {scale: scale, field: field} = borderStyle, mergedStyle = __rest(borderStyle, [ "scale", "field" ]);
+        if ("stroke" in {}) {
+            if (constant_1.GradientType.includes(null === (_c = mergedStyle.stroke) || void 0 === _c ? void 0 : _c.gradient)) {
+                const gradientFunctor = this._computeGradientAttr(mergedStyle.stroke);
+                return (data, opt) => {
+                    const computeStyle = {};
+                    return Object.keys(mergedStyle).forEach((key => {
+                        const value = mergedStyle[key];
+                        (0, vutils_1.isFunction)(value) ? computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView()) : computeStyle[key] = value;
+                    })), computeStyle.stroke = gradientFunctor(data, opt), computeStyle;
+                };
+            }
+        } else {
+            const themeColor = (0, util_1.computeActualDataScheme)((0, util_1.getDataScheme)(this.model.getColorScheme(), "series" === this.model.modelType ? null === (_b = (_a = this.model).getSpec) || void 0 === _b ? void 0 : _b.call(_a) : void 0), this.model.getDefaultColorDomain());
             let colorScale = scale, colorField = field;
             if (!(scale && field || "series" !== this.model.modelType)) {
                 const {scale: globalColorScale, field: globalField} = this.model.getColorAttribute();
-                scale || (colorScale = globalColorScale), colorField || (colorField = globalField), 
-                computeStyle.stroke = (null == colorScale ? void 0 : colorScale.scale(data[colorField])) || themeColor[0];
+                return scale || (colorScale = globalColorScale), colorField || (colorField = globalField), 
+                (data, opt) => {
+                    const computeStyle = {};
+                    return Object.keys(mergedStyle).forEach((key => {
+                        const value = mergedStyle[key];
+                        (0, vutils_1.isFunction)(value) ? computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView()) : computeStyle[key] = value;
+                    })), computeStyle.stroke = (null == colorScale ? void 0 : colorScale.scale(data[colorField])) || themeColor[0], 
+                    computeStyle;
+                };
             }
         }
-        return computeStyle;
+        return (data, opt) => {
+            const computeStyle = {};
+            return Object.keys(mergedStyle).forEach((key => {
+                const value = mergedStyle[key];
+                (0, vutils_1.isFunction)(value) ? computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView()) : computeStyle[key] = value;
+            })), computeStyle;
+        };
     }
 }
 

package/cjs/mark/base/base-mark.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/base/base-mark.ts"],"names":[],"mappings":"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","file":"base-mark.js","sourcesContent":["import type { IStateInfo, IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport type {\n  Datum,\n  IMarkSpec,\n  ConvertToMarkStyleSpec,\n  GradientStop,\n  IVisual,\n  IVisualScale,\n  IVisualSpecStyle,\n  ICommonSpec,\n  FunctionType\n} from '../../typings';\n\nimport { isBoolean, isFunction, isNil, isValid, mergeSpec, Color, createScaleWithSpec, isNumber } from '../../util';\nimport type {\n  IMarkRaw,\n  IMarkStateStyle,\n  IMarkStyle,\n  IMark,\n  IMarkOption,\n  StyleConvert,\n  VisualScaleType,\n  MarkInputStyle\n} from '../interface';\nimport { AttributeLevel, GradientType, DEFAULT_GRADIENT_CONFIG } from '../../constant';\nimport { isValidScaleType } from '@visactor/vscale';\nimport type { DataView } from '@visactor/vdataset';\nimport { computeActualDataScheme, getDataScheme } from '../../theme/color-scheme/util';\nimport type { ISeries, SeriesTypeEnum } from '../../series/interface';\nimport { CompilableMark } from '../../compile/mark/compilable-mark';\nimport type { StateValueType } from '../../compile/mark';\nimport { degreeToRadian } from '@visactor/vutils';\n\nexport type ExChannelCall = (\n  key: string | number | symbol,\n  datum: Datum,\n  states: StateValueType,\n  opt: unknown,\n  baseValue: unknown\n) => unknown;\n\nexport class BaseMark<T extends ICommonSpec> extends CompilableMark implements IMarkRaw<T> {\n  declare stateStyle: IMarkStateStyle<T>;\n\n  protected declare _option: IMarkOption;\n\n  protected _attributeContext: IModelMarkAttributeContext;\n\n  /** by _unCompileChannel, some channel need add default channel to make sure update available */\n  _extensionChannel: {\n    [key: string | number | symbol]: string[];\n  } = {};\n  /** same as _extensionChannel. when compute channel, add extension channel effect */\n  _computeExChannel: {\n    [key: string | number | symbol]: ExChannelCall;\n  } = {};\n\n  constructor(name: string, option: IMarkOption) {\n    super(option, name, option.model);\n    // 这里的上下文多数情况下与 mark 是什么是没有关系的，与mark的使用者，也就是series，component有的逻辑有关。\n    this._attributeContext = option.attributeContext;\n    option.map?.set(this.id, this as unknown as IMark);\n  }\n\n  created(): void {\n    this._initStyle();\n  }\n\n  /**\n   * 外部调用，根据 spec 初始化 style（如果由 IModel 派生类调用，请使用 IModel.initMarkStyleWithSpec）\n   * @param spec\n   * @param key\n   * @returns\n   */\n  initStyleWithSpec(spec: IMarkSpec<T>, key?: string) {\n    if (!spec) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      this._userId = spec.id;\n    }\n\n    // interactive\n    if (isBoolean(spec.interactive)) {\n      this._interactive = spec.interactive;\n    }\n    // zIndex\n    if (isValid(spec.zIndex)) {\n      this.setZIndex(spec.zIndex);\n    }\n    // visible\n    if (isBoolean(spec.visible)) {\n      this.setVisible(spec.visible);\n    }\n    // style\n    this._initSpecStyle(spec, this.stateStyle, key);\n  }\n\n  convertAngleToRadian(styleConverter: StyleConvert<number>): StyleConvert<any> {\n    // 用户传入的angle配置，需要做一层转换\n    if (isNumber(styleConverter)) {\n      return degreeToRadian(styleConverter) as StyleConvert<any>;\n    } else if ((styleConverter as VisualScaleType).scale) {\n      const range = (styleConverter as VisualScaleType).scale.range();\n\n      (styleConverter as VisualScaleType).scale.range(range.map(degreeToRadian));\n\n      return styleConverter as StyleConvert<any>;\n    } else if (typeof styleConverter === 'function') {\n      return ((item: any, ctx: any, opt: IAttributeOpt, source?: DataView) => {\n        return degreeToRadian((styleConverter as FunctionType<number>)(item, ctx, opt, source));\n      }) as StyleConvert<any>;\n    }\n\n    return styleConverter;\n  }\n\n  isUserLevel(level: number) {\n    return [AttributeLevel.User_Mark, AttributeLevel.User_Series, AttributeLevel.User_Chart].includes(level);\n  }\n\n  /**\n   * 由外部series调用，设置markStyle的接口（如果由 IModel 派生类调用，请使用 IModel.setMarkStyle）\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<U extends keyof T>(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n    style = this._filterStyle(style, state, level, stateStyle);\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const isUserLevel = this.isUserLevel(level);\n\n    Object.keys(style).forEach((attr: string) => {\n      let attrStyle = style[attr] as MarkInputStyle<T[U]>;\n      if (isNil(attrStyle)) {\n        return;\n      }\n\n      attrStyle = this._filterAttribute(attr as any, attrStyle, state, level, isUserLevel, stateStyle);\n\n      this.setAttribute(attr as any, attrStyle, state, level, stateStyle);\n    });\n  }\n\n  getStyle(key: string, state: StateValueType = 'normal'): any {\n    return this.stateStyle[state][key]?.style;\n  }\n\n  /** 过滤用户传来的 style 对象 */\n  protected _filterStyle(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<IMarkStyle<T>> {\n    return style;\n  }\n\n  /** 过滤单个 attribute */\n  protected _filterAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType,\n    level: number,\n    isUserLevel: boolean,\n    stateStyle = this.stateStyle\n  ): StyleConvert<T[U]> {\n    let newStyle = this._styleConvert(style);\n    if (isUserLevel && attr === 'angle') {\n      newStyle = this.convertAngleToRadian(newStyle as StyleConvert<number>);\n    }\n    return newStyle;\n  }\n\n  /**\n   * TODO: 没有外部调用\n   * 设置mark样式所参考的图元\n   */\n  setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle = this.stateStyle) {\n    if (!mark) {\n      return;\n    }\n    if (styleKey && state) {\n      const style = stateStyle[state] ?? { [styleKey]: {} };\n      stateStyle[state][styleKey] = {\n        ...(style[styleKey] as unknown as any),\n        ...{ referer: mark }\n      };\n      return;\n    }\n\n    Object.entries(stateStyle).forEach(([state, style]) => {\n      Object.entries(style).forEach(([styleKey, style]) => {\n        stateStyle[state][styleKey].referer = mark;\n      });\n    });\n  }\n\n  setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state: StateValueType = 'normal') {\n    if (this.stateStyle[state]?.[key]) {\n      this.stateStyle[state][key].postProcess = postProcessFunc;\n    }\n  }\n\n  getAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType = 'normal', opt?: IAttributeOpt) {\n    return this._computeAttribute(key, datum, state, opt);\n  }\n\n  setAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ) {\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    if (stateStyle[state][attr] === undefined) {\n      // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n      // @ts-ignore\n      stateStyle[state][attr] = {\n        level,\n        style,\n        referer: undefined\n      };\n    }\n    const attrLevel = stateStyle[state][attr]?.level;\n    if (isValid(attrLevel) && attrLevel <= level) {\n      mergeSpec(stateStyle[state][attr], { style, level });\n    }\n\n    // some attr has extension channel in VChart to make some effect\n    if (state !== 'normal') {\n      if (attr in this._extensionChannel) {\n        this._extensionChannel[attr].forEach(key => {\n          if (stateStyle[state][key] === undefined) {\n            // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-ignore\n            stateStyle[state][key as keyof T] = stateStyle.normal[key];\n          }\n        });\n      }\n    }\n  }\n\n  /**\n   * 与 vgrammar 默认值一致的样式可以不设置默认值或设置为undefined, 减少encode属性\n   */\n  protected _getDefaultStyle() {\n    return {\n      visible: true,\n      // mark的层级应该在mark层 不在encode属性层\n      // zIndex: LayoutZIndex.Mark,\n      x: 0,\n      y: 0\n    } as IMarkStyle<T>;\n  }\n\n  // /**\n  //  * 获取该 mark 不支持的图形属性，由子类覆写\n  //  * @returns\n  //  */\n  // protected getIgnoreAttributes(): string[] {\n  //   return [];\n  // }\n\n  protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined {\n    if (!style) {\n      return style as undefined;\n    }\n    // visual spec 转换为 scale 类型的mark style\n    if (isValidScaleType((style as IVisualSpecStyle<unknown, T[U]>).type) || (style as IVisualScale).scale) {\n      // const _style = style as IVisual<T[U]>;\n      const scale = createScaleWithSpec(style as IVisual<T[U]>, {\n        globalScale: this._option.globalScale,\n        dataStatistics: this._option.dataStatistics\n      });\n      if (scale) {\n        return {\n          scale,\n          field: (style as IVisual<T[U]>).field,\n          changeDomain: (style as IVisualScale).changeDomain\n        };\n      }\n    }\n    return style as StyleConvert<T[U]>;\n  }\n\n  protected _computeAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType, opt: IAttributeOpt) {\n    let stateStyle = this.stateStyle[state]?.[key];\n    if (!stateStyle) {\n      stateStyle = this.stateStyle.normal[key];\n    }\n    let baseValue = this._computeStateAttribute(stateStyle, key, datum, state, opt);\n\n    if (isFunction(stateStyle?.postProcess)) {\n      baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());\n    }\n    // add effect to base\n    if (key in this._computeExChannel) {\n      return this._computeExChannel[key](key, datum, state, opt, baseValue);\n    }\n    return baseValue;\n  }\n\n  protected _computeStateAttribute<U extends keyof T>(\n    stateStyle: any,\n    key: U,\n    datum: Datum,\n    state: StateValueType,\n    opt: IAttributeOpt\n  ) {\n    if (!stateStyle) {\n      return undefined;\n    }\n    if (stateStyle.referer) {\n      return stateStyle.referer.getAttribute(key, datum, state, opt);\n    }\n    if (typeof stateStyle.style === 'function') {\n      return stateStyle.style(datum, this._attributeContext, opt, this.getDataView());\n    }\n\n    if (GradientType.includes(stateStyle.style.gradient)) {\n      // 渐变色处理，支持各个属性回调\n      return this._computeGradientAttr(stateStyle.style, datum, opt);\n    }\n\n    if (['outerBorder', 'innerBorder'].includes(key as string)) {\n      // 内外描边处理，支持各个属性回调\n      return this._computeBorderAttr(stateStyle.style, datum, opt);\n    }\n\n    if (isValidScaleType(stateStyle.style.scale?.type)) {\n      return stateStyle.style.scale.scale(datum[stateStyle.style.field]);\n    }\n\n    return stateStyle.style;\n  }\n\n  private _initStyle(): void {\n    const defaultStyle = this._getDefaultStyle();\n    this.setStyle(defaultStyle, 'normal', 0);\n  }\n\n  private _initSpecStyle(spec: IMarkSpec<T>, stateStyle: IMarkStateStyle<T>, key?: string) {\n    // style\n    if (spec.style) {\n      this.setStyle(spec.style, 'normal', AttributeLevel.User_Mark, stateStyle);\n    }\n    const state = spec.state;\n    if (state) {\n      Object.keys(state).forEach(key => {\n        const stateTemp = state[key];\n        if ('style' in stateTemp) {\n          const style = stateTemp.style;\n          let stateInfo: IStateInfo = { stateValue: key };\n          if ('level' in stateTemp) {\n            stateInfo.level = stateTemp.level as number;\n          }\n          if ('filter' in stateTemp) {\n            if (isFunction(stateTemp.filter)) {\n              stateInfo = {\n                filter: stateTemp.filter as (datum: any, options: Record<string, any>) => boolean,\n                ...stateInfo\n              };\n            } else {\n              stateInfo = { ...stateTemp.filter, ...stateInfo };\n            }\n          }\n          this.state.addStateInfo(stateInfo);\n          this.setStyle(style as ConvertToMarkStyleSpec<T>, key, AttributeLevel.User_Mark, stateStyle);\n        } else {\n          this.setStyle(stateTemp, key, AttributeLevel.User_Mark, stateStyle);\n        }\n      });\n    }\n  }\n\n  private _computeGradientAttr(gradientStyle: any, data: Datum, opt: IAttributeOpt) {\n    const { gradient, scale, field, ...rest } = gradientStyle;\n    const markData = this.getDataView();\n    let colorScale = scale;\n    let colorField = field;\n    if ((!scale || !field) && this.model.modelType === 'series') {\n      // 目前只有series有这个属性\n      const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n      if (!scale) {\n        // 获取全局的 colorScale\n        colorScale = globalColorScale;\n      }\n      if (!colorField) {\n        colorField = globalField;\n      }\n    }\n\n    const themeColor = computeActualDataScheme(\n      getDataScheme(\n        this.model.getColorScheme(),\n        this.model.modelType === 'series' ? (this.model.type as SeriesTypeEnum) : undefined\n      ),\n      (this.model as ISeries).getDefaultColorDomain()\n    );\n    const computeStyle: any = {};\n    // 默认配置处理\n    const mergedStyle = {\n      ...DEFAULT_GRADIENT_CONFIG[gradient],\n      ...rest\n    };\n    Object.keys(mergedStyle).forEach(key => {\n      const value = mergedStyle[key];\n      if (key === 'stops') {\n        computeStyle.stops = value.map((stop: GradientStop) => {\n          const { opacity, color, offset } = stop;\n          let computeColor = color ?? colorScale?.scale(data[colorField]);\n          if (isFunction(color)) {\n            computeColor = color(data, this._attributeContext, opt, markData);\n          }\n\n          if (isValid(opacity)) {\n            computeColor = Color.SetOpacity(computeColor as string, opacity);\n          }\n\n          return {\n            offset: isFunction(offset) ? offset(data, this._attributeContext, opt, markData) : offset,\n            color: computeColor || themeColor[0]\n          };\n        });\n      } else if (isFunction(value)) {\n        computeStyle[key] = value(data, this._attributeContext, opt, markData);\n      } else {\n        computeStyle[key] = value;\n      }\n    });\n\n    computeStyle.gradient = gradient;\n\n    return computeStyle;\n  }\n\n  private _computeBorderAttr(borderStyle: any, data: Datum, opt: IAttributeOpt) {\n    const { scale, field, ...mergedStyle } = borderStyle;\n\n    const computeStyle: any = {};\n\n    Object.keys(mergedStyle).forEach(key => {\n      const value = mergedStyle[key];\n      if (isFunction(value)) {\n        computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView());\n      } else {\n        computeStyle[key] = value;\n      }\n    });\n    if (!('stroke' in computeStyle)) {\n      const themeColor = computeActualDataScheme(\n        getDataScheme(\n          this.model.getColorScheme(),\n          this.model.modelType === 'series' ? (this.model.type as SeriesTypeEnum) : undefined\n        ),\n        (this.model as ISeries).getDefaultColorDomain()\n      );\n      let colorScale = scale;\n      let colorField = field;\n      if ((!scale || !field) && this.model.modelType === 'series') {\n        // 目前只有series有这个属性\n        const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n        if (!scale) {\n          // 获取全局的 colorScale\n          colorScale = globalColorScale;\n        }\n        if (!colorField) {\n          colorField = globalField;\n        }\n        computeStyle.stroke = colorScale?.scale(data[colorField]) || themeColor[0];\n      }\n    } else if (GradientType.includes(mergedStyle.stroke?.gradient)) {\n      computeStyle.stroke = this._computeGradientAttr(mergedStyle.stroke, data, opt);\n    }\n    return computeStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/base/base-mark.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAcA,2DAAuD;AACvD,4CAAyC;AACzC,4CAAuD;AAWvD,6CAAuF;AACvF,6CAAoD;AAEpD,wDAAuF;AAEvF,wEAAoE;AAEpE,6CAAmG;AAUnG,MAAa,QAAgC,SAAQ,gCAAc;IAgBjE,YAAY,IAAY,EAAE,MAAmB;;QAC3C,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QATpC,sBAAiB,GAEb,EAAE,CAAC;QAEP,sBAAiB,GAEb,EAAE,CAAC;QAKL,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC;QACjD,MAAA,MAAM,CAAC,GAAG,0CAAE,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAwB,CAAC,CAAC;IACrD,CAAC;IAED,OAAO;QACL,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAQD,iBAAiB,CAAC,IAAkB,EAAE,GAAY;QAChD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAED,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,EAAE,CAAC,EAAE;YACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;SACxB;QAGD,IAAI,IAAA,kBAAS,EAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAC/B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;SACtC;QAED,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACxB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAC7B;QAED,IAAI,IAAA,kBAAS,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/B;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IAED,oBAAoB,CAAC,cAAoC;QAEvD,IAAI,IAAA,iBAAQ,EAAC,cAAc,CAAC,EAAE;YAC5B,OAAO,IAAA,uBAAc,EAAC,cAAc,CAAsB,CAAC;SAC5D;aAAM,IAAK,cAAkC,CAAC,KAAK,EAAE;YACpD,MAAM,KAAK,GAAI,cAAkC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAE/D,cAAkC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAc,CAAC,CAAC,CAAC;YAE3E,OAAO,cAAmC,CAAC;SAC5C;aAAM,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE;YAC/C,OAAO,CAAC,CAAC,IAAS,EAAE,GAAQ,EAAE,GAAkB,EAAE,MAAiB,EAAE,EAAE;gBACrE,OAAO,IAAA,uBAAc,EAAE,cAAuC,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;YAC1F,CAAC,CAAsB,CAAC;SACzB;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,OAAO,CAAC,yBAAc,CAAC,SAAS,EAAE,yBAAc,CAAC,WAAW,EAAE,yBAAc,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3G,CAAC;IAQD,QAAQ,CACN,KAA6B,EAC7B,QAAwB,QAAQ,EAChC,QAAgB,CAAC,EACjB,UAAU,GAAG,IAAI,CAAC,UAAU;QAE5B,IAAI,IAAA,cAAK,EAAC,KAAK,CAAC,EAAE;YAChB,OAAO;SACR;QACD,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAE3D,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;YACnC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;SACxB;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE5C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;YAC1C,IAAI,SAAS,GAAG,KAAK,CAAC,IAAI,CAAyB,CAAC;YACpD,IAAI,IAAA,cAAK,EAAC,SAAS,CAAC,EAAE;gBACpB,OAAO;aACR;YAED,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAW,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;YAEjG,IAAI,CAAC,YAAY,CAAC,IAAW,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,GAAW,EAAE,QAAwB,QAAQ;;QACpD,OAAO,MAAA,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,0CAAE,KAAK,CAAC;IAC5C,CAAC;IAGS,YAAY,CACpB,KAA6B,EAC7B,KAAqB,EACrB,KAAa,EACb,UAAU,GAAG,IAAI,CAAC,UAAU;QAE5B,OAAO,KAAK,CAAC;IACf,CAAC;IAGS,gBAAgB,CACxB,IAAO,EACP,KAA2B,EAC3B,KAAqB,EACrB,KAAa,EACb,WAAoB,EACpB,UAAU,GAAG,IAAI,CAAC,UAAU;QAE5B,IAAI,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,WAAW,IAAI,IAAI,KAAK,OAAO,EAAE;YACnC,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAgC,CAAC,CAAC;SACxE;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAMD,UAAU,CAAoB,IAAiB,EAAE,QAAY,EAAE,KAAsB,EAAE,UAAU,GAAG,IAAI,CAAC,UAAU;;QACjH,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QACD,IAAI,QAAQ,IAAI,KAAK,EAAE;YACrB,MAAM,KAAK,GAAG,MAAA,UAAU,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;YACtD,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,mCACrB,KAAK,CAAC,QAAQ,CAAoB,GACnC,EAAE,OAAO,EAAE,IAAI,EAAE,CACrB,CAAC;YACF,OAAO;SACR;QAED,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,EAAE;YACpD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;gBAClD,UAAU,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;YAC7C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAoB,GAAM,EAAE,eAAoB,EAAE,QAAwB,QAAQ;;QAC9F,IAAI,MAAA,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,0CAAG,GAAG,CAAC,EAAE;YACjC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,eAAe,CAAC;SAC3D;IACH,CAAC;IAED,YAAY,CAAoB,GAAM,EAAE,KAAY,EAAE,QAAwB,QAAQ,EAAE,GAAmB;QACzG,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC;IAED,YAAY,CACV,IAAO,EACP,KAA2B,EAC3B,QAAwB,QAAQ,EAChC,QAAgB,CAAC,EACjB,UAAU,GAAG,IAAI,CAAC,UAAU;;QAE5B,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;YACnC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;SACxB;QAED,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;YAGzC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG;gBACxB,KAAK;gBACL,KAAK;gBACL,OAAO,EAAE,SAAS;aACnB,CAAC;SACH;QACD,MAAM,SAAS,GAAG,MAAA,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,0CAAE,KAAK,CAAC;QACjD,IAAI,IAAA,gBAAO,EAAC,SAAS,CAAC,IAAI,SAAS,IAAI,KAAK,EAAE;YAC5C,IAAA,sBAAS,EAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;SACtD;QAGD,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,IAAI,IAAI,IAAI,IAAI,CAAC,iBAAiB,EAAE;gBAClC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACzC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;wBAGxC,UAAU,CAAC,KAAK,CAAC,CAAC,GAAc,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;qBAC5D;gBACH,CAAC,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAKS,gBAAgB;QACxB,OAAO;YACL,OAAO,EAAE,IAAI;YAGb,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,CAAC;SACY,CAAC;IACrB,CAAC;IAUS,aAAa,CAAoB,KAA4B;QACrE,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,KAAkB,CAAC;SAC3B;QAED,IAAI,IAAA,yBAAgB,EAAE,KAAyC,CAAC,IAAI,CAAC,IAAK,KAAsB,CAAC,KAAK,EAAE;YAEtG,MAAM,KAAK,GAAG,IAAA,2BAAmB,EAAC,KAAsB,EAAE;gBACxD,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;gBACrC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;aAChC,CAAC,CAAC;YACH,IAAI,KAAK,EAAE;gBACT,OAAO;oBACL,KAAK;oBACL,KAAK,EAAG,KAAuB,CAAC,KAAK;oBACrC,YAAY,EAAG,KAAsB,CAAC,YAAY;iBACnD,CAAC;aACH;SACF;QACD,OAAO,KAA2B,CAAC;IACrC,CAAC;IAES,iBAAiB,CAAoB,GAAM,EAAE,KAAqB;;QAC1E,IAAI,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,0CAAG,GAAG,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC1C;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7E,MAAM,cAAc,GAAG,IAAA,mBAAU,EAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC;QAEnD,IAAI,cAAc,IAAI,YAAY,EAAE;YAClC,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC9C,OAAO,CAAC,KAAY,EAAE,GAAkB,EAAE,EAAE;gBAC1C,IAAI,SAAS,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;gBAE7C,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;gBAEtG,OAAO,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;YACtD,CAAC,CAAC;SACH;aAAM,IAAI,cAAc,EAAE;YACzB,OAAO,CAAC,KAAY,EAAE,GAAkB,EAAE,EAAE;gBAC1C,OAAO,UAAU,CAAC,WAAW,CAC3B,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,EAC5B,KAAK,EACL,IAAI,CAAC,iBAAiB,EACtB,GAAG,EACH,IAAI,CAAC,WAAW,EAAE,CACnB,CAAC;YACJ,CAAC,CAAC;SACH;aAAM,IAAI,YAAY,EAAE;YACvB,MAAM,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC9C,OAAO,CAAC,KAAY,EAAE,GAAkB,EAAE,EAAE;gBAC1C,OAAO,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;YACzE,CAAC,CAAC;SACH;QAED,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAES,sBAAsB,CAC9B,UAAe,EACf,GAAM,EAEN,KAAqB;;QAErB,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,CAAC,KAAY,EAAE,GAAkB,EAAE,EAAE,CAAC,SAAgB,CAAC;SAC/D;QACD,IAAI,UAAU,CAAC,OAAO,EAAE;YACtB,OAAO,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACzD;QAED,IAAI,uBAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YAEpD,OAAO,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SACpD;QAED,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,GAAa,CAAC,EAAE;YAE1D,OAAO,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;SAClD;QAED,IAAI,IAAA,yBAAgB,EAAC,MAAA,UAAU,CAAC,KAAK,CAAC,KAAK,0CAAE,IAAI,CAAC,EAAE;YAClD,OAAO,CAAC,KAAY,EAAE,GAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;SAC1G;QAED,OAAO,CAAC,KAAY,EAAE,GAAkB,EAAE,EAAE;;YAC1C,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,UAAU,EAAE;gBAC1C,OAAO,MAAA,UAAU,CAAC,KAAK,2DAAG,KAAK,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;aACnF;YAED,OAAO,UAAU,CAAC,KAAK,CAAC;QAC1B,CAAC,CAAC;IACJ,CAAC;IAEO,UAAU;QAChB,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC7C,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IAEO,cAAc,CAAC,IAAkB,EAAE,UAA8B,EAAE,GAAY;QAErF,IAAI,IAAI,CAAC,KAAK,EAAE;YACd,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,yBAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;SAC3E;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,KAAK,EAAE;YACT,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC7B,IAAI,OAAO,IAAI,SAAS,EAAE;oBACxB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;oBAC9B,IAAI,SAAS,GAAe,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;oBAChD,IAAI,OAAO,IAAI,SAAS,EAAE;wBACxB,SAAS,CAAC,KAAK,GAAG,SAAS,CAAC,KAAe,CAAC;qBAC7C;oBACD,IAAI,QAAQ,IAAI,SAAS,EAAE;wBACzB,IAAI,IAAA,mBAAU,EAAC,SAAS,CAAC,MAAM,CAAC,EAAE;4BAChC,SAAS,mBACP,MAAM,EAAE,SAAS,CAAC,MAA+D,IAC9E,SAAS,CACb,CAAC;yBACH;6BAAM;4BACL,SAAS,mCAAQ,SAAS,CAAC,MAAM,GAAK,SAAS,CAAE,CAAC;yBACnD;qBACF;oBACD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,KAAkC,EAAE,GAAG,EAAE,yBAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;iBAC9F;qBAAM;oBACL,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE,yBAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;iBACrE;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAEO,oBAAoB,CAAC,aAAkB;;QAC7C,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,KAAc,aAAa,EAAtB,IAAI,UAAK,aAAa,EAAnD,8BAAmC,CAAgB,CAAC;QAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE;YAE3D,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,WAAW,EAAE,GAAI,IAAI,CAAC,KAAyB,CAAC,iBAAiB,EAAE,CAAC;YAC5G,IAAI,CAAC,KAAK,EAAE;gBAEV,UAAU,GAAG,gBAAgB,CAAC;aAC/B;YACD,IAAI,CAAC,UAAU,EAAE;gBACf,UAAU,GAAG,WAAW,CAAC;aAC1B;SACF;QAED,MAAM,UAAU,GAAG,IAAA,8BAAuB,EACxC,IAAA,oBAAa,EACX,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,EAC3B,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAA,MAAA,IAAI,CAAC,KAAK,EAAC,OAAO,kDAAI,CAAC,CAAC,CAAC,SAAS,CACvE,EACA,IAAI,CAAC,KAAiB,CAAC,qBAAqB,EAAE,CAChD,CAAC;QAGF,MAAM,WAAW,mCACZ,kCAAuB,CAAC,QAAQ,CAAC,GACjC,IAAI,CACR,CAAC;QAEF,OAAO,CAAC,IAAW,EAAE,GAAkB,EAAE,EAAE;YACzC,MAAM,YAAY,GAAQ,EAAE,CAAC;YAE7B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;gBAC/B,IAAI,GAAG,KAAK,OAAO,EAAE;oBACnB,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAkB,EAAE,EAAE;wBACpD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;wBACxC,IAAI,YAAY,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;wBAChE,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,EAAE;4BACrB,YAAY,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;yBACnE;wBAED,IAAI,IAAA,gBAAO,EAAC,OAAO,CAAC,EAAE;4BACpB,YAAY,GAAG,aAAK,CAAC,UAAU,CAAC,YAAsB,EAAE,OAAO,CAAC,CAAC;yBAClE;wBAED,OAAO;4BACL,MAAM,EAAE,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM;4BACzF,KAAK,EAAE,YAAY,IAAI,UAAU,CAAC,CAAC,CAAC;yBACrC,CAAC;oBACJ,CAAC,CAAC,CAAC;iBACJ;qBAAM,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,EAAE;oBAC5B,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;iBACxE;qBAAM;oBACL,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAC3B;YACH,CAAC,CAAC,CAAC;YAEH,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACjC,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,WAAgB;;QACzC,MAAM,EAAE,KAAK,EAAE,KAAK,KAAqB,WAAW,EAA3B,WAAW,UAAK,WAAW,EAA9C,kBAAgC,CAAc,CAAC;QAErD,MAAM,YAAY,GAAQ,EAAE,CAAC;QAE7B,IAAI,CAAC,CAAC,QAAQ,IAAI,YAAY,CAAC,EAAE;YAC/B,MAAM,UAAU,GAAG,IAAA,8BAAuB,EACxC,IAAA,oBAAa,EACX,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,EAC3B,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAA,MAAA,IAAI,CAAC,KAAK,EAAC,OAAO,kDAAI,CAAC,CAAC,CAAC,SAAS,CACvE,EACA,IAAI,CAAC,KAAiB,CAAC,qBAAqB,EAAE,CAChD,CAAC;YACF,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,QAAQ,EAAE;gBAE3D,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,WAAW,EAAE,GAAI,IAAI,CAAC,KAAyB,CAAC,iBAAiB,EAAE,CAAC;gBAC5G,IAAI,CAAC,KAAK,EAAE;oBAEV,UAAU,GAAG,gBAAgB,CAAC;iBAC/B;gBACD,IAAI,CAAC,UAAU,EAAE;oBACf,UAAU,GAAG,WAAW,CAAC;iBAC1B;gBAED,OAAO,CAAC,IAAW,EAAE,GAAkB,EAAE,EAAE;oBACzC,MAAM,YAAY,GAAQ,EAAE,CAAC;oBAE7B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBACrC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;wBAC/B,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,EAAE;4BACrB,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;yBAClF;6BAAM;4BACL,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;yBAC3B;oBACH,CAAC,CAAC,CAAC;oBAEH,YAAY,CAAC,MAAM,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,KAAI,UAAU,CAAC,CAAC,CAAC,CAAC;oBAE3E,OAAO,YAAY,CAAC;gBACtB,CAAC,CAAC;aACH;SACF;aAAM,IAAI,uBAAY,CAAC,QAAQ,CAAC,MAAA,WAAW,CAAC,MAAM,0CAAE,QAAQ,CAAC,EAAE;YAC9D,MAAM,eAAe,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAEtE,OAAO,CAAC,IAAW,EAAE,GAAkB,EAAE,EAAE;gBACzC,MAAM,YAAY,GAAQ,EAAE,CAAC;gBAE7B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACrC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;oBAC/B,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,EAAE;wBACrB,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;qBAClF;yBAAM;wBACL,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;qBAC3B;gBACH,CAAC,CAAC,CAAC;gBAEH,YAAY,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAEjD,OAAO,YAAY,CAAC;YACtB,CAAC,CAAC;SACH;QAED,OAAO,CAAC,IAAW,EAAE,GAAkB,EAAE,EAAE;YACzC,MAAM,YAAY,GAAQ,EAAE,CAAC;YAE7B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;gBAC/B,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,EAAE;oBACrB,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;iBAClF;qBAAM;oBACL,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;iBAC3B;YACH,CAAC,CAAC,CAAC;YAEH,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC;CACF;AAvgBD,4BAugBC","file":"base-mark.js","sourcesContent":["import type { IStateInfo, IAttributeOpt, IModelMarkAttributeContext } from '../../compile/mark/interface';\nimport type { BaseSeries } from '../../series/base/base-series';\nimport type {\n  Datum,\n  IMarkSpec,\n  ConvertToMarkStyleSpec,\n  GradientStop,\n  IVisual,\n  IVisualScale,\n  IVisualSpecStyle,\n  ICommonSpec,\n  FunctionType\n} from '../../typings';\n\nimport { mergeSpec } from '../../util/spec/merge-spec';\nimport { Color } from '../../util/color';\nimport { createScaleWithSpec } from '../../util/scale';\nimport type {\n  IMarkRaw,\n  IMarkStateStyle,\n  IMarkStyle,\n  IMark,\n  IMarkOption,\n  StyleConvert,\n  VisualScaleType,\n  MarkInputStyle\n} from '../interface';\nimport { AttributeLevel, GradientType, DEFAULT_GRADIENT_CONFIG } from '../../constant';\nimport { isValidScaleType } from '@visactor/vscale';\nimport type { DataView } from '@visactor/vdataset';\nimport { computeActualDataScheme, getDataScheme } from '../../theme/color-scheme/util';\nimport type { ISeries } from '../../series/interface';\nimport { CompilableMark } from '../../compile/mark/compilable-mark';\nimport type { StateValueType } from '../../compile/mark';\nimport { degreeToRadian, isBoolean, isFunction, isNil, isValid, isNumber } from '@visactor/vutils';\n\nexport type ExChannelCall = (\n  key: string | number | symbol,\n  datum: Datum,\n  states: StateValueType,\n  opt: unknown,\n  baseValue: unknown\n) => unknown;\n\nexport class BaseMark<T extends ICommonSpec> extends CompilableMark implements IMarkRaw<T> {\n  declare stateStyle: IMarkStateStyle<T>;\n\n  protected declare _option: IMarkOption;\n\n  protected _attributeContext: IModelMarkAttributeContext;\n\n  /** by _unCompileChannel, some channel need add default channel to make sure update available */\n  _extensionChannel: {\n    [key: string | number | symbol]: string[];\n  } = {};\n  /** same as _extensionChannel. when compute channel, add extension channel effect */\n  _computeExChannel: {\n    [key: string | number | symbol]: ExChannelCall;\n  } = {};\n\n  constructor(name: string, option: IMarkOption) {\n    super(option, name, option.model);\n    // 这里的上下文多数情况下与 mark 是什么是没有关系的，与mark的使用者，也就是series，component有的逻辑有关。\n    this._attributeContext = option.attributeContext;\n    option.map?.set(this.id, this as unknown as IMark);\n  }\n\n  created(): void {\n    this._initStyle();\n  }\n\n  /**\n   * 外部调用，根据 spec 初始化 style（如果由 IModel 派生类调用，请使用 IModel.initMarkStyleWithSpec）\n   * @param spec\n   * @param key\n   * @returns\n   */\n  initStyleWithSpec(spec: IMarkSpec<T>, key?: string) {\n    if (!spec) {\n      return;\n    }\n\n    if (isValid(spec.id)) {\n      this._userId = spec.id;\n    }\n\n    // interactive\n    if (isBoolean(spec.interactive)) {\n      this._interactive = spec.interactive;\n    }\n    // zIndex\n    if (isValid(spec.zIndex)) {\n      this.setZIndex(spec.zIndex);\n    }\n    // visible\n    if (isBoolean(spec.visible)) {\n      this.setVisible(spec.visible);\n    }\n    // style\n    this._initSpecStyle(spec, this.stateStyle, key);\n  }\n\n  convertAngleToRadian(styleConverter: StyleConvert<number>): StyleConvert<any> {\n    // 用户传入的angle配置，需要做一层转换\n    if (isNumber(styleConverter)) {\n      return degreeToRadian(styleConverter) as StyleConvert<any>;\n    } else if ((styleConverter as VisualScaleType).scale) {\n      const range = (styleConverter as VisualScaleType).scale.range();\n\n      (styleConverter as VisualScaleType).scale.range(range.map(degreeToRadian));\n\n      return styleConverter as StyleConvert<any>;\n    } else if (typeof styleConverter === 'function') {\n      return ((item: any, ctx: any, opt: IAttributeOpt, source?: DataView) => {\n        return degreeToRadian((styleConverter as FunctionType<number>)(item, ctx, opt, source));\n      }) as StyleConvert<any>;\n    }\n\n    return styleConverter;\n  }\n\n  isUserLevel(level: number) {\n    return [AttributeLevel.User_Mark, AttributeLevel.User_Series, AttributeLevel.User_Chart].includes(level);\n  }\n\n  /**\n   * 由外部series调用，设置markStyle的接口（如果由 IModel 派生类调用，请使用 IModel.setMarkStyle）\n   * @param style\n   * @param level\n   * @param state\n   */\n  setStyle<U extends keyof T>(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ): void {\n    if (isNil(style)) {\n      return;\n    }\n    style = this._filterStyle(style, state, level, stateStyle);\n\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    const isUserLevel = this.isUserLevel(level);\n\n    Object.keys(style).forEach((attr: string) => {\n      let attrStyle = style[attr] as MarkInputStyle<T[U]>;\n      if (isNil(attrStyle)) {\n        return;\n      }\n\n      attrStyle = this._filterAttribute(attr as any, attrStyle, state, level, isUserLevel, stateStyle);\n\n      this.setAttribute(attr as any, attrStyle, state, level, stateStyle);\n    });\n  }\n\n  getStyle(key: string, state: StateValueType = 'normal'): any {\n    return this.stateStyle[state][key]?.style;\n  }\n\n  /** 过滤用户传来的 style 对象 */\n  protected _filterStyle(\n    style: Partial<IMarkStyle<T>>,\n    state: StateValueType,\n    level: number,\n    stateStyle = this.stateStyle\n  ): Partial<IMarkStyle<T>> {\n    return style;\n  }\n\n  /** 过滤单个 attribute */\n  protected _filterAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType,\n    level: number,\n    isUserLevel: boolean,\n    stateStyle = this.stateStyle\n  ): StyleConvert<T[U]> {\n    let newStyle = this._styleConvert(style);\n    if (isUserLevel && attr === 'angle') {\n      newStyle = this.convertAngleToRadian(newStyle as StyleConvert<number>);\n    }\n    return newStyle;\n  }\n\n  /**\n   * TODO: 没有外部调用\n   * 设置mark样式所参考的图元\n   */\n  setReferer<U extends keyof T>(mark: IMarkRaw<T>, styleKey?: U, state?: StateValueType, stateStyle = this.stateStyle) {\n    if (!mark) {\n      return;\n    }\n    if (styleKey && state) {\n      const style = stateStyle[state] ?? { [styleKey]: {} };\n      stateStyle[state][styleKey] = {\n        ...(style[styleKey] as unknown as any),\n        ...{ referer: mark }\n      };\n      return;\n    }\n\n    Object.entries(stateStyle).forEach(([state, style]) => {\n      Object.entries(style).forEach(([styleKey, style]) => {\n        stateStyle[state][styleKey].referer = mark;\n      });\n    });\n  }\n\n  setPostProcess<U extends keyof T>(key: U, postProcessFunc: any, state: StateValueType = 'normal') {\n    if (this.stateStyle[state]?.[key]) {\n      this.stateStyle[state][key].postProcess = postProcessFunc;\n    }\n  }\n\n  getAttribute<U extends keyof T>(key: U, datum: Datum, state: StateValueType = 'normal', opt?: IAttributeOpt) {\n    return this._computeAttribute(key, state)(datum, opt);\n  }\n\n  setAttribute<U extends keyof T>(\n    attr: U,\n    style: MarkInputStyle<T[U]>,\n    state: StateValueType = 'normal',\n    level: number = 0,\n    stateStyle = this.stateStyle\n  ) {\n    if (stateStyle[state] === undefined) {\n      stateStyle[state] = {};\n    }\n\n    if (stateStyle[state][attr] === undefined) {\n      // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n      // @ts-ignore\n      stateStyle[state][attr] = {\n        level,\n        style,\n        referer: undefined\n      };\n    }\n    const attrLevel = stateStyle[state][attr]?.level;\n    if (isValid(attrLevel) && attrLevel <= level) {\n      mergeSpec(stateStyle[state][attr], { style, level });\n    }\n\n    // some attr has extension channel in VChart to make some effect\n    if (state !== 'normal') {\n      if (attr in this._extensionChannel) {\n        this._extensionChannel[attr].forEach(key => {\n          if (stateStyle[state][key] === undefined) {\n            // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n            // @ts-ignore\n            stateStyle[state][key as keyof T] = stateStyle.normal[key];\n          }\n        });\n      }\n    }\n  }\n\n  /**\n   * 与 vgrammar 默认值一致的样式可以不设置默认值或设置为undefined, 减少encode属性\n   */\n  protected _getDefaultStyle() {\n    return {\n      visible: true,\n      // mark的层级应该在mark层 不在encode属性层\n      // zIndex: LayoutZIndex.Mark,\n      x: 0,\n      y: 0\n    } as IMarkStyle<T>;\n  }\n\n  // /**\n  //  * 获取该 mark 不支持的图形属性，由子类覆写\n  //  * @returns\n  //  */\n  // protected getIgnoreAttributes(): string[] {\n  //   return [];\n  // }\n\n  protected _styleConvert<U extends keyof T>(style?: MarkInputStyle<T[U]>): StyleConvert<T[U]> | undefined {\n    if (!style) {\n      return style as undefined;\n    }\n    // visual spec 转换为 scale 类型的mark style\n    if (isValidScaleType((style as IVisualSpecStyle<unknown, T[U]>).type) || (style as IVisualScale).scale) {\n      // const _style = style as IVisual<T[U]>;\n      const scale = createScaleWithSpec(style as IVisual<T[U]>, {\n        globalScale: this._option.globalScale,\n        seriesId: this._option.seriesId\n      });\n      if (scale) {\n        return {\n          scale,\n          field: (style as IVisual<T[U]>).field,\n          changeDomain: (style as IVisualScale).changeDomain\n        };\n      }\n    }\n    return style as StyleConvert<T[U]>;\n  }\n\n  protected _computeAttribute<U extends keyof T>(key: U, state: StateValueType) {\n    let stateStyle = this.stateStyle[state]?.[key];\n    if (!stateStyle) {\n      stateStyle = this.stateStyle.normal[key];\n    }\n    const baseValueFunctor = this._computeStateAttribute(stateStyle, key, state);\n    const hasPostProcess = isFunction(stateStyle?.postProcess);\n    const hasExCompute = key in this._computeExChannel;\n\n    if (hasPostProcess && hasExCompute) {\n      const exCompute = this._computeExChannel[key];\n      return (datum: Datum, opt: IAttributeOpt) => {\n        let baseValue = baseValueFunctor(datum, opt);\n\n        baseValue = stateStyle.postProcess(baseValue, datum, this._attributeContext, opt, this.getDataView());\n\n        return exCompute(key, datum, state, opt, baseValue);\n      };\n    } else if (hasPostProcess) {\n      return (datum: Datum, opt: IAttributeOpt) => {\n        return stateStyle.postProcess(\n          baseValueFunctor(datum, opt),\n          datum,\n          this._attributeContext,\n          opt,\n          this.getDataView()\n        );\n      };\n    } else if (hasExCompute) {\n      const exCompute = this._computeExChannel[key];\n      return (datum: Datum, opt: IAttributeOpt) => {\n        return exCompute(key, datum, state, opt, baseValueFunctor(datum, opt));\n      };\n    }\n\n    return baseValueFunctor;\n  }\n\n  protected _computeStateAttribute<U extends keyof T>(\n    stateStyle: any,\n    key: U,\n\n    state: StateValueType\n  ): (datum: Datum, opt: IAttributeOpt) => any {\n    if (!stateStyle) {\n      return (datum: Datum, opt: IAttributeOpt) => undefined as any;\n    }\n    if (stateStyle.referer) {\n      return stateStyle.referer._computeAttribute(key, state);\n    }\n\n    if (GradientType.includes(stateStyle.style.gradient)) {\n      // 渐变色处理，支持各个属性回调\n      return this._computeGradientAttr(stateStyle.style);\n    }\n\n    if (['outerBorder', 'innerBorder'].includes(key as string)) {\n      // 内外描边处理，支持各个属性回调\n      return this._computeBorderAttr(stateStyle.style);\n    }\n\n    if (isValidScaleType(stateStyle.style.scale?.type)) {\n      return (datum: Datum, opt: IAttributeOpt) => stateStyle.style.scale.scale(datum[stateStyle.style.field]);\n    }\n\n    return (datum: Datum, opt: IAttributeOpt) => {\n      if (typeof stateStyle.style === 'function') {\n        return stateStyle.style?.(datum, this._attributeContext, opt, this.getDataView());\n      }\n\n      return stateStyle.style;\n    };\n  }\n\n  private _initStyle(): void {\n    const defaultStyle = this._getDefaultStyle();\n    this.setStyle(defaultStyle, 'normal', 0);\n  }\n\n  private _initSpecStyle(spec: IMarkSpec<T>, stateStyle: IMarkStateStyle<T>, key?: string) {\n    // style\n    if (spec.style) {\n      this.setStyle(spec.style, 'normal', AttributeLevel.User_Mark, stateStyle);\n    }\n    const state = spec.state;\n    if (state) {\n      Object.keys(state).forEach(key => {\n        const stateTemp = state[key];\n        if ('style' in stateTemp) {\n          const style = stateTemp.style;\n          let stateInfo: IStateInfo = { stateValue: key };\n          if ('level' in stateTemp) {\n            stateInfo.level = stateTemp.level as number;\n          }\n          if ('filter' in stateTemp) {\n            if (isFunction(stateTemp.filter)) {\n              stateInfo = {\n                filter: stateTemp.filter as (datum: any, options: Record<string, any>) => boolean,\n                ...stateInfo\n              };\n            } else {\n              stateInfo = { ...stateTemp.filter, ...stateInfo };\n            }\n          }\n          this.state.addStateInfo(stateInfo);\n          this.setStyle(style as ConvertToMarkStyleSpec<T>, key, AttributeLevel.User_Mark, stateStyle);\n        } else {\n          this.setStyle(stateTemp, key, AttributeLevel.User_Mark, stateStyle);\n        }\n      });\n    }\n  }\n\n  private _computeGradientAttr(gradientStyle: any) {\n    const { gradient, scale, field, ...rest } = gradientStyle;\n    const markData = this.getDataView();\n    let colorScale = scale;\n    let colorField = field;\n    if ((!scale || !field) && this.model.modelType === 'series') {\n      // 目前只有series有这个属性\n      const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n      if (!scale) {\n        // 获取全局的 colorScale\n        colorScale = globalColorScale;\n      }\n      if (!colorField) {\n        colorField = globalField;\n      }\n    }\n\n    const themeColor = computeActualDataScheme(\n      getDataScheme(\n        this.model.getColorScheme(),\n        this.model.modelType === 'series' ? this.model.getSpec?.() : undefined\n      ),\n      (this.model as ISeries).getDefaultColorDomain()\n    );\n\n    // 默认配置处理\n    const mergedStyle = {\n      ...DEFAULT_GRADIENT_CONFIG[gradient],\n      ...rest\n    };\n\n    return (data: Datum, opt: IAttributeOpt) => {\n      const computeStyle: any = {};\n\n      Object.keys(mergedStyle).forEach(key => {\n        const value = mergedStyle[key];\n        if (key === 'stops') {\n          computeStyle.stops = value.map((stop: GradientStop) => {\n            const { opacity, color, offset } = stop;\n            let computeColor = color ?? colorScale?.scale(data[colorField]);\n            if (isFunction(color)) {\n              computeColor = color(data, this._attributeContext, opt, markData);\n            }\n\n            if (isValid(opacity)) {\n              computeColor = Color.SetOpacity(computeColor as string, opacity);\n            }\n\n            return {\n              offset: isFunction(offset) ? offset(data, this._attributeContext, opt, markData) : offset,\n              color: computeColor || themeColor[0]\n            };\n          });\n        } else if (isFunction(value)) {\n          computeStyle[key] = value(data, this._attributeContext, opt, markData);\n        } else {\n          computeStyle[key] = value;\n        }\n      });\n\n      computeStyle.gradient = gradient;\n      return computeStyle;\n    };\n  }\n\n  private _computeBorderAttr(borderStyle: any) {\n    const { scale, field, ...mergedStyle } = borderStyle;\n\n    const computeStyle: any = {};\n\n    if (!('stroke' in computeStyle)) {\n      const themeColor = computeActualDataScheme(\n        getDataScheme(\n          this.model.getColorScheme(),\n          this.model.modelType === 'series' ? this.model.getSpec?.() : undefined\n        ),\n        (this.model as ISeries).getDefaultColorDomain()\n      );\n      let colorScale = scale;\n      let colorField = field;\n      if ((!scale || !field) && this.model.modelType === 'series') {\n        // 目前只有series有这个属性\n        const { scale: globalColorScale, field: globalField } = (this.model as BaseSeries<any>).getColorAttribute();\n        if (!scale) {\n          // 获取全局的 colorScale\n          colorScale = globalColorScale;\n        }\n        if (!colorField) {\n          colorField = globalField;\n        }\n\n        return (data: Datum, opt: IAttributeOpt) => {\n          const computeStyle: any = {};\n\n          Object.keys(mergedStyle).forEach(key => {\n            const value = mergedStyle[key];\n            if (isFunction(value)) {\n              computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView());\n            } else {\n              computeStyle[key] = value;\n            }\n          });\n\n          computeStyle.stroke = colorScale?.scale(data[colorField]) || themeColor[0];\n\n          return computeStyle;\n        };\n      }\n    } else if (GradientType.includes(mergedStyle.stroke?.gradient)) {\n      const gradientFunctor = this._computeGradientAttr(mergedStyle.stroke);\n\n      return (data: Datum, opt: IAttributeOpt) => {\n        const computeStyle: any = {};\n\n        Object.keys(mergedStyle).forEach(key => {\n          const value = mergedStyle[key];\n          if (isFunction(value)) {\n            computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView());\n          } else {\n            computeStyle[key] = value;\n          }\n        });\n\n        computeStyle.stroke = gradientFunctor(data, opt);\n\n        return computeStyle;\n      };\n    }\n\n    return (data: Datum, opt: IAttributeOpt) => {\n      const computeStyle: any = {};\n\n      Object.keys(mergedStyle).forEach(key => {\n        const value = mergedStyle[key];\n        if (isFunction(value)) {\n          computeStyle[key] = value(data, this._attributeContext, opt, this.getDataView());\n        } else {\n          computeStyle[key] = value;\n        }\n      });\n\n      return computeStyle;\n    };\n  }\n}\n"]}

package/cjs/mark/box-plot.d.ts

@@ -2,7 +2,7 @@ import type { IBoxPlotMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IGroupMark } from '@visactor/vgrammar-core';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IBoxPlotMark = IMarkRaw<IBoxPlotMarkSpec>;
 export declare class BoxPlotMark extends BaseMark<IBoxPlotMarkSpec> implements IBoxPlotMark {
     static readonly type = MarkTypeEnum.boxPlot;

package/cjs/mark/box-plot.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BoxPlotMark = void 0;
 
-const base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), interface_1 = require("./interface"), BOX_PLOT_GLYPH_TYPE = "boxplot", BAR_BOX_PLOT_GLYPH_TYPE = "barBoxplot";
+const base_mark_1 = require("./base/base-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), type_1 = require("./interface/type"), BOX_PLOT_GLYPH_TYPE = "boxplot", BAR_BOX_PLOT_GLYPH_TYPE = "barBoxplot";
 
 class BoxPlotMark extends base_mark_1.BaseMark {
     constructor() {
@@ -28,5 +28,5 @@ class BoxPlotMark extends base_mark_1.BaseMark {
     }
 }
 
-exports.BoxPlotMark = BoxPlotMark, BoxPlotMark.type = interface_1.MarkTypeEnum.boxPlot;
+exports.BoxPlotMark = BoxPlotMark, BoxPlotMark.type = type_1.MarkTypeEnum.boxPlot;
 //# sourceMappingURL=box-plot.js.map

package/cjs/mark/box-plot.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/box-plot.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2DAAwF;AAGxF,2CAA2C;AAG3C,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAE7C,MAAa,WAAY,SAAQ,oBAA0B;IAA3D;;QAEW,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IAgCnC,CAAC;IA9BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,EAAE,EACZ,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,MAAM,GACnB,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,UAAU,KAAK,KAAK,EAAE;YACxB,IAAA,uCAAuB,GAAE,CAAC;SAC3B;aAAM;YACL,IAAA,oCAAoB,GAAE,CAAC;SACxB;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,mBAAmB,CAAC;QACvF,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,CAAC,CAAC;QACjC,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAjCH,kCAkCC;AAjCiB,gBAAI,GAAG,wBAAY,CAAC,OAAO,CAAC","file":"box-plot.js","sourcesContent":["import type { IBoxPlotMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { registerBarBoxplotGlyph, registerBoxplotGlyph } from '@visactor/vgrammar-core';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nexport type IBoxPlotMark = IMarkRaw<IBoxPlotMarkSpec>;\n\nconst BOX_PLOT_GLYPH_TYPE = 'boxplot';\nconst BAR_BOX_PLOT_GLYPH_TYPE = 'barBoxplot';\n\nexport class BoxPlotMark extends BaseMark<IBoxPlotMarkSpec> implements IBoxPlotMark {\n  static readonly type = MarkTypeEnum.boxPlot;\n  readonly type = BoxPlotMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IBoxPlotMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 2,\n      boxWidth: 30,\n      shaftWidth: 20,\n      shaftShape: 'line'\n    };\n    return defaultStyle;\n  }\n  /** 创建语法元素对象 */\n  protected _initProduct(group?: string | IGroupMark) {\n    const shaftShape = this.getStyle('shaftShape');\n    if (shaftShape === 'bar') {\n      registerBarBoxplotGlyph();\n    } else {\n      registerBoxplotGlyph();\n    }\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = shaftShape === 'bar' ? BAR_BOX_PLOT_GLYPH_TYPE : BOX_PLOT_GLYPH_TYPE;\n    const direction = this.getStyle('direction');\n    this._product = view\n      .glyph(glyphType, group ?? view.rootMark)\n      .id(id)\n      .configureGlyph({ direction });\n    this._compiledProductId = id;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/box-plot.ts"],"names":[],"mappings":";;;AACA,gDAA4C;AAG5C,2DAAwF;AAGxF,2CAAgD;AAGhD,MAAM,mBAAmB,GAAG,SAAS,CAAC;AACtC,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAE7C,MAAa,WAAY,SAAQ,oBAA0B;IAA3D;;QAEW,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IAgCnC,CAAC;IA9BW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,EAAE,EACZ,UAAU,EAAE,EAAE,EACd,UAAU,EAAE,MAAM,GACnB,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;IAES,YAAY,CAAC,KAA2B;QAChD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,UAAU,KAAK,KAAK,EAAE;YACxB,IAAA,uCAAuB,GAAE,CAAC;SAC3B;aAAM;YACL,IAAA,oCAAoB,GAAE,CAAC;SACxB;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAGpC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,mBAAmB,CAAC;QACvF,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,CAAC,CAAC;QACjC,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;;AAjCH,kCAkCC;AAjCiB,gBAAI,GAAG,mBAAY,CAAC,OAAO,CAAC","file":"box-plot.js","sourcesContent":["import type { IBoxPlotMarkSpec } from '../typings/visual';\nimport { BaseMark } from './base/base-mark';\nimport type { IGroupMark } from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { registerBarBoxplotGlyph, registerBoxplotGlyph } from '@visactor/vgrammar-core';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nexport type IBoxPlotMark = IMarkRaw<IBoxPlotMarkSpec>;\n\nconst BOX_PLOT_GLYPH_TYPE = 'boxplot';\nconst BAR_BOX_PLOT_GLYPH_TYPE = 'barBoxplot';\n\nexport class BoxPlotMark extends BaseMark<IBoxPlotMarkSpec> implements IBoxPlotMark {\n  static readonly type = MarkTypeEnum.boxPlot;\n  readonly type = BoxPlotMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<IBoxPlotMarkSpec> = {\n      ...super._getDefaultStyle(),\n      lineWidth: 2,\n      boxWidth: 30,\n      shaftWidth: 20,\n      shaftShape: 'line'\n    };\n    return defaultStyle;\n  }\n  /** 创建语法元素对象 */\n  protected _initProduct(group?: string | IGroupMark) {\n    const shaftShape = this.getStyle('shaftShape');\n    if (shaftShape === 'bar') {\n      registerBarBoxplotGlyph();\n    } else {\n      registerBoxplotGlyph();\n    }\n    const view = this.getVGrammarView();\n\n    // 声明语法元素\n    const id = this.getProductId();\n    const glyphType = shaftShape === 'bar' ? BAR_BOX_PLOT_GLYPH_TYPE : BOX_PLOT_GLYPH_TYPE;\n    const direction = this.getStyle('direction');\n    this._product = view\n      .glyph(glyphType, group ?? view.rootMark)\n      .id(id)\n      .configureGlyph({ direction });\n    this._compiledProductId = id;\n  }\n}\n"]}

package/cjs/mark/cell.d.ts

@@ -1,6 +1,6 @@
 import type { ICellMarkSpec } from '../typings';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 import { BaseSymbolMark } from './symbol';
 export type ICellMark = IMarkRaw<ICellMarkSpec>;
 export declare class CellMark extends BaseSymbolMark<ICellMarkSpec> implements ICellMark {

package/cjs/mark/cell.js

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

package/cjs/mark/cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/mark/cell.ts"],"names":[],"mappings":";;;AAGA,2CAA2C;AAC3C,qCAA0C;AAI1C,MAAa,QAAS,SAAQ,uBAA6B;IAA3D;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAShC,CAAC;IAPW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,OAAO,EAAE,CAAC,GACX,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,4BAWC;AAViB,aAAI,GAAG,wBAAY,CAAC,IAAI,CAAC","file":"cell.js","sourcesContent":["import type { ICellMarkSpec } from '../typings';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface';\nimport { BaseSymbolMark } from './symbol';\n\nexport type ICellMark = IMarkRaw<ICellMarkSpec>;\n\nexport class CellMark extends BaseSymbolMark<ICellMarkSpec> implements ICellMark {\n  static readonly type = MarkTypeEnum.cell;\n  readonly type = CellMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ICellMarkSpec> = {\n      ...super._getDefaultStyle(),\n      padding: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}
+{"version":3,"sources":["../src/mark/cell.ts"],"names":[],"mappings":";;;AAGA,2CAAgD;AAChD,qCAA0C;AAI1C,MAAa,QAAS,SAAQ,uBAA6B;IAA3D;;QAEW,SAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;IAShC,CAAC;IAPW,gBAAgB;QACxB,MAAM,YAAY,mCACb,KAAK,CAAC,gBAAgB,EAAE,KAC3B,OAAO,EAAE,CAAC,GACX,CAAC;QACF,OAAO,YAAY,CAAC;IACtB,CAAC;;AAVH,4BAWC;AAViB,aAAI,GAAG,mBAAY,CAAC,IAAI,CAAC","file":"cell.js","sourcesContent":["import type { ICellMarkSpec } from '../typings';\nimport type { IMarkRaw, IMarkStyle } from './interface';\n// eslint-disable-next-line no-duplicate-imports\nimport { MarkTypeEnum } from './interface/type';\nimport { BaseSymbolMark } from './symbol';\n\nexport type ICellMark = IMarkRaw<ICellMarkSpec>;\n\nexport class CellMark extends BaseSymbolMark<ICellMarkSpec> implements ICellMark {\n  static readonly type = MarkTypeEnum.cell;\n  readonly type = CellMark.type;\n\n  protected _getDefaultStyle() {\n    const defaultStyle: IMarkStyle<ICellMarkSpec> = {\n      ...super._getDefaultStyle(),\n      padding: 0\n    };\n    return defaultStyle;\n  }\n}\n"]}

package/cjs/mark/component.d.ts

@@ -2,7 +2,7 @@ import type { IGroupMark } from '@visactor/vgrammar-core';
 import type { ICommonSpec } from '../typings';
 import { BaseMark } from './base/base-mark';
 import type { IMarkOption, IMarkRaw } from './interface';
-import { MarkTypeEnum } from './interface';
+import { MarkTypeEnum } from './interface/type';
 export type IComponentMark = IMarkRaw<ICommonSpec>;
 export declare class ComponentMark extends BaseMark<ICommonSpec> implements IComponentMark {
     static readonly type = MarkTypeEnum.component;