@rebasepro/server-postgres 0.9.1-canary.58368ce → 0.9.1-canary.73476f2

package/src/services/RelationService.ts

@@ -162,12 +162,11 @@ export class RelationService {
             const rows: RelatedRow<M>[] = [];
             for (const row of results as Array<Record<string, unknown>>) {
                 const targetRow = (row[targetTableName] as Record<string, unknown>) || row;
+                const id = targetRow[idInfo[0].fieldName as string];
                 const parsedValues = await parseDataFromServer(targetRow, targetCollection, this.db, this.registry);
 
                 rows.push({
-                    // The whole key: the first column of a composite one names
-                    // every row that shares it.
-                    id: buildCompositeId(targetRow, idInfo),
+                    id: id?.toString() || "",
                     path: targetCollection.slug,
                     values: parsedValues as M
                 });
@@ -229,10 +228,11 @@ export class RelationService {
         const rows: RelatedRow<M>[] = [];
         for (const row of results) {
             const targetRow = row[getTableName(targetCollection)] || row;
+            const id = targetRow[idInfo[0].fieldName];
             const parsedValues = await parseDataFromServer(targetRow, targetCollection, this.db, this.registry);
 
             rows.push({
-                id: buildCompositeId(targetRow as Record<string, unknown>, idInfo),
+                id: id?.toString() || "",
                 path: targetCollection.slug,
                 values: parsedValues as M
             });
@@ -371,7 +371,7 @@ export class RelationService {
                 const parsedValues = await parseDataFromServer(targetRow, targetCollection);
 
                 resultMap.set(String(parentId), {
-                    id: buildCompositeId(targetRow, targetPks),
+                    id: String(targetRow[targetIdInfo.fieldName]),
                     path: targetCollection.slug,
                     values: parsedValues as Record<string, unknown>
                 });
@@ -438,7 +438,7 @@ export class RelationService {
                 if (targetRow) {
                     const parsedValues = await parseDataFromServer(targetRow, targetCollection);
                     resultMap.set(parentIdStr, {
-                        id: buildCompositeId(targetRow, targetPks),
+                        id: String(targetRow[targetIdInfo.fieldName]),
                         path: targetCollection.slug,
                         values: parsedValues as Record<string, unknown>
                     });
@@ -490,7 +490,7 @@ export class RelationService {
             if (parentId !== undefined && parentIdSet.has(String(parentId))) {
                 const parsedValues = await parseDataFromServer(targetRow, targetCollection);
                 resultMap.set(String(parentId), {
-                    id: buildCompositeId(targetRow, targetPks),
+                    id: String(targetRow[targetIdInfo.fieldName]),
                     path: targetCollection.slug,
                     values: parsedValues as Record<string, unknown>
                 });
@@ -565,7 +565,7 @@ export class RelationService {
 
                 const arr = resultMap.get(parentId) || [];
                 arr.push({
-                    id: buildCompositeId(targetRow, targetPks),
+                    id: String(targetRow[targetIdInfo.fieldName]),
                     path: targetCollection.slug,
                     values: parsedValues as Record<string, unknown>
                 });
@@ -616,7 +616,7 @@ export class RelationService {
 
                 const arr = resultMap.get(parentId) || [];
                 arr.push({
-                    id: buildCompositeId(targetData, targetPks),
+                    id: String(targetData[targetIdInfo.fieldName]),
                     path: targetCollection.slug,
                     values: parsedValues as Record<string, unknown>
                 });
@@ -672,7 +672,7 @@ export class RelationService {
                 const key = String(parentId);
                 const arr = resultMap.get(key) || [];
                 arr.push({
-                    id: buildCompositeId(targetRow, targetPks),
+                    id: String(targetRow[targetIdInfo.fieldName]),
                     path: targetCollection.slug,
                     values: parsedValues as Record<string, unknown>
                 });
@@ -865,6 +865,7 @@ export class RelationService {
             relationKey: string;
             relation: Relation;
             newValue: unknown;
+            currentId?: string | number;
         }>
     ) {
         for (const update of inverseRelationUpdates) {

package/src/services/collection-helpers.ts

@@ -2,15 +2,6 @@ import { PgTable, AnyPgColumn } from "drizzle-orm/pg-core";
 import { CollectionConfig, Property } from "@rebasepro/types";
 import { PostgresCollectionRegistry } from "../collections/PostgresCollectionRegistry";
 import { getTableName } from "@rebasepro/common";
-import { logger } from "@rebasepro/server";
-
-// Row identity is derived on both sides of the wire — the driver parses an
-// incoming address into key columns, the admin derives one from a served row —
-// so the implementation lives in `common` and both agree by construction.
-export { buildCompositeId, parseIdValues, COMPOSITE_ID_SEPARATOR } from "@rebasepro/common";
-export type { PrimaryKeyInfo } from "@rebasepro/common";
-import { buildCompositeId, COMPOSITE_ID_SEPARATOR, getDeclaredPrimaryKeys } from "@rebasepro/common";
-import type { PrimaryKeyInfo } from "@rebasepro/common";
 
 /**
  * Shared helper functions for row operations.
@@ -58,7 +49,7 @@ export function getTableForCollection(collection: CollectionConfig, registry: Po
     return table;
 }
 
-export function getPrimaryKeys(collection: CollectionConfig, registry: PostgresCollectionRegistry): PrimaryKeyInfo[] {
+export function getPrimaryKeys(collection: CollectionConfig, registry: PostgresCollectionRegistry): { fieldName: string; type: "string" | "number"; isUUID?: boolean }[] {
     const table = getTableForCollection(collection, registry);
 
     // Fallback to explicitly defined isId properties
@@ -77,7 +68,7 @@ export function getPrimaryKeys(collection: CollectionConfig, registry: PostgresC
     }
 
     // Otherwise infer from Drizzle schema
-    const keys: PrimaryKeyInfo[] = [];
+    const keys: { fieldName: string; type: "string" | "number"; isUUID?: boolean }[] = [];
     for (const [key, colRaw] of Object.entries(table)) {
         const col = colRaw as AnyPgColumn;
         if (col && typeof col === "object" && "primary" in col && col.primary) {
@@ -105,132 +96,56 @@ isUUID });
     return keys;
 }
 
-/**
- * Collections whose key the *browser* cannot resolve, and what it will do
- * instead.
- *
- * The two sides resolve keys from different evidence. This driver reads, in
- * order: properties marked `isId`, the primary keys of the Drizzle schema, then
- * a column literally named `id`. The admin shares the `CollectionConfig` — it
- * compiles the same collection files into its bundle — but never the Drizzle
- * schema, so the middle tier is invisible to it.
- *
- * Nothing can normalize this at runtime: the server does not serve the admin
- * its collections, so a key resolved here cannot be handed over there. The
- * config files are the only thing both sides read, so the fix is an edit to
- * them, and the most this can do is say exactly which edit.
- *
- * Two shapes, and the second is the dangerous one:
- *
- * - No `isId`, no `id` property → the admin resolves no address, warns in the
- *   console, and rows cannot be opened or linked.
- * - No `isId`, but an `id` property that is *not* the key → the admin addresses
- *   rows by `id` while this driver reads the address as the real key. Nothing
- *   errors: the addresses look right and route wrong.
- */
-export function findUnresolvableKeyCollections(
-    collections: CollectionConfig[],
-    registry: PostgresCollectionRegistry
-): { collection: CollectionConfig; keys: PrimaryKeyInfo[]; shadowedByIdProperty: boolean }[] {
-    const findings: { collection: CollectionConfig; keys: PrimaryKeyInfo[]; shadowedByIdProperty: boolean }[] = [];
-
-    for (const collection of collections) {
-        // Declared `isId` is the tier both sides share: if it is there, they agree.
-        if (getDeclaredPrimaryKeys(collection).length > 0) continue;
-
-        let keys: PrimaryKeyInfo[];
-        try {
-            keys = getPrimaryKeys(collection, registry);
-        } catch {
-            // No registered table — nothing resolved here either, so there is no
-            // disagreement to report.
-            continue;
-        }
-        if (keys.length === 0) continue;
-
-        // A single key named `id` is the last tier on both sides: they agree
-        // without anything being declared.
-        if (keys.length === 1 && keys[0].fieldName === "id") continue;
+export function parseIdValues(idValue: string | number, primaryKeys: { fieldName: string; type: "string" | "number"; isUUID?: boolean }[]): Record<string, string | number> {
+    const result: Record<string, string | number> = {};
 
-        findings.push({
-            collection,
-            keys,
-            shadowedByIdProperty: Boolean(collection.properties?.id)
-        });
+    if (primaryKeys.length === 0) {
+        return result;
     }
 
-    return findings;
-}
-
-/**
- * Report the collections from {@link findUnresolvableKeyCollections} at boot,
- * with the edit that fixes each one.
- *
- * Grouped by failure, not by collection: the shadowed case is a routing bug and
- * the silent case is a missing feature, and they deserve different urgency.
- */
-export function warnOnKeysTheAdminCannotResolve(
-    collections: CollectionConfig[],
-    registry: PostgresCollectionRegistry
-): void {
-    const findings = findUnresolvableKeyCollections(collections, registry);
-    if (findings.length === 0) return;
-
-    const edit = (f: { collection: CollectionConfig; keys: PrimaryKeyInfo[] }) =>
-        `${f.collection.slug}: mark ${f.keys.map(k => `\`${k.fieldName}\``).join(" and ")} with ` +
-        `\`isId: ${f.keys[0].isUUID ? "\"uuid\"" : f.keys[0].type === "number" ? "\"increment\"" : "true"}\``;
-
-    const shadowed = findings.filter(f => f.shadowedByIdProperty);
-    const silent = findings.filter(f => !f.shadowedByIdProperty);
-
-    if (shadowed.length > 0) {
-        logger.warn(
-            `⚠️ These collections declare no \`isId\`, and their key is only in the drizzle schema — but they ` +
-            `do have a property called \`id\`. The admin has no way to know \`id\` is not the key, so it will ` +
-            `address rows by it while this server reads the address as the real key: the links look right and ` +
-            `route wrong. Nothing will error.\n\n` +
-            shadowed.map(f => `  • ${edit(f)}`).join("\n") + "\n"
-        );
+    if (primaryKeys.length === 1) {
+        const pk = primaryKeys[0];
+        if (pk.type === "number" && !pk.isUUID) {
+            const parsed = typeof idValue === "number" ? idValue : parseInt(String(idValue), 10);
+            if (isNaN(parsed)) {
+                throw new Error(`Invalid numeric ID: ${idValue}`);
+            }
+            result[pk.fieldName] = parsed;
+        } else {
+            result[pk.fieldName] = String(idValue);
+        }
+        return result;
     }
 
-    if (silent.length > 0) {
-        logger.warn(
-            `⚠️ These collections declare no \`isId\`, and their key is only in the drizzle schema, which the ` +
-            `admin never sees. It will resolve no address for their rows, so detail links, caching and ` +
-            `relations will not work for them:\n\n` +
-            silent.map(f => `  • ${edit(f)}`).join("\n") + "\n"
-        );
+    // Composite key - split by :::
+    const parts = String(idValue).split(":::");
+    if (parts.length !== primaryKeys.length) {
+        throw new Error(`Composite ID parts mismatch. Expected ${primaryKeys.length}, got ${parts.length} for ID: ${idValue}`);
     }
-}
 
-/**
- * The address of a row: derived from the collection's primary keys, because a
- * row does not carry one — it is exactly its columns.
- *
- * Falls back to a literal `id` column, which covers the two cases where the
- * keys cannot be resolved: a row that reached us from somewhere other than the
- * postgres driver, and a collection whose table the registry cannot look up
- * (`getPrimaryKeys` throws for an unregistered table rather than returning
- * nothing). Returns `""` when there is no key and no `id` — callers decide what
- * that means, since "unaddressable" is a different answer in a notification
- * (broadcast a wildcard) than in a save (fail).
- */
-export function deriveRowAddress(
-    row: Record<string, unknown>,
-    collection: CollectionConfig,
-    registry: PostgresCollectionRegistry
-): string {
-    try {
-        const composite = buildCompositeId(row, getPrimaryKeys(collection, registry));
-        // An all-empty composite is indistinguishable from a missing key, and
-        // `buildCompositeId` returns "" for no keys at all.
-        if (composite && composite.split(COMPOSITE_ID_SEPARATOR).some(part => part !== "")) {
-            return composite;
+    for (let i = 0; i < primaryKeys.length; i++) {
+        const pk = primaryKeys[i];
+        const val = parts[i];
+        if (pk.type === "number" && !pk.isUUID) {
+            const parsed = parseInt(val, 10);
+            if (isNaN(parsed)) {
+                throw new Error(`Invalid numeric ID component: ${val}`);
+            }
+            result[pk.fieldName] = parsed;
+        } else {
+            result[pk.fieldName] = val;
         }
-    } catch {
-        /* unresolvable table or keys — fall through to the literal column */
     }
-    if (row.id !== undefined && row.id !== null) return String(row.id);
-    return "";
+
+    return result;
 }
 
+export function buildCompositeId(values: Record<string, unknown>, primaryKeys: { fieldName: string; type: "string" | "number"; isUUID?: boolean }[]): string {
+    if (primaryKeys.length === 0) {
+        return "";
+    }
+    if (primaryKeys.length === 1) {
+        return String(values[primaryKeys[0].fieldName] ?? "");
+    }
+    return primaryKeys.map(pk => String(values[pk.fieldName] ?? "")).join(":::");
+}

package/src/services/dataService.ts

@@ -154,10 +154,9 @@ export class DataService implements DataRepository {
         collectionPath: string,
         values: Partial<M>,
         id?: string | number,
-        databaseId?: string,
-        options?: { upsert?: boolean }
+        databaseId?: string
     ): Promise<Record<string, unknown>> {
-        return this.persistService.save<M>(collectionPath, values, id, databaseId, options);
+        return this.persistService.save<M>(collectionPath, values, id, databaseId);
     }
 
     /**

package/src/services/index.ts

@@ -8,7 +8,6 @@ export {
     getCollectionByPath,
     getTableForCollection,
     getPrimaryKeys,
-    deriveRowAddress,
     parseIdValues,
     buildCompositeId
 } from "./collection-helpers";

package/src/services/realtimeService.ts

@@ -14,7 +14,7 @@ import { applyAuthContext } from "../security/rls-enforcement";
 import { logger } from "@rebasepro/server";
 import { sanitizeErrorForClient } from "../utils/pg-error-utils";
 import { CdcListener, type CdcChangeEvent } from "./cdc/CdcListener";
-import { deriveRowAddress, getPrimaryKeys, type PrimaryKeyInfo } from "./collection-helpers";
+import { getPrimaryKeys, buildCompositeId } from "./collection-helpers";
 
 /** Channel name used for Postgres LISTEN/NOTIFY cross-instance realtime. */
 const PG_NOTIFY_CHANNEL = "rebase_entity_changes";
@@ -390,7 +390,7 @@ export class RealtimeService extends EventEmitter implements RealtimeProvider {
                 authContext
             );
 
-            this.sendCollectionUpdate(clientId, subscriptionId, rows, request.path);
+            this.sendCollectionUpdate(clientId, subscriptionId, rows);
 
         } catch (error) {
             const sanitized = sanitizeErrorForClient(error, request.path);
@@ -554,7 +554,7 @@ export class RealtimeService extends EventEmitter implements RealtimeProvider {
                     // Phase 1: Send instant row-level patch (no DB query)
                     // This gives immediate cross-tab feedback
                     if (!row || !(row as Record<string, unknown>)?._rebase_invalidated) {
-                        this.sendCollectionPatch(subscription.clientId, subscriptionId, id, row, notifyPath);
+                        this.sendCollectionPatch(subscription.clientId, subscriptionId, id, row);
                     }
 
                     // Phase 2: Schedule a deferred full refetch for correctness
@@ -609,7 +609,7 @@ export class RealtimeService extends EventEmitter implements RealtimeProvider {
             if (!this._subscriptions.has(subscriptionId)) return;
             try {
                 const rows = await this.fetchCollectionWithAuth(notifyPath, subscription.collectionRequest!, subscription.authContext);
-                this.sendCollectionUpdate(subscription.clientId, subscriptionId, rows, notifyPath);
+                this.sendCollectionUpdate(subscription.clientId, subscriptionId, rows);
             } catch (error) {
                 const sanitized = sanitizeErrorForClient(error, notifyPath);
                 this.sendError(subscription.clientId, sanitized.message, subscriptionId, sanitized.code);
@@ -910,12 +910,11 @@ roles: activeAuth.roles },
         return await this.dataService.fetchOne(notifyPath, id);
     }
 
-    private sendCollectionUpdate(clientId: string, subscriptionId: string, rows: Record<string, unknown>[], path: string) {
+    private sendCollectionUpdate(clientId: string, subscriptionId: string, rows: Record<string, unknown>[]) {
         const message: CollectionUpdateMessage = {
             type: "collection_update",
             subscriptionId,
-            rows: rows,
-            pks: this.primaryKeysForPath(path)
+            rows: rows
         };
         this.sendMessage(clientId, message);
     }
@@ -932,43 +931,17 @@ roles: activeAuth.roles },
     /**
      * Send a lightweight row-level patch to a collection subscriber.
      * The client can merge this into its cached data for instant feedback.
-     *
-     * The key columns ride along: the patch names a row by address, and the
-     * client has to find that row among the ones it cached — which carry
-     * columns and no address. The SDK holds no collection config to derive one
-     * from, so this is the only place the mapping can come from.
      */
-    private sendCollectionPatch(
-        clientId: string,
-        subscriptionId: string,
-        id: string,
-        row: Record<string, unknown> | null,
-        notifyPath: string
-    ) {
+    private sendCollectionPatch(clientId: string, subscriptionId: string, id: string, row: Record<string, unknown> | null) {
         const message: CollectionPatchMessage = {
             type: "collection_patch",
             subscriptionId,
             id,
-            row: row,
-            pks: this.primaryKeysForPath(notifyPath)
+            row: row
         };
         this.sendMessage(clientId, message);
     }
 
-    /** The key columns of the collection at `path`, if they can be resolved. */
-    private primaryKeysForPath(path: string): PrimaryKeyInfo[] | undefined {
-        try {
-            const collection = this.registry.getCollectionByPath(path);
-            if (!collection) return undefined;
-            const keys = getPrimaryKeys(collection, this.registry);
-            return keys.length > 0 ? keys : undefined;
-        } catch {
-            // Unregistered table, or a relation path with no collection of its
-            // own: the client keeps its pre-existing `id` behaviour.
-            return undefined;
-        }
-    }
-
     private sendError(clientId: string, error: string, subscriptionId?: string, code?: string) {
         const message = {
             type: "error" as const,
@@ -1321,9 +1294,17 @@ lastSeen: Date.now() });
 
     /** Compute the canonical (possibly composite) id string from a captured row. */
     private extractIdFromCdcRow(collection: CollectionConfig, row: Record<string, unknown>): string {
-        // Unaddressable falls back to a collection-level invalidation: single-row
-        // subs won't match, but collection subs still refetch.
-        return deriveRowAddress(row, collection, this.registry) || "*";
+        try {
+            const primaryKeys = getPrimaryKeys(collection, this.registry);
+            const composite = buildCompositeId(row, primaryKeys);
+            if (composite && composite !== ":::") return composite;
+        } catch {
+            /* fall through to id-field / wildcard */
+        }
+        // Fallbacks: a plain `id` column (common), else a collection-level
+        // invalidation ("*") — single-row subs won't match but collection subs refetch.
+        if (row.id !== undefined && row.id !== null) return String(row.id);
+        return "*";
     }
 
     // ── App/CDC de-duplication ──

package/src/websocket.ts

@@ -620,12 +620,9 @@ roles: ["anon"] };
                 if (error instanceof Error) {
                     logger.error("Stack trace", { detail: error.stack });
                 }
-                // Unwrap the cause chain: a Drizzle failure reports itself as
-                // "Failed query: <sql> params:", which tells the user nothing and
-                // echoes the statement back at them. The reason is in the cause.
                 const errorMessage = process.env.NODE_ENV === "production"
                     ? "An unexpected error occurred"
-                    : extractErrorMessage(error);
+                    : (error instanceof Error ? error.message : "An unexpected error occurred");
                 const errorResponse = {
                     type: "ERROR",
                     requestId,

package/dist/collections/buildRegistry.d.ts

@@ -1,27 +0,0 @@
-import { Relations } from "drizzle-orm";
-import { PgEnum } from "drizzle-orm/pg-core";
-import { CollectionConfig } from "@rebasepro/types";
-import { PostgresCollectionRegistry } from "./PostgresCollectionRegistry";
-/**
- * Everything a registry is built from: the collections, and the drizzle schema
- * they are backed by. In BaaS mode all of it is introspected from the live
- * database; in CMS mode it comes from the config and the generated schema.
- */
-export interface RegistrySchema {
-    collections?: CollectionConfig[];
-    tables?: Record<string, unknown>;
-    enums?: Record<string, PgEnum<[string, ...string[]]>>;
-    relations?: Record<string, Relations>;
-}
-/**
- * Build the collection registry for a driver.
- *
- * The order matters and is the reason this is one function rather than a run of
- * statements in the bootstrapper. Keys are resolved from the drizzle schema, so
- * anything that inspects them has to run *after* the tables are registered —
- * and `warnOnKeysTheAdminCannotResolve` fails open if it does not, because a
- * collection whose table it cannot look up is one it has nothing to say about.
- * Warned too early, it would skip every collection and report nothing, which
- * reads exactly like having nothing to report.
- */
-export declare function buildCollectionRegistry(schema: RegistrySchema): PostgresCollectionRegistry;

package/src/collections/buildRegistry.ts

@@ -1,59 +0,0 @@
-import { isTable, getTableName, Relations } from "drizzle-orm";
-import { PgEnum, PgTable } from "drizzle-orm/pg-core";
-import { CollectionConfig } from "@rebasepro/types";
-import { logger } from "@rebasepro/server";
-import { PostgresCollectionRegistry } from "./PostgresCollectionRegistry";
-import { warnOnKeysTheAdminCannotResolve } from "../services/collection-helpers";
-
-/**
- * Everything a registry is built from: the collections, and the drizzle schema
- * they are backed by. In BaaS mode all of it is introspected from the live
- * database; in CMS mode it comes from the config and the generated schema.
- */
-export interface RegistrySchema {
-    collections?: CollectionConfig[];
-    tables?: Record<string, unknown>;
-    enums?: Record<string, PgEnum<[string, ...string[]]>>;
-    relations?: Record<string, Relations>;
-}
-
-/**
- * Build the collection registry for a driver.
- *
- * The order matters and is the reason this is one function rather than a run of
- * statements in the bootstrapper. Keys are resolved from the drizzle schema, so
- * anything that inspects them has to run *after* the tables are registered —
- * and `warnOnKeysTheAdminCannotResolve` fails open if it does not, because a
- * collection whose table it cannot look up is one it has nothing to say about.
- * Warned too early, it would skip every collection and report nothing, which
- * reads exactly like having nothing to report.
- */
-export function buildCollectionRegistry(schema: RegistrySchema): PostgresCollectionRegistry {
-    const registry = new PostgresCollectionRegistry();
-
-    if (schema.collections) {
-        registry.registerMultiple(schema.collections);
-        logger.info(
-            `📋 [PostgresRegistry] Registered ${registry.getCollections().length} collections: ` +
-            `[${registry.getCollections().map(c => c.slug).join(", ")}]`
-        );
-    }
-
-    if (schema.tables) {
-        Object.values(schema.tables).forEach((table) => {
-            if (isTable(table)) {
-                registry.registerTable(table as PgTable, getTableName(table));
-            }
-        });
-    }
-
-    if (schema.enums) registry.registerEnums(schema.enums);
-    if (schema.relations) registry.registerRelations(schema.relations);
-
-    // Now that the keys resolve: say which of them the admin cannot see. It
-    // compiles the same collection files into its bundle but never the drizzle
-    // schema, and nothing serves it one, so only an edit to the config fixes it.
-    warnOnKeysTheAdminCannotResolve(registry.getCollections(), registry);
-
-    return registry;
-}