applesauce-core 2.2.0 → 3.0.0

package/dist/models/common.js

@@ -1,40 +1,60 @@
-import { defer, distinctUntilChanged, EMPTY, endWith, filter, finalize, from, map, merge, mergeWith, of, repeat, scan, takeUntil, tap, } from "rxjs";
+import { combineLatest, defer, distinctUntilChanged, EMPTY, endWith, filter, finalize, from, map, merge, mergeWith, of, repeat, scan, takeUntil, tap, } from "rxjs";
+import { insertEventIntoDescendingList } from "nostr-tools/utils";
 import { createReplaceableAddress, getEventUID, getReplaceableIdentifier, isReplaceable, matchFilters, } from "../helpers/index.js";
 import { claimEvents } from "../observable/claim-events.js";
 import { claimLatest } from "../observable/claim-latest.js";
-import { insertEventIntoDescendingList } from "nostr-tools/utils";
 import { withImmediateValueOrDefault } from "../observable/with-immediate-value.js";
 /** A model that returns a single event or undefined when its removed */
-export function EventModel(id) {
+export function EventModel(pointer) {
+    if (typeof pointer === "string")
+        pointer = { id: pointer };
     return (events) => merge(
     // get current event and ignore if there is none
     defer(() => {
-        let event = events.getEvent(id);
-        return event ? of(event) : EMPTY;
+        let event = events.getEvent(pointer.id);
+        if (event)
+            return of(event);
+        // If there is a loader, use it to get the event
+        if (!events.eventLoader)
+            return EMPTY;
+        return from(events.eventLoader(pointer)).pipe(filter((e) => !!e));
     }), 
-    // subscribe to updates
-    events.insert$.pipe(filter((e) => e.id === id)), 
-    // subscribe to updates
-    events.updated(id), 
+    // Listen for new events
+    events.insert$.pipe(filter((e) => e.id === pointer.id)), 
     // emit undefined when deleted
-    events.removed(id).pipe(endWith(undefined))).pipe(
+    events.removed(pointer.id).pipe(endWith(undefined))).pipe(
     // claim all events
     claimLatest(events), 
+    // ignore duplicate events
+    distinctUntilChanged((a, b) => a?.id === b?.id), 
     // always emit undefined so the observable is synchronous
     withImmediateValueOrDefault(undefined));
 }
 /** A model that returns the latest version of a replaceable event or undefined if its removed */
-export function ReplaceableModel(kind, pubkey, d) {
+export function ReplaceableModel(pointer) {
     return (events) => {
         let current = undefined;
         return merge(
         // lazily get current event
         defer(() => {
-            let event = events.getReplaceable(kind, pubkey, d);
-            return event ? of(event) : EMPTY;
+            let event = events.getReplaceable(pointer.kind, pointer.pubkey, pointer.identifier);
+            if (event)
+                return of(event);
+            else if (pointer.identifier !== undefined) {
+                if (!events.addressableLoader)
+                    return EMPTY;
+                return from(events.addressableLoader(pointer)).pipe(filter((e) => !!e));
+            }
+            else {
+                if (!events.replaceableLoader)
+                    return EMPTY;
+                return from(events.replaceableLoader(pointer)).pipe(filter((e) => !!e));
+            }
         }), 
         // subscribe to new events
-        events.insert$.pipe(filter((e) => e.pubkey == pubkey && e.kind === kind && (d !== undefined ? getReplaceableIdentifier(e) === d : true)))).pipe(
+        events.insert$.pipe(filter((e) => e.pubkey == pointer.pubkey &&
+            e.kind === pointer.kind &&
+            (pointer.identifier !== undefined ? getReplaceableIdentifier(e) === pointer.identifier : true)))).pipe(
         // only update if event is newer
         distinctUntilChanged((prev, event) => {
             // are the events the same? i.e. is the prev event older
@@ -108,69 +128,20 @@ export function TimelineModel(filters, includeOldVersion) {
         finalize(() => seen.clear()));
     };
 }
-/** A model that returns a multiple events in a map */
+/**
+ * A model that returns a multiple events in a map
+ * @deprecated use multiple {@link EventModel} instead
+ */
 export function EventsModel(ids) {
-    return (events) => merge(
-    // lazily get existing events
-    defer(() => from(ids.map((id) => events.getEvent(id)))), 
-    // subscribe to new events
-    events.insert$.pipe(filter((e) => ids.includes(e.id))), 
-    // subscribe to updates
-    events.update$.pipe(filter((e) => ids.includes(e.id)))).pipe(
-    // ignore empty messages
-    filter((e) => !!e), 
-    // claim all events until cleanup
-    claimEvents(events), 
-    // watch for removed events
-    mergeWith(events.remove$.pipe(filter((e) => ids.includes(e.id)), map((e) => e.id))), 
-    // merge all events into a directory
-    scan((dir, event) => {
-        if (typeof event === "string") {
-            // delete event by id
-            const clone = { ...dir };
-            delete clone[event];
-            return clone;
-        }
-        else {
-            // add even to directory
-            return { ...dir, [event.id]: event };
-        }
-    }, {}));
+    return (events) => combineLatest(Object.fromEntries(ids.map((id) => [id, events.model(EventModel, { id })])));
 }
-/** A model that returns a directory of events by their UID */
+/**
+ * A model that returns a directory of events by their UID
+ * @deprecated use multiple {@link ReplaceableModel} instead
+ */
 export function ReplaceableSetModel(pointers) {
-    return (events) => {
-        const uids = new Set(pointers.map((p) => createReplaceableAddress(p.kind, p.pubkey, p.identifier)));
-        return merge(
-        // start with existing events
-        defer(() => from(pointers.map((p) => events.getReplaceable(p.kind, p.pubkey, p.identifier)))), 
-        // subscribe to new events
-        events.insert$.pipe(filter((e) => isReplaceable(e.kind) && uids.has(getEventUID(e))))).pipe(
-        // filter out undefined
-        filter((e) => !!e), 
-        // claim all events
-        claimEvents(events), 
-        // convert events to add commands
-        map((e) => ["add", e]), 
-        // watch for removed events
-        mergeWith(events.remove$.pipe(filter((e) => isReplaceable(e.kind) && uids.has(getEventUID(e))), map((e) => ["remove", e]))), 
-        // reduce events into directory
-        scan((dir, [action, event]) => {
-            const uid = getEventUID(event);
-            if (action === "add") {
-                // add event to dir if its newer
-                if (!dir[uid] || dir[uid].created_at < event.created_at)
-                    return { ...dir, [uid]: event };
-            }
-            else if (action === "remove" && dir[uid] === event) {
-                // remove event from dir
-                let newDir = { ...dir };
-                delete newDir[uid];
-                return newDir;
-            }
-            return dir;
-        }, {}), 
-        // ignore changes that do not modify the directory
-        distinctUntilChanged());
-    };
+    return (events) => combineLatest(Object.fromEntries(pointers.map((pointer) => [
+        createReplaceableAddress(pointer.kind, pointer.pubkey, pointer.identifier),
+        events.model(ReplaceableModel, pointer),
+    ])));
 }

package/dist/models/contacts.d.ts

@@ -1,7 +1,7 @@
 import { ProfilePointer } from "nostr-tools/nip19";
 import { Model } from "../event-store/interface.js";
 /** A model that returns all contacts for a user */
-export declare function ContactsModel(pubkey: string): Model<ProfilePointer[]>;
+export declare function ContactsModel(user: string | ProfilePointer): Model<ProfilePointer[]>;
 /** A model that returns all public contacts for a user */
 export declare function PublicContactsModel(pubkey: string): Model<ProfilePointer[] | undefined>;
 /** A model that returns all hidden contacts for a user */

package/dist/models/contacts.js

@@ -3,8 +3,10 @@ import { map } from "rxjs/operators";
 import { getContacts, getHiddenContacts, getPublicContacts } from "../helpers/contacts.js";
 import { watchEventUpdates } from "../observable/index.js";
 /** A model that returns all contacts for a user */
-export function ContactsModel(pubkey) {
-    return (events) => events.replaceable(kinds.Contacts, pubkey).pipe(
+export function ContactsModel(user) {
+    if (typeof user === "string")
+        user = { pubkey: user };
+    return (events) => events.replaceable({ kind: kinds.Contacts, pubkey: user.pubkey, relays: user.relays }).pipe(
     // listen for event updates (hidden tags unlocked)
     watchEventUpdates(events), 
     // Get all contacts

package/dist/models/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./blossom.js";
 export * from "./bookmarks.js";
+export * from "./calendar.js";
 export * from "./channels.js";
 export * from "./comments.js";
 export * from "./common.js";

package/dist/models/index.js

@@ -1,5 +1,6 @@
 export * from "./blossom.js";
 export * from "./bookmarks.js";
+export * from "./calendar.js";
 export * from "./channels.js";
 export * from "./comments.js";
 export * from "./common.js";

package/dist/models/mailboxes.d.ts

@@ -1,6 +1,7 @@
+import { ProfilePointer } from "nostr-tools/nip19";
 import { Model } from "../event-store/interface.js";
 /** A model that gets and parses the inbox and outbox relays for a pubkey */
-export declare function MailboxesModel(pubkey: string): Model<{
+export declare function MailboxesModel(user: string | ProfilePointer): Model<{
     inboxes: string[];
     outboxes: string[];
 } | undefined>;

package/dist/models/mailboxes.js

@@ -2,8 +2,10 @@ import { kinds } from "nostr-tools";
 import { map } from "rxjs/operators";
 import { getInboxes, getOutboxes } from "../helpers/mailboxes.js";
 /** A model that gets and parses the inbox and outbox relays for a pubkey */
-export function MailboxesModel(pubkey) {
-    return (events) => events.replaceable(kinds.RelayList, pubkey).pipe(map((event) => event && {
+export function MailboxesModel(user) {
+    if (typeof user === "string")
+        user = { pubkey: user };
+    return (events) => events.replaceable({ kind: kinds.RelayList, pubkey: user.pubkey, relays: user.relays }).pipe(map((event) => event && {
         inboxes: getInboxes(event),
         outboxes: getOutboxes(event),
     }));

package/dist/models/mutes.d.ts

@@ -1,7 +1,8 @@
-import { Mutes } from "../helpers/mutes.js";
+import { ProfilePointer } from "nostr-tools/nip19";
 import { Model } from "../event-store/interface.js";
+import { Mutes } from "../helpers/mutes.js";
 /** A model that returns all a users muted things */
-export declare function MuteModel(pubkey: string): Model<Mutes | undefined>;
+export declare function MuteModel(user: string | ProfilePointer): Model<Mutes | undefined>;
 /** A model that returns all a users public muted things */
 export declare function PublicMuteModel(pubkey: string): Model<Mutes | undefined>;
 /** A model that returns all a users hidden muted things */

package/dist/models/mutes.js

@@ -3,8 +3,10 @@ import { map } from "rxjs/operators";
 import { getHiddenMutedThings, getMutedThings, getPublicMutedThings } from "../helpers/mutes.js";
 import { watchEventUpdates } from "../observable/watch-event-updates.js";
 /** A model that returns all a users muted things */
-export function MuteModel(pubkey) {
-    return (events) => events.replaceable(kinds.Mutelist, pubkey).pipe(
+export function MuteModel(user) {
+    if (typeof user === "string")
+        user = { pubkey: user };
+    return (events) => events.replaceable({ kind: kinds.Mutelist, pubkey: user.pubkey, relays: user.relays }).pipe(
     // listen for event updates (hidden tags unlocked)
     watchEventUpdates(events), 
     // Get all muted things

package/dist/models/profile.d.ts

@@ -1,4 +1,5 @@
 import { Model } from "../event-store/interface.js";
 import { ProfileContent } from "../helpers/profile.js";
+import { ProfilePointer } from "nostr-tools/nip19";
 /** A model that gets and parses the kind 0 metadata for a pubkey */
-export declare function ProfileModel(pubkey: string): Model<ProfileContent | undefined>;
+export declare function ProfileModel(user: string | ProfilePointer): Model<ProfileContent | undefined>;

package/dist/models/profile.js

@@ -3,8 +3,10 @@ import { filter, map } from "rxjs/operators";
 import { getProfileContent, isValidProfile } from "../helpers/profile.js";
 import { withImmediateValueOrDefault } from "../observable/with-immediate-value.js";
 /** A model that gets and parses the kind 0 metadata for a pubkey */
-export function ProfileModel(pubkey) {
-    return (events) => events.replaceable(kinds.Metadata, pubkey).pipe(
+export function ProfileModel(user) {
+    if (typeof user === "string")
+        user = { pubkey: user };
+    return (events) => events.replaceable({ kind: kinds.Metadata, pubkey: user.pubkey, relays: user.relays }).pipe(
     // Filter out invalid profile events
     filter(isValidProfile), 
     // Parse the profile event into a ProfileContent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "2.2.0",
+  "version": "3.0.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",

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

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

package/dist/event-store/common.js

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