@visactor/vgrammar-plot 0.6.6-alpha.0 → 0.7.0-alpha.0

package/cjs/tree.js

@@ -58,11 +58,11 @@ class TreeSemanticMark extends semantic_mark_1.SemanticMark {
                 data: this.getDataIdOfFiltered(),
                 field: option
             },
-            range: (0, vgrammar_1.getPalette)()
+            range: this.getPalette()
         } : null;
     }
     convertMarkEncode(encode) {
-        var _a, _b;
+        var _a, _b, _c;
         const markEncoder = this.convertSimpleMarkEncode(encode), res = {
             x: {
                 field: "x"
@@ -71,14 +71,13 @@ class TreeSemanticMark extends semantic_mark_1.SemanticMark {
                 field: "y"
             }
         };
-        if (markEncoder.color) {
+        if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
             const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
             res.fill = (datum, el, params) => {
                 const scale = params[scaleColorId];
                 return (null == datum ? void 0 : datum.datum) ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : void 0;
             };
-        } else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : (0, 
-        vgrammar_1.getPalette)()[0];
+        } else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : null === (_c = this.getPalette()) || void 0 === _c ? void 0 : _c[0];
         return res;
     }
     setLabelTextGetter(channel, option) {

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';\nimport { getPalette, 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: 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.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 ?? 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';\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"]}

package/cjs/treemap.js

@@ -35,11 +35,11 @@ class TreemapSemanticMark extends semantic_mark_1.SemanticMark {
                 data: this.getDataIdOfFiltered(),
                 field: option
             },
-            range: (0, vgrammar_1.getPalette)()
+            range: this.getPalette()
         } : null;
     }
     convertMarkEncode(encode) {
-        var _a, _b;
+        var _a, _b, _c;
         const markEncoder = this.convertSimpleMarkEncode(encode), res = {
             x: {
                 field: "x0"
@@ -54,14 +54,13 @@ class TreemapSemanticMark extends semantic_mark_1.SemanticMark {
                 field: "y1"
             }
         };
-        if (markEncoder.color) {
+        if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
             const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
             res.fill = (datum, el, params) => {
                 const scale = params[scaleColorId];
                 return (null == datum ? void 0 : datum.datum) ? scale.scale(colorAccessor(datum.datum[datum.datum.length - 1])) : void 0;
             };
-        } else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : (0, 
-        vgrammar_1.getPalette)()[0];
+        } else res.fill = null !== (_b = null === (_a = this.spec.style) || void 0 === _a ? void 0 : _a.fill) && void 0 !== _b ? _b : null === (_c = this.getPalette()) || void 0 === _c ? void 0 : _c[0];
         return res;
     }
     setMainMarkSpec() {

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';\nimport { getPalette, 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: 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.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 ?? 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';\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"]}

package/cjs/wordcloud-shape.d.ts

@@ -7,6 +7,7 @@ export declare class WordcloudShapeSemanticMark extends SemanticMark<PlotWordclo
     constructor(id?: string | number);
     setMarkType(): GrammarMarkType;
     setDefaultDataTransform(): TransformSpec[];
+    protected setMainMarkEnterEncode(): any;
     parseScaleByEncode(channel: WordcloudShapeEncodeChannels, option: ValueOf<WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>, WordcloudShapeEncodeChannels>): ScaleSpec | Nil;
     convertMarkEncode(encode: WithDefaultEncode<PlotWordcloudShapeEncodeSpec, WordcloudShapeEncodeChannels>): GenerateBaseEncodeSpec<PlotWordcloudShapeEncodeSpec>;
     protected parseLabelSpec(): LabelSpec[];

package/cjs/wordcloud-shape.js

@@ -4,7 +4,7 @@ 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");
+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");
 
 class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
     constructor(id) {
@@ -21,12 +21,18 @@ class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
                 callback: params => [ params.viewBox.width(), params.viewBox.height() ],
                 dependency: [ "viewBox" ]
             },
-            colorList: (0, vgrammar_1.getPalette)(),
+            colorList: this.getPalette(),
             text: {
                 field: null === (_a = this.spec.encode) || void 0 === _a ? void 0 : _a.text
             }
         } ];
     }
+    setMainMarkEnterEncode() {
+        return (0, vutils_1.merge)({
+            textAlign: "center",
+            textBaseline: "middle"
+        }, this.spec.style);
+    }
     parseScaleByEncode(channel, option) {
         return "color" === channel ? {
             type: "ordinal",
@@ -35,11 +41,11 @@ class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
                 data: this.getDataIdOfFiltered(),
                 field: option
             },
-            range: (0, vgrammar_1.getPalette)()
+            range: this.getPalette()
         } : null;
     }
     convertMarkEncode(encode) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const markEncoder = this.convertSimpleMarkEncode(encode), res = {
             x: {
                 field: "x"
@@ -69,11 +75,10 @@ class WordcloudShapeSemanticMark extends semantic_mark_1.SemanticMark {
                 field: null === (_a = this.spec.encode) || void 0 === _a ? void 0 : _a.text
             }
         };
-        if (markEncoder.color) {
+        if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
             const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
             res.fill = (datum, el, params) => params[scaleColorId].scale(colorAccessor(datum));
-        } else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : (0, 
-        vgrammar_1.getPalette)()[0];
+        } else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : null === (_d = this.getPalette()) || void 0 === _d ? void 0 : _d[0];
         return res;
     }
     parseLabelSpec() {

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';\nimport { getPalette, GrammarMarkType, getTransform } from '@visactor/vgrammar';\nimport { PlotMakType } from './enums';\nimport { field as getFieldAccessor } from '@visactor/vgrammar-util';\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: getPalette(),\n        text: { field: this.spec.encode?.text }\n      }\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: 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.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 ?? 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';\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"]}

package/cjs/wordcloud.js

@@ -34,11 +34,11 @@ class WordcloudSemanticMark extends semantic_mark_1.SemanticMark {
                 data: this.getDataIdOfFiltered(),
                 field: option
             },
-            range: (0, vgrammar_1.getPalette)()
+            range: this.getPalette()
         } : null;
     }
     convertMarkEncode(encode) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const markEncoder = this.convertSimpleMarkEncode(encode), res = {
             x: {
                 field: "x"
@@ -65,11 +65,10 @@ class WordcloudSemanticMark extends semantic_mark_1.SemanticMark {
                 field: null === (_a = this.spec.encode) || void 0 === _a ? void 0 : _a.text
             }
         };
-        if (markEncoder.color) {
+        if (markEncoder.stroke && (res.stroke = markEncoder.stroke), markEncoder.color) {
             const scaleColorId = this.getScaleId("color"), colorAccessor = (0, vgrammar_util_1.field)(markEncoder.color.field);
             res.fill = (datum, el, params) => params[scaleColorId].scale(colorAccessor(datum));
-        } else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : (0, 
-        vgrammar_1.getPalette)()[0];
+        } else res.fill = null !== (_c = null === (_b = this.spec.style) || void 0 === _b ? void 0 : _b.fill) && void 0 !== _c ? _c : null === (_d = this.getPalette()) || void 0 === _d ? void 0 : _d[0];
         return res;
     }
     parseLabelSpec() {

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';\nimport { getPalette, 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: 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.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 ?? 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';\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"]}