@welshman/app 0.9.0-pre1 → 0.9.0-pre2

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

@@ -0,0 +1,84 @@
+import { parseJson } from "@welshman/lib";
+import { decrypt } from "@welshman/signer";
+import { APP_DATA } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
+// NIP-78 kind-30078 arbitrary app data, keyed by `d` tag. Content is JSON,
+// optionally NIP-44 encrypted to the author.
+export class AppDataReader extends EventReader {
+    decrypted = false;
+    encrypted = false;
+    json = undefined;
+    async parse() {
+        const { signer } = this.context;
+        if (!this.event.content) {
+            this.decrypted = true;
+            return;
+        }
+        const json = parseJson(this.event.content);
+        if (json !== undefined) {
+            this.json = json;
+            this.decrypted = true;
+            return;
+        }
+        this.encrypted = true;
+        if (signer && (await signer.getPubkey()) === this.event.pubkey) {
+            try {
+                this.json = parseJson(await decrypt(signer, this.event.pubkey, this.event.content));
+                this.decrypted = true;
+            }
+            catch {
+                // pass
+            }
+        }
+    }
+    values() {
+        return this.json;
+    }
+}
+export class AppDataWriter extends EventWriter {
+    values = undefined;
+    encrypted = false;
+    constructor(kind, context, reader) {
+        super(kind, context, reader);
+        this.values = reader?.values();
+        this.encrypted = reader?.encrypted ?? false;
+    }
+    setValues(values) {
+        this.values = values;
+        return this;
+    }
+    setEncrypted(encrypted) {
+        this.encrypted = encrypted;
+        return this;
+    }
+    validate() {
+        super.validate();
+        if (this.reader?.encrypted && this.reader?.decrypted === false && this.values !== undefined) {
+            throw new Error("Unable to modify app data when decryption was not performed");
+        }
+    }
+    async renderContent() {
+        // Preserve the original ciphertext when we never decrypted it.
+        if (this.reader?.decrypted === false)
+            return this.reader.event.content;
+        if (this.values === undefined)
+            return "";
+        const json = JSON.stringify(this.values);
+        if (!this.encrypted)
+            return json;
+        const { signer } = this.context;
+        if (!signer) {
+            throw new Error("A signer is required to encrypt app data");
+        }
+        const pubkey = await signer.getPubkey();
+        return signer.nip44.encrypt(pubkey, json);
+    }
+}
+export const AppData = new KindFactory({
+    kind: APP_DATA,
+    reader: AppDataReader,
+    writer: AppDataWriter,
+});
+//# sourceMappingURL=AppData.js.map

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

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

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"BlockedRelayList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlockedRelayList.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,SAAiB;IAE9B,IAAI;IAIJ,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,OAAO;CAGR;AAED,qBAAa,uBAAwB,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IACzE,QAAQ,CAAC,IAAI,SAAiB;IAE9B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB"}
+{"version":3,"file":"BlockedRelayList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlockedRelayList.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,IAAI;IAIJ,QAAQ,CAAC,GAAG,EAAE,MAAM;CAGrB;AAED,qBAAa,sBAAuB,SAAQ,WAAW,CAAC,sBAAsB,CAAC;IAC7E,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB;AAED,eAAO,MAAM,gBAAgB,6DAI3B,CAAA"}

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

@@ -1,22 +1,18 @@
 import { uniqBy, spec } from "@welshman/lib";
-import { BLOCKED_RELAYS, getTagValues, normalizeRelayUrl } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { BLOCKED_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-10006 blocked relays list.
-export class BlockedRelayList extends EventReader {
-    kind = BLOCKED_RELAYS;
+export class BlockedRelayListReader 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 BlockedRelayListBuilder(this);
-    }
 }
-export class BlockedRelayListBuilder extends EventBuilder {
-    kind = BLOCKED_RELAYS;
+export class BlockedRelayListWriter extends EventWriter {
     addUrl(url) {
         return this.addTags(["relay", normalizeRelayUrl(url)]);
     }
@@ -27,4 +23,9 @@ export class BlockedRelayListBuilder extends EventBuilder {
         return this.dropTags(spec(["relay"])).addTags(...urls.map(url => ["relay", normalizeRelayUrl(url)]));
     }
 }
+export const BlockedRelayList = new KindFactory({
+    kind: BLOCKED_RELAYS,
+    reader: BlockedRelayListReader,
+    writer: BlockedRelayListWriter,
+});
 //# sourceMappingURL=BlockedRelayList.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"BlockedRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlockedRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,cAAc,EAAE,YAAY,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AAC9E,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,yCAAyC;AACzC,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IACtC,IAAI,GAAG,cAAc,CAAA;IAE9B,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,uBAAuB,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC;CACF;AAED,MAAM,OAAO,uBAAwB,SAAQ,YAA8B;IAChE,IAAI,GAAG,cAAc,CAAA;IAE9B,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":"BlockedRelayList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlockedRelayList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,IAAI,EAAC,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAC,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAA;AACpF,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,yCAAyC;AACzC,MAAM,OAAO,sBAAuB,SAAQ,WAAW;IACrD,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,sBAAuB,SAAQ,WAAmC;IAC7E,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,gBAAgB,GAAG,IAAI,WAAW,CAAC;IAC9C,IAAI,EAAE,cAAc;IACpB,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,sBAAsB;CAC/B,CAAC,CAAA"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"BlossomServerList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlossomServerList.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAG/C,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,QAAQ,CAAC,IAAI,SAAkB;IAE/B,IAAI;IAIJ,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,OAAO;CAGR;AAED,qBAAa,wBAAyB,SAAQ,YAAY,CAAC,iBAAiB,CAAC;IAC3E,QAAQ,CAAC,IAAI,SAAkB;IAE/B,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB"}
+{"version":3,"file":"BlossomServerList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlossomServerList.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,uBAAwB,SAAQ,WAAW;IACtD,IAAI;IAIJ,QAAQ,CAAC,GAAG,EAAE,MAAM;CAGrB;AAED,qBAAa,uBAAwB,SAAQ,WAAW,CAAC,uBAAuB,CAAC;IAC/E,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;CAKvB;AAED,eAAO,MAAM,iBAAiB,+DAI5B,CAAA"}

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

@@ -1,22 +1,18 @@
 import { uniq, spec, normalizeUrl } from "@welshman/lib";
-import { BLOSSOM_SERVERS, getTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { BLOSSOM_SERVERS, tagSpec, tagValues } from "@welshman/util";
+import { EventReader } from "../core/EventReader.js";
+import { EventWriter } from "../core/EventWriter.js";
+import { KindFactory } from "../core/Kind.js";
 // Blossom BUD-03 kind-10063 user server list.
-export class BlossomServerList extends EventReader {
-    kind = BLOSSOM_SERVERS;
+export class BlossomServerListReader extends EventReader {
     urls() {
-        return uniq(getTagValues("server", this.tags()).map(url => normalizeUrl(url)));
+        return uniq(tagValues(tagSpec("server"), this.tags()).map(url => normalizeUrl(url)));
     }
     includes(url) {
         return this.urls().includes(normalizeUrl(url));
     }
-    builder() {
-        return new BlossomServerListBuilder(this);
-    }
 }
-export class BlossomServerListBuilder extends EventBuilder {
-    kind = BLOSSOM_SERVERS;
+export class BlossomServerListWriter extends EventWriter {
     addUrl(url) {
         return this.addTags(["server", normalizeUrl(url)]);
     }
@@ -27,4 +23,9 @@ export class BlossomServerListBuilder extends EventBuilder {
         return this.dropTags(spec(["server"])).addTags(...urls.map(url => ["server", normalizeUrl(url)]));
     }
 }
+export const BlossomServerList = new KindFactory({
+    kind: BLOSSOM_SERVERS,
+    reader: BlossomServerListReader,
+    writer: BlossomServerListWriter,
+});
 //# sourceMappingURL=BlossomServerList.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"BlossomServerList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlossomServerList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAC,MAAM,eAAe,CAAA;AACtD,OAAO,EAAC,eAAe,EAAE,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,8CAA8C;AAC9C,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IACvC,IAAI,GAAG,eAAe,CAAA;IAE/B,IAAI;QACF,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IAChF,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;IAChD,CAAC;IAED,OAAO;QACL,OAAO,IAAI,wBAAwB,CAAC,IAAI,CAAC,CAAA;IAC3C,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,YAA+B;IAClE,IAAI,GAAG,eAAe,CAAA;IAE/B,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAC5C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAClD,CAAA;IACH,CAAC;CACF"}
+{"version":3,"file":"BlossomServerList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BlossomServerList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,YAAY,EAAC,MAAM,eAAe,CAAA;AACtD,OAAO,EAAC,eAAe,EAAE,OAAO,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAClE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAA;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,8CAA8C;AAC9C,MAAM,OAAO,uBAAwB,SAAQ,WAAW;IACtD,IAAI;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACtF,CAAC;IAED,QAAQ,CAAC,GAAW;QAClB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;IAChD,CAAC;CACF;AAED,MAAM,OAAO,uBAAwB,SAAQ,WAAoC;IAC/E,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACpD,CAAC;IAED,SAAS,CAAC,GAAW;QACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3D,CAAC;IAED,OAAO,CAAC,IAAc;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAC5C,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAClD,CAAA;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,WAAW,CAAC;IAC/C,IAAI,EAAE,eAAe;IACrB,MAAM,EAAE,uBAAuB;IAC/B,MAAM,EAAE,uBAAuB;CAChC,CAAC,CAAA"}

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

@@ -1,17 +1,16 @@
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
-export declare class BookmarkList extends ListReader {
-    readonly kind = 10003;
+import { ListReader } from "../core/ListReader.js";
+import { ListWriter } from "../core/ListWriter.js";
+import { KindFactory } from "../core/Kind.js";
+export declare class BookmarkListReader extends ListReader {
     ids(): string[];
     addresses(): string[];
     topics(): string[];
     urls(): string[];
-    builder(): BookmarkListBuilder;
 }
-export declare class BookmarkListBuilder extends ListBuilder<BookmarkList> {
-    readonly kind = 10003;
+export declare class BookmarkListWriter extends ListWriter<BookmarkListReader> {
     bookmarkPublicly(tag: string[]): this;
     bookmarkPrivately(tag: string[]): this;
     removeBookmark(value: string): this;
 }
+export declare const BookmarkList: KindFactory<BookmarkListReader, BookmarkListWriter>;
 //# sourceMappingURL=BookmarkList.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"BookmarkList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/BookmarkList.ts"],"names":[],"mappings":"AAQA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAG7C,qBAAa,YAAa,SAAQ,UAAU;IAC1C,QAAQ,CAAC,IAAI,SAAY;IAEzB,GAAG;IAIH,SAAS;IAIT,MAAM;IAIN,IAAI;IAIJ,OAAO;CAGR;AAED,qBAAa,mBAAoB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAChE,QAAQ,CAAC,IAAI,SAAY;IAEzB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE;IAI9B,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE;IAI/B,cAAc,CAAC,KAAK,EAAE,MAAM;CAG7B"}
+{"version":3,"file":"BookmarkList.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/BookmarkList.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,kBAAmB,SAAQ,UAAU;IAChD,GAAG;IAIH,SAAS;IAIT,MAAM;IAIN,IAAI;CAGL;AAED,qBAAa,kBAAmB,SAAQ,UAAU,CAAC,kBAAkB,CAAC;IACpE,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE;IAI9B,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE;IAI/B,cAAc,CAAC,KAAK,EAAE,MAAM;CAG7B;AAED,eAAO,MAAM,YAAY,qDAIvB,CAAA"}

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

@@ -1,28 +1,24 @@
 import { uniq } from "@welshman/lib";
-import { BOOKMARKS, getEventTagValues, getAddressTagValues, getTopicTagValues, getTagValues, } from "@welshman/util";
-import { ListReader } from "../ListReader.js";
-import { ListBuilder } from "../ListBuilder.js";
+import { BOOKMARKS, addressTags, hexTags, tagSpec, 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-10003 bookmark list.
-export class BookmarkList extends ListReader {
-    kind = BOOKMARKS;
+export class BookmarkListReader extends ListReader {
     ids() {
-        return uniq(getEventTagValues(this.tags()));
+        return uniq(tagValues(hexTags("e"), this.tags()));
     }
     addresses() {
-        return uniq(getAddressTagValues(this.tags()));
+        return uniq(tagValues(addressTags("a"), this.tags()));
     }
     topics() {
-        return uniq(getTopicTagValues(this.tags()));
+        return uniq(tagValues(topicTags("t"), this.tags()));
     }
     urls() {
-        return uniq(getTagValues("r", this.tags()));
-    }
-    builder() {
-        return new BookmarkListBuilder(this);
+        return uniq(tagValues(tagSpec("r"), this.tags()));
     }
 }
-export class BookmarkListBuilder extends ListBuilder {
-    kind = BOOKMARKS;
+export class BookmarkListWriter extends ListWriter {
     bookmarkPublicly(tag) {
         return this.addPublic(tag);
     }
@@ -33,4 +29,9 @@ export class BookmarkListBuilder extends ListBuilder {
         return this.dropTags(t => ["e", "a", "t", "r"].includes(t[0]) && t[1] === value);
     }
 }
+export const BookmarkList = new KindFactory({
+    kind: BOOKMARKS,
+    reader: BookmarkListReader,
+    writer: BookmarkListWriter,
+});
 //# sourceMappingURL=BookmarkList.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"BookmarkList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BookmarkList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EACL,SAAS,EACT,iBAAiB,EACjB,mBAAmB,EACnB,iBAAiB,EACjB,YAAY,GACb,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAE7C,mCAAmC;AACnC,MAAM,OAAO,YAAa,SAAQ,UAAU;IACjC,IAAI,GAAG,SAAS,CAAA;IAEzB,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,MAAM;QACJ,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,OAAO;QACL,OAAO,IAAI,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,WAAyB;IACvD,IAAI,GAAG,SAAS,CAAA;IAEzB,gBAAgB,CAAC,GAAa;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IAED,iBAAiB,CAAC,GAAa;QAC7B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAA;IAClF,CAAC;CACF"}
+{"version":3,"file":"BookmarkList.js","sourceRoot":"","sources":["../../../../../domain/src/kinds/BookmarkList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,eAAe,CAAA;AAClC,OAAO,EAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAA;AAC7F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAA;AAE3C,mCAAmC;AACnC,MAAM,OAAO,kBAAmB,SAAQ,UAAU;IAChD,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;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACnD,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,UAA8B;IACpE,gBAAgB,CAAC,GAAa;QAC5B,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IAED,iBAAiB,CAAC,GAAa;QAC7B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAA;IAC5F,CAAC;CACF;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,WAAW,CAAC;IAC1C,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,kBAAkB;IAC1B,MAAM,EAAE,kBAAkB;CAC3B,CAAC,CAAA"}

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

@@ -1,22 +1,20 @@
-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 ClassifiedPrice = {
     amount: number;
     currency: string;
     frequency: string;
 };
-export declare class Classified extends EventReader {
-    readonly kind = 30402;
+export declare class ClassifiedReader extends EventReader {
     title(): string | undefined;
     summary(): string | undefined;
     price(): ClassifiedPrice | undefined;
     status(): string | undefined;
     images(): string[];
     topics(): string[];
-    builder(): ClassifiedBuilder;
 }
-export declare class ClassifiedBuilder extends EventBuilder<Classified> {
-    readonly kind = 30402;
+export declare class ClassifiedWriter extends EventWriter<ClassifiedReader> {
     setTitle(title: string): this;
     setSummary(summary: string): this;
     setPrice(amount: number, currency?: string, frequency?: string): this;
@@ -24,4 +22,5 @@ export declare class ClassifiedBuilder extends EventBuilder<Classified> {
     setImages(images: string[]): this;
     setTopics(topics: string[]): this;
 }
+export declare const Classified: KindFactory<ClassifiedReader, ClassifiedWriter>;
 //# sourceMappingURL=Classified.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Classified.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Classified.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAE/C,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAaD,qBAAa,UAAW,SAAQ,WAAW;IACzC,QAAQ,CAAC,IAAI,SAAa;IAE1B,KAAK;IAIL,OAAO;IAIP,KAAK,IAAI,eAAe,GAAG,SAAS;IAQpC,MAAM;IAIN,MAAM;IAIN,MAAM;IAIN,OAAO;CAGR;AAED,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,UAAU,CAAC;IAC7D,QAAQ,CAAC,IAAI,SAAa;IAE1B,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,UAAU,CAAC,OAAO,EAAE,MAAM;IAI1B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,SAAQ,EAAE,SAAS,SAAK;IASzD,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;IAI1B,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;CAG3B"}
+{"version":3,"file":"Classified.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Classified.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;AAE3C,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAaD,qBAAa,gBAAiB,SAAQ,WAAW;IAC/C,KAAK;IAIL,OAAO;IAIP,KAAK,IAAI,eAAe,GAAG,SAAS;IAQpC,MAAM;IAIN,MAAM;IAIN,MAAM;CAGP;AAED,qBAAa,gBAAiB,SAAQ,WAAW,CAAC,gBAAgB,CAAC;IACjE,QAAQ,CAAC,KAAK,EAAE,MAAM;IAItB,UAAU,CAAC,OAAO,EAAE,MAAM;IAI1B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,SAAQ,EAAE,SAAS,SAAK;IASzD,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;IAI1B,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE;CAG3B;AAED,eAAO,MAAM,UAAU,iDAIrB,CAAA"}

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

@@ -1,7 +1,8 @@
 import { spec } from "@welshman/lib";
-import { CLASSIFIED, getTag, getTagValue, getTagValues, getTopicTagValues } from "@welshman/util";
-import { EventReader } from "../EventReader.js";
-import { EventBuilder } from "../EventBuilder.js";
+import { CLASSIFIED, 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 parsePrice = ([, amount = "0", currency = "SAT", frequency = ""]) => {
     const value = parseFloat(amount);
     if (!isNaN(value)) {
@@ -9,35 +10,30 @@ const parsePrice = ([, amount = "0", currency = "SAT", frequency = ""]) => {
     }
 };
 // NIP-99 kind-30402 classified listing.
-export class Classified extends EventReader {
-    kind = CLASSIFIED;
+export class ClassifiedReader extends EventReader {
     title() {
-        return getTagValue("title", this.event.tags);
+        return tagValue(tagSpec("title"), this.event.tags);
     }
     summary() {
-        return getTagValue("summary", this.event.tags);
+        return tagValue(tagSpec("summary"), this.event.tags);
     }
     price() {
-        const tag = getTag("price", this.event.tags);
+        const tag = matchTag(tagSpec("price"), this.event.tags);
         if (tag) {
             return parsePrice(tag);
         }
     }
     status() {
-        return getTagValue("status", this.event.tags);
+        return tagValue(tagSpec("status"), this.event.tags);
     }
     images() {
-        return getTagValues("image", this.event.tags);
+        return tagValues(tagSpec("image"), this.event.tags);
     }
     topics() {
-        return getTopicTagValues(this.event.tags);
-    }
-    builder() {
-        return new ClassifiedBuilder(this);
+        return tagValues(topicTags("t"), this.event.tags);
     }
 }
-export class ClassifiedBuilder extends EventBuilder {
-    kind = CLASSIFIED;
+export class ClassifiedWriter extends EventWriter {
     setTitle(title) {
         return this.dropTags(spec(["title"])).addTags(["title", title]);
     }
@@ -62,4 +58,9 @@ export class ClassifiedBuilder extends EventBuilder {
         return this.dropTags(spec(["t"])).addTags(...topics.map(topic => ["t", topic]));
     }
 }
+export const Classified = new KindFactory({
+    kind: CLASSIFIED,
+    reader: ClassifiedReader,
+    writer: ClassifiedWriter,
+});
 //# sourceMappingURL=Classified.js.map

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

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

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

@@ -1,29 +1,33 @@
 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";
+import type { KindContext } from "../core/Kind.js";
+export declare const getCommentTags: (tags: string[][]) => {
+    roots: string[][];
+    replies: string[][];
+};
+export declare const getCommentTagValues: (tags: string[][]) => Record<string, string[]>;
 export type CommentRef = {
     id?: string;
     address?: string;
     kind?: string;
     pubkey?: string;
 };
-export declare class Comment extends EventReader {
-    readonly kind = 1111;
+export declare class CommentReader extends EventReader {
     root(): CommentRef;
     parent(): CommentRef;
-    builder(): CommentBuilder;
 }
-export declare class CommentBuilder extends EventBuilder<Comment> {
-    readonly reader?: Comment | undefined;
-    readonly kind = 1111;
+export declare class CommentWriter extends EventWriter<CommentReader> {
     rootTags: string[][];
     parentTags: string[][];
-    constructor(reader?: Comment | undefined);
+    constructor(kind: number, context: KindContext, reader?: CommentReader);
     private consumeRefTags;
     setRoot(kind: number, id: string, pubkey: string, identifier?: string): this;
     setParent(kind: number, id: string, pubkey: string, identifier?: string): this;
     setRootFromEvent(event: TrustedEvent): this;
     setParentFromEvent(event: TrustedEvent): this;
-    protected buildTags(): string[][];
+    protected renderDomainTags(): string[][];
 }
+export declare const Comment: KindFactory<CommentReader, CommentWriter>;
 //# sourceMappingURL=Comment.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Comment.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Comment.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,UAAU,GAAG;IACvB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAGD,qBAAa,OAAQ,SAAQ,WAAW;IACtC,QAAQ,CAAC,IAAI,QAAU;IAEvB,IAAI,IAAI,UAAU;IASlB,MAAM,IAAI,UAAU;IASpB,OAAO;CAGR;AAED,qBAAa,cAAe,SAAQ,YAAY,CAAC,OAAO,CAAC;IAM3C,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO;IALrC,QAAQ,CAAC,IAAI,QAAU;IAEvB,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAK;IACzB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAK;gBAEN,MAAM,CAAC,EAAE,OAAO,YAAA;IAOrC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAcrE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAcvE,gBAAgB,CAAC,KAAK,EAAE,YAAY;IAMpC,kBAAkB,CAAC,KAAK,EAAE,YAAY;IAMtC,SAAS,CAAC,SAAS;CAGpB"}
+{"version":3,"file":"Comment.d.ts","sourceRoot":"","sources":["../../../../../domain/src/kinds/Comment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAChD,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;AAIhD,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,EAAE;;;CAK9C,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,MAAM,MAAM,EAAE,EAAE,6BAIjD,CAAA;AAEH,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAGD,qBAAa,aAAc,SAAQ,WAAW;IAC5C,IAAI,IAAI,UAAU;IASlB,MAAM,IAAI,UAAU;CAQrB;AAED,qBAAa,aAAc,SAAQ,WAAW,CAAC,aAAa,CAAC;IAC3D,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAK;IACzB,UAAU,EAAE,MAAM,EAAE,EAAE,CAAK;gBAEf,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,aAAa;IAYtE,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAsBrE,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;IAsBvE,gBAAgB,CAAC,KAAK,EAAE,YAAY;IAMpC,kBAAkB,CAAC,KAAK,EAAE,YAAY;IAMtC,SAAS,CAAC,gBAAgB;CAG3B;AAED,eAAO,MAAM,OAAO,2CAIlB,CAAA"}