@meadmin/cli 1.3.7 → 1.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,8 +1,9 @@
1
1
  import { setEnv } from '../utils/env.js';
2
2
  import { addonInit } from './addon.js';
3
+ import { compressInit } from './compress.js';
3
4
  import { crudInit } from './crud.js';
4
5
  import { syncInit } from './sync.js';
5
- import { compressInit } from './compress.js';
6
+ import { updateInit } from './update.js';
6
7
  export const init = (program) => {
7
8
  program.option('-m <char>', 'env环境变量').hook('preAction', (thisCommand) => {
8
9
  setEnv(thisCommand.opts().m);
@@ -11,5 +12,6 @@ export const init = (program) => {
11
12
  crudInit(program);
12
13
  addonInit(program);
13
14
  compressInit(program);
15
+ updateInit(program);
14
16
  };
15
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUN2QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBQ3JDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUM3QyxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsQ0FBQyxPQUFnQixFQUFFLEVBQUU7SUFDdkMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsU0FBUyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLFdBQVcsRUFBRSxFQUFFO1FBQ3ZFLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDL0IsQ0FBQyxDQUFDLENBQUM7SUFDSCxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbEIsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ2xCLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNuQixZQUFZLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0=
17
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29tbWFuZGVycy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDekMsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUN2QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQzdDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFDckMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNyQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBQ3pDLE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBRyxDQUFDLE9BQWdCLEVBQUUsRUFBRTtJQUN2QyxPQUFPLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsV0FBVyxFQUFFLEVBQUU7UUFDdkUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMvQixDQUFDLENBQUMsQ0FBQztJQUNILFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNsQixRQUFRLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbEIsU0FBUyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ25CLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN0QixVQUFVLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDdEIsQ0FBQyxDQUFDIn0=
@@ -0,0 +1,3 @@
1
+ import type { Command } from 'commander';
2
+ export declare const databaseReminder = "\n\u540E\u7EED\u5FC5\u987B\u624B\u52A8\u5904\u7406\uFF1A\n1. \u6587\u4EF6\u5347\u7EA7\u4F1A\u5C06\u6A21\u677F\u65B0\u589E\u4F9D\u8D56\u5199\u5165\u6E05\u5355\uFF1B\u5347\u7EA7\u540E\u8BF7\u6838\u5BF9\u4EBA\u5DE5\u5408\u5E76\u9879\uFF0C\u624B\u52A8\u6267\u884C pnpm install\uFF08\u5982\u5C1A\u672A\u5B89\u88C5\uFF09\uFF0C\u518D\u66F4\u65B0\u540E\u7AEF\u7F16\u8BD1\u4EA7\u7269\u3002\n2. \u5907\u4EFD\u6570\u636E\u5E93\u540E\u624B\u52A8\u6267\u884C\uFF1Apnpm exec meadmin sync * \u540C\u6B65\u6570\u636E\u5E93\u8868\u7ED3\u6784\u3002\n3. \u8C28\u614E\u6267\u884C update.sql\uFF01\u5EFA\u8BAE\u81EA\u884C\u6BD4\u8F83\u7248\u672CSQL\u3001update.sql\u4E0E\u73B0\u6709\u6570\u636E\u5E93\u540E\u518D\u6267\u884C\uFF0C\u5148\u5728\u6D4B\u8BD5\u73AF\u5883\u9A8C\u8BC1\u3002\n4. \u6570\u636E\u5904\u7406\u5B8C\u6210\u540E\uFF0C\u624B\u52A8\u4F9D\u6B21\u6267\u884C\u83DC\u5355\u3001\u7EC4\u7EC7\u3001\u89D2\u8272\u7684\u201C\u4FEE\u590D\u6811\u5173\u7CFB\u201D\u3002\n5. \u5237\u65B0/\u91CD\u65B0\u767B\u5F55\u5E76\u6838\u5BF9\u83DC\u5355\u6388\u6743\u3001\u7EC4\u7EC7\u6570\u636E\u8303\u56F4\u548C\u4E1A\u52A1\u529F\u80FD\u3002\n\u672C\u5DE5\u5177\u4E0D\u81EA\u52A8\u540C\u6B65\u8868\u7ED3\u6784\u3001\u6267\u884CSQL\u6216\u4FEE\u590D\u6811\u5173\u7CFB\u3002\u539F\u59CB\u7248\u672CSQL\u4E0D\u80FD\u76F4\u63A5\u5B8C\u6574\u5BFC\u5165\u5DF2\u6709\u4E1A\u52A1\u5E93\u3002\n\u6587\u4EF6\u56DE\u6EDA\u4E0D\u56DE\u6EDA\u6570\u636E\u5E93\u3002\u65B0\u589E\u6388\u6743\u5173\u8054\u4E5F\u53EF\u80FD\u5F71\u54CD\u5DF2\u6709\u89D2\u8272\u6743\u9650\u3002\n";
3
+ export declare function updateInit(program: Command): void;
@@ -0,0 +1,132 @@
1
+ import { spawnSync } from 'node:child_process';
2
+ import { copyFileSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync } from 'node:fs';
3
+ import { tmpdir } from 'node:os';
4
+ import { basename, join, resolve } from 'node:path';
5
+ import { stdin, stdout } from 'node:process';
6
+ import { createInterface } from 'node:readline/promises';
7
+ import { applyPlan, rollback, saveRecord } from '../update/backup.js';
8
+ import { makePlan } from '../update/planner.js';
9
+ import { validateConfig } from '../update/rules.js';
10
+ import { compareVersions, currentVersion, downloadTemplate, registryManifest, selectVersion } from '../update/template.js';
11
+ import { Log } from '../utils/log.js';
12
+ async function confirm(message) {
13
+ if (!stdin.isTTY || !stdout.isTTY)
14
+ throw new Error('需要交互式终端确认;非交互场景请使用 --dry-run');
15
+ const prompt = createInterface({ input: stdin, output: stdout });
16
+ try {
17
+ return (await prompt.question(message + ' [y/N] ')).trim().toLowerCase() === 'y';
18
+ }
19
+ finally {
20
+ prompt.close();
21
+ }
22
+ }
23
+ export const databaseReminder = `
24
+ 后续必须手动处理:
25
+ 1. 文件升级会将模板新增依赖写入清单;升级后请核对人工合并项,手动执行 pnpm install(如尚未安装),再更新后端编译产物。
26
+ 2. 备份数据库后手动执行:pnpm exec meadmin sync * 同步数据库表结构。
27
+ 3. 谨慎执行 update.sql!建议自行比较版本SQL、update.sql与现有数据库后再执行,先在测试环境验证。
28
+ 4. 数据处理完成后,手动依次执行菜单、组织、角色的“修复树关系”。
29
+ 5. 刷新/重新登录并核对菜单授权、组织数据范围和业务功能。
30
+ 本工具不自动同步表结构、执行SQL或修复树关系。原始版本SQL不能直接完整导入已有业务库。
31
+ 文件回滚不回滚数据库。新增授权关联也可能影响已有角色权限。
32
+ `;
33
+ export function updateInit(program) {
34
+ program
35
+ .command('update')
36
+ .description('基于官方模板升级框架(需确认覆盖,不自动操作数据库)')
37
+ .option('--version <version>', '指定准确的目标稳定版本')
38
+ .option('--config <path>', '自定义跳过规则文件')
39
+ .option('--registry <url>', 'npm registry 地址')
40
+ .option('--dry-run', '仅预览,不写入项目')
41
+ .option('--rollback <id>', '恢复升级批次的文件(不恢复数据库)')
42
+ .action(async (options) => {
43
+ try {
44
+ const root = process.cwd();
45
+ if (!existsSync(join(root, 'package.json')))
46
+ throw new Error('请在目标项目根目录运行');
47
+ if (options.rollback) {
48
+ if (options.version || options.config || options.dryRun)
49
+ throw new Error('--rollback 不能与升级选项组合');
50
+ if (!/^[a-f0-9-]{36}$/.test(options.rollback))
51
+ throw new Error('备份ID无效');
52
+ if (await confirm('将恢复本批次文件,数据库不会恢复,是否继续?'))
53
+ rollback(root, join(root, '.meadmin/updates', options.rollback));
54
+ return;
55
+ }
56
+ const from = currentVersion(root);
57
+ const updates = join(root, '.meadmin/updates');
58
+ if (existsSync(updates))
59
+ for (const id of readdirSync(updates)) {
60
+ const file = join(updates, id, 'record.json');
61
+ if (!existsSync(file))
62
+ continue;
63
+ const record = JSON.parse(readFileSync(file, 'utf8'));
64
+ if (record.phase !== 'rolled-back' && (record.phase !== 'files-complete' || compareVersions(record.to, from) > 0 || ['failed', 'running'].includes(record.installation)))
65
+ throw new Error(`存在待处理升级批次 ${id},请先按报告完成依赖/人工处理或回滚`);
66
+ }
67
+ const npmRegistry = spawnSync(process.platform === 'win32' ? 'npm.cmd' : 'npm', ['config', 'get', 'registry'], { encoding: 'utf8', shell: process.platform === 'win32' });
68
+ const registry = options.registry || process.env.npm_config_registry || (npmRegistry.status === 0 ? npmRegistry.stdout.trim() : '') || 'https://registry.npmjs.org';
69
+ const manifest = await registryManifest(registry);
70
+ const to = selectVersion(from, manifest.versions, options.version);
71
+ if (from === to) {
72
+ console.log(`已是目标版本 ${to},不重置本地文件`);
73
+ return;
74
+ }
75
+ const rulePath = options.config ? resolve(root, options.config) : join(root, 'meadmin.update.json');
76
+ if (options.config && !existsSync(rulePath))
77
+ throw new Error('指定规则文件不存在');
78
+ const config = existsSync(rulePath) ? validateConfig(JSON.parse(readFileSync(rulePath, 'utf8'))) : { skipExisting: {}, mergeSource: {} };
79
+ const rules = config.skipExisting;
80
+ const sourceRules = config.mergeSource;
81
+ const workspace = mkdtempSync(join(tmpdir(), 'meadmin-update-'));
82
+ const [oldTemplate, targetTemplate] = await Promise.all([downloadTemplate(manifest, from, join(workspace, 'old')), downloadTemplate(manifest, to, join(workspace, 'target'))]);
83
+ const plan = makePlan(root, oldTemplate, targetTemplate, to, rules, sourceRules);
84
+ const git = spawnSync('git', ['status', '--porcelain'], { cwd: root, encoding: 'utf8' });
85
+ Log.log(`升级 ${from} → ${to}${from.split('.')[0] !== to.split('.')[0] ? '(跨主版本)' : ''}`);
86
+ if (git.status === 0 && git.stdout.trim())
87
+ console.warn('工作区存在未提交修改,请先审查或提交。');
88
+ for (const item of plan.changes)
89
+ console.log(`${item.action}${item.conflict ? ' [本地冲突]' : ''}: ${item.path}`);
90
+ for (const item of plan.skipped)
91
+ console.log('跳过: ' + item);
92
+ for (const item of plan.manual)
93
+ console.warn('人工处理: ' + item);
94
+ console.log('SQL候选插入(不代表数据库实际新增):', plan.sqlTables);
95
+ Log.log(`参考模板保留于:${workspace}`);
96
+ Log.log(databaseReminder);
97
+ if (options.dryRun)
98
+ return;
99
+ if (!(await confirm('警告:将覆盖上述文件,可能丢失业务修改;特殊文件仅按规则合并。是否继续?')))
100
+ return;
101
+ const directory = applyPlan(root, plan, from, to);
102
+ Log.log(`文件处理完成${plan.manual.length ? ',存在人工处理项' : ''}。备份:${directory};批次:${basename(directory)}`);
103
+ Log.log('依赖清单已合并(包含目标模板新增依赖),请执行 pnpm install 安装。');
104
+ if (await confirm('是否现在执行 pnpm install?可能运行生命周期脚本;选择否后请手动执行。')) {
105
+ const record = JSON.parse(readFileSync(join(directory, 'record.json'), 'utf8'));
106
+ const installBackup = join(directory, 'before-install');
107
+ mkdirSync(installBackup, { recursive: true });
108
+ for (const name of new Set(['pnpm-lock.yaml', 'package.json', ...plan.changes.filter((change) => change.path.endsWith('/package.json')).map((change) => change.path)])) {
109
+ if (existsSync(join(root, name))) {
110
+ mkdirSync(join(installBackup, name, '..'), { recursive: true });
111
+ copyFileSync(join(root, name), join(installBackup, name));
112
+ }
113
+ }
114
+ record.installation = 'running';
115
+ saveRecord(directory, record);
116
+ const install = spawnSync(process.platform === 'win32' ? 'pnpm.cmd' : 'pnpm', ['install'], { cwd: root, stdio: 'inherit', shell: process.platform === 'win32' });
117
+ record.installation = install.status === 0 ? 'completed' : 'failed';
118
+ saveRecord(directory, record);
119
+ if (install.status !== 0) {
120
+ console.warn('依赖安装失败,请手动处理,文件备份仍保留');
121
+ process.exitCode = 1;
122
+ }
123
+ }
124
+ Log.success(databaseReminder);
125
+ }
126
+ catch (error) {
127
+ Log.error(error instanceof Error ? error.message : '', error);
128
+ process.exitCode = 1;
129
+ }
130
+ });
131
+ }
132
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commanders/update.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,21 @@
1
+ import { type Plan } from './planner.js';
2
+ type RecordFile = {
3
+ path: string;
4
+ before: string | null;
5
+ after: string;
6
+ state: 'pending' | 'writing' | 'written';
7
+ };
8
+ export type UpgradeRecord = {
9
+ root: string;
10
+ from: string;
11
+ to: string;
12
+ phase: string;
13
+ files: RecordFile[];
14
+ manual: string[];
15
+ installation: string;
16
+ };
17
+ export declare function safePath(root: string, path: string): string;
18
+ export declare function saveRecord(directory: string, record: UpgradeRecord): void;
19
+ export declare function applyPlan(root: string, plan: Plan, from: string, to: string): string;
20
+ export declare function rollback(root: string, directory: string): void;
21
+ export {};
@@ -0,0 +1,120 @@
1
+ import { randomUUID } from 'node:crypto';
2
+ import { existsSync, lstatSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs';
3
+ import { dirname, join, relative, resolve } from 'node:path';
4
+ import { hash, readLocal } from './planner.js';
5
+ export function safePath(root, path) {
6
+ if (!path || path.includes('\\') || path.includes(':') || path.startsWith('/') || path.split('/').some((x) => x === '..' || x === '.' || !x || ['.git', 'node_modules', '.meadmin', '.workbuddy'].includes(x.toLowerCase())))
7
+ throw new Error('恢复清单路径无效');
8
+ readLocal(root, path);
9
+ return join(root, path);
10
+ }
11
+ function atomic(file, content) {
12
+ mkdirSync(dirname(file), { recursive: true });
13
+ const temporary = file + '.meadmin-' + randomUUID();
14
+ try {
15
+ writeFileSync(temporary, content, { mode: 0o600 });
16
+ renameSync(temporary, file);
17
+ }
18
+ finally {
19
+ if (existsSync(temporary))
20
+ unlinkSync(temporary);
21
+ }
22
+ }
23
+ export function saveRecord(directory, record) {
24
+ atomic(join(directory, 'record.json'), JSON.stringify(record, null, 2));
25
+ }
26
+ export function applyPlan(root, plan, from, to) {
27
+ for (const part of ['.meadmin', '.meadmin/updates']) {
28
+ const location = join(root, part);
29
+ if (existsSync(location) && (lstatSync(location).isSymbolicLink() || !lstatSync(location).isDirectory()))
30
+ throw new Error('升级备份目录不安全');
31
+ }
32
+ for (const change of plan.changes) {
33
+ const before = readLocal(root, change.path);
34
+ if ((before ? hash(before) : null) !== change.previous)
35
+ throw new Error(`预览后文件发生变化:${change.path}`);
36
+ }
37
+ const directory = join(root, '.meadmin/updates', randomUUID());
38
+ mkdirSync(directory, { recursive: true });
39
+ const record = { root: resolve(root), from, to, phase: 'prepared', files: [], manual: plan.manual, installation: 'not-run' };
40
+ for (const change of plan.changes) {
41
+ const before = readLocal(root, change.path);
42
+ if ((before ? hash(before) : null) !== change.previous)
43
+ throw new Error(`备份时文件发生变化:${change.path}`);
44
+ if (before)
45
+ atomic(join(directory, 'original', change.path), before);
46
+ atomic(join(directory, 'target', change.path), change.content);
47
+ record.files.push({ path: change.path, before: change.previous, after: hash(change.content), state: 'pending' });
48
+ }
49
+ saveRecord(directory, record);
50
+ try {
51
+ for (const [index, change] of plan.changes.entries()) {
52
+ const current = readLocal(root, change.path);
53
+ if ((current ? hash(current) : null) !== change.previous)
54
+ throw new Error(`写入前文件发生变化:${change.path}`);
55
+ record.files[index].state = 'writing';
56
+ saveRecord(directory, record);
57
+ atomic(safePath(root, change.path), change.content);
58
+ record.files[index].state = 'written';
59
+ saveRecord(directory, record);
60
+ }
61
+ record.phase = 'files-complete';
62
+ saveRecord(directory, record);
63
+ }
64
+ catch (error) {
65
+ record.phase = 'failed';
66
+ try {
67
+ saveRecord(directory, record);
68
+ }
69
+ catch {
70
+ /* 日志写入失败也必须尝试恢复。 */
71
+ }
72
+ try {
73
+ rollback(root, directory);
74
+ }
75
+ catch (recovery) {
76
+ throw new Error(`${String(error)};恢复未完成:${String(recovery)}。备份:${directory}`, { cause: recovery });
77
+ }
78
+ throw error;
79
+ }
80
+ return directory;
81
+ }
82
+ export function rollback(root, directory) {
83
+ const rel = relative(resolve(root), resolve(directory)).replaceAll('\\', '/');
84
+ if (!/^\.meadmin\/updates\/[a-f0-9-]{36}$/.test(rel))
85
+ throw new Error('备份路径不在项目升级目录');
86
+ let currentDirectory = resolve(root);
87
+ for (const part of rel.split('/')) {
88
+ currentDirectory = join(currentDirectory, part);
89
+ if (!existsSync(currentDirectory) || lstatSync(currentDirectory).isSymbolicLink() || !lstatSync(currentDirectory).isDirectory())
90
+ throw new Error('备份路径不安全');
91
+ }
92
+ readLocal(directory, 'record.json');
93
+ const record = JSON.parse(readFileSync(join(directory, 'record.json'), 'utf8'));
94
+ if (record.root !== resolve(root))
95
+ throw new Error('备份所属项目不匹配');
96
+ if (record.installation !== 'not-run')
97
+ console.warn('安装已执行:仅恢复内容未被再次修改的升级文件;锁文件、node_modules及生命周期脚本影响需人工恢复并重新安装依赖。');
98
+ const candidates = record.files.filter((file) => file.state !== 'pending');
99
+ for (const file of candidates) {
100
+ safePath(root, file.path);
101
+ const current = readLocal(root, file.path), currentHash = current ? hash(current) : null;
102
+ if (currentHash !== file.after && currentHash !== file.before)
103
+ throw new Error(`升级后文件已被修改,拒绝覆盖:${file.path}`);
104
+ if (file.before) {
105
+ const backup = readLocal(directory, 'original/' + file.path);
106
+ if (!backup || hash(backup) !== file.before)
107
+ throw new Error(`备份不完整:${file.path}`);
108
+ }
109
+ }
110
+ for (const file of [...candidates].reverse()) {
111
+ const destination = safePath(root, file.path);
112
+ if (file.before)
113
+ atomic(destination, readFileSync(join(directory, 'original', file.path)));
114
+ else if (existsSync(destination))
115
+ unlinkSync(destination);
116
+ }
117
+ record.phase = 'rolled-back';
118
+ saveRecord(directory, record);
119
+ }
120
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/update/backup.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,7 @@
1
+ export type MergeResult = {
2
+ content: string;
3
+ manual: string[];
4
+ };
5
+ export declare function mergePackage(local: string, target: string, base?: string): MergeResult;
6
+ export declare function mergeConfig(local: string, target: string, base?: string): MergeResult;
7
+ export declare function mergeEntity(local: string, target: string, base?: string): MergeResult;