@nkzw/codiff-core 1.10.0 → 1.11.0

package/dist/share.mjs

@@ -1,8 +1,8 @@
 import { array, check, integer, literal, looseObject, maxLength, maxValue, minLength, minValue, number, optional, parse, picklist, pipe, safeParse, string, union } from "valibot";
 //#region share.ts
-const maxDocumentLength = 2 * 1024 * 1024;
-const maxCommentLength = 128 * 1024;
-const maxAnchorTextLength = 64 * 1024;
+const maxDocumentLength = 2097152;
+const maxCommentLength = 131072;
+const maxAnchorTextLength = 65536;
 const boundedString = (maximum) => pipe(string(), maxLength(maximum));
 const nonEmptyString = (maximum) => pipe(string(), minLength(1), maxLength(maximum));
 const timestamp = pipe(nonEmptyString(64), check((value) => Number.isFinite(Date.parse(value)), "Invalid timestamp."));
@@ -83,12 +83,13 @@ const planShareManifestV1Schema = looseObject({
 	})),
 	version: literal(1)
 });
+const uploaderSchema = looseObject({
+	email: optional(boundedString(320)),
+	name: optional(boundedString(200))
+});
 const planShareUploadEnvelopeSchema = looseObject({
 	snapshot: planShareManifestV1Schema,
-	uploader: optional(looseObject({
-		email: optional(boundedString(320)),
-		name: optional(boundedString(200))
-	}))
+	uploader: optional(uploaderSchema)
 });
 const parsePlanShareManifest = (value) => parse(planShareManifestV1Schema, value);
 const parsePlanShareUpload = (value) => {

package/dist/style.css

@@ -3766,7 +3766,7 @@ form._multiFieldForm_sre1d_1628 {
   box-shadow: inset 3px 0 #3d87f500;
 }
 
-.wt-stop-block-header.current {
+.codiff-selected-item .wt-stop-block-header {
   box-shadow: inset 3px 0 0 var(--tree-selection-focus);
 }
 
@@ -5249,6 +5249,10 @@ html[data-codiff-platform="darwin"] .workspace-top-bar {
   display: none;
 }
 
+.app-shell.sidebar-collapsed > .review {
+  grid-column: 1;
+}
+
 .review-top-bar {
   grid-area: 1 / 1 / auto / -1;
   grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
@@ -5256,6 +5260,7 @@ html[data-codiff-platform="darwin"] .workspace-top-bar {
   min-width: 0;
   padding: 0 14px 0 78px;
   display: grid;
+  position: relative;
 }
 
 .share-shell .review-top-bar, .app-shell.window-fullscreen .review-top-bar {
@@ -5270,13 +5275,33 @@ html[data-codiff-platform="darwin"] .workspace-top-bar {
 }
 
 .review-top-bar-left {
+  grid-column: 1;
   justify-content: flex-start;
 }
 
 .review-top-bar-right {
+  grid-column: 3;
   justify-content: flex-end;
 }
 
+.review-top-bar-center {
+  pointer-events: none;
+  justify-content: center;
+  align-items: center;
+  min-width: 0;
+  max-width: min(38%, 320px);
+  display: flex;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.review-top-bar-center .review-top-bar-branch {
+  pointer-events: auto;
+  max-width: 100%;
+}
+
 .review-top-bar-repository-slot {
   color: var(--sidebar-text);
   font-family: var(--font-mono);
@@ -5493,8 +5518,24 @@ a.review-top-bar-repository:focus-visible, a.review-top-bar-source:focus-visible
   position: relative;
 }
 
-.app-shell > .sidebar, .app-shell > .sidebar-resizer, .app-shell > .review {
-  grid-row: 2;
+.app-shell > .sidebar {
+  grid-area: 2 / 1;
+}
+
+.app-shell > .sidebar-resizer {
+  grid-area: 2 / 2;
+}
+
+.app-shell > .review {
+  grid-area: 2 / 3;
+}
+
+.app-shell[data-sidebar-position="right"] > .review {
+  grid-column: 1;
+}
+
+.app-shell[data-sidebar-position="right"] > .sidebar {
+  grid-column: 3;
 }
 
 .sidebar-resizer:before {
@@ -6159,6 +6200,118 @@ html[data-codiff-platform="darwin"] .sidebar {
   overflow: auto;
 }
 
+.definition-popover {
+  background: var(--code-bg);
+  border: 1px solid var(--file-border);
+  color: var(--text);
+  z-index: 100;
+  border-radius: 14px;
+  width: min(420px, 100vw - 24px);
+  max-height: 300px;
+  animation: .12s review-submit-popover-in;
+  position: fixed;
+  overflow: hidden;
+  box-shadow: 0 12px 36px #0003;
+}
+
+.definition-popover-header, .definition-popover-location {
+  justify-content: space-between;
+  align-items: center;
+  display: flex;
+}
+
+.definition-popover-header {
+  border-bottom: 1px solid var(--file-border);
+  padding: 9px 10px 9px 12px;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.definition-popover-header code {
+  font-family: var(--codiff-font-mono);
+}
+
+.definition-popover-header button {
+  color: var(--muted);
+  background: none;
+  border: 0;
+  border-radius: 6px;
+  align-items: center;
+  padding: 3px;
+  display: flex;
+}
+
+.definition-popover-header button:hover, .definition-popover-result:hover {
+  background: var(--hover-wash);
+}
+
+.definition-popover-message {
+  color: var(--muted);
+  padding: 18px 12px;
+  font-size: 12px;
+}
+
+.definition-popover-results {
+  max-height: 252px;
+  padding: 5px;
+  overflow: auto;
+}
+
+.definition-popover-result {
+  color: inherit;
+  text-align: left;
+  background: none;
+  border: 0;
+  border-radius: 8px;
+  width: 100%;
+  padding: 7px 8px;
+  display: block;
+}
+
+.definition-popover-result:disabled {
+  cursor: not-allowed;
+  opacity: .56;
+}
+
+.definition-popover-result:disabled:hover {
+  background: none;
+}
+
+.definition-popover-location {
+  gap: 12px;
+  margin-bottom: 4px;
+  font-size: 11px;
+}
+
+.definition-popover-meta, .definition-popover-destination {
+  align-items: center;
+  display: inline-flex;
+}
+
+.definition-popover-meta {
+  color: var(--muted);
+  gap: 7px;
+}
+
+.definition-popover-destination {
+  opacity: .72;
+}
+
+.definition-popover-result:hover .definition-popover-destination {
+  color: var(--text);
+  opacity: 1;
+}
+
+.definition-popover-result code {
+  color: var(--muted);
+  font-family: var(--codiff-font-mono);
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 11px;
+  display: block;
+  overflow: hidden;
+}
+
 .codiff-header-toggle.codiff-header-toggle-static {
   cursor: default;
   grid-template-columns: minmax(0, 1fr);
@@ -6610,8 +6763,23 @@ html[data-codiff-platform="darwin"] .sidebar {
   color: var(--text);
   cursor: pointer;
   font: 600 13px/1.4 var(--font-sans);
+  align-items: center;
+  gap: 8px;
   padding: 8px 10px;
   list-style: none;
+  display: flex;
+}
+
+.codiff-markdown-details-summary-label {
+  flex: 1;
+  min-width: 0;
+}
+
+.codiff-markdown-details > summary .codiff-copy-code-button {
+  opacity: 1;
+  width: 24px;
+  height: 24px;
+  margin: -4px 0;
 }
 
 .codiff-markdown-details > summary::-webkit-details-marker {
@@ -6620,7 +6788,7 @@ html[data-codiff-platform="darwin"] .sidebar {
 
 .codiff-markdown-details > summary:before {
   content: "▸";
-  margin-right: 8px;
+  flex: none;
   font-size: 20px;
   line-height: .5;
   display: inline-block;
@@ -7318,6 +7486,10 @@ html[data-codiff-platform="darwin"] .sidebar {
   color: #b8312f;
 }
 
+.codiff-status-badge.conflicted {
+  color: var(--danger);
+}
+
 .codiff-status-badge.renamed, .codiff-section-badge.staged {
   color: #8f5d18;
 }
@@ -7475,6 +7647,75 @@ diffs-container .review-comment-thread {
   display: flex;
 }
 
+.resolved-thread-disclosure {
+  border: 1px solid var(--file-border);
+  border-radius: 6px;
+  inline-size: 100%;
+  min-inline-size: 0;
+  overflow: clip;
+}
+
+.resolved-thread-toggle {
+  color: var(--muted);
+  cursor: pointer;
+  font: 600 12px/1.3 var(--font-sans);
+  text-align: start;
+  background: #7f7f7f12;
+  border: 0;
+  align-items: center;
+  gap: 7px;
+  min-block-size: 34px;
+  inline-size: 100%;
+  min-inline-size: 0;
+  padding: 7px 9px;
+  display: flex;
+}
+
+.resolved-thread-toggle:hover {
+  color: var(--text);
+  background: #7f7f7f1f;
+}
+
+.resolved-thread-toggle:focus-visible {
+  box-shadow: 0 0 0 2px var(--tree-selection-focus) inset;
+  outline: 0;
+}
+
+.resolved-thread-caret {
+  flex: none;
+  display: block;
+}
+
+.resolved-thread-label {
+  color: currentColor;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  min-inline-size: 0;
+  overflow: hidden;
+}
+
+.resolved-thread-count {
+  white-space: nowrap;
+  margin-inline-start: auto;
+  font-weight: 500;
+}
+
+.resolved-thread-caret {
+  transition: transform .14s;
+}
+
+.resolved-thread-disclosure.expanded .resolved-thread-caret {
+  transform: rotate(180deg);
+}
+
+.resolved-thread-content {
+  border-block-start: 1px solid var(--file-border);
+  flex-direction: column;
+  gap: 8px;
+  padding: 10px;
+  display: flex;
+}
+
 .review-comment-thread-footer {
   justify-content: flex-end;
   align-items: center;
@@ -7920,37 +8161,23 @@ diffs-container .review-comment-thread {
   word-break: break-word;
 }
 
-.review-action-bar {
-  -webkit-app-region: no-drag;
-  z-index: 12;
-  align-items: center;
-  gap: 12px;
-  display: inline-flex;
-  position: fixed;
-  bottom: 16px;
-  right: 16px;
-}
-
 .copy-comments-button {
-  backdrop-filter: blur(22px) saturate(1.35);
-  background: color-mix(in srgb, var(--code-bg) 78%, transparent);
-  border: 1px solid var(--file-border);
-  box-shadow: 0 0 0 1px #ffffff29 inset,
-    0 0 0 1px var(--file-border),
-    0 18px 80px -54px #000c,
-    0 16px 46px -30px #000000b8,
-    0 12px 24px -18px #000000e6;
+  -webkit-app-region: no-drag;
+  color: var(--muted);
+  corner-shape: squircle;
   cursor: pointer;
-  width: 46px;
-  height: 46px;
-  color: var(--copy-icon);
-  border-radius: 50%;
+  font: 700 11px/1 var(--font-sans);
+  background: none;
+  border: 0;
+  border-radius: 8px;
+  flex: none;
   justify-content: center;
   align-items: center;
-  padding: 0;
-  transition: all .25s cubic-bezier(.34, 1.56, .64, 1);
+  gap: 5px;
+  height: 28px;
+  padding: 0 8px;
+  transition: background .12s, color .12s;
   display: inline-flex;
-  transform: scale(1);
 }
 
 .review-submit-button {
@@ -8091,16 +8318,20 @@ diffs-container .review-comment-thread {
   color: var(--text);
 }
 
-.copy-comments-button:hover {
-  box-shadow: 0 0 0 1px var(--file-border),
-    0 26px 96px -48px #000000eb,
-    0 22px 62px -30px #000000d1,
-    0 16px 32px -18px #000000f5;
-  transform: scale(1.05);
+.copy-comments-button:hover:not(:disabled) {
+  color: var(--sidebar-text);
+  background: #7f7f7f24;
 }
 
-.copy-comments-button:active {
-  transform: scale(.95);
+.copy-comments-button:active:not(:disabled) {
+  color: var(--sidebar-text);
+  background: #7f7f7f33;
+}
+
+.copy-comments-button:disabled {
+  color: var(--muted);
+  cursor: default;
+  opacity: .5;
 }
 
 .review-submit-button:disabled {
@@ -8108,9 +8339,8 @@ diffs-container .review-comment-thread {
   opacity: .58;
 }
 
-.copy-comments-button.copied {
-  background: color-mix(in srgb, var(--code-bg) 80%, var(--viewed) 14%);
-  color: var(--viewed);
+.copy-comments-count {
+  font: 700 11px/1 var(--font-mono);
 }
 
 .copy-comments-icon {
@@ -8120,7 +8350,7 @@ diffs-container .review-comment-thread {
 }
 
 .copy-comments-icon.check {
-  transform: translateY(-1px);
+  transform: none;
 }
 
 .review-submit-icon {
@@ -8566,7 +8796,19 @@ diffs-container .review-comment-thread {
 }
 
 @media (width <= 720px) {
-  .review-top-bar-repository-slot, .review-top-bar-context {
+  .share-shell.sidebar-auto {
+    grid-template-columns: minmax(0, 1fr);
+  }
+
+  .share-shell.sidebar-auto .sidebar, .share-shell.sidebar-auto .sidebar-resizer {
+    display: none;
+  }
+
+  .share-shell.sidebar-auto > .review {
+    grid-column: 1;
+  }
+
+  .review-top-bar-repository-slot, .review-top-bar-center, .review-top-bar-context {
     display: none;
   }
 }

package/dist/types.d.ts

@@ -25,7 +25,7 @@ export type DiffSection = {
         size?: number;
     };
 };
-export type GitFileStatus = 'added' | 'deleted' | 'modified' | 'renamed' | 'untracked';
+export type GitFileStatus = 'added' | 'conflicted' | 'deleted' | 'modified' | 'renamed' | 'untracked';
 export type ChangedFile = {
     fingerprint: string;
     generated?: boolean;
@@ -610,6 +610,30 @@ export type DiffSectionContentRequest = {
     showWhitespace?: boolean;
     source?: ReviewSource;
 };
+export type DefinitionSearchRequest = {
+    identifier: string;
+    kind: DiffSection['kind'];
+    lineNumber: number;
+    path: string;
+    side: 'additions' | 'deletions';
+    source: ReviewSource;
+};
+export type DefinitionCandidate = {
+    canOpenInEditor: boolean;
+    kind: string;
+    line: string;
+    lineNumber: number;
+    path: string;
+    side: 'additions' | 'deletions';
+};
+export type DefinitionSearchResult = {
+    candidates: ReadonlyArray<DefinitionCandidate>;
+    identifier: string;
+    status: 'ready';
+} | {
+    reason: string;
+    status: 'unavailable';
+};
 export type DiffImageContentRequest = {
     kind: DiffSection['kind'];
     path: string;
@@ -645,6 +669,7 @@ export type CodiffPreferences = {
     reviewCommentsPrefix: string;
     showOutdated: boolean;
     showWhitespace: boolean;
+    sidebarPosition: 'left' | 'right';
     theme: CodiffTheme;
     walkthroughPrompt: string;
     wordWrap: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nkzw/codiff-core",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "A fast diff viewer.",
   "license": "MIT",
   "author": {
@@ -54,12 +54,12 @@
     "@nkzw/mdx-editor": "^0.2.2",
     "@nkzw/use-relative-time": "^1.2.3",
     "@phosphor-icons/react": "^2.1.10",
-    "@pierre/diffs": "1.3.0-beta.9",
-    "@pierre/trees": "1.0.0-beta.5",
+    "@pierre/diffs": "1.3.6",
+    "@pierre/trees": "1.0.0-beta.6",
     "@radix-ui/react-slot": "^1.3.3",
     "class-variance-authority": "^0.7.1",
     "ghostty-web": "^0.4.0",
-    "lucide-react": "^1.26.0",
+    "lucide-react": "^1.34.0",
     "valibot": "^1.4.2"
   },
   "peerDependencies": {