Update OGComparisionMode (#10)

* Update OGComparisionMode to fix __C issue * Add compareValues and update test
OpenSwiftUIProject · Dec 20, 2023 · cb8da29 · cb8da29
1 parent ef985c1
commit cb8da29
Show file tree

Hide file tree

Showing 30 changed files with 460 additions and 46 deletions.
diff --git a/Package.swift b/Package.swift
@@ -20,7 +20,7 @@ let openSwiftUITarget = Target.target(
     ],
     swiftSettings: [
         .enableExperimentalFeature("AccessLevelOnImport"),
-        .define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS")
+        .define("OPENSWIFTUI_SUPPRESS_DEPRECATED_WARNINGS"),
     ],
     linkerSettings: [
         .unsafeFlags(
@@ -80,17 +80,42 @@ let package = Package(
     ]
 )
 
+// FIXME: The binary of AG for macOS is copied from dyld shared cache and it will cause a link error when running. Use iOS Simulator to run this target as a temporary workaround
+let graphCompatibilityTest = ProcessInfo.processInfo.environment["OPENGRAPH_COMPATIBILITY_TEST"] != nil
+let openGraphCompatibilityTestTarget = Target.testTarget(
+    name: "OpenGraphCompatibilityTests",
+    dependencies: [
+        graphCompatibilityTest ? "AttributeGraph" : "OpenGraph",
+    ],
+    exclude: ["README.md"],
+    swiftSettings: graphCompatibilityTest ? [
+        .define("OPENGRAPH_COMPATIBILITY_TEST")
+    ] : []
+)
+package.targets.append(openGraphCompatibilityTestTarget)
+
 let useAG = ProcessInfo.processInfo.environment["OPENSWIFTUI_USE_AG"] != nil
 if useAG {
+    if !graphCompatibilityTest {
+        let targets: [Target] = [
+            // FIXME: Merge into one target
+            // OpenGraph is a C++ & Swift mix target.
+            // The SwiftPM support for such usage is still in progress.
+            .target(
+                name: "_OpenGraph",
+                dependencies: [.product(name: "OpenFoundation", package: "OpenFoundation")],
+                cSettings: [clangEnumFixSetting]
+            ),
+            .target(
+                name: "OpenGraph",
+                dependencies: ["_OpenGraph"],
+                cSettings: [clangEnumFixSetting]
+            ),
+        ]
+        package.targets.append(contentsOf: targets)
+    }
     let targets: [Target] = [
         .binaryTarget(name: "AttributeGraph", path: "Sources/AttributeGraph.xcframework"),
-        // FIXME: The binary of AG for macOS is copied from dyld shared cache and it will cause a link error when running. Use iOS Simulator to run this target as a temporary workaround
-        .testTarget(
-            name: "AttributeGraphTests",
-            dependencies: [
-                "AttributeGraph",
-            ]
-        ),
     ]
     package.targets.append(contentsOf: targets)
     openSwiftUITarget.dependencies.append(
@@ -100,6 +125,12 @@ if useAG {
     swiftSettings.append(.define("OPENSWIFTUI_USE_AG"))
     openSwiftUITarget.swiftSettings = swiftSettings
 } else {
+    if graphCompatibilityTest {
+        let targets: [Target] = [
+            .binaryTarget(name: "AttributeGraph", path: "Sources/AttributeGraph.xcframework"),
+        ]
+        package.targets.append(contentsOf: targets)
+    }
     package.products.append(
         .library(name: "OpenGraph", targets: ["OpenGraph", "_OpenGraph"])
     )

diff --git a/...xcframework/ios-arm64_x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h b/...xcframework/ios-arm64_x86_64-simulator/AttributeGraph.framework/Headers/AGCompareValues.h
@@ -0,0 +1,20 @@
+//
+//  AGCompareValues.h
+//  
+//
+//  Created by Kyle on 2023/10/9.
+//
+
+#ifndef AGCompareValues_h
+#define AGCompareValues_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include "AGComparisonMode.h"
+#include <stdbool.h>
+
+CF_EXTERN_C_BEGIN
+CF_EXPORT
+bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
+CF_EXTERN_C_END
+
+#endif /* AGCompareValues_h */
diff --git a/...cframework/ios-arm64_x86_64-simulator/AttributeGraph.framework/Headers/AGComparisonMode.h b/...cframework/ios-arm64_x86_64-simulator/AttributeGraph.framework/Headers/AGComparisonMode.h
@@ -0,0 +1,21 @@
+//
+//  AGComparisonMode.hpp
+//
+//
+//  Created by Kyle on 2023/12/20.
+//
+
+#ifndef AGComparisonMode_h
+#define AGComparisonMode_h
+
+#include <CoreFoundation/CoreFoundation.h>
+
+typedef CF_OPTIONS(uint32_t, AGComparisonMode) {
+    AGComparisonMode_0 = 0,
+    AGComparisonMode_1 = 1 << 0,
+    AGComparisonMode_2 = 1 << 1,
+    AGComparisonMode_3 = AGComparisonMode_1 | AGComparisonMode_2,
+};
+
+#endif /* AGComparisonMode_h */
+
diff --git a/...raph.xcframework/ios-arm64_x86_64-simulator/AttributeGraph.framework/Headers/AGUniqueID.h b/...raph.xcframework/ios-arm64_x86_64-simulator/AttributeGraph.framework/Headers/AGUniqueID.h
@@ -1,12 +1,12 @@
 //
-//  AGMakeUniqueID.hpp
+//  AGUniqueID.h
 //  
 //
 //  Created by Kyle on 2023/10/9.
 //
 
-#ifndef AGMakeUniqueID_hpp
-#define AGMakeUniqueID_hpp
+#ifndef AGUniqueID_h
+#define AGUniqueID_h
 
 #include <CoreFoundation/CoreFoundation.h>
 typedef long long AGUniqueID;
@@ -16,4 +16,4 @@ CF_EXPORT
 AGUniqueID AGMakeUniqueID(void);
 CF_EXTERN_C_END
 
-#endif /* AGMakeUniqueID_hpp */
+#endif /* AGUniqueID_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
@@ -12,6 +12,8 @@
 
 #import "AGAttribute.h"
 #import "AGUniqueID.h"
+#import "AGComparisonMode.h"
+#import "AGCompareValues.h"
 
 FOUNDATION_EXPORT double AGAttributeVersionNumber;
 FOUNDATION_EXPORT const unsigned char AGAttributeVersionString[];

diff --git a/...aph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/...aph.framework/Modules/AttributeGraph.swiftmodule/arm64-apple-ios-simulator.swiftinterface
@@ -43,13 +43,15 @@ public protocol _AttributeBody {
   static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   static var _hasDestroySelf: Swift.Bool { get }
   static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  static var comparisonMode: AGComparisonMode { get }
 }
 extension AttributeGraph._AttributeBody {
   public static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   public static var _hasDestroySelf: Swift.Bool {
     get
   }
   public static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  public static var comparisonMode: AGComparisonMode { get }
 }
 public protocol Rule : AttributeGraph._AttributeBody {
   associatedtype Value
@@ -61,3 +63,4 @@ extension AttributeGraph.Rule {
     get
   }
 }
+public func compareValues<A>(_ lhs: A, _ rhs: A, mode: AGComparisonMode = ._3) -> Swift.Bool
diff --git a/...ph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/...ph.framework/Modules/AttributeGraph.swiftmodule/x86_64-apple-ios-simulator.swiftinterface
@@ -43,13 +43,15 @@ public protocol _AttributeBody {
   static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   static var _hasDestroySelf: Swift.Bool { get }
   static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  static var comparisonMode: AGComparisonMode { get }
 }
 extension AttributeGraph._AttributeBody {
   public static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   public static var _hasDestroySelf: Swift.Bool {
     get
   }
   public static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  public static var comparisonMode: AGComparisonMode { get }
 }
 public protocol Rule : AttributeGraph._AttributeBody {
   associatedtype Value
@@ -61,3 +63,4 @@ extension AttributeGraph.Rule {
     get
   }
 }
+public func compareValues<A>(_ lhs: A, _ rhs: A, mode: AGComparisonMode = ._3) -> Swift.Bool
diff --git a/.../AttributeGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h b/.../AttributeGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h
@@ -0,0 +1,20 @@
+//
+//  AGCompareValues.h
+//  
+//
+//  Created by Kyle on 2023/10/9.
+//
+
+#ifndef AGCompareValues_h
+#define AGCompareValues_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include "AGComparisonMode.h"
+#include <stdbool.h>
+
+CF_EXTERN_C_BEGIN
+CF_EXPORT
+bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
+CF_EXTERN_C_END
+
+#endif /* AGCompareValues_h */
diff --git a/...AttributeGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AGComparisonMode.h b/...AttributeGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AGComparisonMode.h
@@ -0,0 +1,21 @@
+//
+//  AGComparisonMode.hpp
+//
+//
+//  Created by Kyle on 2023/12/20.
+//
+
+#ifndef AGComparisonMode_h
+#define AGComparisonMode_h
+
+#include <CoreFoundation/CoreFoundation.h>
+
+typedef CF_OPTIONS(uint32_t, AGComparisonMode) {
+    AGComparisonMode_0 = 0,
+    AGComparisonMode_1 = 1 << 0,
+    AGComparisonMode_2 = 1 << 1,
+    AGComparisonMode_3 = AGComparisonMode_1 | AGComparisonMode_2,
+};
+
+#endif /* AGComparisonMode_h */
+
diff --git a/Sources/AttributeGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AGUniqueID.h b/Sources/AttributeGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AGUniqueID.h
@@ -1,12 +1,12 @@
 //
-//  AGMakeUniqueID.hpp
+//  AGUniqueID.h
 //  
 //
 //  Created by Kyle on 2023/10/9.
 //
 
-#ifndef AGMakeUniqueID_hpp
-#define AGMakeUniqueID_hpp
+#ifndef AGUniqueID_h
+#define AGUniqueID_h
 
 #include <CoreFoundation/CoreFoundation.h>
 typedef long long AGUniqueID;
@@ -16,4 +16,4 @@ CF_EXPORT
 AGUniqueID AGMakeUniqueID(void);
 CF_EXTERN_C_END
 
-#endif /* AGMakeUniqueID_hpp */
+#endif /* AGUniqueID_h */
diff --git a/...teGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h b/...teGraph.xcframework/ios-arm64e/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h
@@ -12,6 +12,8 @@
 
 #import "AGAttribute.h"
 #import "AGUniqueID.h"
+#import "AGComparisonMode.h"
+#import "AGCompareValues.h"
 
 FOUNDATION_EXPORT double AGAttributeVersionNumber;
 FOUNDATION_EXPORT const unsigned char AGAttributeVersionString[];

diff --git a/...tributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-ios.swiftinterface b/...tributeGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-ios.swiftinterface
@@ -43,13 +43,15 @@ public protocol _AttributeBody {
   static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   static var _hasDestroySelf: Swift.Bool { get }
   static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  static var comparisonMode: AGComparisonMode { get }
 }
 extension AttributeGraph._AttributeBody {
   public static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   public static var _hasDestroySelf: Swift.Bool {
     get
   }
   public static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  public static var comparisonMode: AGComparisonMode { get }
 }
 public protocol Rule : AttributeGraph._AttributeBody {
   associatedtype Value
@@ -61,3 +63,4 @@ extension AttributeGraph.Rule {
     get
   }
 }
+public func compareValues<A>(_ lhs: A, _ rhs: A, mode: AGComparisonMode = ._3) -> Swift.Bool
diff --git a/...ttributeGraph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h b/...ttributeGraph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AGCompareValues.h
@@ -0,0 +1,20 @@
+//
+//  AGCompareValues.h
+//  
+//
+//  Created by Kyle on 2023/10/9.
+//
+
+#ifndef AGCompareValues_h
+#define AGCompareValues_h
+
+#include <CoreFoundation/CoreFoundation.h>
+#include "AGComparisonMode.h"
+#include <stdbool.h>
+
+CF_EXTERN_C_BEGIN
+CF_EXPORT
+bool AGCompareValues(const void *lhs, const void *rhs, const AGComparisonMode comparisonMode, const void *type);
+CF_EXTERN_C_END
+
+#endif /* AGCompareValues_h */
diff --git a/...tributeGraph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AGComparisonMode.h b/...tributeGraph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AGComparisonMode.h
@@ -0,0 +1,21 @@
+//
+//  AGComparisonMode.hpp
+//
+//
+//  Created by Kyle on 2023/12/20.
+//
+
+#ifndef AGComparisonMode_h
+#define AGComparisonMode_h
+
+#include <CoreFoundation/CoreFoundation.h>
+
+typedef CF_OPTIONS(uint32_t, AGComparisonMode) {
+    AGComparisonMode_0 = 0,
+    AGComparisonMode_1 = 1 << 0,
+    AGComparisonMode_2 = 1 << 1,
+    AGComparisonMode_3 = AGComparisonMode_1 | AGComparisonMode_2,
+};
+
+#endif /* AGComparisonMode_h */
+
diff --git a/...ces/AttributeGraph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AGUniqueID.h b/...ces/AttributeGraph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AGUniqueID.h
@@ -1,12 +1,12 @@
 //
-//  AGMakeUniqueID.hpp
+//  AGUniqueID.h
 //  
 //
 //  Created by Kyle on 2023/10/9.
 //
 
-#ifndef AGMakeUniqueID_hpp
-#define AGMakeUniqueID_hpp
+#ifndef AGUniqueID_h
+#define AGUniqueID_h
 
 #include <CoreFoundation/CoreFoundation.h>
 typedef long long AGUniqueID;
@@ -16,4 +16,4 @@ CF_EXPORT
 AGUniqueID AGMakeUniqueID(void);
 CF_EXTERN_C_END
 
-#endif /* AGMakeUniqueID_hpp */
+#endif /* AGUniqueID_h */
diff --git a/...Graph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h b/...Graph.xcframework/macos-arm64e/AttributeGraph.framework/Headers/AttributeGraph-umbrella.h
@@ -12,6 +12,8 @@
 
 #import "AGAttribute.h"
 #import "AGUniqueID.h"
+#import "AGComparisonMode.h"
+#import "AGCompareValues.h"
 
 FOUNDATION_EXPORT double AGAttributeVersionNumber;
 FOUNDATION_EXPORT const unsigned char AGAttributeVersionString[];

diff --git a/...ibuteGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-macos.swiftinterface b/...ibuteGraph.framework/Modules/AttributeGraph.swiftmodule/arm64e-apple-macos.swiftinterface
@@ -43,13 +43,15 @@ public protocol _AttributeBody {
   static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   static var _hasDestroySelf: Swift.Bool { get }
   static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  static var comparisonMode: AGComparisonMode { get }
 }
 extension AttributeGraph._AttributeBody {
   public static func _destroySelf(_ value: Swift.UnsafeMutableRawPointer)
   public static var _hasDestroySelf: Swift.Bool {
     get
   }
   public static func _updateDefault(_ value: Swift.UnsafeMutableRawPointer)
+  public static var comparisonMode: AGComparisonMode { get }
 }
 public protocol Rule : AttributeGraph._AttributeBody {
   associatedtype Value
@@ -61,3 +63,4 @@ extension AttributeGraph.Rule {
     get
   }
 }
+public func compareValues<A>(_ lhs: A, _ rhs: A, mode: AGComparisonMode = ._3) -> Swift.Bool
diff --git a/Sources/OpenGraph/TODO/OGComparisonMode.swift b/Sources/OpenGraph/TODO/OGComparisonMode.swift