🤖 Merge PR #46342 Lots of fixes for firefox-webext-browser by @jsmnbom

- Fix handling of some functions with optional parameters (browser.runtime.connect, browser.alarms.create, etc, jsmnbom/definitelytyped-firefox-webext-browser#36)
- Fix a couple of return types (browser.alarms.get, browser.cookies.get, browser.cookies.remove) jsmnbom/definitelytyped-firefox-webext-browser#35
- Fix additional types from events having "Undefined in their name"
- Make "enums" with a single item not output an additional type
- Finally always use addtionaltypes for internal interfaces (with underscores in front) - this allows for using them in user code jsmnbom/definitelytyped-firefox-webext-browser#31

types/firefox-webext-browser/firefox-webext-browser-tests.ts

@@ -10,16 +10,16 @@ browser._manifest; // $ExpectError
 // browser.runtime
 const port = browser.runtime.connect();
 port.postMessage(); // $ExpectError
-port.postMessage({test: "ok"});
+port.postMessage({ test: 'ok' });
 
-port.onDisconnect.addListener((p) => {
+port.onDisconnect.addListener(p => {
     if (p.error) {
         console.log(`Disconnected due to an error: ${p.error.message}`);
     }
 });
 
-port.onMessage.addListener((response) => {
-    console.log("Received: " + response);
+port.onMessage.addListener(response => {
+    console.log('Received: ' + response);
 });
 
 browser.bookmarks.getTree();
@@ -28,20 +28,24 @@ browser.proxy.onError.addListener(error => {
     console.error(`Proxy error: ${error.message}`);
 });
 
-browser.proxy.onRequest.addListener(d => {
-    console.log(d.requestId);
-}, {
-    urls: ['test']
-}, ["requestHeaders"]);
+browser.proxy.onRequest.addListener(
+    d => {
+        console.log(d.requestId);
+    },
+    {
+        urls: ['test'],
+    },
+    ['requestHeaders'],
+);
 
-browser.webNavigation.onBeforeNavigate.addListener(d => {
-    console.log(d.url, d.timeStamp);
-}, {
-    url: [
-        {hostContains: 'something'},
-        {hostPrefix: 'somethineelse'}
-    ]
-});
+browser.webNavigation.onBeforeNavigate.addListener(
+    d => {
+        console.log(d.url, d.timeStamp);
+    },
+    {
+        url: [{ hostContains: 'something' }, { hostPrefix: 'somethineelse' }],
+    },
+);
 
 browser.runtime.connect().onDisconnect.addListener(() => {
     console.log('ok');
@@ -53,3 +57,31 @@ browser.storage.onChanged.addListener((changes, area) => {
         console.log(changes[key].newValue);
     }
 });
+
+/* Test to make sure function optionals work properly */
+
+browser.runtime.connect();
+browser.runtime.connect({ name: 'my-port-name' });
+browser.runtime.connect({});
+browser.runtime.connect('extension-id', { name: 'my-port-name' });
+browser.runtime.connect('extension-id', {});
+browser.runtime.connect('extension-id');
+
+browser.tabs.reload();
+browser.tabs.reload(15);
+browser.tabs.reload(15, {
+    bypassCache: true,
+});
+browser.tabs.reload({
+    bypassCache: true,
+});
+
+browser.tabs.captureTab();
+browser.tabs.captureTab(15);
+browser.tabs.captureTab(15, {format: 'png'});
+browser.tabs.captureTab({format: 'png'});
+
+browser.tabs.captureVisibleTab();
+browser.tabs.captureVisibleTab(15);
+browser.tabs.captureVisibleTab(15, {format: 'png'});
+browser.tabs.captureVisibleTab({format: 'png'});

types/firefox-webext-browser/tslint.json

@@ -3,6 +3,7 @@
     "rules": {
         "no-mergeable-namespace": false,
         "no-unnecessary-qualifier": false,
-        "unified-signatures": false
+        "unified-signatures": false,
+        "max-line-length": false
     }
 }