xulbux 1.6.8__py3-none-any.whl → 1.7.0__py3-none-any.whl

xulbux/xx_color.py

@@ -33,10 +33,36 @@ The `Color` class, which contains all sorts of different color-related methods:
 
 from .xx_regex import Regex
 
-from typing import Optional
+from typing import Annotated, TypeAlias, Iterator, Optional, Literal, Union
 import re as _re
 
 
+Int_0_100 = Annotated[int, "An integer value between 0 and 100, inclusive."]
+Int_0_255 = Annotated[int, "An integer value between 0 and 255, inclusive."]
+Int_0_360 = Annotated[int, "An integer value between 0 and 360, inclusive."]
+Float_0_1 = Annotated[float, "A float value between 0.0 and 1.0, inclusive."]
+
+Rgba: TypeAlias = Union[
+    tuple[Int_0_255, Int_0_255, Int_0_255],
+    tuple[Int_0_255, Int_0_255, Int_0_255, Float_0_1],
+    list[Int_0_255],
+    list[Union[Int_0_255, Float_0_1]],
+    dict[str, Union[int, float]],
+    "rgba",
+    str,
+]
+Hsla: TypeAlias = Union[
+    tuple[Int_0_360, Int_0_100, Int_0_100],
+    tuple[Int_0_360, Int_0_100, Int_0_100, Float_0_1],
+    list[Union[Int_0_360, Int_0_100]],
+    list[Union[Int_0_360, Int_0_100, Float_0_1]],
+    dict[str, Union[int, float]],
+    "hsla",
+    str,
+]
+Hexa: TypeAlias = Union[str, int, "hexa"]
+
+
 class rgba:
     """An RGB/RGBA color: is a tuple of 3 integers, representing the red (`0`-`255`), green (`0`-`255`), and blue (`0`-`255`).\n
     Also includes an optional 4th param, which is a float, that represents the alpha channel (`0.0`-`1.0`).\n
@@ -60,7 +86,11 @@ class rgba:
     - `with_alpha(alpha)` to create a new color with different alpha
     - `complementary()` to get the complementary color"""
 
-    def __init__(self, r: int, g: int, b: int, a: float = None, _validate: bool = True):
+    def __init__(self, r: int, g: int, b: int, a: Optional[float] = None, _validate: bool = True):
+        self.r: int
+        self.g: int
+        self.b: int
+        self.a: Optional[float]
         if not _validate:
             self.r, self.g, self.b, self.a = r, g, b, a
             return
@@ -79,13 +109,10 @@ class rgba:
     def __len__(self) -> int:
         return 3 if self.a is None else 4
 
-    def __iter__(self) -> iter:
+    def __iter__(self) -> Iterator:
         return iter((self.r, self.g, self.b) + (() if self.a is None else (self.a, )))
 
-    def __dict__(self) -> dict:
-        return self.dict()
-
-    def __getitem__(self, index: int) -> int:
+    def __getitem__(self, index: int) -> int | float:
         return ((self.r, self.g, self.b) + (() if self.a is None else (self.a, )))[index]
 
     def __repr__(self) -> str:
@@ -94,15 +121,10 @@ class rgba:
     def __str__(self) -> str:
         return f'({self.r}, {self.g}, {self.b}{"" if self.a is None else f", {self.a}"})'
 
-    def __eq__(self, other: "rgba") -> bool:
+    def __eq__(self, other: "rgba") -> bool:  # type: ignore[override]
         if not isinstance(other, rgba):
             return False
-        return (self.r, self.g, self.b, self.a) == (
-            other[0],
-            other[1],
-            other[2],
-            other[3],
-        )
+        return (self.r, self.g, self.b, self.a) == (other.r, other.g, other.b, other.a)
 
     def dict(self) -> dict:
         """Returns the color components as a dictionary with keys `'r'`, `'g'`, `'b'` and optionally `'a'`"""
@@ -114,7 +136,7 @@ class rgba:
 
     def to_hsla(self) -> "hsla":
         """Returns the color as a `hsla()` color"""
-        return hsla(*self._rgb_to_hsl(self.r, self.g, self.b), self.a, _validate=False)
+        return hsla(*self._rgb_to_hsl(self.r, self.g, self.b), self.a, _validate=False)  # type: ignore[positional-arguments]
 
     def to_hexa(self) -> "hexa":
         """Returns the color as a `hexa()` color"""
@@ -152,16 +174,22 @@ class rgba:
     def invert(self, invert_alpha: bool = False) -> "rgba":
         """Inverts the color by rotating hue by 180 degrees and inverting lightness"""
         self.r, self.g, self.b = 255 - self.r, 255 - self.g, 255 - self.b
-        if invert_alpha:
+        if invert_alpha and self.a is not None:
             self.a = 1 - self.a
         return rgba(self.r, self.g, self.b, self.a, _validate=False)
 
-    def grayscale(self) -> "rgba":
-        """Converts the color to grayscale using the luminance formula"""
-        self.r = self.g = self.b = Color.luminance(self.r, self.g, self.b)
+    def grayscale(self, method: str = "wcag2") -> "rgba":
+        """Converts the color to grayscale using the luminance formula.\n
+        ------------------------------------------------------------------
+        The `method` is the luminance calculation method to use:
+        - `"wcag2"` WCAG 2.0 standard (default and most accurate for perception)
+        - `"wcag3"` Draft WCAG 3.0 standard with improved coefficients
+        - `"simple"` Simple arithmetic mean (less accurate)
+        - `"bt601"` ITU-R BT.601 standard (older TV standard)"""
+        self.r = self.g = self.b = int(Color.luminance(self.r, self.g, self.b, method=method))
         return rgba(self.r, self.g, self.b, self.a, _validate=False)
 
-    def blend(self, other: "rgba", ratio: float = 0.5, additive_alpha: bool = False) -> "rgba":
+    def blend(self, other: Rgba, ratio: float = 0.5, additive_alpha: bool = False) -> "rgba":
         """Blends the current color with another color using the specified ratio (`0.0`-`1.0`):
         - if `ratio` is `0.0` it means 100% of the current color and 0% of the `other` color (2:0 mixture)
         - if `ratio` is `0.5` it means 50% of both colors (1:1 mixture)
@@ -170,7 +198,7 @@ class rgba:
             raise ValueError("'ratio' must be a float/int in [0.0, 1.0]")
         elif not isinstance(other, rgba):
             if Color.is_valid_rgba(other):
-                other = rgba(*other, _validate=False)
+                other = Color.to_rgba(other)
             else:
                 raise TypeError("'other' must be a valid RGBA color")
         ratio *= 2
@@ -216,20 +244,20 @@ class rgba:
         return self.to_hsla().complementary().to_rgba()
 
     def _rgb_to_hsl(self, r: int, g: int, b: int) -> tuple:
-        r, g, b = r / 255.0, g / 255.0, b / 255.0
-        max_c, min_c = max(r, g, b), min(r, g, b)
+        _r, _g, _b = r / 255.0, g / 255.0, b / 255.0
+        max_c, min_c = max(_r, _g, _b), min(_r, _g, _b)
         l = (max_c + min_c) / 2
         if max_c == min_c:
             h = s = 0
         else:
             delta = max_c - min_c
             s = delta / (1 - abs(2 * l - 1))
-            if max_c == r:
-                h = ((g - b) / delta) % 6
-            elif max_c == g:
-                h = ((b - r) / delta) + 2
+            if max_c == _r:
+                h = ((_g - _b) / delta) % 6
+            elif max_c == _g:
+                h = ((_b - _r) / delta) + 2
             else:
-                h = ((r - g) / delta) + 4
+                h = ((_r - _g) / delta) + 4
             h /= 6
         return int(round(h * 360)), int(round(s * 100)), int(round(l * 100))
 
@@ -257,7 +285,11 @@ class hsla:
     - `with_alpha(alpha)` to create a new color with different alpha
     - `complementary()` to get the complementary color"""
 
-    def __init__(self, h: int, s: int, l: int, a: float = None, _validate: bool = True):
+    def __init__(self, h: int, s: int, l: int, a: Optional[float] = None, _validate: bool = True):
+        self.h: int
+        self.s: int
+        self.l: int
+        self.a: Optional[float]
         if not _validate:
             self.h, self.s, self.l, self.a = h, s, l, a
             return
@@ -276,30 +308,22 @@ class hsla:
     def __len__(self) -> int:
         return 3 if self.a is None else 4
 
-    def __iter__(self) -> iter:
+    def __iter__(self) -> Iterator:
         return iter((self.h, self.s, self.l) + (() if self.a is None else (self.a, )))
 
-    def __dict__(self) -> dict:
-        return self.dict()
-
-    def __getitem__(self, index: int) -> int:
+    def __getitem__(self, index: int) -> int | float:
         return ((self.h, self.s, self.l) + (() if self.a is None else (self.a, )))[index]
 
     def __repr__(self) -> str:
-        return f'hsla({self.h}, {self.s}, {self.l}{"" if self.a is None else f", {self.a}"})'
+        return f'hsla({self.h}°, {self.s}%, {self.l}%{"" if self.a is None else f", {self.a}"})'
 
     def __str__(self) -> str:
-        return f'({self.h}, {self.s}, {self.l}{"" if self.a is None else f", {self.a}"})'
+        return f'({self.h}°, {self.s}%, {self.l}%{"" if self.a is None else f", {self.a}"})'
 
-    def __eq__(self, other: "hsla") -> bool:
+    def __eq__(self, other: "hsla") -> bool:  # type: ignore[override]
         if not isinstance(other, hsla):
             return False
-        return (self.h, self.s, self.l, self.a) == (
-            other[0],
-            other[1],
-            other[2],
-            other[3],
-        )
+        return (self.h, self.s, self.l, self.a) == (other.h, other.s, other.l, other.a)
 
     def dict(self) -> dict:
         """Returns the color components as a dictionary with keys `'h'`, `'s'`, `'l'` and optionally `'a'`"""
@@ -311,7 +335,7 @@ class hsla:
 
     def to_rgba(self) -> "rgba":
         """Returns the color as a `rgba()` color"""
-        return rgba(*self._hsl_to_rgb(self.h, self.s, self.l), self.a, _validate=False)
+        return rgba(*self._hsl_to_rgb(self.h, self.s, self.l), self.a, _validate=False)  # type: ignore[positional-arguments]
 
     def to_hexa(self) -> "hexa":
         """Returns the color as a `hexa()` color"""
@@ -359,17 +383,23 @@ class hsla:
         """Inverts the color by rotating hue by 180 degrees and inverting lightness"""
         self.h = (self.h + 180) % 360
         self.l = 100 - self.l
-        if invert_alpha:
+        if invert_alpha and self.a is not None:
             self.a = 1 - self.a
         return hsla(self.h, self.s, self.l, self.a, _validate=False)
 
-    def grayscale(self) -> "hsla":
-        """Converts the color to grayscale using the luminance formula"""
-        l = Color.luminance(*self._hsl_to_rgb(self.h, self.s, self.l))
+    def grayscale(self, method: str = "wcag2") -> "hsla":
+        """Converts the color to grayscale using the luminance formula.\n
+        ------------------------------------------------------------------
+        The `method` is the luminance calculation method to use:
+        - `"wcag2"` WCAG 2.0 standard (default and most accurate for perception)
+        - `"wcag3"` Draft WCAG 3.0 standard with improved coefficients
+        - `"simple"` Simple arithmetic mean (less accurate)
+        - `"bt601"` ITU-R BT.601 standard (older TV standard)"""
+        l = int(Color.luminance(*self._hsl_to_rgb(self.h, self.s, self.l), method=method))
         self.h, self.s, self.l, _ = rgba(l, l, l, _validate=False).to_hsla().values()
         return hsla(self.h, self.s, self.l, self.a, _validate=False)
 
-    def blend(self, other: "hsla", ratio: float = 0.5, additive_alpha: bool = False) -> "rgba":
+    def blend(self, other: Hsla, ratio: float = 0.5, additive_alpha: bool = False) -> "hsla":
         """Blends the current color with another color using the specified ratio (`0.0`-`1.0`):
         - if `ratio` is `0.0` it means 100% of the current color and 0% of the `other` color (2:0 mixture)
         - if `ratio` is `0.5` it means 50% of both colors (1:1 mixture)
@@ -404,9 +434,9 @@ class hsla:
         return hsla((self.h + 180) % 360, self.s, self.l, self.a, _validate=False)
 
     def _hsl_to_rgb(self, h: int, s: int, l: int) -> tuple:
-        h, s, l = h / 360, s / 100, l / 100
-        if s == 0:
-            r = g = b = int(l * 255)
+        _h, _s, _l = h / 360, s / 100, l / 100
+        if _s == 0:
+            r = g = b = int(_l * 255)
         else:
 
             def hue_to_rgb(p, q, t):
@@ -422,11 +452,11 @@ class hsla:
                     return p + (q - p) * (2 / 3 - t) * 6
                 return p
 
-            q = l * (1 + s) if l < 0.5 else l + s - l * s
-            p = 2 * l - q
-            r = int(round(hue_to_rgb(p, q, h + 1 / 3) * 255))
-            g = int(round(hue_to_rgb(p, q, h) * 255))
-            b = int(round(hue_to_rgb(p, q, h - 1 / 3) * 255))
+            q = _l * (1 + _s) if _l < 0.5 else _l + _s - _l * _s
+            p = 2 * _l - q
+            r = int(round(hue_to_rgb(p, q, _h + 1 / 3) * 255))
+            g = int(round(hue_to_rgb(p, q, _h) * 255))
+            b = int(round(hue_to_rgb(p, q, _h - 1 / 3) * 255))
         return r, g, b
 
 
@@ -453,9 +483,20 @@ class hexa:
     - `with_alpha(alpha)` to create a new color with different alpha
     - `complementary()` to get the complementary color"""
 
-    def __init__(self, color: str | int, _r: int = None, _g: int = None, _b: int = None, _a: float = None):
+    def __init__(
+        self,
+        color: str | int,
+        _r: Optional[int] = None,
+        _g: Optional[int] = None,
+        _b: Optional[int] = None,
+        _a: Optional[float] = None,
+    ):
+        self.r: int
+        self.g: int
+        self.b: int
+        self.a: Optional[float]
         if all(x is not None for x in (_r, _g, _b)):
-            self.r, self.g, self.b, self.a = _r, _g, _b, _a
+            self.r, self.g, self.b, self.a = _r, _g, _b, _a  # type: ignore[assignment]
             return
         if isinstance(color, hexa):
             raise ValueError("Color is already a hexa() color")
@@ -502,14 +543,11 @@ class hexa:
     def __len__(self) -> int:
         return 3 if self.a is None else 4
 
-    def __iter__(self) -> iter:
+    def __iter__(self) -> Iterator:
         return iter((f"{self.r:02X}", f"{self.g:02X}", f"{self.b:02X}")
                     + (() if self.a is None else (f"{int(self.a * 255):02X}", )))
 
-    def __dict__(self) -> dict:
-        return self.dict()
-
-    def __getitem__(self, index: int) -> int:
+    def __getitem__(self, index: int) -> str | int:
         return ((f"{self.r:02X}", f"{self.g:02X}", f"{self.b:02X}") + (() if self.a is None else
                                                                        (f"{int(self.a * 255):02X}", )))[index]
 
@@ -519,15 +557,11 @@ class hexa:
     def __str__(self) -> str:
         return f'#{self.r:02X}{self.g:02X}{self.b:02X}{"" if self.a is None else f"{int(self.a * 255):02X}"}'
 
-    def __eq__(self, other: "hexa") -> bool:
+    def __eq__(self, other: "hexa") -> bool:  # type: ignore[override]
+        """Returns whether the other color is equal to this one."""
         if not isinstance(other, hexa):
             return False
-        return (self.r, self.g, self.b, self.a) == (
-            other[0],
-            other[1],
-            other[2],
-            other[3],
-        )
+        return (self.r, self.g, self.b, self.a) == (other.r, other.g, other.b, other.a)
 
     def dict(self) -> dict:
         """Returns the color components as a dictionary with hex string values for keys `'r'`, `'g'`, `'b'` and optionally `'a'`"""
@@ -540,9 +574,9 @@ class hexa:
             )
         )
 
-    def values(self) -> tuple:
+    def values(self, round_alpha: bool = True) -> tuple:
         """Returns the color components as separate values `r, g, b, a`"""
-        return self.r, self.g, self.b, self.a
+        return self.r, self.g, self.b, None if self.a is None else (round(self.a, 2) if round_alpha else self.a)
 
     def to_rgba(self, round_alpha: bool = True) -> "rgba":
         """Returns the color as a `rgba()` color"""
@@ -590,16 +624,22 @@ class hexa:
     def invert(self, invert_alpha: bool = False) -> "hexa":
         """Inverts the color by rotating hue by 180 degrees and inverting lightness"""
         self.r, self.g, self.b, self.a = self.to_rgba(False).invert().values()
-        if invert_alpha:
+        if invert_alpha and self.a is not None:
             self.a = 1 - self.a
         return hexa("", self.r, self.g, self.b, self.a)
 
-    def grayscale(self) -> "hexa":
-        """Converts the color to grayscale using the luminance formula"""
-        self.r = self.g = self.b = Color.luminance(self.r, self.g, self.b)
+    def grayscale(self, method: str = "wcag2") -> "hexa":
+        """Converts the color to grayscale using the luminance formula.\n
+        ------------------------------------------------------------------
+        The `method` is the luminance calculation method to use:
+        - `"wcag2"` WCAG 2.0 standard (default and most accurate for perception)
+        - `"wcag3"` Draft WCAG 3.0 standard with improved coefficients
+        - `"simple"` Simple arithmetic mean (less accurate)
+        - `"bt601"` ITU-R BT.601 standard (older TV standard)"""
+        self.r = self.g = self.b = int(Color.luminance(self.r, self.g, self.b, method=method))
         return hexa("", self.r, self.g, self.b, self.a)
 
-    def blend(self, other: "hexa", ratio: float = 0.5, additive_alpha: bool = False) -> "rgba":
+    def blend(self, other: Hexa, ratio: float = 0.5, additive_alpha: bool = False) -> "hexa":
         """Blends the current color with another color using the specified ratio (`0.0`-`1.0`):
         - if `ratio` is `0.0` it means 100% of the current color and 0% of the `other` color (2:0 mixture)
         - if `ratio` is `0.5` it means 50% of both colors (1:1 mixture)
@@ -637,7 +677,7 @@ class hexa:
 class Color:
 
     @staticmethod
-    def is_valid_rgba(color: str | list | tuple | dict, allow_alpha: bool = True) -> bool:
+    def is_valid_rgba(color: Rgba, allow_alpha: bool = True) -> bool:
         try:
             if isinstance(color, rgba):
                 return True
@@ -645,16 +685,22 @@ class Color:
                 if allow_alpha and Color.has_alpha(color):
                     return (
                         0 <= color[0] <= 255 and 0 <= color[1] <= 255 and 0 <= color[2] <= 255
-                        and (0 <= color[3] <= 1 or color[3] is None)
+                        and (0 <= color[3] <= 1 or color[3] is None)  # type: ignore[index]
                     )
-                return 0 <= color[0] <= 255 and 0 <= color[1] <= 255 and 0 <= color[2] <= 255
+                elif len(color) == 3:
+                    return 0 <= color[0] <= 255 and 0 <= color[1] <= 255 and 0 <= color[2] <= 255
+                else:
+                    return False
             elif isinstance(color, dict):
                 if allow_alpha and Color.has_alpha(color):
                     return (
                         0 <= color["r"] <= 255 and 0 <= color["g"] <= 255 and 0 <= color["b"] <= 255
                         and (0 <= color["a"] <= 1 or color["a"] is None)
                     )
-                return 0 <= color["r"] <= 255 and 0 <= color["g"] <= 255 and 0 <= color["b"] <= 255
+                elif len(color) == 3:
+                    return 0 <= color["r"] <= 255 and 0 <= color["g"] <= 255 and 0 <= color["b"] <= 255
+                else:
+                    return False
             elif isinstance(color, str):
                 return bool(_re.fullmatch(Regex.rgba_str(allow_alpha=allow_alpha), color))
             return False
@@ -662,7 +708,7 @@ class Color:
             return False
 
     @staticmethod
-    def is_valid_hsla(color: str | list | tuple | dict, allow_alpha: bool = True) -> bool:
+    def is_valid_hsla(color: Hsla, allow_alpha: bool = True) -> bool:
         try:
             if isinstance(color, hsla):
                 return True
@@ -670,30 +716,38 @@ class Color:
                 if allow_alpha and Color.has_alpha(color):
                     return (
                         0 <= color[0] <= 360 and 0 <= color[1] <= 100 and 0 <= color[2] <= 100
-                        and (0 <= color[3] <= 1 or color[3] is None)
+                        and (0 <= color[3] <= 1 or color[3] is None)  # type: ignore[index]
                     )
-                else:
+                elif len(color) == 3:
                     return 0 <= color[0] <= 360 and 0 <= color[1] <= 100 and 0 <= color[2] <= 100
+                else:
+                    return False
             elif isinstance(color, dict):
                 if allow_alpha and Color.has_alpha(color):
                     return (
                         0 <= color["h"] <= 360 and 0 <= color["s"] <= 100 and 0 <= color["l"] <= 100
                         and (0 <= color["a"] <= 1 or color["a"] is None)
                     )
-                else:
+                elif len(color) == 3:
                     return 0 <= color["h"] <= 360 and 0 <= color["s"] <= 100 and 0 <= color["l"] <= 100
+                else:
+                    return False
             elif isinstance(color, str):
                 return bool(_re.fullmatch(Regex.hsla_str(allow_alpha=allow_alpha), color))
         except Exception:
             return False
 
     @staticmethod
-    def is_valid_hexa(color: str | int, allow_alpha: bool = True, get_prefix: bool = False) -> bool | tuple[bool, str]:
+    def is_valid_hexa(
+        color: Hexa,
+        allow_alpha: bool = True,
+        get_prefix: bool = False,
+    ) -> bool | tuple[bool, Optional[Literal['#', '0x']]]:
         try:
             if isinstance(color, hexa):
-                return (True, "#")
+                return (True, "#") if get_prefix else True
             elif isinstance(color, int):
-                is_valid = 0 <= color <= (0xFFFFFFFF if allow_alpha else 0xFFFFFF)
+                is_valid = 0x000000 <= color <= (0xFFFFFFFF if allow_alpha else 0xFFFFFF)
                 return (is_valid, "0x") if get_prefix else is_valid
             elif isinstance(color, str):
                 color, prefix = ((color[1:], "#") if color.startswith("#") else
@@ -704,21 +758,21 @@ class Color:
             return (False, None) if get_prefix else False
 
     @staticmethod
-    def is_valid(color: str | list | tuple | dict, allow_alpha: bool = True) -> bool:
-        return (
-            Color.is_valid_rgba(color, allow_alpha) or Color.is_valid_hsla(color, allow_alpha)
-            or Color.is_valid_hexa(color, allow_alpha)
+    def is_valid(color: Rgba | Hsla | Hexa, allow_alpha: bool = True) -> bool:
+        return bool(
+            Color.is_valid_rgba(color, allow_alpha) or Color.is_valid_hsla(color, allow_alpha)  # type: ignore[assignment]
+            or Color.is_valid_hexa(color, allow_alpha)  # type: ignore[assignment]
         )
 
     @staticmethod
-    def has_alpha(color: rgba | hsla | hexa) -> bool:
+    def has_alpha(color: Rgba | Hsla | Hexa) -> bool:
         """Check if the given color has an alpha channel.\n
         ---------------------------------------------------------------------------
         Input a RGBA, HSLA or HEXA color as `color`.
         Returns `True` if the color has an alpha channel and `False` otherwise."""
         if isinstance(color, (rgba, hsla, hexa)):
             return color.has_alpha()
-        if Color.is_valid_hexa(color):
+        if Color.is_valid_hexa(color):  # type: ignore[assignment]
             if isinstance(color, str):
                 if color.startswith("#"):
                     color = color[1:]
@@ -733,42 +787,42 @@ class Color:
         return False
 
     @staticmethod
-    def to_rgba(color: hsla | hexa) -> rgba:
+    def to_rgba(color: Rgba | Hsla | Hexa) -> rgba:
         """Will try to convert any color type to a color of type RGBA."""
         if isinstance(color, (hsla, hexa)):
             return color.to_rgba()
-        elif Color.is_valid_hsla(color):
-            return hsla(*color, _validate=False).to_rgba()
-        elif Color.is_valid_hexa(color):
-            return hexa(color).to_rgba()
-        elif Color.is_valid_rgba(color):
-            return color if isinstance(color, rgba) else (rgba(*color, _validate=False))
+        elif Color.is_valid_hsla(color):  # type: ignore[assignment]
+            return hsla(*color, _validate=False).to_rgba()  # type: ignore[not-iterable]
+        elif Color.is_valid_hexa(color):  # type: ignore[assignment]
+            return hexa(color).to_rgba()  # type: ignore[assignment]
+        elif Color.is_valid_rgba(color):  # type: ignore[assignment]
+            return color if isinstance(color, rgba) else (rgba(*color, _validate=False))  # type: ignore[not-iterable]
         raise ValueError(f"Invalid color format '{color}'")
 
     @staticmethod
-    def to_hsla(color: rgba | hexa) -> hsla:
+    def to_hsla(color: Rgba | Hsla | Hexa) -> hsla:
         """Will try to convert any color type to a color of type HSLA."""
         if isinstance(color, (rgba, hexa)):
             return color.to_hsla()
-        elif Color.is_valid_rgba(color):
-            return rgba(*color, _validate=False).to_hsla()
-        elif Color.is_valid_hexa(color):
-            return hexa(color).to_hsla()
-        elif Color.is_valid_hsla(color):
-            return color if isinstance(color, hsla) else (hsla(*color, _validate=False))
+        elif Color.is_valid_rgba(color):  # type: ignore[assignment]
+            return rgba(*color, _validate=False).to_hsla()  # type: ignore[not-iterable]
+        elif Color.is_valid_hexa(color):  # type: ignore[assignment]
+            return hexa(color).to_hsla()  # type: ignore[assignment]
+        elif Color.is_valid_hsla(color):  # type: ignore[assignment]
+            return color if isinstance(color, hsla) else (hsla(*color, _validate=False))  # type: ignore[not-iterable]
         raise ValueError(f"Invalid color format '{color}'")
 
     @staticmethod
-    def to_hexa(color: rgba | hsla) -> hexa:
+    def to_hexa(color: Rgba | Hsla | Hexa) -> hexa:
         """Will try to convert any color type to a color of type HEXA."""
         if isinstance(color, (rgba, hsla)):
             return color.to_hexa()
-        elif Color.is_valid_rgba(color):
-            return rgba(*color, _validate=False).to_hexa()
-        elif Color.is_valid_hsla(color):
-            return hsla(*color, _validate=False).to_hexa()
-        elif Color.is_valid_hexa(color):
-            return color if isinstance(color, hexa) else hexa(color)
+        elif Color.is_valid_rgba(color):  # type: ignore[assignment]
+            return rgba(*color, _validate=False).to_hexa()  # type: ignore[not-iterable]
+        elif Color.is_valid_hsla(color):  # type: ignore[assignment]
+            return hsla(*color, _validate=False).to_hexa()  # type: ignore[not-iterable]
+        elif Color.is_valid_hexa(color):  # type: ignore[assignment]
+            return color if isinstance(color, hexa) else hexa(color)  # type: ignore[assignment]
         raise ValueError(f"Invalid color format '{color}'")
 
     @staticmethod
@@ -777,7 +831,7 @@ class Color:
         --------------------------------------------------------------------------------------------------
         If `only_first` is `True` only the first found color will be returned (not as a list)."""
         if only_first:
-            match = _re.search(Regex.rgb_str(allow_alpha=True), string)
+            match = _re.search(Regex.rgba_str(allow_alpha=True), string)
             if not match:
                 return None
             m = match.groups()
@@ -789,7 +843,7 @@ class Color:
                 _validate=False,
             )
         else:
-            matches = _re.findall(Regex.rgb_str(allow_alpha=True), string)
+            matches = _re.findall(Regex.rgba_str(allow_alpha=True), string)
             if not matches:
                 return None
             return [
@@ -807,7 +861,7 @@ class Color:
         r: int,
         g: int,
         b: int,
-        a: float = None,
+        a: Optional[float] = None,
         preserve_original: bool = False,
     ) -> int:
         """Convert RGBA channels to a HEXA integer (alpha is optional).\n
@@ -865,71 +919,81 @@ class Color:
             raise ValueError(f"Invalid HEX integer '0x{hex_str}': expected in range [0x000000, 0xFFFFFF]")
 
     @staticmethod
-    def luminance(r: int, g: int, b: int, output_type: type = None) -> int | float:
-        """Gets the colors luminance using the luminance formula.\n
-        ------------------------------------------------------------
-        The param `output_type` can be set to:
-        - `int`   =⠀integer in [0, 100]
-        - `float` =⠀float in [0.0, 1.0]
-        - `None`  =⠀integer in [0, 255]"""
-        r, g, b = r / 255.0, g / 255.0, b / 255.0
-        if r < 0.03928:
-            r = r / 12.92
+    def luminance(r: int, g: int, b: int, output_type: Optional[type] = None, method: str = "wcag2") -> int | float:
+        """Calculates the relative luminance of a color according to various standards.\n
+        ----------------------------------------------------------------------------------
+        The `output_type` controls the range of the returned luminance value:
+        - `int` returns integer in [0, 100]
+        - `float` returns float in [0.0, 1.0]
+        - `None` returns integer in [0, 255]\n
+        The `method` is the luminance calculation method to use:
+        - `"wcag2"` WCAG 2.0 standard (default and most accurate for perception)
+        - `"wcag3"` Draft WCAG 3.0 standard with improved coefficients
+        - `"simple"` Simple arithmetic mean (less accurate)
+        - `"bt601"` ITU-R BT.601 standard (older TV standard)"""
+        _r, _g, _b = r / 255.0, g / 255.0, b / 255.0
+        if method == "simple":
+            luminance = (_r + _g + _b) / 3
+        elif method == "bt601":
+            luminance = 0.299 * _r + 0.587 * _g + 0.114 * _b
+        elif method == "wcag3":
+            _r = Color._linearize_srgb(_r)
+            _g = Color._linearize_srgb(_g)
+            _b = Color._linearize_srgb(_b)
+            luminance = 0.2126729 * _r + 0.7151522 * _g + 0.0721750 * _b
         else:
-            r = ((r + 0.055) / 1.055)**2.4
-        if g < 0.03928:
-            g = g / 12.92
+            _r = Color._linearize_srgb(_r)
+            _g = Color._linearize_srgb(_g)
+            _b = Color._linearize_srgb(_b)
+            luminance = 0.2126 * _r + 0.7152 * _g + 0.0722 * _b
+        if output_type == int:
+            return round(luminance * 100)
+        elif output_type == float:
+            return luminance
         else:
-            g = ((g + 0.055) / 1.055)**2.4
-        if b < 0.03928:
-            b = b / 12.92
+            return round(luminance * 255)
+
+    @staticmethod
+    def _linearize_srgb(c: float) -> float:
+        """Helper method to linearize sRGB component following the WCAG standard."""
+        if c <= 0.03928:
+            return c / 12.92
         else:
-            b = ((b + 0.055) / 1.055)**2.4
-        l = 0.2126 * r + 0.7152 * g + 0.0722 * b
-        return round(l * 100) if isinstance(output_type, int) else round(l * 255) if output_type is None else l
+            return ((c + 0.055) / 1.055)**2.4
 
     @staticmethod
-    def text_color_for_on_bg(text_bg_color: rgba | hexa) -> rgba | hexa:
-        was_hexa, was_int = Color.is_valid_hexa(text_bg_color), isinstance(text_bg_color, int)
+    def text_color_for_on_bg(text_bg_color: Rgba | Hexa) -> rgba | hexa | int:
+        was_hexa, was_int = Color.is_valid_hexa(text_bg_color), isinstance(text_bg_color, int)  # type: ignore[assignment]
         text_bg_color = Color.to_rgba(text_bg_color)
         brightness = 0.2126 * text_bg_color[0] + 0.7152 * text_bg_color[1] + 0.0722 * text_bg_color[2]
-        return ((hexa("", 255, 255, 255) if was_hexa else rgba(255, 255, 255, _validate=False)) if brightness < 128 else
+        return (((0xFFFFFF if was_int else hexa("", 255, 255, 255)) if was_hexa else rgba(255, 255, 255, _validate=False))
+                if brightness < 128 else
                 ((0x000 if was_int else hexa("", 0, 0, 0)) if was_hexa else rgba(0, 0, 0, _validate=False)))
 
     @staticmethod
-    def adjust_lightness(color: rgba | hexa, lightness_change: float) -> rgba | hexa:
+    def adjust_lightness(color: Rgba | Hexa, lightness_change: float) -> rgba | hexa:
         """In- or decrease the lightness of the input color.\n
         -----------------------------------------------------------------------------------------------------
         - color (rgba|hexa): HEX or RGBA color
         - lightness_change (float): float between -1.0 (darken by `100%`) and 1.0 (lighten by `100%`)\n
         -----------------------------------------------------------------------------------------------------
         returns (rgba|hexa): the adjusted color in the format of the input color"""
-        was_hexa = Color.is_valid_hexa(color)
-        color = Color.to_hsla(color)
-        h, s, l, a = (
-            color[0],
-            color[1],
-            color[2],
-            color[3] if Color.has_alpha(color) else None,
-        )
+        was_hexa = Color.is_valid_hexa(color)  # type: ignore[assignment]
+        _color: hsla = Color.to_hsla(color)  # type: ignore[assignment]
+        h, s, l, a = (int(_color[0]), int(_color[1]), int(_color[2]), _color[3] if Color.has_alpha(_color) else None)
         l = int(max(0, min(100, l + lightness_change * 100)))
         return hsla(h, s, l, a, _validate=False).to_hexa() if was_hexa else hsla(h, s, l, a, _validate=False).to_rgba()
 
     @staticmethod
-    def adjust_saturation(color: rgba | hexa, saturation_change: float) -> rgba | hexa:
+    def adjust_saturation(color: Rgba | Hsla | Hexa, saturation_change: float) -> rgba | hexa:
         """In- or decrease the saturation of the input color.\n
         -----------------------------------------------------------------------------------------------------------
         - color (rgba|hexa): HEX or RGBA color
         - saturation_change (float): float between -1.0 (saturate by `100%`) and 1.0 (desaturate by `100%`)\n
         -----------------------------------------------------------------------------------------------------------
         returns (rgba|hexa): the adjusted color in the format of the input color"""
-        was_hexa = Color.is_valid_hexa(color)
-        color = Color.to_hsla(color)
-        h, s, l, a = (
-            color[0],
-            color[1],
-            color[2],
-            color[3] if Color.has_alpha(color) else None,
-        )
+        was_hexa = Color.is_valid_hexa(color)  # type: ignore[assignment]
+        _color: hsla = Color.to_hsla(color)  # type: ignore[assignment]
+        h, s, l, a = (int(_color[0]), int(_color[1]), int(_color[2]), _color[3] if Color.has_alpha(_color) else None)
         s = int(max(0, min(100, s + saturation_change * 100)))
         return hsla(h, s, l, a, _validate=False).to_hexa() if was_hexa else hsla(h, s, l, a, _validate=False).to_rgba()