@optique/core 1.0.0-dev.1484 → 1.0.0-dev.1492

package/dist/valueparser.cjs

@@ -1726,73 +1726,182 @@ function socketAddress(options) {
 		metavar,
 		parse(input) {
 			const trimmed = input.trim();
-			const separatorIndex = trimmed.lastIndexOf(separator);
-			let hostPart;
-			let portPart;
-			if (separatorIndex === -1) {
-				hostPart = trimmed;
-				portPart = void 0;
-			} else {
-				hostPart = trimmed.substring(0, separatorIndex);
-				portPart = trimmed.substring(separatorIndex + separator.length);
-			}
-			const hostResult = parseHost(hostPart);
-			if (!hostResult.success) {
-				const errorMsg = options?.errors?.invalidFormat;
-				if (errorMsg) {
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg;
+			const canOmitPort = defaultPort !== void 0 && !requirePort;
+			let firstHostError;
+			let validHostNumericPortInvalid = false;
+			let trailingSepHost;
+			let trailingSepHostError;
+			let anySeparatorFound = false;
+			let searchFrom = trimmed.length;
+			while (searchFrom > 0) {
+				const separatorIndex = trimmed.lastIndexOf(separator, searchFrom - 1);
+				if (separatorIndex === -1) break;
+				anySeparatorFound = true;
+				const hostPart = trimmed.substring(0, separatorIndex);
+				const portPart = trimmed.substring(separatorIndex + separator.length);
+				if (portPart === "") {
+					if (trailingSepHost === void 0 && trailingSepHostError === void 0) {
+						const hostResult = parseHost(hostPart);
+						if (hostResult.success) trailingSepHost = hostResult.value;
+						else trailingSepHostError = {
+							hostPart,
+							error: hostResult.error
+						};
+					}
+				} else {
+					const portResult = portParser.parse(portPart);
+					if (portResult.success) {
+						const hostResult = parseHost(hostPart);
+						if (hostResult.success) return {
+							success: true,
+							value: {
+								host: hostResult.value,
+								port: portResult.value
+							}
+						};
+						if (firstHostError === void 0 || (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) && !looksLikeIpv4(firstHostError.hostPart) && !looksLikeAltIpv4Literal(firstHostError.hostPart)) firstHostError = {
+							hostPart,
+							error: hostResult.error
+						};
+					} else if (!validHostNumericPortInvalid && hostPart !== "" && /^[0-9]+$/.test(portPart)) if (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) {
+						const hostResult = parseHost(hostPart);
+						if (!hostResult.success) {
+							if (firstHostError === void 0 || !looksLikeIpv4(firstHostError.hostPart) && !looksLikeAltIpv4Literal(firstHostError.hostPart)) firstHostError = {
+								hostPart,
+								error: hostResult.error
+							};
+						} else validHostNumericPortInvalid = true;
+					} else validHostNumericPortInvalid = true;
+					else if ((firstHostError === void 0 || !looksLikeIpv4(firstHostError.hostPart) && !looksLikeAltIpv4Literal(firstHostError.hostPart)) && (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart))) {
+						const hostResult = parseHost(hostPart);
+						if (!hostResult.success) firstHostError = {
+							hostPart,
+							error: hostResult.error
+						};
+					}
+				}
+				searchFrom = separatorIndex;
+			}
+			if (validHostNumericPortInvalid) {
+				const errorMsg$1 = options?.errors?.invalidFormat;
+				if (errorMsg$1) {
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-				if (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) return {
+				return {
 					success: false,
-					error: hostResult.error
+					error: require_message.message`Expected a socket address in format host${separator}port, but got ${input}.`
+				};
+			}
+			if (firstHostError !== void 0) {
+				if (looksLikeIpv4(firstHostError.hostPart) || looksLikeAltIpv4Literal(firstHostError.hostPart)) {
+					const errorMsg$1 = options?.errors?.invalidFormat;
+					if (errorMsg$1) {
+						const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
+						return {
+							success: false,
+							error: msg
+						};
+					}
+					return {
+						success: false,
+						error: firstHostError.error
+					};
+				}
+			}
+			let hostOnlyResult;
+			if (!requirePort || trailingSepHost !== void 0 || trailingSepHostError !== void 0) {
+				hostOnlyResult = parseHost(trimmed);
+				if (canOmitPort && hostOnlyResult.success) return {
+					success: true,
+					value: {
+						host: hostOnlyResult.value,
+						port: defaultPort
+					}
+				};
+			}
+			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+				if (canOmitPort) return {
+					success: true,
+					value: {
+						host: trailingSepHost,
+						port: defaultPort
+					}
 				};
+				const errorMsg$1 = options?.errors?.missingPort;
+				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? require_message.message`Port number is required but was not specified.`;
 				return {
 					success: false,
-					error: require_message.message`Expected a socket address in format host${separator}port, but got ${input}.`
+					error: msg
 				};
 			}
-			const validatedHost = hostResult.value;
-			let validatedPort;
-			if (portPart === void 0 || portPart === "") {
-				if (requirePort) {
-					const errorMsg = options?.errors?.missingPort;
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg ?? require_message.message`Port number is required but was not specified.`;
+			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+				const errorMsg$1 = options?.errors?.invalidFormat;
+				if (errorMsg$1) {
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-				if (defaultPort !== void 0) validatedPort = defaultPort;
-				else {
-					const errorMsg = options?.errors?.missingPort;
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg ?? require_message.message`Port number is required but was not specified.`;
+				if (looksLikeIpv4(trailingSepHostError.hostPart) || looksLikeAltIpv4Literal(trailingSepHostError.hostPart)) return {
+					success: false,
+					error: trailingSepHostError.error
+				};
+				return {
+					success: false,
+					error: require_message.message`Expected a socket address in format host${separator}port, but got ${input}.`
+				};
+			}
+			if (!canOmitPort && !requirePort && hostOnlyResult !== void 0 && hostOnlyResult.success) {
+				const errorMsg$1 = options?.errors?.missingPort;
+				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? require_message.message`Port number is required but was not specified.`;
+				return {
+					success: false,
+					error: msg
+				};
+			}
+			if (!canOmitPort && !anySeparatorFound) {
+				hostOnlyResult = hostOnlyResult ?? parseHost(trimmed);
+				if (hostOnlyResult.success) {
+					const errorMsg$1 = options?.errors?.missingPort;
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? require_message.message`Port number is required but was not specified.`;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-			} else {
-				const portResult = portParser.parse(portPart);
-				if (!portResult.success) {
-					const errorMsg = options?.errors?.invalidFormat;
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg ?? require_message.message`Expected a socket address in format host${separator}port, but got ${input}.`;
+			}
+			if (firstHostError !== void 0) {
+				const errorMsg$1 = options?.errors?.invalidFormat;
+				if (errorMsg$1) {
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-				validatedPort = portResult.value;
+			}
+			const errorMsg = options?.errors?.invalidFormat;
+			if (errorMsg) {
+				const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg;
+				return {
+					success: false,
+					error: msg
+				};
+			}
+			if (hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+				if (looksLikeIpv4(trimmed) || looksLikeAltIpv4Literal(trimmed)) return {
+					success: false,
+					error: hostOnlyResult.error
+				};
 			}
 			return {
-				success: true,
-				value: {
-					host: validatedHost,
-					port: validatedPort
-				}
+				success: false,
+				error: require_message.message`Expected a socket address in format host${separator}port, but got ${input}.`
 			};
 		},
 		format(value) {

package/dist/valueparser.js

@@ -1726,73 +1726,182 @@ function socketAddress(options) {
 		metavar,
 		parse(input) {
 			const trimmed = input.trim();
-			const separatorIndex = trimmed.lastIndexOf(separator);
-			let hostPart;
-			let portPart;
-			if (separatorIndex === -1) {
-				hostPart = trimmed;
-				portPart = void 0;
-			} else {
-				hostPart = trimmed.substring(0, separatorIndex);
-				portPart = trimmed.substring(separatorIndex + separator.length);
-			}
-			const hostResult = parseHost(hostPart);
-			if (!hostResult.success) {
-				const errorMsg = options?.errors?.invalidFormat;
-				if (errorMsg) {
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg;
+			const canOmitPort = defaultPort !== void 0 && !requirePort;
+			let firstHostError;
+			let validHostNumericPortInvalid = false;
+			let trailingSepHost;
+			let trailingSepHostError;
+			let anySeparatorFound = false;
+			let searchFrom = trimmed.length;
+			while (searchFrom > 0) {
+				const separatorIndex = trimmed.lastIndexOf(separator, searchFrom - 1);
+				if (separatorIndex === -1) break;
+				anySeparatorFound = true;
+				const hostPart = trimmed.substring(0, separatorIndex);
+				const portPart = trimmed.substring(separatorIndex + separator.length);
+				if (portPart === "") {
+					if (trailingSepHost === void 0 && trailingSepHostError === void 0) {
+						const hostResult = parseHost(hostPart);
+						if (hostResult.success) trailingSepHost = hostResult.value;
+						else trailingSepHostError = {
+							hostPart,
+							error: hostResult.error
+						};
+					}
+				} else {
+					const portResult = portParser.parse(portPart);
+					if (portResult.success) {
+						const hostResult = parseHost(hostPart);
+						if (hostResult.success) return {
+							success: true,
+							value: {
+								host: hostResult.value,
+								port: portResult.value
+							}
+						};
+						if (firstHostError === void 0 || (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) && !looksLikeIpv4(firstHostError.hostPart) && !looksLikeAltIpv4Literal(firstHostError.hostPart)) firstHostError = {
+							hostPart,
+							error: hostResult.error
+						};
+					} else if (!validHostNumericPortInvalid && hostPart !== "" && /^[0-9]+$/.test(portPart)) if (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) {
+						const hostResult = parseHost(hostPart);
+						if (!hostResult.success) {
+							if (firstHostError === void 0 || !looksLikeIpv4(firstHostError.hostPart) && !looksLikeAltIpv4Literal(firstHostError.hostPart)) firstHostError = {
+								hostPart,
+								error: hostResult.error
+							};
+						} else validHostNumericPortInvalid = true;
+					} else validHostNumericPortInvalid = true;
+					else if ((firstHostError === void 0 || !looksLikeIpv4(firstHostError.hostPart) && !looksLikeAltIpv4Literal(firstHostError.hostPart)) && (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart))) {
+						const hostResult = parseHost(hostPart);
+						if (!hostResult.success) firstHostError = {
+							hostPart,
+							error: hostResult.error
+						};
+					}
+				}
+				searchFrom = separatorIndex;
+			}
+			if (validHostNumericPortInvalid) {
+				const errorMsg$1 = options?.errors?.invalidFormat;
+				if (errorMsg$1) {
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-				if (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) return {
+				return {
 					success: false,
-					error: hostResult.error
+					error: message`Expected a socket address in format host${separator}port, but got ${input}.`
+				};
+			}
+			if (firstHostError !== void 0) {
+				if (looksLikeIpv4(firstHostError.hostPart) || looksLikeAltIpv4Literal(firstHostError.hostPart)) {
+					const errorMsg$1 = options?.errors?.invalidFormat;
+					if (errorMsg$1) {
+						const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
+						return {
+							success: false,
+							error: msg
+						};
+					}
+					return {
+						success: false,
+						error: firstHostError.error
+					};
+				}
+			}
+			let hostOnlyResult;
+			if (!requirePort || trailingSepHost !== void 0 || trailingSepHostError !== void 0) {
+				hostOnlyResult = parseHost(trimmed);
+				if (canOmitPort && hostOnlyResult.success) return {
+					success: true,
+					value: {
+						host: hostOnlyResult.value,
+						port: defaultPort
+					}
+				};
+			}
+			if (trailingSepHost !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+				if (canOmitPort) return {
+					success: true,
+					value: {
+						host: trailingSepHost,
+						port: defaultPort
+					}
 				};
+				const errorMsg$1 = options?.errors?.missingPort;
+				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? message`Port number is required but was not specified.`;
 				return {
 					success: false,
-					error: message`Expected a socket address in format host${separator}port, but got ${input}.`
+					error: msg
 				};
 			}
-			const validatedHost = hostResult.value;
-			let validatedPort;
-			if (portPart === void 0 || portPart === "") {
-				if (requirePort) {
-					const errorMsg = options?.errors?.missingPort;
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg ?? message`Port number is required but was not specified.`;
+			if (trailingSepHostError !== void 0 && hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+				const errorMsg$1 = options?.errors?.invalidFormat;
+				if (errorMsg$1) {
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-				if (defaultPort !== void 0) validatedPort = defaultPort;
-				else {
-					const errorMsg = options?.errors?.missingPort;
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg ?? message`Port number is required but was not specified.`;
+				if (looksLikeIpv4(trailingSepHostError.hostPart) || looksLikeAltIpv4Literal(trailingSepHostError.hostPart)) return {
+					success: false,
+					error: trailingSepHostError.error
+				};
+				return {
+					success: false,
+					error: message`Expected a socket address in format host${separator}port, but got ${input}.`
+				};
+			}
+			if (!canOmitPort && !requirePort && hostOnlyResult !== void 0 && hostOnlyResult.success) {
+				const errorMsg$1 = options?.errors?.missingPort;
+				const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? message`Port number is required but was not specified.`;
+				return {
+					success: false,
+					error: msg
+				};
+			}
+			if (!canOmitPort && !anySeparatorFound) {
+				hostOnlyResult = hostOnlyResult ?? parseHost(trimmed);
+				if (hostOnlyResult.success) {
+					const errorMsg$1 = options?.errors?.missingPort;
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1 ?? message`Port number is required but was not specified.`;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-			} else {
-				const portResult = portParser.parse(portPart);
-				if (!portResult.success) {
-					const errorMsg = options?.errors?.invalidFormat;
-					const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg ?? message`Expected a socket address in format host${separator}port, but got ${input}.`;
+			}
+			if (firstHostError !== void 0) {
+				const errorMsg$1 = options?.errors?.invalidFormat;
+				if (errorMsg$1) {
+					const msg = typeof errorMsg$1 === "function" ? errorMsg$1(input) : errorMsg$1;
 					return {
 						success: false,
 						error: msg
 					};
 				}
-				validatedPort = portResult.value;
+			}
+			const errorMsg = options?.errors?.invalidFormat;
+			if (errorMsg) {
+				const msg = typeof errorMsg === "function" ? errorMsg(input) : errorMsg;
+				return {
+					success: false,
+					error: msg
+				};
+			}
+			if (hostOnlyResult !== void 0 && !hostOnlyResult.success) {
+				if (looksLikeIpv4(trimmed) || looksLikeAltIpv4Literal(trimmed)) return {
+					success: false,
+					error: hostOnlyResult.error
+				};
 			}
 			return {
-				success: true,
-				value: {
-					host: validatedHost,
-					port: validatedPort
-				}
+				success: false,
+				error: message`Expected a socket address in format host${separator}port, but got ${input}.`
 			};
 		},
 		format(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1484+220c0bfd",
+  "version": "1.0.0-dev.1492+3035da3f",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",