remove map_set

Author: cherylEnkidu

Firestore/Swift/Source/ExpressionImplementation.swift

@@ -789,20 +789,6 @@ public extension Expression {
     return FunctionExpression(functionName: "map_merge", args: [self] + maps)
   }
 
-  func mapSet(key: Expression, value: Sendable) -> FunctionExpression {
-    return FunctionExpression(
-      functionName: "map_set",
-      args: [self, key, Helper.sendableToExpr(value)]
-    )
-  }
-
-  func mapSet(key: String, value: Sendable) -> FunctionExpression {
-    return FunctionExpression(
-      functionName: "map_set",
-      args: [self, Helper.sendableToExpr(key), Helper.sendableToExpr(value)]
-    )
-  }
-
   // --- Added Aggregate Operations (on Expr) ---
 
   func countDistinct() -> AggregateFunction {

Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/Expression.swift

@@ -1103,34 +1103,6 @@ public protocol Expression: Sendable {
   /// - Returns: A new `FunctionExpression` representing the "map_merge" operation.
   func mapMerge(_ maps: [Expression]) -> FunctionExpression
 
-  /// Creates an expression that adds or updates a specified field in a map.
-  /// Assumes `self` evaluates to a Map, `key` evaluates to a string, and `value` can be
-  /// any type.
-  ///
-  /// ```swift
-  /// // Set a field using a key from another field
-  /// Field("config").mapSet(key: Field("keyName"), value: Field("keyValue"))
-  /// ```
-  ///
-  /// - Parameter key: An `Expression` (evaluating to a string) representing the key of
-  /// the field to set or update.
-  /// - Parameter value: The `Expression` representing the value to set for the field.
-  /// - Returns: A new `FunctionExpression` representing the map with the updated field.
-  func mapSet(key: Expression, value: Sendable) -> FunctionExpression
-
-  /// Creates an expression that adds or updates a specified field in a map.
-  /// Assumes `self` evaluates to a Map.
-  ///
-  /// ```swift
-  /// // Set the "status" field to "active" in the "order" map
-  /// Field("order").mapSet(key: "status", value: "active")
-  /// ```
-  ///
-  /// - Parameter key: The literal string key of the field to set or update.
-  /// - Parameter value: The `Sendable` literal value to set for the field.
-  /// - Returns: A new `FunctionExpression` representing the map with the updated field.
-  func mapSet(key: String, value: Sendable) -> FunctionExpression
-
   // MARK: Aggregations
 
   /// Creates an aggregation that counts the number of distinct values of this expression.

Firestore/Swift/Tests/Integration/PipelineTests.swift

@@ -3107,142 +3107,6 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     }
   }
 
-  func testMapSetAddsNewField() async throws {
-    let collRef = collectionRef(withDocuments: bookDocs)
-    let db = collRef.firestore
-
-    let pipeline = db.pipeline()
-      .collection(collRef.path)
-      .where(Field("title").equal("The Hitchhiker's Guide to the Galaxy"))
-      .select([
-        Field("awards").mapSet(key: "newAward", value: true).as("modifiedAwards"),
-        Field("title"),
-      ])
-
-    let snapshot = try await pipeline.execute()
-
-    XCTAssertEqual(snapshot.results.count, 1, "Should retrieve one document")
-    if let resultDoc = snapshot.results.first {
-      let expectedAwards: [String: Sendable?] = [
-        "hugo": true,
-        "nebula": false,
-        "others": ["unknown": ["year": 1980]],
-        "newAward": true,
-      ]
-      let expectedResult: [String: Sendable?] = [
-        "title": "The Hitchhiker's Guide to the Galaxy",
-        "modifiedAwards": expectedAwards,
-      ]
-      TestHelper.compare(pipelineResult: resultDoc, expected: expectedResult)
-    } else {
-      XCTFail("No document retrieved for testMapSetAddsNewField")
-    }
-  }
-
-  func testMapSetUpdatesExistingField() async throws {
-    let collRef = collectionRef(withDocuments: bookDocs)
-    let db = collRef.firestore
-
-    let pipeline = db.pipeline()
-      .collection(collRef.path)
-      .where(Field("title").equal("The Hitchhiker's Guide to the Galaxy"))
-      .select([
-        Field("awards").mapSet(key: "hugo", value: false).as("modifiedAwards"),
-        Field("title"),
-      ])
-
-    let snapshot = try await pipeline.execute()
-
-    XCTAssertEqual(snapshot.results.count, 1, "Should retrieve one document")
-    if let resultDoc = snapshot.results.first {
-      let expectedAwards: [String: Sendable?] = [
-        "hugo": false,
-        "nebula": false,
-        "others": ["unknown": ["year": 1980]],
-      ]
-      let expectedResult: [String: Sendable?] = [
-        "title": "The Hitchhiker's Guide to the Galaxy",
-        "modifiedAwards": expectedAwards,
-      ]
-      TestHelper.compare(pipelineResult: resultDoc, expected: expectedResult)
-    } else {
-      XCTFail("No document retrieved for testMapSetUpdatesExistingField")
-    }
-  }
-
-  func testMapSetWithExpressionValue() async throws {
-    let collRef = collectionRef(withDocuments: bookDocs)
-    let db = collRef.firestore
-
-    let pipeline = db.pipeline()
-      .collection(collRef.path)
-      .where(Field("title").equal("The Hitchhiker's Guide to the Galaxy"))
-      .select(
-        [
-          Field("awards")
-            .mapSet(
-              key: "ratingCategory",
-              value: Field("rating").greaterThan(4.0).then(Constant("high"), else: Constant("low"))
-            )
-            .as("modifiedAwards"),
-          Field("title"),
-        ]
-      )
-
-    let snapshot = try await pipeline.execute()
-
-    XCTAssertEqual(snapshot.results.count, 1, "Should retrieve one document")
-    if let resultDoc = snapshot.results.first {
-      let expectedAwards: [String: Sendable?] = [
-        "hugo": true,
-        "nebula": false,
-        "others": ["unknown": ["year": 1980]],
-        "ratingCategory": "high",
-      ]
-      let expectedResult: [String: Sendable?] = [
-        "title": "The Hitchhiker's Guide to the Galaxy",
-        "modifiedAwards": expectedAwards,
-      ]
-      TestHelper.compare(pipelineResult: resultDoc, expected: expectedResult)
-    } else {
-      XCTFail("No document retrieved for testMapSetWithExpressionValue")
-    }
-  }
-
-  func testMapSetWithExpressionKey() async throws {
-    let collRef = collectionRef(withDocuments: bookDocs)
-    let db = collRef.firestore
-
-    let pipeline = db.pipeline()
-      .collection(collRef.path)
-      .where(Field("title").equal("The Hitchhiker's Guide to the Galaxy"))
-      .select([
-        Field("awards")
-          .mapSet(key: Constant("dynamicKey"), value: "dynamicValue")
-          .as("modifiedAwards"),
-        Field("title"),
-      ])
-
-    let snapshot = try await pipeline.execute()
-
-    XCTAssertEqual(snapshot.results.count, 1, "Should retrieve one document")
-    if let resultDoc = snapshot.results.first {
-      let expectedAwards: [String: Sendable?] = [
-        "hugo": true,
-        "nebula": false,
-        "others": ["unknown": ["year": 1980]],
-        "dynamicKey": "dynamicValue",
-      ]
-      let expectedResult: [String: Sendable?] = [
-        "title": "The Hitchhiker's Guide to the Galaxy",
-        "modifiedAwards": expectedAwards,
-      ]
-      TestHelper.compare(pipelineResult: resultDoc, expected: expectedResult)
-    } else {
-      XCTFail("No document retrieved for testMapSetWithExpressionKey")
-    }
-  }
-
   func testSupportsTimestampConversions() async throws {
     let db = firestore()
     let randomCol = collectionRef() // Unique collection for this test