@fnndsc/salsa 3.8.0 → 3.8.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.
|
@@ -54,19 +54,19 @@ async function pluginMetadata_get(cache, item, piping) {
|
|
|
54
54
|
const plugin = await item.plugin_get();
|
|
55
55
|
if (plugin === null)
|
|
56
56
|
throw new Error('piping exposes no plugin link');
|
|
57
|
-
const [
|
|
58
|
-
plugin.parametersPage_get({ limit
|
|
59
|
-
plugin.computeResourcesPage_get({ limit
|
|
57
|
+
const [parameterRows, computeRows] = await Promise.all([
|
|
58
|
+
(0, cumin_1.listPages_drain)((offset, limit) => plugin.parametersPage_get({ limit, offset })),
|
|
59
|
+
(0, cumin_1.listPages_drain)((offset, limit) => plugin.computeResourcesPage_get({ limit, offset })),
|
|
60
60
|
]);
|
|
61
61
|
return {
|
|
62
|
-
parameterDefinitions:
|
|
62
|
+
parameterDefinitions: parameterRows.map((parameter) => ({
|
|
63
63
|
name: parameter.name,
|
|
64
64
|
type: parameter.type ?? 'string',
|
|
65
65
|
optional: parameter.optional ?? false,
|
|
66
66
|
default: parameter.default,
|
|
67
67
|
help: parameter.help,
|
|
68
68
|
})),
|
|
69
|
-
computeResources:
|
|
69
|
+
computeResources: computeRows
|
|
70
70
|
.map((compute) => compute.name)
|
|
71
71
|
.filter((name) => typeof name === 'string'),
|
|
72
72
|
};
|
|
@@ -112,11 +112,16 @@ function definedValue_getFirst(...values) {
|
|
|
112
112
|
async function pipelineManifest_project(pipelineRecord, pipeline, detail, cache) {
|
|
113
113
|
const manifestKey = `${pipelineRecord.id}:${detail}`;
|
|
114
114
|
try {
|
|
115
|
-
const [pipingItems,
|
|
116
|
-
|
|
117
|
-
|
|
115
|
+
const [pipingItems, defaultRows] = await Promise.all([
|
|
116
|
+
// pluginPipings_get returns a bare item array (no page envelope), so
|
|
117
|
+
// the drain terminates on the short page.
|
|
118
|
+
(0, cumin_1.listPages_drain)(async (offset, limit) => ({
|
|
119
|
+
data: await pipeline.pluginPipings_get({ limit, offset }),
|
|
120
|
+
totalCount: null,
|
|
121
|
+
})),
|
|
122
|
+
(0, cumin_1.listPages_drain)((offset, limit) => pipeline.defaultParametersPage_get({ limit, offset })),
|
|
118
123
|
]);
|
|
119
|
-
const defaults =
|
|
124
|
+
const defaults = defaultRows
|
|
120
125
|
.map((row) => defaultParameter_narrow(row))
|
|
121
126
|
.filter((row) => row !== null);
|
|
122
127
|
const defaultsByPiping = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/pipelines/manifest.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/pipelines/manifest.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fnndsc/salsa",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.1",
|
|
4
4
|
"description": "Shared Application Logic and Service Assets for ChRIS",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"inflight": "npm:@aashutoshrathi/word-wrap@^1.2.6"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@fnndsc/cumin": "^3.
|
|
57
|
+
"@fnndsc/cumin": "^3.13.0",
|
|
58
58
|
"axios": "^1.6.8",
|
|
59
59
|
"ws": "^8.21.0"
|
|
60
60
|
}
|