fix: merge new external plugin presets into runtime settings

Author: TomyJan

packages/tego/src/__tests__/utils.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { convertEnvToSettings } from '../utils';
+import { convertEnvToSettings, mergeExternalPluginPresets } from '../utils';
 
 describe('convertEnvToSettings', () => {
   it('should convert flat env into structured settings object', () => {
@@ -22,3 +22,32 @@ describe('convertEnvToSettings', () => {
     expect(result.env.INIT_APP_LANG).toBe('zh-CN');
   });
 });
+
+describe('mergeExternalPluginPresets', () => {
+  it('should append plugins added by a newer default preset', () => {
+    const defaults = [
+      { name: 'existing', enabledByDefault: true },
+      { name: 'new-plugin', enabledByDefault: false },
+    ];
+    const runtime = [{ name: 'existing', enabledByDefault: true }];
+
+    expect(mergeExternalPluginPresets(defaults, runtime)).toEqual(defaults);
+  });
+
+  it('should preserve runtime overrides for existing plugins', () => {
+    const defaults = [{ name: 'existing', enabledByDefault: true }];
+    const runtime = [{ name: 'existing', enabledByDefault: false }];
+
+    expect(mergeExternalPluginPresets(defaults, runtime)).toEqual(runtime);
+  });
+
+  it('should preserve runtime-only plugins without creating duplicates', () => {
+    const defaults = [{ name: 'existing', enabledByDefault: true }];
+    const runtime = [
+      { name: 'existing', enabledByDefault: false },
+      { name: 'private-plugin', enabledByDefault: false },
+    ];
+
+    expect(mergeExternalPluginPresets(defaults, runtime)).toEqual(runtime);
+  });
+});

packages/tego/src/constants.ts

@@ -4,17 +4,23 @@ import TachybaseGlobal from '@tachybase/globals';
 
 import _ from 'lodash';
 
-import { convertEnvToSettings, parseEnvironment } from './utils';
+import { convertEnvToSettings, mergeExternalPluginPresets, parseEnvironment } from './utils';
 
 // 解析环境变量
 parseEnvironment();
 
 // 读取配置
+const defaultSettingsPath = path.join(__dirname, '../presets/settings.js');
 if (!fs.existsSync(`${process.env.TEGO_RUNTIME_HOME}/settings.js`)) {
   fs.mkdirSync(`${process.env.TEGO_RUNTIME_HOME}`, { recursive: true });
-  fs.copyFileSync(path.join(__dirname, '../presets/settings.js'), `${process.env.TEGO_RUNTIME_HOME}/settings.js`);
+  fs.copyFileSync(defaultSettingsPath, `${process.env.TEGO_RUNTIME_HOME}/settings.js`);
 }
+const defaultSettings = require(defaultSettingsPath);
 const baseSettings = require(`${process.env.TEGO_RUNTIME_HOME}/settings.js`);
+baseSettings.presets.externalPlugins = mergeExternalPluginPresets(
+  defaultSettings.presets.externalPlugins,
+  baseSettings.presets.externalPlugins,
+);
 
 // 用环境变量覆盖 settings.js 的配置 (环境变量优先)
 const envSettings = convertEnvToSettings(process.env as any);

packages/tego/src/utils.ts

@@ -274,3 +274,16 @@ export function convertEnvToSettings(flatEnv: Record<string, string | undefined>
 
   return settings;
 }
+
+export interface ExternalPluginPreset {
+  name: string;
+  enabledByDefault: boolean;
+}
+
+export function mergeExternalPluginPresets(
+  defaultPlugins: ExternalPluginPreset[] = [],
+  runtimePlugins: ExternalPluginPreset[] = [],
+) {
+  const runtimePluginNames = new Set(runtimePlugins.map((plugin) => plugin.name));
+  return [...runtimePlugins, ...defaultPlugins.filter((plugin) => !runtimePluginNames.has(plugin.name))];
+}