@ditto/router -> @ditto/mastoapi/router

deno.json

@@ -10,7 +10,6 @@
     "./packages/nip98",
     "./packages/policies",
     "./packages/ratelimiter",
-    "./packages/router",
     "./packages/translators",
     "./packages/uploaders"
   ],

packages/ditto/app.ts

@@ -1,7 +1,7 @@
 import { DittoConf } from '@ditto/conf';
 import { DittoDB } from '@ditto/db';
 import { paginationMiddleware, tokenMiddleware, userMiddleware } from '@ditto/mastoapi/middleware';
-import { DittoApp, type DittoEnv } from '@ditto/router';
+import { DittoApp, type DittoEnv } from '@ditto/mastoapi/router';
 import { type DittoTranslator } from '@ditto/translators';
 import { type Context, Handler, Input as HonoInput, MiddlewareHandler } from '@hono/hono';
 import { every } from '@hono/hono/combine';

packages/ditto/controllers/api/cashu.test.ts

@@ -1,6 +1,6 @@
 import { DittoConf } from '@ditto/conf';
 import { type User } from '@ditto/mastoapi/middleware';
-import { DittoApp, DittoMiddleware } from '@ditto/router';
+import { DittoApp, DittoMiddleware } from '@ditto/mastoapi/router';
 import { NSecSigner } from '@nostrify/nostrify';
 import { genEvent } from '@nostrify/nostrify/test';
 import { bytesToString, stringToBytes } from '@scure/base';

packages/ditto/controllers/api/cashu.ts

@@ -1,6 +1,6 @@
 import { Proof } from '@cashu/cashu-ts';
 import { userMiddleware } from '@ditto/mastoapi/middleware';
-import { DittoRoute } from '@ditto/router';
+import { DittoRoute } from '@ditto/mastoapi/router';
 import { generateSecretKey, getPublicKey } from 'nostr-tools';
 import { bytesToString, stringToBytes } from '@scure/base';
 import { z } from 'zod';

packages/mastoapi/deno.json

@@ -3,6 +3,7 @@
   "version": "1.1.0",
   "exports": {
     "./middleware": "./middleware/mod.ts",
+    "./router": "./router/mod.ts",
     "./test": "./test.ts"
   }
 }

packages/mastoapi/middleware/paginationMiddleware.ts

@@ -1,7 +1,7 @@
 import { paginated, paginatedList } from '../pagination/paginate.ts';
 import { paginationSchema } from '../pagination/schema.ts';
 
-import type { DittoMiddleware } from '@ditto/router';
+import type { DittoMiddleware } from '@ditto/mastoapi/router';
 import type { NostrEvent } from '@nostrify/nostrify';
 
 interface Pagination {

packages/mastoapi/middleware/tokenMiddleware.ts

@@ -9,7 +9,7 @@ import { ConnectSigner } from '../signers/ConnectSigner.ts';
 import { ReadOnlySigner } from '../signers/ReadOnlySigner.ts';
 import { UserStore } from '../storages/UserStore.ts';
 
-import type { DittoEnv, DittoMiddleware } from '@ditto/router';
+import type { DittoEnv, DittoMiddleware } from '@ditto/mastoapi/router';
 import type { Context } from '@hono/hono';
 import type { User } from './User.ts';
 

packages/mastoapi/middleware/userMiddleware.ts

@@ -1,7 +1,7 @@
 import { buildAuthEventTemplate, validateAuthEvent } from '@ditto/nip98';
 import { HTTPException } from '@hono/hono/http-exception';
 
-import type { DittoMiddleware } from '@ditto/router';
+import type { DittoMiddleware } from '@ditto/mastoapi/router';
 import type { NostrEvent, NostrSigner } from '@nostrify/nostrify';
 import type { SetRequired } from 'type-fest';
 import type { User } from './User.ts';

packages/mastoapi/test.ts

@@ -1,6 +1,6 @@
 import { DittoConf } from '@ditto/conf';
 import { type DittoDB, DummyDB } from '@ditto/db';
-import { DittoApp, type DittoMiddleware } from '@ditto/router';
+import { DittoApp, type DittoMiddleware } from '@ditto/mastoapi/router';
 import { type NostrSigner, type NRelay, NSecSigner } from '@nostrify/nostrify';
 import { MockRelay } from '@nostrify/nostrify/test';
 import { generateSecretKey, nip19 } from 'nostr-tools';

packages/router/deno.json

@@ -1,7 +0,0 @@
-{
-  "name": "@ditto/router",
-  "version": "1.1.0",
-  "exports": {
-    ".": "./mod.ts"
-  }
-}