rado 0.4.7 → 0.4.9

package/dist/define/Expr.d.ts

@@ -27,7 +27,8 @@ export declare enum BinOpType {
     Match = "Match",
     In = "In",
     NotIn = "NotIn",
-    Concat = "Concat"
+    Concat = "Concat",
+    Collate = "Collate"
 }
 export declare enum ExprType {
     UnOp = "ExprData.UnOp",
@@ -139,6 +140,7 @@ export declare class Expr<T> {
     isLess(that: EV<any>): Expr<boolean>;
     isLessOrEqual(that: EV<any>): Expr<boolean>;
     add(this: Expr<number>, that: EV<number>, ...rest: Array<EV<number>>): Expr<number>;
+    collate(collation: string): Expr<string>;
     subtract(this: Expr<number>, that: EV<number>, ...rest: Array<EV<number>>): Expr<number>;
     multiply(this: Expr<number>, that: EV<number>, ...rest: Array<EV<number>>): Expr<number>;
     remainder(this: Expr<number>, that: EV<number>): Expr<number>;

package/dist/define/Expr.js

@@ -28,6 +28,7 @@ var BinOpType = /* @__PURE__ */ ((BinOpType2) => {
   BinOpType2["In"] = "In";
   BinOpType2["NotIn"] = "NotIn";
   BinOpType2["Concat"] = "Concat";
+  BinOpType2["Collate"] = "Collate";
   return BinOpType2;
 })(BinOpType || {});
 var ExprType = /* @__PURE__ */ ((ExprType2) => {
@@ -284,6 +285,15 @@ class Expr {
       )
     );
   }
+  collate(collation) {
+    return new Expr(
+      new ExprData.BinOp(
+        "Collate" /* Collate */,
+        this[Expr.Data],
+        ExprData.create(collation)
+      )
+    );
+  }
   subtract(that, ...rest) {
     return new Expr(
       ExprData.createAll(this, that, ...rest).reduce(

package/dist/lib/Formatter.js

@@ -24,7 +24,8 @@ const binOps = {
   [BinOpType.Match]: "MATCH",
   [BinOpType.In]: "IN",
   [BinOpType.NotIn]: "NOT IN",
-  [BinOpType.Concat]: "||"
+  [BinOpType.Concat]: "||",
+  [BinOpType.Collate]: "COLLATE"
 };
 const joins = {
   left: "LEFT",
@@ -616,12 +617,21 @@ class Formatter {
     const { stmt } = ctx;
     stmt.openParenthesis();
     this.formatExprValue(ctx, expr.a).add(binOps[expr.op]).space();
-    const asIn = expr.op === BinOpType.In || expr.op === BinOpType.NotIn;
-    if (asIn)
-      this.formatIn(ctx, expr.b);
-    else
-      this.formatExprValue(ctx, expr.b);
-    return stmt.closeParenthesis();
+    switch (expr.op) {
+      case BinOpType.Collate:
+        const value = expr.b.type === ExprType.Param && expr.b.param.type === ParamType.Value && expr.b.param.value;
+        if (typeof value !== "string")
+          throw new Error("Expected string");
+        stmt.add(this.escapeIdentifier(value));
+        return stmt.closeParenthesis();
+      case BinOpType.In:
+      case BinOpType.NotIn:
+        this.formatIn(ctx, expr.b);
+        return stmt.closeParenthesis();
+      default:
+        this.formatExprValue(ctx, expr.b);
+        return stmt.closeParenthesis();
+    }
   }
   formatParam(ctx, expr) {
     const { stmt } = ctx;

package/dist/sqlite/SqliteFunctions.d.ts

@@ -159,7 +159,7 @@ export type SqliteFunctions = {
     julianday(timeValue: EV<any>, ...rest: Array<EV<string>>): Expr<string>;
     strftime(format: EV<string>, timeValue: EV<any>, ...rest: Array<EV<string>>): Expr<string>;
 };
-export declare const count: (x?: Expr<any>) => Expr<number>, iif: <T>(x: EV<boolean>, y: EV<T>, z: EV<T>) => Expr<T>, exists: (cursor: Query<any>) => Expr<boolean>, match: (table: Table<any>, searchTerm: EV<string>) => Expr<boolean>, highlight: (table: Table<any>, index: EV<number>, insertBefore: EV<string>, insertAfter: EV<string>) => Expr<string>, snippet: (table: Table<any>, index: EV<number>, insertBefore: EV<string>, insertAfter: EV<string>, snip: EV<string>, maxTokens: EV<number>) => Expr<string>, cast: {
+export declare const count: (x?: Expr<any>) => Expr<number>, iif: <T>(x: EV<boolean>, y: EV<T>, z: EV<T>) => Expr<T>, exists: (cursor: Query<any>) => Expr<boolean>, match: (table: Table<any>, searchTerm: EV<string>) => Expr<boolean>, bm25: (table: Table<any>, ...weights: Array<EV<number>>) => Expr<number>, highlight: (table: Table<any>, index: EV<number>, insertBefore: EV<string>, insertAfter: EV<string>) => Expr<string>, snippet: (table: Table<any>, index: EV<number>, insertBefore: EV<string>, insertAfter: EV<string>, snip: EV<string>, maxTokens: EV<number>) => Expr<string>, cast: {
     (x: EV<any>, type: 'text'): Expr<string>;
     (x: EV<any>, type: 'real'): Expr<number>;
     (x: EV<any>, type: 'integer'): Expr<number>;

package/dist/sqlite/SqliteFunctions.js

@@ -5,6 +5,7 @@ const {
   iif,
   exists,
   match,
+  bm25,
   highlight,
   snippet,
   cast,
@@ -84,6 +85,7 @@ export {
   atan2,
   atanh,
   avg,
+  bm25,
   cast,
   ceil,
   changes,

package/package.json

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