sera-2 1.15.0__py3-none-any.whl → 1.16.0__py3-none-any.whl

sera/make/make_typescript_model.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
 import re
-from typing import Any, Callable
+from typing import Any, Callable, Optional
 
-from codegen.models import AST, PredefinedFn, Program, expr, stmt
+from codegen.models import AST, ImportHelper, PredefinedFn, Program, expr, stmt
 from codegen.models.var import DeferredVar
 from loguru import logger
 
 from sera.misc import (
     assert_isinstance,
     assert_not_null,
+    identity,
     to_camel_case,
     to_pascal_case,
     to_snake_case,
@@ -25,6 +26,11 @@ from sera.models import (
 )
 from sera.typing import is_set
 
+TS_GLOBAL_IDENTS = {
+    "normalizers.normalizeNumber": "sera-db.normalizers",
+    "normalizers.normalizeOptionalNumber": "sera-db.normalizers",
+}
+
 
 def make_typescript_data_model(schema: Schema, target_pkg: Package):
     """Generate TypeScript data model from the schema. The data model aligns with the public data model in Python, not the database model."""
@@ -259,6 +265,8 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         program.import_("mobx.action", True)
         program.import_("sera-db.validators", True)
 
+        import_helper = ImportHelper(program, TS_GLOBAL_IDENTS)
+
         program.root(
             stmt.LineBreak(),
             stmt.TypescriptStatement(
@@ -331,12 +339,15 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
 
             if isinstance(prop, DataProperty):
                 tstype = prop.get_data_model_datatype().get_typescript_type()
+                original_tstype = tstype
+
                 if idprop is not None and prop.name == idprop.name:
                     # use id type alias
                     tstype = TsTypeWithDep(
                         f"{cls.name}Id",
                         deps=[f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}Id"],
                     )
+                    original_tstype = tstype
                 elif tstype.type not in schema.enums:
                     # for none id & none enum properties, we need to include a type for "invalid" value
                     tstype = _inject_type_for_invalid_value(tstype)
@@ -344,6 +355,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 if prop.is_optional:
                     # convert type to optional
                     tstype = tstype.as_optional_type()
+                    original_tstype = original_tstype.as_optional_type()
 
                 for dep in tstype.deps:
                     program.import_(dep, True)
@@ -400,6 +412,11 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         expr.ExprIdent("record"), expr.ExprIdent(propname)
                     )
 
+                if original_tstype.type != tstype.type:
+                    norm_func = get_norm_func(original_tstype, import_helper)
+                else:
+                    norm_func = identity
+
                 ser_args.append(
                     (
                         expr.ExprIdent(prop.name),
@@ -420,14 +437,18 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                     ),
                                     expr.ExprIdent("isValid"),
                                 ),
-                                PredefinedFn.attr_getter(
-                                    expr.ExprIdent("this"), expr.ExprIdent(propname)
+                                norm_func(
+                                    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)
+                            else norm_func(
+                                PredefinedFn.attr_getter(
+                                    expr.ExprIdent("this"), expr.ExprIdent(propname)
+                                )
                             )
                         ),
                     )
@@ -455,14 +476,19 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                         ),
                                         expr.ExprIdent("isValid"),
                                     ),
-                                    PredefinedFn.attr_getter(
-                                        expr.ExprIdent("this"), expr.ExprIdent(propname)
+                                    norm_func(
+                                        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)
+                                else norm_func(
+                                    PredefinedFn.attr_getter(
+                                        expr.ExprIdent("this"), expr.ExprIdent(propname)
+                                    )
                                 )
                             ),
                         )
@@ -1086,6 +1112,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
 
         program = Program()
         prop_defs: list[tuple[DataProperty | ObjectProperty, expr.Expr, expr.Expr]] = []
+        prop_normalizers: list[tuple[expr.Expr, expr.Expr]] = []
+
+        import_helper = ImportHelper(program, TS_GLOBAL_IDENTS)
 
         for prop in cls.properties.values():
             # we must include private properties that are needed during upsert for our forms.
@@ -1126,6 +1155,11 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         ),
                     ),
                 ]
+
+                norm_func = get_normalizer(tstype, import_helper)
+                if norm_func is not None:
+                    # we have a normalizer for this type
+                    prop_normalizers.append((expr.ExprIdent(propname), norm_func))
             else:
                 assert isinstance(prop, ObjectProperty)
                 if prop.target.db is not None:
@@ -1340,6 +1374,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                             expr.ExprIdent("validators"),
                             expr.ExprIdent(f"draft{cls.name}Validators"),
                         ),
+                        (
+                            expr.ExprIdent("normalizers"),
+                            PredefinedFn.dict(prop_normalizers),
+                        ),
                     ]
                     + (
                         [
@@ -1500,3 +1538,35 @@ def _inject_type_for_invalid_value(tstype: TsTypeWithDep) -> TsTypeWithDep:
         return tstype
 
     raise NotImplementedError(tstype.type)
+
+
+def get_normalizer(
+    tstype: TsTypeWithDep, import_helper: ImportHelper
+) -> Optional[expr.ExprIdent]:
+    if tstype.type == "number":
+        return import_helper.use("normalizers.normalizeNumber")
+    if tstype.type == "number | undefined":
+        return import_helper.use("normalizers.normalizeOptionalNumber")
+
+    assert "number" not in tstype.type, tstype.type
+    return None
+
+
+def get_norm_func(
+    tstype: TsTypeWithDep, import_helper: ImportHelper
+) -> Callable[[expr.Expr], expr.Expr]:
+    """
+    Get the normalizer function for the given TypeScript type.
+    If no normalizer is available, return None.
+    """
+    norm_func = get_normalizer(tstype, import_helper)
+    if norm_func is not None:
+
+        def modify_expr(value: expr.Expr) -> expr.Expr:
+            return expr.ExprFuncCall(
+                norm_func,
+                [value],
+            )
+
+        return modify_expr
+    return identity  # Return the value as is if no normalizer is available

sera/misc/__init__.py

@@ -3,6 +3,7 @@ from sera.misc._utils import (
     assert_isinstance,
     assert_not_null,
     filter_duplication,
+    identity,
     load_data,
     to_camel_case,
     to_pascal_case,
@@ -20,4 +21,5 @@ __all__ = [
     "Formatter",
     "File",
     "load_data",
+    "identity",
 ]

sera/misc/_utils.py

@@ -148,3 +148,8 @@ def load_data(
                 )
             )
         session.commit()
+
+
+def identity(x: T) -> T:
+    """Identity function that returns the input unchanged."""
+    return x

{sera_2-1.15.0.dist-info → sera_2-1.16.0.dist-info}/METADATA

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

{sera_2-1.15.0.dist-info → sera_2-1.16.0.dist-info}/RECORD

@@ -19,10 +19,10 @@ sera/make/make_app.py,sha256=n9NtW73O3s_5Q31VHIRmnd-jEIcpDO7ksAsOdovde2s,5999
 sera/make/make_python_api.py,sha256=iXGbKQ3IJvsY1ur_fhurr_THFNnH66E3Wl85o0emUbw,26853
 sera/make/make_python_model.py,sha256=cRb-fuHX0WH7XPAAliu6lycC0iEjE5kcKg4bBU40GwQ,61275
 sera/make/make_python_services.py,sha256=0ZpWLwQ7Nwfn8BXAikAB4JRpNknpSJyJgY5b1cjtxV4,2073
-sera/make/make_typescript_model.py,sha256=3F-1TAbVb2-vidj5wKIi_U442JkBXZU3UYCZkodWRRM,64466
-sera/misc/__init__.py,sha256=t-Z3Zv-a_W0n59RSBoeGMqNEiavjc4vCoRdz-GCKp3Q,443
+sera/make/make_typescript_model.py,sha256=1ouYFCeqOlwEzsGBiXUn4VZtLJjJW7GSacdOSlQzhjI,67012
+sera/misc/__init__.py,sha256=mPKkik00j3tO_m45VPDJBjm8K85NpymRPl36Kh4hBn8,473
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
-sera/misc/_utils.py,sha256=EvWCHquEkqMq6C4vCy9kXsirD9Nuq3KmNMjWTKjPuts,3993
+sera/misc/_utils.py,sha256=pGYv8p7m7opiDTLYbsPrhF0YA4WjFff7beMQQZ9NnEs,4095
 sera/models/__init__.py,sha256=vJC5Kzo_N7wd16ocNPy1VvAZDGNiWeiAhWJ4ihATKvA,780
 sera/models/_class.py,sha256=1J4Bd_LanzhhDWwZFHWGtFYD7lupe_alaB3D02ebNDI,2862
 sera/models/_collection.py,sha256=ZnQEriKC4X88Zz48Kn1AVZKH-1_l8OgWa-zf2kcQOOE,1414
@@ -36,6 +36,6 @@ sera/models/_parse.py,sha256=MaGZty29lsVUFumWqNanIjAwptBNOMbVZMXLZ2A9_2g,12317
 sera/models/_property.py,sha256=2rSLs9JjSesrxrEugE7krYaBQOivKU882I8mZN94FlI,7017
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=Fl4-UzLJu1GdLLk_g87fA7nT9wQGelNnGzag6dg_0gs,980
-sera_2-1.15.0.dist-info/METADATA,sha256=KhiL3wTbAKSWXp40eoNTpZ86X8DFgPvIDloXnBGU1tQ,852
-sera_2-1.15.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-sera_2-1.15.0.dist-info/RECORD,,
+sera_2-1.16.0.dist-info/METADATA,sha256=wZvclB-3wd_K5sN9Q64s832aMVXueS3p2xbDJKCplnk,852
+sera_2-1.16.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+sera_2-1.16.0.dist-info/RECORD,,