rgb-hex - npm Package Compare versions

Comparing version 4.0.1 to 4.1.0

index.js

@@ -0,6 +1,16 @@
+// TODO: Remove this ignore comment.
+// eslint-disable-next-line no-mixed-operators
+const toHex = (red, green, blue, alpha) => ((blue | green << 8 | red << 16) | 1 << 24).toString(16).slice(1) + alpha;
+
 export default function rgbHex(red, green, blue, alpha) {
-	const isPercent = (red + (alpha || '')).toString().includes('%');
+	let isPercent = (red + (alpha || '')).toString().includes('%');
 
-	if (typeof red === 'string') {
-		[red, green, blue, alpha] = red.match(/(0?\.?\d+)%?\b/g).map(component => Number(component));
+	if (typeof red === 'string' && !green) { // Single string parameter.
+		const parsed = parseCssRgbString(red);
+		if (!parsed) {
+			throw new TypeError('Invalid or unsupported color format.');
+		}
+
+		isPercent = false;
+		[red, green, blue, alpha] = parsed;
 	} else if (alpha !== undefined) {
@@ -34,5 +44,31 @@ alpha = Number.parseFloat(alpha);
 
-	// TODO: Remove this ignore comment.
-	// eslint-disable-next-line no-mixed-operators
-	return ((blue | green << 8 | red << 16) | 1 << 24).toString(16).slice(1) + alpha;
+	return toHex(red, green, blue, alpha);
 }
+
+const parseCssRgbString = input => {
+	const parts = input.replace(/rgba?\(([^)]+)\)/, '$1').split(/[,\s/]+/).filter(Boolean);
+	if (parts.length < 3) {
+		return;
+	}
+
+	const parseValue = (value, max) => {
+		value = value.trim();
+
+		if (value.endsWith('%')) {
+			return Math.min(Number.parseFloat(value) * max / 100, max);
+		}
+
+		return Math.min(Number.parseFloat(value), max);
+	};
+
+	const red = parseValue(parts[0], 255);
+	const green = parseValue(parts[1], 255);
+	const blue = parseValue(parts[2], 255);
+	let alpha;
+
+	if (parts.length === 4) {
+		alpha = parseValue(parts[3], 1);
+	}
+
+	return [red, green, blue, alpha];
+};

package.json

 {
 	"name": "rgb-hex",
-	"version": "4.0.1",
+	"version": "4.1.0",
 	"description": "Convert RGB(A) color to HEX",
@@ -5,0 +5,0 @@ "license": "MIT",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

4816

increased by20.55%

Lines of code

78

increased by52.94%

No dependency changes