@altronix/cli 0.8.0 → 0.9.0

package/dist/build.js

@@ -10,64 +10,69 @@ import { render } from 'ink';
 import React from 'react';
 import Ui, { BuildError } from './build.ui.js';
 import { keys } from './keys.js';
-const schemaBuild = {
+const schemaBoard = {
     type: 'object',
-    required: [],
-    patternProperties: {
-        '.*': {
+    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: ['sourceDir', 'binaryDir', 'installDir', 'boards'],
-            properties: {
-                sourceDir: { type: 'string' },
-                binaryDir: { type: 'string' },
-                installDir: { type: 'string' },
-                boards: {
-                    type: 'object',
-                    required: [],
-                    patternProperties: {
-                        '.*': {
-                            type: 'object',
-                            required: [],
-                            patternProperties: {
-                                '.*': {
-                                    type: 'object',
-                                    properties: {
-                                        configs: {
-                                            type: 'array',
-                                            items: { type: 'string' },
-                                            nullable: true
-                                        },
-                                        overlays: {
-                                            type: 'array',
-                                            items: { type: 'string' },
-                                            nullable: true
-                                        }
-                                    }
-                                }
-                            }
-                        }
+            required: [],
+            additionalProperties: {
+                type: 'object',
+                properties: {
+                    configs: {
+                        type: 'array',
+                        items: { type: 'string' },
+                        nullable: true
+                    },
+                    overlays: {
+                        type: 'array',
+                        items: { type: 'string' },
+                        nullable: true
                     }
                 }
             }
         }
     }
 };
-const schemaSeedle = {
+const schemaBuild = {
     type: 'object',
     required: [],
-    patternProperties: {
-        '.*': {
-            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' } }
+    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'],
@@ -143,9 +148,12 @@ function formatVersion(ver) {
 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), board, config.__key);
+    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
@@ -156,7 +164,8 @@ async function westOptionsNormalize(board, config, build, cwd, verbose) {
         : [];
     return {
         name,
-        board,
+        board: boardTarget.replaceAll('/', '-'),
+        boardTarget,
         config: config.__key,
         cwd,
         version,
@@ -178,12 +187,12 @@ function westItem(opts) {
     };
 }
 function west(args) {
-    const { cwd, board, sourceDir, binaryDir, confs, overlays } = 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 ${board}`,
+        `-b ${boardTarget}`,
         `-s ${sourceDir}`,
         `-d ${binaryDir}`,
         `--`,
@@ -347,13 +356,8 @@ function cmake(opts) {
     return concat(cmakeConfigure(opts), cmakeBuild(opts), of({ item, complete: true })).pipe(catchError(of));
 }
 function emulateBytePages(board) {
-    return (board.startsWith('atsame54_xpro') ||
-        board.startsWith('netwaysp4b') ||
-        board.startsWith('netwaysp4bt') ||
-        board.startsWith('netway4eb') ||
-        board.startsWith('netway4ebt') ||
-        board.startsWith('netway5pq') ||
-        board.startsWith('netway5btq') ||
+    return (board.startsWith('same54_xpro') ||
+        board.startsWith('netway') ||
         board.startsWith('oa2b'));
 }
 function extraAppConfs(extraConfs, config) {
@@ -444,7 +448,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,18 +460,24 @@ 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.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(matches))
+            .filter(({ __key }) => __key.match(mBoard))
             .flatMap((board) => {
-            return keys(board).map((config) => westOptionsNormalize(board.__key, config, app, cwd, verbose));
+            return keys(board.images).map((config) => westOptionsNormalize(board, config, app, cwd, verbose));
         });
     });
     const wasm = keys(atx.wasm).map((w) => seedleOptionsNormalize(w, cwd, verbose));
@@ -500,13 +512,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/dist/keys.d.ts

@@ -1,6 +1,7 @@
 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;
-}): WithKey<T>[];
+}): FlattenWithKey<T>;

package/dist/keys.js

@@ -1,5 +1,14 @@
 export function keys(map) {
-    return Object.keys(map)
+    let ret = [];
+    Object.keys(map)
         .filter((key) => key !== '__key')
-        .map((key) => ({ ...map[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/package.json

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

package/dist/app.d.ts

@@ -1,6 +0,0 @@
-import React from 'react';
-type Props = {
-    name: string | undefined;
-};
-export default function App({ name }: Props): React.JSX.Element;
-export {};

package/dist/app.js

@@ -1,7 +0,0 @@
-import React from 'react';
-import { Text } from 'ink';
-export default function App({ name = 'Stranger' }) {
-    return (React.createElement(Text, null,
-        "Hello, ",
-        React.createElement(Text, { color: "green" }, name)));
-}

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/cli.js

@@ -1,24 +0,0 @@
-#!/usr/bin/env node
-import React from 'react';
-import { render } from 'ink';
-import meow from 'meow';
-import App from './app.js';
-const cli = meow(`
-	Usage
-	  $ cli
-
-	Options
-		--name  Your name
-
-	Examples
-	  $ cli --name=Jane
-	  Hello, Jane
-`, {
-    importMeta: import.meta,
-    flags: {
-        name: {
-            type: 'string',
-        },
-    },
-});
-render(React.createElement(App, { name: cli.flags.name }));

package/dist/stress.ui.d.ts

@@ -1,3 +0,0 @@
-import { OperatorFunction } from 'rxjs';
-import { ResponseBody } from '@altronix/device';
-export default function (): OperatorFunction<ResponseBody, void>;

package/dist/stress.ui.js

@@ -1,31 +0,0 @@
-import React, { useLayoutEffect, useState } from 'react';
-import { Observable, scan } from 'rxjs';
-import { Box, render, Text } from 'ink';
-export default function () {
-    return (obs$) => new Observable((subscriber) => {
-        const renderer = render(React.createElement(View, { "response$": obs$, onComplete: () => {
-                renderer.unmount();
-                subscriber.next();
-                subscriber.complete();
-            } }));
-    });
-}
-function View({ response$, onComplete }) {
-    const responses = useResponses(response$, onComplete);
-    return (React.createElement(Box, null,
-        React.createElement(Text, null, "Response count:"),
-        React.createElement(Text, null, responses.length)));
-}
-function useResponses(obs$, onComplete) {
-    const [responses, setResponses] = useState([]);
-    useLayoutEffect(() => {
-        const s = obs$
-            .pipe(scan((acc, next) => [...acc, next], responses))
-            .subscribe({
-            next: (responses) => setResponses(responses),
-            complete: onComplete
-        });
-        return () => s.unsubscribe();
-    }, [obs$]);
-    return responses;
-}