fix(ecp): commands type definition

packages/ecp/src/commands/input.ts

@@ -1,12 +1,11 @@
 import type { Executor } from '../Executor.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
-import type { Params } from '../types/Params.ts';
 
 export async function input<Context extends Executor>(
   ctx: Context,
-  params: Params,
+  payload: Record<string, unknown>,
   config?: Config<Context>
 ): Promise<void> {
-  await execute(ctx, 'input', params, config);
+  await execute(ctx, 'input', payload, config);
 }

packages/ecp/src/commands/keydown.ts

@@ -1,13 +1,11 @@
 import type { Executor } from '../Executor.ts';
 import { execute } from '../internal/execute.js';
-import { toKey } from '../internal/toKey.js';
 import type { Config } from '../internal/types.d.ts';
-import type { Key } from '../types/Key.ts';
 
 export async function keydown<Context extends Executor>(
   ctx: Context,
-  params: { key: Key },
+  payload: { key: string },
   config?: Config<Context>
 ): Promise<void> {
-  await execute(ctx, `keydown/${toKey(params.key)}`, undefined, config);
+  await execute(ctx, `keydown/${payload.key}`, undefined, config);
 }

packages/ecp/src/commands/keypress.ts

@@ -1,13 +1,11 @@
 import type { Executor } from '../Executor.ts';
 import { execute } from '../internal/execute.js';
-import { toKey } from '../internal/toKey.js';
 import type { Config } from '../internal/types.d.ts';
-import type { Key } from '../types/Key.ts';
 
 export async function keypress<Context extends Executor>(
   ctx: Context,
-  params: { key: Key },
+  payload: { key: string },
   config?: Config<Context>
 ): Promise<void> {
-  await execute(ctx, `keypress/${toKey(params.key)}`, undefined, config);
+  await execute(ctx, `keypress/${payload.key}`, undefined, config);
 }

packages/ecp/src/commands/keyup.ts

@@ -1,13 +1,11 @@
 import type { Executor } from '../Executor.ts';
 import { execute } from '../internal/execute.js';
-import { toKey } from '../internal/toKey.js';
 import type { Config } from '../internal/types.d.ts';
-import type { Key } from '../types/Key.ts';
 
 export async function keyup<Context extends Executor>(
   ctx: Context,
-  params: { key: Key },
+  payload: { key: string },
   config?: Config<Context>
 ): Promise<void> {
-  await execute(ctx, `keyup/${toKey(params.key)}`, undefined, config);
+  await execute(ctx, `keyup/${payload.key}`, undefined, config);
 }

packages/ecp/src/commands/launch.ts

@@ -1,14 +1,12 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import type { AppId } from '../types/AppId.ts';
-import type { Params } from '../types/Params.ts';
 
 export async function launch<Context extends Executor>(
   ctx: Context,
-  params: { id: AppId; params?: Nullable<Params> },
+  payload: { appId: AppId; params?: Record<string, unknown> },
   config?: Config<Context>
 ): Promise<void> {
-  await execute(ctx, `launch/${params.id}`, params.params, config);
+  await execute(ctx, `launch/${payload.appId}`, payload.params, config);
 }

packages/ecp/src/commands/queryChannelPerformance.ts

@@ -1,22 +1,20 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import parse from '../internal/xml.js';
 import type { AppId } from '../types/AppId.ts';
 import type { ChannelPerformance } from '../types/ChannelPerformance.ts';
 import type { Failure } from '../types/Failure.ts';
-import type { Params } from '../types/Params.ts';
 
 export async function queryChannelPerformance<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId>; params?: Nullable<Params> }>,
+  payload?: { appId?: AppId; params?: Record<string, unknown> },
   config?: Config<Context>
 ): Promise<Failure | ChannelPerformance> {
   const response = await execute(
     ctx,
-    `query/chanperf${params?.id ? `/${params.id}` : ''}`,
-    params,
+    `query/chanperf${payload?.appId ? `/${payload.appId}` : ''}`,
+    payload?.params,
     config
   );
   return parse(await response.text());

packages/ecp/src/commands/queryIcon.ts

@@ -5,12 +5,12 @@ import type { AppId } from '../types/AppId.ts';
 
 export async function queryIcon<Context extends Executor>(
   ctx: Context,
-  params: { id: AppId },
+  payload: { appId: AppId },
   config?: Config<Context>
 ): Promise<ArrayBuffer> {
   const response = await execute(
     ctx,
-    `query/icon/${params.id}`,
+    `query/icon/${payload.appId}`,
     undefined,
     config
   );

packages/ecp/src/commands/queryR2D2Bitmaps.ts

@@ -1,5 +1,4 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import parse from '../internal/xml.js';
@@ -9,12 +8,12 @@ import type { R2D2Bitmaps } from '../types/R2D2Bitmaps.ts';
 
 export async function queryR2D2Bitmaps<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId> }>,
+  payload?: { appId?: AppId },
   config?: Config<Context>
 ): Promise<Failure | R2D2Bitmaps> {
   const response = await execute(
     ctx,
-    `query/r2d2-bitmaps${params?.id ? `/${params.id}` : ''}`,
+    `query/r2d2-bitmaps${payload?.appId ? `/${payload.appId}` : ''}`,
     undefined,
     config
   );

packages/ecp/src/commands/queryRegistry.ts

@@ -8,12 +8,12 @@ import type { Registry } from '../types/Registry.ts';
 
 export async function queryRegistry<Context extends Executor>(
   ctx: Context,
-  params: { id: AppId },
+  payload: { appId: AppId },
   config?: Config<Context>
 ): Promise<Failure | Registry> {
   const response = await execute(
     ctx,
-    `query/registry/${params.id}`,
+    `query/registry/${payload.appId}`,
     undefined,
     config
   );

packages/ecp/src/commands/querySGNodesAll.ts

@@ -1,17 +1,16 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import type { AppId } from '../types/AppId.ts';
 
 export async function querySGNodesAll<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId> }>,
+  payload?: { appId?: AppId },
   config?: Config<Context>
 ): Promise<string> {
   const response = await execute(
     ctx,
-    `query/sgnodes/all${params?.id ? `/${params.id}` : ''}`,
+    `query/sgnodes/all${payload?.appId ? `/${payload.appId}` : ''}`,
     undefined,
     config
   );

packages/ecp/src/commands/querySGNodesNodes.ts

@@ -1,18 +1,17 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import type { AppId } from '../types/AppId.ts';
 
 export async function querySGNodesNodes<Context extends Executor>(
   ctx: Context,
-  params: { id?: Nullable<AppId>; nodeId: string },
+  payload: { appId?: AppId; nodeId: string },
   config?: Config<Context>
 ): Promise<string> {
   const response = await execute(
     ctx,
-    `query/sgnodes/nodes${params?.id ? `/${params.id}` : ''}?node-id=${
-      params.nodeId
+    `query/sgnodes/nodes${payload?.appId ? `/${payload.appId}` : ''}?node-id=${
+      payload.nodeId
     }`,
     undefined,
     config

packages/ecp/src/commands/querySGNodesRoots.ts

@@ -1,17 +1,16 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import type { AppId } from '../types/AppId.ts';
 
 export async function querySGNodesRoots<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId> }>,
+  payload?: { appId?: AppId },
   config?: Config<Context>
 ): Promise<string> {
   const response = await execute(
     ctx,
-    `query/sgnodes/roots${params?.id ? `/${params.id}` : ''}`,
+    `query/sgnodes/roots${payload?.appId ? `/${payload.appId}` : ''}`,
     undefined,
     config
   );

packages/ecp/src/commands/search.ts

@@ -1,12 +1,11 @@
 import type { Executor } from '../Executor.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
-import type { Params } from '../types/Params.ts';
 
 export async function search<Context extends Executor>(
   ctx: Context,
-  params: Params,
+  payload: Record<string, unknown>,
   config?: Config<Context>
 ): Promise<void> {
-  await execute(ctx, 'search/browse', params, config);
+  await execute(ctx, 'search/browse', payload, config);
 }

packages/ecp/src/commands/trackFWBeacons.ts

@@ -1,5 +1,4 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import parse from '../internal/xml.js';
@@ -9,12 +8,12 @@ import type { Failure } from '../types/Failure.ts';
 
 export async function trackFWBeacons<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId> }>,
+  payload?: { appId?: AppId },
   config?: Config<Context>
 ): Promise<Failure | FWBeaconsStatus> {
   const response = await execute(
     ctx,
-    `fwbeacons/track${params?.id ? `/${params.id}` : ''}`,
+    `fwbeacons/track${payload?.appId ? `/${payload.appId}` : ''}`,
     undefined,
     config
   );

packages/ecp/src/commands/trackSGRendezvous.ts

@@ -1,5 +1,4 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import parse from '../internal/xml.js';
@@ -9,12 +8,12 @@ import type { SGRendezvousStatus } from '../types/SGRendezvousStatus.ts';
 
 export async function trackSGRendezvous<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId> }>,
+  payload?: { appId?: AppId },
   config?: Config<Context>
 ): Promise<Failure | SGRendezvousStatus> {
   const response = await execute(
     ctx,
-    `sgrendezvous/track${params?.id ? `/${params.id}` : ''}`,
+    `sgrendezvous/track${payload?.appId ? `/${payload.appId}` : ''}`,
     undefined,
     config
   );

packages/ecp/src/commands/untrackFWBeacons.ts

@@ -1,5 +1,4 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import parse from '../internal/xml.js';
@@ -9,12 +8,12 @@ import type { Failure } from '../types/Failure.ts';
 
 export async function untrackFWBeacons<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId> }>,
+  payload?: { appId?: AppId },
   config?: Config<Context>
 ): Promise<Failure | FWBeaconsStatus> {
   const response = await execute(
     ctx,
-    `fwbeacons/untrack${params?.id ? `/${params.id}` : ''}`,
+    `fwbeacons/untrack${payload?.appId ? `/${payload.appId}` : ''}`,
     undefined,
     config
   );

packages/ecp/src/commands/untrackSGRendezvous.ts

@@ -1,5 +1,4 @@
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from '../internal/Nullable.ts';
 import { execute } from '../internal/execute.js';
 import type { Config } from '../internal/types.d.ts';
 import parse from '../internal/xml.js';
@@ -9,12 +8,12 @@ import type { SGRendezvousStatus } from '../types/SGRendezvousStatus.ts';
 
 export async function untrackSGRendezvous<Context extends Executor>(
   ctx: Context,
-  params?: Nullable<{ id?: Nullable<AppId> }>,
+  payload?: { appId?: AppId },
   config?: Config<Context>
 ): Promise<Failure | SGRendezvousStatus> {
   const response = await execute(
     ctx,
-    `sgrendezvous/untrack${params?.id ? `/${params.id}` : ''}`,
+    `sgrendezvous/untrack${payload?.appId ? `/${payload.appId}` : ''}`,
     undefined,
     config
   );

packages/ecp/src/index.ts

@@ -38,7 +38,6 @@ export type * from './types/Failure.ts';
 export type * from './types/GraphicsFrameRate.ts';
 export type * from './types/Key.ts';
 export type * from './types/MediaInfo.ts';
-export type * from './types/Params.ts';
 export type * from './types/R2D2Bitmaps.ts';
 export type * from './types/Registry.ts';
 export type * from './types/SGRendezvous.ts';

packages/ecp/src/internal/execute.ts

@@ -1,12 +1,11 @@
 import { ECPError } from '../ECPError.js';
 import type { Executor } from '../Executor.ts';
-import type { Nullable } from './Nullable.ts';
 import type { Config } from './types.d.ts';
 
 export async function execute<Context extends Executor>(
   ctx: Context,
   path: string,
-  params?: Nullable<Record<string, unknown>>,
+  params?: Record<string, unknown>,
   config?: Config<Context>
 ): Promise<Response> {
   if (params && Object.keys(params).length) {

packages/ecp/src/internal/types.d.ts

@@ -4,5 +4,3 @@ export type Mixed<A, B> =
   | (A & B)
   | (Omit<A, keyof B> &
       Omit<B, keyof A> & { [K in keyof (A | B)]: (A | B)[K] });
-
-export type Nullable<T> = T | undefined | null;