fix: externalize shared VChart factory registry

xuefei1313 · xuefei1313 · commit e505df6af356 · 2026-07-01T11:16:01.000+08:00
diff --git a/packages/vchart/bundler.config.js b/packages/vchart/bundler.config.js
@@ -69,12 +69,33 @@ const umdEntries = Object.keys(crossEnvs)
   .filter((input, index, arr) => arr.indexOf(input, 0) === index);
 
 const multiEnvRuntimeEntries = new Set(['index-lark', 'index-wx', 'index-wx-simple', ...esEntries]);
+const factoryRegistryExternalId = '@visactor/vchart/esm/core/factory-registry';
 
 function isBrowserRuntimeEntry(entry) {
   const entryName = path.basename(entry, path.extname(entry));
   return !multiEnvRuntimeEntries.has(entryName);
 }
 
+function externalizeFactoryRegistryForEsTotal() {
+  return {
+    name: 'externalize-vchart-factory-registry',
+    resolveId(source, importer) {
+      if (
+        source === './factory-registry' &&
+        importer &&
+        path.normalize(importer).endsWith(path.normalize('src/core/factory.ts'))
+      ) {
+        return {
+          id: factoryRegistryExternalId,
+          external: true
+        };
+      }
+
+      return null;
+    }
+  };
+}
+
 /**
  * @type {import('@internal/bundler').Config}
  */
@@ -98,6 +119,9 @@ module.exports = {
   rollupOptions: {
     plugins
   },
+  esTotalRollupOptions: {
+    prePlugins: [externalizeFactoryRegistryForEsTotal()]
+  },
   nodeResolveOptions: entry =>
     isBrowserRuntimeEntry(entry)
       ? {
diff --git a/packages/vchart/src/core/factory-registry.ts b/packages/vchart/src/core/factory-registry.ts
@@ -0,0 +1,80 @@
+import type { Transform, Parser } from '@visactor/vdataset';
+// eslint-disable-next-line no-duplicate-imports
+import { fields, filter, fold, csvParser, dsvParser, tsvParser } from '@visactor/vdataset';
+import type { IChartConstructor } from '../chart/interface';
+import type { ISeriesConstructor } from '../series/interface';
+import type { IComponentConstructor } from '../component/interface';
+import type { MarkConstructor } from '../mark/interface';
+import type { IRegionConstructor } from '../region/interface';
+import type { ILayoutConstructor } from '../layout/interface';
+import type { IChartPluginConstructor } from '../plugin/chart/interface';
+import type { IComponentPluginConstructor } from '../plugin/components/interface';
+import type { IGraphic } from '@visactor/vrender-core';
+import type { GrammarTransformOption, IStageEventPlugin, VRenderComponentOptions } from './interface';
+import type { MarkAnimationSpec } from '../animation/interface';
+import type { ITriggerConstructor } from '../interaction/interface/trigger';
+import type { IComposedEventConstructor } from '../index-harmony-simple';
+import type { ITooltipProcessorConstructor } from '../component/tooltip/processor/interface';
+import type { IVChartPluginConstructor } from '../plugin/vchart';
+
+export interface IFactoryRegistry {
+  charts: { [key: string]: IChartConstructor };
+  series: { [key: string]: ISeriesConstructor };
+  components: {
+    [key: string]: {
+      cmp: IComponentConstructor;
+      alwaysCheck?: boolean;
+      createOrder: number;
+    };
+  };
+  graphicComponents: Record<string, (attrs: any, options?: VRenderComponentOptions) => IGraphic>;
+  marks: { [key: string]: MarkConstructor };
+  regions: { [key: string]: IRegionConstructor };
+  animations: { [key: string]: (params?: any, preset?: any) => MarkAnimationSpec };
+  implements: { [key: string]: (...args: any) => void };
+  chartPlugin: { [key: string]: IChartPluginConstructor };
+  vChartPlugin: { [key: string]: IVChartPluginConstructor };
+  componentPlugin: { [key: string]: IComponentPluginConstructor };
+  transforms: { [key: string]: Transform };
+  dataParser: { [key: string]: Parser };
+  layout: { [key: string]: ILayoutConstructor };
+  grammarTransforms: Record<string, GrammarTransformOption>;
+  stageEventPlugins: Record<string, IStageEventPlugin<any>>;
+  interactionTriggers: Record<string, ITriggerConstructor>;
+  composedEventMap: Record<string, IComposedEventConstructor>;
+  tooltipProcessors: Record<string, ITooltipProcessorConstructor>;
+  formatter?: (text: string | number | string[] | number[], datum: any, formatter: string | string[]) => any;
+}
+
+export const factoryRegistry: IFactoryRegistry = {
+  charts: {},
+  series: {},
+  components: {},
+  graphicComponents: {},
+  marks: {},
+  regions: {},
+  animations: {},
+  implements: {},
+  chartPlugin: {},
+  vChartPlugin: {},
+  componentPlugin: {},
+  transforms: {
+    // buildIn transforms
+    fields,
+    filter,
+    fold
+  },
+  dataParser: {
+    // buildIn parser
+    csv: csvParser,
+    dsv: dsvParser,
+    tsv: tsvParser
+  },
+  layout: {},
+  grammarTransforms: {},
+  stageEventPlugins: {},
+  interactionTriggers: {},
+  composedEventMap: {},
+  tooltipProcessors: {},
+  formatter: undefined
+};
diff --git a/packages/vchart/src/core/factory.ts b/packages/vchart/src/core/factory.ts
@@ -13,8 +13,6 @@ import { MarkTypeEnum } from '../mark/interface/type';
 import type { IRegion, IRegionConstructor } from '../region/interface';
 import type { IBaseModelSpecTransformer, IBaseModelSpecTransformerOption, IModelOption } from '../model/interface';
 import type { Transform, Parser } from '@visactor/vdataset';
-// eslint-disable-next-line no-duplicate-imports
-import { fields, filter, fold, csvParser, dsvParser, tsvParser } from '@visactor/vdataset';
 import type { ILayoutConstructor } from '../layout/interface';
 import type { IChartPluginConstructor } from '../plugin/chart/interface';
 import type { IComponentPluginConstructor } from '../plugin/components/interface';
@@ -26,44 +24,37 @@ import type { IComposedEventConstructor } from '../index-harmony-simple';
 import type { ITooltipProcessorConstructor } from '../component/tooltip/processor/interface';
 import type { ITooltip } from '../component';
 import type { IVChartPluginConstructor } from '../plugin/vchart';
+import { factoryRegistry } from './factory-registry';
 
 export class Factory {
-  private static _charts: { [key: string]: IChartConstructor } = {};
-  private static _series: { [key: string]: ISeriesConstructor } = {};
+  private static _charts: { [key: string]: IChartConstructor } = factoryRegistry.charts;
+  private static _series: { [key: string]: ISeriesConstructor } = factoryRegistry.series;
   private static _components: {
     [key: string]: {
       cmp: IComponentConstructor;
       alwaysCheck?: boolean;
       createOrder: number;
     };
-  } = {};
-  private static _graphicComponents: Record<string, (attrs: any, options?: VRenderComponentOptions) => IGraphic> = {};
-  private static _marks: { [key: string]: MarkConstructor } = {};
-  private static _regions: { [key: string]: IRegionConstructor } = {};
-  private static _animations: { [key: string]: (params?: any, preset?: any) => MarkAnimationSpec } = {};
-  private static _implements: { [key: string]: (...args: any) => void } = {};
-  private static _chartPlugin: { [key: string]: IChartPluginConstructor } = {};
-  private static _vChartPlugin: { [key: string]: IVChartPluginConstructor } = {};
-  private static _componentPlugin: { [key: string]: IComponentPluginConstructor } = {};
+  } = factoryRegistry.components;
+  private static _graphicComponents: Record<string, (attrs: any, options?: VRenderComponentOptions) => IGraphic> =
+    factoryRegistry.graphicComponents;
+  private static _marks: { [key: string]: MarkConstructor } = factoryRegistry.marks;
+  private static _regions: { [key: string]: IRegionConstructor } = factoryRegistry.regions;
+  private static _animations: { [key: string]: (params?: any, preset?: any) => MarkAnimationSpec } =
+    factoryRegistry.animations;
+  private static _implements: { [key: string]: (...args: any) => void } = factoryRegistry.implements;
+  private static _chartPlugin: { [key: string]: IChartPluginConstructor } = factoryRegistry.chartPlugin;
+  private static _vChartPlugin: { [key: string]: IVChartPluginConstructor } = factoryRegistry.vChartPlugin;
+  private static _componentPlugin: { [key: string]: IComponentPluginConstructor } = factoryRegistry.componentPlugin;
   private static _formatter: (
     text: string | number | string[] | number[],
     datum: any,
     formatter: string | string[]
   ) => any;
 
-  static transforms: { [key: string]: Transform } = {
-    // buildIn transforms
-    fields: fields,
-    filter: filter,
-    fold: fold
-  };
-  static dataParser: { [key: string]: Parser } = {
-    // buildIn parser
-    csv: csvParser,
-    dsv: dsvParser,
-    tsv: tsvParser
-  };
-  static _layout: { [key: string]: ILayoutConstructor } = {};
+  static transforms: { [key: string]: Transform } = factoryRegistry.transforms;
+  static dataParser: { [key: string]: Parser } = factoryRegistry.dataParser;
+  static _layout: { [key: string]: ILayoutConstructor } = factoryRegistry.layout;
 
   static registerChart(key: string, chart: IChartConstructor) {
     Factory._charts[key] = chart;
@@ -98,7 +89,7 @@ export class Factory {
     Factory.transforms[key] = transform;
   }
 
-  private static _grammarTransforms: Record<string, GrammarTransformOption> = {};
+  private static _grammarTransforms: Record<string, GrammarTransformOption> = factoryRegistry.grammarTransforms;
 
   static registerGrammarTransform(type: string, transform: GrammarTransformOption) {
     Factory._grammarTransforms[type] = transform;
@@ -288,13 +279,14 @@ export class Factory {
 
   static registerFormatter(func: typeof Factory['_formatter']) {
     this._formatter = func;
+    factoryRegistry.formatter = func;
   }
 
   static getFormatter() {
-    return this._formatter;
+    return factoryRegistry.formatter ?? this._formatter;
   }
 
-  private static _stageEventPlugins: Record<string, IStageEventPlugin<any>> = {};
+  private static _stageEventPlugins: Record<string, IStageEventPlugin<any>> = factoryRegistry.stageEventPlugins;
 
   static registerStageEventPlugin = (type: string, Plugin: IStageEventPlugin<any>) => {
     Factory._stageEventPlugins[type] = Plugin;
@@ -304,7 +296,7 @@ export class Factory {
     return Factory._stageEventPlugins[type];
   };
 
-  private static _interactionTriggers: Record<string, ITriggerConstructor> = {};
+  private static _interactionTriggers: Record<string, ITriggerConstructor> = factoryRegistry.interactionTriggers;
 
   static registerInteractionTrigger = (interactionType: string, interaction: ITriggerConstructor) => {
     Factory._interactionTriggers[interactionType] = interaction;
@@ -323,7 +315,7 @@ export class Factory {
     return !!Factory._interactionTriggers[interactionType];
   }
 
-  private static _composedEventMap: Record<string, IComposedEventConstructor> = {};
+  private static _composedEventMap: Record<string, IComposedEventConstructor> = factoryRegistry.composedEventMap;
 
   static registerComposedEvent = (eType: string, composedEvent: IComposedEventConstructor) => {
     Factory._composedEventMap[eType] = composedEvent;
@@ -333,7 +325,7 @@ export class Factory {
     return Factory._composedEventMap[eType];
   }
 
-  private static _tooltipProcessors: Record<string, ITooltipProcessorConstructor> = {};
+  private static _tooltipProcessors: Record<string, ITooltipProcessorConstructor> = factoryRegistry.tooltipProcessors;
   static registerTooltipProcessor = (type: string, processor: ITooltipProcessorConstructor) => {
     Factory._tooltipProcessors[type] = processor;
   };
diff --git a/tools/bundler/src/bootstrap.ts b/tools/bundler/src/bootstrap.ts
@@ -4,7 +4,7 @@ import ms from 'ms';
 import watcher from 'glob-watcher';
 import { DebugConfig } from './logic/debug';
 import { parserCLIArgs, getDefaultConfig, getFinalConfig, loadConfigFile, DEFAULT_CONFIG_FILE } from './logic/config';
-import type { _ModuleKind } from './logic/config';
+import type { _ModuleKind, Config } from './logic/config';
 import { loadPackageJson } from './logic/package';
 import Undertaker, { Task } from 'undertaker';
 import Spinnies from '@trufflesuite/spinnies';
@@ -32,6 +32,19 @@ enum Tasks {
   // COPY_DIST = "Copy dist",
   COPY_FILES = 'Copy files'
 }
+
+function mergeRollupOptions(
+  base: Config['rollupOptions'],
+  extra: Config['esTotalRollupOptions']
+): Config['rollupOptions'] {
+  return {
+    ...base,
+    ...extra,
+    prePlugins: [...(base.prePlugins ?? []), ...(extra.prePlugins ?? [])],
+    plugins: [...((base.plugins ?? []) as any[]), ...((extra.plugins ?? []) as any[])]
+  };
+}
+
 async function bootstrap() {
   const args = parserCLIArgs(process.argv.slice(2));
   DebugConfig('CLI args', args);
@@ -104,7 +117,18 @@ async function bootstrap() {
         return;
       } else if (format === 'es' && config.esTotalFile) {
         subBuildTasks.push(`${taskName}_total`);
-        _task(`${taskName}_total`, () => buildES({ ...config, minify: false }, PROJECT_ROOT, rawPackageJson, false));
+        _task(`${taskName}_total`, () =>
+          buildES(
+            {
+              ...config,
+              minify: false,
+              rollupOptions: mergeRollupOptions(config.rollupOptions, config.esTotalRollupOptions)
+            },
+            PROJECT_ROOT,
+            rawPackageJson,
+            false
+          )
+        );
       }
 
       _task(taskName, () =>
diff --git a/tools/bundler/src/logic/config.ts b/tools/bundler/src/logic/config.ts
@@ -1,6 +1,6 @@
 import ArgsParser, { Arguments } from 'yargs-parser';
 import type { RawPackageJson } from './package';
-import type { RollupOptions } from 'rollup';
+import type { Plugin, RollupOptions } from 'rollup';
 import type { Alias } from '@rollup/plugin-alias';
 import type { RollupNodeResolveOptions } from '@rollup/plugin-node-resolve';
 
@@ -102,7 +102,9 @@ export interface Config {
   // 构建 UMD 产物时，传递给 @rollup/plugin-alias 作为 entries 的选项
   alias: Array<Alias>;
   // 额外的 rollup 配置项
-  rollupOptions: Omit<RollupOptions, 'output'>;
+  rollupOptions: Omit<RollupOptions, 'output'> & { prePlugins?: Plugin[] };
+  // 仅用于 esTotalFile 产物的额外 rollup 配置项
+  esTotalRollupOptions: Omit<RollupOptions, 'output'> & { prePlugins?: Plugin[] };
   // 传给 @rollup/plugin-node-resolve 的配置项
   nodeResolveOptions:
     | RollupNodeResolveOptions
@@ -159,6 +161,7 @@ export function getDefaultConfig(): Config {
     external: [],
     alias: [],
     rollupOptions: {},
+    esTotalRollupOptions: {},
     nodeResolveOptions: {},
     preTasks: {},
     postTasks: {},
diff --git a/tools/bundler/src/logic/rollup.config.ts b/tools/bundler/src/logic/rollup.config.ts
@@ -42,11 +42,14 @@ export function getRollupOptions(
   babelPlugins: BabelPlugins,
   config: Config
 ): RollupOptions {
+  const { prePlugins = [], plugins = [], ...rollupOptions } = config.rollupOptions;
+
   return {
     input: entry,
     external: getExternal(rawPackageJson, config.external),
-    ...config.rollupOptions,
+    ...rollupOptions,
     plugins: [
+      ...prePlugins,
       resolve(getNodeResolveOptions(entry, config)),
       commonjs(),
       babel({ ...babelPlugins, babelHelpers: 'bundled' }),
@@ -68,7 +71,7 @@ export function getRollupOptions(
       }),
       Alias({ entries: config.alias }),
       ...(config.minify ? [terser()] : []),
-      ...((config.rollupOptions.plugins as Plugin[]) || [])
+      ...(plugins as Plugin[])
     ]
   };
 }
