applesauce-core 0.0.0-next-20241126195214 → 0.0.0-next-20241127180935

package/dist/event-store/database.js

@@ -202,27 +202,21 @@ export class Database {
         let sinceIndex = this.created_at.length - 1;
         let start = until
             ? binarySearch(this.created_at, (mid) => {
-                if (mid.created_at === until)
-                    return -1;
                 return mid.created_at - until;
             })
             : undefined;
-        if (start && start[1])
+        if (start)
             untilIndex = start[0];
         const end = since
             ? binarySearch(this.created_at, (mid) => {
-                if (mid.created_at === since)
-                    return 1;
-                return since - mid.created_at;
+                return mid.created_at - since;
             })
             : undefined;
-        if (end && end[1])
+        if (end)
             sinceIndex = end[0];
-        const events = new Set();
-        for (let i = untilIndex; i <= sinceIndex; i++) {
-            events.add(this.created_at[i]);
+        for (let i = untilIndex; i < sinceIndex; i++) {
+            yield this.created_at[i];
         }
-        return events;
     }
     *iterateIds(ids) {
         for (const id of ids) {

package/dist/event-store/event-store.d.ts

@@ -21,7 +21,7 @@ export declare class EventStore {
     /** Gets the latest version of a replaceable event */
     getReplaceable(kind: number, pubkey: string, d?: string): NostrEvent | undefined;
     /** Returns all versions of a replaceable event */
-    getAllReplaceable(kind: number, pubkey: string, d?: string): NostrEvent[] | undefined;
+    getReplaceableHistory(kind: number, pubkey: string, d?: string): NostrEvent[] | undefined;
     /** Creates an observable that updates a single event */
     event(id: string): Observable<NostrEvent | undefined>;
     /** Creates an observable that subscribes to multiple events */

package/dist/event-store/event-store.js

@@ -6,7 +6,7 @@ import { Database } from "./database.js";
 import { getEventUID, getReplaceableUID, getTagValue, isReplaceable } from "../helpers/event.js";
 import { matchFilters } from "../helpers/filter.js";
 import { addSeenRelay } from "../helpers/relays.js";
-import { getDeleteIds } from "../helpers/delete.js";
+import { getDeleteCoordinates, getDeleteIds } from "../helpers/delete.js";
 export class EventStore {
     database;
     /** Whether to keep old versions of replaceable events */
@@ -51,7 +51,7 @@ export class EventStore {
             if (event)
                 this.database.deleteEvent(event);
         }
-        const coords = getDeleteIds(deleteEvent);
+        const coords = getDeleteCoordinates(deleteEvent);
         for (const coord of coords) {
             this.deletedCoords.set(coord, Math.max(this.deletedCoords.get(coord) ?? 0, deleteEvent.created_at));
             // remove deleted events in the database
@@ -91,7 +91,7 @@ export class EventStore {
         return this.database.getReplaceable(kind, pubkey, d)?.[0];
     }
     /** Returns all versions of a replaceable event */
-    getAllReplaceable(kind, pubkey, d) {
+    getReplaceableHistory(kind, pubkey, d) {
         return this.database.getReplaceable(kind, pubkey, d);
     }
     /** Creates an observable that updates a single event */

package/dist/helpers/filter.js

@@ -20,7 +20,7 @@ export function matchFilter(filter, event) {
             let values = filter[`#${tagName}`];
             if (values) {
                 const tags = getIndexableTags(event);
-                if (values.some((v) => !tags.has(tagName + ":" + v)))
+                if (values.some((v) => tags.has(tagName + ":" + v)) === false)
                     return false;
             }
         }

package/dist/queries/simple.js

@@ -1,5 +1,5 @@
-import { getReplaceableUID } from "../helpers/event.js";
 import hash_sum from "hash-sum";
+import { getReplaceableUID } from "../helpers/event.js";
 /** Creates a Query that returns a single event or undefined */
 export function SingleEventQuery(id) {
     return {
@@ -23,9 +23,10 @@ export function ReplaceableQuery(kind, pubkey, d) {
 }
 /** Creates a Query that returns an array of sorted events matching the filters */
 export function TimelineQuery(filters, keepOldVersions) {
+    filters = Array.isArray(filters) ? filters : [filters];
     return {
         key: hash_sum(filters) + (keepOldVersions ? "-history" : ""),
-        run: (events) => events.timeline(Array.isArray(filters) ? filters : [filters], keepOldVersions),
+        run: (events) => events.timeline(filters, keepOldVersions),
     };
 }
 /** Creates a Query that returns a directory of events by their UID */
@@ -35,3 +36,5 @@ export function ReplaceableSetQuery(pointers) {
         run: (events) => events.replaceableSet(pointers),
     };
 }
+// @ts-expect-error
+window.hash_sum = hash_sum;

package/dist/query-store/index.d.ts

@@ -6,6 +6,7 @@ import * as Queries from "../queries/index.js";
 import { AddressPointer, EventPointer } from "nostr-tools/nip19";
 export type Query<T extends unknown> = {
     key: string;
+    args?: Array<any>;
     run: (events: EventStore, store: QueryStore) => Observable<T>;
 };
 export type QueryConstructor<T extends unknown, Args extends Array<any>> = (...args: Args) => Query<T>;
@@ -13,7 +14,8 @@ export declare class QueryStore {
     static Queries: typeof Queries;
     store: EventStore;
     constructor(store: EventStore);
-    queries: LRU<Observable<any> | BehaviorSubject<any>>;
+    queries: LRU<Query<any>>;
+    observables: WeakMap<Query<any>, Observable<any> | BehaviorSubject<any>>;
     /** Creates a cached query */
     runQuery<T extends unknown, Args extends Array<any>>(queryConstructor: (...args: Args) => {
         key: string;

package/dist/query-store/index.js

@@ -8,17 +8,24 @@ export class QueryStore {
         this.store = store;
     }
     queries = new LRU();
+    observables = new WeakMap();
     /** Creates a cached query */
     runQuery(queryConstructor) {
         return (...args) => {
-            const query = queryConstructor(...args);
-            const key = `${queryConstructor.name}|${query.key}`;
-            if (!this.queries.has(key)) {
+            const tempQuery = queryConstructor(...args);
+            const key = `${queryConstructor.name}|${tempQuery.key}`;
+            let query = this.queries.get(key);
+            if (!query) {
+                query = tempQuery;
+                this.queries.set(key, tempQuery);
+            }
+            if (!this.observables.has(query)) {
+                query.args = args;
                 const observable = query.run(this.store, this).pipe(shareLatestValue());
-                this.queries.set(key, observable);
+                this.observables.set(query, observable);
                 return observable;
             }
-            return this.queries.get(key);
+            return this.observables.get(query);
         };
     }
     /** Returns a single event */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "0.0.0-next-20241126195214",
+  "version": "0.0.0-next-20241127180935",
   "description": "",
   "type": "module",
   "main": "dist/index.js",