omlish 0.0.0.dev413__py3-none-any.whl → 0.0.0.dev415__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.
- omlish/__about__.py +2 -3
- omlish/codecs/registry.py +1 -1
- omlish/dataclasses/__init__.py +135 -113
- omlish/dataclasses/impl/api/classes/make.py +5 -3
- omlish/dataclasses/impl/configs.py +29 -29
- omlish/lite/maysyncs.py +1 -0
- omlish/manifests/base.py +1 -1
- omlish/marshal/__init__.py +98 -57
- omlish/marshal/base/__init__.py +0 -0
- omlish/marshal/base/contexts.py +75 -0
- omlish/marshal/{errors.py → base/errors.py} +1 -1
- omlish/marshal/base/options.py +2 -0
- omlish/marshal/base/overrides.py +25 -0
- omlish/marshal/{registries.py → base/registries.py} +4 -8
- omlish/marshal/base/types.py +70 -0
- omlish/marshal/{values.py → base/values.py} +1 -13
- omlish/marshal/composite/iterables.py +7 -7
- omlish/marshal/composite/literals.py +7 -7
- omlish/marshal/composite/mappings.py +7 -7
- omlish/marshal/composite/maybes.py +7 -7
- omlish/marshal/composite/newtypes.py +6 -6
- omlish/marshal/composite/optionals.py +7 -7
- omlish/marshal/composite/special.py +6 -6
- omlish/marshal/composite/wrapped.py +5 -5
- omlish/marshal/factories/__init__.py +0 -0
- omlish/marshal/factories/func.py +28 -0
- omlish/marshal/factories/match.py +34 -0
- omlish/marshal/factories/multi.py +55 -0
- omlish/marshal/factories/recursive.py +120 -0
- omlish/marshal/factories/simple.py +28 -0
- omlish/marshal/factories/typecache.py +91 -0
- omlish/marshal/factories/typemap.py +65 -0
- omlish/marshal/globals.py +7 -7
- omlish/marshal/naming.py +1 -1
- omlish/marshal/objects/dataclasses.py +7 -7
- omlish/marshal/objects/marshal.py +4 -4
- omlish/marshal/objects/metadata.py +4 -4
- omlish/marshal/objects/namedtuples.py +7 -7
- omlish/marshal/objects/unmarshal.py +4 -4
- omlish/marshal/polymorphism/marshal.py +4 -4
- omlish/marshal/polymorphism/metadata.py +1 -1
- omlish/marshal/polymorphism/standard.py +2 -2
- omlish/marshal/polymorphism/unions.py +7 -7
- omlish/marshal/polymorphism/unmarshal.py +4 -4
- omlish/marshal/singular/base64.py +7 -7
- omlish/marshal/singular/datetimes.py +7 -7
- omlish/marshal/singular/enums.py +7 -7
- omlish/marshal/singular/numbers.py +7 -7
- omlish/marshal/singular/primitives.py +7 -7
- omlish/marshal/singular/uuids.py +7 -7
- omlish/marshal/standard.py +8 -8
- omlish/marshal/trivial/any.py +7 -7
- omlish/marshal/trivial/forbidden.py +7 -7
- omlish/marshal/trivial/nop.py +5 -5
- omlish/subprocesses/maysyncs.py +7 -96
- {omlish-0.0.0.dev413.dist-info → omlish-0.0.0.dev415.dist-info}/METADATA +1 -1
- {omlish-0.0.0.dev413.dist-info → omlish-0.0.0.dev415.dist-info}/RECORD +61 -53
- omlish/inject/.dataclasses.json +0 -3
- omlish/marshal/.dataclasses.json +0 -3
- omlish/marshal/base.py +0 -472
- omlish/marshal/factories.py +0 -116
- omlish/marshal/proxy.py +0 -26
- {omlish-0.0.0.dev413.dist-info → omlish-0.0.0.dev415.dist-info}/WHEEL +0 -0
- {omlish-0.0.0.dev413.dist-info → omlish-0.0.0.dev415.dist-info}/entry_points.txt +0 -0
- {omlish-0.0.0.dev413.dist-info → omlish-0.0.0.dev415.dist-info}/licenses/LICENSE +0 -0
- {omlish-0.0.0.dev413.dist-info → omlish-0.0.0.dev415.dist-info}/top_level.txt +0 -0
@@ -0,0 +1,91 @@
|
|
1
|
+
import threading
|
2
|
+
import typing as ta
|
3
|
+
|
4
|
+
from ... import check
|
5
|
+
from ... import reflect as rfl
|
6
|
+
from ...funcs import match as mfs
|
7
|
+
from ..base.contexts import MarshalContext
|
8
|
+
from ..base.contexts import UnmarshalContext
|
9
|
+
from ..base.types import Marshaler
|
10
|
+
from ..base.types import MarshalerFactory
|
11
|
+
from ..base.types import MarshalerMaker
|
12
|
+
from ..base.types import Unmarshaler
|
13
|
+
from ..base.types import UnmarshalerFactory
|
14
|
+
from ..base.types import UnmarshalerMaker
|
15
|
+
|
16
|
+
|
17
|
+
R = ta.TypeVar('R')
|
18
|
+
C = ta.TypeVar('C')
|
19
|
+
|
20
|
+
|
21
|
+
##
|
22
|
+
|
23
|
+
|
24
|
+
class _TypeCacheFactory(mfs.MatchFn[[C, rfl.Type], R]):
|
25
|
+
def __init__(self, f: mfs.MatchFn[[C, rfl.Type], R]) -> None:
|
26
|
+
super().__init__()
|
27
|
+
|
28
|
+
self._f = f
|
29
|
+
self._dct: dict[rfl.Type, R | None] = {}
|
30
|
+
self._lock = threading.RLock()
|
31
|
+
|
32
|
+
def guard(self, ctx: C, rty: rfl.Type) -> bool:
|
33
|
+
check.isinstance(rty, rfl.TYPES)
|
34
|
+
with self._lock:
|
35
|
+
try:
|
36
|
+
e = self._dct[rty]
|
37
|
+
except KeyError:
|
38
|
+
if self._f.guard(ctx, rty):
|
39
|
+
return True
|
40
|
+
else:
|
41
|
+
self._dct[rty] = None
|
42
|
+
return False
|
43
|
+
else:
|
44
|
+
return e is not None
|
45
|
+
|
46
|
+
def fn(self, ctx: C, rty: rfl.Type) -> R:
|
47
|
+
check.isinstance(rty, rfl.TYPES)
|
48
|
+
with self._lock:
|
49
|
+
try:
|
50
|
+
e = self._dct[rty]
|
51
|
+
except KeyError:
|
52
|
+
try:
|
53
|
+
ret = self._f(ctx, rty)
|
54
|
+
except mfs.MatchGuardError:
|
55
|
+
self._dct[rty] = None
|
56
|
+
raise
|
57
|
+
else:
|
58
|
+
self._dct[rty] = ret
|
59
|
+
return ret
|
60
|
+
else:
|
61
|
+
if e is None:
|
62
|
+
raise mfs.MatchGuardError(ctx, rty)
|
63
|
+
else:
|
64
|
+
return e
|
65
|
+
|
66
|
+
|
67
|
+
##
|
68
|
+
|
69
|
+
|
70
|
+
class TypeCacheMarshalerFactory(MarshalerFactory):
|
71
|
+
def __init__(self, f: MarshalerFactory) -> None:
|
72
|
+
super().__init__()
|
73
|
+
|
74
|
+
self._f = f
|
75
|
+
self._tcf: _TypeCacheFactory[MarshalContext, Marshaler] = _TypeCacheFactory(f.make_marshaler)
|
76
|
+
|
77
|
+
@property
|
78
|
+
def make_marshaler(self) -> MarshalerMaker:
|
79
|
+
return self._tcf
|
80
|
+
|
81
|
+
|
82
|
+
class TypeCacheUnmarshalerFactory(UnmarshalerFactory):
|
83
|
+
def __init__(self, f: UnmarshalerFactory) -> None:
|
84
|
+
super().__init__()
|
85
|
+
|
86
|
+
self._f = f
|
87
|
+
self._tcf: _TypeCacheFactory[UnmarshalContext, Unmarshaler] = _TypeCacheFactory(f.make_unmarshaler)
|
88
|
+
|
89
|
+
@property
|
90
|
+
def make_unmarshaler(self) -> UnmarshalerMaker:
|
91
|
+
return self._tcf
|
@@ -0,0 +1,65 @@
|
|
1
|
+
import typing as ta
|
2
|
+
|
3
|
+
from ... import check
|
4
|
+
from ... import dataclasses as dc
|
5
|
+
from ... import reflect as rfl
|
6
|
+
from ...funcs import match as mfs
|
7
|
+
from ..base.contexts import MarshalContext
|
8
|
+
from ..base.contexts import UnmarshalContext
|
9
|
+
from ..base.types import Marshaler
|
10
|
+
from ..base.types import MarshalerFactory
|
11
|
+
from ..base.types import MarshalerMaker
|
12
|
+
from ..base.types import Unmarshaler
|
13
|
+
from ..base.types import UnmarshalerFactory
|
14
|
+
from ..base.types import UnmarshalerMaker
|
15
|
+
|
16
|
+
|
17
|
+
R = ta.TypeVar('R')
|
18
|
+
C = ta.TypeVar('C')
|
19
|
+
|
20
|
+
|
21
|
+
##
|
22
|
+
|
23
|
+
|
24
|
+
@dc.dataclass(frozen=True)
|
25
|
+
class _TypeMapFactory(mfs.MatchFn[[C, rfl.Type], R]):
|
26
|
+
m: ta.Mapping[rfl.Type, R] = dc.field(default_factory=dict)
|
27
|
+
|
28
|
+
def __post_init__(self) -> None:
|
29
|
+
for k in self.m:
|
30
|
+
if not isinstance(k, rfl.TYPES):
|
31
|
+
raise TypeError(k)
|
32
|
+
|
33
|
+
def guard(self, ctx: C, rty: rfl.Type) -> bool:
|
34
|
+
check.isinstance(rty, rfl.TYPES)
|
35
|
+
return rty in self.m
|
36
|
+
|
37
|
+
def fn(self, ctx: C, rty: rfl.Type) -> R:
|
38
|
+
check.isinstance(rty, rfl.TYPES)
|
39
|
+
try:
|
40
|
+
return self.m[rty]
|
41
|
+
except KeyError:
|
42
|
+
raise mfs.MatchGuardError(ctx, rty) # noqa
|
43
|
+
|
44
|
+
|
45
|
+
##
|
46
|
+
|
47
|
+
|
48
|
+
@dc.dataclass(frozen=True)
|
49
|
+
class TypeMapMarshalerFactory(
|
50
|
+
_TypeMapFactory[MarshalContext, Marshaler],
|
51
|
+
MarshalerFactory,
|
52
|
+
):
|
53
|
+
@property
|
54
|
+
def make_marshaler(self) -> MarshalerMaker:
|
55
|
+
return self # noqa
|
56
|
+
|
57
|
+
|
58
|
+
@dc.dataclass(frozen=True)
|
59
|
+
class TypeMapUnmarshalerFactory(
|
60
|
+
_TypeMapFactory[UnmarshalContext, Unmarshaler],
|
61
|
+
UnmarshalerFactory,
|
62
|
+
):
|
63
|
+
@property
|
64
|
+
def make_unmarshaler(self) -> UnmarshalerMaker:
|
65
|
+
return self # noqa
|
omlish/marshal/globals.py
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
import typing as ta
|
2
2
|
|
3
3
|
from .. import lang
|
4
|
-
from .base import MarshalContext
|
5
|
-
from .base import
|
6
|
-
from .base import
|
7
|
-
from .base import
|
8
|
-
from .
|
9
|
-
from .
|
4
|
+
from .base.contexts import MarshalContext
|
5
|
+
from .base.contexts import UnmarshalContext
|
6
|
+
from .base.registries import Registry
|
7
|
+
from .base.registries import RegistryItem
|
8
|
+
from .base.types import MarshalerFactory
|
9
|
+
from .base.types import UnmarshalerFactory
|
10
|
+
from .base.values import Value
|
10
11
|
from .standard import new_standard_marshaler_factory
|
11
12
|
from .standard import new_standard_unmarshaler_factory
|
12
|
-
from .values import Value
|
13
13
|
|
14
14
|
|
15
15
|
T = ta.TypeVar('T')
|
omlish/marshal/naming.py
CHANGED
@@ -10,13 +10,13 @@ from ... import dataclasses as dc
|
|
10
10
|
from ... import lang
|
11
11
|
from ... import reflect as rfl
|
12
12
|
from ...lite import marshal as lm
|
13
|
-
from ..base import MarshalContext
|
14
|
-
from ..base import
|
15
|
-
from ..base import Option
|
16
|
-
from ..base import
|
17
|
-
from ..base import
|
18
|
-
from ..
|
19
|
-
from ..
|
13
|
+
from ..base.contexts import MarshalContext
|
14
|
+
from ..base.contexts import UnmarshalContext
|
15
|
+
from ..base.options import Option
|
16
|
+
from ..base.types import Marshaler
|
17
|
+
from ..base.types import Unmarshaler
|
18
|
+
from ..factories.simple import SimpleMarshalerFactory
|
19
|
+
from ..factories.simple import SimpleUnmarshalerFactory
|
20
20
|
from ..naming import Naming
|
21
21
|
from ..naming import translate_name
|
22
22
|
from .marshal import ObjectMarshaler
|
@@ -4,10 +4,10 @@ import typing as ta
|
|
4
4
|
from ... import check
|
5
5
|
from ... import dataclasses as dc
|
6
6
|
from ... import reflect as rfl
|
7
|
-
from ..base import MarshalContext
|
8
|
-
from ..base import Marshaler
|
9
|
-
from ..base import
|
10
|
-
from ..
|
7
|
+
from ..base.contexts import MarshalContext
|
8
|
+
from ..base.types import Marshaler
|
9
|
+
from ..base.values import Value
|
10
|
+
from ..factories.simple import SimpleMarshalerFactory
|
11
11
|
from .metadata import FieldInfo
|
12
12
|
from .metadata import FieldInfos
|
13
13
|
from .metadata import ObjectSpecials
|
@@ -4,10 +4,10 @@ from ... import cached
|
|
4
4
|
from ... import collections as col
|
5
5
|
from ... import dataclasses as dc
|
6
6
|
from ... import lang
|
7
|
-
from ..base import Marshaler
|
8
|
-
from ..base import MarshalerFactory
|
9
|
-
from ..base import Unmarshaler
|
10
|
-
from ..base import UnmarshalerFactory
|
7
|
+
from ..base.types import Marshaler
|
8
|
+
from ..base.types import MarshalerFactory
|
9
|
+
from ..base.types import Unmarshaler
|
10
|
+
from ..base.types import UnmarshalerFactory
|
11
11
|
from ..naming import Naming
|
12
12
|
|
13
13
|
|
@@ -5,13 +5,13 @@ from ... import check
|
|
5
5
|
from ... import collections as col
|
6
6
|
from ... import lang
|
7
7
|
from ... import reflect as rfl
|
8
|
-
from ..base import MarshalContext
|
9
|
-
from ..base import
|
10
|
-
from ..base import Option
|
11
|
-
from ..base import
|
12
|
-
from ..base import
|
13
|
-
from ..
|
14
|
-
from ..
|
8
|
+
from ..base.contexts import MarshalContext
|
9
|
+
from ..base.contexts import UnmarshalContext
|
10
|
+
from ..base.options import Option
|
11
|
+
from ..base.types import Marshaler
|
12
|
+
from ..base.types import Unmarshaler
|
13
|
+
from ..factories.simple import SimpleMarshalerFactory
|
14
|
+
from ..factories.simple import SimpleUnmarshalerFactory
|
15
15
|
from .marshal import ObjectMarshaler
|
16
16
|
from .metadata import FieldInfo
|
17
17
|
from .metadata import FieldInfos
|
@@ -4,10 +4,10 @@ import typing as ta
|
|
4
4
|
from ... import check
|
5
5
|
from ... import dataclasses as dc
|
6
6
|
from ... import reflect as rfl
|
7
|
-
from ..base import
|
8
|
-
from ..base import
|
9
|
-
from ..base import
|
10
|
-
from ..
|
7
|
+
from ..base.contexts import UnmarshalContext
|
8
|
+
from ..base.types import Unmarshaler
|
9
|
+
from ..base.values import Value
|
10
|
+
from ..factories.simple import SimpleUnmarshalerFactory
|
11
11
|
from .metadata import FieldInfo
|
12
12
|
from .metadata import FieldInfos
|
13
13
|
from .metadata import ObjectSpecials
|
@@ -5,10 +5,10 @@ import typing as ta
|
|
5
5
|
from ... import check
|
6
6
|
from ... import lang
|
7
7
|
from ... import reflect as rfl
|
8
|
-
from ..base import MarshalContext
|
9
|
-
from ..base import Marshaler
|
10
|
-
from ..base import
|
11
|
-
from ..
|
8
|
+
from ..base.contexts import MarshalContext
|
9
|
+
from ..base.types import Marshaler
|
10
|
+
from ..base.values import Value
|
11
|
+
from ..factories.simple import SimpleMarshalerFactory
|
12
12
|
from .metadata import FieldTypeTagging
|
13
13
|
from .metadata import Impls
|
14
14
|
from .metadata import Polymorphism
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import typing as ta
|
2
2
|
|
3
|
-
from ..base import MarshalerFactory
|
4
|
-
from ..base import UnmarshalerFactory
|
3
|
+
from ..base.types import MarshalerFactory
|
4
|
+
from ..base.types import UnmarshalerFactory
|
5
5
|
from .marshal import PolymorphismMarshalerFactory
|
6
6
|
from .metadata import Polymorphism
|
7
7
|
from .metadata import TypeTagging
|
@@ -6,13 +6,13 @@ from ... import dataclasses as dc
|
|
6
6
|
from ... import lang
|
7
7
|
from ... import reflect as rfl
|
8
8
|
from ...funcs import match as mfs
|
9
|
-
from ..base import MarshalContext
|
10
|
-
from ..base import
|
11
|
-
from ..base import
|
12
|
-
from ..base import
|
13
|
-
from ..base import
|
14
|
-
from ..
|
15
|
-
from ..
|
9
|
+
from ..base.contexts import MarshalContext
|
10
|
+
from ..base.contexts import UnmarshalContext
|
11
|
+
from ..base.types import Marshaler
|
12
|
+
from ..base.types import Unmarshaler
|
13
|
+
from ..base.values import Value
|
14
|
+
from ..factories.simple import SimpleMarshalerFactory
|
15
|
+
from ..factories.simple import SimpleUnmarshalerFactory
|
16
16
|
from .marshal import make_polymorphism_marshaler
|
17
17
|
from .metadata import Impls
|
18
18
|
from .metadata import TypeTagging
|
@@ -6,10 +6,10 @@ import typing as ta
|
|
6
6
|
from ... import check
|
7
7
|
from ... import lang
|
8
8
|
from ... import reflect as rfl
|
9
|
-
from ..base import
|
10
|
-
from ..base import
|
11
|
-
from ..base import
|
12
|
-
from ..
|
9
|
+
from ..base.contexts import UnmarshalContext
|
10
|
+
from ..base.types import Unmarshaler
|
11
|
+
from ..base.values import Value
|
12
|
+
from ..factories.simple import SimpleUnmarshalerFactory
|
13
13
|
from .metadata import FieldTypeTagging
|
14
14
|
from .metadata import Impls
|
15
15
|
from .metadata import Polymorphism
|
@@ -7,13 +7,13 @@ import typing as ta
|
|
7
7
|
|
8
8
|
from ... import check
|
9
9
|
from ... import dataclasses as dc
|
10
|
-
from ..base import MarshalContext
|
11
|
-
from ..base import
|
12
|
-
from ..base import
|
13
|
-
from ..base import
|
14
|
-
from ..base import
|
15
|
-
from ..
|
16
|
-
from ..
|
10
|
+
from ..base.contexts import MarshalContext
|
11
|
+
from ..base.contexts import UnmarshalContext
|
12
|
+
from ..base.types import Marshaler
|
13
|
+
from ..base.types import Unmarshaler
|
14
|
+
from ..base.values import Value
|
15
|
+
from ..factories.typemap import TypeMapMarshalerFactory
|
16
|
+
from ..factories.typemap import TypeMapUnmarshalerFactory
|
17
17
|
|
18
18
|
|
19
19
|
T = ta.TypeVar('T')
|
@@ -4,13 +4,13 @@ import typing as ta
|
|
4
4
|
|
5
5
|
from ... import check
|
6
6
|
from ... import datetimes as dts
|
7
|
-
from ..base import MarshalContext
|
8
|
-
from ..base import
|
9
|
-
from ..base import
|
10
|
-
from ..base import
|
11
|
-
from ..base import
|
12
|
-
from ..
|
13
|
-
from ..
|
7
|
+
from ..base.contexts import MarshalContext
|
8
|
+
from ..base.contexts import UnmarshalContext
|
9
|
+
from ..base.types import Marshaler
|
10
|
+
from ..base.types import Unmarshaler
|
11
|
+
from ..base.values import Value
|
12
|
+
from ..factories.typemap import TypeMapMarshalerFactory
|
13
|
+
from ..factories.typemap import TypeMapUnmarshalerFactory
|
14
14
|
|
15
15
|
|
16
16
|
DatetimeLikeT = ta.TypeVar('DatetimeLikeT', bound=datetime.datetime | datetime.date | datetime.time)
|
omlish/marshal/singular/enums.py
CHANGED
@@ -4,13 +4,13 @@ import typing as ta
|
|
4
4
|
|
5
5
|
from ... import check
|
6
6
|
from ... import reflect as rfl
|
7
|
-
from ..base import MarshalContext
|
8
|
-
from ..base import
|
9
|
-
from ..base import
|
10
|
-
from ..base import
|
11
|
-
from ..base import
|
12
|
-
from ..
|
13
|
-
from ..
|
7
|
+
from ..base.contexts import MarshalContext
|
8
|
+
from ..base.contexts import UnmarshalContext
|
9
|
+
from ..base.types import Marshaler
|
10
|
+
from ..base.types import Unmarshaler
|
11
|
+
from ..base.values import Value
|
12
|
+
from ..factories.simple import SimpleMarshalerFactory
|
13
|
+
from ..factories.simple import SimpleUnmarshalerFactory
|
14
14
|
|
15
15
|
|
16
16
|
##
|
@@ -3,13 +3,13 @@ import fractions
|
|
3
3
|
import typing as ta
|
4
4
|
|
5
5
|
from ... import check
|
6
|
-
from ..base import MarshalContext
|
7
|
-
from ..base import
|
8
|
-
from ..base import
|
9
|
-
from ..base import
|
10
|
-
from ..base import
|
11
|
-
from ..
|
12
|
-
from ..
|
6
|
+
from ..base.contexts import MarshalContext
|
7
|
+
from ..base.contexts import UnmarshalContext
|
8
|
+
from ..base.types import Marshaler
|
9
|
+
from ..base.types import Unmarshaler
|
10
|
+
from ..base.values import Value
|
11
|
+
from ..factories.typemap import TypeMapMarshalerFactory
|
12
|
+
from ..factories.typemap import TypeMapUnmarshalerFactory
|
13
13
|
|
14
14
|
|
15
15
|
##
|
@@ -5,13 +5,13 @@ TODO:
|
|
5
5
|
import typing as ta
|
6
6
|
|
7
7
|
from ... import dataclasses as dc
|
8
|
-
from ..base import MarshalContext
|
9
|
-
from ..base import
|
10
|
-
from ..base import
|
11
|
-
from ..base import
|
12
|
-
from ..base import
|
13
|
-
from ..
|
14
|
-
from ..
|
8
|
+
from ..base.contexts import MarshalContext
|
9
|
+
from ..base.contexts import UnmarshalContext
|
10
|
+
from ..base.types import Marshaler
|
11
|
+
from ..base.types import Unmarshaler
|
12
|
+
from ..base.values import Value
|
13
|
+
from ..factories.typemap import TypeMapMarshalerFactory
|
14
|
+
from ..factories.typemap import TypeMapUnmarshalerFactory
|
15
15
|
|
16
16
|
|
17
17
|
##
|
omlish/marshal/singular/uuids.py
CHANGED
@@ -2,13 +2,13 @@ import re
|
|
2
2
|
import uuid
|
3
3
|
|
4
4
|
from ... import check
|
5
|
-
from ..base import MarshalContext
|
6
|
-
from ..base import
|
7
|
-
from ..base import
|
8
|
-
from ..base import
|
9
|
-
from ..base import
|
10
|
-
from ..
|
11
|
-
from ..
|
5
|
+
from ..base.contexts import MarshalContext
|
6
|
+
from ..base.contexts import UnmarshalContext
|
7
|
+
from ..base.types import Marshaler
|
8
|
+
from ..base.types import Unmarshaler
|
9
|
+
from ..base.values import Value
|
10
|
+
from ..factories.typemap import TypeMapMarshalerFactory
|
11
|
+
from ..factories.typemap import TypeMapUnmarshalerFactory
|
12
12
|
|
13
13
|
|
14
14
|
##
|
omlish/marshal/standard.py
CHANGED
@@ -1,13 +1,7 @@
|
|
1
1
|
import typing as ta
|
2
2
|
|
3
|
-
from .base import MarshalerFactory
|
4
|
-
from .base import
|
5
|
-
from .base import MultiUnmarshalerFactory
|
6
|
-
from .base import RecursiveMarshalerFactory
|
7
|
-
from .base import RecursiveUnmarshalerFactory
|
8
|
-
from .base import TypeCacheMarshalerFactory
|
9
|
-
from .base import TypeCacheUnmarshalerFactory
|
10
|
-
from .base import UnmarshalerFactory
|
3
|
+
from .base.types import MarshalerFactory
|
4
|
+
from .base.types import UnmarshalerFactory
|
11
5
|
from .composite.iterables import IterableMarshalerFactory
|
12
6
|
from .composite.iterables import IterableUnmarshalerFactory
|
13
7
|
from .composite.literals import LiteralMarshalerFactory
|
@@ -22,6 +16,12 @@ from .composite.optionals import OptionalMarshalerFactory
|
|
22
16
|
from .composite.optionals import OptionalUnmarshalerFactory
|
23
17
|
from .composite.special import SequenceNotStrMarshalerFactory
|
24
18
|
from .composite.special import SequenceNotStrUnmarshalerFactory
|
19
|
+
from .factories.multi import MultiMarshalerFactory
|
20
|
+
from .factories.multi import MultiUnmarshalerFactory
|
21
|
+
from .factories.recursive import RecursiveMarshalerFactory
|
22
|
+
from .factories.recursive import RecursiveUnmarshalerFactory
|
23
|
+
from .factories.typecache import TypeCacheMarshalerFactory
|
24
|
+
from .factories.typecache import TypeCacheUnmarshalerFactory
|
25
25
|
from .objects.dataclasses import DataclassMarshalerFactory
|
26
26
|
from .objects.dataclasses import DataclassUnmarshalerFactory
|
27
27
|
from .objects.namedtuples import NamedtupleMarshalerFactory
|
omlish/marshal/trivial/any.py
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
import typing as ta
|
2
2
|
|
3
3
|
from ... import reflect as rfl
|
4
|
-
from ..base import MarshalContext
|
5
|
-
from ..base import
|
6
|
-
from ..base import
|
7
|
-
from ..base import
|
8
|
-
from ..base import
|
9
|
-
from ..
|
10
|
-
from ..
|
4
|
+
from ..base.contexts import MarshalContext
|
5
|
+
from ..base.contexts import UnmarshalContext
|
6
|
+
from ..base.types import Marshaler
|
7
|
+
from ..base.types import Unmarshaler
|
8
|
+
from ..base.values import Value
|
9
|
+
from ..factories.typemap import TypeMapMarshalerFactory
|
10
|
+
from ..factories.typemap import TypeMapUnmarshalerFactory
|
11
11
|
|
12
12
|
|
13
13
|
##
|
@@ -3,13 +3,13 @@ import typing as ta
|
|
3
3
|
|
4
4
|
from ... import reflect as rfl
|
5
5
|
from ...funcs import match as mfs
|
6
|
-
from ..base import MarshalContext
|
7
|
-
from ..base import
|
8
|
-
from ..base import
|
9
|
-
from ..base import
|
10
|
-
from ..base import
|
11
|
-
from ..
|
12
|
-
from ..
|
6
|
+
from ..base.contexts import MarshalContext
|
7
|
+
from ..base.contexts import UnmarshalContext
|
8
|
+
from ..base.errors import ForbiddenTypeError
|
9
|
+
from ..base.types import Marshaler
|
10
|
+
from ..base.types import Unmarshaler
|
11
|
+
from ..factories.simple import SimpleMarshalerFactory
|
12
|
+
from ..factories.simple import SimpleUnmarshalerFactory
|
13
13
|
|
14
14
|
|
15
15
|
C = ta.TypeVar('C')
|
omlish/marshal/trivial/nop.py
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
import typing as ta
|
2
2
|
|
3
|
-
from ..base import MarshalContext
|
4
|
-
from ..base import
|
5
|
-
from ..base import
|
6
|
-
from ..base import Unmarshaler
|
7
|
-
from ..values import Value
|
3
|
+
from ..base.contexts import MarshalContext
|
4
|
+
from ..base.contexts import UnmarshalContext
|
5
|
+
from ..base.types import Marshaler
|
6
|
+
from ..base.types import Unmarshaler
|
7
|
+
from ..base.values import Value
|
8
8
|
|
9
9
|
|
10
10
|
##
|