@galaxy-tool-util/schema 0.2.0 → 0.4.0

package/dist/workflow/state-merge.js

@@ -1,231 +1,54 @@
 /**
- * Inject ConnectedValue markers into workflow state dicts.
+ * ConnectedValue injection and stripping for workflow state dicts.
  *
- * Port of Python galaxy.tool_util.workflow_state._state_merge +
- * helper functions from galaxy.tool_util.parameters.visitor.
+ * Thin wrappers around walkNativeState that inject or strip
+ * ConnectedValue markers. Mutate state in-place for caller compat.
  *
- * Walks the parameter tree to match pipe-separated connection paths
- * (e.g. "queries_0|input2") to tool parameters. Handles conditionals,
- * repeats, and sections. Used by validate-workflow for both native
- * and format2 validation paths.
+ * Port of Python galaxy.tool_util.workflow_state._state_merge.
+ * Tree-walking helpers live in walk-helpers.ts; re-exported here
+ * for backward compatibility.
  */
-import { parseBool } from "./coercions.js";
 import { CONNECTED_VALUE, isConnectedValue } from "./runtime-markers.js";
-// --- Helpers (ported from Python visitor.py) ---
-/** Build flat pipe-separated state path: `name` or `prefix|name`. */
-export function flatStatePath(name, prefix) {
-    return prefix != null ? `${prefix}|${name}` : name;
-}
-/** Filter a flat key→value map to keys starting with a given prefix. */
-export function keysStartingWith(map, prefix) {
-    const result = {};
-    for (const [key, value] of Object.entries(map)) {
-        if (key.startsWith(prefix)) {
-            result[key] = value;
-        }
-    }
-    return result;
-}
-/**
- * Split flat connection keys for a repeat into per-instance arrays.
- *
- * Connection keys use the pattern `repeatName_N|paramName`.
- * Returns an array of per-instance connection dicts.
- */
-export function repeatInputsToArray(statePath, inputs) {
-    const repeatInputs = keysStartingWith(inputs, statePath + "_");
-    let highestCount = -1;
-    for (const key of Object.keys(repeatInputs)) {
-        const numStr = key.slice(statePath.length + 1).split("|")[0];
-        const num = parseInt(numStr, 10);
-        if (!isNaN(num) && num > highestCount) {
-            highestCount = num;
-        }
-    }
-    const params = [];
-    for (let i = 0; i <= highestCount; i++) {
-        params.push({});
-    }
-    for (const [key, value] of Object.entries(repeatInputs)) {
-        const numStr = key.slice(statePath.length + 1).split("|")[0];
-        const num = parseInt(numStr, 10);
-        if (!isNaN(num)) {
-            params[num][key] = value;
-        }
-    }
-    return params;
-}
-/**
- * Select the matching ConditionalWhen for a conditional state dict.
- *
- * Matches the test parameter's value in state against each when's
- * discriminator. Falls back to the default when if no match found.
- * Returns null if no match at all (graceful degradation).
- */
-export function selectWhichWhen(conditional, state) {
-    const testParam = conditional.test_parameter;
-    const testValue = state[testParam.name];
-    // Try exact match first
-    for (const when of conditional.whens) {
-        if (_testValueMatchesDiscriminator(testParam, testValue, when.discriminator)) {
-            return when;
-        }
-    }
-    // Fall back to default when
-    for (const when of conditional.whens) {
-        if (when.is_default_when) {
-            return when;
-        }
-    }
-    return null;
-}
-function _testValueMatchesDiscriminator(testParam, testValue, discriminator) {
-    if (testParam.parameter_type === "gx_boolean") {
-        // Boolean coercion: handle string "true"/"false"/"True"/"False" and actual booleans
-        const boolValue = parseBool(testValue);
-        const discBool = typeof discriminator === "boolean" ? discriminator : parseBool(discriminator);
-        return boolValue === discBool;
-    }
-    // Select: string comparison
-    return String(testValue) === String(discriminator);
-}
+import { walkNativeState, SKIP_VALUE } from "./walker.js";
+import { flatStatePath, keysStartingWith, repeatInputsToArray, selectWhichWhen, } from "./walk-helpers.js";
+// Re-export helpers so existing importers don't break
+export { flatStatePath, keysStartingWith, repeatInputsToArray, selectWhichWhen };
 // --- Main injection function ---
 /**
  * Inject ConnectedValue markers into a state dict for all connections.
  *
- * Walks the parameter tree to match connection paths to tool parameters,
- * setting matched leaves to `{"__class__": "ConnectedValue"}`.
- * Mutates `state` in-place.
+ * Uses walkNativeState with a leaf callback that replaces connected
+ * leaves with ConnectedValue markers, then reassigns the input state
+ * in-place to preserve the mutation contract callers expect.
  *
  * @returns remaining unmatched connection paths (empty if all consumed)
  */
 export function injectConnectionsIntoState(toolInputs, state, connections) {
     const remaining = { ...connections };
-    for (const toolInput of toolInputs) {
-        _mergeParam(remaining, toolInput, state);
-    }
+    const result = walkNativeState(connections, toolInputs, state, (_input, value, statePath) => {
+        if (statePath in remaining) {
+            delete remaining[statePath];
+            return { ...CONNECTED_VALUE };
+        }
+        return value === undefined ? SKIP_VALUE : value;
+    }, { preserveUnknownKeys: true });
+    for (const key of Object.keys(state))
+        delete state[key];
+    Object.assign(state, result);
     return remaining;
 }
-function _mergeParam(connections, toolInput, state, prefix, branchConnections) {
-    if (branchConnections == null) {
-        branchConnections = connections;
-    }
-    const name = toolInput.name;
-    const parameterType = toolInput.parameter_type;
-    const statePath = flatStatePath(name, prefix);
-    if (parameterType === "gx_conditional") {
-        const conditional = toolInput;
-        let conditionalState = state[name];
-        if (conditionalState == null) {
-            conditionalState = {};
-            state[name] = conditionalState;
-        }
-        const when = selectWhichWhen(conditional, conditionalState);
-        const conditionalConnections = keysStartingWith(branchConnections, statePath);
-        _mergeParam(connections, conditional.test_parameter, conditionalState, statePath, conditionalConnections);
-        if (when != null) {
-            for (const whenParameter of when.parameters) {
-                _mergeParam(connections, whenParameter, conditionalState, statePath, conditionalConnections);
-            }
-        }
-    }
-    else if (parameterType === "gx_repeat") {
-        const repeat = toolInput;
-        let repeatStateArray = state[name];
-        if (repeatStateArray == null) {
-            repeatStateArray = [];
-        }
-        const repeatInstanceConnects = repeatInputsToArray(statePath, connections);
-        for (let i = 0; i < repeatInstanceConnects.length; i++) {
-            while (repeatStateArray.length <= i) {
-                repeatStateArray.push({});
-            }
-            const instancePrefix = `${statePath}_${i}`;
-            for (const repeatParameter of repeat.parameters) {
-                _mergeParam(connections, repeatParameter, repeatStateArray[i], instancePrefix, repeatInstanceConnects[i]);
-            }
-        }
-        if (repeatStateArray.length > 0 && !(name in state)) {
-            state[name] = repeatStateArray;
-        }
-    }
-    else if (parameterType === "gx_section") {
-        const section = toolInput;
-        let sectionState = state[name];
-        if (sectionState == null) {
-            sectionState = {};
-            state[name] = sectionState;
-        }
-        const sectionConnections = keysStartingWith(branchConnections, statePath);
-        for (const sectionParameter of section.parameters) {
-            _mergeParam(connections, sectionParameter, sectionState, statePath, sectionConnections);
-        }
-    }
-    else {
-        // Leaf parameter
-        if (statePath in branchConnections) {
-            state[name] = { ...CONNECTED_VALUE };
-            delete connections[statePath];
-        }
-    }
-}
 // --- ConnectedValue stripping ---
 /**
  * Strip ConnectedValue markers from a state dict using the parameter tree.
  *
- * Walks conditionals, repeats, and sections so nested markers inside
- * container parameters are removed. Mutates `state` in-place.
+ * Uses walkNativeState with a leaf callback that omits ConnectedValue
+ * entries via SKIP_VALUE, then reassigns the input state in-place to
+ * preserve the mutation contract callers expect.
  */
 export function stripConnectedValues(toolInputs, state) {
-    for (const toolInput of toolInputs) {
-        _stripParam(toolInput, state);
-    }
-}
-function _stripParam(toolInput, state, prefix) {
-    const name = toolInput.name;
-    const parameterType = toolInput.parameter_type;
-    if (parameterType === "gx_conditional") {
-        const conditional = toolInput;
-        const conditionalState = state[name];
-        if (conditionalState == null)
-            return;
-        const statePath = flatStatePath(name, prefix);
-        _stripParam(conditional.test_parameter, conditionalState, statePath);
-        const when = selectWhichWhen(conditional, conditionalState);
-        if (when != null) {
-            for (const whenParameter of when.parameters) {
-                _stripParam(whenParameter, conditionalState, statePath);
-            }
-        }
-    }
-    else if (parameterType === "gx_repeat") {
-        const repeat = toolInput;
-        const repeatStateArray = state[name];
-        if (!Array.isArray(repeatStateArray))
-            return;
-        const statePath = flatStatePath(name, prefix);
-        for (let i = 0; i < repeatStateArray.length; i++) {
-            const instancePrefix = `${statePath}_${i}`;
-            for (const repeatParameter of repeat.parameters) {
-                _stripParam(repeatParameter, repeatStateArray[i], instancePrefix);
-            }
-        }
-    }
-    else if (parameterType === "gx_section") {
-        const section = toolInput;
-        const sectionState = state[name];
-        if (sectionState == null)
-            return;
-        const statePath = flatStatePath(name, prefix);
-        for (const sectionParameter of section.parameters) {
-            _stripParam(sectionParameter, sectionState, statePath);
-        }
-    }
-    else {
-        // Leaf parameter
-        if (isConnectedValue(state[name])) {
-            delete state[name];
-        }
-    }
+    const cleaned = walkNativeState({}, toolInputs, state, (_input, value) => isConnectedValue(value) ? SKIP_VALUE : value === undefined ? SKIP_VALUE : value, { preserveUnknownKeys: true });
+    for (const key of Object.keys(state))
+        delete state[key];
+    Object.assign(state, cleaned);
 }
 //# sourceMappingURL=state-merge.js.map

package/dist/workflow/state-merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"state-merge.js","sourceRoot":"","sources":["../../src/workflow/state-merge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state-merge.js","sourceRoot":"","sources":["../../src/workflow/state-merge.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAE3B,sDAAsD;AACtD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,eAAe,EAAE,CAAC;AAEjF,kCAAkC;AAElC;;;;;;;;GAQG;AACH,MAAM,UAAU,0BAA0B,CACxC,UAAgC,EAChC,KAA8B,EAC9B,WAAoC;IAEpC,MAAM,SAAS,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;IACrC,MAAM,MAAM,GAAG,eAAe,CAC5B,WAAW,EACX,UAAU,EACV,KAAK,EACL,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;QAC3B,IAAI,SAAS,IAAI,SAAS,EAAE,CAAC;YAC3B,OAAO,SAAS,CAAC,SAAS,CAAC,CAAC;YAC5B,OAAO,EAAE,GAAG,eAAe,EAAE,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IAClD,CAAC,EACD,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAC9B,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,mCAAmC;AAEnC;;;;;;GAMG;AACH,MAAM,UAAU,oBAAoB,CAClC,UAAgC,EAChC,KAA8B;IAE9B,MAAM,OAAO,GAAG,eAAe,CAC7B,EAAE,EACF,UAAU,EACV,KAAK,EACL,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAChB,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,EACjF,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAC9B,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAChC,CAAC"}

package/dist/workflow/stateful-validate.d.ts

@@ -43,4 +43,25 @@ export declare function validateNativeStepState(inputs: ToolParameterModel[], to
  * `ConversionValidationFailure` with phase="post" on validation failure.
  */
 export declare function validateFormat2StepState(inputs: ToolParameterModel[], format2State: Record<string, unknown>): void;
+/**
+ * A single diagnostic produced by tool-state validation.
+ *
+ * Defined here (lower-level module) so both {@link validateFormat2StepStateStrict}
+ * and the higher-level {@link ToolStateValidator} share one canonical type.
+ */
+export interface ToolStateDiagnostic {
+    /** Dot-separated parameter path, or "" for top-level / unlocated issues. */
+    path: string;
+    message: string;
+    severity: "error" | "warning";
+}
+/**
+ * Strict variant of {@link validateFormat2StepState}: reports unknown keys as
+ * diagnostics rather than silently ignoring them.
+ *
+ * Uses `onExcessProperty: "error"` so Effect Schema flags any key that has no
+ * corresponding parameter definition. Returns an empty array if the schema
+ * cannot be built or validation passes.
+ */
+export declare function validateFormat2StepStateStrict(inputs: ToolParameterModel[], format2State: Record<string, unknown>): ToolStateDiagnostic[];
 //# sourceMappingURL=stateful-validate.d.ts.map

package/dist/workflow/stateful-validate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stateful-validate.d.ts","sourceRoot":"","sources":["../../src/workflow/stateful-validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH,OAAO,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAA4B,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG9F,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,MAAM,CAAC;AAE7C;;;;GAIG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;aAGlC,KAAK,EAAE,eAAe;aACtB,MAAM,EAAE,MAAM,EAAE;IAHlC,QAAQ,CAAC,IAAI,EAAG,6BAA6B,CAAU;gBAErC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EAAE;CAKnC;AAiBD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAC7C,IAAI,CAiBN;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC,IAAI,CAaN"}
+{"version":3,"file":"stateful-validate.d.ts","sourceRoot":"","sources":["../../src/workflow/stateful-validate.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH,OAAO,+BAA+B,CAAC;AAEvC,OAAO,KAAK,EAA4B,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG9F,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,MAAM,CAAC;AAE7C;;;;GAIG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;aAGlC,KAAK,EAAE,eAAe;aACtB,MAAM,EAAE,MAAM,EAAE;IAHlC,QAAQ,CAAC,IAAI,EAAG,6BAA6B,CAAU;gBAErC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EAAE;CAKnC;AAiBD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,gBAAgB,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAC7C,IAAI,CAiBN;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC,IAAI,CAaN;AAED;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,4EAA4E;IAC5E,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,kBAAkB,EAAE,EAC5B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACpC,mBAAmB,EAAE,CAqBvB"}

package/dist/workflow/stateful-validate.js

@@ -93,4 +93,31 @@ export function validateFormat2StepState(inputs, format2State) {
         throw new ConversionValidationFailure("post", formatIssues(result.left));
     }
 }
+/**
+ * Strict variant of {@link validateFormat2StepState}: reports unknown keys as
+ * diagnostics rather than silently ignoring them.
+ *
+ * Uses `onExcessProperty: "error"` so Effect Schema flags any key that has no
+ * corresponding parameter definition. Returns an empty array if the schema
+ * cannot be built or validation passes.
+ */
+export function validateFormat2StepStateStrict(inputs, format2State) {
+    const bundle = buildBundle(inputs);
+    const model = createFieldModel(bundle, "workflow_step");
+    if (!model)
+        return [];
+    const state = deepClone(format2State);
+    stripConnectedValues(inputs, state);
+    const decode = S.decodeUnknownEither(model, { onExcessProperty: "error" });
+    const result = decode(state);
+    if (result._tag === "Left") {
+        const issues = ParseResult.ArrayFormatter.formatErrorSync(result.left);
+        return issues.map((i) => ({
+            path: i.path.map(String).join("."),
+            message: i.message,
+            severity: "error",
+        }));
+    }
+    return [];
+}
 //# sourceMappingURL=stateful-validate.js.map

package/dist/workflow/stateful-validate.js.map

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

package/dist/workflow/strict-checks.d.ts

@@ -0,0 +1,22 @@
+import type { WorkflowFormat } from "./detect-format.js";
+/**
+ * Native: reject tool_state that is a JSON string instead of a parsed dict.
+ * Walks top-level steps only (matching Python `validate_encoding_native`).
+ */
+export declare function validateEncodingNative(workflowDict: Record<string, unknown>): string[];
+/**
+ * Format2: reject steps using `tool_state` field instead of `state`.
+ *
+ * No string-state check — format2 state comes from YAML parsing so
+ * it's always a dict. The Python side checks this defensively but
+ * it's not a real-world scenario.
+ */
+export declare function validateEncodingFormat2(workflowDict: Record<string, unknown>): string[];
+/** Dispatch encoding check based on format auto-detection. */
+export declare function checkStrictEncoding(workflowDict: Record<string, unknown>, format?: WorkflowFormat): string[];
+/**
+ * Strict structure check — decode with onExcessProperty: "error" to
+ * catch unknown keys at envelope and step level.
+ */
+export declare function checkStrictStructure(workflowDict: Record<string, unknown>, format?: WorkflowFormat): string[];
+//# sourceMappingURL=strict-checks.d.ts.map

package/dist/workflow/strict-checks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"strict-checks.d.ts","sourceRoot":"","sources":["../../src/workflow/strict-checks.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAQzD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAqBtF;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAiBvF;AAED,8DAA8D;AAC9D,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,MAAM,CAAC,EAAE,cAAc,GACtB,MAAM,EAAE,CAKV;AASD;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,MAAM,CAAC,EAAE,cAAc,GACtB,MAAM,EAAE,CAcV"}

package/dist/workflow/strict-checks.js

@@ -0,0 +1,95 @@
+/**
+ * Pre-normalization strict validation checks for workflows.
+ *
+ * These run on raw workflow dicts before any schema normalization,
+ * matching the Python pattern of failing fast before decoding.
+ */
+import { NativeGalaxyWorkflowSchema, GalaxyWorkflowSchema } from "./raw/index.js";
+import { detectFormat } from "./detect-format.js";
+import { withClass } from "./validators.js";
+import * as ParseResult from "effect/ParseResult";
+import * as S from "effect/Schema";
+// ── Encoding checks ──────────────────────────────────────────────────
+/**
+ * Native: reject tool_state that is a JSON string instead of a parsed dict.
+ * Walks top-level steps only (matching Python `validate_encoding_native`).
+ */
+export function validateEncodingNative(workflowDict) {
+    const errors = [];
+    const steps = workflowDict.steps;
+    if (!steps || typeof steps !== "object")
+        return errors;
+    const entries = Array.isArray(steps)
+        ? steps.map((s, i) => [String(i), s])
+        : Object.entries(steps);
+    for (const [key, step] of entries) {
+        if (!step || typeof step !== "object")
+            continue;
+        const s = step;
+        if (s.type === "subworkflow")
+            continue;
+        if (!s.tool_id)
+            continue;
+        const toolState = s.tool_state;
+        if (typeof toolState === "string") {
+            errors.push(`step ${key}: tool_state is a JSON string (legacy encoding), expected a dict`);
+        }
+    }
+    return errors;
+}
+/**
+ * Format2: reject steps using `tool_state` field instead of `state`.
+ *
+ * No string-state check — format2 state comes from YAML parsing so
+ * it's always a dict. The Python side checks this defensively but
+ * it's not a real-world scenario.
+ */
+export function validateEncodingFormat2(workflowDict) {
+    const errors = [];
+    const steps = workflowDict.steps;
+    if (!steps || !Array.isArray(steps))
+        return errors;
+    for (let i = 0; i < steps.length; i++) {
+        const step = steps[i];
+        if (!step || typeof step !== "object")
+            continue;
+        const s = step;
+        if (s.run && typeof s.run === "object")
+            continue; // subworkflow
+        if (!s.tool_id)
+            continue;
+        if ("tool_state" in s && !("state" in s)) {
+            errors.push(`step ${i}: uses "tool_state" instead of "state" (format2 should use "state")`);
+        }
+    }
+    return errors;
+}
+/** Dispatch encoding check based on format auto-detection. */
+export function checkStrictEncoding(workflowDict, format) {
+    const fmt = format ?? detectFormat(workflowDict);
+    return fmt === "native"
+        ? validateEncodingNative(workflowDict)
+        : validateEncodingFormat2(workflowDict);
+}
+// ── Structure checks ─────────────────────────────────────────────────
+function formatIssues(error) {
+    const issues = ParseResult.ArrayFormatter.formatErrorSync(error);
+    return issues.map((i) => `${i.path.join(".")}: ${i.message}`);
+}
+/**
+ * Strict structure check — decode with onExcessProperty: "error" to
+ * catch unknown keys at envelope and step level.
+ */
+export function checkStrictStructure(workflowDict, format) {
+    const fmt = format ?? detectFormat(workflowDict);
+    const cls = fmt === "native" ? "NativeGalaxyWorkflow" : "GalaxyWorkflow";
+    const data = withClass(workflowDict, cls);
+    const schema = fmt === "native" ? NativeGalaxyWorkflowSchema : GalaxyWorkflowSchema;
+    const decode = S.decodeUnknownEither(schema, { onExcessProperty: "error" });
+    const result = decode(data);
+    if (result._tag === "Left") {
+        return formatIssues(result.left);
+    }
+    return [];
+}
+//# sourceMappingURL=strict-checks.js.map

package/dist/workflow/strict-checks.js.map

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

package/dist/workflow/tool-state-io.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Shared helper for reading a native step's `tool_state`.
+ *
+ * Native workflows store parameter state as either:
+ *   - a JSON-encoded string (`.ga` on disk), or
+ *   - a parsed dict (after normalization / in-memory manipulation).
+ *
+ * Consumers elsewhere in the package duplicated this logic (cross-check
+ * extractor, normalized native builder, clean). Kept here as the shared
+ * root. `clean.ts` wraps this with legacy-dict decoding; it's a superset, not
+ * a replacement.
+ */
+export declare function parseToolState(raw: unknown): Record<string, unknown>;
+//# sourceMappingURL=tool-state-io.d.ts.map

package/dist/workflow/tool-state-io.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-state-io.d.ts","sourceRoot":"","sources":["../../src/workflow/tool-state-io.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBpE"}

package/dist/workflow/tool-state-io.js

@@ -0,0 +1,33 @@
+/**
+ * Shared helper for reading a native step's `tool_state`.
+ *
+ * Native workflows store parameter state as either:
+ *   - a JSON-encoded string (`.ga` on disk), or
+ *   - a parsed dict (after normalization / in-memory manipulation).
+ *
+ * Consumers elsewhere in the package duplicated this logic (cross-check
+ * extractor, normalized native builder, clean). Kept here as the shared
+ * root. `clean.ts` wraps this with legacy-dict decoding; it's a superset, not
+ * a replacement.
+ */
+export function parseToolState(raw) {
+    if (typeof raw === "string") {
+        if (raw === "")
+            return {};
+        try {
+            const parsed = JSON.parse(raw);
+            if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+                return parsed;
+            }
+        }
+        catch {
+            /* fall through to empty */
+        }
+        return {};
+    }
+    if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+        return raw;
+    }
+    return {};
+}
+//# sourceMappingURL=tool-state-io.js.map

package/dist/workflow/tool-state-io.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-state-io.js","sourceRoot":"","sources":["../../src/workflow/tool-state-io.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,GAAG,KAAK,EAAE;YAAE,OAAO,EAAE,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnE,OAAO,MAAiC,CAAC;YAC3C,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,2BAA2B;QAC7B,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1D,OAAO,GAA8B,CAAC;IACxC,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC"}

package/dist/workflow/validators.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Shared Effect-schema validator dispatch for workflow dict inputs.
+ *
+ * Mirrors gxformat2/validators.py. Callers pass a parsed workflow dict and get
+ * back the decoded value or throw on validation failure. Used by the schema-rule
+ * catalog runner and declarative-operation tests.
+ *
+ * The generated Effect schemas make `class` a required literal; Python's
+ * pydantic models default it. `withClass` injects the discriminator when
+ * missing so pass/fail semantics match Python byte-for-byte — see the plan
+ * note about `Format2MissingClass` being unenforceable today.
+ */
+/**
+ * Return `raw` with `class: cls` injected if missing, and the same injection
+ * applied recursively to step subworkflows. Native steps embed subworkflows
+ * under `.subworkflow`; format2 steps embed them under `.run` (when `run` is
+ * an inline dict, not a URL).
+ *
+ * The cls string must match the parent document's class: nested format2
+ * subworkflows inherit `"GalaxyWorkflow"`, native inherit `"NativeGalaxyWorkflow"`.
+ */
+export declare function withClass(raw: unknown, cls: string): unknown;
+export declare function validateFormat2(wf: unknown): unknown;
+export declare function validateFormat2Strict(wf: unknown): unknown;
+export declare function validateNative(wf: unknown): unknown;
+export declare function validateNativeStrict(wf: unknown): unknown;
+/**
+ * Pick the validator matching a fixture filename's format.
+ *
+ * `.ga` → native; anything else → format2. `strict` picks the closed-schema
+ * flavor that rejects unknown fields.
+ */
+export declare function validatorForFixture(fixtureName: string, strict: boolean): (wf: unknown) => unknown;
+//# sourceMappingURL=validators.d.ts.map

package/dist/workflow/validators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["../../src/workflow/validators.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAOH;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAkB5D;AAgBD,wBAAgB,eAAe,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAIpD;AAED,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAI1D;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAInD;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,OAAO,GACd,CAAC,EAAE,EAAE,OAAO,KAAK,OAAO,CAK1B"}