Merge branch 'master' into muzahidul-opti-patch-2

Author: muzahidul-opti

.github/workflows/integration_tests.yml

@@ -5,9 +5,6 @@ on:
     secrets:
       CI_USER_TOKEN:
         required: true
-      TRAVIS_COM_TOKEN:
-        required: true
-
 jobs:
   integration_tests:
     runs-on: ubuntu-latest
@@ -16,8 +13,8 @@ jobs:
       with:
         # You should create a personal access token and store it in your repository
         token: ${{ secrets.CI_USER_TOKEN }}
-        repository: 'optimizely/travisci-tools'
-        path: 'home/runner/travisci-tools'
+        repository: 'optimizely/ci-helper-tools'
+        path: 'home/runner/ci-helper-tools'
         ref: 'master'
     - name: set SDK Branch if PR
       env: 
@@ -31,7 +28,6 @@ jobs:
       if: ${{ github.event_name != 'pull_request' }}
       run: |
         echo "SDK_BRANCH=$REF_NAME" >> $GITHUB_ENV
-        echo "TRAVIS_BRANCH=$REF_NAME" >> $GITHUB_ENV
     - name: Trigger build
       env:
         SDK: swift
@@ -41,14 +37,12 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
         EVENT_TYPE: ${{ github.event_name }}
         GITHUB_CONTEXT: ${{ toJson(github) }}
-        #REPO_SLUG: ${{ github.repository }}
         PULL_REQUEST_SLUG: ${{ github.repository }}
         UPSTREAM_REPO: ${{ github.repository }}
         PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}
         PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
         UPSTREAM_SHA: ${{ github.sha }}
-        TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
         EVENT_MESSAGE: ${{ github.event.message }}
         HOME: 'home/runner'
       run: |
-        home/runner/travisci-tools/trigger-script-with-status-update.sh
+        home/runner/ci-helper-tools/trigger-script-with-status-update.sh

.github/workflows/swift.yml

@@ -17,7 +17,7 @@ on:
         description: release
 
 env:
-  VERSION: 5.0.0
+  VERSION: 5.1.0
 
 jobs:
 
@@ -29,7 +29,6 @@ jobs:
     uses: optimizely/swift-sdk/.github/workflows/integration_tests.yml@master
     secrets:
       CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
-      TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
 
   lint: 
     runs-on: macos-13

.github/workflows/unit_tests.yml

@@ -19,27 +19,27 @@ jobs:
         # - see "https://github.com/actions/runner-images/blob/main/images/macos/macos-11-Readme.md" for installed macOS, xcode and simulator versions.
         include:
           - os: 16.1
-            device: "iPhone 12"
+            device: "iPhone 14"
             scheme: "OptimizelySwiftSDK-iOS"
             test_sdk: "iphonesimulator"
             platform: "iOS Simulator"
             os_type: "iOS"
             simulator_xcode_version: 14.1
-          - os: 15.5
-            device: "iPhone 12"
+          - os: 16.2
+            device: "iPhone 14"
             scheme: "OptimizelySwiftSDK-iOS"
             test_sdk: "iphonesimulator"
             platform: "iOS Simulator"
             os_type: "iOS"
-            simulator_xcode_version: 13.4.1
-          - os: 15.5
+            simulator_xcode_version: 14.2
+          - os: 16.4
             # good to have tests with older OS versions, but it looks like this is min OS+xcode versions supported by github actions
-            device: "iPad Air (4th generation)"
+            device: "iPad Air (5th generation)"
             scheme: "OptimizelySwiftSDK-iOS"
             test_sdk: "iphonesimulator"
             platform: "iOS Simulator"
             os_type: "iOS"
-            simulator_xcode_version: 13.4.1
+            simulator_xcode_version: 14.3.1
           - os: 16.1
             device: "Apple TV"
             scheme: "OptimizelySwiftSDK-tvOS"
@@ -85,7 +85,7 @@ jobs:
           # - to find pre-installed xcode version, run this:
           ##ls /Applications/
           # - to find supported simulator os versions, run this (and find simulator with non-error "datapath")
-          ##xcrun simctl list --json devices
+          # xcrun simctl list --json devices
 
           # switch to the target xcode version
           sudo xcode-select -switch /Applications/Xcode_$SIMULATOR_XCODE_VERSION.app

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Optimizely Swift SDK Changelog
 
+## 5.1.0
+February 4th, 2025
+
+### Functionality Enhancement
+* Add support for nested event tags ([#570](https://github.com/optimizely/swift-sdk/pull/570)).
+
 ## 5.0.0
 November 25th, 2024
 

OptimizelySwiftSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                    = "OptimizelySwiftSDK"
   s.module_name	            = "Optimizely"
-  s.version                 = "5.0.0"
+  s.version                 = "5.1.0"
   s.summary                 = "Optimizely experiment framework for iOS/tvOS/watchOS"
   s.homepage                = "https://docs.developers.optimizely.com/experimentation/v4.0.0-full-stack/docs"
   s.license                 = { :type => "Apache License, Version 2.0", :file => "LICENSE" }

README.md

@@ -39,7 +39,7 @@ If you have a name conflict with other swift packages when you add the Optimizel
 #### CocoaPods 
 1. Add the following lines to the _Podfile_:<pre>
 ```use_frameworks!```
-```pod 'OptimizelySwiftSDK', '~> 5.0.0'```
+```pod 'OptimizelySwiftSDK', '~> 5.1.0'```
 </pre>
 
 2. Run the following command: <pre>``` pod install ```</pre>
@@ -130,5 +130,4 @@ Used to enforce Swift style and conventions.
 
 - React - https://github.com/optimizely/react-sdk
 
-- Ruby - https://github.com/optimizely/ruby-sdk
-- 
+- Ruby - https://github.com/optimizely/ruby-sdk

Sources/Data Model/Audience/AttributeValue.swift

@@ -17,11 +17,15 @@
 import Foundation
 
 enum AttributeValue: Codable, Equatable, CustomStringConvertible {
+    typealias AttrArray = Array<AttributeValue>
+    typealias AttrDictionary = [String : AttributeValue]
+    
     case string(String)
     case int(Int64)         // supported value range [-2^53, 2^53]
     case double(Double)
     case bool(Bool)
-    // not defined in datafile schema, but required for forward compatiblity (see Nikhil's doc)
+    case array(AttrArray)
+    case dictionary(AttrDictionary)
     case others
 
     var description: String {
@@ -34,6 +38,10 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             return "int(\(value))"
         case .bool(let value):
             return "bool(\(value))"
+        case .array(let value):
+            return "array(\(value))"
+        case .dictionary(let value):
+            return "dictionary(\(value))"
         case .others:
             return "others"
         }
@@ -63,6 +71,18 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             self = .bool(boolValue)
             return
         }
+        
+        if let arrValue = value as? [Any] {
+            let attr = arrValue.compactMap { AttributeValue(value: $0) }
+            self = .array(attr)
+            return
+        }
+        
+        if let dicValue = value as? [String : Any] {
+            let attr = dicValue.compactMapValues { AttributeValue(value: $0) }
+            self = .dictionary(attr)
+            return
+        }
 
         return nil
     }
@@ -87,7 +107,18 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             return
         }
 
-        // accept all other types (null, {}, []) for forward compatibility support
+        if let value = try? container.decode(AttrArray.self) {
+            self = .array(value)
+            return
+        }
+        
+        if let value = try? container.decode(AttrDictionary.self) {
+            self = .dictionary(value)
+            return
+        }
+        
+        
+        // accept all other types (null) for forward compatibility support
         self = .others
     }
 
@@ -103,6 +134,10 @@ enum AttributeValue: Codable, Equatable, CustomStringConvertible {
             try container.encode(value)
         case .bool(let value):
             try container.encode(value)
+        case .array(let value):
+            try container.encode(value)
+        case .dictionary(let value):
+            try container.encode(value.mapValues { $0 })
         case .others:
             return
         }
@@ -135,6 +170,14 @@ extension AttributeValue {
             return true
         }
 
+        if case .array(let selfArr) = self, case .array(let targetArr) = targetValue {
+            return selfArr == targetArr
+        }
+        
+        if case .dictionary(let selfDict) = self, case .dictionary(let targetDict) = targetValue {
+            return selfDict == targetDict
+        }
+        
         return false
     }
 
@@ -227,6 +270,10 @@ extension AttributeValue {
             return String(value)
         case .bool(let value):
             return String(value)
+        case .array(let value):
+            return String(describing: value)
+        case .dictionary(let value):
+            return String(describing: value)
         case .others:
             return "UNKNOWN"
         }
@@ -240,6 +287,8 @@ extension AttributeValue {
         case (.double, .int): return true
         case (.double, .double): return true
         case (.bool, .bool): return true
+        case (.array, .array): return true
+        case (.dictionary, .dictionary): return true
         default: return false
         }
     }
@@ -271,6 +320,8 @@ extension AttributeValue {
         case (.int): return true
         case (.double): return true
         case (.bool): return true
+        case (.array): return true
+        case (.dictionary): return true
         default: return false
         }
     }

Sources/Utils/SDKVersion.swift

@@ -17,4 +17,4 @@
 /// Do not edit this field.
 /// - It is auto updated (Scripts/updated_version.sh) to reflect the current version
 /// - Do not put underscores in the name (Swiftlint can modify unexpectedly)
-let OPTIMIZELYSDKVERSION = "5.0.0"
+let OPTIMIZELYSDKVERSION = "5.1.0"

Tests/OptimizelyTests-Common/BatchEventBuilderTests_EventTags.swift

@@ -76,7 +76,7 @@ class BatchEventBuilderTests_EventTags: XCTestCase {
 
 extension BatchEventBuilderTests_EventTags {
 
-    func testEventTagsWhenInvalidType() {
+    func testEventTagsWhenArrayType() {
         let eventKey = "event_single_targeted_exp"
         let eventTags: [String: Any] = ["browser": "chrome",
                                         "future": [1, 2, 3]]
@@ -87,7 +87,8 @@ extension BatchEventBuilderTests_EventTags {
         let tags = de["tags"] as! [String: Any]
 
         XCTAssertEqual(tags["browser"] as! String, "chrome")
-        XCTAssertNil(tags["future"])
+        XCTAssertNotNil(tags["future"])
+        XCTAssertEqual(tags["future"] as? [Int], [1, 2, 3])
     }
 
     func testEventTagsWhenTooBigNumbers() {
@@ -316,6 +317,55 @@ extension BatchEventBuilderTests_EventTags {
         XCTAssertEqual(de["value"] as! Double, 32, "value must be valid for value")
     }
 
+    
+    func testNestedTag() {
+        let properties: [String: Any] = [
+            "category": "shoes",
+            "Text": "value",
+            "nested": [
+                "foot": "value",
+                "mouth": "mouth_value"
+            ],
+            "stringArray": ["a", "b", "c"],
+            "intArray": [1, 2, 3],
+            "doubleArray": [1.0, 2.0, 3.0],
+            "boolAray": [false, true, false, true],
+        ]
+        let eventKey = "event_single_targeted_exp"
+        let eventTags: [String: Any] = ["browser": "chrome",
+                                        "v1": Int8(10),
+                                        "v2": Int16(20),
+                                        "v3": Int32(30),
+                                        "revenue": Int64(40),
+                                        "value": Float(32),
+                                        "$opt_event_properties": properties]
+        
+        try! optimizely.track(eventKey: eventKey, userId: userId, attributes: nil, eventTags: eventTags)
+        
+        let de = getDispatchEvent(dispatcher: eventDispatcher)!
+        let tags = de["tags"] as! [String: Any]
+        
+        XCTAssertEqual(tags["browser"] as! String, "chrome")
+        XCTAssertEqual(tags["v1"] as! Int, 10)
+        XCTAssertEqual(tags["v2"] as! Int, 20)
+        XCTAssertEqual(tags["v3"] as! Int, 30)
+        XCTAssertEqual(tags["revenue"] as! Int, 40)
+        XCTAssertEqual(tags["value"] as! Double, 32)
+        XCTAssertEqual(de["revenue"] as! Int, 40, "value must be valid for revenue")
+        XCTAssertEqual(de["value"] as! Double, 32, "value must be valid for value")
+        
+        XCTAssertEqual((tags["$opt_event_properties"] as! [String : Any])["category"] as! String, "shoes")
+        XCTAssertEqual((tags["$opt_event_properties"] as! [String : Any])["nested"] as! [String : String], ["foot": "value", "mouth": "mouth_value"])
+        
+        XCTAssertEqual((tags["$opt_event_properties"] as! [String : Any])["stringArray"] as! [String], ["a", "b", "c"])
+        XCTAssertEqual((tags["$opt_event_properties"] as! [String : Any])["intArray"] as! [Int], [1, 2, 3])
+        XCTAssertEqual((tags["$opt_event_properties"] as! [String : Any])["doubleArray"] as! [Double], [1, 2, 3])
+        XCTAssertEqual((tags["$opt_event_properties"] as! [String : Any])["boolAray"] as! [Bool], [false, true, false, true])
+        
+        
+    }
+    
+    
     func testEventTagsWithRevenueAndValue_toJSON() {
 
         // valid revenue/value types