fix generation of callback parameters

Author: cypressious

README.md

@@ -22,7 +22,7 @@ and
 ```groovy 
 dependencies {
     // ...
-    compile 'com.github.cypressious.kotlin-webextensions-declarations:webextensions-declarations:v0.1'
+    compile 'com.github.cypressious.kotlin-webextensions-declarations:webextensions-declarations:v0.2'
 }
 ```
 

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.2.0'
-    ext.publish_version = 0.1
+    ext.publish_version = '0.2'
 
     repositories {
         jcenter()

declarations/src/main/kotlin/alarms/alarms.kt

@@ -1,7 +1,7 @@
 package alarms
 
-import webextensions.Event
 import kotlin.js.Promise
+import webextensions.Event
 
 class Alarm(
         /**

declarations/src/main/kotlin/downloads/downloads.kt

@@ -1,7 +1,7 @@
 package downloads
 
-import kotlin.js.Promise
 import webextensions.Event
+import kotlin.js.Promise
 
 typealias FilenameConflictAction = String
 
@@ -232,8 +232,6 @@ class Options2(/**
  */
 var size: Int? = null)
 
-typealias Callback = Any
-
 class DownloadDelta(
         /**
          * The <code>id</code> of the <a href='#type-DownloadItem'>DownloadItem</a> that changed.

declarations/src/main/kotlin/menus/menus.kt

@@ -91,10 +91,6 @@ class Icons() {
     }
 }
 
-/**
- * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for $(ref:contextMenus.onClicked). */
-typealias Onclick = Any
-
 /**
  * The ID of a parent menu item; this makes the item a child of a previously added item. */
 typealias ParentId = Any
@@ -124,7 +120,7 @@ class CreateProperties(
         /**
          * A function that will be called back when the menu item is clicked. Event pages cannot use this; instead, they should register a listener for $(ref:contextMenus.onClicked).
          */
-        var onclick: Onclick? = null,
+        var onclick: (() -> Unit)? = null,
         /**
          * The ID of a parent menu item; this makes the item a child of a previously added item.
          */
@@ -147,10 +143,6 @@ class CreateProperties(
         var command: String? = null
 )
 
-/**
- * Called when the item has been created in the browser. If there were any problems creating the item, details will be available in $(ref:runtime.lastError). */
-typealias Callback = Any
-
 /**
  * The ID of the newly created item. */
 typealias CreateResult = Any
@@ -159,8 +151,6 @@ typealias CreateResult = Any
  * The ID of the item to update. */
 typealias Id = Any
 
-typealias Onclick2 = Any
-
 /**
  * Note: You cannot change an item to be a child of one of its own descendants. */
 typealias ParentId2 = Any
@@ -173,7 +163,7 @@ class UpdateProperties(
         var title: String? = null,
         var checked: Boolean? = null,
         var contexts: Array<ContextType>? = null,
-        var onclick: Onclick2,
+        var onclick: () -> Unit,
         /**
          * Note: You cannot change an item to be a child of one of its own descendants.
          */
@@ -193,7 +183,7 @@ external class MenusNamespace {
     /**
      * Creates a new context menu item. Note that if an error occurs during creation, you may not find out until the creation callback fires (the details will be in $(ref:runtime.lastError)).
      */
-    fun create(createProperties: CreateProperties, callback: Callback? = definedExternally): CreateResult
+    fun create(createProperties: CreateProperties, callback: (() -> Unit)? = definedExternally): CreateResult
 
     /**
      * Updates a previously created context menu item.

declarations/src/main/kotlin/omnibox/omnibox.kt

@@ -63,14 +63,10 @@ class DescriptionStyles2(
  */
 class DescriptionStylesRaw2(var offset: Int, var type: Int)
 
-/**
- * A callback passed to the onInputChanged event used for sending suggestions back to the browser. */
-typealias Suggest = Any
-
 external class OmniboxNamespace {
     val onInputStarted: Event<() -> Unit>
 
-    val onInputChanged: Event<(text: String, suggest: Suggest) -> Unit>
+    val onInputChanged: Event<(text: String, suggest: () -> Unit) -> Unit>
 
     val onInputEntered: Event<(text: String, disposition: OnInputEnteredDisposition) -> Unit>
 

declarations/src/main/kotlin/tabs/tabs.kt

@@ -239,8 +239,6 @@ var name: String? = null, /**
  */
 var frameId: Int? = null)
 
-typealias ResponseCallback = Any
-
 class Options(/**
  * Send a message to a specific $(topic:frame_ids)[frame] identified by <code>frameId</code> instead of all frames in the tab.
  */

declarations/src/main/kotlin/webRequest/webRequest.kt

@@ -393,8 +393,6 @@ class Details5(
         var statusCode: Int
 )
 
-typealias Callback = Any
-
 class Details6(
         /**
          * The ID of the request. Request IDs are unique within a browser session. As a result, they could be used to relate different events of the same request.
@@ -640,7 +638,7 @@ external class WebRequestNamespace {
 
     val onHeadersReceived: Event<(details: Details4) -> Unit>
 
-    val onAuthRequired: Event<(details: Details5, callback: Callback?) -> Unit>
+    val onAuthRequired: Event<(details: Details5, callback: (() -> Unit)?) -> Unit>
 
     val onResponseStarted: Event<(details: Details6) -> Unit>
 

src/main/kotlin/de/rakhman/webextensions/merging.kt

@@ -77,6 +77,7 @@ private fun Parameter.resolve(
         actual: Boolean = false,
         isReturn: Boolean = false
 ): Parameter {
+    if (type == "function") return copy(parameters = parameters?.map { it.resolve(it.name ?: name, types) })
     if (type == "array") return copy(items = items?.resolve(name, types, actual))
     if (type != "object" &&
             choices == null &&