Rework PromoteId to accomodate expression variant

GitOrigin-RevId: 9649fb299e6a138f4f43e857f1241fe488eb36d6

Author: persidskiy

CHANGELOG.md

@@ -7,6 +7,7 @@ Mapbox welcomes participation and contributions from everyone.
 * The Interactions and Featuresets API is promoted from experimental. The new API allows you to add interaction handlers to layers, Standard Style featuresets (POI, Buildings and Place Labels), and the map itself in the consistent way. You can control the propagation of events, tappable area, and the order of event handling.
 * The experimental style `MapStyle.standardExperimental` is removed. Use `MapStyle.standard` instead.
 * Methods `GestureManager.onMapTap`, `GestureManager.onMapLongPress`, `GestureManager.onLayerTap`, `GestureManager.onLayerLongPress` and their SwiftUI counterparts are deprecated. Use `TapInteraction` and `LongPressInteraction` instead.
+* Add new `VectorSource.promoteId2` and `GeoJSONSource.promoteId2`. Deprecate `VectorSource.promoteId` and `GeoJSONSource.promoteId`. The newer version support the expression variant of promoteId, which can be used to dynamically nominate IDs to the features.
 
 ```swift
 // Before (SwiftUI)

Sources/MapboxMaps/Documentation.docc/API Catalogs/Sources.md

@@ -15,6 +15,7 @@
 - ``RasterArraySource``
 - ``VectorSource``
 - ``PromoteId``
+- ``VectorSourcePromoteId``
 - ``Scheme``
 - ``Encoding``
 - ``CustomGeometrySource``

Sources/MapboxMaps/Style/Generated/Sources/GeoJSONSource.swift

@@ -1,5 +1,46 @@
 import Foundation
 
+/// Denotes promote-id setting for ``VectorSource``.
+///
+/// In vector sources, a promote-id setting can be applied globally for all layers, or individually for each vector source layer.
+public enum VectorSourcePromoteId: Equatable, Codable, Sendable {
+    // The promoteId will be applied to all layers in the vector source.
+    case global(Value<String>)
+
+    // The promoteId will be applied per each layer in the vector source.
+    case byLayer([String: Value<String>])
+
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+
+        if let decodedSingle = try? container.decode(Value<String>.self) {
+            self = .global(decodedSingle)
+            return
+        }
+
+        if let decodedDict = try? container.decode([String: Value<String>].self) {
+            self = .byLayer(decodedDict)
+            return
+        }
+
+        let context = DecodingError.Context(codingPath: decoder.codingPath,
+                                            debugDescription: "Failed to decode VectorSourcePromoteId")
+        throw DecodingError.dataCorrupted(context)
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.singleValueContainer()
+
+        switch self {
+        case .global(let string):
+            try container.encode(string)
+        case .byLayer(let object):
+            try container.encode(object)
+        }
+    }
+}
+
+@available(*, deprecated, message: "Use VectorSourcePromoteId instead")
 public enum PromoteId: Equatable, Codable, Sendable {
     case string(String)
     case object([String: String])
@@ -31,4 +72,45 @@ public enum PromoteId: Equatable, Codable, Sendable {
             try container.encode(object)
         }
     }
+
+    init?(from: VectorSourcePromoteId?) {
+        guard let from else { return nil }
+        switch from {
+        case let .global(val):
+            guard let constant = val.asConstant else { return nil }
+            self = .string(constant)
+        case let .byLayer(dict):
+            self = .object(dict.compactMapValues { $0.asConstant })
+        }
+    }
+
+    init?(from: Value<String>?) {
+        guard let from, let const = from.asConstant else { return nil }
+        self = .string(const)
+    }
+}
+
+@available(*, deprecated)
+extension VectorSourcePromoteId {
+    init?(from: PromoteId?) {
+        guard let from else { return nil }
+        switch from {
+        case .string(let string):
+            self = .global(.constant(string))
+        case .object(let dict):
+            self = .byLayer(dict.mapValues { .constant($0) })
+        }
+    }
+}
+
+@available(*, deprecated)
+extension Value where T == String {
+    init?(from: PromoteId?) {
+        if let from,
+           case let .string(string) = from {
+            self = .init(constant: string)
+        } else {
+            return nil
+        }
+    }
 }

Sources/MapboxMaps/Style/Generated/Sources/RasterArraySource.swift

@@ -127,6 +127,21 @@ internal extension PromoteId {
     }
 }
 
+internal extension VectorSourcePromoteId {
+    static func testSourceValue() -> VectorSourcePromoteId {
+        return .byLayer([
+            "layer-1": .constant("test-promote-id-1"),
+            "layer-2": .expression(Exp(.get, "name")),
+        ])
+    }
+}
+
+extension Value where T == String {
+    static func testSourceValue() -> Value {
+        .expression(Exp(.get, "name"))
+    }
+}
+
 internal extension Array where Element == RasterArraySource.RasterDataLayer {
     static func testSourceValue() -> [RasterArraySource.RasterDataLayer] {
         return [.init(layerId: "test-layer-id", bands: ["band_0", "band_1"])]