@altronix/cli 0.7.12 → 0.7.14

package/dist/build.d.ts

@@ -1,2 +1,2 @@
-import { Command } from "commander";
+import { Command } from 'commander';
 export declare function build(this: Command): Promise<void>;

package/dist/build.js

@@ -1,82 +1,82 @@
-import dotenv from "dotenv";
-import { Ajv } from "ajv";
-import path from "node:path";
-import fs from "node:fs";
-import cp from "node:child_process";
-import inquirer from "@inquirer/confirm";
-import { catchError, concat, concatMap, EMPTY, from, last, lastValueFrom, map, merge, mergeMap, Observable, of, share, tap, toArray, } from "rxjs";
-import { PassThrough } from "node:stream";
-import { render } from "ink";
-import React from "react";
-import Ui, { BuildError } from "./build.ui.js";
-import { keys } from "./keys.js";
+import dotenv from 'dotenv';
+import { Ajv } from 'ajv';
+import path from 'node:path';
+import fs from 'node:fs';
+import cp from 'node:child_process';
+import inquirer from '@inquirer/confirm';
+import { catchError, concat, concatMap, EMPTY, EmptyError, from, last, lastValueFrom, map, merge, mergeMap, Observable, of, share, tap, toArray } from 'rxjs';
+import { PassThrough } from 'node:stream';
+import { render } from 'ink';
+import React from 'react';
+import Ui, { BuildError } from './build.ui.js';
+import { keys } from './keys.js';
 const schemaBuild = {
-    type: "object",
+    type: 'object',
     required: [],
     patternProperties: {
-        ".*": {
-            type: "object",
-            required: ["sourceDir", "binaryDir", "installDir", "boards"],
+        '.*': {
+            type: 'object',
+            required: ['sourceDir', 'binaryDir', 'installDir', 'boards'],
             properties: {
-                sourceDir: { type: "string" },
-                binaryDir: { type: "string" },
-                installDir: { type: "string" },
+                sourceDir: { type: 'string' },
+                binaryDir: { type: 'string' },
+                installDir: { type: 'string' },
                 boards: {
-                    type: "object",
+                    type: 'object',
                     required: [],
                     patternProperties: {
-                        ".*": {
-                            type: "object",
+                        '.*': {
+                            type: 'object',
                             required: [],
                             patternProperties: {
-                                ".*": {
-                                    type: "object",
+                                '.*': {
+                                    type: 'object',
                                     properties: {
                                         configs: {
-                                            type: "array",
-                                            items: { type: "string" },
-                                            nullable: true,
+                                            type: 'array',
+                                            items: { type: 'string' },
+                                            nullable: true
                                         },
                                         overlays: {
-                                            type: "array",
-                                            items: { type: "string" },
-                                            nullable: true,
-                                        },
-                                    },
-                                },
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    },
+                                            type: 'array',
+                                            items: { type: 'string' },
+                                            nullable: true
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 };
 const schemaSeedle = {
-    type: "object",
+    type: 'object',
     required: [],
     patternProperties: {
-        ".*": {
-            type: "object",
-            required: ["installDir", "files"],
+        '.*': {
+            type: 'object',
+            required: ['installDir', 'files'],
             properties: {
-                namespace: { type: "string", nullable: true },
-                prefix: { type: "string", nullable: true },
-                installDir: { type: "string" },
-                files: { type: "array", items: { type: "string" } },
-            },
-        },
-    },
+                namespace: { type: 'string', nullable: true },
+                prefix: { type: 'string', nullable: true },
+                installDir: { type: 'string' },
+                files: { type: 'array', items: { type: 'string' } }
+            }
+        }
+    }
 };
 const schema = {
-    type: "object",
-    required: ["applications", "bootloaders", "wasm"],
+    type: 'object',
+    required: ['applications', 'bootloaders', 'wasm'],
     additionalProperties: false,
     properties: {
         applications: schemaBuild,
         bootloaders: schemaBuild,
-        wasm: schemaSeedle,
-    },
+        wasm: schemaSeedle
+    }
 };
 const ajv = new Ajv({ allErrors: true, verbose: true });
 const validate = ajv.compile(schema);
@@ -97,18 +97,18 @@ async function resolver(cwd) {
     //      workspace. We can have atx.json() pass this name in and resolve it
     //      that way
     const project = path.resolve(cwd);
-    const workspace = path.resolve(cwd, "..");
-    const atx0 = path.resolve(cwd, "..", "atx");
-    const atx1 = path.resolve(cwd, "..", "atx-zdk");
+    const workspace = path.resolve(cwd, '..');
+    const atx0 = path.resolve(cwd, '..', 'atx');
+    const atx1 = path.resolve(cwd, '..', 'atx-zdk');
     const atx = (await stat(atx0)) ? atx0 : (await stat(atx1)) ? atx1 : project;
     return (dir, from) => {
-        if (dir.startsWith("<workspace>")) {
+        if (dir.startsWith('<workspace>')) {
             return path.join(workspace, dir.substring(12));
         }
-        else if (dir.startsWith("<project>")) {
+        else if (dir.startsWith('<project>')) {
             return path.join(project, dir.substring(10));
         }
-        else if (dir.startsWith("<atx>")) {
+        else if (dir.startsWith('<atx>')) {
             return path.join(atx, dir.substring(6));
         }
         else if (path.isAbsolute(dir)) {
@@ -120,7 +120,7 @@ async function resolver(cwd) {
     };
 }
 async function parseAppVersion(v) {
-    const data = await fs.promises.readFile(v, "ascii");
+    const data = await fs.promises.readFile(v, 'ascii');
     const reMajor = data.matchAll(/^VERSION_MAJOR = ([0-9]+)/gm).next();
     const reMinor = data.matchAll(/^VERSION_MINOR = ([0-9]+)/gm).next();
     const rePatch = data.matchAll(/^PATCHLEVEL = ([0-9]+)/gm).next();
@@ -131,7 +131,7 @@ async function parseAppVersion(v) {
         minor: reMinor.value ? parseInt(reMinor.value[1]) : 0,
         patch: rePatch.value ? parseInt(rePatch.value[1]) : 0,
         tweak: reTweak.value ? parseInt(reTweak.value[1]) : 0,
-        extra: reExtra.value ? reExtra.value[1] : "",
+        extra: reExtra.value ? reExtra.value[1] : ''
     };
 }
 function formatVersion(ver) {
@@ -146,7 +146,7 @@ async function westOptionsNormalize(board, config, build, cwd, verbose) {
     const installDir = resolve(build.installDir);
     const sourceDir = resolve(build.sourceDir);
     const binaryDir = path.join(resolve(build.binaryDir), board, config.__key);
-    const versionFile = path.join(sourceDir, "VERSION");
+    const versionFile = path.join(sourceDir, 'VERSION');
     const version = formatVersion(await parseAppVersion(versionFile));
     const confs = config.configs
         ? config.configs.map((f) => resolve(f, sourceDir))
@@ -163,67 +163,70 @@ async function westOptionsNormalize(board, config, build, cwd, verbose) {
         sourceDir,
         binaryDir,
         installDir,
-        outputFile: path.join(binaryDir, "build.log"),
-        errorFile: path.join(binaryDir, "build.err"),
+        outputFile: path.join(binaryDir, 'build.log'),
+        errorFile: path.join(binaryDir, 'build.err'),
         confs,
         overlays,
-        verbose,
+        verbose
     };
 }
 function westItem(opts) {
     const { board, name, config, version } = opts;
     return {
-        kind: "west",
+        kind: 'west',
         item: `${board}-${name}-${config}-${version}`
     };
 }
 function west(args) {
     const { cwd, board, sourceDir, binaryDir, confs, overlays } = args;
     const { item } = westItem(args);
+    const expect = path.join(binaryDir, 'zephyr', 'zephyr.bin');
     return of([
         `build`,
         `-b ${board}`,
         `-s ${sourceDir}`,
         `-d ${binaryDir}`,
         `--`,
-        `-DEXTRA_CONF_FILE="${[...confs].join(";")}"`,
-        `-DEXTRA_DTC_OVERLAY_FILE="${[...overlays].join(";")}"`,
+        `-DEXTRA_CONF_FILE="${[...confs].join(';')}"`,
+        `-DEXTRA_DTC_OVERLAY_FILE="${[...overlays].join(';')}"`
     ]).pipe(mergeMap((westArgs) => new Observable((subscriber) => {
-        const west = cp.spawn("west", westArgs, { cwd, shell: true });
+        const west = cp.spawn('west', westArgs, { cwd, shell: true });
         const fout = fs.createWriteStream(args.outputFile);
         const ferr = fs.createWriteStream(args.errorFile);
         const out = new PassThrough();
         const err = new PassThrough();
-        let error = "";
+        let error = '';
         west.stdout.pipe(fout);
         west.stdout.pipe(out);
         west.stderr.pipe(ferr);
         west.stderr.pipe(err);
-        west.on("error", (e) => {
+        west.on('error', (e) => {
             fout.close();
             ferr.close();
             out.destroy();
             err.destroy();
             subscriber.next({ item, error: e.name });
         });
-        west.on("exit", () => {
+        west.on('exit', (_code) => {
             fout.close();
             ferr.close();
             out.destroy();
             err.destroy();
-            error.length ?
-                subscriber.next({ item, error }) :
-                subscriber.next({ item, complete: true });
-            subscriber.complete();
+            fs.stat(expect, (e) => {
+                e
+                    ? subscriber.next({ item, error })
+                    : subscriber.next({ item, complete: true });
+                subscriber.complete();
+            });
         });
-        out.on("data", (d) => subscriber.next({ item, output: d.toString() }));
-        err.on("data", (d) => error += d);
+        out.on('data', (d) => subscriber.next({ item, output: d.toString() }));
+        err.on('data', (d) => (error += d));
     })));
 }
 async function seedleOptionsNormalize(seedle, cwd, verbose) {
     const name = seedle.__key;
     const resolve = await resolver(cwd);
-    const types = resolve("<atx>/lib/atx/types.cddl");
+    const types = resolve('<atx>/lib/atx/types.cddl');
     const installDir = resolve(seedle.installDir);
     const buildDir = path.join(installDir, name);
     const files = [...seedle.files, types].map((file) => path.resolve(cwd, file));
@@ -236,40 +239,40 @@ async function seedleOptionsNormalize(seedle, cwd, verbose) {
         cddl: path.join(installDir, name, `${name}.cddl`),
         outputFile: path.join(installDir, `${name}-build.log`),
         errorFile: path.join(installDir, `${name}-build.err`),
-        prefix: seedle.prefix || "",
-        namespace: seedle.namespace || "altronix",
-        verbose,
+        prefix: seedle.prefix || '',
+        namespace: seedle.namespace || 'altronix',
+        verbose
     };
 }
 function seedle(opts) {
     const { name, namespace, cddl, cwd, installDir } = opts;
-    const templatePath = path.resolve(cwd, "..", "seedle-template");
-    const seedlePath = path.resolve(cwd, "..", "seedle", "seedle");
+    const templatePath = path.resolve(cwd, '..', 'seedle-template');
+    const seedlePath = path.resolve(cwd, '..', 'seedle', 'seedle');
     return of([
-        "generate",
-        "--force",
+        'generate',
+        '--force',
         `--destination=${installDir}`,
         `--path=${templatePath}`,
         `--name=${name}`,
-        "--overwrite",
+        '--overwrite',
         `-dnamespace=${namespace}`,
-        `-dseedle-manifest-path=${seedlePath.replace(/\\/g, "\\\\")}`,
-        `-dcddl=${cddl.replace(/\\/g, "\\\\")}`,
+        `-dseedle-manifest-path=${seedlePath.replace(/\\/g, '\\\\')}`,
+        `-dcddl=${cddl.replace(/\\/g, '\\\\')}`
     ]).pipe(mergeMap((seedleArgs) => new Observable((subscriber) => {
-        const wasm = cp.spawn("cargo", seedleArgs, {
+        const wasm = cp.spawn('cargo', seedleArgs, {
             cwd: installDir,
-            shell: true,
+            shell: true
         });
         const fout = fs.createWriteStream(opts.outputFile);
         const ferr = fs.createWriteStream(opts.errorFile);
         wasm.stdout.pipe(fout);
         wasm.stderr.pipe(ferr);
-        wasm.on("error", (e) => {
+        wasm.on('error', (e) => {
             subscriber.error(e);
             fout.close();
             ferr.close();
         });
-        wasm.on("exit", () => {
+        wasm.on('exit', () => {
             fout.close();
             ferr.close();
             subscriber.next();
@@ -279,15 +282,15 @@ function seedle(opts) {
 }
 function cmakeItem(opts) {
     const { name: item } = opts;
-    return { kind: "wasm", item };
+    return { kind: 'wasm', item };
 }
 function cmakeConfigure(opts) {
-    const { buildDir, outputFile, errorFile, } = opts;
+    const { buildDir, outputFile, errorFile } = opts;
     const { item } = cmakeItem(opts);
     return of([`-B${buildDir}`, `-S${buildDir}`]).pipe(mergeMap((cmakeArgs) => new Observable((subscriber) => {
-        const wasm = cp.spawn("cmake", cmakeArgs, {
+        const wasm = cp.spawn('cmake', cmakeArgs, {
             cwd: buildDir,
-            shell: true,
+            shell: true
         });
         const fout = fs.createWriteStream(outputFile);
         const ferr = fs.createWriteStream(errorFile);
@@ -295,28 +298,28 @@ function cmakeConfigure(opts) {
         wasm.stdout.pipe(fout);
         wasm.stdout.pipe(out);
         wasm.stderr.pipe(ferr);
-        wasm.on("error", (e) => {
+        wasm.on('error', (e) => {
             fout.close();
             ferr.close();
             out.destroy();
-            subscriber.error(new BuildError(item, "wasm", e.name));
+            subscriber.error(new BuildError(item, 'wasm', e.name));
         });
-        wasm.on("exit", () => {
+        wasm.on('exit', () => {
             fout.close();
             ferr.close();
             out.destroy();
             subscriber.complete();
         });
-        out.on("data", (data) => subscriber.next({ item, output: data.toString() }));
+        out.on('data', (data) => subscriber.next({ item, output: data.toString() }));
     })));
 }
 function cmakeBuild(opts) {
-    const { buildDir, outputFile, errorFile, } = opts;
+    const { buildDir, outputFile, errorFile } = opts;
     const { item } = cmakeItem(opts);
     return of([`--build`, `${buildDir}`, `--target`, ` wasm`]).pipe(mergeMap((cmakeArgs) => new Observable((subscriber) => {
-        const wasm = cp.spawn("cmake", cmakeArgs, {
+        const wasm = cp.spawn('cmake', cmakeArgs, {
             cwd: buildDir,
-            shell: true,
+            shell: true
         });
         const fout = fs.createWriteStream(outputFile);
         const ferr = fs.createWriteStream(errorFile);
@@ -324,69 +327,67 @@ function cmakeBuild(opts) {
         wasm.stdout.pipe(fout);
         wasm.stdout.pipe(out);
         wasm.stderr.pipe(ferr);
-        wasm.on("error", (e) => {
+        wasm.on('error', (e) => {
             fout.close();
             ferr.close();
             out.destroy();
-            subscriber.error(new BuildError(item, "wasm", e.name));
+            subscriber.error(new BuildError(item, 'wasm', e.name));
         });
-        wasm.on("exit", () => {
+        wasm.on('exit', () => {
             fout.close();
             ferr.close();
             out.destroy();
             subscriber.complete();
         });
-        out.on("data", (data) => subscriber.next({ item, output: data.toString() }));
+        out.on('data', (data) => subscriber.next({ item, output: data.toString() }));
     })));
 }
 function cmake(opts) {
     const { item } = cmakeItem(opts);
-    return concat(cmakeConfigure(opts), cmakeBuild(opts), of({ item, complete: true })).pipe(catchError(e => of(e)));
+    return concat(cmakeConfigure(opts), cmakeBuild(opts), of({ item, complete: true })).pipe(catchError(of));
 }
 function emulateBytePages(board) {
-    return (board.startsWith("atsame54_xpro") ||
-        board.startsWith("netway4e1bt") ||
-        board.startsWith("netway4eb") ||
-        board.startsWith("netway5pq") ||
-        board.startsWith("oa2b"));
+    return (board.startsWith('atsame54_xpro') ||
+        board.startsWith('netway4e1bt') ||
+        board.startsWith('netway4eb') ||
+        board.startsWith('netway5pq') ||
+        board.startsWith('oa2b'));
 }
-function extraApplicationConfs(extraConfs) {
-    const key = process.env["ALTRONIX_RELEASE_KEY"];
+function extraAppConfs(extraConfs) {
+    const key = process.env['ALTRONIX_RELEASE_KEY'];
     if (!key)
-        throw new Error("missing ALTRONIX_RELEASE_KEY from environment");
+        throw new Error('missing ALTRONIX_RELEASE_KEY from environment');
     const extraConfsData = [
         `CONFIG_MCUBOOT_SIGNATURE_KEY_FILE="${key}"`,
         `CONFIG_BOOTLOADER_MCUBOOT=y`,
-        `CONFIG_ATX_UPDATE_ENABLE=y`,
-    ].join("\r\n");
+        `CONFIG_ATX_UPDATE_ENABLE=y`
+    ].join('\r\n');
     return from(fs.promises.writeFile(extraConfs, extraConfsData));
 }
-function extraBootloaderConfs(board, extraConfs) {
-    const key = process.env["ALTRONIX_RELEASE_KEY"];
+function extraBootConfs(board, extraConfs) {
+    const key = process.env['ALTRONIX_RELEASE_KEY'];
     if (!key)
-        throw new Error("missing ALTRONIX_RELEASE_KEY from environment");
+        throw new Error('missing ALTRONIX_RELEASE_KEY from environment');
     const extraConfsData = emulateBytePages(board)
         ? [
             `CONFIG_BOOT_SIGNATURE_KEY_FILE="${key}"`,
-            `CONFIG_SOC_FLASH_SAM0_EMULATE_BYTE_PAGES=y`,
+            `CONFIG_SOC_FLASH_SAM0_EMULATE_BYTE_PAGES=y`
         ]
         : [`CONFIG_BOOT_SIGNATURE_KEY_FILE="${key}"`];
-    return from(fs.promises.writeFile(extraConfs, extraConfsData.join("\r\n")));
+    return from(fs.promises.writeFile(extraConfs, extraConfsData.join('\r\n')));
 }
 function copy() {
     return (obs$) => obs$.pipe(mergeMap((opts) => {
         const { src, dst } = opts;
-        return new Observable((subscriber) => {
-            fs.promises
-                .copyFile(src, dst)
-                .then(() => subscriber.next(opts))
-                .catch(() => subscriber.next({ ...opts, err: dst }))
-                .finally(() => subscriber.complete());
-        });
+        const promise = fs.promises
+            .copyFile(src, dst)
+            .then(() => opts)
+            .catch(() => ({ ...opts, err: dst }));
+        return from(promise);
     }));
 }
 function concatFiles(src, dest) {
-    return from(src).pipe(concatMap((src) => from(fs.promises.readFile(src, "ascii"))), toArray(), mergeMap((arr) => from(fs.promises.writeFile(dest, arr.join("\r\n")))));
+    return from(src).pipe(concatMap((src) => from(fs.promises.readFile(src, 'ascii'))), toArray(), mergeMap((arr) => from(fs.promises.writeFile(dest, arr.join('\r\n')))));
 }
 function mkdir() {
     return (obs$) => obs$.pipe(mergeMap((dir) => new Observable((subscriber) => {
@@ -406,14 +407,14 @@ function rmdir(dir) {
             .finally(() => subscriber.complete());
     });
 }
-function exists() {
-    return (obs$) => obs$.pipe(mergeMap((dir) => new Observable((subscriber) => {
+function exists(dir) {
+    return new Observable((subscriber) => {
         fs.promises
             .stat(dir)
-            .then(() => subscriber.next(dir))
-            .catch(() => subscriber.next(undefined))
+            .then(() => subscriber.next(true))
+            .catch(() => subscriber.next(false))
             .finally(() => subscriber.complete());
-    })));
+    });
 }
 function confirm(force) {
     return (obs$) => force
@@ -427,26 +428,26 @@ function throwIf(predicate, message) {
     });
 }
 function clean(force) {
-    return (obs$) => obs$.pipe(exists(), concatMap((dir) => {
-        return dir
-            ? of(dir).pipe(confirm(force), throwIf((confirm) => !confirm, "User rejected delete"), mergeMap((_) => rmdir(dir)), map(() => void 0))
-            : of(void 0);
-    }));
+    return (obs$) => obs$.pipe(concatMap((dir) => exists(dir).pipe(concatMap((exists) => {
+        return exists
+            ? of(dir).pipe(confirm(force), throwIf((confirm) => !confirm, 'User rejected delete'), mergeMap((_) => rmdir(dir)), map(() => dir))
+            : of(dir);
+    }))));
 }
 function tovoid() {
     return (obs$) => obs$.pipe(map(() => void 0));
 }
 export async function build() {
-    const config = this.opts()["config"] || path.resolve("./", "atx.json");
-    const verbose = this.optsWithGlobals()["verbose"];
+    const config = this.opts()['config'] || path.resolve('./', 'atx.json');
+    const verbose = this.optsWithGlobals()['verbose'];
     const cwd = path.resolve(path.dirname(config));
-    const data = await fs.promises.readFile(config, "ascii");
+    const data = await fs.promises.readFile(config, 'ascii');
     const atx = JSON.parse(data);
-    const extraAppConfFile = "application.conf";
-    const extraBootConfFile = "bootloader.conf";
+    const extraAppConfFile = 'application.conf';
+    const extraBootConfFile = 'bootloader.conf';
     if (!validate(atx))
         throw validate.errors;
-    const env = path.resolve(cwd, ".env");
+    const env = path.resolve(cwd, '.env');
     dotenv.config({ path: env });
     const apps = keys(atx.applications).flatMap((app) => {
         return keys(app.boards).flatMap((board) => {
@@ -459,12 +460,12 @@ export async function build() {
         });
     });
     const wasm = keys(atx.wasm).map((w) => seedleOptionsNormalize(w, cwd, verbose));
-    let concurrent = this.opts()["concurrent"]
-        ? parseInt(this.opts()["concurrent"])
+    let concurrent = this.opts()['concurrent']
+        ? parseInt(this.opts()['concurrent'])
         : Infinity;
-    let buildApps = this.opts()["application"];
-    let buildBoot = this.opts()["bootloader"];
-    let buildWasm = this.opts()["wasm"];
+    let buildApps = this.opts()['application'];
+    let buildBoot = this.opts()['bootloader'];
+    let buildWasm = this.opts()['wasm'];
     if (!(buildApps || buildBoot || buildWasm)) {
         buildApps = buildBoot = buildWasm = true;
     }
@@ -472,7 +473,8 @@ export async function build() {
     const boot$ = buildBoot ? from(await Promise.all(bootloaders)) : EMPTY;
     const wasm$ = buildWasm ? from(await Promise.all(wasm)) : EMPTY;
     // Handle all the preliminary stuff before building
-    const ready$ = concat(merge(apps$.pipe(mergeMap(({ installDir: s, binaryDir: b }) => from([s, b]))), boot$.pipe(mergeMap(({ installDir: s, binaryDir: b }) => from([s, b]))), wasm$.pipe(map(({ installDir: dir }) => dir))).pipe(mkdir()), wasm$.pipe(map(({ name, installDir }) => path.join(installDir, name)), clean(this.opts()["yes"])), apps$.pipe(mergeMap(({ binaryDir }) => extraApplicationConfs(path.join(binaryDir, extraAppConfFile)))), boot$.pipe(mergeMap(({ board, binaryDir }) => extraBootloaderConfs(board, path.join(binaryDir, extraBootConfFile)))), wasm$.pipe(mergeMap(seedle)), wasm$.pipe(mergeMap(({ files, cddl: dest }) => concatFiles(files, dest)))).pipe(last(), share());
+    const ready$ = concat(merge(apps$.pipe(mergeMap(({ installDir: s, binaryDir: b }) => from([s, b]))), boot$.pipe(mergeMap(({ installDir: s, binaryDir: b }) => from([s, b]))), wasm$.pipe(map(({ installDir }) => installDir))).pipe(toArray(), mergeMap((arr) => from([...new Set(arr)])), // dedupe
+    clean(this.opts()['yes']), mkdir()), apps$.pipe(mergeMap(({ binaryDir }) => extraAppConfs(path.join(binaryDir, extraAppConfFile)))), boot$.pipe(mergeMap(({ board, binaryDir }) => extraBootConfs(board, path.join(binaryDir, extraBootConfFile)))), wasm$.pipe(mergeMap(seedle)), wasm$.pipe(mergeMap(({ files, cddl: dest }) => concatFiles(files, dest)))).pipe(last(), share());
     // Get an array of every build item.
     const items$ = merge(apps$.pipe(map(westItem)), boot$.pipe(map(westItem)), wasm$.pipe(map(cmakeItem))).pipe(toArray());
     // Run build commands for all bootloaders, applications and wasm concurrently
@@ -480,19 +482,22 @@ export async function build() {
     // Install everything into installDir
     const install$ = merge(apps$.pipe(map(({ name, config, version: ver, board, binaryDir, installDir: d }) => {
         return {
-            src: path.join(binaryDir, "zephyr", "zephyr.signed.bin"),
-            dst: path.join(d, `${board}-${name}-${config}-${ver}.signed.bin`),
+            src: path.join(binaryDir, 'zephyr', 'zephyr.signed.bin'),
+            dst: path.join(d, `${board}-${name}-${config}-${ver}.signed.bin`)
         };
     })), boot$.pipe(map(({ name, config, board, binaryDir, installDir: d }) => {
         return {
-            src: path.join(binaryDir, "zephyr", "zephyr.bin"),
-            dst: path.join(d, `${board}-${name}-${config}.bin`),
+            src: path.join(binaryDir, 'zephyr', 'zephyr.bin'),
+            dst: path.join(d, `${board}-${name}-${config}.bin`)
         };
     }))).pipe(copy(), tovoid());
     await lastValueFrom(ready$);
     const items = await lastValueFrom(items$);
-    const renderer = render(React.createElement(Ui, { items: items, "progress$": build$ }));
-    await lastValueFrom(build$);
+    const renderer = render(React.createElement(Ui, { items: items, "progress$": build$, onComplete: () => renderer.unmount() }));
+    await renderer.waitUntilExit();
     renderer.cleanup();
-    return lastValueFrom(install$);
+    return lastValueFrom(install$).catch((e) => {
+        if (!(e instanceof EmptyError))
+            throw e;
+    });
 }

package/dist/build.ui.d.ts

@@ -2,12 +2,12 @@ import React from 'react';
 import { Observable } from 'rxjs';
 export declare class BuildError extends Error implements BuildItem {
     item: string;
-    kind: "west" | "wasm";
-    constructor(item: string, kind: "west" | "wasm", message: string);
+    kind: 'west' | 'wasm';
+    constructor(item: string, kind: 'west' | 'wasm', message: string);
 }
 export interface BuildItem {
     item: string;
-    kind: "west" | "wasm";
+    kind: 'west' | 'wasm';
 }
 export interface BuildProgress<K extends string = string> {
     item: K;
@@ -18,5 +18,10 @@ export interface BuildProgress<K extends string = string> {
 export interface Options {
     items: BuildItem[];
     progress$: Observable<BuildProgress>;
+    onComplete: BuildEffectCallback;
 }
-export default function ({ items, progress$ }: Options): React.JSX.Element;
+export default function ({ items, progress$, onComplete }: Options): React.JSX.Element;
+interface BuildEffectCallback<E extends Error = Error> {
+    (e?: E): void;
+}
+export {};

package/dist/build.ui.js

@@ -1,5 +1,5 @@
 import React, { useLayoutEffect, useEffect, useState } from 'react';
-import { Box, Text, useStdout } from "ink";
+import { Box, Text, useStdout } from 'ink';
 import { scan } from 'rxjs';
 export class BuildError extends Error {
     constructor(item, kind, message) {
@@ -18,14 +18,12 @@ export class BuildError extends Error {
         });
     }
 }
-export default function ({ items, progress$ }) {
+export default function ({ items, progress$, onComplete }) {
     const [col, _rows] = useStdoutDimensions();
     const [width, setWidth] = useState(0);
-    const progress = useBuildEffect(progress$, items.map(({ item }) => item));
+    const progress = useBuildEffect(progress$, items.map(({ item: i }) => i), onComplete);
     useLayoutEffect(() => {
-        const width = items
-            .map(({ item }) => item)
-            .reduce(calculateItemWidth, 0);
+        const width = items.map(({ item }) => item).reduce(calculateItemWidth, 0);
         setWidth(width);
     }, [items]);
     return (React.createElement(Box, { flexDirection: "column" }, items.map(({ item, kind }) => (React.createElement(Box, { key: item },
@@ -38,58 +36,68 @@ export default function ({ items, progress$ }) {
             React.createElement(Text, { wrap: "truncate", dimColor: !progressComplete(progress[item]), color: progressColor(progress[item]) }, progress[item])))))));
 }
 function buildColor(kind) {
-    return kind === "west" ? "blue" : "magenta";
+    return kind === 'west' ? 'blue' : 'magenta';
 }
 function progressComplete(progress) {
-    return progress === "OK!";
+    return progress === 'OK!';
 }
 function progressColor(progress) {
-    return (!progress || (progress.charAt(0) == "|" ||
-        progress.charAt(0) == "/" ||
-        progress.charAt(0) == "-" ||
-        progress.charAt(0) == "\\")) ? "white" : progressComplete(progress) ? "green" : "red";
+    return !progress ||
+        progress.charAt(0) == '|' ||
+        progress.charAt(0) == '/' ||
+        progress.charAt(0) == '-' ||
+        progress.charAt(0) == '\\'
+        ? 'white'
+        : progressComplete(progress)
+            ? 'green'
+            : 'red';
 }
 function initProgress(items) {
-    return items.reduce((acc, curr) => ({ ...acc, [curr]: "" }), {});
+    return items.reduce((acc, curr) => ({ ...acc, [curr]: '' }), {});
 }
 function calculateItemWidth(acc, next) {
     return next.length > acc ? next.length : acc;
 }
 function progressInc(progress) {
-    if (progress.charAt(0) == "|") {
-        return "/";
+    if (progress.charAt(0) == '|') {
+        return '/';
     }
-    else if (progress.charAt(0) == "/") {
-        return "-";
+    else if (progress.charAt(0) == '/') {
+        return '-';
     }
-    else if (progress.charAt(0) == "-") {
-        return "\\";
+    else if (progress.charAt(0) == '-') {
+        return '\\';
     }
     else {
-        return "|";
+        return '|';
     }
 }
 function progressReducer(acc, next) {
     acc[next.item] = next.complete
-        ? "OK!"
+        ? 'OK!'
         : next.error
-            ? next.error.replace(/\r?\n/g, "")
+            ? next.error.replace(/\r?\n/g, '')
             : progressInc(acc[next.item]);
     return acc;
 }
-function useBuildEffect(obs$, items) {
+function useBuildEffect(obs$, items, cb) {
     const [progress, setProgress] = useState(initProgress(items));
     useLayoutEffect(() => {
-        const s = obs$
-            .pipe(scan(progressReducer, progress))
-            .subscribe(progress => setProgress({ ...progress }));
+        const s = obs$.pipe(scan(progressReducer, progress)).subscribe({
+            next: (progress) => setProgress({ ...progress }),
+            complete: cb,
+            error: cb
+        });
         return () => s.unsubscribe();
-    }, [obs$, items]);
+    }, [obs$]);
     return progress;
 }
 function useStdoutDimensions() {
     const { stdout } = useStdout();
-    const [dimensions, setDimensions] = useState([stdout.columns, stdout.rows]);
+    const [dimensions, setDimensions] = useState([
+        stdout.columns,
+        stdout.rows
+    ]);
     useEffect(() => {
         const handler = () => setDimensions([stdout.columns, stdout.rows]);
         stdout.on('resize', handler);

package/dist/index.js

@@ -1,24 +1,23 @@
 #!/usr/bin/env node
-import { program } from "commander";
-import path from "path";
-import fs from "fs";
-import { build } from "./build.js";
+import { program } from 'commander';
+import path from 'path';
+import fs from 'fs';
+import { build } from './build.js';
 //import { plugins } from "./plugin.js";
-import { fileURLToPath } from "url";
+import { fileURLToPath } from 'url';
 // https://stackoverflow.com/questions/8817423/why-is-dirname-not-defined-in-node-repl
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-(async function main() {
-    // Parse package.json to get version
-    const pkg = path.resolve(__dirname, "..", "package.json");
-    const ver = JSON.parse(await fs.promises.readFile(pkg, "ascii")).version;
-    // const cwd = path.resolve('./');
-    program
-        .name("atx")
-        .description("build atx zdk projects")
-        .version(ver)
-        .option("-VV, --verbose", "extra logging");
-    // Scan command
-    /*
+// Parse package.json to get version
+const pkg = path.resolve(__dirname, '..', 'package.json');
+const ver = JSON.parse(fs.readFileSync(pkg, 'ascii')).version;
+// const cwd = path.resolve('./');
+program
+    .name('atx')
+    .description('build atx zdk projects')
+    .version(ver)
+    .option('-VV, --verbose', 'extra logging');
+// Scan command
+/*
     const ignore = 'node_modules;target;build;.git';
     program
         .command('scan')
@@ -28,24 +27,18 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
         .option('-i, --ignores <REGEX>', 'ignore directories', ignore)
         .action(seedle.scan);
         */
-    // Build command
-    // TODO - detect if west is available and fail early
-    program
-        .command("build")
-        .description("build atx zdk application")
-        .option("-c, --config <CONFIG>", "workspace config file")
-        .option("-C, --concurrent <NUMBER>", "how many builds to run concurrently")
-        .option("-A, --application", "build applications")
-        .option("-B, --bootloader", "build bootloaders")
-        .option("-W, --wasm", "build wasm")
-        .option("-y, --yes", "answer yes automatically")
-        .action(build);
-    // Load plugins
-    // (await plugins()).forEach(({ plugin: _, path: __, description: ___ }) => {});
-    try {
-        await program.parseAsync();
-    }
-    catch (e) {
-        console.error(e);
-    }
-})();
+// Build command
+// TODO - detect if west is available and fail early
+program
+    .command('build')
+    .description('build atx zdk application')
+    .option('-c, --config <CONFIG>', 'workspace config file')
+    .option('-C, --concurrent <NUMBER>', 'how many builds to run concurrently')
+    .option('-A, --application', 'build applications')
+    .option('-B, --bootloader', 'build bootloaders')
+    .option('-W, --wasm', 'build wasm')
+    .option('-y, --yes', 'answer yes automatically')
+    .action(build);
+// Load plugins
+// (await plugins()).forEach(({ plugin: _, path: __, description: ___ }) => {});
+program.parseAsync().catch((e) => console.error(e));

package/dist/keys.js

@@ -1,5 +1,5 @@
 export function keys(map) {
     return Object.keys(map)
-        .filter((key) => key !== "__key")
+        .filter((key) => key !== '__key')
         .map((key) => ({ ...map[key], __key: key }));
 }

package/dist/plugin.js

@@ -1,13 +1,13 @@
 import cp from 'node:child_process';
 import path from 'node:path';
-import { filter, from, lastValueFrom, map, merge, mergeMap, Observable, of, toArray, } from 'rxjs';
+import { filter, from, lastValueFrom, map, merge, mergeMap, Observable, of, toArray } from 'rxjs';
 import { keys } from './keys.js';
 function npmls(g) {
-    return of(['ls', `${g ? '-g' : ''}`, '-l', '--json', '--depth 0']).pipe(mergeMap(args => new Observable(subscriber => {
+    return of(['ls', `${g ? '-g' : ''}`, '-l', '--json', '--depth 0']).pipe(mergeMap((args) => new Observable((subscriber) => {
         const ls = cp.spawn('npm', args, { shell: true });
         let data = '';
-        ls.stdout.on('data', next => (data = data.concat(data, next)));
-        ls.on('error', e => subscriber.error(e));
+        ls.stdout.on('data', (next) => (data = data.concat(data, next)));
+        ls.on('error', (e) => subscriber.error(e));
         ls.on('exit', () => {
             try {
                 subscriber.next(JSON.parse(data));
@@ -20,12 +20,12 @@ function npmls(g) {
     })));
 }
 function dependencies() {
-    return obs$ => obs$.pipe(mergeMap(({ path: npmRoot, dependencies: deps }) => {
-        return from(keys(deps)).pipe(filter(dep => dep.__key.startsWith('@altronix')), mergeMap(dep => from(Object.keys(dep.bin)).pipe(filter(bin => bin.startsWith('atx-')), map(bin => {
+    return (obs$) => obs$.pipe(mergeMap(({ path: npmRoot, dependencies: deps }) => {
+        return from(keys(deps)).pipe(filter((dep) => dep.__key.startsWith('@altronix')), mergeMap((dep) => from(Object.keys(dep.bin)).pipe(filter((bin) => bin.startsWith('atx-')), map((bin) => {
             return {
                 path: path.join(npmRoot, 'node_modules', dep.__key, dep.bin[bin] || ''),
                 description: dep.description,
-                plugin: bin.substring(4),
+                plugin: bin.substring(4)
             };
         }))));
     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altronix/cli",
-  "version": "0.7.12",
+  "version": "0.7.14",
   "license": "MIT",
   "bin": {
     "atx": "./dist/index.js"
@@ -13,21 +13,26 @@
     "dist"
   ],
   "dependencies": {
-    "ink": "^4.1.0",
-    "react": "^18.2.0",
     "@inquirer/confirm": "^3.1.14",
     "ajv": "^8.16.0",
     "commander": "^10.0.1",
     "dotenv": "^16.4.5",
+    "ink": "^4.1.0",
     "jsonc-parser": "^3.3.1",
+    "react": "^18.2.0",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@sindresorhus/tsconfig": "^3.0.1",
     "@types/react": "^18.0.32",
+    "@typescript-eslint/eslint-plugin": "~5.44.0",
+    "@typescript-eslint/parser": "~5.44.0",
     "ava": "^5.2.0",
     "chalk": "^5.2.0",
+    "eslint": "~8.28.0",
+    "eslint-config-prettier": "~8.5.0",
     "eslint-config-xo-react": "^0.27.0",
+    "eslint-plugin-jest": "~27.1.7",
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "ink-testing-library": "^3.0.0",