sera-2 1.7.1__py3-none-any.whl → 1.7.3__py3-none-any.whl

sera/make/make_typescript_model.py

@@ -241,8 +241,15 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         program.import_("mobx.makeObservable", True)
         program.import_("mobx.observable", True)
         program.import_("mobx.action", True)
+        program.import_("sera-db.validators", True)
 
-        program.root.linebreak()
+        program.root(
+            stmt.LineBreak(),
+            stmt.TypescriptStatement(
+                "const {getValidator, memoizeOneValidators} = validators;"
+            ),
+            stmt.LineBreak(),
+        )
 
         # make sure that the property stale is not in existing properties
         if "stale" in cls.properties:
@@ -252,6 +259,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_constructor_assigns = []
         # attrs needed for the cls.create function
         create_args = []
@@ -330,6 +338,25 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     else:
                         create_propvalue = tstype.get_default()
 
+                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
+                                    ]
+                                ),
+                            ],
+                        ),
+                    )
+                )
+
                 if prop.db is not None and prop.db.is_primary_key:
                     # for checking if the primary key is from the database or default (create_propvalue)
                     cls_pk = (expr.ExprIdent(propname), create_propvalue)
@@ -479,6 +506,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(
@@ -530,6 +577,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         )
         observable_args.sort(key=lambda x: {"observable": 0, "action": 1}[x[1].ident])
 
+        validators = expr.ExprFuncCall(
+            expr.ExprIdent("memoizeOneValidators"), [PredefinedFn.dict(prop_validators)]
+        )
+
         program.root(
             lambda ast00: ast00.class_like(
                 "interface",
@@ -623,6 +674,12 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     ),
                 ),
             ),
+            stmt.LineBreak(),
+            stmt.TypescriptStatement(
+                f"export const draft{cls.name}Validators = "
+                + validators.to_typescript()
+                + ";"
+            ),
         )
 
         pkg.module("Draft" + cls.name).write(program)
@@ -869,6 +926,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(
@@ -960,6 +1020,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.1.dist-info → sera_2-1.7.3.dist-info}/METADATA

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

{sera_2-1.7.1.dist-info → sera_2-1.7.3.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=vBbVPJ3yZoMIwUOBfYykD7i3PwzDhE72SQWk6vgepPc,45513
+sera/make/make_typescript_model.py,sha256=E7HT3cmPnhw2HUdtWLOc3pz4EpvHW9EaMjHS_s1gvL4,48011
 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.1.dist-info/METADATA,sha256=xyOCEi73Y50ltZKFNEZSNats-Ho3tPkd3_B1Y8dlECY,856
-sera_2-1.7.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.7.1.dist-info/RECORD,,
+sera_2-1.7.3.dist-info/METADATA,sha256=5HVujlhHjtBZxvO3R-6jbu2uYCjybYB9kAknXeSx4AY,856
+sera_2-1.7.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.7.3.dist-info/RECORD,,