Fix route resolution with base url and output option

mattt · mattt · commit 7074084ba092 · 2020-05-11T11:55:24.000-07:00
diff --git a/Sources/swift-doc/Subcommands/Generate.swift b/Sources/swift-doc/Subcommands/Generate.swift
@@ -57,9 +57,9 @@ extension SwiftDoc {
         for symbol in module.interface.topLevelSymbols.filter({ $0.isPublic }) {
           switch symbol.api {
           case is Class, is Enumeration, is Structure, is Protocol:
-            pages[path(for: symbol, with: baseURL)] = TypePage(module: module, symbol: symbol, baseURL: baseURL)
+            pages[route(for: symbol)] = TypePage(module: module, symbol: symbol, baseURL: baseURL)
           case let `typealias` as Typealias:
-            pages[path(for: `typealias`.name, with: baseURL)] = TypealiasPage(module: module, symbol: symbol, baseURL: baseURL)
+            pages[route(for: `typealias`.name)] = TypealiasPage(module: module, symbol: symbol, baseURL: baseURL)
           case let function as Function where !function.isOperator:
             globals[function.name, default: []] += [symbol]
           case let variable as Variable:
@@ -70,7 +70,7 @@ extension SwiftDoc {
         }
 
         for (name, symbols) in globals {
-            pages[path(for: name, with: baseURL)] = GlobalPage(module: module, name: name, symbols: symbols, baseURL: baseURL)
+            pages[route(for: name)] = GlobalPage(module: module, name: name, symbols: symbols, baseURL: baseURL)
         }
 
         guard !pages.isEmpty else {
diff --git a/Sources/swift-doc/Supporting Types/Layout.swift b/Sources/swift-doc/Supporting Types/Layout.swift
@@ -11,7 +11,7 @@ func layout(_ page: Page) -> HTML {
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>\#(page.module.name) - \#(page.title)</title>
-        <link rel="stylesheet" type="text/css" href="/all.css" media="all" />
+        <link rel="stylesheet" type="text/css" href="\#(path(for: "all.css", with: page.baseURL))" media="all" />
     </head>
     <body>
         <header>
diff --git a/Sources/swift-doc/Supporting Types/Page.swift b/Sources/swift-doc/Supporting Types/Page.swift
@@ -35,19 +35,27 @@ extension Page {
     }
 }
 
+func route(for symbol: Symbol) -> String {
+    return route(for: symbol.id)
+}
+
+func route(for name: CustomStringConvertible) -> String {
+    return name.description.replacingOccurrences(of: ".", with: "_")
+}
+
 func path(for symbol: Symbol, with baseURL: String) -> String {
-    return path(for: symbol.id.description, with: baseURL)
+    return path(for: route(for: symbol), with: baseURL)
 }
 
 func path(for identifier: CustomStringConvertible, with baseURL: String) -> String {
     var urlComponents = URLComponents(string: baseURL)
-    urlComponents?.path += "\(identifier)".replacingOccurrences(of: ".", with: "_")
-    guard let path = urlComponents?.string else {
+    urlComponents = urlComponents?.appendingPathComponent("\(identifier)")
+    guard let string = urlComponents?.string else {
         logger.critical("Unable to construct path for \(identifier) with baseURL \(baseURL)")
         fatalError()
     }
     
-    return path
+    return string
 }
 
 func writeFile(_ data: Data, to url: URL) throws {
@@ -57,3 +65,16 @@ func writeFile(_ data: Data, to url: URL) throws {
     try data.write(to: url)
     try fileManager.setAttributes([.posixPermissions: 0o744], ofItemAtPath: url.path)
 }
+
+// MARK: -
+
+fileprivate extension URLComponents {
+    func appendingPathComponent(_ component: String) -> URLComponents? {
+        var urlComponents = self
+        var pathComponents = urlComponents.path.split(separator: "/").map { "\($0)" }
+        pathComponents.append(component)
+        urlComponents.path = "/" + pathComponents.joined(separator: "/")
+
+        return urlComponents
+    }
+}
