applesauce-core 0.0.0-next-20250312113207 → 0.0.0-next-20250312162115

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

@@ -1,8 +1,9 @@
 import { Filter, NostrEvent } from "nostr-tools";
 import { Observable } from "rxjs";
 import { Database } from "./database.js";
+import { IEventStore } from "./interface.js";
 export declare const EventStoreSymbol: unique symbol;
-export declare class EventStore {
+export declare class EventStore implements IEventStore {
     database: Database;
     /** Enable this to keep old versions of replaceable events */
     keepOldVersions: boolean;
@@ -50,7 +51,7 @@ export declare class EventStore {
     /** Returns an observable that completes when an event is removed */
     removed(id: string): Observable<never>;
     /** Creates an observable that emits when event is updated */
-    updated(id: string): Observable<NostrEvent>;
+    updated(event: string | NostrEvent): Observable<NostrEvent>;
     /** Creates an observable that subscribes to a single event */
     event(id: string): Observable<NostrEvent | undefined>;
     /** Creates an observable that subscribes to multiple events */

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

@@ -181,8 +181,8 @@ export class EventStore {
         mergeMap(() => EMPTY));
     }
     /** Creates an observable that emits when event is updated */
-    updated(id) {
-        return this.database.updated.pipe(filter((e) => e.id === id));
+    updated(event) {
+        return this.database.updated.pipe(filter((e) => e.id === event || e === event));
     }
     /** Creates an observable that subscribes to a single event */
     event(id) {
@@ -199,7 +199,7 @@ export class EventStore {
         // emit undefined when deleted
         this.removed(id).pipe(endWith(undefined))).pipe(
         // claim all events
-        claimEvents(this.database));
+        claimLatest(this.database));
     }
     /** Creates an observable that subscribes to multiple events */
     events(ids) {

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

@@ -1,2 +1,3 @@
 export * from "./event-store.js";
 export * from "./database.js";
+export * from "./interface.js";

package/dist/event-store/index.js

@@ -1,2 +1,3 @@
 export * from "./event-store.js";
 export * from "./database.js";
+export * from "./interface.js";

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

@@ -0,0 +1,27 @@
+import { Filter, NostrEvent } from "nostr-tools";
+import { Observable } from "rxjs";
+export interface IEventStore {
+    updates: Observable<NostrEvent>;
+    add(event: NostrEvent, fromRelay?: string): NostrEvent;
+    remove(event: string | NostrEvent): boolean;
+    update(event: NostrEvent): NostrEvent;
+    hasEvent(id: string): boolean;
+    hasReplaceable(kind: number, pubkey: string, identifier?: string): boolean;
+    getEvent(id: string): NostrEvent | undefined;
+    getReplaceable(kind: number, pubkey: string, identifier?: string): NostrEvent | undefined;
+    getReplaceableHistory(kind: number, pubkey: string, identifier?: string): NostrEvent[] | undefined;
+    getAll(filters: Filter | Filter[]): Set<NostrEvent>;
+    getTimeline(filters: Filter | Filter[]): NostrEvent[];
+    filters(filters: Filter | Filter[]): Observable<NostrEvent>;
+    updated(id: string | NostrEvent): Observable<NostrEvent>;
+    removed(id: string): Observable<never>;
+    event(id: string): Observable<NostrEvent | undefined>;
+    events(ids: string[]): Observable<Record<string, NostrEvent>>;
+    replaceable(kind: number, pubkey: string, identifier?: string): Observable<NostrEvent | undefined>;
+    replaceableSet(pointers: {
+        kind: number;
+        pubkey: string;
+        identifier?: string;
+    }[]): Observable<Record<string, NostrEvent>>;
+    timeline(filters: Filter | Filter[], includeOldVersion?: boolean): Observable<NostrEvent[]>;
+}

package/dist/event-store/interface.js

@@ -0,0 +1 @@
+export {};

package/dist/helpers/cache.d.ts

@@ -1,5 +1,4 @@
-import { EventTemplate, NostrEvent } from "nostr-tools";
-export declare function getCachedValue<T extends unknown>(event: NostrEvent | EventTemplate, symbol: symbol): T | undefined;
-export declare function setCachedValue<T extends unknown>(event: NostrEvent | EventTemplate, symbol: symbol, value: T): void;
+export declare function getCachedValue<T extends unknown>(event: any, symbol: symbol): T | undefined;
+export declare function setCachedValue<T extends unknown>(event: any, symbol: symbol, value: T): void;
 /** Internal method used to cache computed values on events */
-export declare function getOrComputeCachedValue<T extends unknown>(event: NostrEvent | EventTemplate, symbol: symbol, compute: (event: NostrEvent | EventTemplate) => T): T;
+export declare function getOrComputeCachedValue<T extends unknown>(event: any, symbol: symbol, compute: () => T): T;

package/dist/helpers/cache.js

@@ -10,7 +10,7 @@ export function getOrComputeCachedValue(event, symbol, compute) {
         return Reflect.get(event, symbol);
     }
     else {
-        const value = compute(event);
+        const value = compute();
         Reflect.set(event, symbol, value);
         return value;
     }

package/dist/helpers/event.d.ts

@@ -1,5 +1,5 @@
-import { EventTemplate, NostrEvent, VerifiedEvent } from "nostr-tools";
-import { EventStore } from "../event-store/event-store.js";
+import { NostrEvent, VerifiedEvent } from "nostr-tools";
+import { IEventStore } from "../event-store/interface.js";
 export declare const EventUIDSymbol: unique symbol;
 export declare const EventIndexableTagsSymbol: unique symbol;
 export declare const FromCacheSymbol: unique symbol;
@@ -35,7 +35,12 @@ export declare function getIndexableTags(event: NostrEvent): Set<string>;
  * Returns the second index ( tag[1] ) of the first tag that matches the name
  * If the event has any hidden tags they will be searched first
  */
-export declare function getTagValue(event: NostrEvent | EventTemplate, name: string): string | undefined;
+export declare function getTagValue<T extends {
+    kind: number;
+    tags: string[][];
+    content: string;
+    pubkey: string;
+}>(event: T, name: string): string | undefined;
 /** Sets events verified flag without checking anything */
 export declare function fakeVerifyEvent(event: NostrEvent): event is VerifiedEvent;
 /** Marks an event as being from a cache */
@@ -43,7 +48,7 @@ export declare function markFromCache(event: NostrEvent): void;
 /** Returns if an event was from a cache */
 export declare function isFromCache(event: NostrEvent): boolean;
 /** Returns the EventStore of an event if its been added to one */
-export declare function getParentEventStore(event: NostrEvent): EventStore | undefined;
+export declare function getParentEventStore<T extends object>(event: T): IEventStore | undefined;
 /**
  * Returns the replaceable identifier for a replaceable event
  * @throws

package/dist/helpers/hidden-content.d.ts

@@ -1,4 +1,3 @@
-import { UnsignedEvent, type EventTemplate, type NostrEvent } from "nostr-tools";
 export declare const HiddenContentSymbol: unique symbol;
 export type HiddenContentSigner = {
     nip04?: {
@@ -17,14 +16,14 @@ export declare function setEventContentEncryptionMethod(kind: number, method: "n
 /** Checks if an event can have hidden content */
 export declare function canHaveHiddenContent(kind: number): boolean;
 /** Checks if an event has hidden content */
-export declare function hasHiddenContent(event: {
+export declare function hasHiddenContent<T extends {
     kind: number;
     content: string;
-}): boolean;
+}>(event: T): boolean;
 /** Returns the hidden tags for an event if they are unlocked */
-export declare function getHiddenContent(event: NostrEvent | EventTemplate): string | undefined;
+export declare function getHiddenContent<T extends object>(event: T): string | undefined;
 /** Checks if the hidden tags are locked */
-export declare function isHiddenContentLocked(event: NostrEvent | UnsignedEvent): boolean;
+export declare function isHiddenContentLocked<T extends object>(event: T): boolean;
 /** Returns either nip04 or nip44 encryption methods depending on event kind */
 export declare function getHiddenContentEncryptionMethods(kind: number, signer: HiddenContentSigner): {
     encrypt: (pubkey: string, plaintext: string) => Promise<string> | string;
@@ -33,14 +32,15 @@ export declare function getHiddenContentEncryptionMethods(kind: number, signer:
     encrypt: (pubkey: string, plaintext: string) => Promise<string> | string;
     decrypt: (pubkey: string, ciphertext: string) => Promise<string> | string;
 };
+export type HiddenContentEvent = {
+    kind: number;
+    pubkey: string;
+    content: string;
+};
 /**
  * Unlocks the encrypted content in an event
  * @param event The event with content to decrypt
  * @param signer A signer to use to decrypt the tags
  * @throws
  */
-export declare function unlockHiddenContent(event: {
-    kind: number;
-    pubkey: string;
-    content: string;
-}, signer: HiddenContentSigner): Promise<string>;
+export declare function unlockHiddenContent<T extends HiddenContentEvent>(event: T, signer: HiddenContentSigner): Promise<string>;

package/dist/helpers/hidden-content.js

@@ -1,6 +1,6 @@
 import * as kinds from "nostr-tools/kinds";
 import { GROUPS_LIST_KIND } from "./groups.js";
-import { getParentEventStore } from "./event.js";
+import { getParentEventStore, isEvent } from "./event.js";
 export const HiddenContentSymbol = Symbol.for("hidden-content");
 /** Various event kinds that can have encrypted tags in their content and which encryption method they use */
 export const EventContentEncryptionMethod = {
@@ -46,7 +46,7 @@ export function getHiddenContent(event) {
 }
 /** Checks if the hidden tags are locked */
 export function isHiddenContentLocked(event) {
-    return getHiddenContent(event) === undefined;
+    return Reflect.has(event, HiddenContentSymbol) === false;
 }
 /** Returns either nip04 or nip44 encryption methods depending on event kind */
 export function getHiddenContentEncryptionMethods(kind, signer) {
@@ -69,8 +69,10 @@ export async function unlockHiddenContent(event, signer) {
     const plaintext = await encryption.decrypt(event.pubkey, event.content);
     Reflect.set(event, HiddenContentSymbol, plaintext);
     // if the event has been added to an event store, notify it
-    const eventStore = getParentEventStore(event);
-    if (eventStore)
-        eventStore.update(event);
+    if (isEvent(event)) {
+        const eventStore = getParentEventStore(event);
+        if (eventStore)
+            eventStore.update(event);
+    }
     return plaintext;
 }

package/dist/helpers/hidden-tags.d.ts

@@ -1,17 +1,18 @@
-import { EventTemplate, NostrEvent } from "nostr-tools";
-import { EventStore } from "../event-store/event-store.js";
-import { HiddenContentSigner } from "./hidden-content.js";
+import { HiddenContentEvent, HiddenContentSigner } from "./hidden-content.js";
 export declare const HiddenTagsSymbol: unique symbol;
 /** Checks if an event can have hidden tags */
 export declare function canHaveHiddenTags(kind: number): boolean;
 /** Checks if an event has hidden tags */
-export declare function hasHiddenTags(event: NostrEvent | EventTemplate): boolean;
+export declare function hasHiddenTags<T extends {
+    content: string;
+    kind: number;
+}>(event: T): boolean;
 /** Returns the hidden tags for an event if they are unlocked */
-export declare function getHiddenTags(event: NostrEvent | EventTemplate): string[][] | undefined;
+export declare function getHiddenTags<T extends object>(event: T): string[][] | undefined;
 /** Checks if the hidden tags are locked */
-export declare function isHiddenTagsLocked(event: NostrEvent): boolean;
+export declare function isHiddenTagsLocked<T extends object>(event: T): boolean;
 /** Returns either nip04 or nip44 encryption method depending on list kind */
-export declare function getListEncryptionMethods(kind: number, signer: HiddenContentSigner): {
+export declare function getHiddenTagsEncryptionMethods(kind: number, signer: HiddenContentSigner): {
     encrypt: (pubkey: string, plaintext: string) => Promise<string> | string;
     decrypt: (pubkey: string, ciphertext: string) => Promise<string> | string;
 } | {
@@ -25,14 +26,4 @@ export declare function getListEncryptionMethods(kind: number, signer: HiddenCon
  * @param store An optional EventStore to notify about the update
  * @throws
  */
-export declare function unlockHiddenTags<T extends {
-    kind: number;
-    pubkey: string;
-    content: string;
-}>(event: T, signer: HiddenContentSigner, store?: EventStore): Promise<string[][]>;
-/**
- * Override the hidden tags in an event
- * @deprecated use EventFactory to create draft events
- * @throws
- */
-export declare function overrideHiddenTags(event: NostrEvent, hidden: string[][], signer: HiddenContentSigner): Promise<EventTemplate>;
+export declare function unlockHiddenTags<T extends HiddenContentEvent>(event: T, signer: HiddenContentSigner): Promise<string[][]>;

package/dist/helpers/hidden-tags.js

@@ -1,6 +1,5 @@
-import { unixNow } from "./time.js";
-import { isEvent } from "./event.js";
-import { canHaveHiddenContent, getHiddenContentEncryptionMethods, unlockHiddenContent, } from "./hidden-content.js";
+import { canHaveHiddenContent, getHiddenContent, getHiddenContentEncryptionMethods, isHiddenContentLocked, unlockHiddenContent, } from "./hidden-content.js";
+import { getOrComputeCachedValue } from "./cache.js";
 export const HiddenTagsSymbol = Symbol.for("hidden-tags");
 /** Checks if an event can have hidden tags */
 export function canHaveHiddenTags(kind) {
@@ -12,14 +11,23 @@ export function hasHiddenTags(event) {
 }
 /** Returns the hidden tags for an event if they are unlocked */
 export function getHiddenTags(event) {
-    return Reflect.get(event, HiddenTagsSymbol);
+    if (isHiddenTagsLocked(event))
+        return undefined;
+    return getOrComputeCachedValue(event, HiddenTagsSymbol, () => {
+        const plaintext = getHiddenContent(event);
+        const parsed = JSON.parse(plaintext);
+        if (!Array.isArray(parsed))
+            throw new Error("Content is not an array of tags");
+        // Convert array to tags array string[][]
+        return parsed.filter((t) => Array.isArray(t)).map((t) => t.map((v) => String(v)));
+    });
 }
 /** Checks if the hidden tags are locked */
 export function isHiddenTagsLocked(event) {
-    return hasHiddenTags(event) && getHiddenTags(event) === undefined;
+    return isHiddenContentLocked(event);
 }
 /** Returns either nip04 or nip44 encryption method depending on list kind */
-export function getListEncryptionMethods(kind, signer) {
+export function getHiddenTagsEncryptionMethods(kind, signer) {
     return getHiddenContentEncryptionMethods(kind, signer);
 }
 /**
@@ -29,34 +37,11 @@ export function getListEncryptionMethods(kind, signer) {
  * @param store An optional EventStore to notify about the update
  * @throws
  */
-export async function unlockHiddenTags(event, signer, store) {
+export async function unlockHiddenTags(event, signer) {
     if (!canHaveHiddenTags(event.kind))
         throw new Error("Event kind does not support hidden tags");
-    const plaintext = await unlockHiddenContent(event, signer);
-    const parsed = JSON.parse(plaintext);
-    if (!Array.isArray(parsed))
-        throw new Error("Content is not an array of tags");
-    // Convert array to tags array string[][]
-    const tags = parsed.filter((t) => Array.isArray(t)).map((t) => t.map((v) => String(v)));
-    Reflect.set(event, HiddenTagsSymbol, tags);
-    if (store && isEvent(event))
-        store.update(event);
-    return tags;
-}
-/**
- * Override the hidden tags in an event
- * @deprecated use EventFactory to create draft events
- * @throws
- */
-export async function overrideHiddenTags(event, hidden, signer) {
-    if (!canHaveHiddenTags(event.kind))
-        throw new Error("Event kind does not support hidden tags");
-    const encryption = getListEncryptionMethods(event.kind, signer);
-    const ciphertext = await encryption.encrypt(event.pubkey, JSON.stringify(hidden));
-    return {
-        kind: event.kind,
-        content: ciphertext,
-        created_at: unixNow(),
-        tags: event.tags,
-    };
+    // unlock hidden content is needed
+    if (isHiddenContentLocked(event))
+        await unlockHiddenContent(event, signer);
+    return getHiddenTags(event);
 }

package/dist/helpers/mutes.d.ts

@@ -7,6 +7,7 @@ export type Mutes = {
     hashtags: Set<string>;
     words: Set<string>;
 };
+/** Parses mute tags */
 export declare function parseMutedTags(tags: string[][]): Mutes;
 /** Returns muted things */
 export declare function getMutedThings(mute: NostrEvent): Mutes;

package/dist/helpers/mutes.js

@@ -3,6 +3,7 @@ import { getOrComputeCachedValue } from "./cache.js";
 import { getHiddenTags } from "./hidden-tags.js";
 export const MutePublicSymbol = Symbol.for("mute-public");
 export const MuteHiddenSymbol = Symbol.for("mute-hidden");
+/** Parses mute tags */
 export function parseMutedTags(tags) {
     const pubkeys = new Set(tags.filter(isPTag).map((t) => t[1]));
     const threads = new Set(tags.filter(isETag).map((t) => t[1]));
@@ -12,7 +13,7 @@ export function parseMutedTags(tags) {
 }
 /** Returns muted things */
 export function getMutedThings(mute) {
-    return getOrComputeCachedValue(mute, MutePublicSymbol, (e) => parseMutedTags(e.tags));
+    return getOrComputeCachedValue(mute, MutePublicSymbol, () => parseMutedTags(mute.tags));
 }
 /** Returns the hidden muted content if the event is unlocked */
 export function getHiddenMutedThings(mute) {

package/dist/observable/claim-latest.d.ts

@@ -1,4 +1,5 @@
 import { MonoTypeOperatorFunction } from "rxjs";
 import { NostrEvent } from "nostr-tools";
-import { Database } from "../event-store/database.js";
-export declare function claimLatest(database: Database): MonoTypeOperatorFunction<NostrEvent | undefined>;
+import { type Database } from "../event-store/database.js";
+/** An operator that claims the latest event with the database */
+export declare function claimLatest<T extends NostrEvent | undefined>(database: Database): MonoTypeOperatorFunction<T>;

package/dist/observable/claim-latest.js

@@ -1,4 +1,5 @@
 import { finalize, tap } from "rxjs";
+/** An operator that claims the latest event with the database */
 export function claimLatest(database) {
     return (source) => {
         let latest = undefined;
@@ -12,7 +13,7 @@ export function claimLatest(database) {
             // update state
             latest = event;
         }), finalize(() => {
-            // late claim
+            // remove latest claim
             if (latest)
                 database.removeClaim(latest, source);
         }));

package/dist/observable/with-immediate-value.d.ts

@@ -0,0 +1,3 @@
+import { OperatorFunction } from "rxjs";
+/** if a synchronous value is not emitted, default is emitted */
+export declare function withImmediateValueOrDefault<Value, Default extends unknown = unknown>(defaultValue: Default): OperatorFunction<Value, Value | Default>;

package/dist/observable/with-immediate-value.js

@@ -0,0 +1,19 @@
+import { Observable } from "rxjs";
+/** if a synchronous value is not emitted, default is emitted */
+export function withImmediateValueOrDefault(defaultValue) {
+    return (source) => new Observable((observer) => {
+        let seen = false;
+        const sub = source.subscribe({
+            next: (v) => {
+                seen = true;
+                observer.next(v);
+            },
+            error: (err) => observer.error(err),
+            complete: () => observer.complete(),
+        });
+        // if a value is not emitted sync, emit default
+        if (!seen)
+            observer.next(defaultValue);
+        return sub;
+    });
+}

package/dist/queries/mutes.js

@@ -5,7 +5,7 @@ import { isHiddenTagsLocked } from "../helpers/hidden-tags.js";
 export function UserMuteQuery(pubkey) {
     return {
         key: pubkey,
-        run: (store) => store.replaceable(kinds.Mutelist, pubkey).pipe(map((event) => event && getMutedThings(event))),
+        run: (event) => event.replaceable(kinds.Mutelist, pubkey).pipe(map((event) => event && getMutedThings(event))),
     };
 }
 export function UserHiddenMuteQuery(pubkey) {

package/dist/queries/simple.d.ts

@@ -7,7 +7,7 @@ export declare function MultipleEventsQuery(ids: string[]): Query<Record<string,
 /** Creates a Query returning the latest version of a replaceable event */
 export declare function ReplaceableQuery(kind: number, pubkey: string, d?: string): Query<NostrEvent | undefined>;
 /** Creates a Query that returns an array of sorted events matching the filters */
-export declare function TimelineQuery(filters: Filter | Filter[], keepOldVersions?: boolean): Query<NostrEvent[]>;
+export declare function TimelineQuery(filters: Filter | Filter[], includeOldVersion?: boolean): Query<NostrEvent[]>;
 /** Creates a Query that returns a directory of events by their UID */
 export declare function ReplaceableSetQuery(pointers: {
     kind: number;

package/dist/queries/simple.js

@@ -22,11 +22,11 @@ export function ReplaceableQuery(kind, pubkey, d) {
     };
 }
 /** Creates a Query that returns an array of sorted events matching the filters */
-export function TimelineQuery(filters, keepOldVersions) {
+export function TimelineQuery(filters, includeOldVersion) {
     filters = Array.isArray(filters) ? filters : [filters];
     return {
-        key: hash_sum(filters) + (keepOldVersions ? "-history" : ""),
-        run: (events) => events.timeline(filters, keepOldVersions),
+        key: hash_sum(filters) + (includeOldVersion ? "-history" : ""),
+        run: (events) => events.timeline(filters, includeOldVersion),
     };
 }
 /** Creates a Query that returns a directory of events by their UID */

package/dist/query-store/__tests__/query-store.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/query-store/__tests__/query-store.test.js

@@ -0,0 +1,63 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { subscribeSpyTo } from "@hirez_io/observer-spy";
+import { EventStore } from "../../event-store/event-store.js";
+import { QueryStore } from "../query-store.js";
+import { ProfileQuery } from "../../queries/profile.js";
+import { SingleEventQuery } from "../../queries/simple.js";
+let eventStore;
+let queryStore;
+const event = {
+    content: '{"name":"hzrd149","picture":"https://cdn.hzrd149.com/5ed3fe5df09a74e8c126831eac999364f9eb7624e2b86d521521b8021de20bdc.png","about":"JavaScript developer working on some nostr stuff\\n- noStrudel https://nostrudel.ninja/ \\n- Blossom https://github.com/hzrd149/blossom \\n- Applesauce https://hzrd149.github.io/applesauce/","website":"https://hzrd149.com","nip05":"_@hzrd149.com","lud16":"hzrd1499@minibits.cash","pubkey":"266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5","display_name":"hzrd149","displayName":"hzrd149","banner":""}',
+    created_at: 1738362529,
+    id: "e9df8d5898c4ccfbd21fcd59f3f48abb3ff0ab7259b19570e2f1756de1e9306b",
+    kind: 0,
+    pubkey: "266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5",
+    sig: "465a47b93626a587bf81dadc2b306b8f713a62db31d6ce1533198e9ae1e665a6eaf376a03250bf9ffbb02eb9059c8eafbd37ae1092d05d215757575bd8357586",
+    tags: [],
+};
+beforeEach(() => {
+    eventStore = new EventStore();
+    queryStore = new QueryStore(eventStore);
+});
+describe("createQuery", () => {
+    it("should emit synchronous value if it exists", () => {
+        let value = undefined;
+        eventStore.add(event);
+        queryStore.createQuery(ProfileQuery, event.pubkey).subscribe((v) => (value = v));
+        expect(value).not.toBe(undefined);
+    });
+    it("should not emit undefined if value exists", () => {
+        eventStore.add(event);
+        const spy = subscribeSpyTo(queryStore.createQuery(SingleEventQuery, event.id));
+        expect(spy.getValues()).toEqual([event]);
+    });
+    it("should emit synchronous undefined if value does not exists", () => {
+        let value = 0;
+        queryStore.createQuery(ProfileQuery, event.pubkey).subscribe((v) => {
+            value = v;
+        });
+        expect(value).not.toBe(0);
+        expect(value).toBe(undefined);
+    });
+    it("should share latest value", () => {
+        eventStore.add(event);
+        const spy = subscribeSpyTo(queryStore.createQuery(SingleEventQuery, event.id));
+        const spy2 = subscribeSpyTo(queryStore.createQuery(SingleEventQuery, event.id));
+        expect(spy.getValues()).toEqual([event]);
+        expect(spy2.getValues()).toEqual([event]);
+    });
+});
+describe("executeQuery", () => {
+    it("should resolve when value is already present", async () => {
+        eventStore.add(event);
+        expect(await queryStore.executeQuery(ProfileQuery, event.pubkey)).toEqual(expect.objectContaining({ name: "hzrd149" }));
+    });
+    it("should resolve when value is added to event store", async () => {
+        const p = queryStore.executeQuery(ProfileQuery, event.pubkey);
+        // delay adding the event
+        setTimeout(() => {
+            eventStore.add(event);
+        }, 10);
+        await expect(p).resolves.toEqual(expect.objectContaining({ name: "hzrd149" }));
+    });
+});

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

@@ -1,19 +1,19 @@
 import { Observable } from "rxjs";
 import { Filter, NostrEvent } from "nostr-tools";
 import type { AddressPointer, EventPointer } from "nostr-tools/nip19";
-import { EventStore } from "../event-store/event-store.js";
+import { IEventStore } from "../event-store/interface.js";
 import * as Queries from "../queries/index.js";
 export type Query<T extends unknown> = {
     /** A unique key for this query. this is used to detect duplicate queries */
     key: string;
     /** 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>;
+    run: (events: IEventStore, store: QueryStore) => Observable<T>;
 };
 export type QueryConstructor<T extends unknown, Args extends Array<any>> = (...args: Args) => Query<T>;
 export declare class QueryStore {
     static Queries: typeof Queries;
-    store: EventStore;
-    constructor(store: EventStore);
+    store: IEventStore;
+    constructor(store: IEventStore);
     /** A directory of all active queries */
     queries: Map<QueryConstructor<any, any[]>, Map<string, Observable<any>>>;
     /** How long a query should be kept "warm" while nothing is subscribed to it */

package/dist/query-store/query-store.js

@@ -1,7 +1,8 @@
-import { filter, finalize, ReplaySubject, share, startWith, timer } from "rxjs";
+import { filter, finalize, ReplaySubject, share, timer } from "rxjs";
 import hash_sum from "hash-sum";
 import * as Queries from "../queries/index.js";
 import { getObservableValue } from "../observable/get-observable-value.js";
+import { withImmediateValueOrDefault } from "../observable/with-immediate-value.js";
 export class QueryStore {
     static Queries = Queries;
     store;
@@ -32,11 +33,15 @@ export class QueryStore {
                 .run(this.store, this)
                 .pipe(
             // always emit undefined so the observable is sync
-            startWith(undefined), 
+            withImmediateValueOrDefault(undefined), 
             // remove the observable when its subscribed
             finalize(cleanup), 
             // only create a single observable for all components
-            share({ connector: () => new ReplaySubject(1), resetOnComplete: () => timer(this.queryKeepWarmTimeout) }));
+            share({
+                connector: () => new ReplaySubject(1),
+                resetOnComplete: () => timer(this.queryKeepWarmTimeout),
+                resetOnRefCountZero: () => timer(this.queryKeepWarmTimeout),
+            }));
             // set debug fields
             Reflect.set(observable, "queryArgs", args);
             observables.set(key, observable);

package/package.json

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