sera-2 1.14.4__py3-none-any.whl → 1.14.6__py3-none-any.whl

sera/make/__main__.py

@@ -30,7 +30,7 @@ def cli(
             "--collection",
             help="API collections to generate.",
         ),
-    ],
+    ] = [],
     language: Annotated[
         Language,
         typer.Option("-l", "--language", help="Language of the generated application"),

sera/make/make_typescript_model.py

@@ -23,6 +23,7 @@ from sera.models import (
     Schema,
     TsTypeWithDep,
 )
+from sera.typing import is_set
 
 
 def make_typescript_data_model(schema: Schema, target_pkg: Package):
@@ -336,8 +337,8 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         f"{cls.name}Id",
                         deps=[f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}Id"],
                     )
-                else:
-                    # for none id properties, we need to include a type for "invalid" value
+                elif tstype.type not in schema.enums:
+                    # for none id & none enum properties, we need to include a type for "invalid" value
                     tstype = _inject_type_for_invalid_value(tstype)
 
                 if prop.is_optional:
@@ -355,9 +356,15 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     and prop.db.is_auto_increment
                 ):
                     create_propvalue = expr.ExprConstant(-1)
+                elif is_set(prop.data.default_value):
+                    create_propvalue = expr.ExprConstant(prop.data.default_value)
                 else:
                     if tstype.type in idprop_aliases:
                         create_propvalue = idprop_aliases[tstype.type].get_default()
+                    elif tstype.type in schema.enums:
+                        create_propvalue = expr.ExprConstant(
+                            next(iter(schema.enums[tstype.type].values.values())).value
+                        )
                     else:
                         create_propvalue = tstype.get_default()
 
@@ -537,7 +544,6 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         ],
                     )
                     if prop.cardinality.is_star_to_many():
-                        tstype = tstype.as_list_type()
                         create_propvalue = expr.ExprConstant([])
                         update_propvalue = PredefinedFn.map_list(
                             PredefinedFn.attr_getter(
@@ -578,6 +584,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                 ),
                             )
                         )
+
                         if not prop.data.is_private:
                             # private property does not include in the public record
                             to_record_args.append(
@@ -612,11 +619,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                     ),
                                 )
                             )
+
+                        tstype = tstype.as_list_type()
                     else:
-                        if prop.is_optional:
-                            # convert type to optional - for list type, we don't need to do this
-                            # as we will use empty list as no value
-                            tstype = tstype.as_optional_type()
                         create_propvalue = expr.ExprMethodCall(
                             expr.ExprIdent(tstype.type),
                             "create",
@@ -729,6 +734,11 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                     )
                                 )
 
+                        if prop.is_optional:
+                            # convert type to optional - for list type, we don't need to do this
+                            # as we will use empty list as no value
+                            tstype = tstype.as_optional_type()
+
                 for dep in tstype.deps:
                     program.import_(
                         dep,
@@ -1407,16 +1417,13 @@ def make_typescript_enum(schema: Schema, target_pkg: Package):
             stmt.LineBreak(),
             lambda ast: ast.class_like("enum", enum.name)(
                 *[
-                    stmt.DefClassVarStatement(
+                    stmt.DefEnumValueStatement(
                         name=value.name,
-                        type=None,
                         value=expr.ExprConstant(value.value),
                     )
                     for value in enum.values.values()
                 ]
             ),
-            stmt.LineBreak(),
-            stmt.TypescriptStatement("export " + enum.name + ";"),
         )
         pkg.module(enum.get_tsmodule_name()).write(program)
 

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/models/_class.py

@@ -51,6 +51,7 @@ class Class:
         Get the ID property of this class.
         The ID property is the one tagged with is_primary_key
         """
+        id_props = []
         for prop in self.properties.values():
             if (
                 isinstance(prop, DataProperty)
@@ -60,7 +61,14 @@ class Class:
                 assert (
                     self.db is not None
                 ), "This class is not stored in the database and thus, cannot have a primary key"
-                return prop
+                id_props.append(prop)
+        if len(id_props) > 1:
+            raise ValueError(
+                f"Class {self.name} has more than one primary key property: {', '.join(p.name for p in id_props)}"
+            )
+        if len(id_props) == 1:
+            return id_props[0]
+        # if there is no primary key, we return None
         assert (
             self.db is None
         ), f"The class {self.name} is stored in the database and thus, must have a primary key"

sera/models/_datatype.py

@@ -82,7 +82,7 @@ class TsTypeWithDep:
             return expr.ExprConstant(0)
         if self.type == "boolean":
             return expr.ExprConstant(False)
-        if self.type == "string | undefined":
+        if self.type.endswith("| undefined"):
             return expr.ExprConstant("undefined")
         if self.type.endswith("| string)") or self.type.endswith("| string"):
             return expr.ExprConstant("")

sera/models/_parse.py

@@ -36,6 +36,7 @@ from sera.models._property import (
     SystemControlledAttrs,
 )
 from sera.models._schema import Schema
+from sera.typing import UNSET
 
 
 def parse_schema(name: str, files: Sequence[Path | str]) -> Schema:
@@ -140,6 +141,7 @@ def _parse_property(
         system_controlled=_parse_system_controlled_attrs(
             _data.get("system_controlled")
         ),
+        default_value=UNSET if "default_value" not in _data else _data["default_value"],
     )
 
     assert isinstance(prop, dict), prop
@@ -237,7 +239,9 @@ def _parse_datatype(schema: Schema, datatype: dict | str) -> DataType:
                 sqltype=SQLTypeWithDep(
                     type="String", mapped_pytype="str", deps=["sqlalchemy.String"]
                 ),
-                tstype=TsTypeWithDep(type=enum.name, deps=["@/models/enums"]),
+                tstype=TsTypeWithDep(
+                    type=enum.name, deps=[f"@.models.enums.{enum.name}"]
+                ),
                 is_list=is_list,
             )
 

sera/models/_property.py

@@ -2,12 +2,15 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import TYPE_CHECKING, Any, Literal, Optional
+
+from msgspec import UNSET
 
 from sera.models._constraints import Constraint
 from sera.models._datatype import DataType
 from sera.models._default import DefaultFactory
 from sera.models._multi_lingual_string import MultiLingualString
+from sera.typing import UnsetType
 
 if TYPE_CHECKING:
     from sera.models._class import Class
@@ -111,6 +114,9 @@ class PropDataAttrs:
     # if this property is controlled by the system, the attributes for the system-controlled property
     system_controlled: Optional[SystemControlledAttrs] = None
 
+    # default value of this property if it is not provided (then optional is false by default)
+    default_value: Any | UnsetType = UNSET
+
 
 @dataclass(kw_only=True)
 class Property:

{sera_2-1.14.4.dist-info → sera_2-1.14.6.dist-info}/METADATA

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

{sera_2-1.14.4.dist-info → sera_2-1.14.6.dist-info}/RECORD

@@ -14,28 +14,28 @@ sera/libs/middlewares/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 sera/libs/middlewares/auth.py,sha256=r6aix1ZBwxMd1Jv5hMCTB8a_gFOJQ6egvxIrf3DWEOs,2323
 sera/libs/middlewares/uscp.py,sha256=H5umW8iEQSCdb_MJ5Im49kxg1E7TpxSg1p2_2A5zI1U,2600
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sera/make/__main__.py,sha256=bt-gDF8E026OWc2zqr9_a3paMOiDkFd3ybWn8ltL2g0,1448
+sera/make/__main__.py,sha256=HRfOR53p351h6KblVvYm3DLhDIfEtk6R0kjl78_S_S8,1453
 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=ugDdSTw_1ayHLuL--92RQ8hf_D-dpJtnvmUZNxcwcDs,63687
+sera/make/make_typescript_model.py,sha256=4yLCLIzP2jeXfmOeee6nNS_qd7_7iPinV2vQh1IfbLs,64000
 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=9XSnJli2SGF-jm-v0swsfY6-omiQ5Xeh33R2pM9Kg_g,2526
+sera/models/_class.py,sha256=1J4Bd_LanzhhDWwZFHWGtFYD7lupe_alaB3D02ebNDI,2862
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
 sera/models/_constraints.py,sha256=RpWDU-TfCslXaMUaTG9utWbl5z8Z6nzvF_fhqlek6ew,1987
-sera/models/_datatype.py,sha256=Lq1iEGqQaNHiG5NlRTcOTWROiUFjoiPoTeSJKFU6lSE,7281
+sera/models/_datatype.py,sha256=cC6Wm0IvobDF5Tq9Jy_ncbjPWBRl3ECGBy0wJyDDMzU,7281
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
 sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
 sera/models/_module.py,sha256=I-GfnTgAa-5R87qTAvEzOt-VVEGeFBBwubGCgUkXVSw,5159
 sera/models/_multi_lingual_string.py,sha256=JETN6k00VH4wrA4w5vAHMEJV8fp3SY9bJebskFTjQLA,1186
-sera/models/_parse.py,sha256=ohexBbjFv6A1wZsEtokfw0zMVoR-RGXYrXa_tAub_Vs,12147
-sera/models/_property.py,sha256=Y98bYIjuCQDcSWpDxERNIFgmxXIaJiwBNFtYeGbDYRE,6812
+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.4.dist-info/METADATA,sha256=PTLgXrXqoFQ74mPm4mgMK3DaBGMh0A45FNuUd40tb94,852
-sera_2-1.14.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.14.4.dist-info/RECORD,,
+sera_2-1.14.6.dist-info/METADATA,sha256=XuXxkDt84tayCblVI10S594d0t3e0eg5j66iUCB-PKQ,852
+sera_2-1.14.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.14.6.dist-info/RECORD,,