@fnndsc/brasa 0.11.0 → 0.11.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/buildinfo.json +1 -1
- package/dist/builtins/net/pacsUtils.d.ts +4 -8
- package/dist/builtins/net/pacsUtils.js +14 -47
- package/dist/builtins/net/pacsUtils.js.map +1 -1
- package/dist/builtins/net/query.d.ts +3 -1
- package/dist/builtins/net/query.js +5 -7
- package/dist/builtins/net/query.js.map +1 -1
- package/package.json +3 -3
package/dist/buildinfo.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"hash":"
|
|
1
|
+
{"hash":"752c98"}
|
|
@@ -5,6 +5,10 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @module
|
|
7
7
|
*/
|
|
8
|
+
import { folderUID_get } from '@fnndsc/salsa';
|
|
9
|
+
export { folderUID_get };
|
|
10
|
+
/** Compatibility alias for cumin's tag_extractValue, the one tag unwrapper. */
|
|
11
|
+
export declare const pacs_tagValueExtract: (val: unknown) => string;
|
|
8
12
|
/**
|
|
9
13
|
* Minimal series info collected from a decoded PACS query result.
|
|
10
14
|
*/
|
|
@@ -25,14 +29,6 @@ export interface SeriesCubePath {
|
|
|
25
29
|
folderPath: string;
|
|
26
30
|
fileCount: number;
|
|
27
31
|
}
|
|
28
|
-
/**
|
|
29
|
-
* Safely unwraps a DICOM tag value (may be `{value: ...}` wrapper or plain string/number).
|
|
30
|
-
*/
|
|
31
|
-
export declare function pacs_tagValueExtract(val: unknown): string;
|
|
32
|
-
/**
|
|
33
|
-
* Extracts the UID portion of a VFS folder name (`<prefix>_<uid>_<label>`).
|
|
34
|
-
*/
|
|
35
|
-
export declare function folderUID_get(folder: string, prefix: string): string;
|
|
36
32
|
/**
|
|
37
33
|
* Resolves a PACS server identifier string from a numeric ID or context.
|
|
38
34
|
*
|
|
@@ -5,28 +5,11 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @module
|
|
7
7
|
*/
|
|
8
|
-
import { errorStack, pacsQuery_resultDecode, pacsServers_list, chrisContext, Context, seriesStorage_resolve } from '@fnndsc/cumin';
|
|
9
|
-
import { queryId_extractFromFolder } from '@fnndsc/salsa';
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
export function pacs_tagValueExtract(val) {
|
|
14
|
-
if (val && typeof val === 'object') {
|
|
15
|
-
const r = val;
|
|
16
|
-
if ('value' in r)
|
|
17
|
-
return String(r.value ?? '');
|
|
18
|
-
if ('Value' in r && Array.isArray(r.Value) && r.Value.length > 0)
|
|
19
|
-
return String(r.Value[0] ?? '');
|
|
20
|
-
}
|
|
21
|
-
return String(val ?? '');
|
|
22
|
-
}
|
|
23
|
-
/**
|
|
24
|
-
* Extracts the UID portion of a VFS folder name (`<prefix>_<uid>_<label>`).
|
|
25
|
-
*/
|
|
26
|
-
export function folderUID_get(folder, prefix) {
|
|
27
|
-
const withoutPrefix = folder.replace(new RegExp(`^${prefix}_`), '');
|
|
28
|
-
return withoutPrefix.split('_')[0];
|
|
29
|
-
}
|
|
8
|
+
import { errorStack, pacsQuery_resultDecode, pacsServers_list, chrisContext, Context, seriesStorage_resolve, tag_extractValue, studies_extractFromDecoded, series_extractFromStudy, } from '@fnndsc/cumin';
|
|
9
|
+
import { queryId_extractFromFolder, queryLabel_extractFromFolder, folderUID_get } from '@fnndsc/salsa';
|
|
10
|
+
export { folderUID_get };
|
|
11
|
+
/** Compatibility alias for cumin's tag_extractValue, the one tag unwrapper. */
|
|
12
|
+
export const pacs_tagValueExtract = tag_extractValue;
|
|
30
13
|
/**
|
|
31
14
|
* Resolves a PACS server identifier string from a numeric ID or context.
|
|
32
15
|
*
|
|
@@ -78,26 +61,13 @@ export async function pacs_seriesCollect(pathStr, fallbackPacsName, callerTag =
|
|
|
78
61
|
errorStack.stack_push('error', `${callerTag}: Cannot parse query ID from: ${queryFolder}`);
|
|
79
62
|
return [];
|
|
80
63
|
}
|
|
81
|
-
const queryLabel = queryFolder
|
|
64
|
+
const queryLabel = queryLabel_extractFromFolder(queryFolder);
|
|
82
65
|
const decodedResult = await pacsQuery_resultDecode(queryId);
|
|
83
66
|
if (!decodedResult.ok || !decodedResult.value.json) {
|
|
84
67
|
errorStack.stack_push('error', `${callerTag}: Failed to decode results for query ${queryId}`);
|
|
85
68
|
return [];
|
|
86
69
|
}
|
|
87
|
-
const
|
|
88
|
-
let studiesSource;
|
|
89
|
-
if (raw && typeof raw === 'object') {
|
|
90
|
-
const r = raw;
|
|
91
|
-
studiesSource =
|
|
92
|
-
'studies' in r ? r.studies :
|
|
93
|
-
'Studies' in r ? r.Studies :
|
|
94
|
-
'results' in r ? r.results :
|
|
95
|
-
raw;
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
studiesSource = raw;
|
|
99
|
-
}
|
|
100
|
-
const studies = (Array.isArray(studiesSource) ? studiesSource : [studiesSource]);
|
|
70
|
+
const studies = studies_extractFromDecoded(decodedResult.value.json);
|
|
101
71
|
const targetStudyUID = parts.length >= 5
|
|
102
72
|
? folderUID_get(parts[4], 'Study')
|
|
103
73
|
: null;
|
|
@@ -108,26 +78,23 @@ export async function pacs_seriesCollect(pathStr, fallbackPacsName, callerTag =
|
|
|
108
78
|
for (const studyObj of studies) {
|
|
109
79
|
if (!studyObj || typeof studyObj !== 'object')
|
|
110
80
|
continue;
|
|
111
|
-
const studyUID =
|
|
81
|
+
const studyUID = tag_extractValue(studyObj.StudyInstanceUID ?? studyObj.uid);
|
|
112
82
|
if (targetStudyUID && studyUID !== targetStudyUID)
|
|
113
83
|
continue;
|
|
114
|
-
const studyLabel =
|
|
115
|
-
const retrieveAETitle =
|
|
84
|
+
const studyLabel = tag_extractValue(studyObj.StudyDescription ?? 'Study').replace(/[\s/]/g, '_');
|
|
85
|
+
const retrieveAETitle = tag_extractValue(studyObj.RetrieveAETitle ?? '');
|
|
116
86
|
const pacsName = retrieveAETitle || fallbackPacsName;
|
|
117
|
-
const seriesArr = (
|
|
118
|
-
Array.isArray(studyObj.Series) ? studyObj.Series :
|
|
119
|
-
Array.isArray(studyObj.results) ? studyObj.results :
|
|
120
|
-
[]);
|
|
87
|
+
const seriesArr = series_extractFromStudy(studyObj);
|
|
121
88
|
for (const seriesObj of seriesArr) {
|
|
122
89
|
if (!seriesObj || typeof seriesObj !== 'object')
|
|
123
90
|
continue;
|
|
124
|
-
const seriesUID =
|
|
91
|
+
const seriesUID = tag_extractValue(seriesObj.SeriesInstanceUID ?? seriesObj.uid);
|
|
125
92
|
if (!seriesUID)
|
|
126
93
|
continue;
|
|
127
94
|
if (targetSeriesUID && seriesUID !== targetSeriesUID)
|
|
128
95
|
continue;
|
|
129
|
-
const seriesLabel =
|
|
130
|
-
const expectedFiles = Number(
|
|
96
|
+
const seriesLabel = tag_extractValue(seriesObj.SeriesDescription ?? 'Series').replace(/[\s/]/g, '_');
|
|
97
|
+
const expectedFiles = Number(tag_extractValue(seriesObj.NumberOfSeriesRelatedInstances ?? '0')) || 0;
|
|
131
98
|
infos.push({
|
|
132
99
|
label: `${queryLabel}|${studyLabel}|${seriesLabel}`,
|
|
133
100
|
seriesLabel,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pacsUtils.js","sourceRoot":"","sources":["../../../src/builtins/net/pacsUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"pacsUtils.js","sourceRoot":"","sources":["../../../src/builtins/net/pacsUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,9 @@ export interface QueryCreateResult {
|
|
|
30
30
|
*/
|
|
31
31
|
export declare function queryExpr_parse(expr: string): Record<string, string> | null;
|
|
32
32
|
/**
|
|
33
|
-
* Builds the VFS path for a query
|
|
33
|
+
* Builds the VFS path for a query via the provider's one naming authority,
|
|
34
|
+
* so the path handed back after `query` is the path `ls` will show once the
|
|
35
|
+
* query has results.
|
|
34
36
|
*
|
|
35
37
|
* @param queryId - The numeric query ID.
|
|
36
38
|
* @param queryObj - The parsed query key-value pairs.
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
*/
|
|
11
11
|
import chalk from 'chalk';
|
|
12
12
|
import { errorStack, chrisContext, Context, pacsQuery_get, pacsQuery_resultDecode, pacsQueries_create, pacsServers_list, envelope_ok, envelope_error, listCache_get, } from '@fnndsc/cumin';
|
|
13
|
+
import { queryFolderName_build } from '@fnndsc/salsa';
|
|
13
14
|
import { screen } from '@fnndsc/chili/screen/screen.js';
|
|
14
15
|
import { spinner } from '../../lib/spinner.js';
|
|
15
16
|
import { args_checkHasHelpFlag, help_render } from '../help.js';
|
|
@@ -49,7 +50,9 @@ export function queryExpr_parse(expr) {
|
|
|
49
50
|
return Object.keys(result).length > 0 ? result : null;
|
|
50
51
|
}
|
|
51
52
|
/**
|
|
52
|
-
* Builds the VFS path for a query
|
|
53
|
+
* Builds the VFS path for a query via the provider's one naming authority,
|
|
54
|
+
* so the path handed back after `query` is the path `ls` will show once the
|
|
55
|
+
* query has results.
|
|
53
56
|
*
|
|
54
57
|
* @param queryId - The numeric query ID.
|
|
55
58
|
* @param queryObj - The parsed query key-value pairs.
|
|
@@ -57,12 +60,7 @@ export function queryExpr_parse(expr) {
|
|
|
57
60
|
* @returns Absolute VFS path string.
|
|
58
61
|
*/
|
|
59
62
|
export function queryVfsPath_build(queryId, queryObj, username) {
|
|
60
|
-
|
|
61
|
-
.filter(([, v]) => v.trim().length > 0)
|
|
62
|
-
.map(([k, v]) => `${k}:${v}`);
|
|
63
|
-
const desc = parts.join('_') || 'query';
|
|
64
|
-
const userSuffix = username ? `_${username}` : '';
|
|
65
|
-
return `/net/pacs/queries/${desc}_qid:${queryId}${userSuffix}`;
|
|
63
|
+
return `/net/pacs/queries/${queryFolderName_build({ queryId, queryObj, username, hasResult: true })}`;
|
|
66
64
|
}
|
|
67
65
|
/**
|
|
68
66
|
* Creates a PACS query and blocks until the result is populated or timeout.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/builtins/net/query.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,UAAU,EACV,YAAY,EACZ,OAAO,EACP,aAAa,EACb,sBAAsB,EACtB,kBAAkB,EAClB,gBAAgB,EAKhB,WAAW,EACX,cAAc,EACd,aAAa,GACd,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEhE,MAAM,sBAAsB,GAAW,KAAK,CAAC;AAC7C,MAAM,gBAAgB,GAAW,MAAM,CAAC;AAexC;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnE,OAAO,MAAgC,CAAC;YAC1C,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,eAAe;QACjB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,QAAQ,GAAW,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,QAAQ,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;QAC9B,MAAM,GAAG,GAAW,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,KAAK,GAAW,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACtB,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,QAAgC,EAAE,QAAiB;IACrG,MAAM,KAAK,GAAa,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;SACtC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,IAAI,GAAW,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC;IAChD,MAAM,UAAU,GAAW,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1D,OAAO,qBAAqB,IAAI,QAAQ,OAAO,GAAG,UAAU,EAAE,CAAC;AACjE,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,SAAiB,EACjB,KAAa,EACb,UAAkB,EAClB,QAAgC;IAEhC,MAAM,QAAQ,GAAkC,eAAe,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,+BAA+B,SAAS,2BAA2B,CAAC,CAAC;QACpG,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAwB;QACnC,KAAK;QACL,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;KAChC,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACnE,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0EAA0E;IAC1E,qEAAqE;IACrE,aAAa,EAAE,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;IAEtD,MAAM,OAAO,GAAW,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;IAC9C,MAAM,aAAa,GACjB,OAAO,YAAY,CAAC,KAAK,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC;IACxG,MAAM,OAAO,GAAW,kBAAkB,CAAC,OAAO,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC7E,MAAM,QAAQ,GAAW,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC;IAEvD,MAAM,KAAK,GAAG,CAAC,EAAU,EAAiB,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAEjF,IAAI,uBAAuB,GAAW,CAAC,CAAC;IAExC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,MAAM,GAAW,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9F,QAAQ,EAAE,CAAC,SAAS,OAAO,MAAM,MAAM,EAAE,CAAC,CAAC;QAE3C,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC3D,IAAI,YAAY,CAAC,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC;QAC3D,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC;YACrB,kEAAkE;YAClE,iEAAiE;YACjE,iBAAiB;YACjB,UAAU,CAAC,SAAS,EAAE,CAAC;QACzB,CAAC;QAED,kEAAkE;QAClE,2DAA2D;QAC3D,IAAI,MAAM,KAAK,WAAW,IAAI,EAAE,uBAAuB,IAAI,CAAC,EAAE,CAAC;YAC7D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC;QACpD,CAAC;QAED,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC;IAED,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,sCAAsC,OAAO,UAAU,CAAC,CAAC;IACxF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,OAA+B;IACzD,MAAM,OAAO,GAAY,OAAO,CAAC,IAAI,CAAC;IACtC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEzD,MAAM,MAAM,GAAG,CAAC,CAAU,EAAU,EAAE;QACpC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,IAAK,CAA6B,EAAE,CAAC;YAC5E,OAAO,MAAM,CAAE,CAA6B,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,UAAU,GAAc,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAE3E,IAAI,WAAW,GAAW,CAAC,CAAC;IAE5B,UAAU,CAAC,OAAO,CAAC,CAAC,QAAiB,EAAE,IAAY,EAAE,EAAE;QACrD,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAAE,OAAO;QACtD,MAAM,KAAK,GAA4B,QAAmC,CAAC;QAE3E,MAAM,SAAS,GAAW,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAW,MAAM,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;QAClF,MAAM,SAAS,GAAW,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;QAC5E,MAAM,SAAS,GAAW,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACxD,MAAM,UAAU,GAAW,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;QACjE,MAAM,SAAS,GAAW,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;QAE9D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,GAAG,CAAC,KAAK,SAAS,IAAI,kBAAkB,EAAE,CAAC,CAAC,CAAC;QACvF,IAAI,WAAW;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,SAAS,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAClH,IAAI,SAAS;YAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,UAAU;YAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC,CAAC;QACxE,IAAI,SAAS;YAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,SAAS,EAAE,CAAC,CAAC,CAAC;QAEvE,MAAM,SAAS,GACb,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC/C,EAAE,CAAC;QAEL,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACf,SAAS,CAAC,OAAO,CAAC,CAAC,SAAkB,EAAE,IAAY,EAAE,EAAE;gBACrD,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ;oBAAE,OAAO;gBACxD,MAAM,MAAM,GAA4B,SAAoC,CAAC;gBAC7E,MAAM,IAAI,GAAW,MAAM,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;gBAC5D,MAAM,GAAG,GAAW,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;gBAClD,MAAM,KAAK,GAAW,MAAM,CAAC,MAAM,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;gBAC1E,MAAM,QAAQ,GAAW,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtE,MAAM,MAAM,GAAW,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5D,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,kBAAkB,GAAG,MAAM,GAAG,QAAQ,EAAE,CAAC,CAAC;gBAC1G,WAAW,EAAE,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEpC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,MAAM,mBAAmB,WAAW,SAAS,CAAC,CAAC,CAAC;IACzF,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAElB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,uBAAuB,CAAC,OAA+B,EAAE,KAAc;IAC9E,MAAM,OAAO,GAAY,OAAO,CAAC,IAAI,CAAC;IACtC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEzD,MAAM,MAAM,GAAG,CAAC,CAAU,EAAU,EAAE;QACpC,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,IAAK,CAA6B,EAAE,CAAC;YAC5E,OAAO,MAAM,CAAE,CAA6B,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACzB,CAAC,CAAC;IAGF,MAAM,IAAI,GAAe,EAAE,CAAC;IAC5B,MAAM,UAAU,GAAc,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAE3E,UAAU,CAAC,OAAO,CAAC,CAAC,QAAiB,EAAE,IAAY,EAAE,EAAE;QACrD,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ;YAAE,OAAO;QACtD,MAAM,KAAK,GAA4B,QAAmC,CAAC;QAC3E,MAAM,UAAU,GAAW,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,SAAS,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;QACjF,MAAM,SAAS,GAAW,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAW,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,KAAK,SAAS,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC;QAErF,MAAM,SAAS,GACb,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9C,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC/C,EAAE,CAAC;QAEL,SAAS,CAAC,OAAO,CAAC,CAAC,SAAkB,EAAE,IAAY,EAAE,EAAE;YACrD,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ;gBAAE,OAAO;YACxD,MAAM,MAAM,GAA4B,SAAoC,CAAC;YAC7E,IAAI,CAAC,IAAI,CAAC;gBACR,KAAK,EAAQ,YAAY;gBACzB,GAAG,EAAU,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;gBAC7B,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,IAAI,EAAE,CAAC;gBACnD,QAAQ,EAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;gBAC1C,KAAK,EAAQ,MAAM,CAAC,MAAM,CAAC,8BAA8B,IAAI,EAAE,CAAC;aACjE,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnC,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,eAAe,EAAE,EAAE,CAAC,CAAC;AACnF,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAc;IAChD,IAAI,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QACzC,OAAO,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,GAAW,SAAS,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;IAC1C,IAAI,kBAAkB,GAAkB,IAAI,CAAC;IAC7C,IAAI,SAAS,GAAY,KAAK,CAAC;IAC/B,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YACjD,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACpB,CAAC;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,cAAc,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7D,kBAAkB,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;YACjC,SAAS,GAAG,IAAI,CAAC;QACnB,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACrC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,mFAAmF,CAAC,IAAI,CAAC,CAAC;IAC9I,CAAC;IAED,MAAM,SAAS,GAAW,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE/C,4BAA4B;IAC5B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,+BAA+B,SAAS,uDAAuD,CAAC,IAAI,CAAC,CAAC;IAC1J,CAAC;IAED,sBAAsB;IACtB,IAAI,UAAU,GAAkB,kBAAkB,IAAI,MAAM,YAAY,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACzG,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,aAAa,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC/C,IAAI,aAAa,CAAC,EAAE,IAAI,aAAa,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvD,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,kEAAkE,CAAC,IAAI,CAAC,CAAC;QAC7H,CAAC;IACH,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,qBAAqB,SAAS,KAAK,EAAE,IAAI,CAAC,CAAC;IAEzD,MAAM,MAAM,GAA6B,MAAM,uBAAuB,CACpE,SAAS,EACT,KAAK,EACL,UAAU,EACV,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAC5C,CAAC;IAEF,OAAO,CAAC,IAAI,EAAE,CAAC;IAEf,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,MAAM,GAAW,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,6DAA6D;YAC7D,IAAI,CAAC,OAAO,CAAC,CAAC,GAAY,EAAE,EAAE;gBAC5B,MAAM,GAAG,GAAW,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE,GAA4B,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3G,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,2DAA2D,CAAC,IAAI,CAAC;QAC1F,CAAC;QACD,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,cAAc,GAAkB,SAAS;QAC7C,CAAC,CAAC,uBAAuB,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,KAAK,SAAS,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9F,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEvC,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,gEAAgE;QAChE,4BAA4B;QAC5B,OAAO,WAAW,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,WAAW,MAAM,CAAC,OAAO,+BAA+B,CAAC,IAAI,CAAC,CAAC;IACpG,CAAC;IAED,IAAI,QAAQ,GAAW,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,WAAW,CAAC,IAAI,CAAC;IAChF,QAAQ,IAAI,GAAG,cAAc,IAAI,CAAC;IAClC,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC;IAC3E,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;IACxD,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC;IAC1D,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC"}
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/builtins/net/query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fnndsc/brasa",
|
|
3
|
-
"version": "0.11.
|
|
3
|
+
"version": "0.11.1",
|
|
4
4
|
"description": "BRASA Runs Abstracted Shell Actions - the hostable ChRIS shell engine (kernel)",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -44,8 +44,8 @@
|
|
|
44
44
|
"license": "MIT",
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@fnndsc/chili": "^3.6.5",
|
|
47
|
-
"@fnndsc/cumin": "^3.
|
|
48
|
-
"@fnndsc/salsa": "^3.
|
|
47
|
+
"@fnndsc/cumin": "^3.12.0",
|
|
48
|
+
"@fnndsc/salsa": "^3.8.0",
|
|
49
49
|
"chalk": "^4.1.2",
|
|
50
50
|
"cli-highlight": "^2.1.11",
|
|
51
51
|
"js-yaml": "^4.1.0",
|