Improve handling of enums with same name

Author: guaycuru

pydantic2ts/cli/script.py

@@ -163,11 +163,15 @@ def add_ts_enum_names(schema: Dict[str, Any], enum_class: Type[Enum]) -> None:
     schema["tsEnumNames"] = [name for name, member in enum_class.__members__.items()]
 
 
-def is_matching_enum(prop_type: Any, schema_title: str) -> bool:
+def is_matching_enum(prop_type: Any, schema_title: str, schema_enum: list[str]) -> bool:
     return (
         isclass(prop_type)
         and issubclass(prop_type, Enum)
         and prop_type.__name__ == schema_title
+        and all(
+            value in (member.value for member in prop_type.__members__.values())
+            for value in schema_enum
+        )
     )
 
 
@@ -183,17 +187,19 @@ def extend_enum_definitions(
         for model in models:
             for prop, prop_type in model.__annotations__.items():
                 origin = get_origin(prop_type)
-                if is_matching_enum(prop_type, schema["title"]):
+                if is_matching_enum(prop_type, schema["title"], schema["enum"]):
                     add_ts_enum_names(schema, prop_type)
                     break
                 elif origin is list:
                     inner_type = get_args(prop_type)[0]
-                    if is_matching_enum(inner_type, schema["title"]):
+                    if is_matching_enum(inner_type, schema["title"], schema["enum"]):
                         add_ts_enum_names(schema, inner_type)
                         break
                 elif (UnionType and origin is UnionType) or origin is Union:
                     for inner_type in get_args(prop_type):
-                        if is_matching_enum(inner_type, schema["title"]):
+                        if is_matching_enum(
+                            inner_type, schema["title"], schema["enum"]
+                        ):
                             add_ts_enum_names(schema, inner_type)
                             break
 

tests/expected_results/__init__.py

@@ -2,6 +2,9 @@
 
 from pydantic import BaseModel
 
+from .schemas.schema_one import ModelOne  # noqa: F401
+from .schemas.schema_two import ModelTwo  # noqa: F401
+
 
 class Cat(BaseModel):
     name: str

tests/expected_results/enums/__init__.py

@@ -21,3 +21,18 @@ export interface Dog {
   name: string;
   age: number;
 }
+export interface ModelOne {
+  foo: Foo;
+}
+export interface ModelTwo {
+  foo: Foo1;
+}
+
+export const enum Foo {
+  ONE_A = "one_a",
+  ONE_B = "one_b"
+}
+export const enum Foo1 {
+  TWO_A = "two_a",
+  TWO_B = "two_b"
+}

tests/expected_results/enums/v1/__init__.py

@@ -0,0 +1,12 @@
+import enum
+
+from pydantic import BaseModel
+
+
+class Foo(enum.Enum):
+    ONE_A = "one_a"
+    ONE_B = "one_b"
+
+
+class ModelOne(BaseModel):
+    foo: Foo

tests/expected_results/enums/v1/input.py

@@ -0,0 +1,12 @@
+import enum
+
+from pydantic import BaseModel
+
+
+class Foo(enum.Enum):
+    TWO_A = "two_a"
+    TWO_B = "two_b"
+
+
+class ModelTwo(BaseModel):
+    foo: Foo

tests/expected_results/enums/v1/output.ts

@@ -2,6 +2,9 @@
 
 from pydantic import BaseModel
 
+from .schemas.schema_one import ModelOne  # noqa: F401
+from .schemas.schema_two import ModelTwo  # noqa: F401
+
 
 class Cat(BaseModel):
     name: str

tests/expected_results/enums/v1/schemas/__init__.py

@@ -21,3 +21,18 @@ export interface Dog {
   name: string;
   age: number;
 }
+export interface ModelOne {
+  foo: Foo;
+}
+export interface ModelTwo {
+  foo: Foo1;
+}
+
+export const enum Foo {
+  ONE_A = "one_a",
+  ONE_B = "one_b"
+}
+export const enum Foo1 {
+  TWO_A = "two_a",
+  TWO_B = "two_b"
+}

tests/expected_results/enums/v1/schemas/schema_one.py

@@ -0,0 +1,12 @@
+import enum
+
+from pydantic import BaseModel
+
+
+class Foo(enum.Enum):
+    ONE_A = "one_a"
+    ONE_B = "one_b"
+
+
+class ModelOne(BaseModel):
+    foo: Foo

tests/expected_results/enums/v1/schemas/schema_two.py

@@ -0,0 +1,12 @@
+import enum
+
+from pydantic import BaseModel
+
+
+class Foo(enum.Enum):
+    TWO_A = "two_a"
+    TWO_B = "two_b"
+
+
+class ModelTwo(BaseModel):
+    foo: Foo