Skip to content
Draft
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
5 changes: 5 additions & 0 deletions .changeset/pos-background-scan-event.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/ui-extensions': minor
---

Add the POS background `scan` host event types: `POS_EVENT_NAMES.SCAN`, a public `ScanEvent` payload with guaranteed decoded `data` and normalized `source` (`camera`, `external`, or `embedded`), and the matching `ShopifyEventMap` entry so `pos.app.ready.data` extensions can register `shopify.addEventListener('scan', ...)`. The event is delivered after POS has finished handling the scan itself.
5 changes: 5 additions & 0 deletions .changeset/pos-scan-event-tester-dispatch-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/ui-extensions-tester': minor
---

`extension.dispatch()` now stamps the dispatched event with its `type`, matching what the POS runtime delivers to `shopify.addEventListener` listeners, and accepts the payload without `type`. Assertions that compared a listener's argument to the raw payload should now expect the added `type` field.
9 changes: 6 additions & 3 deletions packages/ui-extensions-tester/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ export const SymbolDispose: typeof Symbol.dispose = ((Symbol as any).dispose ??
* `getExtension`) and {@link DisposableExtensionHarness} (returned
* by `setUpExtension`).
*/
type EventDispatchPayload<T> = T extends unknown ? Omit<T, 'type'> : never;

interface BaseExtensionHarness<T extends AnyExtensionTarget> {
/**
* Imports and executes the extension module's default export,
Expand Down Expand Up @@ -118,7 +120,7 @@ interface BaseExtensionHarness<T extends AnyExtensionTarget> {
*/
dispatch<K extends keyof EventMapForTarget<T>>(
type: K,
event: EventMapForTarget<T>[K],
event: EventDispatchPayload<EventMapForTarget<T>[K]>,
): void;
}

Expand Down Expand Up @@ -234,15 +236,16 @@ class Extension<T extends AnyExtensionTarget> implements ExtensionHarness<T> {

dispatch<K extends keyof EventMapForTarget<T>>(
type: K,
event: EventMapForTarget<T>[K],
event: EventDispatchPayload<EventMapForTarget<T>[K]>,
): void {
const listeners = this.#eventListeners.get(type as string);
if (!listeners) return;
const dispatchedEvent = {...event, type};
// Snapshot so listeners that register/unregister during dispatch
// don't mutate the iteration.
for (const listener of [...listeners]) {
try {
listener(event);
listener(dispatchedEvent);
} catch {
// Fire-and-forget: per the shopify.addEventListener contract,
// listener errors must not affect other listeners.
Expand Down
47 changes: 44 additions & 3 deletions packages/ui-extensions-tester/src/tests/shopify-events.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
import type {
CashTrackingSessionStartEvent,
ScanEvent,
ShopifyEventMap,
TransactionCompleteEvent,
} from '@shopify/ui-extensions/point-of-sale';

import {getExtension} from '../index';
import type {EventMapForTarget} from '../targets';

import {createTestSandbox, type TestSandbox} from './helpers';
import {assertType, type Equals} from './type-assertions';

// `extension.dispatch('scan', ...)` on the background target and
// `shopify.addEventListener('scan', ...)` share the same guaranteed payload:
// decoded `data` plus its normalized `source`.
assertType<Equals<ShopifyEventMap['scan'], ScanEvent>>();
assertType<
Equals<EventMapForTarget<'pos.app.ready.data'>['scan'], ScanEvent>
>();

function makeTransactionCompleteEvent(): TransactionCompleteEvent {
return {
Expand All @@ -30,6 +42,13 @@ function makeCashTrackingSessionStartEvent(): CashTrackingSessionStartEvent {
};
}

function makeScanEvent(): Omit<ScanEvent, 'type'> {
return {
data: 'synthetic-test-value',
source: 'external',
};
}

describe('shopify.addEventListener / extension.dispatch', () => {
let sandbox: TestSandbox;

Expand Down Expand Up @@ -57,6 +76,19 @@ describe('shopify.addEventListener / extension.dispatch', () => {
expect(typeof shopify.removeEventListener).toBe('function');
});

it('delivers dispatched scan events to registered scan listeners', () => {
const extension = setUpExt();
const shopify = (globalThis as any).shopify;
const listener = jest.fn();
shopify.addEventListener('scan', listener);

const event = makeScanEvent();
extension.dispatch('scan', event);

expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith({...event, type: 'scan'});
});

it('dispatches a registered listener with the provided event payload', () => {
const extension = setUpExt();
const shopify = (globalThis as any).shopify;
Expand All @@ -67,7 +99,10 @@ describe('shopify.addEventListener / extension.dispatch', () => {
extension.dispatch('transactioncomplete', event);

expect(listener).toHaveBeenCalledTimes(1);
expect(listener).toHaveBeenCalledWith(event);
expect(listener).toHaveBeenCalledWith({
...event,
type: 'transactioncomplete',
});
});

it('fires all listeners registered for the same event', () => {
Expand All @@ -81,8 +116,14 @@ describe('shopify.addEventListener / extension.dispatch', () => {
const event = makeTransactionCompleteEvent();
extension.dispatch('transactioncomplete', event);

expect(listenerA).toHaveBeenCalledWith(event);
expect(listenerB).toHaveBeenCalledWith(event);
expect(listenerA).toHaveBeenCalledWith({
...event,
type: 'transactioncomplete',
});
expect(listenerB).toHaveBeenCalledWith({
...event,
type: 'transactioncomplete',
});
});

it('does not fire other events when dispatching one', () => {
Expand Down
1 change: 1 addition & 0 deletions packages/ui-extensions/src/surfaces/point-of-sale/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export type {
TransactionCompleteEvent,
CashTrackingSessionStartEvent,
CashTrackingSessionCompleteEvent,
ScanEvent,
ShopifyEventMap,
} from './events';

Expand Down
9 changes: 9 additions & 0 deletions packages/ui-extensions/src/surfaces/point-of-sale/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type {
CashTrackingSessionStartEvent,
CashTrackingSessionCompleteEvent,
} from './events/cash-tracking-session-events';
import type {ScanEvent} from './events/scan-event';
import type {Cart} from './types/cart';
import type {MoneyV2} from './types/money';

Expand All @@ -16,6 +17,7 @@ export const POS_EVENT_NAMES = {
TRANSACTION_COMPLETE: 'transactioncomplete',
CASH_TRACKING_SESSION_START: 'cashtrackingsessionstart',
CASH_TRACKING_SESSION_COMPLETE: 'cashtrackingsessioncomplete',
SCAN: 'scan',
} as const;

/**
Expand Down Expand Up @@ -47,6 +49,12 @@ export interface ShopifyEventMap {
[POS_EVENT_NAMES.CASH_TRACKING_SESSION_START]: CashTrackingSessionStartEvent;
/** Dispatched when a cash tracking session closes after reconciliation. */
[POS_EVENT_NAMES.CASH_TRACKING_SESSION_COMPLETE]: CashTrackingSessionCompleteEvent;
/**
* Dispatched once for each successful scan captured by a camera, external,
* or embedded scanner, after POS has finished handling the scan itself.
* Every event carries decoded `data` and its `source`.
*/
[POS_EVENT_NAMES.SCAN]: ScanEvent;
}

/**
Expand Down Expand Up @@ -246,4 +254,5 @@ export type {
TransactionCompleteEvent,
CashTrackingSessionStartEvent,
CashTrackingSessionCompleteEvent,
ScanEvent,
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import type {ScannerSource} from '../api/scanner-api/scanner-api';

/**
* Dispatched once for each successful scan captured by a camera, external,
* or embedded scanner. Every event carries a decoded `data` value and its
* `source`; no event is dispatched for initial or empty scanner state.
*
* The event is delivered only after POS has finished handling the scan
* itself.
*
* @example
* ```ts
* shopify.addEventListener('scan', (event) => {
* handleScan(event.data, event.source);
* });
* ```
* @publicDocs
*/
export interface ScanEvent {
/** The event name. */
readonly type: 'scan';
/**
* The decoded string captured by the scan. Contains the scanned barcode, QR code, or other scannable data. Always present: an event is only dispatched for a successful scan.
*/
readonly data: string;
/**
* The scanner source that captured the scan. One of the following scanner types:
*
* • `'camera'` - Built-in device camera used for scanning
* • `'external'` - External scanner hardware connected to the device
* • `'embedded'` - Embedded scanner hardware built into the device
*/
readonly source: ScannerSource;
}
Loading