Add @GraphContentBuilder<NodeID> to graph content body

li3zhen1 · li3zhen1 · commit 1b8799eef251 · 2025-01-13T20:49:00.000-08:00
diff --git a/Sources/Grape/Contents/AnyGraphContent.swift b/Sources/Grape/Contents/AnyGraphContent.swift
@@ -9,9 +9,10 @@ public struct AnyGraphContent<NodeID: Hashable>: GraphContent {
         self.storage = storage
     }
 
+
     @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
 
     @inlinable
diff --git a/Sources/Grape/Contents/CompositedGraphContent.swift b/Sources/Grape/Contents/CompositedGraphContent.swift
diff --git a/Sources/Grape/Contents/GraphContent.swift b/Sources/Grape/Contents/GraphContent.swift
@@ -9,6 +9,7 @@ public protocol GraphContent<NodeID> {
     func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>)
 
     @inlinable
+    @GraphContentBuilder<NodeID>
     var body: Body { get }
 }
 
diff --git a/Sources/Grape/Contents/LinkMark.swift b/Sources/Grape/Contents/LinkMark.swift
@@ -5,8 +5,9 @@ public struct LinkMark<NodeID: Hashable>: GraphContent & Identifiable {
 
     @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
+
     // public enum LabelDisplayStrategy {
     //     case auto
     //     case specified(Bool)
diff --git a/Sources/Grape/Contents/ModifiedGraphContent.swift b/Sources/Grape/Contents/ModifiedGraphContent.swift
@@ -50,8 +50,9 @@ extension ModifiedGraphContent: GraphContent {
         modifier._exit(&context)
     }
 
-        @inlinable
+
+    @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
 }
diff --git a/Sources/Grape/Contents/NodeMark.swift b/Sources/Grape/Contents/NodeMark.swift
@@ -15,9 +15,9 @@ public struct NodeMark<NodeID: Hashable>: GraphContent, Identifiable, Equatable
 
     @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
-
+    
     @inlinable
     public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
         context.nodeOperations.append(
diff --git a/Sources/Grape/Contents/_ArrayGraphContent.swift b/Sources/Grape/Contents/_ArrayGraphContent.swift
@@ -13,9 +13,10 @@ where C: GraphContent {
         self.storage = storage
     }
 
+
     @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
     
     @inlinable
diff --git a/Sources/Grape/Contents/_ConditionalGraphContent.swift b/Sources/Grape/Contents/_ConditionalGraphContent.swift
@@ -18,9 +18,10 @@ where C1: GraphContent, C2: GraphContent, C1.NodeID == C2.NodeID {
         self.storage = storage
     }
 
-        @inlinable
+
+    @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
 
     @inlinable
diff --git a/Sources/Grape/Contents/_EmptyGraphContent.swift b/Sources/Grape/Contents/_EmptyGraphContent.swift
@@ -2,15 +2,15 @@
 struct _EmptyGraphContent<NodeID: Hashable>: GraphContent {
     @inlinable
     public init() {
-        
+
     }
     @inlinable
     public func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>) {
-        
+
     }
 
-        @inlinable
+    @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
-}
+}
diff --git a/Sources/Grape/Contents/_IdentifiableNever.swift b/Sources/Grape/Contents/_IdentifiableNever.swift
@@ -1,11 +1,22 @@
-public enum _IdentifiableNever<ID: Hashable> { }
+public enum _IdentifiableNever<ID: Hashable> {
+    @usableFromInline
+    internal init() {
+        fatalError()
+    }
+}
+
+
+@inlinable
+public func _fatalError<ID>(of identityType: ID) -> _IdentifiableNever<ID> where ID: Hashable {
+    _IdentifiableNever<ID>()
+}
 
 extension _IdentifiableNever: GraphContent {
     public typealias NodeID = ID
     
     @inlinable
     public var body: Self {
-        fatalError()
+        _IdentifiableNever<ID>()
     }
     
     @inlinable
diff --git a/Sources/Grape/Contents/_OptionalGraphContent.swift b/Sources/Grape/Contents/_OptionalGraphContent.swift
@@ -24,8 +24,9 @@ where C: GraphContent {
         }
     }
 
-        @inlinable
+
+    @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
 }
diff --git a/Sources/Grape/Contents/_PairedGraphContent.swift b/Sources/Grape/Contents/_PairedGraphContent.swift
@@ -21,8 +21,9 @@ where C1: GraphContent, C2: GraphContent, NodeID: Hashable, C1.NodeID == NodeID,
     }
 
 
+
     @inlinable
     public var body: _IdentifiableNever<NodeID> {
-        fatalError()
+        _IdentifiableNever<_>()
     }
 }
diff --git a/Tests/GrapeTests/ContentBuilderTests.swift b/Tests/GrapeTests/ContentBuilderTests.swift
@@ -50,16 +50,31 @@ final class ContentBuilderTests: XCTestCase {
     }
 
     func testForEach() {
-        let _ = [
+        let arr = [
             ID(id: 0),
             ID(id: 1),
             ID(id: 2),
         ]
 
-        // let _ = buildGraph {
-        //     ForEach(data: arr) { i in
-        //         NodeMark(id: i.id)
-        //     }
-        // }
+        let _ = buildGraph {
+            Series(arr) { i in
+                NodeMark(id: i.id)
+            }
+        }
+    }
+
+    func testComposing() {
+        struct MyGraphContent: GraphContent {
+            var body: some GraphContent<Int> {
+                NodeMark(id: 1)
+                AnnotationNodeMark(id: 3, radius: 4.0) {
+                    EmptyView()
+                }
+            }
+        }
+
+        let _ = buildGraph {
+            MyGraphContent()
+        }
     }
 }
diff --git a/Tests/GrapeTests/GraphContentBuilderTests.swift b/Tests/GrapeTests/GraphContentBuilderTests.swift
@@ -179,8 +179,7 @@ final class GraphContentBuilderTests: XCTestCase {
 
     }
 
-    struct MyGraphComponent: GraphComponent {
-        typealias NodeID = Int
+    struct MyGraphComponent: GraphContent {
         var body: some GraphContent<Int> {
             NodeMark(id: 0)
                 // .opacity(0.6)

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,10 @@ public struct AnyGraphContent<NodeID: Hashable>: GraphContent {`
`9`	`9`	`self.storage = storage`
`10`	`10`	`}`
`11`	`11`
	`12`	`+`
`12`	`13`	`@inlinable`
`13`	`14`	`public var body: _IdentifiableNever<NodeID> {`
`14`		`- fatalError()`
	`15`	`+ _IdentifiableNever<_>()`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`@inlinable`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public protocol GraphContent<NodeID> {`
`9`	`9`	`func _attachToGraphRenderingContext(_ context: inout _GraphRenderingContext<NodeID>)`
`10`	`10`
`11`	`11`	`@inlinable`
	`12`	`+ @GraphContentBuilder<NodeID>`
`12`	`13`	`var body: Body { get }`
`13`	`14`	`}`
`14`	`15`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,9 @@ extension ModifiedGraphContent: GraphContent {`
`50`	`50`	`modifier._exit(&context)`
`51`	`51`	`}`
`52`	`52`
`53`		`- @inlinable`
	`53`	`+`
	`54`	`+ @inlinable`
`54`	`55`	`public var body: _IdentifiableNever<NodeID> {`
`55`		`- fatalError()`
	`56`	`+ _IdentifiableNever<_>()`
`56`	`57`	`}`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,10 @@ where C: GraphContent {`
`13`	`13`	`self.storage = storage`
`14`	`14`	`}`
`15`	`15`
	`16`	`+`
`16`	`17`	`@inlinable`
`17`	`18`	`public var body: _IdentifiableNever<NodeID> {`
`18`		`- fatalError()`
	`19`	`+ _IdentifiableNever<_>()`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`@inlinable`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,10 @@ where C1: GraphContent, C2: GraphContent, C1.NodeID == C2.NodeID {`
`18`	`18`	`self.storage = storage`
`19`	`19`	`}`
`20`	`20`
`21`		`- @inlinable`
	`21`	`+`
	`22`	`+ @inlinable`
`22`	`23`	`public var body: _IdentifiableNever<NodeID> {`
`23`		`- fatalError()`
	`24`	`+ _IdentifiableNever<_>()`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`@inlinable`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,9 @@ where C: GraphContent {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- @inlinable`
	`27`	`+`
	`28`	`+ @inlinable`
`28`	`29`	`public var body: _IdentifiableNever<NodeID> {`
`29`		`- fatalError()`
	`30`	`+ _IdentifiableNever<_>()`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ where C1: GraphContent, C2: GraphContent, NodeID: Hashable, C1.NodeID == NodeID,`
`21`	`21`	`}`
`22`	`22`
`23`	`23`
	`24`	`+`
`24`	`25`	`@inlinable`
`25`	`26`	`public var body: _IdentifiableNever<NodeID> {`
`26`		`- fatalError()`
	`27`	`+ _IdentifiableNever<_>()`
`27`	`28`	`}`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,7 @@ final class GraphContentBuilderTests: XCTestCase {`
`179`	`179`
`180`	`180`	`}`
`181`	`181`
`182`		`- struct MyGraphComponent: GraphComponent {`
`183`		`- typealias NodeID = Int`
	`182`	`+ struct MyGraphComponent: GraphContent {`
`184`	`183`	`var body: some GraphContent<Int> {`
`185`	`184`	`NodeMark(id: 0)`
`186`	`185`	`// .opacity(0.6)`