@altronix/cli 0.7.13 → 0.7.14

package/dist/build.js

@@ -379,13 +379,11 @@ function extraBootConfs(board, extraConfs) {
 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) {

package/dist/build.ui.d.ts

@@ -18,10 +18,10 @@ export interface BuildProgress<K extends string = string> {
 export interface Options {
     items: BuildItem[];
     progress$: Observable<BuildProgress>;
-    onComplete: UseCompleteEffectCallback;
+    onComplete: BuildEffectCallback;
 }
 export default function ({ items, progress$, onComplete }: Options): React.JSX.Element;
-interface UseCompleteEffectCallback<E extends Error = Error> {
+interface BuildEffectCallback<E extends Error = Error> {
     (e?: E): void;
 }
 export {};

package/dist/build.ui.js

@@ -21,8 +21,7 @@ export class BuildError extends Error {
 export default function ({ items, progress$, onComplete }) {
     const [col, _rows] = useStdoutDimensions();
     const [width, setWidth] = useState(0);
-    const progress = useBuildEffect(progress$, items.map(({ item: i }) => i));
-    useCompleteEffect(progress$, onComplete);
+    const progress = useBuildEffect(progress$, items.map(({ item: i }) => i), onComplete);
     useLayoutEffect(() => {
         const width = items.map(({ item }) => item).reduce(calculateItemWidth, 0);
         setWidth(width);
@@ -81,17 +80,13 @@ function progressReducer(acc, next) {
             : progressInc(acc[next.item]);
     return acc;
 }
-function useCompleteEffect(obs$, cb) {
-    useLayoutEffect(() => {
-        const s = obs$.subscribe({ complete: cb, error: cb });
-        return s.unsubscribe();
-    });
-}
-function useBuildEffect(obs$, items) {
+function useBuildEffect(obs$, items, cb) {
     const [progress, setProgress] = useState(initProgress(items));
     useLayoutEffect(() => {
         const s = obs$.pipe(scan(progressReducer, progress)).subscribe({
-            next: (progress) => setProgress({ ...progress })
+            next: (progress) => setProgress({ ...progress }),
+            complete: cb,
+            error: cb
         });
         return () => s.unsubscribe();
     }, [obs$]);

package/dist/index.js

@@ -7,45 +7,38 @@ import { build } from './build.js';
 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('./');
+// 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
-        .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')
-          .description('scan for *.cddl files')
-          .option('-p, --path <PATH>', 'root directory to start scan', cwd)
-          .option('-m, --matches <REGEX>', 'match expression', '.*cddl$')
-          .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);
-    }
-})();
+        .command('scan')
+        .description('scan for *.cddl files')
+        .option('-p, --path <PATH>', 'root directory to start scan', cwd)
+        .option('-m, --matches <REGEX>', 'match expression', '.*cddl$')
+        .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: ___ }) => {});
+program.parseAsync().catch((e) => console.error(e));

package/package.json

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