Fixes for latest ColorAide update

Author: facelessuser

CHANGES.md

@@ -1,5 +1,9 @@
 # ColorHelper
 
+## 6.5.1
+
+-   **NEW**: Fix issues related to ColorAide update.
+
 ## 6.5.0
 
 -   **NEW**: Upgrade ColorAide to 6.0.0.

custom/ahex.py

@@ -3,9 +3,9 @@
 from ..lib.coloraide.css import parse
 from ..lib.coloraide import algebra as alg
 import re
-from ColorHelper.ch_util import get_base_color
+from ColorHelper.ch_util import get_base_color, COLOR_PARTS
 
-MATCH = re.compile(r"(?i)\#(?:{hex}{{8}}|{hex}{{6}})\b".format(**parse.COLOR_PARTS))
+MATCH = re.compile(r"(?i)\#(?:{hex}{{8}}|{hex}{{6}})\b".format(**COLOR_PARTS))
 
 
 def split_channels(color):

custom/st_colormod.py

@@ -290,7 +290,10 @@ def _adjust(self, string, start=0):
                 if color is None:
                     m = RE_COLOR_START.match(string, start)
                     if m:
+                        fullmatch = self.fullmatch
+                        self.fullmatch = False
                         color2, start = self._adjust(string, start=start)
+                        self.fullmatch = fullmatch
                         if color2 is None:
                             raise ValueError("Found unterminated or invalid 'color('")
                         color = color2.convert("srgb")
@@ -635,19 +638,20 @@ def _parse(
                 num_data = len(data)
                 if num_data < num_channels:
                     data = list(data) + [alg.NaN] * (num_channels - num_data)
-                coords = [alg.clamp(float(v), *c.limit) for c, v in zipl(space_class.CHANNELS, data)]
-                coords.append(alg.clamp(float(alpha), *space_class.channels[-1].limit))
+                coords = [float(c.limit(v) if c.limit is not None else v) for c, v in zipl(space_class.CHANNELS, data)]
+                limit = space_class.channels[-1].limit
+                coords.append(float(limit(alpha) if limit is not None else alpha))
                 obj = space_class, coords
 
             # Parse a CSS string
             else:
                 m = cls._match(color, fullmatch=True, variables=variables)
                 if m is None:
                     raise ValueError("'{}' is not a valid color".format(color))
-                coords = [alg.clamp(float(v), *c.limit) for c, v in zipl(m[0].CHANNELS, m[1])]
-                coords.append(alg.clamp(float(m[2]), *m[0].channels[-1].limit))
+                coords = [float(c.limit(v) if c.limit is not None else v) for c, v in zipl(m[0].CHANNELS, m[1])]
+                limit = m[0].channels[-1].limit
+                coords.append(float(limit(m[2]) if limit is not None else m[2]))
                 obj = m[0], coords
-
         # Handle a color instance
         elif isinstance(color, BASE):
             space_class = cls.CS_MAP.get(color.space())

support.py

@@ -5,7 +5,7 @@
 import webbrowser
 import re
 
-__version__ = "6.5.0"
+__version__ = "6.5.1"
 __pc_name__ = 'ColorHelper'
 
 CSS = '''