sera-2 1.26.3__py3-none-any.whl → 1.26.4__py3-none-any.whl

sera/make/ts_frontend/make_query.py

@@ -96,29 +96,47 @@ def make_query(schema: Schema, cls: Class, pkg: Package):
         for dep in tstype.deps:
             program.import_(dep, is_import_attr=True)
 
+        query_ops = []
+
         if tstype.type == "string":
-            op = '"fuzzy"'
-        elif tstype.type in "number" or tstype.type == "Date":
-            op = '"eq" | "ne" | "lt" | "lte" | "gt" | "gte"'
+            query_ops.append(('"fuzzy"', tstype.type))
+        elif tstype.type == "number":
+            if (
+                isinstance(prop, DataProperty)
+                and prop.db is not None
+                and prop.db.is_primary_key
+            ) or (isinstance(prop, ObjectProperty) and prop.target.db is not None):
+                # primary key or foreign key, we only support a limited set of operations
+                query_ops.append(('"eq" | "ne"', tstype.type))
+            else:
+                query_ops.append(
+                    ('"eq" | "ne" | "lt" | "lte" | "gt" | "gte"', tstype.type)
+                )
+                query_ops.append(('"bti"', "[number, number]"))
         elif tstype.is_enum_type():
-            op = '"eq" | "ne"'
+            query_ops.append(('"eq" | "ne"', tstype.type))
+        elif tstype.type == "Date":
+            # for date type, we use iso string as the value
+            query_ops.append(('"eq" | "ne" | "lt" | "lte" | "gt" | "gte"', "string"))
+            query_ops.append(('"bti"', "[string, string]"))
         else:
             raise NotImplementedError(tstype.type)
 
-        if tstype.type == "Date":
-            # for date type, we use timestamp (number) for comparison
-            value = "number"
-        else:
-            value = tstype.type
-
         query_condition_args.append(
             (
                 expr.ExprIdent(tspropname + "?"),
-                PredefinedFn.dict(
-                    [
-                        (expr.ExprIdent("op"), expr.ExprIdent(op)),
-                        (expr.ExprIdent("value"), expr.ExprIdent(value)),
-                    ]
+                expr.ExprRawTypescript(
+                    " | ".join(
+                        [
+                            PredefinedFn.dict(
+                                [
+                                    (expr.ExprIdent("op"), expr.ExprIdent(op)),
+                                    (expr.ExprIdent("value"), expr.ExprIdent(value)),
+                                ]
+                            ).to_typescript()
+                            for op, value in query_ops
+                        ]
+                    )
                 ),
             )
         )

{sera_2-1.26.3.dist-info → sera_2-1.26.4.dist-info}/METADATA

@@ -1,14 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sera-2
-Version: 1.26.3
+Version: 1.26.4
 Summary: 
-Home-page: https://github.com/binh-vu/sera
 Author: Binh Vu
 Author-email: bvu687@gmail.com
 Requires-Python: >=3.12,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: black (==25.1.0)
 Requires-Dist: codegen-2 (>=2.15.1,<3.0.0)
 Requires-Dist: graph-wrapper (>=1.7.3,<2.0.0)

{sera_2-1.26.3.dist-info → sera_2-1.26.4.dist-info}/RECORD

@@ -26,13 +26,14 @@ sera/make/make_app.py,sha256=dTzpJRPGoCojCdJr1TAzwbaquctwwitrGPxkRm9skpo,6033
 sera/make/make_python_api.py,sha256=sfaYnX6Vwj0xWPpvpWbBhq8GyNHgNkvwlyZr7NDCO0k,24770
 sera/make/make_python_model.py,sha256=cW3RGVttuZWLVWrEg-NppSknWoTKCRE2mar9yyhj-gU,72545
 sera/make/make_python_services.py,sha256=SvdU--QF23FN_d-Ao07CeXIK9d5eL_-mdXYwXx69dRE,2102
-sera/make/make_typescript_model.py,sha256=SOuTojrMD3QQe_jW7cGpYdNV5upZwDYHR8QDW-wLOKc,56365
+sera/make/make_typescript_model.py,sha256=bhvYbQKST1DT0pnkNOpwcmsaeVnUcNfVvHxUq2LAoo4,17604
 sera/make/py_backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sera/make/py_backend/misc.py,sha256=lZNkrniR2OZiyK4rei1Yl_mRYBR_QzOpqVO_gMWbJD4,487
 sera/make/ts_frontend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sera/make/ts_frontend/make_class_schema.py,sha256=FHTNQOJl-Zz6CHRT6J2GOZxpIeyMDqMRNTK9XUiM578,14489
+sera/make/ts_frontend/make_class_schema.py,sha256=JrUNBl5yJSbVFrdGcuC7sG0A-HhmXl24VJWCTVkDh8I,14458
+sera/make/ts_frontend/make_draft_model.py,sha256=LY1HP6BuEmtxEevqAWMe-GJyTbK-yDIsUjLjZdd-0Rg,32570
 sera/make/ts_frontend/make_enums.py,sha256=3U6Dt5Y4DM6D_ZiitcVHXtNQyA9cTE046WCDQCDOvSU,2596
-sera/make/ts_frontend/make_query.py,sha256=mQUK5H7jN5sgd8GzhswshWdt6_wKSFv1HnxuHj6uAd4,4771
+sera/make/ts_frontend/make_query.py,sha256=YnUBwMW_3LRJBoV2dpim6M6ouNhPPloCT2YBEBLgU7M,5731
 sera/make/ts_frontend/misc.py,sha256=A54nMg4dsn1AC_6T1tFRW3rZAJ71d7SHEMrFOdsI3jo,1011
 sera/misc/__init__.py,sha256=ee7OODdWPKP8pCDxsfg1EOdxxKFMJCoNMljgV0NCxBw,767
 sera/misc/_formatter.py,sha256=aCGYL08l8f3aLODHxSocxBBwkRYEo3K1QzCDEn3suj0,1685
@@ -50,6 +51,6 @@ sera/models/_parse.py,sha256=nihBEDni-jKwecSBagd6bupDOuCzGviuoD9u6-rT64Q,13203
 sera/models/_property.py,sha256=Qo23KZl5OQNbuceygicgC3_Yv5ve1KxiFiMoWq6Ljj0,7758
 sera/models/_schema.py,sha256=VxJEiqgVvbXgcSUK4UW6JnRcggk4nsooVSE6MyXmfNY,1636
 sera/typing.py,sha256=7S6Ah-Yfcl8a0xAJ4lxEcguq3rYVM7SBeOiuxyJhC04,1089
-sera_2-1.26.3.dist-info/METADATA,sha256=wO4sTs5TgOwaVEFZfbXAcySNWnnPapxqBDddJnUr9JQ,979
-sera_2-1.26.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-sera_2-1.26.3.dist-info/RECORD,,
+sera_2-1.26.4.dist-info/METADATA,sha256=9tRFamnahw1dsWTpsIeoBGCkF8pLU2o6rNlQG2PExbA,987
+sera_2-1.26.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+sera_2-1.26.4.dist-info/RECORD,,

{sera_2-1.26.3.dist-info → sera_2-1.26.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any