dsh-knit 0.26.0 → 0.27.0
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/CHANGELOG.md +36 -0
- package/README.en.md +13 -8
- package/README.md +11 -7
- package/SECURITY.md +7 -2
- package/package.json +6 -2
- package/src/client/client.js +405 -43
- package/src/host/git.js +184 -3
- package/src/host/index.js +236 -2
- package/test/client.test.mjs +76 -10
- package/test/comments.test.mjs +56 -1
- package/test/git-changes.test.mjs +197 -3
- package/test/harness.mjs +1 -1
package/src/host/git.js
CHANGED
|
@@ -62,9 +62,27 @@ export const MAX_REPORTED_FILES = 30
|
|
|
62
62
|
*/
|
|
63
63
|
export const GIT_GLOBAL_ARGS = ['--no-optional-locks', '--no-pager', '-c', 'core.fsmonitor=false']
|
|
64
64
|
|
|
65
|
-
/**
|
|
65
|
+
/** **唯一**允许的三个 git 子命令。改这个数组 = 改安全边界。 */
|
|
66
66
|
export const GIT_STATUS_ARGS = ['status', '--porcelain=v1', '-z', '--untracked-files=all']
|
|
67
67
|
export const GIT_PREFIX_ARGS = ['rev-parse', '--show-prefix']
|
|
68
|
+
/**
|
|
69
|
+
* v0.26.x「变更」档:**只读 diff 的行数统计,不读 diff 正文**。
|
|
70
|
+
*
|
|
71
|
+
* `--numstat` 只输出 `added\tdeleted\tpath`,正文一个字节都不吐;`--no-renames`
|
|
72
|
+
* 让「重命名」退化成一删一增(计数简单、可确定),状态仍由 `git status` 给出。
|
|
73
|
+
* ⚠️ 仍然不带任何写动词;仍然是固定 argv + 不走 shell。
|
|
74
|
+
*/
|
|
75
|
+
export const GIT_NUMSTAT_ARGS = ['diff', '--numstat', '-z', '--no-renames', 'HEAD']
|
|
76
|
+
/**
|
|
77
|
+
* v0.26.x「变更」档的逐行 diff:**只读**、固定 argv、不调用外部 diff / textconv。
|
|
78
|
+
* `--` 之后才是客户端给的文件路径,且由上层先 resolve 回工作区根。
|
|
79
|
+
*/
|
|
80
|
+
export const GIT_DIFF_ARGS = ['diff', '--no-color', '--no-ext-diff', '--no-textconv', '--unified=3', 'HEAD', '--']
|
|
81
|
+
/** diff 正文上限(字节 / 行);超过就截断并如实标记。 */
|
|
82
|
+
export const MAX_DIFF_BYTES = 512 * 1024
|
|
83
|
+
export const MAX_DIFF_LINES = 1200
|
|
84
|
+
/** 行数统计的 stdout 上限(比 status 小一个量级;它只有数字和路径)。 */
|
|
85
|
+
export const MAX_NUMSTAT_BYTES = 256 * 1024
|
|
68
86
|
|
|
69
87
|
/**
|
|
70
88
|
* 允许从父进程**继承**的环境变量(白名单)。
|
|
@@ -221,6 +239,97 @@ export function kindsOf(x, y) {
|
|
|
221
239
|
return kinds
|
|
222
240
|
}
|
|
223
241
|
|
|
242
|
+
/**
|
|
243
|
+
* 一次 `git diff --numstat -z --no-renames HEAD` 的输出 → 每文件行数。**纯函数**。
|
|
244
|
+
*
|
|
245
|
+
* 格式(`-z`,`--no-renames`):`ADDED\tDELETED\tPATH\0`;二进制文件的两个数是 `-`。
|
|
246
|
+
* 路径以仓库根为基准,和 status 一样要减掉工作区前缀;工作区外的丢弃。
|
|
247
|
+
*
|
|
248
|
+
* @param {string} raw - stdout 原文
|
|
249
|
+
* @param {{prefix?: string}} [options] - 工作区相对仓库根的前缀
|
|
250
|
+
* @returns {Map<string,{added:number|null,deleted:number|null,binary:boolean}>} rel → 计数
|
|
251
|
+
*/
|
|
252
|
+
export function parseNumstatZ(raw, options = {}) {
|
|
253
|
+
const prefix = typeof options.prefix === 'string' ? options.prefix : ''
|
|
254
|
+
const text = typeof raw === 'string' ? raw : ''
|
|
255
|
+
const out = new Map()
|
|
256
|
+
for (const entry of text.split('\0')) {
|
|
257
|
+
if (!entry) continue
|
|
258
|
+
const first = entry.indexOf('\t')
|
|
259
|
+
if (first < 0) continue
|
|
260
|
+
const second = entry.indexOf('\t', first + 1)
|
|
261
|
+
if (second < 0) continue
|
|
262
|
+
const path = trimPrefix(entry.slice(second + 1), prefix)
|
|
263
|
+
if (!path) continue
|
|
264
|
+
const addedRaw = entry.slice(0, first)
|
|
265
|
+
const deletedRaw = entry.slice(first + 1, second)
|
|
266
|
+
const binary = addedRaw === '-' || deletedRaw === '-'
|
|
267
|
+
out.set(path, {
|
|
268
|
+
added: binary ? null : Number(addedRaw),
|
|
269
|
+
deleted: binary ? null : Number(deletedRaw),
|
|
270
|
+
binary,
|
|
271
|
+
})
|
|
272
|
+
}
|
|
273
|
+
return out
|
|
274
|
+
}
|
|
275
|
+
|
|
276
|
+
/**
|
|
277
|
+
* 把 `git diff --unified=3` 的原文解析成可渲染的行。**纯函数**。
|
|
278
|
+
*
|
|
279
|
+
* 只保留 hunk 内真正的内容行(上下文 / 新增 / 删除),并把新旧行号算好;
|
|
280
|
+
* `diff --git` / `index` / `---` / `+++` 这些元信息不返回(前端只画内容)。
|
|
281
|
+
* 二进制文件由调用方看 stdout 里的 `Binary files` 判定。
|
|
282
|
+
*
|
|
283
|
+
* @param {string} raw - diff 原文
|
|
284
|
+
* @param {{maxLines?: number}} [options] - 最多保留多少内容行
|
|
285
|
+
* @returns {{lines: Array<{type:'context'|'add'|'del', oldNo:number|null, newNo:number|null, text:string}>,
|
|
286
|
+
* added:number, removed:number, truncated:boolean, hunks:number}} 解析结果
|
|
287
|
+
*/
|
|
288
|
+
export function parseUnifiedDiff(raw, options = {}) {
|
|
289
|
+
const text = typeof raw === 'string' ? raw : ''
|
|
290
|
+
const maxLines = Number.isInteger(options.maxLines) && options.maxLines > 0 ? options.maxLines : MAX_DIFF_LINES
|
|
291
|
+
const lines = []
|
|
292
|
+
let oldNo = 0
|
|
293
|
+
let newNo = 0
|
|
294
|
+
let added = 0
|
|
295
|
+
let removed = 0
|
|
296
|
+
let hunks = 0
|
|
297
|
+
let truncated = false
|
|
298
|
+
for (const rawLine of text.split('\n')) {
|
|
299
|
+
if (rawLine.startsWith('@@')) {
|
|
300
|
+
const match = /^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/.exec(rawLine)
|
|
301
|
+
if (!match) continue
|
|
302
|
+
oldNo = Number(match[1]) - 1
|
|
303
|
+
newNo = Number(match[2]) - 1
|
|
304
|
+
hunks += 1
|
|
305
|
+
lines.push({ type: 'hunk', oldNo: null, newNo: null, text: rawLine })
|
|
306
|
+
continue
|
|
307
|
+
}
|
|
308
|
+
if (rawLine.startsWith('diff --git') || rawLine.startsWith('index ')
|
|
309
|
+
|| rawLine.startsWith('--- ') || rawLine.startsWith('+++ ')
|
|
310
|
+
|| rawLine.startsWith('new file mode') || rawLine.startsWith('deleted file mode')
|
|
311
|
+
|| rawLine.startsWith('old mode') || rawLine.startsWith('new mode')
|
|
312
|
+
|| rawLine.startsWith('similarity index') || rawLine.startsWith('rename from')
|
|
313
|
+
|| rawLine.startsWith('rename to') || rawLine.startsWith('Binary files')) continue
|
|
314
|
+
if (rawLine.startsWith('\\ No newline')) continue
|
|
315
|
+
if (!rawLine && oldNo === 0 && newNo === 0) continue
|
|
316
|
+
let type = 'context'
|
|
317
|
+
let content = rawLine
|
|
318
|
+
if (rawLine.startsWith('+')) { type = 'add'; content = rawLine.slice(1); added += 1; newNo += 1 }
|
|
319
|
+
else if (rawLine.startsWith('-')) { type = 'del'; content = rawLine.slice(1); removed += 1; oldNo += 1 }
|
|
320
|
+
else if (rawLine.startsWith(' ')) { content = rawLine.slice(1); oldNo += 1; newNo += 1 }
|
|
321
|
+
else continue
|
|
322
|
+
if (lines.length >= maxLines) { truncated = true; break }
|
|
323
|
+
lines.push({
|
|
324
|
+
type,
|
|
325
|
+
oldNo: type === 'add' ? null : oldNo,
|
|
326
|
+
newNo: type === 'del' ? null : newNo,
|
|
327
|
+
text: content,
|
|
328
|
+
})
|
|
329
|
+
}
|
|
330
|
+
return { lines, added, removed, truncated, hunks }
|
|
331
|
+
}
|
|
332
|
+
|
|
224
333
|
/**
|
|
225
334
|
* 默认的 `exec`:`spawn('git', args)` + 两个上限。**不走 shell**。
|
|
226
335
|
*
|
|
@@ -311,6 +420,10 @@ export function createGitReader(options = {}) {
|
|
|
311
420
|
const resultCache = new Map()
|
|
312
421
|
/** root → 进行中的 Promise(并发的两轮轮询共用同一次 git 调用)。 */
|
|
313
422
|
const inflight = new Map()
|
|
423
|
+
/** root → {at, result} —— 只给「变更」档的 status+numstat 用,不影响 `read()` 的语义。 */
|
|
424
|
+
const detailCache = new Map()
|
|
425
|
+
/** root → 进行中的 detail 读取。 */
|
|
426
|
+
const detailInflight = new Map()
|
|
314
427
|
|
|
315
428
|
const prefixOf = async (root) => {
|
|
316
429
|
const hit = prefixCache.get(root)
|
|
@@ -356,10 +469,78 @@ export function createGitReader(options = {}) {
|
|
|
356
469
|
return task
|
|
357
470
|
}
|
|
358
471
|
|
|
472
|
+
/**
|
|
473
|
+
* v0.26.x「变更」档:状态 + 行数统计(只读、只跑 status + numstat,不读 diff 正文)。
|
|
474
|
+
*
|
|
475
|
+
* 与 `read()` 分开的原因:`/api/changes`(关联检索)只需要 status,不该因为
|
|
476
|
+
* 「变更」档的上线每 8 秒多 spawn 一条 git。`readDetailed()` 只在那个档位被调用。
|
|
477
|
+
*
|
|
478
|
+
* @param {string} root - 工作区根
|
|
479
|
+
* @returns {Promise<object>} 与 `read()` 同形;文件条目额外有 `added/deleted/binary/untracked`。
|
|
480
|
+
* 读不到行数统计时 `statsAvailable=false`,状态列表**仍然可用**(不把整个功能拖垮)。
|
|
481
|
+
*/
|
|
482
|
+
const readDetailed = async (root) => {
|
|
483
|
+
const key = String(root || '')
|
|
484
|
+
const cached = detailCache.get(key)
|
|
485
|
+
if (cached && now() - cached.at < ttlMs) return cached.result
|
|
486
|
+
if (detailInflight.has(key)) return detailInflight.get(key)
|
|
487
|
+
const task = (async () => {
|
|
488
|
+
const changeSet = await read(key)
|
|
489
|
+
if (changeSet.available !== true) return { ...changeSet, statsAvailable: false }
|
|
490
|
+
const prefixHit = prefixCache.get(key)
|
|
491
|
+
const prefix = prefixHit ? prefixHit.prefix : ''
|
|
492
|
+
if (prefix === null) return { ...changeSet, statsAvailable: false }
|
|
493
|
+
const res = await exec(GIT_NUMSTAT_ARGS, { cwd: key, timeoutMs: GIT_TIMEOUT_MS, maxBytes: MAX_NUMSTAT_BYTES })
|
|
494
|
+
const reason = reasonOf(res)
|
|
495
|
+
if (reason) return { ...changeSet, statsAvailable: false }
|
|
496
|
+
const stats = parseNumstatZ(res.stdout, { prefix })
|
|
497
|
+
const files = changeSet.files.map((file) => {
|
|
498
|
+
const stat = stats.get(file.rel)
|
|
499
|
+
const untracked = Array.isArray(file.kinds) && file.kinds.includes('untracked')
|
|
500
|
+
return {
|
|
501
|
+
...file,
|
|
502
|
+
untracked,
|
|
503
|
+
...(stat ? { added: stat.added, deleted: stat.deleted, binary: stat.binary }
|
|
504
|
+
: (untracked ? { added: null, deleted: null, binary: false } : { added: null, deleted: null, binary: false })),
|
|
505
|
+
}
|
|
506
|
+
})
|
|
507
|
+
return { ...changeSet, files, statsAvailable: true }
|
|
508
|
+
})().then((result) => {
|
|
509
|
+
detailCache.set(key, { at: now(), result })
|
|
510
|
+
detailInflight.delete(key)
|
|
511
|
+
return result
|
|
512
|
+
}).catch(() => {
|
|
513
|
+
detailInflight.delete(key)
|
|
514
|
+
return { available: false, reason: 'failed-fatal', files: [], filesTotal: 0, truncated: false, statsAvailable: false }
|
|
515
|
+
})
|
|
516
|
+
detailInflight.set(key, task)
|
|
517
|
+
return task
|
|
518
|
+
}
|
|
519
|
+
|
|
520
|
+
/**
|
|
521
|
+
* 一次只读的逐行 diff(只给「变更」档点开看;不缓存,点一次读一次)。
|
|
522
|
+
* @param {string} root - 工作区根
|
|
523
|
+
* @param {string} rel - 工作区相对路径(上层已 resolve 校验)
|
|
524
|
+
* @returns {Promise<{available:boolean, reason:string|null, stdout:string, killed:string|null}>}
|
|
525
|
+
*/
|
|
526
|
+
const readDiff = async (root, rel) => {
|
|
527
|
+
const res = await exec([...GIT_DIFF_ARGS, String(rel || '')], {
|
|
528
|
+
cwd: String(root || ''), timeoutMs: GIT_TIMEOUT_MS, maxBytes: MAX_DIFF_BYTES,
|
|
529
|
+
})
|
|
530
|
+
const reason = reasonOf(res)
|
|
531
|
+
if (reason) return { available: false, reason, stdout: '', killed: res ? res.killed : null }
|
|
532
|
+
return { available: true, reason: null, stdout: res.stdout, killed: res.killed }
|
|
533
|
+
}
|
|
534
|
+
|
|
359
535
|
return {
|
|
360
536
|
read,
|
|
361
|
-
|
|
362
|
-
|
|
537
|
+
readDetailed,
|
|
538
|
+
readDiff,
|
|
539
|
+
/** 仅供测试 / 显式刷新:清掉四种缓存。 */
|
|
540
|
+
reset() {
|
|
541
|
+
prefixCache.clear(); resultCache.clear(); inflight.clear()
|
|
542
|
+
detailCache.clear(); detailInflight.clear()
|
|
543
|
+
},
|
|
363
544
|
}
|
|
364
545
|
}
|
|
365
546
|
|
package/src/host/index.js
CHANGED
|
@@ -50,7 +50,7 @@ import {
|
|
|
50
50
|
// v0.25:Git 变更关联检索。**只读、有界、默认关闭** —— `git.js` 只跑一条
|
|
51
51
|
// `git status --porcelain=v1 -z`(argv 是数组,绝不走 shell;写动词一个都没有),
|
|
52
52
|
// `changes.js` 把变更文件当种子去**已有的**关系事实表里取边,不发明关系。
|
|
53
|
-
import { createGitReader, MAX_REPORTED_FILES } from './git.js'
|
|
53
|
+
import { createGitReader, MAX_REPORTED_FILES, parseUnifiedDiff, MAX_DIFF_LINES } from './git.js'
|
|
54
54
|
import { splitSeeds, ghostCandidates, projectChangeRelated, MAX_CHANGE_RELATED } from './changes.js'
|
|
55
55
|
// v0.14:上下文装配。同样由这里注入依赖(`list` / `read`),保持纯函数可单测。
|
|
56
56
|
// ⚠️ 这里**只 import `buildContext`**:Context Pack 的文本渲染只在 `tool.js` 的
|
|
@@ -2071,6 +2071,227 @@ export async function buildContextFor(root, options = {}) {
|
|
|
2071
2071
|
return withPin
|
|
2072
2072
|
}
|
|
2073
2073
|
|
|
2074
|
+
/**
|
|
2075
|
+
* v0.26.x · **单文件逐行 diff**(「变更」档点开一行时读一次)。
|
|
2076
|
+
*
|
|
2077
|
+
* 只读:`git diff --no-color --no-ext-diff --no-textconv --unified=3 HEAD -- <rel>`,
|
|
2078
|
+
* 固定 argv、不走 shell、不带写动词;未跟踪文件没有 HEAD 基线,由宿主读文件生成全新增行。
|
|
2079
|
+
* 路径先 `resolve` 回工作区根;不合法 / 越界一律 404。
|
|
2080
|
+
*
|
|
2081
|
+
* @param {string} root - 工作区根
|
|
2082
|
+
* @param {string} rel - 工作区相对路径
|
|
2083
|
+
* @param {{gitReader?: object}} [input]
|
|
2084
|
+
* @returns {Promise<object>} `{ok, rel, kind, added, removed, binary, truncated, lines}`
|
|
2085
|
+
*/
|
|
2086
|
+
export async function diffPayload(root, rel, input = {}) {
|
|
2087
|
+
const clean = String(rel || '')
|
|
2088
|
+
if (!clean) return { ok: false, code: 'knit/missing-rel' }
|
|
2089
|
+
const rootAbs = resolve(root)
|
|
2090
|
+
const abs = resolve(root, clean)
|
|
2091
|
+
if (abs !== rootAbs && !abs.startsWith(`${rootAbs}${sep}`)) {
|
|
2092
|
+
return { ok: false, code: 'knit/not-found' }
|
|
2093
|
+
}
|
|
2094
|
+
const reader = input.gitReader && typeof input.gitReader.readDiff === 'function'
|
|
2095
|
+
? input.gitReader : gitReader
|
|
2096
|
+
const repos = await repositoryRoots(root)
|
|
2097
|
+
let repo = null
|
|
2098
|
+
let subRel = clean
|
|
2099
|
+
for (const candidate of repos) {
|
|
2100
|
+
if (!candidate.rel) { repo = candidate; subRel = clean; break }
|
|
2101
|
+
if (clean.startsWith(`${candidate.rel}/`)) {
|
|
2102
|
+
repo = candidate
|
|
2103
|
+
subRel = clean.slice(candidate.rel.length + 1)
|
|
2104
|
+
break
|
|
2105
|
+
}
|
|
2106
|
+
}
|
|
2107
|
+
// 没有仓库(或测试替身)时仍按根目录尝试一次:未跟踪文件可以纯读文件生成 diff。
|
|
2108
|
+
if (!repo) repo = { root: rootAbs, rel: '' }
|
|
2109
|
+
const kind = classifyFile(clean).kind
|
|
2110
|
+
const status = typeof reader.readDetailed === 'function'
|
|
2111
|
+
? await reader.readDetailed(repo.root).catch(() => null) : null
|
|
2112
|
+
const file = status && Array.isArray(status.files)
|
|
2113
|
+
? status.files.find((item) => item && item.rel === subRel) : null
|
|
2114
|
+
const untracked = Boolean(file && Array.isArray(file.kinds) && file.kinds.includes('untracked'))
|
|
2115
|
+
if (untracked) {
|
|
2116
|
+
let buf = null
|
|
2117
|
+
try { buf = await readFile(abs) } catch { /* 读不到按失败 */ }
|
|
2118
|
+
if (!buf) return { ok: false, code: 'knit/diff-failed' }
|
|
2119
|
+
if (buf.includes(0)) return { ok: true, rel: clean, kind, added: 0, removed: 0, binary: true, truncated: false, lines: [] }
|
|
2120
|
+
const parts = buf.toString('utf8').split('\n')
|
|
2121
|
+
if (parts.length && parts[parts.length - 1] === '') parts.pop()
|
|
2122
|
+
const truncated = parts.length > MAX_DIFF_LINES
|
|
2123
|
+
const shown = truncated ? parts.slice(0, MAX_DIFF_LINES) : parts
|
|
2124
|
+
return {
|
|
2125
|
+
ok: true, rel: clean, kind, added: shown.length, removed: 0, binary: false, truncated,
|
|
2126
|
+
lines: shown.map((text, i) => ({ type: 'add', oldNo: null, newNo: i + 1, text })),
|
|
2127
|
+
}
|
|
2128
|
+
}
|
|
2129
|
+
if (typeof reader.readDiff !== 'function') return { ok: false, code: 'knit/diff-failed' }
|
|
2130
|
+
const diff = await reader.readDiff(repo.root, subRel)
|
|
2131
|
+
if (!diff.available) return { ok: false, code: 'knit/diff-failed' }
|
|
2132
|
+
const binary = /^Binary files /m.test(diff.stdout)
|
|
2133
|
+
if (binary) {
|
|
2134
|
+
return { ok: true, rel: clean, kind, added: 0, removed: 0, binary: true, truncated: false, lines: [] }
|
|
2135
|
+
}
|
|
2136
|
+
const parsed = parseUnifiedDiff(diff.stdout, { maxLines: MAX_DIFF_LINES })
|
|
2137
|
+
return {
|
|
2138
|
+
ok: true, rel: clean, kind,
|
|
2139
|
+
added: parsed.added, removed: parsed.removed,
|
|
2140
|
+
binary: false, truncated: parsed.truncated,
|
|
2141
|
+
lines: parsed.lines,
|
|
2142
|
+
}
|
|
2143
|
+
}
|
|
2144
|
+
|
|
2145
|
+
/**
|
|
2146
|
+
* 找这个工作区里可用的 Git 仓库:根目录本身是仓库就用它;否则只看**一层子目录**
|
|
2147
|
+
* (最多 8 个)里带 `.git` 的那些。Knit 的 workspace 经常是项目根(如 `08_Knit/`),
|
|
2148
|
+
* 而仓库在其子目录(`08_Knit/knit/`)—— 这时变更档要能列出子仓库的改动,
|
|
2149
|
+
* 而不是一句「不是 Git 工作区」。
|
|
2150
|
+
*
|
|
2151
|
+
* @param {string} root - 工作区根
|
|
2152
|
+
* @returns {Promise<Array<{root:string, rel:string}>>} `rel=''` 表示根仓库;否则是子目录名
|
|
2153
|
+
*/
|
|
2154
|
+
async function repositoryRoots(root) {
|
|
2155
|
+
const abs = resolve(root)
|
|
2156
|
+
const hasGit = async (dir) => {
|
|
2157
|
+
try {
|
|
2158
|
+
const info = await stat(join(dir, '.git'))
|
|
2159
|
+
return info.isDirectory() || info.isFile()
|
|
2160
|
+
} catch { return false }
|
|
2161
|
+
}
|
|
2162
|
+
if (await hasGit(abs)) return [{ root: abs, rel: '' }]
|
|
2163
|
+
let entries = []
|
|
2164
|
+
try { entries = await readdir(abs, { withFileTypes: true }) } catch { return [] }
|
|
2165
|
+
const out = []
|
|
2166
|
+
for (const entry of entries.slice().sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0))) {
|
|
2167
|
+
if (!entry.isDirectory() || entry.name.startsWith('.') || entry.name === 'node_modules') continue
|
|
2168
|
+
const child = join(abs, entry.name)
|
|
2169
|
+
if (await hasGit(child)) out.push({ root: child, rel: entry.name })
|
|
2170
|
+
if (out.length >= 8) break
|
|
2171
|
+
}
|
|
2172
|
+
return out
|
|
2173
|
+
}
|
|
2174
|
+
|
|
2175
|
+
/**
|
|
2176
|
+
* v0.26.x · **未提交变更的文件清单**(「变更」档)。
|
|
2177
|
+
*
|
|
2178
|
+
* 根目录是仓库就照旧;不是的话会在**一层子目录**里找仓库(见 `repositoryRoots`),
|
|
2179
|
+
* 把子仓库的 rel 前缀成工作区相对路径(如 `knit/src/client/client.js`)。
|
|
2180
|
+
* 只读:`git status` + `git diff --numstat`,不读 diff 正文。
|
|
2181
|
+
*
|
|
2182
|
+
* @param {string} root - 工作区根
|
|
2183
|
+
* @param {{gitReader?: object}} [input]
|
|
2184
|
+
* @returns {Promise<object>} `{ ok, mode:'status', git: { available, reason, filesTotal, truncated, statsAvailable, files } }`
|
|
2185
|
+
*/
|
|
2186
|
+
export async function statusPayload(root, input = {}) {
|
|
2187
|
+
const reader = input.gitReader && typeof input.gitReader.readDetailed === 'function'
|
|
2188
|
+
? input.gitReader
|
|
2189
|
+
: gitReader
|
|
2190
|
+
const rootAbs = resolve(root)
|
|
2191
|
+
const repos = await repositoryRoots(root)
|
|
2192
|
+
// 没有仓库也走一次 reader:让「不是 Git 工作区」这个事实从 git.js 原样出来,而不是这里编。
|
|
2193
|
+
if (repos.length === 0) repos.push({ root: rootAbs, rel: '' })
|
|
2194
|
+
|
|
2195
|
+
const MAX_STATUS_FILES = 100
|
|
2196
|
+
const rows = []
|
|
2197
|
+
let available = false
|
|
2198
|
+
let reason = null
|
|
2199
|
+
let filesTotal = 0
|
|
2200
|
+
let truncated = false
|
|
2201
|
+
let statsAvailable = true
|
|
2202
|
+
for (const repo of repos) {
|
|
2203
|
+
const changeSet = typeof reader.readDetailed === 'function'
|
|
2204
|
+
? await reader.readDetailed(repo.root)
|
|
2205
|
+
: await reader.read(repo.root)
|
|
2206
|
+
if (!changeSet || changeSet.available !== true) {
|
|
2207
|
+
if (!reason && changeSet && changeSet.reason) reason = changeSet.reason
|
|
2208
|
+
continue
|
|
2209
|
+
}
|
|
2210
|
+
available = true
|
|
2211
|
+
filesTotal += Number(changeSet.filesTotal) || 0
|
|
2212
|
+
truncated = truncated || changeSet.truncated === true
|
|
2213
|
+
statsAvailable = statsAvailable && changeSet.statsAvailable === true
|
|
2214
|
+
const rawFiles = Array.isArray(changeSet.files) ? changeSet.files : []
|
|
2215
|
+
for (const file of rawFiles) {
|
|
2216
|
+
if (!file || file.isDir === true) continue
|
|
2217
|
+
const subRel = String(file.rel || '')
|
|
2218
|
+
if (!subRel) continue
|
|
2219
|
+
const rel = repo.rel ? `${repo.rel}/${subRel}` : subRel
|
|
2220
|
+
const abs = resolve(root, rel)
|
|
2221
|
+
// 越界 / 目录外:git 自己的输出理论上不会给,但这条边界和 /api/raw 一样不能省。
|
|
2222
|
+
if (abs !== rootAbs && !abs.startsWith(`${rootAbs}${sep}`)) continue
|
|
2223
|
+
const kinds = Array.isArray(file.kinds) ? file.kinds.slice() : []
|
|
2224
|
+
const untracked = kinds.includes('untracked')
|
|
2225
|
+
const deleted = kinds.includes('deleted')
|
|
2226
|
+
const classified = classifyFile(rel)
|
|
2227
|
+
const kind = classified.kind
|
|
2228
|
+
const previewable = !deleted && classified.previewable === true
|
|
2229
|
+
let mtimeMs = 0
|
|
2230
|
+
let bytes = 0
|
|
2231
|
+
if (!deleted) {
|
|
2232
|
+
const info = await stat(abs).catch(() => null)
|
|
2233
|
+
if (info && info.isFile()) { mtimeMs = info.mtimeMs || 0; bytes = info.size || 0 }
|
|
2234
|
+
}
|
|
2235
|
+
let added = Number.isFinite(file.added) ? file.added : null
|
|
2236
|
+
let removed = Number.isFinite(file.deleted) ? file.deleted : null
|
|
2237
|
+
let binary = file.binary === true
|
|
2238
|
+
// 未跟踪文件没有 HEAD 基线(numstat 不列),用「读一遍数行数」补上;二进制/超大不数。
|
|
2239
|
+
if (untracked && !deleted) {
|
|
2240
|
+
try {
|
|
2241
|
+
const buf = await readFile(abs)
|
|
2242
|
+
if (buf.length <= 512 * 1024 && !buf.includes(0)) {
|
|
2243
|
+
const text = buf.toString('utf8')
|
|
2244
|
+
added = text === '' ? 0 : text.split('\n').length - (text.endsWith('\n') ? 1 : 0)
|
|
2245
|
+
removed = 0
|
|
2246
|
+
binary = false
|
|
2247
|
+
} else {
|
|
2248
|
+
binary = true
|
|
2249
|
+
}
|
|
2250
|
+
} catch { /* 读不到就只给状态,不给行数 */ }
|
|
2251
|
+
}
|
|
2252
|
+
rows.push({
|
|
2253
|
+
rel,
|
|
2254
|
+
repo: repo.rel,
|
|
2255
|
+
...(file.origRel ? { origRel: repo.rel ? `${repo.rel}/${file.origRel}` : file.origRel } : {}),
|
|
2256
|
+
kinds,
|
|
2257
|
+
kind,
|
|
2258
|
+
previewable,
|
|
2259
|
+
untracked,
|
|
2260
|
+
deleted,
|
|
2261
|
+
added,
|
|
2262
|
+
removed,
|
|
2263
|
+
binary,
|
|
2264
|
+
mtimeMs,
|
|
2265
|
+
bytes,
|
|
2266
|
+
})
|
|
2267
|
+
}
|
|
2268
|
+
}
|
|
2269
|
+
if (!available) {
|
|
2270
|
+
return {
|
|
2271
|
+
ok: true,
|
|
2272
|
+
mode: 'status',
|
|
2273
|
+
git: { available: false, reason: reason || 'not-a-repo', filesTotal: 0, truncated: false, statsAvailable: false, files: [] },
|
|
2274
|
+
}
|
|
2275
|
+
}
|
|
2276
|
+
rows.sort((a, b) => {
|
|
2277
|
+
if (a.mtimeMs !== b.mtimeMs) return b.mtimeMs - a.mtimeMs
|
|
2278
|
+
return a.rel < b.rel ? -1 : a.rel > b.rel ? 1 : 0
|
|
2279
|
+
})
|
|
2280
|
+
const limited = rows.slice(0, MAX_STATUS_FILES)
|
|
2281
|
+
return {
|
|
2282
|
+
ok: true,
|
|
2283
|
+
mode: 'status',
|
|
2284
|
+
git: {
|
|
2285
|
+
available: true,
|
|
2286
|
+
reason: null,
|
|
2287
|
+
filesTotal,
|
|
2288
|
+
truncated: truncated || rows.length > MAX_STATUS_FILES,
|
|
2289
|
+
statsAvailable,
|
|
2290
|
+
files: limited,
|
|
2291
|
+
},
|
|
2292
|
+
}
|
|
2293
|
+
}
|
|
2294
|
+
|
|
2074
2295
|
/**
|
|
2075
2296
|
* v0.25 · **Git 变更关联**:独立接口 `/knit/api/changes` 的载荷构造函数。
|
|
2076
2297
|
*
|
|
@@ -3138,6 +3359,19 @@ export function apply(ctx) {
|
|
|
3138
3359
|
return
|
|
3139
3360
|
}
|
|
3140
3361
|
|
|
3362
|
+
if (url.pathname === `${ROUTE_PREFIX}/api/diff`) {
|
|
3363
|
+
const rel = url.searchParams.get('rel') || ''
|
|
3364
|
+
const payload = await diffPayload(root, rel)
|
|
3365
|
+
sendJson(res, payload.ok ? 200 : 404, payload)
|
|
3366
|
+
return
|
|
3367
|
+
}
|
|
3368
|
+
|
|
3369
|
+
if (url.pathname === `${ROUTE_PREFIX}/api/status`) {
|
|
3370
|
+
/* v0.26.x「变更」档:未提交文件清单 + 行数统计。只读;不碰 Context Pack。 */
|
|
3371
|
+
sendJson(res, 200, await statusPayload(root))
|
|
3372
|
+
return
|
|
3373
|
+
}
|
|
3374
|
+
|
|
3141
3375
|
if (url.pathname === `${ROUTE_PREFIX}/api/changes`) {
|
|
3142
3376
|
/* v0.25 · **Git 变更关联**:独立接口。
|
|
3143
3377
|
⚠️ 与 `/api/recent` 分开不是洁癖,是契约纪律:
|
|
@@ -3307,7 +3541,7 @@ export function apply(ctx) {
|
|
|
3307
3541
|
|
|
3308
3542
|
webCtx.effect(() => {
|
|
3309
3543
|
const unregister = webCtx.webServer.register({ kind: 'prefix', path: ROUTE_PREFIX, handler })
|
|
3310
|
-
console.log(`[${name}] route ready: ${ROUTE_PREFIX}/api/recent, ${ROUTE_PREFIX}/api/doc, ${ROUTE_PREFIX}/api/raw, ${ROUTE_PREFIX}/api/links, ${ROUTE_PREFIX}/api/context, ${ROUTE_PREFIX}/api/changes, ${ROUTE_PREFIX}/api/attachments, ${ROUTE_PREFIX}/api/attachment, ${ROUTE_PREFIX}/api/control (POST)`)
|
|
3544
|
+
console.log(`[${name}] route ready: ${ROUTE_PREFIX}/api/recent, ${ROUTE_PREFIX}/api/doc, ${ROUTE_PREFIX}/api/raw, ${ROUTE_PREFIX}/api/links, ${ROUTE_PREFIX}/api/context, ${ROUTE_PREFIX}/api/status, ${ROUTE_PREFIX}/api/diff, ${ROUTE_PREFIX}/api/changes, ${ROUTE_PREFIX}/api/attachments, ${ROUTE_PREFIX}/api/attachment, ${ROUTE_PREFIX}/api/control (POST)`)
|
|
3311
3545
|
return () => unregister()
|
|
3312
3546
|
}, 'dsh-knit: host route')
|
|
3313
3547
|
})
|
package/test/client.test.mjs
CHANGED
|
@@ -714,7 +714,7 @@ test('媒体:类型偏好默认 doc,合法值保留,老值 all 回落到 d
|
|
|
714
714
|
assert.equal(readKindPref(), 'doc')
|
|
715
715
|
})
|
|
716
716
|
|
|
717
|
-
test('
|
|
717
|
+
test('媒体:默认文档视图有**四个**类型按钮(文档/代码/媒体/变更),但不出现媒体网格,计数仍按文档', async () => {
|
|
718
718
|
installFetch(kindResponder({ doc: listPayload() }))
|
|
719
719
|
const { KnitBody } = loadClientModule().exports.__test
|
|
720
720
|
harness.reset()
|
|
@@ -724,10 +724,10 @@ test('媒体:默认文档视图有**三个**类型按钮(文档/代码/媒
|
|
|
724
724
|
nodes = harness.render(h(KnitBody, { sessionId: 's1' }))
|
|
725
725
|
|
|
726
726
|
const btns = byClass(nodes, 'knit-type-btn')
|
|
727
|
-
// v0.
|
|
728
|
-
//
|
|
729
|
-
assert.equal(btns.length,
|
|
730
|
-
assert.deepEqual(btns.map(textOf), ['文档', '代码', '媒体'])
|
|
727
|
+
// v0.26.x:四档「文档 / 代码 / 媒体 / 变更」——「全部」仍然不许回来。
|
|
728
|
+
// 四档等距、下划线页签样式不变(出现「全部」即红)。
|
|
729
|
+
assert.equal(btns.length, 4)
|
|
730
|
+
assert.deepEqual(btns.map(textOf), ['文档', '代码', '媒体', '变更'])
|
|
731
731
|
assert.ok(!btns.some((btn) => textOf(btn) === '全部'), '界面上不许再有「全部」这一档')
|
|
732
732
|
assert.equal(btns.find((b) => textOf(b) === '文档').props['aria-selected'], true)
|
|
733
733
|
assert.equal(byClass(nodes, 'knit-media-grid').length, 0)
|
|
@@ -739,6 +739,72 @@ test('媒体:默认文档视图有**三个**类型按钮(文档/代码/媒
|
|
|
739
739
|
'v0.21.x:计数只剩阿拉伯数字,量词只留在 title 里')
|
|
740
740
|
})
|
|
741
741
|
|
|
742
|
+
test('变更:第四档列出未提交的 Markdown/代码,带状态与 +N −N', async () => {
|
|
743
|
+
const statusPayload = {
|
|
744
|
+
ok: true,
|
|
745
|
+
mode: 'status',
|
|
746
|
+
git: {
|
|
747
|
+
available: true,
|
|
748
|
+
reason: null,
|
|
749
|
+
filesTotal: 3,
|
|
750
|
+
truncated: false,
|
|
751
|
+
statsAvailable: true,
|
|
752
|
+
files: [
|
|
753
|
+
{ rel: 'src/a.ts', kind: 'code', kinds: ['modified'], added: 5, removed: 2, mtimeMs: Date.now() },
|
|
754
|
+
{ rel: 'docs/b.md', kind: 'md', kinds: ['untracked'], added: 3, removed: 0, untracked: true, mtimeMs: Date.now() - 1000 },
|
|
755
|
+
{ rel: 'img/c.png', kind: 'image', kinds: ['modified'], added: null, removed: null, mtimeMs: Date.now() - 2000 },
|
|
756
|
+
],
|
|
757
|
+
},
|
|
758
|
+
}
|
|
759
|
+
const diffPayload = {
|
|
760
|
+
ok: true, rel: 'src/a.ts', kind: 'code', added: 2, removed: 1, binary: false, truncated: false,
|
|
761
|
+
lines: [
|
|
762
|
+
{ type: 'context', oldNo: 1, newNo: 1, text: 'one' },
|
|
763
|
+
{ type: 'del', oldNo: 2, newNo: null, text: 'two' },
|
|
764
|
+
{ type: 'add', oldNo: null, newNo: 2, text: 'TWO' },
|
|
765
|
+
{ type: 'add', oldNo: null, newNo: 3, text: 'three' },
|
|
766
|
+
],
|
|
767
|
+
}
|
|
768
|
+
installFetch((url) => (url.includes('/api/status') ? statusPayload
|
|
769
|
+
: url.includes('/api/diff') ? diffPayload : listPayload()))
|
|
770
|
+
const { KnitBody } = loadClientModule().exports.__test
|
|
771
|
+
harness.reset()
|
|
772
|
+
harness.seed(['', 'time'])
|
|
773
|
+
let nodes = harness.render(h(KnitBody, { sessionId: 's1' }))
|
|
774
|
+
await harness.flush()
|
|
775
|
+
nodes = harness.render(h(KnitBody, { sessionId: 's1' }))
|
|
776
|
+
|
|
777
|
+
const changeTab = byClass(nodes, 'knit-type-btn').find((btn) => textOf(btn) === '变更')
|
|
778
|
+
assert.ok(changeTab, '第四档「变更」在')
|
|
779
|
+
changeTab.props.onClick()
|
|
780
|
+
nodes = harness.render(h(KnitBody, { sessionId: 's1' }))
|
|
781
|
+
await harness.flush()
|
|
782
|
+
nodes = harness.render(h(KnitBody, { sessionId: 's1' }))
|
|
783
|
+
|
|
784
|
+
assert.equal(byClass(nodes, 'knit-type-btn').find((b) => textOf(b) === '变更').props['aria-selected'], true)
|
|
785
|
+
const rows = byClass(nodes, 'knit-doc')
|
|
786
|
+
assert.equal(rows.length, 2, '只列 Markdown / 代码;图片变更不计入可列行')
|
|
787
|
+
assert.deepEqual(byClass(nodes, 'knit-change-badge').map(textOf), ['修改', '新文件'])
|
|
788
|
+
const counts = byClass(nodes, 'knit-change-count').map(textOf)
|
|
789
|
+
assert.ok(counts.some((text) => text.includes('+5') && text.includes('−2')), '修改行带 +5 −2')
|
|
790
|
+
assert.ok(counts.some((text) => text.includes('+3')), '未跟踪文件按行数补 +3')
|
|
791
|
+
assert.equal(textOf(byExactClass(nodes, 'knit-count')[0]), '3', '计数是全部变更文件数(含图片)')
|
|
792
|
+
assert.ok(byClass(nodes, 'knit-seg-btn').every((btn) => btn.props.disabled === true),
|
|
793
|
+
'变更档固定按时间,排序按钮禁用')
|
|
794
|
+
|
|
795
|
+
// 点变更行 → 拉 diff → 同一个预览面板里画逐行
|
|
796
|
+
rows[0].props.onClick()
|
|
797
|
+
await harness.flush()
|
|
798
|
+
nodes = harness.render(h(KnitBody, { sessionId: 's1' }))
|
|
799
|
+
assert.equal(byExactClass(nodes, 'knit-diff').length, 1, '变更行打开逐行 diff')
|
|
800
|
+
const diffLines = byClass(nodes, 'knit-diff-line')
|
|
801
|
+
.filter((node) => String(node.props.className || '').split(' ').includes('knit-diff-line'))
|
|
802
|
+
assert.equal(diffLines.length, 4)
|
|
803
|
+
assert.equal(diffLines.filter((node) => String(node.props.className).split(' ').includes('add')).length, 2)
|
|
804
|
+
assert.equal(diffLines.filter((node) => String(node.props.className).split(' ').includes('del')).length, 1)
|
|
805
|
+
assert.ok(byClass(nodes, 'knit-diff-add').some((node) => textOf(node) === '+2'))
|
|
806
|
+
})
|
|
807
|
+
|
|
742
808
|
test('v0.21.x 顶行计数:可见的只有阿拉伯数字,量词只留在 title 里', async () => {
|
|
743
809
|
const mounted = await mountWithPayload(listPayload())
|
|
744
810
|
|
|
@@ -860,10 +926,10 @@ test('v0.23.1:「全部」档在**源码里整体删除**(KIND_ALL / allRows
|
|
|
860
926
|
]) {
|
|
861
927
|
assert.ok(!source.includes(dead), `「全部」必须整体删除,源码里不该再有 ${dead}`)
|
|
862
928
|
}
|
|
863
|
-
//
|
|
929
|
+
// 类型档就是这四档 —— 一行写得清清楚楚(多一档 / 少一档都会红)
|
|
864
930
|
assert.ok(
|
|
865
|
-
source.includes("[[KIND_DOC, 'kind.doc'], [KIND_CODE, 'kind.code'], [KIND_MEDIA, 'kind.media']]"),
|
|
866
|
-
'
|
|
931
|
+
source.includes("[[KIND_DOC, 'kind.doc'], [KIND_CODE, 'kind.code'], [KIND_MEDIA, 'kind.media'], [KIND_CHANGES, 'kind.changes']]"),
|
|
932
|
+
'类型档就是四档',
|
|
867
933
|
)
|
|
868
934
|
})
|
|
869
935
|
|
|
@@ -4793,8 +4859,8 @@ test('v0.21.x/v0.23.1 工具栏:排序 | 竖线 | 三档类型 | [检索
|
|
|
4793
4859
|
|
|
4794
4860
|
// ② 各条件都在,而且各用各的控件(不是把条件连排成一串按钮)
|
|
4795
4861
|
assert.deepEqual(byClass(under, 'knit-seg-btn').map(textOf), ['相关', '最新'])
|
|
4796
|
-
assert.deepEqual(byClass(under, 'knit-type-btn').map(textOf), ['文档', '代码', '媒体'],
|
|
4797
|
-
'v0.
|
|
4862
|
+
assert.deepEqual(byClass(under, 'knit-type-btn').map(textOf), ['文档', '代码', '媒体', '变更'],
|
|
4863
|
+
'v0.26.x:「全部」仍然删除 ⇒ 文档 / 代码 / 媒体 / 变更四档')
|
|
4798
4864
|
assert.equal(byClass(under, 'knit-retmode-btn').length + byClass(under, 'knit-pipe-method').length, 0,
|
|
4799
4865
|
'v0.24:第二行只有排序 / 类型 / 搜索三样,检索方式不在这里')
|
|
4800
4866
|
for (const node of under) {
|