@welshman/util 0.0.4 → 0.0.6

package/build/Address.cjs

@@ -1,44 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isContextAddress = exports.isCommunityAddress = exports.isGroupAddress = exports.addressFromEvent = exports.getIdentifier = exports.addressToNaddr = exports.addressFromNaddr = exports.encodeAddress = exports.decodeAddress = void 0;
+exports.isContextAddress = exports.isCommunityAddress = exports.isGroupAddress = exports.getAddress = exports.Address = void 0;
 const nostr_tools_1 = require("nostr-tools");
 const Kinds_1 = require("./Kinds.cjs");
-// Plain text format
-const decodeAddress = (a, relays = []) => {
-    const [kind, pubkey, identifier = ""] = a.split(":");
-    return { kind: parseInt(kind), pubkey, identifier, relays };
-};
-exports.decodeAddress = decodeAddress;
-const encodeAddress = (a) => [a.kind, a.pubkey, a.identifier].join(":");
-exports.encodeAddress = encodeAddress;
-// Naddr encoding
-const addressFromNaddr = (naddr) => {
-    let type;
-    let data = {};
-    try {
-        ({ type, data } = nostr_tools_1.nip19.decode(naddr));
+class Address {
+    constructor(kind, pubkey, identifier, relays = []) {
+        this.kind = kind;
+        this.pubkey = pubkey;
+        this.identifier = identifier;
+        this.relays = relays;
+        this.toString = () => [this.kind, this.pubkey, this.identifier].join(":");
+        this.toNaddr = () => nostr_tools_1.nip19.naddrEncode(this);
     }
-    catch (e) {
-        // pass
+    static isAddress(address) {
+        return Boolean(address.match(/^\d+:\w+:.*$/));
     }
-    if (type !== "naddr") {
-        throw new Error(`Invalid naddr ${naddr}`);
+    static from(address, relays = []) {
+        const [kind, pubkey, identifier = ""] = address.match(/^(\d+):(\w+):(.*)$/).slice(1);
+        return new Address(parseInt(kind), pubkey, identifier, relays);
     }
-    return data;
-};
-exports.addressFromNaddr = addressFromNaddr;
-const addressToNaddr = (a) => nostr_tools_1.nip19.naddrEncode(a);
-exports.addressToNaddr = addressToNaddr;
-// Get from event, encode to filter
-const getIdentifier = (e) => { var _a; return ((_a = e.tags.find(t => t[0] === "d")) === null || _a === void 0 ? void 0 : _a[1]) || ""; };
-exports.getIdentifier = getIdentifier;
-const addressFromEvent = (e, relays = []) => ({ kind: e.kind, pubkey: e.pubkey, identifier: (0, exports.getIdentifier)(e), relays });
-exports.addressFromEvent = addressFromEvent;
+    static fromNaddr(naddr) {
+        let type;
+        let data = {};
+        try {
+            ({ type, data } = nostr_tools_1.nip19.decode(naddr));
+        }
+        catch (e) {
+            // pass
+        }
+        if (type !== "naddr") {
+            throw new Error(`Invalid naddr ${naddr}`);
+        }
+        return new Address(data.kind, data.pubkey, data.identifier, data.relays);
+    }
+    static fromEvent(event, relays = []) {
+        var _a;
+        const identifier = ((_a = event.tags.find(t => t[0] === "d")) === null || _a === void 0 ? void 0 : _a[1]) || "";
+        return new Address(event.kind, event.pubkey, identifier, relays);
+    }
+}
+exports.Address = Address;
 // Utils
-const isGroupAddress = (a) => a.kind === Kinds_1.Kind.GroupDefinition;
+const getAddress = (e) => Address.fromEvent(e).toString();
+exports.getAddress = getAddress;
+const isGroupAddress = (a, ...args) => Address.from(a).kind === Kinds_1.GROUP;
 exports.isGroupAddress = isGroupAddress;
-const isCommunityAddress = (a) => a.kind === Kinds_1.Kind.CommunityDefinition;
+const isCommunityAddress = (a, ...args) => Address.from(a).kind === Kinds_1.COMMUNITY;
 exports.isCommunityAddress = isCommunityAddress;
-const isContextAddress = (a) => [Kinds_1.Kind.GroupDefinition, Kinds_1.Kind.CommunityDefinition].includes(a.kind);
+const isContextAddress = (a, ...args) => [Kinds_1.GROUP, Kinds_1.COMMUNITY].includes(Address.from(a).kind);
 exports.isContextAddress = isContextAddress;
 //# sourceMappingURL=Address.cjs.map

package/build/Address.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Address.cjs","sourceRoot":"","sources":["../Address.ts"],"names":[],"mappings":";;;AACA,6CAAiC;AACjC,uCAA4B;AAS5B,oBAAoB;AAEb,MAAM,aAAa,GAAG,CAAC,CAAS,EAAE,SAAmB,EAAE,EAAW,EAAE;IACzE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEpD,OAAO,EAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAC,CAAA;AAC3D,CAAC,CAAA;AAJY,QAAA,aAAa,iBAIzB;AAEM,MAAM,aAAa,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAA1E,QAAA,aAAa,iBAA6D;AAEvF,iBAAiB;AAEV,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAW,EAAE;IACzD,IAAI,IAAI,CAAA;IACR,IAAI,IAAI,GAAG,EAAS,CAAA;IACpB,IAAI;QACF,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,GAAG,mBAAK,CAAC,MAAM,CAAC,KAAK,CAGjC,CAAC,CAAA;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;KACR;IAED,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAA;KAC1C;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAjBY,QAAA,gBAAgB,oBAiB5B;AAEM,MAAM,cAAc,GAAG,CAAC,CAAU,EAAU,EAAE,CAAC,mBAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;AAA7D,QAAA,cAAc,kBAA+C;AAE1E,mCAAmC;AAE5B,MAAM,aAAa,GAAG,CAAC,CAAgB,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,0CAAG,CAAC,CAAC,KAAI,EAAE,CAAA,EAAA,CAAA;AAA/E,QAAA,aAAa,iBAAkE;AAErF,MAAM,gBAAgB,GAAG,CAAC,CAAgB,EAAE,SAAmB,EAAE,EAAE,EAAE,CAC1E,CAAC,EAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,IAAA,qBAAa,EAAC,CAAC,CAAC,EAAE,MAAM,EAAC,CAAC,CAAA;AAD7D,QAAA,gBAAgB,oBAC6C;AAE1E,QAAQ;AAED,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAI,CAAC,eAAe,CAAA;AAAhE,QAAA,cAAc,kBAAkD;AAEtE,MAAM,kBAAkB,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAI,CAAC,mBAAmB,CAAA;AAAxE,QAAA,kBAAkB,sBAAsD;AAE9E,MAAM,gBAAgB,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,YAAI,CAAC,eAAe,EAAE,YAAI,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAApG,QAAA,gBAAgB,oBAAoF"}
+{"version":3,"file":"Address.cjs","sourceRoot":"","sources":["../Address.ts"],"names":[],"mappings":"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"}

package/build/Address.d.ts

@@ -1,21 +1,23 @@
-import type { UnsignedEvent } from 'nostr-tools';
-export type Address = {
+type AddressableEvent = {
     kind: number;
     pubkey: string;
-    identifier: string;
-    relays: string[];
+    tags: string[][];
 };
-export declare const decodeAddress: (a: string, relays?: string[]) => Address;
-export declare const encodeAddress: (a: Address) => string;
-export declare const addressFromNaddr: (naddr: string) => Address;
-export declare const addressToNaddr: (a: Address) => string;
-export declare const getIdentifier: (e: UnsignedEvent) => string;
-export declare const addressFromEvent: (e: UnsignedEvent, relays?: string[]) => {
-    kind: number;
-    pubkey: string;
-    identifier: string;
-    relays: string[];
-};
-export declare const isGroupAddress: (a: Address) => boolean;
-export declare const isCommunityAddress: (a: Address) => boolean;
-export declare const isContextAddress: (a: Address) => boolean;
+export declare class Address {
+    readonly kind: number;
+    readonly pubkey: string;
+    readonly identifier: string;
+    readonly relays: string[];
+    constructor(kind: number, pubkey: string, identifier: string, relays?: string[]);
+    static isAddress(address: string): boolean;
+    static from(address: string, relays?: string[]): Address;
+    static fromNaddr(naddr: string): Address;
+    static fromEvent(event: AddressableEvent, relays?: string[]): Address;
+    toString: () => string;
+    toNaddr: () => `naddr1${string}`;
+}
+export declare const getAddress: (e: AddressableEvent) => string;
+export declare const isGroupAddress: (a: string, ...args: unknown[]) => boolean;
+export declare const isCommunityAddress: (a: string, ...args: unknown[]) => boolean;
+export declare const isContextAddress: (a: string, ...args: unknown[]) => boolean;
+export {};

package/build/Address.mjs

@@ -1,32 +1,44 @@
 import { nip19 } from 'nostr-tools';
-import { Kind } from "./Kinds.mjs";
-// Plain text format
-export const decodeAddress = (a, relays = []) => {
-    const [kind, pubkey, identifier = ""] = a.split(":");
-    return { kind: parseInt(kind), pubkey, identifier, relays };
-};
-export const encodeAddress = (a) => [a.kind, a.pubkey, a.identifier].join(":");
-// Naddr encoding
-export const addressFromNaddr = (naddr) => {
-    let type;
-    let data = {};
-    try {
-        ({ type, data } = nip19.decode(naddr));
+import { GROUP, COMMUNITY } from "./Kinds.mjs";
+export class Address {
+    constructor(kind, pubkey, identifier, relays = []) {
+        this.kind = kind;
+        this.pubkey = pubkey;
+        this.identifier = identifier;
+        this.relays = relays;
+        this.toString = () => [this.kind, this.pubkey, this.identifier].join(":");
+        this.toNaddr = () => nip19.naddrEncode(this);
     }
-    catch (e) {
-        // pass
+    static isAddress(address) {
+        return Boolean(address.match(/^\d+:\w+:.*$/));
     }
-    if (type !== "naddr") {
-        throw new Error(`Invalid naddr ${naddr}`);
+    static from(address, relays = []) {
+        const [kind, pubkey, identifier = ""] = address.match(/^(\d+):(\w+):(.*)$/).slice(1);
+        return new Address(parseInt(kind), pubkey, identifier, relays);
     }
-    return data;
-};
-export const addressToNaddr = (a) => nip19.naddrEncode(a);
-// Get from event, encode to filter
-export const getIdentifier = (e) => { var _a; return ((_a = e.tags.find(t => t[0] === "d")) === null || _a === void 0 ? void 0 : _a[1]) || ""; };
-export const addressFromEvent = (e, relays = []) => ({ kind: e.kind, pubkey: e.pubkey, identifier: getIdentifier(e), relays });
+    static fromNaddr(naddr) {
+        let type;
+        let data = {};
+        try {
+            ({ type, data } = nip19.decode(naddr));
+        }
+        catch (e) {
+            // pass
+        }
+        if (type !== "naddr") {
+            throw new Error(`Invalid naddr ${naddr}`);
+        }
+        return new Address(data.kind, data.pubkey, data.identifier, data.relays);
+    }
+    static fromEvent(event, relays = []) {
+        var _a;
+        const identifier = ((_a = event.tags.find(t => t[0] === "d")) === null || _a === void 0 ? void 0 : _a[1]) || "";
+        return new Address(event.kind, event.pubkey, identifier, relays);
+    }
+}
 // Utils
-export const isGroupAddress = (a) => a.kind === Kind.GroupDefinition;
-export const isCommunityAddress = (a) => a.kind === Kind.CommunityDefinition;
-export const isContextAddress = (a) => [Kind.GroupDefinition, Kind.CommunityDefinition].includes(a.kind);
+export const getAddress = (e) => Address.fromEvent(e).toString();
+export const isGroupAddress = (a, ...args) => Address.from(a).kind === GROUP;
+export const isCommunityAddress = (a, ...args) => Address.from(a).kind === COMMUNITY;
+export const isContextAddress = (a, ...args) => [GROUP, COMMUNITY].includes(Address.from(a).kind);
 //# sourceMappingURL=Address.mjs.map

package/build/Address.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Address.mjs","sourceRoot":"","sources":["../Address.ts"],"names":[],"mappings":"OACO,EAAC,KAAK,EAAC,MAAM,aAAa;OAC1B,EAAC,IAAI,EAAC;AASb,oBAAoB;AAEpB,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAS,EAAE,SAAmB,EAAE,EAAW,EAAE;IACzE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEpD,OAAO,EAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAC,CAAA;AAC3D,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAEvF,iBAAiB;AAEjB,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAW,EAAE;IACzD,IAAI,IAAI,CAAA;IACR,IAAI,IAAI,GAAG,EAAS,CAAA;IACpB,IAAI;QACF,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAGjC,CAAC,CAAA;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;KACR;IAED,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,EAAE,CAAC,CAAA;KAC1C;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAU,EAAU,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;AAE1E,mCAAmC;AAEnC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAgB,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,0CAAG,CAAC,CAAC,KAAI,EAAE,CAAA,EAAA,CAAA;AAE5F,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAgB,EAAE,SAAmB,EAAE,EAAE,EAAE,CAC1E,CAAC,EAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,MAAM,EAAC,CAAC,CAAA;AAE1E,QAAQ;AAER,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,eAAe,CAAA;AAE7E,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,mBAAmB,CAAA;AAErF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA"}
+{"version":3,"file":"Address.mjs","sourceRoot":"","sources":["../Address.ts"],"names":[],"mappings":"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"}

package/build/Events.cjs

@@ -1,26 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isChildOf = exports.isParameterizedReplaceable = exports.isPlainReplaceable = exports.isReplaceable = exports.isEphemeral = exports.getIdAndAddress = exports.getIdOrAddress = exports.getAddress = exports.hasValidSignature = exports.asEvent = exports.asRumor = exports.asUnsignedEvent = exports.asEventTemplate = exports.createEvent = void 0;
+exports.isChildOf = exports.isParameterizedReplaceable = exports.isPlainReplaceable = exports.isReplaceable = exports.isEphemeral = exports.getIdAndAddress = exports.getIdOrAddress = exports.hasValidSignature = exports.asTrustedEvent = exports.asUnwrappedEvent = exports.asSignedEvent = exports.asHashedEvent = exports.asOwnedEvent = exports.asEventTemplate = exports.isTrustedEvent = exports.isUnwrappedEvent = exports.isSignedEvent = exports.isHashedEvent = exports.isOwnedEvent = exports.isEventTemplate = exports.createEvent = void 0;
 const nostr_tools_1 = require("nostr-tools");
+const nostr_tools_2 = require("nostr-tools");
 const lib_1 = require("@welshman/lib");
 const Tags_1 = require("./Tags.cjs");
 const Address_1 = require("./Address.cjs");
 const Kinds_1 = require("./Kinds.cjs");
 const createEvent = (kind, { content = "", tags = [], created_at = (0, lib_1.now)() }) => ({ kind, content, tags, created_at });
 exports.createEvent = createEvent;
-const asEventTemplate = ({ kind, tags, content, created_at }) => ({ kind, tags, content, created_at });
+const isEventTemplate = (e) => Boolean(typeof e.kind === "number" && e.tags && typeof e.content === "string" && e.created_at);
+exports.isEventTemplate = isEventTemplate;
+const isOwnedEvent = (e) => Boolean((0, exports.isEventTemplate)(e) && e.pubkey);
+exports.isOwnedEvent = isOwnedEvent;
+const isHashedEvent = (e) => Boolean((0, exports.isOwnedEvent)(e) && e.id);
+exports.isHashedEvent = isHashedEvent;
+const isSignedEvent = (e) => Boolean((0, exports.isHashedEvent)(e) && e.sig);
+exports.isSignedEvent = isSignedEvent;
+const isUnwrappedEvent = (e) => Boolean((0, exports.isHashedEvent)(e) && e.wrap);
+exports.isUnwrappedEvent = isUnwrappedEvent;
+const isTrustedEvent = (e) => (0, exports.isSignedEvent)(e) || (0, exports.isUnwrappedEvent)(e);
+exports.isTrustedEvent = isTrustedEvent;
+const asEventTemplate = (e) => (0, lib_1.pick)(['kind', 'tags', 'content', 'created_at'], e);
 exports.asEventTemplate = asEventTemplate;
-const asUnsignedEvent = ({ kind, tags, content, created_at, pubkey }) => ({ kind, tags, content, created_at, pubkey });
-exports.asUnsignedEvent = asUnsignedEvent;
-const asRumor = ({ kind, tags, content, created_at, pubkey, id }) => ({ kind, tags, content, created_at, pubkey, id });
-exports.asRumor = asRumor;
-const asEvent = ({ kind, tags, content, created_at, pubkey, id, sig }) => ({ kind, tags, content, created_at, pubkey, id, sig });
-exports.asEvent = asEvent;
+const asOwnedEvent = (e) => (0, lib_1.pick)(['kind', 'tags', 'content', 'created_at', 'pubkey'], e);
+exports.asOwnedEvent = asOwnedEvent;
+const asHashedEvent = (e) => (0, lib_1.pick)(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id'], e);
+exports.asHashedEvent = asHashedEvent;
+const asSignedEvent = (e) => (0, lib_1.pick)(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id', 'sig'], e);
+exports.asSignedEvent = asSignedEvent;
+const asUnwrappedEvent = (e) => (0, lib_1.pick)(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id', 'wrap'], e);
+exports.asUnwrappedEvent = asUnwrappedEvent;
+const asTrustedEvent = (e) => (0, lib_1.pick)(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id', 'sig', 'wrap'], e);
+exports.asTrustedEvent = asTrustedEvent;
 exports.hasValidSignature = (0, lib_1.cached)({
     maxSize: 10000,
     getKey: ([e]) => {
         try {
-            return [(0, nostr_tools_1.getEventHash)(e), e.sig].join(":");
+            return [(0, nostr_tools_2.getEventHash)(e), e.sig].join(":");
         }
         catch (err) {
             return 'invalid';
@@ -28,18 +45,16 @@ exports.hasValidSignature = (0, lib_1.cached)({
     },
     getValue: ([e]) => {
         try {
-            return (0, nostr_tools_1.verifyEvent)(e);
+            return (0, nostr_tools_2.verifyEvent)(e);
         }
         catch (err) {
             return false;
         }
     },
 });
-const getAddress = (e) => (0, Address_1.encodeAddress)((0, Address_1.addressFromEvent)(e));
-exports.getAddress = getAddress;
-const getIdOrAddress = (e) => (0, exports.isReplaceable)(e) ? (0, exports.getAddress)(e) : e.id;
+const getIdOrAddress = (e) => (0, exports.isReplaceable)(e) ? (0, Address_1.getAddress)(e) : e.id;
 exports.getIdOrAddress = getIdOrAddress;
-const getIdAndAddress = (e) => (0, exports.isReplaceable)(e) ? [e.id, (0, exports.getAddress)(e)] : [e.id];
+const getIdAndAddress = (e) => (0, exports.isReplaceable)(e) ? [e.id, (0, Address_1.getAddress)(e)] : [e.id];
 exports.getIdAndAddress = getIdAndAddress;
 const isEphemeral = (e) => (0, Kinds_1.isEphemeralKind)(e.kind);
 exports.isEphemeral = isEphemeral;

package/build/Events.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Events.cjs","sourceRoot":"","sources":["../Events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Events.cjs","sourceRoot":"","sources":["../Events.ts"],"names":[],"mappings":"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"}

package/build/Events.d.ts

@@ -1,7 +1,27 @@
-import type { Event, EventTemplate, UnsignedEvent } from 'nostr-tools';
-export type { Event, EventTemplate, UnsignedEvent } from 'nostr-tools';
-export type Rumor = Pick<Event, 'kind' | 'tags' | 'content' | 'created_at' | 'pubkey' | 'id'> & {
-    wrap?: Event;
+import { verifiedSymbol } from 'nostr-tools';
+export type EventTemplate = {
+    kind: number;
+    tags: string[][];
+    content: string;
+    created_at: number;
+};
+export type OwnedEvent = EventTemplate & {
+    pubkey: string;
+};
+export type HashedEvent = OwnedEvent & {
+    id: string;
+};
+export type SignedEvent = HashedEvent & {
+    sig: string;
+    [verifiedSymbol]?: boolean;
+};
+export type UnwrappedEvent = HashedEvent & {
+    wrap: SignedEvent;
+};
+export type TrustedEvent = HashedEvent & {
+    sig?: string;
+    wrap?: SignedEvent;
+    [verifiedSymbol]?: boolean;
 };
 export type CreateEventOpts = {
     content?: string;
@@ -14,21 +34,28 @@ export declare const createEvent: (kind: number, { content, tags, created_at }:
     tags: string[][];
     created_at: number;
 };
-export declare const asEventTemplate: ({ kind, tags, content, created_at }: EventTemplate) => EventTemplate;
-export declare const asUnsignedEvent: ({ kind, tags, content, created_at, pubkey }: UnsignedEvent) => UnsignedEvent;
-export declare const asRumor: ({ kind, tags, content, created_at, pubkey, id }: Rumor) => Rumor;
-export declare const asEvent: ({ kind, tags, content, created_at, pubkey, id, sig }: Event) => Event;
+export declare const isEventTemplate: (e: EventTemplate) => e is EventTemplate;
+export declare const isOwnedEvent: (e: OwnedEvent) => e is OwnedEvent;
+export declare const isHashedEvent: (e: HashedEvent) => e is HashedEvent;
+export declare const isSignedEvent: (e: TrustedEvent) => e is SignedEvent;
+export declare const isUnwrappedEvent: (e: TrustedEvent) => e is UnwrappedEvent;
+export declare const isTrustedEvent: (e: TrustedEvent) => e is TrustedEvent;
+export declare const asEventTemplate: (e: EventTemplate) => EventTemplate;
+export declare const asOwnedEvent: (e: OwnedEvent) => OwnedEvent;
+export declare const asHashedEvent: (e: HashedEvent) => HashedEvent;
+export declare const asSignedEvent: (e: SignedEvent) => SignedEvent;
+export declare const asUnwrappedEvent: (e: UnwrappedEvent) => UnwrappedEvent;
+export declare const asTrustedEvent: (e: TrustedEvent) => TrustedEvent;
 export declare const hasValidSignature: {
-    (args_0: Event): boolean;
+    (args_0: SignedEvent): boolean;
     cache: import("@welshman/lib").LRUCache<string, boolean>;
-    getKey: (args: [Event]) => string;
-    getValue: (args: [Event]) => boolean;
+    getKey: (args: [SignedEvent]) => string;
+    getValue: (args: [SignedEvent]) => boolean;
 };
-export declare const getAddress: (e: UnsignedEvent) => string;
-export declare const getIdOrAddress: (e: Rumor) => string;
-export declare const getIdAndAddress: (e: Rumor) => string[];
+export declare const getIdOrAddress: (e: HashedEvent) => string;
+export declare const getIdAndAddress: (e: HashedEvent) => string[];
 export declare const isEphemeral: (e: EventTemplate) => boolean;
 export declare const isReplaceable: (e: EventTemplate) => boolean;
 export declare const isPlainReplaceable: (e: EventTemplate) => boolean;
 export declare const isParameterizedReplaceable: (e: EventTemplate) => boolean;
-export declare const isChildOf: (child: EventTemplate, parent: Rumor) => boolean;
+export declare const isChildOf: (child: EventTemplate, parent: HashedEvent) => boolean;

package/build/Events.mjs

@@ -1,13 +1,22 @@
+import { verifiedSymbol } from 'nostr-tools';
 import { verifyEvent, getEventHash } from 'nostr-tools';
-import { cached, now } from '@welshman/lib';
+import { cached, pick, now } from '@welshman/lib';
 import { Tags } from "./Tags.mjs";
-import { addressFromEvent, encodeAddress } from "./Address.mjs";
+import { getAddress } from "./Address.mjs";
 import { isEphemeralKind, isReplaceableKind, isPlainReplaceableKind, isParameterizedReplaceableKind } from "./Kinds.mjs";
 export const createEvent = (kind, { content = "", tags = [], created_at = now() }) => ({ kind, content, tags, created_at });
-export const asEventTemplate = ({ kind, tags, content, created_at }) => ({ kind, tags, content, created_at });
-export const asUnsignedEvent = ({ kind, tags, content, created_at, pubkey }) => ({ kind, tags, content, created_at, pubkey });
-export const asRumor = ({ kind, tags, content, created_at, pubkey, id }) => ({ kind, tags, content, created_at, pubkey, id });
-export const asEvent = ({ kind, tags, content, created_at, pubkey, id, sig }) => ({ kind, tags, content, created_at, pubkey, id, sig });
+export const isEventTemplate = (e) => Boolean(typeof e.kind === "number" && e.tags && typeof e.content === "string" && e.created_at);
+export const isOwnedEvent = (e) => Boolean(isEventTemplate(e) && e.pubkey);
+export const isHashedEvent = (e) => Boolean(isOwnedEvent(e) && e.id);
+export const isSignedEvent = (e) => Boolean(isHashedEvent(e) && e.sig);
+export const isUnwrappedEvent = (e) => Boolean(isHashedEvent(e) && e.wrap);
+export const isTrustedEvent = (e) => isSignedEvent(e) || isUnwrappedEvent(e);
+export const asEventTemplate = (e) => pick(['kind', 'tags', 'content', 'created_at'], e);
+export const asOwnedEvent = (e) => pick(['kind', 'tags', 'content', 'created_at', 'pubkey'], e);
+export const asHashedEvent = (e) => pick(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id'], e);
+export const asSignedEvent = (e) => pick(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id', 'sig'], e);
+export const asUnwrappedEvent = (e) => pick(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id', 'wrap'], e);
+export const asTrustedEvent = (e) => pick(['kind', 'tags', 'content', 'created_at', 'pubkey', 'id', 'sig', 'wrap'], e);
 export const hasValidSignature = cached({
     maxSize: 10000,
     getKey: ([e]) => {
@@ -27,7 +36,6 @@ export const hasValidSignature = cached({
         }
     },
 });
-export const getAddress = (e) => encodeAddress(addressFromEvent(e));
 export const getIdOrAddress = (e) => isReplaceable(e) ? getAddress(e) : e.id;
 export const getIdAndAddress = (e) => isReplaceable(e) ? [e.id, getAddress(e)] : [e.id];
 export const isEphemeral = (e) => isEphemeralKind(e.kind);

package/build/Events.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Events.mjs","sourceRoot":"","sources":["../Events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Events.mjs","sourceRoot":"","sources":["../Events.ts"],"names":[],"mappings":"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"}

package/build/Filters.cjs

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.guessFilterDelta = exports.getFilterGenerality = exports.getReplyFilters = exports.getIdFilters = exports.intersectFilters = exports.unionFilters = exports.calculateFilterGroup = exports.getFilterId = exports.matchFilters = exports.matchFilter = exports.EPOCH = void 0;
 const nostr_tools_1 = require("nostr-tools");
 const lib_1 = require("@welshman/lib");
-const Address_1 = require("./Address.cjs");
 const Kinds_1 = require("./Kinds.cjs");
+const Address_1 = require("./Address.cjs");
 exports.EPOCH = 1609459200;
 const matchFilter = (filter, event) => {
     if (!(0, nostr_tools_1.matchFilter)(filter, event)) {
@@ -59,7 +59,7 @@ const calculateFilterGroup = ({ since, until, limit, search, ...filter }) => {
 exports.calculateFilterGroup = calculateFilterGroup;
 const unionFilters = (filters) => {
     const result = [];
-    for (const group of Object.values((0, lib_1.groupBy)(exports.calculateFilterGroup, filters))) {
+    for (const group of (0, lib_1.groupBy)(exports.calculateFilterGroup, filters).values()) {
         const newFilter = {};
         for (const k of Object.keys(group[0])) {
             if (["since", "until", "limit", "search"].includes(k)) {
@@ -110,8 +110,8 @@ const getIdFilters = (idsOrAddresses) => {
     const ids = [];
     const aFilters = [];
     for (const idOrAddress of idsOrAddresses) {
-        if (idOrAddress.includes(":")) {
-            const { kind, pubkey, identifier } = (0, Address_1.decodeAddress)(idOrAddress);
+        if (Address_1.Address.isAddress(idOrAddress)) {
+            const { kind, pubkey, identifier } = Address_1.Address.from(idOrAddress);
             if (identifier) {
                 aFilters.push({ kinds: [kind], authors: [pubkey], "#d": [identifier] });
             }
@@ -136,7 +136,7 @@ const getReplyFilters = (events, filter) => {
     for (const event of events) {
         e.push(event.id);
         if ((0, Kinds_1.isReplaceableKind)(event.kind)) {
-            a.push((0, Address_1.encodeAddress)((0, Address_1.addressFromEvent)(event)));
+            a.push((0, Address_1.getAddress)(event));
         }
         if (event.wrap) {
             e.push(event.wrap.id);

package/build/Filters.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Filters.cjs","sourceRoot":"","sources":["../Filters.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Filters.cjs","sourceRoot":"","sources":["../Filters.ts"],"names":[],"mappings":"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"}

package/build/Filters.d.ts

@@ -1,4 +1,4 @@
-import type { Rumor } from './Events';
+import type { HashedEvent, TrustedEvent } from './Events';
 export declare const EPOCH = 1609459200;
 export type Filter = {
     ids?: string[];
@@ -10,14 +10,14 @@ export type Filter = {
     search?: string;
     [key: `#${string}`]: string[];
 };
-export declare const matchFilter: <E extends Rumor>(filter: Filter, event: E) => boolean;
-export declare const matchFilters: <E extends Rumor>(filters: Filter[], event: E) => boolean;
+export declare const matchFilter: <E extends HashedEvent>(filter: Filter, event: E) => boolean;
+export declare const matchFilters: <E extends HashedEvent>(filters: Filter[], event: E) => boolean;
 export declare const getFilterId: (filter: Filter) => string;
 export declare const calculateFilterGroup: ({ since, until, limit, search, ...filter }: Filter) => string;
 export declare const unionFilters: (filters: Filter[]) => Filter[];
 export declare const intersectFilters: (groups: Filter[][]) => Filter[];
 export declare const getIdFilters: (idsOrAddresses: string[]) => Filter[];
-export declare const getReplyFilters: (events: Rumor[], filter: Filter) => ({
+export declare const getReplyFilters: (events: TrustedEvent[], filter: Filter) => ({
     "#a": string[];
     ids?: string[] | undefined;
     kinds?: number[] | undefined;

package/build/Filters.mjs

@@ -1,7 +1,7 @@
 import { matchFilter as nostrToolsMatchFilter } from 'nostr-tools';
 import { prop, avg, hash, groupBy, randomId, uniq } from '@welshman/lib';
-import { decodeAddress, addressFromEvent, encodeAddress } from "./Address.mjs";
 import { isReplaceableKind } from "./Kinds.mjs";
+import { Address, getAddress } from "./Address.mjs";
 export const EPOCH = 1609459200;
 export const matchFilter = (filter, event) => {
     if (!nostrToolsMatchFilter(filter, event)) {
@@ -52,7 +52,7 @@ export const calculateFilterGroup = ({ since, until, limit, search, ...filter })
 };
 export const unionFilters = (filters) => {
     const result = [];
-    for (const group of Object.values(groupBy(calculateFilterGroup, filters))) {
+    for (const group of groupBy(calculateFilterGroup, filters).values()) {
         const newFilter = {};
         for (const k of Object.keys(group[0])) {
             if (["since", "until", "limit", "search"].includes(k)) {
@@ -101,8 +101,8 @@ export const getIdFilters = (idsOrAddresses) => {
     const ids = [];
     const aFilters = [];
     for (const idOrAddress of idsOrAddresses) {
-        if (idOrAddress.includes(":")) {
-            const { kind, pubkey, identifier } = decodeAddress(idOrAddress);
+        if (Address.isAddress(idOrAddress)) {
+            const { kind, pubkey, identifier } = Address.from(idOrAddress);
             if (identifier) {
                 aFilters.push({ kinds: [kind], authors: [pubkey], "#d": [identifier] });
             }
@@ -126,7 +126,7 @@ export const getReplyFilters = (events, filter) => {
     for (const event of events) {
         e.push(event.id);
         if (isReplaceableKind(event.kind)) {
-            a.push(encodeAddress(addressFromEvent(event)));
+            a.push(getAddress(event));
         }
         if (event.wrap) {
             e.push(event.wrap.id);