🏷️ Fix windowApi types for globals

apps/content/src/browser/lib/window/api.ts

@@ -19,26 +19,12 @@ import {
 } from './tabs'
 import { id, setId } from './window'
 
-export type WindowTriggers = {
-  bookmarkCurrentPage: undefined
-}
-
-export const windowApi = {
-  /**
-   * Identify which window this is. This should be used for actions like tab
-   * moving that go across windows
-   *
-   * Note: You need to wait for the window watcher to register this window
-   * before you get a valid id
-   */
+export const windowApi: WindowApi = {
   id,
 
-  /**
-   * Sets the window ID. You should only use this if you are the WindowWatcher
-   */
   setId,
 
-  windowTriggers: mitt<WindowTriggers>(),
+  windowTriggers: mitt(),
   window: {
     /**
      * @todo Move this into BrowserWindowTracker

apps/content/src/browser/lib/window/arguments.ts

@@ -2,13 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-export interface WindowConfiguration {
-  /**
-   * The initial page to show when the window is opened
-   */
-  initialUrl: string
-}
-
 const defaultWindowConfiguration: WindowConfiguration = {
   initialUrl: Services.prefs.getStringPref(
     'browser.newwindow.default',

apps/content/src/browser/lib/window/tabs.ts

@@ -61,7 +61,7 @@ export function setCurrentTab(tab: Tab) {
   setCurrentTabIndex(index)
 }
 
-export function runOnCurrentTab<R>(method: (tab: Tab) => R): R | void {
+export function runOnCurrentTab<R>(method: (tab: Tab) => R): R | undefined {
   const currentTab = getCurrentTab()
   if (currentTab) return method(currentTab)
 }

apps/content/src/types.d.ts

@@ -14,7 +14,6 @@ declare module '*.txt' {
 }
 
 declare interface Window {
-  windowApi: typeof import('./browser/lib/window/api').windowApi
   browserDOMWindow: nsIBrowserDOMWindowType
   /**
    * Arguments that may be passed into a specific window. We control these types

libs/link/types/_link.d.ts

@@ -12,6 +12,7 @@
 /// <reference path="./globals/Elements.d.ts" />
 /// <reference path="./globals/MatchPattern.d.ts" />
 /// <reference path="./globals/MessageManager.d.ts" />
+/// <reference path="./globals/WindowApi.d.ts" />
 
 /// <reference path="./interfaces/ClickHandler.d.ts" />
 /// <reference path="./interfaces/ContextMenu.d.ts" />

libs/link/types/globals/WindowApi.d.ts

@@ -0,0 +1,50 @@
+type WindowTriggers = {
+  bookmarkCurrentPage: undefined
+}
+
+declare interface WindowConfiguration {
+  /**
+   * The initial page to show when the window is opened
+   */
+  initialUrl: string
+}
+
+declare type WindowApi = {
+  /**
+   * Identify which window this is. This should be used for actions like tab
+   * moving that go across windows
+   *
+   * Note: You need to wait for the window watcher to register this window
+   * before you get a valid id
+   */
+  id: number
+  /**
+   * Sets the window ID. You should only use this if you are the WindowWatcher
+   */
+  setId: (id: number) => void
+
+  windowTriggers: import('mitt').Emitter<WindowTriggers>
+
+  window: {
+    new: (args?: WindowArguments) => unknown
+  }
+
+  tabs: {
+    closeTab(tab: Tab): void
+    openTab(url?: nsIURIType): Tab
+    runOnCurrentTab<R>(callback: (tab: Tab) => R): R | undefined
+    setCurrentTab(tab: Tab): void
+    getCurrentTab(): Tab | undefined
+    getTabById(id: number): Tab | undefined
+    tabs: Tab[]
+    setIcon(browser: XULBrowserElement, iconURL: string): void
+  }
+
+  contextMenu: {
+    showContextMenu(menuInfo: ContextMenuInfo, actor: JSWindowActorParent): void
+  }
+}
+
+declare interface Window {
+  windowApi: WindowApi
+}