|
28 | 28 | from mypy.types import Type as MypyType |
29 | 29 | from mypy.typevars import fill_typevars |
30 | 30 | from typing_extensions import override |
31 | | - |
| 31 | +from mypy.subtypes import is_subtype |
32 | 32 | from mypy_django_plugin.errorcodes import MANAGER_MISSING |
33 | 33 | from mypy_django_plugin.exceptions import UnregisteredModelError |
34 | 34 | from mypy_django_plugin.lib import fullnames, helpers |
@@ -246,35 +246,30 @@ def run(self) -> None: |
246 | 246 |
|
247 | 247 | class InjectAnyAsBaseForNestedMeta(ModelClassInitializer): |
248 | 248 | """ |
249 | | - Replaces |
250 | | - class MyModel(models.Model): |
251 | | - class Meta: |
252 | | - pass |
253 | | - with |
254 | | - class MyModel(models.Model): |
255 | | - class Meta(TypedModelMeta): |
256 | | - pass |
257 | | -
|
258 | | - to provide proper typing of attributes in Meta inner classes. |
259 | | -
|
260 | | - If TypedModelMeta is not available, fallback to Any as a base |
261 | | - to get around incompatible Meta inner classes for different models. |
| 249 | + Handle Meta class transformation and validation. |
262 | 250 | """ |
263 | | - |
264 | 251 | @override |
265 | 252 | def run(self) -> None: |
266 | 253 | meta_node = helpers.get_nested_meta_node_for_current_class(self.model_classdef.info) |
267 | 254 | if meta_node is None: |
268 | 255 | return None |
| 256 | + |
269 | 257 | meta_node.fallback_to_any = True |
270 | | - |
271 | 258 | typed_model_meta_info = self.lookup_typeinfo(fullnames.TYPED_MODEL_META_FULLNAME) |
272 | | - if typed_model_meta_info and not meta_node.has_base(fullnames.TYPED_MODEL_META_FULLNAME): |
273 | | - # Insert TypedModelMeta just before `object` to leverage mypy's class-body semantic analysis. |
274 | | - meta_node.mro.insert(-1, typed_model_meta_info) |
275 | | - return None |
276 | | - |
277 | 259 |
|
| 260 | + if typed_model_meta_info: |
| 261 | + # Sobolevn's Strategy: iterate and validate attributes. |
| 262 | + for name, sym in meta_node.names.items(): |
| 263 | + if name in typed_model_meta_info.names: |
| 264 | + parent_sym = typed_model_meta_info.names[name] |
| 265 | + if parent_sym.type and sym.type: |
| 266 | + # Manual type validation against TypedModelMeta |
| 267 | + if not is_subtype(sym.type, parent_sym.type): |
| 268 | + self.ctx.api.fail( |
| 269 | + f'Incompatible type for "{name}" in Meta (expected "{parent_sym.type}", got "{sym.type}")', |
| 270 | + sym.node |
| 271 | + ) |
| 272 | + return None |
278 | 273 | class AddDefaultPrimaryKey(ModelClassInitializer): |
279 | 274 | @override |
280 | 275 | def run_with_model_cls(self, model_cls: type[Model]) -> None: |
|
0 commit comments