@rebasepro/server-postgres 0.9.1-canary.d198c11 → 0.9.1-canary.e2fc7b6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/PostgresBootstrapper.d.ts +10 -0
- package/dist/auth/services.d.ts +16 -0
- package/dist/collections/buildRegistry.d.ts +27 -0
- package/dist/connection.d.ts +21 -0
- package/dist/data-transformer.d.ts +9 -2
- package/dist/index.es.js +600 -318
- package/dist/index.es.js.map +1 -1
- package/dist/services/FetchService.d.ts +4 -32
- package/dist/services/RelationService.d.ts +34 -1
- package/dist/services/collection-helpers.d.ts +76 -0
- package/dist/services/index.d.ts +1 -1
- package/dist/services/realtimeService.d.ts +7 -0
- package/dist/services/row-pipeline.d.ts +63 -0
- package/package.json +10 -7
- package/src/PostgresBackendDriver.ts +39 -11
- package/src/PostgresBootstrapper.ts +62 -25
- package/src/auth/ensure-tables.ts +73 -11
- package/src/auth/services.ts +49 -19
- package/src/collections/buildRegistry.ts +59 -0
- package/src/connection.ts +61 -1
- package/src/data-transformer.ts +11 -9
- package/src/databasePoolManager.ts +2 -0
- package/src/schema/introspect-db.ts +19 -2
- package/src/services/FetchService.ts +50 -229
- package/src/services/PersistService.ts +9 -2
- package/src/services/RelationService.ts +153 -94
- package/src/services/collection-helpers.ts +166 -3
- package/src/services/index.ts +1 -0
- package/src/services/realtimeService.ts +40 -19
- package/src/services/row-pipeline.ts +215 -0
- package/src/utils/drizzle-conditions.ts +13 -0
|
@@ -40,52 +40,22 @@ export declare class FetchService {
|
|
|
40
40
|
* the target relation so actual row data is returned.
|
|
41
41
|
*/
|
|
42
42
|
private buildWithConfig;
|
|
43
|
-
/**
|
|
44
|
-
* Detect if a many-to-many relation uses a junction table in the Drizzle schema.
|
|
45
|
-
*/
|
|
46
|
-
private isJunctionRelation;
|
|
47
43
|
/**
|
|
48
44
|
* Get the Drizzle relation name on the junction table that points to the actual target row.
|
|
49
45
|
* For example, for posts_tags junction, this returns "tag_id" (the relation pointing to tags).
|
|
50
46
|
*/
|
|
51
47
|
private getJunctionTargetRelationName;
|
|
52
|
-
/**
|
|
53
|
-
* Convert a db.query result row (with nested relation objects) to a flat row.
|
|
54
|
-
* Handles:
|
|
55
|
-
* - Type normalization (dates, numbers, NaN) via normalizeDbValues
|
|
56
|
-
* - Converting nested relation objects to { id, path, __type: "relation" } for CMS
|
|
57
|
-
* - Flattening junction-table many-to-many results
|
|
58
|
-
*
|
|
59
|
-
* The row's own address is not among them: it is derived by the consumer
|
|
60
|
-
* from the collection's primary keys.
|
|
61
|
-
*/
|
|
62
|
-
private drizzleResultToRow;
|
|
63
48
|
/**
|
|
64
49
|
* Post-fetch joinPath relations for a single flat row.
|
|
65
50
|
* joinPath relations cannot be expressed via Drizzle's `with` config,
|
|
66
51
|
* so they must be loaded separately after the primary query.
|
|
67
52
|
*/
|
|
68
53
|
private resolveJoinPathRelations;
|
|
69
|
-
/**
|
|
70
|
-
* Post-fetch joinPath relations for a batch of flat rows.
|
|
71
|
-
* Uses batch fetching to avoid N+1 queries for list views.
|
|
72
|
-
*/
|
|
73
|
-
private resolveJoinPathRelationsBatch;
|
|
74
54
|
/**
|
|
75
55
|
* Resolves joinPath relations for raw REST rows and directly injects them.
|
|
76
56
|
* Uses RelationService to query the database and maps results back to the flattened objects.
|
|
77
57
|
*/
|
|
78
58
|
private resolveJoinPathRelationsBatchRest;
|
|
79
|
-
/**
|
|
80
|
-
* Convert a db.query result row to a flat REST-style row with populated relations.
|
|
81
|
-
*
|
|
82
|
-
* Every column is copied through under its own name, with the value Postgres
|
|
83
|
-
* returned. This used to open with a synthesized `id` and then skip the key
|
|
84
|
-
* column, which renamed it (a `sku` primary key was served as `id`, and `sku`
|
|
85
|
-
* did not appear at all) and restringified it (`42` → `"42"`). Consumers that
|
|
86
|
-
* need an address derive it from the collection's primary keys.
|
|
87
|
-
*/
|
|
88
|
-
private drizzleResultToRestRow;
|
|
89
59
|
/**
|
|
90
60
|
* Build db.query-compatible options from standard fetch options.
|
|
91
61
|
* Handles filter, search, orderBy, limit, and cursor-based pagination.
|
|
@@ -116,8 +86,10 @@ export declare class FetchService {
|
|
|
116
86
|
}): Promise<Record<string, unknown>[]>;
|
|
117
87
|
/**
|
|
118
88
|
* Fallback path used when db.query is unavailable.
|
|
119
|
-
*
|
|
120
|
-
*
|
|
89
|
+
*
|
|
90
|
+
* The primary path runs the results through `toCmsRow`, which maps
|
|
91
|
+
* relations from what drizzle already nested — no query per row. This one
|
|
92
|
+
* has no nesting to read, so it resolves relations itself, in batches.
|
|
121
93
|
*
|
|
122
94
|
* Process raw database results into flat rows with relations.
|
|
123
95
|
*/
|
|
@@ -20,6 +20,40 @@ export declare class RelationService {
|
|
|
20
20
|
private db;
|
|
21
21
|
private registry;
|
|
22
22
|
constructor(db: DrizzleClient, registry: PostgresCollectionRegistry);
|
|
23
|
+
/**
|
|
24
|
+
* One target row, as the {@link RelatedRow} everything here returns.
|
|
25
|
+
*
|
|
26
|
+
* Eight sites built this by hand, which is how the address came to be the
|
|
27
|
+
* target's first key column in all eight — one edit, eight places to miss.
|
|
28
|
+
*
|
|
29
|
+
* `resolveNested` is the one thing they did not agree on, and the
|
|
30
|
+
* disagreement was invisible: the single-parent fetches pass `db` and
|
|
31
|
+
* `registry` to `parseDataFromServer`, so the target's *own* relations get
|
|
32
|
+
* resolved too, while the batch paths deliberately do not — a query per
|
|
33
|
+
* target row is the N+1 the batching exists to avoid. Naming the parameter
|
|
34
|
+
* makes that a decision rather than a difference between two call sites
|
|
35
|
+
* nobody was comparing.
|
|
36
|
+
*/
|
|
37
|
+
private toRelatedRow;
|
|
38
|
+
/**
|
|
39
|
+
* A WHERE matching any of `parentIds`, by the whole key.
|
|
40
|
+
*
|
|
41
|
+
* A single key is an `IN (…)`. A composite one cannot be: matching
|
|
42
|
+
* `tenant_id IN (1, 1)` collects every row of tenant 1, so two parents that
|
|
43
|
+
* share their first column each receive the other's relations. It becomes
|
|
44
|
+
* an OR of ANDs — one exact address per parent — which Postgres indexes the
|
|
45
|
+
* same way it would a multi-column key lookup.
|
|
46
|
+
*/
|
|
47
|
+
private parentKeyCondition;
|
|
48
|
+
/**
|
|
49
|
+
* Reject a relation that cannot express a composite-keyed parent.
|
|
50
|
+
*
|
|
51
|
+
* `localKey` and `foreignKeyOnTarget` are single column names: one column
|
|
52
|
+
* cannot reference a two-column key, so such a relation has no correct
|
|
53
|
+
* reading. Left alone it would silently match on the first key column and
|
|
54
|
+
* hand a tenant's rows to its neighbour — say so instead.
|
|
55
|
+
*/
|
|
56
|
+
private assertSingleKeyAddressable;
|
|
23
57
|
/**
|
|
24
58
|
* Fetch rows related to a parent row through a specific relation
|
|
25
59
|
*/
|
|
@@ -72,7 +106,6 @@ export declare class RelationService {
|
|
|
72
106
|
relationKey: string;
|
|
73
107
|
relation: Relation;
|
|
74
108
|
newValue: unknown;
|
|
75
|
-
currentId?: string | number;
|
|
76
109
|
}>): Promise<void>;
|
|
77
110
|
/**
|
|
78
111
|
* Handle inverse relations with joinPath
|
|
@@ -24,4 +24,80 @@ export interface DrizzleColumnMeta {
|
|
|
24
24
|
export declare function getColumnMeta(col: AnyPgColumn): DrizzleColumnMeta;
|
|
25
25
|
export declare function getCollectionByPath(collectionPath: string, registry: PostgresCollectionRegistry): CollectionConfig;
|
|
26
26
|
export declare function getTableForCollection(collection: CollectionConfig, registry: PostgresCollectionRegistry): PgTable<any>;
|
|
27
|
+
/**
|
|
28
|
+
* The key columns a collection's rows are addressed by.
|
|
29
|
+
*
|
|
30
|
+
* Three tiers, in order: properties marked `isId`, the primary keys of the
|
|
31
|
+
* drizzle schema, and finally a column literally named `id`. Only the first is
|
|
32
|
+
* visible to the browser, which is why a key known only to drizzle is reported
|
|
33
|
+
* at boot — see {@link warnOnKeysTheAdminCannotResolve}.
|
|
34
|
+
*
|
|
35
|
+
* Returns `[]` when nothing resolves, rather than throwing. It used to open by
|
|
36
|
+
* resolving the table, which throws when there is none — so the `isId` tier,
|
|
37
|
+
* which needs no table at all, was unreachable for exactly the collections
|
|
38
|
+
* most likely to have no table registered. Every caller that wanted "no keys"
|
|
39
|
+
* to mean "no keys" had to spell that out in a try/catch.
|
|
40
|
+
*
|
|
41
|
+
* Callers that cannot proceed without a key must say so themselves, naming the
|
|
42
|
+
* collection: an empty array here means "this collection has no address", which
|
|
43
|
+
* is a different answer in a notification (broadcast a wildcard) than in a save
|
|
44
|
+
* (fail).
|
|
45
|
+
*/
|
|
27
46
|
export declare function getPrimaryKeys(collection: CollectionConfig, registry: PostgresCollectionRegistry): PrimaryKeyInfo[];
|
|
47
|
+
/**
|
|
48
|
+
* The key columns, for callers that cannot do their job without one.
|
|
49
|
+
*
|
|
50
|
+
* {@link getPrimaryKeys} answers "what keys, if any" and returns `[]` for a
|
|
51
|
+
* collection with no address. Most of this driver, though, is building a WHERE
|
|
52
|
+
* clause and has no meaning without a key — for those, an empty array is not an
|
|
53
|
+
* answer, and indexing `[0]` into it produces `Cannot read properties of
|
|
54
|
+
* undefined` three frames from where the real problem is. This says what is
|
|
55
|
+
* wrong and which collection it is wrong about.
|
|
56
|
+
*/
|
|
57
|
+
export declare function requirePrimaryKeys(collection: CollectionConfig, registry: PostgresCollectionRegistry): PrimaryKeyInfo[];
|
|
58
|
+
/**
|
|
59
|
+
* Collections whose key the *browser* cannot resolve, and what it will do
|
|
60
|
+
* instead.
|
|
61
|
+
*
|
|
62
|
+
* The two sides resolve keys from different evidence. This driver reads, in
|
|
63
|
+
* order: properties marked `isId`, the primary keys of the Drizzle schema, then
|
|
64
|
+
* a column literally named `id`. The admin shares the `CollectionConfig` — it
|
|
65
|
+
* compiles the same collection files into its bundle — but never the Drizzle
|
|
66
|
+
* schema, so the middle tier is invisible to it.
|
|
67
|
+
*
|
|
68
|
+
* Nothing can normalize this at runtime: the server does not serve the admin
|
|
69
|
+
* its collections, so a key resolved here cannot be handed over there. The
|
|
70
|
+
* config files are the only thing both sides read, so the fix is an edit to
|
|
71
|
+
* them, and the most this can do is say exactly which edit.
|
|
72
|
+
*
|
|
73
|
+
* Two shapes, and the second is the dangerous one:
|
|
74
|
+
*
|
|
75
|
+
* - No `isId`, no `id` property → the admin resolves no address, warns in the
|
|
76
|
+
* console, and rows cannot be opened or linked.
|
|
77
|
+
* - No `isId`, but an `id` property that is *not* the key → the admin addresses
|
|
78
|
+
* rows by `id` while this driver reads the address as the real key. Nothing
|
|
79
|
+
* errors: the addresses look right and route wrong.
|
|
80
|
+
*/
|
|
81
|
+
export declare function findUnresolvableKeyCollections(collections: CollectionConfig[], registry: PostgresCollectionRegistry): {
|
|
82
|
+
collection: CollectionConfig;
|
|
83
|
+
keys: PrimaryKeyInfo[];
|
|
84
|
+
shadowedByIdProperty: boolean;
|
|
85
|
+
}[];
|
|
86
|
+
/**
|
|
87
|
+
* Report the collections from {@link findUnresolvableKeyCollections} at boot,
|
|
88
|
+
* with the edit that fixes each one.
|
|
89
|
+
*
|
|
90
|
+
* Grouped by failure, not by collection: the shadowed case is a routing bug and
|
|
91
|
+
* the silent case is a missing feature, and they deserve different urgency.
|
|
92
|
+
*/
|
|
93
|
+
export declare function warnOnKeysTheAdminCannotResolve(collections: CollectionConfig[], registry: PostgresCollectionRegistry): void;
|
|
94
|
+
/**
|
|
95
|
+
* The address of a row: derived from the collection's primary keys, because a
|
|
96
|
+
* row does not carry one — it is exactly its columns.
|
|
97
|
+
*
|
|
98
|
+
* Falls back to a literal `id` column, for a row that reached us from somewhere
|
|
99
|
+
* other than this driver. Returns `""` when there is no key and no `id` —
|
|
100
|
+
* callers decide what that means, since "unaddressable" is a different answer
|
|
101
|
+
* in a notification (broadcast a wildcard) than in a save (fail).
|
|
102
|
+
*/
|
|
103
|
+
export declare function deriveRowAddress(row: Record<string, unknown>, collection: CollectionConfig, registry: PostgresCollectionRegistry): string;
|
package/dist/services/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { FetchService } from "./FetchService";
|
|
2
2
|
export { PersistService } from "./PersistService";
|
|
3
3
|
export { RelationService } from "./RelationService";
|
|
4
|
-
export { getCollectionByPath, getTableForCollection, getPrimaryKeys, parseIdValues, buildCompositeId } from "./collection-helpers";
|
|
4
|
+
export { getCollectionByPath, getTableForCollection, getPrimaryKeys, deriveRowAddress, parseIdValues, buildCompositeId } from "./collection-helpers";
|
|
@@ -177,8 +177,15 @@ export declare class RealtimeService extends EventEmitter implements RealtimePro
|
|
|
177
177
|
/**
|
|
178
178
|
* Send a lightweight row-level patch to a collection subscriber.
|
|
179
179
|
* The client can merge this into its cached data for instant feedback.
|
|
180
|
+
*
|
|
181
|
+
* The key columns ride along: the patch names a row by address, and the
|
|
182
|
+
* client has to find that row among the ones it cached — which carry
|
|
183
|
+
* columns and no address. The SDK holds no collection config to derive one
|
|
184
|
+
* from, so this is the only place the mapping can come from.
|
|
180
185
|
*/
|
|
181
186
|
private sendCollectionPatch;
|
|
187
|
+
/** The key columns of the collection at `path`, if they can be resolved. */
|
|
188
|
+
private primaryKeysForPath;
|
|
182
189
|
private sendError;
|
|
183
190
|
private sendMessage;
|
|
184
191
|
/**
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { CollectionConfig, Relation } from "@rebasepro/types";
|
|
2
|
+
import { PostgresCollectionRegistry } from "../collections/PostgresCollectionRegistry";
|
|
3
|
+
/**
|
|
4
|
+
* Turning a drizzle result into a row we serve.
|
|
5
|
+
*
|
|
6
|
+
* There are two shapes, and they are the same walk. Both take a row whose
|
|
7
|
+
* relation fields hold nested objects, both unwrap junction rows to reach the
|
|
8
|
+
* target behind them, and both leave every other column alone. They differ only
|
|
9
|
+
* in what they put where the relation was:
|
|
10
|
+
*
|
|
11
|
+
* - `"ref"` — a `{ id, path, __type: "relation" }` reference carrying the
|
|
12
|
+
* target's values. This is what the admin renders.
|
|
13
|
+
* - `"inline"` — the target's own columns, flat. This is what REST serves.
|
|
14
|
+
*
|
|
15
|
+
* They used to be two functions that happened to agree, and the agreement was
|
|
16
|
+
* not enforced by anything: the row-identity bug had to be fixed five times
|
|
17
|
+
* across differently-shaped copies of this walk, and one of the copies was
|
|
18
|
+
* dead code nobody had noticed. Whatever the next cross-cutting change is, it
|
|
19
|
+
* is one edit here.
|
|
20
|
+
*/
|
|
21
|
+
export type RelationStyle = "ref" | "inline";
|
|
22
|
+
/**
|
|
23
|
+
* Whether a many-relation reaches its target through a junction table.
|
|
24
|
+
*
|
|
25
|
+
* Also used to build the drizzle `with` config, which is why it is exported:
|
|
26
|
+
* the query has to nest one level deeper for a junction, and the row walk has
|
|
27
|
+
* to unwrap that same level back out.
|
|
28
|
+
*/
|
|
29
|
+
export declare function isJunctionRelation(relation: Relation): boolean;
|
|
30
|
+
/**
|
|
31
|
+
* The address a relation ref points at.
|
|
32
|
+
*
|
|
33
|
+
* The whole key, not its first column: a composite-keyed target addressed by
|
|
34
|
+
* `tenant_id` alone points at every row that shares it. A target whose key
|
|
35
|
+
* cannot be resolved at all used to throw here — reading `[0]` of an empty
|
|
36
|
+
* array — taking down the parent's fetch over a relation it may not even have
|
|
37
|
+
* asked for. The first column is a guess, but a ref that resolves to nothing
|
|
38
|
+
* beats no rows at all.
|
|
39
|
+
*/
|
|
40
|
+
export declare function relationTargetAddress(targetRow: Record<string, unknown>, targetCollection: CollectionConfig, registry: PostgresCollectionRegistry): string;
|
|
41
|
+
/**
|
|
42
|
+
* The row the admin renders: every column, with relations as references.
|
|
43
|
+
*
|
|
44
|
+
* Values are normalized (dates, numbers, NaN) because the admin's view-model
|
|
45
|
+
* expects real types. The row's own address is *not* among the columns — it is
|
|
46
|
+
* derived by the consumer from the collection's primary keys.
|
|
47
|
+
*/
|
|
48
|
+
export declare function toCmsRow(row: Record<string, unknown>, collection: CollectionConfig, registry: PostgresCollectionRegistry): Record<string, unknown>;
|
|
49
|
+
/**
|
|
50
|
+
* The row REST serves: every column under its own name, with the value Postgres
|
|
51
|
+
* returned, and relations inlined as the target's columns.
|
|
52
|
+
*
|
|
53
|
+
* Values are the ones the database returned, except where that contradicts the
|
|
54
|
+
* declared type: a `number` property is served as a number (see
|
|
55
|
+
* {@link coerceDeclaredNumber}). Dates stay as the database returned them —
|
|
56
|
+
* JSON has its own opinions about dates that the admin's view-model does not
|
|
57
|
+
* share.
|
|
58
|
+
*
|
|
59
|
+
* Keyed by the row rather than by the relation list — a REST fetch only loads
|
|
60
|
+
* the relations `include` asked for, so the row is the authority on which are
|
|
61
|
+
* actually there.
|
|
62
|
+
*/
|
|
63
|
+
export declare function toRestRow(row: Record<string, unknown>, collection: CollectionConfig, registry: PostgresCollectionRegistry): Record<string, unknown>;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rebasepro/server-postgres",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.9.1-canary.
|
|
4
|
+
"version": "0.9.1-canary.e2fc7b6",
|
|
5
5
|
"description": "PostgreSQL data source backend implementation for Rebase with Drizzle ORM",
|
|
6
6
|
"funding": {
|
|
7
7
|
"url": "https://github.com/sponsors/rebaseco"
|
|
@@ -71,18 +71,20 @@
|
|
|
71
71
|
"execa": "^9.6.1",
|
|
72
72
|
"pg": "^8.21.0",
|
|
73
73
|
"ws": "^8.21.0",
|
|
74
|
-
"@rebasepro/
|
|
75
|
-
"@rebasepro/
|
|
76
|
-
"@rebasepro/
|
|
77
|
-
"@rebasepro/
|
|
78
|
-
"@rebasepro/
|
|
74
|
+
"@rebasepro/codegen": "0.9.1-canary.e2fc7b6",
|
|
75
|
+
"@rebasepro/common": "0.9.1-canary.e2fc7b6",
|
|
76
|
+
"@rebasepro/server": "0.9.1-canary.e2fc7b6",
|
|
77
|
+
"@rebasepro/utils": "0.9.1-canary.e2fc7b6",
|
|
78
|
+
"@rebasepro/types": "0.9.1-canary.e2fc7b6"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
+
"@hono/node-server": "^2.0.9",
|
|
81
82
|
"@types/jest": "^30.0.0",
|
|
82
83
|
"@types/node": "^25.9.3",
|
|
83
84
|
"@types/pg": "^8.20.0",
|
|
84
85
|
"@types/ws": "^8.18.1",
|
|
85
86
|
"@vitejs/plugin-react": "^6.0.2",
|
|
87
|
+
"hono": "^4.12.25",
|
|
86
88
|
"jest": "^30.4.2",
|
|
87
89
|
"ts-jest": "^29.4.11",
|
|
88
90
|
"typescript": "^6.0.3",
|
|
@@ -103,6 +105,7 @@
|
|
|
103
105
|
"test:lint": "eslint \"src/**\" --quiet",
|
|
104
106
|
"test": "jest --passWithNoTests",
|
|
105
107
|
"test:e2e": "vitest run --config vitest.e2e.config.ts",
|
|
106
|
-
"clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f"
|
|
108
|
+
"clean": "rm -rf dist && find ./src -name '*.js' -type f | xargs rm -f",
|
|
109
|
+
"smoke:baas": "tsx scripts/smoke-baas.ts"
|
|
107
110
|
}
|
|
108
111
|
}
|
|
@@ -29,6 +29,7 @@ import {
|
|
|
29
29
|
import { sql as drizzleSql } from "drizzle-orm";
|
|
30
30
|
import { buildPropertyCallbacks, buildSdkData, resolveCollectionRelations, updateDateAutoValues } from "@rebasepro/common";
|
|
31
31
|
import { PostgresCollectionRegistry } from "./collections/PostgresCollectionRegistry";
|
|
32
|
+
import { deriveRowAddress } from "./services/collection-helpers";
|
|
32
33
|
import { HistoryService } from "./history/HistoryService";
|
|
33
34
|
import { mergeDeep } from "@rebasepro/utils";
|
|
34
35
|
import { logger } from "@rebasepro/server";
|
|
@@ -547,13 +548,26 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
547
548
|
let updatedValues = values;
|
|
548
549
|
const contextForCallback = this.buildCallContext();
|
|
549
550
|
|
|
550
|
-
// Fetch previous values for callbacks AND history recording
|
|
551
|
+
// Fetch previous values for callbacks AND history recording. Same walk
|
|
552
|
+
// as the saved row the callbacks receive (`fetchOneForRest`), so
|
|
553
|
+
// `values` and `previousValues` compare like with like — a Date on one
|
|
554
|
+
// side and its ISO string on the other reads as a change that never
|
|
555
|
+
// happened.
|
|
551
556
|
let previousValuesForHistory: Partial<M> | undefined;
|
|
552
557
|
if (status === "existing" && id) {
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
558
|
+
try {
|
|
559
|
+
const existing = await this.dataService.getFetchService()
|
|
560
|
+
.fetchOneForRest(path, id, undefined, resolvedCollection?.databaseId);
|
|
561
|
+
if (existing) {
|
|
562
|
+
const { id: _existingId, ...existingValues } = existing;
|
|
563
|
+
previousValuesForHistory = existingValues as Partial<M>;
|
|
564
|
+
}
|
|
565
|
+
} catch (err) {
|
|
566
|
+
// Best-effort enrichment: callbacks and history run without
|
|
567
|
+
// previous values rather than the save failing on a read the
|
|
568
|
+
// write itself does not need (e.g. a collection whose key the
|
|
569
|
+
// registry cannot resolve).
|
|
570
|
+
logger.debug(`[save] Could not fetch previous values for "${path}"`, { detail: err instanceof Error ? err.message : String(err) });
|
|
557
571
|
}
|
|
558
572
|
}
|
|
559
573
|
|
|
@@ -652,8 +666,19 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
652
666
|
}
|
|
653
667
|
}
|
|
654
668
|
|
|
655
|
-
|
|
656
|
-
|
|
669
|
+
// The row is exactly its columns, so its address is derived, not read
|
|
670
|
+
// off it: `savedRow.id` is undefined for every table whose key is not
|
|
671
|
+
// literally named `id`, and is ordinary data for a table that has such
|
|
672
|
+
// a column without it being the key.
|
|
673
|
+
const savedId = deriveRowAddress(
|
|
674
|
+
savedRow,
|
|
675
|
+
(resolvedCollection ?? collection) as CollectionConfig,
|
|
676
|
+
this.registry
|
|
677
|
+
);
|
|
678
|
+
// `values` are the row's columns — all of them. For an `id`-keyed table
|
|
679
|
+
// that includes `id`, which used to be stripped here because it was the
|
|
680
|
+
// synthesized address rather than the column it now is.
|
|
681
|
+
const savedValues = savedRow;
|
|
657
682
|
|
|
658
683
|
if (globalCallbacks?.afterSave || callbacks?.afterSave || propertyCallbacks?.afterSave) {
|
|
659
684
|
// 1. Global callbacks first
|
|
@@ -698,7 +723,7 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
698
723
|
if (this.historyService && resolvedCollection?.history) {
|
|
699
724
|
this.historyService.recordHistory({
|
|
700
725
|
tableName: path,
|
|
701
|
-
id: savedId
|
|
726
|
+
id: savedId,
|
|
702
727
|
action: status === "new" ? "create" : "update",
|
|
703
728
|
values: savedValues as Record<string, unknown>,
|
|
704
729
|
previousValues: previousValuesForHistory as Record<string, unknown> | undefined,
|
|
@@ -710,14 +735,14 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
710
735
|
if (this._deferNotifications) {
|
|
711
736
|
this._pendingNotifications.push({
|
|
712
737
|
path,
|
|
713
|
-
id: savedId
|
|
738
|
+
id: savedId,
|
|
714
739
|
row: savedRow,
|
|
715
740
|
databaseId: resolvedCollection?.databaseId
|
|
716
741
|
});
|
|
717
742
|
} else {
|
|
718
743
|
await this.realtimeService.notifyUpdate(
|
|
719
744
|
path,
|
|
720
|
-
savedId
|
|
745
|
+
savedId,
|
|
721
746
|
savedRow,
|
|
722
747
|
resolvedCollection?.databaseId
|
|
723
748
|
);
|
|
@@ -843,7 +868,10 @@ export class PostgresBackendDriver implements DataDriver {
|
|
|
843
868
|
}: DeleteProps<M>): Promise<void> {
|
|
844
869
|
|
|
845
870
|
const targetPath = row.path;
|
|
846
|
-
|
|
871
|
+
// The callbacks' `row` is the row: its columns, nothing else. The address
|
|
872
|
+
// travels beside it as `id`, so merging it in here only ever invented an
|
|
873
|
+
// `id` field for tables that have no such column.
|
|
874
|
+
const targetRow: Record<string, unknown> = { ...(row.values ?? {}) };
|
|
847
875
|
|
|
848
876
|
// Resolve from backend registry to restore callbacks lost during WebSocket serialization
|
|
849
877
|
const {
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Implements the `BackendBootstrapper` interface for PostgreSQL.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { Relations, sql } from "drizzle-orm";
|
|
8
8
|
import { NodePgDatabase } from "drizzle-orm/node-postgres";
|
|
9
9
|
import { PgEnum, PgTable } from "drizzle-orm/pg-core";
|
|
10
10
|
import type { RebasePgTable } from "./types";
|
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
} from "@rebasepro/types";
|
|
22
22
|
import { PostgresBackendDriver } from "./PostgresBackendDriver";
|
|
23
23
|
import { RealtimeService } from "./services/realtimeService";
|
|
24
|
+
import { buildCollectionRegistry } from "./collections/buildRegistry";
|
|
24
25
|
import { DatabasePoolManager } from "./databasePoolManager";
|
|
25
26
|
import { PostgresCollectionRegistry } from "./collections/PostgresCollectionRegistry";
|
|
26
27
|
import { createEmailService, type EmailConfig, type EmailService, logger } from "@rebasepro/server";
|
|
@@ -64,6 +65,15 @@ export interface PostgresDriverInternals {
|
|
|
64
65
|
realtimeService: RealtimeService;
|
|
65
66
|
driver: PostgresBackendDriver;
|
|
66
67
|
poolManager?: DatabasePoolManager;
|
|
68
|
+
/**
|
|
69
|
+
* Attach CDC triggers to tables that did not exist when the driver
|
|
70
|
+
* bootstrapped. Only set when database-level capture is actually active.
|
|
71
|
+
*
|
|
72
|
+
* Auth owns its own tables and creates them later in boot, so at driver
|
|
73
|
+
* bootstrap they are legitimately missing and get skipped; without this
|
|
74
|
+
* they would stay uninstrumented until the next restart.
|
|
75
|
+
*/
|
|
76
|
+
provisionCdcForTables?: (tables: CdcTableRef[]) => Promise<void>;
|
|
67
77
|
}
|
|
68
78
|
|
|
69
79
|
// Re-export from shared CLI error utilities
|
|
@@ -161,30 +171,17 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
161
171
|
}
|
|
162
172
|
|
|
163
173
|
const activeCollections = introspectedCollections ?? collections;
|
|
164
|
-
|
|
165
|
-
// Create a fresh registry for this driver
|
|
166
|
-
const registry = new PostgresCollectionRegistry();
|
|
167
|
-
if (activeCollections) {
|
|
168
|
-
registry.registerMultiple(activeCollections);
|
|
169
|
-
logger.info(`📋 [PostgresRegistry] Registered ${registry.getCollections().length} collections: [${registry.getCollections().map(c => c.slug).join(", ")}]`);
|
|
170
|
-
}
|
|
171
|
-
|
|
172
174
|
const schemaTables = introspectedTables ?? pgConfig.schema?.tables;
|
|
173
|
-
|
|
174
|
-
// Register tables
|
|
175
|
-
if (schemaTables) {
|
|
176
|
-
Object.values(schemaTables).forEach((table) => {
|
|
177
|
-
if (isTable(table)) {
|
|
178
|
-
const tableName = getTableName(table);
|
|
179
|
-
registry.registerTable(table as PgTable, tableName);
|
|
180
|
-
}
|
|
181
|
-
});
|
|
182
|
-
}
|
|
183
|
-
|
|
184
|
-
if (pgConfig.schema?.enums) registry.registerEnums(pgConfig.schema.enums as Record<string, PgEnum<[string, ...string[]]>>);
|
|
185
|
-
|
|
186
175
|
const schemaRelations = introspectedRelations ?? (pgConfig.schema?.relations as Record<string, Relations> | undefined);
|
|
187
|
-
|
|
176
|
+
|
|
177
|
+
// Create a fresh registry for this driver. Registration order is
|
|
178
|
+
// load-bearing, so it lives in one place — see `buildCollectionRegistry`.
|
|
179
|
+
const registry = buildCollectionRegistry({
|
|
180
|
+
collections: activeCollections,
|
|
181
|
+
tables: schemaTables,
|
|
182
|
+
enums: pgConfig.schema?.enums as Record<string, PgEnum<[string, ...string[]]>> | undefined,
|
|
183
|
+
relations: schemaRelations
|
|
184
|
+
});
|
|
188
185
|
|
|
189
186
|
// Patch Drizzle's PgArray columns to handle NULL values safely.
|
|
190
187
|
// Drizzle's mapFromDriverValue crashes with "value.map is not a function"
|
|
@@ -346,6 +343,7 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
346
343
|
const wantsCdc = cdcMode !== "off";
|
|
347
344
|
const explicitCdc = cdcMode === "trigger" || cdcMode === "wal";
|
|
348
345
|
let cdcEnabled = false;
|
|
346
|
+
let provisionCdcForTables: PostgresDriverInternals["provisionCdcForTables"];
|
|
349
347
|
|
|
350
348
|
if (wantsCdc && !directUrl) {
|
|
351
349
|
const reason = "no direct database connection is available for the realtime LISTEN client (set DATABASE_DIRECT_URL)";
|
|
@@ -379,6 +377,11 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
379
377
|
await provisionTriggerCdc(cdcRunSql, cdcTables);
|
|
380
378
|
await realtimeService.enableCdc(directUrl);
|
|
381
379
|
cdcEnabled = true;
|
|
380
|
+
// Boot steps that create their own tables (auth) run after
|
|
381
|
+
// this one and use it to instrument what they just created.
|
|
382
|
+
provisionCdcForTables = async (tables) => {
|
|
383
|
+
await provisionTriggerCdc(cdcRunSql, tables);
|
|
384
|
+
};
|
|
382
385
|
logger.info(
|
|
383
386
|
`📡 [CDC] Realtime source = database-level change capture (mode: ${cdcMode === "wal" ? "wal→trigger" : "trigger"}). ` +
|
|
384
387
|
`All writes now emit realtime events regardless of origin.`
|
|
@@ -429,6 +432,14 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
429
432
|
);
|
|
430
433
|
const missing: Array<{ slug: string; table: string }> = [];
|
|
431
434
|
for (const col of registeredCollections) {
|
|
435
|
+
// Auth owns its table and creates it later in this same
|
|
436
|
+
// boot (initializeAuth → ensureAuthTablesExist), so it is
|
|
437
|
+
// legitimately absent right now. Reporting it as drift
|
|
438
|
+
// tells the user to `db:push` a table that is about to
|
|
439
|
+
// exist — and on an introspected database, one that the
|
|
440
|
+
// database was never supposed to hold.
|
|
441
|
+
if ((col as { auth?: { enabled?: boolean } }).auth?.enabled) continue;
|
|
442
|
+
|
|
432
443
|
const schemaName = "schema" in col && col.schema ? col.schema : "public";
|
|
433
444
|
const tableName = registry.hasTableForCollection(
|
|
434
445
|
col.table ?? col.slug
|
|
@@ -443,8 +454,10 @@ export function createPostgresBootstrapper(pgConfig: PostgresDriverConfig): Back
|
|
|
443
454
|
const checkName = resolvedTable ?? tableName;
|
|
444
455
|
const fullCheckName = schemaName === "public" ? checkName : `${schemaName}.${checkName}`;
|
|
445
456
|
if (!dbTables.has(fullCheckName)) {
|
|
457
|
+
// Report what was actually looked up: an unqualified
|
|
458
|
+
// "users" sends people hunting for public.users.
|
|
446
459
|
missing.push({ slug: col.slug,
|
|
447
|
-
table:
|
|
460
|
+
table: fullCheckName });
|
|
448
461
|
}
|
|
449
462
|
}
|
|
450
463
|
if (missing.length > 0) {
|
|
@@ -478,7 +491,8 @@ table: checkName });
|
|
|
478
491
|
registry,
|
|
479
492
|
realtimeService,
|
|
480
493
|
driver,
|
|
481
|
-
poolManager
|
|
494
|
+
poolManager,
|
|
495
|
+
provisionCdcForTables
|
|
482
496
|
};
|
|
483
497
|
|
|
484
498
|
return {
|
|
@@ -507,6 +521,29 @@ table: checkName });
|
|
|
507
521
|
// ensureAuthTablesExist works with the collection abstraction — no Drizzle leakage.
|
|
508
522
|
await ensureAuthTablesExist(db, authCollection);
|
|
509
523
|
|
|
524
|
+
// The driver bootstrapped before these tables existed, so CDC skipped
|
|
525
|
+
// them. Instrument them now, or writes to the user table emit no
|
|
526
|
+
// realtime events until the next restart.
|
|
527
|
+
if (authCollection && internals.provisionCdcForTables) {
|
|
528
|
+
const authSchema = "schema" in authCollection && typeof authCollection.schema === "string"
|
|
529
|
+
? authCollection.schema
|
|
530
|
+
: "rebase";
|
|
531
|
+
const authTable = "table" in authCollection && typeof authCollection.table === "string"
|
|
532
|
+
? authCollection.table
|
|
533
|
+
: authCollection.slug;
|
|
534
|
+
if (authTable) {
|
|
535
|
+
try {
|
|
536
|
+
await internals.provisionCdcForTables([{ schema: authSchema, table: authTable }]);
|
|
537
|
+
} catch (err) {
|
|
538
|
+
logger.warn(
|
|
539
|
+
`⚠️ [CDC] Could not attach change-capture to the auth table "${authSchema}.${authTable}" — ` +
|
|
540
|
+
"writes to it won't emit database-level events.",
|
|
541
|
+
{ detail: err instanceof Error ? err.message : String(err) }
|
|
542
|
+
);
|
|
543
|
+
}
|
|
544
|
+
}
|
|
545
|
+
}
|
|
546
|
+
|
|
510
547
|
let emailService: EmailService | undefined;
|
|
511
548
|
if (authConfig.email) {
|
|
512
549
|
emailService = createEmailService(authConfig.email as EmailConfig);
|