@altronix/cli 0.8.0 → 0.8.1

package/dist/build.js

@@ -444,7 +444,9 @@ function tovoid() {
 export async function build() {
     const config = this.opts()['config'] || path.resolve('./', 'atx.json');
     const verbose = this.optsWithGlobals()['verbose'];
-    const matches = new RegExp(this.opts()['matches'] || '(.*)');
+    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);
@@ -454,16 +456,22 @@ export async function build() {
         throw validate.errors;
     const env = path.resolve(cwd, '.env');
     dotenv.config({ path: env });
-    const apps = keys(atx.applications).flatMap((app) => {
+    const apps = keys(atx.applications)
+        .filter(({ __key }) => __key.match(mApplication))
+        .flatMap((app) => {
         return keys(app.boards)
-            .filter(({ __key }) => __key.match(matches))
+            .filter(({ __key }) => __key.match(mBoard))
             .flatMap((board) => {
-            return keys(board).map((config) => westOptionsNormalize(board.__key, config, app, cwd, verbose));
+            return keys(board)
+                .filter(({ __key }) => __key.match(mConfig))
+                .map((config) => {
+                return westOptionsNormalize(board.__key, config, app, cwd, verbose);
+            });
         });
     });
     const bootloaders = keys(atx.bootloaders).flatMap((app) => {
         return keys(app.boards)
-            .filter(({ __key }) => __key.match(matches))
+            .filter(({ __key }) => __key.match(mBoard))
             .flatMap((board) => {
             return keys(board).map((config) => westOptionsNormalize(board.__key, config, app, cwd, verbose));
         });
@@ -500,13 +508,17 @@ export async function build() {
             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$, onComplete: () => renderer.unmount() }));
-    await renderer.waitUntilExit();
-    renderer.cleanup();
-    return lastValueFrom(install$).catch((e) => {
+    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/index.js

@@ -46,7 +46,9 @@ program
     .option('-A, --application', 'build applications')
     .option('-B, --bootloader', 'build bootloaders')
     .option('-W, --wasm', 'build wasm')
-    .option('-M, --matches [regex]', 'board regex match expr')
+    .option('--matches-board [regex]', 'board regex match expr')
+    .option('--matches-application [regex]', 'application regex match expr')
+    .option('--matches-config [regex]', 'config regex match expr')
     .option('-y, --yes', 'answer yes automatically')
     .action(build);
 const device = program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@altronix/cli",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "license": "MIT",
   "type": "module",
   "bin": {