fix: upgrade VRender and stabilize on-demand imports

docs/package.json

@@ -19,8 +19,8 @@
     "@visactor/vchart-theme": "~1.6.6",
     "@visactor/vmind": "1.2.4-alpha.5",
     "@visactor/vutils": "~1.0.23",
-    "@visactor/vrender": "^1.1.2",
-    "@visactor/vrender-kits": "^1.1.2",
+    "@visactor/vrender": "^1.1.3",
+    "@visactor/vrender-kits": "^1.1.3",
     "@visactor/vtable": "1.19.0-alpha.0",
     "@visactor/vtable-editors": "1.19.0-alpha.0",
     "@visactor/vtable-gantt": "1.19.0-alpha.0",

packages/openinula-vchart/package.json

@@ -30,8 +30,8 @@
   "dependencies": {
     "@visactor/vchart": "workspace:2.1.1",
     "@visactor/vutils": "~1.0.23",
-    "@visactor/vrender-core": "^1.1.2",
-    "@visactor/vrender-kits": "^1.1.2",
+    "@visactor/vrender-core": "^1.1.3",
+    "@visactor/vrender-kits": "^1.1.3",
     "react-is": "^18.2.0"
   },
   "devDependencies": {

packages/react-vchart/package.json

@@ -36,8 +36,8 @@
     "@visactor/vchart": "workspace:2.1.1",
     "@visactor/vchart-extension": "workspace:2.1.1",
     "@visactor/vutils": "~1.0.23",
-    "@visactor/vrender-core": "^1.1.2",
-    "@visactor/vrender-kits": "^1.1.2",
+    "@visactor/vrender-core": "^1.1.3",
+    "@visactor/vrender-kits": "^1.1.3",
     "react-is": "^18.2.0"
   },
   "devDependencies": {

packages/vchart-extension/package.json

@@ -26,10 +26,10 @@
     "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser"
   },
   "dependencies": {
-    "@visactor/vrender-core": "^1.1.2",
-    "@visactor/vrender-kits": "^1.1.2",
-    "@visactor/vrender-components": "^1.1.2",
-    "@visactor/vrender-animate": "^1.1.2",
+    "@visactor/vrender-core": "^1.1.3",
+    "@visactor/vrender-kits": "^1.1.3",
+    "@visactor/vrender-components": "^1.1.3",
+    "@visactor/vrender-animate": "^1.1.3",
     "@visactor/vchart": "workspace:2.1.1",
     "@visactor/vutils": "~1.0.23",
     "@visactor/vdataset": "~1.0.23",

packages/vchart-extension/src/charts/3d/arc-3d.ts

@@ -1,6 +1,9 @@
 import { registerArc3d } from '@visactor/vrender-kits/register/register-arc3d';
-import { registerShadowRoot, createArc3d } from '@visactor/vchart';
-import { BaseArcMark, Factory, registerArcAnimation } from '@visactor/vchart';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
+import { createArc3d } from '@visactor/vrender-core';
+import { registerArcAnimation } from '@visactor/vchart/esm/animation/config';
+import { Factory } from '@visactor/vchart/esm/core/factory';
+import { BaseArcMark } from '@visactor/vchart/esm/mark/arc';
 import { MarkType3dEnum } from './enum';
 import type { IArc3dMark, IArc3dMarkSpec } from './interface';
 

packages/vchart-extension/src/charts/3d/interface.ts

@@ -1,4 +1,6 @@
-import type { IArcMarkSpec, IMarkRaw, IPoint, IPolygonMarkSpec, IRectMarkSpec } from '@visactor/vchart';
+import type { IMarkRaw } from '@visactor/vchart/esm/mark/interface/common';
+import type { IPoint } from '@visactor/vchart/esm/typings/coordinate';
+import type { IArcMarkSpec, IPolygonMarkSpec, IRectMarkSpec } from '@visactor/vchart/esm/typings/visual';
 
 // 3d rect，支持length表示长宽高中的长属性（深度属性）
 export interface IRect3dMarkSpec extends IRectMarkSpec {

packages/vchart-extension/src/charts/3d/layout.ts

@@ -1,7 +1,11 @@
-import type { IAxis, IBaseLayout, IChart, ILayoutItem, IOffset, LayoutSideType } from '@visactor/vchart';
-import { Factory, isXAxis, isYAxis, Layout } from '@visactor/vchart';
-import type { IBoundsLike } from '@visactor/vchart';
-import type { IRect } from '@visactor/vchart/src/typings/space';
+import type { IBoundsLike } from '@visactor/vutils';
+import type { IChart } from '@visactor/vchart/esm/chart/interface/chart';
+import { isXAxis, isYAxis } from '@visactor/vchart/esm/component/axis/cartesian/util/common';
+import type { IAxis } from '@visactor/vchart/esm/component/axis/interface/common';
+import { Factory } from '@visactor/vchart/esm/core/factory';
+import { Layout, type IOffset, type LayoutSideType } from '@visactor/vchart/esm/layout/base-layout';
+import type { IBaseLayout, ILayoutItem } from '@visactor/vchart/esm/layout/interface';
+import type { IRect } from '@visactor/vchart/esm/typings/space';
 
 export class Layout3d extends Layout implements IBaseLayout {
   declare recomputeWidth: boolean;

packages/vchart-extension/src/charts/3d/plugin.ts

@@ -1,6 +1,8 @@
-import { registerDirectionalLight, registerOrthoCamera, registerViewTransform3dPlugin } from '@visactor/vchart';
-import type { IChartPlugin, IChartPluginService, VChartRenderActionSource } from '@visactor/vchart';
-import { BasePlugin, registerChartPlugin } from '@visactor/vchart';
+import { registerDirectionalLight, registerOrthoCamera, registerViewTransform3dPlugin } from '@visactor/vrender-core';
+import type { VChartRenderActionSource } from '@visactor/vchart/esm/core/interface';
+import { BasePlugin } from '@visactor/vchart/esm/plugin/base/base-plugin';
+import type { IChartPlugin, IChartPluginService } from '@visactor/vchart/esm/plugin/chart/interface';
+import { registerChartPlugin } from '@visactor/vchart/esm/plugin/chart/register';
 import { is3DAxisChart, is3DChart } from './util';
 
 export class VChart3dPlugin extends BasePlugin implements IChartPlugin {

packages/vchart-extension/src/charts/3d/pyramid-3d.ts

@@ -1,7 +1,11 @@
-import { registerPyramid3d, registerShadowRoot, createPyramid3d } from '@visactor/vchart';
+import { createPyramid3d } from '@visactor/vrender-core';
+import { registerPyramid3d } from '@visactor/vrender-kits/register/register-pyramid3d';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
+import { registerPolygonAnimation } from '@visactor/vchart/esm/animation/config';
+import { Factory } from '@visactor/vchart/esm/core/factory';
+import { BasePolygonMark } from '@visactor/vchart/esm/mark/polygon/base-polygon';
 import type { IPyramid3dMark, IPyramid3dMarkSpec } from './interface';
 import { MarkType3dEnum } from './enum';
-import { BasePolygonMark, Factory, registerPolygonAnimation } from '@visactor/vchart';
 
 export class Pyramid3dMark extends BasePolygonMark<IPyramid3dMarkSpec> implements IPyramid3dMark {
   static readonly type = MarkType3dEnum.pyramid3d;

packages/vchart-extension/src/charts/3d/rect-3d.ts

@@ -1,6 +1,10 @@
-import { registerRect3d, registerShadowRoot, createRect3d } from '@visactor/vchart';
-import type { IMarkStyle } from '@visactor/vchart';
-import { BaseMark, Factory, registerRectAnimation } from '@visactor/vchart';
+import { createRect3d } from '@visactor/vrender-core';
+import { registerRect3d } from '@visactor/vrender-kits/register/register-rect3d';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
+import { registerRectAnimation } from '@visactor/vchart/esm/animation/config';
+import { Factory } from '@visactor/vchart/esm/core/factory';
+import { BaseMark } from '@visactor/vchart/esm/mark/base/base-mark';
+import type { IMarkStyle } from '@visactor/vchart/esm/mark/interface/common';
 import type { IRect3dMark, IRect3dMarkSpec } from './interface';
 import { MarkType3dEnum } from './enum';
 

packages/vchart-extension/src/charts/pie-3d/animation.ts

@@ -1,5 +1,11 @@
-import type { IPieAnimationParams, PieAppearPreset } from '@visactor/vchart';
-import { Factory, pieDisappear, pieEnter, pieExit, piePresetAnimation } from '@visactor/vchart';
+import { Factory } from '@visactor/vchart/esm/core/factory';
+import type { IPieAnimationParams, PieAppearPreset } from '@visactor/vchart/esm/series/pie/interface';
+import {
+  pieDisappear,
+  pieEnter,
+  pieExit,
+  piePresetAnimation
+} from '@visactor/vchart/esm/series/pie/animation/animation';
 
 export const registerPie3dAnimation = () => {
   Factory.registerAnimation('pie3d', (params: IPieAnimationParams, preset: PieAppearPreset) => {

packages/vchart-extension/src/charts/pie-3d/chart-spec-transformer.ts

@@ -1,5 +1,5 @@
-import type { AdaptiveSpec, ISeriesSpec } from '@visactor/vchart';
-import { BasePieChartSpecTransformer } from '@visactor/vchart';
+import type { AdaptiveSpec, ISeriesSpec } from '@visactor/vchart/esm/typings/spec/common';
+import { BasePieChartSpecTransformer } from '@visactor/vchart/esm/chart/pie/base/pie-transformer';
 import type { IPie3dChartSpec } from './interface';
 
 export class Pie3dChartSpecTransformer<T extends IPie3dChartSpec = IPie3dChartSpec> extends BasePieChartSpecTransformer<

packages/vchart-extension/src/charts/pie-3d/chart.ts

@@ -1,5 +1,7 @@
-import type { AdaptiveSpec } from '@visactor/vchart';
-import { BasePieChart, Factory, registerMarkTooltipProcessor } from '@visactor/vchart';
+import { Factory } from '@visactor/vchart/esm/core/factory';
+import type { AdaptiveSpec } from '@visactor/vchart/esm/typings/spec/common';
+import { BasePieChart } from '@visactor/vchart/esm/chart/pie/base/base';
+import { registerMarkTooltipProcessor } from '@visactor/vchart/esm/component/tooltip/processor/mark-tooltip';
 import type { IPie3dChartSpec } from './interface';
 import { ChartType3dEnum, SeriesType3dEnum } from '../3d/enum';
 import { register3DPlugin } from '../3d/plugin';

packages/vchart-extension/src/charts/pie-3d/constant.ts

@@ -1,4 +1,6 @@
-import { baseSeriesMark, MarkTypeEnum, SeriesMarkNameEnum } from '@visactor/vchart';
+import { baseSeriesMark } from '@visactor/vchart/esm/series/base/constant';
+import { MarkTypeEnum } from '@visactor/vchart/esm/mark/interface/type';
+import { SeriesMarkNameEnum } from '@visactor/vchart/esm/series/interface/type';
 import { MarkType3dEnum, SeriesMark3dNameEnum } from '../3d/enum';
 
 export const pie3dSeriesMark = {

packages/vchart-extension/src/charts/pie-3d/interface.ts

@@ -1,13 +1,8 @@
-import type {
-  IArcLabelSpec,
-  IChartExtendsSeriesSpec,
-  IChartSpec,
-  IIndicatorSpec,
-  IMarkTheme,
-  IPieSeriesSpec,
-  IPolarSeriesTheme,
-  SeriesMarkNameEnum
-} from '@visactor/vchart';
+import type { IChartExtendsSeriesSpec, IChartSpec, IMarkTheme } from '@visactor/vchart/esm/typings/spec/common';
+import type { IIndicatorSpec } from '@visactor/vchart/esm/component/indicator/interface';
+import type { IPolarSeriesTheme } from '@visactor/vchart/esm/series/polar/interface';
+import type { IArcLabelSpec, IPieSeriesSpec } from '@visactor/vchart/esm/series/pie/interface';
+import type { SeriesMarkNameEnum } from '@visactor/vchart/esm/series/interface/type';
 import type { SeriesMark3dNameEnum } from '../3d/enum';
 import type { IArc3dMarkSpec } from '../3d/interface';
 

packages/vchart-extension/src/charts/pie-3d/series-spec-transformer.ts

@@ -1,4 +1,4 @@
-import { PieSeriesSpecTransformer } from '@visactor/vchart';
+import { PieSeriesSpecTransformer } from '@visactor/vchart/esm/series/pie/pie-transformer';
 import type { IPie3dSeriesSpec, IPie3dSeriesTheme } from './interface';
 import { SeriesMark3dNameEnum } from '../3d/enum';
 

packages/vchart-extension/src/charts/pie-3d/series.ts

@@ -3,8 +3,11 @@ import type { IPie3dSeriesSpec } from './interface';
 import { registerArc3dMark } from '../3d/arc-3d';
 import { pie3dSeriesMark } from './constant';
 import { MarkType3dEnum, SeriesMark3dNameEnum, SeriesType3dEnum } from '../3d/enum';
-import type { ITextMark } from '@visactor/vchart';
-import { AttributeLevel, BasePieSeries, Factory, type IArcSeries } from '@visactor/vchart';
+import { AttributeLevel } from '@visactor/vchart/esm/constant/attribute';
+import { Factory } from '@visactor/vchart/esm/core/factory';
+import type { ITextMark } from '@visactor/vchart/esm/mark/interface/mark';
+import type { IArcSeries } from '@visactor/vchart/esm/series/interface/series';
+import { BasePieSeries } from '@visactor/vchart/esm/series/pie/pie';
 import { Pie3dSeriesSpecTransformer } from './series-spec-transformer';
 import { registerPie3dAnimation } from './animation';
 import { registerLayout3d } from '../3d/layout';

packages/vchart-types/types/index.d.ts

@@ -31,7 +31,12 @@ export * from './interaction';
 export { createImage, createPath, createArc3d, createPyramid3d, createRect3d, registerDirectionalLight, registerOrthoCamera, registerViewTransform3dPlugin, graphicCreator, type IGraphic, type IGlyph, type IGroup, type IText, type ILine, type IArea, type IRect, type INode, type IStage, type EasingType, type ILineGraphicAttribute, type ITextGraphicAttribute, type IRectGraphicAttribute, type IGroupGraphicAttribute, type TextAlignType, type TextBaselineType, type GraphicEventType, type IAreaGraphicAttribute, type ISymbolGraphicAttribute } from '@visactor/vrender-core';
 export { ACustomAnimate, AnimateExecutor, RotateBySphereAnimate } from '@visactor/vrender-animate';
 export { AbstractComponent, Segment, MarkPoint, type SegmentAttributes, type Point } from '@visactor/vrender-components';
-export { registerLine, registerRect, registerArc3d, registerPyramid3d, registerRect3d, registerShadowRoot } from '@visactor/vrender-kits';
+export { registerLine } from '@visactor/vrender-kits/register/register-line';
+export { registerRect } from '@visactor/vrender-kits/register/register-rect';
+export { registerArc3d } from '@visactor/vrender-kits/register/register-arc3d';
+export { registerPyramid3d } from '@visactor/vrender-kits/register/register-pyramid3d';
+export { registerRect3d } from '@visactor/vrender-kits/register/register-rect3d';
+export { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
 export * from '@visactor/vlayouts';
 export { DataView, DataSet, svgParser } from '@visactor/vdataset';
 export type { SVGParsedElement, SVGParserResult, ISVGSourceOption } from '@visactor/vdataset';

packages/vchart/package.json

@@ -128,11 +128,11 @@
     "@visactor/vdataset": "~1.0.23",
     "@visactor/vscale": "~1.0.23",
     "@visactor/vlayouts": "~1.0.23",
-    "@visactor/vrender": "^1.1.2",
-    "@visactor/vrender-core": "^1.1.2",
-    "@visactor/vrender-kits": "^1.1.2",
-    "@visactor/vrender-components": "^1.1.2",
-    "@visactor/vrender-animate": "^1.1.2",
+    "@visactor/vrender": "^1.1.3",
+    "@visactor/vrender-core": "^1.1.3",
+    "@visactor/vrender-kits": "^1.1.3",
+    "@visactor/vrender-components": "^1.1.3",
+    "@visactor/vrender-animate": "^1.1.3",
     "@visactor/vutils-extension": "workspace:2.1.1"
   },
   "publishConfig": {

packages/vchart/src/animation/callback-disappear.ts

@@ -1,5 +1,5 @@
 import { AStageAnimate } from '@visactor/vrender-animate/custom/custom-animate';
-import { EasingType } from '@visactor/vrender-core';
+import type { EasingType } from '@visactor/vrender-core';
 
 /**
  * 特效动画基类，提取公共的WebGL和Canvas 2D操作

packages/vchart/src/mark/box-plot.ts

@@ -7,7 +7,8 @@ import { createLine, createRect, type IGlyph, type ILineGraphicAttribute } from
 import { GlyphMark, registerGlyphMark } from './glyph';
 import type { Datum } from '../typings/common';
 import { isValidNumber } from '@visactor/vutils';
-import { registerLine, registerRect } from '@visactor/vrender-kits';
+import { registerLine } from '@visactor/vrender-kits/register/register-line';
+import { registerRect } from '@visactor/vrender-kits/register/register-rect';
 
 const BAR_BOX_PLOT_CHANNELS = [
   'x',

packages/vchart/src/mark/cell.ts

@@ -3,7 +3,8 @@ import type { ICellMarkSpec } from '../typings';
 import type { ICellMark, IMarkGraphic, IMarkStyle } from './interface';
 // eslint-disable-next-line no-duplicate-imports
 import { MarkTypeEnum } from './interface/type';
-import { registerShadowRoot, registerSymbol } from '@visactor/vrender-kits';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
+import { registerSymbol } from '@visactor/vrender-kits/register/register-symbol';
 import { registerSymbolDataLabel } from '@visactor/vrender-components';
 import type { IGraphic, ISymbolGraphicAttribute } from '@visactor/vrender-core';
 import { createSymbol } from '@visactor/vrender-core';

packages/vchart/src/mark/glyph.ts

@@ -6,7 +6,8 @@ import type { IGlyphMark } from './interface/mark';
 import type { MarkType } from './interface/type';
 import { Factory } from '../core/factory';
 import type { Datum } from '../typings/common';
-import { registerGlyph, registerShadowRoot } from '@visactor/vrender-kits';
+import { registerGlyph } from '@visactor/vrender-kits/register/register-glyph';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
 import type { IMarkGraphic } from './interface/common';
 import { DiffState } from './interface/enum';
 import { merge } from '@visactor/vutils';

packages/vchart/src/mark/image.ts

@@ -4,7 +4,8 @@ import { BaseMark } from './base/base-mark';
 import type { IImageMark, IMarkStyle, MarkConstructor } from './interface';
 // eslint-disable-next-line no-duplicate-imports
 import { MarkTypeEnum } from './interface/type';
-import { registerImage, registerShadowRoot } from '@visactor/vrender-kits';
+import { registerImage } from '@visactor/vrender-kits/register/register-image';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
 import { createImage } from '@visactor/vrender-core';
 
 export class ImageMark extends BaseMark<IImageMarkSpec> implements IImageMark {

packages/vchart/src/mark/link-path.ts

@@ -6,7 +6,7 @@ import { MarkTypeEnum } from './interface/type';
 import { GlyphMark, registerGlyphMark } from './glyph';
 import type { IGlyph, IPathGraphicAttribute } from '@visactor/vrender-core';
 import { createPath } from '@visactor/vrender-core';
-import { registerPath } from '@visactor/vrender-kits';
+import { registerPath } from '@visactor/vrender-kits/register/register-path';
 import type { Datum } from '../typings/common';
 
 export const getHorizontalPath = (options: ILinkPathMarkSpec, ratio?: number) => {

packages/vchart/src/mark/liquid.ts

@@ -6,7 +6,7 @@ import type { ILiquidMark } from '../series/liquid/liquid';
 import { GlyphMark, registerGlyphMark } from './glyph';
 import { createArea, type IAreaGraphicAttribute, type IGlyph } from '@visactor/vrender-core';
 import type { IPointLike } from '@visactor/vutils';
-import { registerArea } from '@visactor/vrender-kits';
+import { registerArea } from '@visactor/vrender-kits/register/register-area';
 import type { ILiquidMarkSpec } from '../typings/visual';
 import type { Datum } from '../typings/common';
 

packages/vchart/src/mark/path.ts

@@ -4,7 +4,8 @@ import { BaseMark } from './base/base-mark';
 import type { IMarkStyle, IPathMark } from './interface';
 // eslint-disable-next-line no-duplicate-imports
 import { MarkTypeEnum } from './interface/type';
-import { registerPath, registerShadowRoot } from '@visactor/vrender-kits';
+import { registerPath } from '@visactor/vrender-kits/register/register-path';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
 import { createPath } from '@visactor/vrender-core';
 
 export class PathMark extends BaseMark<IPathMarkSpec> implements IPathMark {

packages/vchart/src/mark/polygon/polygon.ts

@@ -5,7 +5,8 @@ import { BasePolygonMark } from './base-polygon';
 import type { IMarkStyle, IPolygonMark } from '../interface';
 import { MarkTypeEnum } from '../interface/type';
 import { registerPolygonAnimation } from '../../animation/config';
-import { registerPolygon, registerShadowRoot } from '@visactor/vrender-kits';
+import { registerPolygon } from '@visactor/vrender-kits/register/register-polygon';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
 import { createPolygon } from '@visactor/vrender-core';
 
 export class PolygonMark extends BasePolygonMark<IPolygonMarkSpec> implements IPolygonMark {

packages/vchart/src/mark/ripple.ts

@@ -7,7 +7,7 @@ import { GlyphMark, registerGlyphMark } from './glyph';
 import type { Datum } from '../typings/common';
 import { createSymbol, type IGlyph, type ISymbolGraphicAttribute } from '@visactor/vrender-core';
 import { clamp } from '@visactor/vutils';
-import { registerSymbol } from '@visactor/vrender-kits';
+import { registerSymbol } from '@visactor/vrender-kits/register/register-symbol';
 
 export class RippleMark extends GlyphMark<IRippleMarkSpec> implements IRippleMark {
   static readonly type = MarkTypeEnum.ripple;

packages/vchart/src/mark/rule.ts

@@ -4,7 +4,8 @@ import { BaseMark } from './base/base-mark';
 import type { IMarkGraphic, IMarkStyle, IRuleMark } from './interface';
 // eslint-disable-next-line no-duplicate-imports
 import { MarkTypeEnum } from './interface/type';
-import { registerLine, registerShadowRoot } from '@visactor/vrender-kits';
+import { registerLine } from '@visactor/vrender-kits/register/register-line';
+import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
 import type { IGraphic, ILineGraphicAttribute } from '@visactor/vrender-core';
 import { createLine } from '@visactor/vrender-core';
 

packages/vchart/src/series/radar/animation.ts

@@ -3,7 +3,7 @@ import { ClipAngleAnimate, AnimateExecutor } from '@visactor/vrender-animate';
 import { Factory } from '../../core/factory';
 import { PolarPointUpdate, PolarTagPointsUpdate } from '../polar/animation';
 import { DEFAULT_ANIMATION_CONFIG } from '../../animation/config';
-import { registerArc } from '@visactor/vrender-kits';
+import { registerArc } from '@visactor/vrender-kits/register/register-arc';
 import type { IRadarAnimationParams, RadarAppearPreset } from './interface';
 import type { IAnimationTypeConfig, MarkAnimationSpec } from '../../animation/interface';
 import type { Datum } from '../../typings/common';