@welshman/util 0.0.24 → 0.0.27

package/build/src/Profile.cjs

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.profileHasName = exports.displayProfile = exports.displayPubkey = exports.editProfile = exports.createProfile = exports.readProfile = exports.makeProfile = exports.isPublishedProfile = void 0;
+const nostr_tools_1 = require("nostr-tools");
+const lib_1 = require("@welshman/lib");
+const Kinds_1 = require("./Kinds.cjs");
+const isPublishedProfile = (profile) => Boolean(profile.event);
+exports.isPublishedProfile = isPublishedProfile;
+const makeProfile = (profile = {}) => ({
+    name: "",
+    nip05: "",
+    lud06: "",
+    lud16: "",
+    about: "",
+    banner: "",
+    picture: "",
+    website: "",
+    display_name: "",
+    ...profile,
+});
+exports.makeProfile = makeProfile;
+const readProfile = (event) => {
+    const profile = (0, lib_1.parseJson)(event.content) || {};
+    return { ...profile, event };
+};
+exports.readProfile = readProfile;
+const createProfile = ({ event, ...profile }) => ({
+    kind: Kinds_1.PROFILE,
+    content: JSON.stringify(profile),
+});
+exports.createProfile = createProfile;
+const editProfile = ({ event, ...profile }) => ({
+    kind: Kinds_1.PROFILE,
+    content: JSON.stringify(profile),
+    tags: event.tags,
+});
+exports.editProfile = editProfile;
+const displayPubkey = (pubkey) => {
+    const d = nostr_tools_1.nip19.npubEncode(pubkey);
+    return d.slice(0, 8) + "…" + d.slice(-5);
+};
+exports.displayPubkey = displayPubkey;
+const displayProfile = (profile, fallback = "") => {
+    const { display_name, name, event } = profile || {};
+    if (name)
+        return (0, lib_1.ellipsize)(name, 60);
+    if (display_name)
+        return (0, lib_1.ellipsize)(display_name, 60);
+    if (event)
+        return (0, exports.displayPubkey)(event.pubkey);
+    return fallback;
+};
+exports.displayProfile = displayProfile;
+const profileHasName = (profile) => Boolean((profile === null || profile === void 0 ? void 0 : profile.name) || (profile === null || profile === void 0 ? void 0 : profile.display_name));
+exports.profileHasName = profileHasName;
+//# sourceMappingURL=Profile.cjs.map

package/build/src/Profile.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Profile.cjs","sourceRoot":"","sources":["../../src/Profile.ts"],"names":[],"mappings":";;;AAAA,6CAAiC;AACjC,uCAAkD;AAElD,uCAA+B;AAmBxB,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAA+B,EAAE,CAClF,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AADX,QAAA,kBAAkB,sBACP;AAEjB,MAAM,WAAW,GAAG,CAAC,UAA4B,EAAE,EAAW,EAAE,CAAC,CAAC;IACvE,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,YAAY,EAAE,EAAE;IAChB,GAAG,OAAO;CACX,CAAC,CAAA;AAXW,QAAA,WAAW,eAWtB;AAEK,MAAM,WAAW,GAAG,CAAC,KAAmB,EAAE,EAAE;IACjD,MAAM,OAAO,GAAG,IAAA,eAAS,EAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;IAE9C,OAAO,EAAC,GAAG,OAAO,EAAE,KAAK,EAAqB,CAAA;AAChD,CAAC,CAAA;AAJY,QAAA,WAAW,eAIvB;AAEM,MAAM,aAAa,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,OAAO,EAAU,EAAE,EAAE,CAAC,CAAC;IAC9D,IAAI,EAAE,eAAO;IACb,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;CACjC,CAAC,CAAA;AAHW,QAAA,aAAa,iBAGxB;AAEK,MAAM,WAAW,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,OAAO,EAAmB,EAAE,EAAE,CAAC,CAAC;IACrE,IAAI,EAAE,eAAO;IACb,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;IAChC,IAAI,EAAE,KAAK,CAAC,IAAI;CACjB,CAAC,CAAA;AAJW,QAAA,WAAW,eAItB;AAEK,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE;IAC9C,MAAM,CAAC,GAAG,mBAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAElC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA;AAJY,QAAA,aAAa,iBAIzB;AAEM,MAAM,cAAc,GAAG,CAAC,OAAiB,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE;IACjE,MAAM,EAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,OAAO,IAAI,EAAE,CAAA;IAEjD,IAAI,IAAI;QAAE,OAAO,IAAA,eAAS,EAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACpC,IAAI,YAAY;QAAE,OAAO,IAAA,eAAS,EAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IACpD,IAAI,KAAK;QAAE,OAAO,IAAA,qBAAa,EAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AARY,QAAA,cAAc,kBAQ1B;AAEM,MAAM,cAAc,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA,CAAC,CAAA;AAAvF,QAAA,cAAc,kBAAyE"}

package/build/src/Profile.d.ts

@@ -0,0 +1,31 @@
+import { TrustedEvent } from "./Events";
+export type Profile = {
+    name?: string;
+    nip05?: string;
+    lud06?: string;
+    lud16?: string;
+    about?: string;
+    banner?: string;
+    picture?: string;
+    website?: string;
+    display_name?: string;
+    event?: TrustedEvent;
+};
+export type PublishedProfile = Omit<Profile, "event"> & {
+    event: TrustedEvent;
+};
+export declare const isPublishedProfile: (profile: Profile) => profile is PublishedProfile;
+export declare const makeProfile: (profile?: Partial<Profile>) => Profile;
+export declare const readProfile: (event: TrustedEvent) => PublishedProfile;
+export declare const createProfile: ({ event, ...profile }: Profile) => {
+    kind: number;
+    content: string;
+};
+export declare const editProfile: ({ event, ...profile }: PublishedProfile) => {
+    kind: number;
+    content: string;
+    tags: string[][];
+};
+export declare const displayPubkey: (pubkey: string) => string;
+export declare const displayProfile: (profile?: Profile, fallback?: string) => string;
+export declare const profileHasName: (profile?: Profile) => boolean;

package/build/src/Profile.mjs

@@ -0,0 +1,45 @@
+import { nip19 } from "nostr-tools";
+import { ellipsize, parseJson } from "@welshman/lib";
+import { PROFILE } from "./Kinds.mjs";
+export const isPublishedProfile = (profile) => Boolean(profile.event);
+export const makeProfile = (profile = {}) => ({
+    name: "",
+    nip05: "",
+    lud06: "",
+    lud16: "",
+    about: "",
+    banner: "",
+    picture: "",
+    website: "",
+    display_name: "",
+    ...profile,
+});
+export const readProfile = (event) => {
+    const profile = parseJson(event.content) || {};
+    return { ...profile, event };
+};
+export const createProfile = ({ event, ...profile }) => ({
+    kind: PROFILE,
+    content: JSON.stringify(profile),
+});
+export const editProfile = ({ event, ...profile }) => ({
+    kind: PROFILE,
+    content: JSON.stringify(profile),
+    tags: event.tags,
+});
+export const displayPubkey = (pubkey) => {
+    const d = nip19.npubEncode(pubkey);
+    return d.slice(0, 8) + "…" + d.slice(-5);
+};
+export const displayProfile = (profile, fallback = "") => {
+    const { display_name, name, event } = profile || {};
+    if (name)
+        return ellipsize(name, 60);
+    if (display_name)
+        return ellipsize(display_name, 60);
+    if (event)
+        return displayPubkey(event.pubkey);
+    return fallback;
+};
+export const profileHasName = (profile) => Boolean((profile === null || profile === void 0 ? void 0 : profile.name) || (profile === null || profile === void 0 ? void 0 : profile.display_name));
+//# sourceMappingURL=Profile.mjs.map

package/build/src/Profile.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"Profile.mjs","sourceRoot":"","sources":["../../src/Profile.ts"],"names":[],"mappings":"OAAO,EAAC,KAAK,EAAC,MAAM,aAAa;OAC1B,EAAC,SAAS,EAAE,SAAS,EAAC,MAAM,eAAe;OAE3C,EAAC,OAAO,EAAC;AAmBhB,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAA+B,EAAE,CAClF,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAExB,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,UAA4B,EAAE,EAAW,EAAE,CAAC,CAAC;IACvE,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;IACV,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,YAAY,EAAE,EAAE;IAChB,GAAG,OAAO;CACX,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAmB,EAAE,EAAE;IACjD,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;IAE9C,OAAO,EAAC,GAAG,OAAO,EAAE,KAAK,EAAqB,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,OAAO,EAAU,EAAE,EAAE,CAAC,CAAC;IAC9D,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;CACjC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,OAAO,EAAmB,EAAE,EAAE,CAAC,CAAC;IACrE,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;IAChC,IAAI,EAAE,KAAK,CAAC,IAAI;CACjB,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,MAAc,EAAE,EAAE;IAC9C,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAElC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAiB,EAAE,QAAQ,GAAG,EAAE,EAAE,EAAE;IACjE,MAAM,EAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAC,GAAG,OAAO,IAAI,EAAE,CAAA;IAEjD,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IACpC,IAAI,YAAY;QAAE,OAAO,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IACpD,IAAI,KAAK;QAAE,OAAO,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA,CAAC,CAAA"}

package/build/src/Relay.cjs

@@ -1,28 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Relay = exports.normalizeRelayUrl = exports.isShareableRelayUrl = exports.BOGUS_RELAY_URL = exports.LOCAL_RELAY_URL = void 0;
+exports.Relay = exports.displayRelayUrl = exports.normalizeRelayUrl = exports.isShareableRelayUrl = exports.isRelayUrl = exports.BOGUS_RELAY_URL = exports.LOCAL_RELAY_URL = void 0;
 const lib_1 = require("@welshman/lib");
 const Filters_1 = require("./Filters.cjs");
+// Constants and types
 exports.LOCAL_RELAY_URL = "local://welshman.relay";
 exports.BOGUS_RELAY_URL = "bogus://welshman.relay";
-const isShareableRelayUrl = (url) => {
-    var _a;
-    return Boolean(typeof url === 'string' &&
-        // Is it actually a websocket url and has a dot
-        url.match(/^wss:\/\/.+\..+/) &&
-        // Sometimes bugs cause multiple relays to get concatenated
-        ((_a = url.match(/:\/\//g)) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
-        // It shouldn't have any whitespace, url-encoded or otherwise
-        !url.match(/\s|%/) &&
-        // Don't match stuff with a port number
-        !url.slice(6).match(/:\d+/) &&
-        // Don't match stuff with a numeric tld
-        !url.slice(6).match(/\.\d+\b/) &&
-        // Don't match raw ip addresses
-        !url.slice(6).match(/\d+\.\d+\.\d+\.\d+/) &&
-        // Skip nostr.wine's virtual relays
-        !url.slice(6).match(/\/npub/));
+// Utils related to bare urls
+const isRelayUrl = (url) => {
+    try {
+        new URL(url);
+    }
+    catch (e) {
+        return false;
+    }
+    return true;
 };
+exports.isRelayUrl = isRelayUrl;
+const isShareableRelayUrl = (url) => Boolean((0, exports.isRelayUrl)(url) &&
+    // Is it actually a websocket url and has a dot
+    url.match(/^wss:\/\/.+\..+/) &&
+    // Don't match stuff with a port number
+    !url.slice(6).match(/:\d+/) &&
+    // Don't match stuff with a numeric tld
+    !url.slice(6).match(/\.\d+\b/) &&
+    // Don't match raw ip addresses
+    !url.slice(6).match(/\d+\.\d+\.\d+\.\d+/) &&
+    // Skip nostr.wine's virtual relays
+    !url.slice(6).match(/\/npub/));
 exports.isShareableRelayUrl = isShareableRelayUrl;
 const normalizeRelayUrl = (url, { allowInsecure = false } = {}) => {
     var _a;
@@ -38,6 +43,9 @@ const normalizeRelayUrl = (url, { allowInsecure = false } = {}) => {
     return prefix + url;
 };
 exports.normalizeRelayUrl = normalizeRelayUrl;
+const displayRelayUrl = (url) => (0, lib_1.last)(url.split("://")).replace(/\/$/, "");
+exports.displayRelayUrl = displayRelayUrl;
+// In-memory relay implementation backed by Repository
 class Relay extends lib_1.Emitter {
     constructor(repository) {
         super();

package/build/src/Relay.cjs.map

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

package/build/src/Relay.d.ts

@@ -4,11 +4,25 @@ import type { Filter } from './Filters';
 import type { TrustedEvent } from './Events';
 export declare const LOCAL_RELAY_URL = "local://welshman.relay";
 export declare const BOGUS_RELAY_URL = "bogus://welshman.relay";
+export type RelayProfile = {
+    url: string;
+    name?: string;
+    pubkey?: string;
+    contact?: string;
+    description?: string;
+    supported_nips?: number[];
+    limitation?: {
+        payment_required?: boolean;
+        auth_required?: boolean;
+    };
+};
+export declare const isRelayUrl: (url: string) => boolean;
 export declare const isShareableRelayUrl: (url: string) => boolean;
 type NormalizeRelayUrlOpts = {
     allowInsecure?: boolean;
 };
 export declare const normalizeRelayUrl: (url: string, { allowInsecure }?: NormalizeRelayUrlOpts) => string;
+export declare const displayRelayUrl: (url: string) => string;
 export declare class Relay extends Emitter {
     readonly repository: Repository;
     subs: Map<string, Filter[]>;

package/build/src/Relay.mjs

@@ -1,25 +1,29 @@
-import { Emitter, normalizeUrl, sleep, stripProtocol } from '@welshman/lib';
+import { last, Emitter, normalizeUrl, sleep, stripProtocol } from '@welshman/lib';
 import { matchFilters } from "./Filters.mjs";
+// Constants and types
 export const LOCAL_RELAY_URL = "local://welshman.relay";
 export const BOGUS_RELAY_URL = "bogus://welshman.relay";
-export const isShareableRelayUrl = (url) => {
-    var _a;
-    return Boolean(typeof url === 'string' &&
-        // Is it actually a websocket url and has a dot
-        url.match(/^wss:\/\/.+\..+/) &&
-        // Sometimes bugs cause multiple relays to get concatenated
-        ((_a = url.match(/:\/\//g)) === null || _a === void 0 ? void 0 : _a.length) === 1 &&
-        // It shouldn't have any whitespace, url-encoded or otherwise
-        !url.match(/\s|%/) &&
-        // Don't match stuff with a port number
-        !url.slice(6).match(/:\d+/) &&
-        // Don't match stuff with a numeric tld
-        !url.slice(6).match(/\.\d+\b/) &&
-        // Don't match raw ip addresses
-        !url.slice(6).match(/\d+\.\d+\.\d+\.\d+/) &&
-        // Skip nostr.wine's virtual relays
-        !url.slice(6).match(/\/npub/));
+// Utils related to bare urls
+export const isRelayUrl = (url) => {
+    try {
+        new URL(url);
+    }
+    catch (e) {
+        return false;
+    }
+    return true;
 };
+export const isShareableRelayUrl = (url) => Boolean(isRelayUrl(url) &&
+    // Is it actually a websocket url and has a dot
+    url.match(/^wss:\/\/.+\..+/) &&
+    // Don't match stuff with a port number
+    !url.slice(6).match(/:\d+/) &&
+    // Don't match stuff with a numeric tld
+    !url.slice(6).match(/\.\d+\b/) &&
+    // Don't match raw ip addresses
+    !url.slice(6).match(/\d+\.\d+\.\d+\.\d+/) &&
+    // Skip nostr.wine's virtual relays
+    !url.slice(6).match(/\/npub/));
 export const normalizeRelayUrl = (url, { allowInsecure = false } = {}) => {
     var _a;
     const prefix = allowInsecure ? ((_a = url.match(/^wss?:\/\//)) === null || _a === void 0 ? void 0 : _a[0]) || "wss://" : "wss://";
@@ -33,6 +37,8 @@ export const normalizeRelayUrl = (url, { allowInsecure = false } = {}) => {
     }
     return prefix + url;
 };
+export const displayRelayUrl = (url) => last(url.split("://")).replace(/\/$/, "");
+// In-memory relay implementation backed by Repository
 export class Relay extends Emitter {
     constructor(repository) {
         super();

package/build/src/Relay.mjs.map

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

package/build/src/Tags.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGroupTagValues = exports.getGroupTags = exports.getRelayTagValues = exports.getRelayTags = exports.getPubkeyTagValues = exports.getPubkeyTags = exports.getContextTagValues = exports.getAddressTagValues = exports.getAddressTags = exports.getEventTagValues = exports.getEventTags = exports.getTagValue = exports.getTagValues = exports.getTags = exports.Tags = exports.Tag = void 0;
+exports.getAncestorTags = exports.getKindTagValues = exports.getKindTags = exports.getGroupTagValues = exports.getGroupTags = exports.getRelayTagValues = exports.getRelayTags = exports.getPubkeyTagValues = exports.getPubkeyTags = exports.getContextTagValues = exports.getAddressTagValues = exports.getAddressTags = exports.getEventTagValues = exports.getEventTags = exports.Tags = exports.Tag = void 0;
 const lib_1 = require("@welshman/lib");
 const Relay_1 = require("./Relay.cjs");
 const Address_1 = require("./Address.cjs");
@@ -40,43 +40,10 @@ class Tags extends lib_1.Fluent {
         this.keys = () => this.mapTo(t => t.key());
         this.values = (key) => (key ? this.filterByKey((0, lib_1.ensurePlural)(key)) : this).mapTo(t => t.value());
         this.entries = () => this.mapTo(t => t.entry());
-        this.relays = () => this.flatMap((t) => t.valueOf().filter(Relay_1.isShareableRelayUrl).map(url => (0, Relay_1.normalizeRelayUrl)(url))).uniq();
+        this.relays = () => this.flatMap((t) => t.valueOf().filter(Relay_1.isRelayUrl).map(url => (0, Relay_1.normalizeRelayUrl)(url))).uniq();
         this.topics = () => this.whereKey("t").values().map((t) => t.replace(/^#/, ""));
         this.ancestors = (x) => {
-            const tags = this.filterByKey(["a", "e", "q"]).reject(t => t.isContext());
-            const mentionTags = tags.whereKey("q");
-            const roots = [];
-            const replies = [];
-            const mentions = [];
-            const dispatchTags = (thisTags) => thisTags.forEach((t, i) => {
-                if (t.nth(3) === 'root') {
-                    if (tags.filter(t => t.nth(3) === "reply").count() === 0) {
-                        replies.push(t.valueOf());
-                    }
-                    else {
-                        roots.push(t.valueOf());
-                    }
-                }
-                else if (t.nth(3) === 'reply') {
-                    replies.push(t.valueOf());
-                }
-                else if (t.nth(3) === 'mention') {
-                    mentions.push(t.valueOf());
-                }
-                else if (i === thisTags.count() - 1) {
-                    replies.push(t.valueOf());
-                }
-                else if (i === 0) {
-                    roots.push(t.valueOf());
-                }
-                else {
-                    mentions.push(t.valueOf());
-                }
-            });
-            // Add different types separately so positional logic works
-            dispatchTags(tags.whereKey("e"));
-            dispatchTags(tags.whereKey("a").filter(t => Boolean(t.nth(3))));
-            mentionTags.forEach((t) => mentions.push(t.valueOf()));
+            const { roots, replies, mentions } = (0, exports.getAncestorTags)(this.unwrap());
             return {
                 roots: Tags.wrap(roots),
                 replies: Tags.wrap(replies),
@@ -146,28 +113,68 @@ Tags.fromEvent = (event) => Tags.wrap(event.tags || []);
 Tags.fromEvents = (events) => Tags.wrap(events.flatMap(e => e.tags || []));
 Tags.fromIMeta = (imeta) => Tags.wrap(imeta.map((m) => m.split(" ")));
 // New, simpler version
-const getTags = (types, testValue) => (tags) => tags.filter(t => types.includes(t[0]) && (!testValue || testValue(t[1] || "")));
-exports.getTags = getTags;
-const getTagValues = (types, testValue) => {
-    const _getTags = (0, exports.getTags)(types, testValue);
-    return (tags) => _getTags(tags).map(t => t[1] || "");
-};
-exports.getTagValues = getTagValues;
-const getTagValue = (types, testValue) => {
-    const _getTagValues = (0, exports.getTagValues)(types, testValue);
-    return (tags) => _getTagValues(tags)[0];
-};
-exports.getTagValue = getTagValue;
-exports.getEventTags = (0, exports.getTags)(["e"], id => id.length === 64);
-exports.getEventTagValues = (0, exports.getTagValues)(["e"], id => id.length === 64);
-exports.getAddressTags = (0, exports.getTags)(["a"], Address_1.Address.isAddress);
-exports.getAddressTagValues = (0, exports.getTagValues)(["a"], Address_1.Address.isAddress);
+const getEventTags = (tags) => tags.filter(t => ["e"].includes(t[0]) && t[1].length === 64);
+exports.getEventTags = getEventTags;
+const getEventTagValues = (tags) => (0, exports.getEventTags)(tags).map((0, lib_1.nth)(1));
+exports.getEventTagValues = getEventTagValues;
+const getAddressTags = (tags) => tags.filter(t => ["a"].includes(t[0]) && Address_1.Address.isAddress(t[1]));
+exports.getAddressTags = getAddressTags;
+const getAddressTagValues = (tags) => (0, exports.getAddressTags)(tags).map((0, lib_1.nth)(1));
+exports.getAddressTagValues = getAddressTagValues;
 const getContextTagValues = (tags) => (0, exports.getAddressTagValues)(tags).filter(Address_1.isContextAddress);
 exports.getContextTagValues = getContextTagValues;
-exports.getPubkeyTags = (0, exports.getTags)(["p"], pk => pk.length === 64);
-exports.getPubkeyTagValues = (0, exports.getTagValues)(["p"], pk => pk.length === 64);
-exports.getRelayTags = (0, exports.getTags)(["r", "relay"], Relay_1.isShareableRelayUrl);
-exports.getRelayTagValues = (0, exports.getTagValues)(["r", "relay"], Relay_1.isShareableRelayUrl);
-exports.getGroupTags = (0, exports.getTags)(["h", "group"], h => Boolean(h.match(/^(.+)'(.+)$/)));
-exports.getGroupTagValues = (0, exports.getTagValues)(["h", "group"], h => Boolean(h.match(/^(.+)'(.+)$/)));
+const getPubkeyTags = (tags) => tags.filter(t => ["p"].includes(t[0]) && t[1].length === 64);
+exports.getPubkeyTags = getPubkeyTags;
+const getPubkeyTagValues = (tags) => (0, exports.getPubkeyTags)(tags).map((0, lib_1.nth)(1));
+exports.getPubkeyTagValues = getPubkeyTagValues;
+const getRelayTags = (tags) => tags.filter(t => ["r", "relay"].includes(t[0]) && (0, Relay_1.isRelayUrl)(t[1]));
+exports.getRelayTags = getRelayTags;
+const getRelayTagValues = (tags) => (0, exports.getRelayTags)(tags).map((0, lib_1.nth)(1));
+exports.getRelayTagValues = getRelayTagValues;
+const getGroupTags = (tags) => tags.filter(t => ["h", "group"].includes(t[0]) && t[1] && (0, Relay_1.isRelayUrl)(t[2]));
+exports.getGroupTags = getGroupTags;
+const getGroupTagValues = (tags) => (0, exports.getGroupTags)(tags).map((0, lib_1.nth)(1));
+exports.getGroupTagValues = getGroupTagValues;
+const getKindTags = (tags) => tags.filter(t => ["k"].includes(t[0]) && t[1].match(/^\d+$/));
+exports.getKindTags = getKindTags;
+const getKindTagValues = (tags) => (0, exports.getKindTags)(tags).map(t => parseInt(t[1]));
+exports.getKindTagValues = getKindTagValues;
+const getAncestorTags = (tags) => {
+    const validTags = tags.filter(t => ["a", "e", "q"].includes(t[0]) && !(0, Address_1.isContextAddress)(t[1]));
+    const mentionTags = validTags.filter((0, lib_1.nthEq)(0, "q"));
+    const roots = [];
+    const replies = [];
+    const mentions = [];
+    const dispatchTags = (thisTags) => thisTags.forEach((t, i) => {
+        if (t[3] === 'root') {
+            if (validTags.filter((0, lib_1.nthEq)(3, "reply")).length === 0) {
+                replies.push(t);
+            }
+            else {
+                roots.push(t);
+            }
+        }
+        else if (t[3] === 'reply') {
+            replies.push(t);
+        }
+        else if (t[3] === 'mention') {
+            mentions.push(t);
+        }
+        else if (i === thisTags.length - 1) {
+            replies.push(t);
+        }
+        else if (i === 0) {
+            roots.push(t);
+        }
+        else {
+            mentions.push(t);
+        }
+    });
+    // Add different types separately so positional logic works
+    dispatchTags(validTags.filter((0, lib_1.nthEq)(0, "e")));
+    dispatchTags(validTags.filter((0, lib_1.nthEq)(0, "a")).filter(t => Boolean(t[3])));
+    mentionTags.forEach((t) => mentions.push(t));
+    return { roots, replies, mentions };
+};
+exports.getAncestorTags = getAncestorTags;
 //# sourceMappingURL=Tags.cjs.map

package/build/src/Tags.cjs.map

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

package/build/src/Tags.d.ts

@@ -1,4 +1,3 @@
-import { EventTemplate } from 'nostr-tools';
 import { Fluent } from '@welshman/lib';
 declare const Tag_base: (new (xs: string[]) => Fluent<string>) & Omit<typeof Fluent<string>, "from">;
 export declare class Tag extends Tag_base {
@@ -22,8 +21,12 @@ declare const Tags_base: (new (xs: Tag[]) => Fluent<Tag>) & Omit<typeof Fluent<T
 export declare class Tags extends Tags_base {
     static from: (p: Iterable<Tag>) => Tags;
     static wrap: (p: Iterable<string[]>) => Tags;
-    static fromEvent: (event: Pick<EventTemplate, "tags">) => Tags;
-    static fromEvents: (events: Pick<EventTemplate, "tags">[]) => Tags;
+    static fromEvent: (event: {
+        tags: string[][];
+    }) => Tags;
+    static fromEvents: (events: {
+        tags: string[][];
+    }[]) => Tags;
     static fromIMeta: (imeta: string[]) => Tags;
     unwrap: () => string[][];
     whereKey: (key: string) => this;
@@ -67,9 +70,6 @@ export declare class Tags extends Tags_base {
     removeIMeta: () => this;
     setIMeta: (imeta: Tags[]) => this;
 }
-export declare const getTags: (types: string[], testValue?: ((v: string) => boolean) | undefined) => (tags: string[][]) => string[][];
-export declare const getTagValues: (types: string[], testValue?: ((v: string) => boolean) | undefined) => (tags: string[][]) => string[];
-export declare const getTagValue: (types: string[], testValue?: ((v: string) => boolean) | undefined) => (tags: string[][]) => string;
 export declare const getEventTags: (tags: string[][]) => string[][];
 export declare const getEventTagValues: (tags: string[][]) => string[];
 export declare const getAddressTags: (tags: string[][]) => string[][];
@@ -81,4 +81,11 @@ export declare const getRelayTags: (tags: string[][]) => string[][];
 export declare const getRelayTagValues: (tags: string[][]) => string[];
 export declare const getGroupTags: (tags: string[][]) => string[][];
 export declare const getGroupTagValues: (tags: string[][]) => string[];
+export declare const getKindTags: (tags: string[][]) => string[][];
+export declare const getKindTagValues: (tags: string[][]) => number[];
+export declare const getAncestorTags: (tags: string[][]) => {
+    roots: string[][];
+    replies: string[][];
+    mentions: string[][];
+};
 export {};