diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 159e6b5..4da2ecd 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -448,7 +448,7 @@ "bzlTransitiveDigest": "aVqwKoRPrSXO367SJABlye04kmpR/9VM2xiXB3nh3Ls=", "usagesDigest": "qH5h0y49b/BYrI5SRoLkSpQctbXmqG8KSHgoA8eopCE=", "recordedFileInputs": { - "@@//package.json": "dd20ac9a9ddd7e87592fda0ad350539f14af9f629de460de2c36c8f66d908dd7" + "@@//package.json": "f281195ffe281de72634e34957cabe0802a02e01d4f6040efe4a584b498b02aa" }, "recordedDirentsInputs": {}, "envVariables": {}, diff --git a/Package.swift b/Package.swift index 543d5b1..82af400 100644 --- a/Package.swift +++ b/Package.swift @@ -158,7 +158,7 @@ let package = Package( ], products: allTargets.map { .library(name: $0.name, targets: [$0.name]) }, dependencies: [ - .package(url: "https://github.com/player-ui/playerui-swift-package.git", from: "0.15.4"), + .package(url: "https://github.com/player-ui/playerui-swift-package.git", from: "1.3.0"), .package(url: "https://github.com/player-ui/SwiftFlipper.git", exact: "0.3.0"), ], targets: allTargets diff --git a/devtools/client/flipper/src/__tests__/transport.test.ts b/devtools/client/flipper/src/__tests__/transport.test.ts index a3075d4..9ea4913 100644 --- a/devtools/client/flipper/src/__tests__/transport.test.ts +++ b/devtools/client/flipper/src/__tests__/transport.test.ts @@ -11,21 +11,22 @@ const INSTALLED = { version: "1.2.3", }; +type ExecFn = (method: string, ...args: Array) => Promise; + +/** + * `plugins-get-installed-plugins` resolves to `INSTALLED` (as if the plugin is + * already present) so tests unrelated to installation don't have to stub it. + */ +const defaultExec: ExecFn = async (method) => { + if (method === "plugins-get-installed-plugins") return [INSTALLED]; + return undefined; +}; + /** - * A fake `FlipperServer` whose `exec` outcomes the test controls. - * - * `plugins-get-installed-plugins` resolves to `INSTALLED` by default (as if - * the plugin is already present) so tests unrelated to installation don't - * have to stub it; pass a custom `exec` to override that. + * A fake `FlipperServer` whose `exec` outcomes the test controls; pass a + * custom `exec` to override `defaultExec`. */ -function fakeFlipperServer( - exec: (method: string, ...args: Array) => Promise = async ( - method, - ) => { - if (method === "plugins-get-installed-plugins") return [INSTALLED]; - return undefined; - }, -): FlipperServer { +function fakeFlipperServer(exec: ExecFn = defaultExec): FlipperServer { return { exec } as unknown as FlipperServer; } @@ -33,7 +34,11 @@ function fakeFlipperServer( * while exercising the connection-state and plugin-activation surfaces. */ type TransportInternals = { server: unknown; - refcount: { peek: () => { pid: number; refs: number } | null }; + refcount: { + peek: () => { pid: number; refs: number } | null; + release?: () => number | null; + acquire?: () => { shouldStart: boolean; commit: (pid: number) => void }; + }; owns: boolean; host: string; port: number; @@ -137,13 +142,13 @@ describe("FlipperServerTransport", () => { (call) => call[0] === "client-request-response", ); expect(installCallOrder).toBeLessThan( - exec.mock.invocationCallOrder[initCall], + exec.mock.invocationCallOrder[initCall]!, ); expect(exec).toHaveBeenCalledWith("plugins-get-installed-plugins"); }); it("sends init to a single client id when one is given", async () => { - const exec = vi.fn(fakeFlipperServer().exec); + const exec = vi.fn(defaultExec); const transport = new FlipperServerTransport(); attach(transport, fakeFlipperServer(exec), { connectedClientIds: ["a", "b"], @@ -163,7 +168,7 @@ describe("FlipperServerTransport", () => { }); it("sends init to every connected client that isn't already active when no id is given", async () => { - const exec = vi.fn(fakeFlipperServer().exec); + const exec = vi.fn(defaultExec); const transport = new FlipperServerTransport(); attach(transport, fakeFlipperServer(exec), { connectedClientIds: ["a", "b", "c"], @@ -190,7 +195,7 @@ describe("FlipperServerTransport", () => { }); it("still sends init to an explicit client id even if already active", async () => { - const exec = vi.fn(fakeFlipperServer().exec); + const exec = vi.fn(defaultExec); const transport = new FlipperServerTransport(); attach(transport, fakeFlipperServer(exec), { connectedClientIds: ["a"], @@ -208,7 +213,7 @@ describe("FlipperServerTransport", () => { it("swallows a per-client failure instead of rejecting the whole call", async () => { vi.spyOn(console, "warn").mockImplementation(() => {}); - const exec = vi.fn(async (method: string, id?: string) => { + const exec = vi.fn(async (method, id) => { if (method === "plugins-get-installed-plugins") return [INSTALLED]; if (id === "bad") throw new Error("boom"); return undefined; @@ -239,7 +244,7 @@ describe("FlipperServerTransport", () => { describe("disablePlugin", () => { it("sends deinit to a single client id when one is given", async () => { - const exec = vi.fn(fakeFlipperServer().exec); + const exec = vi.fn(defaultExec); const transport = new FlipperServerTransport(); attach(transport, fakeFlipperServer(exec), { activeClientIds: ["a"] }); @@ -253,7 +258,7 @@ describe("FlipperServerTransport", () => { }); it("sends deinit only to clients currently believed active when no id is given", async () => { - const exec = vi.fn(fakeFlipperServer().exec); + const exec = vi.fn(defaultExec); const transport = new FlipperServerTransport(); attach(transport, fakeFlipperServer(exec), { connectedClientIds: ["a", "b"], @@ -543,15 +548,10 @@ describe("FlipperServerTransport", () => { vi.useFakeTimers(); try { const transport = new FlipperServerTransport(); - const state = internals(transport); - state.refcount = { + internals(transport).refcount = { peek: () => null, - } as unknown as TransportInternals["refcount"]; - ( - transport as unknown as { - refcount: { release: () => number | null }; - } - ).refcount.release = () => 4242; + release: () => 4242, + }; let alive = true; const killSpy = vi.spyOn(process, "kill").mockImplementation((( @@ -591,17 +591,13 @@ describe("FlipperServerTransport", () => { const transport = new FlipperServerTransport(); let releaseCalls = 0; - ( - transport as unknown as { - refcount: { release: () => number | null }; - } - ).refcount = { + internals(transport).refcount = { peek: () => null, release: () => { releaseCalls += 1; return null; }, - } as unknown as TransportInternals["refcount"]; + }; const first = transport.close(); const second = transport.close(); @@ -649,23 +645,13 @@ describe("FlipperServerTransport", () => { // or locally, so real net.connect attempts genuinely fail fast. port: 1, }); - const state = internals(transport); - state.refcount = { + internals(transport).refcount = { peek: () => null, - } as unknown as TransportInternals["refcount"]; - ( - transport as unknown as { - refcount: { - acquire: () => { - shouldStart: boolean; - commit: (pid: number) => void; - }; - }; - } - ).refcount.acquire = () => ({ - shouldStart: true, - commit: vi.fn(), - }); + acquire: () => ({ + shouldStart: true, + commit: vi.fn(), + }), + }; const connectPromise = transport.connect().catch((err) => err as Error); diff --git a/devtools/client/react/src/plugins/index.ts b/devtools/client/react/src/plugins/index.ts index d3914f6..cc6fe21 100644 --- a/devtools/client/react/src/plugins/index.ts +++ b/devtools/client/react/src/plugins/index.ts @@ -22,7 +22,7 @@ class LogForwarder implements PlayerPlugin, ReactPlayerPlugin { } } -export const PUBSUB_PLUGIN = new PubSubPlugin(); +export const PUBSUB_PLUGIN: PubSubPlugin = new PubSubPlugin(); export const PLAYER_PLUGINS: ReactPlayerPlugin[] = [ new CommonTypesPlugin(), diff --git a/devtools/client/react/src/state/index.ts b/devtools/client/react/src/state/index.ts index ad40fb2..ba8129f 100644 --- a/devtools/client/react/src/state/index.ts +++ b/devtools/client/react/src/state/index.ts @@ -1,7 +1,13 @@ -import type { CommunicationLayerMethods } from "@player-devtools/types"; +import type { + CommunicationLayerMethods, + ExtensionState, +} from "@player-devtools/types"; import { useEffect, useMemo, useSyncExternalStore } from "react"; -import { createExtensionClient } from "@player-devtools/client"; +import { + createExtensionClient, + type ExtensionClient, +} from "@player-devtools/client"; /** * Thin React adapter over `createExtensionClient`. @@ -14,7 +20,12 @@ export const useExtensionState = ({ }: { /** the communication layer to use for the extension */ communicationLayer: CommunicationLayerMethods; -}) => { +}): { + state: ExtensionState; + selectPlayer: ExtensionClient["selectPlayer"]; + selectPlugin: ExtensionClient["selectPlugin"]; + handleInteraction: ExtensionClient["handleInteraction"]; +} => { const client = useMemo( () => createExtensionClient(communicationLayer), [communicationLayer], diff --git a/devtools/flipper-plugin/src/theme/select.ts b/devtools/flipper-plugin/src/theme/select.ts index 9e761b2..2197645 100644 --- a/devtools/flipper-plugin/src/theme/select.ts +++ b/devtools/flipper-plugin/src/theme/select.ts @@ -5,7 +5,11 @@ import { theme } from "flipper-plugin"; const { definePartsStyle, defineMultiStyleConfig } = createMultiStyleConfigHelpers(selectAnatomy.keys); -export const Select = defineMultiStyleConfig({ +export const Select: ReturnType< + ReturnType< + typeof createMultiStyleConfigHelpers<(typeof selectAnatomy.keys)[number]> + >["defineMultiStyleConfig"] +> = defineMultiStyleConfig({ baseStyle: definePartsStyle({ field: { background: theme.buttonDefaultBackground, diff --git a/devtools/flipper-plugin/src/theme/table.ts b/devtools/flipper-plugin/src/theme/table.ts index 0b4f421..5ddaf0e 100644 --- a/devtools/flipper-plugin/src/theme/table.ts +++ b/devtools/flipper-plugin/src/theme/table.ts @@ -5,7 +5,11 @@ import { theme } from "flipper-plugin"; const { definePartsStyle, defineMultiStyleConfig } = createMultiStyleConfigHelpers(tableAnatomy.keys); -export const Table = defineMultiStyleConfig({ +export const Table: ReturnType< + ReturnType< + typeof createMultiStyleConfigHelpers<(typeof tableAnatomy.keys)[number]> + >["defineMultiStyleConfig"] +> = defineMultiStyleConfig({ baseStyle: definePartsStyle({ table: { lineHeight: 1, diff --git a/devtools/mcp/src/__tests__/server.test.ts b/devtools/mcp/src/__tests__/server.test.ts index 10cab34..5903c3b 100644 --- a/devtools/mcp/src/__tests__/server.test.ts +++ b/devtools/mcp/src/__tests__/server.test.ts @@ -1,6 +1,8 @@ import { describe, it, expect, vi, beforeEach } from "vitest"; import type { Transport } from "@player-devtools/types"; +import { MCPServer } from "../server"; + const shutdown = vi.hoisted(() => vi.fn()); const createAnalytics = vi.hoisted(() => vi.fn()); @@ -18,8 +20,6 @@ vi.mock("@modelcontextprotocol/sdk/server/stdio.js", () => ({ }, })); -const { MCPServer } = await import("../server"); - /** A transport whose connect outcome the test controls. */ function fakeTransport(connect: () => Promise): Transport { return { diff --git a/devtools/mcp/src/telemetry/__tests__/index.test.ts b/devtools/mcp/src/telemetry/__tests__/index.test.ts index 732f6aa..e731719 100644 --- a/devtools/mcp/src/telemetry/__tests__/index.test.ts +++ b/devtools/mcp/src/telemetry/__tests__/index.test.ts @@ -1,5 +1,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; +import { createAnalytics } from "../index"; + const instrument = vi.hoisted(() => vi.fn()); const shutdown = vi.hoisted(() => vi.fn()); const PostHogCtor = vi.hoisted(() => vi.fn()); @@ -20,8 +22,6 @@ vi.mock("posthog-node", () => ({ }, })); -const { createAnalytics } = await import("../index"); - const KEY = "phc_test_key"; const server = {} as object; const deps = { isTransportConnected: () => true }; diff --git a/devtools/mcp/src/telemetry/__tests__/redaction.test.ts b/devtools/mcp/src/telemetry/__tests__/redaction.test.ts index c91e84c..d477747 100644 --- a/devtools/mcp/src/telemetry/__tests__/redaction.test.ts +++ b/devtools/mcp/src/telemetry/__tests__/redaction.test.ts @@ -25,7 +25,7 @@ describe("allowlistEventProperties", () => { // Assert on the serialized payload, not key presence — a nested leak would // pass a shallow key check. expect(JSON.stringify(result)).not.toContain(SECRET); - expect(result.properties).toEqual({ + expect(result?.properties).toEqual({ $mcp_tool_name: "invoke_action", $mcp_duration_ms: 12, }); @@ -42,7 +42,7 @@ describe("allowlistEventProperties", () => { }); expect(JSON.stringify(result)).not.toContain(SECRET); - expect(Object.keys(result.properties ?? {})).toEqual(["$mcp_tool_name"]); + expect(Object.keys(result?.properties ?? {})).toEqual(["$mcp_tool_name"]); }); it("preserves every allowlisted property", () => { @@ -55,7 +55,7 @@ describe("allowlistEventProperties", () => { properties, }); - expect(Object.keys(result.properties ?? {}).sort()).toEqual( + expect(Object.keys(result?.properties ?? {}).sort()).toEqual( [...ALLOWED_EVENT_PROPERTIES].sort(), ); }); @@ -66,7 +66,7 @@ describe("allowlistEventProperties", () => { properties: { $mcp_parameters: SECRET, $mcp_response: SECRET }, }); - expect(result.properties).toEqual({}); + expect(result?.properties).toEqual({}); expect(JSON.stringify(result)).not.toContain(SECRET); }); diff --git a/devtools/mcp/src/telemetry/index.ts b/devtools/mcp/src/telemetry/index.ts index aefddc5..cf0e167 100644 --- a/devtools/mcp/src/telemetry/index.ts +++ b/devtools/mcp/src/telemetry/index.ts @@ -13,9 +13,9 @@ export { export { resolveTelemetryConfig, type TelemetryConfig } from "./config"; export { getInstallId, type InstallIdDeps } from "./installId"; -declare global { - const __VERSION__: string; -} +// Scoped to this module so that packages declaring the same define don't +// collide in a shared TS program. +declare const __VERSION__: string; /** * Stamped at release build time by tsup (see devtools/tsup.config.ts). The diff --git a/devtools/mcp/src/tools/__tests__/flipper.test.ts b/devtools/mcp/src/tools/__tests__/flipper.test.ts index 1790c6e..f744e3e 100644 --- a/devtools/mcp/src/tools/__tests__/flipper.test.ts +++ b/devtools/mcp/src/tools/__tests__/flipper.test.ts @@ -1,5 +1,6 @@ import { describe, it, expect, vi } from "vitest"; import type { ExtensionClient } from "@player-devtools/client"; +import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; import { FlipperServerTransport } from "@player-devtools/client-flipper"; import type { Transport } from "@player-devtools/types"; @@ -15,8 +16,9 @@ import { const client = {} as ExtensionClient; -function parse(result: { content: Array<{ text?: string }> }): unknown { - return JSON.parse(result.content[0]?.text ?? "{}"); +function parse(result: CallToolResult): unknown { + const first = result.content[0]; + return JSON.parse(first?.type === "text" ? first.text : "{}"); } /** diff --git a/devtools/messenger/core/src/__tests__/helpers/index.ts b/devtools/messenger/core/src/__tests__/helpers/index.ts index d10875d..26ae075 100644 --- a/devtools/messenger/core/src/__tests__/helpers/index.ts +++ b/devtools/messenger/core/src/__tests__/helpers/index.ts @@ -13,19 +13,19 @@ export class MockedMessagingAPI { constructor(private spies: Array) {} - addListener(callback: (event: any) => void) { + addListener(callback: (event: any) => void): void { this.spies.forEach(({ addListener }) => addListener(callback)); this.listeners.add(callback); } - removeListener(callback: (event: any) => void) { + removeListener(callback: (event: any) => void): void { this.spies.forEach(({ removeListener }) => removeListener(callback)); this.listeners.delete(callback); } - async sendMessage(event: any, fail = false) { + async sendMessage(event: any, fail = false): Promise { this.spies.forEach(({ sendMessage }) => sendMessage(event)); if (fail) { @@ -36,7 +36,14 @@ export class MockedMessagingAPI { } } -export function createMockContext() { +export function createMockContext(): { + spies: { + web1: MessengerSpies; + web2: MessengerSpies; + devtools: MessengerSpies; + }; + mockMessagingAPI: MockedMessagingAPI; +} { const spies = { web1: { sendMessage: vi.fn(), diff --git a/devtools/messenger/core/src/__tests__/index.test.ts b/devtools/messenger/core/src/__tests__/index.test.ts index 9edfb33..c69251a 100644 --- a/devtools/messenger/core/src/__tests__/index.test.ts +++ b/devtools/messenger/core/src/__tests__/index.test.ts @@ -11,6 +11,7 @@ import { Messenger } from "../index"; import { createMockContext } from "./helpers"; import { BaseEvent, + type MessengerEvent, type Transaction, type ExtensionSupportedEvents, } from "@player-devtools/types"; @@ -399,8 +400,9 @@ describe("Messenger", () => { const messengers: Array> = []; const api = { - sendMessage: async (event: Frame) => - listeners.forEach((listener) => listener(event)), + // the Messenger stamps transaction metadata before it sends + sendMessage: async (event: MessengerEvent) => + listeners.forEach((listener) => listener(event as Frame)), addListener: (cb: (event: Frame) => void) => { listeners.add(cb); }, @@ -469,7 +471,9 @@ describe("Messenger", () => { type Frame = Transaction; const listeners = new Set<(event: Frame) => void>(); const layer = { - sendMessage: async (event: Frame) => listeners.forEach((l) => l(event)), + // the Messenger stamps transaction metadata before it sends + sendMessage: async (event: MessengerEvent) => + listeners.forEach((l) => l(event as Frame)), addListener: (cb: (event: Frame) => void) => { listeners.add(cb); }, @@ -530,7 +534,9 @@ describe("Messenger", () => { type Frame = Transaction; const listeners = new Set<(event: Frame) => void>(); const layer = { - sendMessage: async (event: Frame) => listeners.forEach((l) => l(event)), + // the Messenger stamps transaction metadata before it sends + sendMessage: async (event: MessengerEvent) => + listeners.forEach((l) => l(event as Frame)), addListener: (cb: (event: Frame) => void) => { listeners.add(cb); }, diff --git a/devtools/messenger/core/src/index.ts b/devtools/messenger/core/src/index.ts index 069218f..762b7df 100644 --- a/devtools/messenger/core/src/index.ts +++ b/devtools/messenger/core/src/index.ts @@ -112,21 +112,32 @@ export class Messenger> { } } - private getConnection(id: string) { - if (!Messenger.connections[this.id]) { - Messenger.connections[this.id] = {}; + private getConnections() { + let connections = Messenger.connections[this.id]; + + if (!connections) { + connections = {}; + Messenger.connections[this.id] = connections; } - return Messenger.connections[this.id][id]; + return connections; + } + + private getConnection(id: string): Connection | undefined { + return this.getConnections()[id]; } - private addConnection(id: string) { - Messenger.connections[this.id][id] = { + private addConnection(id: string): Connection { + const connection: Connection = { id, messagesReceived: 0, messagesSent: 0, desync: false, }; + + this.getConnections()[id] = connection; + + return connection; } private getEvents() { @@ -151,11 +162,8 @@ export class Messenger> { return -1; } - if (!this.getConnection(message.target)) { - this.addConnection(message.target); - } - - const connection = this.getConnection(message.target); + const connection = + this.getConnection(message.target) ?? this.addConnection(message.target); connection.messagesSent += 1; return connection.messagesSent; } @@ -196,7 +204,7 @@ export class Messenger> { const isFromSameContext = parsed.context === this.options.context; const isTargetingOthers = parsed.target ? parsed.target !== this.id : false; const connection = this.getConnection(parsed.sender); - const isKnownConnection = Boolean(connection); + const isKnownConnection = connection !== undefined; if ( !isFromMessenger || @@ -225,7 +233,8 @@ export class Messenger> { const isBatch = parsed.type === "MESSENGER_EVENT_BATCH"; const transactionID = isBatch - ? (parsed.payload as EventsBatchEvent["payload"]).events[0].id + ? ((parsed.payload as EventsBatchEvent["payload"]).events[0]?.id ?? + -1) : parsed.id; const { messagesReceived, desync } = connection; @@ -289,7 +298,7 @@ export class Messenger> { return; } - this.addConnection(parsed.sender); + const connection = this.addConnection(parsed.sender); const events = this.getEvents(); if (events.length > 0) { @@ -309,7 +318,6 @@ export class Messenger> { }`, ); - const connection = this.getConnection(parsed.sender); connection.messagesSent = events.length; } @@ -388,7 +396,7 @@ export class Messenger> { }); } - public destroy() { + public destroy(): void { if (this.beaconInterval) { clearInterval(this.beaconInterval); } @@ -416,7 +424,7 @@ export class Messenger> { } /** reset static records for every instance, intended for tests */ - static reset() { + static reset(): void { Messenger.events = {}; Messenger.connections = {}; } diff --git a/devtools/messenger/jvm/api/messenger.api b/devtools/messenger/jvm/api/messenger.api index 69737a4..8ca9428 100755 --- a/devtools/messenger/jvm/api/messenger.api +++ b/devtools/messenger/jvm/api/messenger.api @@ -22,13 +22,13 @@ public final class com/intuit/playerui/devtools/BeaconEvent : com/intuit/playeru public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/BeaconEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/BeaconEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/BeaconEvent$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/BeaconEvent; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/BeaconEvent; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/BeaconEvent;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/BeaconEvent;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -64,13 +64,13 @@ public final class com/intuit/playerui/devtools/DevtoolsDataChangeEvent : com/in public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/DevtoolsDataChangeEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/DevtoolsDataChangeEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -93,13 +93,13 @@ public final class com/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsDataChangeEvent$Payload;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -135,13 +135,13 @@ public final class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent : public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -164,13 +164,13 @@ public final class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$P public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent$Payload;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -203,13 +203,13 @@ public final class com/intuit/playerui/devtools/DisconnectEvent : com/intuit/pla public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/DisconnectEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/DisconnectEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DisconnectEvent$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DisconnectEvent; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DisconnectEvent; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DisconnectEvent;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DisconnectEvent;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -230,12 +230,6 @@ public final class com/intuit/playerui/devtools/Event$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/Event$Companion$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Event$Companion$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - public abstract class com/intuit/playerui/devtools/EventWithPayload : com/intuit/playerui/devtools/Event { public static final field Companion Lcom/intuit/playerui/devtools/EventWithPayload$Companion; public synthetic fun (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V @@ -247,12 +241,6 @@ public final class com/intuit/playerui/devtools/EventWithPayload$Companion { public final fun serializer (Lkotlinx/serialization/KSerializer;)Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/EventWithPayload$Companion$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/EventWithPayload$Companion$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - public final class com/intuit/playerui/devtools/EventsBatchEvent : com/intuit/playerui/devtools/EventWithPayload, com/intuit/playerui/devtools/InternalEvent { public static final field Companion Lcom/intuit/playerui/devtools/EventsBatchEvent$Companion; public fun (Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V @@ -280,13 +268,13 @@ public final class com/intuit/playerui/devtools/EventsBatchEvent : com/intuit/pl public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/EventsBatchEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/EventsBatchEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/EventsBatchEvent$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/EventsBatchEvent; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/EventsBatchEvent; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/EventsBatchEvent;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/EventsBatchEvent;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -307,13 +295,13 @@ public final class com/intuit/playerui/devtools/EventsBatchEvent$Payload { public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/EventsBatchEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/EventsBatchEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -322,12 +310,6 @@ public final class com/intuit/playerui/devtools/EventsBatchEvent$Payload$Compani public final fun serializer ()Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/EventsBatchEvent$Payload$Companion$$childSerializers$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/EventsBatchEvent$Payload$Companion$$childSerializers$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - public abstract interface class com/intuit/playerui/devtools/InternalEvent { public static final field Companion Lcom/intuit/playerui/devtools/InternalEvent$Companion; } @@ -386,100 +368,21 @@ public final class com/intuit/playerui/devtools/Messenger$Options { public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/Messenger$Options$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/Messenger$Options$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/Messenger$Options; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/Messenger$Options; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/Messenger$Options;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/Messenger$Options;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/Messenger$Options$1 : com/intuit/playerui/devtools/Messenger$Logger { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$1; - public final fun log ([Ljava/lang/Object;)V -} - public final class com/intuit/playerui/devtools/Messenger$Options$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$2; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$3 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$3; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$4 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$4; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$5 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$5; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$6 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$6; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$7 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$7; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$8 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$8; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$9 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Options$Companion$$childSerializers$9; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/Messenger$Options$_handleFailedMessage$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public final fun invoke (Lcom/intuit/playerui/core/bridge/Node;)Lkotlin/Unit; - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/Messenger$Options$_logger$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; - public final fun invoke ([Ljava/lang/Object;)V -} - -final class com/intuit/playerui/devtools/Messenger$Options$_messageCallback$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public final fun invoke (Lcom/intuit/playerui/core/bridge/Node;)V - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/Messenger$Options$_sendMessage$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public final fun invoke (Lcom/intuit/playerui/core/bridge/Node;)Lcom/intuit/playerui/core/bridge/Promise; - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; -} - final class com/intuit/playerui/devtools/Messenger$Options$_sendMessage$1$1 : kotlin/coroutines/jvm/internal/SuspendLambda, kotlin/jvm/functions/Function3 { public synthetic fun invoke (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; public final fun invoke (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; @@ -495,42 +398,6 @@ public final class com/intuit/playerui/devtools/Messenger$Serializer : kotlinx/s public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V } -final class com/intuit/playerui/devtools/Messenger$Serializer$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/Messenger$Serializer$1; - public final fun invoke (Lcom/intuit/playerui/core/bridge/Node;)Lcom/intuit/playerui/devtools/Messenger; - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/Messenger$apply$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; - public final fun invoke (Lkotlin/jvm/functions/Function1;)V -} - -final class com/intuit/playerui/devtools/Messenger$apply$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; - public final fun invoke (Lkotlin/jvm/functions/Function1;)V -} - -final class com/intuit/playerui/devtools/Messenger$destroy$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/Messenger$handleMessage$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/Messenger$reset$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/Messenger$sendMessage$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - public final class com/intuit/playerui/devtools/MessengerKt { } @@ -561,13 +428,13 @@ public final class com/intuit/playerui/devtools/PlayerInitEvent : com/intuit/pla public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/PlayerInitEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/PlayerInitEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/PlayerInitEvent$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/PlayerInitEvent; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/PlayerInitEvent; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/PlayerInitEvent;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/PlayerInitEvent;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -588,13 +455,13 @@ public final class com/intuit/playerui/devtools/PlayerInitEvent$Payload { public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/PlayerInitEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/PlayerInitEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -603,12 +470,6 @@ public final class com/intuit/playerui/devtools/PlayerInitEvent$Payload$Companio public final fun serializer ()Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/PlayerInitEvent$Payload$Companion$$childSerializers$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/PlayerInitEvent$Payload$Companion$$childSerializers$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - public final class com/intuit/playerui/devtools/RequestLostEventsEvent : com/intuit/playerui/devtools/EventWithPayload, com/intuit/playerui/devtools/InternalEvent { public static final field Companion Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Companion; public fun (Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;JJLjava/lang/String;Lkotlinx/serialization/json/JsonElement;ZLjava/lang/String;)V @@ -636,13 +497,13 @@ public final class com/intuit/playerui/devtools/RequestLostEventsEvent : com/int public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/RequestLostEventsEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/RequestLostEventsEvent$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/RequestLostEventsEvent$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/RequestLostEventsEvent; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/RequestLostEventsEvent; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/RequestLostEventsEvent;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/RequestLostEventsEvent;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -663,13 +524,13 @@ public final class com/intuit/playerui/devtools/RequestLostEventsEvent$Payload { public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/RequestLostEventsEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/RequestLostEventsEvent$Payload$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/RequestLostEventsEvent$Payload;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -691,6 +552,7 @@ public final class com/intuit/playerui/devtools/TransactionMetaData$Context : ja public static final field Companion Lcom/intuit/playerui/devtools/TransactionMetaData$Context$Companion; public static final field DEVTOOLS Lcom/intuit/playerui/devtools/TransactionMetaData$Context; public static final field PLAYER Lcom/intuit/playerui/devtools/TransactionMetaData$Context; + public static fun getEntries ()Lkotlin/enums/EnumEntries; public static fun valueOf (Ljava/lang/String;)Lcom/intuit/playerui/devtools/TransactionMetaData$Context; public static fun values ()[Lcom/intuit/playerui/devtools/TransactionMetaData$Context; } @@ -699,12 +561,6 @@ public final class com/intuit/playerui/devtools/TransactionMetaData$Context$Comp public final fun serializer ()Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/TransactionMetaData$Context$Companion$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/TransactionMetaData$Context$Companion$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - public final class com/intuit/playerui/devtools/TransactionMetaData$DefaultImpls { public static fun getTarget (Lcom/intuit/playerui/devtools/TransactionMetaData;)Ljava/lang/String; } diff --git a/devtools/plugin/core/src/helpers/getNowTime.ts b/devtools/plugin/core/src/helpers/getNowTime.ts index fd3192d..f50dea8 100644 --- a/devtools/plugin/core/src/helpers/getNowTime.ts +++ b/devtools/plugin/core/src/helpers/getNowTime.ts @@ -1,3 +1,3 @@ -export const getNowTime = globalThis.performance +export const getNowTime: () => number = globalThis.performance ? () => globalThis.performance.now() : () => Date.now(); diff --git a/devtools/plugin/jvm/api/plugin.api b/devtools/plugin/jvm/api/plugin.api index 83a7d7c..9a7b0b2 100755 --- a/devtools/plugin/jvm/api/plugin.api +++ b/devtools/plugin/jvm/api/plugin.api @@ -25,44 +25,21 @@ public final class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandle public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$1; - public final fun invoke (Lcom/intuit/playerui/devtools/DevtoolsPluginInteractionEvent;)V - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; -} - public final class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$Companion { public final fun serializer ()Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$Companion$$childSerializers$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$Companion$$childSerializers$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$Companion$$childSerializers$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$Companion$$childSerializers$2; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - -final class com/intuit/playerui/devtools/DevtoolsHandler$SerializedHandler$_processInteraction$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public final fun invoke (Lcom/intuit/playerui/core/bridge/Node;)V - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; -} - public final class com/intuit/playerui/devtools/DevtoolsHandler$Serializer : kotlinx/serialization/KSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsHandler$Serializer; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsHandler; @@ -118,13 +95,13 @@ public final class com/intuit/playerui/devtools/DevtoolsPlugin$Options { public fun toString ()Ljava/lang/String; } -public final class com/intuit/playerui/devtools/DevtoolsPlugin$Options$$serializer : kotlinx/serialization/internal/GeneratedSerializer { +public synthetic class com/intuit/playerui/devtools/DevtoolsPlugin$Options$$serializer : kotlinx/serialization/internal/GeneratedSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsPlugin$Options$$serializer; - public fun childSerializers ()[Lkotlinx/serialization/KSerializer; - public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsPlugin$Options; + public final fun childSerializers ()[Lkotlinx/serialization/KSerializer; + public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsPlugin$Options; public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object; - public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; - public fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsPlugin$Options;)V + public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor; + public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/intuit/playerui/devtools/DevtoolsPlugin$Options;)V public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer; } @@ -133,12 +110,6 @@ public final class com/intuit/playerui/devtools/DevtoolsPlugin$Options$Companion public final fun serializer ()Lkotlinx/serialization/KSerializer; } -final class com/intuit/playerui/devtools/DevtoolsPlugin$Options$Companion$$childSerializers$1 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsPlugin$Options$Companion$$childSerializers$1; - public synthetic fun invoke ()Ljava/lang/Object; - public final fun invoke ()Lkotlinx/serialization/KSerializer; -} - public final class com/intuit/playerui/devtools/DevtoolsPlugin$Serializer : kotlinx/serialization/KSerializer { public static final field INSTANCE Lcom/intuit/playerui/devtools/DevtoolsPlugin$Serializer; public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/intuit/playerui/devtools/DevtoolsPlugin; @@ -154,31 +125,6 @@ synthetic class com/intuit/playerui/devtools/DevtoolsPlugin$Serializer$1 : kotli public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; } -final class com/intuit/playerui/devtools/DevtoolsPlugin$apply$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/DevtoolsPlugin$checkIfDevtoolsIsActive$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/DevtoolsPlugin$processInteraction$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/DevtoolsPlugin$registerMessenger$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/DevtoolsPlugin$teardown$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - public final class com/intuit/playerui/devtools/DevtoolsPluginKt { } @@ -251,23 +197,3 @@ synthetic class com/intuit/playerui/devtools/PluginStore$Serializer$1 : kotlin/j public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; } -final class com/intuit/playerui/devtools/PluginStore$dispatch$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/PluginStore$getState$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/PluginStore$subscribe$2 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function0 { - public final fun invoke ()Lcom/intuit/playerui/core/bridge/Invokable; - public synthetic fun invoke ()Ljava/lang/Object; -} - -final class com/intuit/playerui/devtools/PluginStore$subscribe$4 : kotlin/jvm/internal/Lambda, kotlin/jvm/functions/Function1 { - public final fun invoke (Lcom/intuit/playerui/core/bridge/Node;)V - public synthetic fun invoke (Ljava/lang/Object;)Ljava/lang/Object; -} - diff --git a/devtools/plugin/react/src/__tests__/useCommunicationLayer.test.ts b/devtools/plugin/react/src/__tests__/useCommunicationLayer.test.ts index d48a70e..d46725e 100644 --- a/devtools/plugin/react/src/__tests__/useCommunicationLayer.test.ts +++ b/devtools/plugin/react/src/__tests__/useCommunicationLayer.test.ts @@ -1,5 +1,6 @@ import { describe, it, expect, vi, beforeEach } from "vitest"; import type { FlipperPluginConnection } from "js-flipper"; +import type * as CommunicationLayer from "../useCommunicationLayer"; type FakePlugin = { getId: () => string; @@ -7,8 +8,16 @@ type FakePlugin = { onDisconnect: () => void; }; +type SetLayerCallbacks = Parameters< + typeof CommunicationLayer.startFlipperConnection +>[0]; +type LayerAction = Parameters[0]; +type LayerCallbacks = ReturnType< + Extract unknown> +>; + const start = vi.fn(); -const addPlugin = vi.fn(); +const addPlugin = vi.fn<(plugin: FakePlugin) => void>(); vi.mock("js-flipper", () => ({ flipperClient: { @@ -36,6 +45,28 @@ function fakeConnection(): { }; } +/** Resolves the SetStateAction handed to startFlipperConnection against an empty layer. */ +function resolveLayer(action: LayerAction): LayerCallbacks { + const empty: LayerCallbacks = { + sendMessage: [], + addListener: [], + removeListener: [], + }; + + return typeof action === "function" ? action(empty) : action; +} + +/** The plugin the module registered with flipperClient.addPlugin(). */ +function registeredPlugin(): FakePlugin { + const plugin = addPlugin.mock.calls[0]?.[0]; + + if (!plugin) { + throw new Error("addPlugin was never called"); + } + + return plugin; +} + const FLIPPER_PROXY_KEY = Symbol.for("player-ui-devtools/flipper-proxy"); describe("startFlipperConnection", () => { @@ -80,23 +111,15 @@ describe("startFlipperConnection", () => { const firstListeners: unknown[] = []; const secondListeners: unknown[] = []; - startFlipperConnection((updater) => { - const result = updater({ - sendMessage: [], - addListener: [], - removeListener: [], - }); + startFlipperConnection((action) => { + const result = resolveLayer(action); result.addListener.forEach((add) => add((message) => firstListeners.push(message)), ); }); - startFlipperConnection((updater) => { - const result = updater({ - sendMessage: [], - addListener: [], - removeListener: [], - }); + startFlipperConnection((action) => { + const result = resolveLayer(action); result.addListener.forEach((add) => add((message) => secondListeners.push(message)), ); @@ -105,8 +128,8 @@ describe("startFlipperConnection", () => { await vi.waitFor(() => expect(addPlugin).toHaveBeenCalledTimes(1)); const { emit, connection } = fakeConnection(); - const registeredPlugin = addPlugin.mock.calls[0][0] as FakePlugin; - registeredPlugin.onConnect(connection); + const plugin = registeredPlugin(); + plugin.onConnect(connection); emit({ payload: "hello" }); @@ -151,12 +174,8 @@ describe("startFlipperConnection", () => { const { startFlipperConnection } = await import("../useCommunicationLayer"); const messages: unknown[] = []; - startFlipperConnection((updater) => { - const result = updater({ - sendMessage: [], - addListener: [], - removeListener: [], - }); + startFlipperConnection((action) => { + const result = resolveLayer(action); result.addListener.forEach((add) => add((message) => messages.push(message)), ); @@ -164,14 +183,14 @@ describe("startFlipperConnection", () => { await vi.waitFor(() => expect(addPlugin).toHaveBeenCalledTimes(1)); - const registeredPlugin = addPlugin.mock.calls[0][0] as FakePlugin; + const plugin = registeredPlugin(); const first = fakeConnection(); - registeredPlugin.onConnect(first.connection); + plugin.onConnect(first.connection); - registeredPlugin.onDisconnect(); + plugin.onDisconnect(); const second = fakeConnection(); - registeredPlugin.onConnect(second.connection); + plugin.onConnect(second.connection); expect(start).toHaveBeenCalledTimes(1); expect(addPlugin).toHaveBeenCalledTimes(1); @@ -190,24 +209,16 @@ describe("startFlipperConnection", () => { const secondListeners: unknown[] = []; let removeFirst: (() => void) | undefined; - startFlipperConnection((updater) => { - const result = updater({ - sendMessage: [], - addListener: [], - removeListener: [], - }); + startFlipperConnection((action) => { + const result = resolveLayer(action); const listener = (message: unknown) => firstListeners.push(message); result.addListener.forEach((add) => add(listener)); removeFirst = () => result.removeListener.forEach((remove) => remove(listener)); }); - startFlipperConnection((updater) => { - const result = updater({ - sendMessage: [], - addListener: [], - removeListener: [], - }); + startFlipperConnection((action) => { + const result = resolveLayer(action); result.addListener.forEach((add) => add((message) => secondListeners.push(message)), ); @@ -216,8 +227,8 @@ describe("startFlipperConnection", () => { await vi.waitFor(() => expect(addPlugin).toHaveBeenCalledTimes(1)); const { emit, connection } = fakeConnection(); - const registeredPlugin = addPlugin.mock.calls[0][0] as FakePlugin; - registeredPlugin.onConnect(connection); + const plugin = registeredPlugin(); + plugin.onConnect(connection); removeFirst?.(); diff --git a/devtools/plugins/basic/content/src/common/Screen.tsx b/devtools/plugins/basic/content/src/common/Screen.tsx index bd20ac0..a3caea2 100644 --- a/devtools/plugins/basic/content/src/common/Screen.tsx +++ b/devtools/plugins/basic/content/src/common/Screen.tsx @@ -24,7 +24,7 @@ export const Screen = ({ id: string; main: React.ReactNode; footer?: React.ReactNode; -}) => ( +}): React.JSX.Element => (