Remove base alias from packages (make scripts use relative paths for now)

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",

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": {

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();

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();
 

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', () => {

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[];

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);

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();

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;

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();
 

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);
 

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();

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');

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();
 

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);

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.');

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 {

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);