public API adjustment

Author: cherylEnkidu

Firestore/Swift/Source/ExprImpl.swift

@@ -13,12 +13,12 @@
 // limitations under the License.
 
 enum Helper {
-  static func sendableToExpr(_ value: Sendable?) -> Expr {
+  static func sendableToExpr(_ value: Sendable?) -> Expression {
     guard let value = value else {
       return Constant.nil
     }
 
-    if let exprValue = value as? Expr {
+    if let exprValue = value as? Expression {
       return exprValue
     } else if let dictionaryValue = value as? [String: Sendable?] {
       return map(dictionaryValue)
@@ -31,8 +31,8 @@ enum Helper {
     }
   }
 
-  static func selectablesToMap(selectables: [Selectable]) -> [String: Expr] {
-    let exprMap = selectables.reduce(into: [String: Expr]()) { result, selectable in
+  static func selectablesToMap(selectables: [Selectable]) -> [String: Expression] {
+    let exprMap = selectables.reduce(into: [String: Expression]()) { result, selectable in
       guard let value = selectable as? SelectableWrapper else {
         fatalError("Selectable class must conform to SelectableWrapper.")
       }
@@ -41,20 +41,20 @@ enum Helper {
     return exprMap
   }
 
-  static func map(_ elements: [String: Sendable?]) -> FunctionExpr {
-    var result: [Expr] = []
+  static func map(_ elements: [String: Sendable?]) -> FunctionExpression {
+    var result: [Expression] = []
     for (key, value) in elements {
       result.append(Constant(key))
       result.append(sendableToExpr(value))
     }
-    return FunctionExpr("map", result)
+    return FunctionExpression("map", result)
   }
 
-  static func array(_ elements: [Sendable?]) -> FunctionExpr {
+  static func array(_ elements: [Sendable?]) -> FunctionExpression {
     let transformedElements = elements.map { element in
       sendableToExpr(element)
     }
-    return FunctionExpr("array", transformedElements)
+    return FunctionExpression("array", transformedElements)
   }
 
   // This function is used to convert Swift type into Objective-C type.
@@ -63,7 +63,7 @@ enum Helper {
       return Constant.nil.bridge
     }
 
-    if let exprValue = value as? Expr {
+    if let exprValue = value as? Expression {
       return exprValue.toBridge()
     } else if let aggregateFunctionValue = value as? AggregateFunction {
       return aggregateFunctionValue.toBridge()

Firestore/Swift/Source/Helper/PipelineHelper.swift

@@ -22,5 +22,5 @@ protocol AggregateBridgeWrapper {
 
 protocol SelectableWrapper: Sendable {
   var alias: String { get }
-  var expr: Expr { get }
+  var expr: Expression { get }
 }

Firestore/Swift/Source/PipelineWrapper.swift

@@ -22,9 +22,9 @@ public class AggregateFunction: AggregateBridgeWrapper, @unchecked Sendable {
   let bridge: AggregateFunctionBridge
 
   let functionName: String
-  let args: [Expr]
+  let args: [Expression]
 
-  public init(_ functionName: String, _ args: [Expr]) {
+  public init(_ functionName: String, _ args: [Expression]) {
     self.functionName = functionName
     self.args = args
     bridge = AggregateFunctionBridge(
@@ -34,7 +34,7 @@ public class AggregateFunction: AggregateBridgeWrapper, @unchecked Sendable {
     )
   }
 
-  public func `as`(_ name: String) -> AggregateWithAlias {
-    return AggregateWithAlias(aggregate: self, alias: name)
+  public func `as`(_ name: String) -> AliasedAggregate {
+    return AliasedAggregate(aggregate: self, alias: name)
   }
 }

Firestore/Swift/Source/SwiftAPI/Pipeline/Aggregation/AggregateFunction.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-public struct AggregateWithAlias {
+public struct AliasedAggregate {
   public let aggregate: AggregateFunction
   public let alias: String
 }

Firestore/Swift/Source/SwiftAPI/Pipeline/Aggregation/AggregateWithAlias.swift renamed to Firestore/Swift/Source/SwiftAPI/Pipeline/Aggregation/AliasedAggregate.swift

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-public struct ExprWithAlias: Selectable, SelectableWrapper, Sendable {
+public struct AliasedExpression: Selectable, SelectableWrapper, Sendable {
   public var alias: String
 
-  public var expr: Expr
+  public var expr: Expression
 
-  init(_ expr: Expr, _ alias: String) {
+  init(_ expr: Expression, _ alias: String) {
     self.alias = alias
     self.expr = expr
   }