sera-2 1.14.5__py3-none-any.whl → 1.14.7__py3-none-any.whl

sera/make/make_typescript_model.py

@@ -1104,7 +1104,19 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 for dep in tstype.deps:
                     program.import_(dep, True)
                 tsprop = [
-                    (expr.ExprIdent("datatype"), expr.ExprConstant(tstype.type)),
+                    (
+                        expr.ExprIdent("datatype"),
+                        (
+                            expr.ExprConstant(tstype.type)
+                            if tstype.type not in schema.enums
+                            else expr.ExprConstant("enum")
+                        ),
+                    ),
+                    *(
+                        [(expr.ExprIdent("enumType"), expr.ExprIdent(tstype.type))]
+                        if tstype.type in schema.enums
+                        else []
+                    ),
                     (
                         expr.ExprIdent("isRequired"),
                         expr.ExprConstant(

sera/misc/_utils.py

@@ -4,6 +4,44 @@ import re
 from typing import Any, Callable, Iterable, Optional, TypeVar
 
 T = TypeVar("T")
+reserved_keywords = {
+    "and",
+    "or",
+    "not",
+    "is",
+    "in",
+    "if",
+    "else",
+    "elif",
+    "for",
+    "while",
+    "def",
+    "class",
+    "return",
+    "yield",
+    "import",
+    "from",
+    "as",
+    "with",
+    "try",
+    "except",
+    "finally",
+    "raise",
+    "assert",
+    "break",
+    "continue",
+    "pass",
+    "del",
+    "global",
+    "nonlocal",
+    "lambda",
+    "async",
+    "await",
+    "True",
+    "False",
+    "None",
+    "self",
+}
 
 
 def to_snake_case(camelcase: str) -> str:
@@ -16,13 +54,21 @@ def to_snake_case(camelcase: str) -> str:
 def to_camel_case(snake: str) -> str:
     """Convert snake_case to camelCase."""
     components = snake.split("_")
-    return components[0] + "".join(x.title() for x in components[1:])
+    out = components[0] + "".join(x.title() for x in components[1:])
+    # handle a corner case where the _ is added to the end of the string to avoid reserved keywords
+    if snake.endswith("_") and snake[:-1] in reserved_keywords:
+        out += "_"
+    return out
 
 
 def to_pascal_case(snake: str) -> str:
     """Convert snake_case to PascalCase."""
     components = snake.split("_")
-    return "".join(x.title() for x in components)
+    out = "".join(x.title() for x in components)
+    # handle a corner case where the _ is added to the end of the string to avoid reserved keywords
+    if snake.endswith("_") and snake[:-1] in reserved_keywords:
+        out += "_"
+    return out
 
 
 def assert_isinstance(x: Any, cls: type[T]) -> T:

{sera_2-1.14.5.dist-info → sera_2-1.14.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sera-2
-Version: 1.14.5
+Version: 1.14.7
 Summary: 
 Author: Binh Vu
 Author-email: bvu687@gmail.com

{sera_2-1.14.5.dist-info → sera_2-1.14.7.dist-info}/RECORD

@@ -19,10 +19,10 @@ sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 sera/make/make_python_api.py,sha256=iXGbKQ3IJvsY1ur_fhurr_THFNnH66E3Wl85o0emUbw,26853
 sera/make/make_python_model.py,sha256=cRb-fuHX0WH7XPAAliu6lycC0iEjE5kcKg4bBU40GwQ,61275
 sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
-sera/make/make_typescript_model.py,sha256=4yLCLIzP2jeXfmOeee6nNS_qd7_7iPinV2vQh1IfbLs,64000
+sera/make/make_typescript_model.py,sha256=3F-1TAbVb2-vidj5wKIi_U442JkBXZU3UYCZkodWRRM,64466
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
-sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
+sera/misc/_utils.py,sha256=vBfbEChf7IMdLDj3CbdOXTUAdWNQTLLpAWwBoUcF3u0,2315
 sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=1J4Bd_LanzhhDWwZFHWGtFYD7lupe_alaB3D02ebNDI,2862
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
@@ -36,6 +36,6 @@ sera/models/_parse.py,sha256=MaGZty29lsVUFumWqNanIjAwptBNOMbVZMXLZ2A9_2g,12317
 sera/models/_property.py,sha256=2rSLs9JjSesrxrEugE7krYaBQOivKU882I8mZN94FlI,7017
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=Fl4-UzLJu1GdLLk_g87fA7nT9wQGelNnGzag6dg_0gs,980
-sera_2-1.14.5.dist-info/METADATA,sha256=vwWtB6bjalDopfemBjaZj3CI2D4S9seb-diDw98smxY,852
-sera_2-1.14.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.14.5.dist-info/RECORD,,
+sera_2-1.14.7.dist-info/METADATA,sha256=r_FKuEQXlq3cQU-xQqcbdd61agMD-dvcg7Ar0n2Hq4s,852
+sera_2-1.14.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.14.7.dist-info/RECORD,,