- Support native return to JavaScript as [Promise](https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Global_Objects/Promise).

DavinAhn · DavinAhn · commit 61f22659f7ca · 2019-02-28T18:07:06.000+09:00
- Add `logEnabled` property. (default: `true`)
- Add `callbackTimeout` property. (default: `10`)
- Rename `shouldSafeMethodCall` to `ignoreMethodCallWhenReceivedNull`.
- Rename `shouldConvertJSONString` to `convertsToDictionaryWhenReceivedJsonString`.
- Fix an issue where string composed of numbers were cast to `JSInt` by parsing top-level objects as `JSONSerialization` with `allowFragments` read option.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-* None.
+### Added
+
+* Support native return to JavaScript as [Promise](https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Global_Objects/Promise).
+* Add `logEnabled` property. (default: `true`)
+* Add `callbackTimeout` property. (default: `10`)
+
+### Changed
+
+* Rename `shouldSafeMethodCall` to `ignoreMethodCallWhenReceivedNull`.
+* Rename `shouldConvertJSONString` to `convertsToDictionaryWhenReceivedJsonString`.
+
+### Fixed
+
+* Fix an issue where string composed of numbers were cast to `JSInt` by parsing top-level objects as `JSONSerialization` with `allowFragments` read option.
 
 ## [1.2.0 (2019-02-26)]
 
@@ -70,7 +83,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 
 * Add method invocation notification.
-* Add `shouldSafeMethodCall` option.
+* Add `shouldSafeMethodCall` property.
 
 ## [1.1.0 (2017-01-18)]
 
diff --git a/README.md b/README.md
@@ -1,18 +1,21 @@
 # WKJavaScriptController
+
 Calling native code from Javascript in iOS likes JavascriptInterface in Android.
 
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/WKJavaScriptController.svg?style=flat)](https://cocoadocs.org/docsets/WKJavaScriptController)
 [![Platform](https://img.shields.io/cocoapods/p/WKJavaScriptController.svg?style=flat)](https://cocoadocs.org/docsets/WKJavaScriptController)
 [![License](https://img.shields.io/cocoapods/l/WKJavaScriptController.svg?style=flat)](https://cocoadocs.org/docsets/WKJavaScriptController)
 
 ## Requirements
+
 - Xcode 10.0+
 - Swift 4.2
 - iOS8+
 
 (based on WKJavaScriptController 1.2.0+)
 
 ## Installation
+
 This library is distributed by [CocoaPods](https://cocoapods.org).
 
  CocoaPods is a dependency manager for Cocoa projects. You can install it with the following command:
@@ -40,6 +43,7 @@ $ pod install
 ```
 
 ## Usage
+
 ```swift
 import WKJavaScriptController
 
@@ -49,6 +53,8 @@ import WKJavaScriptController
     func onSubmit(_ dictonary: [String: AnyObject])
     func onSubmit(_ email: String, firstName: String, lastName: String, address1: String, address2: String, zipCode: JSInt, phoneNumber: String)
     func onCancel()
+    var isSubmitted: JSBool { get }
+    @objc optional func getErrorMessages(codes: [JSInt]) -> [String]
 }
 
 // Implement protocol. 
@@ -64,6 +70,14 @@ extension ViewController: JavaScriptInterface {
     func onCancel() {
         NSLog("onCancel")
     }
+    
+    var isSubmitted: JSBool {
+        return JSBool(true)
+    }
+    
+    func getErrorMessages(codes: [JSInt]) -> [String] {
+        return ["dummy1", "dummy2", "dummy3"]
+    }
 }
 
 class ViewController: UIViewController {
@@ -101,10 +115,24 @@ native.onSubmit({
 });
 ```
 
+Can receive native return in JavaScript as [Promise](https://developer.mozilla.org/ko/docs/Web/JavaScript/Reference/Global_Objects/Promise):
+
+```js
+// In javascript.
+const isSubmitted = await native.isSubmitted;
+// or native.isSubmitted.then(isSubmitted => ...);
+const messages = await native.getErrorMessages([200, 400, 500]);
+// or native.getErrorMessages([200, 400, 500]).then(messages => ...);
+```
+
 ## Limitations
-- Can not receive native return in JavaScript.
+
+- Can not receive native return in JavaScript as sync. can only async return.
 - Method argument length is up to 10.
-- Allowed argument types are NSNumber, NSString, NSDate, NSArray, NSDictionary, and NSNull(when `undefined` passed).
-- If Value types of Swift(Bool, Int32, Int, Float, Double, ...) used in argument that are not wrapped in NSArray or NSDictionary, it must be replaced with JSBool, JSInt or JSFloat.
-  (Because Value types of Swift in ObjC is replaced by NSNumber.)
+- Allowed argument types are String, Date, Array, Dictionary, JSBool, JSInt, JSFloat, NSNumber and NSNull(when `undefined` or `null` passed from JavaScript).
+- If Swift value types(Bool, Int32, Int, Float, Double, ...) used in argument, it must be replaced with JSBool, JSInt or JSFloat. (Because Swift value type is replaced by NSNumber in ObjC.)
 - Class methods in protocol are not supported.
+
+## License
+
+[MIT](https://github.com/ridi/WKJavaScriptController/blob/master/LICENSE)
diff --git a/WKJavaScriptController-Demo/WKJavaScriptController-Demo.xcodeproj/project.pbxproj b/WKJavaScriptController-Demo/WKJavaScriptController-Demo.xcodeproj/project.pbxproj
@@ -19,6 +19,8 @@
 
 /* Begin PBXFileReference section */
 		272FAEE1CFFC059EDAA9D22F /* Pods_WKJavaScriptController_Demo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WKJavaScriptController_Demo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		2A34D7D622277CB800250021 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../README.md; sourceTree = "<group>"; };
+		2A34D7D722277CC200250021 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; name = CHANGELOG.md; path = ../../CHANGELOG.md; sourceTree = "<group>"; };
 		2CC90156977464A015EF3DCC /* Pods-WKJavaScriptController-Demo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WKJavaScriptController-Demo.debug.xcconfig"; path = "Target Support Files/Pods-WKJavaScriptController-Demo/Pods-WKJavaScriptController-Demo.debug.xcconfig"; sourceTree = "<group>"; };
 		83D5383F1E2C960D00E42B6A /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
 		83D538411E2C978000E42B6A /* index.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = index.js; sourceTree = "<group>"; };
@@ -65,6 +67,8 @@
 		83FA358C1E2C5C6900A6B171 /* WKJavaScriptController-Demo */ = {
 			isa = PBXGroup;
 			children = (
+				2A34D7D622277CB800250021 /* README.md */,
+				2A34D7D722277CC200250021 /* CHANGELOG.md */,
 				83FA358D1E2C5C6900A6B171 /* AppDelegate.swift */,
 				83FA358F1E2C5C6900A6B171 /* ViewController.swift */,
 				83FA35911E2C5C6900A6B171 /* Main.storyboard */,
diff --git a/WKJavaScriptController-Demo/WKJavaScriptController-Demo/ViewController.swift b/WKJavaScriptController-Demo/WKJavaScriptController-Demo/ViewController.swift
@@ -9,6 +9,8 @@ import WKJavaScriptController
     func onSubmit(_ dictonary: [String: AnyObject], clear: JSBool)
     func onSubmit(_ email: String, firstName: String, lastName: String, address1: String, address2: String, zipCode: JSInt, phoneNumber: String)
     func onCancel()
+    var isSubmitted: JSBool { get }
+    @objc optional func getErrorMessages(codes: [JSInt]) -> [String]
 }
 
 // Implement protocol.
@@ -31,6 +33,14 @@ extension ViewController: JavaScriptInterface {
     func onCancel() {
         NSLog("onCancel")
     }
+    
+    var isSubmitted: JSBool {
+        return JSBool(true)
+    }
+    
+    func getErrorMessages(codes: [JSInt]) -> [String] {
+        return codes.map { "message\($0)" }
+    }
 }
 
 class ViewController: UIViewController {
diff --git a/WKJavaScriptController-Demo/WKJavaScriptController-Demo/index.js b/WKJavaScriptController-Demo/WKJavaScriptController-Demo/index.js
@@ -12,7 +12,7 @@ function submit() {
     if (isChecked('input_json')) {
         native.onSubmit(values);
     } else if (isChecked('input_literal')) {
-        native.onSubmitWithFirstnameAndLastnameAndAddress1AndAddress2AndZipcodeAndPhonenumber(values['mail'], values['first_name'], values['last_name'], values['address_line_1'], values['address_line_2'], parseInt(values['zip_code']), values['phone_number']);
+        native.onSubmitWithFirstnameAndLastnameAndAddress1AndAddress2AndZipcodeAndPhonenumber(values['mail'], values['first_name'], values['last_name'], values['address_line_1'], values['address_line_2'], parseInt(values['zip_code']), `${values['phone_number']}`);
     }
 }
 
diff --git a/WKJavaScriptController/WKJavaScriptController.swift b/WKJavaScriptController/WKJavaScriptController.swift

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ function submit() {`
`12`	`12`	`if (isChecked('input_json')) {`
`13`	`13`	`native.onSubmit(values);`
`14`	`14`	`} else if (isChecked('input_literal')) {`
`15`		`- native.onSubmitWithFirstnameAndLastnameAndAddress1AndAddress2AndZipcodeAndPhonenumber(values['mail'], values['first_name'], values['last_name'], values['address_line_1'], values['address_line_2'], parseInt(values['zip_code']), values['phone_number']);`
	`15`	+ native.onSubmitWithFirstnameAndLastnameAndAddress1AndAddress2AndZipcodeAndPhonenumber(values['mail'], values['first_name'], values['last_name'], values['address_line_1'], values['address_line_2'], parseInt(values['zip_code']), `${values['phone_number']}`);
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`