Refactored out the block setting canonicalUrl.

SwiftPackageIndex · Aug 29, 2024 · e9183bf · e9183bf
1 parent 557a1a4
commit e9183bf
Showing 1 changed file with 10 additions and 16 deletions.
diff --git a/Sources/App/Controllers/PackageController+routes.swift b/Sources/App/Controllers/PackageController+routes.swift
@@ -122,19 +122,11 @@ enum PackageController {
             .init(archive: $0, isCurrent: $0.name == route.archive)
         }
 
-        let canonicalUrl: String? = {
-            guard let canonicalOwner = documentationMetadata.owner,
-                  let canonicalRepository = documentationMetadata.repository,
-                  let canonicalTarget = documentationMetadata.canonicalTarget
-            else { return nil }
-
-            return Self.canonicalDocumentationUrl(from: "\(req.url)",
-                                                  owner: canonicalOwner,
-                                                  repository: canonicalRepository,
-                                                  docVersion: route.docVersion,
-                                                  toTarget: canonicalTarget)
-        }()
-
+        let canonicalUrl = Self.canonicalDocumentationUrl(from: "\(req.url)",
+                                                          owner: documentationMetadata.owner,
+                                                          repository: documentationMetadata.repository,
+                                                          docVersion: route.docVersion,
+                                                          toTarget: documentationMetadata.canonicalTarget)
 
         // Try and parse the page and add our header, but fall back to the unprocessed page if it fails.
         guard let body = awsResponse.body,
@@ -466,10 +458,12 @@ extension PackageController {
 
 extension PackageController {
     static func canonicalDocumentationUrl(from url: String,
-                                          owner: String,
-                                          repository: String,
+                                          owner: String?,
+                                          repository: String?,
                                           docVersion: DocVersion,
-                                          toTarget target: DocumentationTarget) -> String? {
+                                          toTarget target: DocumentationTarget?) -> String? {
+        guard let owner, let repository, let target else { return nil }
+
         // It's important to use `docVersion.reference` here to make sure we match with true reference urls and not ~
         let urlPrefix = "/\(owner)/\(repository)/\(docVersion.reference.pathEncoded)/"
         if case let .internal(canonicalReference, _) = target,