sera-2 1.7.2__tar.gz → 1.7.3__tar.gz

{sera_2-1.7.2 → sera_2-1.7.3}/PKG-INFO

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

{sera_2-1.7.2 → sera_2-1.7.3}/pyproject.toml

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

{sera_2-1.7.2 → sera_2-1.7.3}/sera/make/make_typescript_model.py

@@ -506,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(
@@ -570,10 +590,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",
                     [
@@ -658,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)
@@ -904,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(
@@ -995,6 +1020,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                 + "}"
                             ),
                         ),
+                        (
+                            expr.ExprIdent("validators"),
+                            expr.ExprIdent(f"draft{cls.name}Validators"),
+                        ),
                     ]
                     + (
                         [