@optique/core 1.2.0-dev.2308 → 1.2.0-dev.2310

package/dist/internal/mode-dispatch.cjs

@@ -63,11 +63,12 @@ function mapMaybePromiseByMode(mode, value, mapFn) {
 */
 function wrapIterableForMode(mode, value) {
 	const canCheckAsyncIterator = value != null && (typeof value === "object" || typeof value === "function");
+	const isAsyncIterable = canCheckAsyncIterator && Symbol.asyncIterator in value;
 	return dispatchIterableByMode(mode, () => {
-		if (canCheckAsyncIterator && Symbol.asyncIterator in value) throw new TypeError("Synchronous mode cannot wrap AsyncIterable value.");
+		if (isAsyncIterable) throw new TypeError("Synchronous mode cannot wrap AsyncIterable value.");
 		return value;
 	}, () => {
-		if (canCheckAsyncIterator && Symbol.asyncIterator in value) return value;
+		if (isAsyncIterable) return value;
 		return async function* () {
 			yield* value;
 		}();

package/dist/internal/mode-dispatch.js

@@ -62,11 +62,12 @@ function mapMaybePromiseByMode(mode, value, mapFn) {
 */
 function wrapIterableForMode(mode, value) {
 	const canCheckAsyncIterator = value != null && (typeof value === "object" || typeof value === "function");
+	const isAsyncIterable = canCheckAsyncIterator && Symbol.asyncIterator in value;
 	return dispatchIterableByMode(mode, () => {
-		if (canCheckAsyncIterator && Symbol.asyncIterator in value) throw new TypeError("Synchronous mode cannot wrap AsyncIterable value.");
+		if (isAsyncIterable) throw new TypeError("Synchronous mode cannot wrap AsyncIterable value.");
 		return value;
 	}, () => {
-		if (canCheckAsyncIterator && Symbol.asyncIterator in value) return value;
+		if (isAsyncIterable) return value;
 		return async function* () {
 			yield* value;
 		}();

package/dist/valueparser.cjs

@@ -5,6 +5,12 @@ const require_suggestion = require('./suggestion.cjs');
 const require_nonempty = require('./nonempty.cjs');
 
 //#region src/valueparser.ts
+function transformMappingFailure() {
+	return {
+		success: false,
+		error: require_message.message`Failed to transform value.`
+	};
+}
 function transformValueParserResult(result, mapping) {
 	if (!result.success) return result;
 	const preserveSnapshot = (mapped) => {
@@ -18,16 +24,16 @@ function transformValueParserResult(result, mapping) {
 			deferred: true
 		});
 	} catch {
+		return preserveSnapshot(transformMappingFailure());
+	}
+	try {
 		return preserveSnapshot({
 			success: true,
-			value: void 0,
-			deferred: true
+			value: mapping.map(result.value)
 		});
+	} catch {
+		return preserveSnapshot(transformMappingFailure());
 	}
-	return preserveSnapshot({
-		success: true,
-		value: mapping.map(result.value)
-	});
 }
 /**
 * A predicate function that checks if an object is a {@link ValueParser}.
@@ -219,8 +225,7 @@ function choice(choices, options = {}) {
 function biject(mapping) {
 	if (mapping === null || typeof mapping !== "object") throw new TypeError("Expected object.");
 	if (Array.isArray(mapping)) throw new TypeError("Expected object, got array.");
-	const keys = [];
-	for (const key in mapping) if (Object.prototype.hasOwnProperty.call(mapping, key)) keys.push(key);
+	const keys = Object.keys(mapping);
 	if (keys.length < 1) throw new RangeError("Expected at least one biject entry.");
 	const source = choice(keys);
 	const forward = /* @__PURE__ */ new Map();
@@ -315,7 +320,7 @@ function transform(parser, mapping) {
 			return mapping.map(normalize(mapping.unmap(value)));
 		} },
 		...suggest == null ? {} : { suggest(prefix) {
-			return suggest(prefix);
+			return require_mode_dispatch.wrapIterableForMode(parser.mode, suggest(prefix));
 		} }
 	};
 	Object.defineProperty(transformed, "placeholder", {
@@ -334,11 +339,21 @@ function transform(parser, mapping) {
 		const validate = parser.validate.bind(parser);
 		Object.defineProperty(transformed, "validate", {
 			value(value) {
-				const result = validate(mapping.unmap(value));
-				return result.success ? {
-					success: true,
-					value: mapping.map(result.value)
-				} : result;
+				let result;
+				try {
+					result = validate(mapping.unmap(value));
+				} catch {
+					return transformMappingFailure();
+				}
+				if (!result.success) return result;
+				try {
+					return {
+						success: true,
+						value: mapping.map(result.value)
+					};
+				} catch {
+					return transformMappingFailure();
+				}
 			},
 			configurable: true,
 			enumerable: true
@@ -351,15 +366,17 @@ function transform(parser, mapping) {
 				try {
 					result = syncParser.parse(syncParser.format(mapping.unmap(value)));
 				} catch {
+					return transformMappingFailure();
+				}
+				if (!result.success) return result;
+				try {
 					return {
 						success: true,
-						value
+						value: mapping.map(result.value)
 					};
+				} catch {
+					return transformMappingFailure();
 				}
-				return result.success ? {
-					success: true,
-					value: mapping.map(result.value)
-				} : result;
 			},
 			configurable: true,
 			enumerable: true

package/dist/valueparser.js

@@ -5,6 +5,12 @@ import { appendValueHint, appendValueSuggestions, deduplicateSuggestions } from
 import { ensureNonEmptyString, isNonEmptyString } from "./nonempty.js";
 
 //#region src/valueparser.ts
+function transformMappingFailure() {
+	return {
+		success: false,
+		error: message`Failed to transform value.`
+	};
+}
 function transformValueParserResult(result, mapping) {
 	if (!result.success) return result;
 	const preserveSnapshot = (mapped) => {
@@ -18,16 +24,16 @@ function transformValueParserResult(result, mapping) {
 			deferred: true
 		});
 	} catch {
+		return preserveSnapshot(transformMappingFailure());
+	}
+	try {
 		return preserveSnapshot({
 			success: true,
-			value: void 0,
-			deferred: true
+			value: mapping.map(result.value)
 		});
+	} catch {
+		return preserveSnapshot(transformMappingFailure());
 	}
-	return preserveSnapshot({
-		success: true,
-		value: mapping.map(result.value)
-	});
 }
 /**
 * A predicate function that checks if an object is a {@link ValueParser}.
@@ -219,8 +225,7 @@ function choice(choices, options = {}) {
 function biject(mapping) {
 	if (mapping === null || typeof mapping !== "object") throw new TypeError("Expected object.");
 	if (Array.isArray(mapping)) throw new TypeError("Expected object, got array.");
-	const keys = [];
-	for (const key in mapping) if (Object.prototype.hasOwnProperty.call(mapping, key)) keys.push(key);
+	const keys = Object.keys(mapping);
 	if (keys.length < 1) throw new RangeError("Expected at least one biject entry.");
 	const source = choice(keys);
 	const forward = /* @__PURE__ */ new Map();
@@ -315,7 +320,7 @@ function transform(parser, mapping) {
 			return mapping.map(normalize(mapping.unmap(value)));
 		} },
 		...suggest == null ? {} : { suggest(prefix) {
-			return suggest(prefix);
+			return wrapIterableForMode(parser.mode, suggest(prefix));
 		} }
 	};
 	Object.defineProperty(transformed, "placeholder", {
@@ -334,11 +339,21 @@ function transform(parser, mapping) {
 		const validate = parser.validate.bind(parser);
 		Object.defineProperty(transformed, "validate", {
 			value(value) {
-				const result = validate(mapping.unmap(value));
-				return result.success ? {
-					success: true,
-					value: mapping.map(result.value)
-				} : result;
+				let result;
+				try {
+					result = validate(mapping.unmap(value));
+				} catch {
+					return transformMappingFailure();
+				}
+				if (!result.success) return result;
+				try {
+					return {
+						success: true,
+						value: mapping.map(result.value)
+					};
+				} catch {
+					return transformMappingFailure();
+				}
 			},
 			configurable: true,
 			enumerable: true
@@ -351,15 +366,17 @@ function transform(parser, mapping) {
 				try {
 					result = syncParser.parse(syncParser.format(mapping.unmap(value)));
 				} catch {
+					return transformMappingFailure();
+				}
+				if (!result.success) return result;
+				try {
 					return {
 						success: true,
-						value
+						value: mapping.map(result.value)
 					};
+				} catch {
+					return transformMappingFailure();
 				}
-				return result.success ? {
-					success: true,
-					value: mapping.map(result.value)
-				} : result;
 			},
 			configurable: true,
 			enumerable: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.2.0-dev.2308",
+  "version": "1.2.0-dev.2310",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -225,7 +225,7 @@
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",
     "typescript": "^5.8.3",
-    "@optique/env": "1.2.0-dev.2308+ddd68ea0"
+    "@optique/env": "1.2.0-dev.2310+1dd4b70d"
   },
   "scripts": {
     "build": "tsdown",