refactor: use asPaper instead of isProjectPaper

This removes the duplicated condititions to get the actual paper object.

Author: Slartibartfass2

src/lib/components/composites/paper-components/PaperListEntry.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
     import PaperInfo from "$lib/components/composites/paper-components/PaperInfo.svelte";
-    import { isProjectPaper, type PaperListEntryInterface } from "$lib/model/general";
+    import { asPaper, type PaperListEntryInterface } from "$lib/model/general";
     import UserAvatar from "$lib/components/composites/user-avatar/UserAvatar.svelte";
     import { goto } from "$app/navigation";
     import { PaperDecision } from "$lib/model/api/project";
@@ -12,7 +12,7 @@
     };
 
     const navigateToPaperView = () => {
-        const paperId = isProjectPaper(paper) ? paper.paper!.id : paper.id;
+        const paperId = asPaper(paper).id;
         const paperLink =
             projectId !== undefined
                 ? `/project/${projectId}/paper/${paperId}`
@@ -107,7 +107,7 @@ Usage:
             ? `border-l-4 ${getReviewDecisionColor(paper.decision, paper.reviews.length)}`
             : ''} rounded-md px-3 py-1.5"
     >
-        <PaperInfo loadingPaper={Promise.resolve(isProjectPaper(paper) ? paper.paper! : paper)} />
+        <PaperInfo loadingPaper={Promise.resolve(asPaper(paper))} />
     </div>
     {#if showReviewStatus}
         {#each paper.reviews as review}

src/lib/components/composites/paper-components/paper-view/PaperView.svelte

@@ -11,7 +11,7 @@
     import type { User } from "$lib/model/api/user";
     import type { Paper } from "$lib/model/api/paper";
     import type { Project_Paper } from "$lib/model/api/project";
-    import { isProjectPaper } from "$lib/model/general";
+    import { asPaper } from "$lib/model/general";
     import type { ReferencesAndCitationsCardContentProps } from "./cards/ReferencesAndCitationsCardContent.svelte";
 
     type Props = ReferencesAndCitationsCardContentProps & {
@@ -39,9 +39,7 @@
         startInEditMode = false,
     }: Props = $props();
 
-    let loadingPaper = initialLoadingPaper.then((paper) =>
-        isProjectPaper(paper) ? paper!.paper! : paper,
-    );
+    let loadingPaper = initialLoadingPaper.then(asPaper);
     let loadingPaperId = loadingPaper.then((paper) => paper.id);
 </script>
 

src/lib/model/general.ts

@@ -1,10 +1,10 @@
-import type {
-    Project,
-    Project_Member_List,
+import {
     Project_Paper,
-    Project_Statistics,
+    type Project,
+    type Project_Member_List,
+    type Project_Statistics,
 } from "$lib/model/api/project";
-import type { Paper } from "./api/paper";
+import type { Paper } from "$lib/model/api/paper";
 
 type ValidationResult = { success: true } | { success: false; error: string };
 
@@ -35,5 +35,9 @@ function isProjectPaper(paper: Project_Paper | Paper): paper is Project_Paper {
     return "paper" in paper;
 }
 
+function asPaper(paper: Project_Paper | Paper): Paper {
+    return isProjectPaper(paper) ? paper.paper! : paper;
+}
+
 export type { ValidationResult, ApiError, ProjectListEntryInterface, PaperListEntryInterface };
-export { isProjectPaper };
+export { isProjectPaper, asPaper };