trident-git 0.2.0 → 0.2.1
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/.next/BUILD_ID +1 -0
- package/.next/app-path-routes-manifest.json +23 -0
- package/.next/build-manifest.json +20 -0
- package/.next/export-marker.json +6 -0
- package/.next/images-manifest.json +73 -0
- package/.next/next-minimal-server.js.nft.json +1 -0
- package/.next/next-server.js.nft.json +1 -0
- package/.next/package.json +1 -0
- package/.next/prerender-manifest.json +282 -0
- package/.next/react-loadable-manifest.json +1 -0
- package/.next/required-server-files.js +330 -0
- package/.next/required-server-files.json +330 -0
- package/.next/routes-manifest.json +170 -0
- package/.next/server/app/_global-error/page.js +3 -0
- package/.next/server/app/_global-error/page.js.nft.json +1 -0
- package/.next/server/app/_global-error/page_client-reference-manifest.js +1 -0
- package/.next/server/app/_global-error.html +2 -0
- package/.next/server/app/_global-error.meta +16 -0
- package/.next/server/app/_global-error.rsc +12 -0
- package/.next/server/app/_global-error.segments/_full.segment.rsc +12 -0
- package/.next/server/app/_global-error.segments/_global-error/__PAGE__.segment.rsc +5 -0
- package/.next/server/app/_global-error.segments/_global-error.segment.rsc +4 -0
- package/.next/server/app/_global-error.segments/_head.segment.rsc +5 -0
- package/.next/server/app/_global-error.segments/_index.segment.rsc +4 -0
- package/.next/server/app/_global-error.segments/_tree.segment.rsc +1 -0
- package/.next/server/app/_not-found/page.js +2 -0
- package/.next/server/app/_not-found/page.js.nft.json +1 -0
- package/.next/server/app/_not-found/page_client-reference-manifest.js +1 -0
- package/.next/server/app/_not-found.html +1 -0
- package/.next/server/app/_not-found.meta +16 -0
- package/.next/server/app/_not-found.rsc +19 -0
- package/.next/server/app/_not-found.segments/_full.segment.rsc +19 -0
- package/.next/server/app/_not-found.segments/_head.segment.rsc +6 -0
- package/.next/server/app/_not-found.segments/_index.segment.rsc +8 -0
- package/.next/server/app/_not-found.segments/_not-found/__PAGE__.segment.rsc +5 -0
- package/.next/server/app/_not-found.segments/_not-found.segment.rsc +4 -0
- package/.next/server/app/_not-found.segments/_tree.segment.rsc +6 -0
- package/.next/server/app/api/credentials/route.js +1 -0
- package/.next/server/app/api/credentials/route.js.nft.json +1 -0
- package/.next/server/app/api/credentials/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/custom-scripts/route.js +3 -0
- package/.next/server/app/api/custom-scripts/route.js.nft.json +1 -0
- package/.next/server/app/api/custom-scripts/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/fs/route.js +1 -0
- package/.next/server/app/api/fs/route.js.nft.json +1 -0
- package/.next/server/app/api/fs/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/git/action/route.js +1 -0
- package/.next/server/app/api/git/action/route.js.nft.json +1 -0
- package/.next/server/app/api/git/action/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/git/branches/route.js +1 -0
- package/.next/server/app/api/git/branches/route.js.nft.json +1 -0
- package/.next/server/app/api/git/branches/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/git/diff/route.js +1 -0
- package/.next/server/app/api/git/diff/route.js.nft.json +1 -0
- package/.next/server/app/api/git/diff/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/git/log/route.js +1 -0
- package/.next/server/app/api/git/log/route.js.nft.json +1 -0
- package/.next/server/app/api/git/log/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/git/status/route.js +1 -0
- package/.next/server/app/api/git/status/route.js.nft.json +1 -0
- package/.next/server/app/api/git/status/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/repos/route.js +1 -0
- package/.next/server/app/api/repos/route.js.nft.json +1 -0
- package/.next/server/app/api/repos/route_client-reference-manifest.js +1 -0
- package/.next/server/app/api/settings/route.js +1 -0
- package/.next/server/app/api/settings/route.js.nft.json +1 -0
- package/.next/server/app/api/settings/route_client-reference-manifest.js +1 -0
- package/.next/server/app/credentials/page.js +4 -0
- package/.next/server/app/credentials/page.js.nft.json +1 -0
- package/.next/server/app/credentials/page_client-reference-manifest.js +1 -0
- package/.next/server/app/credentials.html +1 -0
- package/.next/server/app/credentials.meta +15 -0
- package/.next/server/app/credentials.rsc +23 -0
- package/.next/server/app/credentials.segments/_full.segment.rsc +23 -0
- package/.next/server/app/credentials.segments/_head.segment.rsc +6 -0
- package/.next/server/app/credentials.segments/_index.segment.rsc +8 -0
- package/.next/server/app/credentials.segments/_tree.segment.rsc +6 -0
- package/.next/server/app/credentials.segments/credentials/__PAGE__.segment.rsc +9 -0
- package/.next/server/app/credentials.segments/credentials.segment.rsc +4 -0
- package/.next/server/app/icon.png/route.js +1 -0
- package/.next/server/app/icon.png/route.js.nft.json +1 -0
- package/.next/server/app/icon.png.meta +1 -0
- package/.next/server/app/index.html +1 -0
- package/.next/server/app/index.meta +14 -0
- package/.next/server/app/index.rsc +20 -0
- package/.next/server/app/index.segments/__PAGE__.segment.rsc +6 -0
- package/.next/server/app/index.segments/_full.segment.rsc +20 -0
- package/.next/server/app/index.segments/_head.segment.rsc +6 -0
- package/.next/server/app/index.segments/_index.segment.rsc +8 -0
- package/.next/server/app/index.segments/_tree.segment.rsc +6 -0
- package/.next/server/app/page.js +2 -0
- package/.next/server/app/page.js.nft.json +1 -0
- package/.next/server/app/page_client-reference-manifest.js +1 -0
- package/.next/server/app/workspace/changes/page.js +4 -0
- package/.next/server/app/workspace/changes/page.js.nft.json +1 -0
- package/.next/server/app/workspace/changes/page_client-reference-manifest.js +1 -0
- package/.next/server/app/workspace/changes.html +1 -0
- package/.next/server/app/workspace/changes.meta +16 -0
- package/.next/server/app/workspace/changes.rsc +26 -0
- package/.next/server/app/workspace/changes.segments/_full.segment.rsc +26 -0
- package/.next/server/app/workspace/changes.segments/_head.segment.rsc +6 -0
- package/.next/server/app/workspace/changes.segments/_index.segment.rsc +8 -0
- package/.next/server/app/workspace/changes.segments/_tree.segment.rsc +7 -0
- package/.next/server/app/workspace/changes.segments/workspace/changes/__PAGE__.segment.rsc +10 -0
- package/.next/server/app/workspace/changes.segments/workspace/changes.segment.rsc +4 -0
- package/.next/server/app/workspace/changes.segments/workspace.segment.rsc +7 -0
- package/.next/server/app/workspace/custom-scripts/page.js +2 -0
- package/.next/server/app/workspace/custom-scripts/page.js.nft.json +1 -0
- package/.next/server/app/workspace/custom-scripts/page_client-reference-manifest.js +1 -0
- package/.next/server/app/workspace/custom-scripts.html +1 -0
- package/.next/server/app/workspace/custom-scripts.meta +16 -0
- package/.next/server/app/workspace/custom-scripts.rsc +25 -0
- package/.next/server/app/workspace/custom-scripts.segments/_full.segment.rsc +25 -0
- package/.next/server/app/workspace/custom-scripts.segments/_head.segment.rsc +6 -0
- package/.next/server/app/workspace/custom-scripts.segments/_index.segment.rsc +8 -0
- package/.next/server/app/workspace/custom-scripts.segments/_tree.segment.rsc +6 -0
- package/.next/server/app/workspace/custom-scripts.segments/workspace/custom-scripts/__PAGE__.segment.rsc +9 -0
- package/.next/server/app/workspace/custom-scripts.segments/workspace/custom-scripts.segment.rsc +4 -0
- package/.next/server/app/workspace/custom-scripts.segments/workspace.segment.rsc +7 -0
- package/.next/server/app/workspace/history/page.js +2 -0
- package/.next/server/app/workspace/history/page.js.nft.json +1 -0
- package/.next/server/app/workspace/history/page_client-reference-manifest.js +1 -0
- package/.next/server/app/workspace/history.html +1 -0
- package/.next/server/app/workspace/history.meta +16 -0
- package/.next/server/app/workspace/history.rsc +26 -0
- package/.next/server/app/workspace/history.segments/_full.segment.rsc +26 -0
- package/.next/server/app/workspace/history.segments/_head.segment.rsc +6 -0
- package/.next/server/app/workspace/history.segments/_index.segment.rsc +8 -0
- package/.next/server/app/workspace/history.segments/_tree.segment.rsc +7 -0
- package/.next/server/app/workspace/history.segments/workspace/history/__PAGE__.segment.rsc +10 -0
- package/.next/server/app/workspace/history.segments/workspace/history.segment.rsc +4 -0
- package/.next/server/app/workspace/history.segments/workspace.segment.rsc +7 -0
- package/.next/server/app/workspace/page.js +2 -0
- package/.next/server/app/workspace/page.js.nft.json +1 -0
- package/.next/server/app/workspace/page_client-reference-manifest.js +1 -0
- package/.next/server/app/workspace/settings/page.js +2 -0
- package/.next/server/app/workspace/settings/page.js.nft.json +1 -0
- package/.next/server/app/workspace/settings/page_client-reference-manifest.js +1 -0
- package/.next/server/app/workspace/settings.html +1 -0
- package/.next/server/app/workspace/settings.meta +16 -0
- package/.next/server/app/workspace/settings.rsc +25 -0
- package/.next/server/app/workspace/settings.segments/_full.segment.rsc +25 -0
- package/.next/server/app/workspace/settings.segments/_head.segment.rsc +6 -0
- package/.next/server/app/workspace/settings.segments/_index.segment.rsc +8 -0
- package/.next/server/app/workspace/settings.segments/_tree.segment.rsc +6 -0
- package/.next/server/app/workspace/settings.segments/workspace/settings/__PAGE__.segment.rsc +9 -0
- package/.next/server/app/workspace/settings.segments/workspace/settings.segment.rsc +4 -0
- package/.next/server/app/workspace/settings.segments/workspace.segment.rsc +7 -0
- package/.next/server/app/workspace/stashes/page.js +2 -0
- package/.next/server/app/workspace/stashes/page.js.nft.json +1 -0
- package/.next/server/app/workspace/stashes/page_client-reference-manifest.js +1 -0
- package/.next/server/app/workspace/stashes.html +1 -0
- package/.next/server/app/workspace/stashes.meta +16 -0
- package/.next/server/app/workspace/stashes.rsc +26 -0
- package/.next/server/app/workspace/stashes.segments/_full.segment.rsc +26 -0
- package/.next/server/app/workspace/stashes.segments/_head.segment.rsc +6 -0
- package/.next/server/app/workspace/stashes.segments/_index.segment.rsc +8 -0
- package/.next/server/app/workspace/stashes.segments/_tree.segment.rsc +7 -0
- package/.next/server/app/workspace/stashes.segments/workspace/stashes/__PAGE__.segment.rsc +10 -0
- package/.next/server/app/workspace/stashes.segments/workspace/stashes.segment.rsc +4 -0
- package/.next/server/app/workspace/stashes.segments/workspace.segment.rsc +7 -0
- package/.next/server/app/workspace.html +1 -0
- package/.next/server/app/workspace.meta +15 -0
- package/.next/server/app/workspace.rsc +26 -0
- package/.next/server/app/workspace.segments/_full.segment.rsc +26 -0
- package/.next/server/app/workspace.segments/_head.segment.rsc +6 -0
- package/.next/server/app/workspace.segments/_index.segment.rsc +8 -0
- package/.next/server/app/workspace.segments/_tree.segment.rsc +7 -0
- package/.next/server/app/workspace.segments/workspace/__PAGE__.segment.rsc +10 -0
- package/.next/server/app/workspace.segments/workspace.segment.rsc +7 -0
- package/.next/server/app-paths-manifest.json +23 -0
- package/.next/server/chunks/116.js +1 -0
- package/.next/server/chunks/170.js +1 -0
- package/.next/server/chunks/309.js +6 -0
- package/.next/server/chunks/356.js +1 -0
- package/.next/server/chunks/392.js +1 -0
- package/.next/server/chunks/443.js +37 -0
- package/.next/server/chunks/445.js +22 -0
- package/.next/server/chunks/471.js +13 -0
- package/.next/server/chunks/557.js +5 -0
- package/.next/server/chunks/680.js +1 -0
- package/.next/server/chunks/739.js +5 -0
- package/.next/server/chunks/781.js +1 -0
- package/.next/server/chunks/813.js +1 -0
- package/.next/server/chunks/816.js +13 -0
- package/.next/server/functions-config-manifest.json +6 -0
- package/.next/server/interception-route-rewrite-manifest.js +1 -0
- package/.next/server/middleware-build-manifest.js +1 -0
- package/.next/server/middleware-manifest.json +6 -0
- package/.next/server/middleware-react-loadable-manifest.js +1 -0
- package/.next/server/next-font-manifest.js +1 -0
- package/.next/server/next-font-manifest.json +1 -0
- package/.next/server/pages/404.html +1 -0
- package/.next/server/pages/500.html +2 -0
- package/.next/server/pages-manifest.json +4 -0
- package/.next/server/server-reference-manifest.js +1 -0
- package/.next/server/server-reference-manifest.json +1 -0
- package/.next/server/webpack-runtime.js +1 -0
- package/.next/static/chunks/131-6237c77d708182b1.js +1 -0
- package/.next/static/chunks/147-d4cb3e03218d75df.js +6 -0
- package/.next/static/chunks/176-b068120641913226.js +1 -0
- package/.next/static/chunks/200-3664e65687e716a2.js +1 -0
- package/.next/static/chunks/26-d93e82c9c09ff972.js +1 -0
- package/.next/static/chunks/4bd1b696-096d35a2bd1da3af.js +1 -0
- package/.next/static/chunks/500-5d45efbf86b8d36e.js +1 -0
- package/.next/static/chunks/772-b39107b40c31b6b6.js +3 -0
- package/.next/static/chunks/785-e6d755147ff87934.js +1 -0
- package/.next/static/chunks/790-3e8fa6e595d97940.js +6 -0
- package/.next/static/chunks/794-37dad9bbc14b04b8.js +2 -0
- package/.next/static/chunks/841-4d865378216d36eb.js +13 -0
- package/.next/static/chunks/app/_global-error/page-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/_not-found/page-5bea07380837254f.js +1 -0
- package/.next/static/chunks/app/api/credentials/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/custom-scripts/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/fs/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/git/action/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/git/branches/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/git/diff/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/git/log/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/git/status/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/repos/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/api/settings/route-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/app/credentials/page-23c1807ad9f68a40.js +1 -0
- package/.next/static/chunks/app/layout-a06241c385e50ae0.js +1 -0
- package/.next/static/chunks/app/page-c8404790f5191fd7.js +1 -0
- package/.next/static/chunks/app/workspace/changes/page-8cca17f80e66f534.js +3 -0
- package/.next/static/chunks/app/workspace/custom-scripts/page-ee24b9dd7779244f.js +1 -0
- package/.next/static/chunks/app/workspace/history/page-b7017fea285c804c.js +1 -0
- package/.next/static/chunks/app/workspace/layout-cb86c00fdcd8db08.js +1 -0
- package/.next/static/chunks/app/workspace/page-21211acc90c08509.js +1 -0
- package/.next/static/chunks/app/workspace/settings/page-7ccb58ece31492e9.js +1 -0
- package/.next/static/chunks/app/workspace/stashes/page-0e1b8304c4b0f4f3.js +1 -0
- package/.next/static/chunks/framework-75892d61b920805f.js +1 -0
- package/.next/static/chunks/main-app-221e1b945693a142.js +1 -0
- package/.next/static/chunks/main-f1d55fffd3cc9809.js +5 -0
- package/.next/static/chunks/next/dist/client/components/builtin/app-error-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/next/dist/client/components/builtin/forbidden-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/next/dist/client/components/builtin/global-error-f2a2c324f3740ed8.js +1 -0
- package/.next/static/chunks/next/dist/client/components/builtin/not-found-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/next/dist/client/components/builtin/unauthorized-9eb8a19109bbd711.js +1 -0
- package/.next/static/chunks/polyfills-42372ed130431b0a.js +1 -0
- package/.next/static/chunks/webpack-7dec27dc3bfe207a.js +1 -0
- package/.next/static/css/36968b90b2339533.css +1 -0
- package/.next/static/css/c56c0e57397a3a60.css +1 -0
- package/.next/static/css/de70bee13400563f.css +1 -0
- package/.next/static/i5Fy6fyWcq44ejS8h_y1c/_buildManifest.js +1 -0
- package/.next/static/i5Fy6fyWcq44ejS8h_y1c/_ssgManifest.js +1 -0
- package/.next/static/media/4cf2300e9c8272f7-s.p.woff2 +0 -0
- package/.next/static/media/747892c23ea88013-s.woff2 +0 -0
- package/.next/static/media/8d697b304b401681-s.woff2 +0 -0
- package/.next/static/media/93f479601ee12b01-s.p.woff2 +0 -0
- package/.next/static/media/9610d9e46709d722-s.woff2 +0 -0
- package/.next/static/media/ba015fad6dcf6784-s.woff2 +0 -0
- package/README.md +2 -0
- package/bin/trident-git.mjs +9 -11
- package/package.json +7 -5
- package/eslint.config.mjs +0 -18
- package/postcss.config.mjs +0 -7
- package/src/app/api/credentials/route.ts +0 -113
- package/src/app/api/custom-scripts/route.ts +0 -203
- package/src/app/api/fs/route.ts +0 -75
- package/src/app/api/git/action/route.ts +0 -383
- package/src/app/api/git/branches/route.ts +0 -20
- package/src/app/api/git/diff/route.ts +0 -104
- package/src/app/api/git/log/route.ts +0 -28
- package/src/app/api/git/status/route.ts +0 -28
- package/src/app/api/repos/route.ts +0 -84
- package/src/app/api/settings/route.ts +0 -37
- package/src/app/credentials/page.tsx +0 -408
- package/src/app/globals.css +0 -109
- package/src/app/layout.tsx +0 -38
- package/src/app/page.tsx +0 -10
- package/src/app/providers.tsx +0 -21
- package/src/app/workspace/changes/page.tsx +0 -27
- package/src/app/workspace/custom-scripts/page.tsx +0 -247
- package/src/app/workspace/history/page.tsx +0 -27
- package/src/app/workspace/layout.tsx +0 -26
- package/src/app/workspace/page.tsx +0 -27
- package/src/app/workspace/settings/page.tsx +0 -233
- package/src/app/workspace/stashes/page.tsx +0 -395
- package/src/components/command-palette.tsx +0 -178
- package/src/components/context-menu.tsx +0 -200
- package/src/components/fs-browser.tsx +0 -154
- package/src/components/git/diff-view.tsx +0 -137
- package/src/components/git/git-graph.tsx +0 -489
- package/src/components/git/grouped-diff-viewer.tsx +0 -332
- package/src/components/git/history-view.tsx +0 -4862
- package/src/components/git/image-diff-view.tsx +0 -342
- package/src/components/git/status-view.tsx +0 -597
- package/src/components/home-settings-modal.tsx +0 -192
- package/src/components/layout/sidebar.tsx +0 -256
- package/src/components/repo-list.tsx +0 -206
- package/src/components/theme-toggle.tsx +0 -37
- package/src/components/toaster.tsx +0 -36
- package/src/components/workspace-repo-open-tracker.tsx +0 -39
- package/src/hooks/use-credentials.ts +0 -123
- package/src/hooks/use-escape-dismiss.ts +0 -72
- package/src/hooks/use-git.ts +0 -448
- package/src/hooks/use-toast.ts +0 -280
- package/src/hooks/use-workspace-title.ts +0 -23
- package/src/lib/api-utils.ts +0 -24
- package/src/lib/branch-colors.ts +0 -98
- package/src/lib/credentials.ts +0 -404
- package/src/lib/git.ts +0 -1510
- package/src/lib/graph-utils.ts +0 -253
- package/src/lib/store.ts +0 -145
- package/src/lib/types.ts +0 -95
- package/src/lib/utils.ts +0 -266
- package/tsconfig.json +0 -34
- /package/{src/app/icon.png → .next/server/app/icon.png.body} +0 -0
|
@@ -1,332 +0,0 @@
|
|
|
1
|
-
'use client';
|
|
2
|
-
|
|
3
|
-
import { cn } from '@/lib/utils';
|
|
4
|
-
import ReactDiffViewer from '@alexbruf/react-diff-viewer';
|
|
5
|
-
import { computeLineInformation, DiffType, LineInformation } from '@alexbruf/react-diff-viewer/compute-lines';
|
|
6
|
-
import '@alexbruf/react-diff-viewer/index.css';
|
|
7
|
-
import type { ReactNode } from 'react';
|
|
8
|
-
import { useMemo, useState } from 'react';
|
|
9
|
-
|
|
10
|
-
interface GroupedDiffViewerProps {
|
|
11
|
-
oldValue: string;
|
|
12
|
-
newValue: string;
|
|
13
|
-
splitView: boolean;
|
|
14
|
-
useDarkTheme?: boolean;
|
|
15
|
-
linesOffset?: number;
|
|
16
|
-
showDiffOnly?: boolean;
|
|
17
|
-
extraLinesSurroundingDiff?: number;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
type InlineEntry =
|
|
21
|
-
| { type: 'line'; line: LineInformation; sourceIndex: number }
|
|
22
|
-
| { type: 'fold'; foldStartIndex: number; totalLines: number };
|
|
23
|
-
|
|
24
|
-
interface InlineRow {
|
|
25
|
-
key: string;
|
|
26
|
-
type: DiffType;
|
|
27
|
-
leftLineNumber: number | null;
|
|
28
|
-
rightLineNumber: number | null;
|
|
29
|
-
value: string;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
const NO_EXPANDED_BLOCKS: number[] = [];
|
|
33
|
-
|
|
34
|
-
function isPairedReplacement(line: LineInformation): boolean {
|
|
35
|
-
return line.left?.type === DiffType.REMOVED && line.right?.type === DiffType.ADDED;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
function getLineText(value: unknown): string {
|
|
39
|
-
if (typeof value === 'string') {
|
|
40
|
-
return value.length > 0 ? value : ' ';
|
|
41
|
-
}
|
|
42
|
-
return ' ';
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
function toInlineRow(line: LineInformation, sourceIndex: number): InlineRow {
|
|
46
|
-
const left = line.left ?? {};
|
|
47
|
-
const right = line.right ?? {};
|
|
48
|
-
|
|
49
|
-
if (left.type === DiffType.REMOVED) {
|
|
50
|
-
return {
|
|
51
|
-
key: `line-${sourceIndex}-removed`,
|
|
52
|
-
type: DiffType.REMOVED,
|
|
53
|
-
leftLineNumber: left.lineNumber ?? null,
|
|
54
|
-
rightLineNumber: null,
|
|
55
|
-
value: getLineText(left.value),
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
if (right.type === DiffType.ADDED) {
|
|
60
|
-
return {
|
|
61
|
-
key: `line-${sourceIndex}-added`,
|
|
62
|
-
type: DiffType.ADDED,
|
|
63
|
-
leftLineNumber: null,
|
|
64
|
-
rightLineNumber: right.lineNumber ?? null,
|
|
65
|
-
value: getLineText(right.value),
|
|
66
|
-
};
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
return {
|
|
70
|
-
key: `line-${sourceIndex}-default`,
|
|
71
|
-
type: DiffType.DEFAULT,
|
|
72
|
-
leftLineNumber: left.lineNumber ?? null,
|
|
73
|
-
rightLineNumber: right.lineNumber ?? null,
|
|
74
|
-
value: getLineText(left.value ?? right.value),
|
|
75
|
-
};
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
function renderInlineRow(row: InlineRow) {
|
|
79
|
-
const isAdded = row.type === DiffType.ADDED;
|
|
80
|
-
const isRemoved = row.type === DiffType.REMOVED;
|
|
81
|
-
|
|
82
|
-
return (
|
|
83
|
-
<tr key={row.key} className="line">
|
|
84
|
-
<td
|
|
85
|
-
className={cn('gutter', {
|
|
86
|
-
'empty-gutter': row.leftLineNumber === null,
|
|
87
|
-
'diff-added': isAdded,
|
|
88
|
-
'diff-removed': isRemoved,
|
|
89
|
-
})}
|
|
90
|
-
>
|
|
91
|
-
<pre className="line-number">{row.leftLineNumber ?? ''}</pre>
|
|
92
|
-
</td>
|
|
93
|
-
<td
|
|
94
|
-
className={cn('gutter', {
|
|
95
|
-
'empty-gutter': row.rightLineNumber === null,
|
|
96
|
-
'diff-added': isAdded,
|
|
97
|
-
'diff-removed': isRemoved,
|
|
98
|
-
})}
|
|
99
|
-
>
|
|
100
|
-
<pre className="line-number">{row.rightLineNumber ?? ''}</pre>
|
|
101
|
-
</td>
|
|
102
|
-
<td
|
|
103
|
-
className={cn('marker', {
|
|
104
|
-
'diff-added': isAdded,
|
|
105
|
-
'diff-removed': isRemoved,
|
|
106
|
-
})}
|
|
107
|
-
>
|
|
108
|
-
<pre>{isAdded ? '+' : isRemoved ? '-' : ''}</pre>
|
|
109
|
-
</td>
|
|
110
|
-
<td
|
|
111
|
-
className={cn('content', {
|
|
112
|
-
'diff-added': isAdded,
|
|
113
|
-
'diff-removed': isRemoved,
|
|
114
|
-
})}
|
|
115
|
-
>
|
|
116
|
-
<pre className="content-text">{row.value}</pre>
|
|
117
|
-
</td>
|
|
118
|
-
</tr>
|
|
119
|
-
);
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
function GroupedInlineDiff({
|
|
123
|
-
oldValue,
|
|
124
|
-
newValue,
|
|
125
|
-
useDarkTheme = false,
|
|
126
|
-
linesOffset = 0,
|
|
127
|
-
showDiffOnly = true,
|
|
128
|
-
extraLinesSurroundingDiff = 3,
|
|
129
|
-
}: Omit<GroupedDiffViewerProps, 'splitView'>) {
|
|
130
|
-
const [expandedByDiff, setExpandedByDiff] = useState<{ signature: string; blocks: number[] }>({
|
|
131
|
-
signature: '',
|
|
132
|
-
blocks: [],
|
|
133
|
-
});
|
|
134
|
-
|
|
135
|
-
const diffSignature = useMemo(
|
|
136
|
-
() => `${linesOffset}:${showDiffOnly ? 1 : 0}:${extraLinesSurroundingDiff}:${oldValue}\0${newValue}`,
|
|
137
|
-
[oldValue, newValue, linesOffset, showDiffOnly, extraLinesSurroundingDiff]
|
|
138
|
-
);
|
|
139
|
-
|
|
140
|
-
const expandedBlocks = useMemo(
|
|
141
|
-
() =>
|
|
142
|
-
expandedByDiff.signature === diffSignature
|
|
143
|
-
? expandedByDiff.blocks
|
|
144
|
-
: NO_EXPANDED_BLOCKS,
|
|
145
|
-
[expandedByDiff, diffSignature]
|
|
146
|
-
);
|
|
147
|
-
|
|
148
|
-
const { lineInformation, diffLines } = useMemo(
|
|
149
|
-
() => computeLineInformation(oldValue, newValue, true, undefined, linesOffset),
|
|
150
|
-
[oldValue, newValue, linesOffset]
|
|
151
|
-
);
|
|
152
|
-
|
|
153
|
-
const entries = useMemo<InlineEntry[]>(() => {
|
|
154
|
-
if (lineInformation.length === 0) return [];
|
|
155
|
-
|
|
156
|
-
if (!showDiffOnly || diffLines.length === 0) {
|
|
157
|
-
return lineInformation.map((line, sourceIndex) => ({ type: 'line', line, sourceIndex }));
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
const contextSize = Math.max(0, extraLinesSurroundingDiff);
|
|
161
|
-
const visible = Array.from({ length: lineInformation.length }, () => false);
|
|
162
|
-
|
|
163
|
-
diffLines.forEach((diffIndex) => {
|
|
164
|
-
const start = Math.max(0, diffIndex - contextSize);
|
|
165
|
-
const end = Math.min(lineInformation.length - 1, diffIndex + contextSize);
|
|
166
|
-
for (let index = start; index <= end; index += 1) {
|
|
167
|
-
visible[index] = true;
|
|
168
|
-
}
|
|
169
|
-
});
|
|
170
|
-
|
|
171
|
-
for (let index = 0; index < visible.length; index += 1) {
|
|
172
|
-
if (visible[index]) continue;
|
|
173
|
-
const foldStartIndex = index;
|
|
174
|
-
while (index < visible.length && !visible[index]) {
|
|
175
|
-
index += 1;
|
|
176
|
-
}
|
|
177
|
-
if (expandedBlocks.includes(foldStartIndex)) {
|
|
178
|
-
for (let expandedIndex = foldStartIndex; expandedIndex < index; expandedIndex += 1) {
|
|
179
|
-
visible[expandedIndex] = true;
|
|
180
|
-
}
|
|
181
|
-
}
|
|
182
|
-
index -= 1;
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
const nextEntries: InlineEntry[] = [];
|
|
186
|
-
for (let index = 0; index < visible.length; index += 1) {
|
|
187
|
-
if (visible[index]) {
|
|
188
|
-
nextEntries.push({
|
|
189
|
-
type: 'line',
|
|
190
|
-
line: lineInformation[index],
|
|
191
|
-
sourceIndex: index,
|
|
192
|
-
});
|
|
193
|
-
continue;
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
const foldStartIndex = index;
|
|
197
|
-
while (index < visible.length && !visible[index]) {
|
|
198
|
-
index += 1;
|
|
199
|
-
}
|
|
200
|
-
nextEntries.push({
|
|
201
|
-
type: 'fold',
|
|
202
|
-
foldStartIndex,
|
|
203
|
-
totalLines: index - foldStartIndex,
|
|
204
|
-
});
|
|
205
|
-
index -= 1;
|
|
206
|
-
}
|
|
207
|
-
|
|
208
|
-
return nextEntries;
|
|
209
|
-
}, [lineInformation, diffLines, showDiffOnly, extraLinesSurroundingDiff, expandedBlocks]);
|
|
210
|
-
|
|
211
|
-
const rows = useMemo(() => {
|
|
212
|
-
const renderedRows: ReactNode[] = [];
|
|
213
|
-
|
|
214
|
-
for (let index = 0; index < entries.length; index += 1) {
|
|
215
|
-
const entry = entries[index];
|
|
216
|
-
if (entry.type === 'fold') {
|
|
217
|
-
renderedRows.push(
|
|
218
|
-
<tr key={`fold-${entry.foldStartIndex}`} className="code-fold">
|
|
219
|
-
<td className="code-fold-gutter" />
|
|
220
|
-
<td className="code-fold-gutter" />
|
|
221
|
-
<td />
|
|
222
|
-
<td>
|
|
223
|
-
<button
|
|
224
|
-
type="button"
|
|
225
|
-
className="cursor-pointer underline"
|
|
226
|
-
onClick={() => {
|
|
227
|
-
setExpandedByDiff((previous) => {
|
|
228
|
-
const currentBlocks =
|
|
229
|
-
previous.signature === diffSignature ? previous.blocks : [];
|
|
230
|
-
if (currentBlocks.includes(entry.foldStartIndex)) {
|
|
231
|
-
return previous.signature === diffSignature
|
|
232
|
-
? previous
|
|
233
|
-
: { signature: diffSignature, blocks: currentBlocks };
|
|
234
|
-
}
|
|
235
|
-
return {
|
|
236
|
-
signature: diffSignature,
|
|
237
|
-
blocks: [...currentBlocks, entry.foldStartIndex],
|
|
238
|
-
};
|
|
239
|
-
});
|
|
240
|
-
}}
|
|
241
|
-
>
|
|
242
|
-
<pre className="code-fold-content">Expand {entry.totalLines} lines ...</pre>
|
|
243
|
-
</button>
|
|
244
|
-
</td>
|
|
245
|
-
</tr>
|
|
246
|
-
);
|
|
247
|
-
continue;
|
|
248
|
-
}
|
|
249
|
-
|
|
250
|
-
if (isPairedReplacement(entry.line)) {
|
|
251
|
-
const removedRows: InlineRow[] = [];
|
|
252
|
-
const addedRows: InlineRow[] = [];
|
|
253
|
-
let pairedIndex = index;
|
|
254
|
-
|
|
255
|
-
while (pairedIndex < entries.length) {
|
|
256
|
-
const candidate = entries[pairedIndex];
|
|
257
|
-
if (candidate.type !== 'line' || !isPairedReplacement(candidate.line)) {
|
|
258
|
-
break;
|
|
259
|
-
}
|
|
260
|
-
removedRows.push({
|
|
261
|
-
key: `line-${candidate.sourceIndex}-paired-removed`,
|
|
262
|
-
type: DiffType.REMOVED,
|
|
263
|
-
leftLineNumber: candidate.line.left?.lineNumber ?? null,
|
|
264
|
-
rightLineNumber: null,
|
|
265
|
-
value: getLineText(candidate.line.left?.value),
|
|
266
|
-
});
|
|
267
|
-
addedRows.push({
|
|
268
|
-
key: `line-${candidate.sourceIndex}-paired-added`,
|
|
269
|
-
type: DiffType.ADDED,
|
|
270
|
-
leftLineNumber: null,
|
|
271
|
-
rightLineNumber: candidate.line.right?.lineNumber ?? null,
|
|
272
|
-
value: getLineText(candidate.line.right?.value),
|
|
273
|
-
});
|
|
274
|
-
pairedIndex += 1;
|
|
275
|
-
}
|
|
276
|
-
|
|
277
|
-
removedRows.forEach((row) => {
|
|
278
|
-
renderedRows.push(renderInlineRow(row));
|
|
279
|
-
});
|
|
280
|
-
addedRows.forEach((row) => {
|
|
281
|
-
renderedRows.push(renderInlineRow(row));
|
|
282
|
-
});
|
|
283
|
-
|
|
284
|
-
index = pairedIndex - 1;
|
|
285
|
-
continue;
|
|
286
|
-
}
|
|
287
|
-
|
|
288
|
-
renderedRows.push(renderInlineRow(toInlineRow(entry.line, entry.sourceIndex)));
|
|
289
|
-
}
|
|
290
|
-
|
|
291
|
-
return renderedRows;
|
|
292
|
-
}, [entries, diffSignature]);
|
|
293
|
-
|
|
294
|
-
return (
|
|
295
|
-
<table className={cn('diff-container', useDarkTheme ? 'dark-theme' : 'light-theme')}>
|
|
296
|
-
<tbody>{rows}</tbody>
|
|
297
|
-
</table>
|
|
298
|
-
);
|
|
299
|
-
}
|
|
300
|
-
|
|
301
|
-
export function GroupedDiffViewer({
|
|
302
|
-
oldValue,
|
|
303
|
-
newValue,
|
|
304
|
-
splitView,
|
|
305
|
-
useDarkTheme = false,
|
|
306
|
-
linesOffset = 0,
|
|
307
|
-
showDiffOnly = true,
|
|
308
|
-
extraLinesSurroundingDiff = 3,
|
|
309
|
-
}: GroupedDiffViewerProps) {
|
|
310
|
-
if (splitView) {
|
|
311
|
-
return (
|
|
312
|
-
<ReactDiffViewer
|
|
313
|
-
oldValue={oldValue}
|
|
314
|
-
newValue={newValue}
|
|
315
|
-
splitView={true}
|
|
316
|
-
useDarkTheme={useDarkTheme}
|
|
317
|
-
disableWordDiff={true}
|
|
318
|
-
/>
|
|
319
|
-
);
|
|
320
|
-
}
|
|
321
|
-
|
|
322
|
-
return (
|
|
323
|
-
<GroupedInlineDiff
|
|
324
|
-
oldValue={oldValue}
|
|
325
|
-
newValue={newValue}
|
|
326
|
-
useDarkTheme={useDarkTheme}
|
|
327
|
-
linesOffset={linesOffset}
|
|
328
|
-
showDiffOnly={showDiffOnly}
|
|
329
|
-
extraLinesSurroundingDiff={extraLinesSurroundingDiff}
|
|
330
|
-
/>
|
|
331
|
-
);
|
|
332
|
-
}
|