Visitar URL original
Enum support in Pigeon by GaryQian · Pull Request #331 · flutter/packages · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
iOS compatibility with swift and e2e test
  • Loading branch information
GaryQian committed May 14, 2021
commit 35e5959d09b92c9536cf5023ffe8c4d1460b7041
2 changes: 1 addition & 1 deletion packages/pigeon/e2e_tests/test_objc/ios/Runner/MyApi.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
NS_ASSUME_NONNULL_BEGIN

/// Implementation of the Pigeon generated interface Api.
@interface MyApi : NSObject<ACApi>
@interface MyApi : NSObject <ACApi>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This applies some of the Engine c/objc formatting to the e2e test files. Lmk if you would prefer it to be as is.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, this has been an annoyance for me. The bot seems to differ from the formatter. Whatever keeps the CI bot happy is good.

@end

NS_ASSUME_NONNULL_END
10 changes: 7 additions & 3 deletions packages/pigeon/e2e_tests/test_objc/ios/Runner/MyApi.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
#import <Flutter/Flutter.h>

@implementation MyApi
- (ACSearchReply*)search:(ACSearchRequest*)input error:(FlutterError**)error {
- (ACSearchReply *)search:(ACSearchRequest *)input
error:(FlutterError **)error {
if ([input.query isEqualToString:@"error"]) {
*error = [FlutterError errorWithCode:@"somecode" message:@"somemessage" details:nil];
*error = [FlutterError errorWithCode:@"somecode"
message:@"somemessage"
details:nil];
return nil;
} else {
ACSearchReply* reply = [[ACSearchReply alloc] init];
ACSearchReply *reply = [[ACSearchReply alloc] init];
reply.result = [NSString stringWithFormat:@"Hello %@!", input.query];
reply.state = ACRequestStateSuccess;
return reply;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
NS_ASSUME_NONNULL_BEGIN

/// Implementation of the Pigeon generated interface NestedApi.
@interface MyNestedApi : NSObject<ACNestedApi>
@interface MyNestedApi : NSObject <ACNestedApi>
- (ACSearchReply *)search:(ACNested *)input error:(FlutterError *_Nullable *_Nonnull)error;
@end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ @implementation MyNestedApi
- (ACSearchReply *)search:(ACNested *)input error:(FlutterError **)error {
ACSearchReply *reply = [[ACSearchReply alloc] init];
reply.result = [NSString stringWithFormat:@"Hello %@!", input.request.query];
reply.state = ACRequestStateSuccess;
return reply;
}
@end
32 changes: 19 additions & 13 deletions packages/pigeon/e2e_tests/test_objc/ios/Runner/dartle.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// Autogenerated from Pigeon (v0.1.2), do not edit directly.
// Autogenerated from Pigeon (v0.2.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon
#import <Foundation/Foundation.h>
@protocol FlutterBinaryMessenger;
Expand All @@ -11,39 +11,45 @@

NS_ASSUME_NONNULL_BEGIN

typedef NS_ENUM(NSUInteger, ACRequestState) {
ACRequestStatePending = 0,
ACRequestStateSuccess = 1,
ACRequestStateFailure = 2,
};

@class ACSearchReply;
@class ACSearchRequest;
@class ACNested;

@interface ACSearchReply : NSObject
@property(nonatomic, copy, nullable) NSString *result;
@property(nonatomic, copy, nullable) NSString *error;
@property(nonatomic, copy, nullable) NSString * result;
@property(nonatomic, copy, nullable) NSString * error;
@property(nonatomic, assign) ACRequestState state;
@end

@interface ACSearchRequest : NSObject
@property(nonatomic, copy, nullable) NSString *query;
@property(nonatomic, strong, nullable) NSNumber *anInt;
@property(nonatomic, strong, nullable) NSNumber *aBool;
@property(nonatomic, copy, nullable) NSString * query;
@property(nonatomic, strong, nullable) NSNumber * anInt;
@property(nonatomic, strong, nullable) NSNumber * aBool;
@end

@interface ACNested : NSObject
@property(nonatomic, strong, nullable) ACSearchRequest *request;
@property(nonatomic, strong, nullable) ACSearchRequest * request;
@end

@interface ACFlutterSearchApi : NSObject
- (instancetype)initWithBinaryMessenger:(id<FlutterBinaryMessenger>)binaryMessenger;
- (void)search:(ACSearchRequest *)input completion:(void (^)(ACSearchReply *, NSError *))completion;
- (void)search:(ACSearchRequest*)input completion:(void(^)(ACSearchReply*, NSError* _Nullable))completion;
@end
@protocol ACNestedApi
- (nullable ACSearchReply *)search:(ACNested *)input error:(FlutterError *_Nullable *_Nonnull)error;
-(nullable ACSearchReply *)search:(ACNested*)input error:(FlutterError *_Nullable *_Nonnull)error;
@end

extern void ACNestedApiSetup(id<FlutterBinaryMessenger> binaryMessenger,
id<ACNestedApi> _Nullable api);
extern void ACNestedApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ACNestedApi> _Nullable api);

@protocol ACApi
- (nullable ACSearchReply *)search:(ACSearchRequest *)input
error:(FlutterError *_Nullable *_Nonnull)error;
-(void)initialize:(FlutterError *_Nullable *_Nonnull)error;
-(nullable ACSearchReply *)search:(ACSearchRequest*)input error:(FlutterError *_Nullable *_Nonnull)error;
@end

extern void ACApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ACApi> _Nullable api);
Expand Down
125 changes: 70 additions & 55 deletions packages/pigeon/e2e_tests/test_objc/ios/Runner/dartle.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// Autogenerated from Pigeon (v0.1.2), do not edit directly.
// Autogenerated from Pigeon (v0.2.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon
#import "dartle.h"
#import <Flutter/Flutter.h>
Expand All @@ -11,35 +11,37 @@
#error File requires ARC to be enabled.
#endif

static NSDictionary *wrapResult(NSDictionary *result, FlutterError *error) {
static NSDictionary<NSString*, id>* wrapResult(NSDictionary *result, FlutterError *error) {
NSDictionary *errorDict = (NSDictionary *)[NSNull null];
if (error) {
errorDict = [NSDictionary
dictionaryWithObjectsAndKeys:(error.code ? error.code : [NSNull null]), @"code",
(error.message ? error.message : [NSNull null]), @"message",
(error.details ? error.details : [NSNull null]), @"details",
nil];
errorDict = @{
@"code": (error.code ? error.code : [NSNull null]),
@"message": (error.message ? error.message : [NSNull null]),
@"details": (error.details ? error.details : [NSNull null]),
};
}
return [NSDictionary dictionaryWithObjectsAndKeys:(result ? result : [NSNull null]), @"result",
errorDict, @"error", nil];
return @{
@"result": (result ? result : [NSNull null]),
@"error": errorDict,
};
}

@interface ACSearchReply ()
+ (ACSearchReply *)fromMap:(NSDictionary *)dict;
- (NSDictionary *)toMap;
+(ACSearchReply*)fromMap:(NSDictionary*)dict;
-(NSDictionary*)toMap;
@end
@interface ACSearchRequest ()
+ (ACSearchRequest *)fromMap:(NSDictionary *)dict;
- (NSDictionary *)toMap;
+(ACSearchRequest*)fromMap:(NSDictionary*)dict;
-(NSDictionary*)toMap;
@end
@interface ACNested ()
+ (ACNested *)fromMap:(NSDictionary *)dict;
- (NSDictionary *)toMap;
+(ACNested*)fromMap:(NSDictionary*)dict;
-(NSDictionary*)toMap;
@end

@implementation ACSearchReply
+ (ACSearchReply *)fromMap:(NSDictionary *)dict {
ACSearchReply *result = [[ACSearchReply alloc] init];
+(ACSearchReply*)fromMap:(NSDictionary*)dict {
ACSearchReply* result = [[ACSearchReply alloc] init];
result.result = dict[@"result"];
if ((NSNull *)result.result == [NSNull null]) {
result.result = nil;
Expand All @@ -48,18 +50,17 @@ + (ACSearchReply *)fromMap:(NSDictionary *)dict {
if ((NSNull *)result.error == [NSNull null]) {
result.error = nil;
}
result.state = (int)dict[@"state"];
return result;
}
- (NSDictionary *)toMap {
return [NSDictionary
dictionaryWithObjectsAndKeys:(self.result ? self.result : [NSNull null]), @"result",
(self.error ? self.error : [NSNull null]), @"error", nil];
-(NSDictionary*)toMap {
return [NSDictionary dictionaryWithObjectsAndKeys:(self.result ? self.result : [NSNull null]), @"result", (self.error ? self.error : [NSNull null]), @"error", @(self.state), @"state", nil];
}
@end

@implementation ACSearchRequest
+ (ACSearchRequest *)fromMap:(NSDictionary *)dict {
ACSearchRequest *result = [[ACSearchRequest alloc] init];
+(ACSearchRequest*)fromMap:(NSDictionary*)dict {
ACSearchRequest* result = [[ACSearchRequest alloc] init];
result.query = dict[@"query"];
if ((NSNull *)result.query == [NSNull null]) {
result.query = nil;
Expand All @@ -74,87 +75,101 @@ + (ACSearchRequest *)fromMap:(NSDictionary *)dict {
}
return result;
}
- (NSDictionary *)toMap {
return [NSDictionary
dictionaryWithObjectsAndKeys:(self.query ? self.query : [NSNull null]), @"query",
(self.anInt ? self.anInt : [NSNull null]), @"anInt",
(self.aBool ? self.aBool : [NSNull null]), @"aBool", nil];
-(NSDictionary*)toMap {
return [NSDictionary dictionaryWithObjectsAndKeys:(self.query ? self.query : [NSNull null]), @"query", (self.anInt ? self.anInt : [NSNull null]), @"anInt", (self.aBool ? self.aBool : [NSNull null]), @"aBool", nil];
}
@end

@implementation ACNested
+ (ACNested *)fromMap:(NSDictionary *)dict {
ACNested *result = [[ACNested alloc] init];
+(ACNested*)fromMap:(NSDictionary*)dict {
ACNested* result = [[ACNested alloc] init];
result.request = [ACSearchRequest fromMap:dict[@"request"]];
if ((NSNull *)result.request == [NSNull null]) {
result.request = nil;
}
return result;
}
- (NSDictionary *)toMap {
return [NSDictionary
dictionaryWithObjectsAndKeys:(self.request ? [self.request toMap] : [NSNull null]),
@"request", nil];
-(NSDictionary*)toMap {
return [NSDictionary dictionaryWithObjectsAndKeys:(self.request ? [self.request toMap] : [NSNull null]), @"request", nil];
}
@end

@interface ACFlutterSearchApi ()
@property(nonatomic, strong) NSObject<FlutterBinaryMessenger> *binaryMessenger;
@property (nonatomic, strong) NSObject<FlutterBinaryMessenger>* binaryMessenger;
@end

@implementation ACFlutterSearchApi
- (instancetype)initWithBinaryMessenger:(NSObject<FlutterBinaryMessenger> *)binaryMessenger {
- (instancetype)initWithBinaryMessenger:(NSObject<FlutterBinaryMessenger>*)binaryMessenger {
self = [super init];
if (self) {
self.binaryMessenger = binaryMessenger;
_binaryMessenger = binaryMessenger;
}
return self;
}

- (void)search:(ACSearchRequest *)input
completion:(void (^)(ACSearchReply *, NSError *))completion {
FlutterBasicMessageChannel *channel = [FlutterBasicMessageChannel
- (void)search:(ACSearchRequest*)input completion:(void(^)(ACSearchReply*, NSError* _Nullable))completion {
FlutterBasicMessageChannel *channel =
[FlutterBasicMessageChannel
messageChannelWithName:@"dev.flutter.pigeon.FlutterSearchApi.search"
binaryMessenger:self.binaryMessenger];
NSDictionary *inputMap = [input toMap];
[channel sendMessage:inputMap
reply:^(id reply) {
NSDictionary *outputMap = reply;
ACSearchReply *output = [ACSearchReply fromMap:outputMap];
completion(output, nil);
}];
binaryMessenger:self.binaryMessenger];
NSDictionary* inputMap = [input toMap];
[channel sendMessage:inputMap reply:^(id reply) {
NSDictionary* outputMap = reply;
ACSearchReply * output = [ACSearchReply fromMap:outputMap];
completion(output, nil);
}];
}
@end
void ACNestedApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ACNestedApi> api) {
{
FlutterBasicMessageChannel *channel =
[FlutterBasicMessageChannel messageChannelWithName:@"dev.flutter.pigeon.NestedApi.search"
binaryMessenger:binaryMessenger];
[FlutterBasicMessageChannel
messageChannelWithName:@"dev.flutter.pigeon.NestedApi.search"
binaryMessenger:binaryMessenger];
if (api) {
[channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
FlutterError *error;
ACNested *input = [ACNested fromMap:message];
FlutterError *error;
ACSearchReply *output = [api search:input error:&error];
callback(wrapResult([output toMap], error));
}];
} else {
}
else {
[channel setMessageHandler:nil];
}
}
}
void ACApiSetup(id<FlutterBinaryMessenger> binaryMessenger, id<ACApi> api) {
{
FlutterBasicMessageChannel *channel =
[FlutterBasicMessageChannel messageChannelWithName:@"dev.flutter.pigeon.Api.search"
binaryMessenger:binaryMessenger];
[FlutterBasicMessageChannel
messageChannelWithName:@"dev.flutter.pigeon.Api.initialize"
binaryMessenger:binaryMessenger];
if (api) {
[channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
FlutterError *error;
[api initialize:&error];
callback(wrapResult(nil, error));
}];
}
else {
[channel setMessageHandler:nil];
}
}
{
FlutterBasicMessageChannel *channel =
[FlutterBasicMessageChannel
messageChannelWithName:@"dev.flutter.pigeon.Api.search"
binaryMessenger:binaryMessenger];
if (api) {
[channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
ACSearchRequest *input = [ACSearchRequest fromMap:message];
FlutterError *error;
ACSearchReply *output = [api search:input error:&error];
callback(wrapResult([output toMap], error));
}];
} else {
}
else {
[channel setMessageHandler:nil];
}
}
Expand Down
Loading