mapres 3.dev17__tar.gz → 3.dev19__tar.gz

{mapres-3.dev17/src/mapres.egg-info → mapres-3.dev19}/PKG-INFO

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

{mapres-3.dev17 → mapres-3.dev19}/pyproject.toml

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

{mapres-3.dev17 → mapres-3.dev19}/src/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-3.dev17 → mapres-3.dev19}/src/mapres/evaluator.py

@@ -41,32 +41,13 @@ class Evaluator:
             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
-
+        # recursion disabled for now (Mapres 2–style behavior)
         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 +79,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)
@@ -148,74 +124,14 @@ class Evaluator:
             cur = cur[p]
         return cur
 
+    # recursion helpers now effectively disabled
     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
+        return 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.dev17 → mapres-3.dev19/src/mapres.egg-info}/PKG-INFO

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