clean-up and lint

Author: jasonhawkharris

client/web-sveltekit/src/routes/[...repo=reporev]/(validrev)/(code)/-/blob/[...path]/+page.ts

@@ -34,37 +34,37 @@ async function loadDiffView({ params, url }: PageLoadEvent) {
     const { repoName } = parseRepoRevision(params.repo)
     const filePath = decodeURIComponent(params.path)
     const revParam = url.searchParams.get('rev')
-    const isPerforceDepot = revParam?.includes('changelist')
-    const cid = revParam?.replace('changelist/', '')
+    const cid = revParam?.includes('changelist') && revParam?.replace('changelist/', '')
 
     assertNonNullable(revisionOverride, 'revisionOverride is set')
 
-    return isPerforceDepot ? {
-        type: 'DiffView' as const,
-        enableInlineDiff: true,
-        enableViewAtCommit: true,
-        filePath,
-        commit: client
-            .query(BlobDiffViewChangelistQuery, {
-                repoName,
-                // @TODO: do better.
-                cid: cid!,
-                path: filePath,
-            })
-            .then(mapOrThrow(result => result.data?.repository?.changelist?.commit ?? null)),
-    } : {
-        type: 'DiffView' as const,
-        enableInlineDiff: true,
-        enableViewAtCommit: true,
-        filePath,
-        commit: client
-            .query(BlobDiffViewCommitQuery, {
-                repoName,
-                revspec: revisionOverride,
-                path: filePath,
-            })
-            .then(mapOrThrow(result => result.data?.repository?.commit ?? null)),
-    }
+    return cid
+        ? {
+              type: 'DiffView' as const,
+              enableInlineDiff: true,
+              enableViewAtCommit: true,
+              filePath,
+              commit: client
+                  .query(BlobDiffViewChangelistQuery, {
+                      repoName,
+                      cid: cid,
+                      path: filePath,
+                  })
+                  .then(mapOrThrow(result => result.data?.repository?.changelist?.commit ?? null)),
+          }
+        : {
+              type: 'DiffView' as const,
+              enableInlineDiff: true,
+              enableViewAtCommit: true,
+              filePath,
+              commit: client
+                  .query(BlobDiffViewCommitQuery, {
+                      repoName,
+                      revspec: revisionOverride,
+                      path: filePath,
+                  })
+                  .then(mapOrThrow(result => result.data?.repository?.commit ?? null)),
+          }
 }
 
 async function fetchCodeGraphData(
@@ -214,11 +214,11 @@ async function loadFileView({ parent, params, url }: PageLoadEvent) {
         // We can ignore the error because if the revision doesn't exist, other queries will fail as well
         revisionOverride: revisionOverride
             ? await client
-                .query(BlobFileViewCommitQuery_revisionOverride, {
-                    repoName,
-                    revspec: revisionOverride,
-                })
-                .then(result => result.data?.repository?.commit)
+                  .query(BlobFileViewCommitQuery_revisionOverride, {
+                      repoName,
+                      revspec: revisionOverride,
+                  })
+                  .then(result => result.data?.repository?.commit)
             : null,
         externalServiceType: parent()
             .then(({ resolvedRevision }) => resolvedRevision.repo?.externalRepository?.serviceType)