@tooee/diff 0.10.1 → 0.10.3
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/README.md +14 -43
- package/dist/diff-code-block.d.ts +1 -1
- package/dist/diff-code-block.d.ts.map +1 -1
- package/dist/diff-code-block.js +2 -2
- package/dist/diff-code-block.js.map +1 -1
- package/dist/diff-view.d.ts +2 -2
- package/dist/diff-view.d.ts.map +1 -1
- package/dist/diff-view.js +3 -3
- package/dist/diff-view.js.map +1 -1
- package/dist/model.d.ts +1 -1
- package/dist/model.d.ts.map +1 -1
- package/dist/model.js +1 -1
- package/dist/model.js.map +1 -1
- package/dist/theme-map.d.ts +1 -1
- package/dist/theme-map.d.ts.map +1 -1
- package/package.json +12 -11
- package/src/diff-code-block.tsx +18 -19
- package/src/diff-view.tsx +19 -20
- package/src/model.ts +4 -4
- package/src/theme-map.ts +2 -2
package/README.md
CHANGED
|
@@ -1,21 +1,14 @@
|
|
|
1
1
|
# @tooee/diff
|
|
2
2
|
|
|
3
|
-
Unified and split diff rendering for Tooee, drawn by [Hunk](https://github.com/modem-dev/hunk)'s
|
|
4
|
-
public OpenTUI primitives (`hunkdiff/opentui`).
|
|
3
|
+
Unified and split diff rendering for Tooee, drawn by [Hunk](https://github.com/modem-dev/hunk)'s public OpenTUI primitives (`hunkdiff/opentui`).
|
|
5
4
|
|
|
6
|
-
Part of the [Tooee](https://github.com/gingerhendrix/tooee) monorepo. See the main repo for
|
|
7
|
-
documentation.
|
|
5
|
+
Part of the [Tooee](https://github.com/gingerhendrix/tooee) monorepo. See the main repo for documentation.
|
|
8
6
|
|
|
9
7
|
## What it provides
|
|
10
8
|
|
|
11
|
-
- `buildDiffModel(patch)` — parses unified patch text into navigation rows: one row per file
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
- `DiffView` — a `row-document` whose rows are those diff rows. The row document stays the only
|
|
15
|
-
scroll owner, so the cursor, search decorations, marks, scroll-follow and mouse routing all keep
|
|
16
|
-
working.
|
|
17
|
-
- `diffCodeBlockRenderer` / `DIFF_CODE_BLOCK_RENDERERS` — a Markdown code-block renderer that
|
|
18
|
-
draws ` ```diff ` and ` ```patch ` fences as Hunk blocks. `@tooee/view` registers it by default.
|
|
9
|
+
- `buildDiffModel(patch)` — parses unified patch text into navigation rows: one row per file header and one per `@@` hunk, each carrying its own patch text and its span in the original patch.
|
|
10
|
+
- `DiffView` — a `row-document` whose rows are those diff rows. The row document stays the only scroll owner, so the cursor, search decorations, marks, scroll-follow and mouse routing all keep working.
|
|
11
|
+
- `diffCodeBlockRenderer` / `DIFF_CODE_BLOCK_RENDERERS` — a Markdown code-block renderer that draws ` ```diff ` and ` ```patch ` fences as Hunk blocks. `@tooee/view` registers it by default.
|
|
19
12
|
- `resolveHunkDiffTheme` — maps a Tooee theme onto the closest bundled Hunk theme.
|
|
20
13
|
- `isDiffPatch` — content sniffing for patch text.
|
|
21
14
|
|
|
@@ -23,13 +16,9 @@ documentation.
|
|
|
23
16
|
|
|
24
17
|
## Row model
|
|
25
18
|
|
|
26
|
-
Hunk renders a whole file at a time, but a diff is only pleasant to navigate hunk by hunk. A hunk
|
|
27
|
-
row therefore carries a copy of its file whose `metadata.hunks` is narrowed to a single hunk while
|
|
28
|
-
the whole-file line arrays stay intact — so line numbers and the `··· N unchanged lines ···`
|
|
29
|
-
counts still resolve against the complete file.
|
|
19
|
+
Hunk renders a whole file at a time, but a diff is only pleasant to navigate hunk by hunk. A hunk row therefore carries a copy of its file whose `metadata.hunks` is narrowed to a single hunk while the whole-file line arrays stay intact — so line numbers and the `··· N unchanged lines ···` counts still resolve against the complete file.
|
|
30
20
|
|
|
31
|
-
Files Hunk renders without hunks (binary, too large, untracked) contribute one `body` row instead,
|
|
32
|
-
so the notice Hunk draws for them is still shown.
|
|
21
|
+
Files Hunk renders without hunks (binary, too large, untracked) contribute one `body` row instead, so the notice Hunk draws for them is still shown.
|
|
33
22
|
|
|
34
23
|
## Fence options
|
|
35
24
|
|
|
@@ -43,31 +32,13 @@ Words after the fence type are read as options; unknown words are ignored.
|
|
|
43
32
|
| `nolines` | Hides Hunk's line-number columns |
|
|
44
33
|
| `wrap` | Wraps long lines instead of clipping them |
|
|
45
34
|
|
|
46
|
-
A fence whose body is not a real unified diff — prose-style `+`/`-` bullets, for instance —
|
|
47
|
-
returns `null` and falls back to the default syntax-highlighted code block.
|
|
35
|
+
A fence whose body is not a real unified diff — prose-style `+`/`-` bullets, for instance — returns `null` and falls back to the default syntax-highlighted code block.
|
|
48
36
|
|
|
49
37
|
## Known limits
|
|
50
38
|
|
|
51
|
-
- **Line-number column width is per hunk.** Hunk sizes its line-number columns from the hunks it
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
- **
|
|
56
|
-
|
|
57
|
-
than reproduced exactly. Unmapped (user) themes fall back to GitHub's palette on the matching
|
|
58
|
-
light/dark side.
|
|
59
|
-
- **Marks are not painted inside hunks.** Row-level decorations (cursor, search, selection, marks)
|
|
60
|
-
paint under the row, but Hunk draws its own backgrounds over most of it, so a mark on a diff row
|
|
61
|
-
reads mainly from the gutter sign.
|
|
62
|
-
- **Diff content is replace-only when streaming.** `ContentChunk`'s `append` does not accept
|
|
63
|
-
`diff`; send the full patch through a `replace` chunk instead.
|
|
64
|
-
- **Peer range.** `hunkdiff@0.18.0` declares `@opentui/core`/`@opentui/react` `^0.4.3`. It runs and
|
|
65
|
-
type-checks against Tooee's `0.5.1`, and Bun resolves it without a warning inside this workspace,
|
|
66
|
-
but a standalone install of `@tooee/diff` may print a peer-dependency warning until Hunk widens
|
|
67
|
-
the range. The version is pinned exactly because Hunk is pre-1.0.
|
|
68
|
-
- **Install weight.** `hunkdiff` declares the `bun` npm package as a runtime dependency and ships a
|
|
69
|
-
prebuilt CLI binary as an optional one, neither of which `hunkdiff/opentui` imports. Adding this
|
|
70
|
-
package grew the local Bun store by roughly 580 MB, of which about 400 MB is the Bun binary and
|
|
71
|
-
its platform variants and 134 MB is `hunkdiff-linux-x64`. Only the ~18 MB `hunkdiff/opentui`
|
|
72
|
-
bundle is actually used. Fixing this needs an upstream packaging change; `bun patch` cannot drop
|
|
73
|
-
a declared dependency from the resolution graph.
|
|
39
|
+
- **Line-number column width is per hunk.** Hunk sizes its line-number columns from the hunks it is given, and each hunk row is given one hunk, so two hunks of the same file can differ by a column when their line numbers differ in digit count. Everything else — collapsed-gap counts, content, word-level highlights — matches a whole-file render.
|
|
40
|
+
- **Themes are approximated.** Hunk resolves one of its own bundled palettes by name and accepts no custom colour table, so each Tooee theme is mapped to the closest bundled Hunk theme rather than reproduced exactly. Unmapped (user) themes fall back to GitHub's palette on the matching light/dark side.
|
|
41
|
+
- **Marks are not painted inside hunks.** Row-level decorations (cursor, search, selection, marks) paint under the row, but Hunk draws its own backgrounds over most of it, so a mark on a diff row reads mainly from the gutter sign.
|
|
42
|
+
- **Diff content is replace-only when streaming.** `ContentChunk`'s `append` does not accept `diff`; send the full patch through a `replace` chunk instead.
|
|
43
|
+
- **Peer range.** `hunkdiff@0.18.0` declares `@opentui/core`/`@opentui/react` `^0.4.3`. It runs and type-checks against Tooee's `0.5.1`, and Bun resolves it without a warning inside this workspace, but a standalone install of `@tooee/diff` may print a peer-dependency warning until Hunk widens the range. The version is pinned exactly because Hunk is pre-1.0.
|
|
44
|
+
- **Install weight.** `hunkdiff` declares the `bun` npm package as a runtime dependency and ships a prebuilt CLI binary as an optional one, neither of which `hunkdiff/opentui` imports. Adding this package grew the local Bun store by roughly 580 MB, of which about 400 MB is the Bun binary and its platform variants and 134 MB is `hunkdiff-linux-x64`. Only the ~18 MB `hunkdiff/opentui` bundle is actually used. Fixing this needs an upstream packaging change; `bun patch` cannot drop a declared dependency from the resolution graph.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { HunkDiffLayout } from "hunkdiff/opentui";
|
|
2
1
|
import type { CodeBlockRenderer } from "@tooee/renderers";
|
|
2
|
+
import type { HunkDiffLayout } from "hunkdiff/opentui";
|
|
3
3
|
/** Options a fence info string can carry after the fence type. */
|
|
4
4
|
export interface DiffFenceOptions {
|
|
5
5
|
layout: HunkDiffLayout;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-code-block.d.ts","sourceRoot":"","sources":["../src/diff-code-block.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diff-code-block.d.ts","sourceRoot":"","sources":["../src/diff-code-block.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAA0B,MAAM,kBAAkB,CAAC;AAElF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAQvD,kEAAkE;AAClE,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,SAC1B,MAAM,KACX,gBAaF,CAAC;AAuDF,eAAO,MAAM,qBAAqB,EAAE,iBAAiC,CAAC;AAOtE,KAAK,wBAAwB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AAElE,6DAA6D;AAE7D,eAAO,MAAM,yBAAyB,EAAE,wBAA2D,CAAC"}
|
package/dist/diff-code-block.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { jsx as _jsx } from "@opentui/react/jsx-runtime";
|
|
2
|
-
import { useMemo } from "react";
|
|
3
2
|
import { CodeBlockChrome } from "@tooee/renderers";
|
|
4
3
|
import { useTheme } from "@tooee/themes";
|
|
5
|
-
import {
|
|
4
|
+
import { useMemo } from "react";
|
|
6
5
|
import { DiffRowView, effectiveLayout } from "./diff-view.js";
|
|
6
|
+
import { buildDiffModel } from "./model.js";
|
|
7
7
|
import { resolveHunkDiffTheme } from "./theme-map.js";
|
|
8
8
|
/**
|
|
9
9
|
* Read fence options from the info string, e.g. ```` ```diff split nolines ````.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-code-block.js","sourceRoot":"","sources":["../src/diff-code-block.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"diff-code-block.js","sourceRoot":"","sources":["../src/diff-code-block.tsx"],"names":[],"mappings":"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"}
|
package/dist/diff-view.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { ReactNode } from "react";
|
|
2
|
-
import type { HunkDiffLayout, HunkDiffThemeName } from "hunkdiff/opentui";
|
|
3
1
|
import type { DocumentBindings } from "@tooee/renderers";
|
|
2
|
+
import type { HunkDiffLayout, HunkDiffThemeName } from "hunkdiff/opentui";
|
|
3
|
+
import type { ReactNode } from "react";
|
|
4
4
|
import "@tooee/renderers/row-document";
|
|
5
5
|
import type { DiffRow } from "./model.js";
|
|
6
6
|
/**
|
package/dist/diff-view.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-view.d.ts","sourceRoot":"","sources":["../src/diff-view.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diff-view.d.ts","sourceRoot":"","sources":["../src/diff-view.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C;;;;GAIG;AACH,eAAO,MAAM,eAAe,KAAK,CAAC;AAKlC,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,gEAAgE;IAChE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,0CAA0C;IAC1C,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+DAA+D;IAC/D,KAAK,CAAC,EAAE,iBAAiB,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAiB,SAAQ,iBAAiB;IACzD,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,iBAAiB,CAAC;IACzB,oEAAoE;IACpE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,qFAAqF;AACrF,eAAO,MAAM,eAAe,WAClB,cAAc,GAAG,SAAS,SAC3B,MAAM,KACZ,cAEF,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,WAAW,mIAYrB,gBAAgB,KAAG,SAoBrB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,iBAAiB;IACtD,IAAI,EAAE,SAAS,OAAO,EAAE,CAAC;IACzB,8EAA8E;IAC9E,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,0EAA0E;IAC1E,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,8DAA8D;IAC9D,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,uEAOlB,aAAa,KAAG,SAyClB,CAAC"}
|
package/dist/diff-view.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { jsx as _jsx } from "@opentui/react/jsx-runtime";
|
|
2
|
-
import { useMemo } from "react";
|
|
3
2
|
import { useTerminalDimensions } from "@opentui/react";
|
|
4
|
-
import { HunkDiffBody, HunkDiffFileHeader } from "hunkdiff/opentui";
|
|
5
|
-
import { useTheme } from "@tooee/themes";
|
|
6
3
|
import { DEFAULT_SIGN_COLUMN_WIDTH, computeRowDocumentGutterWidth, useGutterPalette, } from "@tooee/renderers";
|
|
4
|
+
import { useTheme } from "@tooee/themes";
|
|
5
|
+
import { HunkDiffBody, HunkDiffFileHeader } from "hunkdiff/opentui";
|
|
6
|
+
import { useMemo } from "react";
|
|
7
7
|
import "@tooee/renderers/row-document";
|
|
8
8
|
import { resolveHunkDiffTheme } from "./theme-map.js";
|
|
9
9
|
/**
|
package/dist/diff-view.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diff-view.js","sourceRoot":"","sources":["../src/diff-view.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"diff-view.js","sourceRoot":"","sources":["../src/diff-view.tsx"],"names":[],"mappings":"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"}
|
package/dist/model.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { HunkDiffFile, HunkDiffFileInput, HunkDiffStats } from "hunkdiff/opentui";
|
|
2
1
|
import type { DocumentRowSource } from "@tooee/renderers";
|
|
2
|
+
import type { HunkDiffFile, HunkDiffFileInput, HunkDiffStats } from "hunkdiff/opentui";
|
|
3
3
|
/**
|
|
4
4
|
* What a navigation row stands for.
|
|
5
5
|
*
|
package/dist/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEvF;;;;;;;;GAQG;AACH,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAEnD,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,WAAW,CAAC;IAClB,0DAA0D;IAC1D,GAAG,EAAE,MAAM,CAAC;IACZ,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,IAAI,EAAE,iBAAiB,CAAC;IACxB,mCAAmC;IACnC,MAAM,EAAE,YAAY,CAAC;IACrB,kEAAkE;IAClE,IAAI,EAAE,MAAM,CAAC;IACb,mFAAmF;IACnF,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAC;CAClC;AAED,MAAM,WAAW,SAAS;IACxB,+CAA+C;IAC/C,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,mDAAmD;IACnD,KAAK,EAAE,aAAa,CAAC;IACrB,+CAA+C;IAC/C,KAAK,EAAE,MAAM,CAAC;CACf;AAMD,UAAU,YAAY;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,8EAA8E;IAC9E,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACzC;AAMD;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,UAAqC,MAAM,KAAG,YAAY,EAmDvF,CAAC;AAkEF;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,UAAkC,MAAM,aAAa,MAAM,KAAG,SAgExF,CAAC;AAEF,oFAAoF;AACpF,eAAO,MAAM,cAAc;IACzB,MAAM,QAAQ,OAAO,KAAG,MAAM;IAC9B,SAAS,QAAQ,OAAO,KAAG,iBAAiB,GAAG,IAAI;IACnD,OAAO,QAAQ,OAAO,KAAG,MAAM;CAChC,CAAC;AAEF,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC"}
|
package/dist/model.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { createHunkDiffFilesFromPatch } from "hunkdiff/opentui";
|
|
2
1
|
import { SourceIndex } from "@tooee/renderers";
|
|
2
|
+
import { createHunkDiffFilesFromPatch } from "hunkdiff/opentui";
|
|
3
3
|
const GIT_HEADER = "diff --git ";
|
|
4
4
|
const OLD_FILE_HEADER = "--- ";
|
|
5
5
|
const HUNK_HEADER = "@@";
|
package/dist/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
package/dist/theme-map.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { HunkDiffThemeName } from "hunkdiff/opentui";
|
|
2
1
|
import type { ResolvedTheme } from "@tooee/themes";
|
|
2
|
+
import type { HunkDiffThemeName } from "hunkdiff/opentui";
|
|
3
3
|
/**
|
|
4
4
|
* Hunk resolves one of its own bundled palettes by name; it accepts no custom
|
|
5
5
|
* colour table, so a Tooee theme is matched to the closest bundled Hunk theme
|
package/dist/theme-map.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme-map.d.ts","sourceRoot":"","sources":["../src/theme-map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"theme-map.d.ts","sourceRoot":"","sources":["../src/theme-map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AA2CD,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAsB,CAAC;AAQhF,uFAAuF;AACvF,eAAO,MAAM,iBAAiB,UAAqC,MAAM,KAAG,OAY3E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,cACpB,MAAM,SACV,aAAa,KACnB,iBAGF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tooee/diff",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.3",
|
|
4
4
|
"description": "Hunk-backed unified/split diff rendering for Tooee",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cli",
|
|
@@ -39,21 +39,22 @@
|
|
|
39
39
|
"typecheck": "tsc --noEmit"
|
|
40
40
|
},
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@
|
|
43
|
-
"@tooee/
|
|
44
|
-
"
|
|
42
|
+
"@pierre/diffs": "1.3.5",
|
|
43
|
+
"@tooee/renderers": "0.10.3",
|
|
44
|
+
"@tooee/themes": "0.10.3",
|
|
45
|
+
"hunkdiff": "0.22.0"
|
|
45
46
|
},
|
|
46
47
|
"devDependencies": {
|
|
47
|
-
"@opentui/core": "^0.5.
|
|
48
|
-
"@opentui/react": "^0.5.
|
|
48
|
+
"@opentui/core": "^0.5.12",
|
|
49
|
+
"@opentui/react": "^0.5.12",
|
|
49
50
|
"@tooee/test-support": "0.7.3",
|
|
50
|
-
"@types/bun": "^1.
|
|
51
|
-
"@types/react": "^19.
|
|
52
|
-
"typescript": "^
|
|
51
|
+
"@types/bun": "^1.4.2",
|
|
52
|
+
"@types/react": "^19.3.0",
|
|
53
|
+
"typescript": "^7.0.2"
|
|
53
54
|
},
|
|
54
55
|
"peerDependencies": {
|
|
55
|
-
"@opentui/core": "^0.5.
|
|
56
|
-
"@opentui/react": "^0.5.
|
|
56
|
+
"@opentui/core": "^0.5.12",
|
|
57
|
+
"@opentui/react": "^0.5.12",
|
|
57
58
|
"react": "^18.0.0 || ^19.0.0"
|
|
58
59
|
}
|
|
59
60
|
}
|
package/src/diff-code-block.tsx
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { useMemo } from "react";
|
|
2
|
-
import type { ReactNode } from "react";
|
|
3
|
-
import type { HunkDiffLayout } from "hunkdiff/opentui";
|
|
4
1
|
import { CodeBlockChrome } from "@tooee/renderers";
|
|
5
2
|
import type { CodeBlockRenderer, CodeBlockRendererProps } from "@tooee/renderers";
|
|
6
3
|
import { useTheme } from "@tooee/themes";
|
|
7
|
-
import {
|
|
4
|
+
import type { HunkDiffLayout } from "hunkdiff/opentui";
|
|
5
|
+
import { useMemo } from "react";
|
|
6
|
+
import type { ReactNode } from "react";
|
|
7
|
+
|
|
8
8
|
import { DiffRowView, effectiveLayout } from "./diff-view.js";
|
|
9
|
+
import { buildDiffModel } from "./model.js";
|
|
9
10
|
import { resolveHunkDiffTheme } from "./theme-map.js";
|
|
10
11
|
|
|
11
12
|
/** Options a fence info string can carry after the fence type. */
|
|
@@ -22,14 +23,14 @@ export interface DiffFenceOptions {
|
|
|
22
23
|
* render.
|
|
23
24
|
*/
|
|
24
25
|
export const parseDiffFenceOptions = function parseDiffFenceOptions(
|
|
25
|
-
info: string
|
|
26
|
+
info: string
|
|
26
27
|
): DiffFenceOptions {
|
|
27
28
|
const words = new Set(
|
|
28
29
|
info
|
|
29
30
|
.trim()
|
|
30
31
|
.split(/\s+/u)
|
|
31
32
|
.slice(1)
|
|
32
|
-
.map((word) => word.toLowerCase())
|
|
33
|
+
.map((word) => word.toLowerCase())
|
|
33
34
|
);
|
|
34
35
|
return {
|
|
35
36
|
layout: words.has("split") ? "split" : "stack",
|
|
@@ -76,19 +77,17 @@ const DiffCodeBlock = function DiffCodeBlock({
|
|
|
76
77
|
|
|
77
78
|
return (
|
|
78
79
|
<CodeBlockChrome theme={theme} indent={indent}>
|
|
79
|
-
{rows.map(
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
),
|
|
91
|
-
)}
|
|
80
|
+
{rows.map((row): ReactNode => (
|
|
81
|
+
<DiffRowView
|
|
82
|
+
key={row.key}
|
|
83
|
+
row={row}
|
|
84
|
+
width={blockWidth}
|
|
85
|
+
theme={hunkTheme}
|
|
86
|
+
layout={effectiveLayout(options.layout, blockWidth)}
|
|
87
|
+
showHunkLineNumbers={options.showLineNumbers}
|
|
88
|
+
wrapLines={options.wrapLines}
|
|
89
|
+
/>
|
|
90
|
+
))}
|
|
92
91
|
</CodeBlockChrome>
|
|
93
92
|
);
|
|
94
93
|
};
|
package/src/diff-view.tsx
CHANGED
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import { useMemo } from "react";
|
|
2
|
-
import type { ReactNode } from "react";
|
|
3
1
|
import { useTerminalDimensions } from "@opentui/react";
|
|
4
|
-
import { HunkDiffBody, HunkDiffFileHeader } from "hunkdiff/opentui";
|
|
5
|
-
import type { HunkDiffLayout, HunkDiffThemeName } from "hunkdiff/opentui";
|
|
6
|
-
import { useTheme } from "@tooee/themes";
|
|
7
2
|
import {
|
|
8
3
|
DEFAULT_SIGN_COLUMN_WIDTH,
|
|
9
4
|
computeRowDocumentGutterWidth,
|
|
10
5
|
useGutterPalette,
|
|
11
6
|
} from "@tooee/renderers";
|
|
12
7
|
import type { DocumentBindings } from "@tooee/renderers";
|
|
8
|
+
import { useTheme } from "@tooee/themes";
|
|
9
|
+
import { HunkDiffBody, HunkDiffFileHeader } from "hunkdiff/opentui";
|
|
10
|
+
import type { HunkDiffLayout, HunkDiffThemeName } from "hunkdiff/opentui";
|
|
11
|
+
import { useMemo } from "react";
|
|
12
|
+
import type { ReactNode } from "react";
|
|
13
13
|
import "@tooee/renderers/row-document";
|
|
14
|
+
|
|
14
15
|
import type { DiffRow } from "./model.js";
|
|
15
16
|
import { resolveHunkDiffTheme } from "./theme-map.js";
|
|
16
17
|
|
|
@@ -49,7 +50,7 @@ export interface DiffRowViewProps extends DiffRenderOptions {
|
|
|
49
50
|
/** Split falls back to stack when the content area is too narrow for two columns. */
|
|
50
51
|
export const effectiveLayout = function effectiveLayout(
|
|
51
52
|
layout: HunkDiffLayout | undefined,
|
|
52
|
-
width: number
|
|
53
|
+
width: number
|
|
53
54
|
): HunkDiffLayout {
|
|
54
55
|
return layout === "split" && width < MIN_SPLIT_WIDTH ? "stack" : (layout ?? "stack");
|
|
55
56
|
};
|
|
@@ -132,7 +133,7 @@ export const DiffView = function DiffView({
|
|
|
132
133
|
showLineNumbers,
|
|
133
134
|
signColumnWidth: DEFAULT_SIGN_COLUMN_WIDTH,
|
|
134
135
|
}),
|
|
135
|
-
[rows.length, showLineNumbers]
|
|
136
|
+
[rows.length, showLineNumbers]
|
|
136
137
|
);
|
|
137
138
|
const contentWidth = Math.max(1, width ?? terminalWidth - gutterWidth - SCROLLBAR_RESERVE);
|
|
138
139
|
|
|
@@ -148,19 +149,17 @@ export const DiffView = function DiffView({
|
|
|
148
149
|
style={{ flexGrow: 1 }}
|
|
149
150
|
onMouseDown={document?.onMouseDown}
|
|
150
151
|
>
|
|
151
|
-
{rows.map(
|
|
152
|
-
|
|
153
|
-
<
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
),
|
|
163
|
-
)}
|
|
152
|
+
{rows.map((row, index): ReactNode => (
|
|
153
|
+
<box key={row.key}>
|
|
154
|
+
<DiffRowView
|
|
155
|
+
{...render}
|
|
156
|
+
row={row}
|
|
157
|
+
width={contentWidth}
|
|
158
|
+
theme={hunkTheme}
|
|
159
|
+
active={index === activeIndex}
|
|
160
|
+
/>
|
|
161
|
+
</box>
|
|
162
|
+
))}
|
|
164
163
|
</row-document>
|
|
165
164
|
);
|
|
166
165
|
};
|
package/src/model.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { createHunkDiffFilesFromPatch } from "hunkdiff/opentui";
|
|
2
|
-
import type { HunkDiffFile, HunkDiffFileInput, HunkDiffStats } from "hunkdiff/opentui";
|
|
3
1
|
import { SourceIndex } from "@tooee/renderers";
|
|
4
2
|
import type { DocumentRowSource } from "@tooee/renderers";
|
|
3
|
+
import { createHunkDiffFilesFromPatch } from "hunkdiff/opentui";
|
|
4
|
+
import type { HunkDiffFile, HunkDiffFileInput, HunkDiffStats } from "hunkdiff/opentui";
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* What a navigation row stands for.
|
|
@@ -140,7 +140,7 @@ const HUNK_HEADER_CONTEXT_SEPARATOR = " @@ ";
|
|
|
140
140
|
* hunk model for drawing.
|
|
141
141
|
*/
|
|
142
142
|
const normalizeHunkHeaderForRender = function normalizeHunkHeaderForRender(
|
|
143
|
-
hunk: HunkDiffFile["metadata"]["hunks"][number]
|
|
143
|
+
hunk: HunkDiffFile["metadata"]["hunks"][number]
|
|
144
144
|
): HunkDiffFile["metadata"]["hunks"][number] {
|
|
145
145
|
const { hunkContext, hunkSpecs } = hunk;
|
|
146
146
|
if (
|
|
@@ -158,7 +158,7 @@ const normalizeHunkHeaderForRender = function normalizeHunkHeaderForRender(
|
|
|
158
158
|
/** Narrow a file to a single hunk while keeping its whole-file line arrays. */
|
|
159
159
|
const narrowToHunk = function narrowToHunk(
|
|
160
160
|
file: HunkDiffFile,
|
|
161
|
-
hunkIndex: number
|
|
161
|
+
hunkIndex: number
|
|
162
162
|
): HunkDiffFileInput {
|
|
163
163
|
const hunk = normalizeHunkHeaderForRender(file.metadata.hunks[hunkIndex]);
|
|
164
164
|
return {
|
package/src/theme-map.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { HunkDiffThemeName } from "hunkdiff/opentui";
|
|
2
1
|
import type { ResolvedTheme } from "@tooee/themes";
|
|
2
|
+
import type { HunkDiffThemeName } from "hunkdiff/opentui";
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Hunk resolves one of its own bundled palettes by name; it accepts no custom
|
|
@@ -86,7 +86,7 @@ export const isLightBackground = function isLightBackground(color: string): bool
|
|
|
86
86
|
*/
|
|
87
87
|
export const resolveHunkDiffTheme = function resolveHunkDiffTheme(
|
|
88
88
|
themeName: string,
|
|
89
|
-
theme: ResolvedTheme
|
|
89
|
+
theme: ResolvedTheme
|
|
90
90
|
): HunkDiffThemeName {
|
|
91
91
|
const pair = HUNK_THEME_BY_NAME.get(themeName) ?? GITHUB;
|
|
92
92
|
return isLightBackground(theme.background) ? pair.light : pair.dark;
|