fix: stabilize BytePack registry singletons

Author: xuefei1313

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

@@ -1,6 +1,6 @@
 import { registerArc3d } from '@visactor/vrender-kits/register/register-arc3d';
 import { registerShadowRoot } from '@visactor/vrender-kits/register/register-shadowRoot';
-import { createArc3d } from '@visactor/vrender-core';
+import { createArc3d } from './graphic-creator';
 import { registerArcAnimation } from '@visactor/vchart/esm/animation/config';
 import { Factory } from '@visactor/vchart/esm/core/factory';
 import { BaseArcMark } from '@visactor/vchart/esm/mark/arc';

packages/vchart-extension/src/charts/3d/graphic-creator.ts

@@ -0,0 +1 @@
+export { createArc3d, createPyramid3d, createRect3d } from '@visactor/vchart/esm/vrender-bridge';

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

@@ -1,4 +1,8 @@
-import { registerDirectionalLight, registerOrthoCamera, registerViewTransform3dPlugin } from '@visactor/vrender-core';
+import {
+  registerDirectionalLight,
+  registerOrthoCamera,
+  registerViewTransform3dPlugin
+} from '@visactor/vrender-core/plugin/3d';
 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';

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

@@ -1,4 +1,4 @@
-import { createPyramid3d } from '@visactor/vrender-core';
+import { createPyramid3d } from './graphic-creator';
 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';

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

@@ -1,4 +1,4 @@
-import { createRect3d } from '@visactor/vrender-core';
+import { createRect3d } from './graphic-creator';
 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';

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

@@ -2,6 +2,7 @@ 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 { registerAnimate } from '@visactor/vchart/esm/plugin/other';
 import type { IPie3dChartSpec } from './interface';
 import { ChartType3dEnum, SeriesType3dEnum } from '../3d/enum';
 import { register3DPlugin } from '../3d/plugin';
@@ -20,6 +21,7 @@ export class Pie3dChart<T extends IPie3dChartSpec = IPie3dChartSpec> extends Bas
 }
 
 export const registerPie3dChart = () => {
+  registerAnimate();
   registerMarkTooltipProcessor();
   register3DPlugin();
   registerLayout3d();

packages/vchart-extension/tsconfig.json

@@ -5,7 +5,11 @@
     "baseUrl": "./",
     "rootDir": "./src",
     "outDir": "./esm",
-    "composite": true
+    "composite": true,
+    "paths": {
+      "@visactor/vrender-core": ["./node_modules/@visactor/vrender-core/es/index"],
+      "@visactor/vrender-core/*": ["./node_modules/@visactor/vrender-core/es/*"]
+    }
   },
   "ts-node": {
     "transpileOnly": true,

packages/vchart/__tests__/unit/component/tooltip/dom-tooltip-handler.test.ts

@@ -0,0 +1,64 @@
+import { DomTooltipHandler } from '../../../../src/plugin/components/tooltip-handler/dom-tooltip-handler';
+import { TOOLTIP_CONTAINER_EL_CLASS_NAME } from '../../../../src/plugin/components/tooltip-handler/constants';
+import { createDiv, removeDom } from '../../../util/dom';
+
+const createTooltipSpec = (spec: any) => ({
+  className: 'vchart-tooltip',
+  style: {
+    shape: {},
+    keyLabel: {},
+    valueLabel: {}
+  },
+  ...spec
+});
+
+const createHandler = (spec: any, chartContainer?: HTMLElement) => {
+  const handler = new DomTooltipHandler() as any;
+
+  handler._component = {
+    getSpec: () => createTooltipSpec(spec)
+  };
+  handler._chartOption = {
+    getTheme: (): undefined => undefined
+  };
+  handler._chartContainer = chartContainer;
+  handler._initStyle();
+
+  return handler as DomTooltipHandler;
+};
+
+describe('DomTooltipHandler', () => {
+  let container: HTMLElement;
+
+  beforeEach(() => {
+    container = createDiv();
+  });
+
+  afterEach(() => {
+    removeDom(container);
+  });
+
+  it('falls back to chart container when tooltip parentElement is not a dom element', () => {
+    const handler = createHandler(
+      {
+        parentElement: {}
+      },
+      container
+    );
+
+    expect(() => handler.initRootDom()).not.toThrow();
+    expect(container.querySelector(`.${TOOLTIP_CONTAINER_EL_CLASS_NAME}`)).toBe(handler.getTooltipContainer());
+    expect(container.querySelector('.vchart-tooltip')).toBe(handler.getRootDom());
+  });
+
+  it('creates tooltip container under an empty valid parentElement', () => {
+    const parentElement = createDiv(container);
+    const handler = createHandler({
+      parentElement
+    });
+
+    handler.initEl();
+
+    expect(parentElement.querySelector(`.${TOOLTIP_CONTAINER_EL_CLASS_NAME}`)).toBe(handler.getTooltipContainer());
+  });
+});

packages/vchart/bundler.config.js

@@ -70,7 +70,6 @@ const umdEntries = Object.keys(crossEnvs)
 
 const multiEnvRuntimeEntries = new Set(['index-lark', 'index-wx', 'index-wx-simple', ...esEntries]);
 const factoryRegistryExternalId = '@visactor/vchart/esm/core/factory-registry';
-const vrenderExternalRE = /^@visactor\/vrender(?:-[^/]+)?(?:\/.*)?$/;
 
 function isBrowserRuntimeEntry(entry) {
   const entryName = path.basename(entry, path.extname(entry));
@@ -82,7 +81,7 @@ function externalizeFactoryRegistryForEsTotal() {
     name: 'externalize-vchart-factory-registry',
     resolveId(source, importer) {
       if (
-        source === './factory-registry' &&
+        (source === './factory-registry' || source === factoryRegistryExternalId) &&
         importer &&
         path.normalize(importer).endsWith(path.normalize('src/core/factory.ts'))
       ) {
@@ -121,7 +120,6 @@ module.exports = {
     plugins
   },
   esTotalRollupOptions: {
-    external: id => vrenderExternalRE.test(id),
     prePlugins: [externalizeFactoryRegistryForEsTotal()]
   },
   nodeResolveOptions: entry =>

packages/vchart/src/animation/index.ts

@@ -1,4 +1,5 @@
-export { registerAnimate as registerVRenderAnimate, registerCustomAnimate } from '@visactor/vrender-animate';
+export { registerVRenderAnimate } from '../vrender-bridge';
+export { registerCustomAnimate } from '@visactor/vrender-animate/custom/register';
 export { registerStateTransition } from './state-transition';
 export { registerSequentialAnimate } from './sequential-animate';
 export {