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

sera/make/make_typescript_model.py

@@ -1,10 +1,12 @@
 from __future__ import annotations
 
+import re
 from typing import Any, Callable
 
 from codegen.models import AST, PredefinedFn, Program, expr, stmt
 from codegen.models.var import DeferredVar
 from loguru import logger
+
 from sera.misc import (
     assert_isinstance,
     assert_not_null,
@@ -239,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:
@@ -250,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 = []
@@ -307,6 +317,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         f"{cls.name}Id",
                         dep=f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}Id",
                     )
+                else:
+                    # for none id properties, we need to include a type for "invalid" value
+                    tstype = _inject_type_for_invalid_value(tstype)
+
                 if tstype.dep is not None:
                     program.import_(tstype.dep, True)
 
@@ -324,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)
@@ -524,6 +557,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",
@@ -533,6 +570,10 @@ 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",
                     [
@@ -822,7 +863,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         [
                             (expr.ExprIdent("name"), expr.ExprConstant(prop.name)),
                             (expr.ExprIdent("tsName"), expr.ExprConstant(propname)),
-                            (expr.ExprIdent("updateFuncName"), expr.ExprConstant(f"update{to_pascal_case(prop.name)}")),
+                            (
+                                expr.ExprIdent("updateFuncName"),
+                                expr.ExprConstant(f"update{to_pascal_case(prop.name)}"),
+                            ),
                             (
                                 expr.ExprIdent("label"),
                                 expr.ExprConstant(prop.label.to_dict()),
@@ -1069,3 +1113,48 @@ def make_typescript_enum(schema: Schema, target_pkg: Package):
         ),
     )
     enum_pkg.module("index").write(program)
+
+
+def _inject_type_for_invalid_value(tstype: TsTypeWithDep) -> TsTypeWithDep:
+    """
+    Inject a type for "invalid" values into the given TypeScript type. For context, see the discussion in Data Modeling Problems:
+    What would be an appropriate type for an invalid value? Since it's user input, it will be a string type.
+
+    However, there are some exceptions such as boolean type, which will always be valid and do not need injection.
+
+    If the type already includes `string` type, no changes are needed. Otherwise, we add `string` to the type. For example:
+    - (number | undefined) -> (number | undefined | string)
+    - number | undefined -> number | undefined | string
+    - number[] -> (number | string)[]
+    - (number | undefined)[] -> (number | undefined | string)[]
+    """
+    if tstype.type == "boolean":
+        return tstype
+
+    # TODO: fix me and make it more robust!
+    m = re.match(r"(\(?[a-zA-Z \|]+\)?)(\[\])", tstype.type)
+    if m is not None:
+        # This is an array type, add string to the inner type
+        inner_type = m.group(1)
+        if "string" not in inner_type:
+            if inner_type.startswith("(") and inner_type.endswith(")"):
+                # Already has parentheses
+                inner_type = f"{inner_type[:-1]} | string)"
+            else:
+                # Need to add parentheses
+                inner_type = f"({inner_type} | string)"
+        return TsTypeWithDep(inner_type + "[]", tstype.dep)
+
+    m = re.match(r"^\(?[a-zA-Z \|]+\)?$", tstype.type)
+    if m is not None:
+        if "string" not in tstype.type:
+            if tstype.type.startswith("(") and tstype.type.endswith(")"):
+                # Already has parentheses
+                new_type = f"{tstype.type[:-1]} | string)"
+            else:
+                # Needs parentheses for clarity
+                new_type = f"({tstype.type} | string)"
+            return TsTypeWithDep(new_type, tstype.dep)
+        return tstype
+
+    raise NotImplementedError(tstype.type)

sera/models/_datatype.py

@@ -69,10 +69,21 @@ class TsTypeWithDep:
             return expr.ExprConstant(False)
         if self.type == "string | undefined":
             return expr.ExprConstant("undefined")
+        if self.type.endswith("| string)") or self.type.endswith("| string"):
+            return expr.ExprConstant("")
         raise ValueError(f"Unknown type: {self.type}")
 
     def as_list_type(self) -> TsTypeWithDep:
-        return TsTypeWithDep(type=f"{self.type}[]", dep=self.dep)
+        """Convert the type to a list type.
+        If the type is not a simple identifier, wrap it in parentheses.
+        """
+        # Check if type is a simple identifier or needs parentheses
+        if not all(c.isalnum() or c == "_" for c in self.type.strip()):
+            # Type contains special chars like | or spaces, wrap in parentheses
+            list_type = f"({self.type})[]"
+        else:
+            list_type = f"{self.type}[]"
+        return TsTypeWithDep(type=list_type, dep=self.dep)
 
 
 @dataclass

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

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

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

@@ -4,13 +4,15 @@ sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/libs/api_helper.py,sha256=hUEy0INHM18lxTQ348tgbXNceOHcjiAnqmuL_8CRpLQ,2509
 sera/libs/base_orm.py,sha256=dyh0OT2sbHku5qPJXvRzYAHRTSXvvbQaS-Qwg65Bw04,2918
 sera/libs/base_service.py,sha256=l5D4IjxIiz8LBRranUYddb8J0Y6SwSyetKYTLrCUdQA,4098
+sera/libs/dag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sera/libs/dag/_dag.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=G5O7s6135-708honwqMFn2yPTs06WbGQTHpupID0eZ4,1417
 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=k69A0AtifoyO9zOaIZFInGSdBETuqpApggTdLiihFo0,43231
+sera/make/make_typescript_model.py,sha256=27lk4YgfJ6_7xxBirxJKgK0-wBNowMWZkvcMUFdmStE,46865
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
 sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
@@ -18,7 +20,7 @@ sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=Wf0e8x6-szG9TzoFkAlqj7_dG0SCICMBw_333n3paxk,2514
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
 sera/models/_constraints.py,sha256=L6QwKL3hRJ5DvvIB4JNgLoyvTKbE9FrpYRzezM4CweE,1484
-sera/models/_datatype.py,sha256=uMxK_8wBLowaIMIAYCb3V17YmkzJrKKc5orjImzqWbA,5818
+sera/models/_datatype.py,sha256=eF71q-X7LA91sNYG29aXQiDVMjjr8-e6ez7P9NRwq_E,6376
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
 sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
 sera/models/_module.py,sha256=8QRSCubZmdDP9rL58rGAS6X5VCrkc1ZHvuMu1I1KrWk,5043
@@ -27,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.0.dist-info/METADATA,sha256=vRXwLTHQXWHB9gV7jz5kJOtM0HPfhRrTlkPcS3rO1Gw,856
-sera_2-1.7.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.7.0.dist-info/RECORD,,
+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,,