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

package/dist/internal/mode-dispatch.cjs

@@ -62,11 +62,13 @@ function mapMaybePromiseByMode(mode, value, mapFn) {
 * @internal
 */
 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 (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 (Symbol.asyncIterator in value) return value;
+		if (isAsyncIterable) return value;
 		return async function* () {
 			yield* value;
 		}();

package/dist/internal/mode-dispatch.js

@@ -61,11 +61,13 @@ function mapMaybePromiseByMode(mode, value, mapFn) {
 * @internal
 */
 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 (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 (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}.
@@ -217,9 +223,9 @@ function choice(choices, options = {}) {
 	};
 }
 function biject(mapping) {
-	if (Array.isArray(mapping)) throw new TypeError("Expected biject mapping to be a non-array object.");
-	const keys = [];
-	for (const key in mapping) if (Object.prototype.hasOwnProperty.call(mapping, key)) keys.push(key);
+	if (mapping === null || typeof mapping !== "object") throw new TypeError("Expected object.");
+	if (Array.isArray(mapping)) throw new TypeError("Expected object, got array.");
+	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();
@@ -305,7 +311,7 @@ function transform(parser, mapping) {
 		placeholder: void 0,
 		...transformedChoices == null ? {} : { choices: transformedChoices },
 		parse(input) {
-			return require_mode_dispatch.mapModeValue(parser.mode, parser.parse(input), (result) => transformValueParserResult(result, mapping));
+			return require_mode_dispatch.mapMaybePromiseByMode(parser.mode, parser.parse(input), (result) => transformValueParserResult(result, mapping));
 		},
 		format(value) {
 			return parser.format(mapping.unmap(value));
@@ -314,11 +320,12 @@ 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", {
 		get() {
+			if (parser.placeholder === void 0) return void 0;
 			try {
 				return mapping.map(parser.placeholder);
 			} catch {
@@ -326,17 +333,27 @@ function transform(parser, mapping) {
 			}
 		},
 		configurable: true,
-		enumerable: false
+		enumerable: true
 	});
 	if (typeof parser.validate === "function") {
 		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
@@ -345,11 +362,21 @@ function transform(parser, mapping) {
 		const syncParser = parser;
 		Object.defineProperty(transformed, "validate", {
 			value(value) {
-				const result = syncParser.parse(syncParser.format(mapping.unmap(value)));
-				return result.success ? {
-					success: true,
-					value: mapping.map(result.value)
-				} : result;
+				let result;
+				try {
+					result = syncParser.parse(syncParser.format(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

package/dist/valueparser.d.cts

@@ -420,8 +420,8 @@ declare function choice<const T extends number>(choices: readonly T[], options?:
  * @param mapping A mapping whose own enumerable string keys are valid inputs.
  * @returns A value parser that accepts one of the mapping keys and returns the
  *          corresponding value.
- * @throws {TypeError} If `mapping` is an array, or if any key is the empty
- *         string.
+ * @throws {TypeError} If `mapping` is not an object, if it is an array, or if
+ *         any key is the empty string.
  * @throws {RangeError} If the mapping has no own enumerable string keys, or if
  *         two keys map to the same value according to `Map` key equality.
  * @since 1.2.0

package/dist/valueparser.d.ts

@@ -420,8 +420,8 @@ declare function choice<const T extends number>(choices: readonly T[], options?:
  * @param mapping A mapping whose own enumerable string keys are valid inputs.
  * @returns A value parser that accepts one of the mapping keys and returns the
  *          corresponding value.
- * @throws {TypeError} If `mapping` is an array, or if any key is the empty
- *         string.
+ * @throws {TypeError} If `mapping` is not an object, if it is an array, or if
+ *         any key is the empty string.
  * @throws {RangeError} If the mapping has no own enumerable string keys, or if
  *         two keys map to the same value according to `Map` key equality.
  * @since 1.2.0

package/dist/valueparser.js

@@ -1,10 +1,16 @@
 import { cloneMessage, lineBreak, message, metavar, text, valueSet } from "./message.js";
-import { mapMaybePromiseByMode, mapModeValue, wrapIterableForMode } from "./internal/mode-dispatch.js";
+import { mapMaybePromiseByMode, wrapIterableForMode } from "./internal/mode-dispatch.js";
 import { defaultValues, dependencyId, dependencyIds, derivedValueParserMarker, getSnapshottedDefaultDependencyValues, isDerivedValueParser, parseWithDependency, singleDefaultValue, snapshotDefaultDependencyValues, suggestWithDependency } from "./internal/dependency.js";
 import { appendValueHint, appendValueSuggestions, deduplicateSuggestions } from "./suggestion.js";
 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}.
@@ -217,9 +223,9 @@ function choice(choices, options = {}) {
 	};
 }
 function biject(mapping) {
-	if (Array.isArray(mapping)) throw new TypeError("Expected biject mapping to be a non-array object.");
-	const keys = [];
-	for (const key in mapping) if (Object.prototype.hasOwnProperty.call(mapping, key)) keys.push(key);
+	if (mapping === null || typeof mapping !== "object") throw new TypeError("Expected object.");
+	if (Array.isArray(mapping)) throw new TypeError("Expected object, got array.");
+	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();
@@ -305,7 +311,7 @@ function transform(parser, mapping) {
 		placeholder: void 0,
 		...transformedChoices == null ? {} : { choices: transformedChoices },
 		parse(input) {
-			return mapModeValue(parser.mode, parser.parse(input), (result) => transformValueParserResult(result, mapping));
+			return mapMaybePromiseByMode(parser.mode, parser.parse(input), (result) => transformValueParserResult(result, mapping));
 		},
 		format(value) {
 			return parser.format(mapping.unmap(value));
@@ -314,11 +320,12 @@ 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", {
 		get() {
+			if (parser.placeholder === void 0) return void 0;
 			try {
 				return mapping.map(parser.placeholder);
 			} catch {
@@ -326,17 +333,27 @@ function transform(parser, mapping) {
 			}
 		},
 		configurable: true,
-		enumerable: false
+		enumerable: true
 	});
 	if (typeof parser.validate === "function") {
 		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
@@ -345,11 +362,21 @@ function transform(parser, mapping) {
 		const syncParser = parser;
 		Object.defineProperty(transformed, "validate", {
 			value(value) {
-				const result = syncParser.parse(syncParser.format(mapping.unmap(value)));
-				return result.success ? {
-					success: true,
-					value: mapping.map(result.value)
-				} : result;
+				let result;
+				try {
+					result = syncParser.parse(syncParser.format(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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.2.0-dev.2302",
+  "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.2302+77665cb5"
+    "@optique/env": "1.2.0-dev.2310+1dd4b70d"
   },
   "scripts": {
     "build": "tsdown",