fix(ios): have KrollPromise static methods return instancetype, not J…

…SValue*
tidev · Jan 26, 2021 · de50c8c · de50c8c
1 parent 62ee5c5
commit de50c8c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/Kroll/KrollPromise.h b/iphone/TitaniumKit/TitaniumKit/Sources/Kroll/KrollPromise.h
@@ -23,8 +23,9 @@
 
 - (KrollPromise *)initInContext:(JSContext *)context;
 
-+ (JSValue *)resolved:(NSArray *)arguments inContext:(JSContext *)context;
-+ (JSValue *)rejected:(NSArray *)arguments inContext:(JSContext *)context;
++ (KrollPromise *)resolved:(NSArray *)arguments inContext:(JSContext *)context;
++ (KrollPromise *)rejected:(NSArray *)arguments inContext:(JSContext *)context;
++ (KrollPromise *)rejectedWithErrorMessage:(NSString *)message inContext:(JSContext *)context;
 
 @end
 

diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/Kroll/KrollPromise.m b/iphone/TitaniumKit/TitaniumKit/Sources/Kroll/KrollPromise.m
@@ -39,18 +39,26 @@ - (KrollPromise *)initInContext:(JSContext *)context
   return self;
 }
 
-+ (JSValue *)resolved:(NSArray *)arguments inContext:(JSContext *)context
++ (KrollPromise *)resolved:(NSArray *)arguments inContext:(JSContext *)context
 {
   KrollPromise *promise = [[[KrollPromise alloc] initInContext:context] autorelease];
   [promise resolve:arguments];
-  return promise.JSValue;
+  return promise;
 }
 
-+ (JSValue *)rejected:(NSArray *)arguments inContext:(JSContext *)context
++ (KrollPromise *)rejected:(NSArray *)arguments inContext:(JSContext *)context
 {
   KrollPromise *promise = [[[KrollPromise alloc] initInContext:context] autorelease];
   [promise reject:arguments];
-  return promise.JSValue;
+  return promise;
+}
+
++ (KrollPromise *)rejectedWithErrorMessage:(NSString *)message inContext:(JSContext *)context
+{
+  KrollPromise *promise = [[[KrollPromise alloc] initInContext:context] autorelease];
+  JSValue *error = [JSValue valueWithNewErrorFromMessage:message inContext:context];
+  [promise reject:@[ error ]];
+  return promise;
 }
 
 - (void)resolve:(NSArray *)arguments