applesauce-core 0.0.0-next-20250407103800 → 0.0.0-next-20250414120207

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

@@ -31,7 +31,7 @@ describe("add", () => {
         expect(eventStore.getEvent(profile.id)).toBeDefined();
         expect([...getSeenRelays(eventStore.getEvent(profile.id))]).toEqual(expect.arrayContaining(["wss://relay.a.com", "wss://relay.b.com"]));
     });
-    it("should ignore deleted events", () => {
+    it("should ignore old deleted events but not newer ones", () => {
         const deleteEvent = {
             id: "delete event id",
             kind: kinds.EventDeletion,
@@ -45,7 +45,58 @@ describe("add", () => {
         eventStore.add(deleteEvent);
         // now event should be ignored
         eventStore.add(profile);
+        const newProfile = user.profile({ name: "new name" }, { created_at: profile.created_at + 1000 });
+        eventStore.add(newProfile);
         expect(eventStore.getEvent(profile.id)).toBeUndefined();
+        expect(eventStore.getEvent(newProfile.id)).toBeDefined();
+    });
+    it("should remove profile events when delete event is added", () => {
+        // Add initial replaceable event
+        eventStore.add(profile);
+        expect(eventStore.getEvent(profile.id)).toBeDefined();
+        const newProfile = user.profile({ name: "new name" }, { created_at: profile.created_at + 1000 });
+        eventStore.add(newProfile);
+        const deleteEvent = {
+            id: "delete event id",
+            kind: kinds.EventDeletion,
+            created_at: profile.created_at + 100,
+            pubkey: user.pubkey,
+            tags: [["a", `${profile.kind}:${profile.pubkey}`]],
+            sig: "this should be ignored for the test",
+            content: "test",
+        };
+        // Add delete event with coordinate
+        eventStore.add(deleteEvent);
+        // Profile should be removed since delete event is newer
+        expect(eventStore.getEvent(profile.id)).toBeUndefined();
+        expect(eventStore.getEvent(newProfile.id)).toBeDefined();
+        expect(eventStore.getReplaceable(profile.kind, profile.pubkey)).toBe(newProfile);
+    });
+    it("should remove addressable replaceable events when delete event is added", () => {
+        // Add initial replaceable event
+        const event = user.event({ content: "test", kind: 30000, tags: [["d", "test"]] });
+        eventStore.add(event);
+        expect(eventStore.getEvent(event.id)).toBeDefined();
+        const newEvent = user.event({
+            ...event,
+            created_at: event.created_at + 500,
+        });
+        eventStore.add(newEvent);
+        const deleteEvent = {
+            id: "delete event id",
+            kind: kinds.EventDeletion,
+            created_at: event.created_at + 100,
+            pubkey: user.pubkey,
+            tags: [["a", `${event.kind}:${event.pubkey}:test`]],
+            sig: "this should be ignored for the test",
+            content: "test",
+        };
+        // Add delete event with coordinate
+        eventStore.add(deleteEvent);
+        // Profile should be removed since delete event is newer
+        expect(eventStore.getEvent(event.id)).toBeUndefined();
+        expect(eventStore.getEvent(newEvent.id)).toBeDefined();
+        expect(eventStore.getReplaceable(event.kind, event.pubkey, "test")).toBe(newEvent);
     });
 });
 describe("inserts", () => {

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

@@ -9,6 +9,7 @@ import { addSeenRelay, getSeenRelays } from "../helpers/relays.js";
 import { getDeleteCoordinates, getDeleteIds } from "../helpers/delete.js";
 import { claimEvents } from "../observable/claim-events.js";
 import { claimLatest } from "../observable/claim-latest.js";
+import { parseCoordinate } from "../helpers/pointers.js";
 export const EventStoreSymbol = Symbol.for("event-store");
 function sortDesc(a, b) {
     return b.created_at - a.created_at;
@@ -74,10 +75,16 @@ export class EventStore {
         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
-            const event = this.database.getEvent(coord);
-            if (event && event.created_at < deleteEvent.created_at)
-                this.database.removeEvent(event);
+            // Parse the nostr address coordinate
+            const parsed = parseCoordinate(coord);
+            if (!parsed)
+                continue;
+            // Remove older versions of replaceable events
+            const events = this.database.getReplaceable(parsed.kind, parsed.pubkey, parsed.identifier) ?? [];
+            for (const event of events) {
+                if (event.created_at < deleteEvent.created_at)
+                    this.database.removeEvent(event);
+            }
         }
     }
     /** Copies important metadata from and identical event to another */

package/dist/helpers/__tests__/comment.test.js

@@ -27,6 +27,7 @@ describe("getCommentEventPointer", () => {
             ["e", "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f"],
         ];
         expect(getCommentEventPointer(tags, true)).toEqual({
+            type: "event",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 1621,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -45,6 +46,7 @@ describe("getCommentEventPointer", () => {
             ["P", "bad-pubkey"],
         ];
         expect(getCommentEventPointer(tags, true)).toEqual({
+            type: "event",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 1621,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -62,6 +64,7 @@ describe("getCommentEventPointer", () => {
             ["K", "1621"],
         ];
         expect(getCommentEventPointer(tags, true)).toEqual({
+            type: "event",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 1621,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -75,6 +78,7 @@ describe("getCommentEventPointer", () => {
             ["P", "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10"],
         ];
         expect(getCommentEventPointer(tags, true)).toEqual({
+            type: "event",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 1621,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -107,6 +111,7 @@ describe("getCommentAddressPointer", () => {
             ["E", "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f"],
             ["K", "30000"],
         ], true)).toEqual({
+            type: "address",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 30000,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -118,6 +123,7 @@ describe("getCommentAddressPointer", () => {
             ["e", "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f"],
             ["k", "30000"],
         ])).toEqual({
+            type: "address",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 30000,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -130,6 +136,7 @@ describe("getCommentAddressPointer", () => {
             ["A", "30000:e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10:list", "wss://relay.io/"],
             ["K", "30000"],
         ], true)).toEqual({
+            type: "address",
             kind: 30000,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
             identifier: "list",
@@ -140,6 +147,7 @@ describe("getCommentAddressPointer", () => {
             ["a", "30000:e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10:list", "wss://relay.io/"],
             ["k", "30000"],
         ])).toEqual({
+            type: "address",
             kind: 30000,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
             identifier: "list",
@@ -153,6 +161,7 @@ describe("getCommentAddressPointer", () => {
             ["E", "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f", "wss://relay.io/"],
             ["K", "30000"],
         ], true)).toEqual({
+            type: "address",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 30000,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -165,6 +174,7 @@ describe("getCommentAddressPointer", () => {
             ["e", "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f", "wss://relay.io/"],
             ["k", "30000"],
         ])).toEqual({
+            type: "address",
             id: "86c0b95589b016ffb703bfc080d49e54106e74e2d683295119c3453e494dbe6f",
             kind: 30000,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
@@ -178,6 +188,7 @@ describe("getCommentAddressPointer", () => {
             ["A", "30010:e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10:list"],
             ["K", "30000"],
         ], true)).toEqual({
+            type: "address",
             kind: 30010,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
             identifier: "list",
@@ -187,6 +198,7 @@ describe("getCommentAddressPointer", () => {
             ["a", "30010:e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10:list"],
             ["k", "30000"],
         ])).toEqual({
+            type: "address",
             kind: 30010,
             pubkey: "e4336cd525df79fa4d3af364fd9600d4b10dce4215aa4c33ed77ea0842344b10",
             identifier: "list",
@@ -214,6 +226,7 @@ describe("getCommentExternalPointer", () => {
             ["I", "podcast:item:guid:d98d189b-dc7b-45b1-8720-d4b98690f31f"],
             ["K", "podcast:item:guid"],
         ], true)).toEqual({
+            type: "external",
             identifier: "podcast:item:guid:d98d189b-dc7b-45b1-8720-d4b98690f31f",
             kind: "podcast:item:guid",
         });
@@ -222,6 +235,7 @@ describe("getCommentExternalPointer", () => {
             ["i", "podcast:item:guid:d98d189b-dc7b-45b1-8720-d4b98690f31f"],
             ["k", "podcast:item:guid"],
         ])).toEqual({
+            type: "external",
             identifier: "podcast:item:guid:d98d189b-dc7b-45b1-8720-d4b98690f31f",
             kind: "podcast:item:guid",
         });

package/dist/helpers/comment.d.ts

@@ -2,20 +2,24 @@ import { NostrEvent } from "nostr-tools";
 import { ExternalPointer, ExternalIdentifiers } from "./external-id.js";
 export declare const COMMENT_KIND = 1111;
 export type CommentEventPointer = {
+    type: "event";
     id: string;
     kind: number;
     pubkey?: string;
     relay?: string;
 };
 export type CommentAddressPointer = {
+    type: "address";
     id?: string;
     kind: number;
     pubkey: string;
     identifier: string;
     relay?: string;
 };
-export type CommentExternalPointer = ExternalPointer<keyof ExternalIdentifiers>;
-export type CommentPointer = CommentEventPointer | CommentAddressPointer | CommentExternalPointer;
+export type CommentExternalPointer<T extends keyof ExternalIdentifiers> = ExternalPointer<T> & {
+    type: "external";
+};
+export type CommentPointer = CommentEventPointer | CommentAddressPointer | CommentExternalPointer<keyof ExternalIdentifiers>;
 export declare const CommentRootPointerSymbol: unique symbol;
 export declare const CommentReplyPointerSymbol: unique symbol;
 /**
@@ -32,7 +36,7 @@ export declare function getCommentAddressPointer(tags: string[][], root?: boolea
  * Gets the ExternalPointer from an array of tags
  * @throws
  */
-export declare function getCommentExternalPointer(tags: string[][], root?: boolean): CommentExternalPointer | null;
+export declare function getCommentExternalPointer(tags: string[][], root?: boolean): CommentExternalPointer<keyof ExternalIdentifiers> | null;
 /**
  * Returns the root pointer for a comment
  * @throws

package/dist/helpers/comment.js

@@ -18,6 +18,7 @@ export function getCommentEventPointer(tags, root = false) {
         // only the root pubkey can be gotten from the tags, since due to quotes and mentions there will be many "p" tags for replies
         const rootPubkey = root ? tags.find((t) => t[0] === "P")?.[1] : undefined;
         const pointer = {
+            type: "event",
             id: eTag[1],
             kind: parseInt(kind),
             pubkey: eTag[3] || rootPubkey || undefined,
@@ -40,6 +41,7 @@ export function getCommentAddressPointer(tags, root = false) {
             throw new Error("Missing kind tag");
         const addressPointer = getAddressPointerFromATag(aTag);
         const pointer = {
+            type: "address",
             id: eTag?.[1],
             pubkey: addressPointer.pubkey,
             identifier: addressPointer.identifier,
@@ -60,7 +62,10 @@ export function getCommentExternalPointer(tags, root = false) {
     if (iTag) {
         if (!kind)
             throw new Error("Missing kind tag");
-        return getExternalPointerFromTag(iTag);
+        return {
+            type: "external",
+            ...getExternalPointerFromTag(iTag),
+        };
     }
     return null;
 }

package/dist/helpers/pointers.js

@@ -5,16 +5,16 @@ import { isParameterizedReplaceableKind } from "nostr-tools/kinds";
 import { isSafeRelayURL } from "./relays.js";
 export function parseCoordinate(a, requireD = false, silent = true) {
     const parts = a.split(":");
-    const kind = parts[0] && parseInt(parts[0]);
+    const kind = parts[0] ? parseInt(parts[0]) : undefined;
     const pubkey = parts[1];
     const d = parts[2];
-    if (!kind) {
+    if (kind === undefined) {
         if (silent)
             return null;
         else
             throw new Error("Missing kind");
     }
-    if (!pubkey) {
+    if (pubkey === undefined || pubkey === "") {
         if (silent)
             return null;
         else

package/package.json

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