@meadmin/cli 1.3.6 → 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.
- package/dist/commanders/index.js +4 -2
- package/dist/commanders/update.d.ts +3 -0
- package/dist/commanders/update.js +132 -0
- package/dist/update/backup.d.ts +21 -0
- package/dist/update/backup.js +120 -0
- package/dist/update/merge.d.ts +7 -0
- package/dist/update/merge.js +432 -0
- package/dist/update/planner.d.ts +17 -0
- package/dist/update/planner.js +116 -0
- package/dist/update/rules.d.ts +12 -0
- package/dist/update/rules.js +55 -0
- package/dist/update/source.d.ts +10 -0
- package/dist/update/source.js +750 -0
- package/dist/update/sql.d.ts +12 -0
- package/dist/update/sql.js +589 -0
- package/dist/update/template.d.ts +20 -0
- package/dist/update/template.js +147 -0
- package/package.json +4 -4
- package/template/update.defaults.json +29 -0
|
@@ -0,0 +1,432 @@
|
|
|
1
|
+
import ts from 'typescript';
|
|
2
|
+
const dependencyGroups = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'];
|
|
3
|
+
function apply(text, edits) {
|
|
4
|
+
return [...edits]
|
|
5
|
+
.reverse()
|
|
6
|
+
.sort((a, b) => b.start - a.start)
|
|
7
|
+
.reduce((result, edit) => result.slice(0, edit.start) + edit.text + result.slice(edit.end), text);
|
|
8
|
+
}
|
|
9
|
+
function unwrap(node) {
|
|
10
|
+
while (ts.isParenthesizedExpression(node) || ts.isAsExpression(node) || ts.isSatisfiesExpression(node) || ts.isTypeAssertionExpression(node)) {
|
|
11
|
+
node = node.expression;
|
|
12
|
+
}
|
|
13
|
+
return node;
|
|
14
|
+
}
|
|
15
|
+
function key(node) {
|
|
16
|
+
return node && (ts.isIdentifier(node) || ts.isStringLiteral(node) || ts.isNumericLiteral(node)) ? node.text : undefined;
|
|
17
|
+
}
|
|
18
|
+
function parse(text, name) {
|
|
19
|
+
const file = ts.createSourceFile(name, text, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
|
|
20
|
+
if (file.parseDiagnostics.length)
|
|
21
|
+
return undefined;
|
|
22
|
+
const options = { noLib: true, noResolve: true, target: ts.ScriptTarget.Latest, experimentalDecorators: true };
|
|
23
|
+
const host = {
|
|
24
|
+
getSourceFile: (path) => (path === name ? file : undefined),
|
|
25
|
+
getDefaultLibFileName: () => '',
|
|
26
|
+
writeFile: () => { },
|
|
27
|
+
getCurrentDirectory: () => '',
|
|
28
|
+
getDirectories: () => [],
|
|
29
|
+
fileExists: (path) => path === name,
|
|
30
|
+
readFile: (path) => (path === name ? text : undefined),
|
|
31
|
+
getCanonicalFileName: (path) => path,
|
|
32
|
+
useCaseSensitiveFileNames: () => true,
|
|
33
|
+
getNewLine: () => '\n',
|
|
34
|
+
};
|
|
35
|
+
const program = ts.createProgram([name], options, host);
|
|
36
|
+
return { file, checker: program.getTypeChecker() };
|
|
37
|
+
}
|
|
38
|
+
function objectProperties(node) {
|
|
39
|
+
const result = new Map();
|
|
40
|
+
for (const property of node.properties) {
|
|
41
|
+
const name = key(property.name);
|
|
42
|
+
if (!ts.isPropertyAssignment(property) || name === undefined || name === '__proto__' || result.has(name))
|
|
43
|
+
return undefined;
|
|
44
|
+
result.set(name, property);
|
|
45
|
+
}
|
|
46
|
+
return result;
|
|
47
|
+
}
|
|
48
|
+
function jsonObject(text) {
|
|
49
|
+
const file = ts.createSourceFile('package.ts', `(${text})`, ts.ScriptTarget.Latest, true);
|
|
50
|
+
const statement = file.statements[0];
|
|
51
|
+
if (!statement || !ts.isExpressionStatement(statement))
|
|
52
|
+
return undefined;
|
|
53
|
+
const expression = unwrap(statement.expression);
|
|
54
|
+
return ts.isObjectLiteralExpression(expression) ? expression : undefined;
|
|
55
|
+
}
|
|
56
|
+
function record(value) {
|
|
57
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
58
|
+
}
|
|
59
|
+
function ordinaryVersion(value) {
|
|
60
|
+
return typeof value === 'string' && value.trim().length > 0 && /^[\d\s.vxX*~^<>=|+-]+(?:[a-zA-Z0-9.+\s~^<>=|-]*)$/.test(value) && /^(?:[~^<>=\s]*v?(?:\d|[xX*]))/.test(value);
|
|
61
|
+
}
|
|
62
|
+
export function mergePackage(local, target, base) {
|
|
63
|
+
const manual = [];
|
|
64
|
+
const edits = [];
|
|
65
|
+
let current, next, previous;
|
|
66
|
+
try {
|
|
67
|
+
current = JSON.parse(local);
|
|
68
|
+
next = JSON.parse(target);
|
|
69
|
+
previous = base === undefined ? undefined : JSON.parse(base);
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return { content: local, manual: ['package.json: JSON 无效,需人工合并'] };
|
|
73
|
+
}
|
|
74
|
+
if (!record(current) || !record(next) || (base !== undefined && !record(previous))) {
|
|
75
|
+
return { content: local, manual: ['package.json: 根节点必须为对象'] };
|
|
76
|
+
}
|
|
77
|
+
const root = jsonObject(local);
|
|
78
|
+
const targetRoot = jsonObject(target);
|
|
79
|
+
const baseRoot = base === undefined ? undefined : jsonObject(base);
|
|
80
|
+
const roots = [root, targetRoot, ...(base === undefined ? [] : [baseRoot])];
|
|
81
|
+
if (roots.some((value) => !value || !objectProperties(value))) {
|
|
82
|
+
return { content: local, manual: ['package.json: 重复或不安全的键,需人工合并'] };
|
|
83
|
+
}
|
|
84
|
+
const localProperties = objectProperties(root);
|
|
85
|
+
const newGroups = [];
|
|
86
|
+
// JSON 在 AST 中包裹了一层括号,插入位置需要还原为原文件偏移。
|
|
87
|
+
const appendJson = (node, additions) => {
|
|
88
|
+
const insertions = [];
|
|
89
|
+
appendMembers(`(${local})`, node, additions, insertions);
|
|
90
|
+
edits.push(...insertions.map((edit) => ({ ...edit, start: edit.start - 1, end: edit.end - 1 })));
|
|
91
|
+
};
|
|
92
|
+
for (const group of dependencyGroups) {
|
|
93
|
+
const objects = [current[group], next[group], record(previous) ? previous[group] : undefined];
|
|
94
|
+
const nodes = roots.map((value) => objectProperties(value).get(group)?.initializer);
|
|
95
|
+
if (objects.some((value) => value !== undefined && !record(value)) || nodes.some((value) => value && (!ts.isObjectLiteralExpression(value) || !objectProperties(value)))) {
|
|
96
|
+
manual.push(`${group}: 依赖组结构无效,需人工合并`);
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
const localGroup = record(current[group]) ? current[group] : {};
|
|
100
|
+
const targetGroup = record(next[group]) ? next[group] : {};
|
|
101
|
+
const baseGroup = record(previous) && record(previous[group]) ? previous[group] : {};
|
|
102
|
+
const additions = [];
|
|
103
|
+
for (const [name, version] of Object.entries(targetGroup)) {
|
|
104
|
+
const path = `${group}.${name}`;
|
|
105
|
+
const acrossGroups = dependencyGroups.some((other) => other !== group && [current, next, previous].some((source) => record(source) && record(source[other]) && Object.hasOwn(source[other], name)));
|
|
106
|
+
if (acrossGroups) {
|
|
107
|
+
manual.push(`${path}: 跨依赖组或多组同名依赖,需人工合并`);
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
if (!Object.hasOwn(localGroup, name)) {
|
|
111
|
+
if (typeof version !== 'string' || !version.trim()) {
|
|
112
|
+
manual.push(`${path}: 目标依赖版本声明无效,需人工处理`);
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
additions.push(`${JSON.stringify(name)}: ${JSON.stringify(version)}`);
|
|
116
|
+
}
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
if (localGroup[name] === version)
|
|
120
|
+
continue;
|
|
121
|
+
if (!ordinaryVersion(version) || !ordinaryVersion(localGroup[name]) || (Object.hasOwn(baseGroup, name) && !ordinaryVersion(baseGroup[name]))) {
|
|
122
|
+
manual.push(`${path}: 特殊协议或非普通版本,需人工合并`);
|
|
123
|
+
continue;
|
|
124
|
+
}
|
|
125
|
+
if (base === undefined || !Object.hasOwn(baseGroup, name)) {
|
|
126
|
+
manual.push(`${path}: 缺少基线依赖,无法安全更新`);
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
if (baseGroup[name] === version)
|
|
130
|
+
continue;
|
|
131
|
+
if (localGroup[name] !== baseGroup[name]) {
|
|
132
|
+
manual.push(`${path}: 本地和目标均修改版本,确认后采用目标版本 ${String(version)}`);
|
|
133
|
+
}
|
|
134
|
+
const groupNode = localProperties.get(group).initializer;
|
|
135
|
+
const versionNode = objectProperties(groupNode).get(name).initializer;
|
|
136
|
+
edits.push({ start: versionNode.getStart() - 1, end: versionNode.end - 1, text: JSON.stringify(version) });
|
|
137
|
+
}
|
|
138
|
+
if (additions.length) {
|
|
139
|
+
const node = localProperties.get(group)?.initializer;
|
|
140
|
+
if (node && ts.isObjectLiteralExpression(node))
|
|
141
|
+
appendJson(node, additions);
|
|
142
|
+
else
|
|
143
|
+
newGroups.push(`${JSON.stringify(group)}: { ${additions.join(', ')} }`);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
appendJson(root, newGroups);
|
|
147
|
+
return { content: apply(local, edits), manual };
|
|
148
|
+
}
|
|
149
|
+
function indentAt(text, position) {
|
|
150
|
+
return /^[\t ]*/.exec(text.slice(text.lastIndexOf('\n', position - 1) + 1, position))[0];
|
|
151
|
+
}
|
|
152
|
+
function appendMembers(text, node, additions, edits) {
|
|
153
|
+
if (!additions.length)
|
|
154
|
+
return;
|
|
155
|
+
const newline = text.includes('\r\n') ? '\r\n' : '\n';
|
|
156
|
+
const members = ts.isObjectLiteralExpression(node) ? node.properties : node.members;
|
|
157
|
+
const closingIndent = indentAt(text, node.getStart());
|
|
158
|
+
const first = members[0];
|
|
159
|
+
const existingIndent = first ? indentAt(text, first.getStart()) : '';
|
|
160
|
+
const indentation = existingIndent.length > closingIndent.length ? existingIndent : `${closingIndent} `;
|
|
161
|
+
const values = additions.map((value) => indentation + value.replace(/\r?\n/g, newline));
|
|
162
|
+
const last = members[members.length - 1];
|
|
163
|
+
if (ts.isObjectLiteralExpression(node) && last && !node.properties.hasTrailingComma) {
|
|
164
|
+
edits.push({ start: last.end, end: last.end, text: ',' });
|
|
165
|
+
}
|
|
166
|
+
if (ts.isClassDeclaration(node) && last && ts.isPropertyDeclaration(last) && !text.slice(last.getStart(), last.end).trimEnd().endsWith(';')) {
|
|
167
|
+
edits.push({ start: last.end, end: last.end, text: ';' });
|
|
168
|
+
}
|
|
169
|
+
const separator = ts.isObjectLiteralExpression(node) ? `,${newline}` : newline;
|
|
170
|
+
edits.push({ start: node.end - 1, end: node.end - 1, text: `${newline}${values.join(separator)}${newline}${closingIndent}` });
|
|
171
|
+
}
|
|
172
|
+
function imports(file) {
|
|
173
|
+
const result = new Map();
|
|
174
|
+
for (const statement of file.statements) {
|
|
175
|
+
if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier) || !statement.importClause)
|
|
176
|
+
continue;
|
|
177
|
+
const clause = statement.importClause;
|
|
178
|
+
const add = (name, imported, typeOnly = clause.isTypeOnly) => result.set(name, { name, imported, module: statement.moduleSpecifier.text, typeOnly, declaration: statement });
|
|
179
|
+
if (clause.name)
|
|
180
|
+
add(clause.name.text, 'default');
|
|
181
|
+
if (clause.namedBindings) {
|
|
182
|
+
if (ts.isNamespaceImport(clause.namedBindings))
|
|
183
|
+
add(clause.namedBindings.name.text, '*');
|
|
184
|
+
else
|
|
185
|
+
for (const specifier of clause.namedBindings.elements)
|
|
186
|
+
add(specifier.name.text, (specifier.propertyName ?? specifier.name).text, clause.isTypeOnly || specifier.isTypeOnly);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
return result;
|
|
190
|
+
}
|
|
191
|
+
function topBindings(parsed) {
|
|
192
|
+
return new Map(parsed.checker
|
|
193
|
+
.getSymbolsInScope(parsed.file, ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace | ts.SymbolFlags.Alias)
|
|
194
|
+
.filter((symbol) => symbol.declarations?.some((declaration) => declaration.getSourceFile() === parsed.file))
|
|
195
|
+
.map((symbol) => [symbol.name, symbol]));
|
|
196
|
+
}
|
|
197
|
+
const globals = new Set('undefined NaN Infinity Object String Number Boolean BigInt Symbol Math JSON Date RegExp Array ReadonlyArray Promise Map Set WeakMap WeakSet Error TypeError RangeError Intl Reflect Proxy ArrayBuffer DataView Uint8Array Uint16Array Uint32Array Int8Array Int16Array Int32Array Float32Array Float64Array console globalThis parseInt parseFloat isNaN isFinite encodeURI encodeURIComponent decodeURI decodeURIComponent Record Partial Required Readonly Pick Omit Exclude Extract NonNullable ReturnType Parameters InstanceType Awaited'.split(' '));
|
|
198
|
+
function isReference(node) {
|
|
199
|
+
const parent = node.parent;
|
|
200
|
+
if ((ts.isPropertyAccessExpression(parent) && parent.name === node) || (ts.isQualifiedName(parent) && parent.right === node))
|
|
201
|
+
return false;
|
|
202
|
+
if ('name' in parent && parent.name === node && !ts.isShorthandPropertyAssignment(parent))
|
|
203
|
+
return false;
|
|
204
|
+
return true;
|
|
205
|
+
}
|
|
206
|
+
function referenceMerger(local, target, manual) {
|
|
207
|
+
const localImports = imports(local.file);
|
|
208
|
+
const targetImports = imports(target.file);
|
|
209
|
+
const localBindings = topBindings(local);
|
|
210
|
+
const pending = new Map();
|
|
211
|
+
function safe(node, path, destination) {
|
|
212
|
+
const scope = new Map(local.checker.getSymbolsInScope(destination, ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace | ts.SymbolFlags.Alias).map((symbol) => [symbol.name, symbol]));
|
|
213
|
+
const needed = new Map();
|
|
214
|
+
const problems = new Set();
|
|
215
|
+
function visit(child) {
|
|
216
|
+
if (child.kind === ts.SyntaxKind.ThisKeyword || child.kind === ts.SyntaxKind.SuperKeyword || ts.isPrivateIdentifier(child)) {
|
|
217
|
+
problems.add('this/super/私有名称引用需人工确认');
|
|
218
|
+
}
|
|
219
|
+
if (ts.isIdentifier(child) && isReference(child)) {
|
|
220
|
+
const symbol = ts.isShorthandPropertyAssignment(child.parent) ? target.checker.getShorthandAssignmentValueSymbol(child.parent) : target.checker.getSymbolAtLocation(child);
|
|
221
|
+
const declarations = symbol?.declarations ?? [];
|
|
222
|
+
const inside = declarations.length > 0 && declarations.every((declaration) => declaration.pos >= node.pos && declaration.end <= node.end);
|
|
223
|
+
if (!inside) {
|
|
224
|
+
const binding = targetImports.get(child.text);
|
|
225
|
+
if (binding && declarations.some((declaration) => ts.isImportSpecifier(declaration) || ts.isImportClause(declaration) || ts.isNamespaceImport(declaration))) {
|
|
226
|
+
const existing = localImports.get(binding.name) ?? pending.get(binding.name);
|
|
227
|
+
const shadow = scope.get(binding.name);
|
|
228
|
+
if (shadow && shadow !== localBindings.get(binding.name)) {
|
|
229
|
+
problems.add(`import ${binding.name} 被本地作用域声明遮蔽`);
|
|
230
|
+
}
|
|
231
|
+
else if (existing && (existing.module !== binding.module || existing.imported !== binding.imported || (existing.typeOnly && !binding.typeOnly))) {
|
|
232
|
+
problems.add(`import ${binding.name} 命名或类型冲突`);
|
|
233
|
+
}
|
|
234
|
+
else if (!existing && localBindings.has(binding.name)) {
|
|
235
|
+
problems.add(`import ${binding.name} 与本地声明冲突`);
|
|
236
|
+
}
|
|
237
|
+
else if (!existing && binding.declaration.attributes) {
|
|
238
|
+
problems.add(`import ${binding.name} 含导入属性,需人工确认`);
|
|
239
|
+
}
|
|
240
|
+
else if (!existing)
|
|
241
|
+
needed.set(binding.name, binding);
|
|
242
|
+
}
|
|
243
|
+
else {
|
|
244
|
+
const existing = localBindings.get(child.text);
|
|
245
|
+
if (scope.get(child.text) && scope.get(child.text) !== existing) {
|
|
246
|
+
problems.add(`引用 ${child.text} 被本地作用域声明遮蔽`);
|
|
247
|
+
}
|
|
248
|
+
else if (declarations.length && existing && !localImports.has(child.text) && existing.flags & symbol.flags & (ts.SymbolFlags.Value | ts.SymbolFlags.Type | ts.SymbolFlags.Namespace)) {
|
|
249
|
+
const targetParameter = declarations.find(ts.isTypeParameterDeclaration);
|
|
250
|
+
if (targetParameter)
|
|
251
|
+
problems.add(`类型参数 ${child.text} 的作用域需人工确认`);
|
|
252
|
+
}
|
|
253
|
+
else if (declarations.length || !globals.has(child.text)) {
|
|
254
|
+
problems.add(`引用 ${child.text} 在本地缺失或无法解析`);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
ts.forEachChild(child, visit);
|
|
260
|
+
}
|
|
261
|
+
visit(node);
|
|
262
|
+
if (problems.size) {
|
|
263
|
+
manual.push(`${path}: ${[...problems].join(';')}`);
|
|
264
|
+
return false;
|
|
265
|
+
}
|
|
266
|
+
for (const [name, binding] of needed)
|
|
267
|
+
pending.set(name, binding);
|
|
268
|
+
return true;
|
|
269
|
+
}
|
|
270
|
+
function finish(text, edits) {
|
|
271
|
+
if (!pending.size)
|
|
272
|
+
return;
|
|
273
|
+
const newline = text.includes('\r\n') ? '\r\n' : '\n';
|
|
274
|
+
const lines = [...pending.values()].map((binding) => {
|
|
275
|
+
const clause = binding.imported === 'default' ? binding.name : binding.imported === '*' ? `* as ${binding.name}` : `{ ${binding.imported === binding.name ? binding.name : `${/^[A-Za-z_$][\w$]*$/.test(binding.imported) ? binding.imported : JSON.stringify(binding.imported)} as ${binding.name}`} }`;
|
|
276
|
+
return `import ${binding.typeOnly ? 'type ' : ''}${clause} from ${JSON.stringify(binding.module)};`;
|
|
277
|
+
});
|
|
278
|
+
const last = [...local.file.statements].reverse().find(ts.isImportDeclaration);
|
|
279
|
+
const position = last ? last.end : text.startsWith('#!') ? (text.indexOf('\n') < 0 ? text.length : text.indexOf('\n') + 1) : 0;
|
|
280
|
+
edits.push({ start: position, end: position, text: `${position ? newline : ''}${lines.join(newline)}${newline}` });
|
|
281
|
+
}
|
|
282
|
+
return { safe, finish };
|
|
283
|
+
}
|
|
284
|
+
function defaultObject(file) {
|
|
285
|
+
const exports = file.statements.filter(ts.isExportAssignment);
|
|
286
|
+
if (exports.length !== 1 || exports[0].isExportEquals)
|
|
287
|
+
return undefined;
|
|
288
|
+
const expression = unwrap(exports[0].expression);
|
|
289
|
+
return ts.isObjectLiteralExpression(expression) ? expression : undefined;
|
|
290
|
+
}
|
|
291
|
+
function staticValue(node) {
|
|
292
|
+
node = unwrap(node);
|
|
293
|
+
if (ts.isObjectLiteralExpression(node)) {
|
|
294
|
+
const properties = objectProperties(node);
|
|
295
|
+
return !!properties && [...properties.values()].every((property) => staticValue(property.initializer));
|
|
296
|
+
}
|
|
297
|
+
if (ts.isArrayLiteralExpression(node))
|
|
298
|
+
return node.elements.every((element) => !ts.isSpreadElement(element) && staticValue(element));
|
|
299
|
+
if (ts.isIdentifier(node) || ts.isLiteralExpression(node) || [ts.SyntaxKind.TrueKeyword, ts.SyntaxKind.FalseKeyword, ts.SyntaxKind.NullKeyword].includes(node.kind))
|
|
300
|
+
return true;
|
|
301
|
+
if (ts.isPropertyAccessExpression(node))
|
|
302
|
+
return staticValue(node.expression);
|
|
303
|
+
if (ts.isPrefixUnaryExpression(node) && [ts.SyntaxKind.PlusToken, ts.SyntaxKind.MinusToken, ts.SyntaxKind.ExclamationToken, ts.SyntaxKind.TildeToken].includes(node.operator))
|
|
304
|
+
return staticValue(node.operand);
|
|
305
|
+
return false;
|
|
306
|
+
}
|
|
307
|
+
export function mergeConfig(local, target, base) {
|
|
308
|
+
void base;
|
|
309
|
+
const manual = [];
|
|
310
|
+
const edits = [];
|
|
311
|
+
const current = parse(local, 'local.ts');
|
|
312
|
+
const next = parse(target, 'target.ts');
|
|
313
|
+
const localObject = current && defaultObject(current.file);
|
|
314
|
+
const targetObject = next && defaultObject(next.file);
|
|
315
|
+
if (!current || !next || !localObject || !targetObject) {
|
|
316
|
+
return { content: local, manual: ['config: 无法解析静态 export default 对象,需人工合并'] };
|
|
317
|
+
}
|
|
318
|
+
const references = referenceMerger(current, next, manual);
|
|
319
|
+
function merge(left, right, path) {
|
|
320
|
+
const localProperties = objectProperties(left);
|
|
321
|
+
const targetProperties = objectProperties(right);
|
|
322
|
+
if (!localProperties || !targetProperties) {
|
|
323
|
+
manual.push(`${path}: 包含展开、计算键、重复键或复杂成员,需人工合并`);
|
|
324
|
+
return;
|
|
325
|
+
}
|
|
326
|
+
const additions = [];
|
|
327
|
+
for (const [name, property] of targetProperties) {
|
|
328
|
+
const existing = localProperties.get(name);
|
|
329
|
+
const propertyPath = `${path}.${name}`;
|
|
330
|
+
const value = unwrap(property.initializer);
|
|
331
|
+
if (!existing) {
|
|
332
|
+
if (!staticValue(value))
|
|
333
|
+
manual.push(`${propertyPath}: 动态或复杂值,需人工合并`);
|
|
334
|
+
else if (references.safe(property, propertyPath, left))
|
|
335
|
+
additions.push(property.getText(next.file));
|
|
336
|
+
}
|
|
337
|
+
else {
|
|
338
|
+
const localValue = unwrap(existing.initializer);
|
|
339
|
+
if (ts.isObjectLiteralExpression(localValue) && ts.isObjectLiteralExpression(value))
|
|
340
|
+
merge(localValue, value, propertyPath);
|
|
341
|
+
else if (!staticValue(localValue) || !staticValue(value) || ts.isObjectLiteralExpression(localValue) !== ts.isObjectLiteralExpression(value)) {
|
|
342
|
+
manual.push(`${propertyPath}: 动态值或结构变化,保留本地值并需人工确认`);
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
appendMembers(local, left, additions, edits);
|
|
347
|
+
}
|
|
348
|
+
merge(localObject, targetObject, 'config');
|
|
349
|
+
references.finish(local, edits);
|
|
350
|
+
return { content: apply(local, edits), manual };
|
|
351
|
+
}
|
|
352
|
+
function exportedClasses(file) {
|
|
353
|
+
const result = new Map();
|
|
354
|
+
for (const statement of file.statements) {
|
|
355
|
+
if (ts.isClassDeclaration(statement) && statement.name && statement.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword)) {
|
|
356
|
+
result.set(statement.name.text, statement);
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
return result;
|
|
360
|
+
}
|
|
361
|
+
function classHeader(node) {
|
|
362
|
+
return [...(node.modifiers ?? []).map((modifier) => modifier.getText()), ...(node.heritageClauses ?? []).map((clause) => clause.getText()), ...(node.typeParameters ?? []).map((parameter) => parameter.getText())].join(' ');
|
|
363
|
+
}
|
|
364
|
+
export function mergeEntity(local, target, base) {
|
|
365
|
+
const manual = [];
|
|
366
|
+
const edits = [];
|
|
367
|
+
const current = parse(local, 'local.ts');
|
|
368
|
+
const next = parse(target, 'target.ts');
|
|
369
|
+
const previous = base === undefined ? undefined : parse(base, 'base.ts');
|
|
370
|
+
if (!current || !next || (base !== undefined && !previous))
|
|
371
|
+
return { content: local, manual: ['entity: TypeScript 语法无效,需人工合并'] };
|
|
372
|
+
const localClasses = exportedClasses(current.file);
|
|
373
|
+
const targetClasses = exportedClasses(next.file);
|
|
374
|
+
const baseClasses = previous && exportedClasses(previous.file);
|
|
375
|
+
if (!targetClasses.size)
|
|
376
|
+
manual.push('entity: 未找到具名导出 class,需人工合并');
|
|
377
|
+
const references = referenceMerger(current, next, manual);
|
|
378
|
+
for (const [name, right] of targetClasses) {
|
|
379
|
+
const left = localClasses.get(name);
|
|
380
|
+
if (!left) {
|
|
381
|
+
manual.push(`entity.${name}: 本地缺少同名导出 class,需人工合并`);
|
|
382
|
+
continue;
|
|
383
|
+
}
|
|
384
|
+
const baseline = baseClasses?.get(name);
|
|
385
|
+
if (classHeader(left) !== classHeader(right) && (!baseline || classHeader(baseline) !== classHeader(right)))
|
|
386
|
+
manual.push(`entity.${name}: 类装饰器、修饰器、继承或类型参数变化,需人工合并`);
|
|
387
|
+
if (left.members.some((member) => member.name && key(member.name) === undefined) || right.members.some((member) => member.name && key(member.name) === undefined)) {
|
|
388
|
+
manual.push(`entity.${name}: 计算键或私有名称无法安全匹配,需人工合并`);
|
|
389
|
+
continue;
|
|
390
|
+
}
|
|
391
|
+
const duplicateFields = (node) => node.members.some((member, index) => ts.isPropertyDeclaration(member) && node.members.some((other, otherIndex) => index !== otherIndex && key(other.name) === key(member.name)));
|
|
392
|
+
if (duplicateFields(left) || duplicateFields(right)) {
|
|
393
|
+
manual.push(`entity.${name}: 重复字段或字段与成员冲突,需人工合并`);
|
|
394
|
+
continue;
|
|
395
|
+
}
|
|
396
|
+
const members = new Map(left.members.map((member) => [key(member.name), member]));
|
|
397
|
+
const additions = [];
|
|
398
|
+
const seen = new Set();
|
|
399
|
+
for (const member of right.members) {
|
|
400
|
+
const field = key(member.name);
|
|
401
|
+
const path = `entity.${name}.${field ?? 'constructor/static'}`;
|
|
402
|
+
if (field !== undefined && seen.has(field)) {
|
|
403
|
+
manual.push(`${path}: 重复成员或访问器,需人工合并`);
|
|
404
|
+
continue;
|
|
405
|
+
}
|
|
406
|
+
if (field !== undefined)
|
|
407
|
+
seen.add(field);
|
|
408
|
+
const existing = members.get(field);
|
|
409
|
+
const parameterProperty = left.members.some((item) => ts.isConstructorDeclaration(item) && item.parameters.some((parameter) => ts.isIdentifier(parameter.name) && parameter.name.text === field && parameter.modifiers?.some((modifier) => [ts.SyntaxKind.PublicKeyword, ts.SyntaxKind.ProtectedKeyword, ts.SyntaxKind.PrivateKeyword, ts.SyntaxKind.ReadonlyKeyword].includes(modifier.kind))));
|
|
410
|
+
if (parameterProperty) {
|
|
411
|
+
manual.push(`${path}: 与本地构造函数参数属性冲突,需人工合并`);
|
|
412
|
+
continue;
|
|
413
|
+
}
|
|
414
|
+
if (!ts.isPropertyDeclaration(member) || field === undefined || member.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.AccessorKeyword)) {
|
|
415
|
+
if (!existing || existing.getText() !== member.getText())
|
|
416
|
+
manual.push(`${path}: 方法、访问器或复杂成员需人工合并`);
|
|
417
|
+
continue;
|
|
418
|
+
}
|
|
419
|
+
if (existing) {
|
|
420
|
+
if (!ts.isPropertyDeclaration(existing) || !!existing.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.StaticKeyword) !== !!member.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.StaticKeyword))
|
|
421
|
+
manual.push(`${path}: 与本地成员类型或静态修饰冲突,需人工合并`);
|
|
422
|
+
continue;
|
|
423
|
+
}
|
|
424
|
+
if (references.safe(member, path, left))
|
|
425
|
+
additions.push(member.getText(next.file).replace(/;?\s*$/, ';'));
|
|
426
|
+
}
|
|
427
|
+
appendMembers(local, left, additions, edits);
|
|
428
|
+
}
|
|
429
|
+
references.finish(local, edits);
|
|
430
|
+
return { content: apply(local, edits), manual };
|
|
431
|
+
}
|
|
432
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/update/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { generateUpdateSql } from './sql.js';
|
|
2
|
+
export type Change = {
|
|
3
|
+
path: string;
|
|
4
|
+
action: 'create' | 'overwrite' | 'merge';
|
|
5
|
+
previous: string | null;
|
|
6
|
+
content: Buffer;
|
|
7
|
+
conflict: boolean;
|
|
8
|
+
};
|
|
9
|
+
export type Plan = {
|
|
10
|
+
changes: Change[];
|
|
11
|
+
skipped: string[];
|
|
12
|
+
manual: string[];
|
|
13
|
+
sqlTables: ReturnType<typeof generateUpdateSql>['tables'];
|
|
14
|
+
};
|
|
15
|
+
export declare const hash: (content: Buffer) => string;
|
|
16
|
+
export declare function readLocal(root: string, path: string): Buffer | undefined;
|
|
17
|
+
export declare function makePlan(root: string, oldTemplate: string, targetTemplate: string, targetVersion: string, rules: Record<string, boolean>, sourceRules?: Record<string, 'functions' | 'exports' | false>): Plan;
|