Merge pull request #84 from electron/fix-array-multi-type

Fix multi array type

Author: zeke

lib/dynamic-param-interfaces.js

@@ -73,7 +73,13 @@ const flushParamInterfaces = (API, addToOutput) => {
         return
       }
       if (declared[paramKey]) {
-        if (!_.isEqual(paramInterfacesToDeclare[paramKey], declared[paramKey])) {
+        const toDeclareCheck = Object.assign({}, paramInterfacesToDeclare[paramKey])
+        const declaredCheck = Object.assign({}, declared[paramKey])
+        for (const prop of ['type', 'collection', 'required', 'description']) {
+          delete toDeclareCheck[prop]
+          delete declaredCheck[prop]
+        }
+        if (!_.isEqual(toDeclareCheck, declaredCheck)) {
           throw new Error('Ruh roh, "' + paramKey + '" is already declared')
         }
         delete paramInterfacesToDeclare[paramKey]

lib/utils.js

@@ -27,12 +27,17 @@ const wrapComment = (comment) => {
 
 const typify = (type) => {
   // Capture some weird edge cases
+  const originalType = type
   if (type.type && typeof type.type === 'object') {
     type = type.type
   }
 
   if (Array.isArray(type)) {
-    return Array.from(new Set(type.map(t => typify(t)))).join(' | ')
+    const arrayType = Array.from(new Set(type.map(t => typify(t)))).join(' | ')
+    if (originalType.collection) {
+      return `Array<${arrayType}>`
+    }
+    return arrayType
   }
 
   if (!type) return 'any'

test-smoke/electron/test/main.ts

@@ -24,6 +24,7 @@ import {
   systemPreferences,
   webContents,
   Event,
+  TouchBar,
 } from "electron";
 
 import * as path from "path";
@@ -1141,3 +1142,10 @@ win4.webContents.on("paint", (event, dirty, _image) => {
 });
 
 win4.loadURL("http://github.com");
+
+const unusedTouchBar = new TouchBar({
+  items: [
+    new TouchBar.TouchBarButton({ label: '' }),
+    new TouchBar.TouchBarLabel({ label: '' }),
+  ],
+});

test/output_spec.js

@@ -21,7 +21,6 @@ describe('Definition File', function () {
     spawn('node', ['cli.js', '-o=electron.d.ts'], {
       cwd: path.resolve(__dirname, '..')
     }).on('exit', () => done())
-    done()
   })
 
   it('should output a electron.d.ts file', () => {

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 = 'cb3c5ded0f99a15edc99b61d227d135f7c3521c8'
+const ELECTRON_COMMIT = 'f469059e9059aa0bda756022deb53322688dac29'
 
 rm(downloadPath)