mapres 2.2.1__tar.gz → 2.3__tar.gz

{mapres-2.2.1/src/mapres.egg-info → mapres-2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 2.2.1
+Version: 2.3
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT

{mapres-2.2.1 → mapres-2.3}/pyproject.toml

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

{mapres-2.2.1 → mapres-2.3}/src/mapres/datamap.py

@@ -33,6 +33,7 @@ class DataMap:
     def get_syntax(cls):
         return getattr(cls, "__syntax__", syntax.braces)
 
+
 # decorator
 def datamap(
     _cls = None,
@@ -46,7 +47,12 @@ def datamap(
         cls.__mode__ = mode
         namespace = dict(cls.__dict__)
         namespace["__dict__"] = {}
+        # preserve any rules class defined in the original namespace by attaching it to the generated class
+        rules_obj = namespace.get("rules", None)
         cls = type(cls.__name__, (DataMap,), namespace)
+        # attach rules (if present) to the new class so validators can read them via the datamap class
+        if rules_obj is not None:
+            setattr(cls, "rules", rules_obj)
         return dataclass(frozen=False)(cls)
     return wrap if _cls is None else wrap(_cls)
 
@@ -55,4 +61,4 @@ def datamap(
 datamap.braces = datamap(syntax=syntax.braces)
 datamap.angles = datamap(syntax=syntax.angles)
 datamap.dollars = datamap(syntax=syntax.dollars)
-datamap.percents = datamap(syntax=syntax.percents)
+datamap.percents = datamap(syntax=syntax.percents)

{mapres-2.2.1 → mapres-2.3}/src/mapres/resolver.py

@@ -88,7 +88,12 @@ class MapResolver:
                         continue
                     if k in d:
                         return str(d[k])
-                raise MissingKeyError(f"Missing key '{k}' in any layer")
+
+                if k in ctx:
+                    return str(ctx[k])
+
+                raise MissingKeyError(f"Missing key '{k}' in any layer or context")
+
             try:
                 text = re.sub(pattern, repl, text)
             except re.error as exc:

{mapres-2.2.1 → mapres-2.3/src/mapres.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mapres
-Version: 2.2.1
+Version: 2.3
 Summary: A powerfull mapping utility
 Author: iFamished
 License: MIT