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

sera/make/make_typescript_model.py

@@ -719,7 +719,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 +798,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
 
             prop_defs.append(
                 (
+                    prop,
                     expr.ExprIdent(propname),
                     PredefinedFn.dict(
                         [
@@ -821,6 +822,7 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             )
 
         program.import_("sera-db.Schema", True)
+        program.import_(f"@.models.{pkg.dir.name}.{cls.name}.{cls.name}", True)
         program.import_(
             f"@.models.{pkg.dir.name}.Draft{cls.name}.Draft{cls.name}", True
         )
@@ -832,16 +834,82 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
                     [
                         expr.ExprConstant(to_camel_case(prop.name)).to_typescript()
                         for prop in cls.properties.values()
+                        if not prop.data.is_private
                     ]
                 )
                 + ";"
             ),
             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 ""
+                    )
+                    + ";"
+                )
+            ),
+            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}, {cls.name}Properties> = "
                 + PredefinedFn.dict(
                     [
-                        (expr.ExprIdent("properties"), PredefinedFn.dict(prop_defs)),
+                        (
+                            expr.ExprIdent("properties"),
+                            PredefinedFn.dict(
+                                [
+                                    (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> = "
+                + PredefinedFn.dict(
+                    [
+                        (
+                            expr.ExprIdent("properties"),
+                            expr.ExprIdent(
+                                f"{{ ...{cls.name}Schema.properties, "
+                                + ", ".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,29 +936,37 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
             logger.info(f"Module {outmod.path} already exists, skip")
             return
 
+        export_types = []
+
         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)
-        program.import_(
-            f"@.models.{pkg.dir.name}.{cls.name}Schema.{cls.name}Schema", True
-        )
+
+        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}.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

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

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

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

@@ -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=RPfMDpEY3MwBSAV_NH0Rsm5dI2FvOSJj0oWwHAIYGdg,40606
 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.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,,