mapres 3.dev22__tar.gz → 3.dev24__tar.gz

{mapres-3.dev22/src/mapres.egg-info → mapres-3.dev24}/PKG-INFO

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

{mapres-3.dev22 → mapres-3.dev24}/pyproject.toml

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

{mapres-3.dev22 → mapres-3.dev24}/src/mapres/datamap.py

@@ -36,6 +36,8 @@ class DataMap:
     __syntax__: str = None
     __mode__: str | None = None  # 'dynamic', 'config', 'callable', or None
     __missing_key__: str = 'error'  # 'error', 'silent', 'placeholder'
+    __recursive__: bool = False
+    __max_depth__: int = 10
 
     def as_map(self):
         '''
@@ -92,11 +94,13 @@ class DataMap:
         return out
 
 
-def datamap(_cls=None, *, syntax=None, mode=None, missing_key=None):
+def datamap(_cls=None, *, syntax=None, mode=None, missing_key=None, recursive=None, max_depth=None):
     def wrap(cls):
         cls.__syntax__ = syntax
         cls.__mode__ = mode
         cls.__missing_key__ = missing_key or 'error'
+        cls.__recursive__ = recursive or False
+        cls.__max_depth__ = max_depth or 10
 
         namespace = dict(cls.__dict__)
         namespace['__dict__'] = {}

{mapres-3.dev22 → mapres-3.dev24}/src/mapres/evaluator.py

@@ -33,6 +33,13 @@ class Evaluator:
             return self._eval_call(node)
 
         raise EvaluationError(f'Unknown AST node: {node}')
+    
+    # re-resolve
+    def _re_resolve(self, text: str) -> str:
+        tokens = Tokenizer(text).tokenize()
+        ast = Parser(tokens).parse()
+        return self.evaluate(ast)
+
 
     # template
     def _eval_template(self, node: TemplateNode):
@@ -40,6 +47,42 @@ class Evaluator:
         for child in node.children:
             parts.append(self._eval(child))
         out = ''.join(parts)
+
+        # ---------------------------------------
+        # PER-MAP RECURSION (syntax-scoped)
+        # ---------------------------------------
+        # Find all maps in the layerstack that have recursive=True
+        recursive_maps = [
+            m for m in self.layerstack.all_maps()
+            if getattr(m, '__recursive__', False) is True
+        ]
+
+        # If no maps are recursive, return the first-pass output
+        if not recursive_maps:
+            return out
+
+        # Determine max recursion depth across all recursive maps
+        max_depth = max(getattr(m, '__max_depth__', 10) for m in recursive_maps)
+
+        seen = set()
+        depth = 0
+
+        while depth < max_depth:
+            # Re-tokenize and re-evaluate the ENTIRE output string
+            new_out = self._re_resolve(out)
+
+            # If stable, stop recursion
+            if new_out == out:
+                break
+
+            # Cycle detection
+            if new_out in seen:
+                raise EvaluationError('Cycle detected in recursive map resolution')
+
+            seen.add(new_out)
+            out = new_out
+            depth += 1
+
         return out
 
     # identifier

{mapres-3.dev22 → mapres-3.dev24}/src/mapres/tokenizer.py

@@ -121,6 +121,23 @@ class Tokenizer:
                 self.advance()
                 continue
 
+            # --- $(IDENT) ---
+            if self.match('$('):
+                flush_text()
+                start = self.i
+                self.advance(2)
+                ident = self._read_ident()
+                if ident is not None and self.peek() == ')':
+                    self.emit(TokenType.DOLLAR_OPEN)
+                    self.emit(TokenType.IDENT, ident)
+                    self.advance()
+                    self.emit(TokenType.DOLLAR_CLOSE)
+                    continue
+                self.i = start
+                buf.append(self.peek())
+                self.advance()
+                continue
+
             # --- <IDENT> ---
             if ch == '<':
                 flush_text()

{mapres-3.dev22 → mapres-3.dev24/src/mapres.egg-info}/PKG-INFO

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