Optimize Flags code (#164)

Author: Kyle-Ye

Package.resolved

@@ -33,7 +33,7 @@ extension AnyAttribute {
         create(offset: offset)
     }
 
-    public func setFlags(_ newFlags: Subgraph.Flags, mask: Subgraph.Flags) {
+    public func setFlags(_ newFlags: Flags, mask: Flags) {
         flags = flags.subtracting(mask).union(newFlags.intersection(mask))
     }
 

Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift

@@ -194,12 +194,14 @@ public struct Attribute<Value> {
 
     // MARK: - Flags
 
-    public var flags: Subgraph.Flags {
+    public typealias Flags = AnyAttribute.Flags
+
+    public var flags: Flags {
         get { identifier.flags }
         nonmutating set { identifier.flags = newValue }
     }
 
-    public func setFlags(_ newFlags: Subgraph.Flags, mask: Subgraph.Flags) {
+    public func setFlags(_ newFlags: Flags, mask: Flags) {
         identifier.setFlags(newFlags, mask: mask)
     }
 }

Sources/OpenGraph/Attribute/Attribute/Attribute.swift

@@ -34,7 +34,7 @@ extension Subgraph {
         #endif
     }
 
-    public func forEach(_ flags: Subgraph.Flags, _ callback: (AnyAttribute) -> Void) {
+    public func forEach(_ flags: Flags, _ callback: (AnyAttribute) -> Void) {
         Subgraph.apply(self, flags: flags, callback: callback)
     }
 }
@@ -62,7 +62,7 @@ extension Subgraph {
 // FIXME: migrate to use @_extern(c, "xx") in Swift 6
 extension Subgraph {
     @_silgen_name("OGSubgraphApply")
-    private static func apply(_ graph: Subgraph, flags: Subgraph.Flags, callback: (AnyAttribute) -> Void)
+    private static func apply(_ graph: Subgraph, flags: Flags, callback: (AnyAttribute) -> Void)
 
     @_silgen_name("OGSubgraphAddObserver")
     private static func addObserver(_ graph: Subgraph, observer: () -> Void) -> Int

Sources/OpenGraph/Graph/Subgraph.swift

@@ -46,34 +46,36 @@ final class AnyAttributeCompatibilityTests: AttributeTestBase {
 
     @Test
     func setFlags() throws {
+        typealias Flags = AnyAttribute.Flags
+
         let attribute = AnyAttribute(Attribute(value: 0))
         #expect(attribute.flags == [])
 
         // Test mask = []
         attribute.flags = []
 
-        attribute.setFlags([Subgraph.Flags(rawValue: 1)], mask: [])
+        attribute.setFlags([Flags(rawValue: 1)], mask: [])
         #expect(attribute.flags == [])
 
-        attribute.setFlags([Subgraph.Flags(rawValue: 2)], mask: [])
+        attribute.setFlags([Flags(rawValue: 2)], mask: [])
         #expect(attribute.flags == [])
 
-        attribute.setFlags([Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 4)], mask: [])
+        attribute.setFlags([Flags(rawValue: 1), Flags(rawValue: 4)], mask: [])
         #expect(attribute.flags == [])
 
         // Test mask
         attribute.flags = []
-        attribute.setFlags([Subgraph.Flags(rawValue: 1)], mask: [Subgraph.Flags(rawValue: 1)])
-        #expect(attribute.flags == [Subgraph.Flags(rawValue: 1)])
+        attribute.setFlags([Flags(rawValue: 1)], mask: [Flags(rawValue: 1)])
+        #expect(attribute.flags == [Flags(rawValue: 1)])
 
-        attribute.setFlags([Subgraph.Flags(rawValue: 2)], mask: [Subgraph.Flags(rawValue: 2)])
-        #expect(attribute.flags == [Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 2)])
+        attribute.setFlags([Flags(rawValue: 2)], mask: [Flags(rawValue: 2)])
+        #expect(attribute.flags == [Flags(rawValue: 1), Flags(rawValue: 2)])
 
-        attribute.setFlags([Subgraph.Flags(rawValue: 4)], mask: [Subgraph.Flags(rawValue: 1)])
-        #expect(attribute.flags == [Subgraph.Flags(rawValue: 2)])
+        attribute.setFlags([Flags(rawValue: 4)], mask: [Flags(rawValue: 1)])
+        #expect(attribute.flags == [Flags(rawValue: 2)])
 
-        attribute.setFlags([Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 4)], mask: [Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 2), Subgraph.Flags(rawValue: 4)])
-        #expect(attribute.flags == [Subgraph.Flags(rawValue: 1), Subgraph.Flags(rawValue: 4)])
+        attribute.setFlags([Flags(rawValue: 1), Flags(rawValue: 4)], mask: [Flags(rawValue: 1), Flags(rawValue: 2), Flags(rawValue: 4)])
+        #expect(attribute.flags == [Flags(rawValue: 1), Flags(rawValue: 4)])
     }
 
     @Test

Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeCompatibilityTests.swift

@@ -75,8 +75,8 @@ final class AttributeCompatibilityTests: AttributeTestBase {
     @Test
     func flagSetter() {
         let attribute = Attribute(value: ())
-        attribute.flags = Subgraph.Flags(rawValue: 1)
-        #expect(attribute.flags == Subgraph.Flags(rawValue: 1))
+        attribute.flags = .init(rawValue: 1)
+        #expect(attribute.flags == .init(rawValue: 1))
     }
 }
 #endif

Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift

@@ -5,6 +5,7 @@
 import Testing
 import Foundation
 
+@MainActor
 struct GraphCompatibilityTests {
     @Test
     func graphCreate() throws {