sera-2 1.8.2__py3-none-any.whl → 1.9.1__py3-none-any.whl

sera/make/make_python_model.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Callable, Sequence
 
 from codegen.models import AST, DeferredVar, PredefinedFn, Program, expr, stmt
+
 from sera.misc import (
     assert_isinstance,
     assert_not_null,
@@ -206,12 +207,6 @@ def make_python_data_model(
                     program.import_(pytype.dep, True)
 
                 pytype_type = pytype.type
-                if prop.data.is_private:
-                    program.import_("typing.Union", True)
-                    program.import_("sera.typing.UnsetType", True)
-                    program.import_("sera.typing.UNSET", True)
-                    pytype_type = f"Union[{pytype_type}, UnsetType]"
-
                 if len(prop.data.constraints) > 0:
                     # if the property has constraints, we need to figure out
                     program.import_("typing.Annotated", True)
@@ -223,6 +218,12 @@ def make_python_data_model(
                     else:
                         raise NotImplementedError(prop.data.constraints)
 
+                if prop.data.is_private:
+                    program.import_("typing.Union", True)
+                    program.import_("sera.typing.UnsetType", True)
+                    program.import_("sera.typing.UNSET", True)
+                    pytype_type = f"Union[{pytype_type}, UnsetType]"
+
                 prop_default_value = None
                 if prop.data.is_private:
                     prop_default_value = expr.ExprIdent("UNSET")

sera/make/make_typescript_model.py

@@ -863,10 +863,6 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     program.import_(tstype.dep, True)
                 tsprop = [
                     (expr.ExprIdent("datatype"), expr.ExprConstant(tstype.type)),
-                    (
-                        expr.ExprIdent("isList"),
-                        expr.ExprConstant(prop.get_data_model_datatype().is_list),
-                    ),
                     (
                         expr.ExprIdent("isRequired"),
                         expr.ExprConstant(
@@ -907,8 +903,8 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     ),
                     (expr.ExprIdent("datatype"), expr.ExprConstant(tstype.type)),
                     (
-                        expr.ExprIdent("isList"),
-                        expr.ExprConstant(prop.cardinality.is_star_to_many()),
+                        expr.ExprIdent("cardinality"),
+                        expr.ExprConstant(prop.cardinality.value),
                     ),
                     (
                         expr.ExprIdent("isEmbedded"),

{sera_2-1.8.2.dist-info → sera_2-1.9.1.dist-info}/METADATA

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

{sera_2-1.8.2.dist-info → sera_2-1.9.1.dist-info}/RECORD

@@ -10,9 +10,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=FcklRwGDGTKPjuhbHKyEog8PYPACi-5DA_nB1ZgxeJU,29424
-sera/make/make_python_model.py,sha256=xf4revAwVWEnF6QhxbbqPyUGgXOOB--Gu3jPxsESg0Y,36593
+sera/make/make_python_model.py,sha256=v5edXKMTQ2XAYDoM7fBONx3S9H6DRUPQp9UwWWUowLg,36594
 sera/make/make_python_services.py,sha256=RsinYZdfkrTlTn9CT50VgqGs9w6IZawsJx-KEmqfnEY,2062
-sera/make/make_typescript_model.py,sha256=8p4rW8VUcBvoMT4a5qxBDDtRWNGKT1TtwLUaVlAQKcE,50313
+sera/make/make_typescript_model.py,sha256=fMjz4YxdGHijb2pHI4xj7rKJf1PxyJxVLYW0ivsu70c,50128
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
 sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
@@ -29,6 +29,6 @@ sera/models/_parse.py,sha256=sJYfQtwek96ltpgxExG4xUbiLnU3qvNYhTP1CeyXGjs,9746
 sera/models/_property.py,sha256=CmEmgOShtSyNFq05YW3tGupwCIVRzPMKudXWld8utPk,5530
 sera/models/_schema.py,sha256=r-Gqg9Lb_wR3UrbNvfXXgt_qs5bts0t2Ve7aquuF_OI,1155
 sera/typing.py,sha256=Q4QMfbtfrCjC9tFfsZPhsAnbNX4lm4NHQ9lmjNXYdV0,772
-sera_2-1.8.2.dist-info/METADATA,sha256=aVLnbP2Vi0Z-Vvaq4jaRgpu8QOjAHUDUsU47JlAwXYQ,856
-sera_2-1.8.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.8.2.dist-info/RECORD,,
+sera_2-1.9.1.dist-info/METADATA,sha256=Xg1hqLX0htdcQaJxgMUXAr4e_DAiDp3BiyTXXtIfHpg,856
+sera_2-1.9.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.9.1.dist-info/RECORD,,