Add Swift name refinements for AGAttributeType and AGAttributeTypeFlags

jcmosc · Kyle-Ye · commit 3fddf8d9cb1b · 2025-08-02T16:05:55.000+08:00
diff --git a/Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift b/Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift
@@ -8,7 +8,7 @@
 public import OpenGraph_SPI
 
 extension AnyAttribute {
-    public typealias Flags = OGAttributeTypeFlags
+    public typealias Flags = AttributeType.Flags
 
     public init<Value>(_ attribute: Attribute<Value>) {
         self = attribute.identifier
diff --git a/Sources/OpenGraph/Attribute/Attribute/Attribute.swift b/Sources/OpenGraph/Attribute/Attribute/Attribute.swift
@@ -37,7 +37,7 @@ public struct Attribute<Value> {
     public init<Body: _AttributeBody>(
         body: UnsafePointer<Body>,
         value: UnsafePointer<Value>?,
-        flags: OGAttributeTypeFlags = [],
+        flags: AttributeType.Flags = [],
         update: AttributeUpdateBlock
     ) {
         #if os(WASI)
@@ -228,12 +228,6 @@ extension Attribute {
     }
 }
 
-// TODO:
-private struct AttributeType {
-    var graphType: OGAttributeType
-    var type: _AttributeBody.Type
-}
-
 @_silgen_name("OGGraphCreateAttribute")
 @inline(__always)
 @inlinable
diff --git a/Sources/OpenGraph/Attribute/Attribute/External.swift b/Sources/OpenGraph/Attribute/Attribute/External.swift
@@ -15,7 +15,7 @@ public struct External<Value> {
 extension External: _AttributeBody {
     public static var comparisonMode: ComparisonMode { .equatableAlways }
 
-    public static var flags: OGAttributeTypeFlags { [] }
+    public static var flags: AttributeType.Flags { [] }
 
     public static func _update(_: UnsafeMutableRawPointer, attribute _: AnyAttribute) {}
 }
diff --git a/Sources/OpenGraph/Attribute/Body/AttributeBody.swift b/Sources/OpenGraph/Attribute/Body/AttributeBody.swift
@@ -12,7 +12,7 @@ public protocol _AttributeBody {
     static var _hasDestroySelf: Bool { get }
     static func _updateDefault(_ pointer: UnsafeMutableRawPointer)
     static var comparisonMode: ComparisonMode { get }
-    static var flags: OGAttributeTypeFlags { get }
+    static var flags: AttributeType.Flags { get }
 }
 
 // MARK: - Protocol Default implementation
@@ -22,7 +22,7 @@ extension _AttributeBody {
     public static var _hasDestroySelf: Bool { false }
     public static func _updateDefault(_ pointer: UnsafeMutableRawPointer) {}
     public static var comparisonMode: ComparisonMode { .equatableUnlessPOD }
-    public static var flags: OGAttributeTypeFlags { .mainThread }
+    public static var flags: AttributeType.Flags { .mainThread }
 }
 
 extension _AttributeBody {
diff --git a/Sources/OpenGraph/Attribute/Rule/Focus.swift b/Sources/OpenGraph/Attribute/Rule/Focus.swift
@@ -17,7 +17,7 @@ public struct Focus<Root, Value>: Rule, CustomStringConvertible {
 
     public var value: Value { root.value[keyPath: keyPath] }
 
-    public static var flags: OGAttributeTypeFlags { [] }
+    public static var flags: AttributeType.Flags { [] }
 
     public var description: String { "• \(Metadata(Value.self).description)" }
 }
diff --git a/Sources/OpenGraph/Attribute/Rule/Map.swift b/Sources/OpenGraph/Attribute/Rule/Map.swift
@@ -19,7 +19,7 @@ public struct Map<Source, Value>: Rule, CustomStringConvertible {
 
     public var value: Value { body(arg.value) }
 
-    public static var flags: OGAttributeTypeFlags { [] }
+    public static var flags: AttributeType.Flags { [] }
 
     public var description: String { "λ \(Value.self)" }
 }
diff --git a/Sources/OpenGraph/Graph/Graph.swift b/Sources/OpenGraph/Graph/Graph.swift
@@ -12,7 +12,7 @@ extension Graph {
         ctx: GraphContext,
         body: _AttributeBody.Type,
         valueType: Metadata,
-        flags: OGAttributeTypeFlags,
+        flags: AttributeType.Flags,
         update: AttributeUpdateBlock
     ) -> Int {
         // TODO: __AGGraphInternAttributeType
diff --git a/Sources/OpenGraph_SPI/include/OGAttributeType.h b/Sources/OpenGraph_SPI/include/OGAttributeType.h
@@ -23,7 +23,7 @@ typedef struct OGAttributeVTable {
     void (*_Nullable update_default)(const OGAttributeType *, void *);
 } OGAttributeVTable OG_SWIFT_NAME(_AttributeVTable);
 
-typedef struct OGAttributeType {
+typedef struct OG_SWIFT_NAME(AttributeType) OGAttributeType {
     OGTypeID self_id;
     OGTypeID value_id;
     OGClosureStorage update;
diff --git a/Sources/OpenGraph_SPI/include/OGAttributeTypeFlags.h b/Sources/OpenGraph_SPI/include/OGAttributeTypeFlags.h
@@ -18,7 +18,7 @@ typedef OG_OPTIONS(uint32_t, OGAttributeTypeFlags) {
     OGAttributeTypeFlagsMainThread = 1 << 3,
     OGAttributeTypeFlagsExternal = 1 << 4,
     OGAttributeTypeFlagsAsyncThread = 1 << 5,
-};
+} OG_SWIFT_NAME(AttributeType.Flags);
 
 #endif /* OGAttributeTypeFlags_h */
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public struct External<Value> {`
`15`	`15`	`extension External: _AttributeBody {`
`16`	`16`	`public static var comparisonMode: ComparisonMode { .equatableAlways }`
`17`	`17`
`18`		`- public static var flags: OGAttributeTypeFlags { [] }`
	`18`	`+ public static var flags: AttributeType.Flags { [] }`
`19`	`19`
`20`	`20`	`public static func _update(_: UnsafeMutableRawPointer, attribute _: AnyAttribute) {}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public struct Focus<Root, Value>: Rule, CustomStringConvertible {`
`17`	`17`
`18`	`18`	`public var value: Value { root.value[keyPath: keyPath] }`
`19`	`19`
`20`		`- public static var flags: OGAttributeTypeFlags { [] }`
	`20`	`+ public static var flags: AttributeType.Flags { [] }`
`21`	`21`
`22`	`22`	`public var description: String { "• \(Metadata(Value.self).description)" }`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public struct Map<Source, Value>: Rule, CustomStringConvertible {`
`19`	`19`
`20`	`20`	`public var value: Value { body(arg.value) }`
`21`	`21`
`22`		`- public static var flags: OGAttributeTypeFlags { [] }`
	`22`	`+ public static var flags: AttributeType.Flags { [] }`
`23`	`23`
`24`	`24`	`public var description: String { "λ \(Value.self)" }`
`25`	`25`	`}`