@optique/core 1.0.0-dev.1448 → 1.0.0-dev.1452

package/dist/message.cjs

@@ -106,7 +106,7 @@ function optionName(name) {
 function optionNames(names) {
 	return {
 		type: "optionNames",
-		optionNames: names
+		optionNames: [...names]
 	};
 }
 /**
@@ -147,7 +147,7 @@ function value(value$1) {
 function values(values$1) {
 	return {
 		type: "values",
-		values: values$1
+		values: [...values$1]
 	};
 }
 /**
@@ -203,7 +203,7 @@ function url(url$1) {
 	if (typeof url$1 === "string") {
 		if (!URL.canParse(url$1)) throw new RangeError(`Invalid URL: ${url$1}.`);
 		urlObj = new URL(url$1);
-	} else urlObj = url$1;
+	} else urlObj = new URL(url$1.href);
 	return {
 		type: "url",
 		url: urlObj

package/dist/message.js

@@ -105,7 +105,7 @@ function optionName(name) {
 function optionNames(names) {
 	return {
 		type: "optionNames",
-		optionNames: names
+		optionNames: [...names]
 	};
 }
 /**
@@ -146,7 +146,7 @@ function value(value$1) {
 function values(values$1) {
 	return {
 		type: "values",
-		values: values$1
+		values: [...values$1]
 	};
 }
 /**
@@ -202,7 +202,7 @@ function url(url$1) {
 	if (typeof url$1 === "string") {
 		if (!URL.canParse(url$1)) throw new RangeError(`Invalid URL: ${url$1}.`);
 		urlObj = new URL(url$1);
-	} else urlObj = url$1;
+	} else urlObj = new URL(url$1.href);
 	return {
 		type: "url",
 		url: urlObj

package/dist/valueparser.cjs

@@ -1675,8 +1675,37 @@ function socketAddress(options) {
 	function looksLikeIpv4(input) {
 		return /^\d+\.\d+\.\d+\.\d+$/.test(input);
 	}
+	function looksLikeAltIpv4Literal(input) {
+		if (/^0[xX][0-9a-fA-F]+$/.test(input)) {
+			const n = parseInt(input.slice(2), 16);
+			return n <= 4294967295;
+		}
+		if (/^0[0-7]+$/.test(input)) {
+			const n = parseInt(input.slice(1), 8);
+			return n <= 4294967295;
+		}
+		const parts = input.split(".");
+		if (parts.length >= 2 && parts.length <= 4) {
+			const numericOrHex = /^(?:[0-9]+|0[xX][0-9a-fA-F]+)$/;
+			if (parts.every((p) => numericOrHex.test(p)) && parts.some((p) => /^0[xX]/i.test(p) || p.length > 1 && p[0] === "0")) {
+				const values = [];
+				for (const p of parts) if (/^0[xX]/i.test(p)) values.push(parseInt(p.slice(2), 16));
+				else if (p.length > 1 && p[0] === "0") {
+					if (/[89]/.test(p)) return false;
+					values.push(parseInt(p, 8));
+				} else values.push(Number(p));
+				const lastMax = 256 ** (5 - parts.length);
+				return values.slice(0, -1).every((v) => v <= 255) && values[values.length - 1] < lastMax;
+			}
+		}
+		return false;
+	}
 	function parseHost(hostInput) {
 		if (hostType === "hostname") {
+			if (looksLikeAltIpv4Literal(hostInput)) return {
+				success: false,
+				error: require_message.message`${hostInput} appears to be a non-standard IPv4 address notation.`
+			};
 			if (looksLikeIpv4(hostInput)) return {
 				success: false,
 				error: require_message.message`Expected a valid hostname, but got ${hostInput}.`
@@ -1684,6 +1713,10 @@ function socketAddress(options) {
 			return hostnameParser.parse(hostInput);
 		} else if (hostType === "ip") return ipParser.parse(hostInput);
 		else {
+			if (looksLikeAltIpv4Literal(hostInput)) return {
+				success: false,
+				error: require_message.message`${hostInput} appears to be a non-standard IPv4 address notation.`
+			};
 			if (looksLikeIpv4(hostInput)) return ipParser.parse(hostInput);
 			return hostnameParser.parse(hostInput);
 		}
@@ -1713,7 +1746,7 @@ function socketAddress(options) {
 						error: msg
 					};
 				}
-				if (looksLikeIpv4(hostPart)) return {
+				if (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) return {
 					success: false,
 					error: hostResult.error
 				};

package/dist/valueparser.js

@@ -1675,8 +1675,37 @@ function socketAddress(options) {
 	function looksLikeIpv4(input) {
 		return /^\d+\.\d+\.\d+\.\d+$/.test(input);
 	}
+	function looksLikeAltIpv4Literal(input) {
+		if (/^0[xX][0-9a-fA-F]+$/.test(input)) {
+			const n = parseInt(input.slice(2), 16);
+			return n <= 4294967295;
+		}
+		if (/^0[0-7]+$/.test(input)) {
+			const n = parseInt(input.slice(1), 8);
+			return n <= 4294967295;
+		}
+		const parts = input.split(".");
+		if (parts.length >= 2 && parts.length <= 4) {
+			const numericOrHex = /^(?:[0-9]+|0[xX][0-9a-fA-F]+)$/;
+			if (parts.every((p) => numericOrHex.test(p)) && parts.some((p) => /^0[xX]/i.test(p) || p.length > 1 && p[0] === "0")) {
+				const values = [];
+				for (const p of parts) if (/^0[xX]/i.test(p)) values.push(parseInt(p.slice(2), 16));
+				else if (p.length > 1 && p[0] === "0") {
+					if (/[89]/.test(p)) return false;
+					values.push(parseInt(p, 8));
+				} else values.push(Number(p));
+				const lastMax = 256 ** (5 - parts.length);
+				return values.slice(0, -1).every((v) => v <= 255) && values[values.length - 1] < lastMax;
+			}
+		}
+		return false;
+	}
 	function parseHost(hostInput) {
 		if (hostType === "hostname") {
+			if (looksLikeAltIpv4Literal(hostInput)) return {
+				success: false,
+				error: message`${hostInput} appears to be a non-standard IPv4 address notation.`
+			};
 			if (looksLikeIpv4(hostInput)) return {
 				success: false,
 				error: message`Expected a valid hostname, but got ${hostInput}.`
@@ -1684,6 +1713,10 @@ function socketAddress(options) {
 			return hostnameParser.parse(hostInput);
 		} else if (hostType === "ip") return ipParser.parse(hostInput);
 		else {
+			if (looksLikeAltIpv4Literal(hostInput)) return {
+				success: false,
+				error: message`${hostInput} appears to be a non-standard IPv4 address notation.`
+			};
 			if (looksLikeIpv4(hostInput)) return ipParser.parse(hostInput);
 			return hostnameParser.parse(hostInput);
 		}
@@ -1713,7 +1746,7 @@ function socketAddress(options) {
 						error: msg
 					};
 				}
-				if (looksLikeIpv4(hostPart)) return {
+				if (looksLikeIpv4(hostPart) || looksLikeAltIpv4Literal(hostPart)) return {
 					success: false,
 					error: hostResult.error
 				};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.0.0-dev.1448+eeae0552",
+  "version": "1.0.0-dev.1452+b060cbd3",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",