@styx-api/core 0.3.0 → 0.4.0

package/dist/index.cjs

@@ -15,7 +15,7 @@ function isObject$3(x) {
 function isString$3(x) {
 	return typeof x === "string";
 }
-function isNumber$1(x) {
+function isNumber$2(x) {
 	return typeof x === "number";
 }
 function isArray$3(x) {
@@ -100,7 +100,7 @@ var ArgdumpParser = class {
 		const choices = action.choices;
 		if (isArray$3(choices) && choices.length > 0) {
 			const alts = [];
-			for (const choice of choices) if (isString$3(choice) || isNumber$1(choice)) alts.push({
+			for (const choice of choices) if (isString$3(choice) || isNumber$2(choice)) alts.push({
 				kind: "literal",
 				attrs: { str: String(choice) }
 			});
@@ -233,7 +233,7 @@ var ArgdumpParser = class {
 				countMin: 1
 			}
 		};
-		if (isNumber$1(nargs) && Number.isInteger(nargs) && nargs >= 0) {
+		if (isNumber$2(nargs) && Number.isInteger(nargs) && nargs >= 0) {
 			if (nargs === 1) return node;
 			return {
 				kind: "repeat",
@@ -253,7 +253,7 @@ var ArgdumpParser = class {
 		const name = this.preferredName(action) ?? (isString$3(dest) ? dest : void 0);
 		const hasName = name !== void 0;
 		const hasHelp = isString$3(help) && !isSuppressed(help);
-		const hasDefault = (isString$3(defaultVal) || isNumber$1(defaultVal) || typeof defaultVal === "boolean") && !isSuppressed(defaultVal);
+		const hasDefault = (isString$3(defaultVal) || isNumber$2(defaultVal) || typeof defaultVal === "boolean") && !isSuppressed(defaultVal);
 		if (!hasName && !hasHelp && !hasDefault) return void 0;
 		return {
 			...hasName && { name },
@@ -854,7 +854,7 @@ function isObject$2(x) {
 function isString$2(x) {
 	return typeof x === "string";
 }
-function isNumber(x) {
+function isNumber$1(x) {
 	return typeof x === "number";
 }
 function isArray$2(x) {
@@ -952,7 +952,7 @@ var BoutiquesParser = class {
 		const title = btInput.name;
 		const description = btInput.description;
 		const defaultValue = btInput["default-value"];
-		const hasDefault = isString$2(defaultValue) || isNumber(defaultValue) || typeof defaultValue === "boolean";
+		const hasDefault = isString$2(defaultValue) || isNumber$1(defaultValue) || typeof defaultValue === "boolean";
 		if (!isString$2(name) && !isString$2(title) && !isString$2(description) && !hasDefault) return;
 		return {
 			...isString$2(name) && { name },
@@ -1076,7 +1076,7 @@ var BoutiquesParser = class {
 			kind: "literal",
 			attrs: { str: choice }
 		});
-		else if (isNumber(choice)) alts.push({
+		else if (isNumber$1(choice)) alts.push({
 			kind: "literal",
 			attrs: { str: String(choice) }
 		});
@@ -1113,11 +1113,11 @@ var BoutiquesParser = class {
 					kind: "int",
 					attrs: {}
 				};
-				if (isNumber(btInput.minimum)) {
+				if (isNumber$1(btInput.minimum)) {
 					node.attrs.minValue = Math.floor(btInput.minimum);
 					if (btInput["exclusive-minimum"] === true) node.attrs.minValue += 1;
 				}
-				if (isNumber(btInput.maximum)) {
+				if (isNumber$1(btInput.maximum)) {
 					node.attrs.maxValue = Math.floor(btInput.maximum);
 					if (btInput["exclusive-maximum"] === true) node.attrs.maxValue -= 1;
 				}
@@ -1129,8 +1129,8 @@ var BoutiquesParser = class {
 					kind: "float",
 					attrs: {}
 				};
-				if (isNumber(btInput.minimum)) node.attrs.minValue = btInput.minimum;
-				if (isNumber(btInput.maximum)) node.attrs.maxValue = btInput.maximum;
+				if (isNumber$1(btInput.minimum)) node.attrs.minValue = btInput.minimum;
+				if (isNumber$1(btInput.maximum)) node.attrs.maxValue = btInput.maximum;
 				if (meta) node.meta = meta;
 				return node;
 			}
@@ -1235,8 +1235,8 @@ var BoutiquesParser = class {
 			attrs: {
 				node,
 				...isString$2(btInput["list-separator"]) && { join: btInput["list-separator"] },
-				...isNumber(btInput["min-list-entries"]) && { countMin: btInput["min-list-entries"] },
-				...isNumber(btInput["max-list-entries"]) && { countMax: btInput["max-list-entries"] }
+				...isNumber$1(btInput["min-list-entries"]) && { countMin: btInput["min-list-entries"] },
+				...isNumber$1(btInput["max-list-entries"]) && { countMax: btInput["max-list-entries"] }
 			}
 		};
 	}
@@ -1486,6 +1486,9 @@ function isObject$1(x) {
 function isString$1(x) {
 	return typeof x === "string";
 }
+function isNumber(x) {
+	return typeof x === "number" && Number.isFinite(x);
+}
 function isArray$1(x) {
 	return Array.isArray(x);
 }
@@ -1532,9 +1535,10 @@ function emptyExpr$1() {
 *   - option, 1 arg          -> opt(seq(lit(-switch), value))      (flat optional)
 *   - option, >1 arg / multi -> opt|rep(seq(lit(-switch), ...))    (sub-struct)
 *
-* Type mapping mirrors the v1 `mrt2bt.js` converter's `set_type`. The dump does
-* not carry choice values, so a `choice` argument degrades to a plain string
-* (as it did in v1). Per-command quirks v1 hand-coded that the flat dump cannot
+* Type mapping mirrors the v1 `mrt2bt.js` converter's `set_type`, plus `choice`
+* values: when the dump carries `choices` it lowers to an enum (an alternative
+* of literals), else a plain string (older dumps that omit the values - as v1
+* always did). Per-command quirks v1 hand-coded that the flat dump cannot
 * express (e.g. dwi2fod/mtnormalise paired in/out args) are intentionally NOT
 * special-cased here - they are patched on the niwrap side post-dump, keeping
 * this frontend format-general.
@@ -1617,6 +1621,19 @@ var MrtrixParser = class {
 		};
 	}
 	/**
+	* Integer/float bounds, when the dump carries them. The C++ hook serializes
+	* `Argument::limits.{i,f}.{min,max}` as `min`/`max`, omitting the unbounded
+	* sentinels - so a present value is a real, tool-enforced bound.
+	*/
+	numericBounds(arg) {
+		const lo = arg.min;
+		const hi = arg.max;
+		return {
+			...isNumber(lo) && { minValue: lo },
+			...isNumber(hi) && { maxValue: hi }
+		};
+	}
+	/**
 	* Lower one MRtrix argument to its terminal node (carrying name + doc) and,
 	* for output types, an accompanying `Output`.
 	*/
@@ -1628,11 +1645,31 @@ var MrtrixParser = class {
 		}
 		const name = meta.name;
 		switch (argType) {
-			case "integer": return { node: int(meta) };
-			case "float": return { node: float(meta) };
+			case "integer": {
+				const node = int(meta);
+				Object.assign(node.attrs, this.numericBounds(arg));
+				return { node };
+			}
+			case "float": {
+				const node = float(meta);
+				Object.assign(node.attrs, this.numericBounds(arg));
+				return { node };
+			}
 			case "text":
-			case "choice":
-			case "undefined": return { node: str(meta) };
+			case "undefined":
+			case "boolean": return { node: str(meta) };
+			case "choice": {
+				const choices = arg.choices;
+				if (isArray$1(choices)) {
+					const alts = choices.filter(isString$1).map((c) => lit(c));
+					if (alts.length > 0) {
+						const node = alt(...alts);
+						node.meta = meta;
+						return { node };
+					}
+				}
+				return { node: str(meta) };
+			}
 			case "int seq": {
 				const node = repJoin(",", int());
 				node.meta = meta;

package/dist/index.mjs

@@ -14,7 +14,7 @@ function isObject$3(x) {
 function isString$3(x) {
 	return typeof x === "string";
 }
-function isNumber$1(x) {
+function isNumber$2(x) {
 	return typeof x === "number";
 }
 function isArray$3(x) {
@@ -99,7 +99,7 @@ var ArgdumpParser = class {
 		const choices = action.choices;
 		if (isArray$3(choices) && choices.length > 0) {
 			const alts = [];
-			for (const choice of choices) if (isString$3(choice) || isNumber$1(choice)) alts.push({
+			for (const choice of choices) if (isString$3(choice) || isNumber$2(choice)) alts.push({
 				kind: "literal",
 				attrs: { str: String(choice) }
 			});
@@ -232,7 +232,7 @@ var ArgdumpParser = class {
 				countMin: 1
 			}
 		};
-		if (isNumber$1(nargs) && Number.isInteger(nargs) && nargs >= 0) {
+		if (isNumber$2(nargs) && Number.isInteger(nargs) && nargs >= 0) {
 			if (nargs === 1) return node;
 			return {
 				kind: "repeat",
@@ -252,7 +252,7 @@ var ArgdumpParser = class {
 		const name = this.preferredName(action) ?? (isString$3(dest) ? dest : void 0);
 		const hasName = name !== void 0;
 		const hasHelp = isString$3(help) && !isSuppressed(help);
-		const hasDefault = (isString$3(defaultVal) || isNumber$1(defaultVal) || typeof defaultVal === "boolean") && !isSuppressed(defaultVal);
+		const hasDefault = (isString$3(defaultVal) || isNumber$2(defaultVal) || typeof defaultVal === "boolean") && !isSuppressed(defaultVal);
 		if (!hasName && !hasHelp && !hasDefault) return void 0;
 		return {
 			...hasName && { name },
@@ -853,7 +853,7 @@ function isObject$2(x) {
 function isString$2(x) {
 	return typeof x === "string";
 }
-function isNumber(x) {
+function isNumber$1(x) {
 	return typeof x === "number";
 }
 function isArray$2(x) {
@@ -951,7 +951,7 @@ var BoutiquesParser = class {
 		const title = btInput.name;
 		const description = btInput.description;
 		const defaultValue = btInput["default-value"];
-		const hasDefault = isString$2(defaultValue) || isNumber(defaultValue) || typeof defaultValue === "boolean";
+		const hasDefault = isString$2(defaultValue) || isNumber$1(defaultValue) || typeof defaultValue === "boolean";
 		if (!isString$2(name) && !isString$2(title) && !isString$2(description) && !hasDefault) return;
 		return {
 			...isString$2(name) && { name },
@@ -1075,7 +1075,7 @@ var BoutiquesParser = class {
 			kind: "literal",
 			attrs: { str: choice }
 		});
-		else if (isNumber(choice)) alts.push({
+		else if (isNumber$1(choice)) alts.push({
 			kind: "literal",
 			attrs: { str: String(choice) }
 		});
@@ -1112,11 +1112,11 @@ var BoutiquesParser = class {
 					kind: "int",
 					attrs: {}
 				};
-				if (isNumber(btInput.minimum)) {
+				if (isNumber$1(btInput.minimum)) {
 					node.attrs.minValue = Math.floor(btInput.minimum);
 					if (btInput["exclusive-minimum"] === true) node.attrs.minValue += 1;
 				}
-				if (isNumber(btInput.maximum)) {
+				if (isNumber$1(btInput.maximum)) {
 					node.attrs.maxValue = Math.floor(btInput.maximum);
 					if (btInput["exclusive-maximum"] === true) node.attrs.maxValue -= 1;
 				}
@@ -1128,8 +1128,8 @@ var BoutiquesParser = class {
 					kind: "float",
 					attrs: {}
 				};
-				if (isNumber(btInput.minimum)) node.attrs.minValue = btInput.minimum;
-				if (isNumber(btInput.maximum)) node.attrs.maxValue = btInput.maximum;
+				if (isNumber$1(btInput.minimum)) node.attrs.minValue = btInput.minimum;
+				if (isNumber$1(btInput.maximum)) node.attrs.maxValue = btInput.maximum;
 				if (meta) node.meta = meta;
 				return node;
 			}
@@ -1234,8 +1234,8 @@ var BoutiquesParser = class {
 			attrs: {
 				node,
 				...isString$2(btInput["list-separator"]) && { join: btInput["list-separator"] },
-				...isNumber(btInput["min-list-entries"]) && { countMin: btInput["min-list-entries"] },
-				...isNumber(btInput["max-list-entries"]) && { countMax: btInput["max-list-entries"] }
+				...isNumber$1(btInput["min-list-entries"]) && { countMin: btInput["min-list-entries"] },
+				...isNumber$1(btInput["max-list-entries"]) && { countMax: btInput["max-list-entries"] }
 			}
 		};
 	}
@@ -1485,6 +1485,9 @@ function isObject$1(x) {
 function isString$1(x) {
 	return typeof x === "string";
 }
+function isNumber(x) {
+	return typeof x === "number" && Number.isFinite(x);
+}
 function isArray$1(x) {
 	return Array.isArray(x);
 }
@@ -1531,9 +1534,10 @@ function emptyExpr$1() {
 *   - option, 1 arg          -> opt(seq(lit(-switch), value))      (flat optional)
 *   - option, >1 arg / multi -> opt|rep(seq(lit(-switch), ...))    (sub-struct)
 *
-* Type mapping mirrors the v1 `mrt2bt.js` converter's `set_type`. The dump does
-* not carry choice values, so a `choice` argument degrades to a plain string
-* (as it did in v1). Per-command quirks v1 hand-coded that the flat dump cannot
+* Type mapping mirrors the v1 `mrt2bt.js` converter's `set_type`, plus `choice`
+* values: when the dump carries `choices` it lowers to an enum (an alternative
+* of literals), else a plain string (older dumps that omit the values - as v1
+* always did). Per-command quirks v1 hand-coded that the flat dump cannot
 * express (e.g. dwi2fod/mtnormalise paired in/out args) are intentionally NOT
 * special-cased here - they are patched on the niwrap side post-dump, keeping
 * this frontend format-general.
@@ -1616,6 +1620,19 @@ var MrtrixParser = class {
 		};
 	}
 	/**
+	* Integer/float bounds, when the dump carries them. The C++ hook serializes
+	* `Argument::limits.{i,f}.{min,max}` as `min`/`max`, omitting the unbounded
+	* sentinels - so a present value is a real, tool-enforced bound.
+	*/
+	numericBounds(arg) {
+		const lo = arg.min;
+		const hi = arg.max;
+		return {
+			...isNumber(lo) && { minValue: lo },
+			...isNumber(hi) && { maxValue: hi }
+		};
+	}
+	/**
 	* Lower one MRtrix argument to its terminal node (carrying name + doc) and,
 	* for output types, an accompanying `Output`.
 	*/
@@ -1627,11 +1644,31 @@ var MrtrixParser = class {
 		}
 		const name = meta.name;
 		switch (argType) {
-			case "integer": return { node: int(meta) };
-			case "float": return { node: float(meta) };
+			case "integer": {
+				const node = int(meta);
+				Object.assign(node.attrs, this.numericBounds(arg));
+				return { node };
+			}
+			case "float": {
+				const node = float(meta);
+				Object.assign(node.attrs, this.numericBounds(arg));
+				return { node };
+			}
 			case "text":
-			case "choice":
-			case "undefined": return { node: str(meta) };
+			case "undefined":
+			case "boolean": return { node: str(meta) };
+			case "choice": {
+				const choices = arg.choices;
+				if (isArray$1(choices)) {
+					const alts = choices.filter(isString$1).map((c) => lit(c));
+					if (alts.length > 0) {
+						const node = alt(...alts);
+						node.meta = meta;
+						return { node };
+					}
+				}
+				return { node: str(meta) };
+			}
 			case "int seq": {
 				const node = repJoin(",", int());
 				node.meta = meta;