mapres 2.1__tar.gz → 2.2__tar.gz

{mapres-2.1/src/mapres.egg-info → mapres-2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 2.1
+Version: 2.2
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT

{mapres-2.1 → mapres-2.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mapres"
-version = "2.1"
+version = "2.2"
 description = "A powerfull mapping utility"
 readme = "README.md"
 requires-python = ">=3.9"

{mapres-2.1 → mapres-2.2}/src/mapres/resolver.py

@@ -61,32 +61,38 @@ class MapResolver:
         return text
 
     # layered maps
-    def _apply_maps(self, text: str, ctx: dict, layerstack: LayerStack) -> str:
+    def _apply_maps(self, text: str, ctx: dict, layerstack: LayerStack):
+        syntax_patterns = []
         for m in layerstack:
-
-            # class-based layer
             if isinstance(m, type) and hasattr(m, "as_map"):
                 m = m()
             if hasattr(m, "as_map"):
-                pattern = m.get_syntax()
-                d = m.as_map()
+                syntax_patterns.append(m.get_syntax())
             elif isinstance(m, dict):
                 pattern = ctx.get("syntax")
-                if not pattern:
-                    continue
-                d = m
-            else:
-                continue
-
-            def repl(match: re.Match) -> str:
+                if pattern:
+                    syntax_patterns.append(pattern)
+        syntax_patterns = list(dict.fromkeys(syntax_patterns))
+        for pattern in syntax_patterns:
+            def repl(match: re.Match):
                 k = match.group(1)
-                if k not in d:
-                    raise MissingKeyError(f"Missing key '{k}' in layer {m}")
-                return str(d[k])
+                for m in layerstack:
+                    layer = m
+                    if isinstance(layer, type) and hasattr(layer, "as_map"):
+                        layer = layer()
+                    if hasattr(layer, "as_map"):
+                        d = layer.as_map()
+                    elif isinstance(layer, dict):
+                        d = layer
+                    else:
+                        continue
+                    if k in d:
+                        return str(d[k])
+                raise MissingKeyError(f"Missing key '{k}' in any layer")
             try:
                 text = re.sub(pattern, repl, text)
             except re.error as exc:
-                raise MapSyntaxError(f"Regex error in layer {m}: {exc}") from exc
+                raise MapSyntaxError(f"Regex error in syntax pattern {pattern}: {exc}") from exc
         return text
 
     # context

{mapres-2.1 → mapres-2.2/src/mapres.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 2.1
+Version: 2.2
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT