Updates Class and TypeAlias representation according to SPICE-0021 (#67)

Author: HT154

Sources/PklSwift/API/Class.swift

@@ -17,13 +17,29 @@
 import MessagePack
 
 /// Class is the Swift representation of Pkl's `pkl.base#Class`.
-public struct Class: Hashable {}
+public struct Class: Hashable {
+    /// The URI of the module containing this class.
+    /// Will be an empty string for values encoded by Pkl versions older than 0.30.
+    public let moduleUri: String
+
+    /// The qualified name of this class.
+    /// Will be an empty string for values encoded by Pkl versions older than 0.30.
+    public let qualifiedName: String
+}
 
 extension Class: PklSerializableType, Sendable {
     public static let messageTag: PklValueType = .class
 
     public static func decode(_ fields: [MessagePackValue], codingPath: [any CodingKey]) throws -> Class {
+        if fields.count > 1 { // pkl 0.30+ includes the qualified name and module uri
+            try checkFieldCount(fields, codingPath: codingPath, min: 3)
+            return try Class(
+                moduleUri: fields[1].decode(String.self),
+                qualifiedName: fields[2].decode(String.self)
+            )
+        }
+
         try checkFieldCount(fields, codingPath: codingPath, min: 1)
-        return Class()
+        return Class(moduleUri: "", qualifiedName: "")
     }
 }

Sources/PklSwift/API/TypeAlias.swift

@@ -17,13 +17,29 @@
 import MessagePack
 
 /// TypeAlias is the Swift representation of Pkl's `pkl.base#TypeAlias`.
-public struct TypeAlias: Hashable {}
+public struct TypeAlias: Hashable {
+    /// The URI of the module containing this typealias.
+    /// Will be an empty string for values encoded by Pkl versions older than 0.30.
+    public let moduleUri: String
+
+    /// The qualified name of this typealias.
+    /// Will be an empty string for values encoded by Pkl versions older than 0.30.
+    public let qualifiedName: String
+}
 
 extension TypeAlias: PklSerializableType, Sendable {
     public static let messageTag: PklValueType = .typealias
 
     public static func decode(_ fields: [MessagePackValue], codingPath: [any CodingKey]) throws -> TypeAlias {
+        if fields.count > 1 { // pkl 0.30+ includes the qualified name and module uri
+            try checkFieldCount(fields, codingPath: codingPath, min: 3)
+            return try TypeAlias(
+                moduleUri: fields[1].decode(String.self),
+                qualifiedName: fields[2].decode(String.self)
+            )
+        }
+
         try checkFieldCount(fields, codingPath: codingPath, min: 1)
-        return TypeAlias()
+        return TypeAlias(moduleUri: "", qualifiedName: "")
     }
 }

Sources/PklSwift/EvaluatorManager.swift

@@ -378,11 +378,13 @@ let pklVersion0_26 = SemanticVersion("0.26.0")!
 let pklVersion0_27 = SemanticVersion("0.27.0")!
 let pklVersion0_28 = SemanticVersion("0.28.0")!
 let pklVersion0_29 = SemanticVersion("0.29.0")!
+let pklVersion0_30 = SemanticVersion("0.30.0")!
 
 let supportedPklVersions = [
     pklVersion0_25,
     pklVersion0_26,
     pklVersion0_27,
     pklVersion0_28,
     pklVersion0_29,
+    pklVersion0_30,
 ]

Tests/PklSwiftTests/Fixtures/ApiTypes.pkl

@@ -1,8 +1,9 @@
+import "pkl:base"
+
 res1: Duration = 10.h
 res2: DataSize = 1.2345.gib
 
 stringClass: Class = String
-moduleClass: Class = module.getClass()
-typeAlias: TypeAlias = Foo
+moduleClass: Class = base.getClass()
+typeAlias: TypeAlias = UInt8
 
-typealias Foo = String

Tests/PklSwiftTests/Fixtures/Generated/ApiTypes.pkl.swift

@@ -32,8 +32,6 @@ extension ApiTypes {
         }
     }
 
-    public typealias Foo = String
-
     /// Load the Pkl module at the given source and evaluate it into `ApiTypes.Module`.
     ///
     /// - Parameter source: The source of the Pkl module.

Tests/PklSwiftTests/FixturesTest.swift

@@ -90,14 +90,29 @@ class FixturesTest: XCTestCase {
             evaluator: self.evaluator,
             source: .path("\(#filePath)/../Fixtures/ApiTypes.pkl")
         )
+
+        let stringClass: Class
+        let moduleClass: Class
+        let typeAlias: TypeAlias
+        let version = try await SemanticVersion(EvaluatorManager().getVersion())!
+        if version < pklVersion0_30 {
+            stringClass = Class(moduleUri: "", qualifiedName: "")
+            moduleClass = Class(moduleUri: "", qualifiedName: "")
+            typeAlias = TypeAlias(moduleUri: "", qualifiedName: "")
+        } else {
+            stringClass = Class(moduleUri: "pkl:base", qualifiedName: "pkl.base#String")
+            moduleClass = Class(moduleUri: "pkl:base", qualifiedName: "pkl.base")
+            typeAlias = TypeAlias(moduleUri: "pkl:base", qualifiedName: "pkl.base#UInt8")
+        }
+
         XCTAssertEqual(
             result,
             ApiTypes.Module(
                 res1: .hours(10),
                 res2: .gibibytes(1.2345),
-                stringClass: Class(),
-                moduleClass: Class(),
-                typeAlias: TypeAlias()
+                stringClass: stringClass,
+                moduleClass: moduleClass,
+                typeAlias: typeAlias
             )
         )
     }