applesauce-core 0.8.0 → 0.10.0

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

@@ -5,7 +5,15 @@ import { LRU } from "../helpers/lru.js";
 import * as Queries from "../queries/index.js";
 import { AddressPointer, EventPointer } from "nostr-tools/nip19";
 export type Query<T extends unknown> = {
+    /**
+     * A unique key for this query. this is used to detect duplicate queries
+     */
     key: string;
+    /** The args array this query was created with. This is mostly for debugging */
+    args?: Array<any>;
+    /**
+     * The meat of the query, this should return an Observables that subscribes to the eventStore in some way
+     */
     run: (events: EventStore, store: QueryStore) => Observable<T>;
 };
 export type QueryConstructor<T extends unknown, Args extends Array<any>> = (...args: Args) => Query<T>;
@@ -13,35 +21,37 @@ 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) => {
+    createQuery<T extends unknown, Args extends Array<any>>(queryConstructor: (...args: Args) => {
         key: string;
         run: (events: EventStore, store: QueryStore) => Observable<T>;
-    }): (...args: Args) => Observable<T>;
-    /** Returns a single event */
+    }, ...args: Args): Observable<T>;
+    /** Creates a SingleEventQuery */
     event(id: string): Observable<import("nostr-tools").Event | undefined>;
-    /** Returns a single event */
+    /** Creates a MultipleEventsQuery */
     events(ids: string[]): Observable<Map<string, import("nostr-tools").Event>>;
-    /** Returns the latest version of a replaceable event */
+    /** Creates a ReplaceableQuery */
     replaceable(kind: number, pubkey: string, d?: string): Observable<import("nostr-tools").Event | undefined>;
-    /** Returns a directory of events by their UID */
+    /** Creates a ReplaceableSetQuery */
     replaceableSet(pointers: {
         kind: number;
         pubkey: string;
         identifier?: string;
     }[]): Observable<Map<string, import("nostr-tools").Event>>;
-    /** Returns an array of events that match the filter */
-    timeline(filters: Filter | Filter[]): Observable<import("nostr-tools").Event[]>;
-    /** Returns the parsed profile (0) for a pubkey */
+    /** Creates a TimelineQuery */
+    timeline(filters: Filter | Filter[], keepOldVersions?: boolean): Observable<import("nostr-tools").Event[]>;
+    /** Creates a ProfileQuery */
     profile(pubkey: string): Observable<import("../helpers/profile.js").ProfileContent | undefined>;
-    /** Returns all reactions for an event (supports replaceable events) */
+    /** Creates a ReactionsQuery */
     reactions(event: NostrEvent): Observable<import("nostr-tools").Event[]>;
-    /** Returns the parsed relay list (10002) for the pubkey */
+    /** Creates a MailboxesQuery */
     mailboxes(pubkey: string): Observable<{
         inboxes: string[];
         outboxes: string[];
     } | undefined>;
+    /** Creates a ThreadQuery */
     thread(root: string | EventPointer | AddressPointer): Observable<Queries.Thread>;
 }
 export { Queries };

package/dist/query-store/index.js

@@ -8,53 +8,59 @@ 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 observable = query.run(this.store, this).pipe(shareLatestValue());
-                this.queries.set(key, observable);
-                return observable;
-            }
-            return this.queries.get(key);
-        };
-    }
-    /** Returns a single event */
+    createQuery(queryConstructor, ...args) {
+        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.observables.set(query, observable);
+            return observable;
+        }
+        return this.observables.get(query);
+    }
+    /** Creates a SingleEventQuery */
     event(id) {
-        return this.runQuery(Queries.SingleEventQuery)(id);
+        return this.createQuery(Queries.SingleEventQuery, id);
     }
-    /** Returns a single event */
+    /** Creates a MultipleEventsQuery */
     events(ids) {
-        return this.runQuery(Queries.MultipleEventsQuery)(ids);
+        return this.createQuery(Queries.MultipleEventsQuery, ids);
     }
-    /** Returns the latest version of a replaceable event */
+    /** Creates a ReplaceableQuery */
     replaceable(kind, pubkey, d) {
-        return this.runQuery(Queries.ReplaceableQuery)(kind, pubkey, d);
+        return this.createQuery(Queries.ReplaceableQuery, kind, pubkey, d);
     }
-    /** Returns a directory of events by their UID */
+    /** Creates a ReplaceableSetQuery */
     replaceableSet(pointers) {
-        return this.runQuery(Queries.ReplaceableSetQuery)(pointers);
+        return this.createQuery(Queries.ReplaceableSetQuery, pointers);
     }
-    /** Returns an array of events that match the filter */
-    timeline(filters) {
-        return this.runQuery(Queries.TimelineQuery)(filters);
+    /** Creates a TimelineQuery */
+    timeline(filters, keepOldVersions) {
+        return this.createQuery(Queries.TimelineQuery, filters, keepOldVersions);
     }
-    /** Returns the parsed profile (0) for a pubkey */
+    /** Creates a ProfileQuery */
     profile(pubkey) {
-        return this.runQuery(Queries.ProfileQuery)(pubkey);
+        return this.createQuery(Queries.ProfileQuery, pubkey);
     }
-    /** Returns all reactions for an event (supports replaceable events) */
+    /** Creates a ReactionsQuery */
     reactions(event) {
-        return this.runQuery(Queries.ReactionsQuery)(event);
+        return this.createQuery(Queries.ReactionsQuery, event);
     }
-    /** Returns the parsed relay list (10002) for the pubkey */
+    /** Creates a MailboxesQuery */
     mailboxes(pubkey) {
-        return this.runQuery(Queries.MailboxesQuery)(pubkey);
+        return this.createQuery(Queries.MailboxesQuery, pubkey);
     }
+    /** Creates a ThreadQuery */
     thread(root) {
-        return this.runQuery(Queries.ThreadQuery)(root);
+        return this.createQuery(Queries.ThreadQuery, root);
     }
 }
 export { Queries };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -52,31 +52,29 @@
     }
   },
   "dependencies": {
+    "@scure/base": "^1.1.9",
     "debug": "^4.3.7",
-    "json-stringify-deterministic": "^1.0.12",
+    "fast-deep-equal": "^3.1.3",
+    "hash-sum": "^2.0.0",
+    "light-bolt11-decoder": "^3.2.0",
     "nanoid": "^5.0.7",
-    "nostr-tools": "^2.7.2",
+    "nostr-tools": "^2.10.3",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.13",
-    "jest": "^29.7.0",
-    "jest-extended": "^4.0.2"
+    "@types/hash-sum": "^1.0.2",
+    "typescript": "^5.6.3",
+    "vitest": "^2.1.8"
   },
-  "jest": {
-    "roots": [
-      "dist"
-    ],
-    "setupFilesAfterEnv": [
-      "jest-extended/all"
-    ]
+  "funding": {
+    "type": "lightning",
+    "url": "lightning:nostrudel@geyser.fund"
   },
   "scripts": {
     "build": "tsc",
     "watch:build": "tsc --watch > /dev/null",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "watch:test": "(trap 'kill 0' SIGINT; pnpm run build -w > /dev/null & pnpm run test --watch)"
+    "test": "vitest run --passWithNoTests",
+    "watch:test": "vitest"
   }
 }