@welshman/domain 0.9.0-pre1 → 0.9.0-pre3

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

@@ -1,19 +1,15 @@
 import { uniqBy, spec } from "@welshman/lib";
-import { MESSAGING_RELAYS, getTagValues, normalizeRelayUrl } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { MESSAGING_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-17 kind-10050 messaging/inbox relays list.
-export class MessagingRelayList extends EventReader {
-    kind = MESSAGING_RELAYS;
+export class MessagingRelayListReader extends EventReader {
     urls() {
-        return uniqBy(normalizeRelayUrl, getTagValues("relay", this.tags()));
-    }
-    builder() {
-        return new MessagingRelayListBuilder(this);
+        return uniqBy(normalizeRelayUrl, tagValues(tagSpec("relay"), this.tags()));
     }
 }
-export class MessagingRelayListBuilder extends EventBuilder {
-    kind = MESSAGING_RELAYS;
+export class MessagingRelayListWriter extends EventWriter {
     addUrl(url) {
         return this.addTags(["relay", normalizeRelayUrl(url)]);
     }
@@ -24,4 +20,9 @@ export class MessagingRelayListBuilder extends EventBuilder {
         return this.dropTags(spec(["relay"])).addTags(...urls.map(url => ["relay", normalizeRelayUrl(url)]));
     }
 }
+export const MessagingRelayList = new KindFactory({
+    kind: MESSAGING_RELAYS,
+    reader: MessagingRelayListReader,
+    writer: MessagingRelayListWriter,
+});
 //# sourceMappingURL=MessagingRelayList.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"MessagingRelayList.js","sourceRoot":"","sources":["../../../../src/kinds/MessagingRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAChF,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,iDAAiD;AACjD,MAAM,OAAO,kBAAmB,SAAQ,WAAW;IACxC,IAAI,GAAG,gBAAgB,CAAA;IAEhC,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACtE,CAAC;IAED,OAAO;QACL,OAAO,IAAI,yBAAyB,CAAC,IAAI,CAAC,CAAA;IAC5C,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,YAAgC;IACpE,IAAI,GAAG,gBAAgB,CAAA;IAEhC,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":"MessagingRelayList.js","sourceRoot":"","sources":["../../../../src/kinds/MessagingRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,gBAAgB,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACtF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,iDAAiD;AACjD,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IACvD,IAAI;QACF,OAAO,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,WAAqC;IACjF,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,kBAAkB,GAAG,IAAI,WAAW,CAAC;IAChD,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,wBAAwB;IAChC,MAAM,EAAE,wBAAwB;CACjC,CAAC,CAAA"}

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

@@ -1,15 +1,15 @@
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
-export declare class MuteList extends ListReader {
-    readonly kind = 10000;
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class MuteListReader extends ListReader {
     pubkeys(): string[];
     includes(pubkey: string): boolean;
-    builder(): MuteListBuilder;
 }
-export declare class MuteListBuilder extends ListBuilder<MuteList> {
-    readonly kind = 10000;
+export declare class MuteListWriter extends ListWriter<MuteListReader> {
+    protected renderRoutes(): Promise<import("@welshman/util").RelaySelection[]>;
     mutePublicly(pubkey: string): this;
     mutePrivately(pubkey: string): this;
     unmute(pubkey: string): this;
 }
+export declare const MuteList: KindFactory<MuteListReader, MuteListWriter>;
 //# sourceMappingURL=MuteList.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MuteList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/MuteList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAG7C,qBAAa,QAAS,SAAQ,UAAU;IACtC,QAAQ,CAAC,IAAI,SAAQ;IAErB,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;IAIvB,OAAO;CAGR;AAED,qBAAa,eAAgB,SAAQ,WAAW,CAAC,QAAQ,CAAC;IACxD,QAAQ,CAAC,IAAI,SAAQ;IAErB,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,MAAM,CAAC,MAAM,EAAE,MAAM;CAGtB"}
+{"version":3,"file":"MuteList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/MuteList.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,cAAe,SAAQ,UAAU;IAC5C,OAAO;IAIP,QAAQ,CAAC,MAAM,EAAE,MAAM;CAGxB;AAED,qBAAa,cAAe,SAAQ,UAAU,CAAC,cAAc,CAAC;cAC5C,YAAY;IAI5B,YAAY,CAAC,MAAM,EAAE,MAAM;IAI3B,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,MAAM,CAAC,MAAM,EAAE,MAAM;CAGtB;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}

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

@@ -1,22 +1,21 @@
 import { uniq, spec } from "@welshman/lib";
-import { MUTES, getPubkeyTagValues } from "@welshman/util";
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
+import { MUTES, hexTags, tagValues, userOutbox } from "@welshman/util";
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-51 kind-10000 mute list.
-export class MuteList extends ListReader {
-    kind = MUTES;
+export class MuteListReader extends ListReader {
     pubkeys() {
-        return uniq(getPubkeyTagValues(this.tags()));
+        return uniq(tagValues(hexTags("p"), this.tags()));
     }
     includes(pubkey) {
         return this.pubkeys().includes(pubkey);
     }
-    builder() {
-        return new MuteListBuilder(this);
-    }
 }
-export class MuteListBuilder extends ListBuilder {
-    kind = MUTES;
+export class MuteListWriter extends ListWriter {
+    async renderRoutes() {
+        return [userOutbox()];
+    }
     mutePublicly(pubkey) {
         return this.addPublic(["p", pubkey]);
     }
@@ -27,4 +26,9 @@ export class MuteListBuilder extends ListBuilder {
         return this.dropTags(spec(["p", pubkey]));
     }
 }
+export const MuteList = new KindFactory({
+    kind: MUTES,
+    reader: MuteListReader,
+    writer: MuteListWriter,
+});
 //# sourceMappingURL=MuteList.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"MuteList.js","sourceRoot":"","sources":["../../../../src/kinds/MuteList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,KAAK,EAAE,kBAAkB,EAAC,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAE7C,+BAA+B;AAC/B,MAAM,OAAO,QAAS,SAAQ,UAAU;IAC7B,IAAI,GAAG,KAAK,CAAA;IAErB,OAAO;QACL,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC9C,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,WAAqB;IAC/C,IAAI,GAAG,KAAK,CAAA;IAErB,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;CACF"}
+{"version":3,"file":"MuteList.js","sourceRoot":"","sources":["../../../../src/kinds/MuteList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAA;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,+BAA+B;AAC/B,MAAM,OAAO,cAAe,SAAQ,UAAU;IAC5C,OAAO;QACL,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,QAAQ,CAAC,MAAc;QACrB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,UAA0B;IAClD,KAAK,CAAC,YAAY;QAC1B,OAAO,CAAC,UAAU,EAAE,CAAC,CAAA;IACvB,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACtC,CAAC;IAED,aAAa,CAAC,MAAc;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,CAAC,MAAc;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,KAAK;IACX,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;CACvB,CAAC,CAAA"}

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

@@ -0,0 +1,18 @@
+import type { TrustedEvent } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare const getReplyTags: (tags: string[][]) => {
+    roots: string[][];
+    replies: string[][];
+    mentions: string[][];
+};
+export declare const getReplyTagValues: (tags: string[][]) => Record<string, string[]>;
+export declare class NoteReader extends EventReader {
+}
+export declare class NoteWriter extends EventWriter<NoteReader> {
+    setParent(event: TrustedEvent): this;
+    private eventRootsSelections;
+}
+export declare const Note: KindFactory<NoteReader, NoteWriter>;
+//# sourceMappingURL=Note.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Note.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Note.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,YAAY,EAAiB,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAI3C,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,EAAE;;;;CAkC5C,CAAA;AAED,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,EAAE,6BACK,CAAA;AAGvD,qBAAa,UAAW,SAAQ,WAAW;CAAG;AAE9C,qBAAa,UAAW,SAAQ,WAAW,CAAC,UAAU,CAAC;IAGrD,SAAS,CAAC,KAAK,EAAE,YAAY;IA+C7B,OAAO,CAAC,oBAAoB;CAa7B;AAED,eAAO,MAAM,IAAI,qCAIf,CAAA"}

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

@@ -0,0 +1,106 @@
+import { nth, nthEq, mapVals, uniq } from "@welshman/lib";
+import { NOTE, hexTags, matchTags, tagValues, getAddress, isReplaceable, isRelayUrl, isShareableRelayUrl, outbox, relays, } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+// NIP-10 reply threading tags, split into roots, replies, and mentions by their
+// markers (or positionally when unmarked). `q` tags are always mentions.
+export const getReplyTags = (tags) => {
+    const validTags = tags.filter(t => ["a", "e", "q"].includes(t[0]));
+    const mentionTags = validTags.filter(nthEq(0, "q"));
+    const roots = [];
+    const replies = [];
+    const mentions = [];
+    const dispatchTags = (thisTags) => thisTags.forEach((t, i) => {
+        if (t[3] === "root") {
+            if (validTags.filter(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(nthEq(0, "e")));
+    dispatchTags(validTags.filter(nthEq(0, "a")).filter(t => Boolean(t[3])));
+    mentionTags.forEach((t) => mentions.push(t));
+    return { roots, replies, mentions };
+};
+export const getReplyTagValues = (tags) => mapVals(tags => tags.map(nth(1)), getReplyTags(tags));
+// NIP-01 kind-1 short text note.
+export class NoteReader extends EventReader {
+}
+export class NoteWriter extends EventWriter {
+    // NIP-10 reply threading: p-tag the parent's participants, then e/a-tag the
+    // parent (and thread root) with the appropriate markers and relay hints.
+    setParent(event) {
+        for (const pubkey of uniq([event.pubkey, ...tagValues(hexTags("p"), event.tags)])) {
+            this.addMention(pubkey);
+        }
+        const { roots, replies } = getReplyTags(event.tags);
+        const parents = roots.length > 0 ? roots : replies;
+        const mark = parents.length > 0 ? "reply" : "root";
+        // If the parent carried roots use them, otherwise fall back to its replies.
+        for (const [k, id, originalHint = "", , pubkey = ""] of parents) {
+            if (isShareableRelayUrl(originalHint)) {
+                this.addTags([k, id, originalHint, "root", pubkey]);
+            }
+            else {
+                const tag = [k, id, "", "root", pubkey];
+                this.addTags(tag);
+                this.hint(...this.eventRootsSelections(event)).then(url => {
+                    tag[2] = url;
+                });
+            }
+        }
+        const eTag = ["e", event.id, "", mark, event.pubkey];
+        this.addTags(eTag);
+        this.hint(outbox(event.pubkey)).then(url => {
+            eTag[2] = url;
+        });
+        if (isReplaceable(event)) {
+            const aTag = ["a", getAddress(event), "", mark, event.pubkey];
+            this.addTags(aTag);
+            this.hint(outbox(event.pubkey)).then(url => {
+                aTag[2] = url;
+            });
+        }
+        return this;
+    }
+    // Relay selections for a reply's thread root: the roots' and mentions' authors
+    // plus any relay hints already present on those tags.
+    eventRootsSelections(event) {
+        const { roots } = getReplyTags(event.tags);
+        const mentions = matchTags(hexTags("p"), event.tags);
+        const authors = roots.map(nth(3)).filter(p => p?.length === 64);
+        const others = mentions.map(nth(1)).filter(p => p?.length === 64);
+        const relayUrls = uniq([...roots, ...mentions].map(nth(2)).filter(r => r && isRelayUrl(r)));
+        return [
+            ...authors.map(pubkey => outbox(pubkey, 10)),
+            ...others.map(pubkey => outbox(pubkey)),
+            ...relays(relayUrls),
+        ];
+    }
+}
+export const Note = new KindFactory({
+    kind: NOTE,
+    reader: NoteReader,
+    writer: NoteWriter,
+});
+//# sourceMappingURL=Note.js.map

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

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

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

@@ -1,5 +1,6 @@
-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";
 export type PinReference = {
     type: "event";
     id: string;
@@ -13,17 +14,14 @@ export type PinReference = {
     id: string;
     kind?: string;
 };
-export declare class Pin extends EventReader {
-    readonly kind = 39067;
+export declare class PinReader extends EventReader {
     boards(): string[];
     isProfilePin(): boolean;
     reference(): PinReference | undefined;
     title(): string | undefined;
     topics(): string[];
-    builder(): PinBuilder;
 }
-export declare class PinBuilder extends EventBuilder<Pin> {
-    readonly kind = 39067;
+export declare class PinWriter extends EventWriter<PinReader> {
     setTitle(title: string): this;
     addBoard(address: string): this;
     removeBoard(address: string): this;
@@ -32,6 +30,7 @@ export declare class PinBuilder extends EventBuilder<Pin> {
     setExternal(id: string, kind?: string): this;
     setTopics(topics: string[]): this;
     private dropReference;
-    protected validate(): void;
+    validate(): void;
 }
+export declare const Pin: KindFactory<PinReader, PinWriter>;
 //# sourceMappingURL=Pin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Pin.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Pin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAI/C,MAAM,MAAM,YAAY,GACpB;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAC,GAC3C;IAAC,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAC,GAClD;IAAC,IAAI,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAC,CAAA;AAOjD,qBAAa,GAAI,SAAQ,WAAW;IAClC,QAAQ,CAAC,IAAI,SAAM;IAEnB,MAAM;IAIN,YAAY;IAIZ,SAAS,IAAI,YAAY,GAAG,SAAS;IAcrC,KAAK;IAIL,MAAM;IAIN,OAAO;CAGR;AAED,qBAAa,UAAW,SAAQ,YAAY,CAAC,GAAG,CAAC;IAC/C,QAAQ,CAAC,IAAI,SAAM;IAEnB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,QAAQ,CAAC,OAAO,EAAE,MAAM;IAIxB,WAAW,CAAC,OAAO,EAAE,MAAM;IAI3B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAInC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAI1C,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAMrC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;IAK1B,OAAO,CAAC,aAAa;IAIrB,SAAS,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"Pin.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Pin.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;AAI3C,MAAM,MAAM,YAAY,GACpB;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAC,GAC3C;IAAC,IAAI,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAC,GAClD;IAAC,IAAI,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAC,CAAA;AASjD,qBAAa,SAAU,SAAQ,WAAW;IACxC,MAAM;IAIN,YAAY;IAIZ,SAAS,IAAI,YAAY,GAAG,SAAS;IAcrC,KAAK;IAIL,MAAM;CAGP;AAED,qBAAa,SAAU,SAAQ,WAAW,CAAC,SAAS,CAAC;IACnD,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,QAAQ,CAAC,OAAO,EAAE,MAAM;IAIxB,WAAW,CAAC,OAAO,EAAE,MAAM;IAI3B,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAInC,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAI1C,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAMrC,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;IAK1B,OAAO,CAAC,aAAa;IAIrB,QAAQ;CAOT;AAED,eAAO,MAAM,GAAG,mCAId,CAAA"}

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

@@ -1,42 +1,40 @@
 import { spec } from "@welshman/lib";
-import { PIN, getTag, getTagValue, getTagValues, getTopicTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { PIN, matchTag, tagSpec, tagValue, tagValues, topicTags } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 const REFERENCE_KEYS = ["e", "a", "i", "k"];
 // Pinboards-NIP kind-39067 pin — a single pinned item. Pins reference one or
-// more boards via `A` tags (none means it's a profile pin). Despite sitting in
-// the addressable range, a pin is a regular event with no `d` tag.
-export class Pin extends EventReader {
-    kind = PIN;
+// more boards via `A` tags (none means it's a profile pin). Kind 39067 sits in
+// the parameterized-replaceable range, so each pin needs its own unique `d`
+// tag (see `PinWriter`) — otherwise every pin from the same author would
+// collide at the same address and replace one another.
+export class PinReader extends EventReader {
     boards() {
-        return getTagValues("A", this.event.tags);
+        return tagValues(tagSpec("A"), this.event.tags);
     }
     isProfilePin() {
         return this.boards().length === 0;
     }
     reference() {
-        const e = getTag("e", this.event.tags);
+        const e = matchTag(tagSpec("e"), this.event.tags);
         if (e)
             return { type: "event", id: e[1], relay: e[2] };
-        const a = getTag("a", this.event.tags);
+        const a = matchTag(tagSpec("a"), this.event.tags);
         if (a)
             return { type: "address", address: a[1], relay: a[2] };
-        const i = getTag("i", this.event.tags);
+        const i = matchTag(tagSpec("i"), this.event.tags);
         if (i)
-            return { type: "external", id: i[1], kind: getTagValue("k", this.event.tags) };
+            return { type: "external", id: i[1], kind: tagValue(tagSpec("k"), this.event.tags) };
     }
     title() {
-        return getTagValue("title", this.event.tags);
+        return tagValue(tagSpec("title"), this.event.tags);
     }
     topics() {
-        return getTopicTagValues(this.event.tags);
-    }
-    builder() {
-        return new PinBuilder(this);
+        return tagValues(topicTags("t"), this.event.tags);
     }
 }
-export class PinBuilder extends EventBuilder {
-    kind = PIN;
+export class PinWriter extends EventWriter {
     setTitle(title) {
         return this.dropTags(spec(["title"])).addTags(["title", title]);
     }
@@ -64,11 +62,15 @@ export class PinBuilder extends EventBuilder {
         return this.dropTags(t => REFERENCE_KEYS.includes(t[0]));
     }
     validate() {
-        // A pin is a regular event (no `d` tag), so skip the base d-tag check and
-        // instead require the single content reference the spec mandates.
+        super.validate();
         if (!this.extraTags.some(t => ["e", "a", "i"].includes(t[0]))) {
             throw new Error("A pin must reference content via an e, a, or i tag");
         }
     }
 }
+export const Pin = new KindFactory({
+    kind: PIN,
+    reader: PinReader,
+    writer: PinWriter,
+});
 //# sourceMappingURL=Pin.js.map

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

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

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

@@ -1,15 +1,14 @@
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
-export declare class PinList extends ListReader {
-    readonly kind = 10001;
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class PinListReader extends ListReader {
     ids(): string[];
     addresses(): string[];
-    builder(): PinListBuilder;
 }
-export declare class PinListBuilder extends ListBuilder<PinList> {
-    readonly kind = 10001;
+export declare class PinListWriter extends ListWriter<PinListReader> {
     pinPublicly(tag: string[]): this;
     pinPrivately(tag: string[]): this;
     unpin(value: string): this;
 }
+export declare const PinList: KindFactory<PinListReader, PinListWriter>;
 //# sourceMappingURL=PinList.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PinList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/PinList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAG7C,qBAAa,OAAQ,SAAQ,UAAU;IACrC,QAAQ,CAAC,IAAI,SAAO;IAEpB,GAAG;IAIH,SAAS;IAIT,OAAO;CAGR;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,OAAO,CAAC;IACtD,QAAQ,CAAC,IAAI,SAAO;IAEpB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE;IAIzB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE;IAI1B,KAAK,CAAC,KAAK,EAAE,MAAM;CAGpB"}
+{"version":3,"file":"PinList.d.ts","sourceRoot":"","sources":["../../../../src/kinds/PinList.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,aAAc,SAAQ,UAAU;IAC3C,GAAG;IAIH,SAAS;CAGV;AAED,qBAAa,aAAc,SAAQ,UAAU,CAAC,aAAa,CAAC;IAC1D,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE;IAIzB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE;IAI1B,KAAK,CAAC,KAAK,EAAE,MAAM;CAGpB;AAED,eAAO,MAAM,OAAO,2CAIlB,CAAA"}

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

@@ -1,22 +1,18 @@
 import { uniq } from "@welshman/lib";
-import { PINS, getEventTagValues, getAddressTagValues } from "@welshman/util";
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
+import { PINS, addressTags, hexTags, tagValues } from "@welshman/util";
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-51 kind-10001 pin list.
-export class PinList extends ListReader {
-    kind = PINS;
+export class PinListReader extends ListReader {
     ids() {
-        return uniq(getEventTagValues(this.tags()));
+        return uniq(tagValues(hexTags("e"), this.tags()));
     }
     addresses() {
-        return uniq(getAddressTagValues(this.tags()));
-    }
-    builder() {
-        return new PinListBuilder(this);
+        return uniq(tagValues(addressTags("a"), this.tags()));
     }
 }
-export class PinListBuilder extends ListBuilder {
-    kind = PINS;
+export class PinListWriter extends ListWriter {
     pinPublicly(tag) {
         return this.addPublic(tag);
     }
@@ -27,4 +23,9 @@ export class PinListBuilder extends ListBuilder {
         return this.dropTags(t => ["e", "a"].includes(t[0]) && t[1] === value);
     }
 }
+export const PinList = new KindFactory({
+    kind: PINS,
+    reader: PinListReader,
+    writer: PinListWriter,
+});
 //# sourceMappingURL=PinList.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"PinList.js","sourceRoot":"","sources":["../../../../src/kinds/PinList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,IAAI,EAAE,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAA;AAC3E,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAE7C,8BAA8B;AAC9B,MAAM,OAAO,OAAQ,SAAQ,UAAU;IAC5B,IAAI,GAAG,IAAI,CAAA;IAEpB,GAAG;QACD,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,OAAO;QACL,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,WAAoB;IAC7C,IAAI,GAAG,IAAI,CAAA;IAEpB,WAAW,CAAC,GAAa;QACvB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IAED,YAAY,CAAC,GAAa;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAA;IACxE,CAAC;CACF"}
+{"version":3,"file":"PinList.js","sourceRoot":"","sources":["../../../../src/kinds/PinList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AACpE,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,8BAA8B;AAC9B,MAAM,OAAO,aAAc,SAAQ,UAAU;IAC3C,GAAG;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACvD,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,UAAyB;IAC1D,WAAW,CAAC,GAAa;QACvB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IAED,YAAY,CAAC,GAAa;QACxB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAA;IAClF,CAAC;CACF;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC;IACrC,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,aAAa;IACrB,MAAM,EAAE,aAAa;CACtB,CAAC,CAAA"}

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

@@ -1,21 +1,20 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class Pinboard extends EventReader {
-    readonly kind = 30067;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class PinboardReader extends EventReader {
     title(): string | undefined;
     description(): string | undefined;
     image(): string | undefined;
     topics(): string[];
     collaborative(): boolean;
-    builder(): PinboardBuilder;
 }
-export declare class PinboardBuilder extends EventBuilder<Pinboard> {
-    readonly kind = 30067;
+export declare class PinboardWriter extends EventWriter<PinboardReader> {
     setTitle(title: string): this;
     setDescription(description: string): this;
     setImage(image: string): this;
     setTopics(topics: string[]): this;
     setCollaborative(collaborative: boolean): this;
-    protected validate(): void;
+    validate(): void;
 }
+export declare const Pinboard: KindFactory<PinboardReader, PinboardWriter>;
 //# sourceMappingURL=Pinboard.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Pinboard.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Pinboard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAI/C,qBAAa,QAAS,SAAQ,WAAW;IACvC,QAAQ,CAAC,IAAI,SAAW;IAExB,KAAK;IAIL,WAAW;IAIX,KAAK;IAIL,MAAM;IAIN,aAAa;IAIb,OAAO;CAGR;AAED,qBAAa,eAAgB,SAAQ,YAAY,CAAC,QAAQ,CAAC;IACzD,QAAQ,CAAC,IAAI,SAAW;IAExB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,cAAc,CAAC,WAAW,EAAE,MAAM;IAIlC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;IAI1B,gBAAgB,CAAC,aAAa,EAAE,OAAO;IAMvC,SAAS,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"Pinboard.d.ts","sourceRoot":"","sources":["../../../../src/kinds/Pinboard.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;AAI3C,qBAAa,cAAe,SAAQ,WAAW;IAC7C,KAAK;IAIL,WAAW;IAIX,KAAK;IAIL,MAAM;IAIN,aAAa;CAGd;AAED,qBAAa,cAAe,SAAQ,WAAW,CAAC,cAAc,CAAC;IAC7D,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,cAAc,CAAC,WAAW,EAAE,MAAM;IAIlC,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;IAI1B,gBAAgB,CAAC,aAAa,EAAE,OAAO;IAMvC,QAAQ;CAOT;AAED,eAAO,MAAM,QAAQ,6CAInB,CAAA"}

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

@@ -1,32 +1,28 @@
 import { spec } from "@welshman/lib";
-import { PINBOARD, getTagValue, getTopicTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { PINBOARD, tagSpec, tagValue, tagValues, topicTags } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // Pinboards-NIP kind-30067 pinboard — addressable board metadata. Pins
 // themselves are separate kind-39067 events (see Pin).
-export class Pinboard extends EventReader {
-    kind = PINBOARD;
+export class PinboardReader extends EventReader {
     title() {
-        return getTagValue("title", this.event.tags);
+        return tagValue(tagSpec("title"), this.event.tags);
     }
     description() {
-        return getTagValue("description", this.event.tags);
+        return tagValue(tagSpec("description"), this.event.tags);
     }
     image() {
-        return getTagValue("image", this.event.tags);
+        return tagValue(tagSpec("image"), this.event.tags);
     }
     topics() {
-        return getTopicTagValues(this.event.tags);
+        return tagValues(topicTags("t"), this.event.tags);
     }
     collaborative() {
         return this.event.tags.some(spec(["collaborative"]));
     }
-    builder() {
-        return new PinboardBuilder(this);
-    }
 }
-export class PinboardBuilder extends EventBuilder {
-    kind = PINBOARD;
+export class PinboardWriter extends EventWriter {
     setTitle(title) {
         return this.dropTags(spec(["title"])).addTags(["title", title]);
     }
@@ -45,9 +41,14 @@ export class PinboardBuilder extends EventBuilder {
     }
     validate() {
         super.validate();
-        if (!getTagValue("title", this.extraTags)) {
+        if (!tagValue(tagSpec("title"), this.extraTags)) {
             throw new Error("A title is required for a pinboard");
         }
     }
 }
+export const Pinboard = new KindFactory({
+    kind: PINBOARD,
+    reader: PinboardReader,
+    writer: PinboardWriter,
+});
 //# sourceMappingURL=Pinboard.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"Pinboard.js","sourceRoot":"","sources":["../../../../src/kinds/Pinboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,uEAAuE;AACvE,uDAAuD;AACvD,MAAM,OAAO,QAAS,SAAQ,WAAW;IAC9B,IAAI,GAAG,QAAQ,CAAA;IAExB,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,WAAW;QACT,OAAO,WAAW,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,KAAK;QACH,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9C,CAAC;IAED,MAAM;QACJ,OAAO,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,eAAe,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,YAAsB;IAChD,IAAI,GAAG,QAAQ,CAAA;IAExB,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,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,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,MAAgB;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;IACjF,CAAC;IAED,gBAAgB,CAAC,aAAsB;QACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QAEtC,OAAO,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/D,CAAC;IAES,QAAQ;QAChB,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"Pinboard.js","sourceRoot":"","sources":["../../../../src/kinds/Pinboard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAChF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,uEAAuE;AACvE,uDAAuD;AACvD,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;IAED,WAAW;QACT,OAAO,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,KAAK;QACH,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACpD,CAAC;IAED,MAAM;QACJ,OAAO,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;IACtD,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,WAA2B;IAC7D,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,cAAc,CAAC,WAAmB;QAChC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,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,MAAgB;QACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAA;IACjF,CAAC;IAED,gBAAgB,CAAC,aAAsB;QACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;QAEtC,OAAO,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC/D,CAAC;IAED,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,SAAuB,CAAC,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC;IACtC,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;CACvB,CAAC,CAAA"}