Add OGGraph.descriptionFormat API (#69)

* Add OGGraph.descriptionFormat API * Fix Linux build issue
OpenSwiftUIProject · Apr 21, 2024 · acbee3c · acbee3c
1 parent 036b8d2
commit acbee3c
Show file tree

Hide file tree

Showing 15 changed files with 143 additions and 25 deletions.
diff --git a/...eGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGGraphDescription.h b/...eGraph.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AGGraphDescription.h
@@ -0,0 +1,24 @@
+//
+//  AGGraphDescription.h
+//
+//
+//  Created by Kyle on 2024/1/21.
+//
+
+#ifndef AGGraphDescription_h
+#define AGGraphDescription_h
+
+#include "AGBase.h"
+
+AG_ASSUME_NONNULL_BEGIN
+
+#if AG_OBJC_FOUNDATION
+AG_EXTERN_C_BEGIN
+AG_EXPORT
+CFStringRef AGDescriptionFormat AG_SWIFT_NAME(AGGraphRef.descriptionFormat);
+AG_EXTERN_C_END
+#endif
+
+AG_ASSUME_NONNULL_END
+
+#endif /* AGGraphDescription_h */
diff --git a/...h.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h b/...h.xcframework/ios-arm64-arm64e/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h
@@ -20,6 +20,7 @@
 #include "AGDebugServer.h"
 #include "AGGraph.h"
 #include "AGGraphContext.h"
+#include "AGGraphDescription.h"
 #include "AGInputOptions.h"
 #include "AGSearchOptions.h"
 #include "AGSubgraph.h"

diff --git a/...ramework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGGraphDescription.h b/...ramework/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AGGraphDescription.h
@@ -0,0 +1,24 @@
+//
+//  AGGraphDescription.h
+//
+//
+//  Created by Kyle on 2024/1/21.
+//
+
+#ifndef AGGraphDescription_h
+#define AGGraphDescription_h
+
+#include "AGBase.h"
+
+AG_ASSUME_NONNULL_BEGIN
+
+#if AG_OBJC_FOUNDATION
+AG_EXTERN_C_BEGIN
+AG_EXPORT
+CFStringRef AGDescriptionFormat AG_SWIFT_NAME(AGGraphRef.descriptionFormat);
+AG_EXTERN_C_END
+#endif
+
+AG_ASSUME_NONNULL_END
+
+#endif /* AGGraphDescription_h */
diff --git a/...ork/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h b/...ork/ios-arm64-x86_64-simulator/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h
@@ -20,6 +20,7 @@
 #include "AGDebugServer.h"
 #include "AGGraph.h"
 #include "AGGraphContext.h"
+#include "AGGraphDescription.h"
 #include "AGInputOptions.h"
 #include "AGSearchOptions.h"
 #include "AGSubgraph.h"

diff --git a/...framework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGGraphDescription.h b/...framework/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AGGraphDescription.h
@@ -0,0 +1,24 @@
+//
+//  AGGraphDescription.h
+//
+//
+//  Created by Kyle on 2024/1/21.
+//
+
+#ifndef AGGraphDescription_h
+#define AGGraphDescription_h
+
+#include "AGBase.h"
+
+AG_ASSUME_NONNULL_BEGIN
+
+#if AG_OBJC_FOUNDATION
+AG_EXTERN_C_BEGIN
+AG_EXPORT
+CFStringRef AGDescriptionFormat AG_SWIFT_NAME(AGGraphRef.descriptionFormat);
+AG_EXTERN_C_END
+#endif
+
+AG_ASSUME_NONNULL_END
+
+#endif /* AGGraphDescription_h */
diff --git a/...work/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h b/...work/macos-arm64e-arm64-x86_64/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h
@@ -20,6 +20,7 @@
 #include "AGDebugServer.h"
 #include "AGGraph.h"
 #include "AGGraphContext.h"
+#include "AGGraphDescription.h"
 #include "AGInputOptions.h"
 #include "AGSearchOptions.h"
 #include "AGSubgraph.h"

diff --git a/AG/Sources/Headers/AGGraphDescription.h b/AG/Sources/Headers/AGGraphDescription.h
@@ -0,0 +1,24 @@
+//
+//  AGGraphDescription.h
+//
+//
+//  Created by Kyle on 2024/1/21.
+//
+
+#ifndef AGGraphDescription_h
+#define AGGraphDescription_h
+
+#include "AGBase.h"
+
+AG_ASSUME_NONNULL_BEGIN
+
+#if AG_OBJC_FOUNDATION
+AG_EXTERN_C_BEGIN
+AG_EXPORT
+CFStringRef AGDescriptionFormat AG_SWIFT_NAME(AGGraphRef.descriptionFormat);
+AG_EXTERN_C_END
+#endif
+
+AG_ASSUME_NONNULL_END
+
+#endif /* AGGraphDescription_h */
diff --git a/AG/Sources/Headers/AttributeGraph-umbrella.h b/AG/Sources/Headers/AttributeGraph-umbrella.h
@@ -20,6 +20,7 @@
 #include "AGDebugServer.h"
 #include "AGGraph.h"
 #include "AGGraphContext.h"
+#include "AGGraphDescription.h"
 #include "AGInputOptions.h"
 #include "AGSearchOptions.h"
 #include "AGSubgraph.h"

diff --git a/Sources/_OpenGraph/Debug/og-debug-server.mm b/Sources/_OpenGraph/Debug/og-debug-server.mm
@@ -10,7 +10,7 @@
 
 #include "../Util/log.hpp"
 #include "../Util/assert.hpp"
-#include "../Graph/GraphDescription.hpp"
+#include "../Graph/OGGraphDescription.h"
 #include "../Graph/Graph.hpp"
 
 #include <iostream>

diff --git a/Sources/_OpenGraph/Graph/GraphDescription.hpp b/Sources/_OpenGraph/Graph/GraphDescription.hpp
diff --git a/Sources/_OpenGraph/Graph/GraphDescription.mm b/Sources/_OpenGraph/Graph/GraphDescription.mm
@@ -5,7 +5,7 @@
 //  Created by Kyle on 2024/1/21.
 //
 
-#include "GraphDescription.hpp"
+#include "OGGraphDescription.h"
 #include "OGGraph.h"
 #include "Graph.hpp"
 #include "../Util/assert.hpp"

diff --git a/Sources/_OpenGraph/Graph/OGGraphDescription.h b/Sources/_OpenGraph/Graph/OGGraphDescription.h
@@ -0,0 +1,24 @@
+//
+//  OGGraphDescription.h
+//
+//
+//  Created by Kyle on 2024/1/21.
+//
+
+#ifndef OGGraphDescription_h
+#define OGGraphDescription_h
+
+#include "OGBase.h"
+
+OG_ASSUME_NONNULL_BEGIN
+
+#if OG_OBJC_FOUNDATION
+OG_EXTERN_C_BEGIN
+OG_EXPORT
+CFStringRef OGDescriptionFormat OG_SWIFT_NAME(OGGraphRef.descriptionFormat);
+OG_EXTERN_C_END
+#endif
+
+OG_ASSUME_NONNULL_END
+
+#endif /* OGGraphDescription_h */
diff --git a/Sources/_OpenGraph/OGBase.h b/Sources/_OpenGraph/OGBase.h
@@ -60,9 +60,8 @@
 #define OG_EXTERN_C_END CF_EXTERN_C_END
 #define OG_ASSUME_NONNULL_BEGIN CF_ASSUME_NONNULL_BEGIN
 #define OG_ASSUME_NONNULL_END CF_ASSUME_NONNULL_END
-// TODO
-//#define OG_IMPLICIT_BRIDGING_ENABLED CF_IMPLICIT_BRIDGING_ENABLED
-//#define OG_IMPLICIT_BRIDGING_DISABLED CF_IMPLICIT_BRIDGING_DISABLED
+#define OG_IMPLICIT_BRIDGING_ENABLED CF_IMPLICIT_BRIDGING_ENABLED
+#define OG_IMPLICIT_BRIDGING_DISABLED CF_IMPLICIT_BRIDGING_DISABLED
 #define OG_EXPORT CF_EXPORT
 #define OG_BRIDGED_TYPE CF_BRIDGED_TYPE
 

diff --git a/Sources/_OpenGraph/include/OGGraphDescription.h b/Sources/_OpenGraph/include/OGGraphDescription.h
@@ -0,0 +1 @@
+../Graph/OGGraphDescription.h
diff --git a/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionTests.swift b/Tests/OpenGraphCompatibilityTests/Graph/GraphDescriptionTests.swift
@@ -0,0 +1,14 @@
+//
+//  GraphDescriptionTests.swift
+//  OpenGraphCompatibilityTests
+
+import Testing
+
+#if canImport(Darwin)
+struct GraphDescriptionTests {
+    @Test
+    func format() {
+        #expect(OGGraph.descriptionFormat.takeUnretainedValue() as String == "format")
+    }
+}
+#endif