diff --git a/deno.json b/deno.json index 629e1813..debd7fa9 100644 --- a/deno.json +++ b/deno.json @@ -1,4 +1,5 @@ { + "version": "1.1.0", "workspace": [ "./packages/api", "./packages/conf", @@ -43,7 +44,6 @@ "./public" ], "imports": { - "@/": "./packages/ditto/", "@b-fuze/deno-dom": "jsr:@b-fuze/deno-dom@^0.1.47", "@bradenmacdonald/s3-lite-client": "jsr:@bradenmacdonald/s3-lite-client@^0.7.4", "@cashu/cashu-ts": "npm:@cashu/cashu-ts@^2.2.0", diff --git a/packages/ditto/deno.json b/packages/ditto/deno.json index 31f80278..82d28139 100644 --- a/packages/ditto/deno.json +++ b/packages/ditto/deno.json @@ -1,9 +1,9 @@ { "name": "@ditto/ditto", - "version": "1.1.0", "exports": {}, "imports": { - "deno.json": "./deno.json" + "@/": "./", + "deno.json": "../../deno.json" }, "lint": { "rules": { diff --git a/scripts/admin-event.ts b/scripts/admin-event.ts index 00711993..70f8ed48 100644 --- a/scripts/admin-event.ts +++ b/scripts/admin-event.ts @@ -1,10 +1,10 @@ import { JsonParseStream } from '@std/json/json-parse-stream'; import { TextLineStream } from '@std/streams/text-line-stream'; -import { AdminSigner } from '@/signers/AdminSigner.ts'; -import { Storages } from '@/storages.ts'; -import { type EventStub } from '@/utils/api.ts'; -import { nostrNow } from '@/utils.ts'; +import { AdminSigner } from '../packages/ditto/signers/AdminSigner.ts'; +import { Storages } from '../packages/ditto/storages.ts'; +import { type EventStub } from '../packages/ditto/utils/api.ts'; +import { nostrNow } from '../packages/ditto/utils.ts'; const signer = new AdminSigner(); const store = await Storages.db(); diff --git a/scripts/admin-role.ts b/scripts/admin-role.ts index d275329f..369440c9 100644 --- a/scripts/admin-role.ts +++ b/scripts/admin-role.ts @@ -1,9 +1,9 @@ import { NSchema } from '@nostrify/nostrify'; import { nip19 } from 'nostr-tools'; -import { AdminSigner } from '@/signers/AdminSigner.ts'; -import { Storages } from '@/storages.ts'; -import { nostrNow } from '@/utils.ts'; +import { AdminSigner } from '../packages/ditto/signers/AdminSigner.ts'; +import { Storages } from '../packages/ditto/storages.ts'; +import { nostrNow } from '../packages/ditto/utils.ts'; const store = await Storages.db(); diff --git a/scripts/db-export.test.ts b/scripts/db-export.test.ts index 939537d5..3b180291 100644 --- a/scripts/db-export.test.ts +++ b/scripts/db-export.test.ts @@ -1,4 +1,5 @@ import { assertEquals, assertThrows } from '@std/assert'; + import { buildFilter } from './db-export.ts'; Deno.test('buildFilter should return an empty filter when no arguments are provided', () => { diff --git a/scripts/db-export.ts b/scripts/db-export.ts index e32e08ad..d36d4f3f 100644 --- a/scripts/db-export.ts +++ b/scripts/db-export.ts @@ -1,7 +1,8 @@ -import { Storages } from '@/storages.ts'; import { NostrFilter } from '@nostrify/nostrify'; import { Command, InvalidOptionArgumentError } from 'commander'; +import { Storages } from '../packages/ditto/storages.ts'; + interface ExportFilter { authors?: string[]; ids?: string[]; diff --git a/scripts/db-import.ts b/scripts/db-import.ts index ed884453..2f6c1595 100644 --- a/scripts/db-import.ts +++ b/scripts/db-import.ts @@ -3,8 +3,8 @@ import { NostrEvent } from '@nostrify/nostrify'; import { JsonParseStream } from '@std/json/json-parse-stream'; import { TextLineStream } from '@std/streams/text-line-stream'; -import { Conf } from '@/config.ts'; -import { Storages } from '@/storages.ts'; +import { Conf } from '../packages/ditto/config.ts'; +import { Storages } from '../packages/ditto/storages.ts'; const store = await Storages.db(); const sem = new Semaphore(Conf.pg.poolSize); diff --git a/scripts/db-migrate.ts b/scripts/db-migrate.ts index d3e93783..21b8db22 100644 --- a/scripts/db-migrate.ts +++ b/scripts/db-migrate.ts @@ -1,4 +1,4 @@ -import { Storages } from '@/storages.ts'; +import { Storages } from '../packages/ditto/storages.ts'; // This migrates kysely internally. const kysely = await Storages.kysely(); diff --git a/scripts/db-policy.ts b/scripts/db-policy.ts index 4be3c4ef..caab55af 100644 --- a/scripts/db-policy.ts +++ b/scripts/db-policy.ts @@ -1,5 +1,5 @@ -import { policyWorker } from '@/workers/policy.ts'; -import { Storages } from '@/storages.ts'; +import { policyWorker } from '../packages/ditto/workers/policy.ts'; +import { Storages } from '../packages/ditto/storages.ts'; const db = await Storages.db(); let count = 0; diff --git a/scripts/db-populate-extensions.ts b/scripts/db-populate-extensions.ts index ca6d1927..2b40bd3d 100644 --- a/scripts/db-populate-extensions.ts +++ b/scripts/db-populate-extensions.ts @@ -1,7 +1,7 @@ import { NostrEvent } from '@nostrify/nostrify'; -import { Storages } from '@/storages.ts'; -import { EventsDB } from '@/storages/EventsDB.ts'; +import { Storages } from '../packages/ditto/storages.ts'; +import { EventsDB } from '../packages/ditto/storages/EventsDB.ts'; const kysely = await Storages.kysely(); diff --git a/scripts/db-populate-nip05.ts b/scripts/db-populate-nip05.ts index df11f007..acfe70da 100644 --- a/scripts/db-populate-nip05.ts +++ b/scripts/db-populate-nip05.ts @@ -1,9 +1,9 @@ import { Semaphore } from '@core/asyncutil'; - -import { updateAuthorData } from '@/pipeline.ts'; -import { Storages } from '@/storages.ts'; import { NostrEvent } from '@nostrify/nostrify'; +import { updateAuthorData } from '../packages/ditto/pipeline.ts'; +import { Storages } from '../packages/ditto/storages.ts'; + const kysely = await Storages.kysely(); const sem = new Semaphore(5); diff --git a/scripts/db-populate-search.ts b/scripts/db-populate-search.ts index 81b84ee6..e73f79ac 100644 --- a/scripts/db-populate-search.ts +++ b/scripts/db-populate-search.ts @@ -1,5 +1,6 @@ import { NSchema as n } from '@nostrify/nostrify'; -import { Storages } from '@/storages.ts'; + +import { Storages } from '../packages/ditto/storages.ts'; const store = await Storages.db(); const kysely = await Storages.kysely(); diff --git a/scripts/db-streak-recompute.ts b/scripts/db-streak-recompute.ts index a05eb08b..e45d4f64 100644 --- a/scripts/db-streak-recompute.ts +++ b/scripts/db-streak-recompute.ts @@ -1,5 +1,5 @@ -import { Conf } from '@/config.ts'; -import { Storages } from '@/storages.ts'; +import { Conf } from '../packages/ditto/config.ts'; +import { Storages } from '../packages/ditto/storages.ts'; const kysely = await Storages.kysely(); const statsQuery = kysely.selectFrom('author_stats').select('pubkey'); diff --git a/scripts/nostr-pull.ts b/scripts/nostr-pull.ts index c7ad21d3..7c21cb80 100644 --- a/scripts/nostr-pull.ts +++ b/scripts/nostr-pull.ts @@ -6,7 +6,7 @@ import { NostrEvent, NRelay1, NSchema } from '@nostrify/nostrify'; import { nip19 } from 'nostr-tools'; -import { Storages } from '@/storages.ts'; +import { Storages } from '../packages/ditto/storages.ts'; const store = await Storages.db(); diff --git a/scripts/setup-kind0.ts b/scripts/setup-kind0.ts index 7aa62df3..ff7cbd1a 100644 --- a/scripts/setup-kind0.ts +++ b/scripts/setup-kind0.ts @@ -1,9 +1,10 @@ -import { AdminSigner } from '@/signers/AdminSigner.ts'; import { Command } from 'commander'; import { NostrEvent } from 'nostr-tools'; -import { nostrNow } from '@/utils.ts'; -import { Conf } from '@/config.ts'; -import { Storages } from '@/storages.ts'; + +import { AdminSigner } from '../packages/ditto/signers/AdminSigner.ts'; +import { nostrNow } from '../packages/ditto/utils.ts'; +import { Conf } from '../packages/ditto/config.ts'; +import { Storages } from '../packages/ditto/storages.ts'; function die(code: number, ...args: unknown[]) { console.error(...args); diff --git a/scripts/setup.ts b/scripts/setup.ts index 3f3fc955..f4ccf368 100644 --- a/scripts/setup.ts +++ b/scripts/setup.ts @@ -4,7 +4,7 @@ import { exists } from '@std/fs/exists'; import { generateSecretKey, nip19 } from 'nostr-tools'; import question from 'question-deno'; -import { Conf } from '@/config.ts'; +import { Conf } from '../packages/ditto/config.ts'; console.log(''); console.log('Hello! Welcome to the Ditto setup tool. We will ask you a few questions to generate a .env file for you.'); diff --git a/scripts/stats-recompute.ts b/scripts/stats-recompute.ts index 77be13fe..942d0012 100644 --- a/scripts/stats-recompute.ts +++ b/scripts/stats-recompute.ts @@ -1,7 +1,7 @@ import { nip19 } from 'nostr-tools'; -import { Storages } from '@/storages.ts'; -import { refreshAuthorStats } from '@/utils/stats.ts'; +import { Storages } from '../packages/ditto/storages.ts'; +import { refreshAuthorStats } from '../packages/ditto/utils/stats.ts'; let pubkey: string; try { diff --git a/scripts/trends.ts b/scripts/trends.ts index 6600f7e2..bb9708ab 100644 --- a/scripts/trends.ts +++ b/scripts/trends.ts @@ -6,7 +6,7 @@ import { updateTrendingLinks, updateTrendingPubkeys, updateTrendingZappedEvents, -} from '@/trends.ts'; +} from '../packages/ditto/trends.ts'; const trendSchema = z.enum(['pubkeys', 'zapped_events', 'events', 'hashtags', 'links']); const trends = trendSchema.array().parse(Deno.args);