@altronix/cli 0.12.0 → 0.13.0

package/dist/about.js

@@ -1,4 +1,4 @@
-import { About, cborDecodeStr } from '@altronix/zdk';
+import { About, cborDecodeStr } from '@altronix/zdk/common';
 import { Linq } from '@altronix/device';
 import { EmptyError, finalize, firstValueFrom, map, switchMap } from 'rxjs';
 import logger from './logger.js';

package/dist/cloud.js

@@ -1,4 +1,4 @@
-import { cborDecodeNum, NetCloud } from '@altronix/zdk';
+import { cborDecodeNum, NetCloud } from '@altronix/zdk/common';
 import { Linq } from '@altronix/device';
 import { concat, EmptyError, finalize, lastValueFrom, map, reduce, switchMap } from 'rxjs';
 import logger from './logger.js';

package/dist/index.js

@@ -2,17 +2,8 @@
 import { program } from 'commander';
 import path from 'path';
 import fs from 'fs';
-import { build } from './build.js';
-import { getAbout, getSite, setSite } from './about.js';
-import { reboot, save, saveAndReboot } from './exe.js';
-import { getNet, setNet, setDhcp } from './net.js';
+import { build } from '@altronix/build';
 import { fileURLToPath } from 'url';
-import { getCloud, setCloud } from './cloud.js';
-import { stress } from './stress.js';
-import { update } from './update.js';
-import { listen } from './listen.js';
-import { getDemo, getHello } from './sample.js';
-import { concurrent } from './concurrent.js';
 // https://stackoverflow.com/questions/8817423/why-is-dirname-not-defined-in-node-repl
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 // Parse package.json to get version
@@ -51,95 +42,117 @@ program
     .option('--matches-config [regex]', 'config regex match expr')
     .option('-y, --yes', 'answer yes automatically')
     .action(build);
-const device = program
-    .command('device')
-    .description('manage zephyr device settings')
-    .option('-p, --port <PORT>', 'listen port for incoming device connections')
-    .option('-v, --verbose', 'print extra debug informating during request')
-    .option('-f, --first', 'perform request on first device we see (any device)');
-device
-    .command('get-about')
-    .description('get about data on the device')
-    .action(getAbout);
-device
-    .command('get-site')
-    .description('get the site ID of the device')
-    .action(getSite);
-device
-    .command('set-site')
-    .description('set the site ID of the device')
-    .argument('<site>', 'new site id')
-    .action(setSite);
-device
-    .command('save')
-    .description('save data to persistant storage. (does not reboot)')
-    .action(save);
-device
-    .command('reboot')
-    .description('reboot the device. (does not save)')
-    .action(reboot);
-device
-    .command('save-reboot')
-    .description('save data to persistant storage and reboot the device')
-    .action(saveAndReboot);
-device
-    .command('get-net')
-    .description('get network configuration from the device')
-    .action(getNet);
-device
-    .command('set-net')
-    .description('set network interface into static ip mode')
-    .argument('<ip>', 'the new IP address')
-    .argument('<sn>', 'the new SUBNET mask')
-    .argument('<gw>', 'the new GATEWAY address')
-    .action(setNet);
-device
-    .command('set-dhcp')
-    .description('set network interface into DHCP mode')
-    .action(setDhcp);
-device
-    .command('get-cloud')
-    .description('get cloud endpoint on the device')
-    .action(getCloud);
-device
-    .command('set-cloud')
-    .description('set cloud endpoint on the device')
-    .argument('<endpoint>', 'cloud service location')
-    .action(setCloud);
-device
-    .command('stress')
-    .description('run a stress test on a device')
-    .argument('<count>', 'how many requests to make')
-    .action(stress);
-device
-    .command('update')
-    .description('run firmware update from file')
-    .argument('<file>', 'file to update device with')
-    .action(update);
-device
-    .command('listen')
-    .description('listen for alerts and heartbeats')
-    .argument('<duration>', 'how long to listen')
-    .action(listen);
-device
-    .command('concurrent')
-    .description('make a number of requests concurrently')
-    .argument('<count>', 'how many requests to make concurrently')
-    .action(concurrent);
-const sample = program
-    .command('sample')
-    .description('manage zephyr device settings')
-    .option('-p, --port <PORT>', 'listen port for incoming device connections')
-    .option('-v, --verbose', 'print extra debug informating during request')
-    .option('-f, --first', 'perform request on first device we see (any device)');
-sample
-    .command('get-demo')
-    .description('read the demo data from the sample')
-    .action(getDemo);
-sample
-    .command('get-hello')
-    .description('read the hello data from the sample')
-    .action(getHello);
+// Device commands are optional - only available when @altronix/device can be loaded
+async function registerDeviceCommands() {
+    try {
+        // Test if device package is available
+        await import('@altronix/device');
+        // Dynamically import device-dependent modules
+        const { getAbout, getSite, setSite } = await import('./about.js');
+        const { reboot, save, saveAndReboot } = await import('./exe.js');
+        const { getNet, setNet, setDhcp } = await import('./net.js');
+        const { getCloud, setCloud } = await import('./cloud.js');
+        const { stress } = await import('./stress.js');
+        const { update } = await import('./update.js');
+        const { listen } = await import('./listen.js');
+        const { getDemo, getHello } = await import('./sample.js');
+        const { concurrent } = await import('./concurrent.js');
+        const device = program
+            .command('device')
+            .description('manage zephyr device settings')
+            .option('-p, --port <PORT>', 'listen port for incoming device connections')
+            .option('-v, --verbose', 'print extra debug informating during request')
+            .option('-f, --first', 'perform request on first device we see (any device)');
+        device
+            .command('get-about')
+            .description('get about data on the device')
+            .action(getAbout);
+        device
+            .command('get-site')
+            .description('get the site ID of the device')
+            .action(getSite);
+        device
+            .command('set-site')
+            .description('set the site ID of the device')
+            .argument('<site>', 'new site id')
+            .action(setSite);
+        device
+            .command('save')
+            .description('save data to persistant storage. (does not reboot)')
+            .action(save);
+        device
+            .command('reboot')
+            .description('reboot the device. (does not save)')
+            .action(reboot);
+        device
+            .command('save-reboot')
+            .description('save data to persistant storage and reboot the device')
+            .action(saveAndReboot);
+        device
+            .command('get-net')
+            .description('get network configuration from the device')
+            .action(getNet);
+        device
+            .command('set-net')
+            .description('set network interface into static ip mode')
+            .argument('<ip>', 'the new IP address')
+            .argument('<sn>', 'the new SUBNET mask')
+            .argument('<gw>', 'the new GATEWAY address')
+            .action(setNet);
+        device
+            .command('set-dhcp')
+            .description('set network interface into DHCP mode')
+            .action(setDhcp);
+        device
+            .command('get-cloud')
+            .description('get cloud endpoint on the device')
+            .action(getCloud);
+        device
+            .command('set-cloud')
+            .description('set cloud endpoint on the device')
+            .argument('<endpoint>', 'cloud service location')
+            .action(setCloud);
+        device
+            .command('stress')
+            .description('run a stress test on a device')
+            .argument('<count>', 'how many requests to make')
+            .action(stress);
+        device
+            .command('update')
+            .description('run firmware update from file')
+            .argument('<file>', 'file to update device with')
+            .action(update);
+        device
+            .command('listen')
+            .description('listen for alerts and heartbeats')
+            .argument('<duration>', 'how long to listen')
+            .action(listen);
+        device
+            .command('concurrent')
+            .description('make a number of requests concurrently')
+            .argument('<count>', 'how many requests to make concurrently')
+            .action(concurrent);
+        const sample = program
+            .command('sample')
+            .description('manage zephyr device settings')
+            .option('-p, --port <PORT>', 'listen port for incoming device connections')
+            .option('-v, --verbose', 'print extra debug informating during request')
+            .option('-f, --first', 'perform request on first device we see (any device)');
+        sample
+            .command('get-demo')
+            .description('read the demo data from the sample')
+            .action(getDemo);
+        sample
+            .command('get-hello')
+            .description('read the hello data from the sample')
+            .action(getHello);
+    }
+    catch {
+        // Device package not available - device commands will not be registered
+    }
+}
 // Load plugins
 // (await plugins()).forEach(({ plugin: _, path: __, description: ___ }) => {});
-program.parseAsync().catch((e) => console.error(e));
+registerDeviceCommands()
+    .then(() => program.parseAsync())
+    .catch((e) => console.error(e));

package/dist/net.js

@@ -1,6 +1,6 @@
 import { concat, EmptyError, finalize, firstValueFrom, lastValueFrom, map, switchMap } from 'rxjs';
 import { Linq } from '@altronix/device';
-import { NetIp } from '@altronix/zdk';
+import { NetIp } from '@altronix/zdk/common';
 import logger from './logger.js';
 import { select, first } from './select.js';
 export async function getNet() {

package/dist/plugin.js

@@ -1,7 +1,7 @@
 import cp from 'node:child_process';
 import path from 'node:path';
 import { filter, from, lastValueFrom, map, merge, mergeMap, Observable, of, toArray } from 'rxjs';
-import { keys } from './keys.js';
+import { keys } from '@altronix/build';
 function npmls(g) {
     return of(['ls', `${g ? '-g' : ''}`, '-l', '--json', '--depth 0']).pipe(mergeMap((args) => new Observable((subscriber) => {
         const ls = cp.spawn('npm', args, { shell: true });

package/dist/progress.ui.js

@@ -1,7 +1,7 @@
 import React, { useLayoutEffect, useState } from 'react';
 import { scan } from 'rxjs';
 import { Box, Text } from 'ink';
-import useDimensions from './useStdoutDimensions.js';
+import { useStdoutDimensions as useDimensions } from '@altronix/build';
 export default function Progress({ total, response$, onComplete }) {
     const [cols] = useDimensions();
     const [width, setWidth] = useState(Math.min(cols - 4, 76));

package/dist/select.ui.d.ts

@@ -1,4 +1,4 @@
-import { AboutProps } from '@altronix/zdk';
+import { AboutProps } from '@altronix/zdk/common';
 import React from 'react';
 import { Observable } from 'rxjs';
 export interface OnSelectCallback {

package/dist/stress.js

@@ -1,4 +1,4 @@
-import { METH_CONSTANTS } from '@altronix/zdk';
+import { METH_CONSTANTS } from '@altronix/zdk/common';
 import { Linq } from '@altronix/device';
 import { EmptyError, finalize, lastValueFrom, switchMap, pipe, repeat } from 'rxjs';
 import progress from './progress.js';

package/dist/update.js

@@ -1,5 +1,5 @@
 import { Linq } from '@altronix/device';
-import { Update } from '@altronix/zdk';
+import { Update } from '@altronix/zdk/common';
 import { concat, defer, EmptyError, finalize, from, lastValueFrom, map, mergeScan, switchMap } from 'rxjs';
 import fs from 'fs';
 import logger from './logger.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altronix/cli",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "license": "MIT",
   "type": "module",
   "bin": {
@@ -13,17 +13,17 @@
     "dist"
   ],
   "dependencies": {
-    "@inquirer/confirm": "^3.1.14",
-    "ajv": "^8.16.0",
+    "@altronix/zdk": "^0.9.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",
     "winston": "^3.13.0",
-    "@altronix/device": "0.9.0",
-    "@altronix/zdk": "0.9.0"
+    "@altronix/build": "0.13.0"
+  },
+  "optionalDependencies": {
+    "@altronix/device": "0.9.0"
   },
   "devDependencies": {
     "@sindresorhus/tsconfig": "^3.0.1",

package/dist/build.d.ts

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

package/dist/build.js

@@ -1,525 +0,0 @@
-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 schemaBoard = {
-    type: 'object',
-    required: ['images'],
-    properties: {
-        version: { type: 'string', nullable: true },
-        soc: { type: 'string', nullable: true },
-        cpu: { type: 'string', nullable: true },
-        variant: { type: 'string', nullable: true },
-        images: {
-            type: 'object',
-            required: [],
-            additionalProperties: {
-                type: 'object',
-                properties: {
-                    configs: {
-                        type: 'array',
-                        items: { type: 'string' },
-                        nullable: true
-                    },
-                    overlays: {
-                        type: 'array',
-                        items: { type: 'string' },
-                        nullable: true
-                    }
-                }
-            }
-        }
-    }
-};
-const schemaBuild = {
-    type: 'object',
-    required: [],
-    additionalProperties: {
-        type: 'object',
-        required: ['sourceDir', 'binaryDir', 'installDir', 'boards'],
-        properties: {
-            sourceDir: { type: 'string' },
-            binaryDir: { type: 'string' },
-            installDir: { type: 'string' },
-            boards: {
-                type: 'object',
-                required: [],
-                additionalProperties: {
-                    anyOf: [{ ...schemaBoard }, { type: 'array', items: schemaBoard }]
-                }
-            }
-        }
-    }
-};
-const schemaSeedle = {
-    type: 'object',
-    required: [],
-    additionalProperties: {
-        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' } }
-        }
-    }
-};
-const schema = {
-    type: 'object',
-    required: ['applications', 'bootloaders', 'wasm'],
-    additionalProperties: false,
-    properties: {
-        applications: schemaBuild,
-        bootloaders: schemaBuild,
-        wasm: schemaSeedle
-    }
-};
-const ajv = new Ajv({ allErrors: true, verbose: true });
-const validate = ajv.compile(schema);
-async function stat(path) {
-    return new Promise((resolve) => fs.stat(path, (err, stat) => {
-        if (err) {
-            resolve(false);
-        }
-        else {
-            resolve(stat);
-        }
-    }));
-}
-async function resolver(cwd) {
-    // NOTE this assumes atx-zdk is named in the west.yml file as either atx or
-    //      atx-zdk. The default case is atx-zdk. Most people never rename the
-    //      yaml. However, if somebody wants to rename atx-zdk repo in their
-    //      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 atx = (await stat(atx0)) ? atx0 : (await stat(atx1)) ? atx1 : project;
-    return (dir, from) => {
-        if (dir.startsWith('<workspace>')) {
-            return path.join(workspace, dir.substring(12));
-        }
-        else if (dir.startsWith('<project>')) {
-            return path.join(project, dir.substring(10));
-        }
-        else if (dir.startsWith('<atx>')) {
-            return path.join(atx, dir.substring(6));
-        }
-        else if (path.isAbsolute(dir)) {
-            return dir;
-        }
-        else {
-            return path.resolve(from || cwd, dir);
-        }
-    };
-}
-async function parseAppVersion(v) {
-    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();
-    const reTweak = data.matchAll(/^VERSION_TWEAK = ([0-9]+)/gm).next();
-    const reExtra = data.matchAll(/^EXTRAVERSION = ([\.a-zA-Z0-9-]+)/gm).next();
-    return {
-        major: reMajor.value ? parseInt(reMajor.value[1]) : 0,
-        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] : ''
-    };
-}
-function formatVersion(ver) {
-    const { major, minor, patch, tweak, extra } = ver;
-    return extra.length
-        ? `${major}-${minor}-${patch}-${tweak}-${extra}`
-        : `${major}-${minor}-${patch}-${tweak}`;
-}
-async function westOptionsNormalize(board, config, build, cwd, verbose) {
-    const resolve = await resolver(cwd);
-    const name = build.__key;
-    const boardTarget = [board.__key, board.soc, board.cpu, board.variant]
-        .filter((item) => !!item)
-        .join('/');
-    const installDir = resolve(build.installDir);
-    const sourceDir = resolve(build.sourceDir);
-    const binaryDir = path.join(resolve(build.binaryDir), boardTarget.replaceAll('/', '-'), config.__key);
-    const versionFile = path.join(sourceDir, 'VERSION');
-    const version = formatVersion(await parseAppVersion(versionFile));
-    const confs = config.configs
-        ? config.configs.map((f) => resolve(f, sourceDir))
-        : [];
-    const overlays = config.overlays
-        ? config.overlays.map((f) => resolve(f, sourceDir))
-        : [];
-    return {
-        name,
-        board: boardTarget.replaceAll('/', '-'),
-        boardTarget,
-        config: config.__key,
-        cwd,
-        version,
-        sourceDir,
-        binaryDir,
-        installDir,
-        outputFile: path.join(binaryDir, 'build.log'),
-        errorFile: path.join(binaryDir, 'build.err'),
-        confs,
-        overlays,
-        verbose
-    };
-}
-function westItem(opts) {
-    const { board, name, config, version } = opts;
-    return {
-        kind: 'west',
-        item: `${board}-${name}-${config}-${version}`
-    };
-}
-function west(args) {
-    const { cwd, boardTarget, sourceDir, binaryDir, confs, overlays } = args;
-    const { item } = westItem(args);
-    const expect = path.join(binaryDir, 'zephyr', 'zephyr.bin');
-    return of([
-        `build`,
-        `-b ${boardTarget}`,
-        `-s ${sourceDir}`,
-        `-d ${binaryDir}`,
-        `--`,
-        `-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 fout = fs.createWriteStream(args.outputFile);
-        const ferr = fs.createWriteStream(args.errorFile);
-        const out = new PassThrough();
-        const err = new PassThrough();
-        let error = '';
-        west.stdout.pipe(fout);
-        west.stdout.pipe(out);
-        west.stderr.pipe(ferr);
-        west.stderr.pipe(err);
-        west.on('error', (e) => {
-            fout.close();
-            ferr.close();
-            out.destroy();
-            err.destroy();
-            subscriber.next({ item, error: e.name });
-        });
-        west.on('exit', (_code) => {
-            fout.close();
-            ferr.close();
-            out.destroy();
-            err.destroy();
-            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));
-    })));
-}
-async function seedleOptionsNormalize(seedle, cwd, verbose) {
-    const name = seedle.__key;
-    const resolve = await resolver(cwd);
-    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));
-    return {
-        name: seedle.__key,
-        cwd,
-        installDir,
-        buildDir,
-        files,
-        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
-    };
-}
-function seedle(opts) {
-    const { name, namespace, cddl, cwd, installDir } = opts;
-    const templatePath = path.resolve(cwd, '..', 'seedle-template');
-    const seedlePath = path.resolve(cwd, '..', 'seedle', 'seedle');
-    return of([
-        'generate',
-        '--force',
-        `--destination=${installDir}`,
-        `--path=${templatePath}`,
-        `--name=${name}`,
-        '--overwrite',
-        `-dnamespace=${namespace}`,
-        `-dseedle-manifest-path=${seedlePath.replace(/\\/g, '\\\\')}`,
-        `-dcddl=${cddl.replace(/\\/g, '\\\\')}`
-    ]).pipe(mergeMap((seedleArgs) => new Observable((subscriber) => {
-        const wasm = cp.spawn('cargo', seedleArgs, {
-            cwd: installDir,
-            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) => {
-            subscriber.error(e);
-            fout.close();
-            ferr.close();
-        });
-        wasm.on('exit', () => {
-            fout.close();
-            ferr.close();
-            subscriber.next();
-            subscriber.complete();
-        });
-    })));
-}
-function cmakeItem(opts) {
-    const { name: item } = opts;
-    return { kind: 'wasm', item };
-}
-function cmakeConfigure(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, {
-            cwd: buildDir,
-            shell: true
-        });
-        const fout = fs.createWriteStream(outputFile);
-        const ferr = fs.createWriteStream(errorFile);
-        const out = new PassThrough();
-        wasm.stdout.pipe(fout);
-        wasm.stdout.pipe(out);
-        wasm.stderr.pipe(ferr);
-        wasm.on('error', (e) => {
-            fout.close();
-            ferr.close();
-            out.destroy();
-            subscriber.error(new BuildError(item, 'wasm', e.name));
-        });
-        wasm.on('exit', () => {
-            fout.close();
-            ferr.close();
-            out.destroy();
-            subscriber.complete();
-        });
-        out.on('data', (data) => subscriber.next({ item, output: data.toString() }));
-    })));
-}
-function cmakeBuild(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, {
-            cwd: buildDir,
-            shell: true
-        });
-        const fout = fs.createWriteStream(outputFile);
-        const ferr = fs.createWriteStream(errorFile);
-        const out = new PassThrough();
-        wasm.stdout.pipe(fout);
-        wasm.stdout.pipe(out);
-        wasm.stderr.pipe(ferr);
-        wasm.on('error', (e) => {
-            fout.close();
-            ferr.close();
-            out.destroy();
-            subscriber.error(new BuildError(item, 'wasm', e.name));
-        });
-        wasm.on('exit', () => {
-            fout.close();
-            ferr.close();
-            out.destroy();
-            subscriber.complete();
-        });
-        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(of));
-}
-function emulateBytePages(board) {
-    return (board.startsWith('same54_xpro') ||
-        board.startsWith('netway') ||
-        board.startsWith('oa2b'));
-}
-function extraAppConfs(extraConfs, config) {
-    const key = process.env['ALTRONIX_RELEASE_KEY'];
-    if (!key)
-        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`,
-        `CONFIG_ATX_CONFIG="${config}"`
-    ].join('\r\n');
-    return from(fs.promises.writeFile(extraConfs, extraConfsData));
-}
-function extraBootConfs(board, extraConfs) {
-    const key = process.env['ALTRONIX_RELEASE_KEY'];
-    if (!key)
-        throw new Error('missing ALTRONIX_RELEASE_KEY from environment');
-    const extraConfsData = emulateBytePages(board)
-        ? [`CONFIG_BOOT_SIGNATURE_KEY_FILE="${key}"`]
-        : [`CONFIG_BOOT_SIGNATURE_KEY_FILE="${key}"`];
-    return from(fs.promises.writeFile(extraConfs, extraConfsData.join('\r\n')));
-}
-function copy() {
-    return (obs$) => obs$.pipe(mergeMap((opts) => {
-        const { src, dst } = opts;
-        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')))));
-}
-function mkdir() {
-    return (obs$) => obs$.pipe(mergeMap((dir) => new Observable((subscriber) => {
-        fs.promises
-            .mkdir(dir, { recursive: true })
-            .then(() => subscriber.next())
-            .catch((e) => subscriber.error(e))
-            .finally(() => subscriber.complete());
-    })));
-}
-function rmdir(dir) {
-    return new Observable((subscriber) => {
-        fs.promises
-            .rm(dir, { recursive: true })
-            .then(() => subscriber.next(dir))
-            .catch((e) => subscriber.error(e))
-            .finally(() => subscriber.complete());
-    });
-}
-function exists(dir) {
-    return new Observable((subscriber) => {
-        fs.promises
-            .stat(dir)
-            .then(() => subscriber.next(true))
-            .catch(() => subscriber.next(false))
-            .finally(() => subscriber.complete());
-    });
-}
-function confirm(force) {
-    return (obs$) => force
-        ? of(true)
-        : obs$.pipe(concatMap((dir) => from(inquirer({ message: `Delete ${dir}?` }))));
-}
-function throwIf(predicate, message) {
-    return tap((v) => {
-        if (predicate(v))
-            throw new Error(message);
-    });
-}
-function clean(force) {
-    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 mBoard = new RegExp(this.opts()['matchesBoard'] || '(.*)');
-    const mApplication = new RegExp(this.opts()['matchesApplication'] || '(.*)');
-    const mConfig = new RegExp(this.opts()['matchesConfig'] || '(.*)');
-    const cwd = path.resolve(path.dirname(config));
-    const data = await fs.promises.readFile(config, 'ascii');
-    const atx = JSON.parse(data);
-    const extraAppConfFile = 'application.conf';
-    const extraBootConfFile = 'bootloader.conf';
-    if (!validate(atx))
-        throw validate.errors;
-    const env = path.resolve(cwd, '.env');
-    dotenv.config({ path: env });
-    const apps = keys(atx.applications)
-        .filter(({ __key }) => __key.match(mApplication))
-        .flatMap((app) => {
-        return keys(app.boards)
-            .filter(({ __key }) => __key.match(mBoard))
-            .flatMap((board) => {
-            return keys(board.images)
-                .filter(({ __key }) => __key.match(mConfig))
-                .map((config) => {
-                return westOptionsNormalize(board, config, app, cwd, verbose);
-            });
-        });
-    });
-    const bootloaders = keys(atx.bootloaders).flatMap((app) => {
-        return keys(app.boards)
-            .filter(({ __key }) => __key.match(mBoard))
-            .flatMap((board) => {
-            return keys(board.images).map((config) => westOptionsNormalize(board, config, app, cwd, verbose));
-        });
-    });
-    const wasm = keys(atx.wasm).map((w) => seedleOptionsNormalize(w, cwd, verbose));
-    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'];
-    if (!(buildApps || buildBoot || buildWasm)) {
-        buildApps = buildBoot = buildWasm = true;
-    }
-    const apps$ = buildApps ? from(await Promise.all(apps)) : EMPTY;
-    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 }) => installDir))).pipe(toArray(), mergeMap((arr) => from([...new Set(arr)])), // dedupe
-    clean(this.opts()['yes']), mkdir()), apps$.pipe(mergeMap(({ binaryDir, config }) => extraAppConfs(path.join(binaryDir, extraAppConfFile), config))), 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
-    const build$ = merge(apps$.pipe(map(west)), boot$.pipe(map(west)), wasm$.pipe(map(cmake))).pipe(mergeMap((obs) => obs, concurrent), share());
-    // 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`)
-        };
-    })), 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`)
-        };
-    }))).pipe(copy(), tovoid());
-    try {
-        await lastValueFrom(ready$);
-        const items = await lastValueFrom(items$);
-        const renderer = render(React.createElement(Ui, { items: items, "progress$": build$, onComplete: () => renderer.unmount() }));
-        await renderer.waitUntilExit();
-        renderer.cleanup();
-        return lastValueFrom(install$);
-    }
-    catch (e) {
-        if (!(e instanceof EmptyError))
-            throw e;
-        console.log('nothing to build');
-    }
-}

package/dist/build.ui.d.ts

@@ -1,27 +0,0 @@
-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);
-}
-export interface BuildItem {
-    item: string;
-    kind: 'west' | 'wasm';
-}
-export interface BuildProgress<K extends string = string> {
-    item: K;
-    output?: string;
-    error?: string;
-    complete?: boolean;
-}
-export interface Options {
-    items: BuildItem[];
-    progress$: Observable<BuildProgress>;
-    onComplete: BuildEffectCallback;
-}
-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,95 +0,0 @@
-import React, { useLayoutEffect, useState } from 'react';
-import { Box, Text } from 'ink';
-import { scan } from 'rxjs';
-import useStdoutDimensions from './useStdoutDimensions.js';
-export class BuildError extends Error {
-    constructor(item, kind, message) {
-        super(message);
-        Object.defineProperty(this, "item", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: item
-        });
-        Object.defineProperty(this, "kind", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: kind
-        });
-    }
-}
-export default function ({ items, progress$, onComplete }) {
-    const [col, _rows] = useStdoutDimensions();
-    const [width, setWidth] = useState(0);
-    const progress = useBuildEffect(progress$, items.map(({ item: i }) => i), onComplete);
-    useLayoutEffect(() => {
-        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 },
-        React.createElement(Box, { width: width, marginRight: 1 },
-            React.createElement(Text, { wrap: "truncate", bold: true }, item.padStart(width))),
-        React.createElement(Box, { width: 4, marginRight: 1 },
-            React.createElement(Text, { wrap: "truncate", bold: true, color: buildColor(kind) }, kind.toUpperCase().padStart(4))),
-        React.createElement(Box, { width: 2, marginRight: 1 }, progress[item] && React.createElement(Text, { color: "cyan" }, "=>")),
-        React.createElement(Box, { width: col - width - 4 - 2 - 1 - 1 - 1 },
-            React.createElement(Text, { wrap: "truncate", dimColor: !progressComplete(progress[item]), color: progressColor(progress[item]) }, progress[item])))))));
-}
-function buildColor(kind) {
-    return kind === 'west' ? 'blue' : 'magenta';
-}
-function progressComplete(progress) {
-    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';
-}
-function initProgress(items) {
-    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 '/';
-    }
-    else if (progress.charAt(0) == '/') {
-        return '-';
-    }
-    else if (progress.charAt(0) == '-') {
-        return '\\';
-    }
-    else {
-        return '|';
-    }
-}
-function progressReducer(acc, next) {
-    acc[next.item] = next.complete
-        ? 'OK!'
-        : next.error
-            ? next.error.replace(/\r?\n/g, '')
-            : progressInc(acc[next.item]);
-    return acc;
-}
-function useBuildEffect(obs$, items, cb) {
-    const [progress, setProgress] = useState(initProgress(items));
-    useLayoutEffect(() => {
-        const s = obs$.pipe(scan(progressReducer, progress)).subscribe({
-            next: (progress) => setProgress({ ...progress }),
-            complete: cb,
-            error: cb
-        });
-        return () => s.unsubscribe();
-    }, [obs$]);
-    return progress;
-}

package/dist/keys.d.ts

@@ -1,7 +0,0 @@
-export type WithKey<T> = T & {
-    __key: string;
-};
-export type FlattenWithKey<Type> = Type extends Array<infer Item> ? Array<WithKey<Item>> : Array<WithKey<Type>>;
-export declare function keys<T>(map: {
-    [key: string]: T;
-}): FlattenWithKey<T>;

package/dist/keys.js

@@ -1,14 +0,0 @@
-export function keys(map) {
-    let ret = [];
-    Object.keys(map)
-        .filter((key) => key !== '__key')
-        .forEach((key) => {
-        if (Array.isArray(map[key])) {
-            map[key].forEach((item) => ret.push({ ...item, __key: key }));
-        }
-        else {
-            ret.push({ ...map[key], __key: key });
-        }
-    });
-    return ret;
-}

package/dist/useStdoutDimensions.d.ts

@@ -1 +0,0 @@
-export default function useStdoutDimensions(): [number, number];

package/dist/useStdoutDimensions.js

@@ -1,17 +0,0 @@
-import { useState, useEffect } from 'react';
-import { useStdout } from 'ink';
-export default function useStdoutDimensions() {
-    const { stdout } = useStdout();
-    const [dimensions, setDimensions] = useState([
-        stdout.columns,
-        stdout.rows
-    ]);
-    useEffect(() => {
-        const handler = () => setDimensions([stdout.columns, stdout.rows]);
-        stdout.on('resize', handler);
-        return () => {
-            stdout.off('resize', handler);
-        };
-    }, [stdout]);
-    return dimensions;
-}