Fix: generated protocols should also implement Sendable (#68)

bioball · web-flow · commit 3c085f03e926 · 2025-10-01T08:47:14.000-07:00
diff --git a/codegen/snippet-tests/output/Classes.pkl.swift b/codegen/snippet-tests/output/Classes.pkl.swift
@@ -13,7 +13,7 @@ public protocol Classes_Person: Classes_Being {
     var things: Set<Int> { get }
 }
 
-public protocol Classes_Being: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol Classes_Being: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var isAlive: Bool { get }
 }
 
@@ -25,7 +25,7 @@ public protocol Classes_B: Classes_A {
     var b: String { get }
 }
 
-public protocol Classes_A: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol Classes_A: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var a: String { get }
 }
 
diff --git a/codegen/snippet-tests/output/EmptyOpenModule.pkl.swift b/codegen/snippet-tests/output/EmptyOpenModule.pkl.swift
@@ -3,7 +3,7 @@ import PklSwift
 
 public enum EmptyOpenModule {}
 
-public protocol EmptyOpenModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol EmptyOpenModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
 }
 
 extension EmptyOpenModule {
diff --git a/codegen/snippet-tests/output/ExtendingOpenClass.pkl.swift b/codegen/snippet-tests/output/ExtendingOpenClass.pkl.swift
@@ -3,7 +3,7 @@ import PklSwift
 
 public enum ExtendingOpenClass {}
 
-public protocol ExtendingOpenClass_MyOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol ExtendingOpenClass_MyOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var myStr: String { get }
 }
 
diff --git a/codegen/snippet-tests/output/ExtendsAbstractClass.pkl.swift b/codegen/snippet-tests/output/ExtendsAbstractClass.pkl.swift
@@ -3,7 +3,7 @@ import PklSwift
 
 public enum ExtendsAbstractClass {}
 
-public protocol ExtendsAbstractClass_A: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol ExtendsAbstractClass_A: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var b: String { get }
 }
 
diff --git a/codegen/snippet-tests/output/Foo.pkl.swift b/codegen/snippet-tests/output/Foo.pkl.swift
@@ -7,7 +7,7 @@ public protocol Foo_Animal: Foo_Being {
     var name: String { get }
 }
 
-public protocol Foo_Being: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol Foo_Being: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var exists: Bool { get }
 }
 
diff --git a/codegen/snippet-tests/output/MyModule.pkl.swift b/codegen/snippet-tests/output/MyModule.pkl.swift
@@ -3,7 +3,7 @@ import PklSwift
 
 public enum MyModule {}
 
-public protocol MyModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol MyModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var foo: String { get }
 }
 
diff --git a/codegen/snippet-tests/output/Override2.pkl.swift b/codegen/snippet-tests/output/Override2.pkl.swift
@@ -3,7 +3,7 @@ import PklSwift
 
 public enum Override2 {}
 
-public protocol Override2_Module: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol Override2_Module: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var foo: String { get }
 }
 
diff --git a/codegen/snippet-tests/output/com_example_Simple.pkl.swift b/codegen/snippet-tests/output/com_example_Simple.pkl.swift
@@ -3,13 +3,13 @@ import PklSwift
 
 public enum com_example_Simple {}
 
-public protocol com_example_Simple_Person: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol com_example_Simple_Person: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var theName: String { get }
 
     var `enum`: String { get }
 }
 
-public protocol com_example_Simple_OpenClassExtendingOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol com_example_Simple_OpenClassExtendingOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var someOtherProp: Bool? { get }
 }
 
diff --git a/codegen/snippet-tests/output/lib3.pkl.swift b/codegen/snippet-tests/output/lib3.pkl.swift
@@ -3,7 +3,7 @@ import PklSwift
 
 public enum lib3 {}
 
-public protocol lib3_GoGoGo: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol lib3_GoGoGo: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var duck: String { get }
 }
 
diff --git a/codegen/snippet-tests/output/override.pkl.swift b/codegen/snippet-tests/output/override.pkl.swift
@@ -3,7 +3,7 @@ import PklSwift
 
 public enum override {}
 
-public protocol override_Foo: PklRegisteredType, DynamicallyEquatable, Hashable {
+public protocol override_Foo: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {
     var myProp: String { get }
 }
 
diff --git a/codegen/src/internal/ClassGen.pkl b/codegen/src/internal/ClassGen.pkl
@@ -133,6 +133,8 @@ local function doesNotInherit(clazz: reflect.Class?) =
   clazz.superclass == null
   || clazz.superclass.reflectee == Typed
 
+local sendable = if (hasAnyHashable) "@unchecked Sendable" else "Sendable"
+
 local structSuperclasses: String =
   if (classInfo.protocol != null)
     classInfo.protocol.name
@@ -142,7 +144,6 @@ local structSuperclasses: String =
     else
       "\(superClass.namespaceName).\(superClass.name)"
   else
-    let (sendable = if (hasAnyHashable) "@unchecked Sendable" else "Sendable")
       "PklRegisteredType, Decodable, Hashable, \(sendable)"
 
 local struct: String = new Listing {
@@ -337,7 +338,7 @@ local protocol: String? =
         when (superClass != null) {
           "\(superClass.protocol.fullName) {\n"
         } else {
-          "PklRegisteredType, DynamicallyEquatable, Hashable {\n"
+          "PklRegisteredType, DynamicallyEquatable, Hashable, \(sendable) {\n"
         }
         for (key, field in methodsToGenerate) {
           when (key != methodsToGenerate.keys.first) {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public protocol Classes_Person: Classes_Being {`
`13`	`13`	`var things: Set<Int> { get }`
`14`	`14`	`}`
`15`	`15`
`16`		`-public protocol Classes_Being: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`16`	`+public protocol Classes_Being: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`17`	`17`	`var isAlive: Bool { get }`
`18`	`18`	`}`
`19`	`19`
`@@ -25,7 +25,7 @@ public protocol Classes_B: Classes_A {`
`25`	`25`	`var b: String { get }`
`26`	`26`	`}`
`27`	`27`
`28`		`-public protocol Classes_A: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`28`	`+public protocol Classes_A: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`29`	`29`	`var a: String { get }`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum EmptyOpenModule {}`
`5`	`5`
`6`		`-public protocol EmptyOpenModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol EmptyOpenModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`extension EmptyOpenModule {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum ExtendingOpenClass {}`
`5`	`5`
`6`		`-public protocol ExtendingOpenClass_MyOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol ExtendingOpenClass_MyOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`var myStr: String { get }`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum ExtendsAbstractClass {}`
`5`	`5`
`6`		`-public protocol ExtendsAbstractClass_A: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol ExtendsAbstractClass_A: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`var b: String { get }`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ public protocol Foo_Animal: Foo_Being {`
`7`	`7`	`var name: String { get }`
`8`	`8`	`}`
`9`	`9`
`10`		`-public protocol Foo_Being: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`10`	`+public protocol Foo_Being: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`11`	`11`	`var exists: Bool { get }`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum MyModule {}`
`5`	`5`
`6`		`-public protocol MyModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol MyModule_Module: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`var foo: String { get }`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum Override2 {}`
`5`	`5`
`6`		`-public protocol Override2_Module: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol Override2_Module: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`var foo: String { get }`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum com_example_Simple {}`
`5`	`5`
`6`		`-public protocol com_example_Simple_Person: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol com_example_Simple_Person: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`var theName: String { get }`
`8`	`8`
`9`	`9`	var `enum`: String { get }
`10`	`10`	`}`
`11`	`11`
`12`		`-public protocol com_example_Simple_OpenClassExtendingOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`12`	`+public protocol com_example_Simple_OpenClassExtendingOpenClass: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`13`	`13`	`var someOtherProp: Bool? { get }`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum lib3 {}`
`5`	`5`
`6`		`-public protocol lib3_GoGoGo: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol lib3_GoGoGo: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`var duck: String { get }`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import PklSwift`
`3`	`3`
`4`	`4`	`public enum override {}`
`5`	`5`
`6`		`-public protocol override_Foo: PklRegisteredType, DynamicallyEquatable, Hashable {`
	`6`	`+public protocol override_Foo: PklRegisteredType, DynamicallyEquatable, Hashable, Sendable {`
`7`	`7`	`var myProp: String { get }`
`8`	`8`	`}`
`9`	`9`