Update OpenGraph_SPI to OpenGraphCxx (#142)

* Update OpenGraph_SPI to OpenGraphCxx

* Change to OpenGraphCxx.Internal

* Add OpenGraphCxx Private submodule

* Add module.private.modulemap

* Refactor all hpp headers

* Update OpenGraphC module

Author: Kyle-Ye

Package.swift

@@ -136,15 +136,15 @@ if libraryEvolutionCondition {
 
 let openGraphTarget = Target.target(
     name: "OpenGraph",
-    dependencies: ["OpenGraph_SPI"],
+    dependencies: ["OpenGraphCxx"],
     cSettings: sharedCSettings,
     swiftSettings: sharedSwiftSettings
 )
 // FIXME: Merge into one target
 // OpenGraph is a C++ & Swift mix target.
 // The SwiftPM support for such usage is still in progress.
 let openGraphSPITarget = Target.target(
-    name: "OpenGraph_SPI",
+    name: "OpenGraphCxx",
     cSettings: sharedCSettings + [
         .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
     ],
@@ -170,14 +170,11 @@ let openGraphTestTarget = Target.testTarget(
     swiftSettings: sharedSwiftSettings
 )
 let openGraphSPITestTarget = Target.testTarget(
-    name: "OpenGraph_SPITests",
+    name: "OpenGraphCxxTests",
     dependencies: [
-        "OpenGraph_SPI",
+        "OpenGraphCxx",
     ],
     exclude: ["README.md"],
-    cSettings: sharedCSettings + [
-        .headerSearchPath("../../Sources/OpenGraph_SPI"),
-    ],
     swiftSettings: sharedSwiftSettings + [.interoperabilityMode(.Cxx)]
 )
 let openGraphShimsTestTarget = Target.testTarget(
@@ -204,8 +201,8 @@ let openGraphCompatibilityTestTarget = Target.testTarget(
 let package = Package(
     name: "OpenGraph",
     products: [
-        .library(name: "OpenGraph", type: .dynamic, targets: ["OpenGraph", "OpenGraph_SPI"]),
-        .library(name: "OpenGraphShims", type: .dynamic, targets: ["OpenGraph", "OpenGraph_SPI", "OpenGraphShims"]),
+        .library(name: "OpenGraph", type: .dynamic, targets: ["OpenGraph", "OpenGraphCxx"]),
+        .library(name: "OpenGraphShims", type: .dynamic, targets: ["OpenGraph", "OpenGraphCxx", "OpenGraphShims"]),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-numerics", from: "1.0.2"),

README.md

@@ -31,7 +31,7 @@ The current suggested toolchain to build the project is Swift 6.1 / Xcode 16.3.
 
 ## Credits
 
-OpenGraph_SPI's Data, Graph, Vector and more is modified based on [Compute](https://github.com/jcmosc/Compute)'s implementations.
+OpenGraphCxx's Data, Graph, Vector and more is modified based on [Compute](https://github.com/jcmosc/Compute)'s implementations.
 
 ## License
 

Scripts/gen_ag_interface_template.sh

@@ -14,8 +14,8 @@ swift build -c release -Xswiftc -emit-module-interface -Xswiftc -enable-library-
 cp .build/release/Modules/OpenGraph.swiftinterface ./template.swiftinterface
 
 sed -i '' '1,4d' ./template.swiftinterface
-sed -i '' 's/@_exported public import OpenGraph_SPI/@_exported public import AttributeGraph/g' ./template.swiftinterface
-sed -i '' 's/OpenGraph_SPI\.//g' ./template.swiftinterface
+sed -i '' 's/@_exported public import OpenGraphCxx/@_exported public import AttributeGraph/g' ./template.swiftinterface
+sed -i '' 's/OpenGraphCxx\.//g' ./template.swiftinterface
 sed -i '' 's/OpenGraph/AttributeGraph/g' ./template.swiftinterface
 sed -i '' 's/OG/AG/g' ./template.swiftinterface
 

Sources/OpenGraph/Attribute/Attribute/AnyAttribute.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: API complete
 
-public import OpenGraph_SPI
+public import OpenGraphCxx
 
 extension AnyAttribute {
     public typealias Flags = OGAttributeTypeFlags

Sources/OpenGraph/Attribute/Attribute/Attribute.swift

@@ -1,4 +1,4 @@
-public import OpenGraph_SPI
+public import OpenGraphCxx
 
 @frozen
 @propertyWrapper

Sources/OpenGraph/Attribute/Body/AttributeBody.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-public import OpenGraph_SPI
+public import OpenGraphCxx
 
 public protocol _AttributeBody {
     static func _destroySelf(_ pointer: UnsafeMutableRawPointer)

Sources/OpenGraph/Attribute/Rule/Rule.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-public import OpenGraph_SPI
+public import OpenGraphCxx
 
 public protocol Rule: _AttributeBody {
     associatedtype Value

Sources/OpenGraph/Attribute/Rule/StatefulRule.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-public import OpenGraph_SPI
+public import OpenGraphCxx
 
 public protocol StatefulRule: _AttributeBody {
     associatedtype Value

Sources/OpenGraph/Attribute/RuleContext/AnyRuleContext.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-public import OpenGraph_SPI
+public import OpenGraphCxx
 
 @frozen
 public struct AnyRuleContext: Equatable {

Sources/OpenGraph/Attribute/RuleContext/RuleContext.swift

@@ -5,7 +5,7 @@
 //  Audited for RELEASE_2021
 //  Status: Complete
 
-public import OpenGraph_SPI
+public import OpenGraphCxx
 
 @frozen
 public struct RuleContext<Value>: Equatable {