fix generic handling

apioo · Apr 7, 2024 · 3c81145 · 3c81145
1 parent a89027d
commit 3c81145
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/Generator/Normalizer/Python.php b/src/Generator/Normalizer/Python.php
@@ -90,6 +90,7 @@ protected function getKeywords(): array
             'continue',
             'global',
             'pass',
+            'async',
         ];
     }
 }
diff --git a/src/Generator/Python.php b/src/Generator/Python.php
@@ -60,12 +60,30 @@ protected function newNormalizer(): NormalizerInterface
 
     protected function writeStruct(Code\Name $name, array $properties, ?string $extends, ?array $generics, StructType $origin): string
     {
-        $code = '@dataclass_json' . "\n";
+        $code = '';
+        if (!empty($generics)) {
+            foreach ($generics as $type) {
+                $code.= $type . ' = TypeVar("' . $type . '")' . "\n";
+            }
+        }
+
+        $code.= '@dataclass_json' . "\n";
         $code.= '@dataclass' . "\n";
         $code.= 'class ' . $name->getClass();
 
+        $parts = [];
         if (!empty($extends)) {
-            $code.= '(' . $extends . ')';
+            $parts[] = $extends;
+        }
+
+        if (!empty($generics)) {
+            foreach ($generics as $type) {
+                $parts[] = 'Generic[' . $type . ']';
+            }
+        }
+
+        if (!empty($parts)) {
+            $code.= '(' . implode(', ', $parts) . ')';
         }
 
         $code.= ':' . "\n";

diff --git a/tests/Generator/resource/python/python_oop.py b/tests/Generator/resource/python/python_oop.py
@@ -27,9 +27,10 @@ class StudentMap(Map[Student]):
 from dataclasses import dataclass, field
 from dataclasses_json import dataclass_json, config
 from typing import List
+T = TypeVar("T")
 @dataclass_json
 @dataclass
-class Map:
+class Map(Generic[T]):
     total_results: int = field(default=None, metadata=config(field_name="totalResults"))
     entries: List[T] = field(default=None, metadata=config(field_name="entries"))