mapres 2.4a3__tar.gz → 2.4a5__tar.gz

{mapres-2.4a3/src/mapres.egg-info → mapres-2.4a5}/PKG-INFO

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

{mapres-2.4a3 → mapres-2.4a5}/pyproject.toml

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

{mapres-2.4a3 → mapres-2.4a5}/src/mapres/datamap.py

@@ -2,16 +2,20 @@ import re
 from dataclasses import dataclass, fields, is_dataclass
 
 class syntax:
-    braces   = r'\{([^{}]+)\}'
-    dollars  = r'\$\{([^{}]+)\}'
-    angles   = r'<([^<>]+)>'
-    percents = r'%([^%]+)%'
-
+    double_braces = r'\{\{([^{}]+)\}\}'     # {{value}}
+    dollars       = r'\$\{([^{}]+)\}'       # ${value}
+    angles        = r'<([^<>]+)>'           # <value>
+    percents      = r'%([^%]+)%'            # %value%
+    at_tags       = r'@([^@]+)@'            # @value@
+    hash_tags     = r'#([^#]+)#'            # #value#
+    pipe_tags     = r'\|([^|]+)\|'          # |value|
+    paren_dollar  = r'\$\(([^)]+)\)'        # $(value)
+    colons        = r':([^:\n]+):'          # :value:
 
 @dataclass
 class DataMap:
     '''Core datamap class. Contains logic used to make datamaps'''
-    __syntax__: str = syntax.braces
+    __syntax__: str = syntax.double_braces
     __mode__: str | None = None
 
     def as_map(self):
@@ -31,14 +35,14 @@ class DataMap:
 
     @classmethod
     def get_syntax(cls):
-        return getattr(cls, '__syntax__', syntax.braces)
+        return getattr(cls, '__syntax__', syntax.double_braces)
 
 
 # decorator
 def datamap(
     _cls = None,
     *,
-    syntax: str = syntax.braces,
+    syntax: str = syntax.double_braces,
     mode: bool | str | None = None,
 ):
     '''@datamap decorator with optional values'''
@@ -47,10 +51,8 @@ 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)
@@ -58,7 +60,12 @@ def datamap(
 
 
 # decorator shortcuts
-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.double_braces = datamap(syntax=syntax.double_braces)
+datamap.angles        = datamap(syntax=syntax.angles)
+datamap.dollars       = datamap(syntax=syntax.dollars)
+datamap.percents      = datamap(syntax=syntax.percents)
+datamap.at_tags       = datamap(syntax=syntax.at_tags)
+datamap.hash_tags     = datamap(syntax=syntax.hash_tags)
+datamap.pipe_tags     = datamap(syntax=syntax.pipe_tags)
+datamap.paren_dollar  = datamap(syntax=syntax.paren_dollar)
+datamap.colons        = datamap(syntax=syntax.colons)

{mapres-2.4a3 → mapres-2.4a5/src/mapres.egg-info}/PKG-INFO

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