fix: expose render symbols from core root

packages/vrender-core/src/index.ts

@@ -1,5 +1,6 @@
 export * from './core/global';
 export * from './graphic';
+export { Group } from './graphic/group';
 export { createGraphic, graphicCreator, registerGraphic } from './graphic/graphic-creator';
 export { container, graphicUtil, transformUtil, graphicService, layerService } from './modules';
 export {
@@ -13,12 +14,35 @@ export * from './create';
 export * from './event';
 export * from './interface';
 export * from './render';
+export {
+  IncrementalDrawContribution,
+  ArcRender,
+  Arc3dRender,
+  AreaRender,
+  CircleRender,
+  GraphicRender,
+  LineRender,
+  PathRender,
+  PolygonRender,
+  RectRender,
+  Rect3DRender,
+  SymbolRender,
+  TextRender,
+  RichTextRender,
+  Pyramid3dRender,
+  GlyphRender,
+  ImageRender,
+  RenderSelector,
+  DrawContribution,
+  StarRender
+} from './render/contributions/render/symbol';
 export * from './render/contributions/render/base-render';
 export * from './canvas';
 export * from './core';
 export * from './core/light';
 export * from './core/camera';
 export * from './picker';
+export { PickerService, PickItemInterceptor, PickServiceInterceptor } from './picker/constants';
 export * from './resource-loader/loader';
 export * from './color-string';
 export * from './factory';
@@ -36,6 +60,7 @@ export * from './common/segment';
 export * from './common/canvas-utils';
 export * from './common/contribution-provider';
 export * from './common/generator';
+export { Generator } from './common/generator';
 export * from './common/utils';
 export * from './common/shape/arc';
 export * from './common/shape/rect';
@@ -66,6 +91,7 @@ export * from './common/xml';
 export * from './common/explicit-binding';
 export * from './constants';
 export * from './application';
+export { application } from './application';
 export * from './env-check';
 
 export * from './render/contributions/render/arc-module';

packages/vrender-core/src/render/contributions/render/index.ts

@@ -1,13 +1,17 @@
 export * from './arc-render';
+export * from './arc3d-render';
+export * from './base-3d-render';
 export * from './circle-render';
 export * from './line-render';
 export * from './area-render';
 export * from './path-render';
 export * from './rect-render';
+export * from './rect3d-render';
 export * from './symbol-render';
 export * from './text-render';
 export * from './graphic-render';
 export * from './polygon-render';
+export * from './pyramid3d-render';
 export * from './group-render';
 export * from './image-render';
 export * from './symbol';

packages/vrender-kits/__tests__/unit/build-artifact-imports.test.ts

@@ -6,6 +6,7 @@ const path = require('path');
 const process = require('process');
 
 const packageRoot = process.cwd();
+const corePackageRoot = path.resolve(packageRoot, '../vrender-core');
 const buildRoots = ['es', 'cjs'];
 const artifactExtensions = new Set(['.js', '.d.ts']);
 const forbiddenWorkspaceSourcePatterns = [
@@ -45,3 +46,56 @@ describe('vrender-kits published artifacts', () => {
     expect(offenders).toEqual([]);
   });
 });
+
+function readArtifact(packageDir: string, relativePath: string): string {
+  return fs.readFileSync(path.join(packageDir, relativePath), 'utf8');
+}
+
+function collectRootNamedImports(artifact: string): string[] {
+  const imports = new Set<string>();
+  const importPattern = /import\s+\{([^}]+)\}\s+from\s+['"]@visactor\/vrender-core['"]/g;
+  let match: RegExpExecArray | null;
+
+  while ((match = importPattern.exec(artifact))) {
+    match[1]
+      .split(',')
+      .map(specifier => specifier.trim())
+      .filter(Boolean)
+      .forEach(specifier => {
+        imports.add(specifier.split(/\s+as\s+/)[0].trim());
+      });
+  }
+
+  return Array.from(imports).sort();
+}
+
+function collectBundleNamedExports(artifact: string): string[] {
+  const exports = new Set<string>();
+  const exportPattern = /export\s+\{([^}]+)\}/g;
+  let match: RegExpExecArray | null;
+
+  while ((match = exportPattern.exec(artifact))) {
+    match[1]
+      .split(',')
+      .map(specifier => specifier.trim())
+      .filter(Boolean)
+      .forEach(specifier => {
+        const [, exportedName = specifier] = specifier.match(/\s+as\s+([A-Za-z0-9_$]+)$/) ?? [];
+        exports.add(exportedName.trim());
+      });
+  }
+
+  return Array.from(exports).sort();
+}
+
+describe('vrender-kits and vrender-core bundle artifacts', () => {
+  test('root named imports from vrender-core should exist in the core root bundle export list', () => {
+    const kitsBundle = readArtifact(packageRoot, 'dist/index.es.js');
+    const coreBundle = readArtifact(corePackageRoot, 'dist/index.es.js');
+    const coreRootImports = collectRootNamedImports(kitsBundle);
+    const coreRootExports = new Set(collectBundleNamedExports(coreBundle));
+    const missingImports = coreRootImports.filter(name => !coreRootExports.has(name));
+
+    expect(missingImports).toEqual([]);
+  });
+});

packages/vrender-kits/src/canvas/contributions/browser/canvas.ts

@@ -1,4 +1,5 @@
-import { application, BaseCanvas } from '@visactor/vrender-core';
+import { application } from '@visactor/vrender-core/application';
+import { BaseCanvas } from '@visactor/vrender-core';
 import type { CanvasConfigType, ICanvas, EnvType } from '@visactor/vrender-core';
 import { BrowserContext2d } from './context';
 

packages/vrender-kits/src/canvas/contributions/browser/context.ts

@@ -34,13 +34,13 @@ import {
   type ITextMeasureSpec,
   type IMatrix
 } from '@visactor/vutils';
+import { application } from '@visactor/vrender-core/application';
 import {
   DefaultFillStyle,
   DefaultStrokeStyle,
   DefaultTextStyle,
   createColor,
   getScaledStroke,
-  application,
   matrixAllocate,
   transformMat4,
   createConicalGradient,

packages/vrender-kits/src/canvas/contributions/harmony/context.ts

@@ -1,5 +1,6 @@
 // 参考konva
-import { createColor, getScaledStroke, application } from '@visactor/vrender-core';
+import { application } from '@visactor/vrender-core/application';
+import { createColor, getScaledStroke } from '@visactor/vrender-core';
 import type {
   IContext2d,
   EnvType,

packages/vrender-kits/src/canvas/contributions/lynx/context.ts

@@ -1,5 +1,6 @@
 // 参考konva
-import { createColor, getScaledStroke, application } from '@visactor/vrender-core';
+import { application } from '@visactor/vrender-core/application';
+import { createColor, getScaledStroke } from '@visactor/vrender-core';
 import type { IContext2d, EnvType, ISetStrokeStyleParams, IStrokeStyleParams } from '@visactor/vrender-core';
 import { BrowserContext2d } from '../browser';
 

packages/vrender-kits/src/env/contributions/browser-contribution.ts

@@ -1,4 +1,6 @@
-import { Generator, BaseEnvContribution, application } from '@visactor/vrender-core';
+import { Generator } from '@visactor/vrender-core/common/generator';
+import { application } from '@visactor/vrender-core/application';
+import { BaseEnvContribution } from '@visactor/vrender-core';
 import type {
   ICanvasLike,
   EnvType,

packages/vrender-kits/src/event/extension/gesture.ts

@@ -1,4 +1,5 @@
-import { application, clock, WILDCARD } from '@visactor/vrender-core';
+import { application } from '@visactor/vrender-core/application';
+import { clock, WILDCARD } from '@visactor/vrender-core';
 import type { IEventTarget, IFederatedPointerEvent, FederatedPointerEvent, INode } from '@visactor/vrender-core';
 import type { IPointLike } from '@visactor/vutils';
 import { EventEmitter } from '@visactor/vutils';

packages/vrender-kits/src/graphic/gif-image.ts

@@ -1,5 +1,6 @@
 import type { IImageGraphicAttribute, ISetAttributeContext } from '@visactor/vrender-core';
-import { application, Image, ResourceLoader } from '@visactor/vrender-core';
+import { application } from '@visactor/vrender-core/application';
+import { Image, ResourceLoader } from '@visactor/vrender-core';
 import type { ITimeline } from '@visactor/vrender-core';
 import { isString } from '@visactor/vutils';
 import type { ParsedFrame } from 'gifuct-js';

packages/vrender-kits/src/installers/app.ts

@@ -1,7 +1,6 @@
+import { PickItemInterceptor, PickServiceInterceptor } from '@visactor/vrender-core/picker/constants';
+import { application } from '@visactor/vrender-core/application';
 import {
-  PickItemInterceptor,
-  PickServiceInterceptor,
-  application,
   arc3dModule,
   arcModule,
   areaModule,

packages/vrender-kits/src/jsx/jsx-classic.ts

@@ -1,5 +1,6 @@
 import { isArray, isString } from '@visactor/vutils';
-import { Group, graphicCreator } from '@visactor/vrender-core';
+import { Group } from '@visactor/vrender-core/graphic/group';
+import { graphicCreator } from '@visactor/vrender-core';
 import { REACT_TO_CANOPUS_EVENTS } from './graphicType';
 
 function flatten(list: any, out: any[]): void {

packages/vrender-kits/src/picker/canvas-module.ts

@@ -1,4 +1,5 @@
-import { DrawContribution, PickItemInterceptor, PickerService, PickServiceInterceptor } from '@visactor/vrender-core';
+import { DrawContribution } from '@visactor/vrender-core/render/symbol';
+import { PickItemInterceptor, PickerService, PickServiceInterceptor } from '@visactor/vrender-core/picker/constants';
 import { createContributionProvider, resolveContainerBinding } from '../common/explicit-binding';
 import { DefaultCanvasPickerService } from './canvas-picker-service';
 import { bindCanvasPickerContribution } from './contributions/canvas-picker/module';

packages/vrender-kits/src/picker/canvas-picker-service.ts

@@ -1,6 +1,7 @@
 import type { IMatrix, IPointLike } from '@visactor/vutils';
 // eslint-disable-next-line
-import { DefaultPickService, canvasAllocate, application } from '@visactor/vrender-core';
+import { application } from '@visactor/vrender-core/application';
+import { DefaultPickService, canvasAllocate } from '@visactor/vrender-core';
 import type {
   ICanvas,
   IContext2d,

packages/vrender-kits/src/picker/contributions/canvas-picker/arc-module.ts

@@ -1,4 +1,4 @@
-import { ArcRender } from '@visactor/vrender-core';
+import { ArcRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasArcPicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasArcPicker } from './arc-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/arc3d-module.ts

@@ -1,4 +1,4 @@
-import { Arc3dRender } from '@visactor/vrender-core';
+import { Arc3dRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasArc3dPicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasArc3dPicker } from './arc3d-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/area-module.ts

@@ -1,4 +1,4 @@
-import { AreaRender } from '@visactor/vrender-core';
+import { AreaRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasAreaPicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasAreaPicker } from './area-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/circle-module.ts

@@ -1,4 +1,4 @@
-import { CircleRender } from '@visactor/vrender-core';
+import { CircleRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasCirclePicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasCirclePicker } from './circle-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/glyph-module.ts

@@ -1,4 +1,4 @@
-import { GlyphRender } from '@visactor/vrender-core';
+import { GlyphRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasGlyphPicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasGlyphPicker } from './glyph-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/image-module.ts

@@ -1,4 +1,4 @@
-import { ImageRender } from '@visactor/vrender-core';
+import { ImageRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasImagePicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasImagePicker } from './image-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/line-module.ts

@@ -1,4 +1,4 @@
-import { LineRender } from '@visactor/vrender-core';
+import { LineRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasLinePicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasLinePicker } from './line-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/lottie-module.ts

@@ -1,4 +1,4 @@
-import { RectRender } from '@visactor/vrender-core';
+import { RectRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasLottiePicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasLottiePicker } from './lottie-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/path-module.ts

@@ -1,4 +1,4 @@
-import { PathRender } from '@visactor/vrender-core';
+import { PathRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPathPicker, CanvasPickerContribution } from '../constants';
 import { DefaultCanvasPathPicker } from './path-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/polygon-module.ts

@@ -1,4 +1,4 @@
-import { PolygonRender } from '@visactor/vrender-core';
+import { PolygonRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasPolygonPicker } from '../constants';
 import { DefaultCanvasPolygonPicker } from './polygon-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/pyramid3d-module.ts

@@ -1,4 +1,4 @@
-import { Pyramid3dRender } from '@visactor/vrender-core';
+import { Pyramid3dRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasPyramid3dPicker } from '../constants';
 import { DefaultCanvasPyramid3dPicker } from './pyramid3d-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/rect-module.ts

@@ -1,4 +1,4 @@
-import { RectRender } from '@visactor/vrender-core';
+import { RectRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasRectPicker } from '../constants';
 import { DefaultCanvasRectPicker } from './rect-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/rect3d-module.ts

@@ -1,4 +1,4 @@
-import { Rect3DRender } from '@visactor/vrender-core';
+import { Rect3DRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasRect3dPicker } from '../constants';
 import { DefaultCanvasRect3dPicker } from './rect3d-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/richtext-module.ts

@@ -1,4 +1,4 @@
-import { RichTextRender } from '@visactor/vrender-core';
+import { RichTextRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasRichTextPicker } from '../constants';
 import { DefaultCanvasRichTextPicker } from './richtext-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/star-module.ts

@@ -1,4 +1,4 @@
-import { StarRender } from '@visactor/vrender-core';
+import { StarRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasStarPicker } from '../constants';
 import { DefaultCanvasStarPicker } from './star-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/symbol-module.ts

@@ -1,4 +1,4 @@
-import { SymbolRender } from '@visactor/vrender-core';
+import { SymbolRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasSymbolPicker } from '../constants';
 import { DefaultCanvasSymbolPicker } from './symbol-picker';

packages/vrender-kits/src/picker/contributions/canvas-picker/text-module.ts

@@ -1,4 +1,4 @@
-import { TextRender } from '@visactor/vrender-core';
+import { TextRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { CanvasPickerContribution, CanvasTextPicker } from '../constants';
 import { DefaultCanvasTextPicker } from './text-picker';

packages/vrender-kits/src/picker/contributions/math-picker/arc-module.ts

@@ -1,4 +1,4 @@
-import { ArcRender } from '@visactor/vrender-core';
+import { ArcRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathArcPicker, MathPickerContribution } from '../constants';
 import { DefaultMathArcPicker } from './arc-picker';

packages/vrender-kits/src/picker/contributions/math-picker/area-module.ts

@@ -1,4 +1,4 @@
-import { AreaRender } from '@visactor/vrender-core';
+import { AreaRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathAreaPicker, MathPickerContribution } from '../constants';
 import { DefaultMathAreaPicker } from './area-picker';

packages/vrender-kits/src/picker/contributions/math-picker/circle-module.ts

@@ -1,4 +1,4 @@
-import { CircleRender } from '@visactor/vrender-core';
+import { CircleRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathCirclePicker, MathPickerContribution } from '../constants';
 import { DefaultMathCirclePicker } from './circle-picker';

packages/vrender-kits/src/picker/contributions/math-picker/glyph-module.ts

@@ -1,4 +1,4 @@
-import { GlyphRender } from '@visactor/vrender-core';
+import { GlyphRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathGlyphPicker, MathPickerContribution } from '../constants';
 import { DefaultMathGlyphPicker } from './glyph-picker';

packages/vrender-kits/src/picker/contributions/math-picker/line-module.ts

@@ -1,4 +1,4 @@
-import { LineRender } from '@visactor/vrender-core';
+import { LineRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathLinePicker, MathPickerContribution } from '../constants';
 import { DefaultMathLinePicker } from './line-picker';

packages/vrender-kits/src/picker/contributions/math-picker/path-module.ts

@@ -1,4 +1,4 @@
-import { PathRender } from '@visactor/vrender-core';
+import { PathRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathPathPicker, MathPickerContribution } from '../constants';
 import { DefaultMathPathPicker } from './path-picker';

packages/vrender-kits/src/picker/contributions/math-picker/polygon-module.ts

@@ -1,4 +1,4 @@
-import { PolygonRender } from '@visactor/vrender-core';
+import { PolygonRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathPickerContribution, MathPolygonPicker } from '../constants';
 import { DefaultMathPolygonPicker } from './polygon-picker';

packages/vrender-kits/src/picker/contributions/math-picker/rect-module.ts

@@ -1,4 +1,4 @@
-import { RectRender } from '@visactor/vrender-core';
+import { RectRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathPickerContribution, MathRectPicker } from '../constants';
 import { DefaultMathRectPicker } from './rect-picker';

packages/vrender-kits/src/picker/contributions/math-picker/richtext-module.ts

@@ -1,4 +1,4 @@
-import { RichTextRender } from '@visactor/vrender-core';
+import { RichTextRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathPickerContribution, MathRichTextPicker } from '../constants';
 import { DefaultMathRichTextPicker } from './richtext-picker';

packages/vrender-kits/src/picker/contributions/math-picker/symbol-module.ts

@@ -1,4 +1,4 @@
-import { SymbolRender } from '@visactor/vrender-core';
+import { SymbolRender } from '@visactor/vrender-core/render/symbol';
 import { resolveContainerBinding } from '../../../common/explicit-binding';
 import { MathPickerContribution, MathSymbolPicker } from '../constants';
 import { DefaultMathSymbolPicker } from './symbol-picker';