mapres 2.3__py3-none-any.whl → 2.4.dev1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- mapres/datamap.py +11 -11
- mapres/maps/color.py +58 -58
- mapres/maps/time.py +1 -1
- mapres/resolver.py +21 -21
- {mapres-2.3.dist-info → mapres-2.4.dev1.dist-info}/METADATA +1 -1
- mapres-2.4.dev1.dist-info/RECORD +14 -0
- {mapres-2.3.dist-info → mapres-2.4.dev1.dist-info}/WHEEL +1 -1
- mapres-2.3.dist-info/RECORD +0 -14
- {mapres-2.3.dist-info → mapres-2.4.dev1.dist-info}/licenses/LICENSE +0 -0
- {mapres-2.3.dist-info → mapres-2.4.dev1.dist-info}/top_level.txt +0 -0
mapres/datamap.py
CHANGED
|
@@ -2,10 +2,10 @@ import re
|
|
|
2
2
|
from dataclasses import dataclass, fields, is_dataclass
|
|
3
3
|
|
|
4
4
|
class syntax:
|
|
5
|
-
braces = r
|
|
6
|
-
dollars = r
|
|
7
|
-
angles = r
|
|
8
|
-
percents = r
|
|
5
|
+
braces = r'\{([^{}]+)\}'
|
|
6
|
+
dollars = r'\$\{([^{}]+)\}'
|
|
7
|
+
angles = r'<([^<>]+)>'
|
|
8
|
+
percents = r'%([^%]+)%'
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
@dataclass
|
|
@@ -17,11 +17,11 @@ class DataMap:
|
|
|
17
17
|
def as_map(self):
|
|
18
18
|
result = {}
|
|
19
19
|
for f in fields(self):
|
|
20
|
-
if not f.init or f.name in (
|
|
20
|
+
if not f.init or f.name in ('__syntax__', '__mode__'):
|
|
21
21
|
continue
|
|
22
22
|
val = getattr(self, f.name)
|
|
23
|
-
if self.__mode__ ==
|
|
24
|
-
providers = getattr(self,
|
|
23
|
+
if self.__mode__ == 'dynamic':
|
|
24
|
+
providers = getattr(self, 'providers', None)
|
|
25
25
|
if isinstance(providers, dict) and f.name in providers:
|
|
26
26
|
val = providers[f.name]
|
|
27
27
|
if callable(val):
|
|
@@ -31,7 +31,7 @@ class DataMap:
|
|
|
31
31
|
|
|
32
32
|
@classmethod
|
|
33
33
|
def get_syntax(cls):
|
|
34
|
-
return getattr(cls,
|
|
34
|
+
return getattr(cls, '__syntax__', syntax.braces)
|
|
35
35
|
|
|
36
36
|
|
|
37
37
|
# decorator
|
|
@@ -46,13 +46,13 @@ def datamap(
|
|
|
46
46
|
cls.__syntax__ = syntax
|
|
47
47
|
cls.__mode__ = mode
|
|
48
48
|
namespace = dict(cls.__dict__)
|
|
49
|
-
namespace[
|
|
49
|
+
namespace['__dict__'] = {}
|
|
50
50
|
# preserve any rules class defined in the original namespace by attaching it to the generated class
|
|
51
|
-
rules_obj = namespace.get(
|
|
51
|
+
rules_obj = namespace.get('rules', None)
|
|
52
52
|
cls = type(cls.__name__, (DataMap,), namespace)
|
|
53
53
|
# attach rules (if present) to the new class so validators can read them via the datamap class
|
|
54
54
|
if rules_obj is not None:
|
|
55
|
-
setattr(cls,
|
|
55
|
+
setattr(cls, 'rules', rules_obj)
|
|
56
56
|
return dataclass(frozen=False)(cls)
|
|
57
57
|
return wrap if _cls is None else wrap(_cls)
|
|
58
58
|
|
mapres/maps/color.py
CHANGED
|
@@ -2,74 +2,74 @@ from mapres.datamap import datamap, syntax
|
|
|
2
2
|
|
|
3
3
|
@datamap(syntax=syntax.angles) # produces <>
|
|
4
4
|
class ColorMap:
|
|
5
|
-
black: str =
|
|
6
|
-
dark_blue: str =
|
|
7
|
-
dark_green: str =
|
|
8
|
-
dark_aqua: str =
|
|
9
|
-
dark_red: str =
|
|
10
|
-
dark_purple: str =
|
|
11
|
-
gold: str =
|
|
12
|
-
gray: str =
|
|
13
|
-
dark_gray: str =
|
|
14
|
-
blue: str =
|
|
15
|
-
green: str =
|
|
16
|
-
aqua: str =
|
|
17
|
-
red: str =
|
|
18
|
-
light_purple: str =
|
|
19
|
-
yellow: str =
|
|
20
|
-
white: str =
|
|
21
|
-
reset: str =
|
|
22
|
-
bold: str =
|
|
23
|
-
italic: str =
|
|
5
|
+
black: str = '\033[30m'
|
|
6
|
+
dark_blue: str = '\033[34m'
|
|
7
|
+
dark_green: str = '\033[32m'
|
|
8
|
+
dark_aqua: str = '\033[36m'
|
|
9
|
+
dark_red: str = '\033[31m'
|
|
10
|
+
dark_purple: str = '\033[35m'
|
|
11
|
+
gold: str = '\033[33m'
|
|
12
|
+
gray: str = '\033[37m'
|
|
13
|
+
dark_gray: str = '\033[90m'
|
|
14
|
+
blue: str = '\033[94m'
|
|
15
|
+
green: str = '\033[92m'
|
|
16
|
+
aqua: str = '\033[96m'
|
|
17
|
+
red: str = '\033[91m'
|
|
18
|
+
light_purple: str = '\033[95m'
|
|
19
|
+
yellow: str = '\033[93m'
|
|
20
|
+
white: str = '\033[97m'
|
|
21
|
+
reset: str = '\033[0m'
|
|
22
|
+
bold: str = '\033[1m'
|
|
23
|
+
italic: str = '\033[3m'
|
|
24
24
|
|
|
25
25
|
def as_dict(self):
|
|
26
|
-
return {f
|
|
26
|
+
return {f'<{k}>': getattr(self, k) for k in self.__dataclass_fields__}
|
|
27
27
|
|
|
28
28
|
# ASCII color map
|
|
29
29
|
ascii_colors = ColorMap()
|
|
30
30
|
|
|
31
31
|
# Minecraft color map
|
|
32
32
|
mc_colors = ColorMap(
|
|
33
|
-
black=
|
|
34
|
-
dark_blue=
|
|
35
|
-
dark_green=
|
|
36
|
-
dark_aqua=
|
|
37
|
-
dark_red=
|
|
38
|
-
dark_purple=
|
|
39
|
-
gold=
|
|
40
|
-
gray=
|
|
41
|
-
dark_gray=
|
|
42
|
-
blue=
|
|
43
|
-
green=
|
|
44
|
-
aqua=
|
|
45
|
-
red=
|
|
46
|
-
light_purple=
|
|
47
|
-
yellow=
|
|
48
|
-
white=
|
|
49
|
-
reset=
|
|
50
|
-
bold=
|
|
51
|
-
italic=
|
|
33
|
+
black='§0',
|
|
34
|
+
dark_blue='§1',
|
|
35
|
+
dark_green='§2',
|
|
36
|
+
dark_aqua='§3',
|
|
37
|
+
dark_red='§4',
|
|
38
|
+
dark_purple='§5',
|
|
39
|
+
gold='§6',
|
|
40
|
+
gray='§7',
|
|
41
|
+
dark_gray='§8',
|
|
42
|
+
blue='§9',
|
|
43
|
+
green='§a',
|
|
44
|
+
aqua='§b',
|
|
45
|
+
red='§c',
|
|
46
|
+
light_purple='§d',
|
|
47
|
+
yellow='§e',
|
|
48
|
+
white='§f',
|
|
49
|
+
reset='§r',
|
|
50
|
+
bold='§l',
|
|
51
|
+
italic='§o'
|
|
52
52
|
)
|
|
53
53
|
|
|
54
54
|
# Color strip map
|
|
55
55
|
strip_colors = ColorMap(
|
|
56
|
-
black=
|
|
57
|
-
dark_blue=
|
|
58
|
-
dark_green=
|
|
59
|
-
dark_aqua=
|
|
60
|
-
dark_red=
|
|
61
|
-
dark_purple=
|
|
62
|
-
gold=
|
|
63
|
-
gray=
|
|
64
|
-
dark_gray=
|
|
65
|
-
blue=
|
|
66
|
-
green=
|
|
67
|
-
aqua=
|
|
68
|
-
red=
|
|
69
|
-
light_purple=
|
|
70
|
-
yellow=
|
|
71
|
-
white=
|
|
72
|
-
reset=
|
|
73
|
-
bold=
|
|
74
|
-
italic=
|
|
56
|
+
black='',
|
|
57
|
+
dark_blue='',
|
|
58
|
+
dark_green='',
|
|
59
|
+
dark_aqua='',
|
|
60
|
+
dark_red='',
|
|
61
|
+
dark_purple='',
|
|
62
|
+
gold='',
|
|
63
|
+
gray='',
|
|
64
|
+
dark_gray='',
|
|
65
|
+
blue='',
|
|
66
|
+
green='',
|
|
67
|
+
aqua='',
|
|
68
|
+
red='',
|
|
69
|
+
light_purple='',
|
|
70
|
+
yellow='',
|
|
71
|
+
white='',
|
|
72
|
+
reset='',
|
|
73
|
+
bold='',
|
|
74
|
+
italic=''
|
|
75
75
|
)
|
mapres/maps/time.py
CHANGED
mapres/resolver.py
CHANGED
|
@@ -6,7 +6,7 @@ from .exceptions import MapResError, MissingKeyError, MapSyntaxError
|
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
class MapResolver:
|
|
9
|
-
|
|
9
|
+
'''
|
|
10
10
|
Core resolution engine for mapres.
|
|
11
11
|
|
|
12
12
|
Handles:
|
|
@@ -16,7 +16,7 @@ class MapResolver:
|
|
|
16
16
|
- context substitution
|
|
17
17
|
- recursive multi-pass resolution
|
|
18
18
|
- optional caching
|
|
19
|
-
|
|
19
|
+
'''
|
|
20
20
|
def __init__(
|
|
21
21
|
self,
|
|
22
22
|
layers: list | None = None,
|
|
@@ -40,7 +40,7 @@ class MapResolver:
|
|
|
40
40
|
text = stage(text, ctx, self)
|
|
41
41
|
return text
|
|
42
42
|
except Exception as exc:
|
|
43
|
-
raise MapResError(f
|
|
43
|
+
raise MapResError(f'Pipeline stage failed: {exc}') from exc
|
|
44
44
|
|
|
45
45
|
# syntax providers
|
|
46
46
|
def _apply_syntax(self, text: str, ctx: dict) -> str:
|
|
@@ -50,13 +50,13 @@ class MapResolver:
|
|
|
50
50
|
def repl(match: re.Match) -> str:
|
|
51
51
|
k = match.group(1)
|
|
52
52
|
if k not in d:
|
|
53
|
-
raise MissingKeyError(f
|
|
53
|
+
raise MissingKeyError(f'Missing key "{k}" in syntax provider {provider}')
|
|
54
54
|
return str(d[k])
|
|
55
55
|
try:
|
|
56
56
|
text = re.sub(pattern, repl, text)
|
|
57
57
|
except re.error as exc:
|
|
58
58
|
raise MapSyntaxError(
|
|
59
|
-
f
|
|
59
|
+
f'Regex error in syntax provider {provider}: {exc}'
|
|
60
60
|
) from exc
|
|
61
61
|
return text
|
|
62
62
|
|
|
@@ -64,12 +64,12 @@ class MapResolver:
|
|
|
64
64
|
def _apply_maps(self, text: str, ctx: dict, layerstack: LayerStack):
|
|
65
65
|
syntax_patterns = []
|
|
66
66
|
for m in layerstack:
|
|
67
|
-
if isinstance(m, type) and hasattr(m,
|
|
67
|
+
if isinstance(m, type) and hasattr(m, 'as_map'):
|
|
68
68
|
m = m()
|
|
69
|
-
if hasattr(m,
|
|
69
|
+
if hasattr(m, 'as_map'):
|
|
70
70
|
syntax_patterns.append(m.get_syntax())
|
|
71
71
|
elif isinstance(m, dict):
|
|
72
|
-
pattern = ctx.get(
|
|
72
|
+
pattern = ctx.get('syntax')
|
|
73
73
|
if pattern:
|
|
74
74
|
syntax_patterns.append(pattern)
|
|
75
75
|
syntax_patterns = list(dict.fromkeys(syntax_patterns))
|
|
@@ -78,9 +78,9 @@ class MapResolver:
|
|
|
78
78
|
k = match.group(1)
|
|
79
79
|
for m in layerstack:
|
|
80
80
|
layer = m
|
|
81
|
-
if isinstance(layer, type) and hasattr(layer,
|
|
81
|
+
if isinstance(layer, type) and hasattr(layer, 'as_map'):
|
|
82
82
|
layer = layer()
|
|
83
|
-
if hasattr(layer,
|
|
83
|
+
if hasattr(layer, 'as_map'):
|
|
84
84
|
d = layer.as_map()
|
|
85
85
|
elif isinstance(layer, dict):
|
|
86
86
|
d = layer
|
|
@@ -92,12 +92,12 @@ class MapResolver:
|
|
|
92
92
|
if k in ctx:
|
|
93
93
|
return str(ctx[k])
|
|
94
94
|
|
|
95
|
-
raise MissingKeyError(f
|
|
95
|
+
raise MissingKeyError(f'Missing key "{k}" in any layer or context')
|
|
96
96
|
|
|
97
97
|
try:
|
|
98
98
|
text = re.sub(pattern, repl, text)
|
|
99
99
|
except re.error as exc:
|
|
100
|
-
raise MapSyntaxError(f
|
|
100
|
+
raise MapSyntaxError(f'Regex error in syntax pattern {pattern}: {exc}') from exc
|
|
101
101
|
return text
|
|
102
102
|
|
|
103
103
|
# context
|
|
@@ -109,12 +109,12 @@ class MapResolver:
|
|
|
109
109
|
def repl(match: re.Match) -> str:
|
|
110
110
|
k = match.group(1)
|
|
111
111
|
if k not in d:
|
|
112
|
-
raise MissingKeyError(f
|
|
112
|
+
raise MissingKeyError(f'Missing ctx key "{k}"')
|
|
113
113
|
return str(d[k])
|
|
114
114
|
try:
|
|
115
115
|
return re.sub(pattern, repl, text)
|
|
116
116
|
except re.error as exc:
|
|
117
|
-
raise MapSyntaxError(f
|
|
117
|
+
raise MapSyntaxError(f'Regex error in ctx syntax: {exc}') from exc
|
|
118
118
|
|
|
119
119
|
# one pass
|
|
120
120
|
def _resolve_once(self, text: str, ctx: dict, layerstack: LayerStack) -> str:
|
|
@@ -143,17 +143,17 @@ class MapResolver:
|
|
|
143
143
|
override_maps: dict | None = None,
|
|
144
144
|
**ctx
|
|
145
145
|
) -> str:
|
|
146
|
-
|
|
146
|
+
'''
|
|
147
147
|
Resolve a string using maps, syntax providers, pipeline, and context.
|
|
148
|
-
|
|
148
|
+
'''
|
|
149
149
|
try:
|
|
150
150
|
if override_maps is not None:
|
|
151
|
-
temp = LayerStack([Layer(
|
|
151
|
+
temp = LayerStack([Layer('override', override_maps, priority=0)])
|
|
152
152
|
return self._recursive(text, ctx, temp)
|
|
153
153
|
|
|
154
154
|
if extra_maps:
|
|
155
155
|
temp = self.layers.clone()
|
|
156
|
-
temp.add_layer(Layer(
|
|
156
|
+
temp.add_layer(Layer('extra', extra_maps, priority=999))
|
|
157
157
|
return self._recursive(text, ctx, temp)
|
|
158
158
|
|
|
159
159
|
if self.cache_enabled:
|
|
@@ -172,14 +172,14 @@ class MapResolver:
|
|
|
172
172
|
except MapResError:
|
|
173
173
|
raise
|
|
174
174
|
except Exception as exc:
|
|
175
|
-
raise MapResError(f
|
|
175
|
+
raise MapResError(f'Unhandled resolver error: {exc}') from exc
|
|
176
176
|
|
|
177
177
|
|
|
178
178
|
# global resolver
|
|
179
179
|
_DEFAULT = MapResolver()
|
|
180
180
|
|
|
181
181
|
def res(text: str, **ctx) -> str:
|
|
182
|
-
|
|
182
|
+
'''
|
|
183
183
|
Resolve using the global default resolver.
|
|
184
|
-
|
|
184
|
+
'''
|
|
185
185
|
return _DEFAULT.res(text, **ctx)
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
mapres/__init__.py,sha256=iqd3OU-FM-khP0CgAOA1-L9soq-lNLUAXT7WNU_Dh8I,974
|
|
2
|
+
mapres/cache.py,sha256=hbvsoc6Qw3RhWAEfOOpKHtC7i9EomoUgWzyd4dnH71w,333
|
|
3
|
+
mapres/datamap.py,sha256=JK86ku6mFSreLz3W8lAMOR76AixMa4Ykn8XBXLmVMJE,2037
|
|
4
|
+
mapres/exceptions.py,sha256=jirHKK5yCffSCWWkgZY_gTSIOaFCmXOe5NJJf60HeeQ,130
|
|
5
|
+
mapres/layers.py,sha256=BPHbc8Bh4VxyphtP60acGoXDCYQcrW4bZRFsOk-5gug,1070
|
|
6
|
+
mapres/resolver.py,sha256=uXE1e4EjZclIzehAhwugwT2S8RmoxvKH4a5-zfelFIc,6021
|
|
7
|
+
mapres/maps/__init__.py,sha256=lIRRfem1Fw4iynuwUQ7BY5qrC4fbJKxqLivao2_Dtm4,239
|
|
8
|
+
mapres/maps/color.py,sha256=sHLHgVmO2BFmx1EK5E78-tMHvB8oxbjJplAaVb1JNFQ,1545
|
|
9
|
+
mapres/maps/time.py,sha256=8DSWZGiYSy8r08EmdNmhb4xY-DmLDl2jO00aaaaCRDE,1890
|
|
10
|
+
mapres-2.4.dev1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
11
|
+
mapres-2.4.dev1.dist-info/METADATA,sha256=79Kvs_joiEe1XP2aLt4UiRXJrm9jxfEcvrmK--TgsrA,1477
|
|
12
|
+
mapres-2.4.dev1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
|
|
13
|
+
mapres-2.4.dev1.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
|
|
14
|
+
mapres-2.4.dev1.dist-info/RECORD,,
|
mapres-2.3.dist-info/RECORD
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
mapres/__init__.py,sha256=iqd3OU-FM-khP0CgAOA1-L9soq-lNLUAXT7WNU_Dh8I,974
|
|
2
|
-
mapres/cache.py,sha256=hbvsoc6Qw3RhWAEfOOpKHtC7i9EomoUgWzyd4dnH71w,333
|
|
3
|
-
mapres/datamap.py,sha256=e1kU6m0Fl9k_vloMzNmSPO2MGpfU08t2lnLwm33XyYI,2037
|
|
4
|
-
mapres/exceptions.py,sha256=jirHKK5yCffSCWWkgZY_gTSIOaFCmXOe5NJJf60HeeQ,130
|
|
5
|
-
mapres/layers.py,sha256=BPHbc8Bh4VxyphtP60acGoXDCYQcrW4bZRFsOk-5gug,1070
|
|
6
|
-
mapres/resolver.py,sha256=Jgy_RJNLQMbG6_qTUCCw9yRCrBCFxnB9gUPwJpXMd8Y,6021
|
|
7
|
-
mapres/maps/__init__.py,sha256=lIRRfem1Fw4iynuwUQ7BY5qrC4fbJKxqLivao2_Dtm4,239
|
|
8
|
-
mapres/maps/color.py,sha256=dT7Eh-xTwaKT6lZcKDxoFJ4WPXEArv1KSl4LUKMhWrQ,1545
|
|
9
|
-
mapres/maps/time.py,sha256=pW4Th3qqJW-B43ogS42cl2vWTsyykspVQH6tqBa9vI8,1878
|
|
10
|
-
mapres-2.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
|
|
11
|
-
mapres-2.3.dist-info/METADATA,sha256=0-s5u2vmIAl54hmr2gg4XrfeMMzP9qhUSJkpuP_-Ejw,1472
|
|
12
|
-
mapres-2.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
|
|
13
|
-
mapres-2.3.dist-info/top_level.txt,sha256=5LMVQqJdtyjxfzv7wJBOZ-360m0Yc79w_-Y7s3n6cTw,7
|
|
14
|
-
mapres-2.3.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|