@kubun/db-adapter 0.5.0 → 0.6.0

package/lib/postgres.d.ts

@@ -12,6 +12,7 @@ export declare class AbstractPostgresAdapter<T extends AdapterTypes = PostgresTy
     encodeJSON(value: unknown): unknown;
     encodeTimestamp(value: Date): string;
     decodeTimestamp(value: string): Date;
+    coerceFilterValue(value: unknown): unknown;
     createSearchIndex(db: Kysely<unknown>, config: SearchIndexConfig): Promise<void>;
     dropSearchIndex(db: Kysely<unknown>, modelID: string): Promise<void>;
     updateSearchEntry(db: Kysely<unknown>, modelID: string, documentID: string, fields: Record<string, string>, fieldNames: Array<string>): Promise<void>;

package/lib/postgres.js

@@ -1,4 +1,4 @@
-import{sql as e}from"kysely";export class AbstractPostgresAdapter{functions={now:"now()"};types={binary:"bytea",json:"jsonb",text:"text",timestamp:"timestamptz(3)",uuid:"uuid"};encodeBinary(e){return e}encodeJSON(e){return e}encodeTimestamp(e){return e.toISOString()}decodeTimestamp(e){return new Date(e)}async createSearchIndex(t,r){let a=`fts_${r.modelID}`,c=`k_${r.modelID}`;await e`
+import{sql as e}from"kysely";export class AbstractPostgresAdapter{functions={now:"now()"};types={binary:"bytea",json:"jsonb",text:"text",timestamp:"timestamptz(3)",uuid:"uuid"};encodeBinary(e){return e}encodeJSON(e){return e}encodeTimestamp(e){return e.toISOString()}decodeTimestamp(e){return new Date(e)}coerceFilterValue(e){return"boolean"==typeof e?e?"true":"false":e}async createSearchIndex(t,r){let a=`fts_${r.modelID}`,c=`k_${r.modelID}`;await e`
       CREATE TABLE IF NOT EXISTS ${e.ref(a)} (
         document_id TEXT PRIMARY KEY REFERENCES ${e.ref(c)}(id) ON DELETE CASCADE,
         search_vector tsvector
@@ -6,10 +6,10 @@ import{sql as e}from"kysely";export class AbstractPostgresAdapter{functions={now
     `.execute(t),await e`
       CREATE INDEX IF NOT EXISTS ${e.ref(`ftsi_${r.modelID}`)}
       ON ${e.ref(a)} USING GIN(search_vector)
-    `.execute(t)}async dropSearchIndex(t,r){let a=`fts_${r}`;await e`DROP TABLE IF EXISTS ${e.ref(a)} CASCADE`.execute(t)}async updateSearchEntry(t,r,a,c,n){let s=`fts_${r}`,o=n.map(t=>{let r=c[t]??"";return e`to_tsvector('simple', ${r})`}).reduce((t,r)=>e`${t} || ${r}`);await e`
-      INSERT INTO ${e.ref(s)} (document_id, search_vector)
-      VALUES (${a}, ${o})
-      ON CONFLICT (document_id) DO UPDATE SET search_vector = ${o}
+    `.execute(t)}async dropSearchIndex(t,r){let a=`fts_${r}`;await e`DROP TABLE IF EXISTS ${e.ref(a)} CASCADE`.execute(t)}async updateSearchEntry(t,r,a,c,n){let o=`fts_${r}`,s=n.map(t=>{let r=c[t]??"";return e`to_tsvector('simple', ${r})`}).reduce((t,r)=>e`${t} || ${r}`);await e`
+      INSERT INTO ${e.ref(o)} (document_id, search_vector)
+      VALUES (${a}, ${s})
+      ON CONFLICT (document_id) DO UPDATE SET search_vector = ${s}
     `.execute(t)}async removeSearchEntry(t,r,a){let c=`fts_${r}`;await e`DELETE FROM ${e.ref(c)} WHERE document_id = ${a}`.execute(t)}async searchIndex(t,r){let a=`fts_${r.modelID}`;return(await e`
       SELECT document_id, ts_rank(search_vector, plainto_tsquery('simple', ${r.query})) AS rank
       FROM ${e.ref(a)}

package/lib/sqlite.d.ts

@@ -12,6 +12,7 @@ export declare class AbstractSQLiteAdapter<T extends AdapterTypes = SQLiteTypes>
     encodeJSON(value: unknown): string;
     encodeTimestamp(value: Date): number;
     decodeTimestamp(value: number): Date;
+    coerceFilterValue(value: unknown): unknown;
     createSearchIndex(db: Kysely<unknown>, config: SearchIndexConfig): Promise<void>;
     dropSearchIndex(db: Kysely<unknown>, modelID: string): Promise<void>;
     updateSearchEntry(db: Kysely<unknown>, modelID: string, documentID: string, fields: Record<string, string>, fieldNames: Array<string>): Promise<void>;

package/lib/sqlite.js

@@ -1,4 +1,4 @@
-import{sql as e}from"kysely";export class AbstractSQLiteAdapter{functions={now:e`(unixepoch())`};types={binary:"blob",json:"jsonb",text:"text",timestamp:"integer",uuid:"text"};encodeBinary(e){return e}encodeJSON(e){return JSON.stringify(e)}encodeTimestamp(e){return Math.floor(e.getTime()/1e3)}decodeTimestamp(e){return new Date(1e3*e)}async createSearchIndex(t,r){let a=`fts_${r.modelID}`,n=["document_id UNINDEXED",...r.fields].join(", ");await e`CREATE VIRTUAL TABLE IF NOT EXISTS ${e.ref(a)} USING fts5(${e.raw(n)})`.execute(t)}async dropSearchIndex(t,r){let a=`fts_${r}`;await e`DROP TABLE IF EXISTS ${e.ref(a)}`.execute(t)}async updateSearchEntry(t,r,a,n,i){let c=`fts_${r}`;await e`DELETE FROM ${e.ref(c)} WHERE document_id = ${a}`.execute(t);let o=["document_id",...i].join(", "),d=[a,...i.map(e=>n[e]??"")].map(t=>e.lit(t));await e`INSERT INTO ${e.ref(c)} (${e.raw(o)}) VALUES (${e.join(d)})`.execute(t)}async removeSearchEntry(t,r,a){let n=`fts_${r}`;await e`DELETE FROM ${e.ref(n)} WHERE document_id = ${a}`.execute(t)}async searchIndex(t,r){let a=`fts_${r.modelID}`;return(await e`
+import{sql as e}from"kysely";export class AbstractSQLiteAdapter{functions={now:e`(unixepoch())`};types={binary:"blob",json:"jsonb",text:"text",timestamp:"integer",uuid:"text"};encodeBinary(e){return e}encodeJSON(e){return JSON.stringify(e)}encodeTimestamp(e){return Math.floor(e.getTime()/1e3)}decodeTimestamp(e){return new Date(1e3*e)}coerceFilterValue(e){return"boolean"==typeof e?+!!e:e}async createSearchIndex(t,r){let a=`fts_${r.modelID}`,n=["document_id UNINDEXED",...r.fields].join(", ");await e`CREATE VIRTUAL TABLE IF NOT EXISTS ${e.ref(a)} USING fts5(${e.raw(n)})`.execute(t)}async dropSearchIndex(t,r){let a=`fts_${r}`;await e`DROP TABLE IF EXISTS ${e.ref(a)}`.execute(t)}async updateSearchEntry(t,r,a,n,c){let i=`fts_${r}`;await e`DELETE FROM ${e.ref(i)} WHERE document_id = ${a}`.execute(t);let o=["document_id",...c].join(", "),d=[a,...c.map(e=>n[e]??"")].map(t=>e.lit(t));await e`INSERT INTO ${e.ref(i)} (${e.raw(o)}) VALUES (${e.join(d)})`.execute(t)}async removeSearchEntry(t,r,a){let n=`fts_${r}`;await e`DELETE FROM ${e.ref(n)} WHERE document_id = ${a}`.execute(t)}async searchIndex(t,r){let a=`fts_${r.modelID}`;return(await e`
       SELECT document_id, rank FROM ${e.ref(a)}
       WHERE ${e.ref(a)} MATCH ${r.query}
       ORDER BY rank

package/lib/types.d.ts

@@ -39,6 +39,7 @@ export type AbstractAdapter<T extends AdapterTypes = AdapterTypes> = {
     updateSearchEntry(db: Kysely<unknown>, modelID: string, documentID: string, fields: Record<string, string>, fieldNames: Array<string>): Promise<void>;
     removeSearchEntry(db: Kysely<unknown>, modelID: string, documentID: string): Promise<void>;
     searchIndex(db: Kysely<unknown>, params: SearchQuery): Promise<Array<SearchHit>>;
+    coerceFilterValue(value: unknown): unknown;
 };
 export type Adapter<T extends AdapterTypes = AdapterTypes> = AbstractAdapter<T> & {
     dialect: Dialect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubun/db-adapter",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "see LICENSE.md",
   "keywords": [],
   "type": "module",