mapres 3.dev22__py3-none-any.whl → 3.dev24__py3-none-any.whl

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/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/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.dist-info → mapres-3.dev24.dist-info}/METADATA

@@ -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.dist-info → mapres-3.dev24.dist-info}/RECORD

@@ -1,18 +1,18 @@
 mapres/__init__.py,sha256=t23ofM-wzpPByYi1rEQonxyU1yyza4ZzwwHDZUa5QqA,1010
 mapres/ast.py,sha256=6PcMkwtNHYD8xEkdyzDgn_mRTj1ZaWSyuHZK3BtXiuo,427
 mapres/cache.py,sha256=hbvsoc6Qw3RhWAEfOOpKHtC7i9EomoUgWzyd4dnH71w,333
-mapres/datamap.py,sha256=R_5G_mE2OZpZ9YVL4tsNXAGS_SkQ6LKlx6Bz2Pr652Y,5021
-mapres/evaluator.py,sha256=KNZ9aygOClM0kgnOf3anigsupLF175EJ07z_17ubZzU,3441
+mapres/datamap.py,sha256=dBYRYijqCBt41MGg95ZEw40C--0ZTnH0Foq-Vv9-jhA,5204
+mapres/evaluator.py,sha256=MV5nyQJ0R40RX4CdXj-lXXKT6dEG_ocoGClM6kLs38U,4756
 mapres/exceptions.py,sha256=D2XKnrMkZDyUXQt2PmaKbj08FObWU00yXKGHwNpjvww,222
 mapres/layers.py,sha256=sFc1eUOBg2BoB2cBXIleq8RMYcg5GZpUoCnGh-uKN6U,1380
 mapres/parser.py,sha256=q3PgyvXJn9c-EJJYyibw7sHJ0Y9soirgB10OyTKaT9s,3657
 mapres/resolver.py,sha256=kQexTdBnPy70Azh_U6--hwUtnIJjoKcuaJ2KlBaG3Rg,3889
-mapres/tokenizer.py,sha256=0iBJBiqY4-_7jKUpY38HzLoZ2m_l2WJJvhBqcRUwo50,7182
+mapres/tokenizer.py,sha256=O28ZTClzC8CkHlnjMHlyGsSLXwMRKIho-JZLF-JDxj0,7795
 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.dev22.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-mapres-3.dev22.dist-info/METADATA,sha256=3gas02EXpAh_Gh52KVRfuhJQ0IKhUQLiwYRGYd-IbFo,1476
-mapres-3.dev22.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-mapres-3.dev22.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
-mapres-3.dev22.dist-info/RECORD,,
+mapres-3.dev24.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+mapres-3.dev24.dist-info/METADATA,sha256=3uX4LVE1YqRCOJP4ehkXZ4ng3VrFL4geQN0OVuYKAjc,1476
+mapres-3.dev24.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+mapres-3.dev24.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
+mapres-3.dev24.dist-info/RECORD,,