mapres 3.dev20__py3-none-any.whl → 3.dev21__py3-none-any.whl

mapres/datamap.py

@@ -1,4 +1,3 @@
-import re
 from dataclasses import dataclass, fields, is_dataclass
 
 # syntax identifiers
@@ -30,15 +29,13 @@ class DataMap:
 
     Mode metadata (__mode__) controls behavior:
         - None: plain static map
-        - "dynamic": values may be provided by callables/providers
-        - "config": config-style maps (no dynamic evaluation)
-        - "callable": map exposes callable methods for nested calls
+        - 'dynamic': values may be provided by callables/providers
+        - 'config': config-style maps (no dynamic evaluation)
+        - 'callable': map exposes callable methods for nested calls
     '''
     __syntax__: str = None
-    __mode__: str | None = None # "dynamic", "config", "callable", or None
-    __recursive__: bool = False
+    __mode__: str | None = None  # 'dynamic', 'config', 'callable', or None
     __missing_key__: str = 'error'  # 'error', 'silent', 'placeholder'
-    __ignore_delimiters__: bool = False
 
     def as_map(self):
         '''
@@ -95,14 +92,11 @@ class DataMap:
         return out
 
 
-def datamap(_cls=None, *, syntax=None, mode=None, recursive=None, missing_key=None, ignore_delimiters=None):
-
+def datamap(_cls=None, *, syntax=None, mode=None, missing_key=None):
     def wrap(cls):
         cls.__syntax__ = syntax
         cls.__mode__ = mode
-        cls.__recursive__ = recursive
         cls.__missing_key__ = missing_key or 'error'
-        cls.__ignore_delimiters__ = ignore_delimiters or False
 
         namespace = dict(cls.__dict__)
         namespace['__dict__'] = {}

mapres/evaluator.py

@@ -40,33 +40,12 @@ class Evaluator:
         for child in node.children:
             parts.append(self._eval(child))
         out = ''.join(parts)
-
-        # recursion over full template output
-        if self._has_recursive_maps():
-            seen = set()
-            depth = 0
-            max_depth = self._get_max_depth()
-
-            while depth < max_depth:
-                new_out = self._re_resolve(out)
-                if new_out == out:
-                    break
-                if new_out in seen:
-                    raise EvaluationError('Cycle detected in template recursion')
-                seen.add(new_out)
-                out = new_out
-                depth += 1
-
         return out
 
     # identifier
     def _eval_ident(self, node: IdentNode):
         name = node.name
 
-        # ignore_delimiters: treat token as literal for this syntax
-        if self._syntax_ignores_delimiters(node.syntax):
-            return self._literal_from_syntax(name, node.syntax)
-
         # cycle detection
         if name in self._seen:
             raise EvaluationError(f"Cycle detected in identifier '{name}'")
@@ -98,11 +77,6 @@ class Evaluator:
     def _eval_call(self, node: CallNode):
         outer = node.name
 
-        # ignore_delimiters: treat call token as literal
-        if self._syntax_ignores_delimiters(node.syntax):
-            arg_text = self._eval(node.arg)
-            return self._literal_from_syntax(outer, node.syntax, is_call=True, arg_text=arg_text)
-
         if outer in self._seen:
             raise EvaluationError(f"Cycle detected in call '{outer}'")
         self._seen.add(outer)
@@ -147,75 +121,3 @@ class Evaluator:
                 return None
             cur = cur[p]
         return cur
-
-    def _has_recursive_maps(self):
-        for m in self.layerstack.all_maps():
-            if getattr(m, '__recursive__', False) is True:
-                return True
-        return False
-
-    def _get_max_depth(self):
-        depths = [
-            getattr(m, '__max_depth__', 10)
-            for m in self.layerstack.all_maps()
-            if getattr(m, '__recursive__', False) is True
-        ]
-        return max(depths) if depths else 0
-
-    def _re_resolve(self, text: str) -> str:
-        tokens = Tokenizer(text).tokenize()
-        ast = Parser(tokens).parse()
-        return self.evaluate(ast)
-
-    def _syntax_ignores_delimiters(self, syntax_name: str) -> bool:
-        for m in self.layerstack.all_maps():
-            if getattr(m, '__syntax__', None) == syntax_name:
-                if getattr(m, '__ignore_delimiters__', False):
-                    return True
-        return False
-
-    def _literal_from_syntax(self, name: str, syntax_name: str, is_call: bool = False, arg_text: str | None = None) -> str:
-        if not is_call:
-            if syntax_name == 'colons':
-                return f':{name}:'
-            if syntax_name == 'braces':
-                return f'{{{{{name}}}}}'
-            if syntax_name == 'dollars':
-                return f'${{{name}}}'
-            if syntax_name == 'angles':
-                return f'<{name}>'
-            if syntax_name == 'pipes':
-                return f'|{name}|'
-            if syntax_name == 'percents':
-                return f'%{name}%'
-            if syntax_name == 'paren_dollars':
-                return f'$({name})'
-            if syntax_name == 'at_tags':
-                return f'@{name}@'
-            if syntax_name == 'hash_tags':
-                return f'#{name}#'
-            return name
-
-        # call literal: syntax-specific wrapping of name(arg_text)
-        arg = arg_text or ''
-        inner = f'{name}({arg})'
-
-        if syntax_name == 'colons':
-            return f':{inner}:'
-        if syntax_name == 'braces':
-            return f'{{{{{inner}}}}}'
-        if syntax_name == 'dollars':
-            return f'${{{inner}}}'
-        if syntax_name == 'angles':
-            return f'<{inner}>'
-        if syntax_name == 'pipes':
-            return f'|{inner}|'
-        if syntax_name == 'percents':
-            return f'%{inner}%'
-        if syntax_name == 'paren_dollars':
-            return f'$({inner})'
-        if syntax_name == 'at_tags':
-            return f'@{inner}@'
-        if syntax_name == 'hash_tags':
-            return f'#{inner}#'
-        return inner

{mapres-3.dev20.dist-info → mapres-3.dev21.dist-info}/METADATA

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

{mapres-3.dev20.dist-info → mapres-3.dev21.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=lqz781REOWSt0YwliSrKA1gDxrLeNgN--wwtyyl8Cp8,5244
-mapres/evaluator.py,sha256=glpB4wzugtst4QtkQyAHwUXliHs13B1P4h4VjRAdgp0,6978
+mapres/datamap.py,sha256=R_5G_mE2OZpZ9YVL4tsNXAGS_SkQ6LKlx6Bz2Pr652Y,5021
+mapres/evaluator.py,sha256=KNZ9aygOClM0kgnOf3anigsupLF175EJ07z_17ubZzU,3441
 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.dev20.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-mapres-3.dev20.dist-info/METADATA,sha256=aOvYC-_w1Kk_sBwqdIpEfEwTamgHFHepWYf0uDGo_4E,1476
-mapres-3.dev20.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-mapres-3.dev20.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
-mapres-3.dev20.dist-info/RECORD,,
+mapres-3.dev21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+mapres-3.dev21.dist-info/METADATA,sha256=SrQXRywgQfa_pKRb7Egsdagr1pNwn2F9S3bBdpTWdVQ,1476
+mapres-3.dev21.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+mapres-3.dev21.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
+mapres-3.dev21.dist-info/RECORD,,