applesauce-sqlite 0.0.0-next-20250915145415 → 0.0.0-next-20250916134023

package/dist/better-sqlite3/event-database.d.ts

@@ -1,7 +1,7 @@
 import { IEventDatabase } from "applesauce-core";
-import { Filter, NostrEvent } from "applesauce-core/helpers";
+import { NostrEvent } from "applesauce-core/helpers";
 import { type Database as TDatabase } from "better-sqlite3";
-import { SearchContentFormatter } from "../helpers/search.js";
+import { FilterWithSearch, SearchContentFormatter } from "../helpers/search.js";
 /** Options for the {@link BetterSqlite3EventDatabase} */
 export type BetterSqlite3EventDatabaseOptions = {
     search?: boolean;
@@ -29,17 +29,9 @@ export declare class BetterSqlite3EventDatabase implements IEventDatabase {
     /** Returns all the versions of a replaceable event */
     getReplaceableHistory(kind: number, pubkey: string, identifier?: string): NostrEvent[];
     /** Get all events that match the filters (supports NIP-50 search field) */
-    getByFilters(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): Set<NostrEvent>;
+    getByFilters(filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
-    getTimeline(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): NostrEvent[];
+    getTimeline(filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
     /** Set the search content formatter */
     setSearchContentFormatter(formatter: SearchContentFormatter): void;
     /** Get the current search content formatter */

package/dist/better-sqlite3/event-database.js

@@ -1,5 +1,4 @@
 import { logger } from "applesauce-core";
-import { insertEventIntoDescendingList } from "applesauce-core/helpers";
 import Database from "better-sqlite3";
 import { createTables, deleteEvent, getEvent, getEventsByFilters, getReplaceable, getReplaceableHistory, hasEvent, hasReplaceable, insertEvent, rebuildSearchIndex, } from "../better-sqlite3/methods.js";
 import { enhancedSearchContentFormatter } from "../helpers/search.js";
@@ -60,23 +59,15 @@ export class BetterSqlite3EventDatabase {
     }
     /** Get all events that match the filters (supports NIP-50 search field) */
     getByFilters(filters) {
-        try {
-            // If search is disabled, remove the search field from the filters
-            if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
-                throw new Error("Search is disabled");
-            return getEventsByFilters(this.db, filters);
-        }
-        catch (error) {
-            return new Set();
-        }
+        // If search is disabled, remove the search field from the filters
+        if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
+            throw new Error("Search is disabled");
+        return getEventsByFilters(this.db, filters);
     }
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
     getTimeline(filters) {
-        const events = this.getByFilters(filters);
-        const timeline = [];
-        for (const event of events)
-            insertEventIntoDescendingList(timeline, event);
-        return timeline;
+        // No need to sort since query defaults to created_at descending order
+        return this.getByFilters(filters);
     }
     /** Set the search content formatter */
     setSearchContentFormatter(formatter) {

package/dist/better-sqlite3/methods.d.ts

@@ -24,7 +24,7 @@ export declare function getReplaceableHistory(db: Database, kind: number, pubkey
 /** Checks if a replaceable event exists in a database */
 export declare function hasReplaceable(db: Database, kind: number, pubkey: string, identifier?: string): boolean;
 /** Get all events that match the filters (includes NIP-50 search support) */
-export declare function getEventsByFilters(db: Database, filters: FilterWithSearch | FilterWithSearch[]): Set<NostrEvent>;
+export declare function getEventsByFilters(db: Database, filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export declare function searchEvents(db: Database, search: string, options?: Filter): NostrEvent[];
 /** Rebuild the FTS5 search index for all events */

package/dist/better-sqlite3/methods.js

@@ -112,14 +112,11 @@ export function hasReplaceable(db, kind, pubkey, identifier = "") {
 export function getEventsByFilters(db, filters) {
     const query = buildFiltersQuery(filters);
     if (!query)
-        return new Set();
-    const eventSet = new Set();
+        return [];
     const stmt = db.prepare(query.sql);
     const rows = stmt.all(...query.params);
     // Convert rows to events and add to set
-    for (const row of rows)
-        eventSet.add(rowToEvent(row));
-    return eventSet;
+    return rows.map(rowToEvent);
 }
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export function searchEvents(db, search, options) {
@@ -131,8 +128,7 @@ export function searchEvents(db, search, options) {
         ...options,
     };
     // Use the main filter system which now supports search
-    const results = getEventsByFilters(db, filter);
-    return Array.from(results);
+    return getEventsByFilters(db, filter);
 }
 /** Rebuild the FTS5 search index for all events */
 export function rebuildSearchIndex(db, contentFormatter) {

package/dist/bun/event-database.d.ts

@@ -1,7 +1,7 @@
 import { IEventDatabase } from "applesauce-core";
-import { Filter, NostrEvent } from "applesauce-core/helpers";
+import { NostrEvent } from "applesauce-core/helpers";
 import { Database } from "bun:sqlite";
-import { SearchContentFormatter } from "../helpers/search.js";
+import { FilterWithSearch, SearchContentFormatter } from "../helpers/search.js";
 /** Options for the {@link BunSqliteEventDatabase} */
 export type BunSqliteEventDatabaseOptions = {
     search?: boolean;
@@ -29,17 +29,9 @@ export declare class BunSqliteEventDatabase implements IEventDatabase {
     /** Returns all the versions of a replaceable event */
     getReplaceableHistory(kind: number, pubkey: string, identifier?: string): NostrEvent[];
     /** Get all events that match the filters (supports NIP-50 search field) */
-    getByFilters(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): Set<NostrEvent>;
+    getByFilters(filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
-    getTimeline(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): NostrEvent[];
+    getTimeline(filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
     /** Set the search content formatter */
     setSearchContentFormatter(formatter: SearchContentFormatter): void;
     /** Get the current search content formatter */

package/dist/bun/event-database.js

@@ -1,9 +1,8 @@
 import { logger } from "applesauce-core";
-import { insertEventIntoDescendingList } from "applesauce-core/helpers";
 // @ts-ignore - bun:sqlite is a built-in module in Bun
 import { Database } from "bun:sqlite";
-import { createTables, deleteEvent, getEvent, getEventsByFilters, getReplaceable, getReplaceableHistory, hasEvent, hasReplaceable, insertEvent, rebuildSearchIndex, } from "./methods.js";
 import { enhancedSearchContentFormatter } from "../helpers/search.js";
+import { createTables, deleteEvent, getEvent, getEventsByFilters, getReplaceable, getReplaceableHistory, hasEvent, hasReplaceable, insertEvent, rebuildSearchIndex, } from "./methods.js";
 const log = logger.extend("BunSqliteEventDatabase");
 export class BunSqliteEventDatabase {
     db;
@@ -61,23 +60,15 @@ export class BunSqliteEventDatabase {
     }
     /** Get all events that match the filters (supports NIP-50 search field) */
     getByFilters(filters) {
-        try {
-            // If search is disabled, remove the search field from the filters
-            if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
-                throw new Error("Search is disabled");
-            return getEventsByFilters(this.db, filters);
-        }
-        catch (error) {
-            return new Set();
-        }
+        // If search is disabled, remove the search field from the filters
+        if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
+            throw new Error("Search is disabled");
+        return getEventsByFilters(this.db, filters);
     }
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
     getTimeline(filters) {
-        const events = this.getByFilters(filters);
-        const timeline = [];
-        for (const event of events)
-            insertEventIntoDescendingList(timeline, event);
-        return timeline;
+        // No need to sort since query defaults to created_at descending order
+        return this.getByFilters(filters);
     }
     /** Set the search content formatter */
     setSearchContentFormatter(formatter) {

package/dist/bun/methods.d.ts

@@ -24,7 +24,7 @@ export declare function getReplaceableHistory(db: Database, kind: number, pubkey
 /** Checks if a replaceable event exists in a database */
 export declare function hasReplaceable(db: Database, kind: number, pubkey: string, identifier?: string): boolean;
 /** Get all events that match the filters (includes NIP-50 search support) */
-export declare function getEventsByFilters(db: Database, filters: FilterWithSearch | FilterWithSearch[]): Set<NostrEvent>;
+export declare function getEventsByFilters(db: Database, filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export declare function searchEvents(db: Database, search: string, options?: Filter): NostrEvent[];
 /** Rebuild the FTS5 search index for all events */

package/dist/bun/methods.js

@@ -114,14 +114,11 @@ export function hasReplaceable(db, kind, pubkey, identifier = "") {
 export function getEventsByFilters(db, filters) {
     const query = buildFiltersQuery(filters);
     if (!query)
-        return new Set();
-    const eventSet = new Set();
+        return [];
     const stmt = db.query(query.sql);
     const rows = stmt.all(...query.params);
-    // Convert rows to events and add to set
-    for (const row of rows)
-        eventSet.add(rowToEvent(row));
-    return eventSet;
+    // Map rows to events
+    return rows.map(rowToEvent);
 }
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export function searchEvents(db, search, options) {
@@ -133,8 +130,7 @@ export function searchEvents(db, search, options) {
         ...options,
     };
     // Use the main filter system which now supports search
-    const results = getEventsByFilters(db, filter);
-    return Array.from(results);
+    return getEventsByFilters(db, filter);
 }
 /** Rebuild the FTS5 search index for all events */
 export function rebuildSearchIndex(db, contentFormatter) {

package/dist/helpers/sql.js

@@ -18,7 +18,7 @@ export function buildFilterConditions(filter) {
     // Handle NIP-50 search filter
     if (filter.search && filter.search.trim()) {
         conditions.push(`events_search MATCH ?`);
-        params.push(filter.search.trim());
+        params.push('"' + filter.search.replace(/"/g, '""') + '"');
         search = true;
     }
     // Handle IDs filter

package/dist/libsql/event-database.d.ts

@@ -1,7 +1,7 @@
-import { IAsyncEventDatabase } from "applesauce-core";
-import { Filter, NostrEvent } from "applesauce-core/helpers";
 import { Client } from "@libsql/client";
-import { SearchContentFormatter } from "../helpers/search.js";
+import { IAsyncEventDatabase } from "applesauce-core";
+import { NostrEvent } from "applesauce-core/helpers";
+import { FilterWithSearch, SearchContentFormatter } from "../helpers/search.js";
 /** Options for the {@link LibsqlEventDatabase} */
 export type LibsqlEventDatabaseOptions = {
     search?: boolean;
@@ -31,17 +31,9 @@ export declare class LibsqlEventDatabase implements IAsyncEventDatabase {
     /** Returns all the versions of a replaceable event */
     getReplaceableHistory(kind: number, pubkey: string, identifier?: string): Promise<NostrEvent[] | undefined>;
     /** Get all events that match the filters (supports NIP-50 search field) */
-    getByFilters(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): Promise<Set<NostrEvent>>;
+    getByFilters(filters: FilterWithSearch | FilterWithSearch[]): Promise<NostrEvent[]>;
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
-    getTimeline(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): Promise<NostrEvent[]>;
+    getTimeline(filters: FilterWithSearch | FilterWithSearch[]): Promise<NostrEvent[]>;
     /** Set the search content formatter */
     setSearchContentFormatter(formatter: SearchContentFormatter): void;
     /** Get the current search content formatter */

package/dist/libsql/event-database.js

@@ -1,8 +1,7 @@
-import { logger } from "applesauce-core";
-import { insertEventIntoDescendingList } from "applesauce-core/helpers";
 import { createClient } from "@libsql/client";
-import { createTables, deleteEvent, getEvent, getEventsByFilters, getReplaceable, getReplaceableHistory, hasEvent, hasReplaceable, insertEvent, rebuildSearchIndex, } from "./methods.js";
+import { logger } from "applesauce-core";
 import { enhancedSearchContentFormatter } from "../helpers/search.js";
+import { createTables, deleteEvent, getEvent, getEventsByFilters, getReplaceable, getReplaceableHistory, hasEvent, hasReplaceable, insertEvent, rebuildSearchIndex, } from "./methods.js";
 const log = logger.extend("LibsqlEventDatabase");
 export class LibsqlEventDatabase {
     db;
@@ -62,23 +61,15 @@ export class LibsqlEventDatabase {
     }
     /** Get all events that match the filters (supports NIP-50 search field) */
     async getByFilters(filters) {
-        try {
-            // If search is disabled, remove the search field from the filters
-            if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
-                throw new Error("Search is disabled");
-            return await getEventsByFilters(this.db, filters);
-        }
-        catch (error) {
-            return new Set();
-        }
+        // If search is disabled, remove the search field from the filters
+        if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
+            throw new Error("Search is disabled");
+        return await getEventsByFilters(this.db, filters);
     }
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
     async getTimeline(filters) {
-        const events = await this.getByFilters(filters);
-        const timeline = [];
-        for (const event of events)
-            insertEventIntoDescendingList(timeline, event);
-        return timeline;
+        // No need to sort since query defaults to created_at descending order
+        return await this.getByFilters(filters);
     }
     /** Set the search content formatter */
     setSearchContentFormatter(formatter) {

package/dist/libsql/methods.d.ts

@@ -24,7 +24,7 @@ export declare function getReplaceableHistory(db: Client, kind: number, pubkey:
 /** Checks if a replaceable event exists in a database */
 export declare function hasReplaceable(db: Client, kind: number, pubkey: string, identifier?: string): Promise<boolean>;
 /** Get all events that match the filters (includes NIP-50 search support) */
-export declare function getEventsByFilters(db: Client, filters: FilterWithSearch | FilterWithSearch[]): Promise<Set<NostrEvent>>;
+export declare function getEventsByFilters(db: Client, filters: FilterWithSearch | FilterWithSearch[]): Promise<NostrEvent[]>;
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export declare function searchEvents(db: Client, search: string, options?: Filter): Promise<NostrEvent[]>;
 /** Rebuild the FTS5 search index for all events */

package/dist/libsql/methods.js

@@ -187,15 +187,15 @@ export async function hasReplaceable(db, kind, pubkey, identifier = "") {
 export async function getEventsByFilters(db, filters) {
     const query = buildFiltersQuery(filters);
     if (!query)
-        return new Set();
-    const eventSet = new Set();
+        return [];
+    const events = [];
     const result = await db.execute({
         sql: query.sql,
         args: query.params,
     });
     // Convert rows to events and add to set
     for (const row of result.rows) {
-        eventSet.add(rowToEvent({
+        events.push(rowToEvent({
             id: row[0],
             kind: row[1],
             pubkey: row[2],
@@ -205,7 +205,7 @@ export async function getEventsByFilters(db, filters) {
             sig: row[6],
         }));
     }
-    return eventSet;
+    return events;
 }
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export async function searchEvents(db, search, options) {
@@ -217,8 +217,7 @@ export async function searchEvents(db, search, options) {
         ...options,
     };
     // Use the main filter system which now supports search
-    const results = await getEventsByFilters(db, filter);
-    return Array.from(results);
+    return await getEventsByFilters(db, filter);
 }
 /** Rebuild the FTS5 search index for all events */
 export async function rebuildSearchIndex(db, contentFormatter) {

package/dist/native/event-database.d.ts

@@ -1,7 +1,7 @@
 import { IEventDatabase } from "applesauce-core";
-import { Filter, NostrEvent } from "applesauce-core/helpers";
+import { NostrEvent } from "applesauce-core/helpers";
 import { DatabaseSync } from "node:sqlite";
-import { SearchContentFormatter } from "../helpers/search.js";
+import { FilterWithSearch, SearchContentFormatter } from "../helpers/search.js";
 /** Options for the {@link NativeSqliteEventDatabase} */
 export type NativeSqliteEventDatabaseOptions = {
     search?: boolean;
@@ -29,17 +29,9 @@ export declare class NativeSqliteEventDatabase implements IEventDatabase {
     /** Returns all the versions of a replaceable event */
     getReplaceableHistory(kind: number, pubkey: string, identifier?: string): NostrEvent[];
     /** Get all events that match the filters (supports NIP-50 search field) */
-    getByFilters(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): Set<NostrEvent>;
+    getByFilters(filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
-    getTimeline(filters: (Filter & {
-        search?: string;
-    }) | (Filter & {
-        search?: string;
-    })[]): NostrEvent[];
+    getTimeline(filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
     /** Set the search content formatter */
     setSearchContentFormatter(formatter: SearchContentFormatter): void;
     /** Get the current search content formatter */

package/dist/native/event-database.js

@@ -1,5 +1,4 @@
 import { logger } from "applesauce-core";
-import { insertEventIntoDescendingList } from "applesauce-core/helpers";
 import { DatabaseSync } from "node:sqlite";
 import { enhancedSearchContentFormatter } from "../helpers/search.js";
 import { createTables, deleteEvent, getEvent, getEventsByFilters, getReplaceable, getReplaceableHistory, hasEvent, hasReplaceable, insertEvent, rebuildSearchIndex, } from "./methods.js";
@@ -60,23 +59,15 @@ export class NativeSqliteEventDatabase {
     }
     /** Get all events that match the filters (supports NIP-50 search field) */
     getByFilters(filters) {
-        try {
-            // If search is disabled, remove the search field from the filters
-            if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
-                throw new Error("Search is disabled");
-            return getEventsByFilters(this.db, filters);
-        }
-        catch (error) {
-            return new Set();
-        }
+        // If search is disabled, remove the search field from the filters
+        if (!this.search && (Array.isArray(filters) ? filters.some((f) => "search" in f) : "search" in filters))
+            throw new Error("Search is disabled");
+        return getEventsByFilters(this.db, filters);
     }
     /** Get a timeline of events that match the filters (returns array in chronological order, supports NIP-50 search) */
     getTimeline(filters) {
-        const events = this.getByFilters(filters);
-        const timeline = [];
-        for (const event of events)
-            insertEventIntoDescendingList(timeline, event);
-        return timeline;
+        // No need to sort since query defaults to created_at descending order
+        return this.getByFilters(filters);
     }
     /** Set the search content formatter */
     setSearchContentFormatter(formatter) {

package/dist/native/methods.d.ts

@@ -24,7 +24,7 @@ export declare function getReplaceableHistory(db: DatabaseSync, kind: number, pu
 /** Checks if a replaceable event exists in a database */
 export declare function hasReplaceable(db: DatabaseSync, kind: number, pubkey: string, identifier?: string): boolean;
 /** Get all events that match the filters (includes NIP-50 search support) */
-export declare function getEventsByFilters(db: DatabaseSync, filters: FilterWithSearch | FilterWithSearch[]): Set<NostrEvent>;
+export declare function getEventsByFilters(db: DatabaseSync, filters: FilterWithSearch | FilterWithSearch[]): NostrEvent[];
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export declare function searchEvents(db: DatabaseSync, search: string, options?: Filter): NostrEvent[];
 /** Rebuild the FTS5 search index for all events */

package/dist/native/methods.js

@@ -131,14 +131,11 @@ export function hasReplaceable(db, kind, pubkey, identifier = "") {
 export function getEventsByFilters(db, filters) {
     const query = buildFiltersQuery(filters);
     if (!query)
-        return new Set();
-    const eventSet = new Set();
+        return [];
     const stmt = db.prepare(query.sql);
     const rows = stmt.all(...query.params);
     // Convert rows to events and add to set
-    for (const row of rows)
-        eventSet.add(rowToEvent(row));
-    return eventSet;
+    return rows.map(rowToEvent);
 }
 /** Search events using FTS5 full-text search (convenience wrapper around getEventsByFilters) */
 export function searchEvents(db, search, options) {
@@ -150,8 +147,7 @@ export function searchEvents(db, search, options) {
         ...options,
     };
     // Use the main filter system which now supports search
-    const results = getEventsByFilters(db, filter);
-    return Array.from(results);
+    return getEventsByFilters(db, filter);
 }
 /** Rebuild the FTS5 search index for all events */
 export function rebuildSearchIndex(db, contentFormatter) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-sqlite",
-  "version": "0.0.0-next-20250915145415",
+  "version": "0.0.0-next-20250916134023",
   "description": "sqlite event databases for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -82,7 +82,7 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "0.0.0-next-20250915145415"
+    "applesauce-core": "0.0.0-next-20250916134023"
   },
   "optionalDependencies": {
     "better-sqlite3": "^12.2.0",
@@ -93,7 +93,7 @@
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "^1.2.22",
     "@types/ws": "^8.5.13",
-    "applesauce-signers": "0.0.0-next-20250915145415",
+    "applesauce-signers": "0.0.0-next-20250916134023",
     "typescript": "^5.7.3",
     "vitest": "^3.2.4",
     "vitest-websocket-mock": "^0.5.0",