add name tag for FunctionExpression

cherylEnkidu · cherylEnkidu · commit 41fcae2b59ef · 2025-10-07T16:38:11.000-04:00
diff --git a/Firestore/Swift/Source/ExpressionImplementation.swift b/Firestore/Swift/Source/ExpressionImplementation.swift
diff --git a/Firestore/Swift/Source/Helper/PipelineHelper.swift b/Firestore/Swift/Source/Helper/PipelineHelper.swift
@@ -47,14 +47,14 @@ enum Helper {
       result.append(Constant(key))
       result.append(sendableToExpr(value))
     }
-    return FunctionExpression("map", result)
+    return FunctionExpression(functionName: "map", args: result)
   }
 
   static func array(_ elements: [Sendable?]) -> FunctionExpression {
     let transformedElements = elements.map { element in
       sendableToExpr(element)
     }
-    return FunctionExpression("array", transformedElements)
+    return FunctionExpression(functionName: "array", args: transformedElements)
   }
 
   // This function is used to convert Swift type into Objective-C type.
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/ArrayExpression.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/ArrayExpression.swift
@@ -38,6 +38,6 @@ public class ArrayExpression: FunctionExpression, @unchecked Sendable {
       result.append(Helper.sendableToExpr(element))
     }
 
-    super.init("array", result)
+    super.init(functionName: "array", args: result)
   }
 }
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/BooleanExpression.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/BooleanExpression.swift
@@ -31,8 +31,8 @@ import Foundation
 ///   )
 /// ```
 public class BooleanExpression: FunctionExpression, @unchecked Sendable {
-  override public init(_ functionName: String, _ agrs: [Expression]) {
-    super.init(functionName, agrs)
+  override public init(functionName: String, args: [Expression]) {
+    super.init(functionName: functionName, args: args)
   }
 
   /// Creates an aggregation that counts the number of documents for which this boolean expression
@@ -79,7 +79,10 @@ public class BooleanExpression: FunctionExpression, @unchecked Sendable {
   /// - Returns: A new `FunctionExpression` representing the conditional logic.
   public func then(_ thenExpression: Expression,
                    else elseExpression: Expression) -> FunctionExpression {
-    return FunctionExpression("conditional", [self, thenExpression, elseExpression])
+    return FunctionExpression(
+      functionName: "conditional",
+      args: [self, thenExpression, elseExpression]
+    )
   }
 
   /// Combines two boolean expressions with a logical AND (`&&`).
@@ -103,7 +106,7 @@ public class BooleanExpression: FunctionExpression, @unchecked Sendable {
   public static func && (lhs: BooleanExpression,
                          rhs: @autoclosure () throws -> BooleanExpression) rethrows
     -> BooleanExpression {
-    try BooleanExpression("and", [lhs, rhs()])
+      try BooleanExpression(functionName: "and", args: [lhs, rhs()])
   }
 
   /// Combines two boolean expressions with a logical OR (`||`).
@@ -127,7 +130,7 @@ public class BooleanExpression: FunctionExpression, @unchecked Sendable {
   public static func || (lhs: BooleanExpression,
                          rhs: @autoclosure () throws -> BooleanExpression) rethrows
     -> BooleanExpression {
-    try BooleanExpression("or", [lhs, rhs()])
+      try BooleanExpression(functionName: "or", args: [lhs, rhs()])
   }
 
   /// Combines two boolean expressions with a logical XOR (`^`).
@@ -151,7 +154,7 @@ public class BooleanExpression: FunctionExpression, @unchecked Sendable {
   public static func ^ (lhs: BooleanExpression,
                         rhs: @autoclosure () throws -> BooleanExpression) rethrows
     -> BooleanExpression {
-    try BooleanExpression("xor", [lhs, rhs()])
+      try BooleanExpression(functionName: "xor", args: [lhs, rhs()])
   }
 
   /// Negates a boolean expression with a logical NOT (`!`).
@@ -168,6 +171,6 @@ public class BooleanExpression: FunctionExpression, @unchecked Sendable {
   /// - Parameter lhs: The boolean expression to negate.
   /// - Returns: A new `BooleanExpression` representing the logical NOT.
   public static prefix func ! (lhs: BooleanExpression) -> BooleanExpression {
-    return BooleanExpression("not", [lhs])
+    return BooleanExpression(functionName: "not", args: [lhs])
   }
 }
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/ConditionalExpression.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/ConditionalExpression.swift
@@ -44,6 +44,6 @@ public class ConditionalExpression: FunctionExpression, @unchecked Sendable {
   public init(_ expr: BooleanExpression,
               then thenExpression: Expression,
               else elseExpression: Expression) {
-    super.init("conditional", [expr, thenExpression, elseExpression])
+    super.init(functionName: "conditional", args: [expr, thenExpression, elseExpression])
   }
 }
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/ErrorExpression.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/ErrorExpression.swift
@@ -23,6 +23,6 @@ import Foundation
 /// ```
 public class ErrorExpression: FunctionExpression, @unchecked Sendable {
   public init(_ errorMessage: String) {
-    super.init("error", [Constant(errorMessage)])
+    super.init(functionName: "error", args: [Constant(errorMessage)])
   }
 }
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/FunctionExpression.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/FunctionExpression.swift
@@ -16,14 +16,14 @@ public class FunctionExpression: Expression, BridgeWrapper, @unchecked Sendable
   let bridge: ExprBridge
 
   let functionName: String
-  let agrs: [Expression]
+  let args: [Expression]
 
-  public init(_ functionName: String, _ agrs: [Expression]) {
+  public init(functionName: String, args: [Expression]) {
     self.functionName = functionName
-    self.agrs = agrs
+    self.args = args
     bridge = FunctionExprBridge(
       name: functionName,
-      args: self.agrs.map { $0.toBridge()
+      args: self.args.map { $0.toBridge()
       }
     )
   }
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/MapExpression.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/MapExpression.swift
@@ -36,6 +36,6 @@ public class MapExpression: FunctionExpression, @unchecked Sendable {
       result.append(Helper.sendableToExpr(element.value))
     }
 
-    super.init("map", result)
+    super.init(functionName: "map", args: result)
   }
 }
diff --git a/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/RandomExpression.swift b/Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/FunctionExpressions/RandomExpression.swift
@@ -29,6 +29,6 @@
 public class RandomExpression: FunctionExpression, @unchecked Sendable {
   /// Creates a new `RandomExpression` that generates a random number.
   public init() {
-    super.init("rand", [])
+    super.init(functionName: "rand", args: [])
   }
 }
diff --git a/Firestore/Swift/Tests/Integration/PipelineTests.swift b/Firestore/Swift/Tests/Integration/PipelineTests.swift
@@ -2758,7 +2758,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
       .limit(1)
       .select(
         [
-          FunctionExpression("add", [Field("rating"), Constant(1)]).as(
+          FunctionExpression(functionName: "add", args: [Field("rating"), Constant(1)]).as(
             "rating"
           ),
         ]
@@ -2786,7 +2786,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     let pipeline = db.pipeline()
       .collection(collRef.path)
       .where(
-        BooleanExpression("and", [Field("rating").greaterThan(0),
+        BooleanExpression(functionName: "and", args: [Field("rating").greaterThan(0),
                                   Field("title").charLength().lessThan(5),
                                   Field("tags").arrayContains("propaganda")])
       )
@@ -2810,8 +2810,8 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
     let pipeline = db.pipeline()
       .collection(collRef.path)
       .where(BooleanExpression(
-        "array_contains_any",
-        [Field("tags"), ArrayExpression(["politics"])]
+        functionName: "array_contains_any",
+        args: [Field("tags"), ArrayExpression(["politics"])]
       ))
       .select([Field("title")])
 
@@ -2858,7 +2858,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
       .collection(collRef.path)
       .sort(
         [
-          FunctionExpression("char_length", [Field("title")]).ascending(),
+          FunctionExpression(functionName: "char_length", args: [Field("title")]).ascending(),
           Field("__name__").descending(),
         ]
       )

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,14 @@ enum Helper {`
`47`	`47`	`result.append(Constant(key))`
`48`	`48`	`result.append(sendableToExpr(value))`
`49`	`49`	`}`
`50`		`- return FunctionExpression("map", result)`
	`50`	`+ return FunctionExpression(functionName: "map", args: result)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`static func array(_ elements: [Sendable?]) -> FunctionExpression {`
`54`	`54`	`let transformedElements = elements.map { element in`
`55`	`55`	`sendableToExpr(element)`
`56`	`56`	`}`
`57`		`- return FunctionExpression("array", transformedElements)`
	`57`	`+ return FunctionExpression(functionName: "array", args: transformedElements)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`// This function is used to convert Swift type into Objective-C type.`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ public class ArrayExpression: FunctionExpression, @unchecked Sendable {`
`38`	`38`	`result.append(Helper.sendableToExpr(element))`
`39`	`39`	`}`
`40`	`40`
`41`		`- super.init("array", result)`
	`41`	`+ super.init(functionName: "array", args: result)`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ public class ConditionalExpression: FunctionExpression, @unchecked Sendable {`
`44`	`44`	`public init(_ expr: BooleanExpression,`
`45`	`45`	`then thenExpression: Expression,`
`46`	`46`	`else elseExpression: Expression) {`
`47`		`- super.init("conditional", [expr, thenExpression, elseExpression])`
	`47`	`+ super.init(functionName: "conditional", args: [expr, thenExpression, elseExpression])`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ import Foundation`
`23`	`23`	/// ```
`24`	`24`	`public class ErrorExpression: FunctionExpression, @unchecked Sendable {`
`25`	`25`	`public init(_ errorMessage: String) {`
`26`		`- super.init("error", [Constant(errorMessage)])`
	`26`	`+ super.init(functionName: "error", args: [Constant(errorMessage)])`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,14 @@ public class FunctionExpression: Expression, BridgeWrapper, @unchecked Sendable`
`16`	`16`	`let bridge: ExprBridge`
`17`	`17`
`18`	`18`	`let functionName: String`
`19`		`- let agrs: [Expression]`
	`19`	`+ let args: [Expression]`
`20`	`20`
`21`		`- public init(_ functionName: String, _ agrs: [Expression]) {`
	`21`	`+ public init(functionName: String, args: [Expression]) {`
`22`	`22`	`self.functionName = functionName`
`23`		`- self.agrs = agrs`
	`23`	`+ self.args = args`
`24`	`24`	`bridge = FunctionExprBridge(`
`25`	`25`	`name: functionName,`
`26`		`- args: self.agrs.map { $0.toBridge()`
	`26`	`+ args: self.args.map { $0.toBridge()`
`27`	`27`	`}`
`28`	`28`	`)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ public class MapExpression: FunctionExpression, @unchecked Sendable {`
`36`	`36`	`result.append(Helper.sendableToExpr(element.value))`
`37`	`37`	`}`
`38`	`38`
`39`		`- super.init("map", result)`
	`39`	`+ super.init(functionName: "map", args: result)`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@`
`29`	`29`	`public class RandomExpression: FunctionExpression, @unchecked Sendable {`
`30`	`30`	/// Creates a new `RandomExpression` that generates a random number.
`31`	`31`	`public init() {`
`32`		`- super.init("rand", [])`
	`32`	`+ super.init(functionName: "rand", args: [])`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2758,7 +2758,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {`
`2758`	`2758`	`.limit(1)`
`2759`	`2759`	`.select(`
`2760`	`2760`	`[`
`2761`		`- FunctionExpression("add", [Field("rating"), Constant(1)]).as(`
	`2761`	`+ FunctionExpression(functionName: "add", args: [Field("rating"), Constant(1)]).as(`
`2762`	`2762`	`"rating"`
`2763`	`2763`	`),`
`2764`	`2764`	`]`
`@@ -2786,7 +2786,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {`
`2786`	`2786`	`let pipeline = db.pipeline()`
`2787`	`2787`	`.collection(collRef.path)`
`2788`	`2788`	`.where(`
`2789`		`- BooleanExpression("and", [Field("rating").greaterThan(0),`
	`2789`	`+ BooleanExpression(functionName: "and", args: [Field("rating").greaterThan(0),`
`2790`	`2790`	`Field("title").charLength().lessThan(5),`
`2791`	`2791`	`Field("tags").arrayContains("propaganda")])`
`2792`	`2792`	`)`
`@@ -2810,8 +2810,8 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {`
`2810`	`2810`	`let pipeline = db.pipeline()`
`2811`	`2811`	`.collection(collRef.path)`
`2812`	`2812`	`.where(BooleanExpression(`
`2813`		`- "array_contains_any",`
`2814`		`- [Field("tags"), ArrayExpression(["politics"])]`
	`2813`	`+ functionName: "array_contains_any",`
	`2814`	`+ args: [Field("tags"), ArrayExpression(["politics"])]`
`2815`	`2815`	`))`
`2816`	`2816`	`.select([Field("title")])`
`2817`	`2817`
`@@ -2858,7 +2858,7 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {`
`2858`	`2858`	`.collection(collRef.path)`
`2859`	`2859`	`.sort(`
`2860`	`2860`	`[`
`2861`		`- FunctionExpression("char_length", [Field("title")]).ascending(),`
	`2861`	`+ FunctionExpression(functionName: "char_length", args: [Field("title")]).ascending(),`
`2862`	`2862`	`Field("__name__").descending(),`
`2863`	`2863`	`]`
`2864`	`2864`	`)`