@optique/core 1.3.0-dev.2583 → 1.3.0-dev.2585

package/dist/valueparser.cjs

@@ -2817,7 +2817,7 @@ function origin(options = {}) {
 	const invalidOrigin = options.errors?.invalidOrigin;
 	const disallowedProtocol = options.errors?.disallowedProtocol;
 	function invalidOriginError(input) {
-		return invalidOrigin ? typeof invalidOrigin === "function" ? invalidOrigin(input) : invalidOrigin : require_message.message`Invalid origin: ${input}.`;
+		return invalidOrigin ? typeof invalidOrigin === "function" ? invalidOrigin(input) : invalidOrigin : require_message.message`Invalid origin.`;
 	}
 	function disallowedProtocolError(protocol) {
 		return disallowedProtocol ? typeof disallowedProtocol === "function" ? disallowedProtocol(protocol, originalProtocols) : disallowedProtocol : [
@@ -2853,18 +2853,18 @@ function origin(options = {}) {
 		} else if (!hostname$1.endsWith(".")) url$1.hostname = `${hostname$1}.`;
 		return url$1;
 	}
-	function resolve(url$1, label) {
+	function resolve(url$1) {
 		if (allowedProtocols != null && !allowedProtocols.includes(url$1.protocol)) return {
 			success: false,
 			error: disallowedProtocolError(url$1.protocol)
 		};
 		if (url$1.protocol === "blob:") return {
 			success: false,
-			error: require_message.message`The URL ${label} wraps another origin. Pass that origin instead.`
+			error: require_message.message`The ${url$1.protocol} URL wraps another origin. Pass that origin instead.`
 		};
 		if (url$1.origin === "null") return {
 			success: false,
-			error: require_message.message`The URL ${label} has no origin.`
+			error: require_message.message`The ${url$1.protocol} URL has no origin.`
 		};
 		if (url$1.username !== "" || url$1.password !== "") return {
 			success: false,
@@ -2872,7 +2872,7 @@ function origin(options = {}) {
 		};
 		if (extraComponents === "reject" && (url$1.pathname !== "/" || url$1.search !== "" || url$1.hash !== "")) return {
 			success: false,
-			error: require_message.message`Expected only an origin, but got: ${label}`
+			error: require_message.message`Expected only an origin, but got extra components on ${url$1.origin}.`
 		};
 		return {
 			success: true,
@@ -2890,21 +2890,21 @@ function origin(options = {}) {
 				success: false,
 				error: invalidOriginError(input)
 			};
-			return resolve(new URL(input), input);
+			return resolve(new URL(input));
 		},
 		validate(value) {
 			if (!(value instanceof URL)) return {
 				success: false,
 				error: invalidOriginError(String(value))
 			};
-			return resolve(value, value.href);
+			return resolve(value);
 		},
 		format(value) {
 			return value.origin;
 		},
 		normalize(value) {
 			if (!(value instanceof URL)) return value;
-			const result = resolve(value, value.href);
+			const result = resolve(value);
 			return result.success ? result.value : value;
 		},
 		*suggest(prefix) {

package/dist/valueparser.js

@@ -2817,7 +2817,7 @@ function origin(options = {}) {
 	const invalidOrigin = options.errors?.invalidOrigin;
 	const disallowedProtocol = options.errors?.disallowedProtocol;
 	function invalidOriginError(input) {
-		return invalidOrigin ? typeof invalidOrigin === "function" ? invalidOrigin(input) : invalidOrigin : message`Invalid origin: ${input}.`;
+		return invalidOrigin ? typeof invalidOrigin === "function" ? invalidOrigin(input) : invalidOrigin : message`Invalid origin.`;
 	}
 	function disallowedProtocolError(protocol) {
 		return disallowedProtocol ? typeof disallowedProtocol === "function" ? disallowedProtocol(protocol, originalProtocols) : disallowedProtocol : [
@@ -2853,18 +2853,18 @@ function origin(options = {}) {
 		} else if (!hostname$1.endsWith(".")) url$1.hostname = `${hostname$1}.`;
 		return url$1;
 	}
-	function resolve(url$1, label) {
+	function resolve(url$1) {
 		if (allowedProtocols != null && !allowedProtocols.includes(url$1.protocol)) return {
 			success: false,
 			error: disallowedProtocolError(url$1.protocol)
 		};
 		if (url$1.protocol === "blob:") return {
 			success: false,
-			error: message`The URL ${label} wraps another origin. Pass that origin instead.`
+			error: message`The ${url$1.protocol} URL wraps another origin. Pass that origin instead.`
 		};
 		if (url$1.origin === "null") return {
 			success: false,
-			error: message`The URL ${label} has no origin.`
+			error: message`The ${url$1.protocol} URL has no origin.`
 		};
 		if (url$1.username !== "" || url$1.password !== "") return {
 			success: false,
@@ -2872,7 +2872,7 @@ function origin(options = {}) {
 		};
 		if (extraComponents === "reject" && (url$1.pathname !== "/" || url$1.search !== "" || url$1.hash !== "")) return {
 			success: false,
-			error: message`Expected only an origin, but got: ${label}`
+			error: message`Expected only an origin, but got extra components on ${url$1.origin}.`
 		};
 		return {
 			success: true,
@@ -2890,21 +2890,21 @@ function origin(options = {}) {
 				success: false,
 				error: invalidOriginError(input)
 			};
-			return resolve(new URL(input), input);
+			return resolve(new URL(input));
 		},
 		validate(value) {
 			if (!(value instanceof URL)) return {
 				success: false,
 				error: invalidOriginError(String(value))
 			};
-			return resolve(value, value.href);
+			return resolve(value);
 		},
 		format(value) {
 			return value.origin;
 		},
 		normalize(value) {
 			if (!(value instanceof URL)) return value;
-			const result = resolve(value, value.href);
+			const result = resolve(value);
 			return result.success ? result.value : value;
 		},
 		*suggest(prefix) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.3.0-dev.2583",
+  "version": "1.3.0-dev.2585",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",
@@ -237,7 +237,7 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@optique/env": "1.3.0-dev.2583+d30dbb53",
+    "@optique/env": "1.3.0-dev.2585+77a42c40",
     "@types/node": "^24.0.0",
     "fast-check": "^4.7.0",
     "tsdown": "^0.13.0",