Rebased on main

Author: adedamola-sode

src/techui_builder/builder.py

@@ -123,15 +123,6 @@ def generate_screens(self):
                 )
                 for prefix in filtered_prefixes:
                     screen_entities.extend(self.entities[prefix])
-<<<<<<< HEAD
-            else:
-                LOGGER.warning(
-                    f"{self.techui.name}: [bold]{component.prefix}[/bold] set in \
-[bold]{component_name}[/bold] does not match any P field in the ioc.yaml \
-files in services"
-                )
-=======
->>>>>>> 3054d0f (Removed false messaging from component prefix not being found using wildcards)
             # If the component prefix is in entities.keys, add to screen entities
             elif component.prefix in self.entities.keys():
                 screen_entities.extend(self.entities[component.prefix])

src/techui_builder/models.py

@@ -25,25 +25,25 @@
     r"""
             ^           # start of string
             (?=         # lookahead to ensure the following pattern matches
-                [A-Za-z0-9-]{13,16} # match 13 to 16 alphanumeric characters or hyphens
-                [:A-Za-z0-9]* # match zero or more colons or alphanumeric characters
-                [.A-Za-z0-9]  # match a dot or alphanumeric character
+                [A-Za-z0-9*?\[\]-]{2,16} # match 2-16 alphanumeric chars,-/wildcards
+                [:A-Za-z0-9*?[\]]* # match >=0 colons or alphanumeric chars/wildcards
+                [.A-Za-z0-9*?[\]]  # match a dot or alphanumeric chars or wildcards
             )
             (?!.*--)    # negative lookahead to ensure no double hyphens
             (?!.*:\..)  # negative lookahead to ensure no colon followed by a dot
             (           # start of capture group 1
-                (?:[A-Za-z0-9]{2,5}-){3} # match 2 to 5 alphanumeric characters followed
+                (?:[A-Za-z0-9*?,\[\]-])* # match >1 alphanumeric characters followed
                                     # by a hyphen, repeated 3 times
-                [\d]*   # match zero or more digits
+                [\d*]   # match zero or more digits
                 [^:]?   # match zero or one non-colon character
             )
-            (?::([a-zA-Z0-9:]*))? # match zero or one colon followed by zero or more
+            (?::([a-zA-Z0-9*:]*))? # match zero or one colon followed by zero or more
                                 # alphanumeric characters or colons (capture group 2)
-            (?:\.([a-zA-Z0-9]+))? # match zero or one dot followed by one or more
+            (?:\.([a-zA-Z0-9*]+))? # match zero or one dot followed by one or more
                                 # alphanumeric characters (capture group 3)
             $           # end of string
         """,
-    re.VERBOSE,
+    re.VERBOSE | re.UNICODE,
 )
 _LONG_DOM_RE = re.compile(r"^[a-z]{2}\d{2}[a-z]$")
 _SHORT_DOM_RE = re.compile(r"^[a-z]\d{2}$")