Update OGTypeID

Author: Kyle-Ye

Package.resolved

@@ -196,14 +196,14 @@ void OGSubgraphSetShouldRecordTree() {
 void OGSubgraphBeginTreeElement(OGAttribute attribute, OGTypeID type, uint32_t flags) {
     OG::Subgraph * subgraph = OG::Subgraph::get_current();
     if (subgraph) {
-        subgraph->begin_tree(attribute, type, flags);
+        subgraph->begin_tree(attribute, reinterpret_cast<OG::swift::metadata const*>(type), flags);
     }
 }
 
 void OGSubgraphAddTreeValue(OGAttribute attribute, OGTypeID type, const char * key, uint32_t flags) {
     OG::Subgraph * subgraph = OG::Subgraph::get_current();
     if (subgraph) {
-        subgraph->add_tree_value(attribute, type, key, flags);
+        subgraph->add_tree_value(attribute, reinterpret_cast<OG::swift::metadata const*>(type), key, flags);
     }
 }
 

Sources/OpenGraph_SPI/Graph/OGSubgraph.cpp

@@ -1,6 +1,7 @@
 //
 //  OGSwiftMetadata.h
 //  OpenGraph_SPI
+//  
 
 #ifndef OGSwiftMetadata_h
 #define OGSwiftMetadata_h

Sources/OpenGraph_SPI/Runtime/OGSwiftMetadata.h

@@ -6,6 +6,7 @@
 //
 
 #include "OGTypeID.h"
+#include "metadata.hpp"
 
 #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
 #include <swift/Runtime/Metadata.h>
@@ -39,6 +40,15 @@ OGTypeKind OGTypeGetKind(OGTypeID typeID) {
     #endif
 }
 
+CFStringRef OGTypeDescription(OGTypeID id) {
+    CFMutableStringRef ref = CFStringCreateMutable(CFAllocatorGetDefault(), 0);
+    #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+    OG::swift::metadata const *metadata = reinterpret_cast<OG::swift::metadata const*>(id);
+    metadata->append_description(ref);
+    #endif
+    return ref;
+}
+
 const void * OGTypeNominalDescriptor(OGTypeID typeID) {
     return nullptr;
 }

Sources/OpenGraph_SPI/Runtime/OGTypeDescription.cpp

@@ -1,29 +1,48 @@
 //
 //  OGTypeID.h
+//  OpenGraph_SPI
 //
-//
-//  Created by Kyle on 2024/1/8.
-//
+//  Audited for iOS 18.0
+//  Status: WIP
 
 #ifndef OGTypeID_h
 #define OGTypeID_h
 
 #include "OGBase.h"
 #include "OGSwiftMetadata.h"
-#include "OGTypeKind.h"
 
-typedef const OGSwiftMetadata *OGTypeID OG_SWIFT_STRUCT OG_SWIFT_NAME(Metadata);
+OG_ASSUME_NONNULL_BEGIN
 
 OG_EXTERN_C_BEGIN
 
+typedef const OGSwiftMetadata *OGTypeID OG_SWIFT_STRUCT OG_SWIFT_NAME(Metadata);
+
+typedef OG_ENUM(uint32_t, OGTypeKind) {
+    OGTypeKindNone,
+    OGTypeKindClass,
+    OGTypeKindStruct,
+    OGTypeKindEnum,
+    OGTypeKindOptional,
+    OGTypeKindTuple,
+    OGTypeKindFunction,
+    OGTypeKindExistential,
+    OGTypeKindMetatype,
+};
+
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
 OGTypeKind OGTypeGetKind(OGTypeID typeID) OG_SWIFT_NAME(getter:OGTypeID.kind(self:));
 
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+CFStringRef OGTypeDescription(OGTypeID type);
+
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
 const void * OGTypeNominalDescriptor(OGTypeID typeID) OG_SWIFT_NAME(getter:OGTypeID.nominalDescriptor(self:));
 
 OG_EXTERN_C_END
 
+OG_ASSUME_NONNULL_END
+
 #endif /* OGTypeID_h */

Sources/OpenGraph_SPI/Runtime/OGTypeDescription.h

@@ -1,8 +1,18 @@
 //
 //  metadata.cpp
-//  
-//
-//  Created by Kyle on 2024/4/4.
+//  OpenGraph_SPI
 //
+//  Audited for iOS 18.0
+//  Status: WIP
 
 #include "metadata.hpp"
+
+#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+
+using OG::swift::metadata;
+
+void metadata::append_description(CFMutableStringRef description) const OG_NOEXCEPT {
+    // TODO
+}
+
+#endif /* OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED */

Sources/OpenGraph_SPI/Runtime/OGTypeID.cpp

@@ -1,19 +1,30 @@
 //
 //  metadata.hpp
-//  
-//
-//  Created by Kyle on 2024/4/4.
+//  OpenGraph_SPI
 //
+//  Audited for iOS 18.0
+//  Status: WIP
 
 #ifndef metadata_hpp
 #define metadata_hpp
 
 #include "OGBase.h"
-#include "OGSwiftMetadata.h"
+
+#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+#include <swift/Runtime/Metadata.h>
+#endif
 
 namespace OG {
 namespace swift {
-using metadata = OGSwiftMetadata; // FIXME: swift::Metadata
-}
-}
+#ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+class metadata: public ::swift::Metadata {
+public:
+    void append_description(CFMutableStringRef description) const OG_NOEXCEPT;
+}; /* OG::swift::metadata */
+#else
+class metadata {};
+#endif /* OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED */
+} /* OG::swift */
+} /* OG */
+
 #endif /* metadata_hpp */