sera-2 1.8.2__tar.gz → 1.9.1__tar.gz

{sera_2-1.8.2 → sera_2-1.9.1}/PKG-INFO

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

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

{sera_2-1.8.2 → sera_2-1.9.1}/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_2-1.8.2 → sera_2-1.9.1}/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"),