Change log and feedback.

Author: wu-hui

Firestore/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Unreleased
+- [feature] Added `Query.count()`, which fetches the number of documents in the
+  result set without actually downloading the documents (#10246).
 - [fixed] Fixed compiler warning about `@param comparator` (#10226).
 
 # 9.6.0

Firestore/Source/Public/FirebaseFirestore/FIRAggregateQuery.h

@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
+#import <Foundation/Foundation.h>
+
 #import "FIRAggregateSource.h"
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class FIRQuery;
 @class FIRAggregateQuerySnapshot;
 
@@ -27,7 +31,7 @@ NS_SWIFT_NAME(AggregateQuery)
 @interface FIRAggregateQuery : NSObject
 
 /** The base `Query` for this aggregate query. */
-@property(nonatomic, readonly) FIRQuery *_Nonnull query;
+@property(nonatomic, readonly) FIRQuery *query;
 
 /**
  * Executes the aggregate query and reads back the results as a `FIRAggregateQuerySnapshot`.
@@ -37,7 +41,9 @@ NS_SWIFT_NAME(AggregateQuery)
  *     snapshot will be `nil` only if error is `non-nil`.
  */
 - (void)aggregationWithSource:(FIRAggregateSource)source
-                   completion:(void (^_Nonnull)(FIRAggregateQuerySnapshot *_Nullable snapshot,
-                                                NSError *_Nullable error))completion
-    NS_SWIFT_NAME(aggregation(source:completion:));
+                   completion:(void (^)(FIRAggregateQuerySnapshot *_Nullable snapshot,
+                                        NSError *_Nullable error))completion
+    NS_SWIFT_NAME(getAggregation(source:completion:));
 @end
+
+NS_ASSUME_NONNULL_END

Firestore/Source/Public/FirebaseFirestore/FIRAggregateQuerySnapshot.h

@@ -16,6 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @class FIRAggregateQuery;
 
 /**
@@ -25,12 +27,14 @@ NS_SWIFT_NAME(AggregateQuerySnapshot)
 @interface FIRAggregateQuerySnapshot : NSObject
 
 /** The original `AggregateQuery` this snapshot is a result of. */
-@property(nonatomic, readonly) FIRAggregateQuery* _Nonnull query;
+@property(nonatomic, readonly) FIRAggregateQuery* query;
 
 /**
  * The result of a document count aggregation. Null if no count aggregation is
  *     available in the result.
  */
-@property(nonatomic, readonly) NSNumber* _Nullable count;
+@property(nonatomic, readonly) NSNumber* count;
 
 @end
+
+NS_ASSUME_NONNULL_END

Firestore/Source/Public/FirebaseFirestore/FIRAggregateSource.h

@@ -16,6 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /** Configures the behavior of `AggregateQuery.aggregateWithSource(source:completion:)`. */
 typedef NS_ENUM(NSUInteger, FIRAggregateSource) {
   /**
@@ -26,3 +28,5 @@ typedef NS_ENUM(NSUInteger, FIRAggregateSource) {
    */
   FIRAggregateSourceServer,
 } NS_SWIFT_NAME(AggregateSource);
+
+NS_ASSUME_NONNULL_END

Firestore/Swift/Tests/Integration/AsyncAwaitIntegrationTests.swift

@@ -77,7 +77,7 @@ let emptyBundle = """
     func testCount() async throws {
       let collection = collectionRef()
       try await collection.addDocument(data: [:])
-      let snapshot = try await collection.count.aggregation(source: .server)
+      let snapshot = try await collection.count.getAggregation(source: .server)
       XCTAssertEqual(snapshot.count, 1)
     }
   }