Refactor commit and diff types, updates outdated diff types

- Adds support for modified moved files see https://github.com/radicle-dev/radicle-git/pull/141

Signed-off-by: Sebastian Martinez <me@sebastinez.dev>

src/views/projects/Changeset.svelte

@@ -72,25 +72,53 @@
     <FileDiff
       {projectId}
       {baseUrl}
-      {file}
       {revision}
+      filePath={file.path}
+      fileDiff={file.diff}
       headerBadgeCaption="added" />
   {/each}
   {#each diff.deleted as file}
     <FileDiff
       {projectId}
       {baseUrl}
-      {file}
       {revision}
+      filePath={file.path}
+      fileDiff={file.diff}
       headerBadgeCaption="deleted" />
   {/each}
   {#each diff.modified as file}
-    <FileDiff {projectId} {baseUrl} {file} {revision} />
+    <FileDiff
+      {projectId}
+      {baseUrl}
+      {revision}
+      filePath={file.path}
+      fileDiff={file.diff} />
   {/each}
   {#each diff.moved as file}
-    <FileLocationChange {projectId} {baseUrl} {file} {revision} mode="moved" />
+    {#if file.diff}
+      <FileDiff
+        {projectId}
+        {baseUrl}
+        {revision}
+        filePath={file.newPath}
+        fileDiff={file.diff} />
+    {:else}
+      <FileLocationChange
+        {projectId}
+        {baseUrl}
+        {revision}
+        newPath={file.newPath}
+        oldPath={file.oldPath}
+        mode="moved" />
+    {/if}
   {/each}
   {#each diff.copied as file}
-    <FileLocationChange {projectId} {baseUrl} {file} {revision} mode="copied" />
+    <FileLocationChange
+      {projectId}
+      {baseUrl}
+      {revision}
+      newPath={file.newPath}
+      oldPath={file.oldPath}
+      mode="copied" />
   {/each}
 </div>

src/views/projects/Changeset/FileDiff.svelte

@@ -1,16 +1,14 @@
 <script lang="ts">
   import { onDestroy, onMount } from "svelte";
-  import type {
-    BaseUrl,
-    DiffAddedDeletedModifiedChangeset,
-    HunkLine,
-  } from "@httpd-client";
+  import type { DiffContent } from "@httpd-client/lib/project/commit";
+  import type { BaseUrl, HunkLine } from "@httpd-client";
 
   import Badge from "@app/components/Badge.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Link from "@app/components/Link.svelte";
 
-  export let file: DiffAddedDeletedModifiedChangeset;
+  export let filePath: string;
+  export let fileDiff: DiffContent;
   export let revision: string;
   export let headerBadgeCaption: "added" | "deleted" | undefined = undefined;
   export let baseUrl: BaseUrl;
@@ -28,11 +26,9 @@
     if (selection) {
       document
         .getElementById(
-          [
-            file.path,
-            "H" + selection.startHunk,
-            "L" + selection.startLine,
-          ].join("-"),
+          [filePath, "H" + selection.startHunk, "L" + selection.startLine].join(
+            "-",
+          ),
         )
         ?.scrollIntoView();
     }
@@ -57,7 +53,7 @@
   function updateSelection() {
     const fragment = window.location.hash.substring(1);
     const match = fragment.match(/(.+):H(\d+)L(\d+)(H(\d+)L(\d+))?/);
-    if (match && match[1] === file.path) {
+    if (match && match[1] === filePath) {
       selection = {
         startHunk: parseInt(match[2]),
         startLine: parseInt(match[3]),
@@ -139,7 +135,7 @@
     lineIdx: number,
     event: MouseEvent,
   ): string {
-    const path = file.path;
+    const path = filePath;
     // single line selection
     if (!event.shiftKey) {
       return path + ":H" + hunkIdx + "L" + lineIdx;
@@ -317,7 +313,7 @@
   }
 </style>
 
-<div id={file.path} class="wrapper">
+<div id={filePath} class="wrapper">
   <header class="header">
     <!-- svelte-ignore a11y-click-events-have-key-events -->
     <!-- svelte-ignore a11y-no-static-element-interactions -->
@@ -329,7 +325,7 @@
       {/if}
     </div>
     <div class="actions">
-      <p class="txt-regular">{file.path}</p>
+      <p class="txt-regular">{filePath}</p>
       {#if headerBadgeCaption === "added"}
         <Badge variant="positive">added</Badge>
       {:else if headerBadgeCaption === "deleted"}
@@ -342,7 +338,7 @@
           resource: "project.source",
           project: projectId,
           node: baseUrl,
-          path: file.path,
+          path: filePath,
           revision,
         }}>
         <Icon name="browse" />
@@ -351,10 +347,10 @@
   </header>
   {#if !collapsed}
     <main>
-      {#if file.diff.type === "plain"}
-        {#if file.diff.hunks.length > 0}
+      {#if fileDiff.type === "plain"}
+        {#if fileDiff.hunks.length > 0}
           <table class="diff" data-file-diff-select>
-            {#each file.diff.hunks as hunk, hunkIdx}
+            {#each fileDiff.hunks as hunk, hunkIdx}
               <tr
                 class="diff-line hunk-header"
                 class:selected={hunkHeaderSelected(selection, hunkIdx)}>
@@ -370,7 +366,7 @@
                   class={`diff-line type-${line.type}`}
                   class:selected={isLineSelected(selection, hunkIdx, lineIdx)}>
                   <td
-                    id={[file.path, "H" + hunkIdx, "L" + lineIdx].join("-")}
+                    id={[filePath, "H" + hunkIdx, "L" + lineIdx].join("-")}
                     class="diff-line-number left"
                     on:click={e => selectLine(hunkIdx, lineIdx, e)}>
                     <div class="selection-indicator" />

src/views/projects/Changeset/FileLocationChange.svelte

@@ -1,11 +1,12 @@
 <script lang="ts">
-  import type { BaseUrl, DiffCopiedMovedChangeset } from "@httpd-client";
+  import type { BaseUrl } from "@httpd-client";
 
   import Badge from "@app/components/Badge.svelte";
   import Icon from "@app/components/Icon.svelte";
   import Link from "@app/components/Link.svelte";
 
-  export let file: DiffCopiedMovedChangeset;
+  export let newPath: string;
+  export let oldPath: string;
   export let revision: string;
   export let mode: "moved" | "copied";
   export let baseUrl: BaseUrl;
@@ -40,10 +41,10 @@
   }
 </style>
 
-<div id={file.newPath} class="wrapper">
+<div id={newPath} class="wrapper">
   <header class="header">
     <div class="actions">
-      <p class="txt-regular">{file.oldPath} → {file.newPath}</p>
+      <p class="txt-regular">{oldPath} → {newPath}</p>
       {#if mode === "moved"}
         <Badge variant="foreground">moved</Badge>
       {:else if mode === "copied"}
@@ -56,7 +57,7 @@
           resource: "project.source",
           project: projectId,
           node: baseUrl,
-          path: file.newPath,
+          path: newPath,
           revision,
         }}>
         <Icon name="browse" />