Update OpenGraph dependency

Kyle-Ye · Kyle-Ye · commit 9afe87833c12 · 2025-01-04T00:02:53.000+08:00
diff --git a/Package.resolved b/Package.resolved
@@ -7,7 +7,7 @@
       "location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git",
       "state" : {
         "branch" : "main",
-        "revision" : "5627dacbbde44c8d3ea7b34f5d91b44839178e15"
+        "revision" : "5a0e8d14d6fbe728951ece9ded2c6f2a6708f5a6"
       }
     },
     {
@@ -25,7 +25,7 @@
       "location" : "https://github.com/OpenSwiftUIProject/OpenGraph",
       "state" : {
         "branch" : "main",
-        "revision" : "c1be687dddce061a6895cf6f7b6c22f79ca5aec4"
+        "revision" : "4aeda45233cb3d8623d819e98aeca4b86a8a3a7d"
       }
     },
     {
diff --git a/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicProperty.swift b/Sources/OpenSwiftUICore/Data/DynamicProperty/DynamicProperty.swift
@@ -166,18 +166,18 @@ package struct DynamicPropertyCache {
             return fields
         }
         let fields: Fields
-        let typeID = OGTypeID(type)
+        let typeID = Metadata(type)
         switch typeID.kind {
         case .enum, .optional:
             var taggedFields: [TaggedFields] = []
             _ = typeID.forEachField(options: [._2, ._4]) { name, offset, fieldType in
                 var fields: [Field] = []
-                let tupleType = OGTupleType(fieldType)
+                let tupleType = TupleType(fieldType)
                 for index in tupleType.indices {
                     guard let dynamicPropertyType = tupleType.type(at: index) as? DynamicProperty.Type else {
                         break
                     }
-                    let offset = tupleType.offset(at: index)
+                    let offset = tupleType.elementOffset(at: index)
                     let field = Field(type: dynamicPropertyType, offset: offset, name: name)
                     fields.append(field)
                 }
diff --git a/Sources/OpenSwiftUICore/Modifier/ViewModifier/CustomViewModifier.swift b/Sources/OpenSwiftUICore/Modifier/ViewModifier/CustomViewModifier.swift
@@ -54,7 +54,7 @@ extension ViewModifier {
         inputs: inout _GraphInputs,
         fields: DynamicPropertyCache.Fields
     ) -> (_GraphValue<Body>, _DynamicPropertyBuffer?) {
-        let kind = OGTypeID(Self.self).kind
+        let kind = Metadata(Self.self).kind
         switch kind {
         case .struct, .enum, .optional, .tuple:
             let accessor = ModifierBodyAccessor<Self>()
diff --git a/Sources/OpenSwiftUICore/Runtime/ProtocolDescriptor.swift b/Sources/OpenSwiftUICore/Runtime/ProtocolDescriptor.swift
@@ -21,7 +21,7 @@ protocol TupleDescriptor: ProtocolDescriptor {
 }
 
 extension TupleDescriptor {
-    static func tupleDescription(_ type: OGTupleType) -> TupleTypeDescription<Self> {
+    static func tupleDescription(_ type: TupleType) -> TupleTypeDescription<Self> {
         let id = ObjectIdentifier(type.type)
         if let cache = typeCache[id] {
             return cache
@@ -38,7 +38,7 @@ extension TupleDescriptor {
 struct TupleTypeDescription<PD: ProtocolDescriptor> {
     let contentTypes: [(Int, TypeConformance<PD>)]
     
-    init(_ tupleType: OGTupleType) {
+    init(_ tupleType: TupleType) {
         contentTypes = tupleType.indices.compactMap { index in
             let type = tupleType.type(at: index)
             guard let comformance = TypeConformance<PD>(type) else {
diff --git a/Sources/OpenSwiftUICore/Util/Tracing.swift b/Sources/OpenSwiftUICore/Util/Tracing.swift
@@ -28,7 +28,7 @@ enum Tracing {
     
     static func libraryName(defining type: Any.Type) -> String {
         let unknown = "ModuleUnknown"
-        guard let nominalDescriptor = OGTypeID(type).nominalDescriptor else {
+        guard let nominalDescriptor = Metadata(type).nominalDescriptor else {
             return unknown
         }
         if let cachedName = moduleLookupCache.value[nominalDescriptor] {
@@ -51,7 +51,7 @@ enum Tracing {
     }
     
     static func nominalTypeName(_ type: Any.Type) -> String {
-        OGTypeID(type).description
+        Metadata(type).description
     }
 }
 
@@ -62,7 +62,7 @@ package func traceBody<Body>(_ v: any Any.Type, body: () -> Body) -> Body {
     guard kdebug_is_enabled(UInt32(OSSignpostType.event.rawValue) & 0xF8 | 0x1411_0014) else {
         return body()
     }
-    // TODO: OGTypeID(type).description, Tracing.libraryName(defining: v)
+    // TODO: Metadata(type).description, Tracing.libraryName(defining: v)
     return body()
     #else
     body()
diff --git a/Sources/OpenSwiftUICore/View/CustomView.swift b/Sources/OpenSwiftUICore/View/CustomView.swift
@@ -46,7 +46,7 @@ extension View {
         inputs: inout _GraphInputs,
         fields: DynamicPropertyCache.Fields
     ) -> (_GraphValue<Body>, _DynamicPropertyBuffer?) {
-        let kind = OGTypeID(Self.self).kind
+        let kind = Metadata(Self.self).kind
         switch kind {
         case .struct, .enum, .optional, .tuple:
             let accessor = ViewBodyAccessor<Self>()
diff --git a/Sources/OpenSwiftUICore/View/Debug/ChangedBodyProperty.swift b/Sources/OpenSwiftUICore/View/Debug/ChangedBodyProperty.swift
@@ -72,7 +72,7 @@ package func changedBodyProperties<Body>(of type: Body.Type) -> [String] {
 
 package func printChangedBodyProperties<Body>(of type: Body.Type) {
     let properties = changedBodyProperties(of: type)
-    var result = OGTypeID(type).description
+    var result = Metadata(type).description
     if properties.isEmpty {
         result.append(": unchanged.")
     } else {
@@ -106,7 +106,7 @@ extension OSLog {
 
 package func logChangedBodyProperties<Body>(of type: Body.Type) {
     let properties = changedBodyProperties(of: type)
-    let result = OGTypeID(type).description
+    let result = Metadata(type).description
     if properties.isEmpty {
         #if OPENSWIFTUI_SWIFT_LOG
         Logger.changeBodyPropertiesLogger.info("\(result): unchanged.")
diff --git a/Sources/OpenSwiftUICore/View/Debug/ViewDebug.swift b/Sources/OpenSwiftUICore/View/Debug/ViewDebug.swift
@@ -395,7 +395,7 @@ extension _ViewDebug.Data {
         init(type anyType: Any.Type) {
             self.name = nil
             self.type = String(reflecting: anyType)
-            self.readableType = OGTypeID(anyType).description
+            self.readableType = Metadata(anyType).description
             self.flags = [
                 conformsToProtocol(anyType, _OpenSwiftUI_viewProtocolDescriptor()) ? .view : [],
                 conformsToProtocol(anyType, _OpenSwiftUI_viewModifierProtocolDescriptor()) ? .viewModifier : [],
@@ -408,7 +408,7 @@ extension _ViewDebug.Data {
             self.name = label
             let anyType = Swift.type(of: value)
             self.type = String(reflecting: anyType)
-            self.readableType = OGTypeID(anyType).description
+            self.readableType = Metadata(anyType).description
             self.flags = [
                 conformsToProtocol(anyType, _OpenSwiftUI_viewProtocolDescriptor()) ? .view : [],
                 conformsToProtocol(anyType, _OpenSwiftUI_viewModifierProtocolDescriptor()) ? .viewModifier : [],
diff --git a/Tests/OpenSwiftUICoreTests/Data/DynamicProperty/DynamicPropertyCacheTests.swift b/Tests/OpenSwiftUICoreTests/Data/DynamicProperty/DynamicPropertyCacheTests.swift
@@ -21,7 +21,7 @@ final class DynamicPropertyCacheTests: XCTestCase {
         print(d)
         
         
-        let t = OGTypeID(DynamicPropertyCache.Fields?.self)
+        let t = Metadata(DynamicPropertyCache.Fields?.self)
         let result = t.forEachField(options: ._4) { name, index, type in
             let s = String(cString: name)
             print("\(s) \(index) \(type)")

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"location" : "https://github.com/OpenSwiftUIProject/DarwinPrivateFrameworks.git",`
`8`	`8`	`"state" : {`
`9`	`9`	`"branch" : "main",`
`10`		`- "revision" : "5627dacbbde44c8d3ea7b34f5d91b44839178e15"`
	`10`	`+ "revision" : "5a0e8d14d6fbe728951ece9ded2c6f2a6708f5a6"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`{`
`@@ -25,7 +25,7 @@`
`25`	`25`	`"location" : "https://github.com/OpenSwiftUIProject/OpenGraph",`
`26`	`26`	`"state" : {`
`27`	`27`	`"branch" : "main",`
`28`		`- "revision" : "c1be687dddce061a6895cf6f7b6c22f79ca5aec4"`
	`28`	`+ "revision" : "4aeda45233cb3d8623d819e98aeca4b86a8a3a7d"`
`29`	`29`	`}`
`30`	`30`	`},`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ enum Tracing {`
`28`	`28`
`29`	`29`	`static func libraryName(defining type: Any.Type) -> String {`
`30`	`30`	`let unknown = "ModuleUnknown"`
`31`		`- guard let nominalDescriptor = OGTypeID(type).nominalDescriptor else {`
	`31`	`+ guard let nominalDescriptor = Metadata(type).nominalDescriptor else {`
`32`	`32`	`return unknown`
`33`	`33`	`}`
`34`	`34`	`if let cachedName = moduleLookupCache.value[nominalDescriptor] {`
`@@ -51,7 +51,7 @@ enum Tracing {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`static func nominalTypeName(_ type: Any.Type) -> String {`
`54`		`- OGTypeID(type).description`
	`54`	`+ Metadata(type).description`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`@@ -62,7 +62,7 @@ package func traceBody<Body>(_ v: any Any.Type, body: () -> Body) -> Body {`
`62`	`62`	`guard kdebug_is_enabled(UInt32(OSSignpostType.event.rawValue) & 0xF8 \| 0x1411_0014) else {`
`63`	`63`	`return body()`
`64`	`64`	`}`
`65`		`- // TODO: OGTypeID(type).description, Tracing.libraryName(defining: v)`
	`65`	`+ // TODO: Metadata(type).description, Tracing.libraryName(defining: v)`
`66`	`66`	`return body()`
`67`	`67`	`#else`
`68`	`68`	`body()`