Remove mark methods from tags, move types dependencies to deps

packages/net/ConnectionMeta.ts

@@ -1,5 +1,5 @@
 import type {Event, Filter} from 'nostr-tools'
-import type {Message} from '@welshman/util'
+import type {Message} from './Socket'
 import type {Connection} from './Connection'
 
 export type PublishMeta = {

packages/net/Executor.ts

@@ -1,6 +1,6 @@
 import type {Event, Filter} from 'nostr-tools'
 import type {Emitter} from '@welshman/lib'
-import type {Message} from '@welshman/util'
+import type {Message} from './Socket'
 import type {Connection} from './Connection'
 import {NetworkContext} from './Context'
 

packages/net/Socket.ts

@@ -1,6 +1,7 @@
 import WebSocket from "isomorphic-ws"
 import {Deferred, defer} from '@welshman/lib'
-import type {Message} from '@welshman/util'
+
+export type Message = [string, ...any[]]
 
 export type PlexMessage = [{relays: string[]}, Message]
 

packages/net/package.json

@@ -26,7 +26,6 @@
     "fix": "gts fix"
   },
   "devDependencies": {
-    "@types/events": "^3.0.3",
     "gts": "^5.0.1",
     "tsc-multi": "^1.1.0",
     "typescript": "~5.1.6"

packages/net/target/Multi.ts

@@ -1,5 +1,5 @@
 import {Emitter} from '@welshman/lib'
-import type {Message} from '@welshman/util'
+import type {Message} from '../Socket'
 import type {Target} from '../Executor'
 
 export class Multi extends Emitter {

packages/net/target/Plex.ts

@@ -1,6 +1,5 @@
 import {Emitter} from '@welshman/lib'
-import type {Message} from '@welshman/util'
-import type {PlexMessage} from '../Socket'
+import type {PlexMessage, Message} from '../Socket'
 import type {Connection} from '../Connection'
 
 export class Plex extends Emitter {

packages/net/target/Relay.ts

@@ -1,5 +1,5 @@
 import {Emitter} from '@welshman/lib'
-import type {Message} from '@welshman/util'
+import type {Message} from '../Socket'
 import type {Connection} from '../Connection'
 
 export class Relay extends Emitter {

packages/net/target/Relays.ts

@@ -1,5 +1,5 @@
 import {Emitter} from '@welshman/lib'
-import type {Message} from '@welshman/util'
+import type {Message} from '../Socket'
 import type {Connection} from '../Connection'
 
 export class Relays extends Emitter {