mapres 3.dev18__py3-none-any.whl → 3.dev19__py3-none-any.whl

mapres/datamap.py

@@ -101,7 +101,8 @@ def datamap(_cls=None, *, syntax=None, mode=None, recursive=None,
     def wrap(cls):
         cls.__syntax__ = syntax
         cls.__mode__ = mode
-        cls.__recursive__ = recursive
+        cls.__recursive__ = recursive if recursive is not None else False
+        # cls.__recursive__ = recursive
         cls.__missing_key__ = missing_key or 'error'
         cls.__ignore_delimiters__ = ignore_delimiters or False
 

mapres/evaluator.py

@@ -14,45 +14,54 @@ class Evaluator:
         self.ctx = ctx or {}
         self._seen = set()  # cycle detection
 
+    # public api
     def evaluate(self, node):
         return self._eval(node)
 
+    # internal dispatch
     def _eval(self, node):
         if isinstance(node, TemplateNode):
             return self._eval_template(node)
+
         if isinstance(node, TextNode):
             return node.text
+
         if isinstance(node, IdentNode):
             return self._eval_ident(node)
+
         if isinstance(node, CallNode):
             return self._eval_call(node)
+
         raise EvaluationError(f'Unknown AST node: {node}')
 
+    # template
     def _eval_template(self, node: TemplateNode):
         parts = []
         for child in node.children:
             parts.append(self._eval(child))
         out = ''.join(parts)
 
-        # recursion disabled for now
+        # recursion disabled for now (Mapres 2–style behavior)
         return out
 
+    # identifier
     def _eval_ident(self, node: IdentNode):
         name = node.name
 
+        # cycle detection
         if name in self._seen:
             raise EvaluationError(f"Cycle detected in identifier '{name}'")
         self._seen.add(name)
 
         parts = name.split('.')
 
-        # ctx first
+        # 1. ctx first
         val = self._lookup_hierarchical(self.ctx, parts)
         if val is not None:
             self._seen.remove(name)
             return str(val)
 
-        # syntax-bound maps
+        # 2. syntax-bound maps
         for m in self.layerstack.all_maps():
             if getattr(m, '__syntax__', None) not in (None, node.syntax):
                 continue
@@ -66,6 +75,7 @@ class Evaluator:
         self._seen.remove(name)
         raise MissingKeyError(name)
 
+    # call (nested token)
     def _eval_call(self, node: CallNode):
         outer = node.name
 
@@ -96,6 +106,7 @@ class Evaluator:
         self._seen.remove(outer)
         raise MissingKeyError(f'{outer}({arg_value})')
 
+    # helpers
     def _map_to_dict(self, m):
         if hasattr(m, 'as_map'):
             return m.as_map()
@@ -113,7 +124,7 @@ class Evaluator:
             cur = cur[p]
         return cur
 
-    # recursion helpers now unused
+    # recursion helpers now effectively disabled
     def _has_recursive_maps(self):
         return False
 

{mapres-3.dev18.dist-info → mapres-3.dev19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 3.dev18
+Version: 3.dev19
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT

{mapres-3.dev18.dist-info → mapres-3.dev19.dist-info}/RECORD

@@ -1,8 +1,8 @@
 mapres/__init__.py,sha256=t23ofM-wzpPByYi1rEQonxyU1yyza4ZzwwHDZUa5QqA,1010
 mapres/ast.py,sha256=6PcMkwtNHYD8xEkdyzDgn_mRTj1ZaWSyuHZK3BtXiuo,427
 mapres/cache.py,sha256=hbvsoc6Qw3RhWAEfOOpKHtC7i9EomoUgWzyd4dnH71w,333
-mapres/datamap.py,sha256=v9DAIYaS-vkBU1BKmshGYnquZa2JPwcct661zaEFocs,5256
-mapres/evaluator.py,sha256=19oUC5BGqMz0j0SDsE_FJkL7C6HR4DTDlztvAJR-HkU,3631
+mapres/datamap.py,sha256=ZTLRBtUCxB9_OTsMk9jEHt_ib9W98iJUlNuOxvJXgt4,5332
+mapres/evaluator.py,sha256=pLvGORfd2qe0gRdnrhz3pHp-whh9WP4ktYxm8EONdCE,3822
 mapres/exceptions.py,sha256=D2XKnrMkZDyUXQt2PmaKbj08FObWU00yXKGHwNpjvww,222
 mapres/layers.py,sha256=sFc1eUOBg2BoB2cBXIleq8RMYcg5GZpUoCnGh-uKN6U,1380
 mapres/parser.py,sha256=8XLCzYosvh81bN-Jddc1AM4w0X7bsHnBzmA8sq5_72w,4018
@@ -11,8 +11,8 @@ mapres/tokenizer.py,sha256=js0S1s8MkltdQoH5V1cLjdY0fFqZoGqmtP_OhEJEM6M,6539
 mapres/maps/__init__.py,sha256=lIRRfem1Fw4iynuwUQ7BY5qrC4fbJKxqLivao2_Dtm4,239
 mapres/maps/color.py,sha256=noRTGFNo9xLl5YEhX0tttV6i_oDAiptXmRVnkr5EzwM,1348
 mapres/maps/time.py,sha256=TyncycYoIGVZWps32qWlFy2a2hTayvZWVHu9uh2nid8,2050
-mapres-3.dev18.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-mapres-3.dev18.dist-info/METADATA,sha256=5Kx-vfrbYympon_lWZsDhJagWAcOKQI51mvKC3D1-Cc,1476
-mapres-3.dev18.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-mapres-3.dev18.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
-mapres-3.dev18.dist-info/RECORD,,
+mapres-3.dev19.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+mapres-3.dev19.dist-info/METADATA,sha256=3TALs5m0rP4P0WyctslQvZwyTH0QNo3d1oQLvOuAVDU,1476
+mapres-3.dev19.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+mapres-3.dev19.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
+mapres-3.dev19.dist-info/RECORD,,