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

sera/make/make_typescript_model.py

@@ -5,7 +5,6 @@ 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,
@@ -723,9 +722,10 @@ def make_typescript_data_model(schema: Schema, target_pkg: Package):
         prop_defs: list[tuple[expr.Expr, expr.Expr]] = []
 
         for prop in cls.properties.values():
-            if prop.data.is_private:
-                # skip private fields as this is for APIs exchange
-                continue
+            # we must include private properties that are needed during upsert for our forms.
+            # if prop.data.is_private:
+            #     # skip private fields as this is for APIs exchange
+            #     continue
             propname = to_camel_case(prop.name)
             tsprop = {}
 
@@ -821,11 +821,24 @@ 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
+        )
         program.root(
             stmt.LineBreak(),
             stmt.TypescriptStatement(
-                f"export const {cls.name}Schema: Schema<{cls.name}> = "
+                f"export type {cls.name}Properties = "
+                + " | ".join(
+                    [
+                        expr.ExprConstant(to_camel_case(prop.name)).to_typescript()
+                        for prop in cls.properties.values()
+                    ]
+                )
+                + ";"
+            ),
+            stmt.LineBreak(),
+            stmt.TypescriptStatement(
+                f"export const {cls.name}Schema: Schema<Draft{cls.name}, {cls.name}Properties> = "
                 + PredefinedFn.dict(
                     [
                         (expr.ExprIdent("properties"), PredefinedFn.dict(prop_defs)),

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

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

{sera_2-1.6.2.dist-info → sera_2-1.6.3.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=dT1ZHpsDvegX07jxDRncd_iu4FAiaV_7xyioWBJdbes,36999
+sera/make/make_typescript_model.py,sha256=rm_QUGSSmGeXAvFcTeJ4qeq1dFog2DERZ0Mo1r1Yak0,37553
 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.2.dist-info/METADATA,sha256=B_Brp3KBIu2C0iqX-5cjwdWAfen1DttoeUyj0ms_7-4,856
-sera_2-1.6.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-sera_2-1.6.2.dist-info/RECORD,,
+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,,