rado 0.1.61 → 0.1.63

package/dist/lib/Formatter.d.ts

@@ -46,7 +46,7 @@ export declare abstract class Formatter implements Sanitizer {
         skipNewlines?: boolean | undefined;
     };
     format<T>(ctx: FormatContext, query: Query<T>): Statement;
-    formatSelect(ctx: FormatContext, query: Query.Select): Statement;
+    formatSelect({ topLevel, ...ctx }: FormatContext, query: Query.Select): Statement;
     formatInsert(ctx: FormatContext, query: Query.Insert): Statement;
     formatUpdate(ctx: FormatContext, query: Query.Update): Statement;
     formatDelete(ctx: FormatContext, query: Query.Delete): Statement;
@@ -63,8 +63,8 @@ export declare abstract class Formatter implements Sanitizer {
     formatInsertRow(ctx: FormatContext, columns: Record<string, ColumnData>, row: Record<string, any>): Statement;
     formatColumnValue(ctx: FormatContext, column: ColumnData, columnValue: any): Statement;
     formatTarget(ctx: FormatContext, target: Target): Statement;
-    formatWhere(ctx: FormatContext, expr: ExprData | undefined): Statement;
-    formatHaving(ctx: FormatContext, expr: ExprData | undefined): Statement;
+    formatWhere({ topLevel, ...ctx }: FormatContext, expr: ExprData | undefined): Statement;
+    formatHaving({ topLevel, ...ctx }: FormatContext, expr: ExprData | undefined): Statement;
     formatGroupBy(ctx: FormatContext, groupBy: Array<ExprData> | undefined): Statement;
     formatOrderBy(ctx: FormatContext, orderBy: Array<OrderBy> | undefined): Statement;
     formatLimit(ctx: FormatContext, { limit, offset, singleResult }: Query.QueryBase): Statement;
@@ -76,6 +76,6 @@ export declare abstract class Formatter implements Sanitizer {
     formatString(ctx: FormatContext, input: string): Statement;
     formatInlineValue(ctx: FormatContext, rawValue: any): Statement;
     formatValue(ctx: FormatContext, rawValue: any): Statement;
-    formatExpr(ctx: FormatContext, expr: ExprData): Statement;
+    formatExpr({ formatAsIn, ...ctx }: FormatContext, expr: ExprData): Statement;
 }
 export {};

package/dist/lib/Formatter.js

@@ -18,18 +18,18 @@ var binOps = {
   [BinOpType.LessOrEqual]: "<=",
   [BinOpType.Equals]: "=",
   [BinOpType.NotEquals]: "!=",
-  [BinOpType.And]: "and",
-  [BinOpType.Or]: "or",
-  [BinOpType.Like]: "like",
-  [BinOpType.Glob]: "glob",
-  [BinOpType.Match]: "match",
-  [BinOpType.In]: "in",
-  [BinOpType.NotIn]: "not in",
+  [BinOpType.And]: "AND",
+  [BinOpType.Or]: "OR",
+  [BinOpType.Like]: "LIKE",
+  [BinOpType.Glob]: "GLOB",
+  [BinOpType.Match]: "MATCH",
+  [BinOpType.In]: "IN",
+  [BinOpType.NotIn]: "NOT IN",
   [BinOpType.Concat]: "||"
 };
 var joins = {
-  left: "left",
-  inner: "inner"
+  left: "LEFT",
+  inner: "INNER"
 };
 function formatAsResultObject(stmt, mkSubject) {
   stmt.raw("json_object('result', ");
@@ -75,11 +75,11 @@ var Formatter = class {
         return this.formatRaw(ctx, query);
     }
   }
-  formatSelect(ctx, query) {
-    const { stmt, topLevel } = ctx;
+  formatSelect({ topLevel, ...ctx }, query) {
+    const { stmt } = ctx;
     stmt.raw("SELECT").space();
     this.formatSelection(
-      { ...ctx, topLevel: false },
+      ctx,
       query.selection,
       topLevel ? formatAsResultObject : void 0
     );
@@ -353,7 +353,7 @@ var Formatter = class {
         throw new Error("Cannot format expression as target");
     }
   }
-  formatWhere(ctx, expr) {
+  formatWhere({ topLevel, ...ctx }, expr) {
     const { stmt } = ctx;
     if (!expr)
       return stmt;
@@ -361,7 +361,7 @@ var Formatter = class {
     this.formatExprValue(ctx, expr);
     return stmt;
   }
-  formatHaving(ctx, expr) {
+  formatHaving({ topLevel, ...ctx }, expr) {
     const { stmt } = ctx;
     if (!expr)
       return stmt;
@@ -410,7 +410,7 @@ var Formatter = class {
     if (formatSubject)
       formatSubject(stmt, mkSubject);
     else
-      mkSubject();
+      this.formatExpr(ctx, selection);
     stmt.add("AS").addIdentifier("result");
     return stmt;
   }
@@ -513,7 +513,7 @@ var Formatter = class {
         return stmt;
     }
   }
-  formatExpr(ctx, expr) {
+  formatExpr({ formatAsIn, ...ctx }, expr) {
     const { stmt } = ctx;
     switch (expr.type) {
       case ExprType.UnOp:
@@ -538,18 +538,16 @@ var Formatter = class {
           case ParamType.Named:
             return stmt.param(expr.param);
         }
-      case ExprType.Field: {
-        const { formatAsIn, ...rest } = ctx;
+      case ExprType.Field:
         if (formatAsIn) {
           stmt.openParenthesis();
           stmt.raw("SELECT value FROM json_each");
           stmt.openParenthesis();
-          this.formatExprJson(rest, expr);
+          this.formatExprJson(ctx, expr);
           stmt.closeParenthesis();
           return stmt.closeParenthesis();
         }
-        return this.formatField(rest, expr.expr, expr.field);
-      }
+        return this.formatField(ctx, expr.expr, expr.field);
       case ExprType.Call: {
         if (expr.method === "cast") {
           const [e, type] = expr.params;
@@ -618,7 +616,6 @@ var Formatter = class {
         }
         return stmt;
       case ExprType.Filter: {
-        const { formatAsIn, ...rest } = ctx;
         const { target, condition } = expr;
         switch (target.type) {
           case TargetType.Expr:
@@ -627,12 +624,12 @@ var Formatter = class {
               stmt.raw("SELECT json_group_array(json(result)) FROM ").openParenthesis();
             }
             stmt.raw("SELECT value AS result").add("FROM json_each").openParenthesis();
-            this.formatExprJson(rest, target.expr);
+            this.formatExpr(ctx, target.expr);
             stmt.closeParenthesis();
             if (target.alias)
               stmt.add("AS").addIdentifier(target.alias);
             stmt.add("WHERE").space();
-            this.formatExprValue(rest, condition);
+            this.formatExprValue(ctx, condition);
             if (!formatAsIn) {
               stmt.closeParenthesis();
             }
@@ -642,7 +639,6 @@ var Formatter = class {
         }
       }
       case ExprType.Map: {
-        const { formatAsIn, ...rest } = ctx;
         const { target, result } = expr;
         switch (target.type) {
           case TargetType.Expr:
@@ -651,8 +647,8 @@ var Formatter = class {
               stmt.raw("SELECT json_group_array(json(result)) FROM ").openParenthesis();
             }
             stmt.raw("SELECT").space();
-            this.formatExprJson(rest, result).add("AS result").add("FROM json_each").openParenthesis();
-            this.formatExprJson(rest, target.expr);
+            this.formatExpr(ctx, result).add("AS result").add("FROM json_each").openParenthesis();
+            this.formatExprJson(ctx, target.expr);
             stmt.closeParenthesis();
             if (target.alias)
               stmt.add("AS").addIdentifier(target.alias);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.61",
+  "version": "0.1.63",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",