sera-2 1.6.4__py3-none-any.whl → 1.6.6__py3-none-any.whl

sera/libs/base_orm.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Optional
 
 import orjson
+from msgspec.json import decode, encode
 from sera.typing import UNSET
 from sqlalchemy import LargeBinary, TypeDecorator
 from sqlalchemy import create_engine as sqlalchemy_create_engine
@@ -50,13 +51,12 @@ class DataclassType(TypeDecorator):
     def process_bind_param(self, value, dialect):
         if value is None:
             return None
-        return orjson.dumps(value.to_dict())
+        return encode(value)
 
     def process_result_value(self, value, dialect):
         if value is None:
             return None
-        result = orjson.loads(value)
-        return self.cls.from_dict(result)
+        return decode(value, type=self.cls)
 
 
 class ListDataclassType(TypeDecorator):
@@ -72,13 +72,12 @@ class ListDataclassType(TypeDecorator):
     def process_bind_param(self, value, dialect):
         if value is None:
             return None
-        return orjson.dumps([x.to_dict() for x in value])
+        return encode(value)
 
     def process_result_value(self, value, dialect):
         if value is None:
             return None
-        result = orjson.loads(value)
-        return [self.cls.from_dict(x) for x in result]
+        return decode(value, type=list[self.cls])
 
 
 class DictDataclassType(TypeDecorator):
@@ -94,13 +93,12 @@ class DictDataclassType(TypeDecorator):
     def process_bind_param(self, value, dialect):
         if value is None:
             return None
-        return orjson.dumps({k: v.to_dict() for k, v in value.items()})
+        return encode(value)
 
     def process_result_value(self, value, dialect):
         if value is None:
             return None
-        result = orjson.loads(value)
-        return {k: self.cls.from_dict(v) for k, v in result.items()}
+        return decode(value, type=dict[str, self.cls])
 
 
 def create_engine(

sera/make/make_typescript_model.py

@@ -49,6 +49,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
 
         idprop = cls.get_id_property()
         program = Program()
+        program.import_(
+            f"@.models.{pkg.dir.name}.Draft{cls.name}.Draft{cls.name}", True
+        )
 
         prop_defs = []
         prop_constructor_assigns = []
@@ -202,6 +205,21 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                         )
                     )
                 ),
+                stmt.LineBreak(),
+                lambda ast13: ast13.func(
+                    "toDraft",
+                    [],
+                    expr.ExprIdent(f"Draft{cls.name}"),
+                    comment="Convert the class instance to a draft for editing",
+                )(
+                    stmt.ReturnStatement(
+                        expr.ExprMethodCall(
+                            expr.ExprIdent(f"Draft{cls.name}"),
+                            "update",
+                            [expr.ExprIdent("this")],
+                        )
+                    ),
+                ),
             ),
         )
 
@@ -815,91 +833,112 @@ 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
                     ),
                 )
             )
 
-        program.import_("sera-db.Schema", True)
+        for type in ["Schema", "ObjectProperty", "DataProperty"]:
+            program.import_(f"sera-db.{type}", True)
+
         program.import_(f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}", True)
+        program.import_(f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}Id", True)
         program.import_(
             f"@.models.{pkg.dir.name}.Draft{cls.name}.Draft{cls.name}", True
         )
         program.root(
             stmt.LineBreak(),
             stmt.TypescriptStatement(
-                f"export type {cls.name}Properties = "
-                + " | ".join(
+                f"export type {cls.name}SchemaType = "
+                + PredefinedFn.dict(
                     [
-                        expr.ExprConstant(to_camel_case(prop.name)).to_typescript()
-                        for prop in cls.properties.values()
-                        if not prop.data.is_private
+                        (expr.ExprIdent("id"), expr.ExprIdent(f"{cls.name}Id")),
+                        (
+                            expr.ExprIdent("publicProperties"),
+                            expr.ExprIdent(
+                                " | ".join(
+                                    [
+                                        expr.ExprConstant(
+                                            to_camel_case(prop.name)
+                                        ).to_typescript()
+                                        for prop in cls.properties.values()
+                                        if not prop.data.is_private
+                                    ]
+                                )
+                            ),
+                        ),
+                        (
+                            expr.ExprIdent("allProperties"),
+                            expr.ExprIdent(
+                                f"{cls.name}SchemaType['publicProperties']"
+                                + (
+                                    " | "
+                                    + " | ".join(
+                                        [
+                                            expr.ExprConstant(
+                                                to_camel_case(prop.name)
+                                            ).to_typescript()
+                                            for prop in cls.properties.values()
+                                            if prop.data.is_private
+                                        ]
+                                    )
+                                    if any(
+                                        prop.data.is_private
+                                        for prop in cls.properties.values()
+                                    )
+                                    else ""
+                                )
+                            ),
+                        ),
+                        (
+                            expr.ExprIdent("cls"),
+                            expr.ExprIdent(cls.name),
+                        ),
+                        (
+                            expr.ExprIdent("draftCls"),
+                            expr.ExprIdent(f"Draft{cls.name}"),
+                        ),
                     ]
-                )
-                + ";"
-            ),
-            stmt.LineBreak(),
-            (
-                stmt.TypescriptStatement(
-                    f"export type Draft{cls.name}Properties = {cls.name}Properties"
-                    + (
-                        " | "
-                        + " | ".join(
-                            [
-                                expr.ExprConstant(
-                                    to_camel_case(prop.name)
-                                ).to_typescript()
-                                for prop in cls.properties.values()
-                                if prop.data.is_private
-                            ]
-                        )
-                        if any(prop.data.is_private for prop in cls.properties.values())
-                        else ""
-                    )
-                    + ";"
-                )
+                ).to_typescript()
+                + ";",
             ),
             stmt.LineBreak(),
             stmt.TypescriptStatement(
-                f"export const {cls.name}Schema: Schema<{cls.name}, {cls.name}Properties> = "
+                f"const publicProperties: Record<{cls.name}SchemaType['publicProperties'], DataProperty | ObjectProperty> = "
                 + PredefinedFn.dict(
                     [
-                        (
-                            expr.ExprIdent("properties"),
-                            PredefinedFn.dict(
-                                [
-                                    (prop_name, prop_def)
-                                    for prop, prop_name, prop_def in prop_defs
-                                    if not prop.data.is_private
-                                ]
-                            ),
-                        ),
+                        (prop_name, prop_def)
+                        for prop, prop_name, prop_def in prop_defs
+                        if not prop.data.is_private
                     ]
-                    + (
-                        [
-                            (
-                                expr.ExprIdent("primaryKey"),
-                                expr.ExprConstant(
-                                    assert_not_null(cls.get_id_property()).name
-                                ),
-                            )
-                        ]
-                        if cls.db is not None
-                        else []
-                    )
                 ).to_typescript()
                 + ";"
             ),
             stmt.LineBreak(),
             stmt.TypescriptStatement(
-                f"export const Draft{cls.name}Schema: Schema<Draft{cls.name}, Draft{cls.name}Properties> = "
+                f"export const {cls.name}Schema: Schema<{cls.name}SchemaType> = "
                 + PredefinedFn.dict(
                     [
                         (
-                            expr.ExprIdent("properties"),
+                            expr.ExprIdent("publicProperties"),
+                            expr.ExprIdent("publicProperties"),
+                        ),
+                        (
+                            expr.ExprIdent("allProperties"),
                             expr.ExprIdent(
-                                f"{{ ...{cls.name}Schema.properties, "
+                                "{ ...publicProperties, "
                                 + ", ".join(
                                     [
                                         f"{prop_name.to_typescript()}: {prop_def.to_typescript()}"
@@ -909,7 +948,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                                 )
                                 + "}"
                             ),
-                        )
+                        ),
                     ]
                     + (
                         [
@@ -937,6 +976,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             return
 
         export_types = []
+        export_iso_types = []  # isolatedModules required separate export type clause
 
         program = Program()
         program.import_(f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}", True)
@@ -944,15 +984,16 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         if cls.db is not None:
             # only import the id if this class is stored in the database
             program.import_(f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}Id", True)
+            export_iso_types.append(f"{cls.name}Id")
 
-        for type in [
-            f"{cls.name}Schema",
-            f"Draft{cls.name}Schema",
-            f"{cls.name}Properties",
-            f"Draft{cls.name}Properties",
-        ]:
-            program.import_(f"@.models.{pkg.dir.name}.{cls.name}Schema.{type}", True)
-            export_types.append(type)
+        program.import_(
+            f"@.models.{pkg.dir.name}.{cls.name}Schema.{cls.name}Schema", True
+        )
+        export_types.append(f"{cls.name}Schema")
+        program.import_(
+            f"@.models.{pkg.dir.name}.{cls.name}Schema.{cls.name}SchemaType", True
+        )
+        export_iso_types.append(f"{cls.name}SchemaType")
 
         program.import_(
             f"@.models.{pkg.dir.name}.Draft{cls.name}.Draft{cls.name}", True
@@ -968,9 +1009,9 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             stmt.LineBreak(),
             stmt.TypescriptStatement("export { %s };" % (", ".join(export_types))),
             (
-                stmt.TypescriptStatement(f"export type {{ {cls.name}Id }};")
-                if cls.db
-                else None
+                stmt.TypescriptStatement(
+                    "export type { %s };" % (", ".join(export_iso_types))
+                )
             ),
         )
 

sera/models/_constraints.py

@@ -28,6 +28,14 @@ class Constraint:
 
         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", ()),

{sera_2-1.6.4.dist-info → sera_2-1.6.6.dist-info}/METADATA

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

{sera_2-1.6.4.dist-info → sera_2-1.6.6.dist-info}/RECORD

@@ -2,7 +2,7 @@ sera/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/constants.py,sha256=mzAaMyIx8TJK0-RYYJ5I24C4s0Uvj26OLMJmBo0pxHI,123
 sera/libs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/libs/api_helper.py,sha256=hUEy0INHM18lxTQ348tgbXNceOHcjiAnqmuL_8CRpLQ,2509
-sera/libs/base_orm.py,sha256=sTiHvbvLALSFygCITKFTXK1w-8UtxXGT_Te-1PEAiCI,3094
+sera/libs/base_orm.py,sha256=dyh0OT2sbHku5qPJXvRzYAHRTSXvvbQaS-Qwg65Bw04,2918
 sera/libs/base_service.py,sha256=l5D4IjxIiz8LBRranUYddb8J0Y6SwSyetKYTLrCUdQA,4098
 sera/make/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/__main__.py,sha256=G5O7s6135-708honwqMFn2yPTs06WbGQTHpupID0eZ4,1417
@@ -10,14 +10,14 @@ 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=RPfMDpEY3MwBSAV_NH0Rsm5dI2FvOSJj0oWwHAIYGdg,40606
+sera/make/make_typescript_model.py,sha256=xblFD1e7YDKH7ADgA4OhLZBt7bMzT8-0yopxP81fuiY,42853
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
 sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
 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=lZmCh6Py0UVMdhTR7zUOPPzGqJGbmDCzf7xH7yITcbQ,1278
+sera/models/_constraints.py,sha256=hWnHfaxGAMF6x_7eUnlChyUYPoARom2ZA6vaUg3CYY4,1484
 sera/models/_datatype.py,sha256=uMxK_8wBLowaIMIAYCb3V17YmkzJrKKc5orjImzqWbA,5818
 sera/models/_default.py,sha256=ABggW6qdPR4ZDqIPJdJ0GCGQ-7kfsfZmQ_DchgZEa-I,137
 sera/models/_enum.py,sha256=sy0q7E646F-APsqrVQ52r1fAQ_DCAeaNq5YM5QN3zIk,2070
@@ -27,6 +27,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.6.4.dist-info/METADATA,sha256=_VtnA4zI_oLY9RjlfftgNh3cyssJnWboBOLF53bieog,856
-sera_2-1.6.4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-sera_2-1.6.4.dist-info/RECORD,,
+sera_2-1.6.6.dist-info/METADATA,sha256=Q8gitA1NPJcPKmDHj5VdT5v9oli0ywv8d-xZ3syxwFE,856
+sera_2-1.6.6.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+sera_2-1.6.6.dist-info/RECORD,,