Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/api/scripting/methods.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {browser} from "../browser";
import {callWithPromise} from "../utils";

type Awaited<T> = chrome.scripting.Awaited<T>;
// Keep the result type independent of the removed chrome.scripting.Awaited alias.
type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
type ContentScriptFilter = chrome.scripting.ContentScriptFilter;
type CSSInjection = chrome.scripting.CSSInjection;
type InjectionResult<T> = chrome.scripting.InjectionResult<T>;
Expand Down
10 changes: 7 additions & 3 deletions tests/consumer-types/scripting-methods-types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {executeScript, getRegisteredContentScripts, insertCss, registerContentScripts, removeCss, unregisterContentScripts, updateContentScripts} from "@addon-core/browser";

type Awaited<T> = chrome.scripting.Awaited<T>;
type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
type ContentScriptFilter = chrome.scripting.ContentScriptFilter;
type CSSInjection = chrome.scripting.CSSInjection;
type InjectionResult<T> = chrome.scripting.InjectionResult<T>;
Expand All @@ -20,8 +20,12 @@ type Expected = {
};

type Equal<A, B> = (<T>() => T extends A ? 1 : 2) extends (<T>() => T extends B ? 1 : 2) ? true : false;
const signaturesUnchanged: Equal<typeof methods, Expected> = true;
void [methods, signaturesUnchanged];
const signaturesUnchanged: Equal<Omit<typeof methods, "executeScript">, Omit<Expected, "executeScript">> = true;
// Conditional result aliases from different declaration files need assignability checks.
const compatibleExecuteScript: Expected["executeScript"] = executeScript;
declare const expectedExecuteScript: Expected["executeScript"];
const compatibleExpected: typeof executeScript = expectedExecuteScript;
void [methods, signaturesUnchanged, compatibleExecuteScript, compatibleExpected];

const pending: Promise<chrome.scripting.InjectionResult<number>[]> = executeScript<Promise<number>>({target: {tabId: 7}, func: async () => 42});
void pending;
Expand Down