@welshman/domain 0.9.0-pre1 → 0.9.0-pre3

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/RoomUpdatePins.d.ts

@@ -0,0 +1,15 @@
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class RoomUpdatePinsReader extends EventReader {
+    pins(): string[];
+    ids(): string[];
+    addresses(): string[];
+}
+export declare class RoomUpdatePinsWriter extends EventWriter<RoomUpdatePinsReader> {
+    readonly requiresRelays = true;
+    validate(): void;
+    setPins(idsOrAddresses: string[]): this;
+}
+export declare const RoomUpdatePins: KindFactory<RoomUpdatePinsReader, RoomUpdatePinsWriter>;
+//# sourceMappingURL=RoomUpdatePins.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RoomUpdatePins.d.ts","sourceRoot":"","sources":["../../../../src/kinds/RoomUpdatePins.ts"],"names":[],"mappings":"AASA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAI3C,qBAAa,oBAAqB,SAAQ,WAAW;IACnD,IAAI;IAQJ,GAAG;IAIH,SAAS;CAGV;AAED,qBAAa,oBAAqB,SAAQ,WAAW,CAAC,oBAAoB,CAAC;IACzE,QAAQ,CAAC,cAAc,QAAO;IAE9B,QAAQ;IAQR,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE;CAOjC;AAED,eAAO,MAAM,cAAc,yDAIzB,CAAA"}

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

@@ -0,0 +1,38 @@
+import { nth, somePass, spec, uniq } from "@welshman/lib";
+import { Address, ROOM_UPDATE_PINS, addressTags, hexTags, tagMatcher, 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-9010 update-pins op. The relay replaces the room's kind-39005 list with what this
+// carries, so it's always the full list rather than a delta.
+export class RoomUpdatePinsReader extends EventReader {
+    pins() {
+        return uniq(this.event.tags
+            .filter(somePass(tagMatcher(hexTags("e")), tagMatcher(addressTags("a"))))
+            .map(nth(1)));
+    }
+    ids() {
+        return uniq(tagValues(hexTags("e"), this.event.tags));
+    }
+    addresses() {
+        return uniq(tagValues(addressTags("a"), this.event.tags));
+    }
+}
+export class RoomUpdatePinsWriter extends EventWriter {
+    requiresRelays = true;
+    validate() {
+        super.validate();
+        if (!this.roomTag) {
+            throw new Error("RoomUpdatePins requires a room");
+        }
+    }
+    setPins(idsOrAddresses) {
+        return this.dropTags(somePass(spec(["e"]), spec(["a"]))).addTags(...uniq(idsOrAddresses).map(value => Address.isAddress(value) ? ["a", value] : ["e", value]));
+    }
+}
+export const RoomUpdatePins = new KindFactory({
+    kind: ROOM_UPDATE_PINS,
+    reader: RoomUpdatePinsReader,
+    writer: RoomUpdatePinsWriter,
+});
+//# sourceMappingURL=RoomUpdatePins.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"RoomUpdatePins.js","sourceRoot":"","sources":["../../../../src/kinds/RoomUpdatePins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACvD,OAAO,EACL,OAAO,EACP,gBAAgB,EAChB,WAAW,EACX,OAAO,EACP,UAAU,EACV,SAAS,GACV,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,gGAAgG;AAChG,6DAA6D;AAC7D,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IACnD,IAAI;QACF,OAAO,IAAI,CACT,IAAI,CAAC,KAAK,CAAC,IAAI;aACZ,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aACxE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CACf,CAAA;IACH,CAAC;IAED,GAAG;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3D,CAAC;CACF;AAED,MAAM,OAAO,oBAAqB,SAAQ,WAAiC;IAChE,cAAc,GAAG,IAAI,CAAA;IAE9B,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;IAED,OAAO,CAAC,cAAwB;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC9D,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAClC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CACvD,CACF,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,WAAW,CAAC;IAC5C,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,oBAAoB;IAC5B,MAAM,EAAE,oBAAoB;CAC7B,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

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

@@ -1 +1 @@
-{"version":3,"file":"SearchRelayList.js","sourceRoot":"","sources":["../../../../src/kinds/SearchRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAC7E,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,wCAAwC;AACxC,MAAM,OAAO,eAAgB,SAAQ,WAAW;IACrC,IAAI,GAAG,aAAa,CAAA;IAE7B,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACtE,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,YAA6B;IAC9D,IAAI,GAAG,aAAa,CAAA;IAE7B,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"SearchRelayList.js","sourceRoot":"","sources":["../../../../src/kinds/SearchRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,aAAa,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACnF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,wCAAwC;AACxC,MAAM,OAAO,qBAAsB,SAAQ,WAAW;IACpD,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,CAAC;CACF;AAED,MAAM,OAAO,qBAAsB,SAAQ,WAAkC;IAC3E,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CACtD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,WAAW,CAAC;IAC7C,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,qBAAqB;IAC7B,MAAM,EAAE,qBAAqB;CAC9B,CAAC,CAAA"}

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

@@ -1,12 +1,11 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class Thread extends EventReader {
-    readonly kind = 11;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class ThreadReader extends EventReader {
     title(): string | undefined;
-    builder(): ThreadBuilder;
 }
-export declare class ThreadBuilder extends EventBuilder<Thread> {
-    readonly kind = 11;
+export declare class ThreadWriter extends EventWriter<ThreadReader> {
     setTitle(title: string): this;
 }
+export declare const Thread: KindFactory<ThreadReader, ThreadWriter>;
 //# sourceMappingURL=Thread.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Thread.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Thread.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,MAAO,SAAQ,WAAW;IACrC,QAAQ,CAAC,IAAI,MAAS;IAEtB,KAAK;IAIL,OAAO;CAGR;AAED,qBAAa,aAAc,SAAQ,YAAY,CAAC,MAAM,CAAC;IACrD,QAAQ,CAAC,IAAI,MAAS;IAEtB,QAAQ,CAAC,KAAK,EAAE,MAAM;CAGvB"}
+{"version":3,"file":"Thread.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Thread.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,YAAa,SAAQ,WAAW;IAC3C,KAAK;CAGN;AAED,qBAAa,YAAa,SAAQ,WAAW,CAAC,YAAY,CAAC;IACzD,QAAQ,CAAC,KAAK,EAAE,MAAM;CAGvB;AAED,eAAO,MAAM,MAAM,yCAIjB,CAAA"}

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

@@ -1,21 +1,22 @@
 import { spec } from "@welshman/lib";
-import { THREAD, getTagValue } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { THREAD, tagSpec, tagValue } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-7D kind-11 forum thread root.
-export class Thread extends EventReader {
-    kind = THREAD;
+export class ThreadReader extends EventReader {
     title() {
-        return getTagValue("title", this.event.tags);
-    }
-    builder() {
-        return new ThreadBuilder(this);
+        return tagValue(tagSpec("title"), this.event.tags);
     }
 }
-export class ThreadBuilder extends EventBuilder {
-    kind = THREAD;
+export class ThreadWriter extends EventWriter {
     setTitle(title) {
         return this.dropTags(spec(["title"])).addTags(["title", title]);
     }
 }
+export const Thread = new KindFactory({
+    kind: THREAD,
+    reader: ThreadReader,
+    writer: ThreadWriter,
+});
 //# sourceMappingURL=Thread.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Thread.js","sourceRoot":"","sources":["../../../../src/kinds/Thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,oCAAoC;AACpC,MAAM,OAAO,MAAO,SAAQ,WAAW;IAC5B,IAAI,GAAG,MAAM,CAAA;IAEtB,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,OAAO;QACL,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,YAAoB;IAC5C,IAAI,GAAG,MAAM,CAAA;IAEtB,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;CACF"}
+{"version":3,"file":"Thread.js","sourceRoot":"","sources":["../../../../src/kinds/Thread.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,oCAAoC;AACpC,MAAM,OAAO,YAAa,SAAQ,WAAW;IAC3C,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,WAAyB;IACzD,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;CACF;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC;IACpC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,YAAY;CACrB,CAAC,CAAA"}

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

@@ -1,21 +1,20 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class TimeEvent extends EventReader {
-    readonly kind = 31923;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+import type { KindContext } from "../core/Kind.js";
+export declare class TimeEventReader extends EventReader {
     title(): string | undefined;
     location(): string | undefined;
     start(): number | undefined;
     end(): number | undefined;
-    builder(): TimeEventBuilder;
 }
-export declare class TimeEventBuilder extends EventBuilder<TimeEvent> {
-    readonly reader?: TimeEvent | undefined;
-    readonly kind = 31923;
-    constructor(reader?: TimeEvent | undefined);
+export declare class TimeEventWriter extends EventWriter<TimeEventReader> {
+    constructor(kind: number, context: KindContext, reader?: TimeEventReader);
     setTitle(title: string): this;
     setLocation(location: string): this;
     setStart(start: number): this;
     setEnd(end: number): this;
-    protected buildTags(): string[][];
+    protected renderDomainTags(): string[][];
 }
+export declare const TimeEvent: KindFactory<TimeEventReader, TimeEventWriter>;
 //# sourceMappingURL=TimeEvent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TimeEvent.d.ts","sourceRoot":"","sources":["../../../../src/kinds/TimeEvent.ts"],"names":[],"mappings":"AAEA,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,SAAa;IAE1B,KAAK;IAIL,QAAQ;IAIR,KAAK;IAML,GAAG;IAMH,OAAO;CAGR;AAED,qBAAa,gBAAiB,SAAQ,YAAY,CAAC,SAAS,CAAC;IAG/C,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS;IAFvC,QAAQ,CAAC,IAAI,SAAa;gBAEL,MAAM,CAAC,EAAE,SAAS,YAAA;IAMvC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,WAAW,CAAC,QAAQ,EAAE,MAAM;IAI5B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,SAAS;CAcpB"}
+{"version":3,"file":"TimeEvent.d.ts","sourceRoot":"","sources":["../../../../src/kinds/TimeEvent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAY,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAGhD,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,KAAK;IAIL,QAAQ;IAIR,KAAK;IAML,GAAG;CAKJ;AAED,qBAAa,eAAgB,SAAQ,WAAW,CAAC,eAAe,CAAC;gBACnD,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,eAAe;IASxE,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,WAAW,CAAC,QAAQ,EAAE,MAAM;IAI5B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,gBAAgB;CAc3B;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}

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

@@ -1,35 +1,31 @@
 import { range, DAY, spec } from "@welshman/lib";
-import { EVENT_TIME, getTagValue } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { EVENT_TIME, tagSpec, tagValue } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter, TagParser } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-52 kind-31923 time-based calendar event.
-export class TimeEvent extends EventReader {
-    kind = EVENT_TIME;
+export class TimeEventReader extends EventReader {
     title() {
-        return getTagValue("title", this.event.tags);
+        return tagValue(tagSpec("title"), this.event.tags);
     }
     location() {
-        return getTagValue("location", this.event.tags);
+        return tagValue(tagSpec("location"), this.event.tags);
     }
     start() {
-        const start = parseInt(getTagValue("start", this.event.tags));
+        const start = parseInt(tagValue(tagSpec("start"), this.event.tags));
         return isNaN(start) ? undefined : start;
     }
     end() {
-        const end = parseInt(getTagValue("end", this.event.tags));
+        const end = parseInt(tagValue(tagSpec("end"), this.event.tags));
         return isNaN(end) ? undefined : end;
     }
-    builder() {
-        return new TimeEventBuilder(this);
-    }
 }
-export class TimeEventBuilder extends EventBuilder {
-    reader;
-    kind = EVENT_TIME;
-    constructor(reader) {
-        super(reader);
-        this.reader = reader;
-        this.consumeTags("D");
+export class TimeEventWriter extends EventWriter {
+    constructor(kind, context, reader) {
+        super(kind, context, reader);
+        const parser = new TagParser(this.extraTags);
+        parser.consume("D");
+        this.extraTags = parser.tags;
     }
     setTitle(title) {
         return this.dropTags(spec(["title"])).addTags(["title", title]);
@@ -43,10 +39,10 @@ export class TimeEventBuilder extends EventBuilder {
     setEnd(end) {
         return this.dropTags(spec(["end"])).addTags(["end", String(end)]);
     }
-    buildTags() {
+    renderDomainTags() {
         const tags = [];
-        const start = parseInt(this.extraTags.find(spec(["start"]))?.[1] ?? "");
-        const end = parseInt(this.extraTags.find(spec(["end"]))?.[1] ?? "");
+        const start = parseInt((this.extraTags.find(spec(["start"]))?.[1] ?? ""));
+        const end = parseInt((this.extraTags.find(spec(["end"]))?.[1] ?? ""));
         if (!isNaN(start) && !isNaN(end)) {
             for (const t of range(start, end, DAY)) {
                 tags.push(["D", String(Math.floor(t / DAY))]);
@@ -55,4 +51,9 @@ export class TimeEventBuilder extends EventBuilder {
         return tags;
     }
 }
+export const TimeEvent = new KindFactory({
+    kind: EVENT_TIME,
+    reader: TimeEventReader,
+    writer: TimeEventWriter,
+});
 //# sourceMappingURL=TimeEvent.js.map

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

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

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

@@ -1,17 +1,16 @@
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
-export declare class TopicList extends ListReader {
-    readonly kind = 10015;
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class TopicListReader extends ListReader {
     topics(): string[];
     addresses(): string[];
     includes(topic: string): boolean;
-    builder(): TopicListBuilder;
 }
-export declare class TopicListBuilder extends ListBuilder<TopicList> {
-    readonly kind = 10015;
+export declare class TopicListWriter extends ListWriter<TopicListReader> {
     followPublicly(topic: string): this;
     followPrivately(topic: string): this;
     follow(topic: string): this;
     unfollow(topic: string): this;
 }
+export declare const TopicList: KindFactory<TopicListReader, TopicListWriter>;
 //# sourceMappingURL=TopicList.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TopicList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/TopicList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAG7C,qBAAa,SAAU,SAAQ,UAAU;IACvC,QAAQ,CAAC,IAAI,SAAS;IAEtB,MAAM;IAIN,SAAS;IAIT,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,OAAO;CAGR;AAED,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,SAAS,CAAC;IAC1D,QAAQ,CAAC,IAAI,SAAS;IAEtB,cAAc,CAAC,KAAK,EAAE,MAAM;IAI5B,eAAe,CAAC,KAAK,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK,EAAE,MAAM;IAIpB,QAAQ,CAAC,KAAK,EAAE,MAAM;CAGvB"}
+{"version":3,"file":"TopicList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/TopicList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAG3C,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,MAAM;IAIN,SAAS;IAIT,QAAQ,CAAC,KAAK,EAAE,MAAM;CAGvB;AAED,qBAAa,eAAgB,SAAQ,UAAU,CAAC,eAAe,CAAC;IAC9D,cAAc,CAAC,KAAK,EAAE,MAAM;IAI5B,eAAe,CAAC,KAAK,EAAE,MAAM;IAI7B,MAAM,CAAC,KAAK,EAAE,MAAM;IAIpB,QAAQ,CAAC,KAAK,EAAE,MAAM;CAGvB;AAED,eAAO,MAAM,SAAS,+CAIpB,CAAA"}

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

@@ -1,25 +1,21 @@
 import { uniq, spec } from "@welshman/lib";
-import { TOPICS, getTopicTagValues, getAddressTagValues } from "@welshman/util";
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
+import { TOPICS, addressTags, tagValues, topicTags } from "@welshman/util";
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-51 kind-10015 interests/topics list.
-export class TopicList extends ListReader {
-    kind = TOPICS;
+export class TopicListReader extends ListReader {
     topics() {
-        return uniq(getTopicTagValues(this.tags()));
+        return uniq(tagValues(topicTags("t"), this.tags()));
     }
     addresses() {
-        return uniq(getAddressTagValues(this.tags()));
+        return uniq(tagValues(addressTags("a"), this.tags()));
     }
     includes(topic) {
         return this.topics().includes(topic);
     }
-    builder() {
-        return new TopicListBuilder(this);
-    }
 }
-export class TopicListBuilder extends ListBuilder {
-    kind = TOPICS;
+export class TopicListWriter extends ListWriter {
     followPublicly(topic) {
         return this.addPublic(["t", topic]);
     }
@@ -33,4 +29,9 @@ export class TopicListBuilder extends ListBuilder {
         return this.dropTags(spec(["t", topic]));
     }
 }
+export const TopicList = new KindFactory({
+    kind: TOPICS,
+    reader: TopicListReader,
+    writer: TopicListWriter,
+});
 //# sourceMappingURL=TopicList.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"TopicList.js","sourceRoot":"","sources":["../../../../src/kinds/TopicList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,MAAM,EAAE,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAA;AAC7E,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAE7C,2CAA2C;AAC3C,MAAM,OAAO,SAAU,SAAQ,UAAU;IAC9B,IAAI,GAAG,MAAM,CAAA;IAEtB,MAAM;QACJ,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAA;IACnC,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,WAAsB;IACjD,IAAI,GAAG,MAAM,CAAA;IAEtB,cAAc,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACrC,CAAC;IAED,eAAe,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;IAC1C,CAAC;CACF"}
+{"version":3,"file":"TopicList.js","sourceRoot":"","sources":["../../../../src/kinds/TopicList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACxE,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,2CAA2C;AAC3C,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAC7C,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACtC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,UAA2B;IAC9D,cAAc,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACrC,CAAC;IAED,eAAe,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,MAAM,CAAC,KAAa;QAClB,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IACnC,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC;IACvC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;CACxB,CAAC,CAAA"}

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

@@ -1,20 +1,26 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class ZapGoal extends EventReader {
-    readonly kind = 9041;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+import type { KindContext } from "../core/Kind.js";
+export declare class ZapGoalReader extends EventReader {
     title(): string;
     summary(): string | undefined;
+    image(): string | undefined;
     amount(): number;
     urls(): string[];
-    builder(): ZapGoalBuilder;
+    closedAt(): number | undefined;
 }
-export declare class ZapGoalBuilder extends EventBuilder<ZapGoal> {
-    readonly kind = 9041;
-    constructor(reader?: ZapGoal);
+export declare class ZapGoalWriter extends EventWriter<ZapGoalReader> {
+    constructor(kind: number, context: KindContext, reader?: ZapGoalReader);
+    private ensureAmount;
     setTitle(title: string): this;
     setSummary(summary: string): this;
     setAmount(amount: number): this;
+    setImage(image: string): this;
+    setClosedAt(closedAt: number): this;
+    clearClosedAt(): this;
     setUrls(urls: string[]): this;
-    protected validate(): void;
+    validate(): void;
 }
+export declare const ZapGoal: KindFactory<ZapGoalReader, ZapGoalWriter>;
 //# sourceMappingURL=ZapGoal.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ZapGoal.d.ts","sourceRoot":"","sources":["../../../../src/kinds/ZapGoal.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,OAAQ,SAAQ,WAAW;IACtC,QAAQ,CAAC,IAAI,QAAW;IAExB,KAAK;IAIL,OAAO;IAIP,MAAM;IAIN,IAAI;IAIJ,OAAO;CAGR;AAED,qBAAa,cAAe,SAAQ,YAAY,CAAC,OAAO,CAAC;IACvD,QAAQ,CAAC,IAAI,QAAW;gBAEZ,MAAM,CAAC,EAAE,OAAO;IAS5B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,UAAU,CAAC,OAAO,EAAE,MAAM;IAI1B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;IAItB,SAAS,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"ZapGoal.d.ts","sourceRoot":"","sources":["../../../../src/kinds/ZapGoal.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;AAC3C,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAGhD,qBAAa,aAAc,SAAQ,WAAW;IAC5C,KAAK;IAIL,OAAO;IAIP,KAAK;IAKL,MAAM;IAKN,IAAI;IAKJ,QAAQ;CAKT;AAED,qBAAa,aAAc,SAAQ,WAAW,CAAC,aAAa,CAAC;gBAC/C,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,aAAa;IAOtE,OAAO,CAAC,YAAY;IAMpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,UAAU,CAAC,OAAO,EAAE,MAAM;IAI1B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,WAAW,CAAC,QAAQ,EAAE,MAAM;IAI5B,aAAa;IAKb,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;IAMtB,QAAQ;CAYT;AAED,eAAO,MAAM,OAAO,2CAIlB,CAAA"}