mapres 2.0__tar.gz → 2.1__tar.gz

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

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

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

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

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

@@ -13,19 +13,28 @@ from .layers import Layer, LayerStack
 
 # maps
 from .maps.color import ColorMap, ascii_colors, mc_colors, strip_colors
-from .maps.time import TimeMap, time_tk
+from .maps.time import TimeMap, time
+from .maps.math import MathMap, math
 
 # namespaces
 maps = SimpleNamespace(
+    # color
     ColorMap = ColorMap,
     ascii_colors = ascii_colors,
     mc_colors = mc_colors,
     strip_colors = strip_colors,
+
+    # time
     TimeMap = TimeMap,
-    time_tk = time_tk,
+    time = time,
+
+    # math
+    MathMap = MathMap,
+    math = math,
 )
 
 __all__ = [
+    # core modules
     'MapResolver',
     'res',
     'DataMap',
@@ -40,7 +49,9 @@ __all__ = [
     'mc_colors',
     'strip_colors',
     'TimeMap',
-    'time_tk',
+    'time',
+    'MathMap',
+    'math',
 
     # namespaces
     'maps',

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

@@ -1,12 +1,19 @@
 from .color import ColorMap, ascii_colors, mc_colors, strip_colors
-from .time import TimeMap, time_tk
+from .time import TimeMap, time
 
 
 __all__ = [
+    # color
     'ColorMap',
     'ascii_colors',
     'mc_colors',
     'strip_colors',
+
+    # time
     'TimeMap',
-    'time_tk',
+    'time',
+
+    # math
+    'MathMap',
+    'math'
 ]

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

@@ -0,0 +1,58 @@
+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

{mapres-2.0 → mapres-2.1}/src/mapres/maps/time.py

@@ -61,5 +61,6 @@ class TimeMap:
             'weekday': lambda: now().strftime('%A'),
         }
 
+
 # proxy map
-time_tk = TimeMap
+time = TimeMap

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

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

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

@@ -14,4 +14,5 @@ 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