sera-2 1.6.5__tar.gz → 1.6.7__tar.gz

{sera_2-1.6.5 → sera_2-1.6.7}/PKG-INFO

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

{sera_2-1.6.5 → sera_2-1.6.7}/pyproject.toml

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

{sera_2-1.6.5 → sera_2-1.6.7}/sera/make/make_typescript_model.py

@@ -833,6 +833,17 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                     else expr.ExprConstant("undefined")
                                 ),
                             ),
+                            (
+                                expr.ExprIdent("constraints"),
+                                PredefinedFn.list(
+                                    [
+                                        expr.ExprConstant(
+                                            constraint.get_typescript_constraint()
+                                        )
+                                        for constraint in prop.data.constraints
+                                    ]
+                                ),
+                            ),
                         ]
                         + tsprop
                     ),
@@ -917,7 +928,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             ),
             stmt.LineBreak(),
             stmt.TypescriptStatement(
-                f"export const {cls.name}Schema: Schema<{cls.name}SchemaType> = "
+                f"export const {cls.name}Schema: Schema<{cls.name}SchemaType['id'], {cls.name}SchemaType['cls'], {cls.name}SchemaType['draftCls'], {cls.name}SchemaType['publicProperties'], {cls.name}SchemaType['allProperties'], {cls.name}SchemaType> = "
                 + PredefinedFn.dict(
                     [
                         (

{sera_2-1.6.5 → sera_2-1.6.7}/sera/models/_constraints.py

@@ -24,10 +24,18 @@ class Constraint:
                 "msgspec.Meta(min_length=3, max_length=32, pattern=r'^[a-zA-Z0-9_]+$')"
             )
         elif self.name == "password":
-            return "msgspec.Meta(min_length=8, max_length=32)"
+            return "msgspec.Meta(min_length=8, max_length=40)"
 
         raise NotImplementedError()
 
+    def get_typescript_constraint(self) -> str | dict:
+        if len(self.args) == 0:
+            return self.name
+        return {
+            "name": self.name,
+            "args": self.args,
+        }
+
 
 predefined_constraints: dict[ConstraintName, Constraint] = {
     "phone_number": Constraint("phone_number", ()),