PySerials 0.0.0.dev26__tar.gz → 0.0.0.dev27__tar.gz

{pyserials-0.0.0.dev26 → pyserials-0.0.0.dev27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev26
+Version: 0.0.0.dev27
 Requires-Python: >=3.10
 Requires-Dist: jsonschema<5,>=4.21.0
 Requires-Dist: referencing>=0.35.1
@@ -8,6 +8,6 @@ Requires-Dist: jsonpath-ng<2,>=1.6.1
 Requires-Dist: ruamel.yaml<0.18,>=0.17.32
 Requires-Dist: ruamel.yaml.string<1,>=0.1.1
 Requires-Dist: tomlkit<0.12,>=0.11.8
-Requires-Dist: MDit==0.0.0.dev23
-Requires-Dist: ExceptionMan==0.0.0.dev23
+Requires-Dist: MDit==0.0.0.dev24
+Requires-Dist: ExceptionMan==0.0.0.dev24
 Requires-Dist: ProtocolMan==0.0.0.dev2

{pyserials-0.0.0.dev26 → pyserials-0.0.0.dev27}/pyproject.toml

@@ -17,7 +17,7 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev26"
+version = "0.0.0.dev27"
 name = "PySerials"
 dependencies = [
     "jsonschema >= 4.21.0, < 5",
@@ -26,8 +26,8 @@ dependencies = [
     "ruamel.yaml >= 0.17.32, < 0.18", # https://yaml.readthedocs.io/en/stable/
     "ruamel.yaml.string >= 0.1.1, < 1",
     "tomlkit >= 0.11.8, < 0.12", # https://tomlkit.readthedocs.io/en/stable/,
-    "MDit == 0.0.0.dev23",
-    "ExceptionMan == 0.0.0.dev23",
+    "MDit == 0.0.0.dev24",
+    "ExceptionMan == 0.0.0.dev24",
     "ProtocolMan == 0.0.0.dev2",
 ]
 requires-python = ">=3.10"

{pyserials-0.0.0.dev26 → pyserials-0.0.0.dev27}/src/PySerials.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev26
+Version: 0.0.0.dev27
 Requires-Python: >=3.10
 Requires-Dist: jsonschema<5,>=4.21.0
 Requires-Dist: referencing>=0.35.1
@@ -8,6 +8,6 @@ Requires-Dist: jsonpath-ng<2,>=1.6.1
 Requires-Dist: ruamel.yaml<0.18,>=0.17.32
 Requires-Dist: ruamel.yaml.string<1,>=0.1.1
 Requires-Dist: tomlkit<0.12,>=0.11.8
-Requires-Dist: MDit==0.0.0.dev23
-Requires-Dist: ExceptionMan==0.0.0.dev23
+Requires-Dist: MDit==0.0.0.dev24
+Requires-Dist: ExceptionMan==0.0.0.dev24
 Requires-Dist: ProtocolMan==0.0.0.dev2

{pyserials-0.0.0.dev26 → pyserials-0.0.0.dev27}/src/PySerials.egg-info/requires.txt

@@ -4,6 +4,6 @@ jsonpath-ng<2,>=1.6.1
 ruamel.yaml<0.18,>=0.17.32
 ruamel.yaml.string<1,>=0.1.1
 tomlkit<0.12,>=0.11.8
-MDit==0.0.0.dev23
-ExceptionMan==0.0.0.dev23
+MDit==0.0.0.dev24
+ExceptionMan==0.0.0.dev24
 ProtocolMan==0.0.0.dev2

{pyserials-0.0.0.dev26 → pyserials-0.0.0.dev27}/src/pyserials/nested_dict.py

@@ -1,5 +1,12 @@
+from __future__ import annotations as _annotations
+
+from typing import TYPE_CHECKING as _TYPE_CHECKING
+
 import pyserials as _ps
 
+if _TYPE_CHECKING:
+    from typing import Callable
+
 
 class NestedDict:
 
@@ -8,14 +15,22 @@ class NestedDict:
         data: dict | None = None,
         template_marker_start: str = "${{",
         template_marker_end: str = "}}",
+        template_marker_unpack_start: str = "*{{",
+        template_marker_unpack_end: str = "}}",
         template_implicit_root: bool = True,
+        template_stringer: Callable[[str], str] = None,
+        template_ignore_key_regex: str | None = None,
     ):
         self._data = data or {}
         self._templater = _ps.update.TemplateFiller(
             marker_start=template_marker_start,
             marker_end=template_marker_end,
+            marker_unpack_start=template_marker_unpack_start,
+            marker_unpack_end=template_marker_unpack_end,
             implicit_root=template_implicit_root,
+            stringer=template_stringer,
         )
+        self._ignore_key_regex = template_ignore_key_regex
         return
 
     def fill(
@@ -30,7 +45,9 @@ class NestedDict:
             value = self.__getitem__(path)
         if not value:
             return
-        filled_value = self.fill_data(data=value, current_path=path, always_list=always_list, recursive=recursive)
+        filled_value = self.fill_data(
+            data=value, current_path=path, always_list=always_list, recursive=recursive,
+        )
         if not path:
             self._data = filled_value
         else:
@@ -50,6 +67,7 @@ class NestedDict:
             current_path=current_path,
             always_list=always_list,
             recursive=recursive,
+            ignore_key_regex=self._ignore_key_regex,
         )
 
     def __call__(self):

{pyserials-0.0.0.dev26 → pyserials-0.0.0.dev27}/src/pyserials/update.py

@@ -93,8 +93,8 @@ class TemplateFiller:
         self,
         marker_start: str = "${{",
         marker_end: str = "}}",
-        marker_start_unpack: str = "*{{",
-        marker_end_unpack: str = "}}",
+        marker_unpack_start: str = "*{{",
+        marker_unpack_end: str = "}}",
         implicit_root: bool = True,
         stringer: Callable[[str], str] = str,
     ):
@@ -107,7 +107,7 @@ class TemplateFiller:
         self._marker_start = marker_start
         self._marker_end = marker_end
         self._pattern_template = make_regex(marker_start, marker_end)
-        self._pattern_template_unpack = make_regex(marker_start_unpack, marker_end_unpack)
+        self._pattern_template_unpack = make_regex(marker_unpack_start, marker_unpack_end)
         self._add_prefix = implicit_root
         self._stringer = stringer
         self._data = None
@@ -115,6 +115,7 @@ class TemplateFiller:
         self._recursive = None
         self._path = None
         self._raise_no_match = None
+        self._ignore_key_regex = None
         return
 
     def fill(
@@ -125,11 +126,13 @@ class TemplateFiller:
         always_list: bool = True,
         recursive: bool = True,
         raise_no_match: bool = True,
+        ignore_key_regex: str | None = None,
     ):
         self._data = templated_data
         self._source = source_data
         self._recursive = recursive
         self._raise_no_match = raise_no_match
+        self._ignore_key_regex = ignore_key_regex
         return self._recursive_subst(
             templ=self._data,
             current_path=(f"$.{current_path}" if self._add_prefix else current_path) if current_path else "$",
@@ -232,7 +235,7 @@ class TemplateFiller:
                 elem_filled = self._recursive_subst(
                     elem, f"{current_path}[{idx}]", always_list
                 )
-                if self._pattern_template_unpack.fullmatch(elem):
+                if isinstance(elem, str) and self._pattern_template_unpack.fullmatch(elem):
                     out.extend(elem_filled)
                 else:
                     out.append(elem_filled)
@@ -241,6 +244,9 @@ class TemplateFiller:
             new_dict = {}
             for key, val in templ.items():
                 key_filled = self._recursive_subst(key, current_path, always_list=False)
+                if self._ignore_key_regex and _re.match(self._ignore_key_regex, key_filled):
+                    new_dict[key_filled] = val
+                    continue
                 new_dict[key_filled] = self._recursive_subst(
                     val, f"{current_path}.'{key_filled}'", always_list=always_list
                 )