@fnndsc/brasa 0.35.1 → 0.36.0

package/dist/session/answer.d.ts

@@ -49,6 +49,10 @@ export interface AnswerRow {
     address?: string;
     /** What to call it in a readout. */
     label: string;
+    /** What a filter matches it on (its line as the listing shows it); the label when absent. */
+    text?: string;
+    /** Its parent row (`STD:<path>` for a series), for a filter that keeps a row with its context. */
+    parent?: string;
 }
 /** A row's handle: its kind and its place in that kind's sequence. */
 export interface AnswerHandle {
@@ -74,6 +78,10 @@ export interface SessionAnswer {
     source: string;
     /** The rows, in the order the model holds them. */
     rows: AnswerRow[];
+    /** The model kind the rows came from, for a filter of the held listing. */
+    kind: string;
+    /** The model itself. */
+    data: unknown;
 }
 /** The answer rows a model carries, or null when it is not a listing. */
 export type AnswerAdapter = (data: unknown) => AnswerRow[] | null;
@@ -116,6 +124,80 @@ export declare function answerKind_count(kind: AnswerKind): number;
  * @returns The handles.
  */
 export declare function answerHandles_get(): NumberedHandle[];
+/**
+ * Keeps the numbers a listing's rows already wore with its data, so a
+ * filtered listing's rows keep them: `@SER41` stays `@SER41` (#1100).
+ *
+ * @param data - The listing's model data.
+ * @param ordinals - `KIND:address` to the number it wore.
+ */
+export declare function answerOrdinals_attach(data: object, ordinals: ReadonlyMap<string, number>): void;
+/** What filters a kind's model down to the rows kept. */
+export type AnswerFilter = (data: unknown, keep: ReadonlySet<string>) => unknown;
+/**
+ * Registers how a model kind is filtered to a set of its rows.
+ *
+ * @param kind - The envelope model kind.
+ * @param filter - Builds the model holding only the kept rows (`KIND:address`).
+ */
+export declare function answerFilter_register(kind: string, filter: AnswerFilter): void;
+/**
+ * A model filtered to the rows kept, or null when its kind has no filter.
+ *
+ * @param kind - The envelope model kind.
+ * @param data - The model.
+ * @param keep - The rows kept, as `KIND:address`.
+ * @returns The filtered model.
+ */
+export declare function answerFilter_apply(kind: string, data: unknown, keep: ReadonlySet<string>): unknown;
+/** A row's key: its kind and address, as numbers and filters name it. */
+export declare function answerRow_key(row: AnswerRow): string;
+/**
+ * A model's rows, as its adapter reads them, without holding them.
+ *
+ * @param kind - The envelope model kind.
+ * @param data - The model.
+ * @returns The rows, or null when the model is not a listing.
+ */
+export declare function answerRows_of(kind: string, data: unknown): AnswerRow[] | null;
+/**
+ * The handles a model's rows will wear once it is the held listing.
+ *
+ * @param kind - The envelope model kind.
+ * @param data - The model.
+ * @returns The handles, in row order, or null when the model is not a listing.
+ */
+export declare function answerNumbering_of(kind: string, data: unknown): NumberedHandle[] | null;
+/**
+ * A handle as it is printed and typed: short, `@SER3`.
+ *
+ * @param handle - The handle.
+ * @returns The word.
+ */
+export declare function handle_word(handle: {
+    kind: AnswerKind;
+    ordinal: number;
+}): string;
+/**
+ * Each row's printed handle, by its kind and address, for a renderer that
+ * walks its own model: `handles.get('SER:' + path)`.
+ *
+ * @param handles - The numbered rows.
+ * @returns Kind-and-address to word.
+ */
+export declare function handleWords_of(handles: ReadonlyArray<NumberedHandle>): Map<string, string>;
+/**
+ * The footer that says what is numbered, in the form an index is typed:
+ * `numbered: @PAT1, @STD1-9, @SER1-235` (runs of numbers as ranges, gaps
+ * with commas: `@SER1,3,41`). It is also the cue for what `@SER3` means now.
+ *
+ * @param handles - The numbered rows.
+ * @returns The footer, or '' when nothing is numbered.
+ */
+export declare function numberedFooter_of(handles: ReadonlyArray<{
+    kind: AnswerKind;
+    ordinal: number;
+}>): string;
 /**
  * What is currently numbered, for a surface that lights its index pills.
  *

package/dist/session/answer.js

@@ -55,7 +55,7 @@ export function answer_note(kind, data, source) {
     if (rows === null || rows.length === 0)
         return;
     sequence += 1;
-    held = { source, rows };
+    held = { source, rows, kind, data };
     // A surface cannot light the index pills on the right listing unless it is
     // told which one the numbers now count. Pills that lie are worse than none.
     ambient_publish({
@@ -79,8 +79,10 @@ export function answer_note(kind, data, source) {
 export function answerRow_get(handle) {
     if (held === null)
         return null;
-    const ofKind = held.rows.filter((row) => row.kind === handle.kind);
-    const row = ofKind[handle.ordinal - 1];
+    // By the number the row wears, which a filtered listing keeps (#1100).
+    const numbered = rows_number(held.rows, held.data);
+    const at = numbered.findIndex((one) => one.kind === handle.kind && one.ordinal === handle.ordinal);
+    const row = at < 0 ? undefined : held.rows[at];
     if (row === undefined)
         return null;
     consulted = true;
@@ -106,14 +108,132 @@ export function answerKind_count(kind) {
  * @returns The handles.
  */
 export function answerHandles_get() {
-    if (held === null)
-        return [];
+    return held === null ? [] : rows_number(held.rows, held.data);
+}
+/** Numbers a listing's rows already wore, kept with the listing's data (a filtered listing). */
+const givenOrdinals = new WeakMap();
+/**
+ * Keeps the numbers a listing's rows already wore with its data, so a
+ * filtered listing's rows keep them: `@SER41` stays `@SER41` (#1100).
+ *
+ * @param data - The listing's model data.
+ * @param ordinals - `KIND:address` to the number it wore.
+ */
+export function answerOrdinals_attach(data, ordinals) {
+    givenOrdinals.set(data, new Map(ordinals));
+}
+/** Model kind to its filter. */
+const filters = new Map();
+/**
+ * Registers how a model kind is filtered to a set of its rows.
+ *
+ * @param kind - The envelope model kind.
+ * @param filter - Builds the model holding only the kept rows (`KIND:address`).
+ */
+export function answerFilter_register(kind, filter) {
+    filters.set(kind, filter);
+}
+/**
+ * A model filtered to the rows kept, or null when its kind has no filter.
+ *
+ * @param kind - The envelope model kind.
+ * @param data - The model.
+ * @param keep - The rows kept, as `KIND:address`.
+ * @returns The filtered model.
+ */
+export function answerFilter_apply(kind, data, keep) {
+    const filter = filters.get(kind);
+    return filter === undefined ? null : filter(data, keep);
+}
+/** A row's key: its kind and address, as numbers and filters name it. */
+export function answerRow_key(row) {
+    return `${row.kind}:${row.address ?? row.values[0] ?? ''}`;
+}
+/**
+ * Numbers rows: one sequence per kind, in the order the rows stand. The one
+ * place a number is made, so what a listing prints is what an index expands
+ * to (#1099).
+ *
+ * @param rows - The rows.
+ * @returns Each row's handle and address.
+ */
+function rows_number(rows, data) {
+    // A filtered listing's rows keep the numbers they wore; any other row is
+    // counted in its kind's sequence.
+    const given = data !== null && typeof data === 'object' ? givenOrdinals.get(data) : undefined;
     const seen = new Map();
-    return held.rows.map((row) => {
-        const ordinal = (seen.get(row.kind) ?? 0) + 1;
-        seen.set(row.kind, ordinal);
-        return { kind: row.kind, ordinal, address: row.address ?? row.values[0] ?? '' };
+    return rows.map((row) => {
+        const counted = (seen.get(row.kind) ?? 0) + 1;
+        seen.set(row.kind, counted);
+        const address = row.address ?? row.values[0] ?? '';
+        return { kind: row.kind, ordinal: given?.get(`${row.kind}:${address}`) ?? counted, address };
+    });
+}
+/**
+ * A model's rows, as its adapter reads them, without holding them.
+ *
+ * @param kind - The envelope model kind.
+ * @param data - The model.
+ * @returns The rows, or null when the model is not a listing.
+ */
+export function answerRows_of(kind, data) {
+    return adapters.get(kind)?.(data) ?? null;
+}
+/**
+ * The handles a model's rows will wear once it is the held listing.
+ *
+ * @param kind - The envelope model kind.
+ * @param data - The model.
+ * @returns The handles, in row order, or null when the model is not a listing.
+ */
+export function answerNumbering_of(kind, data) {
+    const rows = adapters.get(kind)?.(data) ?? null;
+    return rows === null ? null : rows_number(rows, data);
+}
+/**
+ * A handle as it is printed and typed: short, `@SER3`.
+ *
+ * @param handle - The handle.
+ * @returns The word.
+ */
+export function handle_word(handle) {
+    return `@${handle.kind}${handle.ordinal}`;
+}
+/**
+ * Each row's printed handle, by its kind and address, for a renderer that
+ * walks its own model: `handles.get('SER:' + path)`.
+ *
+ * @param handles - The numbered rows.
+ * @returns Kind-and-address to word.
+ */
+export function handleWords_of(handles) {
+    return new Map(handles.map((handle) => [`${handle.kind}:${handle.address}`, handle_word(handle)]));
+}
+/**
+ * The footer that says what is numbered, in the form an index is typed:
+ * `numbered: @PAT1, @STD1-9, @SER1-235` (runs of numbers as ranges, gaps
+ * with commas: `@SER1,3,41`). It is also the cue for what `@SER3` means now.
+ *
+ * @param handles - The numbered rows.
+ * @returns The footer, or '' when nothing is numbered.
+ */
+export function numberedFooter_of(handles) {
+    const byKind = new Map();
+    for (const handle of handles)
+        byKind.set(handle.kind, [...(byKind.get(handle.kind) ?? []), handle.ordinal]);
+    const parts = [...byKind].map(([kind, ordinals]) => {
+        const sorted = [...new Set(ordinals)].sort((a, b) => a - b);
+        const runs = [];
+        for (let at = 0; at < sorted.length;) {
+            let end = at;
+            while (end + 1 < sorted.length && (sorted[end + 1] ?? 0) === (sorted[end] ?? 0) + 1)
+                end += 1;
+            runs.push(end > at ? `${sorted[at]}-${sorted[end]}` : `${sorted[at]}`);
+            at = end + 1;
+        }
+        return `@${kind}${runs.join(',')}`;
     });
+    return parts.length === 0 ? '' : `numbered: ${parts.join(', ')}`;
 }
 /**
  * What is currently numbered, for a surface that lights its index pills.

package/dist/session/answer.js.map

@@ -1 +1 @@
-{"version":3,"file":"answer.js","sourceRoot":"","sources":["../../src/session/answer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"answer.js","sourceRoot":"","sources":["../../src/session/answer.ts"],"names":[],"mappings":"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"}

package/dist/session/answerAdapters.js

@@ -9,7 +9,7 @@
  */
 import path from 'path';
 import { patientAddress_of } from '@fnndsc/menu';
-import { answerAdapter_register } from './answer.js';
+import { answerAdapter_register, answerFilter_register } from './answer.js';
 /**
  * Registers the adapters. Called once, when the engine is created.
  */
@@ -28,6 +28,7 @@ export function answerAdapters_register() {
                     kind: item.type === 'dir' ? 'DIR' : 'FIL',
                     values: [path.posix.join(listing.path, item.name)],
                     label: item.name,
+                    text: item.name,
                 });
             }
         }
@@ -64,26 +65,41 @@ export function answerAdapters_register() {
                 .filter((one) => typeof one === 'string');
             if (seriesPaths.length === 0)
                 continue;
-            rows.push({ kind: 'PAT', address: patientAddress_of(patient), values: seriesPaths, label: patient.patientName || patient.patientId });
+            rows.push({ kind: 'PAT', address: patientAddress_of(patient), values: seriesPaths, label: patient.patientName || patient.patientId, text: `${patient.patientName ?? ''} (ID: ${patient.patientId})` });
         }
+        // A study's patient, by the same match the patients were found with: the
+        // parent a filter keeps a study with.
+        const patientOf = (study) => {
+            const owner = patients.find((patient) => patient.patientId === study.patientId && (patient.server === undefined || study.server === undefined || study.server === patient.server));
+            return owner === undefined ? undefined : `PAT:${patientAddress_of(owner)}`;
+        };
         for (const study of model.studies) {
             const series = Array.isArray(study.series) ? study.series : [];
             const seriesPaths = series
                 .map((one) => one.vfsPath)
                 .filter((one) => typeof one === 'string');
             if (typeof study.vfsPath === 'string') {
+                const parent = patientOf(study);
                 rows.push({
                     kind: 'STD',
                     // The study's own path leads, as the address a surface matches on;
                     // its series follow, as what a verb is handed.
                     values: [study.vfsPath, ...seriesPaths],
                     label: study.description || 'study',
+                    text: [study.description, study.date, study.modalities].filter((one) => one !== '').join('   '),
+                    ...(parent !== undefined ? { parent } : {}),
                 });
             }
             for (const one of series) {
                 if (typeof one.vfsPath !== 'string')
                     continue;
-                rows.push({ kind: 'SER', values: [one.vfsPath], label: one.description || one.modality || 'series' });
+                rows.push({
+                    kind: 'SER',
+                    values: [one.vfsPath],
+                    label: one.description || one.modality || 'series',
+                    text: `${one.description || '(no description)'}${one.modality ? ` [${one.modality}]` : ''}${one.fileCount === undefined ? '' : ` ${one.fileCount} files`}`,
+                    ...(typeof study.vfsPath === 'string' ? { parent: `STD:${study.vfsPath}` } : {}),
+                });
             }
         }
         return rows;
@@ -100,7 +116,27 @@ export function answerAdapters_register() {
             kind: member.kind === 'dir' ? 'DIR' : member.kind === 'file' ? 'FIL' : 'SER',
             values: [member.vfsPath],
             label: member.description ?? path.posix.basename(member.vfsPath),
+            text: `${member.description ?? path.posix.basename(member.vfsPath)} ${member.vfsPath}`,
         }));
     });
+    // Each listing filtered to the rows a filter kept (`KIND:address`), as the
+    // same kind of model, so it renders, numbers and travels as before (#1100).
+    answerFilter_register('fs.listing', (data, keep) => (Array.isArray(data) ? data : []).map((listing) => ({
+        ...listing,
+        items: listing.items.filter((item) => keep.has(`${item.type === 'dir' ? 'DIR' : 'FIL'}:${path.posix.join(listing.path, item.name)}`)),
+    })));
+    answerFilter_register('pacs.query', (data, keep) => {
+        const model = data;
+        const studies = model.studies
+            .filter((study) => typeof study.vfsPath === 'string' && keep.has(`STD:${study.vfsPath}`))
+            .map((study) => ({ ...study, series: study.series.filter((one) => typeof one.vfsPath === 'string' && keep.has(`SER:${one.vfsPath}`)) }));
+        const patients = Array.isArray(model.patients) ? model.patients.filter((patient) => keep.has(`PAT:${patientAddress_of(patient)}`)) : undefined;
+        return { ...model, studies, ...(patients !== undefined ? { patients } : {}) };
+    });
+    answerFilter_register('gather.cohort', (data, keep) => {
+        const state = data;
+        const kindCode = (member) => (member.kind === 'dir' ? 'DIR' : member.kind === 'file' ? 'FIL' : 'SER');
+        return { ...state, series: (state.series ?? []).filter((member) => keep.has(`${kindCode(member)}:${member.vfsPath ?? ''}`)) };
+    });
 }
 //# sourceMappingURL=answerAdapters.js.map

package/dist/session/answerAdapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"answerAdapters.js","sourceRoot":"","sources":["../../src/session/answerAdapters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"answerAdapters.js","sourceRoot":"","sources":["../../src/session/answerAdapters.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAwD,MAAM,cAAc,CAAC;AACvG,OAAO,EAAa,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAQvF;;GAEG;AACH,MAAM,UAAU,uBAAuB;IACrC,2EAA2E;IAC3E,yDAAyD;IACzD,sBAAsB,CAAC,YAAY,EAAE,CAAC,IAAa,EAAsB,EAAE;QACzE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACtC,MAAM,IAAI,GAAgB,EAAE,CAAC;QAC7B,KAAK,MAAM,OAAO,IAAI,IAAmB,EAAE,CAAC;YAC1C,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,SAAS;YAC/F,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;gBACjC,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;oBACzC,MAAM,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBAClD,KAAK,EAAE,IAAI,CAAC,IAAI;oBAChB,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,0EAA0E;IAC1E,wEAAwE;IACxE,uEAAuE;IACvE,0EAA0E;IAC1E,oEAAoE;IACpE,gEAAgE;IAChE,sBAAsB,CAAC,YAAY,EAAE,CAAC,IAAa,EAAsB,EAAE;QACzE,MAAM,KAAK,GAA0B,IAA6B,CAAC;QACnE,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,OAAO,IAAI,CAAC;QACjE,MAAM,IAAI,GAAgB,EAAE,CAAC;QAC7B,wEAAwE;QACxE,mEAAmE;QACnE,qEAAqE;QACrE,wCAAwC;QACxC,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YACxD,CAAC,CAAC,KAAK,CAAC,QAAQ;YAChB,CAAC,CAAE,KAAK,CAAC,OAAuB,CAAC,MAAM,CAAC,CAAC,IAAyE,EAAE,KAAgB,EAAE,EAAE;gBACtI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAW,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;oBACpE,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC5H,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAiB,KAAK,CAAC,OAAuB,CAAC,MAAM,CAAC,CAAC,KAAgB,EAAW,EAAE,CAC9F,KAAK,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5I,MAAM,WAAW,GAAa,MAAM;iBACjC,OAAO,CAAC,CAAC,KAAgB,EAAgB,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;iBAC9F,GAAG,CAAC,CAAC,GAAe,EAAsB,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;iBACzD,MAAM,CAAC,CAAC,GAAuB,EAAiB,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC;YAC/E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YACvC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,SAAS,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC;QACzM,CAAC;QACD,yEAAyE;QACzE,sCAAsC;QACtC,MAAM,SAAS,GAAG,CAAC,KAAgB,EAAsB,EAAE;YACzD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAW,EAAE,CAC/C,OAAO,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAC5I,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7E,CAAC,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAsB,EAAE,CAAC;YACjD,MAAM,MAAM,GAAiB,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7E,MAAM,WAAW,GAAa,MAAM;iBACjC,GAAG,CAAC,CAAC,GAAe,EAAsB,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;iBACzD,MAAM,CAAC,CAAC,GAAuB,EAAiB,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC;YAC/E,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACtC,MAAM,MAAM,GAAuB,SAAS,CAAC,KAAK,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,KAAK;oBACX,mEAAmE;oBACnE,+CAA+C;oBAC/C,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC;oBACvC,KAAK,EAAE,KAAK,CAAC,WAAW,IAAI,OAAO;oBACnC,IAAI,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAW,EAAW,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;oBAChH,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC5C,CAAC,CAAC;YACL,CAAC;YACD,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;gBACzB,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;oBAAE,SAAS;gBAC9C,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,KAAK;oBACX,MAAM,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;oBACrB,KAAK,EAAE,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,QAAQ,IAAI,QAAQ;oBAClD,IAAI,EAAE,GAAG,GAAG,CAAC,WAAW,IAAI,kBAAkB,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,SAAS,QAAQ,EAAE;oBAC1J,GAAG,CAAC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACjF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,iDAAiD;IACjD,sBAAsB,CAAC,eAAe,EAAE,CAAC,IAAa,EAAsB,EAAE;QAC5E,MAAM,KAAK,GAAG,IAA4F,CAAC;QAC3G,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;QAChE,OAAO,KAAK,CAAC,MAAM;aAChB,MAAM,CAAC,CAAC,MAAM,EAAW,EAAE,CAAC,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;aAC/D,GAAG,CAAC,CAAC,MAAM,EAAa,EAAE,CAAC,CAAC;YAC3B,IAAI,EAAE,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;YAC5E,MAAM,EAAE,CAAC,MAAM,CAAC,OAAiB,CAAC;YAClC,KAAK,EAAE,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAiB,CAAC;YAC1E,IAAI,EAAE,GAAG,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAiB,CAAC,IAAI,MAAM,CAAC,OAAiB,EAAE;SAC3G,CAAC,CAAC,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,2EAA2E;IAC3E,4EAA4E;IAC5E,qBAAqB,CAAC,YAAY,EAAE,CAAC,IAAa,EAAE,IAAyB,EAAW,EAAE,CACxF,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAE,IAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAkB,EAAE,EAAE,CAAC,CAAC;QAC9E,GAAG,OAAO;QACV,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACtI,CAAC,CAAC,CAAC,CAAC;IACP,qBAAqB,CAAC,YAAY,EAAE,CAAC,IAAa,EAAE,IAAyB,EAAW,EAAE;QACxF,MAAM,KAAK,GAAmB,IAAsB,CAAC;QACrD,MAAM,OAAO,GAAiB,KAAK,CAAC,OAAuB;aACxD,MAAM,CAAC,CAAC,KAAgB,EAAW,EAAE,CAAC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aAC5G,GAAG,CAAC,CAAC,KAAgB,EAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAe,EAAW,EAAE,CAAC,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACtL,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAW,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxJ,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAChF,CAAC,CAAC,CAAC;IACH,qBAAqB,CAAC,eAAe,EAAE,CAAC,IAAa,EAAE,IAAyB,EAAW,EAAE;QAC3F,MAAM,KAAK,GAAG,IAAyF,CAAC;QACxG,MAAM,QAAQ,GAAG,CAAC,MAAyB,EAAU,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACjI,OAAO,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAW,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;IACzI,CAAC,CAAC,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fnndsc/brasa",
-  "version": "0.35.1",
+  "version": "0.36.0",
   "description": "BRASA Runs Abstracted Shell Actions - the hostable ChRIS shell engine (kernel)",
   "repository": {
     "type": "git",
@@ -50,14 +50,14 @@
   "dependencies": {
     "@fnndsc/chili": "^3.7.7",
     "@fnndsc/fond": "^0.3.0",
-    "@fnndsc/cumin": "^3.27.12",
-    "@fnndsc/salsa": "^4.0.1",
+    "@fnndsc/cumin": "^3.27.13",
+    "@fnndsc/salsa": "^4.0.2",
     "chalk": "^4.1.2",
     "cli-highlight": "^2.1.11",
     "js-yaml": "^4.1.0",
     "minimatch": "^10.1.1",
     "ws": "^8.21.0",
-    "@fnndsc/menu": "^0.22.1",
+    "@fnndsc/menu": "^0.22.2",
     "@fnndsc/orrery": "^0.6.1"
   },
   "devDependencies": {