PySerials 0.0.0.dev25__tar.gz → 0.0.0.dev26__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev25
+Version: 0.0.0.dev26
 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.dev22
-Requires-Dist: ExceptionMan==0.0.0.dev22
+Requires-Dist: MDit==0.0.0.dev23
+Requires-Dist: ExceptionMan==0.0.0.dev23
 Requires-Dist: ProtocolMan==0.0.0.dev2

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

@@ -17,7 +17,7 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev25"
+version = "0.0.0.dev26"
 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.dev22",
-    "ExceptionMan == 0.0.0.dev22",
+    "MDit == 0.0.0.dev23",
+    "ExceptionMan == 0.0.0.dev23",
     "ProtocolMan == 0.0.0.dev2",
 ]
 requires-python = ">=3.10"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PySerials
-Version: 0.0.0.dev25
+Version: 0.0.0.dev26
 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.dev22
-Requires-Dist: ExceptionMan==0.0.0.dev22
+Requires-Dist: MDit==0.0.0.dev23
+Requires-Dist: ExceptionMan==0.0.0.dev23
 Requires-Dist: ProtocolMan==0.0.0.dev2

{pyserials-0.0.0.dev25 → pyserials-0.0.0.dev26}/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.dev22
-ExceptionMan==0.0.0.dev22
+MDit==0.0.0.dev23
+ExceptionMan==0.0.0.dev23
 ProtocolMan==0.0.0.dev2

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

@@ -1,4 +1,5 @@
-from typing import Literal as _Literal
+from __future__ import annotations as _annotations
+from typing import TYPE_CHECKING as _TYPE_CHECKING
 import re as _re
 
 import jsonpath_ng as _jsonpath
@@ -6,6 +7,9 @@ from jsonpath_ng import exceptions as _jsonpath_exceptions
 
 import pyserials.exception as _exception
 
+if _TYPE_CHECKING:
+    from typing import Literal, Callable
+
 
 def dict_from_addon(
     data: dict,
@@ -18,7 +22,7 @@ def dict_from_addon(
     """Recursively update a dictionary from another dictionary."""
     def recursive(source: dict, add: dict, path: str, log: dict):
 
-        def raise_error(typ: _Literal["duplicate", "type_mismatch"]):
+        def raise_error(typ: Literal["duplicate", "type_mismatch"]):
             raise _exception.update.PySerialsUpdateDictFromAddonError(
                 problem_type=typ,
                 path=fullpath,
@@ -89,15 +93,23 @@ class TemplateFiller:
         self,
         marker_start: str = "${{",
         marker_end: str = "}}",
+        marker_start_unpack: str = "*{{",
+        marker_end_unpack: str = "}}",
         implicit_root: bool = True,
+        stringer: Callable[[str], str] = str,
     ):
+        def make_regex(start, end):
+            start_esc = _re.escape(start)
+            end_esc = _re.escape(end)
+            regex_sub = rf"{start_esc}([^{end_esc}]+){end_esc}"
+            return _re.compile(regex_sub)
+
         self._marker_start = marker_start
         self._marker_end = marker_end
-        start = _re.escape(marker_start)
-        end = _re.escape(marker_end)
-        regex_sub = rf"{start}([^{end}]+){end}"
-        self._pattern_template = _re.compile(regex_sub)
+        self._pattern_template = make_regex(marker_start, marker_end)
+        self._pattern_template_unpack = make_regex(marker_start_unpack, marker_end_unpack)
         self._add_prefix = implicit_root
+        self._stringer = stringer
         self._data = None
         self._source = None
         self._recursive = None
@@ -211,15 +223,20 @@ class TemplateFiller:
             if match_whole_str:
                 return get_address_value(match_whole_str)
             return self._pattern_template.sub(
-                lambda x: str(get_address_value(x)),
+                lambda x: self._stringer(get_address_value(x)),
                 templ
             )
         if isinstance(templ, list):
-            return [
-                self._recursive_subst(
+            out = []
+            for idx, elem in enumerate(templ):
+                elem_filled = self._recursive_subst(
                     elem, f"{current_path}[{idx}]", always_list
-                ) for idx, elem in enumerate(templ)
-            ]
+                )
+                if self._pattern_template_unpack.fullmatch(elem):
+                    out.extend(elem_filled)
+                else:
+                    out.append(elem_filled)
+            return out
         if isinstance(templ, dict):
             new_dict = {}
             for key, val in templ.items():