@microbit/microbit-connection 0.9.0-apps.alpha.9 → 1.0.0-beta.1

package/build/cjs/{usb-radio-bridge.js → radio-bridge/connection.js}

@@ -29,19 +29,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRadioBridgeConnection = void 0;
-const accelerometer_js_1 = require("./accelerometer.js");
-const buttons_js_1 = require("./buttons.js");
-const device_js_1 = require("./device.js");
-const events_js_1 = require("./events.js");
-const logging_js_1 = require("./logging.js");
-const protocol = __importStar(require("./usb-serial-protocol.js"));
-const connectTimeoutDuration = 10000;
-class BridgeError extends Error {
-}
-class RemoteError extends Error {
-}
+const device_js_1 = require("../device.js");
+const events_js_1 = require("../events.js");
+const logging_js_1 = require("../logging.js");
+const service_events_js_1 = require("../service-events.js");
+const protocol = __importStar(require("./serial-protocol.js"));
+const connectTimeoutDuration = 10_000;
 /**
  * A radio bridge connection factory.
+ *
+ * @experimental See {@link MicrobitRadioBridgeConnection} for limitations.
  */
 const createRadioBridgeConnection = (delegate, options) => new MicrobitRadioBridgeConnectionImpl(delegate, options);
 exports.createRadioBridgeConnection = createRadioBridgeConnection;
@@ -59,6 +56,12 @@ class MicrobitRadioBridgeConnectionImpl extends events_js_1.TypedEventTarget {
             writable: true,
             value: delegate
         });
+        Object.defineProperty(this, "type", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "radio-bridge"
+        });
         Object.defineProperty(this, "status", {
             enumerable: true,
             configurable: true,
@@ -95,27 +98,18 @@ class MicrobitRadioBridgeConnectionImpl extends events_js_1.TypedEventTarget {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "ignoreDelegateStatus", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
         Object.defineProperty(this, "delegateStatusListener", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: (e) => {
-                if (this.ignoreDelegateStatus) {
-                    return;
-                }
                 const currentStatus = this.status;
-                if (e.status !== device_js_1.ConnectionStatus.CONNECTED) {
+                if (e.status !== device_js_1.ConnectionStatus.Connected) {
                     this.setStatus(e.status);
                     // Don't dispose the serial session when PAUSED - USB is temporarily
                     // unavailable due to tab visibility, but we'll reconnect when visible.
                     // Attempting dispose would fail anyway since USB is disconnected.
-                    if (e.status === device_js_1.ConnectionStatus.PAUSED) {
+                    if (e.status === device_js_1.ConnectionStatus.Paused) {
                         // Clear timestamp so stale values don't trigger reconnection when resuming.
                         this.serialSession?.clearLastReceivedTimestamp();
                     }
@@ -125,12 +119,11 @@ class MicrobitRadioBridgeConnectionImpl extends events_js_1.TypedEventTarget {
                     }
                 }
                 else {
-                    this.status = device_js_1.ConnectionStatus.DISCONNECTED;
-                    // Reconnect the serial session if we were previously disconnected or paused.
+                    this.status = device_js_1.ConnectionStatus.Disconnected;
+                    // Reconnect the serial session if we were previously paused.
                     // PAUSED means the USB connection was temporarily suspended due to tab
                     // visibility, and now the tab is visible again so we should reconnect.
-                    const shouldReconnect = currentStatus === device_js_1.ConnectionStatus.DISCONNECTED ||
-                        currentStatus === device_js_1.ConnectionStatus.PAUSED;
+                    const shouldReconnect = currentStatus === device_js_1.ConnectionStatus.Paused;
                     if (shouldReconnect && this.serialSessionOpen) {
                         this.serialSession?.connect();
                     }
@@ -171,40 +164,34 @@ class MicrobitRadioBridgeConnectionImpl extends events_js_1.TypedEventTarget {
         // TODO: previously this skipped overlapping connect attempts but that seems awkward
         // can we... just not do that? or wait?
         if (this.remoteDeviceId === undefined) {
-            throw new BridgeError(`Missing remote micro:bit ID`);
+            throw new device_js_1.DeviceError({
+                code: "connection-error",
+                message: "Missing remote micro:bit ID",
+            });
         }
         this.logging.event({
             type: "Connect",
             message: "Serial connect start",
         });
-        this.ignoreDelegateStatus = false;
         await this.delegate.connect();
         try {
-            this.serialSession = new RadioBridgeSerialSession(this.logging, this.remoteDeviceId, this.delegate, this.dispatchTypedEvent.bind(this), {
-                onConnecting: () => this.setStatus(device_js_1.ConnectionStatus.CONNECTING),
-                onReconnecting: () => {
-                    // Leave serial connection running in case the remote device comes back.
-                    if (this.status !== device_js_1.ConnectionStatus.RECONNECTING) {
-                        this.setStatus(device_js_1.ConnectionStatus.RECONNECTING);
-                    }
+            this.serialSession = new RadioBridgeSerialSession(this.logging, this.remoteDeviceId, this.delegate, this.dispatchEvent.bind(this), {
+                onConnecting: () => {
+                    this.setStatus(device_js_1.ConnectionStatus.Connecting);
+                    this.serialSessionOpen = true;
                 },
-                onRestartConnection: () => {
-                    // So that serial session does not get repetitively disposed in
-                    // delegate status listener when delegate is disconnected for restarting connection
-                    this.ignoreDelegateStatus = true;
+                onFailPreDispose: () => {
+                    this.serialSessionOpen = false;
                 },
-                onFail: () => {
-                    if (this.status !== device_js_1.ConnectionStatus.DISCONNECTED) {
-                        this.setStatus(device_js_1.ConnectionStatus.DISCONNECTED);
+                onFailPostDispose: () => {
+                    if (this.status !== device_js_1.ConnectionStatus.Disconnected) {
+                        this.setStatus(device_js_1.ConnectionStatus.Disconnected);
                     }
-                    this.ignoreDelegateStatus = false;
-                    this.serialSessionOpen = false;
                 },
                 onSuccess: () => {
-                    if (this.status !== device_js_1.ConnectionStatus.CONNECTED) {
-                        this.setStatus(device_js_1.ConnectionStatus.CONNECTED);
+                    if (this.status !== device_js_1.ConnectionStatus.Connected) {
+                        this.setStatus(device_js_1.ConnectionStatus.Connected);
                     }
-                    this.ignoreDelegateStatus = false;
                     this.serialSessionOpen = true;
                 },
             });
@@ -241,11 +228,14 @@ class MicrobitRadioBridgeConnectionImpl extends events_js_1.TypedEventTarget {
         const previousStatus = this.status;
         this.status = newStatus;
         this.log("Radio connection status " + newStatus);
-        this.dispatchTypedEvent("status", new device_js_1.ConnectionStatusEvent(newStatus, previousStatus));
+        this.dispatchEvent("status", {
+            status: newStatus,
+            previousStatus,
+        });
     }
     statusFromDelegate() {
-        return this.delegate.status == device_js_1.ConnectionStatus.CONNECTED
-            ? device_js_1.ConnectionStatus.DISCONNECTED
+        return this.delegate.status == device_js_1.ConnectionStatus.Connected
+            ? device_js_1.ConnectionStatus.Disconnected
             : this.delegate.status;
     }
 }
@@ -256,7 +246,12 @@ class RadioBridgeSerialSession {
     processButton(button, type, sensorData) {
         if (sensorData[button] !== this.previousButtonState[button]) {
             this.previousButtonState[button] = sensorData[button];
-            this.dispatchTypedEvent(type, new buttons_js_1.ButtonEvent(type, sensorData[button] ? buttons_js_1.ButtonState.ShortPress : buttons_js_1.ButtonState.NotPressed));
+            this.dispatchTypedEvent(type, {
+                button: type === "buttonachanged" ? "A" : "B",
+                state: sensorData[button]
+                    ? service_events_js_1.ButtonState.ShortPress
+                    : service_events_js_1.ButtonState.NotPressed,
+            });
         }
     }
     constructor(logging, remoteDeviceId, delegate, dispatchTypedEvent, callbacks) {
@@ -320,13 +315,7 @@ class RadioBridgeSerialSession {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "isRestartingConnection", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "serialErrorListener", {
+        Object.defineProperty(this, "backgroundErrorListener", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -349,11 +338,11 @@ class RadioBridgeSerialSession {
                     const sensorData = protocol.processPeriodicMessage(msg);
                     if (sensorData) {
                         this.onPeriodicMessageReceived?.();
-                        this.dispatchTypedEvent("accelerometerdatachanged", new accelerometer_js_1.AccelerometerDataEvent({
+                        this.dispatchTypedEvent("accelerometerdatachanged", {
                             x: sensorData.accelerometerX,
                             y: sensorData.accelerometerY,
                             z: sensorData.accelerometerZ,
-                        }));
+                        });
                         this.processButton("buttonA", "buttonachanged", sensorData);
                         this.processButton("buttonB", "buttonbchanged", sensorData);
                     }
@@ -380,21 +369,19 @@ class RadioBridgeSerialSession {
     }
     async connect() {
         this.delegate.addEventListener("serialdata", this.serialDataListener);
-        this.delegate.addEventListener("serialerror", this.serialErrorListener);
+        this.delegate.addEventListener("backgrounderror", this.backgroundErrorListener);
         try {
-            if (this.isRestartingConnection) {
-                this.callbacks.onReconnecting();
-            }
-            else {
-                this.callbacks.onConnecting();
-            }
+            this.callbacks.onConnecting();
             await this.handshake();
             this.logging.log(`Serial: using remote device id ${this.remoteDeviceId}`);
             const remoteMbIdCommand = protocol.generateCmdRemoteMbId(this.remoteDeviceId);
             const remoteMbIdResponse = await this.sendCmdWaitResponse(remoteMbIdCommand);
             if (remoteMbIdResponse.type === protocol.ResponseTypes.Error ||
                 remoteMbIdResponse.value !== this.remoteDeviceId) {
-                throw new BridgeError(`Failed to set remote micro:bit ID. Expected ${this.remoteDeviceId}, got ${remoteMbIdResponse.value}`);
+                throw new device_js_1.DeviceError({
+                    code: "connection-error",
+                    message: `Failed to set remote micro:bit ID. Expected ${this.remoteDeviceId}, got ${remoteMbIdResponse.value}`,
+                });
             }
             // Request the micro:bit to start sending the periodic messages
             const startCmd = protocol.generateCmdStart({
@@ -406,21 +393,25 @@ class RadioBridgeSerialSession {
                 setTimeout(() => {
                     this.onPeriodicMessageReceived = undefined;
                     reject(new Error("Failed to receive data from remote micro:bit"));
-                }, 500);
+                }, connectTimeoutDuration);
             });
             const startCmdResponse = await this.sendCmdWaitResponse(startCmd);
             if (startCmdResponse.type === protocol.ResponseTypes.Error) {
-                throw new RemoteError(`Failed to start streaming sensors data. Error response received: ${startCmdResponse.message}`);
+                throw new device_js_1.DeviceError({
+                    code: "connection-error",
+                    message: `Failed to start streaming sensors data. Error response received: ${startCmdResponse.message}`,
+                });
             }
             // TODO: in the first-time connection case we used to move the error/disconnect to the background here, why? timing?
             await periodicMessagePromise;
-            this.isRestartingConnection = false;
             await this.startConnectionCheck();
             this.callbacks.onSuccess();
         }
         catch (e) {
-            this.callbacks.onFail();
+            this.callbacks.onFailPreDispose();
             await this.dispose();
+            this.callbacks.onFailPostDispose();
+            throw e;
         }
     }
     async dispose(disconnect = false) {
@@ -433,11 +424,16 @@ class RadioBridgeSerialSession {
         }
         this.responseMap.clear();
         this.delegate.removeEventListener("serialdata", this.serialDataListener);
-        this.delegate.removeEventListener("serialerror", this.serialErrorListener);
+        this.delegate.removeEventListener("backgrounderror", this.backgroundErrorListener);
         if (disconnect) {
             await this.delegate.disconnect();
         }
-        await this.delegate.softwareReset();
+        try {
+            await this.delegate.softwareReset();
+        }
+        catch {
+            // May already be disconnected.
+        }
     }
     async sendCmdWaitResponse(cmd) {
         const responsePromise = new Promise((resolve, reject) => {
@@ -456,7 +452,7 @@ class RadioBridgeSerialSession {
             this.connectionCheckIntervalId = setInterval(async () => {
                 // Don't check connection while USB is paused/disconnected.
                 // The check will resume when USB reconnects.
-                if (this.delegate.status !== device_js_1.ConnectionStatus.CONNECTED) {
+                if (this.delegate.status !== device_js_1.ConnectionStatus.Connected) {
                     return;
                 }
                 if (this.lastReceivedMessageTimestamp &&
@@ -467,29 +463,15 @@ class RadioBridgeSerialSession {
                     Date.now() - this.lastReceivedMessageTimestamp > 1_000) {
                     this.logging.event({
                         type: "Serial",
-                        message: "Serial connection lost...attempt to reconnect",
+                        message: "Serial connection lost",
                     });
-                    this.callbacks.onReconnecting();
-                }
-                if (this.lastReceivedMessageTimestamp &&
-                    Date.now() - this.lastReceivedMessageTimestamp >
-                        connectTimeoutDuration) {
-                    await this.restartConnection();
+                    this.callbacks.onFailPreDispose();
+                    await this.dispose(true);
+                    this.callbacks.onFailPostDispose();
                 }
             }, 1000);
         }
     }
-    async restartConnection() {
-        this.isRestartingConnection = true;
-        this.logging.event({
-            type: "Serial",
-            message: "Serial connection lost...restart connection",
-        });
-        this.callbacks.onRestartConnection();
-        await this.dispose(true);
-        await this.delegate.connect();
-        await this.connect();
-    }
     stopConnectionCheck() {
         clearInterval(this.connectionCheckIntervalId);
         this.connectionCheckIntervalId = undefined;
@@ -523,7 +505,10 @@ class RadioBridgeSerialSession {
                     // We expect some to time out, likely well after the handshake is completed.
                     if (!resolved) {
                         if (++failureCounter === attempts) {
-                            reject(new BridgeError("Handshake not completed"));
+                            reject(new device_js_1.DeviceError({
+                                code: "timeout",
+                                message: "Handshake not completed",
+                            }));
                         }
                     }
                 });
@@ -531,8 +516,11 @@ class RadioBridgeSerialSession {
             }
         });
         if (handshakeResult.value !== protocol.version) {
-            throw new BridgeError(`Handshake failed. Unexpected protocol version ${protocol.version}`);
+            throw new device_js_1.DeviceError({
+                code: "connection-error",
+                message: `Handshake failed. Unexpected protocol version ${protocol.version}`,
+            });
         }
     }
 }
-//# sourceMappingURL=usb-radio-bridge.js.map
+//# sourceMappingURL=connection.js.map

package/build/cjs/radio-bridge/connection.js.map

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

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

@@ -0,0 +1,4 @@
+/**
+ * @module @microbit/microbit-connection/radio-bridge
+ */
+export { createRadioBridgeConnection, type MicrobitRadioBridgeConnection, type MicrobitRadioBridgeConnectionOptions, } from "./connection.js";

package/build/cjs/radio-bridge/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRadioBridgeConnection = void 0;
+/**
+ * @module @microbit/microbit-connection/radio-bridge
+ */
+var connection_js_1 = require("./connection.js");
+Object.defineProperty(exports, "createRadioBridgeConnection", { enumerable: true, get: function () { return connection_js_1.createRadioBridgeConnection; } });
+//# sourceMappingURL=index.js.map

package/build/cjs/radio-bridge/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/radio-bridge/index.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,iDAIyB;AAHvB,4HAAA,2BAA2B,OAAA"}

package/build/cjs/{usb-serial-protocol.js → radio-bridge/serial-protocol.js}

@@ -180,4 +180,4 @@ const generateRandomRadioFrequency = () => {
     return Math.floor(Math.random() * 84);
 };
 exports.generateRandomRadioFrequency = generateRandomRadioFrequency;
-//# sourceMappingURL=usb-serial-protocol.js.map
+//# sourceMappingURL=serial-protocol.js.map

package/build/cjs/radio-bridge/serial-protocol.js.map

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

package/build/cjs/service-events.d.ts

@@ -1,17 +1,94 @@
-import { AccelerometerDataEvent } from "./accelerometer.js";
-import { ButtonEvent } from "./buttons.js";
 import { DeviceConnectionEventMap } from "./device.js";
-import { MagnetometerDataEvent } from "./magnetometer.js";
-import { UARTDataEvent } from "./uart.js";
-export declare class ServiceConnectionEventMap {
-    "accelerometerdatachanged": AccelerometerDataEvent;
-    "buttonachanged": ButtonEvent;
-    "buttonbchanged": ButtonEvent;
-    "magnetometerdatachanged": MagnetometerDataEvent;
-    "uartdata": UARTDataEvent;
-}
-export type CharacteristicDataTarget = EventTarget & {
-    value: DataView;
+import type { GestureEvent, ButtonAction } from "./microbit-events.js";
+export interface AccelerometerData {
+    x: number;
+    y: number;
+    z: number;
+}
+export declare const ButtonState: {
+    readonly NotPressed: 0;
+    readonly ShortPress: 1;
+    readonly LongPress: 2;
 };
-export type TypedServiceEvent = keyof (ServiceConnectionEventMap & DeviceConnectionEventMap);
-export type TypedServiceEventDispatcher = (_type: TypedServiceEvent, event: (ServiceConnectionEventMap & DeviceConnectionEventMap)[TypedServiceEvent]) => boolean;
+export type ButtonState = (typeof ButtonState)[keyof typeof ButtonState];
+export type ButtonActionType = "buttonachanged" | "buttonbchanged";
+export interface ButtonData {
+    button: "A" | "B";
+    state: ButtonState;
+}
+/**
+ * A 5x5 boolean matrix representing the micro:bit LED display.
+ * Each inner array is a row of 5 booleans (left to right),
+ * and there are 5 rows (top to bottom).
+ */
+export type LedMatrix = boolean[][];
+export interface MagnetometerData {
+    x: number;
+    y: number;
+    z: number;
+}
+export interface TemperatureData {
+    celsius: number;
+}
+export interface PinValue {
+    /** Pin number (0-18). */
+    pin: number;
+    /**
+     * Pin value. For digital pins: 0 or 1.
+     * For analog pins: 0-255 (the 10-bit analog reading scaled to 8 bits).
+     */
+    value: number;
+}
+/**
+ * Data from a `pinchanged` event.
+ *
+ * Contains only the input pins whose values changed since the last
+ * notification, up to a firmware limit of 10 pins per event
+ * (lowest-numbered first). Use {@link @microbit/microbit-connection/bluetooth!MicrobitBluetoothConnection.readPins}
+ * to read all input pins on demand.
+ */
+export interface PinData {
+    data: PinValue[];
+}
+export interface GestureData {
+    gesture: GestureEvent;
+}
+export interface ButtonActionData {
+    button: "A" | "B" | "AB" | "Logo";
+    action: ButtonAction;
+}
+/**
+ * A raw event from the micro:bit's message bus, received via the
+ * BLE Event Service. Use {@link @microbit/microbit-connection/bluetooth!MicrobitBluetoothConnection.subscribeToEvent}
+ * to register which events the micro:bit should forward.
+ */
+export interface MicrobitEventData {
+    source: number;
+    value: number;
+}
+export interface UartData {
+    value: Uint8Array;
+}
+/**
+ * Events from BLE GATT service notifications (accelerometer, buttons,
+ * magnetometer, UART). Used by Bluetooth and radio bridge connections.
+ */
+export interface ServiceConnectionEventMap {
+    accelerometerdatachanged: AccelerometerData;
+    buttonachanged: ButtonData;
+    buttonbchanged: ButtonData;
+    magnetometerdatachanged: MagnetometerData;
+    temperaturechanged: TemperatureData;
+    pinchanged: PinData;
+    gesturechanged: GestureData;
+    buttonaaction: ButtonActionData;
+    buttonbaction: ButtonActionData;
+    buttonabaction: ButtonActionData;
+    logoaction: ButtonActionData;
+    microbitevent: MicrobitEventData;
+    uartdata: UartData;
+}
+type AllEventMap = ServiceConnectionEventMap & DeviceConnectionEventMap;
+export type TypedServiceEvent = keyof AllEventMap;
+export type TypedServiceEventDispatcher = <K extends TypedServiceEvent>(type: K, ...[data]: AllEventMap[K] extends void ? [] : [data: AllEventMap[K]]) => void;
+export {};

package/build/cjs/service-events.js

@@ -1,39 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceConnectionEventMap = void 0;
-class ServiceConnectionEventMap {
-    constructor() {
-        Object.defineProperty(this, "accelerometerdatachanged", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "buttonachanged", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "buttonbchanged", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "magnetometerdatachanged", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "uartdata", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-    }
-}
-exports.ServiceConnectionEventMap = ServiceConnectionEventMap;
+exports.ButtonState = void 0;
+exports.ButtonState = {
+    NotPressed: 0,
+    ShortPress: 1,
+    LongPress: 2,
+};
 //# sourceMappingURL=service-events.js.map

package/build/cjs/service-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-events.js","sourceRoot":"","sources":["../../lib/service-events.ts"],"names":[],"mappings":";;;AAMA,MAAa,yBAAyB;IAAtC;QACE,4BAAA,0BAA0B;;;;;WAAyB;QACnD,4BAAA,gBAAgB;;;;;WAAc;QAC9B,4BAAA,gBAAgB;;;;;WAAc;QAC9B,4BAAA,yBAAyB;;;;;WAAwB;QACjD,4BAAA,UAAU;;;;;WAAgB;IAC5B,CAAC;CAAA;AAND,8DAMC"}
+{"version":3,"file":"service-events.js","sourceRoot":"","sources":["../../src/service-events.ts"],"names":[],"mappings":";;;AASa,QAAA,WAAW,GAAG;IACzB,UAAU,EAAE,CAAC;IACb,UAAU,EAAE,CAAC;IACb,SAAS,EAAE,CAAC;CACJ,CAAC"}

package/build/{esm/hex-flash-data-source.d.ts → cjs/universal-hex/flash-data-source.d.ts}

@@ -1,4 +1,4 @@
-import { FlashDataSource } from "./device.js";
+import { FlashDataSource } from "../device.js";
 /**
  * A flash data source that converts universal hex files as needed.
  *

package/build/cjs/{hex-flash-data-source.js → universal-hex/flash-data-source.js}

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUniversalHexFlashDataSource = void 0;
-const board_id_js_1 = require("./board-id.js");
-const device_js_1 = require("./device.js");
+// This module is deliberately kept separate so that
+// @microbit/microbit-universal-hex can be tree-shaken by bundlers
+// when consumers don't use createUniversalHexFlashDataSource.
+const board_id_js_1 = require("../board-id.js");
+const device_js_1 = require("../device.js");
 const microbit_universal_hex_1 = require("@microbit/microbit-universal-hex");
 /**
  * A flash data source that converts universal hex files as needed.
@@ -23,4 +26,4 @@ const createUniversalHexFlashDataSource = (universalHex) => {
     };
 };
 exports.createUniversalHexFlashDataSource = createUniversalHexFlashDataSource;
-//# sourceMappingURL=hex-flash-data-source.js.map
+//# sourceMappingURL=flash-data-source.js.map

package/build/cjs/universal-hex/flash-data-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"flash-data-source.js","sourceRoot":"","sources":["../../../src/universal-hex/flash-data-source.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AACpD,kEAAkE;AAClE,8DAA8D;AAC9D,gDAAyC;AACzC,4CAIsB;AACtB,6EAG0C;AAE1C;;;;GAIG;AACI,MAAM,iCAAiC,GAAG,CAC/C,YAAoB,EACH,EAAE;IACnB,OAAO,CAAC,YAA0B,EAAE,EAAE;QACpC,IAAI,IAAA,uCAAc,EAAC,YAAY,CAAC,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,IAAA,6CAAoB,EAAC,YAAY,CAAC,CAAC;YACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,qBAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,EAAE,CACxD,CAAC;YACF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,0BAAc,CAAC,kBAAkB,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,iCAAiC,qCAgB5C"}

package/build/cjs/universal-hex/index.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @module @microbit/microbit-connection/universal-hex
+ */
+export { createUniversalHexFlashDataSource } from "./flash-data-source.js";

package/build/cjs/universal-hex/index.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUniversalHexFlashDataSource = void 0;
+/**
+ * @module @microbit/microbit-connection/universal-hex
+ */
+var flash_data_source_js_1 = require("./flash-data-source.js");
+Object.defineProperty(exports, "createUniversalHexFlashDataSource", { enumerable: true, get: function () { return flash_data_source_js_1.createUniversalHexFlashDataSource; } });
+//# sourceMappingURL=index.js.map

package/build/cjs/universal-hex/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/universal-hex/index.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,+DAA2E;AAAlE,yIAAA,iCAAiC,OAAA"}