@welshman/domain 0.9.0-pre1 → 0.9.0-pre2

package/dist/domain/src/kinds/RoomJoin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomJoin.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomJoin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,QAAS,SAAQ,WAAW;IACvC,QAAQ,CAAC,IAAI,QAAY;IAEzB,KAAK;IAIL,MAAM;IAIN,OAAO;CAGR;AAED,qBAAa,eAAgB,SAAQ,YAAY,CAAC,QAAQ,CAAC;IACzD,QAAQ,CAAC,IAAI,QAAY;IAEzB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,SAAS,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"RoomJoin.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomJoin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,KAAK;CAGN;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,cAAc,QAAO;IAE9B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,QAAQ;CAOT;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}

package/dist/domain/src/kinds/RoomJoin.js

@@ -1,28 +1,19 @@
 import { spec } from "@welshman/lib";
-import { ROOM_JOIN, getTagValue } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { ROOM_JOIN, tagSpec, tagValue } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-29 kind-9021 room join request.
-export class RoomJoin extends EventReader {
-    kind = ROOM_JOIN;
+export class RoomJoinReader extends EventReader {
     claim() {
-        return getTagValue("claim", this.event.tags);
-    }
-    reason() {
-        return this.event.content || undefined;
-    }
-    builder() {
-        return new RoomJoinBuilder(this);
+        return tagValue(tagSpec("claim"), this.event.tags);
     }
 }
-export class RoomJoinBuilder extends EventBuilder {
-    kind = ROOM_JOIN;
+export class RoomJoinWriter extends EventWriter {
+    requiresRelays = true;
     setClaim(claim) {
         return this.dropTags(spec(["claim"])).addTags(["claim", claim]);
     }
-    setReason(reason) {
-        return this.setContent(reason);
-    }
     validate() {
         super.validate();
         if (!this.groupTag) {
@@ -30,4 +21,9 @@ export class RoomJoinBuilder extends EventBuilder {
         }
     }
 }
+export const RoomJoin = new KindFactory({
+    kind: ROOM_JOIN,
+    reader: RoomJoinReader,
+    writer: RoomJoinWriter,
+});
 //# sourceMappingURL=RoomJoin.js.map

package/dist/domain/src/kinds/RoomJoin.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoomJoin.js","sourceRoot":"","sources":["../../../../src/kinds/RoomJoin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,sCAAsC;AACtC,MAAM,OAAO,QAAS,SAAQ,WAAW;IAC9B,IAAI,GAAG,SAAS,CAAA;IAEzB,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,SAAS,CAAA;IACxC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,YAAsB;IAChD,IAAI,GAAG,SAAS,CAAA;IAEzB,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IAChC,CAAC;IAES,QAAQ;QAChB,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;QAC9C,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"RoomJoin.js","sourceRoot":"","sources":["../../../../src/kinds/RoomJoin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AAC3D,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,sCAAsC;AACtC,MAAM,OAAO,cAAe,SAAQ,WAAW;IAC7C,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,WAA2B;IACpD,cAAc,GAAG,IAAI,CAAA;IAE9B,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAA;IACjE,CAAC;IAED,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;QAC9C,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;CACvB,CAAC,CAAA"}

package/dist/domain/src/kinds/RoomLeave.d.ts

@@ -1,11 +1,11 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RoomLeave extends EventReader {
-    readonly kind = 9022;
-    builder(): RoomLeaveBuilder;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RoomLeaveReader extends EventReader {
 }
-export declare class RoomLeaveBuilder extends EventBuilder<RoomLeave> {
-    readonly kind = 9022;
-    protected validate(): void;
+export declare class RoomLeaveWriter extends EventWriter<RoomLeaveReader> {
+    readonly requiresRelays = true;
+    validate(): void;
 }
+export declare const RoomLeave: KindFactory<RoomLeaveReader, RoomLeaveWriter>;
 //# sourceMappingURL=RoomLeave.d.ts.map

package/dist/domain/src/kinds/RoomLeave.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomLeave.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomLeave.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,SAAU,SAAQ,WAAW;IACxC,QAAQ,CAAC,IAAI,QAAa;IAE1B,OAAO;CAGR;AAED,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,SAAS,CAAC;IAC3D,QAAQ,CAAC,IAAI,QAAa;IAE1B,SAAS,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"RoomLeave.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomLeave.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,eAAgB,SAAQ,WAAW;CAAG;AAEnD,qBAAa,eAAgB,SAAQ,WAAW,CAAC,eAAe,CAAC;IAC/D,QAAQ,CAAC,cAAc,QAAO;IAE9B,QAAQ;CAOT;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}

package/dist/domain/src/kinds/RoomLeave.js

@@ -1,15 +1,12 @@
 import { ROOM_LEAVE } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-29 kind-9022 room leave op. The target room is the "h" group tag.
-export class RoomLeave extends EventReader {
-    kind = ROOM_LEAVE;
-    builder() {
-        return new RoomLeaveBuilder(this);
-    }
+export class RoomLeaveReader extends EventReader {
 }
-export class RoomLeaveBuilder extends EventBuilder {
-    kind = ROOM_LEAVE;
+export class RoomLeaveWriter extends EventWriter {
+    requiresRelays = true;
     validate() {
         super.validate();
         if (!this.groupTag) {
@@ -17,4 +14,9 @@ export class RoomLeaveBuilder extends EventBuilder {
         }
     }
 }
+export const RoomLeave = new KindFactory({
+    kind: ROOM_LEAVE,
+    reader: RoomLeaveReader,
+    writer: RoomLeaveWriter,
+});
 //# sourceMappingURL=RoomLeave.js.map

package/dist/domain/src/kinds/RoomLeave.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoomLeave.js","sourceRoot":"","sources":["../../../../src/kinds/RoomLeave.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,wEAAwE;AACxE,MAAM,OAAO,SAAU,SAAQ,WAAW;IAC/B,IAAI,GAAG,UAAU,CAAA;IAE1B,OAAO;QACL,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,YAAuB;IAClD,IAAI,GAAG,UAAU,CAAA;IAEhB,QAAQ;QAChB,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC/C,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"RoomLeave.js","sourceRoot":"","sources":["../../../../src/kinds/RoomLeave.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,wEAAwE;AACxE,MAAM,OAAO,eAAgB,SAAQ,WAAW;CAAG;AAEnD,MAAM,OAAO,eAAgB,SAAQ,WAA4B;IACtD,cAAc,GAAG,IAAI,CAAA;IAE9B,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC/C,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC;IACvC,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;CACxB,CAAC,CAAA"}

package/dist/domain/src/kinds/RoomList.d.ts

@@ -1,14 +1,19 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RoomList extends EventReader {
-    readonly kind = 10009;
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RoomListReader extends ListReader {
     groups(): string[];
     groupTags(): string[][];
-    builder(): RoomListBuilder;
+    relays(): string[];
+    urls(): string[];
+    groupsForUrl(url: string): string[];
 }
-export declare class RoomListBuilder extends EventBuilder<RoomList> {
-    readonly kind = 10009;
+export declare class RoomListWriter extends ListWriter<RoomListReader> {
+    protected renderRoutes(): Promise<import("@welshman/util").RelaySelection[]>;
     addGroup(groupId: string, url: string): this;
-    removeGroup(groupId: string): this;
+    removeGroup(groupId: string, url?: string): this;
+    addRelay(url: string): this;
+    removeRelay(url: string): this;
 }
+export declare const RoomList: KindFactory<RoomListReader, RoomListWriter>;
 //# sourceMappingURL=RoomList.d.ts.map

package/dist/domain/src/kinds/RoomList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,QAAS,SAAQ,WAAW;IACvC,QAAQ,CAAC,IAAI,SAAQ;IAErB,MAAM;IAIN,SAAS;IAIT,OAAO;CAGR;AAED,qBAAa,eAAgB,SAAQ,YAAY,CAAC,QAAQ,CAAC;IACzD,QAAQ,CAAC,IAAI,SAAQ;IAErB,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAIrC,WAAW,CAAC,OAAO,EAAE,MAAM;CAG5B"}
+{"version":3,"file":"RoomList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomList.ts"],"names":[],"mappings":"AAWA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAkB3C,qBAAa,cAAe,SAAQ,UAAU;IAC5C,MAAM;IAIN,SAAS;IAIT,MAAM;IAIN,IAAI;IAIJ,YAAY,CAAC,GAAG,EAAE,MAAM;CAOzB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;cAI5C,YAAY;IAO5B,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAIrC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAWzC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAWpB,WAAW,CAAC,GAAG,EAAE,MAAM;CASxB;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}

package/dist/domain/src/kinds/RoomList.js

@@ -1,27 +1,72 @@
-import { spec } from "@welshman/lib";
-import { ROOMS, getGroupTags, getGroupTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { nth, uniq } from "@welshman/lib";
+import { ROOMS, matchTags, tagSpec, tagValues, isRelayUrl, normalizeRelayUrl, relays, userOutbox, } from "@welshman/util";
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
+// NIP-29 group tags (`h`/`group`) carry the group id at t[1] and a relay hint at t[2].
+const groupSpec = tagSpec(["h", "group"]);
+const matchesUrl = (normalized, value = "") => isRelayUrl(value) && normalizeRelayUrl(value) === normalized;
+// Every relay a room list references: its `r` relays plus the relay hints on its
+// group tags, normalized and deduped.
+const getUrls = (tags) => uniq([...tagValues(tagSpec("r"), tags), ...matchTags(groupSpec, tags).map(nth(2))]
+    .filter(isRelayUrl)
+    .map(normalizeRelayUrl));
 // NIP-51 kind-10009 simple-groups membership list.
-export class RoomList extends EventReader {
-    kind = ROOMS;
+export class RoomListReader extends ListReader {
     groups() {
-        return getGroupTagValues(this.tags());
+        return tagValues(groupSpec, this.tags());
     }
     groupTags() {
-        return getGroupTags(this.tags());
+        return matchTags(groupSpec, this.tags());
     }
-    builder() {
-        return new RoomListBuilder(this);
+    relays() {
+        return tagValues(tagSpec("r"), this.tags());
+    }
+    urls() {
+        return getUrls(this.tags());
+    }
+    groupsForUrl(url) {
+        const normalized = normalizeRelayUrl(url);
+        return matchTags(groupSpec, this.tags())
+            .filter(t => matchesUrl(normalized, t[2]))
+            .map(nth(1));
     }
 }
-export class RoomListBuilder extends EventBuilder {
-    kind = ROOMS;
+export class RoomListWriter extends ListWriter {
+    // Publishes to every relay this list references — both its current urls and the
+    // ones it used to have (via the seed reader) — so each relay learns of the user's
+    // membership changes.
+    async renderRoutes() {
+        const original = this.reader?.urls() ?? [];
+        const current = getUrls(await this.renderTags());
+        return [userOutbox(), ...relays(uniq([...original, ...current]))];
+    }
     addGroup(groupId, url) {
-        return this.addTags(["group", groupId, url]);
+        return this.addRelay(url).addPublic(["group", groupId, url]);
+    }
+    removeGroup(groupId, url) {
+        const normalized = url ? normalizeRelayUrl(url) : undefined;
+        return this.dropTags(t => t[0] === "group" &&
+            t[1] === groupId &&
+            (!normalized || matchesUrl(normalized, t[2])));
+    }
+    addRelay(url) {
+        const normalized = normalizeRelayUrl(url);
+        const tags = [...this.publicTags, ...this.privateTags];
+        if (!tags.some(t => t[0] === "r" && matchesUrl(normalized, t[1]))) {
+            this.addPublic(["r", normalized]);
+        }
+        return this;
     }
-    removeGroup(groupId) {
-        return this.dropTags(spec(["group", groupId]));
+    removeRelay(url) {
+        const normalized = normalizeRelayUrl(url);
+        return this.dropTags(t => (t[0] === "r" && matchesUrl(normalized, t[1])) ||
+            (t[0] === "group" && matchesUrl(normalized, t[2])));
     }
 }
+export const RoomList = new KindFactory({
+    kind: ROOMS,
+    reader: RoomListReader,
+    writer: RoomListWriter,
+});
 //# sourceMappingURL=RoomList.js.map

package/dist/domain/src/kinds/RoomList.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoomList.js","sourceRoot":"","sources":["../../../../src/kinds/RoomList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACrE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,mDAAmD;AACnD,MAAM,OAAO,QAAS,SAAQ,WAAW;IAC9B,IAAI,GAAG,KAAK,CAAA;IAErB,MAAM;QACJ,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IACvC,CAAC;IAED,SAAS;QACP,OAAO,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAClC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,YAAsB;IAChD,IAAI,GAAG,KAAK,CAAA;IAErB,QAAQ,CAAC,OAAe,EAAE,GAAW;QACnC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;IAC9C,CAAC;IAED,WAAW,CAAC,OAAe;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAChD,CAAC;CACF"}
+{"version":3,"file":"RoomList.js","sourceRoot":"","sources":["../../../../src/kinds/RoomList.ts"],"names":[],"mappings":"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"}

package/dist/domain/src/kinds/RoomMembers.d.ts

@@ -1,15 +1,15 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RoomMembers extends EventReader {
-    readonly kind = 39002;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RoomMembersReader extends EventReader {
     members(): string[];
     isMember(pubkey: string): boolean;
-    builder(): RoomMembersBuilder;
 }
-export declare class RoomMembersBuilder extends EventBuilder<RoomMembers> {
-    readonly kind = 39002;
+export declare class RoomMembersWriter extends EventWriter<RoomMembersReader> {
+    readonly requiresRelays = true;
     addPubkey(pubkey: string): this;
     removePubkey(pubkey: string): this;
     setPubkeys(pubkeys: string[]): this;
 }
+export declare const RoomMembers: KindFactory<RoomMembersReader, RoomMembersWriter>;
 //# sourceMappingURL=RoomMembers.d.ts.map

package/dist/domain/src/kinds/RoomMembers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomMembers.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomMembers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,WAAY,SAAQ,WAAW;IAC1C,QAAQ,CAAC,IAAI,SAAe;IAE5B,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;IAIvB,OAAO;CAGR;AAED,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,WAAW,CAAC;IAC/D,QAAQ,CAAC,IAAI,SAAe;IAE5B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;CAG7B"}
+{"version":3,"file":"RoomMembers.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomMembers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;CAGxB;AAED,qBAAa,iBAAkB,SAAQ,WAAW,CAAC,iBAAiB,CAAC;IACnE,QAAQ,CAAC,cAAc,QAAO;IAE9B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;CAG7B;AAED,eAAO,MAAM,WAAW,mDAItB,CAAA"}

package/dist/domain/src/kinds/RoomMembers.js

@@ -1,22 +1,19 @@
 import { uniq, spec, removeUndefined } from "@welshman/lib";
-import { ROOM_MEMBERS, getPubkeyTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { ROOM_MEMBERS, hexTags, tagValues } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-29 kind-39002 room members list.
-export class RoomMembers extends EventReader {
-    kind = ROOM_MEMBERS;
+export class RoomMembersReader extends EventReader {
     members() {
-        return uniq(getPubkeyTagValues(this.event.tags));
+        return uniq(tagValues(hexTags("p"), this.event.tags));
     }
     isMember(pubkey) {
         return this.members().includes(pubkey);
     }
-    builder() {
-        return new RoomMembersBuilder(this);
-    }
 }
-export class RoomMembersBuilder extends EventBuilder {
-    kind = ROOM_MEMBERS;
+export class RoomMembersWriter extends EventWriter {
+    requiresRelays = true;
     addPubkey(pubkey) {
         return this.dropTags(spec(["p", pubkey])).addTags(removeUndefined(["p", pubkey]));
     }
@@ -27,4 +24,9 @@ export class RoomMembersBuilder extends EventBuilder {
         return this.dropTags(spec(["p"])).addTags(...uniq(pubkeys).map(pk => ["p", pk]));
     }
 }
+export const RoomMembers = new KindFactory({
+    kind: ROOM_MEMBERS,
+    reader: RoomMembersReader,
+    writer: RoomMembersWriter,
+});
 //# sourceMappingURL=RoomMembers.js.map

package/dist/domain/src/kinds/RoomMembers.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoomMembers.js","sourceRoot":"","sources":["../../../../src/kinds/RoomMembers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,uCAAuC;AACvC,MAAM,OAAO,WAAY,SAAQ,WAAW;IACjC,IAAI,GAAG,YAAY,CAAA;IAE5B,OAAO;QACL,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAClD,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,YAAyB;IACtD,IAAI,GAAG,YAAY,CAAA;IAE5B,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;CACF"}
+{"version":3,"file":"RoomMembers.js","sourceRoot":"","sources":["../../../../src/kinds/RoomMembers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,YAAY,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAC/D,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,uCAAuC;AACvC,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAChD,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,WAA8B;IAC1D,cAAc,GAAG,IAAI,CAAA;IAE9B,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;CACF;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;IACzC,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,iBAAiB;IACzB,MAAM,EAAE,iBAAiB;CAC1B,CAAC,CAAA"}

package/dist/domain/src/kinds/RoomMeta.d.ts

@@ -1,7 +1,7 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RoomMeta extends EventReader {
-    readonly kind = 39000;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RoomMetaReader extends EventReader {
     name(): string | undefined;
     about(): string | undefined;
     picture(): string | undefined;
@@ -11,10 +11,9 @@ export declare class RoomMeta extends EventReader {
     isPrivate(): boolean;
     isRestricted(): boolean;
     hasLivekit(): boolean;
-    builder(): RoomMetaBuilder;
 }
-export declare class RoomMetaBuilder extends EventBuilder<RoomMeta> {
-    readonly kind = 39000;
+export declare class RoomMetaWriter extends EventWriter<RoomMetaReader> {
+    readonly requiresRelays = true;
     setName(name: string): this;
     setAbout(about: string): this;
     setPicture(picture: string, meta?: string[]): this;
@@ -24,4 +23,5 @@ export declare class RoomMetaBuilder extends EventBuilder<RoomMeta> {
     setRestricted(restricted?: boolean): this;
     setLivekit(livekit?: boolean): this;
 }
+export declare const RoomMeta: KindFactory<RoomMetaReader, RoomMetaWriter>;
 //# sourceMappingURL=RoomMeta.d.ts.map

package/dist/domain/src/kinds/RoomMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomMeta.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomMeta.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,QAAS,SAAQ,WAAW;IACvC,QAAQ,CAAC,IAAI,SAAY;IAEzB,IAAI;IAIJ,KAAK;IAIL,OAAO;IAIP,WAAW;IAMX,QAAQ;IAIR,QAAQ;IAIR,SAAS;IAIT,YAAY;IAIZ,UAAU;IAIV,OAAO;CAGR;AAED,qBAAa,eAAgB,SAAQ,YAAY,CAAC,QAAQ,CAAC;IACzD,QAAQ,CAAC,IAAI,SAAY;IAEzB,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO;IAI/C,SAAS,CAAC,MAAM,UAAO;IAMvB,SAAS,CAAC,MAAM,UAAO;IAMvB,UAAU,CAAC,SAAS,UAAO;IAM3B,aAAa,CAAC,UAAU,UAAO;IAM/B,UAAU,CAAC,OAAO,UAAO;CAK1B"}
+{"version":3,"file":"RoomMeta.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomMeta.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,IAAI;IAIJ,KAAK;IAIL,OAAO;IAIP,WAAW;IAMX,QAAQ;IAIR,QAAQ;IAIR,SAAS;IAIT,YAAY;IAIZ,UAAU;CAGX;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,cAAc,QAAO;IAE9B,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO;IAI/C,SAAS,CAAC,MAAM,UAAO;IAMvB,SAAS,CAAC,MAAM,UAAO;IAMvB,UAAU,CAAC,SAAS,UAAO;IAM3B,aAAa,CAAC,UAAU,UAAO;IAM/B,UAAU,CAAC,OAAO,UAAO;CAK1B;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}

package/dist/domain/src/kinds/RoomMeta.js

@@ -1,21 +1,21 @@
 import { spec } from "@welshman/lib";
-import { ROOM_META, getTag, getTagValue } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { ROOM_META, matchTag, tagSpec, tagValue } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-29 kind-39000 room metadata.
-export class RoomMeta extends EventReader {
-    kind = ROOM_META;
+export class RoomMetaReader extends EventReader {
     name() {
-        return getTagValue("name", this.event.tags);
+        return tagValue(tagSpec("name"), this.event.tags);
     }
     about() {
-        return getTagValue("about", this.event.tags);
+        return tagValue(tagSpec("about"), this.event.tags);
     }
     picture() {
-        return getTag("picture", this.event.tags)?.[1];
+        return matchTag(tagSpec("picture"), this.event.tags)?.[1];
     }
     pictureMeta() {
-        const tag = getTag("picture", this.event.tags);
+        const tag = matchTag(tagSpec("picture"), this.event.tags);
         return tag ? tag.slice(2) : undefined;
     }
     isClosed() {
@@ -33,12 +33,9 @@ export class RoomMeta extends EventReader {
     hasLivekit() {
         return this.event.tags.some(spec(["livekit"]));
     }
-    builder() {
-        return new RoomMetaBuilder(this);
-    }
 }
-export class RoomMetaBuilder extends EventBuilder {
-    kind = ROOM_META;
+export class RoomMetaWriter extends EventWriter {
+    requiresRelays = true;
     setName(name) {
         return this.dropTags(spec(["name"])).addTags(["name", name]);
     }
@@ -69,4 +66,9 @@ export class RoomMetaBuilder extends EventBuilder {
         return livekit ? this.addTags(["livekit"]) : this;
     }
 }
+export const RoomMeta = new KindFactory({
+    kind: ROOM_META,
+    reader: RoomMetaReader,
+    writer: RoomMetaWriter,
+});
 //# sourceMappingURL=RoomMeta.js.map

package/dist/domain/src/kinds/RoomMeta.js.map

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

package/dist/domain/src/kinds/RoomRemoveMember.d.ts

@@ -1,14 +1,14 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class RoomRemoveMember extends EventReader {
-    readonly kind = 9001;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RoomRemoveMemberReader extends EventReader {
     pubkeys(): string[];
-    builder(): RoomRemoveMemberBuilder;
 }
-export declare class RoomRemoveMemberBuilder extends EventBuilder<RoomRemoveMember> {
-    readonly kind = 9001;
+export declare class RoomRemoveMemberWriter extends EventWriter<RoomRemoveMemberReader> {
+    readonly requiresRelays = true;
     addPubkey(pubkey: string): this;
     removePubkey(pubkey: string): this;
     setPubkeys(pubkeys: string[]): this;
 }
+export declare const RoomRemoveMember: KindFactory<RoomRemoveMemberReader, RoomRemoveMemberWriter>;
 //# sourceMappingURL=RoomRemoveMember.d.ts.map

package/dist/domain/src/kinds/RoomRemoveMember.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoomRemoveMember.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomRemoveMember.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,QAAQ,CAAC,IAAI,QAAqB;IAElC,OAAO;IAIP,OAAO;CAGR;AAED,qBAAa,uBAAwB,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IACzE,QAAQ,CAAC,IAAI,QAAqB;IAElC,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;CAG7B"}
+{"version":3,"file":"RoomRemoveMember.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomRemoveMember.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,sBAAuB,SAAQ,WAAW;IACrD,OAAO;CAGR;AAED,qBAAa,sBAAuB,SAAQ,WAAW,CAAC,sBAAsB,CAAC;IAC7E,QAAQ,CAAC,cAAc,QAAO;IAE9B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE;CAG7B;AAED,eAAO,MAAM,gBAAgB,6DAI3B,CAAA"}

package/dist/domain/src/kinds/RoomRemoveMember.js

@@ -1,19 +1,16 @@
 import { uniq, spec, removeUndefined } from "@welshman/lib";
-import { ROOM_REMOVE_MEMBER, getPubkeyTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { ROOM_REMOVE_MEMBER, hexTags, tagValues } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-29 room remove-member op (kind 9001).
-export class RoomRemoveMember extends EventReader {
-    kind = ROOM_REMOVE_MEMBER;
+export class RoomRemoveMemberReader extends EventReader {
     pubkeys() {
-        return uniq(getPubkeyTagValues(this.event.tags));
-    }
-    builder() {
-        return new RoomRemoveMemberBuilder(this);
+        return uniq(tagValues(hexTags("p"), this.event.tags));
     }
 }
-export class RoomRemoveMemberBuilder extends EventBuilder {
-    kind = ROOM_REMOVE_MEMBER;
+export class RoomRemoveMemberWriter extends EventWriter {
+    requiresRelays = true;
     addPubkey(pubkey) {
         return this.dropTags(spec(["p", pubkey])).addTags(removeUndefined(["p", pubkey]));
     }
@@ -24,4 +21,9 @@ export class RoomRemoveMemberBuilder extends EventBuilder {
         return this.dropTags(spec(["p"])).addTags(...pubkeys.map(pk => ["p", pk]));
     }
 }
+export const RoomRemoveMember = new KindFactory({
+    kind: ROOM_REMOVE_MEMBER,
+    reader: RoomRemoveMemberReader,
+    writer: RoomRemoveMemberWriter,
+});
 //# sourceMappingURL=RoomRemoveMember.js.map

package/dist/domain/src/kinds/RoomRemoveMember.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoomRemoveMember.js","sourceRoot":"","sources":["../../../../src/kinds/RoomRemoveMember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAA;AACrE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,4CAA4C;AAC5C,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IACtC,IAAI,GAAG,kBAAkB,CAAA;IAElC,OAAO;QACL,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAClD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,uBAAuB,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,MAAM,OAAO,uBAAwB,SAAQ,YAA8B;IAChE,IAAI,GAAG,kBAAkB,CAAA;IAElC,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;CACF"}
+{"version":3,"file":"RoomRemoveMember.js","sourceRoot":"","sources":["../../../../src/kinds/RoomRemoveMember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAC,MAAM,eAAe,CAAA;AACzD,OAAO,EAAC,kBAAkB,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACrE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,4CAA4C;AAC5C,MAAM,OAAO,sBAAuB,SAAQ,WAAW;IACrD,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,WAAmC;IACpE,cAAc,GAAG,IAAI,CAAA;IAE9B,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,UAAU,CAAC,OAAiB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAC5E,CAAC;CACF;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,WAAW,CAAC;IAC9C,IAAI,EAAE,kBAAkB;IACxB,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,sBAAsB;CAC/B,CAAC,CAAA"}

package/dist/domain/src/kinds/SearchRelayList.d.ts

@@ -1,15 +1,14 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class SearchRelayList extends EventReader {
-    readonly kind = 10007;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class SearchRelayListReader extends EventReader {
     urls(): string[];
     includes(url: string): boolean;
-    builder(): SearchRelayListBuilder;
 }
-export declare class SearchRelayListBuilder extends EventBuilder<SearchRelayList> {
-    readonly kind = 10007;
+export declare class SearchRelayListWriter extends EventWriter<SearchRelayListReader> {
     addUrl(url: string): this;
     removeUrl(url: string): this;
     setUrls(urls: string[]): this;
 }
+export declare const SearchRelayList: KindFactory<SearchRelayListReader, SearchRelayListWriter>;
 //# sourceMappingURL=SearchRelayList.d.ts.map

package/dist/domain/src/kinds/SearchRelayList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchRelayList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/SearchRelayList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,QAAQ,CAAC,IAAI,SAAgB;IAE7B,IAAI;IAIJ,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,OAAO;CAGR;AAED,qBAAa,sBAAuB,SAAQ,YAAY,CAAC,eAAe,CAAC;IACvE,QAAQ,CAAC,IAAI,SAAgB;IAE7B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB"}
+{"version":3,"file":"SearchRelayList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/SearchRelayList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,qBAAsB,SAAQ,WAAW;IACpD,IAAI;IAIJ,QAAQ,CAAC,GAAG,EAAE,MAAM;CAGrB;AAED,qBAAa,qBAAsB,SAAQ,WAAW,CAAC,qBAAqB,CAAC;IAC3E,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB;AAED,eAAO,MAAM,eAAe,2DAI1B,CAAA"}

package/dist/domain/src/kinds/SearchRelayList.js

@@ -1,22 +1,18 @@
 import { uniqBy, spec } from "@welshman/lib";
-import { SEARCH_RELAYS, getTagValues, normalizeRelayUrl } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { SEARCH_RELAYS, tagSpec, tagValues, normalizeRelayUrl } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-51 kind-10007 search relays list.
-export class SearchRelayList extends EventReader {
-    kind = SEARCH_RELAYS;
+export class SearchRelayListReader extends EventReader {
     urls() {
-        return uniqBy(normalizeRelayUrl, getTagValues("relay", this.tags()));
+        return uniqBy(normalizeRelayUrl, tagValues(tagSpec("relay"), this.tags()));
     }
     includes(url) {
         return this.urls().includes(normalizeRelayUrl(url));
     }
-    builder() {
-        return new SearchRelayListBuilder(this);
-    }
 }
-export class SearchRelayListBuilder extends EventBuilder {
-    kind = SEARCH_RELAYS;
+export class SearchRelayListWriter extends EventWriter {
     addUrl(url) {
         return this.addTags(["relay", normalizeRelayUrl(url)]);
     }
@@ -27,4 +23,9 @@ export class SearchRelayListBuilder extends EventBuilder {
         return this.dropTags(spec(["relay"])).addTags(...urls.map(url => ["relay", normalizeRelayUrl(url)]));
     }
 }
+export const SearchRelayList = new KindFactory({
+    kind: SEARCH_RELAYS,
+    reader: SearchRelayListReader,
+    writer: SearchRelayListWriter,
+});
 //# sourceMappingURL=SearchRelayList.js.map