From 39ca2fe6aa662627786b7db84db3e054fc25d355 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Wed, 12 Jun 2024 09:34:45 -0700 Subject: [PATCH] Put everything in src directories --- packages/content/package.json | 8 ++++---- packages/content/{ => src}/index.ts | 0 packages/feeds/package.json | 8 ++++---- packages/feeds/{ => src}/compiler.ts | 0 packages/feeds/{ => src}/core.ts | 0 packages/feeds/{ => src}/index.ts | 0 packages/feeds/{ => src}/loader.ts | 0 packages/feeds/{ => src}/utils.ts | 0 packages/lib/package.json | 8 ++++---- packages/lib/{ => src}/Deferred.ts | 0 packages/lib/{ => src}/Emitter.ts | 0 packages/lib/{ => src}/Fluent.ts | 0 packages/lib/{ => src}/LRUCache.ts | 0 packages/lib/{ => src}/Store.ts | 0 packages/lib/{ => src}/Tools.ts | 0 packages/lib/{ => src}/Worker.ts | 0 packages/lib/{ => src}/index.ts | 0 packages/lib/{ => src}/normalize-url/index.ts | 0 packages/lib/{ => src}/normalize-url/license | 0 packages/lib/{ => src}/normalize-url/readme.md | 0 packages/net/package.json | 8 ++++---- packages/net/{ => src}/Connection.ts | 0 packages/net/{ => src}/ConnectionMeta.ts | 2 +- packages/net/{ => src}/Context.ts | 0 packages/net/{ => src}/Executor.ts | 0 packages/net/{ => src}/Pool.ts | 0 packages/net/{ => src}/Publish.ts | 0 packages/net/{ => src}/Socket.ts | 0 packages/net/{ => src}/Subscribe.ts | 0 packages/net/{ => src}/Tracker.ts | 0 packages/net/{ => src}/index.ts | 0 packages/net/{ => src}/target/Local.ts | 0 packages/net/{ => src}/target/Multi.ts | 0 packages/net/{ => src}/target/Plex.ts | 0 packages/net/{ => src}/target/Relay.ts | 0 packages/net/{ => src}/target/Relays.ts | 0 packages/util/package.json | 8 ++++---- packages/util/{ => src}/Address.ts | 0 packages/util/{ => src}/Events.ts | 0 packages/util/{ => src}/Filters.ts | 0 packages/util/{ => src}/Kinds.ts | 0 packages/util/{ => src}/Links.ts | 0 packages/util/{ => src}/Relay.ts | 0 packages/util/{ => src}/Repository.ts | 0 packages/util/{ => src}/Router.ts | 2 +- packages/util/{ => src}/Tags.ts | 0 packages/util/{ => src}/Zaps.ts | 0 packages/util/{ => src}/index.ts | 0 48 files changed, 22 insertions(+), 22 deletions(-) rename packages/content/{ => src}/index.ts (100%) rename packages/feeds/{ => src}/compiler.ts (100%) rename packages/feeds/{ => src}/core.ts (100%) rename packages/feeds/{ => src}/index.ts (100%) rename packages/feeds/{ => src}/loader.ts (100%) rename packages/feeds/{ => src}/utils.ts (100%) rename packages/lib/{ => src}/Deferred.ts (100%) rename packages/lib/{ => src}/Emitter.ts (100%) rename packages/lib/{ => src}/Fluent.ts (100%) rename packages/lib/{ => src}/LRUCache.ts (100%) rename packages/lib/{ => src}/Store.ts (100%) rename packages/lib/{ => src}/Tools.ts (100%) rename packages/lib/{ => src}/Worker.ts (100%) rename packages/lib/{ => src}/index.ts (100%) rename packages/lib/{ => src}/normalize-url/index.ts (100%) rename packages/lib/{ => src}/normalize-url/license (100%) rename packages/lib/{ => src}/normalize-url/readme.md (100%) rename packages/net/{ => src}/Connection.ts (100%) rename packages/net/{ => src}/ConnectionMeta.ts (98%) rename packages/net/{ => src}/Context.ts (100%) rename packages/net/{ => src}/Executor.ts (100%) rename packages/net/{ => src}/Pool.ts (100%) rename packages/net/{ => src}/Publish.ts (100%) rename packages/net/{ => src}/Socket.ts (100%) rename packages/net/{ => src}/Subscribe.ts (100%) rename packages/net/{ => src}/Tracker.ts (100%) rename packages/net/{ => src}/index.ts (100%) rename packages/net/{ => src}/target/Local.ts (100%) rename packages/net/{ => src}/target/Multi.ts (100%) rename packages/net/{ => src}/target/Plex.ts (100%) rename packages/net/{ => src}/target/Relay.ts (100%) rename packages/net/{ => src}/target/Relays.ts (100%) rename packages/util/{ => src}/Address.ts (100%) rename packages/util/{ => src}/Events.ts (100%) rename packages/util/{ => src}/Filters.ts (100%) rename packages/util/{ => src}/Kinds.ts (100%) rename packages/util/{ => src}/Links.ts (100%) rename packages/util/{ => src}/Relay.ts (100%) rename packages/util/{ => src}/Repository.ts (100%) rename packages/util/{ => src}/Router.ts (99%) rename packages/util/{ => src}/Tags.ts (100%) rename packages/util/{ => src}/Zaps.ts (100%) rename packages/util/{ => src}/index.ts (100%) diff --git a/packages/content/package.json b/packages/content/package.json index 8253dcc..7658fcd 100644 --- a/packages/content/package.json +++ b/packages/content/package.json @@ -11,12 +11,12 @@ "files": [ "build" ], - "types": "./build/index.d.ts", + "types": "./build/src/index.d.ts", "exports": { ".": { - "types": "./build/index.d.ts", - "import": "./build/index.mjs", - "require": "./build/index.cjs" + "types": "./build/src/index.d.ts", + "import": "./build/src/index.mjs", + "require": "./build/src/index.cjs" } }, "scripts": { diff --git a/packages/content/index.ts b/packages/content/src/index.ts similarity index 100% rename from packages/content/index.ts rename to packages/content/src/index.ts diff --git a/packages/feeds/package.json b/packages/feeds/package.json index 0eb16ed..d716d52 100644 --- a/packages/feeds/package.json +++ b/packages/feeds/package.json @@ -11,12 +11,12 @@ "files": [ "build" ], - "types": "./build/index.d.ts", + "types": "./build/src/index.d.ts", "exports": { ".": { - "types": "./build/index.d.ts", - "import": "./build/index.mjs", - "require": "./build/index.cjs" + "types": "./build/src/index.d.ts", + "import": "./build/src/index.mjs", + "require": "./build/src/index.cjs" } }, "scripts": { diff --git a/packages/feeds/compiler.ts b/packages/feeds/src/compiler.ts similarity index 100% rename from packages/feeds/compiler.ts rename to packages/feeds/src/compiler.ts diff --git a/packages/feeds/core.ts b/packages/feeds/src/core.ts similarity index 100% rename from packages/feeds/core.ts rename to packages/feeds/src/core.ts diff --git a/packages/feeds/index.ts b/packages/feeds/src/index.ts similarity index 100% rename from packages/feeds/index.ts rename to packages/feeds/src/index.ts diff --git a/packages/feeds/loader.ts b/packages/feeds/src/loader.ts similarity index 100% rename from packages/feeds/loader.ts rename to packages/feeds/src/loader.ts diff --git a/packages/feeds/utils.ts b/packages/feeds/src/utils.ts similarity index 100% rename from packages/feeds/utils.ts rename to packages/feeds/src/utils.ts diff --git a/packages/lib/package.json b/packages/lib/package.json index 2f8d6a9..6596c70 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -11,12 +11,12 @@ "files": [ "build" ], - "types": "./build/index.d.ts", + "types": "./build/src/index.d.ts", "exports": { ".": { - "types": "./build/index.d.ts", - "import": "./build/index.mjs", - "require": "./build/index.cjs" + "types": "./build/src/index.d.ts", + "import": "./build/src/index.mjs", + "require": "./build/src/index.cjs" } }, "scripts": { diff --git a/packages/lib/Deferred.ts b/packages/lib/src/Deferred.ts similarity index 100% rename from packages/lib/Deferred.ts rename to packages/lib/src/Deferred.ts diff --git a/packages/lib/Emitter.ts b/packages/lib/src/Emitter.ts similarity index 100% rename from packages/lib/Emitter.ts rename to packages/lib/src/Emitter.ts diff --git a/packages/lib/Fluent.ts b/packages/lib/src/Fluent.ts similarity index 100% rename from packages/lib/Fluent.ts rename to packages/lib/src/Fluent.ts diff --git a/packages/lib/LRUCache.ts b/packages/lib/src/LRUCache.ts similarity index 100% rename from packages/lib/LRUCache.ts rename to packages/lib/src/LRUCache.ts diff --git a/packages/lib/Store.ts b/packages/lib/src/Store.ts similarity index 100% rename from packages/lib/Store.ts rename to packages/lib/src/Store.ts diff --git a/packages/lib/Tools.ts b/packages/lib/src/Tools.ts similarity index 100% rename from packages/lib/Tools.ts rename to packages/lib/src/Tools.ts diff --git a/packages/lib/Worker.ts b/packages/lib/src/Worker.ts similarity index 100% rename from packages/lib/Worker.ts rename to packages/lib/src/Worker.ts diff --git a/packages/lib/index.ts b/packages/lib/src/index.ts similarity index 100% rename from packages/lib/index.ts rename to packages/lib/src/index.ts diff --git a/packages/lib/normalize-url/index.ts b/packages/lib/src/normalize-url/index.ts similarity index 100% rename from packages/lib/normalize-url/index.ts rename to packages/lib/src/normalize-url/index.ts diff --git a/packages/lib/normalize-url/license b/packages/lib/src/normalize-url/license similarity index 100% rename from packages/lib/normalize-url/license rename to packages/lib/src/normalize-url/license diff --git a/packages/lib/normalize-url/readme.md b/packages/lib/src/normalize-url/readme.md similarity index 100% rename from packages/lib/normalize-url/readme.md rename to packages/lib/src/normalize-url/readme.md diff --git a/packages/net/package.json b/packages/net/package.json index 79e0284..b95679b 100644 --- a/packages/net/package.json +++ b/packages/net/package.json @@ -11,12 +11,12 @@ "files": [ "build" ], - "types": "./build/index.d.ts", + "types": "./build/src/index.d.ts", "exports": { ".": { - "types": "./build/index.d.ts", - "import": "./build/index.mjs", - "require": "./build/index.cjs" + "types": "./build/src/index.d.ts", + "import": "./build/src/index.mjs", + "require": "./build/src/index.cjs" } }, "scripts": { diff --git a/packages/net/Connection.ts b/packages/net/src/Connection.ts similarity index 100% rename from packages/net/Connection.ts rename to packages/net/src/Connection.ts diff --git a/packages/net/ConnectionMeta.ts b/packages/net/src/ConnectionMeta.ts similarity index 98% rename from packages/net/ConnectionMeta.ts rename to packages/net/src/ConnectionMeta.ts index 4f4e079..8326a35 100644 --- a/packages/net/ConnectionMeta.ts +++ b/packages/net/src/ConnectionMeta.ts @@ -99,7 +99,7 @@ export class ConnectionMeta { if (ok) { this.authStatus = AuthStatus.Ok - } else if (notice.startsWith('auth-required:')) { + } else if (notice?.startsWith('auth-required:')) { // Re-enqueue pending reqs when auth challenge is received const pub = this.pendingPublishes.get(eventId) diff --git a/packages/net/Context.ts b/packages/net/src/Context.ts similarity index 100% rename from packages/net/Context.ts rename to packages/net/src/Context.ts diff --git a/packages/net/Executor.ts b/packages/net/src/Executor.ts similarity index 100% rename from packages/net/Executor.ts rename to packages/net/src/Executor.ts diff --git a/packages/net/Pool.ts b/packages/net/src/Pool.ts similarity index 100% rename from packages/net/Pool.ts rename to packages/net/src/Pool.ts diff --git a/packages/net/Publish.ts b/packages/net/src/Publish.ts similarity index 100% rename from packages/net/Publish.ts rename to packages/net/src/Publish.ts diff --git a/packages/net/Socket.ts b/packages/net/src/Socket.ts similarity index 100% rename from packages/net/Socket.ts rename to packages/net/src/Socket.ts diff --git a/packages/net/Subscribe.ts b/packages/net/src/Subscribe.ts similarity index 100% rename from packages/net/Subscribe.ts rename to packages/net/src/Subscribe.ts diff --git a/packages/net/Tracker.ts b/packages/net/src/Tracker.ts similarity index 100% rename from packages/net/Tracker.ts rename to packages/net/src/Tracker.ts diff --git a/packages/net/index.ts b/packages/net/src/index.ts similarity index 100% rename from packages/net/index.ts rename to packages/net/src/index.ts diff --git a/packages/net/target/Local.ts b/packages/net/src/target/Local.ts similarity index 100% rename from packages/net/target/Local.ts rename to packages/net/src/target/Local.ts diff --git a/packages/net/target/Multi.ts b/packages/net/src/target/Multi.ts similarity index 100% rename from packages/net/target/Multi.ts rename to packages/net/src/target/Multi.ts diff --git a/packages/net/target/Plex.ts b/packages/net/src/target/Plex.ts similarity index 100% rename from packages/net/target/Plex.ts rename to packages/net/src/target/Plex.ts diff --git a/packages/net/target/Relay.ts b/packages/net/src/target/Relay.ts similarity index 100% rename from packages/net/target/Relay.ts rename to packages/net/src/target/Relay.ts diff --git a/packages/net/target/Relays.ts b/packages/net/src/target/Relays.ts similarity index 100% rename from packages/net/target/Relays.ts rename to packages/net/src/target/Relays.ts diff --git a/packages/util/package.json b/packages/util/package.json index 0c4c32d..2005061 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -11,12 +11,12 @@ "files": [ "build" ], - "types": "./build/index.d.ts", + "types": "./build/src/index.d.ts", "exports": { ".": { - "types": "./build/index.d.ts", - "import": "./build/index.mjs", - "require": "./build/index.cjs" + "types": "./build/src/index.d.ts", + "import": "./build/src/index.mjs", + "require": "./build/src/index.cjs" } }, "scripts": { diff --git a/packages/util/Address.ts b/packages/util/src/Address.ts similarity index 100% rename from packages/util/Address.ts rename to packages/util/src/Address.ts diff --git a/packages/util/Events.ts b/packages/util/src/Events.ts similarity index 100% rename from packages/util/Events.ts rename to packages/util/src/Events.ts diff --git a/packages/util/Filters.ts b/packages/util/src/Filters.ts similarity index 100% rename from packages/util/Filters.ts rename to packages/util/src/Filters.ts diff --git a/packages/util/Kinds.ts b/packages/util/src/Kinds.ts similarity index 100% rename from packages/util/Kinds.ts rename to packages/util/src/Kinds.ts diff --git a/packages/util/Links.ts b/packages/util/src/Links.ts similarity index 100% rename from packages/util/Links.ts rename to packages/util/src/Links.ts diff --git a/packages/util/Relay.ts b/packages/util/src/Relay.ts similarity index 100% rename from packages/util/Relay.ts rename to packages/util/src/Relay.ts diff --git a/packages/util/Repository.ts b/packages/util/src/Repository.ts similarity index 100% rename from packages/util/Repository.ts rename to packages/util/src/Repository.ts diff --git a/packages/util/Router.ts b/packages/util/src/Router.ts similarity index 99% rename from packages/util/Router.ts rename to packages/util/src/Router.ts index 8128758..5f5fa3f 100644 --- a/packages/util/Router.ts +++ b/packages/util/src/Router.ts @@ -1,5 +1,5 @@ import {first, splitAt, identity, sortBy, uniq, shuffle, pushToMapKey} from '@welshman/lib' -import {Tags, Tag} from '@welshman/util' +import {Tags, Tag} from './Tags' import type {TrustedEvent} from './Events' import {isReplaceable} from './Events' import {isShareableRelayUrl} from './Relay' diff --git a/packages/util/Tags.ts b/packages/util/src/Tags.ts similarity index 100% rename from packages/util/Tags.ts rename to packages/util/src/Tags.ts diff --git a/packages/util/Zaps.ts b/packages/util/src/Zaps.ts similarity index 100% rename from packages/util/Zaps.ts rename to packages/util/src/Zaps.ts diff --git a/packages/util/index.ts b/packages/util/src/index.ts similarity index 100% rename from packages/util/index.ts rename to packages/util/src/index.ts