feat: support inner types like Promise<boolean> (#115)

* chore: fix the npm audit issues

* feat: support inner types for things like Promise<Boolean>

Author: MarshallOfSound

lib/utils.js

@@ -42,6 +42,8 @@ const typify = (type) => {
 
   if (!type) return 'any'
 
+  let innerType
+
   if (typeof type === 'object') {
     let newType = type.typeName || type.type || 'any'
 
@@ -55,6 +57,10 @@ const typify = (type) => {
       if (type.collection) newType += '[]'
     }
 
+    if (type.innerType) {
+      innerType = type.innerType
+    }
+
     type = newType
   }
 
@@ -67,9 +73,11 @@ const typify = (type) => {
     case 'integer[]':
     case 'float[]':
       return 'number[]'
-    case 'array':
+    case 'array': {
+      if (innerType) return `Array<${innerType}>`
       debug('Untyped "Array" as return type'.yellow)
       return 'any[]'
+    }
     case 'true':
     case 'false':
       debug('"true" or "false" provided as return value, inferring "Boolean" type'.info)
@@ -94,6 +102,10 @@ const typify = (type) => {
     case 'buffer[]':
       return 'Buffer[]'
     case 'promise':
+      if (innerType) {
+        return `Promise<${innerType}>`
+      }
+      debug('Promise with missing inner type, defaulting to any')
       return 'Promise<any>'
     case 'url':
       return 'string'
@@ -175,13 +187,13 @@ const genMethodString = (paramInterfaces, module, moduleMethod, parameters, retu
     if (Array.isArray(param.type)) {
       param.type = param.type.map((paramType) => {
         if (paramType.typeName === 'Function' && param.parameters) {
-          return Object.assign({}, paramType, { typeName: genMethodString(paramInterfaces, module, moduleMethod, param.parameters, param.returns) })
+          return Object.assign({}, paramType, { typeName: genMethodString(paramInterfaces, module, moduleMethod, param.parameters, param.returns || paramType.innerType) })
         }
         return paramType
       })
     }
     if (param.type === 'Function' && param.parameters) {
-      paramType = genMethodString(paramInterfaces, module, moduleMethod, param.parameters, param.returns)
+      paramType = genMethodString(paramInterfaces, module, moduleMethod, param.parameters, param.returns || param.innerType)
     }
 
     const name = paramify(param.name)

vendor/fetch-docs.js

@@ -7,7 +7,7 @@ const mkdirp = require('mkdirp').sync
 const os = require('os')
 
 const downloadPath = path.join(os.tmpdir(), 'electron-api-tmp')
-const ELECTRON_COMMIT = '83b7f2369a3d7301f1038171636c8704be8b6818'
+const ELECTRON_COMMIT = '8f89b6748dadbd9b19d1a2e272e5df167291ef3a'
 
 rm(downloadPath)