fix add/multiply

Author: cherylEnkidu

Firestore/Swift/Source/ExprImpl.swift

@@ -33,14 +33,6 @@ public extension Expr {
     return FunctionExpr("add", [self, Helper.sendableToExpr(value)])
   }
 
-  func add(_ values: [Expr]) -> FunctionExpr {
-    return FunctionExpr("add", [self, Helper.array(values)])
-  }
-
-  func add(_ values: [Sendable]) -> FunctionExpr {
-    return FunctionExpr("add", [self, Helper.array(values)])
-  }
-
   func subtract(_ other: Expr) -> FunctionExpr {
     return FunctionExpr("subtract", [self, other])
   }
@@ -57,14 +49,6 @@ public extension Expr {
     return FunctionExpr("multiply", [self, Helper.sendableToExpr(value)])
   }
 
-  func multiply(_ values: [Expr]) -> FunctionExpr {
-    return FunctionExpr("multiply", [self, Helper.array(values)])
-  }
-
-  func multiply(_ values: [Sendable]) -> FunctionExpr {
-    return FunctionExpr("multiply", [self, Helper.array(values)])
-  }
-
   func divide(_ other: Expr) -> FunctionExpr {
     return FunctionExpr("divide", [self, other])
   }

Firestore/Swift/Source/Helper/PipelineHelper.swift

@@ -18,22 +18,24 @@ enum Helper {
       return Constant.nil
     }
 
-    if value is Expr {
-      return value as! Expr
-    } else if value is [String: Sendable?] {
-      return map(value as! [String: Sendable?])
-    } else if value is [Sendable?] {
-      return array(value as! [Sendable?])
-    } else if value is TimeUnit {
-      return Constant((value as! TimeUnit).rawValue)
+    if let exprValue = value as? Expr {
+      return exprValue
+    } else if let dictionaryValue = value as? [String: Sendable?] {
+      return map(dictionaryValue)
+    } else if let arrayValue = value as? [Sendable?] {
+      return array(arrayValue)
+    } else if let timeUnitValue = value as? TimeUnit {
+      return Constant(timeUnitValue.rawValue)
     } else {
       return Constant(value)
     }
   }
 
   static func selectablesToMap(selectables: [Selectable]) -> [String: Expr] {
     let exprMap = selectables.reduce(into: [String: Expr]()) { result, selectable in
-      let value = selectable as! SelectableWrapper
+      guard let value = selectable as? SelectableWrapper else {
+        fatalError("Selectable class must conform to SelectableWrapper.")
+      }
       result[value.alias] = value.expr
     }
     return exprMap
@@ -57,22 +59,18 @@ enum Helper {
 
   // This function is used to convert Swift type into Objective-C type.
   static func sendableToAnyObjectForRawStage(_ value: Sendable?) -> AnyObject {
-    guard let value = value else {
-      return Constant.nil.bridge
-    }
-
-    guard !(value is NSNull) else {
+    guard let value = value, !(value is NSNull) else {
       return Constant.nil.bridge
     }
 
-    if value is Expr {
-      return (value as! Expr).toBridge()
-    } else if value is AggregateFunction {
-      return (value as! AggregateFunction).toBridge()
-    } else if value is [String: Sendable?] {
-      let mappedValue: [String: Sendable?] = (value as! [String: Sendable?]).mapValues {
-        if $0 is AggregateFunction {
-          return ($0 as! AggregateFunction).toBridge()
+    if let exprValue = value as? Expr {
+      return exprValue.toBridge()
+    } else if let aggregateFunctionValue = value as? AggregateFunction {
+      return aggregateFunctionValue.toBridge()
+    } else if let dictionaryValue = value as? [String: Sendable?] {
+      let mappedValue: [String: Sendable] = dictionaryValue.mapValues {
+        if let aggFunc = $0 as? AggregateFunction {
+          return aggFunc.toBridge()
         }
         return sendableToExpr($0).toBridge()
       }

Firestore/Swift/Source/SwiftAPI/Pipeline/Expr.swift

@@ -68,37 +68,6 @@ public protocol Expr: Sendable {
   /// - Returns: A new `FunctionExpr` representing the addition operation.
   func add(_ value: Sendable) -> FunctionExpr
 
-  /// Creates an expression that adds this expression to one or more other expressions.
-  /// Assumes `self` and all parameters evaluate to compatible types for addition (e.g., numbers, or
-  /// string/array concatenation if supported by the specific "add" implementation).
-  ///
-  /// ```swift
-  /// // Add the value of the 'quantity' field and the 'reserve' field.
-  /// Field("quantity").add(Field("reserve"))
-  ///
-  /// // Add multiple numeric fields
-  /// Field("subtotal").add(Field("tax"), Field("shipping"))
-  /// ```
-  ///
-  /// - Parameter values: Expr` values to add.
-  /// - Returns: A new `FunctionExpr` representing the addition operation.
-  func add(_ values: [Expr]) -> FunctionExpr
-
-  /// Creates an expression that adds this expression to one or more literal values.
-  /// Assumes `self` and all parameters evaluate to compatible types for addition.
-  ///
-  /// ```swift
-  /// // Add 5 to the 'count' field
-  /// Field("count").add(5)
-  ///
-  /// // Add multiple literal numbers
-  /// Field("score").add(10, 20, -5)
-  /// ```
-  ///
-  /// - Parameter values: Expr` values to add.
-  /// - Returns: A new `FunctionExpr` representing the addition operation.
-  func add(_ values: [Sendable]) -> FunctionExpr
-
   /// Creates an expression that subtracts another expression from this expression.
   /// Assumes `self` and `other` evaluate to numeric types.
   ///
@@ -153,36 +122,6 @@ public protocol Expr: Sendable {
   /// - Returns: A new `FunctionExpr` representing the multiplication operation.
   func multiply(_ value: Sendable) -> FunctionExpr
 
-  /// Creates an expression that multiplies this expression by one or more other expressions.
-  /// Assumes `self` and all parameters evaluate to numeric types.
-  ///
-  /// ```swift
-  /// // Multiply the 'quantity' field by the 'price' field
-  /// Field("quantity").multiply(Field("price"))
-  ///
-  /// // Multiply 'rate' by 'time' and 'conversionFactor' fields
-  /// Field("rate").multiply(Field("time"), Field("conversionFactor"))
-  /// ```
-  ///
-  /// - Parameter values: `Expr` values to multiply by.
-  /// - Returns: A new `FunctionExpr` representing the multiplication operation.
-  func multiply(_ values: [Expr]) -> FunctionExpr
-
-  /// Creates an expression that multiplies this expression by one or more literal values.
-  /// Assumes `self` evaluates to a numeric type.
-  ///
-  /// ```swift
-  /// // Multiply the 'score' by 1.1
-  /// Field("score").multiply(1.1)
-  ///
-  /// // Multiply 'base' by 2 and then by 3.0
-  /// Field("base").multiply(2, 3.0)
-  /// ```
-  ///
-  /// - Parameter values: `Sendable` literal values to multiply by.
-  /// - Returns: A new `FunctionExpr` representing the multiplication operation.
-  func multiply(_ values: [Sendable]) -> FunctionExpr
-
   /// Creates an expression that divides this expression by another expression.
   /// Assumes `self` and `other` evaluate to numeric types.
   ///

Firestore/Swift/Tests/Integration/PipelineTests.swift

@@ -1900,8 +1900,8 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
         Field("published").subtract(1900).as("yearsSince1900"),
         Field("rating").multiply(10).as("ratingTimesTen"),
         Field("rating").divide(2).as("ratingDividedByTwo"),
-        Field("rating").multiply([10, 2]).as("ratingTimes20"),
-        Field("rating").add([1, 2]).as("ratingPlus3"),
+        Field("rating").multiply(20).as("ratingTimes20"),
+        Field("rating").add(3).as("ratingPlus3"),
         Field("rating").mod(2).as("ratingMod2")
       )
       .limit(1)