Merge branch 'ditto-conf' into 'main'

@ditto/config -> @ditto/conf, DittoConfig -> DittoConf

See merge request soapbox-pub/ditto!664

deno.json

@@ -1,7 +1,7 @@
 {
   "workspace": [
     "./packages/api",
-    "./packages/config",
+    "./packages/conf",
     "./packages/ditto"
   ],
   "tasks": {

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

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

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<string, string>([
     ['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<string, string>();
-  const config = new DittoConfig(env);
+  const config = new DittoConf(env);
 
   await t.step('nsec throws', () => {
     assertThrows(() => config.nsec);

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. */

packages/conf/deno.json

@@ -1,5 +1,5 @@
 {
-  "name": "@ditto/config",
+  "name": "@ditto/conf",
   "version": "1.1.0",
   "exports": {
     ".": "./mod.ts"

packages/conf/mod.ts

@@ -0,0 +1 @@
+export { DittoConf } from './DittoConf.ts';

packages/config/mod.ts

@@ -1 +0,0 @@
-export { DittoConfig } from './DittoConfig.ts';

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