@microbit/microbit-connection 0.9.0-apps.alpha.16 → 0.9.0-apps.alpha.18

package/build/cjs/events.d.ts

@@ -1,110 +1,10 @@
-/**
- * Copyright (c) 2022 Jonas "DerZade" Schade
- *
- * SPDX-License-Identifier: MIT
- *
- * https://github.com/DerZade/typescript-event-target/blob/master/src/TypedEventTarget.ts
- */
-/**
- * A function that can be passed to the `listener` parameter of {@link TypedEventTarget.addEventListener} and {@link TypedEventTarget.removeEventListener}.
- *
- * @template M A map of event types to their respective event classes.
- * @template T The type of event to listen for (has to be keyof `M`).
- */
-export type TypedEventListener<M, T extends keyof M> = (evt: M[T]) => void | Promise<void>;
-/**
- * An object that can be passed to the `listener` parameter of {@link TypedEventTarget.addEventListener} and {@link TypedEventTarget.removeEventListener}.
- *
- * @template M A map of event types to their respective event classes.
- * @template T The type of event to listen for (has to be keyof `M`).
- */
-export interface TypedEventListenerObject<M, T extends keyof M> {
-    handleEvent: (evt: M[T]) => void | Promise<void>;
-}
-/**
- * Type of parameter `listener` in {@link TypedEventTarget.addEventListener} and {@link TypedEventTarget.removeEventListener}.
- *
- * The object that receives a notification (an object that implements the Event interface) when an event of the specified type occurs.
- *
- * Can be either an object with a handleEvent() method, or a JavaScript function.
- *
- * @template M A map of event types to their respective event classes.
- * @template T The type of event to listen for (has to be keyof `M`).
- */
-export type TypedEventListenerOrEventListenerObject<M, T extends keyof M> = TypedEventListener<M, T> | TypedEventListenerObject<M, T>;
-export type ValueIsEvent<T> = {
-    [key in keyof T]: Event;
-};
-/**
- * Typescript friendly version of {@link EventTarget}
- *
- * @template M A map of event types to their respective event classes.
- *
- * @example
- * ```typescript
- * interface MyEventMap {
- *     hello: Event;
- *     time: CustomEvent<number>;
- * }
- *
- * const eventTarget = new TypedEventTarget<MyEventMap>();
- *
- * eventTarget.addEventListener('time', (event) => {
- *     // event is of type CustomEvent<number>
- * });
- * ```
- */
-export interface TypedEventTarget<M extends ValueIsEvent<M>> {
-    /** Appends an event listener for events whose type attribute value is type.
-     * The callback argument sets the callback that will be invoked when the event
-     * is dispatched.
-     *
-     * The options argument sets listener-specific options. For compatibility this
-     * can be a boolean, in which case the method behaves exactly as if the value
-     * was specified as options's capture.
-     *
-     * When set to true, options's capture prevents callback from being invoked
-     * when the event's eventPhase attribute value is BUBBLING_PHASE. When false
-     * (or not present), callback will not be invoked when event's eventPhase
-     * attribute value is CAPTURING_PHASE. Either way, callback will be invoked if
-     * event's eventPhase attribute value is AT_TARGET.
-     *
-     * When set to true, options's passive indicates that the callback will not
-     * cancel the event by invoking preventDefault(). This is used to enable
-     * performance optimizations described in § 2.8 Observing event listeners.
-     *
-     * When set to true, options's once indicates that the callback will only be
-     * invoked once after which the event listener will be removed.
-     *
-     * The event listener is appended to target's event listener list and is not
-     * appended if it has the same type, callback, and capture. */
-    addEventListener: <T extends keyof M & string>(type: T, listener: TypedEventListenerOrEventListenerObject<M, T> | null, options?: boolean | AddEventListenerOptions) => void;
-    /** Removes the event listener in target's event listener list with the same
-     * type, callback, and options. */
-    removeEventListener: <T extends keyof M & string>(type: T, callback: TypedEventListenerOrEventListenerObject<M, T> | null, options?: EventListenerOptions | boolean) => void;
-    /**
-     * Dispatches a synthetic event event to target and returns true if either
-     * event's cancelable attribute value is false or its preventDefault() method
-     * was not invoked, and false otherwise.
-     * @deprecated To ensure type safety use `dispatchTypedEvent` instead.
-     */
-    dispatchEvent: (event: Event) => boolean;
-}
-export declare class TrackingEventTarget extends EventTarget {
-    private activeEventTracking;
-    addEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: AddEventListenerOptions | boolean): void;
-    removeEventListener(type: string, callback: EventListenerOrEventListenerObject | null, options?: EventListenerOptions | boolean): void;
-    dispatchEvent(event: Event): boolean;
-    private filterRegistrations;
-    protected eventActivated(type: string): void;
-    protected eventDeactivated(type: string): void;
+export type Listener<T> = (data: T) => void;
+export declare class TypedEventTarget<M> {
+    private listeners;
+    addEventListener<K extends keyof M & string>(type: K, listener: Listener<M[K]>): void;
+    removeEventListener<K extends keyof M & string>(type: K, listener: Listener<M[K]>): void;
+    protected dispatchEvent<K extends keyof M & string>(type: K, ...[data]: M[K] extends void ? [] : [data: M[K]]): void;
+    protected eventActivated(_type: string): void;
+    protected eventDeactivated(_type: string): void;
     protected getActiveEvents(): string[];
 }
-export declare class TypedEventTarget<M extends ValueIsEvent<M>> extends TrackingEventTarget {
-    /**
-     * Dispatches a synthetic event event to target and returns true if either
-     * event's cancelable attribute value is false or its preventDefault() method
-     * was not invoked, and false otherwise.
-     */
-    dispatchTypedEvent<T extends keyof M>(_type: T, event: M[T]): boolean;
-}

package/build/cjs/events.js

@@ -1,109 +1,48 @@
 "use strict";
-/**
- * Copyright (c) 2022 Jonas "DerZade" Schade
- *
- * SPDX-License-Identifier: MIT
- *
- * https://github.com/DerZade/typescript-event-target/blob/master/src/TypedEventTarget.ts
- */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypedEventTarget = exports.TrackingEventTarget = void 0;
-// We've added this in to keep track of what events are active.
-// Having done this it's questionable whether it's worth the reimplementation
-// just to use an EventTarget API.
-class TrackingEventTarget extends EventTarget {
+exports.TypedEventTarget = void 0;
+class TypedEventTarget {
     constructor() {
-        super(...arguments);
-        Object.defineProperty(this, "activeEventTracking", {
+        Object.defineProperty(this, "listeners", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: new Map()
         });
     }
-    addEventListener(type, callback, options) {
-        if (callback !== null) {
-            const registrations = this.activeEventTracking.get(type) ?? [];
-            const wasEmpty = registrations.length === 0;
-            const registration = new Registration(callback, options ?? false);
-            if (!registrations.find((r) => r.eq(registration))) {
-                registrations.push(registration);
-                this.activeEventTracking.set(type, registrations);
-                if (wasEmpty) {
-                    this.eventActivated(type);
-                }
-            }
+    addEventListener(type, listener) {
+        let set = this.listeners.get(type);
+        const wasEmpty = !set || set.size === 0;
+        if (!set) {
+            set = new Set();
+            this.listeners.set(type, set);
         }
-        super.addEventListener(type, callback, options);
-    }
-    removeEventListener(type, callback, options) {
-        if (callback !== null) {
-            const registration = new Registration(callback, options ?? false);
-            this.filterRegistrations(type, (r) => !r.eq(registration));
+        if (!set.has(listener)) {
+            set.add(listener);
+            if (wasEmpty)
+                this.eventActivated(type);
         }
-        super.removeEventListener(type, callback, options);
-    }
-    dispatchEvent(event) {
-        const result = super.dispatchEvent(event);
-        this.filterRegistrations(event.type, (r) => !r.isOnce());
-        return result;
     }
-    filterRegistrations(type, predicate) {
-        let registrations = this.activeEventTracking.get(type) ?? [];
-        registrations = registrations.filter(predicate);
-        if (registrations.length === 0) {
-            this.activeEventTracking.delete(type);
+    removeEventListener(type, listener) {
+        const set = this.listeners.get(type);
+        if (set?.delete(listener) && set.size === 0) {
+            this.listeners.delete(type);
             this.eventDeactivated(type);
         }
-        else {
-            this.activeEventTracking.set(type, registrations);
+    }
+    dispatchEvent(type, ...[data]) {
+        const set = this.listeners.get(type);
+        if (set) {
+            for (const listener of set) {
+                listener(data);
+            }
         }
     }
-    eventActivated(type) { }
-    eventDeactivated(type) { }
+    eventActivated(_type) { }
+    eventDeactivated(_type) { }
     getActiveEvents() {
-        return [...this.activeEventTracking.keys()];
-    }
-}
-exports.TrackingEventTarget = TrackingEventTarget;
-// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
-class TypedEventTarget extends TrackingEventTarget {
-    /**
-     * Dispatches a synthetic event event to target and returns true if either
-     * event's cancelable attribute value is false or its preventDefault() method
-     * was not invoked, and false otherwise.
-     */
-    dispatchTypedEvent(_type, event) {
-        return super.dispatchEvent(event);
+        return [...this.listeners.keys()];
     }
 }
 exports.TypedEventTarget = TypedEventTarget;
-class Registration {
-    constructor(callback, options) {
-        Object.defineProperty(this, "callback", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: callback
-        });
-        Object.defineProperty(this, "options", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: options
-        });
-    }
-    isOnce() {
-        return typeof this.options === "object" && this.options.once === true;
-    }
-    eq(other) {
-        return (other.callback === this.callback &&
-            eqUseCapture(this.options, other.options));
-    }
-}
-const eqUseCapture = (left, right) => {
-    const leftValue = typeof left === "boolean" ? left : left.capture ?? false;
-    const rightValue = typeof right === "boolean" ? right : right.capture ?? false;
-    return leftValue === rightValue;
-};
 //# sourceMappingURL=events.js.map

package/build/cjs/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/events.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AA0GH,+DAA+D;AAC/D,6EAA6E;AAC7E,kCAAkC;AAClC,MAAa,mBAAoB,SAAQ,WAAW;IAApD;;QACU;;;;mBAAmD,IAAI,GAAG,EAAE;WAAC;IA6DvE,CAAC;IA3DC,gBAAgB,CACd,IAAY,EACZ,QAAmD,EACnD,OAA2C;QAE3C,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,MAAM,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/D,MAAM,QAAQ,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC;YAC5C,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,QAAQ,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC;YAClE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;gBACnD,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACjC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAClD,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;QACH,CAAC;QACD,KAAK,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,mBAAmB,CACjB,IAAY,EACZ,QAAmD,EACnD,OAAwC;QAExC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,QAAQ,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC;YAClE,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,aAAa,CAAC,KAAY;QACxB,MAAM,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,mBAAmB,CACzB,IAAY,EACZ,SAAuC;QAEvC,IAAI,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7D,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAES,cAAc,CAAC,IAAY,IAAG,CAAC;IAE/B,gBAAgB,CAAC,IAAY,IAAG,CAAC;IAEjC,eAAe;QACvB,OAAO,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;CACF;AA9DD,kDA8DC;AAED,4EAA4E;AAC5E,MAAa,gBAEX,SAAQ,mBAAmB;IAC3B;;;;OAIG;IACI,kBAAkB,CAAoB,KAAQ,EAAE,KAAW;QAChE,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;CACF;AAXD,4CAWC;AAED,MAAM,YAAY;IAChB,YACU,QAA4C,EAC5C,OAA0C;QADlD;;;;mBAAQ,QAAQ;WAAoC;QACpD;;;;mBAAQ,OAAO;WAAmC;IACjD,CAAC;IAEJ,MAAM;QACJ,OAAO,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;IACxE,CAAC;IAED,EAAE,CAAC,KAAmB;QACpB,OAAO,CACL,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;YAChC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAC1C,CAAC;IACJ,CAAC;CACF;AAED,MAAM,YAAY,GAAG,CACnB,IAAuC,EACvC,KAAwC,EACxC,EAAE;IACF,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC;IAC3E,MAAM,UAAU,GACd,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC;IAC9D,OAAO,SAAS,KAAK,UAAU,CAAC;AAClC,CAAC,CAAC"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/events.ts"],"names":[],"mappings":";;;AAEA,MAAa,gBAAgB;IAA7B;QACU;;;;mBAAY,IAAI,GAAG,EAA8B;WAAC;IA8C5D,CAAC;IA5CC,gBAAgB,CACd,IAAO,EACP,QAAwB;QAExB,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAChC,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAClB,IAAI,QAAQ;gBAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;IAED,mBAAmB,CACjB,IAAO,EACP,QAAwB;QAExB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAES,aAAa,CACrB,IAAO,EACP,GAAG,CAAC,IAAI,CAAwC;QAEhD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,GAAG,EAAE,CAAC;YACR,KAAK,MAAM,QAAQ,IAAI,GAAG,EAAE,CAAC;gBAC3B,QAAQ,CAAC,IAAY,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;IACH,CAAC;IAES,cAAc,CAAC,KAAa,IAAS,CAAC;IACtC,gBAAgB,CAAC,KAAa,IAAS,CAAC;IACxC,eAAe;QACvB,OAAO,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAa,CAAC;IAChD,CAAC;CACF;AA/CD,4CA+CC"}

package/build/cjs/events.test.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
 const events_js_1 = require("./events.js");
-class TestTrackingEventTarget extends events_js_1.TrackingEventTarget {
+class TestTypedEventTarget extends events_js_1.TypedEventTarget {
     constructor(activate, deactivate) {
         super();
         Object.defineProperty(this, "activate", {
@@ -21,6 +21,9 @@ class TestTrackingEventTarget extends events_js_1.TrackingEventTarget {
     getActiveEvents() {
         return super.getActiveEvents();
     }
+    dispatchEvent(type, ...[data]) {
+        super.dispatchEvent(type, ...[data]);
+    }
     eventActivated(type) {
         this.activate(type);
     }
@@ -28,12 +31,12 @@ class TestTrackingEventTarget extends events_js_1.TrackingEventTarget {
         this.deactivate(type);
     }
 }
-(0, vitest_1.describe)("TrackingEventTarget", () => {
-    const listener = () => { };
+(0, vitest_1.describe)("TypedEventTarget", () => {
+    const listener = (_data) => { };
     (0, vitest_1.it)("add remove", () => {
         const activate = vitest_1.vi.fn();
         const deactivate = vitest_1.vi.fn();
-        const target = new TestTrackingEventTarget(activate, deactivate);
+        const target = new TestTypedEventTarget(activate, deactivate);
         (0, vitest_1.expect)(target.getActiveEvents()).toEqual([]);
         target.addEventListener("foo", listener);
         (0, vitest_1.expect)(activate).toBeCalledTimes(1);
@@ -44,66 +47,69 @@ class TestTrackingEventTarget extends events_js_1.TrackingEventTarget {
         (0, vitest_1.expect)(deactivate).toBeCalledTimes(1);
         (0, vitest_1.expect)(target.getActiveEvents()).toEqual([]);
     });
-    (0, vitest_1.it)("callback equality", () => {
-        const listenerAlt = () => { };
+    (0, vitest_1.it)("identity-based dedup", () => {
+        const listenerAlt = (_data) => { };
         const activate = vitest_1.vi.fn();
         const deactivate = vitest_1.vi.fn();
-        const target = new TestTrackingEventTarget(activate, deactivate);
-        (0, vitest_1.expect)(target.getActiveEvents()).toEqual([]);
+        const target = new TestTypedEventTarget(activate, deactivate);
         target.addEventListener("foo", listenerAlt);
         target.addEventListener("foo", listener);
-        target.addEventListener("foo", listener);
+        target.addEventListener("foo", listener); // duplicate, ignored
+        (0, vitest_1.expect)(activate).toBeCalledTimes(1); // only called once for "foo"
         target.removeEventListener("foo", listener);
         (0, vitest_1.expect)(target.getActiveEvents()).toEqual(["foo"]);
         target.removeEventListener("foo", listenerAlt);
         (0, vitest_1.expect)(target.getActiveEvents()).toEqual([]);
     });
-    (0, vitest_1.it)("option equality - capture", () => {
-        const fooListener = vitest_1.vi.fn();
+    (0, vitest_1.it)("remove during dispatch", () => {
         const activate = vitest_1.vi.fn();
         const deactivate = vitest_1.vi.fn();
-        const target = new TestTrackingEventTarget(activate, deactivate);
-        (0, vitest_1.expect)(target.getActiveEvents()).toEqual([]);
-        target.addEventListener("foo", fooListener, { capture: true });
-        target.addEventListener("foo", fooListener, false);
-        target.removeEventListener("foo", fooListener, true);
+        const target = new TestTypedEventTarget(activate, deactivate);
+        const calls = [];
+        const selfRemovingListener = (_data) => {
+            calls.push(1);
+            target.removeEventListener("foo", selfRemovingListener);
+        };
+        const secondListener = (_data) => {
+            calls.push(2);
+        };
+        target.addEventListener("foo", selfRemovingListener);
+        target.addEventListener("foo", secondListener);
+        target.dispatchEvent("foo", { value: 42 });
+        // Both should have been called (Set iteration guarantees this)
+        (0, vitest_1.expect)(calls).toEqual([1, 2]);
+        // selfRemovingListener should be removed now
         (0, vitest_1.expect)(target.getActiveEvents()).toEqual(["foo"]);
-        target.dispatchEvent(new Event("foo"));
-        (0, vitest_1.expect)(fooListener).toBeCalledTimes(1);
     });
-    (0, vitest_1.it)("option equality", () => {
-        const fooListener = vitest_1.vi.fn();
-        const activate = vitest_1.vi.fn();
-        const deactivate = vitest_1.vi.fn();
-        const target = new TestTrackingEventTarget(activate, deactivate);
-        // Despite MDN docs claiming all options can result in another listener added
-        // it seems only capture counts for both add and remove
-        target.addEventListener("foo", fooListener, { passive: true });
-        target.addEventListener("foo", fooListener, { once: true });
-        target.addEventListener("foo", fooListener, { capture: true });
-        target.addEventListener("foo", fooListener, { capture: false });
-        target.dispatchEvent(new Event("foo"));
-        (0, vitest_1.expect)(fooListener).toBeCalledTimes(2);
-        target.removeEventListener("foo", fooListener, true);
-        (0, vitest_1.expect)(target.getActiveEvents()).toEqual(["foo"]);
-        target.dispatchEvent(new Event("foo"));
-        (0, vitest_1.expect)(fooListener).toBeCalledTimes(3);
-        target.removeEventListener("foo", fooListener, false);
-        (0, vitest_1.expect)(target.getActiveEvents()).toEqual([]);
-        target.dispatchEvent(new Event("foo"));
-        (0, vitest_1.expect)(fooListener).toBeCalledTimes(3);
+    (0, vitest_1.it)("getActiveEvents", () => {
+        const target = new TestTypedEventTarget(vitest_1.vi.fn(), vitest_1.vi.fn());
+        const fooListener = () => { };
+        const barListener = () => { };
+        target.addEventListener("foo", fooListener);
+        target.addEventListener("bar", barListener);
+        (0, vitest_1.expect)(target.getActiveEvents().sort()).toEqual(["bar", "foo"]);
+        target.removeEventListener("foo", fooListener);
+        (0, vitest_1.expect)(target.getActiveEvents()).toEqual(["bar"]);
     });
-    (0, vitest_1.it)("once", () => {
+    (0, vitest_1.it)("void events dispatch without argument", () => {
+        const target = new TestTypedEventTarget(vitest_1.vi.fn(), vitest_1.vi.fn());
+        const barListener = vitest_1.vi.fn();
+        target.addEventListener("bar", barListener);
+        target.dispatchEvent("bar");
+        (0, vitest_1.expect)(barListener).toBeCalledTimes(1);
+    });
+    (0, vitest_1.it)("dispatches correct data to listeners", () => {
+        const target = new TestTypedEventTarget(vitest_1.vi.fn(), vitest_1.vi.fn());
         const fooListener = vitest_1.vi.fn();
-        const activate = vitest_1.vi.fn();
+        target.addEventListener("foo", fooListener);
+        target.dispatchEvent("foo", { value: 99 });
+        (0, vitest_1.expect)(fooListener).toBeCalledWith({ value: 99 });
+    });
+    (0, vitest_1.it)("removing non-existent listener is a no-op", () => {
         const deactivate = vitest_1.vi.fn();
-        const target = new TestTrackingEventTarget(activate, deactivate);
-        target.addEventListener("foo", fooListener, { once: true });
-        target.dispatchEvent(new Event("foo"));
-        (0, vitest_1.expect)(fooListener).toBeCalledTimes(1);
-        (0, vitest_1.expect)(deactivate).toBeCalledTimes(1);
-        target.dispatchEvent(new Event("foo"));
-        (0, vitest_1.expect)(fooListener).toBeCalledTimes(1);
+        const target = new TestTypedEventTarget(vitest_1.vi.fn(), deactivate);
+        target.removeEventListener("foo", listener);
+        (0, vitest_1.expect)(deactivate).not.toBeCalled();
     });
 });
 //# sourceMappingURL=events.test.js.map

package/build/cjs/events.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.test.js","sourceRoot":"","sources":["../../src/events.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"events.test.js","sourceRoot":"","sources":["../../src/events.test.ts"],"names":[],"mappings":"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"}

package/build/cjs/hex-util.d.ts

@@ -0,0 +1 @@
+export declare const truncateHexAfterEof: (hex: string) => string;

package/build/cjs/hex-util.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.truncateHexAfterEof = void 0;
+// MakeCode hex files may contain embedded source in custom record types
+// (type 0x0E) after the EOF record, and older files may have trailing blank
+// lines. The nrf-intel-hex parser rejects any data after EOF, so we truncate.
+const truncateHexAfterEof = (hex) => {
+    // The EOF record is :00000001FF (case-insensitive per the Intel HEX spec).
+    const eofIdx = hex.search(/:00000001FF/i);
+    if (eofIdx < 0)
+        return hex;
+    return hex.slice(0, eofIdx + ":00000001FF".length) + "\n";
+};
+exports.truncateHexAfterEof = truncateHexAfterEof;
+//# sourceMappingURL=hex-util.js.map

package/build/cjs/hex-util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hex-util.js","sourceRoot":"","sources":["../../src/hex-util.ts"],"names":[],"mappings":";;;AAAA,wEAAwE;AACxE,4EAA4E;AAC5E,8EAA8E;AACvE,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAU,EAAE;IACzD,2EAA2E;IAC3E,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC1C,IAAI,MAAM,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;AAC5D,CAAC,CAAC;AALW,QAAA,mBAAmB,uBAK9B"}

package/build/cjs/index.d.ts

@@ -1,18 +1,8 @@
-import { AccelerometerData, AccelerometerDataEvent } from "./accelerometer.js";
-import { createWebBluetoothConnection, MicrobitWebBluetoothConnection, MicrobitWebBluetoothConnectionOptions } from "./bluetooth.js";
-import { BoardId } from "./board-id.js";
-import { ButtonEvent, ButtonEventType, ButtonState } from "./buttons.js";
-import { DeviceBondState } from "./device-bond-state.js";
-import { AfterRequestDevice, BackgroundErrorEvent, BeforeRequestDevice, BoardVersion, ConnectOptions, ConnectionAvailabilityStatus, ConnectionStatus, ConnectionStatusEvent, DeviceConnection, DeviceConnectionEventMap, DeviceError, DeviceErrorCode, FlashDataError, FlashDataSource, FlashOptions, ProgressCallback, ProgressStage } from "./device.js";
-import { TypedEventTarget } from "./events.js";
-import { createUniversalHexFlashDataSource } from "./hex-flash-data-source.js";
-import { LedMatrix } from "./led.js";
+/**
+ * @module @microbit/microbit-connection
+ */
+import { BackgroundErrorData, BoardVersion, ConnectOptions, ConnectionAvailabilityStatus, ConnectionStatus, ConnectionStatusChange, DeviceConnection, DeviceError, DeviceErrorCode, FlashDataError, FlashDataSource, FlashOptions, ProgressCallback, ProgressStage, assertConnected } from "./device.js";
 import { Logging, LoggingEvent } from "./logging.js";
-import { MagnetometerData, MagnetometerDataEvent } from "./magnetometer.js";
-import { FlashEvent, SerialConnectionEventMap, SerialDataEvent, SerialErrorEvent, SerialResetEvent } from "./serial-events.js";
-import { ServiceConnectionEventMap } from "./service-events.js";
-import { UARTDataEvent } from "./uart.js";
-import { createRadioBridgeConnection, MicrobitRadioBridgeConnection, MicrobitRadioBridgeConnectionOptions } from "./usb-radio-bridge.js";
-import { createWebUSBConnection, DeviceSelectionMode, MicrobitWebUSBConnection, MicrobitWebUSBConnectionOptions } from "./usb.js";
-export { AfterRequestDevice, BackgroundErrorEvent, BeforeRequestDevice, BoardId, ConnectionStatus, ConnectionStatusEvent, createRadioBridgeConnection, createUniversalHexFlashDataSource, createWebBluetoothConnection, createWebUSBConnection, DeviceConnectionEventMap, DeviceSelectionMode, DeviceError, FlashDataError, FlashEvent, ProgressStage, SerialConnectionEventMap, SerialDataEvent, SerialErrorEvent, SerialResetEvent, ServiceConnectionEventMap, TypedEventTarget, UARTDataEvent, };
-export type { AccelerometerData, AccelerometerDataEvent, BoardVersion, ConnectionAvailabilityStatus, ButtonEvent, ButtonEventType, ButtonState, ConnectOptions, DeviceBondState, DeviceConnection, DeviceErrorCode, FlashDataSource, FlashOptions, LedMatrix, Logging, LoggingEvent, MagnetometerData, MagnetometerDataEvent, MicrobitRadioBridgeConnection, MicrobitRadioBridgeConnectionOptions, MicrobitWebBluetoothConnection, MicrobitWebBluetoothConnectionOptions, MicrobitWebUSBConnection, MicrobitWebUSBConnectionOptions, ProgressCallback, };
+import { AccelerometerData, ButtonData, ButtonEventType, ButtonState, LedMatrix, MagnetometerData, UartData } from "./service-events.js";
+export { ButtonState, ConnectionStatus, DeviceError, FlashDataError, assertConnected, ProgressStage, };
+export type { AccelerometerData, BackgroundErrorData, BoardVersion, ButtonData, ButtonEventType, ConnectOptions, ConnectionAvailabilityStatus, ConnectionStatusChange, DeviceConnection, DeviceErrorCode, FlashDataSource, FlashOptions, LedMatrix, Logging, LoggingEvent, MagnetometerData, ProgressCallback, UartData, };

package/build/cjs/index.js

@@ -1,37 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UARTDataEvent = exports.TypedEventTarget = exports.ServiceConnectionEventMap = exports.SerialResetEvent = exports.SerialErrorEvent = exports.SerialDataEvent = exports.SerialConnectionEventMap = exports.ProgressStage = exports.FlashEvent = exports.FlashDataError = exports.DeviceError = exports.DeviceSelectionMode = exports.DeviceConnectionEventMap = exports.createWebUSBConnection = exports.createWebBluetoothConnection = exports.createUniversalHexFlashDataSource = exports.createRadioBridgeConnection = exports.ConnectionStatusEvent = exports.ConnectionStatus = exports.BoardId = exports.BeforeRequestDevice = exports.BackgroundErrorEvent = exports.AfterRequestDevice = void 0;
-const bluetooth_js_1 = require("./bluetooth.js");
-Object.defineProperty(exports, "createWebBluetoothConnection", { enumerable: true, get: function () { return bluetooth_js_1.createWebBluetoothConnection; } });
-const board_id_js_1 = require("./board-id.js");
-Object.defineProperty(exports, "BoardId", { enumerable: true, get: function () { return board_id_js_1.BoardId; } });
+exports.ProgressStage = exports.assertConnected = exports.FlashDataError = exports.DeviceError = exports.ConnectionStatus = exports.ButtonState = void 0;
+/**
+ * @module @microbit/microbit-connection
+ */
 const device_js_1 = require("./device.js");
-Object.defineProperty(exports, "AfterRequestDevice", { enumerable: true, get: function () { return device_js_1.AfterRequestDevice; } });
-Object.defineProperty(exports, "BackgroundErrorEvent", { enumerable: true, get: function () { return device_js_1.BackgroundErrorEvent; } });
-Object.defineProperty(exports, "BeforeRequestDevice", { enumerable: true, get: function () { return device_js_1.BeforeRequestDevice; } });
 Object.defineProperty(exports, "ConnectionStatus", { enumerable: true, get: function () { return device_js_1.ConnectionStatus; } });
-Object.defineProperty(exports, "ConnectionStatusEvent", { enumerable: true, get: function () { return device_js_1.ConnectionStatusEvent; } });
-Object.defineProperty(exports, "DeviceConnectionEventMap", { enumerable: true, get: function () { return device_js_1.DeviceConnectionEventMap; } });
 Object.defineProperty(exports, "DeviceError", { enumerable: true, get: function () { return device_js_1.DeviceError; } });
 Object.defineProperty(exports, "FlashDataError", { enumerable: true, get: function () { return device_js_1.FlashDataError; } });
 Object.defineProperty(exports, "ProgressStage", { enumerable: true, get: function () { return device_js_1.ProgressStage; } });
-const events_js_1 = require("./events.js");
-Object.defineProperty(exports, "TypedEventTarget", { enumerable: true, get: function () { return events_js_1.TypedEventTarget; } });
-const hex_flash_data_source_js_1 = require("./hex-flash-data-source.js");
-Object.defineProperty(exports, "createUniversalHexFlashDataSource", { enumerable: true, get: function () { return hex_flash_data_source_js_1.createUniversalHexFlashDataSource; } });
-const serial_events_js_1 = require("./serial-events.js");
-Object.defineProperty(exports, "FlashEvent", { enumerable: true, get: function () { return serial_events_js_1.FlashEvent; } });
-Object.defineProperty(exports, "SerialConnectionEventMap", { enumerable: true, get: function () { return serial_events_js_1.SerialConnectionEventMap; } });
-Object.defineProperty(exports, "SerialDataEvent", { enumerable: true, get: function () { return serial_events_js_1.SerialDataEvent; } });
-Object.defineProperty(exports, "SerialErrorEvent", { enumerable: true, get: function () { return serial_events_js_1.SerialErrorEvent; } });
-Object.defineProperty(exports, "SerialResetEvent", { enumerable: true, get: function () { return serial_events_js_1.SerialResetEvent; } });
+Object.defineProperty(exports, "assertConnected", { enumerable: true, get: function () { return device_js_1.assertConnected; } });
 const service_events_js_1 = require("./service-events.js");
-Object.defineProperty(exports, "ServiceConnectionEventMap", { enumerable: true, get: function () { return service_events_js_1.ServiceConnectionEventMap; } });
-const uart_js_1 = require("./uart.js");
-Object.defineProperty(exports, "UARTDataEvent", { enumerable: true, get: function () { return uart_js_1.UARTDataEvent; } });
-const usb_radio_bridge_js_1 = require("./usb-radio-bridge.js");
-Object.defineProperty(exports, "createRadioBridgeConnection", { enumerable: true, get: function () { return usb_radio_bridge_js_1.createRadioBridgeConnection; } });
-const usb_js_1 = require("./usb.js");
-Object.defineProperty(exports, "createWebUSBConnection", { enumerable: true, get: function () { return usb_js_1.createWebUSBConnection; } });
-Object.defineProperty(exports, "DeviceSelectionMode", { enumerable: true, get: function () { return usb_js_1.DeviceSelectionMode; } });
+Object.defineProperty(exports, "ButtonState", { enumerable: true, get: function () { return service_events_js_1.ButtonState; } });
 //# sourceMappingURL=index.js.map

package/build/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AACA,iDAIwB;AA0DtB,6GA7DA,2CAA4B,OA6DA;AAzD9B,+CAAwC;AAoDtC,wFApDO,qBAAO,OAoDP;AAjDT,2CAkBqB;AA4BnB,mGA7CA,8BAAkB,OA6CA;AAClB,qGA7CA,gCAAoB,OA6CA;AACpB,oGA7CA,+BAAmB,OA6CA;AAEnB,iGA3CA,4BAAgB,OA2CA;AAChB,sGA3CA,iCAAqB,OA2CA;AAKrB,yGA9CA,oCAAwB,OA8CA;AAExB,4FA/CA,uBAAW,OA+CA;AACX,+FA9CA,0BAAc,OA8CA;AAEd,8FA5CA,yBAAa,OA4CA;AA1Cf,2CAA+C;AAgD7C,iGAhDO,4BAAgB,OAgDP;AA/ClB,yEAA+E;AAiC7E,kHAjCO,4DAAiC,OAiCP;AA7BnC,yDAM4B;AA8B1B,2FAnCA,6BAAU,OAmCA;AAEV,yGApCA,2CAAwB,OAoCA;AACxB,gGApCA,kCAAe,OAoCA;AACf,iGApCA,mCAAgB,OAoCA;AAChB,iGApCA,mCAAgB,OAoCA;AAlClB,2DAAgE;AAmC9D,0GAnCO,6CAAyB,OAmCP;AAlC3B,uCAA0C;AAoCxC,8FApCO,uBAAa,OAoCP;AAnCf,+DAI+B;AAe7B,4GAlBA,iDAA2B,OAkBA;AAd7B,qCAKkB;AAYhB,uGAhBA,+BAAsB,OAgBA;AAEtB,oGAjBA,4BAAmB,OAiBA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,2CAgBqB;AAcnB,iGAzBA,4BAAgB,OAyBA;AAChB,4FAvBA,uBAAW,OAuBA;AACX,+FAtBA,0BAAc,OAsBA;AAEd,8FApBA,yBAAa,OAoBA;AADb,gGAlBA,2BAAe,OAkBA;AAfjB,2DAQ6B;AAG3B,4FAPA,+BAAW,OAOA"}

package/build/cjs/radio-bridge/connection.d.ts

@@ -0,0 +1,52 @@
+/**
+ * (c) 2023, Center for Computational Thinking and Design at Aarhus University and contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+import { BackgroundErrorData, ConnectionStatusChange, DeviceConnection } from "../device.js";
+import { Logging } from "../logging.js";
+import { AccelerometerData, ButtonData } from "../service-events.js";
+import { MicrobitUSBConnection } from "../usb/connection.js";
+export interface MicrobitRadioBridgeConnectionOptions {
+    logging?: Logging;
+}
+/**
+ * A connection to a remote micro:bit via a USB-connected micro:bit running
+ * radio bridge firmware. Sensor data is relayed over a serial protocol.
+ *
+ * @experimental This connection type has limited service support compared to
+ * direct Bluetooth connections:
+ *
+ * - `accelerometerdatachanged`, `buttonachanged`, `buttonbchanged` events
+ *   are supported.
+ * - `flash` is not supported.
+ */
+export interface MicrobitRadioBridgeConnection extends DeviceConnection {
+    readonly type: "radio-bridge";
+    addEventListener(type: "status", listener: (data: ConnectionStatusChange) => void): void;
+    addEventListener(type: "backgrounderror", listener: (data: BackgroundErrorData) => void): void;
+    addEventListener(type: "beforerequestdevice", listener: () => void): void;
+    addEventListener(type: "afterrequestdevice", listener: () => void): void;
+    addEventListener(type: "flash", listener: () => void): void;
+    addEventListener(type: "accelerometerdatachanged", listener: (data: AccelerometerData) => void): void;
+    addEventListener(type: "buttonachanged" | "buttonbchanged", listener: (data: ButtonData) => void): void;
+    removeEventListener(type: "status", listener: (data: ConnectionStatusChange) => void): void;
+    removeEventListener(type: "backgrounderror", listener: (data: BackgroundErrorData) => void): void;
+    removeEventListener(type: "beforerequestdevice", listener: () => void): void;
+    removeEventListener(type: "afterrequestdevice", listener: () => void): void;
+    removeEventListener(type: "flash", listener: () => void): void;
+    removeEventListener(type: "accelerometerdatachanged", listener: (data: AccelerometerData) => void): void;
+    removeEventListener(type: "buttonachanged" | "buttonbchanged", listener: (data: ButtonData) => void): void;
+    /**
+     * Sets remote device.
+     *
+     * @param deviceId The device id of remote micro:bit.
+     */
+    setRemoteDeviceId(deviceId: number): void;
+}
+/**
+ * A radio bridge connection factory.
+ *
+ * @experimental See {@link MicrobitRadioBridgeConnection} for limitations.
+ */
+export declare const createRadioBridgeConnection: (delegate: MicrobitUSBConnection, options?: MicrobitRadioBridgeConnectionOptions) => MicrobitRadioBridgeConnection;