@objectstack/spec 3.3.1 → 4.0.0

package/json-schema/data/DataEngineRequest.json

@@ -56,6 +56,138 @@
               ],
               "additionalProperties": false
             },
+            "where": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "$ref": "#/$defs/__schema0"
+                }
+              ]
+            },
+            "fields": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/__schema1"
+              }
+            },
+            "orderBy": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "field": {
+                    "type": "string"
+                  },
+                  "order": {
+                    "default": "asc",
+                    "type": "string",
+                    "enum": [
+                      "asc",
+                      "desc"
+                    ]
+                  }
+                },
+                "required": [
+                  "field",
+                  "order"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "limit": {
+              "type": "number"
+            },
+            "offset": {
+              "type": "number"
+            },
+            "top": {
+              "type": "number"
+            },
+            "cursor": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {}
+            },
+            "search": {
+              "type": "object",
+              "properties": {
+                "query": {
+                  "type": "string",
+                  "description": "Search query text"
+                },
+                "fields": {
+                  "description": "Fields to search in (if not specified, searches all text fields)",
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "fuzzy": {
+                  "default": false,
+                  "description": "Enable fuzzy matching (tolerates typos)",
+                  "type": "boolean"
+                },
+                "operator": {
+                  "default": "or",
+                  "description": "Logical operator between terms",
+                  "type": "string",
+                  "enum": [
+                    "and",
+                    "or"
+                  ]
+                },
+                "boost": {
+                  "description": "Field-specific relevance boosting (field name -> boost factor)",
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {
+                    "type": "number"
+                  }
+                },
+                "minScore": {
+                  "description": "Minimum relevance score threshold",
+                  "type": "number"
+                },
+                "language": {
+                  "description": "Language for text analysis (e.g., \"en\", \"zh\", \"es\")",
+                  "type": "string"
+                },
+                "highlight": {
+                  "default": false,
+                  "description": "Enable search result highlighting",
+                  "type": "boolean"
+                }
+              },
+              "required": [
+                "query",
+                "fuzzy",
+                "operator",
+                "highlight"
+              ],
+              "additionalProperties": false
+            },
+            "expand": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {
+                "$ref": "#/$defs/__schema2"
+              }
+            },
+            "distinct": {
+              "type": "boolean"
+            },
             "filter": {
               "anyOf": [
                 {
@@ -137,21 +269,11 @@
               ],
               "description": "Sort order definition"
             },
-            "limit": {
-              "type": "integer",
-              "minimum": 1,
-              "maximum": 9007199254740991
-            },
             "skip": {
               "type": "integer",
               "minimum": 0,
               "maximum": 9007199254740991
             },
-            "top": {
-              "type": "integer",
-              "minimum": 1,
-              "maximum": 9007199254740991
-            },
             "populate": {
               "type": "array",
               "items": {
@@ -159,8 +281,7 @@
               }
             }
           },
-          "additionalProperties": false,
-          "description": "Query options for IDataEngine.find() operations"
+          "additionalProperties": false
         }
       },
       "required": [
@@ -224,6 +345,138 @@
               ],
               "additionalProperties": false
             },
+            "where": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "$ref": "#/$defs/__schema0"
+                }
+              ]
+            },
+            "fields": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/__schema1"
+              }
+            },
+            "orderBy": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "field": {
+                    "type": "string"
+                  },
+                  "order": {
+                    "default": "asc",
+                    "type": "string",
+                    "enum": [
+                      "asc",
+                      "desc"
+                    ]
+                  }
+                },
+                "required": [
+                  "field",
+                  "order"
+                ],
+                "additionalProperties": false
+              }
+            },
+            "limit": {
+              "type": "number"
+            },
+            "offset": {
+              "type": "number"
+            },
+            "top": {
+              "type": "number"
+            },
+            "cursor": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {}
+            },
+            "search": {
+              "type": "object",
+              "properties": {
+                "query": {
+                  "type": "string",
+                  "description": "Search query text"
+                },
+                "fields": {
+                  "description": "Fields to search in (if not specified, searches all text fields)",
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                },
+                "fuzzy": {
+                  "default": false,
+                  "description": "Enable fuzzy matching (tolerates typos)",
+                  "type": "boolean"
+                },
+                "operator": {
+                  "default": "or",
+                  "description": "Logical operator between terms",
+                  "type": "string",
+                  "enum": [
+                    "and",
+                    "or"
+                  ]
+                },
+                "boost": {
+                  "description": "Field-specific relevance boosting (field name -> boost factor)",
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {
+                    "type": "number"
+                  }
+                },
+                "minScore": {
+                  "description": "Minimum relevance score threshold",
+                  "type": "number"
+                },
+                "language": {
+                  "description": "Language for text analysis (e.g., \"en\", \"zh\", \"es\")",
+                  "type": "string"
+                },
+                "highlight": {
+                  "default": false,
+                  "description": "Enable search result highlighting",
+                  "type": "boolean"
+                }
+              },
+              "required": [
+                "query",
+                "fuzzy",
+                "operator",
+                "highlight"
+              ],
+              "additionalProperties": false
+            },
+            "expand": {
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {
+                "$ref": "#/$defs/__schema2"
+              }
+            },
+            "distinct": {
+              "type": "boolean"
+            },
             "filter": {
               "anyOf": [
                 {
@@ -305,21 +558,11 @@
               ],
               "description": "Sort order definition"
             },
-            "limit": {
-              "type": "integer",
-              "minimum": 1,
-              "maximum": 9007199254740991
-            },
             "skip": {
               "type": "integer",
               "minimum": 0,
               "maximum": 9007199254740991
             },
-            "top": {
-              "type": "integer",
-              "minimum": 1,
-              "maximum": 9007199254740991
-            },
             "populate": {
               "type": "array",
               "items": {
@@ -327,8 +570,7 @@
               }
             }
           },
-          "additionalProperties": false,
-          "description": "Query options for IDataEngine.find() operations"
+          "additionalProperties": false
         }
       },
       "required": [
@@ -447,7 +689,7 @@
           "additionalProperties": {}
         },
         "id": {
-          "description": "ID for single update, or use filter in options",
+          "description": "ID for single update, or use where in options",
           "anyOf": [
             {
               "type": "string"
@@ -502,7 +744,7 @@
               ],
               "additionalProperties": false
             },
-            "filter": {
+            "where": {
               "anyOf": [
                 {
                   "type": "object",
@@ -514,8 +756,7 @@
                 {
                   "$ref": "#/$defs/__schema0"
                 }
-              ],
-              "description": "Data Engine query filter conditions"
+              ]
             },
             "upsert": {
               "default": false,
@@ -528,10 +769,24 @@
             "returning": {
               "default": false,
               "type": "boolean"
+            },
+            "filter": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "$ref": "#/$defs/__schema0"
+                }
+              ],
+              "description": "Data Engine query filter conditions"
             }
           },
-          "additionalProperties": false,
-          "description": "Options for DataEngine.update operations"
+          "additionalProperties": false
         }
       },
       "required": [
@@ -552,7 +807,7 @@
           "type": "string"
         },
         "id": {
-          "description": "ID for single delete, or use filter in options",
+          "description": "ID for single delete, or use where in options",
           "anyOf": [
             {
               "type": "string"
@@ -607,7 +862,7 @@
               ],
               "additionalProperties": false
             },
-            "filter": {
+            "where": {
               "anyOf": [
                 {
                   "type": "object",
@@ -619,16 +874,29 @@
                 {
                   "$ref": "#/$defs/__schema0"
                 }
-              ],
-              "description": "Data Engine query filter conditions"
+              ]
             },
             "multi": {
               "default": false,
               "type": "boolean"
+            },
+            "filter": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "$ref": "#/$defs/__schema0"
+                }
+              ],
+              "description": "Data Engine query filter conditions"
             }
           },
-          "additionalProperties": false,
-          "description": "Options for DataEngine.delete operations"
+          "additionalProperties": false
         }
       },
       "required": [
@@ -692,6 +960,20 @@
               ],
               "additionalProperties": false
             },
+            "where": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "$ref": "#/$defs/__schema0"
+                }
+              ]
+            },
             "filter": {
               "anyOf": [
                 {
@@ -708,8 +990,7 @@
               "description": "Data Engine query filter conditions"
             }
           },
-          "additionalProperties": false,
-          "description": "Options for DataEngine.count operations"
+          "additionalProperties": false
         }
       },
       "required": [
@@ -773,7 +1054,7 @@
               ],
               "additionalProperties": false
             },
-            "filter": {
+            "where": {
               "anyOf": [
                 {
                   "type": "object",
@@ -785,8 +1066,7 @@
                 {
                   "$ref": "#/$defs/__schema0"
                 }
-              ],
-              "description": "Data Engine query filter conditions"
+              ]
             },
             "groupBy": {
               "type": "array",
@@ -799,10 +1079,7 @@
               "items": {
                 "type": "object",
                 "properties": {
-                  "field": {
-                    "type": "string"
-                  },
-                  "method": {
+                  "function": {
                     "type": "string",
                     "enum": [
                       "count",
@@ -810,23 +1087,53 @@
                       "avg",
                       "min",
                       "max",
-                      "count_distinct"
-                    ]
+                      "count_distinct",
+                      "array_agg",
+                      "string_agg"
+                    ],
+                    "description": "Aggregation function"
                   },
-                  "alias": {
+                  "field": {
+                    "description": "Field to aggregate (optional for COUNT(*))",
                     "type": "string"
+                  },
+                  "alias": {
+                    "type": "string",
+                    "description": "Result column alias"
+                  },
+                  "distinct": {
+                    "description": "Apply DISTINCT before aggregation",
+                    "type": "boolean"
+                  },
+                  "filter": {
+                    "description": "Filter/Condition to apply to the aggregation (FILTER WHERE clause)",
+                    "$ref": "#/$defs/__schema0"
                   }
                 },
                 "required": [
-                  "field",
-                  "method"
+                  "function",
+                  "alias"
                 ],
                 "additionalProperties": false
               }
+            },
+            "filter": {
+              "anyOf": [
+                {
+                  "type": "object",
+                  "propertyNames": {
+                    "type": "string"
+                  },
+                  "additionalProperties": {}
+                },
+                {
+                  "$ref": "#/$defs/__schema0"
+                }
+              ],
+              "description": "Data Engine query filter conditions"
             }
           },
-          "additionalProperties": false,
-          "description": "Options for DataEngine.aggregate operations"
+          "additionalProperties": false
         }
       },
       "required": [
@@ -902,6 +1209,138 @@
                         ],
                         "additionalProperties": false
                       },
+                      "where": {
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {}
+                          },
+                          {
+                            "$ref": "#/$defs/__schema0"
+                          }
+                        ]
+                      },
+                      "fields": {
+                        "type": "array",
+                        "items": {
+                          "$ref": "#/$defs/__schema1"
+                        }
+                      },
+                      "orderBy": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "field": {
+                              "type": "string"
+                            },
+                            "order": {
+                              "default": "asc",
+                              "type": "string",
+                              "enum": [
+                                "asc",
+                                "desc"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "field",
+                            "order"
+                          ],
+                          "additionalProperties": false
+                        }
+                      },
+                      "limit": {
+                        "type": "number"
+                      },
+                      "offset": {
+                        "type": "number"
+                      },
+                      "top": {
+                        "type": "number"
+                      },
+                      "cursor": {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {}
+                      },
+                      "search": {
+                        "type": "object",
+                        "properties": {
+                          "query": {
+                            "type": "string",
+                            "description": "Search query text"
+                          },
+                          "fields": {
+                            "description": "Fields to search in (if not specified, searches all text fields)",
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "fuzzy": {
+                            "default": false,
+                            "description": "Enable fuzzy matching (tolerates typos)",
+                            "type": "boolean"
+                          },
+                          "operator": {
+                            "default": "or",
+                            "description": "Logical operator between terms",
+                            "type": "string",
+                            "enum": [
+                              "and",
+                              "or"
+                            ]
+                          },
+                          "boost": {
+                            "description": "Field-specific relevance boosting (field name -> boost factor)",
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {
+                              "type": "number"
+                            }
+                          },
+                          "minScore": {
+                            "description": "Minimum relevance score threshold",
+                            "type": "number"
+                          },
+                          "language": {
+                            "description": "Language for text analysis (e.g., \"en\", \"zh\", \"es\")",
+                            "type": "string"
+                          },
+                          "highlight": {
+                            "default": false,
+                            "description": "Enable search result highlighting",
+                            "type": "boolean"
+                          }
+                        },
+                        "required": [
+                          "query",
+                          "fuzzy",
+                          "operator",
+                          "highlight"
+                        ],
+                        "additionalProperties": false
+                      },
+                      "expand": {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {
+                          "$ref": "#/$defs/__schema2"
+                        }
+                      },
+                      "distinct": {
+                        "type": "boolean"
+                      },
                       "filter": {
                         "anyOf": [
                           {
@@ -983,21 +1422,11 @@
                         ],
                         "description": "Sort order definition"
                       },
-                      "limit": {
-                        "type": "integer",
-                        "minimum": 1,
-                        "maximum": 9007199254740991
-                      },
                       "skip": {
                         "type": "integer",
                         "minimum": 0,
                         "maximum": 9007199254740991
                       },
-                      "top": {
-                        "type": "integer",
-                        "minimum": 1,
-                        "maximum": 9007199254740991
-                      },
                       "populate": {
                         "type": "array",
                         "items": {
@@ -1005,8 +1434,7 @@
                         }
                       }
                     },
-                    "additionalProperties": false,
-                    "description": "Query options for IDataEngine.find() operations"
+                    "additionalProperties": false
                   }
                 },
                 "required": [
@@ -1070,6 +1498,138 @@
                         ],
                         "additionalProperties": false
                       },
+                      "where": {
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {}
+                          },
+                          {
+                            "$ref": "#/$defs/__schema0"
+                          }
+                        ]
+                      },
+                      "fields": {
+                        "type": "array",
+                        "items": {
+                          "$ref": "#/$defs/__schema1"
+                        }
+                      },
+                      "orderBy": {
+                        "type": "array",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "field": {
+                              "type": "string"
+                            },
+                            "order": {
+                              "default": "asc",
+                              "type": "string",
+                              "enum": [
+                                "asc",
+                                "desc"
+                              ]
+                            }
+                          },
+                          "required": [
+                            "field",
+                            "order"
+                          ],
+                          "additionalProperties": false
+                        }
+                      },
+                      "limit": {
+                        "type": "number"
+                      },
+                      "offset": {
+                        "type": "number"
+                      },
+                      "top": {
+                        "type": "number"
+                      },
+                      "cursor": {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {}
+                      },
+                      "search": {
+                        "type": "object",
+                        "properties": {
+                          "query": {
+                            "type": "string",
+                            "description": "Search query text"
+                          },
+                          "fields": {
+                            "description": "Fields to search in (if not specified, searches all text fields)",
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "fuzzy": {
+                            "default": false,
+                            "description": "Enable fuzzy matching (tolerates typos)",
+                            "type": "boolean"
+                          },
+                          "operator": {
+                            "default": "or",
+                            "description": "Logical operator between terms",
+                            "type": "string",
+                            "enum": [
+                              "and",
+                              "or"
+                            ]
+                          },
+                          "boost": {
+                            "description": "Field-specific relevance boosting (field name -> boost factor)",
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {
+                              "type": "number"
+                            }
+                          },
+                          "minScore": {
+                            "description": "Minimum relevance score threshold",
+                            "type": "number"
+                          },
+                          "language": {
+                            "description": "Language for text analysis (e.g., \"en\", \"zh\", \"es\")",
+                            "type": "string"
+                          },
+                          "highlight": {
+                            "default": false,
+                            "description": "Enable search result highlighting",
+                            "type": "boolean"
+                          }
+                        },
+                        "required": [
+                          "query",
+                          "fuzzy",
+                          "operator",
+                          "highlight"
+                        ],
+                        "additionalProperties": false
+                      },
+                      "expand": {
+                        "type": "object",
+                        "propertyNames": {
+                          "type": "string"
+                        },
+                        "additionalProperties": {
+                          "$ref": "#/$defs/__schema2"
+                        }
+                      },
+                      "distinct": {
+                        "type": "boolean"
+                      },
                       "filter": {
                         "anyOf": [
                           {
@@ -1151,21 +1711,11 @@
                         ],
                         "description": "Sort order definition"
                       },
-                      "limit": {
-                        "type": "integer",
-                        "minimum": 1,
-                        "maximum": 9007199254740991
-                      },
                       "skip": {
                         "type": "integer",
                         "minimum": 0,
                         "maximum": 9007199254740991
                       },
-                      "top": {
-                        "type": "integer",
-                        "minimum": 1,
-                        "maximum": 9007199254740991
-                      },
                       "populate": {
                         "type": "array",
                         "items": {
@@ -1173,8 +1723,7 @@
                         }
                       }
                     },
-                    "additionalProperties": false,
-                    "description": "Query options for IDataEngine.find() operations"
+                    "additionalProperties": false
                   }
                 },
                 "required": [
@@ -1293,7 +1842,7 @@
                     "additionalProperties": {}
                   },
                   "id": {
-                    "description": "ID for single update, or use filter in options",
+                    "description": "ID for single update, or use where in options",
                     "anyOf": [
                       {
                         "type": "string"
@@ -1348,7 +1897,7 @@
                         ],
                         "additionalProperties": false
                       },
-                      "filter": {
+                      "where": {
                         "anyOf": [
                           {
                             "type": "object",
@@ -1360,8 +1909,7 @@
                           {
                             "$ref": "#/$defs/__schema0"
                           }
-                        ],
-                        "description": "Data Engine query filter conditions"
+                        ]
                       },
                       "upsert": {
                         "default": false,
@@ -1374,10 +1922,24 @@
                       "returning": {
                         "default": false,
                         "type": "boolean"
+                      },
+                      "filter": {
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {}
+                          },
+                          {
+                            "$ref": "#/$defs/__schema0"
+                          }
+                        ],
+                        "description": "Data Engine query filter conditions"
                       }
                     },
-                    "additionalProperties": false,
-                    "description": "Options for DataEngine.update operations"
+                    "additionalProperties": false
                   }
                 },
                 "required": [
@@ -1398,7 +1960,7 @@
                     "type": "string"
                   },
                   "id": {
-                    "description": "ID for single delete, or use filter in options",
+                    "description": "ID for single delete, or use where in options",
                     "anyOf": [
                       {
                         "type": "string"
@@ -1453,7 +2015,7 @@
                         ],
                         "additionalProperties": false
                       },
-                      "filter": {
+                      "where": {
                         "anyOf": [
                           {
                             "type": "object",
@@ -1465,16 +2027,29 @@
                           {
                             "$ref": "#/$defs/__schema0"
                           }
-                        ],
-                        "description": "Data Engine query filter conditions"
+                        ]
                       },
                       "multi": {
                         "default": false,
                         "type": "boolean"
-                      }
-                    },
-                    "additionalProperties": false,
-                    "description": "Options for DataEngine.delete operations"
+                      },
+                      "filter": {
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {}
+                          },
+                          {
+                            "$ref": "#/$defs/__schema0"
+                          }
+                        ],
+                        "description": "Data Engine query filter conditions"
+                      }
+                    },
+                    "additionalProperties": false
                   }
                 },
                 "required": [
@@ -1538,6 +2113,20 @@
                         ],
                         "additionalProperties": false
                       },
+                      "where": {
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {}
+                          },
+                          {
+                            "$ref": "#/$defs/__schema0"
+                          }
+                        ]
+                      },
                       "filter": {
                         "anyOf": [
                           {
@@ -1554,8 +2143,7 @@
                         "description": "Data Engine query filter conditions"
                       }
                     },
-                    "additionalProperties": false,
-                    "description": "Options for DataEngine.count operations"
+                    "additionalProperties": false
                   }
                 },
                 "required": [
@@ -1619,7 +2207,7 @@
                         ],
                         "additionalProperties": false
                       },
-                      "filter": {
+                      "where": {
                         "anyOf": [
                           {
                             "type": "object",
@@ -1631,8 +2219,7 @@
                           {
                             "$ref": "#/$defs/__schema0"
                           }
-                        ],
-                        "description": "Data Engine query filter conditions"
+                        ]
                       },
                       "groupBy": {
                         "type": "array",
@@ -1645,10 +2232,7 @@
                         "items": {
                           "type": "object",
                           "properties": {
-                            "field": {
-                              "type": "string"
-                            },
-                            "method": {
+                            "function": {
                               "type": "string",
                               "enum": [
                                 "count",
@@ -1656,23 +2240,53 @@
                                 "avg",
                                 "min",
                                 "max",
-                                "count_distinct"
-                              ]
+                                "count_distinct",
+                                "array_agg",
+                                "string_agg"
+                              ],
+                              "description": "Aggregation function"
                             },
-                            "alias": {
+                            "field": {
+                              "description": "Field to aggregate (optional for COUNT(*))",
                               "type": "string"
+                            },
+                            "alias": {
+                              "type": "string",
+                              "description": "Result column alias"
+                            },
+                            "distinct": {
+                              "description": "Apply DISTINCT before aggregation",
+                              "type": "boolean"
+                            },
+                            "filter": {
+                              "description": "Filter/Condition to apply to the aggregation (FILTER WHERE clause)",
+                              "$ref": "#/$defs/__schema0"
                             }
                           },
                           "required": [
-                            "field",
-                            "method"
+                            "function",
+                            "alias"
                           ],
                           "additionalProperties": false
                         }
+                      },
+                      "filter": {
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "propertyNames": {
+                              "type": "string"
+                            },
+                            "additionalProperties": {}
+                          },
+                          {
+                            "$ref": "#/$defs/__schema0"
+                          }
+                        ],
+                        "description": "Data Engine query filter conditions"
                       }
                     },
-                    "additionalProperties": false,
-                    "description": "Options for DataEngine.aggregate operations"
+                    "additionalProperties": false
                   }
                 },
                 "required": [
@@ -1720,7 +2334,7 @@
                       "type": "number"
                     }
                   },
-                  "filter": {
+                  "where": {
                     "anyOf": [
                       {
                         "type": "object",
@@ -1732,10 +2346,9 @@
                       {
                         "$ref": "#/$defs/__schema0"
                       }
-                    ],
-                    "description": "Data Engine query filter conditions"
+                    ]
                   },
-                  "select": {
+                  "fields": {
                     "type": "array",
                     "items": {
                       "type": "string"
@@ -1810,7 +2423,7 @@
             "type": "number"
           }
         },
-        "filter": {
+        "where": {
           "anyOf": [
             {
               "type": "object",
@@ -1822,10 +2435,9 @@
             {
               "$ref": "#/$defs/__schema0"
             }
-          ],
-          "description": "Data Engine query filter conditions"
+          ]
         },
-        "select": {
+        "fields": {
           "type": "array",
           "items": {
             "type": "string"
@@ -1882,8 +2494,419 @@
           "additionalProperties": false
         }
       ]
+    },
+    "__schema1": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "field": {
+              "type": "string"
+            },
+            "fields": {
+              "type": "array",
+              "items": {
+                "$ref": "#/$defs/__schema1"
+              }
+            },
+            "alias": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "field"
+          ],
+          "additionalProperties": false
+        }
+      ]
+    },
+    "__schema2": {
+      "type": "object",
+      "properties": {
+        "object": {
+          "type": "string",
+          "description": "Object name (e.g. account)"
+        },
+        "fields": {
+          "description": "Fields to retrieve",
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/__schema1"
+          }
+        },
+        "where": {
+          "description": "Filtering criteria (WHERE)",
+          "$ref": "#/$defs/__schema0"
+        },
+        "search": {
+          "description": "Full-text search configuration ($search parameter)",
+          "type": "object",
+          "properties": {
+            "query": {
+              "type": "string",
+              "description": "Search query text"
+            },
+            "fields": {
+              "description": "Fields to search in (if not specified, searches all text fields)",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "fuzzy": {
+              "default": false,
+              "description": "Enable fuzzy matching (tolerates typos)",
+              "type": "boolean"
+            },
+            "operator": {
+              "default": "or",
+              "description": "Logical operator between terms",
+              "type": "string",
+              "enum": [
+                "and",
+                "or"
+              ]
+            },
+            "boost": {
+              "description": "Field-specific relevance boosting (field name -> boost factor)",
+              "type": "object",
+              "propertyNames": {
+                "type": "string"
+              },
+              "additionalProperties": {
+                "type": "number"
+              }
+            },
+            "minScore": {
+              "description": "Minimum relevance score threshold",
+              "type": "number"
+            },
+            "language": {
+              "description": "Language for text analysis (e.g., \"en\", \"zh\", \"es\")",
+              "type": "string"
+            },
+            "highlight": {
+              "default": false,
+              "description": "Enable search result highlighting",
+              "type": "boolean"
+            }
+          },
+          "required": [
+            "query",
+            "fuzzy",
+            "operator",
+            "highlight"
+          ],
+          "additionalProperties": false
+        },
+        "orderBy": {
+          "description": "Sorting instructions (ORDER BY)",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "field": {
+                "type": "string"
+              },
+              "order": {
+                "default": "asc",
+                "type": "string",
+                "enum": [
+                  "asc",
+                  "desc"
+                ]
+              }
+            },
+            "required": [
+              "field",
+              "order"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "limit": {
+          "description": "Max records to return (LIMIT)",
+          "type": "number"
+        },
+        "offset": {
+          "description": "Records to skip (OFFSET)",
+          "type": "number"
+        },
+        "top": {
+          "description": "Alias for limit (OData compatibility)",
+          "type": "number"
+        },
+        "cursor": {
+          "description": "Cursor for keyset pagination",
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          },
+          "additionalProperties": {}
+        },
+        "joins": {
+          "description": "Explicit Table Joins",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "inner",
+                  "left",
+                  "right",
+                  "full"
+                ],
+                "description": "Join type"
+              },
+              "strategy": {
+                "description": "Execution strategy hint",
+                "type": "string",
+                "enum": [
+                  "auto",
+                  "database",
+                  "hash",
+                  "loop"
+                ]
+              },
+              "object": {
+                "type": "string",
+                "description": "Object/table to join"
+              },
+              "alias": {
+                "description": "Table alias",
+                "type": "string"
+              },
+              "on": {
+                "description": "Join condition",
+                "allOf": [
+                  {
+                    "type": "object",
+                    "propertyNames": {
+                      "type": "string"
+                    },
+                    "additionalProperties": {}
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "$and": {
+                        "type": "array",
+                        "items": {
+                          "$ref": "#/$defs/__schema0"
+                        }
+                      },
+                      "$or": {
+                        "type": "array",
+                        "items": {
+                          "$ref": "#/$defs/__schema0"
+                        }
+                      },
+                      "$not": {
+                        "$ref": "#/$defs/__schema0"
+                      }
+                    },
+                    "additionalProperties": false
+                  }
+                ],
+                "$ref": "#/$defs/__schema0"
+              },
+              "subquery": {
+                "description": "Subquery instead of object",
+                "$ref": "#/$defs/__schema2"
+              }
+            },
+            "required": [
+              "type",
+              "object",
+              "on"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "aggregations": {
+          "description": "Aggregation functions",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "function": {
+                "type": "string",
+                "enum": [
+                  "count",
+                  "sum",
+                  "avg",
+                  "min",
+                  "max",
+                  "count_distinct",
+                  "array_agg",
+                  "string_agg"
+                ],
+                "description": "Aggregation function"
+              },
+              "field": {
+                "description": "Field to aggregate (optional for COUNT(*))",
+                "type": "string"
+              },
+              "alias": {
+                "type": "string",
+                "description": "Result column alias"
+              },
+              "distinct": {
+                "description": "Apply DISTINCT before aggregation",
+                "type": "boolean"
+              },
+              "filter": {
+                "description": "Filter/Condition to apply to the aggregation (FILTER WHERE clause)",
+                "$ref": "#/$defs/__schema0"
+              }
+            },
+            "required": [
+              "function",
+              "alias"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "groupBy": {
+          "description": "GROUP BY fields",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "having": {
+          "description": "HAVING clause for aggregation filtering",
+          "$ref": "#/$defs/__schema0"
+        },
+        "windowFunctions": {
+          "description": "Window functions with OVER clause",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "function": {
+                "type": "string",
+                "enum": [
+                  "row_number",
+                  "rank",
+                  "dense_rank",
+                  "percent_rank",
+                  "lag",
+                  "lead",
+                  "first_value",
+                  "last_value",
+                  "sum",
+                  "avg",
+                  "count",
+                  "min",
+                  "max"
+                ],
+                "description": "Window function name"
+              },
+              "field": {
+                "description": "Field to operate on (for aggregate window functions)",
+                "type": "string"
+              },
+              "alias": {
+                "type": "string",
+                "description": "Result column alias"
+              },
+              "over": {
+                "type": "object",
+                "properties": {
+                  "partitionBy": {
+                    "description": "PARTITION BY fields",
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "orderBy": {
+                    "description": "ORDER BY specification",
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "field": {
+                          "type": "string"
+                        },
+                        "order": {
+                          "default": "asc",
+                          "type": "string",
+                          "enum": [
+                            "asc",
+                            "desc"
+                          ]
+                        }
+                      },
+                      "required": [
+                        "field",
+                        "order"
+                      ],
+                      "additionalProperties": false
+                    }
+                  },
+                  "frame": {
+                    "description": "Window frame specification",
+                    "type": "object",
+                    "properties": {
+                      "type": {
+                        "type": "string",
+                        "enum": [
+                          "rows",
+                          "range"
+                        ]
+                      },
+                      "start": {
+                        "description": "Frame start (e.g., \"UNBOUNDED PRECEDING\", \"1 PRECEDING\")",
+                        "type": "string"
+                      },
+                      "end": {
+                        "description": "Frame end (e.g., \"CURRENT ROW\", \"1 FOLLOWING\")",
+                        "type": "string"
+                      }
+                    },
+                    "additionalProperties": false
+                  }
+                },
+                "additionalProperties": false,
+                "description": "Window specification (OVER clause)"
+              }
+            },
+            "required": [
+              "function",
+              "alias",
+              "over"
+            ],
+            "additionalProperties": false
+          }
+        },
+        "distinct": {
+          "description": "SELECT DISTINCT flag",
+          "type": "boolean"
+        },
+        "expand": {
+          "description": "Recursive relation loading map. Keys are lookup/master_detail field names; values are nested QueryAST objects that control select, filter, sort, and further expansion on the related object. The engine resolves expand via batch $in queries (driver-agnostic) with a default max depth of 3.",
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          },
+          "additionalProperties": {
+            "$ref": "#/$defs/__schema2"
+          }
+        }
+      },
+      "required": [
+        "object"
+      ],
+      "additionalProperties": false
     }
   },
-  "$id": "https://schema.objectstack.io/v3.3.1/data/DataEngineRequest.json",
-  "x-spec-version": "3.3.1"
+  "$id": "https://schema.objectstack.io/v4.0.0/data/DataEngineRequest.json",
+  "x-spec-version": "4.0.0"
 }