sera-2 1.6.3__py3-none-any.whl → 1.6.5__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")],
+                        )
+                    ),
+                ),
             ),
         )
 
@@ -719,7 +737,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             return
 
         program = Program()
-        prop_defs: list[tuple[expr.Expr, expr.Expr]] = []
+        prop_defs: list[tuple[DataProperty | ObjectProperty, expr.Expr, expr.Expr]] = []
 
         for prop in cls.properties.values():
             # we must include private properties that are needed during upsert for our forms.
@@ -798,6 +816,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
 
             prop_defs.append(
                 (
+                    prop,
                     expr.ExprIdent(propname),
                     PredefinedFn.dict(
                         [
@@ -820,28 +839,105 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                 )
             )
 
-        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()
+                        (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}"),
+                        ),
                     ]
-                )
+                ).to_typescript()
+                + ";",
+            ),
+            stmt.LineBreak(),
+            stmt.TypescriptStatement(
+                f"const publicProperties: Record<{cls.name}SchemaType['publicProperties'], DataProperty | ObjectProperty> = "
+                + PredefinedFn.dict(
+                    [
+                        (prop_name, prop_def)
+                        for prop, prop_name, prop_def in prop_defs
+                        if not prop.data.is_private
+                    ]
+                ).to_typescript()
                 + ";"
             ),
             stmt.LineBreak(),
             stmt.TypescriptStatement(
-                f"export const {cls.name}Schema: Schema<Draft{cls.name}, {cls.name}Properties> = "
+                f"export const {cls.name}Schema: Schema<{cls.name}SchemaType> = "
                 + PredefinedFn.dict(
                     [
-                        (expr.ExprIdent("properties"), PredefinedFn.dict(prop_defs)),
+                        (
+                            expr.ExprIdent("publicProperties"),
+                            expr.ExprIdent("publicProperties"),
+                        ),
+                        (
+                            expr.ExprIdent("allProperties"),
+                            expr.ExprIdent(
+                                "{ ...publicProperties, "
+                                + ", ".join(
+                                    [
+                                        f"{prop_name.to_typescript()}: {prop_def.to_typescript()}"
+                                        for prop, prop_name, prop_def in prop_defs
+                                        if prop.data.is_private
+                                    ]
+                                )
+                                + "}"
+                            ),
+                        ),
                     ]
                     + (
                         [
@@ -868,33 +964,43 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             logger.info(f"Module {outmod.path} already exists, skip")
             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)
+        export_types.append(cls.name)
         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")
+
         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
         )
+        export_types.append(f"Draft{cls.name}")
         if cls.db is not None:
             program.import_(
                 f"@.models.{pkg.dir.name}.{cls.name}Table.{cls.name}Table", True
             )
+            export_types.append(f"{cls.name}Table")
 
         program.root(
             stmt.LineBreak(),
-            stmt.TypescriptStatement(
-                f"export {{ {cls.name}, Draft{cls.name}, {cls.name}Table, {cls.name}Schema }};"
-                if cls.db is not None
-                else f"export {{ {cls.name}, Draft{cls.name}, {cls.name}Schema }};"
-            ),
+            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_2-1.6.3.dist-info → sera_2-1.6.5.dist-info}/METADATA

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

{sera_2-1.6.3.dist-info → sera_2-1.6.5.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,7 +10,7 @@ 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=rm_QUGSSmGeXAvFcTeJ4qeq1dFog2DERZ0Mo1r1Yak0,37553
+sera/make/make_typescript_model.py,sha256=KWseO3VGLlXfNVjwDF31Nh8q9Wat-hmiS4DJh0r0UCo,42303
 sera/misc/__init__.py,sha256=Dh4uDq0D4N53h3zhvmwfa5a0TPVRSUvLzb0hkFuPirk,411
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
 sera/misc/_utils.py,sha256=V5g4oLGHOhUCR75Kkcn1w01pAvGvaepK-T8Z3pIgHjI,1450
@@ -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.3.dist-info/METADATA,sha256=BBwuS2iLs2Ubc7WnJa6Q8sOR4Fz8aqXx9iTkLd3PO4M,856
-sera_2-1.6.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-sera_2-1.6.3.dist-info/RECORD,,
+sera_2-1.6.5.dist-info/METADATA,sha256=Gv3f8FNU3Wke6T_yvsNb5r5S92YeYxmg2ogy8kgsOXo,856
+sera_2-1.6.5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+sera_2-1.6.5.dist-info/RECORD,,