ugly-app 0.1.310 → 0.1.312

package/dist/server/Socket.d.ts

@@ -2,7 +2,7 @@ import type { IncomingMessage as HttpIncomingMessage, Server } from 'http';
 import { WebSocket, WebSocketServer } from 'ws';
 import type { CollectionRegistry, TypedDB, UserHelper } from '../shared/DB.js';
 import type { AppRouter } from './Router.js';
-import type { StorageClient } from './Storage.js';
+import type { StorageClient } from './DataProxyClient.js';
 export declare function initWebSocketServer(server: Server, router: AppRouter, collections: CollectionRegistry, _storage: StorageClient | null, typedDb: TypedDB<any>, _userHelper: UserHelper<any>, wsPath?: string, onSocketMessageHandlers?: ((ws: WebSocket, userId: string, msg: unknown) => boolean)[], 
 /** Pass an existing WebSocketServer to skip creating a new one and skip
  *  registering the HTTP upgrade handler (the caller manages routing). */

package/dist/server/Socket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Socket.d.ts","sourceRoot":"","sources":["../../src/server/Socket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AA+ClD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,kBAAkB,EAC/B,QAAQ,EAAE,aAAa,GAAG,IAAI,EAE9B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAErB,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,EAC5B,MAAM,SAAS,EACf,uBAAuB,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,EAAE;AACtF;yEACyE;AACzE,WAAW,CAAC,EAAE,eAAe;AAC7B;+EAC+E;AAC/E,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACzF,eAAe,CA2ZjB"}
+{"version":3,"file":"Socket.d.ts","sourceRoot":"","sources":["../../src/server/Socket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AA+C1D,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,kBAAkB,EAC/B,QAAQ,EAAE,aAAa,GAAG,IAAI,EAE9B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,EAErB,WAAW,EAAE,UAAU,CAAC,GAAG,CAAC,EAC5B,MAAM,SAAS,EACf,uBAAuB,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,EAAE;AACtF;yEACyE;AACzE,WAAW,CAAC,EAAE,eAAe;AAC7B;+EAC+E;AAC/E,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,mBAAmB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GACzF,eAAe,CA2ZjB"}

package/eslint.config.js

@@ -87,6 +87,7 @@ export default [
       '@typescript-eslint/no-extraneous-class': 'off',
       '@typescript-eslint/no-deprecated': 'off',
       '@typescript-eslint/no-unnecessary-type-parameters': 'off',
+      '@typescript-eslint/no-unnecessary-type-arguments': 'off',
       '@typescript-eslint/no-redundant-type-constituents': 'off',
       '@typescript-eslint/only-throw-error': 'off',
       '@typescript-eslint/no-useless-constructor': 'off',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ugly-app",
-  "version": "0.1.310",
+  "version": "0.1.312",
   "type": "module",
   "main": "./dist/server/index.js",
   "exports": {
@@ -40,7 +40,6 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.700.0",
     "@aws-sdk/s3-request-presigner": "^3.700.0",
-    "@qdrant/js-client-rest": "^1.17.0",
     "@tanstack/virtual-core": "^3.0.0",
     "@types/jsonwebtoken": "^9.0.10",
     "bcrypt": "^6.0.0",
@@ -59,7 +58,6 @@
     "nanoid": "^5.1.5",
     "nats": "^2.28.2",
     "onnxruntime-node": "^1.23.0",
-    "pg": "^8.20.0",
     "react-datepicker": "^9.1.0",
     "ws": "^8.18.0",
     "zod": "^4.3.6"

package/src/cli/authCommands.ts

@@ -40,7 +40,7 @@ export async function createAccount(
 
     return { userId, email };
   } finally {
-    await stopDataProxy();
+    stopDataProxy();
   }
 }
 

package/src/cli/dev.ts

@@ -2,8 +2,6 @@ import { exec, execSync, spawn } from 'child_process';
 import fs from 'fs';
 import net from 'net';
 import path from 'path';
-import pg from 'pg';
-
 function waitForPort(port: number, retries = 30, intervalMs = 1000): Promise<void> {
   return new Promise((resolve, reject) => {
     let attempts = 0;
@@ -26,30 +24,6 @@ import {
   validateLocalPort,
 } from './uglyappConfig.js';
 
-async function waitForPostgres(
-  url: string,
-  opts: { retries: number; intervalMs: number },
-): Promise<void> {
-  for (let i = 0; i < opts.retries; i++) {
-    try {
-      const client = new pg.Client({ connectionString: url, connectionTimeoutMillis: 2000 });
-      await client.connect();
-      await client.query('SELECT 1');
-      await client.end();
-      return;
-    } catch {
-      // fall through to retry
-    }
-    if (i === opts.retries - 1)
-      throw new Error(
-        `[ugly-app] PostgreSQL not ready after ${Math.round((opts.retries * opts.intervalMs) / 1000)}s — check ugly.bot connection`,
-      );
-    if (i % 5 === 4) process.stdout.write('.');
-    await new Promise((r) => setTimeout(r, opts.intervalMs));
-  }
-}
-
-
 export async function runDev(opts: { watch: boolean; verbose: boolean } = { watch: false, verbose: false }): Promise<void> {
   const config = readUglyAppConfig(process.cwd());
   if (config !== null) {
@@ -97,10 +71,6 @@ export async function runDev(opts: { watch: boolean; verbose: boolean } = { watc
   // ── 2. Wait for data proxy ─────────────────────────────────────────────────
   if (process.env['DATA_PROXY_URL']) {
     process.stdout.write('[DataProxy] Connected to data proxy\n');
-  } else if (process.env['POSTGRES_URL']) {
-    process.stdout.write('[ugly-app] Waiting for PostgreSQL');
-    await waitForPostgres(process.env['POSTGRES_URL']!, { retries: 30, intervalMs: 1000 });
-    process.stdout.write(' ✓\n');
   }
 
   // ── 3. Run any pending migrations ─────────────────────────────────────────

package/src/cli/migrate.ts

@@ -117,6 +117,6 @@ export async function runMigrations(
       }
     }
   } finally {
-    await stopDataProxy();
+    stopDataProxy();
   }
 }

package/src/cli/scaffold.ts

@@ -109,8 +109,11 @@ export async function scaffoldProject(projectName: string): Promise<void> {
   for (const [name, def] of Object.entries(BUILTIN_DEFS)) {
     bootstrapCollections[name] = { indexes: (def as { indexes?: { fields: Record<string, 1 | -1>; unique?: boolean; ttl?: number }[] }).indexes };
   }
-  // Template ships with todo (no indexes). User data lives on ugly.bot.
+  // Template collections — todo, conversation, message, collabDoc
   bootstrapCollections['todo'] = {};
+  bootstrapCollections['conversation'] = {};
+  bootstrapCollections['message'] = { indexes: [{ fields: { conversationId: 1 } }] };
+  bootstrapCollections['collabDoc'] = {};
 
   const migrationCode = generateBootstrapMigration(bootstrapCollections);
   await fs.writeFile(path.join(migrationsDir, '001_bootstrap.ts'), migrationCode, 'utf-8');

package/src/cli/serverLogQuery.ts

@@ -140,6 +140,6 @@ export async function queryServerLogs(
       }
     }
   } finally {
-    await stopDataProxy();
+    stopDataProxy();
   }
 }

package/src/cli/version.ts

@@ -1,2 +1,2 @@
 // Auto-generated by prebuild — do not edit manually
-export const CLI_VERSION = "0.1.310";
+export const CLI_VERSION = "0.1.312";

package/src/server/App.ts

@@ -962,11 +962,7 @@ export function createApp<
       console.log('[App] SIGTERM received, shutting down gracefully');
       await new Promise<void>((resolve) => httpServer.close(() => resolve()));
       if (workerQueue) await workerQueue.stop();
-      await stopDataProxy();
-      if (process.env.QDRANT_URL) {
-        const { stopQdrant } = await import('./Qdrant.js');
-        stopQdrant();
-      }
+      stopDataProxy();
       console.log('[App] Shutdown complete');
       process.exit(0);
     };

package/src/server/DataProxyClient.ts

@@ -39,12 +39,6 @@ let _connected = false;
 // Queue of messages to send when connection is established
 const _sendQueue: string[] = [];
 
-function ensureConnected(): void {
-  if (!_ws || _ws.readyState !== WebSocket.OPEN) {
-    throw new Error('[DataProxy] Not connected to data proxy server');
-  }
-}
-
 async function rpc(op: string, args: unknown[]): Promise<unknown> {
   // Wait for connection if still connecting
   if (_connectPromise) await _connectPromise;
@@ -57,7 +51,7 @@ async function rpc(op: string, args: unknown[]): Promise<unknown> {
   return new Promise<unknown>((resolve, reject) => {
     _pending.set(id, { resolve, reject });
 
-    if (_ws && _ws.readyState === WebSocket.OPEN) {
+    if (_ws?.readyState === WebSocket.OPEN) {
       _ws.send(msg);
     } else {
       _sendQueue.push(msg);
@@ -145,8 +139,8 @@ export async function initDataProxy(url: string, token: string): Promise<void> {
       if (_url && _token) {
         setTimeout(() => {
           console.log('[DataProxy] Reconnecting...');
-          initDataProxy(_url, _token).catch((err) => {
-            console.error('[DataProxy] Reconnect failed:', err.message);
+          initDataProxy(_url, _token).catch((err: unknown) => {
+            console.error('[DataProxy] Reconnect failed:', err instanceof Error ? err.message : err);
           });
         }, 1000);
       }
@@ -161,15 +155,14 @@ export async function initDataProxy(url: string, token: string): Promise<void> {
     });
   });
 
-  _connectPromise.finally(() => {
+  void _connectPromise.finally(() => {
     _connectPromise = null;
   });
 
   return _connectPromise;
 }
 
-export async function stopDataProxy(): Promise<void> {
-  const url = _url;
+export function stopDataProxy(): void {
   _url = '';
   _token = '';
   _connected = false;
@@ -299,6 +292,7 @@ export async function pgFind<T>(
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export async function pgFindCount<T = unknown>(
   collection: string,
   filter?: any,

package/src/server/Logging.ts

@@ -3,7 +3,7 @@ import fsSync from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import type { TypedDB } from '../shared/DB.js';
-import type { StorageClient } from './Storage.js';
+import type { StorageClient } from './DataProxyClient.js';
 
 // ─── App API forwarding ─────────────────────────────────────────────────────
 

package/src/server/SchemaCheck.ts

@@ -1,6 +1,5 @@
 import type { z } from 'zod';
 import { pgQuery } from './DataProxyClient.js';
-// Compatibility shim for code that uses Postgres.query()
 const Postgres = { query: pgQuery };
 import type { CollectionDefRegistry, IndexDef } from '../shared/DB.js';
 import { serializeSchema, type SchemaDescriptor } from '../shared/SchemaSerializer.js';

package/src/server/Socket.ts

@@ -5,7 +5,7 @@ import { verifyToken } from './Auth.js';
 import { subscribeCollection, subscribeDoc, subscribeDocKey } from './NatsStore.js';
 import { registerPushConnection } from './PushNotification.js';
 import type { AppRouter } from './Router.js';
-import type { StorageClient } from './Storage.js';
+import type { StorageClient } from './DataProxyClient.js';
 
 interface Session {
   userId: string;

package/src/server/Postgres.ts

@@ -1,29 +0,0 @@
-import pg from 'pg';
-
-const { Pool } = pg;
-
-let _pool: pg.Pool | null = null;
-
-export async function initPostgres(connectionString: string): Promise<void> {
-  _pool = new Pool({ connectionString });
-  // Verify connection
-  const client = await _pool.connect();
-  client.release();
-}
-
-export function getPool(): pg.Pool {
-  if (!_pool) throw new Error('[DB] PostgreSQL not initialized — call initPostgres first');
-  return _pool;
-}
-
-export async function query<T extends pg.QueryResultRow = pg.QueryResultRow>(
-  text: string,
-  values?: unknown[],
-): Promise<pg.QueryResult<T>> {
-  return getPool().query<T>(text, values);
-}
-
-export async function stopPostgres(): Promise<void> {
-  await _pool?.end();
-  _pool = null;
-}

package/src/server/PostgresDB.ts

@@ -1,263 +0,0 @@
-import type { DBObject, DocFields, FindOptions, MongoUpdateOp, TypedFilter } from '../shared/DB.js';
-import { query } from './Postgres.js';
-import { translateFilter, translateSort } from './PostgresFilter.js';
-import { applyUpdateOp } from './PostgresOperators.js';
-import { translatePipeline } from './PostgresPipeline.js';
-
-/** Merge JSONB data with top-level DB columns into a document */
-function toDoc<T extends DBObject>(row: {
-  _id: string;
-  data: Record<string, unknown>;
-  created: Date;
-  updated: Date;
-  version: number;
-}): T {
-  return {
-    ...row.data,
-    _id: row._id,
-    created: row.created,
-    updated: row.updated,
-    version: row.version,
-  } as unknown as T;
-}
-
-/** Strip DB metadata fields from a doc to get the JSONB data payload */
-function toData(doc: DBObject): Record<string, unknown> {
-  const { _id: _, version: _v, created: _c, updated: _u, ...data } = doc as unknown as Record<string, unknown>;
-  return data;
-}
-
-interface FullRow { _id: string; data: Record<string, unknown>; created: Date; updated: Date; version: number }
-
-export async function pgGetDoc<T extends DBObject>(
-  collection: string,
-  id: string,
-): Promise<T | null> {
-  const result = await query<FullRow>(
-    `SELECT _id, data, created, updated, version FROM "${collection}" WHERE _id = $1`,
-    [id],
-  );
-  if (result.rows.length === 0) return null;
-  return toDoc<T>(result.rows[0]);
-}
-
-export async function pgSetDoc<T extends DBObject>(
-  collection: string,
-  doc: T,
-  options?: { skipIfExists?: boolean },
-): Promise<boolean> {
-  const data = toData(doc);
-
-  if (options?.skipIfExists) {
-    const result = await query(
-      `INSERT INTO "${collection}" (_id, data, created, updated, version)
-       VALUES ($1, $2, $3, $4, $5)
-       ON CONFLICT (_id) DO NOTHING`,
-      [doc._id, JSON.stringify(data), doc.created, doc.updated, doc.version],
-    );
-    return (result.rowCount ?? 0) > 0;
-  }
-
-  await query(
-    `INSERT INTO "${collection}" (_id, data, created, updated, version)
-     VALUES ($1, $2, $3, $4, $5)
-     ON CONFLICT (_id) DO UPDATE SET
-       data = EXCLUDED.data,
-       updated = EXCLUDED.updated,
-       version = EXCLUDED.version`,
-    [doc._id, JSON.stringify(data), doc.created, doc.updated, doc.version],
-  );
-  return true;
-}
-
-export async function pgSetDocFields<T extends DBObject>(
-  collection: string,
-  id: string,
-  fields: DocFields<T>,
-): Promise<T> {
-  const result = await applyUpdateOp(collection, id, { $set: fields as Record<string, unknown> });
-  if (!result) throw new Error(`[DB] Document not found: ${collection}/${id}`);
-  return result as unknown as T;
-}
-
-export async function pgSetDocFieldsOrIgnore<T extends DBObject>(
-  collection: string,
-  id: string,
-  fields: DocFields<T>,
-): Promise<T | null> {
-  const result = await applyUpdateOp(collection, id, { $set: fields as Record<string, unknown> });
-  return result as unknown as T | null;
-}
-
-export async function pgSetDocFieldsOrCreate<T extends DBObject>(
-  collection: string,
-  id: string,
-  fields: DocFields<T>,
-  obj: T,
-): Promise<T> {
-  const existing = await pgSetDocFieldsOrIgnore<T>(collection, id, fields);
-  if (existing) return existing;
-  await pgSetDoc(collection, obj);
-  return obj;
-}
-
-export async function pgSetDocOp<T extends DBObject>(
-  collection: string,
-  id: string,
-  op: MongoUpdateOp<T>,
-): Promise<T> {
-  const result = await applyUpdateOp(collection, id, op as Record<string, unknown>);
-  if (!result) throw new Error(`[DB] Document not found: ${collection}/${id}`);
-  return result as unknown as T;
-}
-
-export async function pgSetDocOpOrIgnore<T extends DBObject>(
-  collection: string,
-  id: string,
-  op: MongoUpdateOp<T>,
-): Promise<T | null> {
-  const result = await applyUpdateOp(collection, id, op as Record<string, unknown>);
-  return result as unknown as T | null;
-}
-
-export async function pgDeleteDoc(
-  collection: string,
-  id: string,
-): Promise<void> {
-  await query(`DELETE FROM "${collection}" WHERE _id = $1`, [id]);
-}
-
-export async function pgGetDocs<T extends DBObject>(
-  collection: string,
-  filter: Record<string, unknown> = {},
-  options: {
-    sort?: Record<string, 1 | -1>;
-    limit?: number;
-    skip?: number;
-  } = {},
-): Promise<T[]> {
-  const { where, values } = translateFilter(filter);
-  let sql = `SELECT _id, data, created, updated, version FROM "${collection}"`;
-  if (where) sql += ` WHERE ${where}`;
-  if (options.sort) sql += ` ORDER BY ${translateSort(options.sort)}`;
-  if (options.limit) {
-    values.push(options.limit);
-    sql += ` LIMIT $${values.length}`;
-  }
-  if (options.skip) {
-    values.push(options.skip);
-    sql += ` OFFSET $${values.length}`;
-  }
-
-  const result = await query<FullRow>(sql, values);
-  return result.rows.map((row) => toDoc<T>(row));
-}
-
-export async function pgGetQuery<T>(
-  collection: string,
-  pipeline: Record<string, unknown>[],
-  options?: { skip?: number; limit?: number },
-): Promise<T[]> {
-  const { sql, values } = translatePipeline(collection, pipeline, options);
-  const result = await query(sql, values);
-  return result.rows.map((row) => {
-    if (row.data && row._id !== undefined && row.created !== undefined) {
-      return toDoc(row as FullRow) as unknown as T;
-    }
-    return row as unknown as T;
-  });
-}
-
-export async function pgGetQueryCount(
-  collection: string,
-  pipeline: Record<string, unknown>[],
-): Promise<number> {
-  const { sql, values } = translatePipeline(collection, [...pipeline, { $count: 'count' }]);
-  const result = await query<{ count: string }>(sql, values);
-  return Number(result.rows[0]?.count ?? 0);
-}
-
-export async function pgGetQueryRaw<T>(
-  collection: string,
-  pipeline: Record<string, unknown>[],
-  options?: { skip?: number; limit?: number },
-): Promise<T[]> {
-  const { sql, values } = translatePipeline(collection, pipeline, options);
-  const result = await query(sql, values);
-  return result.rows as unknown as T[];
-}
-
-export async function pgDeleteDocs(
-  collection: string,
-  filter: Record<string, unknown>,
-): Promise<string[]> {
-  const { where, values } = translateFilter(filter);
-  let sql = `DELETE FROM "${collection}"`;
-  if (where) sql += ` WHERE ${where}`;
-  sql += ` RETURNING _id`;
-
-  const result = await query<{ _id: string }>(sql, values);
-  return result.rows.map((r) => r._id);
-}
-
-// ---------------------------------------------------------------------------
-// Typed SQL-native query functions
-// ---------------------------------------------------------------------------
-
-export async function pgFind<T extends DBObject>(
-  collection: string,
-  filter: TypedFilter<T> = {} as TypedFilter<T>,
-  options: FindOptions<T> = {} as FindOptions<T>,
-): Promise<T[]> {
-  const { where, values } = translateFilter(filter as Record<string, unknown>);
-  let sql = `SELECT _id, data, created, updated, version FROM "${collection}"`;
-  if (where) sql += ` WHERE ${where}`;
-  if (options.sort) sql += ` ORDER BY ${translateSort(options.sort as Record<string, 1 | -1>)}`;
-  if (options.limit) {
-    values.push(options.limit);
-    sql += ` LIMIT $${values.length}`;
-  }
-  if (options.skip) {
-    values.push(options.skip);
-    sql += ` OFFSET $${values.length}`;
-  }
-  const result = await query<FullRow>(sql, values);
-  return result.rows.map((row) => toDoc<T>(row));
-}
-
-export async function pgFindCount<T>(
-  collection: string,
-  filter: TypedFilter<T> = {} as TypedFilter<T>,
-): Promise<number> {
-  const { where, values } = translateFilter(filter as Record<string, unknown>);
-  let sql = `SELECT COUNT(*)::int AS count FROM "${collection}"`;
-  if (where) sql += ` WHERE ${where}`;
-  const result = await query<{ count: number }>(sql, values);
-  return result.rows[0]?.count ?? 0;
-}
-
-export async function pgFindRandom<T extends DBObject>(
-  collection: string,
-  filter: TypedFilter<T> = {} as TypedFilter<T>,
-  limit = 100,
-): Promise<T[]> {
-  const { where, values } = translateFilter(filter as Record<string, unknown>);
-  let sql = `SELECT _id, data, created, updated, version FROM "${collection}"`;
-  if (where) sql += ` WHERE ${where}`;
-  values.push(limit);
-  sql += ` ORDER BY RANDOM() LIMIT $${values.length}`;
-  const result = await query<FullRow>(sql, values);
-  return result.rows.map((row) => toDoc<T>(row));
-}
-
-export async function pgDeleteWhere<T>(
-  collection: string,
-  filter: TypedFilter<T>,
-): Promise<string[]> {
-  const { where, values } = translateFilter(filter as Record<string, unknown>);
-  let sql = `DELETE FROM "${collection}"`;
-  if (where) sql += ` WHERE ${where}`;
-  sql += ` RETURNING _id`;
-  const result = await query<{ _id: string }>(sql, values);
-  return result.rows.map((r) => r._id);
-}