Remove generics for event type

packages/util/package.json

@@ -32,6 +32,6 @@
   },
   "dependencies": {
     "@welshman/lib": "0.0.14",
-    "nostr-tools": "^2.3.2"
+    "nostr-tools": "^2.7.2"
   }
 }

packages/util/src/Events.ts

@@ -5,10 +5,13 @@ import {Tags} from './Tags'
 import {getAddress} from './Address'
 import {isEphemeralKind, isReplaceableKind, isPlainReplaceableKind, isParameterizedReplaceableKind} from './Kinds'
 
-export type EventTemplate = {
-  kind: number
+export type EventContent = {
   tags: string[][]
   content: string
+}
+
+export type EventTemplate = EventContent & {
+  kind: number
   created_at: number
 }
 
@@ -35,6 +38,8 @@ export type TrustedEvent = HashedEvent & {
   [verifiedSymbol]?: boolean
 }
 
+export type ExtensibleTrustedEvent = TrustedEvent & Record<string, any>
+
 export type CreateEventOpts = {
   content?: string
   tags?: string[][]

packages/util/src/Relay.ts

@@ -2,7 +2,7 @@ import {Emitter, normalizeUrl, sleep, stripProtocol} from '@welshman/lib'
 import {matchFilters} from './Filters'
 import type {Repository} from './Repository'
 import type {Filter} from './Filters'
-import type {TrustedEvent} from './Events'
+import type {ExtensibleTrustedEvent} from './Events'
 
 export const LOCAL_RELAY_URL = "local://welshman.relay"
 
@@ -48,22 +48,22 @@ export const normalizeRelayUrl = (url: string, {allowInsecure = false}: Normaliz
   return prefix + url
 }
 
-export class Relay<T extends TrustedEvent> extends Emitter {
+export class Relay extends Emitter {
   subs = new Map<string, Filter[]>()
 
-  constructor(readonly repository: Repository<T>) {
+  constructor(readonly repository: Repository) {
     super()
   }
 
   send(type: string, ...message: any[]) {
     switch(type) {
-      case 'EVENT': return this.handleEVENT(message as [T])
+      case 'EVENT': return this.handleEVENT(message as [ExtensibleTrustedEvent])
       case 'CLOSE': return this.handleCLOSE(message as [string])
       case 'REQ': return this.handleREQ(message as [string, ...Filter[]])
     }
   }
 
-  handleEVENT([event]: [T]) {
+  handleEVENT([event]: [ExtensibleTrustedEvent]) {
     this.repository.publish(event)
 
     // Callers generally expect async relays

packages/util/src/Repository.ts

@@ -4,19 +4,19 @@ import {EPOCH, matchFilter} from './Filters'
 import {isReplaceable, isTrustedEvent} from './Events'
 import {getAddress} from './Address'
 import type {Filter} from './Filters'
-import type {TrustedEvent} from './Events'
+import type {ExtensibleTrustedEvent} from './Events'
 
 export const DAY = 86400
 
 const getDay = (ts: number) => Math.floor(ts / DAY)
 
-export class Repository<T extends TrustedEvent> extends Emitter {
-  eventsById = new Map<string, T>()
-  eventsByWrap = new Map<string, T>()
-  eventsByAddress = new Map<string, T>()
-  eventsByTag = new Map<string, T[]>()
-  eventsByDay = new Map<number, T[]>()
-  eventsByAuthor = new Map<string, T[]>()
+export class Repository extends Emitter {
+  eventsById = new Map<string, ExtensibleTrustedEvent>()
+  eventsByWrap = new Map<string, ExtensibleTrustedEvent>()
+  eventsByAddress = new Map<string, ExtensibleTrustedEvent>()
+  eventsByTag = new Map<string, ExtensibleTrustedEvent[]>()
+  eventsByDay = new Map<number, ExtensibleTrustedEvent[]>()
+  eventsByAuthor = new Map<string, ExtensibleTrustedEvent[]>()
   deletes = new Map<string, number>()
 
   // Dump/load/clear
@@ -25,7 +25,7 @@ export class Repository<T extends TrustedEvent> extends Emitter {
     return Array.from(this.eventsById.values())
   }
 
-  load = async (events: T[], chunkSize = 1000) => {
+  load = async (events: ExtensibleTrustedEvent[], chunkSize = 1000) => {
     this.clear()
 
     const added = []
@@ -69,7 +69,7 @@ export class Repository<T extends TrustedEvent> extends Emitter {
       : this.eventsById.get(idOrAddress)
   }
 
-  hasEvent = (event: T) => {
+  hasEvent = (event: ExtensibleTrustedEvent) => {
     const duplicate = (
       this.eventsById.get(event.id) ||
       this.eventsByAddress.get(getAddress(event))
@@ -79,12 +79,12 @@ export class Repository<T extends TrustedEvent> extends Emitter {
   }
 
   query = (filters: Filter[], {includeDeleted = false} = {}) => {
-    const result: T[][] = []
+    const result: ExtensibleTrustedEvent[][] = []
     for (let filter of filters) {
-      let events: T[] = Array.from(this.eventsById.values())
+      let events: ExtensibleTrustedEvent[] = Array.from(this.eventsById.values())
 
       if (filter.ids) {
-        events = filter.ids!.map(id => this.eventsById.get(id)).filter(identity) as T[]
+        events = filter.ids!.map(id => this.eventsById.get(id)).filter(identity) as ExtensibleTrustedEvent[]
         filter = omit(['ids'], filter)
       } else if (filter.authors) {
         events = uniq(filter.authors!.flatMap(pubkey => this.eventsByAuthor.get(pubkey) || []))
@@ -112,8 +112,8 @@ export class Repository<T extends TrustedEvent> extends Emitter {
         }
       }
 
-      const chunk: T[] = []
-      for (const event of sortBy((e: T) => -e.created_at, events)) {
+      const chunk: ExtensibleTrustedEvent[] = []
+      for (const event of sortBy((e: ExtensibleTrustedEvent) => -e.created_at, events)) {
         if (filter.limit && chunk.length >= filter.limit) {
           break
         }
@@ -133,7 +133,7 @@ export class Repository<T extends TrustedEvent> extends Emitter {
     return uniq(flatten(result))
   }
 
-  publish = (event: T, {shouldNotify = true} = {}): boolean => {
+  publish = (event: ExtensibleTrustedEvent, {shouldNotify = true} = {}): boolean => {
     if (!isTrustedEvent(event)) {
       throw new Error("Invalid event published to Repository", event)
     }
@@ -203,19 +203,19 @@ export class Repository<T extends TrustedEvent> extends Emitter {
     return true
   }
 
-  isDeletedByAddress = (event: T) => (this.deletes.get(getAddress(event)) || 0) > event.created_at
+  isDeletedByAddress = (event: ExtensibleTrustedEvent) => (this.deletes.get(getAddress(event)) || 0) > event.created_at
 
-  isDeletedById = (event: T) => (this.deletes.get(event.id) || 0) > event.created_at
+  isDeletedById = (event: ExtensibleTrustedEvent) => (this.deletes.get(event.id) || 0) > event.created_at
 
-  isDeleted = (event: T) => this.isDeletedByAddress(event) || this.isDeletedById(event)
+  isDeleted = (event: ExtensibleTrustedEvent) => this.isDeletedByAddress(event) || this.isDeletedById(event)
 
   // Utilities
 
-  _updateIndex<K>(m: Map<K, T[]>, k: K, e: T, duplicate?: T) {
+  _updateIndex<K>(m: Map<K, ExtensibleTrustedEvent[]>, k: K, e: ExtensibleTrustedEvent, duplicate?: ExtensibleTrustedEvent) {
     let a = m.get(k) || []
 
     if (duplicate) {
-      a = a.filter((x: T) => x !== duplicate)
+      a = a.filter((x: ExtensibleTrustedEvent) => x !== duplicate)
     }
 
     a.push(e)