@visactor/vgrammar-plot 0.7.5-alpha.0 → 0.7.6-alpha.0

package/cjs/text.d.ts

@@ -1,6 +1,6 @@
-import type { TextEncodeChannels, WithDefaultEncode, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, BasicEncoderSpecMap } from '@visactor/vgrammar';
+import type { TextEncodeChannels, WithDefaultEncode, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, BasicEncoderSpecMap } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class TextSemanticMark extends SemanticMark<BasicEncoderSpecMap['text'], TextEncodeChannels> {
     static readonly type = PlotMakType.text;

package/cjs/text.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.TextSemanticMark = void 0;
 
-const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visactor/vgrammar"), enums_1 = require("./enums");
+const semantic_mark_1 = require("./semantic-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), enums_1 = require("./enums");
 
 class TextSemanticMark extends semantic_mark_1.SemanticMark {
     constructor(id) {
         super(enums_1.PlotMakType.text, id);
     }
     setMarkType() {
-        return vgrammar_1.GrammarMarkType.text;
+        return vgrammar_core_1.GrammarMarkType.text;
     }
     parseScaleOfEncodeX(option) {
         const res = super.parseScaleOfEncodeX(option);

package/cjs/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/text.ts"],"names":[],"mappings":";;;AAWA,mDAA+C;AAE/C,iDAAqD;AACrD,mCAAsC;AAEtC,MAAa,gBAAiB,SAAQ,4BAA6D;IAEjG,YAAY,EAAoB;QAC9B,KAAK,CAAC,mBAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,OAAO,0BAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAES,mBAAmB,CAC3B,MAAuG;QAEvG,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,kBAAkB,CAChB,OAA2B,EAC3B,MAAuG;QAEvG,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB,CACf,MAA0E;;QAE1E,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAqD,WAAW,CAAC;QAE1E,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAG,GAAG,CAAC,IAAwB,CAAC,KAAK,EAAE,CAAC;SAC3D;QAED,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;YAC1C,GAAG,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,KAAK,mCAAI,WAAW,CAAC,KAAK,CAAC;SACnD;aAAM;YACL,GAAG,CAAC,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,mCAAI,MAAA,IAAI,CAAC,UAAU,EAAE,0CAAG,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;;AAhDH,4CAiDC;AAhDiB,qBAAI,GAAG,mBAAW,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import type {\n  TextEncodeChannels,\n  WithDefaultEncode,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  BasicEncoderSpecMap,\n  FieldEncodeType\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\n\nexport class TextSemanticMark extends SemanticMark<BasicEncoderSpecMap['text'], TextEncodeChannels> {\n  static readonly type = PlotMakType.text;\n  constructor(id?: string | number) {\n    super(PlotMakType.text, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.text;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>, TextEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: TextEncodeChannels,\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>, TextEncodeChannels>\n  ): ScaleSpec | Nil {\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>\n  ): GenerateBaseEncodeSpec<BasicEncoderSpecMap['text']> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<BasicEncoderSpecMap['text']> = markEncoder;\n\n    if (res.text) {\n      res.text = { field: (res.text as FieldEncodeType).field };\n    }\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}
+{"version":3,"sources":["../src/text.ts"],"names":[],"mappings":";;;AAWA,mDAA+C;AAE/C,2DAA0D;AAC1D,mCAAsC;AAEtC,MAAa,gBAAiB,SAAQ,4BAA6D;IAEjG,YAAY,EAAoB;QAC9B,KAAK,CAAC,mBAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,OAAO,+BAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAES,mBAAmB,CAC3B,MAAuG;QAEvG,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,kBAAkB,CAChB,OAA2B,EAC3B,MAAuG;QAEvG,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB,CACf,MAA0E;;QAE1E,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAqD,WAAW,CAAC;QAE1E,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,GAAG,CAAC,IAAI,GAAG,EAAE,KAAK,EAAG,GAAG,CAAC,IAAwB,CAAC,KAAK,EAAE,CAAC;SAC3D;QAED,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;YAC1C,GAAG,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,KAAK,mCAAI,WAAW,CAAC,KAAK,CAAC;SACnD;aAAM;YACL,GAAG,CAAC,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,mCAAI,MAAA,IAAI,CAAC,UAAU,EAAE,0CAAG,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;;AAhDH,4CAiDC;AAhDiB,qBAAI,GAAG,mBAAW,CAAC,IAAI,CAAC","file":"text.js","sourcesContent":["import type {\n  TextEncodeChannels,\n  WithDefaultEncode,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  BasicEncoderSpecMap,\n  FieldEncodeType\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport { PlotMakType } from './enums';\n\nexport class TextSemanticMark extends SemanticMark<BasicEncoderSpecMap['text'], TextEncodeChannels> {\n  static readonly type = PlotMakType.text;\n  constructor(id?: string | number) {\n    super(PlotMakType.text, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.text;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>, TextEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: TextEncodeChannels,\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>, TextEncodeChannels>\n  ): ScaleSpec | Nil {\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<BasicEncoderSpecMap['text'], TextEncodeChannels>\n  ): GenerateBaseEncodeSpec<BasicEncoderSpecMap['text']> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<BasicEncoderSpecMap['text']> = markEncoder;\n\n    if (res.text) {\n      res.text = { field: (res.text as FieldEncodeType).field };\n    }\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}

package/cjs/tree.d.ts

@@ -1,6 +1,6 @@
-import type { TreeEncodeChannels, WithDefaultEncode, PlotTreeEncodeSpec, SemanticLabelOption, MarkSpec, ChannelEncodeType, DataSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec } from '@visactor/vgrammar';
+import type { TreeEncodeChannels, WithDefaultEncode, PlotTreeEncodeSpec, SemanticLabelOption, MarkSpec, ChannelEncodeType, DataSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 import type { ITextAttribute } from '@visactor/vrender';
 export declare class TreeSemanticMark extends SemanticMark<PlotTreeEncodeSpec, TreeEncodeChannels> {

package/cjs/tree.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.TreeSemanticMark = void 0;
 
-const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visactor/vgrammar"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util");
+const semantic_mark_1 = require("./semantic-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util");
 
 class TreeSemanticMark extends semantic_mark_1.SemanticMark {
     constructor(id) {
-        super(enums_1.PlotMakType.tree, id), (0, vgrammar_1.getTransform)(enums_1.PlotMakType.tree) || this._logger.error("Please add this line of code: import { registerTreeTransforms } from 'vgrammar-hierarchy', \n        and run registerTreeTransforms() before use tree"), 
-        (0, vgrammar_1.getGlyph)("treePath") || this._logger.error("Please add this line of code: import { registerTreePathGlyph } from '@visactor/vgrammar';\n        and run registerTreePathGlyph() before use tree");
+        super(enums_1.PlotMakType.tree, id), vgrammar_core_1.Factory.getTransform(enums_1.PlotMakType.tree) || this._logger.error("Please add this line of code: import { registerTreeTransforms } from 'vgrammar-hierarchy', \n        and run registerTreeTransforms() before use tree"), 
+        vgrammar_core_1.Factory.getGlyph("treePath") || this._logger.error("Please add this line of code: import { registerTreePathGlyph } from '@visactor/vgrammar-core';\n        and run registerTreePathGlyph() before use tree");
     }
     setMarkType() {
-        return vgrammar_1.GrammarMarkType.symbol;
+        return vgrammar_core_1.GrammarMarkType.symbol;
     }
     setDefaultDataTransform() {
         var _a;

package/cjs/tree.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/tree.ts"],"names":[],"mappings":"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","file":"tree.js","sourcesContent":["import type {\n  TreeEncodeChannels,\n  WithDefaultEncode,\n  PlotTreeEncodeSpec,\n  SemanticLabelOption,\n  MarkSpec,\n  ChannelEncodeType,\n  DataSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, getTransform, getGlyph } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { ITextAttribute } from '@visactor/vrender';\n\nexport class TreeSemanticMark extends SemanticMark<PlotTreeEncodeSpec, TreeEncodeChannels> {\n  static readonly type = PlotMakType.tree;\n  constructor(id?: string | number) {\n    super(PlotMakType.tree, id);\n\n    if (!getTransform(PlotMakType.tree)) {\n      this._logger.error(\n        `Please add this line of code: import { registerTreeTransforms } from 'vgrammar-hierarchy', \n        and run registerTreeTransforms() before use tree`\n      );\n    }\n\n    if (!getGlyph('treePath')) {\n      this._logger.error(\n        `Please add this line of code: import { registerTreePathGlyph } from '@visactor/vgrammar';\n        and run registerTreePathGlyph() before use tree`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.symbol;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'tree',\n        width: { signal: 'viewWidth' },\n        height: { signal: 'viewHeight' },\n        nodeKey: this.spec.encode?.node,\n        flatten: true\n      }\n    ];\n  }\n\n  getDataIdOfLink() {\n    return `${this.spec.data?.id ?? this.spec.id}-data-link`;\n  }\n\n  setMultipleData(): DataSpec[] {\n    return [\n      {\n        id: this.getDataIdOfFiltered(),\n        transform: [\n          {\n            type: 'map',\n            all: true,\n            callback: (datum: any) => {\n              return datum[0].nodes;\n            }\n          }\n        ]\n      },\n      {\n        source: this.getDataIdOfMain(),\n        id: this.getDataIdOfLink(),\n        transform: [\n          {\n            type: 'map',\n            all: true,\n            callback: (datum: any) => {\n              // return formatLinkPath(datum[0].links);\n              return datum[0].links;\n            }\n          }\n        ]\n      }\n    ];\n  }\n\n  parseScaleByEncode(\n    channel: TreeEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotTreeEncodeSpec, TreeEncodeChannels>, TreeEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotTreeEncodeSpec, TreeEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotTreeEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotTreeEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  protected setLabelTextGetter(\n    channel: string,\n    option: SemanticLabelOption | boolean\n  ): ChannelEncodeType<ITextAttribute['text']> {\n    const textGetter = getFieldAccessor(channel);\n    return (datum: any, el: IElement, params: any) => {\n      return textGetter(datum.datum[datum.datum.length - 1]);\n    };\n  }\n\n  setMainMarkSpec() {\n    return { key: 'key' };\n  }\n\n  setMultiMarksSpec() {\n    const label = this.spec.label;\n\n    if (!label) {\n      return null;\n    }\n\n    const marks: MarkSpec[] = [];\n\n    marks.push({\n      type: 'glyph',\n      glyphType: 'treePath',\n      from: { data: this.getDataIdOfLink() },\n      key: 'key',\n      zIndex: -1,\n      encode: {\n        update: {\n          x0: { field: 'x0' },\n          x1: { field: 'x1' },\n          y0: { field: 'y0' },\n          y1: { field: 'y1' },\n          thickness: 1,\n          round: true,\n          stroke: '#333'\n        }\n      }\n    });\n\n    return marks;\n  }\n}\n"]}
+{"version":3,"sources":["../src/tree.ts"],"names":[],"mappings":"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","file":"tree.js","sourcesContent":["import type {\n  TreeEncodeChannels,\n  WithDefaultEncode,\n  PlotTreeEncodeSpec,\n  SemanticLabelOption,\n  MarkSpec,\n  ChannelEncodeType,\n  DataSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory } from '@visactor/vgrammar-core';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { ITextAttribute } from '@visactor/vrender';\n\nexport class TreeSemanticMark extends SemanticMark<PlotTreeEncodeSpec, TreeEncodeChannels> {\n  static readonly type = PlotMakType.tree;\n  constructor(id?: string | number) {\n    super(PlotMakType.tree, id);\n\n    if (!Factory.getTransform(PlotMakType.tree)) {\n      this._logger.error(\n        `Please add this line of code: import { registerTreeTransforms } from 'vgrammar-hierarchy', \n        and run registerTreeTransforms() before use tree`\n      );\n    }\n\n    if (!Factory.getGlyph('treePath')) {\n      this._logger.error(\n        `Please add this line of code: import { registerTreePathGlyph } from '@visactor/vgrammar-core';\n        and run registerTreePathGlyph() before use tree`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.symbol;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'tree',\n        width: { signal: 'viewWidth' },\n        height: { signal: 'viewHeight' },\n        nodeKey: this.spec.encode?.node,\n        flatten: true\n      }\n    ];\n  }\n\n  getDataIdOfLink() {\n    return `${this.spec.data?.id ?? this.spec.id}-data-link`;\n  }\n\n  setMultipleData(): DataSpec[] {\n    return [\n      {\n        id: this.getDataIdOfFiltered(),\n        transform: [\n          {\n            type: 'map',\n            all: true,\n            callback: (datum: any) => {\n              return datum[0].nodes;\n            }\n          }\n        ]\n      },\n      {\n        source: this.getDataIdOfMain(),\n        id: this.getDataIdOfLink(),\n        transform: [\n          {\n            type: 'map',\n            all: true,\n            callback: (datum: any) => {\n              // return formatLinkPath(datum[0].links);\n              return datum[0].links;\n            }\n          }\n        ]\n      }\n    ];\n  }\n\n  parseScaleByEncode(\n    channel: TreeEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotTreeEncodeSpec, TreeEncodeChannels>, TreeEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotTreeEncodeSpec, TreeEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotTreeEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotTreeEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  protected setLabelTextGetter(\n    channel: string,\n    option: SemanticLabelOption | boolean\n  ): ChannelEncodeType<ITextAttribute['text']> {\n    const textGetter = getFieldAccessor(channel);\n    return (datum: any, el: IElement, params: any) => {\n      return textGetter(datum.datum[datum.datum.length - 1]);\n    };\n  }\n\n  setMainMarkSpec() {\n    return { key: 'key' };\n  }\n\n  setMultiMarksSpec() {\n    const label = this.spec.label;\n\n    if (!label) {\n      return null;\n    }\n\n    const marks: MarkSpec[] = [];\n\n    marks.push({\n      type: 'glyph',\n      glyphType: 'treePath',\n      from: { data: this.getDataIdOfLink() },\n      key: 'key',\n      zIndex: -1,\n      encode: {\n        update: {\n          x0: { field: 'x0' },\n          x1: { field: 'x1' },\n          y0: { field: 'y0' },\n          y1: { field: 'y1' },\n          thickness: 1,\n          round: true,\n          stroke: '#333'\n        }\n      }\n    });\n\n    return marks;\n  }\n}\n"]}

package/cjs/treemap.d.ts

@@ -1,6 +1,6 @@
-import type { TreemapEncodeChannels, WithDefaultEncode, PlotTreemapEncodeSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, IElement, LabelSpec } from '@visactor/vgrammar';
+import type { TreemapEncodeChannels, WithDefaultEncode, PlotTreemapEncodeSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, IElement, LabelSpec } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class TreemapSemanticMark extends SemanticMark<PlotTreemapEncodeSpec, TreemapEncodeChannels> {
     static readonly type = PlotMakType.treemap;
@@ -25,7 +25,7 @@ export declare class TreemapSemanticMark extends SemanticMark<PlotTreemapEncodeS
         };
         key: string;
         dependency: string[];
-        animation: import("@visactor/vgrammar").MarkAnimationSpec;
+        animation: import("@visactor/vgrammar-core").MarkAnimationSpec;
         encode: {
             enter: {
                 textAlign: string;

package/cjs/treemap.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.TreemapSemanticMark = void 0;
 
-const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visactor/vgrammar"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util");
+const semantic_mark_1 = require("./semantic-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util");
 
 class TreemapSemanticMark extends semantic_mark_1.SemanticMark {
     constructor(id) {
-        super(enums_1.PlotMakType.treemap, id), (0, vgrammar_1.getTransform)("treemap") || this._logger.error("Please add this line of code: import { registerTreemapTransforms } from 'vgrammar-hierarchy'; \n        and run registerTreemapTransforms() before use treemap");
+        super(enums_1.PlotMakType.treemap, id), vgrammar_core_1.Factory.getTransform("treemap") || this._logger.error("Please add this line of code: import { registerTreemapTransforms } from 'vgrammar-hierarchy'; \n        and run registerTreemapTransforms() before use treemap");
     }
     setMarkType() {
-        return vgrammar_1.GrammarMarkType.rect;
+        return vgrammar_core_1.GrammarMarkType.rect;
     }
     setDefaultDataTransform() {
         var _a;
@@ -86,7 +86,7 @@ class TreemapSemanticMark extends semantic_mark_1.SemanticMark {
                     skipBeforeLayouted: !0
                 },
                 key: "flattenIndex",
-                dependency: this.viewSpec.scales.map((scale => scale.id)).concat(vgrammar_1.SIGNAL_VIEW_BOX),
+                dependency: this.viewSpec.scales.map((scale => scale.id)).concat(vgrammar_core_1.SIGNAL_VIEW_BOX),
                 animation: this.convertMarkAnimation(),
                 encode: {
                     enter: Object.assign({

package/cjs/treemap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/treemap.ts"],"names":[],"mappings":"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","file":"treemap.js","sourcesContent":["import type {\n  TreemapEncodeChannels,\n  WithDefaultEncode,\n  PlotTreemapEncodeSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  LabelSpec\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, getTransform, SIGNAL_VIEW_BOX } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { BaseLabelAttrs } from '@visactor/vrender-components';\n\nexport class TreemapSemanticMark extends SemanticMark<PlotTreemapEncodeSpec, TreemapEncodeChannels> {\n  static readonly type = PlotMakType.treemap;\n  constructor(id?: string | number) {\n    super(PlotMakType.treemap, id);\n\n    if (!getTransform('treemap')) {\n      this._logger.error(\n        `Please add this line of code: import { registerTreemapTransforms } from 'vgrammar-hierarchy'; \n        and run registerTreemapTransforms() before use treemap`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.rect;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'treemap',\n        width: { signal: 'viewWidth' },\n        height: { signal: 'viewHeight' },\n        nodeKey: this.spec.encode?.node,\n        flatten: true\n      }\n    ];\n  }\n  parseScaleByEncode(\n    channel: TreemapEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotTreemapEncodeSpec, TreemapEncodeChannels>, TreemapEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotTreemapEncodeSpec, TreemapEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotTreemapEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotTreemapEncodeSpec> = {\n      x: { field: 'x0' },\n      x1: { field: 'x1' },\n      y: { field: 'y0' },\n      y1: { field: 'y1' }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  setMainMarkSpec() {\n    return { key: 'key' };\n  }\n\n  protected parseLabelSpec(): LabelSpec[] {\n    // TODO use arc label in the future\n    return [];\n  }\n\n  setMultiMarksSpec() {\n    const label = this.spec.label;\n\n    if (!label) {\n      return null;\n    }\n\n    return Object.keys(label).map(key => {\n      const textGetter = getFieldAccessor(key);\n      return {\n        id: `${this.getMarkId()}-text-${key}`,\n        type: 'text',\n        from: {\n          data: this.getDataIdOfFiltered()\n        },\n        layout: {\n          position: 'content',\n          skipBeforeLayouted: true\n        },\n        key: 'flattenIndex',\n        dependency: this.viewSpec.scales.map(scale => scale.id).concat(SIGNAL_VIEW_BOX),\n        animation: this.convertMarkAnimation(),\n        encode: {\n          enter: Object.assign(\n            {\n              textAlign: 'center',\n              textBaseline: 'middle'\n            },\n            (label[key] as Partial<BaseLabelAttrs>).textStyle\n          ),\n          update: (datum: any, el: IElement, params: any) => {\n            return {\n              x: datum.labelRect ? (datum.labelRect.x0 + datum.labelRect.x1) / 2 : (datum.x0 + datum.x1) / 2,\n              y: datum.labelRect ? (datum.labelRect.y0 + datum.labelRect.y1) / 2 : (datum.y0 + datum.y1) / 2,\n              text: textGetter(datum.datum[datum.datum.length - 1])\n            };\n          }\n        }\n      };\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/treemap.ts"],"names":[],"mappings":"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","file":"treemap.js","sourcesContent":["import type {\n  TreemapEncodeChannels,\n  WithDefaultEncode,\n  PlotTreemapEncodeSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  LabelSpec\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory, SIGNAL_VIEW_BOX } from '@visactor/vgrammar-core';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { BaseLabelAttrs } from '@visactor/vrender-components';\n\nexport class TreemapSemanticMark extends SemanticMark<PlotTreemapEncodeSpec, TreemapEncodeChannels> {\n  static readonly type = PlotMakType.treemap;\n  constructor(id?: string | number) {\n    super(PlotMakType.treemap, id);\n\n    if (!Factory.getTransform('treemap')) {\n      this._logger.error(\n        `Please add this line of code: import { registerTreemapTransforms } from 'vgrammar-hierarchy'; \n        and run registerTreemapTransforms() before use treemap`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.rect;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'treemap',\n        width: { signal: 'viewWidth' },\n        height: { signal: 'viewHeight' },\n        nodeKey: this.spec.encode?.node,\n        flatten: true\n      }\n    ];\n  }\n  parseScaleByEncode(\n    channel: TreemapEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotTreemapEncodeSpec, TreemapEncodeChannels>, TreemapEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotTreemapEncodeSpec, TreemapEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotTreemapEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotTreemapEncodeSpec> = {\n      x: { field: 'x0' },\n      x1: { field: 'x1' },\n      y: { field: 'y0' },\n      y1: { field: 'y1' }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  setMainMarkSpec() {\n    return { key: 'key' };\n  }\n\n  protected parseLabelSpec(): LabelSpec[] {\n    // TODO use arc label in the future\n    return [];\n  }\n\n  setMultiMarksSpec() {\n    const label = this.spec.label;\n\n    if (!label) {\n      return null;\n    }\n\n    return Object.keys(label).map(key => {\n      const textGetter = getFieldAccessor(key);\n      return {\n        id: `${this.getMarkId()}-text-${key}`,\n        type: 'text',\n        from: {\n          data: this.getDataIdOfFiltered()\n        },\n        layout: {\n          position: 'content',\n          skipBeforeLayouted: true\n        },\n        key: 'flattenIndex',\n        dependency: this.viewSpec.scales.map(scale => scale.id).concat(SIGNAL_VIEW_BOX),\n        animation: this.convertMarkAnimation(),\n        encode: {\n          enter: Object.assign(\n            {\n              textAlign: 'center',\n              textBaseline: 'middle'\n            },\n            (label[key] as Partial<BaseLabelAttrs>).textStyle\n          ),\n          update: (datum: any, el: IElement, params: any) => {\n            return {\n              x: datum.labelRect ? (datum.labelRect.x0 + datum.labelRect.x1) / 2 : (datum.x0 + datum.x1) / 2,\n              y: datum.labelRect ? (datum.labelRect.y0 + datum.labelRect.y1) / 2 : (datum.y0 + datum.y1) / 2,\n              text: textGetter(datum.datum[datum.datum.length - 1])\n            };\n          }\n        }\n      };\n    });\n  }\n}\n"]}

package/cjs/wordcloud-shape.d.ts

@@ -1,6 +1,6 @@
-import type { WordcloudShapeEncodeChannels, WithDefaultEncode, PlotWordcloudShapeEncodeSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, LabelSpec } from '@visactor/vgrammar';
+import type { WordcloudShapeEncodeChannels, WithDefaultEncode, PlotWordcloudShapeEncodeSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, LabelSpec } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class WordcloudShapeSemanticMark extends SemanticMark<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels> {
     static readonly type = PlotMakType.wordcloudShape;

package/cjs/wordcloud-shape.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.WordcloudShapeSemanticMark = void 0;
 
-const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visactor/vgrammar"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util"), vutils_1 = require("@visactor/vutils");
+const semantic_mark_1 = require("./semantic-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util"), vutils_1 = require("@visactor/vutils");
 
 class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
     constructor(id) {
-        super(enums_1.PlotMakType.wordcloudShape, id), (0, vgrammar_1.getTransform)(enums_1.PlotMakType.wordcloudShape) || this._logger.error("Please add this line of code:\n          import { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape'; \n        and run registerWordCloudShapeTransforms() before use wordcloud-shape");
+        super(enums_1.PlotMakType.wordcloudShape, id), vgrammar_core_1.Factory.getTransform(enums_1.PlotMakType.wordcloudShape) || this._logger.error("Please add this line of code:\n          import { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape'; \n        and run registerWordCloudShapeTransforms() before use wordcloud-shape");
     }
     setMarkType() {
-        return vgrammar_1.GrammarMarkType.text;
+        return vgrammar_core_1.GrammarMarkType.text;
     }
     setDefaultDataTransform() {
         var _a;

package/cjs/wordcloud-shape.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/wordcloud-shape.ts"],"names":[],"mappings":"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","file":"wordcloud-shape.js","sourcesContent":["import type {\n  WordcloudShapeEncodeChannels,\n  WithDefaultEncode,\n  PlotWordcloudShapeEncodeSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  LabelSpec\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, getTransform } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport { merge } from '@visactor/vutils';\n\nexport class WordcloudShapeSemanticMark extends SemanticMark<\n  PlotWordcloudShapeEncodeSpec,\n  WordcloudShapeEncodeChannels\n> {\n  static readonly type = PlotMakType.wordcloudShape;\n  constructor(id?: string | number) {\n    super(PlotMakType.wordcloudShape, id);\n\n    if (!getTransform(PlotMakType.wordcloudShape)) {\n      this._logger.error(\n        `Please add this line of code:\n          import { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape'; \n        and run registerWordCloudShapeTransforms() before use wordcloud-shape`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.text;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'wordcloudShape',\n        size: {\n          callback: (params: any) => {\n            return [params.viewBox.width(), params.viewBox.height()];\n          },\n          dependency: ['viewBox']\n        },\n        colorList: this.getPalette(),\n        text: { field: this.spec.encode?.text }\n      }\n    ];\n  }\n\n  protected setMainMarkEnterEncode() {\n    return merge(\n      {\n        textAlign: 'center',\n        textBaseline: 'middle'\n      },\n      this.spec.style\n    );\n  }\n\n  parseScaleByEncode(\n    channel: WordcloudShapeEncodeChannels,\n    option: ValueOf<\n      WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>,\n      WordcloudShapeEncodeChannels\n    >\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotWordcloudShapeEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotWordcloudShapeEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' },\n      angle: { field: 'angle' },\n      fontSize: { field: 'fontSize' },\n      fontStyle: { field: 'fontStyle' },\n      fontFamily: { field: 'fontFamily' },\n      fontWeight: { field: 'fontWeight' },\n      fillOpacity: { field: 'opacity' },\n      text: { field: this.spec.encode?.text }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return scale.scale(colorAccessor(datum));\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  protected parseLabelSpec(): LabelSpec[] {\n    return [];\n  }\n}\n"]}
+{"version":3,"sources":["../src/wordcloud-shape.ts"],"names":[],"mappings":"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","file":"wordcloud-shape.js","sourcesContent":["import type {\n  WordcloudShapeEncodeChannels,\n  WithDefaultEncode,\n  PlotWordcloudShapeEncodeSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  LabelSpec\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory } from '@visactor/vgrammar-core';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport { merge } from '@visactor/vutils';\n\nexport class WordcloudShapeSemanticMark extends SemanticMark<\n  PlotWordcloudShapeEncodeSpec,\n  WordcloudShapeEncodeChannels\n> {\n  static readonly type = PlotMakType.wordcloudShape;\n  constructor(id?: string | number) {\n    super(PlotMakType.wordcloudShape, id);\n\n    if (!Factory.getTransform(PlotMakType.wordcloudShape)) {\n      this._logger.error(\n        `Please add this line of code:\n          import { registerWordCloudShapeTransforms } from '@visactor/vgrammar-wordcloud-shape'; \n        and run registerWordCloudShapeTransforms() before use wordcloud-shape`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.text;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'wordcloudShape',\n        size: {\n          callback: (params: any) => {\n            return [params.viewBox.width(), params.viewBox.height()];\n          },\n          dependency: ['viewBox']\n        },\n        colorList: this.getPalette(),\n        text: { field: this.spec.encode?.text }\n      }\n    ];\n  }\n\n  protected setMainMarkEnterEncode() {\n    return merge(\n      {\n        textAlign: 'center',\n        textBaseline: 'middle'\n      },\n      this.spec.style\n    );\n  }\n\n  parseScaleByEncode(\n    channel: WordcloudShapeEncodeChannels,\n    option: ValueOf<\n      WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>,\n      WordcloudShapeEncodeChannels\n    >\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotWordcloudShapeEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotWordcloudShapeEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' },\n      angle: { field: 'angle' },\n      fontSize: { field: 'fontSize' },\n      fontStyle: { field: 'fontStyle' },\n      fontFamily: { field: 'fontFamily' },\n      fontWeight: { field: 'fontWeight' },\n      fillOpacity: { field: 'opacity' },\n      text: { field: this.spec.encode?.text }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return scale.scale(colorAccessor(datum));\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  protected parseLabelSpec(): LabelSpec[] {\n    return [];\n  }\n}\n"]}

package/cjs/wordcloud.d.ts

@@ -1,6 +1,6 @@
-import type { WordcloudEncodeChannels, WithDefaultEncode, PlotWordcloudEncodeSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, LabelSpec } from '@visactor/vgrammar';
+import type { WordcloudEncodeChannels, WithDefaultEncode, PlotWordcloudEncodeSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, LabelSpec } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class WordcloudSemanticMark extends SemanticMark<PlotWordcloudEncodeSpec, WordcloudEncodeChannels> {
     static readonly type = PlotMakType.wordcloud;

package/cjs/wordcloud.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.WordcloudSemanticMark = void 0;
 
-const semantic_mark_1 = require("./semantic-mark"), vgrammar_1 = require("@visactor/vgrammar"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util");
+const semantic_mark_1 = require("./semantic-mark"), vgrammar_core_1 = require("@visactor/vgrammar-core"), enums_1 = require("./enums"), vgrammar_util_1 = require("@visactor/vgrammar-util");
 
 class WordcloudSemanticMark extends semantic_mark_1.SemanticMark {
     constructor(id) {
-        super(enums_1.PlotMakType.wordcloud, id), (0, vgrammar_1.getTransform)(enums_1.PlotMakType.wordcloud) || this._logger.error("Please add this line of code:\n         'import { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud'; \n        and run registerWordCloudTransforms() before use wordcloud");
+        super(enums_1.PlotMakType.wordcloud, id), vgrammar_core_1.Factory.getTransform(enums_1.PlotMakType.wordcloud) || this._logger.error("Please add this line of code:\n         'import { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud'; \n        and run registerWordCloudTransforms() before use wordcloud");
     }
     setMarkType() {
-        return vgrammar_1.GrammarMarkType.text;
+        return vgrammar_core_1.GrammarMarkType.text;
     }
     setDefaultMarkTransform() {
         var _a;

package/cjs/wordcloud.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/wordcloud.ts"],"names":[],"mappings":"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","file":"wordcloud.js","sourcesContent":["import type {\n  WordcloudEncodeChannels,\n  WithDefaultEncode,\n  PlotWordcloudEncodeSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  LabelSpec\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, getTransform } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\n\nexport class WordcloudSemanticMark extends SemanticMark<PlotWordcloudEncodeSpec, WordcloudEncodeChannels> {\n  static readonly type = PlotMakType.wordcloud;\n  constructor(id?: string | number) {\n    super(PlotMakType.wordcloud, id);\n\n    if (!getTransform(PlotMakType.wordcloud)) {\n      this._logger.error(\n        `Please add this line of code:\n         'import { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud'; \n        and run registerWordCloudTransforms() before use wordcloud`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.text;\n  }\n\n  setDefaultMarkTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'wordcloud',\n        size: {\n          callback: (params: any) => {\n            return [params.viewBox.width(), params.viewBox.height()];\n          },\n          dependency: ['viewBox']\n        },\n        text: { field: this.spec.encode?.text }\n      }\n    ];\n  }\n  parseScaleByEncode(\n    channel: WordcloudEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotWordcloudEncodeSpec, WordcloudEncodeChannels>, WordcloudEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotWordcloudEncodeSpec, WordcloudEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotWordcloudEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotWordcloudEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' },\n      angle: { field: 'angle' },\n      fontSize: { field: 'fontSize' },\n      fontStyle: { field: 'fontStyle' },\n      fontFamily: { field: 'fontFamily' },\n      fontWeight: { field: 'fontWeight' },\n      text: { field: this.spec.encode?.text }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return scale.scale(colorAccessor(datum));\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  protected parseLabelSpec(): LabelSpec[] {\n    return [];\n  }\n}\n"]}
+{"version":3,"sources":["../src/wordcloud.ts"],"names":[],"mappings":"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","file":"wordcloud.js","sourcesContent":["import type {\n  WordcloudEncodeChannels,\n  WithDefaultEncode,\n  PlotWordcloudEncodeSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  LabelSpec\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory } from '@visactor/vgrammar-core';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\n\nexport class WordcloudSemanticMark extends SemanticMark<PlotWordcloudEncodeSpec, WordcloudEncodeChannels> {\n  static readonly type = PlotMakType.wordcloud;\n  constructor(id?: string | number) {\n    super(PlotMakType.wordcloud, id);\n\n    if (!Factory.getTransform(PlotMakType.wordcloud)) {\n      this._logger.error(\n        `Please add this line of code:\n         'import { registerWordCloudTransforms } from '@visactor/vgrammar-wordcloud'; \n        and run registerWordCloudTransforms() before use wordcloud`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.text;\n  }\n\n  setDefaultMarkTransform(): TransformSpec[] {\n    return [\n      {\n        type: 'wordcloud',\n        size: {\n          callback: (params: any) => {\n            return [params.viewBox.width(), params.viewBox.height()];\n          },\n          dependency: ['viewBox']\n        },\n        text: { field: this.spec.encode?.text }\n      }\n    ];\n  }\n  parseScaleByEncode(\n    channel: WordcloudEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotWordcloudEncodeSpec, WordcloudEncodeChannels>, WordcloudEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotWordcloudEncodeSpec, WordcloudEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotWordcloudEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotWordcloudEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' },\n      angle: { field: 'angle' },\n      fontSize: { field: 'fontSize' },\n      fontStyle: { field: 'fontStyle' },\n      fontFamily: { field: 'fontFamily' },\n      fontWeight: { field: 'fontWeight' },\n      text: { field: this.spec.encode?.text }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return scale.scale(colorAccessor(datum));\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  protected parseLabelSpec(): LabelSpec[] {\n    return [];\n  }\n}\n"]}

package/es/area.d.ts

@@ -1,6 +1,6 @@
-import type { AreaEncodeChannels, SemanticTooltipOption, WithDefaultEncode, PlotAreaEncoderSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, CrosshairSpec } from '@visactor/vgrammar';
+import type { AreaEncodeChannels, SemanticTooltipOption, WithDefaultEncode, PlotAreaEncoderSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, CrosshairSpec } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class Area extends SemanticMark<PlotAreaEncoderSpec, AreaEncodeChannels> {
     static readonly type = PlotMakType.area;

package/es/area.js

@@ -1,6 +1,6 @@
 import { SemanticMark } from "./semantic-mark";
 
-import { GrammarMarkType } from "@visactor/vgrammar";
+import { GrammarMarkType } from "@visactor/vgrammar-core";
 
 import { isArray } from "@visactor/vutils";
 

package/es/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type {\n  AreaEncodeChannels,\n  SemanticTooltipOption,\n  WithDefaultEncode,\n  PlotAreaEncoderSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  IElement,\n  CrosshairSpec\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar';\nimport { isArray } from '@visactor/vutils';\nimport { PlotMakType } from './enums';\n\nexport class Area extends SemanticMark<PlotAreaEncoderSpec, AreaEncodeChannels> {\n  static readonly type = PlotMakType.area;\n  constructor(id?: string | number) {\n    super(PlotMakType.area, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.area;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<PlotAreaEncoderSpec, AreaEncodeChannels>, AreaEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: AreaEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotAreaEncoderSpec, AreaEncodeChannels>, AreaEncodeChannels>\n  ): ScaleSpec | Nil {\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  setDefaultCrosshair(): Record<string, Pick<CrosshairSpec, 'crosshairShape' | 'crosshairType'>> {\n    return {\n      x: { crosshairShape: 'line' }\n    };\n  }\n\n  setDefaultTooltip(): SemanticTooltipOption | Nil {\n    const encodeX = this.spec.encode?.x;\n    const encodeY = this.spec.encode?.y;\n    return {\n      disableGraphicTooltip: true,\n      title: isArray(encodeX) ? encodeX[0] : encodeX,\n      content: isArray(encodeY)\n        ? encodeY.map(entry => {\n            return {\n              value: entry\n            };\n          })\n        : [\n            {\n              value: encodeY\n            }\n          ]\n    };\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotAreaEncoderSpec, AreaEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotAreaEncoderSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    let res: GenerateEncoderSpec<PlotAreaEncoderSpec>;\n\n    if (isArray(markEncoder.x?.field)) {\n      res = {\n        y: markEncoder.y,\n        x: { field: markEncoder.x.field[0], scale: markEncoder.x.scale },\n        x1: { field: markEncoder.x.field[1], scale: markEncoder.x.scale }\n      } as GenerateEncoderSpec<PlotAreaEncoderSpec>;\n    } else if (isArray(markEncoder.y?.field)) {\n      res = {\n        y: { field: markEncoder.y.field[0], scale: markEncoder.y.scale },\n        y1: { field: markEncoder.y.field[1], scale: markEncoder.y.scale },\n        x: markEncoder.x\n      } as GenerateEncoderSpec<PlotAreaEncoderSpec>;\n    } else {\n      const scaleYId = this.getScaleId('y');\n      res = {\n        x: markEncoder.x,\n        y: markEncoder.y,\n        y1: (datum: any, el: IElement, params: any) => {\n          const scale = params[scaleYId];\n          const domain = scale.domain();\n          const min = Math.min.apply(null, domain);\n          const max = Math.max.apply(null, domain);\n          const baseValue = min > 0 ? min : max < 0 ? max : 0;\n\n          return scale.scale(baseValue);\n        }\n      } as GenerateEncoderSpec<PlotAreaEncoderSpec>;\n    }\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}
+{"version":3,"sources":["../src/area.ts"],"names":[],"mappings":"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","file":"area.js","sourcesContent":["import type {\n  AreaEncodeChannels,\n  SemanticTooltipOption,\n  WithDefaultEncode,\n  PlotAreaEncoderSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  IElement,\n  CrosshairSpec\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport { isArray } from '@visactor/vutils';\nimport { PlotMakType } from './enums';\n\nexport class Area extends SemanticMark<PlotAreaEncoderSpec, AreaEncodeChannels> {\n  static readonly type = PlotMakType.area;\n  constructor(id?: string | number) {\n    super(PlotMakType.area, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.area;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<PlotAreaEncoderSpec, AreaEncodeChannels>, AreaEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: AreaEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotAreaEncoderSpec, AreaEncodeChannels>, AreaEncodeChannels>\n  ): ScaleSpec | Nil {\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  setDefaultCrosshair(): Record<string, Pick<CrosshairSpec, 'crosshairShape' | 'crosshairType'>> {\n    return {\n      x: { crosshairShape: 'line' }\n    };\n  }\n\n  setDefaultTooltip(): SemanticTooltipOption | Nil {\n    const encodeX = this.spec.encode?.x;\n    const encodeY = this.spec.encode?.y;\n    return {\n      disableGraphicTooltip: true,\n      title: isArray(encodeX) ? encodeX[0] : encodeX,\n      content: isArray(encodeY)\n        ? encodeY.map(entry => {\n            return {\n              value: entry\n            };\n          })\n        : [\n            {\n              value: encodeY\n            }\n          ]\n    };\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotAreaEncoderSpec, AreaEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotAreaEncoderSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    let res: GenerateEncoderSpec<PlotAreaEncoderSpec>;\n\n    if (isArray(markEncoder.x?.field)) {\n      res = {\n        y: markEncoder.y,\n        x: { field: markEncoder.x.field[0], scale: markEncoder.x.scale },\n        x1: { field: markEncoder.x.field[1], scale: markEncoder.x.scale }\n      } as GenerateEncoderSpec<PlotAreaEncoderSpec>;\n    } else if (isArray(markEncoder.y?.field)) {\n      res = {\n        y: { field: markEncoder.y.field[0], scale: markEncoder.y.scale },\n        y1: { field: markEncoder.y.field[1], scale: markEncoder.y.scale },\n        x: markEncoder.x\n      } as GenerateEncoderSpec<PlotAreaEncoderSpec>;\n    } else {\n      const scaleYId = this.getScaleId('y');\n      res = {\n        x: markEncoder.x,\n        y: markEncoder.y,\n        y1: (datum: any, el: IElement, params: any) => {\n          const scale = params[scaleYId];\n          const domain = scale.domain();\n          const min = Math.min.apply(null, domain);\n          const max = Math.max.apply(null, domain);\n          const baseValue = min > 0 ? min : max < 0 ? max : 0;\n\n          return scale.scale(baseValue);\n        }\n      } as GenerateEncoderSpec<PlotAreaEncoderSpec>;\n    }\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}

package/es/cell.d.ts

@@ -1,6 +1,6 @@
-import type { BasicEncoderSpecMap, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, CrosshairSpec, CellEncodeChannels, SemanticTooltipOption, WithDefaultEncode } from '@visactor/vgrammar';
+import type { BasicEncoderSpecMap, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, CrosshairSpec, CellEncodeChannels, SemanticTooltipOption, WithDefaultEncode } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class Cell extends SemanticMark<BasicEncoderSpecMap['cell'], CellEncodeChannels> {
     static readonly type = PlotMakType.cell;

package/es/cell.js

@@ -1,6 +1,6 @@
 import { SemanticMark } from "./semantic-mark";
 
-import { GrammarMarkType } from "@visactor/vgrammar";
+import { GrammarMarkType } from "@visactor/vgrammar-core";
 
 import { PlotMakType } from "./enums";
 

package/es/cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/cell.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,OAAO,IAAK,SAAQ,YAA6D;IAErF,YAAY,EAAoB;QAC9B,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAES,mBAAmB,CAC3B,MAAuG;QAEvG,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,kBAAkB,CAChB,OAA2B,EAC3B,MAAuG;QAEvG,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,mBAAmB;QACjB,OAAO;YACL,CAAC,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,iBAAiB;;QACf,OAAO;YACL,KAAK,EAAE,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,CAAC;YAC1B,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,CAAC;iBAC3B;aACF;SACF,CAAC;IACJ,CAAC;IAED,iBAAiB,CACf,MAA0E;;QAE1E,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAG;YACV,CAAC,EAAE,WAAW,CAAC,CAAC;YAChB,CAAC,EAAE,WAAW,CAAC,CAAC;SACmC,CAAC;QAEtD,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;YAC1C,GAAG,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,KAAK,mCAAI,WAAW,CAAC,KAAK,CAAC;SACnD;aAAM;YACL,GAAG,CAAC,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,mCAAI,MAAA,IAAI,CAAC,UAAU,EAAE,0CAAG,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;;AA/De,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC","file":"cell.js","sourcesContent":["import type {\n  BasicEncoderSpecMap,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  CrosshairSpec,\n  CellEncodeChannels,\n  SemanticTooltipOption,\n  WithDefaultEncode\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\n\nexport class Cell extends SemanticMark<BasicEncoderSpecMap['cell'], CellEncodeChannels> {\n  static readonly type = PlotMakType.cell;\n  constructor(id?: string | number) {\n    super(PlotMakType.cell, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.cell;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['cell'], CellEncodeChannels>, CellEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: CellEncodeChannels,\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['cell'], CellEncodeChannels>, CellEncodeChannels>\n  ): ScaleSpec | Nil {\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  setDefaultCrosshair(): Record<string, Pick<CrosshairSpec, 'crosshairShape' | 'crosshairType'>> {\n    return {\n      x: { crosshairShape: 'line' }\n    };\n  }\n\n  setDefaultTooltip(): SemanticTooltipOption | Nil {\n    return {\n      title: this.spec.encode?.x,\n      content: [\n        {\n          value: this.spec.encode?.y\n        }\n      ]\n    };\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<BasicEncoderSpecMap['cell'], CellEncodeChannels>\n  ): GenerateBaseEncodeSpec<BasicEncoderSpecMap['cell']> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res = {\n      y: markEncoder.y,\n      x: markEncoder.x\n    } as GenerateEncoderSpec<BasicEncoderSpecMap['cell']>;\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}
+{"version":3,"sources":["../src/cell.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,OAAO,IAAK,SAAQ,YAA6D;IAErF,YAAY,EAAoB;QAC9B,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW;QACT,OAAO,eAAe,CAAC,IAAI,CAAC;IAC9B,CAAC;IAES,mBAAmB,CAC3B,MAAuG;QAEvG,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,kBAAkB,CAChB,OAA2B,EAC3B,MAAuG;QAEvG,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,mBAAmB;QACjB,OAAO;YACL,CAAC,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE;SAC9B,CAAC;IACJ,CAAC;IAED,iBAAiB;;QACf,OAAO;YACL,KAAK,EAAE,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,CAAC;YAC1B,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,CAAC;iBAC3B;aACF;SACF,CAAC;IACJ,CAAC;IAED,iBAAiB,CACf,MAA0E;;QAE1E,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAG;YACV,CAAC,EAAE,WAAW,CAAC,CAAC;YAChB,CAAC,EAAE,WAAW,CAAC,CAAC;SACmC,CAAC;QAEtD,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;YAC1C,GAAG,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,KAAK,mCAAI,WAAW,CAAC,KAAK,CAAC;SACnD;aAAM;YACL,GAAG,CAAC,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,mCAAI,MAAA,IAAI,CAAC,UAAU,EAAE,0CAAG,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;;AA/De,SAAI,GAAG,WAAW,CAAC,IAAI,CAAC","file":"cell.js","sourcesContent":["import type {\n  BasicEncoderSpecMap,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  CrosshairSpec,\n  CellEncodeChannels,\n  SemanticTooltipOption,\n  WithDefaultEncode\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport { PlotMakType } from './enums';\n\nexport class Cell extends SemanticMark<BasicEncoderSpecMap['cell'], CellEncodeChannels> {\n  static readonly type = PlotMakType.cell;\n  constructor(id?: string | number) {\n    super(PlotMakType.cell, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.cell;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['cell'], CellEncodeChannels>, CellEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: CellEncodeChannels,\n    option: ValueOf<WithDefaultEncode<BasicEncoderSpecMap['cell'], CellEncodeChannels>, CellEncodeChannels>\n  ): ScaleSpec | Nil {\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  setDefaultCrosshair(): Record<string, Pick<CrosshairSpec, 'crosshairShape' | 'crosshairType'>> {\n    return {\n      x: { crosshairShape: 'line' }\n    };\n  }\n\n  setDefaultTooltip(): SemanticTooltipOption | Nil {\n    return {\n      title: this.spec.encode?.x,\n      content: [\n        {\n          value: this.spec.encode?.y\n        }\n      ]\n    };\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<BasicEncoderSpecMap['cell'], CellEncodeChannels>\n  ): GenerateBaseEncodeSpec<BasicEncoderSpecMap['cell']> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res = {\n      y: markEncoder.y,\n      x: markEncoder.x\n    } as GenerateEncoderSpec<BasicEncoderSpecMap['cell']>;\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}

package/es/circle-packing.d.ts

@@ -1,6 +1,6 @@
-import type { GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, ChannelEncodeType, CirclepackingEncodeChannels, WithDefaultEncode, PlotCirclePackingEncodeSpec, SemanticLabelOption } from '@visactor/vgrammar';
+import type { GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, TransformSpec, ChannelEncodeType, CirclepackingEncodeChannels, WithDefaultEncode, PlotCirclePackingEncodeSpec, SemanticLabelOption } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 import type { ITextAttribute } from '@visactor/vrender';
 export declare class CirclePackingSemanticMark extends SemanticMark<PlotCirclePackingEncodeSpec, CirclepackingEncodeChannels> {

package/es/circle-packing.js

@@ -1,6 +1,6 @@
 import { SemanticMark } from "./semantic-mark";
 
-import { GrammarMarkType, getTransform } from "@visactor/vgrammar";
+import { GrammarMarkType, Factory } from "@visactor/vgrammar-core";
 
 import { PlotMakType } from "./enums";
 
@@ -8,7 +8,7 @@ import { field as getFieldAccessor } from "@visactor/vgrammar-util";
 
 export class CirclePackingSemanticMark extends SemanticMark {
     constructor(id) {
-        super(PlotMakType.circlePacking, id), getTransform(PlotMakType.circlePacking) || this._logger.error("Please add this line of code: import { registerCirclePackingTransforms } from '@visactor/vgrammar-hierarchy'; \n        and run registerCirclePackingTransforms() before use treemap chart");
+        super(PlotMakType.circlePacking, id), Factory.getTransform(PlotMakType.circlePacking) || this._logger.error("Please add this line of code: import { registerCirclePackingTransforms } from '@visactor/vgrammar-hierarchy'; \n        and run registerCirclePackingTransforms() before use treemap chart");
     }
     setMarkType() {
         return GrammarMarkType.circle;

package/es/circle-packing.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/circle-packing.ts"],"names":[],"mappings":"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","file":"circle-packing.js","sourcesContent":["import type {\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  ChannelEncodeType,\n  CirclepackingEncodeChannels,\n  WithDefaultEncode,\n  PlotCirclePackingEncodeSpec,\n  SemanticLabelOption\n} from '@visactor/vgrammar';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, getTransform } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { ITextAttribute } from '@visactor/vrender';\n\nexport class CirclePackingSemanticMark extends SemanticMark<PlotCirclePackingEncodeSpec, CirclepackingEncodeChannels> {\n  static readonly type = PlotMakType.circlePacking;\n  constructor(id?: string | number) {\n    super(PlotMakType.circlePacking, id);\n\n    if (!getTransform(PlotMakType.circlePacking)) {\n      this._logger.error(\n        `Please add this line of code: import { registerCirclePackingTransforms } from '@visactor/vgrammar-hierarchy'; \n        and run registerCirclePackingTransforms() before use treemap chart`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.circle;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: PlotMakType.circlePacking,\n        width: { signal: 'viewWidth' },\n        height: { signal: 'viewHeight' },\n        nodeKey: this.spec.encode?.node,\n        flatten: true\n      }\n    ];\n  }\n  parseScaleByEncode(\n    channel: CirclepackingEncodeChannels,\n    option: ValueOf<\n      WithDefaultEncode<PlotCirclePackingEncodeSpec, CirclepackingEncodeChannels>,\n      CirclepackingEncodeChannels\n    >\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotCirclePackingEncodeSpec, CirclepackingEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotCirclePackingEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotCirclePackingEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' },\n      radius: { field: 'radius' }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  setMainMarkSpec() {\n    return { key: 'key' };\n  }\n\n  protected setLabelTextGetter(\n    channel: string,\n    option: SemanticLabelOption | boolean\n  ): ChannelEncodeType<ITextAttribute['text']> {\n    const textGetter = getFieldAccessor(channel);\n    return (datum: any, el: IElement, params: any) => {\n      return textGetter(datum.datum[datum.datum.length - 1]);\n    };\n  }\n}\n"]}
+{"version":3,"sources":["../src/circle-packing.ts"],"names":[],"mappings":"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","file":"circle-packing.js","sourcesContent":["import type {\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  Nil,\n  ScaleSpec,\n  ValueOf,\n  TransformSpec,\n  IElement,\n  ChannelEncodeType,\n  CirclepackingEncodeChannels,\n  WithDefaultEncode,\n  PlotCirclePackingEncodeSpec,\n  SemanticLabelOption\n} from '@visactor/vgrammar-core';\nimport { SemanticMark } from './semantic-mark';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType, Factory } from '@visactor/vgrammar-core';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport type { ITextAttribute } from '@visactor/vrender';\n\nexport class CirclePackingSemanticMark extends SemanticMark<PlotCirclePackingEncodeSpec, CirclepackingEncodeChannels> {\n  static readonly type = PlotMakType.circlePacking;\n  constructor(id?: string | number) {\n    super(PlotMakType.circlePacking, id);\n\n    if (!Factory.getTransform(PlotMakType.circlePacking)) {\n      this._logger.error(\n        `Please add this line of code: import { registerCirclePackingTransforms } from '@visactor/vgrammar-hierarchy'; \n        and run registerCirclePackingTransforms() before use treemap chart`\n      );\n    }\n  }\n\n  setMarkType() {\n    return GrammarMarkType.circle;\n  }\n\n  setDefaultDataTransform(): TransformSpec[] {\n    return [\n      {\n        type: PlotMakType.circlePacking,\n        width: { signal: 'viewWidth' },\n        height: { signal: 'viewHeight' },\n        nodeKey: this.spec.encode?.node,\n        flatten: true\n      }\n    ];\n  }\n  parseScaleByEncode(\n    channel: CirclepackingEncodeChannels,\n    option: ValueOf<\n      WithDefaultEncode<PlotCirclePackingEncodeSpec, CirclepackingEncodeChannels>,\n      CirclepackingEncodeChannels\n    >\n  ): ScaleSpec | Nil {\n    if (channel === 'color') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('color'),\n        domain: {\n          data: this.getDataIdOfFiltered(),\n          field: option as string\n        },\n        range: this.getPalette()\n      };\n    }\n\n    return null;\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotCirclePackingEncodeSpec, CirclepackingEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotCirclePackingEncodeSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n\n    const res: GenerateEncoderSpec<PlotCirclePackingEncodeSpec> = {\n      x: { field: 'x' },\n      y: { field: 'y' },\n      radius: { field: 'radius' }\n    };\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color) {\n      const scaleColorId = this.getScaleId('color');\n      const colorAccessor = getFieldAccessor(markEncoder.color.field);\n\n      res.fill = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleColorId];\n        return datum?.datum ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : undefined;\n      };\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n\n  setMainMarkSpec() {\n    return { key: 'key' };\n  }\n\n  protected setLabelTextGetter(\n    channel: string,\n    option: SemanticLabelOption | boolean\n  ): ChannelEncodeType<ITextAttribute['text']> {\n    const textGetter = getFieldAccessor(channel);\n    return (datum: any, el: IElement, params: any) => {\n      return textGetter(datum.datum[datum.datum.length - 1]);\n    };\n  }\n}\n"]}

package/es/image.d.ts

@@ -1,6 +1,6 @@
 import { SemanticMark } from './semantic-mark';
-import type { ImageEncodeChannels, WithDefaultEncode, PlotImageEncoderSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf } from '@visactor/vgrammar';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import type { ImageEncodeChannels, WithDefaultEncode, PlotImageEncoderSpec, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf } from '@visactor/vgrammar-core';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class ImageSemanticMark extends SemanticMark<PlotImageEncoderSpec, ImageEncodeChannels> {
     static readonly type = PlotMakType.image;

package/es/image.js

@@ -1,6 +1,6 @@
 import { SemanticMark } from "./semantic-mark";
 
-import { GrammarMarkType } from "@visactor/vgrammar";
+import { GrammarMarkType } from "@visactor/vgrammar-core";
 
 import { isArray } from "@visactor/vutils";
 

package/es/image.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/image.ts"],"names":[],"mappings":"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","file":"image.js","sourcesContent":["import { SemanticMark } from './semantic-mark';\nimport type {\n  ImageEncodeChannels,\n  WithDefaultEncode,\n  PlotImageEncoderSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  IElement,\n  Nil,\n  ScaleSpec,\n  ValueOf\n} from '@visactor/vgrammar';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar';\nimport { isArray } from '@visactor/vutils';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport { PlotMakType } from './enums';\n\nexport class ImageSemanticMark extends SemanticMark<PlotImageEncoderSpec, ImageEncodeChannels> {\n  static readonly type = PlotMakType.image;\n  static defaultSpec: PlotImageEncoderSpec = { width: 10, height: 10 };\n  constructor(id?: string | number) {\n    super(PlotMakType.image, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.image;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<PlotImageEncoderSpec, ImageEncodeChannels>, ImageEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: ImageEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotImageEncoderSpec, ImageEncodeChannels>, ImageEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'src') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('src'),\n        domain: {\n          data: this.getDataIdOfMain(),\n          field: option as string\n        }\n      };\n    }\n\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotImageEncoderSpec, ImageEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotImageEncoderSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n    const scaleXId = this.getScaleId('x');\n    const scaleYId = this.getScaleId('y');\n    const res: GenerateEncoderSpec<PlotImageEncoderSpec> = {\n      image: markEncoder.src\n    };\n\n    if (markEncoder.src) {\n      res.image = markEncoder.src;\n    }\n\n    if (isArray(markEncoder.x?.field)) {\n      const xAccessor = getFieldAccessor(markEncoder.x.field[0]);\n      const x1Accessor = getFieldAccessor(markEncoder.x.field[1]);\n      res.x = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return Math.min(scale.scale(xAccessor(datum)), scale.scale(x1Accessor(datum)));\n      };\n      res.width = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return Math.abs(scale.scale(xAccessor(datum)) - scale.scale(x1Accessor(datum)));\n      };\n    } else {\n      const width = this.spec.style?.width ?? ImageSemanticMark.defaultSpec.width;\n      const xAccessor = getFieldAccessor(markEncoder.x.field);\n\n      res.x = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return scale.scale(xAccessor(datum)) - width / 2;\n      };\n      res.width = width;\n    }\n\n    if (isArray(markEncoder.y?.field)) {\n      const yAccessor = getFieldAccessor(markEncoder.y.field[0]);\n      const y1Accessor = getFieldAccessor(markEncoder.y.field[1]);\n      res.y = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleYId];\n\n        return Math.min(scale.scale(yAccessor(datum)), scale.scale(y1Accessor(datum)));\n      };\n      res.height = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleYId];\n\n        return Math.abs(scale.scale(yAccessor(datum)) - scale.scale(y1Accessor(datum)));\n      };\n    } else {\n      const height = this.spec.style?.height ?? ImageSemanticMark.defaultSpec.height;\n      const yAccessor = getFieldAccessor(markEncoder.y.field);\n\n      res.y = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return scale.scale(yAccessor(datum)) - height / 2;\n      };\n      res.height = height;\n    }\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}
+{"version":3,"sources":["../src/image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAa/C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,IAAI,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,OAAO,iBAAkB,SAAQ,YAAuD;IAG5F,YAAY,EAAoB;QAC9B,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,WAAW;QACT,OAAO,eAAe,CAAC,KAAK,CAAC;IAC/B,CAAC;IAES,mBAAmB,CAC3B,MAAkG;QAElG,MAAM,GAAG,GAAG,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAE9C,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,kBAAkB,CAChB,OAA4B,EAC5B,MAAkG;QAElG,IAAI,OAAO,KAAK,KAAK,EAAE;YACrB,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;gBAC1B,MAAM,EAAE;oBACN,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE;oBAC5B,KAAK,EAAE,MAAgB;iBACxB;aACF,CAAC;SACH;QAED,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,iBAAiB,CACf,MAAoE;;QAEpE,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,GAAG,GAA8C;YACrD,KAAK,EAAE,WAAW,CAAC,GAAG;SACvB,CAAC;QAEF,IAAI,WAAW,CAAC,GAAG,EAAE;YACnB,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC;SAC7B;QAED,IAAI,OAAO,CAAC,MAAA,WAAW,CAAC,CAAC,0CAAE,KAAK,CAAC,EAAE;YACjC,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,UAAU,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,GAAG,CAAC,CAAC,GAAG,CAAC,KAAU,EAAE,EAAY,EAAE,MAAW,EAAE,EAAE;gBAChD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE/B,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjF,CAAC,CAAC;YACF,GAAG,CAAC,KAAK,GAAG,CAAC,KAAU,EAAE,EAAY,EAAE,MAAW,EAAE,EAAE;gBACpD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE/B,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAClF,CAAC,CAAC;SACH;aAAM;YACL,MAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,KAAK,mCAAI,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC;YAC5E,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAExD,GAAG,CAAC,CAAC,GAAG,CAAC,KAAU,EAAE,EAAY,EAAE,MAAW,EAAE,EAAE;gBAChD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE/B,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;YACnD,CAAC,CAAC;YACF,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC;SACnB;QAED,IAAI,OAAO,CAAC,MAAA,WAAW,CAAC,CAAC,0CAAE,KAAK,CAAC,EAAE;YACjC,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,UAAU,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5D,GAAG,CAAC,CAAC,GAAG,CAAC,KAAU,EAAE,EAAY,EAAE,MAAW,EAAE,EAAE;gBAChD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE/B,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjF,CAAC,CAAC;YACF,GAAG,CAAC,MAAM,GAAG,CAAC,KAAU,EAAE,EAAY,EAAE,MAAW,EAAE,EAAE;gBACrD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE/B,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAClF,CAAC,CAAC;SACH;aAAM;YACL,MAAM,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,MAAM,mCAAI,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC;YAC/E,MAAM,SAAS,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAExD,GAAG,CAAC,CAAC,GAAG,CAAC,KAAU,EAAE,EAAY,EAAE,MAAW,EAAE,EAAE;gBAChD,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAE/B,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;YACpD,CAAC,CAAC;YACF,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC;SACrB;QAED,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,GAAG,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;SACjC;QAED,IAAI,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,EAAE;YAC1C,GAAG,CAAC,IAAI,GAAG,MAAA,WAAW,CAAC,KAAK,mCAAI,WAAW,CAAC,KAAK,CAAC;SACnD;aAAM;YACL,GAAG,CAAC,IAAI,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,CAAC,KAAK,0CAAE,IAAI,mCAAI,MAAA,IAAI,CAAC,UAAU,EAAE,0CAAG,CAAC,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;;AAhHe,sBAAI,GAAG,WAAW,CAAC,KAAK,CAAC;AAClC,6BAAW,GAAyB,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC","file":"image.js","sourcesContent":["import { SemanticMark } from './semantic-mark';\nimport type {\n  ImageEncodeChannels,\n  WithDefaultEncode,\n  PlotImageEncoderSpec,\n  GenerateBaseEncodeSpec,\n  GenerateEncoderSpec,\n  IElement,\n  Nil,\n  ScaleSpec,\n  ValueOf\n} from '@visactor/vgrammar-core';\n// eslint-disable-next-line no-duplicate-imports\nimport { GrammarMarkType } from '@visactor/vgrammar-core';\nimport { isArray } from '@visactor/vutils';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\nimport { PlotMakType } from './enums';\n\nexport class ImageSemanticMark extends SemanticMark<PlotImageEncoderSpec, ImageEncodeChannels> {\n  static readonly type = PlotMakType.image;\n  static defaultSpec: PlotImageEncoderSpec = { width: 10, height: 10 };\n  constructor(id?: string | number) {\n    super(PlotMakType.image, id);\n  }\n\n  setMarkType() {\n    return GrammarMarkType.image;\n  }\n\n  protected parseScaleOfEncodeX(\n    option: ValueOf<WithDefaultEncode<PlotImageEncoderSpec, ImageEncodeChannels>, ImageEncodeChannels>\n  ): ScaleSpec | Nil {\n    const res = super.parseScaleOfEncodeX(option);\n\n    res.type = 'point';\n    return res;\n  }\n\n  parseScaleByEncode(\n    channel: ImageEncodeChannels,\n    option: ValueOf<WithDefaultEncode<PlotImageEncoderSpec, ImageEncodeChannels>, ImageEncodeChannels>\n  ): ScaleSpec | Nil {\n    if (channel === 'src') {\n      return {\n        type: 'ordinal',\n        id: this.getScaleId('src'),\n        domain: {\n          data: this.getDataIdOfMain(),\n          field: option as string\n        }\n      };\n    }\n\n    return this.parseScaleOfCommonEncode(channel, option);\n  }\n\n  convertMarkEncode(\n    encode: WithDefaultEncode<PlotImageEncoderSpec, ImageEncodeChannels>\n  ): GenerateBaseEncodeSpec<PlotImageEncoderSpec> {\n    const markEncoder = this.convertSimpleMarkEncode(encode);\n    const scaleXId = this.getScaleId('x');\n    const scaleYId = this.getScaleId('y');\n    const res: GenerateEncoderSpec<PlotImageEncoderSpec> = {\n      image: markEncoder.src\n    };\n\n    if (markEncoder.src) {\n      res.image = markEncoder.src;\n    }\n\n    if (isArray(markEncoder.x?.field)) {\n      const xAccessor = getFieldAccessor(markEncoder.x.field[0]);\n      const x1Accessor = getFieldAccessor(markEncoder.x.field[1]);\n      res.x = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return Math.min(scale.scale(xAccessor(datum)), scale.scale(x1Accessor(datum)));\n      };\n      res.width = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return Math.abs(scale.scale(xAccessor(datum)) - scale.scale(x1Accessor(datum)));\n      };\n    } else {\n      const width = this.spec.style?.width ?? ImageSemanticMark.defaultSpec.width;\n      const xAccessor = getFieldAccessor(markEncoder.x.field);\n\n      res.x = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return scale.scale(xAccessor(datum)) - width / 2;\n      };\n      res.width = width;\n    }\n\n    if (isArray(markEncoder.y?.field)) {\n      const yAccessor = getFieldAccessor(markEncoder.y.field[0]);\n      const y1Accessor = getFieldAccessor(markEncoder.y.field[1]);\n      res.y = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleYId];\n\n        return Math.min(scale.scale(yAccessor(datum)), scale.scale(y1Accessor(datum)));\n      };\n      res.height = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleYId];\n\n        return Math.abs(scale.scale(yAccessor(datum)) - scale.scale(y1Accessor(datum)));\n      };\n    } else {\n      const height = this.spec.style?.height ?? ImageSemanticMark.defaultSpec.height;\n      const yAccessor = getFieldAccessor(markEncoder.y.field);\n\n      res.y = (datum: any, el: IElement, params: any) => {\n        const scale = params[scaleXId];\n\n        return scale.scale(yAccessor(datum)) - height / 2;\n      };\n      res.height = height;\n    }\n\n    if (markEncoder.stroke) {\n      res.stroke = markEncoder.stroke;\n    }\n\n    if (markEncoder.color || markEncoder.group) {\n      res.fill = markEncoder.color ?? markEncoder.group;\n    } else {\n      res.fill = this.spec.style?.fill ?? this.getPalette()?.[0];\n    }\n\n    return res;\n  }\n}\n"]}

package/es/interval.d.ts

@@ -1,6 +1,6 @@
-import type { IntervalEncodeChannels, PlotIntervalEncoderSpec, SemanticTooltipOption, WithDefaultEncode, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, CrosshairSpec, AttributeTransform, TransformSpec } from '@visactor/vgrammar';
+import type { IntervalEncodeChannels, PlotIntervalEncoderSpec, SemanticTooltipOption, WithDefaultEncode, GenerateBaseEncodeSpec, Nil, ScaleSpec, ValueOf, CrosshairSpec, AttributeTransform, TransformSpec } from '@visactor/vgrammar-core';
 import { SemanticMark } from './semantic-mark';
-import { GrammarMarkType } from '@visactor/vgrammar';
+import { GrammarMarkType } from '@visactor/vgrammar-core';
 import { PlotMakType } from './enums';
 export declare class Interval extends SemanticMark<PlotIntervalEncoderSpec, IntervalEncodeChannels> {
     static readonly type = PlotMakType.interval;

package/es/interval.js

@@ -2,7 +2,7 @@ import { field as getFieldAccessor } from "@visactor/vgrammar-util";
 
 import { SemanticMark } from "./semantic-mark";
 
-import { GrammarMarkType } from "@visactor/vgrammar";
+import { GrammarMarkType } from "@visactor/vgrammar-core";
 
 import { isArray } from "@visactor/vutils";