diff --git a/deno.json b/deno.json index 2c7392ce..f7296fa0 100644 --- a/deno.json +++ b/deno.json @@ -1,7 +1,7 @@ { "workspace": [ "./packages/api", - "./packages/config", + "./packages/conf", "./packages/ditto" ], "tasks": { diff --git a/packages/api/middleware/confMw.ts b/packages/api/middleware/confMw.ts index ae53ab72..ebfdfe4b 100644 --- a/packages/api/middleware/confMw.ts +++ b/packages/api/middleware/confMw.ts @@ -1,12 +1,12 @@ -import { DittoConfig } from '@ditto/config'; +import { DittoConf } from '@ditto/conf'; import type { MiddlewareHandler } from '@hono/hono'; /** Set Ditto config. */ export function confMw( env: { get(key: string): string | undefined }, -): MiddlewareHandler<{ Variables: { conf: DittoConfig } }> { - const conf = new DittoConfig(env); +): MiddlewareHandler<{ Variables: { conf: DittoConf } }> { + const conf = new DittoConf(env); return async (c, next) => { c.set('conf', conf); diff --git a/packages/api/middleware/confRequiredMw.ts b/packages/api/middleware/confRequiredMw.ts index 129734b4..dc4d661d 100644 --- a/packages/api/middleware/confRequiredMw.ts +++ b/packages/api/middleware/confRequiredMw.ts @@ -1,10 +1,10 @@ import { HTTPException } from '@hono/hono/http-exception'; -import type { DittoConfig } from '@ditto/config'; +import type { DittoConf } from '@ditto/conf'; import type { MiddlewareHandler } from '@hono/hono'; /** Throws an error if conf isn't set. */ -export const confRequiredMw: MiddlewareHandler<{ Variables: { conf: DittoConfig } }> = async (c, next) => { +export const confRequiredMw: MiddlewareHandler<{ Variables: { conf: DittoConf } }> = async (c, next) => { const { conf } = c.var; if (!conf) { diff --git a/packages/config/DittoConfig.test.ts b/packages/conf/DittoConf.test.ts similarity index 85% rename from packages/config/DittoConfig.test.ts rename to packages/conf/DittoConf.test.ts index a61a0c77..c2e87c46 100644 --- a/packages/config/DittoConfig.test.ts +++ b/packages/conf/DittoConf.test.ts @@ -1,13 +1,13 @@ import { assertEquals, assertThrows } from '@std/assert'; -import { DittoConfig } from './DittoConfig.ts'; +import { DittoConf } from './DittoConf.ts'; Deno.test('DittoConfig', async (t) => { const env = new Map([ ['DITTO_NSEC', 'nsec19shyxpuzd0cq2p5078fwnws7tyykypud6z205fzhlmlrs2vpz6hs83zwkw'], ]); - const config = new DittoConfig(env); + const config = new DittoConf(env); await t.step('nsec', () => { assertEquals(config.nsec, 'nsec19shyxpuzd0cq2p5078fwnws7tyykypud6z205fzhlmlrs2vpz6hs83zwkw'); @@ -20,7 +20,7 @@ Deno.test('DittoConfig', async (t) => { Deno.test('DittoConfig defaults', async (t) => { const env = new Map(); - const config = new DittoConfig(env); + const config = new DittoConf(env); await t.step('nsec throws', () => { assertThrows(() => config.nsec); diff --git a/packages/config/DittoConfig.ts b/packages/conf/DittoConf.ts similarity index 99% rename from packages/config/DittoConfig.ts rename to packages/conf/DittoConf.ts index 5090fb7b..b0f1256f 100644 --- a/packages/config/DittoConfig.ts +++ b/packages/conf/DittoConf.ts @@ -9,7 +9,7 @@ import { optionalBooleanSchema, optionalNumberSchema } from './utils/schema.ts'; import { mergeURLPath } from './utils/url.ts'; /** Ditto application-wide configuration. */ -export class DittoConfig { +export class DittoConf { constructor(private env: { get(key: string): string | undefined }) {} /** Cached parsed admin pubkey value. */ diff --git a/packages/config/deno.json b/packages/conf/deno.json similarity index 70% rename from packages/config/deno.json rename to packages/conf/deno.json index a726b21d..7ba0a49a 100644 --- a/packages/config/deno.json +++ b/packages/conf/deno.json @@ -1,5 +1,5 @@ { - "name": "@ditto/config", + "name": "@ditto/conf", "version": "1.1.0", "exports": { ".": "./mod.ts" diff --git a/packages/conf/mod.ts b/packages/conf/mod.ts new file mode 100644 index 00000000..4d7ef2b7 --- /dev/null +++ b/packages/conf/mod.ts @@ -0,0 +1 @@ +export { DittoConf } from './DittoConf.ts'; diff --git a/packages/config/utils/crypto.test.ts b/packages/conf/utils/crypto.test.ts similarity index 100% rename from packages/config/utils/crypto.test.ts rename to packages/conf/utils/crypto.test.ts diff --git a/packages/config/utils/crypto.ts b/packages/conf/utils/crypto.ts similarity index 100% rename from packages/config/utils/crypto.ts rename to packages/conf/utils/crypto.ts diff --git a/packages/config/utils/schema.test.ts b/packages/conf/utils/schema.test.ts similarity index 100% rename from packages/config/utils/schema.test.ts rename to packages/conf/utils/schema.test.ts diff --git a/packages/config/utils/schema.ts b/packages/conf/utils/schema.ts similarity index 100% rename from packages/config/utils/schema.ts rename to packages/conf/utils/schema.ts diff --git a/packages/config/utils/url.test.ts b/packages/conf/utils/url.test.ts similarity index 100% rename from packages/config/utils/url.test.ts rename to packages/conf/utils/url.test.ts diff --git a/packages/config/utils/url.ts b/packages/conf/utils/url.ts similarity index 100% rename from packages/config/utils/url.ts rename to packages/conf/utils/url.ts diff --git a/packages/config/mod.ts b/packages/config/mod.ts deleted file mode 100644 index 76e94a0d..00000000 --- a/packages/config/mod.ts +++ /dev/null @@ -1 +0,0 @@ -export { DittoConfig } from './DittoConfig.ts'; diff --git a/packages/ditto/config.ts b/packages/ditto/config.ts index 56e67f49..59554920 100644 --- a/packages/ditto/config.ts +++ b/packages/ditto/config.ts @@ -1,4 +1,4 @@ -import { DittoConfig } from '@ditto/config'; +import { DittoConf } from '@ditto/conf'; /** @deprecated Use middleware to set/get the config instead. */ -export const Conf = new DittoConfig(Deno.env); +export const Conf = new DittoConf(Deno.env);