rado 0.1.36 → 0.1.38

package/dist/lib/Formatter.d.ts

@@ -8,7 +8,15 @@ import { Target } from './Target';
 export interface FormatContext {
     stmt: Statement;
     nameResult?: string;
+    /** Skip prefixing fields with their table name */
     skipTableName?: boolean;
+    /**
+     * In SQLite table names are used as expressions in the FTS5 plugin.
+     * To distinguish between formatting a row of the table and just the table name
+     * this flag can be used.
+     **/
+    tableAsExpr?: boolean;
+    /** Inline all parameters */
     forceInline?: boolean;
     formatAsJson?: boolean;
     formatSubject?: (mkSubject: () => void) => void;
@@ -30,7 +38,7 @@ export declare abstract class Formatter implements Sanitizer {
     formatDropIndex(ctx: FormatContext, query: Query.DropIndex): Statement;
     formatAlterTable(ctx: FormatContext, query: Query.AlterTable): Statement;
     formatTransaction(ctx: FormatContext, { op, id }: Query.Transaction): Statement;
-    formatBatch(ctx: FormatContext, queries: Query[]): Statement;
+    formatBatch(ctx: FormatContext, { queries }: Query.Batch): Statement;
     formatRaw(ctx: FormatContext, { strings, params }: Query.Raw): Statement;
     formatColumn(ctx: FormatContext, column: ColumnData): Statement;
     formatContraintReference(ctx: FormatContext, reference: ExprData): Statement;

package/dist/lib/Formatter.js

@@ -71,7 +71,7 @@ var Formatter = class {
       case QueryType.Transaction:
         return this.formatTransaction(ctx, query);
       case QueryType.Batch:
-        return this.formatBatch(ctx, query.queries);
+        return this.formatBatch(ctx, query);
       case QueryType.Raw:
         return this.formatRaw(ctx, query);
     }
@@ -198,7 +198,7 @@ var Formatter = class {
         return stmt.raw("ROLLBACK TO").addIdentifier(id);
     }
   }
-  formatBatch(ctx, queries) {
+  formatBatch(ctx, { queries }) {
     const { stmt } = ctx;
     for (const query of stmt.separate(queries, ";"))
       this.format(ctx, query);
@@ -574,6 +574,8 @@ var Formatter = class {
             const table = Target.source(expr.target);
             if (!table)
               throw new Error(`Cannot select empty target`);
+            if (ctx.tableAsExpr)
+              return stmt.identifier(table.alias || table.name);
             return this.formatExpr(
               ctx,
               ExprData.Record(

package/dist/sqlite/SqliteFormatter.js

@@ -1,7 +1,6 @@
 // src/sqlite/SqliteFormatter.ts
 import { ExprType } from "../lib/Expr.js";
 import { Formatter } from "../lib/Formatter.js";
-import { TargetType } from "../lib/Target.js";
 function escapeWithin(input, outer) {
   let buf = outer;
   for (const char of input) {
@@ -52,15 +51,19 @@ var SqliteFormatter = class extends Formatter {
     const { stmt } = ctx;
     switch (expr.type) {
       case ExprType.Call:
-        if (expr.method === "match") {
-          const [from, query] = expr.params;
-          if (from.type !== ExprType.Row)
-            throw new Error("not implemented");
-          if (from.target.type !== TargetType.Table)
-            throw new Error("not implemented");
-          stmt.identifier(from.target.table.alias || from.target.table.name).raw(" MATCH ");
-          this.formatExprValue(ctx, query);
-          return stmt;
+        switch (expr.method) {
+          case "match":
+            const [from, query] = expr.params;
+            this.formatExprValue({ ...ctx, tableAsExpr: true }, from);
+            stmt.raw(" MATCH ");
+            this.formatExprValue(ctx, query);
+            return stmt;
+          case "highlight":
+          case "snippet":
+            stmt.identifier(expr.method);
+            for (const param of stmt.call(expr.params))
+              this.formatExprValue({ ...ctx, tableAsExpr: true }, param);
+            return stmt;
         }
       default:
         return super.formatExpr(ctx, expr);

package/dist/sqlite/SqliteFunctions.d.ts

@@ -13,6 +13,10 @@ export type SqliteFunctions = {
     exists(cursor: Cursor<any>): Expr<boolean>;
     /** Use the match operator for the FTS5 module */
     match(table: Table<any>, searchTerm: EV<string>): Expr<boolean>;
+    /** The highlight() function returns a copy of the text from a specified column of the current row with extra markup text inserted to mark the start and end of phrase matches. */
+    highlight(table: Table<any>, index: EV<number>, insertBefore: EV<string>, insertAfter: EV<string>): Expr<string>;
+    /** The snippet() function is similar to highlight(), except that instead of returning entire column values, it automatically selects and extracts a short fragment of document text to process and return. */
+    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>;
     cast(x: EV<any>, type: 'real'): Expr<number>;
     cast(x: EV<any>, type: 'integer'): Expr<number>;
@@ -153,7 +157,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: Cursor<any>) => Expr<boolean>, match: (table: Table<any>, searchTerm: EV<string>) => Expr<boolean>, 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: Cursor<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: {
     (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

@@ -6,6 +6,8 @@ var {
   iif,
   exists,
   match,
+  highlight,
+  snippet,
   cast,
   abs,
   changes,
@@ -98,6 +100,7 @@ export {
   exp,
   floor,
   group_concat,
+  highlight,
   ifnull,
   iif,
   instr,
@@ -128,6 +131,7 @@ export {
   sign,
   sin,
   sinh,
+  snippet,
   soundex,
   sqlite_version,
   sqrt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rado",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "license": "MIT",
   "type": "module",
   "exports": {