Update metadata.cpp

Author: Kyle-Ye

Package.swift

@@ -22,14 +22,22 @@ func envEnable(_ key: String, default defaultValue: Bool = false) -> Bool {
 let isXcodeEnv = Context.environment["__CFBundleIdentifier"] == "com.apple.dt.Xcode"
 let development = envEnable("OPENGRAPH_DEVELOPMENT", default: false)
 
-let releaseVersion = Context.environment["OPENGRAPH_TARGET_RELEASE"].flatMap { Int($0) } ?? 2024
-
 let swiftBinPath = Context.environment["_"] ?? "/usr/bin/swift"
 let swiftBinURL = URL(fileURLWithPath: swiftBinPath)
 let SDKPath = swiftBinURL.deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent().path
 let includePath = SDKPath.appending("/usr/lib/swift")
 
-// MARK: - C/CXX Settings
+var sharedCSettings: [CSetting] = [
+    .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
+    .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
+]
+
+var sharedSwiftSettings: [SwiftSetting] = [
+    .enableUpcomingFeature("InternalImportsByDefault"),
+    .swiftLanguageMode(.v5),
+]
+
+// MARK: [env] OPENGRAPH_SWIFT_TOOLCHAIN_PATH
 
 // Modified from: https://github.com/swiftlang/swift/blob/main/SwiftCompilerSources/Package.swift
 //
@@ -44,15 +52,7 @@ let includePath = SDKPath.appending("/usr/lib/swift")
 //
 // where <$OPENGRAPH_SWIFT_TOOLCHAIN_PATH> is the parent directory of the swift repository.
 
-let swiftToolchainVersion = Context.environment["OPENGRAPH_SWIFT_TOOLCHAIN_VERSION"] ?? (development ? "6.0.2" : "")
 let swiftToolchainPath = Context.environment["OPENGRAPH_SWIFT_TOOLCHAIN_PATH"] ?? (development ? "/Volumes/BuildMachine/swift-project" : "")
-let swiftToolchainSupported = envEnable("OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED", default: !swiftToolchainVersion.isEmpty)
-
-var sharedCSettings: [CSetting] = [
-    .unsafeFlags(["-I", includePath], .when(platforms: .nonDarwinPlatforms)),
-    .define("__COREFOUNDATION_FORSWIFTFOUNDATIONONLY__", to: "1", .when(platforms: .nonDarwinPlatforms)),
-]
-
 if !swiftToolchainPath.isEmpty {
     sharedCSettings.append(
         .unsafeFlags(
@@ -74,38 +74,36 @@ if !swiftToolchainPath.isEmpty {
     )
 }
 
+// MARK: [env] OPENGRAPH_SWIFT_TOOLCHAIN_VERSION
+
+let swiftToolchainVersion = Context.environment["OPENGRAPH_SWIFT_TOOLCHAIN_VERSION"] ?? (development ? "6.0.2" : "")
 if !swiftToolchainVersion.isEmpty {
     sharedCSettings.append(
         .define("OPENGRAPH_SWIFT_TOOLCHAIN_VERSION", to: swiftToolchainVersion)
     )
 }
 
-if swiftToolchainSupported {
-    sharedCSettings.append(
-        .define("OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED")
-    )
-}
-
-// MARK: - Swift Settings
-
-var sharedSwiftSettings: [SwiftSetting] = [
-    .enableUpcomingFeature("InternalImportsByDefault"),
-    .define("OPENGRAPH_RELEASE_\(releaseVersion)"),
-    .swiftLanguageMode(.v5),
-]
+// MARK: - [env] OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
 
+let swiftToolchainSupported = envEnable("OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED", default: !swiftToolchainVersion.isEmpty)
 if swiftToolchainSupported {
-    sharedSwiftSettings.append(
-        .define("OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED")
-    )
+    sharedCSettings.append(.define("OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED"))
+    sharedSwiftSettings.append(.define("OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED"))
 }
 
+// MARK: - [env] OPENGRAPH_TARGET_RELEASE
+
+let releaseVersion = Context.environment["OPENGRAPH_TARGET_RELEASE"].flatMap { Int($0) } ?? 2024
+sharedCSettings.append(.define("OPENGRAPH_RELEASE", to: "\(releaseVersion)"))
+sharedSwiftSettings.append(.define("OPENGRAPH_RELEASE_\(releaseVersion)"))
 if releaseVersion >= 2021 {
     for year in 2021 ... releaseVersion {
         sharedSwiftSettings.append(.define("OPENGRAPH_SUPPORT_\(year)_API"))
     }
 }
 
+// MARK: - [env] OPENGRAPH_WERROR
+
 let warningsAsErrorsCondition = envEnable("OPENGRAPH_WERROR", default: isXcodeEnv && development)
 if warningsAsErrorsCondition {
     sharedSwiftSettings.append(.unsafeFlags(["-warnings-as-errors"]))

Sources/OpenGraph_SPI/Runtime/OGTypeID.cpp

@@ -1,9 +1,9 @@
 //
 //  OGTypeID.cpp
+//  OpenGraph_SPI
 //
-//
-//  Created by Kyle on 2024/1/7.
-//
+//  Audited for iOS 18.0
+//  Status: WIP
 
 #include "OGTypeID.h"
 #include "metadata.hpp"
@@ -14,23 +14,23 @@
 
 OGTypeKind OGTypeGetKind(OGTypeID typeID) {
     #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
-    const swift::Metadata *type = reinterpret_cast<const swift::Metadata *>(typeID);
-    switch (type->getKind()) {
-        case swift::MetadataKind::Class:
+    OG::swift::metadata const *metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
+    switch (metadata->getKind()) {
+        case swift::MetadataKind::Class: // 0x0
             return OGTypeKindClass;
-        case swift::MetadataKind::Struct:
+        case swift::MetadataKind::Struct: // 0x200
             return OGTypeKindStruct;
-        case swift::MetadataKind::Enum:
+        case swift::MetadataKind::Enum: // 0x201
             return OGTypeKindEnum;
-        case swift::MetadataKind::Optional:
+        case swift::MetadataKind::Optional: // 0x202
             return OGTypeKindOptional;
-        case swift::MetadataKind::Tuple:
+        case swift::MetadataKind::Tuple: // 0x301
             return OGTypeKindTuple;
-        case swift::MetadataKind::Function:
+        case swift::MetadataKind::Function: // 0x302
             return OGTypeKindFunction;
-        case swift::MetadataKind::Existential:
+        case swift::MetadataKind::Existential: // 0x303
             return OGTypeKindExistential;
-        case swift::MetadataKind::Metatype:
+        case swift::MetadataKind::Metatype: // 0x304
             return OGTypeKindMetatype;
         default:
             return OGTypeKindNone;
@@ -40,15 +40,46 @@ OGTypeKind OGTypeGetKind(OGTypeID typeID) {
     #endif
 }
 
-CFStringRef OGTypeDescription(OGTypeID id) {
+#if OPENGRAPH_RELEASE >= 2024
+
+void const* OGTypeGetSignature(OGTypeID typeID) {
+    #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+    OG::swift::metadata const *metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
+    // TODO
+    return nullptr;
+    #else
+    return nullptr;
+    #endif
+}
+void const* OGTypeGetDescriptor(OGTypeID typeID) {
+    #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+    OG::swift::metadata const *metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
+    return metadata->descriptor();
+    #else
+    return nullptr;
+    #endif
+}
+
+#endif /* OPENGRAPH_RELEASE */
+
+CFStringRef OGTypeDescription(OGTypeID typeID) {
     CFMutableStringRef ref = CFStringCreateMutable(CFAllocatorGetDefault(), 0);
     #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
-    OG::swift::metadata const *metadata = reinterpret_cast<OG::swift::metadata const*>(id);
+    OG::swift::metadata const *metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
     metadata->append_description(ref);
     #endif
     return ref;
 }
 
-const void * OGTypeNominalDescriptor(OGTypeID typeID) {
+void const* OGTypeNominalDescriptor(OGTypeID typeID) {
+    #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
+    OG::swift::metadata const *metadata = reinterpret_cast<OG::swift::metadata const*>(typeID);
+    return metadata->nominal_descriptor();
+    #else
     return nullptr;
+    #endif
+}
+
+CFStringRef OGTypeNominalDescriptorName(OGTypeID typeID) {
+    // TODO
 }

Sources/OpenGraph_SPI/Runtime/OGTypeID.h

@@ -27,19 +27,35 @@ typedef OG_ENUM(uint32_t, OGTypeKind) {
     OGTypeKindFunction,
     OGTypeKindExistential,
     OGTypeKindMetatype,
-};
+} OG_SWIFT_NAME(Metadata.Kind);
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-OGTypeKind OGTypeGetKind(OGTypeID typeID) OG_SWIFT_NAME(getter:OGTypeID.kind(self:));
+OGTypeKind OGTypeGetKind(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.kind(self:));
+
+#if OPENGRAPH_RELEASE >= 2024
+
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+void const* OGTypeGetSignature(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.signature(self:));
+
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+void const* OGTypeGetDescriptor(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.descriptor(self:));
+
+#endif /* OPENGRAPH_RELEASE */
+
+OG_EXPORT
+OG_REFINED_FOR_SWIFT
+CFStringRef OGTypeDescription(OGTypeID typeID);
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-CFStringRef OGTypeDescription(OGTypeID type);
+void const* OGTypeNominalDescriptor(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.nominalDescriptor(self:));
 
 OG_EXPORT
 OG_REFINED_FOR_SWIFT
-const void * OGTypeNominalDescriptor(OGTypeID typeID) OG_SWIFT_NAME(getter:OGTypeID.nominalDescriptor(self:));
+CFStringRef OGTypeNominalDescriptorName(OGTypeID typeID) OG_SWIFT_NAME(getter:Metadata.nominalDescriptorName(self:));
 
 OG_EXTERN_C_END
 

Sources/OpenGraph_SPI/Runtime/metadata.cpp

@@ -11,6 +11,21 @@
 
 using OG::swift::metadata;
 
+void const* metadata::descriptor() const OG_NOEXCEPT {
+    // TODO
+    return nullptr;
+}
+
+void const* metadata::nominal_descriptor() const OG_NOEXCEPT {
+    void const* descriptor = this->descriptor();
+    if (descriptor == nullptr) {
+        return nullptr;
+    }
+    // TODO
+    return nullptr;
+}
+
+
 void metadata::append_description(CFMutableStringRef description) const OG_NOEXCEPT {
     // TODO
 }

Sources/OpenGraph_SPI/Runtime/metadata.hpp

@@ -19,6 +19,9 @@ namespace swift {
 #ifdef OPENGRAPH_SWIFT_TOOLCHAIN_SUPPORTED
 class metadata: public ::swift::Metadata {
 public:
+    void const* descriptor() const OG_NOEXCEPT;
+    void const* nominal_descriptor() const OG_NOEXCEPT;
+    
     void append_description(CFMutableStringRef description) const OG_NOEXCEPT;
 }; /* OG::swift::metadata */
 #else