sera-2 1.11.2__py3-none-any.whl → 1.11.3__py3-none-any.whl

sera/make/make_python_model.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from operator import is_
 from typing import Callable, Sequence
 
 from codegen.models import AST, DeferredVar, PredefinedFn, Program, expr, stmt
@@ -296,11 +297,14 @@ def make_python_data_model(
                         ],
                     )
 
+                if prop.cardinality.is_star_to_many():
+                    pytype = pytype.as_list_type()
+                elif prop.is_optional:
+                    pytype = pytype.as_optional_type()
+
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                if prop.cardinality.is_star_to_many():
-                    pytype = pytype.as_list_type()
                 cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
 
         # has_to_db = True
@@ -453,11 +457,14 @@ def make_python_data_model(
                         ],
                     )
 
+                if prop.cardinality.is_star_to_many():
+                    pytype = pytype.as_list_type()
+                elif prop.is_optional:
+                    pytype = pytype.as_optional_type()
+
                 for dep in pytype.deps:
                     program.import_(dep, True)
 
-                if prop.cardinality.is_star_to_many():
-                    pytype = pytype.as_list_type()
                 cls_ast(stmt.DefClassVarStatement(prop.name, pytype.type))
 
         cls_ast(
@@ -690,7 +697,12 @@ def make_python_relational_model(
                     program.import_(dep, True)
 
                 propname = prop.name
-                proptype = f"Mapped[{sqltype.mapped_pytype}]"
+
+                if prop.is_optional:
+                    program.import_("typing.Optional", True)
+                    proptype = f"Mapped[Optional[{sqltype.mapped_pytype}]]"
+                else:
+                    proptype = f"Mapped[{sqltype.mapped_pytype}]"
 
                 propvalargs: list[expr.Expr] = [expr.ExprIdent(sqltype.type)]
                 if prop.db.is_primary_key:

sera/make/make_typescript_model.py

@@ -74,6 +74,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 if idprop is not None and prop.name == idprop.name:
                     # use id type alias
                     tstype = TsTypeWithDep(f"{cls.name}Id")
+                
+                if prop.is_optional:
+                    # convert type to optional
+                    tstype = tstype.as_optional_type()
 
                 deser_args.append(
                     (
@@ -95,6 +99,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     )
                     if prop.cardinality.is_star_to_many():
                         tstype = tstype.as_list_type()
+                    elif prop.is_optional:
+                        # convert type to optional only if it isn't a list
+                        tstype = tstype.as_optional_type()
                     deser_args.append(
                         (
                             expr.ExprIdent(propname),
@@ -134,6 +141,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                             )
                         )
                     else:
+                        if prop.is_optional:
+                            # convert type to optional only if it isn't a list
+                            tstype = tstype.as_optional_type()
                         deser_args.append(
                             (
                                 expr.ExprIdent(propname),
@@ -329,6 +339,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     # for none id properties, we need to include a type for "invalid" value
                     tstype = _inject_type_for_invalid_value(tstype)
 
+                if prop.is_optional:
+                    # convert type to optional
+                    tstype = tstype.as_optional_type()
+
                 for dep in tstype.deps:
                     program.import_(dep, True)
 
@@ -438,6 +452,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         tstype = tstype.as_list_type()
                         create_propvalue = expr.ExprConstant([])
                     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()
                         # if target class has an auto-increment primary key, we set a different default value
                         # to be -1 to avoid start from 0
                         target_idprop = prop.target.get_id_property()
@@ -496,6 +514,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                             )
                         )
                     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",

sera/models/_datatype.py

@@ -97,6 +97,13 @@ class TsTypeWithDep:
             list_type = f"{self.type}[]"
         return TsTypeWithDep(type=list_type, deps=self.deps)
 
+    def as_optional_type(self) -> TsTypeWithDep:
+        if "undefined" in self.type:
+            raise NotImplementedError(
+                f"Have not handle nested optional yet: {self.type}"
+            )
+        return TsTypeWithDep(type=f"{self.type} | undefined", deps=self.deps)
+
 
 @dataclass
 class SQLTypeWithDep:

{sera_2-1.11.2.dist-info → sera_2-1.11.3.dist-info}/METADATA

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

{sera_2-1.11.2.dist-info → sera_2-1.11.3.dist-info}/RECORD

@@ -13,9 +13,9 @@ sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=G5O7s6135-708honwqMFn2yPTs06WbGQTHpupID0eZ4,1417
 sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 sera/make/make_python_api.py,sha256=kq5DClmEeeNgg-a3Bb_8GN9jxvjnhjmW3RfBHNzynO8,25407
-sera/make/make_python_model.py,sha256=MyEhVXeeHxAzqUkjSUuVzQJLUCCe7RKL6VxEMiCfTxk,41507
+sera/make/make_python_model.py,sha256=AlNJyyovb99TWocS2jtfTxy0C5YaFizx-Bhwdw1mUNw,41923
 sera/make/make_python_services.py,sha256=RsinYZdfkrTlTn9CT50VgqGs9w6IZawsJx-KEmqfnEY,2062
-sera/make/make_typescript_model.py,sha256=-FNeUlcrqz2Zd1Eg6P14usXTrgTXd9oGhpOApLqntOw,51395
+sera/make/make_typescript_model.py,sha256=Mv6vXhvwQYzbKCMudzymxN_FH1utqaGGJB2dgyB5sIM,52601
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
 sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
@@ -23,7 +23,7 @@ sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=Wf0e8x6-szG9TzoFkAlqj7_dG0SCICMBw_333n3paxk,2514
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
 sera/models/_constraints.py,sha256=L6QwKL3hRJ5DvvIB4JNgLoyvTKbE9FrpYRzezM4CweE,1484
-sera/models/_datatype.py,sha256=zkqOKOTZIkoYhJkIpytWWhGp-LtD10Jzud7lxOSd5UQ,6533
+sera/models/_datatype.py,sha256=RDn0lDl_b0O_PwRqobcD1O903owEAEoMzRf4dyRcgBk,6819
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
 sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
 sera/models/_module.py,sha256=8QRSCubZmdDP9rL58rGAS6X5VCrkc1ZHvuMu1I1KrWk,5043
@@ -32,6 +32,6 @@ sera/models/_parse.py,sha256=uw6fvvh1ucGqE2jFTCCr-e6_qMfZfSVpaPolNxmrHww,9897
 sera/models/_property.py,sha256=SJSm5fZJimd2rQuL4UH_aZuNyp9v7x64xMbEVbtYx8Q,5633
 sera/models/_schema.py,sha256=r-Gqg9Lb_wR3UrbNvfXXgt_qs5bts0t2Ve7aquuF_OI,1155
 sera/typing.py,sha256=Q4QMfbtfrCjC9tFfsZPhsAnbNX4lm4NHQ9lmjNXYdV0,772
-sera_2-1.11.2.dist-info/METADATA,sha256=t32pt4lTWNgWc27jVQKlmlK_xf9c99crcgWGVVQjo-Y,857
-sera_2-1.11.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.11.2.dist-info/RECORD,,
+sera_2-1.11.3.dist-info/METADATA,sha256=Rw99XGPK9fkwo5e278P34cjeiLdiEq41e-jl7N269hI,857
+sera_2-1.11.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.11.3.dist-info/RECORD,,