@optique/core 1.1.0-dev.2006 → 1.1.0-dev.2053

package/dist/valueparser.cjs

@@ -2151,34 +2151,18 @@ function macAddress(options) {
 		if (sep === "none") return formatted.join("");
 		return formatted.join(sep);
 	}
-	function normalizeMac(value) {
-		if (typeof value !== "string") return metavar;
-		let octets;
-		let detectedSep;
-		if (value.includes(":")) {
-			octets = value.split(":");
-			detectedSep = ":";
-		} else if (value.includes("-")) {
-			octets = value.split("-");
-			detectedSep = "-";
-		} else if (value.includes(".")) {
-			const groups = value.split(".");
-			if (groups.length !== 3 || !groups.every((g) => /^[0-9a-fA-F]{4}$/.test(g))) return value;
-			octets = groups.flatMap((g) => [g.slice(0, 2), g.slice(2)]);
-			detectedSep = ".";
-		} else {
-			if (value.length !== 12) return value;
-			octets = [];
-			for (let i = 0; i < value.length; i += 2) octets.push(value.slice(i, i + 2));
-			detectedSep = "none";
+	let macParsing = false;
+	function normalizeMacValue(value, fallback) {
+		if (macParsing) return value;
+		macParsing = true;
+		try {
+			const result = parserObj.parse(value);
+			return result.success ? result.value : fallback;
+		} catch {
+			return fallback;
+		} finally {
+			macParsing = false;
 		}
-		if (octets.length !== 6 || !octets.every((o) => /^[0-9a-fA-F]{1,2}$/.test(o))) return value;
-		octets = octets.map((o) => o.padStart(2, "0"));
-		let sep;
-		if (outputSeparator != null) sep = outputSeparator;
-		else if (separator !== "any") sep = separator;
-		else sep = detectedSep;
-		return joinOctets(octets, sep);
 	}
 	const parserObj = {
 		mode: "sync",
@@ -2263,44 +2247,15 @@ function macAddress(options) {
 				value: joinOctets(octets, finalSeparator)
 			};
 		},
-		format: normalizeMac
-	};
-	const macParser = parserObj;
-	let macParsing = false;
-	Object.defineProperty(parserObj, "format", {
-		value(v) {
-			if (typeof v !== "string") return metavar;
-			if (macParsing) return v;
-			macParsing = true;
-			try {
-				const result = macParser.parse(v);
-				return result.success ? result.value : v;
-			} catch {
-				return v;
-			} finally {
-				macParsing = false;
-			}
-		},
-		configurable: true,
-		enumerable: true
-	});
-	Object.defineProperty(parserObj, "normalize", {
-		value(v) {
-			if (typeof v !== "string") return v;
-			if (macParsing) return v;
-			macParsing = true;
-			try {
-				const result = macParser.parse(v);
-				return result.success ? result.value : v;
-			} catch {
-				return v;
-			} finally {
-				macParsing = false;
-			}
+		format(value) {
+			if (typeof value !== "string") return metavar;
+			return normalizeMacValue(value, value);
 		},
-		configurable: true,
-		enumerable: true
-	});
+		normalize(value) {
+			if (typeof value !== "string") return value;
+			return normalizeMacValue(value, value);
+		}
+	};
 	return parserObj;
 }
 /**

package/dist/valueparser.js

@@ -2151,34 +2151,18 @@ function macAddress(options) {
 		if (sep === "none") return formatted.join("");
 		return formatted.join(sep);
 	}
-	function normalizeMac(value) {
-		if (typeof value !== "string") return metavar;
-		let octets;
-		let detectedSep;
-		if (value.includes(":")) {
-			octets = value.split(":");
-			detectedSep = ":";
-		} else if (value.includes("-")) {
-			octets = value.split("-");
-			detectedSep = "-";
-		} else if (value.includes(".")) {
-			const groups = value.split(".");
-			if (groups.length !== 3 || !groups.every((g) => /^[0-9a-fA-F]{4}$/.test(g))) return value;
-			octets = groups.flatMap((g) => [g.slice(0, 2), g.slice(2)]);
-			detectedSep = ".";
-		} else {
-			if (value.length !== 12) return value;
-			octets = [];
-			for (let i = 0; i < value.length; i += 2) octets.push(value.slice(i, i + 2));
-			detectedSep = "none";
+	let macParsing = false;
+	function normalizeMacValue(value, fallback) {
+		if (macParsing) return value;
+		macParsing = true;
+		try {
+			const result = parserObj.parse(value);
+			return result.success ? result.value : fallback;
+		} catch {
+			return fallback;
+		} finally {
+			macParsing = false;
 		}
-		if (octets.length !== 6 || !octets.every((o) => /^[0-9a-fA-F]{1,2}$/.test(o))) return value;
-		octets = octets.map((o) => o.padStart(2, "0"));
-		let sep;
-		if (outputSeparator != null) sep = outputSeparator;
-		else if (separator !== "any") sep = separator;
-		else sep = detectedSep;
-		return joinOctets(octets, sep);
 	}
 	const parserObj = {
 		mode: "sync",
@@ -2263,44 +2247,15 @@ function macAddress(options) {
 				value: joinOctets(octets, finalSeparator)
 			};
 		},
-		format: normalizeMac
-	};
-	const macParser = parserObj;
-	let macParsing = false;
-	Object.defineProperty(parserObj, "format", {
-		value(v) {
-			if (typeof v !== "string") return metavar;
-			if (macParsing) return v;
-			macParsing = true;
-			try {
-				const result = macParser.parse(v);
-				return result.success ? result.value : v;
-			} catch {
-				return v;
-			} finally {
-				macParsing = false;
-			}
-		},
-		configurable: true,
-		enumerable: true
-	});
-	Object.defineProperty(parserObj, "normalize", {
-		value(v) {
-			if (typeof v !== "string") return v;
-			if (macParsing) return v;
-			macParsing = true;
-			try {
-				const result = macParser.parse(v);
-				return result.success ? result.value : v;
-			} catch {
-				return v;
-			} finally {
-				macParsing = false;
-			}
+		format(value) {
+			if (typeof value !== "string") return metavar;
+			return normalizeMacValue(value, value);
 		},
-		configurable: true,
-		enumerable: true
-	});
+		normalize(value) {
+			if (typeof value !== "string") return value;
+			return normalizeMacValue(value, value);
+		}
+	};
 	return parserObj;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/core",
-  "version": "1.1.0-dev.2006+b336c042",
+  "version": "1.1.0-dev.2053",
   "description": "Type-safe combinatorial command-line interface parser",
   "keywords": [
     "CLI",