iter(g281): 抽出差异纯逻辑并加皮肤冒烟
This commit is contained in:
HIsheR
@@ -0,0 +1,40 @@
|
||||
/*** 皮肤包冒烟：只测纯逻辑（今日覆盖行级差异对齐），DOM 渲染靠演示页人工过 ***/
|
||||
import { alignMiddle, diffLines, normalizeLine, toRows, DP_LIMIT } from '../dist/diffKit.js';
|
||||
|
||||
let failed = 0;
|
||||
/*** 断言：打印一条结果，失败计数 +1 ***/
|
||||
const ok = (label, cond) => {
|
||||
if (cond) { console.log(`ok - ${label}`); return; }
|
||||
console.error(`FAIL - ${label}`);
|
||||
failed += 1;
|
||||
};
|
||||
|
||||
// 1) 完全相同：全是 same，没有增删
|
||||
const same = diffLines('a\nb\nc', 'a\nb\nc', false);
|
||||
ok('相同文本全是 same', same.length === 3 && same.every((o) => o.type === 'same'));
|
||||
// 2) 纯新增一行
|
||||
const added = diffLines('a\nc', 'a\nb\nc', false);
|
||||
ok('中间插入一行 → 恰好 1 条 add', added.filter((o) => o.type === 'add').length === 1 && added.filter((o) => o.type === 'del').length === 0);
|
||||
// 3) 纯删除一行
|
||||
const removed = diffLines('a\nb\nc', 'a\nc', false);
|
||||
ok('中间删除一行 → 恰好 1 条 del', removed.filter((o) => o.type === 'del').length === 1 && removed.filter((o) => o.type === 'add').length === 0);
|
||||
// 4) 尾部换行不产生假差异
|
||||
ok('尾部换行不算差异', diffLines('a\nb\n', 'a\nb', false).every((o) => o.type === 'same'));
|
||||
// 5) 忽略行内空白：只差缩进时无增删，且显示保留原文
|
||||
const ws = diffLines('if (a) {\n return 1;\n}', 'if (a) {\n return 1;\n}', true);
|
||||
ok('忽略空白后缩进差不计入差异', ws.every((o) => o.type === 'same') && ws[1].text.includes(' '));
|
||||
// 6) 不忽略空白时同一对文本必须报差异（对照组：证明开关真的起作用）
|
||||
ok('不忽略空白时同一对文本报增删', diffLines('if (a) {\n return 1;\n}', 'if (a) {\n return 1;\n}', false).some((o) => o.type !== 'same'));
|
||||
// 7) 行内多空格归一
|
||||
ok('行内连续空白压成一个空格', normalizeLine(' a b\t c ') === 'a b c');
|
||||
// 8) 超限退化：仍保证「旧行全 del + 新行全 add」，不丢内容
|
||||
const bigA = Array.from({ length: 700 }, (_, i) => `a${i}`);
|
||||
const bigB = Array.from({ length: 700 }, (_, i) => `b${i}`);
|
||||
const big = alignMiddle(toRows(bigA.join('\n'), false), toRows(bigB.join('\n'), false));
|
||||
ok(`超限（>${DP_LIMIT}）退化为整段替换`, big.filter((o) => o.type === 'del').length === 700 && big.filter((o) => o.type === 'add').length === 700);
|
||||
|
||||
if (failed) {
|
||||
console.error(`皮肤冒烟失败 ${failed} 条`);
|
||||
process.exit(1);
|
||||
}
|
||||
console.log('SKIN SMOKE OK');
|
||||
@@ -0,0 +1,58 @@
|
||||
/*** 行级差异纯逻辑：切行 / 归一键 / 中间段 LCS 对齐；不碰 DOM，可被冒烟脚本直接跑 ***/
|
||||
|
||||
/*** 一条差异：same 原样、add 只在右边、del 只在左边 ***/
|
||||
export type DiffOp = { type: 'same' | 'add' | 'del'; text: string };
|
||||
/*** 比较用的一行：text 是显示原文，key 是比对键（忽略空白模式下把行内空白压成一个空格） ***/
|
||||
export type DiffRow = { text: string; key: string };
|
||||
// LCS 计算上限：中间段行数乘积超过这个值就退化为「整段替换」，避免大文件把主线程卡住
|
||||
export const DP_LIMIT = 400_000;
|
||||
|
||||
/*** 作用：比对键归一——行内连续空白压成一个空格并去首尾空白；显示仍用原文，缩进不丢 ***/
|
||||
export function normalizeLine(line: string): string {
|
||||
return line.replace(/\s+/g, ' ').trim();
|
||||
}
|
||||
|
||||
/*** 作用：切行并算比对键；末尾换行不产生一行空内容（否则每个文件都多一条假差异） ***/
|
||||
export function toRows(text: string, ignore: boolean): DiffRow[] {
|
||||
const lines = text.split(/\r?\n/);
|
||||
if (lines.length > 1 && lines[lines.length - 1] === '') lines.pop(); // 尾部换行忽略
|
||||
return lines.map((line) => ({ text: line, key: ignore ? normalizeLine(line) : line }));
|
||||
}
|
||||
|
||||
/*** 作用：中间段做 LCS 对齐，输出 del / add / same 序列；超限或一侧为空时退化为整段替换 ***/
|
||||
export function alignMiddle(a: DiffRow[], b: DiffRow[]): DiffOp[] {
|
||||
if (!a.length || !b.length) return [...a.map((r) => ({ type: 'del' as const, text: r.text })), ...b.map((r) => ({ type: 'add' as const, text: r.text }))];
|
||||
if (a.length * b.length > DP_LIMIT) return [...a.map((r) => ({ type: 'del' as const, text: r.text })), ...b.map((r) => ({ type: 'add' as const, text: r.text }))]; // 超限：语义仍正确，只是不再逐行对齐
|
||||
const dp: number[][] = Array.from({ length: a.length + 1 }, () => new Array<number>(b.length + 1).fill(0)); // dp[i][j]：a 前 i 行与 b 前 j 行的 LCS 长度
|
||||
for (let i = a.length - 1; i >= 0; i -= 1) {
|
||||
for (let j = b.length - 1; j >= 0; j -= 1) {
|
||||
dp[i][j] = a[i].key === b[j].key ? dp[i + 1][j + 1] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1]);
|
||||
}
|
||||
}
|
||||
const ops: DiffOp[] = [];
|
||||
let i = 0;
|
||||
let j = 0;
|
||||
while (i < a.length && j < b.length) {
|
||||
if (a[i].key === b[j].key) { ops.push({ type: 'same', text: a[i].text }); i += 1; j += 1; continue; }
|
||||
if (dp[i + 1][j] >= dp[i][j + 1]) { ops.push({ type: 'del', text: a[i].text }); i += 1; continue; }
|
||||
ops.push({ type: 'add', text: b[j].text }); j += 1;
|
||||
}
|
||||
for (; i < a.length; i += 1) ops.push({ type: 'del', text: a[i].text });
|
||||
for (; j < b.length; j += 1) ops.push({ type: 'add', text: b[j].text });
|
||||
return ops;
|
||||
}
|
||||
|
||||
/*** 作用：逐行差异——剪公共前后缀后只对中间段做对齐，日常改动只占几行 ***/
|
||||
export function diffLines(before: string, after: string, ignore: boolean): DiffOp[] {
|
||||
const a = toRows(before, ignore);
|
||||
const b = toRows(after, ignore);
|
||||
let head = 0;
|
||||
while (head < a.length && head < b.length && a[head].key === b[head].key) head += 1; // 公共前缀
|
||||
let tail = 0;
|
||||
while (tail < a.length - head && tail < b.length - head && a[a.length - 1 - tail].key === b[b.length - 1 - tail].key) tail += 1; // 公共后缀
|
||||
return [
|
||||
...a.slice(0, head).map((r) => ({ type: 'same' as const, text: r.text })),
|
||||
...alignMiddle(a.slice(head, a.length - tail), b.slice(head, b.length - tail)),
|
||||
...a.slice(a.length - tail).map((r) => ({ type: 'same' as const, text: r.text })),
|
||||
];
|
||||
}
|
||||
@@ -1,69 +1,11 @@
|
||||
import { h } from '@ui-arch/frame';
|
||||
import { diffLines } from './diffKit.js';
|
||||
import type { DiffViewProps } from './types.js';
|
||||
|
||||
// 一条差异：same 原样、add 只在右边、del 只在左边
|
||||
type DiffOp = { type: 'same' | 'add' | 'del'; text: string };
|
||||
// 比较用的一行：text 是显示原文，key 是比对键（忽略空白模式下把行内空白压成一个空格再 trim）
|
||||
type Row = { text: string; key: string };
|
||||
// LCS 计算上限：中间段行数乘积超过这个值就退化为「整段替换」，避免大文件把主线程卡住
|
||||
const DP_LIMIT = 400_000;
|
||||
|
||||
/*** 比对键归一：行内连续空白压成一个空格并去掉首尾空白；显示仍用原文，缩进不丢 ***/
|
||||
function normalize(line: string): string {
|
||||
return line.replace(/\s+/g, ' ').trim();
|
||||
}
|
||||
|
||||
/*** 切行：末尾换行不产生一行空内容（否则每个文件都会多出一条假的空行差异） ***/
|
||||
function toRows(text: string, ignore: boolean): Row[] {
|
||||
const lines = text.split(/\r?\n/);
|
||||
if (lines.length > 1 && lines[lines.length - 1] === '') lines.pop(); // 尾部换行忽略
|
||||
return lines.map((line) => ({ text: line, key: ignore ? normalize(line) : line }));
|
||||
}
|
||||
|
||||
/*** 中间段做 LCS 对齐：先剪掉公共前后缀，剩下的才真算，日常改动只占几行 ***/
|
||||
function alignMiddle(a: Row[], b: Row[]): DiffOp[] {
|
||||
if (!a.length || !b.length) return [...a.map((r) => ({ type: 'del' as const, text: r.text })), ...b.map((r) => ({ type: 'add' as const, text: r.text }))];
|
||||
if (a.length * b.length > DP_LIMIT) return [...a.map((r) => ({ type: 'del' as const, text: r.text })), ...b.map((r) => ({ type: 'add' as const, text: r.text }))]; // 超限：整段替换，语义仍正确
|
||||
const dp: number[][] = Array.from({ length: a.length + 1 }, () => new Array<number>(b.length + 1).fill(0)); // dp[i][j]：a 前 i 行与 b 前 j 行的 LCS 长度
|
||||
for (let i = a.length - 1; i >= 0; i -= 1) {
|
||||
for (let j = b.length - 1; j >= 0; j -= 1) {
|
||||
dp[i][j] = a[i].key === b[j].key ? dp[i + 1][j + 1] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1]);
|
||||
}
|
||||
}
|
||||
const ops: DiffOp[] = [];
|
||||
let i = 0;
|
||||
let j = 0;
|
||||
while (i < a.length && j < b.length) {
|
||||
if (a[i].key === b[j].key) { ops.push({ type: 'same', text: a[i].text }); i += 1; j += 1; continue; }
|
||||
if (dp[i + 1][j] >= dp[i][j + 1]) { ops.push({ type: 'del', text: a[i].text }); i += 1; continue; }
|
||||
ops.push({ type: 'add', text: b[j].text }); j += 1;
|
||||
}
|
||||
for (; i < a.length; i += 1) ops.push({ type: 'del', text: a[i].text });
|
||||
for (; j < b.length; j += 1) ops.push({ type: 'add', text: b[j].text });
|
||||
return ops;
|
||||
}
|
||||
|
||||
/*** 逐行差异：剪公共前后缀后对齐中间段，输出完整 same / add / del 序列 ***/
|
||||
function diffLines(before: string, after: string, ignore: boolean): DiffOp[] {
|
||||
const a = toRows(before, ignore);
|
||||
const b = toRows(after, ignore);
|
||||
let head = 0;
|
||||
while (head < a.length && head < b.length && a[head].key === b[head].key) head += 1; // 公共前缀
|
||||
let tail = 0;
|
||||
while (tail < a.length - head && tail < b.length - head && a[a.length - 1 - tail].key === b[b.length - 1 - tail].key) tail += 1; // 公共后缀
|
||||
const midA = a.slice(head, a.length - tail);
|
||||
const midB = b.slice(head, b.length - tail);
|
||||
return [
|
||||
...a.slice(0, head).map((r) => ({ type: 'same' as const, text: r.text })),
|
||||
...alignMiddle(midA, midB),
|
||||
...a.slice(a.length - tail).map((r) => ({ type: 'same' as const, text: r.text })),
|
||||
];
|
||||
}
|
||||
|
||||
/*** 文本差异对比：行级对齐 + 增删着色 + 双行号列，超限时退化为整段替换（只影响精度不影响语义） ***/
|
||||
export function diffView(props: DiffViewProps): HTMLElement {
|
||||
const ignore = props.ignoreWhitespace === true; // 只在显式开启时归一行内空白
|
||||
const ops = diffLines(props.before, props.after, ignore);
|
||||
const ops = diffLines(props.before, props.after, ignore); // 纯逻辑在 diffKit：这里只负责把它画出来
|
||||
const added = ops.filter((o) => o.type === 'add').length; // 新增行数：统计条与读屏共用
|
||||
const removed = ops.filter((o) => o.type === 'del').length; // 删除行数
|
||||
let oldNo = 0;
|
||||
|
||||
Reference in New Issue
Block a user