@@ -710,9 +710,11 @@ - (id)initWithPercentage:(double)percentage {
710710- (std::shared_ptr<api::Stage>)cppStageWithReader : (FSTUserDataReader *)reader {
711711 if (!isUserDataRead) {
712712 if ([type isEqualToString: @" count"
713- cpp_sample = std::make_shared<Sample>(" count" 0 );
713+ cpp_sample =
714+ std::make_shared<Sample>(Sample::SampleMode (Sample::SampleMode::DOCUMENTS), _count, 0 );
714715 } else {
715- cpp_sample = std::make_shared<Sample>(" percentage" 0 , _percentage);
716+ cpp_sample =
717+ std::make_shared<Sample>(Sample::SampleMode (Sample::SampleMode::PERCENT), 0 , _percentage);
716718 }
717719 }
718720
@@ -750,30 +752,35 @@ - (id)initWithOther:(FIRPipelineBridge *)other {
750752
751753@implementation FIRUnnestStageBridge {
752754 FIRExprBridge *_field;
753- NSString *_Nullable _indexField;
755+ FIRExprBridge *_Nullable _index_field;
756+ FIRExprBridge *_alias;
754757 Boolean isUserDataRead;
755758 std::shared_ptr<Unnest> cpp_unnest;
756759}
757760
758- - (id )initWithField : (FIRExprBridge *)field indexField : (NSString *_Nullable)indexField {
761+ - (id )initWithField : (FIRExprBridge *)field
762+ alias : (FIRExprBridge *)alias
763+ indexField : (FIRExprBridge *_Nullable)index_field {
759764 self = [super init ];
760765 if (self) {
761766 _field = field;
762- _indexField = indexField;
767+ _alias = alias;
768+ _index_field = index_field;
763769 isUserDataRead = NO ;
764770 }
765771 return self;
766772}
767773
768774- (std::shared_ptr<api::Stage>)cppStageWithReader : (FSTUserDataReader *)reader {
769775 if (!isUserDataRead) {
770- absl::optional<std::string > cpp_index_field;
771- if (_indexField != nil ) {
772- cpp_index_field = MakeString (_indexField) ;
776+ absl::optional<std::shared_ptr<Expr> > cpp_index_field;
777+ if (_index_field != nil ) {
778+ cpp_index_field = [_index_field cppExprWithReader: reader] ;
773779 } else {
774780 cpp_index_field = absl::nullopt;
775781 }
776- cpp_unnest = std::make_shared<Unnest>([_field cppExprWithReader: reader], cpp_index_field);
782+ cpp_unnest = std::make_shared<Unnest>([_field cppExprWithReader: reader],
783+ [_alias cppExprWithReader: reader], cpp_index_field);
777784 }
778785
779786 isUserDataRead = YES ;
@@ -784,14 +791,14 @@ - (id)initWithField:(FIRExprBridge *)field indexField:(NSString *_Nullable)index
784791
785792@implementation FIRRawStageBridge {
786793 NSString *_name;
787- NSArray <FIRExprBridge * > *_params;
794+ NSArray <id > *_params;
788795 NSDictionary <NSString *, FIRExprBridge *> *_Nullable _options;
789796 Boolean isUserDataRead;
790797 std::shared_ptr<RawStage> cpp_generic_stage;
791798}
792799
793800- (id )initWithName : (NSString *)name
794- params : (NSArray <FIRExprBridge * > *)params
801+ params : (NSArray <id > *)params
795802 options : (NSDictionary <NSString *, FIRExprBridge *> *_Nullable)options {
796803 self = [super init ];
797804 if (self) {
@@ -803,12 +810,51 @@ - (id)initWithName:(NSString *)name
803810 return self;
804811}
805812
813+ - (firebase::firestore::google_firestore_v1_Value)convertIdToV1Value : (id )value
814+ reader : (FSTUserDataReader *)reader {
815+ if ([value isKindOfClass: [FIRExprBridge class ]]) {
816+ return [((FIRExprBridge *)value) cppExprWithReader: reader]->to_proto ();
817+ } else if ([value isKindOfClass: [FIRAggregateFunctionBridge class ]]) {
818+ return [((FIRAggregateFunctionBridge *)value) cppExprWithReader: reader]->to_proto ();
819+ } else if ([value isKindOfClass: [NSDictionary class ]]) {
820+ NSDictionary <NSString *, id > *dictionary = (NSDictionary <NSString *, id > *)value;
821+
822+ std::unordered_map<std::string, firebase::firestore::google_firestore_v1_Value> cpp_dictionary;
823+ for (NSString *key in dictionary) {
824+ if ([dictionary[key] isKindOfClass: [FIRExprBridge class ]]) {
825+ cpp_dictionary[MakeString (key)] =
826+ [((FIRExprBridge *)dictionary[key]) cppExprWithReader: reader]->to_proto ();
827+ } else if ([dictionary[key] isKindOfClass: [FIRAggregateFunctionBridge class ]]) {
828+ cpp_dictionary[MakeString (key)] =
829+ [((FIRAggregateFunctionBridge *)dictionary[key]) cppExprWithReader: reader]->to_proto ();
830+ } else {
831+ ThrowInvalidArgument (
832+ " Dictionary value must be an FIRExprBridge or FIRAggregateFunctionBridge."
833+ }
834+ }
835+
836+ firebase::firestore::google_firestore_v1_Value result;
837+ result.which_value_type = google_firestore_v1_Value_map_value_tag;
838+
839+ nanopb::SetRepeatedField (
840+ &result.map_value .fields , &result.map_value .fields_count , cpp_dictionary,
841+ [](const std::pair<std::string, firebase::firestore::google_firestore_v1_Value> &entry) {
842+ return firebase::firestore::_google_firestore_v1_MapValue_FieldsEntry{
843+ nanopb::MakeBytesArray (entry.first ), entry.second };
844+ });
845+ return result;
846+ } else {
847+ ThrowInvalidArgument (" Invalid value to convert to google_firestore_v1_Value."
848+ }
849+ }
850+
806851- (std::shared_ptr<api::Stage>)cppStageWithReader : (FSTUserDataReader *)reader {
807852 if (!isUserDataRead) {
808- std::vector<std::shared_ptr<Expr> > cpp_params;
809- for (FIRExprBridge * param in _params) {
810- cpp_params.push_back ([param cppExprWithReader :
853+ std::vector<firebase::firestore::google_firestore_v1_Value > cpp_params;
854+ for (id param in _params) {
855+ cpp_params.push_back ([self convertIdToV1Value: param reader :
811856 }
857+
812858 std::unordered_map<std::string, std::shared_ptr<Expr>> cpp_options;
813859 if (_options) {
814860 for (NSString *key in _options) {
@@ -928,7 +974,9 @@ - (id)initWithCppResult:(api::PipelineResult)result db:(std::shared_ptr<api::Fir
928974 FSTUserDataWriter *dataWriter =
929975 [[FSTUserDataWriter alloc ] initWithFirestore: _db
930976 serverTimestampBehavior: serverTimestampBehavior];
931- return [dataWriter convertedValue: *data];
977+ NSDictionary <NSString *, id > *dictionary = [dataWriter convertedValue: *data];
978+ NSLog (@" Dictionary contents: %@ "
979+ return dictionary;
932980}
933981
934982- (nullable id )get : (id )field {
@@ -959,35 +1007,41 @@ - (nullable id)get:(id)field
9591007@implementation FIRPipelineBridge {
9601008 NSArray <FIRStageBridge *> *_stages;
9611009 FIRFirestore *firestore;
1010+ Boolean isUserDataRead;
9621011 std::shared_ptr<Pipeline> cpp_pipeline;
9631012}
9641013
9651014- (id )initWithStages : (NSArray <FIRStageBridge *> *)stages db : (FIRFirestore *)db {
9661015 _stages = stages;
9671016 firestore = db;
1017+ isUserDataRead = NO ;
9681018 return [super init ];
9691019}
9701020
9711021- (void )executeWithCompletion : (void (^)(__FIRPipelineSnapshotBridge *_Nullable result,
9721022 NSError *_Nullable error))completion {
973- std::vector<std::shared_ptr<firebase::firestore::api::Stage>> cpp_stages;
974- for (FIRStageBridge *stage in _stages) {
975- cpp_stages.push_back ([stage cppStageWithReader: firestore.dataReader]);
976- }
977- cpp_pipeline = std::make_shared<Pipeline>(cpp_stages, firestore.wrapped );
978-
979- cpp_pipeline->
execute ([completion](StatusOr<api::PipelineSnapshot> maybe_value) {
980- if (maybe_value.ok ()) {
981- __FIRPipelineSnapshotBridge *bridge = [[__FIRPipelineSnapshotBridge alloc ]
982- initWithCppSnapshot: std: :move (maybe_value).ValueOrDie ()];
983- completion (bridge, nil );
984- } else {
985- completion (nil , MakeNSError (std::move (maybe_value).status ()));
986- }
987- });
1023+ [self cppPipelineWithReader: firestore.dataReader]->execute (
1024+ [completion](StatusOr<api::PipelineSnapshot> maybe_value) {
1025+ if (maybe_value.ok ()) {
1026+ __FIRPipelineSnapshotBridge *bridge = [[__FIRPipelineSnapshotBridge alloc ]
1027+ initWithCppSnapshot: std: :move (maybe_value).ValueOrDie ()];
1028+ completion (bridge, nil );
1029+ } else {
1030+ completion (nil , MakeNSError (std::move (maybe_value).status ()));
1031+ }
1032+ });
9881033}
9891034
9901035- (std::shared_ptr<api::Pipeline>)cppPipelineWithReader : (FSTUserDataReader *)reader {
1036+ if (!isUserDataRead) {
1037+ std::vector<std::shared_ptr<firebase::firestore::api::Stage>> cpp_stages;
1038+ for (FIRStageBridge *stage in _stages) {
1039+ cpp_stages.push_back ([stage cppStageWithReader: firestore.dataReader]);
1040+ }
1041+ cpp_pipeline = std::make_shared<Pipeline>(cpp_stages, firestore.wrapped );
1042+ }
1043+
1044+ isUserDataRead = YES ;
9911045 return cpp_pipeline;
9921046}
9931047
0 commit comments