sera-2 1.14.5__tar.gz → 1.14.7__tar.gz

{sera_2-1.14.5 → sera_2-1.14.7}/PKG-INFO

@@ -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 → sera_2-1.14.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sera-2"
-version = "1.14.5"
+version = "1.14.7"
 description = ""
 authors = ["Binh Vu <bvu687@gmail.com>"]
 readme = "README.md"

{sera_2-1.14.5 → sera_2-1.14.7}/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_2-1.14.5 → sera_2-1.14.7}/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: