@vyr/echarts 0.0.32 → 0.0.34

package/build/actor/EchartActor.d.ts

@@ -1,70 +1,17 @@
 import * as echarts from 'echarts';
 import { HTMLActor } from "@vyr/engine";
-import { EchartDescriptor } from "../descriptor";
-interface EchartServiceOption {
-    [k: string]: any;
-}
-interface AxisOption {
-    [k: string]: any;
-}
-declare class EchartActor extends HTMLActor {
+import { Echart } from "../descriptor";
+export declare class EchartActor extends HTMLActor {
     private _wrapper;
-    readonly DOM: HTMLElement;
     readonly instance: echarts.ECharts;
     options: {
         [k: string]: any;
     };
     constructor(uuid: string);
     protected createWrapper(): HTMLDivElement;
-    getWrapper(): HTMLElement;
+    getDOM(): HTMLElement;
+    resize: () => void;
     add(): void;
     remove(): void;
-    getXAxis(descriptor: EchartDescriptor): AxisOption;
-    getYAxis(descriptor: EchartDescriptor): AxisOption;
-    getGrid(descriptor: EchartDescriptor): {
-        right: string;
-        bottom: string;
-        left: string;
-        top: string;
-        width: string;
-        height: string;
-        show: boolean;
-    };
-    getLegend(descriptor: EchartDescriptor): {
-        show: boolean;
-        type: string | undefined;
-        left: string;
-        top: string;
-        textStyle: {
-            color: string;
-        };
-    };
-    getTooltip(descriptor: EchartDescriptor): {
-        show: boolean;
-        trigger: string;
-    };
-    getDataZoom(descriptor: EchartDescriptor): ({
-        show: boolean;
-        type: string;
-        startValue: number;
-        endValue: number;
-        yAxisIndex: number[];
-        filterMode: string;
-        zoomOnMouseWheel?: undefined;
-        moveOnMouseMove?: undefined;
-        moveOnMouseWheel?: undefined;
-    } | {
-        type: string;
-        yAxisIndex: number[];
-        zoomOnMouseWheel: boolean;
-        moveOnMouseMove: boolean;
-        moveOnMouseWheel: boolean;
-        show?: undefined;
-        startValue?: undefined;
-        endValue?: undefined;
-        filterMode?: undefined;
-    })[];
-    setOptions(descriptor: EchartDescriptor): void;
-    update(descriptor: EchartDescriptor): void;
+    update(descriptor: Echart): void;
 }
-export { EchartServiceOption, EchartActor, };

package/build/actor/EchartActor.js

@@ -1,146 +1,37 @@
 import * as echarts from 'echarts';
-import { DatasetDescriptor, HTMLActor } from "@vyr/engine";
-class EchartActor extends HTMLActor {
+import { createHTMLDOM, HTMLActor } from "@vyr/engine";
+export class EchartActor extends HTMLActor {
     _wrapper = null;
-    DOM;
     instance;
     options = {};
     constructor(uuid) {
         super(uuid);
-        this.DOM = this.createDOM();
-        const wrapper = this.getWrapper();
-        wrapper.appendChild(this.DOM);
-        this.instance = echarts.init(this.DOM);
+        const DOM = this.getDOM();
+        this.instance = echarts.init(DOM);
     }
     createWrapper() {
-        const wrapper = document.createElement('div');
-        wrapper.setAttribute('class', HTMLActor.className);
-        wrapper.setAttribute(HTMLActor.uuidKey, this.uuid);
-        return wrapper;
+        const DOM = createHTMLDOM(this.uuid);
+        return DOM;
     }
-    getWrapper() {
+    getDOM() {
         if (this._wrapper === null) {
             this._wrapper = this.createWrapper();
         }
         return this._wrapper;
     }
+    resize = () => {
+        const rect = this.getDOM().getBoundingClientRect();
+        this.instance.resize({ width: rect.width, height: rect.height, });
+    };
     add() { }
     remove() { }
-    getXAxis(descriptor) {
-        const xAxis = {
-            show: descriptor.xAxisShow,
-            axisLine: descriptor.xAxisLine,
-            axisTick: descriptor.xAxisTick,
-            axisLabel: descriptor.xAxisLabel,
-            splitLine: descriptor.xAxisSplitLine,
-        };
-        if (descriptor.xAxisType)
-            xAxis.type = descriptor.xAxisType;
-        return xAxis;
-    }
-    getYAxis(descriptor) {
-        const yAxis = {
-            show: descriptor.yAxisShow,
-            axisLine: descriptor.yAxisLine,
-            axisTick: descriptor.yAxisTick,
-            axisLabel: descriptor.yAxisLabel,
-            splitLine: descriptor.yAxisSplitLine,
-        };
-        if (descriptor.yAxisType)
-            yAxis.type = descriptor.yAxisType;
-        return yAxis;
-    }
-    getGrid(descriptor) {
-        const grid = {
-            show: descriptor.gridShow,
-            ...descriptor.gridRect,
-        };
-        return grid;
-    }
-    getLegend(descriptor) {
-        const legend = {
-            show: descriptor.legendShow,
-            type: descriptor.legendType || undefined,
-            left: descriptor.legendRect.left,
-            top: descriptor.legendRect.top,
-            textStyle: {
-                color: descriptor.legendTextStyle.color,
-            }
-        };
-        return legend;
-    }
-    getTooltip(descriptor) {
-        const tooltip = {
-            show: descriptor.tooltipShow,
-            trigger: descriptor.tooltipTrigger,
-        };
-        return tooltip;
-    }
-    getDataZoom(descriptor) {
-        const dataZoom = [
-            {
-                // 设置滚动条的隐藏或显示
-                show: false,
-                // 设置类型
-                type: "slider",
-                // 数据窗口范围的起始数值
-                startValue: 0,
-                // 数据窗口范围的结束数值（一页显示多少条数据）
-                endValue: descriptor.scroll.end - 1,
-                // 控制哪个轴，如果是number表示控制一个轴，
-                // 如果是Array表示控制多个轴。此处控制第二根轴
-                yAxisIndex: [0, 1],
-                // empty：当前数据窗口外的数据，被设置为空。
-                // 即不会影响其他轴的数据范围
-                filterMode: "empty",
-            },
-            {
-                // 没有下面这块的话，只能拖动滚动条，
-                // 鼠标滚轮在区域内不能控制外部滚动条
-                type: "inside",
-                // 控制哪个轴，如果是number表示控制一个轴，
-                // 如果是Array表示控制多个轴。此处控制第二根轴
-                yAxisIndex: [0, 1],
-                // 滚轮是否触发缩放
-                zoomOnMouseWheel: false,
-                // 鼠标移动能否触发平移
-                moveOnMouseMove: true,
-                // 鼠标滚轮能否触发平移
-                moveOnMouseWheel: true,
-            },
-        ];
-        return dataZoom;
-    }
-    setOptions(descriptor) {
-        const dimensions = [descriptor.xAxisModelValue];
-        const children = [];
-        const graphics = HTMLActor.getGraphics(this);
-        for (const serie of descriptor.children) {
-            dimensions.push(serie.modelValue);
-            const interpreter = graphics.getInterpreter(serie);
-            children.push(interpreter.getService(serie));
-        }
-        const xAxis = this.getXAxis(descriptor);
-        const yAxis = this.getYAxis(descriptor);
-        const grid = this.getGrid(descriptor);
-        const legend = this.getLegend(descriptor);
-        const tooltip = this.getTooltip(descriptor);
-        const dataZoom = descriptor.scroll.end <= 0 ? undefined : this.getDataZoom(descriptor);
-        const dataset = { dimensions, source: DatasetDescriptor.getCollection(descriptor.dataset) };
-        this.options = { xAxis, yAxis, grid, legend, tooltip, dataset, dataZoom, series: children };
-    }
     update(descriptor) {
-        const wrapper = this.getWrapper();
-        this.setHTMLStyle(wrapper, this.getWrapperStyle(descriptor));
-        this.setHTMLInteraction(wrapper, descriptor);
-        this.setHTMLStyle(this.DOM, this.getLayoutStyle(descriptor));
-        this.setStyleClass(this.DOM, this.getStyleClass(descriptor));
-        this.setOptions(descriptor);
         this.instance.clear();
-        this.instance.setOption(this.options);
-        const rect = wrapper.getBoundingClientRect();
-        this.instance.resize({ width: rect.width, height: rect.height, });
+        const DOM = this.getDOM();
+        this.setHtmlAttributes(DOM, descriptor);
+        this.setHTMLInteraction(DOM, descriptor);
+        this.instance.setOption(descriptor.options);
+        requestAnimationFrame(this.resize);
     }
 }
-export { EchartActor, };
 //# sourceMappingURL=EchartActor.js.map

package/build/actor/EchartActor.js.map

@@ -1 +1 @@
-{"version":3,"file":"EchartActor.js","sourceRoot":"","sources":["../../src/actor/EchartActor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EchartActor.js","sourceRoot":"","sources":["../../src/actor/EchartActor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGvD,MAAM,OAAO,WAAY,SAAQ,SAAS;IAC9B,QAAQ,GAAuB,IAAI,CAAA;IAClC,QAAQ,CAAA;IACjB,OAAO,GAAyB,EAAE,CAAA;IAElC,YAAY,IAAY;QACpB,KAAK,CAAC,IAAI,CAAC,CAAA;QACX,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACzB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACrC,CAAC;IAES,aAAa;QACnB,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACpC,OAAO,GAAG,CAAA;IACd,CAAC;IAED,MAAM;QACF,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;QACxC,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAA;IACxB,CAAC;IAED,MAAM,GAAG,GAAG,EAAE;QACV,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,qBAAqB,EAAE,CAAA;QAClD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAA;IACrE,CAAC,CAAA;IAED,GAAG,KAAK,CAAC;IAET,MAAM,KAAK,CAAC;IAEZ,MAAM,CAAC,UAAkB;QACrB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACzB,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QACvC,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAA;QACxC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QAC3C,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;CACJ"}

package/build/descriptor/Echart.d.ts

@@ -0,0 +1,18 @@
+import { Descriptor, DeserializationObject, HTML, HtmlAttributes } from '@vyr/engine';
+export interface EchartOptions {
+    [k: string]: any;
+}
+export declare class Echart extends Descriptor implements HTML {
+    static type: string;
+    readonly isHTML = true;
+    visible: boolean;
+    htmlAttributes: HtmlAttributes;
+    /**
+     * ECharts图表配置对象
+     * 包含图表类型、数据、样式、交互等完整的ECharts配置选项
+     * 类型：EchartOptions (ECharts官方配置类型)
+     * 用途：用于初始化、更新或控制ECharts图表实例的显示和行为
+     */
+    options: EchartOptions;
+    constructor(descriptor?: Partial<DeserializationObject<Echart>>);
+}

package/build/descriptor/Echart.js

@@ -0,0 +1,22 @@
+import { Descriptor, HtmlAttributesSchema } from '@vyr/engine';
+export class Echart extends Descriptor {
+    static type = 'Echart';
+    isHTML = true;
+    visible;
+    htmlAttributes;
+    /**
+     * ECharts图表配置对象
+     * 包含图表类型、数据、样式、交互等完整的ECharts配置选项
+     * 类型：EchartOptions (ECharts官方配置类型)
+     * 用途：用于初始化、更新或控制ECharts图表实例的显示和行为
+     */
+    options;
+    constructor(descriptor = {}) {
+        super(descriptor);
+        this.visible = descriptor.visible ?? true;
+        this.htmlAttributes = HtmlAttributesSchema.parse(descriptor.htmlAttributes);
+        this.options = descriptor.options ? Descriptor.deepClone(descriptor.options) : {};
+    }
+}
+Descriptor.register(Echart);
+//# sourceMappingURL=Echart.js.map

package/build/descriptor/Echart.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Echart.js","sourceRoot":"","sources":["../../src/descriptor/Echart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA+C,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAM3G,MAAM,OAAO,MAAO,SAAQ,UAAU;IAClC,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAA;IAEb,MAAM,GAAG,IAAI,CAAA;IAEtB,OAAO,CAAS;IAEhB,cAAc,CAAgB;IAE9B;;;;;OAKG;IACH,OAAO,CAAe;IAEtB,YAAY,aAAqD,EAAE;QAC/D,KAAK,CAAC,UAAU,CAAC,CAAA;QACjB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,IAAI,IAAI,CAAA;QACzC,IAAI,CAAC,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACrF,CAAC;;AAEL,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA"}

package/build/descriptor/index.d.ts

@@ -1,5 +1 @@
-export * from './EchartDescriptor';
-export * from './ServiceEchartDescriptor';
-export * from './BarServiceEchartDescriptor';
-export * from './LineServiceEchartDescriptor';
-export * from './PieServiceEchartDescriptor';
+export * from './Echart';

package/build/descriptor/index.js

@@ -1,6 +1,2 @@
-export * from './EchartDescriptor';
-export * from './ServiceEchartDescriptor';
-export * from './BarServiceEchartDescriptor';
-export * from './LineServiceEchartDescriptor';
-export * from './PieServiceEchartDescriptor';
+export * from './Echart';
 //# sourceMappingURL=index.js.map

package/build/descriptor/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/descriptor/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,2BAA2B,CAAA;AACzC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,8BAA8B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/descriptor/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA"}

package/build/interpreter/EchartInterpreter.d.ts

@@ -1,12 +1,11 @@
 import { Descriptor, Interpreter, PickupObject } from "@vyr/engine";
-import { EchartDescriptor } from "../descriptor";
+import { Echart } from "../descriptor";
 import { EchartActor } from "../actor";
-declare class EchartInterpreter extends Interpreter {
+export declare class EchartInterpreter extends Interpreter {
     static type: string;
-    protected createActor(descriptor: EchartDescriptor): EchartActor;
-    update(descriptor: EchartDescriptor): void;
-    mount(descriptor: EchartDescriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor): void;
+    protected createActor(descriptor: Echart): EchartActor;
+    update(descriptor: Echart): void;
+    mount(descriptor: Echart, parentInterpreter: Interpreter, parentDescriptor: Descriptor): void;
     unmount(descriptor: Descriptor, parentInterpreter: Interpreter, parentDescriptor: Descriptor): void;
     pickup(descriptor: Descriptor, result: PickupObject[]): void;
 }
-export { EchartInterpreter };

package/build/interpreter/EchartInterpreter.js

@@ -1,8 +1,8 @@
 import { Interpreter } from "@vyr/engine";
-import { EchartDescriptor } from "../descriptor";
+import { Echart } from "../descriptor";
 import { EchartActor } from "../actor";
-class EchartInterpreter extends Interpreter {
-    static type = EchartDescriptor.type;
+export class EchartInterpreter extends Interpreter {
+    static type = Echart.type;
     createActor(descriptor) {
         return new EchartActor(descriptor.uuid);
     }
@@ -19,16 +19,14 @@ class EchartInterpreter extends Interpreter {
     }
     unmount(descriptor, parentInterpreter, parentDescriptor) {
         const actor = this.getActor(descriptor);
-        actor.clearStyleClass(actor.DOM);
         actor.cleanInteraction();
         const parenActor = parentInterpreter.getActor(parentDescriptor);
         parenActor.remove(actor);
         super.unmount(descriptor, parentInterpreter, parentDescriptor);
     }
     pickup(descriptor, result) {
-        result.push({ uuid: descriptor.uuid, generatedBy: descriptor.generatedBy });
+        result.push({ uuid: descriptor.uuid });
     }
 }
 Interpreter.register(EchartInterpreter);
-export { EchartInterpreter };
 //# sourceMappingURL=EchartInterpreter.js.map

package/build/interpreter/EchartInterpreter.js.map

@@ -1 +1 @@
-{"version":3,"file":"EchartInterpreter.js","sourceRoot":"","sources":["../../src/interpreter/EchartInterpreter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,WAAW,EAAgB,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,iBAAkB,SAAQ,WAAW;IACvC,MAAM,CAAC,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAA;IAEzB,WAAW,CAAC,UAA4B;QAC9C,OAAO,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,UAA4B;QAC/B,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAExB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAc,UAAU,CAAC,CAAA;QACpD,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,UAA4B,EAAE,iBAA8B,EAAE,gBAA4B;QAC5F,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAA;QAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAc,UAAU,CAAC,CAAA;QAEpD,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAY,gBAAgB,CAAC,CAAA;QAC1E,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;IAED,OAAO,CAAC,UAAsB,EAAE,iBAA8B,EAAE,gBAA4B;QACxF,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAc,UAAU,CAAC,CAAA;QACpD,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,KAAK,CAAC,gBAAgB,EAAE,CAAA;QAExB,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAY,gBAAgB,CAAC,CAAA;QAC1E,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAExB,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAA;IAClE,CAAC;IAED,MAAM,CAAC,UAAsB,EAAE,MAAsB;QACjD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAA;IAC/E,CAAC;;AAEL,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA;AAEvC,OAAO,EACH,iBAAiB,EACpB,CAAA"}
+{"version":3,"file":"EchartInterpreter.js","sourceRoot":"","sources":["../../src/interpreter/EchartInterpreter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,WAAW,EAAgB,MAAM,aAAa,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAC9C,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IAEf,WAAW,CAAC,UAAkB;QACpC,OAAO,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED,MAAM,CAAC,UAAkB;QACrB,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAExB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAc,UAAU,CAAC,CAAA;QACpD,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAC5B,CAAC;IAED,KAAK,CAAC,UAAkB,EAAE,iBAA8B,EAAE,gBAA4B;QAClF,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAA;QAC5D,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAc,UAAU,CAAC,CAAA;QAEpD,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAY,gBAAgB,CAAC,CAAA;QAC1E,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;IAED,OAAO,CAAC,UAAsB,EAAE,iBAA8B,EAAE,gBAA4B;QACxF,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAc,UAAU,CAAC,CAAA;QACpD,KAAK,CAAC,gBAAgB,EAAE,CAAA;QAExB,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAY,gBAAgB,CAAC,CAAA;QAC1E,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAExB,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAA;IAClE,CAAC;IAED,MAAM,CAAC,UAAsB,EAAE,MAAsB;QACjD,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAA;IAC1C,CAAC;;AAEL,WAAW,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAA"}

package/build/interpreter/index.d.ts

@@ -1,5 +1 @@
 export * from './EchartInterpreter';
-export * from './ServiceEchartInterpreter';
-export * from './BarServiceEchartInterpreter';
-export * from './LineServiceEchartInterpreter';
-export * from './PieServiceEchartInterpreter';

package/build/interpreter/index.js

@@ -1,6 +1,2 @@
 export * from './EchartInterpreter';
-export * from './ServiceEchartInterpreter';
-export * from './BarServiceEchartInterpreter';
-export * from './LineServiceEchartInterpreter';
-export * from './PieServiceEchartInterpreter';
 //# sourceMappingURL=index.js.map

package/build/interpreter/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interpreter/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,4BAA4B,CAAA;AAC1C,cAAc,+BAA+B,CAAA;AAC7C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interpreter/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA"}

package/build/locale/Language.d.ts

@@ -1,3 +1,2 @@
 import { ZhCNLanguageProvider } from "./LanguageProvider";
-declare const language: import("@vyr/locale").Language<ZhCNLanguageProvider>;
-export { language };
+export declare const language: import("@vyr/locale").Language<ZhCNLanguageProvider>;

package/build/locale/Language.js

@@ -1,6 +1,5 @@
 import { Locale } from "@vyr/locale";
 import { zhCnLanguageProvider } from "./LanguageProvider";
 Locale.register(zhCnLanguageProvider);
-const language = Locale.getLanguage(zhCnLanguageProvider.name);
-export { language };
+export const language = Locale.getLanguage(zhCnLanguageProvider.name);
 //# sourceMappingURL=Language.js.map

package/build/locale/Language.js.map

@@ -1 +1 @@
-{"version":3,"file":"Language.js","sourceRoot":"","sources":["../../src/locale/Language.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAwB,MAAM,oBAAoB,CAAC;AAEhF,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAA;AAErC,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAuB,oBAAoB,CAAC,IAAI,CAAC,CAAA;AAEpF,OAAO,EACH,QAAQ,EACX,CAAA"}
+{"version":3,"file":"Language.js","sourceRoot":"","sources":["../../src/locale/Language.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAwB,MAAM,oBAAoB,CAAC;AAEhF,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAA;AAErC,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAuB,oBAAoB,CAAC,IAAI,CAAC,CAAA"}

package/build/locale/LanguageProvider.d.ts

@@ -1,5 +1,4 @@
 import { LanguageProvider } from '@vyr/locale';
-interface ZhCNLanguageProvider extends LanguageProvider {
+export interface ZhCNLanguageProvider extends LanguageProvider {
 }
-declare const zhCnLanguageProvider: ZhCNLanguageProvider;
-export { ZhCNLanguageProvider, zhCnLanguageProvider, };
+export declare const zhCnLanguageProvider: ZhCNLanguageProvider;

package/build/locale/LanguageProvider.js

@@ -1,6 +1,5 @@
-const zhCnLanguageProvider = {
+export const zhCnLanguageProvider = {
     id: 'zh_CN',
     name: '@vyr/echarts',
 };
-export { zhCnLanguageProvider, };
 //# sourceMappingURL=LanguageProvider.js.map

package/build/locale/LanguageProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"LanguageProvider.js","sourceRoot":"","sources":["../../src/locale/LanguageProvider.ts"],"names":[],"mappings":"AAMA,MAAM,oBAAoB,GAAyB;IAC/C,EAAE,EAAE,OAAO;IACX,IAAI,EAAE,cAAc;CACvB,CAAA;AAED,OAAO,EAEH,oBAAoB,GACvB,CAAA"}
+{"version":3,"file":"LanguageProvider.js","sourceRoot":"","sources":["../../src/locale/LanguageProvider.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,oBAAoB,GAAyB;IACtD,EAAE,EAAE,OAAO;IACX,IAAI,EAAE,cAAc;CACvB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyr/echarts",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "",
   "main": "build/index.js",
   "author": "",