xs-dev 1.9.1 → 1.9.2--canary.987899d.0

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xs-dev",
-    "version": "1.9.1",
+    "version": "1.9.2--canary.987899d.0",
     "description": "CLI for automating the setup and usage of Moddable XS tools",
     "type": "module",
     "types": "build/types/types.d.ts",

package/build/src/toolbox/scan/devices.js

@@ -0,0 +1,55 @@
+const KNOWN_DEVICES = {
+    0x2e8a: {
+        0x0003: 'Raspberry Pi Pico',
+        0x000f: 'Raspberry Pi Pico 2',
+        0x0004: 'Raspberry Pi Pico',
+        0x0005: 'RP2040 MicroPython',
+        0x0009: 'RP2350 CDC Serial',
+        0x000a: 'RP2040 CDC Serial',
+        0x000b: 'Raspberry Pi Pico 2',
+        0x000c: 'Raspberry Pi Pico 2 W',
+    },
+    0x1b4f: {
+        0x0046: 'SparkFun XRP 2350',
+    },
+    0x303a: {
+        0x0002: 'ESP32-S2',
+        0x1001: 'ESP32-S3',
+        0x8086: 'ESP32-C3',
+    },
+};
+const VENDOR_FALLBACKS = {
+    0x2e8a: 'Raspberry Pi RP Device',
+    0x303a: 'Espressif ESP Device',
+};
+const BRIDGE_VENDORS = {
+    0x10c4: 'CP210x',
+    0x1a86: 'CH340',
+    0x0403: 'FTDI',
+    0x067b: 'PL2303',
+};
+export function identifyDevice(vendorId, productId) {
+    if (vendorId === undefined)
+        return null;
+    const vid = parseInt(vendorId, 16);
+    const pid = productId !== undefined ? parseInt(productId, 16) : 0;
+    if (isNaN(vid))
+        return null;
+    const exactMatch = KNOWN_DEVICES[vid]?.[pid];
+    if (exactMatch !== undefined) {
+        // features require chip-level probing (e.g. picoboot protocol) — not available via VID/PID alone
+        return { device: exactMatch, features: '' };
+    }
+    const vendorFallback = VENDOR_FALLBACKS[vid];
+    if (vendorFallback !== undefined) {
+        // features require chip-level probing (e.g. picoboot protocol) — not available via VID/PID alone
+        return { device: vendorFallback, features: '' };
+    }
+    const bridge = BRIDGE_VENDORS[vid];
+    if (bridge !== undefined) {
+        // serial bridge chip identified — features require chip-level probing (e.g. picoboot protocol) — not available via VID/PID alone
+        return { device: `Serial Device (${bridge})`, features: '' };
+    }
+    return null;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGV2aWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NjYW4vZGV2aWNlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLGFBQWEsR0FBMkM7SUFDNUQsTUFBTSxFQUFFO1FBQ04sTUFBTSxFQUFFLG1CQUFtQjtRQUMzQixNQUFNLEVBQUUscUJBQXFCO1FBQzdCLE1BQU0sRUFBRSxtQkFBbUI7UUFDM0IsTUFBTSxFQUFFLG9CQUFvQjtRQUM1QixNQUFNLEVBQUUsbUJBQW1CO1FBQzNCLE1BQU0sRUFBRSxtQkFBbUI7UUFDM0IsTUFBTSxFQUFFLHFCQUFxQjtRQUM3QixNQUFNLEVBQUUsdUJBQXVCO0tBQ2hDO0lBQ0QsTUFBTSxFQUFFO1FBQ04sTUFBTSxFQUFFLG1CQUFtQjtLQUM1QjtJQUNELE1BQU0sRUFBRTtRQUNOLE1BQU0sRUFBRSxVQUFVO1FBQ2xCLE1BQU0sRUFBRSxVQUFVO1FBQ2xCLE1BQU0sRUFBRSxVQUFVO0tBQ25CO0NBQ0YsQ0FBQTtBQUVELE1BQU0sZ0JBQWdCLEdBQTJCO0lBQy9DLE1BQU0sRUFBRSx3QkFBd0I7SUFDaEMsTUFBTSxFQUFFLHNCQUFzQjtDQUMvQixDQUFBO0FBRUQsTUFBTSxjQUFjLEdBQTJCO0lBQzdDLE1BQU0sRUFBRSxRQUFRO0lBQ2hCLE1BQU0sRUFBRSxPQUFPO0lBQ2YsTUFBTSxFQUFFLE1BQU07SUFDZCxNQUFNLEVBQUUsUUFBUTtDQUNqQixDQUFBO0FBRUQsTUFBTSxVQUFVLGNBQWMsQ0FDNUIsUUFBNEIsRUFDNUIsU0FBNkI7SUFFN0IsSUFBSSxRQUFRLEtBQUssU0FBUztRQUFFLE9BQU8sSUFBSSxDQUFBO0lBQ3ZDLE1BQU0sR0FBRyxHQUFHLFFBQVEsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUFDLENBQUE7SUFDbEMsTUFBTSxHQUFHLEdBQUcsU0FBUyxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLFNBQVMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pFLElBQUksS0FBSyxDQUFDLEdBQUcsQ0FBQztRQUFFLE9BQU8sSUFBSSxDQUFBO0lBRTNCLE1BQU0sVUFBVSxHQUFHLGFBQWEsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVDLElBQUksVUFBVSxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQzdCLGlHQUFpRztRQUNqRyxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUE7SUFDN0MsQ0FBQztJQUVELE1BQU0sY0FBYyxHQUFHLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzVDLElBQUksY0FBYyxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ2pDLGlHQUFpRztRQUNqRyxPQUFPLEVBQUUsTUFBTSxFQUFFLGNBQWMsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFLENBQUE7SUFDakQsQ0FBQztJQUVELE1BQU0sTUFBTSxHQUFHLGNBQWMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNsQyxJQUFJLE1BQU0sS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUN6QixpSUFBaUk7UUFDakksT0FBTyxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsTUFBTSxHQUFHLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFBO0lBQzlELENBQUM7SUFFRCxPQUFPLElBQUksQ0FBQTtBQUNiLENBQUMifQ==

package/build/src/toolbox/scan/index.js

@@ -1,102 +1,36 @@
-import { setTimeout as sleep } from 'node:timers/promises';
-import { execSync } from 'node:child_process';
+import { debuglog } from 'node:util';
 import { SerialPort } from 'serialport';
-import { findBySerialNumber } from 'usb';
-import { parseScanResult } from './parse.js';
-import { toolchains } from '../toolchains/registry.js';
-import { getHostContext } from '../toolchains/context.js';
+import { identifyDevice } from './devices.js';
+const debug = debuglog('xs-dev:scan');
+function normalizePath(portPath) {
+    return portPath.replace('/dev/tty.', '/dev/cu.');
+}
 export default async function* scanDevices() {
-    const ctx = getHostContext();
-    for (const toolchain of Object.values(toolchains).filter((a) => a.platforms.includes(ctx.platform))) {
-        Object.assign(process.env, toolchain.getEnvVars(ctx));
-    }
-    const esptoolPath = (() => {
-        try {
-            const result = execSync('which esptool.py', { encoding: 'utf8' }).trim();
-            return result.length > 0 ? result : null;
-        }
-        catch {
-            return null;
-        }
-    })();
-    if (esptoolPath === null) {
-        yield {
-            type: 'warning',
-            message: 'esptool.py required to scan for Espressif devices. Setup environment for ESP8266 or ESP32:\n xs-dev setup --device esp32\n xs-dev setup --device esp8266.',
-        };
-    }
-    const picotoolPath = (() => {
-        try {
-            const result = execSync('which picotool', { encoding: 'utf8' }).trim();
-            return result.length > 0 ? result : null;
-        }
-        catch {
-            return null;
-        }
-    })();
-    const hasPicotool = picotoolPath !== null;
-    if (hasPicotool) {
-        try {
-            yield {
-                type: 'step:start',
-                message: 'Found picotool, rebooting device before scanning',
-            };
-            execSync('picotool reboot -fa');
-            await sleep(1000);
-            yield { type: 'step:done' };
-        }
-        catch {
-            yield { type: 'step:done' }; // best-effort reboot, continue scanning
-        }
-    }
     yield { type: 'step:start', message: 'Scanning for devices...' };
     const ports = await SerialPort.list();
-    const result = await Promise.all(ports
-        .filter((port) => port.serialNumber !== undefined)
-        .map(async (port) => {
-        try {
-            if (port.vendorId === '2e8a' && hasPicotool) {
-                const device = await findBySerialNumber(port.serialNumber ?? '');
-                if (device === null || typeof device === 'undefined') {
-                    return [undefined, port.path];
-                }
-                const bus = String(device.busNumber);
-                const address = String(device.deviceAddress);
-                const buffer = execSync(`picotool info --bus ${bus} --address ${address} -fa`);
-                return [buffer, port.path];
-            }
-            if (esptoolPath === null) {
-                return [undefined, port.path];
-            }
-            const buffer = execSync(`esptool.py --port ${port.path} read_mac`);
-            return [buffer, port.path];
-        }
-        catch { }
-        return [undefined, port.path];
-    }));
-    const record = parseScanResult(result);
-    const rows = Object.keys(record).map((port) => {
-        const { device, features } = record[port];
-        return [port, device, features];
+    const rows = ports
+        .filter((port) => port.vendorId !== undefined)
+        .flatMap((port) => {
+        debug(JSON.stringify(port, null, 2));
+        const info = identifyDevice(port.vendorId, port.productId);
+        if (info === null)
+            return [];
+        return [[normalizePath(port.path), info.device, info.features]];
     });
     if (rows.length === 0) {
         yield { type: 'warning', message: 'No available devices found.' };
+        return;
     }
-    else {
+    yield { type: 'step:done', message: 'Found the following available devices!' };
+    const allRows = [['Port', 'Device', 'Features'], ...rows];
+    const colWidths = allRows[0].map((_, colIdx) => Math.max(...allRows.map((row) => String(row[colIdx]).length)));
+    for (const row of allRows) {
         yield {
-            type: 'step:done',
-            message: 'Found the following available devices!',
+            type: 'info',
+            message: row
+                .map((cell, idx) => String(cell).padEnd(colWidths[idx]))
+                .join('  '),
         };
-        const allRows = [['Port', 'Device', 'Features'], ...rows];
-        const colWidths = allRows[0].map((_, colIdx) => Math.max(...allRows.map((row) => String(row[colIdx]).length)));
-        for (const row of allRows) {
-            yield {
-                type: 'info',
-                message: row
-                    .map((cell, idx) => String(cell).padEnd(colWidths[idx]))
-                    .join('  '),
-            };
-        }
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zY2FuL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLElBQUksS0FBSyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFDMUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBQzdDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDdkMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sS0FBSyxDQUFBO0FBRXhDLE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDNUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ3RELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQTtBQUV6RCxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssU0FBUyxDQUFDLENBQUMsV0FBVztJQUN4QyxNQUFNLEdBQUcsR0FBRyxjQUFjLEVBQUUsQ0FBQTtJQUM1QixLQUFLLE1BQU0sU0FBUyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDN0QsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUNuQyxFQUFFLENBQUM7UUFDRixNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsU0FBUyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQ3ZELENBQUM7SUFFRCxNQUFNLFdBQVcsR0FBRyxDQUFDLEdBQUcsRUFBRTtRQUN4QixJQUFJLENBQUM7WUFDSCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsa0JBQWtCLEVBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zY2FuL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFDcEMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV2QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRTdDLE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxhQUFhLENBQUMsQ0FBQTtBQUVyQyxTQUFTLGFBQWEsQ0FBQyxRQUFnQjtJQUNyQyxPQUFPLFFBQVEsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxDQUFBO0FBQ2xELENBQUM7QUFFRCxNQUFNLENBQUMsT0FBTyxDQUFDLEtBQUssU0FBUyxDQUFDLENBQUMsV0FBVztJQUN4QyxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUseUJBQXlCLEVBQUUsQ0FBQTtJQUVoRSxNQUFNLEtBQUssR0FBRyxNQUFNLFVBQVUsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUVyQyxNQUFNLElBQUksR0FBRyxLQUFLO1NBQ2YsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxLQUFLLFNBQVMsQ0FBQztTQUM3QyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUNoQixLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDcEMsTUFBTSxJQUFJLEdBQUcsY0FBYyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQzFELElBQUksSUFBSSxLQUFLLElBQUk7WUFBRSxPQUFPLEVBQUUsQ0FBQTtRQUM1QixPQUFPLENBQUMsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUE7SUFDakUsQ0FBQyxDQUFDLENBQUE7SUFFSixJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFLENBQUM7UUFDdEIsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLDZCQUE2QixFQUFFLENBQUE7UUFDakUsT0FBTTtJQUNSLENBQUM7SUFFRCxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsd0NBQXdDLEVBQUUsQ0FBQTtJQUM5RSxNQUFNLE9BQU8sR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLFFBQVEsRUFBRSxVQUFVLENBQUMsRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFBO0lBQ3pELE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsQ0FDN0MsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUM5RCxDQUFBO0lBQ0QsS0FBSyxNQUFNLEdBQUcsSUFBSSxPQUFPLEVBQUUsQ0FBQztRQUMxQixNQUFNO1lBQ0osSUFBSSxFQUFFLE1BQU07WUFDWixPQUFPLEVBQUUsR0FBRztpQkFDVCxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2lCQUN2RCxJQUFJLENBQUMsSUFBSSxDQUFDO1NBQ2QsQ0FBQTtJQUNILENBQUM7QUFDSCxDQUFDIn0=

package/build/types/src/toolbox/scan/devices.d.ts

@@ -0,0 +1,5 @@
+export interface DeviceInfo {
+    device: string;
+    features: string;
+}
+export declare function identifyDevice(vendorId: string | undefined, productId: string | undefined): DeviceInfo | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xs-dev",
-  "version": "1.9.1",
+  "version": "1.9.2--canary.987899d.0",
   "description": "CLI for automating the setup and usage of Moddable XS tools",
   "type": "module",
   "types": "build/types/types.d.ts",

package/build/src/toolbox/scan/parse.js

@@ -1,82 +0,0 @@
-function parseEsptoolLines(lines) {
-    let state = 'searching';
-    let currentPort = null;
-    return lines.reduce((result, line) => {
-        if (state === 'searching') {
-            if (line.startsWith('Serial port')) {
-                currentPort = line.replace('Serial port ', '').replace('tty', 'cu');
-                result[currentPort] = { device: '', features: '' };
-                state = 'portFound';
-            }
-        }
-        if (state === 'portFound') {
-            if (line.startsWith('Chip is ') && currentPort !== null) {
-                const device = line.replace('Chip is ', '');
-                result[currentPort].device = device;
-                state = 'deviceFound';
-            }
-            if (line.includes('failed to connect') && currentPort !== null) {
-                // oxlint-disable-next-line @typescript-eslint/no-dynamic-delete
-                delete result[currentPort];
-                currentPort = null;
-                state = 'searching';
-            }
-        }
-        if (state === 'deviceFound') {
-            if (line.startsWith('Features: ') && currentPort !== null) {
-                const features = line.replace('Features: ', '');
-                result[currentPort].features = features;
-                state = 'featuresFound';
-            }
-        }
-        if (state === 'featuresFound') {
-            if (line.startsWith('Hard resetting')) {
-                currentPort = null;
-                state = 'searching';
-            }
-        }
-        return result;
-    }, {});
-}
-function parsePicotoolLines(lines, port) {
-    let state = 'searching';
-    const currentPort = port.replace('tty', 'cu');
-    return lines.reduce((result, line) => {
-        if (state === 'searching') {
-            result[currentPort] = { device: '', features: '' };
-            state = 'portFound';
-        }
-        if (state === 'portFound') {
-            if (line.trim().startsWith('features')) {
-                const [, features] = line.split(':');
-                result[currentPort].features = features.trim();
-                state = 'featuresFound';
-            }
-        }
-        if (state === 'featuresFound') {
-            if (line.trim().startsWith('pico_board')) {
-                const [, device] = line.split(':');
-                result[currentPort].device = device.trim();
-                state = 'deviceFound';
-            }
-        }
-        if (state === 'deviceFound') {
-            if (line.includes('asked to reboot')) {
-                state = 'searching';
-            }
-        }
-        return result;
-    }, {});
-}
-export function parseScanResult(scans) {
-    return scans.reduce((result, [output, port]) => {
-        if (typeof output === 'undefined')
-            return result;
-        const lines = String(output).split('\n');
-        if (output.includes('pico_board')) {
-            return { ...result, ...parsePicotoolLines(lines, port) };
-        }
-        return { ...result, ...parseEsptoolLines(lines) };
-    }, {});
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zY2FuL3BhcnNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLFNBQVMsaUJBQWlCLENBQUMsS0FBZTtJQUN4QyxJQUFJLEtBQUssR0FBZSxXQUFXLENBQUE7SUFDbkMsSUFBSSxXQUFXLEdBQWtCLElBQUksQ0FBQTtJQUVyQyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQWEsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLEVBQUU7UUFDL0MsSUFBSSxLQUFLLEtBQUssV0FBVyxFQUFFLENBQUM7WUFDMUIsSUFBSSxJQUFJLENBQUMsVUFBVSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUM7Z0JBQ25DLFdBQVcsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFBO2dCQUNuRSxNQUFNLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLFFBQVEsRUFBRSxFQUFFLEVBQUUsQ0FBQTtnQkFDbEQsS0FBSyxHQUFHLFdBQVcsQ0FBQTtZQUNyQixDQUFDO1FBQ0gsQ0FBQztRQUVELElBQUksS0FBSyxLQUFLLFdBQVcsRUFBRSxDQUFDO1lBQzFCLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsSUFBSSxXQUFXLEtBQUssSUFBSSxFQUFFLENBQUM7Z0JBQ3hELE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFBO2dCQUMzQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQTtnQkFDbkMsS0FBSyxHQUFHLGFBQWEsQ0FBQTtZQUN2QixDQUFDO1lBQ0QsSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLG1CQUFtQixDQUFDLElBQUksV0FB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

package/build/types/src/toolbox/scan/parse.d.ts

@@ -1,9 +0,0 @@
-type ScanResult = Record<string, {
-    device: string;
-    features: string;
-}>;
-export declare function parseScanResult(scans: Array<[
-    output: Buffer,
-    port: string
-] | [output: undefined, port: string]>): ScanResult;
-export {};