@silverbulletmd/silverbullet 2.4.2 → 2.6.1

package/client/space_lua/ast.ts

@@ -175,7 +175,9 @@ export type LuaExpression =
   | LuaUnaryExpression
   | LuaTableConstructor
   | LuaFunctionDefinition
-  | LuaQueryExpression;
+  | LuaQueryExpression
+  | LuaFilteredCallExpression
+  | LuaAggregateCallExpression;
 
 export type LuaNilLiteral = {
   type: "Nil";
@@ -234,6 +236,7 @@ export type LuaFunctionCallExpression = {
   prefix: LuaPrefixExpression;
   name?: string;
   args: LuaExpression[];
+  orderBy?: LuaOrderBy[];
 } & ASTContext;
 
 export type LuaBinaryExpression = {
@@ -254,10 +257,7 @@ export type LuaTableConstructor = {
   fields: LuaTableField[];
 } & ASTContext;
 
-export type LuaTableField =
-  | LuaDynamicField
-  | LuaPropField
-  | LuaExpressionField;
+export type LuaTableField = LuaDynamicField | LuaPropField | LuaExpressionField;
 
 export type LuaDynamicField = {
   type: "DynamicField";
@@ -281,6 +281,20 @@ export type LuaFunctionDefinition = {
   body: LuaFunctionBody;
 } & ASTContext;
 
+// Aggregate with per-row filter
+export type LuaFilteredCallExpression = {
+  type: "FilteredCall";
+  call: LuaFunctionCallExpression;
+  filter: LuaExpression;
+} & ASTContext;
+
+// Aggregate call with intra-aggregate order by
+export type LuaAggregateCallExpression = {
+  type: "AggregateCall";
+  call: LuaFunctionCallExpression;
+  orderBy: LuaOrderBy[];
+} & ASTContext;
+
 // Query stuff
 export type LuaQueryExpression = {
   type: "Query";
@@ -291,13 +305,16 @@ export type LuaQueryClause =
   | LuaFromClause
   | LuaWhereClause
   | LuaLimitClause
+  | LuaOffsetClause
   | LuaOrderByClause
-  | LuaSelectClause;
+  | LuaSelectClause
+  | LuaGroupByClause
+  | LuaHavingClause;
 
+// Field list used by `from`, `select` and `group by` clauses
 export type LuaFromClause = {
   type: "From";
-  name?: string;
-  expression: LuaExpression;
+  fields: LuaTableField[];
 } & ASTContext;
 
 export type LuaWhereClause = {
@@ -311,6 +328,11 @@ export type LuaLimitClause = {
   offset?: LuaExpression;
 } & ASTContext;
 
+export type LuaOffsetClause = {
+  type: "Offset";
+  offset: LuaExpression;
+} & ASTContext;
+
 export type LuaOrderByClause = {
   type: "OrderBy";
   orderBy: LuaOrderBy[];
@@ -320,9 +342,21 @@ export type LuaOrderBy = {
   type: "Order";
   expression: LuaExpression;
   direction: "asc" | "desc";
+  nulls?: "first" | "last";
+  using?: string | LuaFunctionBody;
 } & ASTContext;
 
 export type LuaSelectClause = {
   type: "Select";
+  fields: LuaTableField[];
+} & ASTContext;
+
+export type LuaGroupByClause = {
+  type: "GroupBy";
+  fields: LuaTableField[];
+} & ASTContext;
+
+export type LuaHavingClause = {
+  type: "Having";
   expression: LuaExpression;
 } & ASTContext;

package/client/space_lua/ast_narrow.ts

@@ -3,8 +3,10 @@
 import type { ASTCtx, LuaExpression, LuaLValue, LuaStatement } from "./ast.ts";
 
 // Extract by `type` discriminant
-type NarrowByType<U, K extends U extends { type: infer T } ? T : never> =
-  Extract<U, { type: K }>;
+type NarrowByType<
+  U,
+  K extends U extends { type: infer T } ? T : never,
+> = Extract<U, { type: K }>;
 
 // Expressions
 export const asStringExpr = (e: LuaExpression) =>