sera-2 1.7.2__py3-none-any.whl → 1.8.0__py3-none-any.whl

sera/make/make_typescript_model.py

@@ -235,6 +235,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         idprop = cls.get_id_property()
 
         draft_clsname = "Draft" + cls.name
+        draft_validators = f"draft{cls.name}Validators"
 
         program = Program()
         program.import_(f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}", True)
@@ -259,7 +260,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         cls_pk = None
         observable_args: list[tuple[expr.Expr, expr.ExprIdent]] = []
         prop_defs = []
-        prop_validators = []
+        prop_validators: list[tuple[expr.ExprIdent, expr.Expr]] = []
         prop_constructor_assigns = []
         # attrs needed for the cls.create function
         create_args = []
@@ -267,12 +268,15 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         ser_args = []
         update_field_funcs: list[Callable[[AST], Any]] = []
 
+        prop2tsname = {}
+
         for prop in cls.properties.values():
             # if prop.data.is_private:
             #     # skip private fields as this is for APIs exchange
             #     continue
 
             propname = to_camel_case(prop.name)
+            prop2tsname[prop.name] = propname
 
             def _update_field_func(
                 prop: DataProperty | ObjectProperty,
@@ -373,8 +377,32 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 ser_args.append(
                     (
                         expr.ExprIdent(prop.name),
-                        PredefinedFn.attr_getter(
-                            expr.ExprIdent("this"), expr.ExprIdent(propname)
+                        (
+                            expr.ExprTernary(
+                                PredefinedFn.attr_getter(
+                                    expr.ExprFuncCall(
+                                        PredefinedFn.attr_getter(
+                                            expr.ExprIdent(draft_validators),
+                                            expr.ExprIdent(propname),
+                                        ),
+                                        [
+                                            PredefinedFn.attr_getter(
+                                                expr.ExprIdent("this"),
+                                                expr.ExprIdent(propname),
+                                            )
+                                        ],
+                                    ),
+                                    expr.ExprIdent("isValid"),
+                                ),
+                                PredefinedFn.attr_getter(
+                                    expr.ExprIdent("this"), expr.ExprIdent(propname)
+                                ),
+                                expr.ExprIdent("undefined"),
+                            )
+                            if prop.is_optional
+                            else PredefinedFn.attr_getter(
+                                expr.ExprIdent("this"), expr.ExprIdent(propname)
+                            )
                         ),
                     )
                 )
@@ -506,6 +534,26 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     )
                 )
 
+                # TODO: fix me!
+                prop_validators.append(
+                    (
+                        expr.ExprIdent(propname),
+                        expr.ExprFuncCall(
+                            expr.ExprIdent("getValidator"),
+                            [
+                                PredefinedFn.list(
+                                    [
+                                        expr.ExprConstant(
+                                            constraint.get_typescript_constraint()
+                                        )
+                                        for constraint in prop.data.constraints
+                                    ]
+                                ),
+                            ],
+                        ),
+                    )
+                )
+
             prop_defs.append(stmt.DefClassVarStatement(propname, tstype.type))
             prop_constructor_assigns.append(
                 stmt.AssignStatement(
@@ -570,10 +618,6 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             lambda ast10: ast10.class_(draft_clsname)(
                 *prop_defs,
                 stmt.LineBreak(),
-                stmt.DefClassVarStatement(
-                    "validators", type=None, value=validators, is_static=True
-                ),
-                stmt.LineBreak(),
                 lambda ast10: ast10.func(
                     "constructor",
                     [
@@ -648,16 +692,37 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 *update_field_funcs,
                 stmt.LineBreak(),
                 lambda ast14: ast14.func(
+                    "isValid",
+                    [],
+                    expr.ExprIdent("boolean"),
+                    comment="Check if the draft is valid (only check the required fields as the non-required fields if it's invalid will be set to undefined)",
+                )(
+                    stmt.ReturnStatement(
+                        stmt.TypescriptStatement(
+                            " && ".join(
+                                f"{draft_validators}.{prop2tsname[prop.name]}(this.{prop2tsname[prop.name]}).isValid"
+                                for prop in cls.properties.values()
+                                if not prop.is_optional
+                            )
+                        )
+                    )
+                ),
+                stmt.LineBreak(),
+                lambda ast15: ast15.func(
                     "ser",
                     [],
                     expr.ExprIdent("any"),
-                    comment="Serialize the draft to communicate with the server",
+                    comment="Serialize the draft to communicate with the server. `isValid` must be called first to ensure all data is valid",
                 )(
                     stmt.ReturnStatement(
                         PredefinedFn.dict(ser_args),
                     ),
                 ),
             ),
+            stmt.LineBreak(),
+            stmt.TypescriptStatement(
+                f"export const {draft_validators} = " + validators.to_typescript() + ";"
+            ),
         )
 
         pkg.module("Draft" + cls.name).write(program)
@@ -904,6 +969,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         program.import_(
             f"@.models.{pkg.dir.name}.Draft{cls.name}.Draft{cls.name}", True
         )
+        program.import_(
+            f"@.models.{pkg.dir.name}.Draft{cls.name}.draft{cls.name}Validators", True
+        )
         program.root(
             stmt.LineBreak(),
             stmt.TypescriptStatement(
@@ -995,6 +1063,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                 + "}"
                             ),
                         ),
+                        (
+                            expr.ExprIdent("validators"),
+                            expr.ExprIdent(f"draft{cls.name}Validators"),
+                        ),
                     ]
                     + (
                         [

{sera_2-1.7.2.dist-info → sera_2-1.8.0.dist-info}/METADATA

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

{sera_2-1.7.2.dist-info → sera_2-1.8.0.dist-info}/RECORD

@@ -12,7 +12,7 @@ sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 sera/make/make_python_api.py,sha256=RuJUm9z-4plBEtjobeOPr12o27OT-0tSeXI4ZlM3IY0,29433
 sera/make/make_python_model.py,sha256=xf4revAwVWEnF6QhxbbqPyUGgXOOB--Gu3jPxsESg0Y,36593
 sera/make/make_python_services.py,sha256=RsinYZdfkrTlTn9CT50VgqGs9w6IZawsJx-KEmqfnEY,2062
-sera/make/make_typescript_model.py,sha256=27lk4YgfJ6_7xxBirxJKgK0-wBNowMWZkvcMUFdmStE,46865
+sera/make/make_typescript_model.py,sha256=9OyNG9hy_lEvlQFFbuOqg9iarNKVwzmpQXgZLXRyvoM,50315
 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.7.2.dist-info/METADATA,sha256=xzCJfINCVbrv5Xd3oAKXJnhF_tYm7A51PpdTpdVqUW8,856
-sera_2-1.7.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.7.2.dist-info/RECORD,,
+sera_2-1.8.0.dist-info/METADATA,sha256=fd-bIlMNnGNKyNDR8A2K2NiTCNbWiSTYyaX13R8H-nU,856
+sera_2-1.8.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.8.0.dist-info/RECORD,,