PySerials 0.0.0.dev25__py3-none-any.whl → 0.0.0.dev26__py3-none-any.whl

{PySerials-0.0.0.dev25.dist-info → PySerials-0.0.0.dev26.dist-info}/METADATA

@@ -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,7 +8,7 @@ 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.dist-info → PySerials-0.0.0.dev26.dist-info}/RECORD

@@ -3,7 +3,7 @@ pyserials/compare.py,sha256=j62A1UIiAm08_xONlbZmU2EcH1GMEpDyEQH66dZ2YMM,1297
 pyserials/format.py,sha256=dTukpab6WHSyVRQ9SteY5fhr3GFjWFboEl-1cw_udVY,1729
 pyserials/nested_dict.py,sha256=8cPs4LykXh4stFpaLINPjrAeSyaOyyTdhg0FZZ2YOYA,3361
 pyserials/read.py,sha256=uucYQH1V4GStwRgRZ2eQIXkH4ukB5qz0EA885grwi68,6592
-pyserials/update.py,sha256=GfrFgc1a2qYqR8zs04cngVKcXE0124o20xiJQiSMIxg,9259
+pyserials/update.py,sha256=rYf-wFQaqyEu5gbJ9a3P1_w0nQpTpUk4KwaRpmsXtLI,9968
 pyserials/validate.py,sha256=ti0D_yLzB_HELvf1d5qrarx1Ac-opBMN1Xh5lADRAQU,3664
 pyserials/write.py,sha256=pN8w78qVsKJjZd_jvPUcZjYp_RJkP7uQzpiXvPOv4lM,1776
 pyserials/exception/__init__.py,sha256=ZhbggwJUMlTyBhifAivC8ZQxP1Na6lJAwzZs7_YjOSU,151
@@ -11,7 +11,7 @@ pyserials/exception/_base.py,sha256=IdaZwBPBYgiUaWnvN0eMXvQQBqLbN1t766034CK7Hlc,
 pyserials/exception/read.py,sha256=QyG6ulExXH9u8oDRjUfter70SMDVQqL4nig5s-JzWN4,9252
 pyserials/exception/update.py,sha256=P0js2-iY2fgO_KLdqedgWE3TTS5Xz15cusZY_wuKIW4,4222
 pyserials/exception/validate.py,sha256=7UkQEEqCa8HJ20gpTFnLDhT3P5OPLD2oD9fUK2Jcuns,7466
-PySerials-0.0.0.dev25.dist-info/METADATA,sha256=AED-NAQT-ry8tShp2z2FomxoGwIx6TG6IQ09Y0lehJ8,438
-PySerials-0.0.0.dev25.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-PySerials-0.0.0.dev25.dist-info/top_level.txt,sha256=SAks7WjSjdkv3i9Hvt4gY_P7VQbhhYJN5mf5dqx1aao,10
-PySerials-0.0.0.dev25.dist-info/RECORD,,
+PySerials-0.0.0.dev26.dist-info/METADATA,sha256=Uqw0SeAg3Byf11FqeJOlQS-pCWx7pfuCoYzprl25bvk,438
+PySerials-0.0.0.dev26.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+PySerials-0.0.0.dev26.dist-info/top_level.txt,sha256=SAks7WjSjdkv3i9Hvt4gY_P7VQbhhYJN5mf5dqx1aao,10
+PySerials-0.0.0.dev26.dist-info/RECORD,,

{PySerials-0.0.0.dev25.dist-info → PySerials-0.0.0.dev26.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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():