rado 0.2.41 → 0.2.43

package/dist/define/Expr.d.ts

@@ -170,7 +170,7 @@ export declare namespace Expr {
     const IsExpr: unique symbol;
     const ToExpr: unique symbol;
     const NULL: Expr<null>;
-    function value<T>(value: T): Expr<T>;
+    function value<T>(value: T, inline?: boolean): Expr<T>;
     function get<T = any>(expr: ObjectExpr, field: string): Expr<T>;
     function create<T>(input: EV<T>): Expr<T>;
     function and(...conditions: Array<EV<boolean>>): Expr<boolean>;

package/dist/define/Expr.js

@@ -392,8 +392,8 @@ class Expr {
   Expr2.IsExpr = Symbol("Expr.IsExpr");
   Expr2.ToExpr = Symbol("Expr.ToExpr");
   Expr2.NULL = create(null);
-  function value(value2) {
-    return new Expr2(new ExprData.Param(new ParamData.Value(value2)));
+  function value(value2, inline = false) {
+    return new Expr2(new ExprData.Param(new ParamData.Value(value2, inline)));
   }
   Expr2.value = value;
   function get(expr, field) {

package/dist/define/Param.d.ts

@@ -5,8 +5,9 @@ export declare enum ParamType {
 export declare namespace ParamData {
     class Value {
         value: any;
+        inline: boolean;
         type: ParamType.Value;
-        constructor(value: any);
+        constructor(value: any, inline?: boolean);
     }
     class Named {
         name: string;

package/dist/define/Param.js

@@ -6,8 +6,9 @@ var ParamType = /* @__PURE__ */ ((ParamType2) => {
 var ParamData;
 ((ParamData2) => {
   class Value {
-    constructor(value) {
+    constructor(value, inline = false) {
       this.value = value;
+      this.inline = inline;
     }
     type = "ParamData.Value" /* Value */;
   }

package/dist/define/Sql.d.ts

@@ -1,6 +1,6 @@
 import { Query } from './Query.js';
 export declare function sql<T>(strings: TemplateStringsArray, ...params: Array<unknown>): Query<T>;
 export declare namespace sql {
-    function all<T>(strings: TemplateStringsArray, ...params: Array<unknown>): Query<T>;
-    function get<T>(strings: TemplateStringsArray, ...params: Array<unknown>): Query<T>;
+    function all<T = unknown>(strings: TemplateStringsArray, ...params: Array<unknown>): Query<Array<T>>;
+    function get<T = unknown>(strings: TemplateStringsArray, ...params: Array<unknown>): Query<T>;
 }

package/dist/lib/Formatter.d.ts

@@ -75,7 +75,7 @@ export declare abstract class Formatter implements Sanitizer {
     formatSelection(ctx: FormatContext, selection: ExprData, formatSubject?: FormatSubject): Statement;
     formatString(ctx: FormatContext, input: string): Statement;
     formatInlineValue(ctx: FormatContext, rawValue: any): Statement;
-    formatValue(ctx: FormatContext, rawValue: any): Statement;
+    formatValue(ctx: FormatContext, rawValue: any, inline?: boolean): Statement;
     formatExprJson(ctx: FormatContext, expr: ExprData): Statement;
     formatExprValue(ctx: FormatContext, expr: ExprData): Statement;
     formatExpr(ctx: FormatContext, expr: ExprData): Statement;

package/dist/lib/Formatter.js

@@ -438,7 +438,7 @@ class Formatter {
   }
   formatGroupBy(ctx, groupBy) {
     const { stmt } = ctx;
-    if (!groupBy)
+    if (!groupBy || groupBy.length === 0)
       return stmt;
     stmt.addLine("GROUP BY").space();
     for (const expr of stmt.separate(groupBy))
@@ -447,7 +447,7 @@ class Formatter {
   }
   formatOrderBy(ctx, orderBy) {
     const { stmt } = ctx;
-    if (!orderBy)
+    if (!orderBy || orderBy.length === 0)
       return stmt;
     stmt.addLine("ORDER BY").space();
     for (const { expr, order } of stmt.separate(orderBy)) {
@@ -502,8 +502,9 @@ class Formatter {
         return this.formatString(ctx, JSON.stringify(rawValue));
     }
   }
-  formatValue(ctx, rawValue) {
+  formatValue(ctx, rawValue, inline = false) {
     const { stmt, formatAsJson, formatAsInsert, forceInline } = ctx;
+    const inlineValue = inline || forceInline;
     const asJson = formatAsJson || formatAsInsert;
     switch (true) {
       case (rawValue === null || rawValue === void 0):
@@ -519,7 +520,7 @@ class Formatter {
         stmt.closeParenthesis();
         return stmt;
       case (typeof rawValue === "string" || typeof rawValue === "number"):
-        if (forceInline)
+        if (inlineValue)
           return stmt.raw(this.escapeValue(rawValue));
         return stmt.value(rawValue);
       default:
@@ -527,7 +528,7 @@ class Formatter {
           stmt.raw("json");
           stmt.openParenthesis();
         }
-        if (forceInline)
+        if (inlineValue)
           this.formatString(ctx, JSON.stringify(rawValue));
         else
           stmt.value(JSON.stringify(rawValue));
@@ -594,7 +595,7 @@ class Formatter {
     const { stmt } = ctx;
     switch (expr.param.type) {
       case ParamType.Value:
-        return this.formatValue(ctx, expr.param.value);
+        return this.formatValue(ctx, expr.param.value, expr.param.inline);
       case ParamType.Named:
         return stmt.param(expr.param);
     }

package/package.json

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