mapres 2.1__tar.gz → 2.2.1__tar.gz

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

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

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

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

{mapres-2.1 → mapres-2.2.1}/src/mapres/__init__.py

@@ -14,7 +14,6 @@ from .layers import Layer, LayerStack
 # maps
 from .maps.color import ColorMap, ascii_colors, mc_colors, strip_colors
 from .maps.time import TimeMap, time
-from .maps.math import MathMap, math
 
 # namespaces
 maps = SimpleNamespace(
@@ -27,10 +26,6 @@ maps = SimpleNamespace(
     # time
     TimeMap = TimeMap,
     time = time,
-
-    # math
-    MathMap = MathMap,
-    math = math,
 )
 
 __all__ = [
@@ -50,8 +45,6 @@ __all__ = [
     'strip_colors',
     'TimeMap',
     'time',
-    'MathMap',
-    'math',
 
     # namespaces
     'maps',

{mapres-2.1 → mapres-2.2.1}/src/mapres/maps/__init__.py

@@ -12,8 +12,4 @@ __all__ = [
     # time
     'TimeMap',
     'time',
-
-    # math
-    'MathMap',
-    'math'
 ]

{mapres-2.1 → mapres-2.2.1}/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.1/src/mapres.egg-info}/PKG-INFO

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

{mapres-2.1 → mapres-2.2.1}/src/mapres.egg-info/SOURCES.txt

@@ -14,5 +14,4 @@ src/mapres.egg-info/requires.txt
 src/mapres.egg-info/top_level.txt
 src/mapres/maps/__init__.py
 src/mapres/maps/color.py
-src/mapres/maps/math.py
 src/mapres/maps/time.py

mapres-2.1/src/mapres/maps/math.py

@@ -1,58 +0,0 @@
-import ast
-from mapres.datamap import datamap, syntax
-
-
-def safe_eval(expr: str, ctx: dict):
-    """
-    Safely evaluate arithmetic expressions using AST.
-    Allowed:
-      - numbers
-      - names (from ctx)
-      - + - * / // % **
-      - parentheses
-    """
-    node = ast.parse(expr, mode="eval")
-
-    allowed_nodes = (
-        ast.Expression, ast.BinOp, ast.UnaryOp,
-        ast.Num, ast.Name, ast.Load,
-        ast.Add, ast.Sub, ast.Mult, ast.Div,
-        ast.FloorDiv, ast.Mod, ast.Pow,
-        ast.USub, ast.UAdd, ast.Constant,
-    )
-
-    for sub in ast.walk(node):
-        if not isinstance(sub, allowed_nodes):
-            raise ValueError(f"Disallowed expression: {expr}")
-
-        if isinstance(sub, ast.Name) and sub.id not in ctx:
-            raise KeyError(f"Unknown variable '{sub.id}' in expression '{expr}'")
-
-    return eval(compile(node, "<math>", "eval"), {}, ctx)
-
-
-@datamap(syntax=r"\$\{\{(.+?)\}\}", mode="dynamic")
-class MathMap:
-    expr: str = None
-
-    def __init__(self):
-        self._ctx = {}
-
-    @property
-    def providers(self):
-        return {
-            "expr": lambda: None
-        }
-
-    def get_map(self, ctx, resolver):
-        # store ctx so safe_eval can use it
-        self._ctx = ctx
-
-        def repl(expr):
-            return safe_eval(expr, ctx)
-
-        return repl
-
-
-# proxy map
-math = MathMap