[HEAP-44118] Expose SourceInfo to Objective-C in Interfaces (#113)

Author: bnickel

HeapSwiftCoreInterfaces.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'HeapSwiftCoreInterfaces'
-  s.version = '0.1.2'
+  s.version = '0.3.0'
   s.license = { :type => 'MIT' }
   s.summary = 'ABI stable interface package for HeapSwiftCore.'
   s.homepage = 'https://heap.io'

HeapSwiftCoreInterfaces/HeapSwiftCoreInterfaces.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		EB79BE652A144E0600F9EEBD /* HeapProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB79BE5C2A144E0600F9EEBD /* HeapProtocol.swift */; };
 		EB79BE662A144E0600F9EEBD /* RuntimeBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB79BE5D2A144E0600F9EEBD /* RuntimeBridge.swift */; };
 		EB79BE672A144E0600F9EEBD /* Interaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB79BE5E2A144E0600F9EEBD /* Interaction.swift */; };
+		EBF245AB2A327A9600C8296D /* HeapObjcPropertyValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBF245AA2A327A9600C8296D /* HeapObjcPropertyValue.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -32,6 +33,7 @@
 		EB79BE5D2A144E0600F9EEBD /* RuntimeBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuntimeBridge.swift; sourceTree = "<group>"; };
 		EB79BE5E2A144E0600F9EEBD /* Interaction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Interaction.swift; sourceTree = "<group>"; };
 		EB79BE682A14508300F9EEBD /* HeapSwiftCoreInterfaces.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = HeapSwiftCoreInterfaces.modulemap; sourceTree = "<group>"; };
+		EBF245AA2A327A9600C8296D /* HeapObjcPropertyValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeapObjcPropertyValue.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -68,6 +70,7 @@
 				EB79BE4F2A144A4000F9EEBD /* HeapSwiftCoreInterfaces.h */,
 				EB79BE562A144E0600F9EEBD /* HeapLogger.swift */,
 				EB79BE5A2A144E0600F9EEBD /* HeapPropertyValue.swift */,
+				EBF245AA2A327A9600C8296D /* HeapObjcPropertyValue.swift */,
 				EB79BE5C2A144E0600F9EEBD /* HeapProtocol.swift */,
 				EB79BE5E2A144E0600F9EEBD /* Interaction.swift */,
 				EB79BE582A144E0600F9EEBD /* Option.swift */,
@@ -187,6 +190,7 @@
 				EB79BE642A144E0600F9EEBD /* Source.swift in Sources */,
 				EB79BE612A144E0600F9EEBD /* Option.swift in Sources */,
 				EB79BE602A144E0600F9EEBD /* Pageview.swift in Sources */,
+				EBF245AB2A327A9600C8296D /* HeapObjcPropertyValue.swift in Sources */,
 				EB79BE672A144E0600F9EEBD /* Interaction.swift in Sources */,
 				EB79BE632A144E0600F9EEBD /* HeapPropertyValue.swift in Sources */,
 				EB79BE662A144E0600F9EEBD /* RuntimeBridge.swift in Sources */,

HeapSwiftCoreInterfaces/HeapSwiftCoreInterfaces/HeapObjcPropertyValue.swift

@@ -0,0 +1,19 @@
+import Foundation
+
+@objc
+public protocol HeapObjcPropertyValue: NSObjectProtocol {
+    var heapValue: String { get }
+}
+
+extension NSString: HeapObjcPropertyValue, HeapPropertyValue {
+    public var heapValue: String { return self as String }
+}
+
+extension NSNumber: HeapObjcPropertyValue, HeapPropertyValue {
+    public var heapValue: String {
+        if CFGetTypeID(self) == CFBooleanGetTypeID() {
+            return self.boolValue ? "true" : "false"
+        }
+        return self.stringValue
+    }
+}

HeapSwiftCoreInterfaces/HeapSwiftCoreInterfaces/SourceInfo.swift

@@ -3,11 +3,17 @@ import Foundation
 @objc(HeapSourceInfo)
 public class SourceInfo: NSObject {
 
+    @objc
     public let name: String
+    
+    @objc
     public let version: String
+    
+    @objc
     public let platform: String
+    
     public let properties: [String: HeapPropertyValue]
-
+    
     public init(name: String, version: String, platform: String, properties: [String: HeapPropertyValue] = [:]) {
         self.name = name
         self.version = version
@@ -16,4 +22,20 @@ public class SourceInfo: NSObject {
     }
 }
 
-
+extension SourceInfo {
+    
+    @objc(sourceInfoWithName:version:platform:properties:)
+    public static func __sourceInfo(name: String, version: String, platform: String, properties: [String: HeapObjcPropertyValue]) -> SourceInfo {
+        .init(name: name, version: version, platform: platform, properties: properties.mapValues(\.heapValue))
+    }
+    
+    @objc(sourceInfoWithName:version:platform:)
+    public static func __sourceInfo(name: String, version: String, platform: String) -> SourceInfo {
+        .init(name: name, version: version, platform: platform)
+    }
+    
+    @objc(properties)
+    public var __objcProperties: [String: String] {
+        properties.mapValues(\.heapValue)
+    }
+}