1 files changed, 25 insertions, 27 deletions

diff --git a/toolkit/components/extensions/types/extensions.ts b/toolkit/components/extensions/types/extensions.ts
index 8f9555421b..e232ab4a3f 100644
--- a/toolkit/components/extensions/types/extensions.ts
+++ b/toolkit/components/extensions/types/extensions.ts
@@ -1,5 +1,5 @@
 /**
- * Type declarations for WebExtensions framework code.
+ * Types specific to toolkit/extensions code.
  */
 
 // This has every possible property we import from all modules, which is not
@@ -42,39 +42,37 @@ type LazyAll = {
   getTrimmedString: typeof import("ExtensionTelemetry.sys.mjs").getTrimmedString,
 };
 
-// Utility type to extract all strings from a const array, to use as keys.
-type Items<A> = A extends ReadonlyArray<infer U extends string> ? U : never;
-
 declare global {
-  type Lazy<Keys extends keyof LazyAll = keyof LazyAll> = Pick<LazyAll, Keys> & { [k: string]: any };
+  type Lazy = Partial<LazyAll> & { [k: string]: any };
 
-  // Export JSDoc types, and make other classes available globally.
-  type ConduitAddress = import("ConduitsParent.sys.mjs").ConduitAddress;
-  type ConduitID = import("ConduitsParent.sys.mjs").ConduitID;
+  type BaseContext = import("ExtensionCommon.sys.mjs").BaseContext;
+  type ExtensionChild = import("ExtensionChild.sys.mjs").ExtensionChild;
   type Extension = import("Extension.sys.mjs").Extension;
+  type callback = (...any) => any;
+
+  interface nsIDOMProcessChild  {
+    getActor(name: "ProcessConduits"): ProcessConduitsChild;
+  }
 
-  // Something about Class type not being exported when nested in a namespace?
-  type BaseContext = InstanceType<typeof import("ExtensionCommon.sys.mjs").ExtensionCommon.BaseContext>;
-  type BrowserExtensionContent = InstanceType<typeof import("ExtensionContent.sys.mjs").ExtensionContent.BrowserExtensionContent>;
-  type EventEmitter = InstanceType<typeof import("ExtensionCommon.sys.mjs").ExtensionCommon.EventEmitter>;
-  type ExtensionAPI = InstanceType<typeof import("ExtensionCommon.sys.mjs").ExtensionCommon.ExtensionAPI>;
-  type ExtensionError = InstanceType<typeof import("ExtensionUtils.sys.mjs").ExtensionUtils.ExtensionError>;
-  type LocaleData = InstanceType<typeof import("ExtensionCommon.sys.mjs").ExtensionCommon.LocaleData>;
-  type ProxyAPIImplementation = InstanceType<typeof import("ExtensionChild.sys.mjs").ExtensionChild.ProxyAPIImplementation>;
-  type SchemaAPIInterface = InstanceType<typeof import("ExtensionCommon.sys.mjs").ExtensionCommon.SchemaAPIInterface>;
-  type WorkerExtensionError = InstanceType<typeof import("ExtensionUtils.sys.mjs").ExtensionUtils.WorkerExtensionError>;
+  interface WebExtensionContentScript {
+    userScriptOptions: { scriptMetadata: object };
+  }
 
-  // Other misc types.
-  type AddonWrapper = any;
-  type Context = BaseContext;
-  type NativeTab = Element;
-  type SavedFrame = object;
+  interface WebExtensionPolicy {
+    extension: Extension;
+    debugName: string;
+    instanceId: string;
+    optionalPermissions: string[];
+  }
 
   // Can't define a const generic parameter in jsdocs yet.
   // https://github.com/microsoft/TypeScript/issues/56634
-  type ConduitInit<Send> = ConduitAddress & { send: Send; };
-  type Conduit<Send> = import("../ConduitsChild.sys.mjs").PointConduit & { [s in `send${Items<Send>}`]: callback };
-  type ConduitOpen = <const Send>(subject: object, address: ConduitInit<Send>) => Conduit<Send>;
+  function ConduitGen<const Send>(_, init: Init<Send>, _actor?): Conduit<Send>;
+  type Items<A> = A extends ReadonlyArray<infer U extends string> ? U : never;
 }
 
-export {}
+import { PointConduit, ProcessConduitsChild } from "ConduitsChild.sys.mjs";
+import { ConduitAddress } from "ConduitsParent.sys.mjs";
+
+type Conduit<Send> = PointConduit & { [s in `send${Items<Send>}`]: callback };
+type Init<Send> = ConduitAddress & { send: Send; };