mapres 3.dev24__tar.gz → 3.dev26__tar.gz

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

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

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

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

{mapres-3.dev24 → mapres-3.dev26}/src/mapres/__init__.py

@@ -10,6 +10,7 @@ except PackageNotFoundError:
 from .resolver import MapResolver, res, setGlobalMaps
 from .datamap import DataMap, datamap, syntax
 from .layers import Layer, LayerStack
+from .utils import rprint
 
 # maps
 from .maps.color import ColorMap, ascii_colors, mc_colors, strip_colors
@@ -28,6 +29,10 @@ maps = SimpleNamespace(
     time = time,
 )
 
+utils = SimpleNamespace(
+    rprint = rprint,
+)
+
 __all__ = [
     # core modules
     'MapResolver',
@@ -39,6 +44,9 @@ __all__ = [
     'LayerStack',
     'setGlobalMaps',
 
+    # utils
+    'rprint',
+
     # maps
     'ColorMap',
     'ascii_colors',
@@ -49,4 +57,5 @@ __all__ = [
 
     # namespaces
     'maps',
+    'utils',
 ]

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

@@ -121,14 +121,6 @@ def datamap(_cls=None, *, syntax=None, mode=None, missing_key=None, recursive=No
 
 # syntax-bound decorator factories
 class _SyntaxFactory:
-    '''
-    Allows:
-        @datamap.angles
-        @datamap.angles(mode='config')
-        @datamap.angles.config
-        @datamap.angles.dynamic
-        @datamap.angles.callable
-    '''
     def __init__(self, syntax_name):
         self._syntax = syntax_name
 
@@ -137,17 +129,20 @@ class _SyntaxFactory:
             return datamap(_cls, syntax=self._syntax)
         return datamap(syntax=self._syntax, **kwargs)
 
-    @property
-    def config(self):
-        return datamap(syntax=self._syntax, mode='config')
+    def config(self, _cls=None, **kwargs):
+        if _cls is not None and isinstance(_cls, type):
+            return datamap(_cls, syntax=self._syntax, mode='config')
+        return datamap(syntax=self._syntax, mode='config', **kwargs)
 
-    @property
-    def dynamic(self):
-        return datamap(syntax=self._syntax, mode='dynamic')
+    def dynamic(self, _cls=None, **kwargs):
+        if _cls is not None and isinstance(_cls, type):
+            return datamap(_cls, syntax=self._syntax, mode='dynamic')
+        return datamap(syntax=self._syntax, mode='dynamic', **kwargs)
 
-    @property
-    def callable(self):
-        return datamap(syntax=self._syntax, mode='callable')
+    def callable(self, _cls=None, **kwargs):
+        if _cls is not None and isinstance(_cls, type):
+            return datamap(_cls, syntax=self._syntax, mode='callable')
+        return datamap(syntax=self._syntax, mode='callable', **kwargs)
 
 
 datamap.braces        = _SyntaxFactory(syntax.braces)

{mapres-3.dev24 → mapres-3.dev26}/src/mapres/resolver.py

@@ -129,7 +129,7 @@ def setGlobalMaps(maps, *, priority=0):
     _DEFAULT_RESOLVER.layers.add_layer(maps, priority=priority)
 
 def res(text: str, **ctx) -> str:
-    """
+    '''
     Simple global resolution.
-    """
+    '''
     return _DEFAULT_RESOLVER.res(text, **ctx)

mapres-3.dev26/src/mapres/utils.py

@@ -0,0 +1,5 @@
+from .resolver import res
+
+def rprint(text: str, **ctx) -> None:
+    '''Simple global resolution and print'''
+    print(res(text, **ctx))

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

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

{mapres-3.dev24 → mapres-3.dev26}/src/mapres.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/mapres/layers.py
 src/mapres/parser.py
 src/mapres/resolver.py
 src/mapres/tokenizer.py
+src/mapres/utils.py
 src/mapres.egg-info/PKG-INFO
 src/mapres.egg-info/SOURCES.txt
 src/mapres.egg-info/dependency_links.txt