@galaxy-tool-util/core 1.8.0 → 1.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.
- package/dist/tool-info.d.ts.map +1 -1
- package/dist/tool-info.js +43 -14
- package/dist/tool-info.js.map +1 -1
- package/package.json +1 -1
package/dist/tool-info.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-info.d.ts","sourceRoot":"","sources":["../src/tool-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"tool-info.d.ts","sourceRoot":"","sources":["../src/tool-info.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAwB,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,kDAAkD;AAClD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,UAAU,GAAG,QAAQ,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,0DAA0D;AAC1D,MAAM,WAAW,eAAe;IAC9B,gGAAgG;IAChG,OAAO,EAAE,YAAY,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,4FAA4F;IAC5F,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,4EAA4E;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CACxB;AAED;;;GAGG;AACH,qBAAa,eAAe;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;gBAE3B,IAAI,EAAE,eAAe;IAsB3B,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IA8E1F;;;OAGG;YACW,oBAAoB;IAalC;;;;;;;OAOG;IACG,OAAO,CACX,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,IAAI,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GACzB,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,aAAa,EAAE,OAAO,CAAA;KAAE,CAAC;IAkCpE,OAAO,CACX,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,UAAU,EACtB,MAAM,GAAE,MAAgB,EACxB,SAAS,GAAE,MAAW,GACrB,OAAO,CAAC,MAAM,CAAC;CAOnB"}
|
package/dist/tool-info.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ToolCache } from "./cache/tool-cache.js";
|
|
1
|
+
import { DEFAULT_TOOL_VERSION, ToolCache } from "./cache/tool-cache.js";
|
|
2
2
|
import { cacheKey } from "./cache/cache-key.js";
|
|
3
3
|
import { fetchFromToolShed, fetchFromGalaxy } from "./client/toolshed.js";
|
|
4
4
|
import { getLatestTRSToolVersion } from "./client/trs.js";
|
|
@@ -33,19 +33,34 @@ export class ToolInfoService {
|
|
|
33
33
|
}
|
|
34
34
|
async getToolInfo(toolId, toolVersion) {
|
|
35
35
|
const coords = this.cache.resolveToolCoordinates(toolId, toolVersion);
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
// `keyVersion` keys the cache entry. The `_default_` sentinel is a stable handle
|
|
37
|
+
// for an unversioned stock/built-in request and must survive as the key so the
|
|
38
|
+
// offline json-schema validate path (which keys by `_default_`) gets cache hits.
|
|
39
|
+
let keyVersion = coords.version;
|
|
40
|
+
if (keyVersion === null) {
|
|
41
|
+
// ToolShed tool without a pin — must resolve a concrete version before we can key it.
|
|
42
|
+
const resolved = await this.resolveLatestVersion(coords.toolshedUrl, coords.trsToolId);
|
|
43
|
+
if (resolved === null) {
|
|
40
44
|
console.debug(`No version available for tool: ${toolId}`);
|
|
41
45
|
return null;
|
|
42
46
|
}
|
|
47
|
+
keyVersion = resolved;
|
|
43
48
|
}
|
|
44
|
-
const key = await cacheKey(coords.toolshedUrl, coords.trsToolId,
|
|
45
|
-
// Check storage cache (ToolCache checks memory first internally)
|
|
49
|
+
const key = await cacheKey(coords.toolshedUrl, coords.trsToolId, keyVersion);
|
|
50
|
+
// Check storage cache (ToolCache checks memory first internally). Done before any
|
|
51
|
+
// `_default_` version discovery so cache hits stay network-free.
|
|
46
52
|
const cached = await this.cache.loadCached(key);
|
|
47
53
|
if (cached !== null)
|
|
48
54
|
return cached;
|
|
55
|
+
// Cache miss — pick the concrete version actually requested from the remote. For a
|
|
56
|
+
// `_default_` request, resolve one now while keeping the key as `_default_`; fall back
|
|
57
|
+
// to the sentinel when the shed can't list versions (genuinely versionless built-ins
|
|
58
|
+
// like __APPLY_RULES__).
|
|
59
|
+
let fetchVersion = keyVersion;
|
|
60
|
+
if (keyVersion === DEFAULT_TOOL_VERSION) {
|
|
61
|
+
const resolved = await this.resolveLatestVersion(coords.toolshedUrl, coords.trsToolId);
|
|
62
|
+
fetchVersion = resolved ?? DEFAULT_TOOL_VERSION;
|
|
63
|
+
}
|
|
49
64
|
// Try each source in order
|
|
50
65
|
for (const source of this.sources) {
|
|
51
66
|
try {
|
|
@@ -53,16 +68,20 @@ export class ToolInfoService {
|
|
|
53
68
|
let sourceLabel;
|
|
54
69
|
let sourceUrl;
|
|
55
70
|
if (source.type === "toolshed") {
|
|
56
|
-
parsedTool = await fetchFromToolShed(source.url, coords.trsToolId,
|
|
71
|
+
parsedTool = await fetchFromToolShed(source.url, coords.trsToolId, fetchVersion, this.fetcher);
|
|
57
72
|
sourceLabel = "api";
|
|
58
|
-
sourceUrl = `${source.url}/api/tools/${coords.trsToolId}/versions/${
|
|
73
|
+
sourceUrl = `${source.url}/api/tools/${coords.trsToolId}/versions/${fetchVersion}`;
|
|
59
74
|
}
|
|
60
75
|
else {
|
|
61
|
-
parsedTool = await fetchFromGalaxy(source.url, toolId,
|
|
76
|
+
parsedTool = await fetchFromGalaxy(source.url, toolId, fetchVersion, this.fetcher);
|
|
62
77
|
sourceLabel = "galaxy";
|
|
63
78
|
sourceUrl = `${source.url}/api/tools/${encodeURIComponent(toolId)}/parsed`;
|
|
64
79
|
}
|
|
65
|
-
|
|
80
|
+
// Key under `keyVersion` (may be `_default_`); record the concrete version the
|
|
81
|
+
// body reports (falling back to `fetchVersion`) as the index/display version so
|
|
82
|
+
// `list` surfaces it.
|
|
83
|
+
const indexVersion = parsedTool.version ?? fetchVersion;
|
|
84
|
+
await this.cache.saveTool(key, parsedTool, coords.readableId, indexVersion, sourceLabel, sourceUrl);
|
|
66
85
|
return parsedTool;
|
|
67
86
|
}
|
|
68
87
|
catch (err) {
|
|
@@ -96,7 +115,7 @@ export class ToolInfoService {
|
|
|
96
115
|
*/
|
|
97
116
|
async refetch(toolId, toolVersion, opts) {
|
|
98
117
|
const coords = this.cache.resolveToolCoordinates(toolId, toolVersion ?? null);
|
|
99
|
-
|
|
118
|
+
const resolvedVersion = coords.version;
|
|
100
119
|
let alreadyCached = false;
|
|
101
120
|
if (resolvedVersion !== null) {
|
|
102
121
|
alreadyCached = await this.cache.hasCached(toolId, resolvedVersion);
|
|
@@ -113,8 +132,18 @@ export class ToolInfoService {
|
|
|
113
132
|
if (tool === null) {
|
|
114
133
|
throw new Error(`Failed to fetch tool: ${toolId}`);
|
|
115
134
|
}
|
|
116
|
-
|
|
117
|
-
|
|
135
|
+
// Mirror getToolInfo's keying: `_default_` and explicit pins key as-is
|
|
136
|
+
// (coords.version); an unpinned ToolShed tool (coords.version === null) keys by the
|
|
137
|
+
// resolved version. Must not key a stock tool by tool.version — its entry lives under
|
|
138
|
+
// the `_default_` key, not `~<version>`.
|
|
139
|
+
//
|
|
140
|
+
// Known edge (tracked): a stock entry is keyed under `_default_` but its index/display
|
|
141
|
+
// version is the concrete one (e.g. `1.1.1`). A caller that refetches by the *display*
|
|
142
|
+
// version (gxwf-web inspector does) passes `1.1.1`, misses the `_default_` key, and
|
|
143
|
+
// writes a duplicate sibling instead of refreshing. Unreachable until the shed's TRS
|
|
144
|
+
// version-list endpoint is healthy; fix needs the request version persisted in the index.
|
|
145
|
+
const keyVersion = coords.version ?? tool.version ?? "unknown";
|
|
146
|
+
const key = await cacheKey(coords.toolshedUrl, coords.trsToolId, keyVersion);
|
|
118
147
|
return { cacheKey: key, fetched: true, alreadyCached };
|
|
119
148
|
}
|
|
120
149
|
async addTool(toolId, toolVersion, parsedTool, source = "local", sourceUrl = "") {
|
package/dist/tool-info.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-info.js","sourceRoot":"","sources":["../src/tool-info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-info.js","sourceRoot":"","sources":["../src/tool-info.ts"],"names":[],"mappings":"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"}
|