@galaxy-tool-util/core 1.10.1 → 1.12.0

package/dist/tool-info.js

@@ -1,7 +1,10 @@
 import { DEFAULT_TOOL_VERSION, ToolCache } from "./cache/tool-cache.js";
 import { cacheKey } from "./cache/cache-key.js";
 import { fetchFromToolShed, fetchFromGalaxy } from "./client/toolshed.js";
+import { ToolFetchError } from "./client/toolshed.js";
+import { fetchToolSourceFromGalaxy, fetchToolSourceFromToolShed } from "./client/tool-source.js";
 import { getLatestTRSToolVersion } from "./client/trs.js";
+import { ignoreDiagnostic } from "./diagnostics.js";
 /**
  * High-level service for fetching Galaxy tool metadata with automatic caching.
  * Tries configured sources in order and caches on first successful fetch.
@@ -10,12 +13,15 @@ export class ToolInfoService {
     cache;
     sources;
     fetcher;
+    onDiagnostic;
     constructor(opts) {
         this.cache = new ToolCache({
             storage: opts.storage,
             defaultToolshedUrl: opts.defaultToolshedUrl,
+            onDiagnostic: opts.onDiagnostic,
         });
         this.fetcher = opts.fetcher ?? globalThis.fetch;
+        this.onDiagnostic = opts.onDiagnostic ?? ignoreDiagnostic;
         if (opts.sources) {
             this.sources = opts.sources;
         }
@@ -35,6 +41,55 @@ export class ToolInfoService {
         const resolved = await this.resolveTool(toolId, toolVersion);
         return resolved === null ? null : resolved.tool;
     }
+    /** Lazy wrapper-source fetch with write-through caching, independent of parsed metadata. */
+    async fetchToolSource(toolId, toolVersion) {
+        const coords = this.cache.resolveToolCoordinates(toolId, toolVersion);
+        const keyVersion = coords.version ?? (await this.resolveLatestVersion(coords.toolshedUrl, coords.trsToolId));
+        if (keyVersion === null)
+            return null;
+        const key = await cacheKey(coords.toolshedUrl, coords.trsToolId, keyVersion);
+        const cached = await this.cache.loadToolSource(key);
+        if (cached !== null)
+            return cached;
+        let fetchVersion = keyVersion;
+        if (keyVersion === DEFAULT_TOOL_VERSION) {
+            const parsed = await this.cache.loadCached(key);
+            fetchVersion =
+                parsed?.version ??
+                    (await this.resolveLatestVersion(coords.toolshedUrl, coords.trsToolId)) ??
+                    DEFAULT_TOOL_VERSION;
+        }
+        let failure;
+        for (const source of this.sources) {
+            let document;
+            try {
+                document =
+                    source.type === "toolshed"
+                        ? await fetchToolSourceFromToolShed(source.url, coords.trsToolId, fetchVersion, this.fetcher)
+                        : await fetchToolSourceFromGalaxy(source.url, coords.trsToolId.includes("~") ? coords.readableId : toolId, fetchVersion === DEFAULT_TOOL_VERSION ? null : fetchVersion, this.fetcher);
+            }
+            catch (err) {
+                this.onDiagnostic(`${source.type} source fetch failed (${source.url}) for ${coords.trsToolId}: ${err}`);
+                if (!(err instanceof ToolFetchError) || err.statusCode !== 404)
+                    failure = err;
+                continue;
+            }
+            try {
+                await this.cache.saveToolSource(key, document);
+                // Source-only entries must participate in cache deletion and prefix clearing.
+                if (!(await this.cache.index.has(key))) {
+                    await this.cache.index.add(key, coords.readableId, fetchVersion, source.type === "toolshed" ? "api" : "galaxy", source.url);
+                }
+            }
+            catch (err) {
+                this.onDiagnostic(`Failed to cache fetched tool source ${coords.trsToolId}: ${err}`);
+            }
+            return document;
+        }
+        if (failure !== undefined)
+            throw failure;
+        return null;
+    }
     /**
      * Like {@link getToolInfo}, but also returns the cache key the tool lives under
      * — the authoritative key this service caches with. Callers needing the key
@@ -51,7 +106,7 @@ export class ToolInfoService {
             // ToolShed tool without a pin — must resolve a concrete version before we can key it.
             const resolved = await this.resolveLatestVersion(coords.toolshedUrl, coords.trsToolId);
             if (resolved === null) {
-                console.debug(`No version available for tool: ${toolId}`);
+                this.onDiagnostic(`No version available for tool: ${toolId}`);
                 return null;
             }
             keyVersion = resolved;
@@ -73,10 +128,10 @@ export class ToolInfoService {
         }
         // Try each source in order
         for (const source of this.sources) {
+            let parsedTool;
+            let sourceLabel;
+            let sourceUrl;
             try {
-                let parsedTool;
-                let sourceLabel;
-                let sourceUrl;
                 if (source.type === "toolshed") {
                     parsedTool = await fetchFromToolShed(source.url, coords.trsToolId, fetchVersion, this.fetcher);
                     sourceLabel = "api";
@@ -87,17 +142,23 @@ export class ToolInfoService {
                     sourceLabel = "galaxy";
                     sourceUrl = `${source.url}/api/tools/${encodeURIComponent(toolId)}/parsed`;
                 }
-                // Key under `keyVersion` (may be `_default_`); record the concrete version the
-                // body reports (falling back to `fetchVersion`) as the index/display version so
-                // `list` surfaces it.
-                const indexVersion = parsedTool.version ?? fetchVersion;
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                this.onDiagnostic(`${source.type} fetch failed (${source.url}) for ${coords.trsToolId}: ${msg}`);
+                continue;
+            }
+            // A cache failure must not discard an otherwise valid remote response.
+            // Report it separately and still return the fetched tool to the caller.
+            const indexVersion = parsedTool.version ?? fetchVersion;
+            try {
                 await this.cache.saveTool(key, parsedTool, coords.readableId, indexVersion, sourceLabel, sourceUrl);
-                return { tool: parsedTool, key };
             }
             catch (err) {
                 const msg = err instanceof Error ? err.message : String(err);
-                console.debug(`${source.type} fetch failed (${source.url}) for ${coords.trsToolId}: ${msg}`);
+                this.onDiagnostic(`Failed to cache fetched tool ${coords.trsToolId} version ${indexVersion}: ${msg}`);
             }
+            return { tool: parsedTool, key };
         }
         return null;
     }
@@ -111,7 +172,7 @@ export class ToolInfoService {
         }
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
-            console.debug(`TRS latest-version lookup failed for ${trsToolId} on ${toolshedUrl}: ${msg}`);
+            this.onDiagnostic(`TRS latest-version lookup failed for ${trsToolId} on ${toolshedUrl}: ${msg}`);
             return null;
         }
     }
@@ -125,7 +186,10 @@ export class ToolInfoService {
      */
     async refetch(toolId, toolVersion, opts) {
         const coords = this.cache.resolveToolCoordinates(toolId, toolVersion ?? null);
-        const resolvedVersion = coords.version;
+        let resolvedVersion = coords.version;
+        if (opts?.force && resolvedVersion === null) {
+            resolvedVersion = await this.resolveLatestVersion(coords.toolshedUrl, coords.trsToolId);
+        }
         let alreadyCached = false;
         if (resolvedVersion !== null) {
             alreadyCached = await this.cache.hasCached(toolId, resolvedVersion);
@@ -134,7 +198,7 @@ export class ToolInfoService {
             const key = await cacheKey(coords.toolshedUrl, coords.trsToolId, resolvedVersion);
             return { cacheKey: key, fetched: false, alreadyCached: true };
         }
-        if (alreadyCached && opts?.force && resolvedVersion !== null) {
+        if (opts?.force && resolvedVersion !== null) {
             const key = await cacheKey(coords.toolshedUrl, coords.trsToolId, resolvedVersion);
             await this.cache.removeCached(key);
         }
@@ -148,12 +212,6 @@ export class ToolInfoService {
         // (coords.version); an unpinned ToolShed tool (coords.version === null) keys by
         // the resolved version. Must not key a stock tool by tool.version — its entry
         // lives under the `_default_` key, not `~<version>`.
-        //
-        // Known edge (tracked): a stock entry is keyed under `_default_` but its index/display
-        // version is the concrete one (e.g. `1.1.1`). A caller that refetches by the *display*
-        // version (gxwf-web inspector does) passes `1.1.1`, misses the `_default_` key, and
-        // writes a duplicate sibling instead of refreshing. Unreachable until the shed's TRS
-        // version-list endpoint is healthy; fix needs the request version persisted in the index.
         const keyVersion = coords.version ?? tool.version ?? "unknown";
         const key = await cacheKey(coords.toolshedUrl, coords.trsToolId, keyVersion);
         return { cacheKey: key, fetched: true, alreadyCached };

package/dist/tool-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-info.js","sourceRoot":"","sources":["../src/tool-info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAqB1D;;;GAGG;AACH,MAAM,OAAO,eAAe;IACjB,KAAK,CAAY;IACT,OAAO,CAAe;IACtB,OAAO,CAAe;IAEvC,YAAY,IAAqB;QAC/B,IAAI,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC;YACzB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC;QAEhD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,GAAG;gBACb;oBACE,IAAI,EAAE,UAAU;oBAChB,GAAG,EAAE,IAAI,CAAC,kBAAkB,IAAI,IAAI,CAAC,KAAK,CAAC,kBAAkB;iBAC9D;aACF,CAAC;YACF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,WAA2B;QAC3D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC7D,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CACf,MAAc,EACd,WAA2B;QAE3B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACtE,iFAAiF;QACjF,+EAA+E;QAC/E,iFAAiF;QACjF,IAAI,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;QAChC,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACxB,sFAAsF;YACtF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACvF,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,OAAO,CAAC,KAAK,CAAC,kCAAkC,MAAM,EAAE,CAAC,CAAC;gBAC1D,OAAO,IAAI,CAAC;YACd,CAAC;YACD,UAAU,GAAG,QAAQ,CAAC;QACxB,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAE7E,kFAAkF;QAClF,iEAAiE;QACjE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QAElD,mFAAmF;QACnF,uFAAuF;QACvF,qFAAqF;QACrF,yBAAyB;QACzB,IAAI,YAAY,GAAG,UAAU,CAAC;QAC9B,IAAI,UAAU,KAAK,oBAAoB,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACvF,YAAY,GAAG,QAAQ,IAAI,oBAAoB,CAAC;QAClD,CAAC;QAED,2BAA2B;QAC3B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC;gBACH,IAAI,UAAsB,CAAC;gBAC3B,IAAI,WAAmB,CAAC;gBACxB,IAAI,SAAiB,CAAC;gBAEtB,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC/B,UAAU,GAAG,MAAM,iBAAiB,CAClC,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,SAAS,EAChB,YAAY,EACZ,IAAI,CAAC,OAAO,CACb,CAAC;oBACF,WAAW,GAAG,KAAK,CAAC;oBACpB,SAAS,GAAG,GAAG,MAAM,CAAC,GAAG,cAAc,MAAM,CAAC,SAAS,aAAa,YAAY,EAAE,CAAC;gBACrF,CAAC;qBAAM,CAAC;oBACN,UAAU,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;oBACnF,WAAW,GAAG,QAAQ,CAAC;oBACvB,SAAS,GAAG,GAAG,MAAM,CAAC,GAAG,cAAc,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC7E,CAAC;gBAED,+EAA+E;gBAC/E,gFAAgF;gBAChF,sBAAsB;gBACtB,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,IAAI,YAAY,CAAC;gBACxD,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CACvB,GAAG,EACH,UAAU,EACV,MAAM,CAAC,UAAU,EACjB,YAAY,EACZ,WAAW,EACX,SAAS,CACV,CAAC;gBACF,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;YACnC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC7D,OAAO,CAAC,KAAK,CACX,GAAG,MAAM,CAAC,IAAI,kBAAkB,MAAM,CAAC,GAAG,SAAS,MAAM,CAAC,SAAS,KAAK,GAAG,EAAE,CAC9E,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,oBAAoB,CAChC,WAAmB,EACnB,SAAiB;QAEjB,IAAI,CAAC;YACH,OAAO,MAAM,uBAAuB,CAAC,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,OAAO,CAAC,KAAK,CAAC,wCAAwC,SAAS,OAAO,WAAW,KAAK,GAAG,EAAE,CAAC,CAAC;YAC7F,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,CACX,MAAc,EACd,WAA2B,EAC3B,IAA0B;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,WAAW,IAAI,IAAI,CAAC,CAAC;QAC9E,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC;QACvC,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;YAC7B,aAAa,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,aAAa,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;YAClC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,eAAgB,CAAC,CAAC;YACnF,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;QAChE,CAAC;QACD,IAAI,aAAa,IAAI,IAAI,EAAE,KAAK,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;YAC7D,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAClF,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,IAAI,IAAI,CAAC,CAAC;QACjE,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAC;QACrD,CAAC;QACD,gFAAgF;QAChF,gFAAgF;QAChF,yEAAyE;QACzE,gFAAgF;QAChF,8EAA8E;QAC9E,qDAAqD;QACrD,EAAE;QACF,uFAAuF;QACvF,uFAAuF;QACvF,oFAAoF;QACpF,qFAAqF;QACrF,0FAA0F;QAC1F,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,IAAI,SAAS,CAAC;QAC/D,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAC7E,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,OAAO,CACX,MAAc,EACd,WAAmB,EACnB,UAAsB,EACtB,SAAiB,OAAO,EACxB,YAAoB,EAAE;QAEtB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,WAAW,CAAC;QAC9C,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC1E,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAC1F,OAAO,GAAG,CAAC;IACb,CAAC;CACF"}
+{"version":3,"file":"tool-info.js","sourceRoot":"","sources":["../src/tool-info.ts"],"names":[],"mappings":"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"}

package/dist/tool-source.d.ts

@@ -0,0 +1,9 @@
+/** A serialized wrapper document, as returned by Galaxy or the Tool Shed. */
+export interface ToolSourceDocument {
+    contents: string;
+    language: "xml" | "yaml" | "json" | "cwl" | "text";
+    /** XML serializers return the macro-expanded tree; other formats have no XML macros. */
+    macrosExpanded: boolean;
+}
+export declare function isToolSourceDocument(value: unknown): value is ToolSourceDocument;
+//# sourceMappingURL=tool-source.d.ts.map

package/dist/tool-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-source.d.ts","sourceRoot":"","sources":["../src/tool-source.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;IACnD,wFAAwF;IACxF,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,kBAAkB,CAQhF"}

package/dist/tool-source.js

@@ -0,0 +1,9 @@
+export function isToolSourceDocument(value) {
+    if (value === null || typeof value !== "object")
+        return false;
+    const source = value;
+    return (typeof source.contents === "string" &&
+        ["xml", "yaml", "json", "cwl", "text"].includes(source.language) &&
+        typeof source.macrosExpanded === "boolean");
+}
+//# sourceMappingURL=tool-source.js.map

package/dist/tool-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-source.js","sourceRoot":"","sources":["../src/tool-source.ts"],"names":[],"mappings":"AAQA,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9D,MAAM,MAAM,GAAG,KAA2B,CAAC;IAC3C,OAAO,CACL,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ;QACnC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChE,OAAO,MAAM,CAAC,cAAc,KAAK,SAAS,CAC3C,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galaxy-tool-util/core",
-  "version": "1.10.1",
+  "version": "1.12.0",
   "description": "Galaxy tool cache, ToolShed client, and ParsedTool models",
   "type": "module",
   "sideEffects": false,
@@ -37,7 +37,7 @@
   "dependencies": {
     "effect": "^3.21.0",
     "yaml": "^2.8.3",
-    "@galaxy-tool-util/schema": "1.10.1"
+    "@galaxy-tool-util/schema": "1.12.0"
   },
   "scripts": {
     "build": "tsc",