Merge pull request #15 from tayloraswift/package-tags

create an HTML interface for viewing information about repo tags and associated symbol graphs

Author: tayloraswift

Assets/css/Admin.css

@@ -1,6 +1,12 @@
 import NIOCore
 import NIOHTTP1
 
+/// A user-defined type for a server’s representation of an HTTP request.
+///
+/// The purpose of this abstraction is to allow the server delegate type to reject malformed
+/// or invalid requests before the server creates a promise on its event loop. The conforming
+/// type’s initializer witnesses do not have any access to the instance state of the delegate,
+/// so the implementation should only attempt to validate the request’s structure.
 public
 protocol HTTPServerOperation:Sendable
 {

Assets/css/Admin.css.map

@@ -28,9 +28,6 @@ extension Repository.Pin.State:CustomStringConvertible
     {
         switch self.version.canonical
         {
-        case .stable(.release(let version)):
-            return "\(version) (stable, release, \(self.revision))"
-
         case .stable(let version):
             return "\(version) (stable, \(self.revision))"
 

Assets/css/Main.css

@@ -7,11 +7,53 @@ enum Main:SyncTests
     static
     func run(tests:Tests)
     {
-        if  let tests:TestGroup = tests / "version-parsing" / "valid"
+        if  let tests:TestGroup = tests / "SemanticVersion" / "Release"
+        {
+            tests.expect(SemanticVersion.init("0.1.2") ==? .release(.v(0, 1, 2)))
+        }
+        if  let tests:TestGroup = tests / "SemanticVersion" / "Release" / "V"
+        {
+            tests.expect(SemanticVersion.init(refname: "v0.1.2") ==? .release(.v(0, 1, 2)))
+        }
+
+        if  let tests:TestGroup = tests / "SemanticVersion" / "Prerelease"
+        {
+            tests.expect(SemanticVersion.init(refname: "0.1.2-rc3") ==?
+                .prerelease(.v(0, 1, 2), "rc3"))
+        }
+        if  let tests:TestGroup = tests / "SemanticVersion" / "Prerelease" / "V"
+        {
+            tests.expect(SemanticVersion.init(refname: "v0.1.2-rc3") ==?
+                .prerelease(.v(0, 1, 2), "rc3"))
+        }
+
+        if  let tests:TestGroup = tests / "SemanticVersion" / "Build"
+        {
+            tests.expect(SemanticVersion.init(refname: "0.1.2+build3") ==?
+                .release(.v(0, 1, 2), build: "build3"))
+        }
+        if  let tests:TestGroup = tests / "SemanticVersion" / "Build" / "V"
+        {
+            tests.expect(SemanticVersion.init(refname: "v0.1.2+build3") ==?
+                .release(.v(0, 1, 2), build: "build3"))
+        }
+
+        if  let tests:TestGroup = tests / "SemanticVersion" / "PrereleaseBuild"
+        {
+            tests.expect(SemanticVersion.init(refname: "0.1.2-rc3+build3") ==?
+                .prerelease(.v(0, 1, 2), "rc3", build: "build3"))
+        }
+        if  let tests:TestGroup = tests / "SemanticVersion" / "PrereleaseBuild" / "V"
+        {
+            tests.expect(SemanticVersion.init(refname: "v0.1.2-rc3+build3") ==?
+                .prerelease(.v(0, 1, 2), "rc3", build: "build3"))
+        }
+
+        if  let tests:TestGroup = tests / "PatchVersion" / "Valid"
         {
             tests.expect(PatchVersion.init("0.1.2") ==? .v(0, 1, 2))
         }
-        if  let tests:TestGroup = tests / "version-parsing" / "invalid"
+        if  let tests:TestGroup = tests / "PatchVersion" / "Invalid"
         {
             if  let tests:TestGroup = tests / "empty"
             {
@@ -50,7 +92,7 @@ enum Main:SyncTests
                 tests.expect(nil: PatchVersion.init("0.1.99999"))
             }
         }
-        if  let tests:TestGroup = tests / "mask-parsing" / "valid"
+        if  let tests:TestGroup = tests / "NumericVersion" / "Valid"
         {
             if  let tests:TestGroup = tests / "major"
             {
@@ -65,7 +107,7 @@ enum Main:SyncTests
                 tests.expect(NumericVersion.init("1.2.3") ==? .patch(.v(1, 2, 3)))
             }
         }
-        if  let tests:TestGroup = tests / "mask-parsing" / "invalid"
+        if  let tests:TestGroup = tests / "NumericVersion" / "Invalid"
         {
             if  let tests:TestGroup = tests / "empty"
             {

Assets/css/Main.css.map

@@ -17,7 +17,6 @@ extension AnyVersion.Canonical:CustomStringConvertible
     {
         switch self
         {
-        case .stable(.release(let version)):    return "\(version) (stable, release)"
         case .stable(let version):              return "\(version) (stable)"
         case .unstable(let name):               return "\(name) (unstable)"
         }

Sources/HTTPServer/Channels/HTTPServerOperation.swift

@@ -1,20 +1,29 @@
 @frozen public
-enum SemanticVersion:Equatable, Hashable, Comparable, Sendable
+enum SemanticVersion:Equatable, Hashable, Sendable
 {
-    case release(PatchVersion)
-
-    @available(*, unavailable, message: "unimplemented")
-    case prerelease
+    case release    (PatchVersion, build:String? = nil)
+    case prerelease (PatchVersion, String, build:String? = nil)
 }
 extension SemanticVersion
 {
+    @inlinable public
+    var patch:PatchVersion
+    {
+        switch self
+        {
+        case .release   (let version,    build: _): return version
+        case .prerelease(let version, _, build: _): return version
+        }
+    }
+
+    @available(*, deprecated, message: "use 'patch' or switch explicitly instead")
     @inlinable public
     var release:PatchVersion?
     {
         switch self
         {
-        case .release(let version): return version
-        case .prerelease:           return nil
+        case .release(let version, _):  return version
+        case .prerelease:               return nil
         }
     }
 }
@@ -25,7 +34,17 @@ extension SemanticVersion:CustomStringConvertible
     {
         switch self
         {
-        case .release(let version): return "\(version)"
+        case .release(let version, build: nil):
+            return "\(version)"
+
+        case .release(let version, build: let build?):
+            return "\(version)+\(build)"
+
+        case .prerelease(let version, let alpha, build: nil):
+            return "\(version)-\(alpha)"
+
+        case .prerelease(let version, let alpha, build: let build?):
+            return "\(version)-\(alpha)+\(build)"
         }
     }
 }
@@ -34,14 +53,49 @@ extension SemanticVersion:LosslessStringConvertible
     @inlinable public
     init?(_ string:some StringProtocol)
     {
-        if  let version:NumericVersion = .init(string)
+        let patch:PatchVersion
+        let alpha:String?
+        let build:String?
+
+        var i:String.Index = string.endIndex
+
+        if  let plus:String.Index = string.lastIndex(of: "+")
         {
-            self = .release(.init(padding: version))
+            build = .init(string[string.index(after: plus)...])
+            i = plus
+        }
+        else
+        {
+            build = nil
+        }
+
+        if  let dash:String.Index = string[..<i].lastIndex(of: "-")
+        {
+            alpha = .init(string[string.index(after: dash) ..< i])
+            i = dash
+        }
+        else
+        {
+            alpha = nil
+        }
+
+        if  let version:NumericVersion = .init(string[..<i])
+        {
+            patch = .init(padding: version)
         }
         else
         {
             return nil
         }
+
+        if  let alpha:String
+        {
+            self = .prerelease(patch, alpha, build: build)
+        }
+        else
+        {
+            self = .release(patch, build: build)
+        }
     }
 }
 extension SemanticVersion:RawRepresentable

Sources/ModuleGraphs/Repositories/Repository.Pin.State.swift

@@ -10,11 +10,11 @@ extension AnyVersion:BSONEncodable
     {
         switch self.canonical
         {
-        case .stable(.release(let version)):
+        case .stable(.release(let version, build: nil)):
             version.encode(to: &field)
 
-        case .unstable(let name):
-            name.encode(to: &field)
+        case let other:
+            "\(other)".encode(to: &field)
         }
     }
 }
@@ -28,7 +28,7 @@ extension AnyVersion:BSONDecodable
             switch $0
             {
             case .int64(let int64):
-                return .stable(.release(.init(rawValue: int64)))
+                return .stable(.release(.init(rawValue: int64), build: nil))
 
             case .string(let utf8):
                 return .init(String.init(bson: utf8))

Sources/SemanticVersionTests/Main.swift

@@ -89,9 +89,12 @@ extension SymbolGraphMetadata
         let display:String
         switch swift.canonical
         {
-        case .stable(.release(let version)):
+        case .stable(.release(let version, _)):
             display = "Swift \(version.minor)"
 
+        case .stable(let version):
+            display = "Swift \(version)"
+
         case .unstable:
             display = "Swift Nightly"
         }

Sources/SemanticVersions/AnyVersion.Canonical.swift

@@ -10,7 +10,7 @@ extension Volume
     func siteMap() -> SiteMap<PackageIdentifier>
     {
         var lines:[UInt8] = []
-        for master:Volume.Master in self.masters
+        for master:Volume.Master in self.vertices
         {
             switch master
             {
@@ -37,7 +37,7 @@ extension Volume
         var procs:[Unidoc.Scalar: [Shoot]] = [:]
         var types:Types = .init()
 
-        for master:Master in self.masters
+        for master:Master in self.vertices
         {
             switch master
             {

Sources/SemanticVersions/SemanticVersion.swift

@@ -46,8 +46,8 @@ enum Main:SyncTests
                 }
             }
             let culture:Unidoc.Scalar = swift_malibu.id + 1 * .module
-            let records:Volume = .init(latest: nil,
-                masters:
+            let volume:Volume = .init(latest: nil,
+                vertices:
                 [
                     .culture(.init(id: swift_malibu.BarbieCore.id,
                         module: .init(name: "BarbieCore", type: .regular))),
@@ -135,7 +135,7 @@ enum Main:SyncTests
                     latest: true,
                     patch: nil))
 
-            let (_, trees):(_, [Volume.TypeTree]) = records.indexes()
+            let (_, trees):(_, [Volume.TypeTree]) = volume.indexes()
             if  let tree:Volume.TypeTree = tests.expect(value: trees.first { $0.id == culture })
             {
                 tests.expect(tree ==? .init(id: culture, rows: