@altronix/cli 0.7.10 → 0.7.12

package/dist/build.js

@@ -4,11 +4,11 @@ import path from "node:path";
 import fs from "node:fs";
 import cp from "node:child_process";
 import inquirer from "@inquirer/confirm";
-import { concat, concatMap, EMPTY, from, last, lastValueFrom, map, merge, mergeMap, Observable, of, share, tap, toArray, } from "rxjs";
+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 from "./build.ui.js";
+import Ui, { BuildError } from "./build.ui.js";
 import { keys } from "./keys.js";
 const schemaBuild = {
     type: "object",
@@ -174,12 +174,12 @@ function westItem(opts) {
     const { board, name, config, version } = opts;
     return {
         kind: "west",
-        name: `${board}-${name}-${config}-${version}`
+        item: `${board}-${name}-${config}-${version}`
     };
 }
 function west(args) {
     const { cwd, board, sourceDir, binaryDir, confs, overlays } = args;
-    const item = westItem(args).name;
+    const { item } = westItem(args);
     return of([
         `build`,
         `-b ${board}`,
@@ -193,23 +193,31 @@ function west(args) {
         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) => {
-            subscriber.error(e);
             fout.close();
             ferr.close();
             out.destroy();
+            err.destroy();
+            subscriber.next({ item, error: e.name });
         });
         west.on("exit", () => {
             fout.close();
             ferr.close();
             out.destroy();
-            subscriber.next({ item, complete: true });
+            err.destroy();
+            error.length ?
+                subscriber.next({ item, error }) :
+                subscriber.next({ item, complete: true });
             subscriber.complete();
         });
-        out.on("data", (data) => subscriber.next({ item, output: data.toString() }));
+        out.on("data", (d) => subscriber.next({ item, output: d.toString() }));
+        err.on("data", (d) => error += d);
     })));
 }
 async function seedleOptionsNormalize(seedle, cwd, verbose) {
@@ -270,12 +278,12 @@ function seedle(opts) {
     })));
 }
 function cmakeItem(opts) {
-    const { name } = opts;
-    return { kind: "wasm", name };
+    const { name: item } = opts;
+    return { kind: "wasm", item };
 }
 function cmakeConfigure(opts) {
     const { buildDir, outputFile, errorFile, } = opts;
-    const item = cmakeItem(opts).name;
+    const { item } = cmakeItem(opts);
     return of([`-B${buildDir}`, `-S${buildDir}`]).pipe(mergeMap((cmakeArgs) => new Observable((subscriber) => {
         const wasm = cp.spawn("cmake", cmakeArgs, {
             cwd: buildDir,
@@ -288,16 +296,15 @@ function cmakeConfigure(opts) {
         wasm.stdout.pipe(out);
         wasm.stderr.pipe(ferr);
         wasm.on("error", (e) => {
-            subscriber.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.next({ item, complete: true });
             subscriber.complete();
         });
         out.on("data", (data) => subscriber.next({ item, output: data.toString() }));
@@ -305,7 +312,7 @@ function cmakeConfigure(opts) {
 }
 function cmakeBuild(opts) {
     const { buildDir, outputFile, errorFile, } = opts;
-    const item = cmakeItem(opts).name;
+    const { item } = cmakeItem(opts);
     return of([`--build`, `${buildDir}`, `--target`, ` wasm`]).pipe(mergeMap((cmakeArgs) => new Observable((subscriber) => {
         const wasm = cp.spawn("cmake", cmakeArgs, {
             cwd: buildDir,
@@ -318,23 +325,23 @@ function cmakeBuild(opts) {
         wasm.stdout.pipe(out);
         wasm.stderr.pipe(ferr);
         wasm.on("error", (e) => {
-            subscriber.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.next({ item, complete: true });
             subscriber.complete();
         });
         out.on("data", (data) => subscriber.next({ item, output: data.toString() }));
     })));
 }
 function cmake(opts) {
-    return concat(cmakeConfigure(opts), cmakeBuild(opts));
+    const { item } = cmakeItem(opts);
+    return concat(cmakeConfigure(opts), cmakeBuild(opts), of({ item, complete: true })).pipe(catchError(e => of(e)));
 }
 function emulateBytePages(board) {
     return (board.startsWith("atsame54_xpro") ||

package/dist/build.ui.d.ts

@@ -1,7 +1,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);
+}
 export interface BuildItem {
-    name: string;
+    item: string;
     kind: "west" | "wasm";
 }
 export interface BuildProgress<K extends string = string> {

package/dist/build.ui.js

@@ -1,21 +1,41 @@
-import React, { useLayoutEffect, useState } from 'react';
-import { Box, Text } from "ink";
+import React, { useLayoutEffect, useEffect, useState } from 'react';
+import { Box, Text, useStdout } from "ink";
 import { scan } from 'rxjs';
+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$ }) {
+    const [col, _rows] = useStdoutDimensions();
     const [width, setWidth] = useState(0);
-    const progress = useBuildEffect(progress$, items.map(({ name }) => name));
+    const progress = useBuildEffect(progress$, items.map(({ item }) => item));
     useLayoutEffect(() => {
         const width = items
-            .map(({ name }) => name)
+            .map(({ item }) => item)
             .reduce(calculateItemWidth, 0);
         setWidth(width);
     }, [items]);
-    return (React.createElement(Box, { flexDirection: "column" }, items.map((item) => (React.createElement(Box, { key: item.name },
-        React.createElement(Box, { width: width, marginRight: 2 },
-            React.createElement(Text, { wrap: "truncate", bold: true }, item.name.padStart(width))),
-        React.createElement(Box, { width: 4, marginRight: 2 },
-            React.createElement(Text, { wrap: "truncate", bold: true, color: buildColor(item.kind) }, item.kind.toUpperCase().padStart(4))),
-        React.createElement(Text, { dimColor: !progressComplete(progress[item.name]), color: progressColor(progress[item.name]) }, progress[item.name]))))));
+    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";
@@ -24,7 +44,10 @@ function progressComplete(progress) {
     return progress === "OK!";
 }
 function progressColor(progress) {
-    return progressComplete(progress) ? "green" : "white";
+    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]: "" }), {});
@@ -47,7 +70,11 @@ function progressInc(progress) {
     }
 }
 function progressReducer(acc, next) {
-    acc[next.item] = next.complete ? "OK!" : progressInc(acc[next.item]);
+    acc[next.item] = next.complete
+        ? "OK!"
+        : next.error
+            ? next.error.replace(/\r?\n/g, "")
+            : progressInc(acc[next.item]);
     return acc;
 }
 function useBuildEffect(obs$, items) {
@@ -60,3 +87,15 @@ function useBuildEffect(obs$, items) {
     }, [obs$, items]);
     return progress;
 }
+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;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altronix/cli",
-  "version": "0.7.10",
+  "version": "0.7.12",
   "license": "MIT",
   "bin": {
     "atx": "./dist/index.js"