@welshman/app 0.9.0-pre1 → 0.9.0-pre2

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

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

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

@@ -1,6 +1,7 @@
 import type { TrustedEvent } 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";
 export type PollType = "singlechoice" | "multiplechoice";
 export type PollOption = {
     id: string;
@@ -14,8 +15,7 @@ export type PollResult = {
     }[];
     voters: number;
 };
-export declare class Poll extends EventReader {
-    readonly kind = 1068;
+export declare class PollReader extends EventReader {
     title(): string;
     options(): PollOption[];
     pollType(): PollType;
@@ -23,15 +23,14 @@ export declare class Poll extends EventReader {
     isClosed(): boolean;
     urls(): string[];
     results(responses: TrustedEvent[]): PollResult;
-    builder(): PollBuilder;
 }
-export declare class PollBuilder extends EventBuilder<Poll> {
-    readonly kind = 1068;
+export declare class PollWriter extends EventWriter<PollReader> {
     setTitle(title: string): this;
     addOption(label: string, id?: string): this;
     setPollType(pollType: PollType): this;
     setEndsAt(endsAt: number): this;
     setUrls(urls: string[]): this;
-    protected validate(): void;
+    validate(): void;
 }
+export declare const Poll: KindFactory<PollReader, PollWriter>;
 //# sourceMappingURL=Poll.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Poll.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Poll.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,MAAM,MAAM,QAAQ,GAAG,cAAc,GAAG,gBAAgB,CAAA;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,EAAE,CAAA;IACrD,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAGD,qBAAa,IAAK,SAAQ,WAAW;IACnC,QAAQ,CAAC,IAAI,QAAO;IAEpB,KAAK;IAIL,OAAO,IAAI,UAAU,EAAE;IAIvB,QAAQ,IAAI,QAAQ;IAIpB,MAAM;IAMN,QAAQ;IAMR,IAAI;IAIJ,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,UAAU;IA8B9C,OAAO;CAGR;AAED,qBAAa,WAAY,SAAQ,YAAY,CAAC,IAAI,CAAC;IACjD,QAAQ,CAAC,IAAI,QAAO;IAEpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAa;IAIxC,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;IAItB,SAAS,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"Poll.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Poll.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,MAAM,MAAM,QAAQ,GAAG,cAAc,GAAG,gBAAgB,CAAA;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,EAAE,CAAA;IACrD,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAGD,qBAAa,UAAW,SAAQ,WAAW;IACzC,KAAK;IAIL,OAAO,IAAI,UAAU,EAAE;IAIvB,QAAQ,IAAI,QAAQ;IAIpB,MAAM;IAMN,QAAQ;IAMR,IAAI;IAIJ,OAAO,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,UAAU;CA6B/C;AAED,qBAAa,UAAW,SAAQ,WAAW,CAAC,UAAU,CAAC;IACrD,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,SAAa;IAIxC,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;IAItB,QAAQ;CAOT;AAED,eAAO,MAAM,IAAI,qCAIf,CAAA"}

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

@@ -1,21 +1,21 @@
 import { now, uniq, randomId, spec } from "@welshman/lib";
-import { POLL, getTagValue, getTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { POLL, tagSpec, tagValue, tagValues } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-88 kind-1068 poll.
-export class Poll extends EventReader {
-    kind = POLL;
+export class PollReader extends EventReader {
     title() {
         return this.event.content || "";
     }
     options() {
-        return this.event.tags.filter(t => t[0] === "option").map(([, id, label = id]) => ({ id, label }));
+        return this.event.tags.filter(spec(["option"])).map(([, id, label = id]) => ({ id, label }));
     }
     pollType() {
-        return getTagValue("polltype", this.event.tags) || "singlechoice";
+        return tagValue(tagSpec("polltype"), this.event.tags) || "singlechoice";
     }
     endsAt() {
-        const endsAt = parseInt(getTagValue("endsAt", this.event.tags) ?? "");
+        const endsAt = parseInt(tagValue(tagSpec("endsAt"), this.event.tags) ?? "");
         return isNaN(endsAt) ? undefined : endsAt;
     }
     isClosed() {
@@ -23,7 +23,7 @@ export class Poll extends EventReader {
         return endsAt !== undefined && endsAt <= now();
     }
     urls() {
-        return getTagValues("relay", this.event.tags);
+        return tagValues(tagSpec("relay"), this.event.tags);
     }
     results(responses) {
         const options = this.options().map(option => ({ ...option, votes: 0 }));
@@ -37,7 +37,7 @@ export class Poll extends EventReader {
             }
         }
         for (const response of latestByPubkey.values()) {
-            const selections = getTagValues("response", response.tags);
+            const selections = tagValues(tagSpec("response"), response.tags);
             const ids = pollType === "singlechoice" ? selections.slice(0, 1) : uniq(selections);
             for (const id of ids) {
                 const option = counts.get(id);
@@ -48,12 +48,8 @@ export class Poll extends EventReader {
         }
         return { options, voters: latestByPubkey.size };
     }
-    builder() {
-        return new PollBuilder(this);
-    }
 }
-export class PollBuilder extends EventBuilder {
-    kind = POLL;
+export class PollWriter extends EventWriter {
     setTitle(title) {
         this.content = title;
         return this;
@@ -77,4 +73,9 @@ export class PollBuilder extends EventBuilder {
         }
     }
 }
+export const Poll = new KindFactory({
+    kind: POLL,
+    reader: PollReader,
+    writer: PollWriter,
+});
 //# sourceMappingURL=Poll.js.map

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

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

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

@@ -1,15 +1,14 @@
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
-export declare class PollResponse extends EventReader {
-    readonly kind = 1018;
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class PollResponseReader extends EventReader {
     pollId(): string;
     selections(): string[];
-    builder(): PollResponseBuilder;
 }
-export declare class PollResponseBuilder extends EventBuilder<PollResponse> {
-    readonly kind = 1018;
+export declare class PollResponseWriter extends EventWriter<PollResponseReader> {
     setPollId(pollId: string): this;
     addSelection(id: string): this;
-    protected validate(): void;
+    validate(): void;
 }
+export declare const PollResponse: KindFactory<PollResponseReader, PollResponseWriter>;
 //# sourceMappingURL=PollResponse.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"PollResponse.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/PollResponse.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,YAAa,SAAQ,WAAW;IAC3C,QAAQ,CAAC,IAAI,QAAgB;IAE7B,MAAM;IAIN,UAAU;IAIV,OAAO;CAGR;AAED,qBAAa,mBAAoB,SAAQ,YAAY,CAAC,YAAY,CAAC;IACjE,QAAQ,CAAC,IAAI,QAAgB;IAE7B,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,YAAY,CAAC,EAAE,EAAE,MAAM;IAIvB,SAAS,CAAC,QAAQ;CAOnB"}
+{"version":3,"file":"PollResponse.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/PollResponse.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,kBAAmB,SAAQ,WAAW;IACjD,MAAM;IAIN,UAAU;CAGX;AAED,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,kBAAkB,CAAC;IACrE,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,YAAY,CAAC,EAAE,EAAE,MAAM;IAIvB,QAAQ;CAOT;AAED,eAAO,MAAM,YAAY,qDAIvB,CAAA"}

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

@@ -1,22 +1,18 @@
 import { uniq, spec } from "@welshman/lib";
-import { POLL_RESPONSE, getTagValue, getTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { POLL_RESPONSE, tagSpec, tagValue, tagValues } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // NIP-88 kind-1018 poll response.
-export class PollResponse extends EventReader {
-    kind = POLL_RESPONSE;
+export class PollResponseReader extends EventReader {
     pollId() {
-        return getTagValue("e", this.event.tags) || "";
+        return tagValue(tagSpec("e"), this.event.tags) || "";
     }
     selections() {
-        return uniq(getTagValues("response", this.event.tags));
-    }
-    builder() {
-        return new PollResponseBuilder(this);
+        return uniq(tagValues(tagSpec("response"), this.event.tags));
     }
 }
-export class PollResponseBuilder extends EventBuilder {
-    kind = POLL_RESPONSE;
+export class PollResponseWriter extends EventWriter {
     setPollId(pollId) {
         return this.dropTags(spec(["e"])).addTags(["e", pollId]);
     }
@@ -30,4 +26,9 @@ export class PollResponseBuilder extends EventBuilder {
         }
     }
 }
+export const PollResponse = new KindFactory({
+    kind: POLL_RESPONSE,
+    reader: PollResponseReader,
+    writer: PollResponseWriter,
+});
 //# sourceMappingURL=PollResponse.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"PollResponse.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/PollResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,aAAa,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,kCAAkC;AAClC,MAAM,OAAO,YAAa,SAAQ,WAAW;IAClC,IAAI,GAAG,aAAa,CAAA;IAE7B,MAAM;QACJ,OAAO,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IAChD,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IACxD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,YAA0B;IACxD,IAAI,GAAG,aAAa,CAAA;IAE7B,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IAC1D,CAAC;IAED,YAAY,CAAC,EAAU;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAA;IACxE,CAAC;IAES,QAAQ;QAChB,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"PollResponse.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/PollResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AACxC,OAAO,EAAC,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,kCAAkC;AAClC,MAAM,OAAO,kBAAmB,SAAQ,WAAW;IACjD,MAAM;QACJ,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAA;IACtD,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9D,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,WAA+B;IACrE,SAAS,CAAC,MAAc;QACtB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;IAC1D,CAAC;IAED,YAAY,CAAC,EAAU;QACrB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAA;IACxE,CAAC;IAED,QAAQ;QACN,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEhB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;QACnD,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAC;IAC1C,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,kBAAkB;CAC3B,CAAC,CAAA"}

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

@@ -1,13 +1,13 @@
 import type { Maybe } from "@welshman/lib";
-import type { ISigner } from "@welshman/signer";
-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";
+import type { KindContext } from "../core/Kind.js";
 export declare const parseLnUrl: (values?: Record<string, any>) => Maybe<string>;
 export declare const displayPubkey: (pubkey: string) => string;
-export declare class Profile extends EventReader {
-    readonly kind = 0;
+export declare class ProfileReader extends EventReader {
     readonly values: Record<string, any>;
-    protected parse(signer?: ISigner): Promise<void>;
+    parse(): Promise<void>;
     name(): Maybe<string>;
     nip05(): Maybe<string>;
     lnurl(): Maybe<string>;
@@ -16,13 +16,10 @@ export declare class Profile extends EventReader {
     picture(): Maybe<string>;
     website(): Maybe<string>;
     display(fallback?: string): string;
-    builder(): ProfileBuilder;
 }
-export declare class ProfileBuilder extends EventBuilder<Profile> {
-    readonly reader?: Profile | undefined;
-    readonly kind = 0;
+export declare class ProfileWriter extends EventWriter<ProfileReader> {
     values: Record<string, any>;
-    constructor(reader?: Profile | undefined);
+    constructor(kind: number, context: KindContext, reader?: ProfileReader);
     update(values: Record<string, any>): this;
     setName(name: string): this;
     setNip05(nip05: string): this;
@@ -30,7 +27,7 @@ export declare class ProfileBuilder extends EventBuilder<Profile> {
     setBanner(banner: string): this;
     setPicture(picture: string): this;
     setWebsite(website: string): this;
-    protected buildTags(): never[];
-    protected buildContent(_signer?: ISigner): string;
+    renderContent(): string;
 }
+export declare const Profile: KindFactory<ProfileReader, ProfileWriter>;
 //# sourceMappingURL=Profile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Profile.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Profile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,eAAO,MAAM,UAAU,GAAI,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,KAAG,KAAK,CAAC,MAAM,CAUzE,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,WAI3C,CAAA;AAGD,qBAAa,OAAQ,SAAQ,WAAW;IACtC,QAAQ,CAAC,IAAI,KAAU;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;cAEzB,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO;IAQtC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;IAIrB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;IAIvB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO,CAAC,QAAQ,SAAK;IAQrB,OAAO;CAGR;AAED,qBAAa,cAAe,SAAQ,YAAY,CAAC,OAAO,CAAC;IAI3C,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO;IAHrC,QAAQ,CAAC,IAAI,KAAU;IACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;gBAEN,MAAM,CAAC,EAAE,OAAO,YAAA;IAKrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMlC,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,SAAS,CAAC,MAAM,EAAE,MAAM;IAMxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,SAAS,CAAC,SAAS;IAInB,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO;CAGzC"}
+{"version":3,"file":"Profile.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Profile.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,KAAK,EAAC,MAAM,eAAe,CAAA;AAExC,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;AAEhD,eAAO,MAAM,UAAU,GAAI,SAAQ,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,KAAG,KAAK,CAAC,MAAM,CAUzE,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,QAAQ,MAAM,WAI3C,CAAA;AAGD,qBAAa,aAAc,SAAQ,WAAW;IAC5C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;IAEnC,KAAK;IAQX,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;IAIrB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAItB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;IAIvB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC;IAIxB,OAAO,CAAC,QAAQ,SAAK;CAOtB;AAED,qBAAa,aAAc,SAAQ,WAAW,CAAC,aAAa,CAAC;IAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAK;gBAEpB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,aAAa;IAMtE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMlC,OAAO,CAAC,IAAI,EAAE,MAAM;IAMpB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,QAAQ,CAAC,KAAK,EAAE,MAAM;IAMtB,SAAS,CAAC,MAAM,EAAE,MAAM;IAMxB,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,UAAU,CAAC,OAAO,EAAE,MAAM;IAM1B,aAAa;CAGd;AAED,eAAO,MAAM,OAAO,2CAIlB,CAAA"}