Merge branch 'OpenSwiftUIProject:main' into patch-2

Author: Dark-Existed

.codecov.yml

@@ -1,10 +1,14 @@
 codecov:
-  require_ci_to_pass: no
+  require_ci_to_pass: yes
 coverage:
   status:
     project:
       default:
         target: auto 
         threshold: 5
+    patch: off
+      # default:
+      #   target: auto 
+      #   threshold: 5
 ignore:
-  - Tests
+  - Tests

Package.resolved

@@ -147,6 +147,9 @@ let openGraphSPITarget = Target.target(
     name: "OpenGraph_SPI",
     cSettings: sharedCSettings + [
         .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
+    ],
+    linkerSettings: [
+        .linkedLibrary("z"),
     ]
 )
 let openGraphShimsTarget = Target.target(

Package.swift

@@ -71,3 +71,33 @@ extension Graph {
     @inlinable
     public static func setOutputValue<Value>(_ value: UnsafePointer<Value>)
 }
+
+#if canImport(Darwin)
+import Foundation
+#endif
+
+extension Graph {
+    public func archiveJSON(name: String?) {
+        #if canImport(Darwin)
+        let options: NSDictionary = [
+            Graph.descriptionFormat: "graph/dict",
+            Graph.descriptionIncludeValues: true,
+        ]
+        guard let description = Graph.description(self, options: options) as? [String: Any] else {
+            return
+        }
+        var name = name ?? "graph"
+        name.append(".ag-json")
+        let path = (NSTemporaryDirectory() as NSString).appendingPathComponent(name)
+        guard let data = try? JSONSerialization.data(withJSONObject: description, options: []) else {
+            return
+        }
+        let url = URL(fileURLWithPath: path)
+        do {
+            try data.write(to: url, options: [])
+            print("Wrote graph data to \"\(path)\".")
+        } catch {
+        }
+        #endif
+    }
+}

Sources/OpenGraph/Graph/Graph.swift

@@ -40,7 +40,7 @@ extension Metadata: Swift.Hashable, Swift.CustomStringConvertible {
     @inline(__always)
     public var description: String {
         #if canImport(ObjectiveC)
-        __OGTypeDescription(self).takeUnretainedValue() as NSString as String
+        __OGTypeDescription(self) as NSString as String
         #else
         fatalError("Unimplemented")
         #endif

Sources/OpenGraph/Runtime/Metadata.swift

@@ -9,11 +9,13 @@ import Foundation
 @_spi(Debug)
 extension Graph {
     public var dict: [String: Any]? {
-        let options = ["format": "graph/dict"] as NSDictionary
+        let options = [
+            Graph.descriptionFormat: Graph.descriptionFormatDictionary
+        ] as NSDictionary
         guard let description = Graph.description(nil, options: options) else {
             return nil
         }
-        guard let dictionary = description.takeUnretainedValue() as? NSDictionary else {
+        guard let dictionary = description as? NSDictionary else {
             return nil
         }
         return dictionary as? [String: Any]
@@ -25,12 +27,14 @@ extension Graph {
     // color:
     // - red: is_changed
     public var dot: String? {
-        let options = ["format": "graph/dot"] as NSDictionary
+        let options = [
+            Graph.descriptionFormat: Graph.descriptionFormatDot
+        ] as NSDictionary
         guard let description = Graph.description(self, options: options)
         else {
             return nil
         }
-        return description.takeUnretainedValue() as? String
+        return description as? String
     }
 }
 

Sources/OpenGraphShims/Graph+Debug.swift

@@ -22,7 +22,7 @@ class AttributeID final {
     enum class Kind: uint8_t {
         Direct = 0x0,
         Indirect = 0x1,
-        Nil = 0x2,
+        Null = 0x2,
     };
 private:
     uint32_t _rawValue;
@@ -59,8 +59,8 @@ class AttributeID final {
     }
 
     OG_INLINE OG_CONSTEXPR
-    const bool isNil() const OG_NOEXCEPT {
-        return getKind() == Kind::Nil;
+    const bool isNull() const OG_NOEXCEPT {
+        return getKind() == Kind::Null;
     }
 
     OG_INLINE OG_CONSTEXPR

Sources/OpenGraph_SPI/Attribute/AttributeID.hpp

@@ -11,7 +11,7 @@
 #include "../Util/assert.hpp"
 #include <optional>
 
-const OGAttribute OGAttributeNil = OGAttribute(OG::AttributeID::Kind::Nil);
+const OGAttribute OGAttributeNil = OGAttribute(OG::AttributeID::Kind::Null);
 
 OGAttribute OGGraphGetCurrentAttribute() {
     // TODO

Sources/OpenGraph_SPI/Attribute/OGAttribute.cpp

@@ -202,7 +202,7 @@
             NSString *command = dic[@"command"];
             if ([command isEqual:@"graph/description"]) {
                 NSMutableDictionary *mutableDic = [NSMutableDictionary dictionaryWithDictionary:dic];
-                mutableDic[(__bridge NSString *)OGDescriptionFormat] = @"graph/dict";
+                mutableDic[(__bridge NSString *)OGDescriptionFormat] = (__bridge NSString *)OGDescriptionFormatDictionary;
                 CFTypeRef description = OG::Graph::description(nullptr, mutableDic);
                 if (description) {
                     NSData *descriptionData = [NSJSONSerialization dataWithJSONObject:(__bridge id)description options:0 error:NULL];

Sources/OpenGraph_SPI/Debug/og-debug-server.mm

@@ -1,23 +1,22 @@
 //
 //  Graph.cpp
-//  
-//
-//  Created by Kyle on 2024/1/18.
-//
+//  OpenGraph_SPI
 
 #include "Graph.hpp"
 #include "Subgraph.hpp"
+#include "OGGraphDescription.h"
 
 #if !OG_TARGET_OS_WASI
 #include <dispatch/dispatch.h>
 #endif
+
 #include <pthread.h>
 
 pthread_key_t OG::Graph::_current_update_key;
 
 OG::Graph::Graph() OG_NOEXCEPT {
     // TODO
-    
+
     // libdispatch is not supported on WASI
     // Tracked via https://github.com/swiftwasm/swift/issues/5565
     #if !OG_TARGET_OS_WASI
@@ -27,7 +26,7 @@ OG::Graph::Graph() OG_NOEXCEPT {
         OG::Subgraph::make_current_subgraph_key();
     });
     #endif
-    
+
     // TODO
 }
 
@@ -48,10 +47,6 @@ void OG::Graph::stop_profiling() OG_NOEXCEPT {
     // TODO
 }
 
-void OG::Graph::write_to_file(const Graph * _Nullable, const char * _Nullable) OG_NOEXCEPT {
-    // TODO
-}
-
 const bool OG::Graph::thread_is_updating() const OG_NOEXCEPT {
     void *current = pthread_getspecific(current_key());
     if (!current) {