Merge pull request #42 from bigpe/master

fix: filter external modules && quote replace
adenh93 · May 24, 2023 · 8751671 · 8751671
2 parents 1823cc9 + d273803
commit 8751671
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/django_typomatic/__init__.py b/django_typomatic/__init__.py
@@ -133,7 +133,8 @@ def __map_choices_to_enum_values(enum_name, field_type, choices):
 
     choices_enum = f"export enum {enum_name} {{\n"
     for key, value in choices.items():
-        value = value.replace("'", "\\'")
+        if type(value) == str:
+            value = value.replace("'", "\\'")
         if type(key) == str:
             choices_enum = choices_enum + f"    {str(key).replace(' ', '_')} = '{value}',\n"
         else:

diff --git a/django_typomatic/management/commands/generate_ts.py b/django_typomatic/management/commands/generate_ts.py
@@ -129,7 +129,7 @@ def handle(self, *args, serializers, output, all, **options):
         if all:
             for app in apps.get_app_configs():
                 # Filter external modules
-                if str(settings.BASE_DIR.parent) not in app.path:
+                if str(settings.BASE_DIR.parent) not in app.path or '.venv' in app.path:
                     continue
 
                 serializers += self._get_app_serializers(app.name)