|
1 | | -from typing import TYPE_CHECKING, Callable, Type, TypeVar |
| 1 | +from typing import TYPE_CHECKING, Callable, List, Type, TypeVar |
2 | 2 |
|
3 | 3 | import dataclasses |
4 | 4 | from dataclasses import asdict, dataclass, is_dataclass |
|
8 | 8 | T = TypeVar("T", bound=Type) |
9 | 9 |
|
10 | 10 |
|
| 11 | +def get_exact_error_message(errors: List[str]) -> str: |
| 12 | + text = "\n" |
| 13 | + indents = 0 |
| 14 | + for error in errors: |
| 15 | + if error == "indent": |
| 16 | + indents += 2 |
| 17 | + text += " " * indents |
| 18 | + continue |
| 19 | + elif error == "unindent": |
| 20 | + indents -= 2 |
| 21 | + text += " " * indents |
| 22 | + continue |
| 23 | + |
| 24 | + text += f"{error}\n{' ' * indents}" |
| 25 | + |
| 26 | + return text.rstrip() |
| 27 | + |
| 28 | + |
11 | 29 | def get_exact_init(dc: Type) -> Callable: |
12 | 30 | etypes = get_etypes_for_dc(dc) |
13 | 31 |
|
14 | 32 | def init(self, *args, **kwargs): |
| 33 | + covered = len(args) + len(kwargs) |
| 34 | + |
| 35 | + if covered != len(etypes): |
| 36 | + raise ValueError( |
| 37 | + f"(dataclass {dc.__name__!r}) Expected to cover {len(etypes)} parameters, but got {covered}" |
| 38 | + ) |
| 39 | + |
15 | 40 | if args: |
16 | 41 | keys_map = list(etypes) # keys |
| 42 | + |
17 | 43 | for idx, value in enumerate(args): |
18 | 44 | k = keys_map[idx] |
19 | | - try: |
20 | | - v = etypes[keys_map[idx]].validate(value) |
21 | | - except TypeError as err: |
| 45 | + res = etypes[keys_map[idx]].validate(value) |
| 46 | + if res.has_error(): |
22 | 47 | raise TypeError( |
23 | | - f"\nDuring validation of dataclass {dc.__name__}, a type error occurred: - {err.args[0]}\n" |
24 | | - f"...at attribute {k!r}" |
| 48 | + get_exact_error_message( |
| 49 | + [ |
| 50 | + f"During validation of dataclass {dc.__name__!r} at attribute {k!r}, a type error occurred:", |
| 51 | + *res.errors, |
| 52 | + ] |
| 53 | + ) |
25 | 54 | ) |
26 | | - setattr(self, k, v) |
| 55 | + setattr(self, k, res.ok) |
27 | 56 |
|
28 | 57 | for key, value in kwargs.items(): |
29 | | - try: |
30 | | - setattr(self, key, etypes[key].validate(value)) |
31 | | - except TypeError as err: |
| 58 | + res = etypes[key].validate(value) |
| 59 | + if res.has_error(): |
32 | 60 | raise TypeError( |
33 | | - f"\nDuring validation of dataclass {dc.__name__}, a type error occurred: - {err.args[0]}\n" |
34 | | - f"...at attribute {key!r}" |
| 61 | + get_exact_error_message( |
| 62 | + [ |
| 63 | + f"During validation of dataclass {dc.__name__!r} at attribute {key!r}, a type error occurred:", |
| 64 | + *res.errors, |
| 65 | + ] |
| 66 | + ) |
35 | 67 | ) |
| 68 | + setattr(self, key, res.ok) |
36 | 69 |
|
37 | 70 | else: |
38 | 71 | for key, value in kwargs.items(): |
39 | | - try: |
40 | | - setattr(self, key, etypes[key].validate(value)) |
41 | | - except TypeError as err: |
| 72 | + res = etypes[key].validate(value) |
| 73 | + if res.has_error(): |
42 | 74 | raise TypeError( |
43 | | - f"\nDuring validation of dataclass {dc.__name__}, a type error occurred: - {err.args[0]}\n" |
44 | | - f"...at attribute {key!r}" |
| 75 | + get_exact_error_message( |
| 76 | + [ |
| 77 | + f"During validation of dataclass {dc.__name__!r} at attribute {key!r}, a type error occurred:", |
| 78 | + *res.errors, |
| 79 | + ] |
| 80 | + ) |
45 | 81 | ) |
| 82 | + setattr(self, key, res.ok) |
46 | 83 |
|
47 | 84 | return None # required! |
48 | 85 |
|
|
0 commit comments