Clean up & format

max-lt · max-lt · commit 35f865581260 · 2026-02-15T10:32:54.000+01:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,6 +4,7 @@
     "bytea",
     "croner",
     "healthcheck",
+    "introspector",
     "kysely",
     "openworkers",
     "postgate",
diff --git a/src/index.ts b/src/index.ts
@@ -58,7 +58,7 @@ api.get('/cron-test', (c) => {
       pattern: cron.pattern(),
       description: cron.describe(),
       nextRun: cron.nextRun()?.toISOString() ?? null,
-      nextRuns: cron.nextRuns(5).map((d: Date) => d.toISOString()),
+      nextRuns: cron.nextRuns(5).map((d: Date) => d.toISOString())
     });
   } catch (error) {
     return c.json({ status: 'error', wasm: true, error: String(error) }, 400);
diff --git a/src/routes/workers.ts b/src/routes/workers.ts
@@ -318,8 +318,9 @@ workers.post('/:id/upload', async (c) => {
 
     // 3b. Parse asset manifest from form data (sent separately from zip)
     const assetsManifest = formData.get('assets');
-    const assetEntries: Array<{ path: string; size: number; contentType: string; hash: string }> =
-      assetsManifest ? JSON.parse(assetsManifest as string) : [];
+    const assetEntries: Array<{ path: string; size: number; contentType: string; hash: string }> = assetsManifest
+      ? JSON.parse(assetsManifest as string)
+      : [];
 
     // 4. Extract zip (code-only: worker script, routes, functions)
     const zipBuffer = await file.arrayBuffer();
diff --git a/src/services/db/crons.ts b/src/services/db/crons.ts
@@ -8,7 +8,15 @@ export async function findCronById(userId: string, cronId: string): Promise<ICro
   const cron = await kysely
     .selectFrom('crons')
     .innerJoin('workers', 'crons.workerId', 'workers.id')
-    .select(['crons.id', 'crons.value', 'crons.workerId', 'crons.nextRun', 'crons.lastRun', 'crons.createdAt', 'crons.updatedAt'])
+    .select([
+      'crons.id',
+      'crons.value',
+      'crons.workerId',
+      'crons.nextRun',
+      'crons.lastRun',
+      'crons.createdAt',
+      'crons.updatedAt'
+    ])
     .where('crons.id', '=', uuid(cronId))
     .where('workers.userId', '=', uuid(userId))
     .executeTakeFirst();
@@ -28,7 +36,7 @@ export async function createCron(userId: string, workerId: string, value: string
     .values({
       value,
       workerId: uuid(workerId),
-      nextRun: timestamptz(nextRun),
+      nextRun: timestamptz(nextRun)
     })
     .returningAll()
     .executeTakeFirstOrThrow();
diff --git a/src/services/db/database-tokens.ts b/src/services/db/database-tokens.ts
@@ -50,14 +50,14 @@ export async function createDatabaseToken(
       name,
       tokenHash,
       tokenPrefix,
-      allowedOperations: textArray(allowedOperations),
+      allowedOperations: textArray(allowedOperations)
     })
     .returning(['id', 'databaseId', 'name', 'tokenPrefix', 'allowedOperations', 'lastUsedAt', 'createdAt'])
     .executeTakeFirstOrThrow();
 
   return {
     token,
-    fullToken,
+    fullToken
   };
 }
 
@@ -123,7 +123,7 @@ async function createSystemToken(databaseId: string): Promise<string> {
       name: SYSTEM_TOKEN_NAME,
       tokenHash,
       tokenPrefix,
-      allowedOperations: textArray(ALL_OPERATIONS),
+      allowedOperations: textArray(ALL_OPERATIONS)
     })
     .onConflict((oc) => oc.columns(['databaseId', 'name']).doNothing())
     .execute();
diff --git a/src/services/db/databases.ts b/src/services/db/databases.ts
@@ -65,7 +65,7 @@ export async function createPlatformDatabase(userId: string, input: CreatePlatfo
       provider: enumCast('platform' as DatabaseProvider, 'database_provider'),
       schemaName: input.schemaName,
       maxRows: input.maxRows,
-      timeoutSeconds: input.timeoutSeconds,
+      timeoutSeconds: input.timeoutSeconds
     })
     .returningAll()
     .executeTakeFirstOrThrow();
@@ -89,7 +89,7 @@ export async function createPostgresDatabase(userId: string, input: CreatePostgr
       provider: enumCast('postgres' as DatabaseProvider, 'database_provider'),
       connectionString: input.connectionString,
       maxRows: input.maxRows,
-      timeoutSeconds: input.timeoutSeconds,
+      timeoutSeconds: input.timeoutSeconds
     })
     .returningAll()
     .executeTakeFirstOrThrow();
diff --git a/src/services/db/domains.ts b/src/services/db/domains.ts
@@ -13,11 +13,7 @@ export async function findAllDomains(userId: string): Promise<IDomain[]> {
 }
 
 export async function findDomainByName(name: string): Promise<IDomain | null> {
-  const domain = await kysely
-    .selectFrom('domains')
-    .selectAll()
-    .where('name', '=', name)
-    .executeTakeFirst();
+  const domain = await kysely.selectFrom('domains').selectAll().where('name', '=', name).executeTakeFirst();
 
   return domain ?? null;
 }
@@ -34,7 +30,7 @@ export async function createDomain(userId: string, workerId: string, name: strin
     .values({
       name,
       workerId: uuid(workerId),
-      userId: uuid(userId),
+      userId: uuid(userId)
     })
     .returningAll()
     .executeTakeFirstOrThrow();
@@ -92,6 +88,6 @@ export async function updateWorkerDomains(userId: string, workerId: string, newD
     toDelete.length > 0 ? deleteDomainsForWorker(userId, workerId, toDelete) : Promise.resolve(0),
 
     // Create new domains
-    ...toCreate.map((name) => createDomain(userId, workerId, name)),
+    ...toCreate.map((name) => createDomain(userId, workerId, name))
   ]);
 }
diff --git a/src/services/db/environments.ts b/src/services/db/environments.ts
@@ -140,7 +140,7 @@ export async function createEnvironment(userId: string, name: string, desc?: str
     .values({
       name,
       desc: desc ?? null,
-      userId: uuid(userId),
+      userId: uuid(userId)
     })
     .returning(['id', 'name', 'desc', 'userId', 'createdAt', 'updatedAt'])
     .executeTakeFirstOrThrow();
@@ -149,7 +149,7 @@ export async function createEnvironment(userId: string, name: string, desc?: str
   return {
     ...env,
     values: [],
-    workers: [],
+    workers: []
   };
 }
 
@@ -184,7 +184,7 @@ export async function updateEnvironment(
   return {
     ...env,
     values: current.values,
-    workers: current.workers,
+    workers: current.workers
   };
 }
 
@@ -214,7 +214,7 @@ export async function createEnvironmentValue(
       value,
       type: enumCast(type as 'var' | 'secret', 'enum_binding_type'),
       environmentId: uuid(envId),
-      userId: uuid(userId),
+      userId: uuid(userId)
     })
     .returningAll()
     .executeTakeFirstOrThrow();
diff --git a/src/services/db/kv.test.ts b/src/services/db/kv.test.ts
@@ -28,7 +28,7 @@ describe('KV service - Kysely SQL generation', () => {
       .values({
         userId: sql<string>`${userId}::uuid`,
         name,
-        desc,
+        desc
       })
       .returningAll()
       .compile();
@@ -47,7 +47,7 @@ describe('KV service - Kysely SQL generation', () => {
       .updateTable('kvConfigs')
       .set({
         name,
-        updatedAt: sql`now()`,
+        updatedAt: sql`now()`
       })
       .where('userId', '=', sql<string>`${userId}::uuid`)
       .where('id', '=', sql<string>`${id}::uuid`)
@@ -106,13 +106,13 @@ describe('KV service - Kysely SQL generation', () => {
         namespaceId: sql<string>`${namespaceId}::uuid`,
         key,
         value: sql`${jsonValue}::jsonb`,
-        expiresAt: sql`${expiresAt}::timestamptz`,
+        expiresAt: sql`${expiresAt}::timestamptz`
       })
       .onConflict((oc) =>
         oc.columns(['namespaceId', 'key']).doUpdateSet({
           value: sql`${jsonValue}::jsonb`,
           expiresAt: sql`${expiresAt}::timestamptz`,
-          updatedAt: sql`now()`,
+          updatedAt: sql`now()`
         })
       )
       .returningAll()
diff --git a/src/services/db/kysely-client.ts b/src/services/db/kysely-client.ts
@@ -119,7 +119,7 @@ export interface Database {
     id: Generated<string>;
     key: string;
     value: string;
-    type: 'var' | 'secret';
+    type: 'var' | 'secret' | 'assets' | 'storage' | 'kv' | 'database' | 'worker';
     environmentId: string;
     userId: string;
     createdAt: Generated<Date>;
diff --git a/src/services/db/kysely-dialect.ts b/src/services/db/kysely-dialect.ts
@@ -7,14 +7,10 @@ import type {
   Driver,
   Kysely,
   QueryCompiler,
-  QueryResult,
+  QueryResult
 } from 'kysely';
 
-import {
-  PostgresAdapter,
-  PostgresIntrospector,
-  PostgresQueryCompiler,
-} from 'kysely';
+import { PostgresAdapter, PostgresIntrospector, PostgresQueryCompiler } from 'kysely';
 
 import type { PostgateSqlClient } from './sql-client';
 
@@ -137,14 +133,11 @@ class SqlClientConnection implements DatabaseConnection {
     // Map SqlResult to Kysely QueryResult
     return {
       rows: result,
-      numAffectedRows: result.count !== undefined ? BigInt(result.count) : undefined,
+      numAffectedRows: result.count !== undefined ? BigInt(result.count) : undefined
     };
   }
 
-  async *streamQuery<R>(
-    _compiledQuery: CompiledQuery,
-    _chunkSize: number
-  ): AsyncIterableIterator<QueryResult<R>> {
+  async *streamQuery<R>(_compiledQuery: CompiledQuery, _chunkSize: number): AsyncIterableIterator<QueryResult<R>> {
     throw new Error('Streaming queries not supported');
   }
 }
diff --git a/src/services/db/storage.ts b/src/services/db/storage.ts
@@ -72,7 +72,7 @@ export async function createStorageConfig(
       secretAccessKey,
       endpoint: endpoint ?? null,
       region: region ?? null,
-      publicUrl: publicUrl ?? null,
+      publicUrl: publicUrl ?? null
     })
     .returningAll()
     .executeTakeFirstOrThrow();
diff --git a/src/services/db/users.test.ts b/src/services/db/users.test.ts
@@ -9,7 +9,17 @@ describe('Users service - Kysely SQL generation', () => {
 
     const query = kysely
       .selectFrom('users')
-      .select(['id', 'username', 'avatarUrl', 'limitWorkers', 'limitEnvironments', 'limitDatabases', 'limitKv', 'limitStorage', 'secondPrecision'])
+      .select([
+        'id',
+        'username',
+        'avatarUrl',
+        'limitWorkers',
+        'limitEnvironments',
+        'limitDatabases',
+        'limitKv',
+        'limitStorage',
+        'secondPrecision'
+      ])
       .where('id', '=', sql<string>`${userId}::uuid`)
       .compile();
 
@@ -39,11 +49,7 @@ describe('Users service - Kysely SQL generation', () => {
   test('createUserWithEmail - generates correct INSERT', () => {
     const email = 'test@example.com';
 
-    const query = kysely
-      .insertInto('users')
-      .values({ username: email })
-      .returningAll()
-      .compile();
+    const query = kysely.insertInto('users').values({ username: email }).returningAll().compile();
 
     expect(query.sql).toContain('insert into "users"');
     expect(query.sql).toContain('("username")');
@@ -77,7 +83,7 @@ describe('Users service - Kysely SQL generation', () => {
       .values({
         externalId,
         provider: enumCast('github', 'enum_external_users_provider'),
-        userId: sql<string>`${userId}::uuid`,
+        userId: sql<string>`${userId}::uuid`
       })
       .compile();
 
diff --git a/src/services/db/users.ts b/src/services/db/users.ts
diff --git a/src/services/db/workers.ts b/src/services/db/workers.ts
diff --git a/src/types/schemas/database-token.schema.ts b/src/types/schemas/database-token.schema.ts
diff --git a/src/utils/base64.ts b/src/utils/base64.ts
diff --git a/src/utils/validate.ts b/src/utils/validate.ts
diff --git a/worker.compile.ts b/worker.compile.ts
