@rebasepro/common 0.19.2-canary.g201749f → 0.19.2-canary.g2cd43e9

package/dist/data/buildRebaseData.d.ts

@@ -19,20 +19,10 @@ export interface EntityDataOptions {
      */
     resolveCollection?: (slug: string) => {
         properties?: Record<string, unknown>;
+        relations?: unknown[];
+        slug?: string;
     } | undefined;
 }
-/**
- * Build a `RebaseData` object from a `DataDriver` using JavaScript Proxy.
- *
- * This is the key bridge: any property access like `data.products` returns
- * a `CollectionAccessor` backed by the underlying DataDriver, without
- * needing per-collection code generation.
- *
- * @example
- * const data = buildRebaseData(driver);
- * await data.products.create({ name: "Camera", price: 299 });
- * const { data: items } = await data.products.find({ where: { status: ["==", "published"] } });
- */
 export declare function buildRebaseData(driver: DataDriver, options?: EntityDataOptions): RebaseData;
 /**
  * Wrap a flat {@link RebaseSdkData} into a Entity-shaped {@link RebaseData}.

package/dist/index.es.js

@@ -5825,6 +5825,89 @@ function createPrimaryKeyResolver(options) {
 	};
 }
 /**
+* Build the admin's view model out of the row the wire serves.
+*
+* The wire has ONE shape, for every consumer: flat columns, typed the way the
+* database typed them, and a relation rendered as the target's own columns (or
+* only its foreign key, when nothing asked for it). That is the REST contract,
+* what `find()` returns, what `listen()` pushes, and what the generated types
+* describe.
+*
+* The admin renders neither of those directly. Its date field requires a real
+* `Date` and rejects a string outright; its relation cells read `.data.values`
+* off a relation ref. Those requirements are the *admin's*, so they are met
+* here — in the browser, from the collection config the panel already has —
+* rather than by asking the server for a second wire shape.
+*
+* That second shape is what this replaces. Until 2026-09-09 the realtime wire
+* carried the view model and every other read carried flat rows, so `find()`
+* and `listen()` answered one query two ways; unifying the wire without doing
+* this conversion is what left every date cell reading "Invalid date value"
+* and every relation cell "Unexpected value".
+*
+* Values already in view-model form pass through untouched: a driver that
+* still sends `{ __type: "date" }` or a relation ref (the client revives both)
+* is served by the same walk.
+*/
+function toViewModelValues(values, properties, collection, resolveCollection) {
+	if (!properties) return values;
+	const relations = collection ? resolveCollectionRelations(collection) : {};
+	let out;
+	const write = (key, value) => {
+		out = out ?? { ...values };
+		out[key] = value;
+	};
+	for (const [key, rawProperty] of Object.entries(properties)) {
+		const property = rawProperty;
+		if (!property) continue;
+		if (!(key in values)) {
+			const fkRelation = relations[key];
+			const column = fkRelation && "localKey" in fkRelation ? fkRelation.localKey : void 0;
+			const fk = column !== void 0 ? values[column] ?? values[toWireKey(column)] : void 0;
+			const fkTarget = fkRelation?.targetSlug;
+			if (fkTarget && (typeof fk === "string" || typeof fk === "number")) write(key, new EntityRelation(fk, fkTarget));
+			continue;
+		}
+		const value = values[key];
+		if (value === null || value === void 0) continue;
+		const relation = relations[key];
+		if (relation && (property.type === "relation" || property.of?.type === "relation" || property.type === "array")) {
+			const target = relation.targetSlug;
+			if (!target) continue;
+			const targetProperties = resolveCollection?.(target)?.properties;
+			const targetCollection = resolveCollection?.(target);
+			const toRef = (item) => {
+				if (item instanceof EntityRelation) return item;
+				if (typeof item === "object" && item !== null && "__type" in item) return item;
+				if (typeof item === "object" && item !== null) {
+					const row = item;
+					const keys = targetCollection ? resolvePrimaryKeys(targetCollection) : [];
+					const id = keys.length > 0 ? buildCompositeId(row, keys) : row.id;
+					if (id === void 0 || id === null || id === "") return item;
+					return new EntityRelation(id, target, {
+						id,
+						path: target,
+						values: toViewModelValues(row, targetProperties, targetCollection, resolveCollection)
+					});
+				}
+				if (typeof item === "string" || typeof item === "number") return new EntityRelation(item, target);
+				return item;
+			};
+			write(key, Array.isArray(value) ? value.map(toRef) : toRef(value));
+			continue;
+		}
+		if (property.type === "date" && !(value instanceof Date)) {
+			if (typeof value === "string" || typeof value === "number") {
+				const date = new Date(value);
+				write(key, isNaN(date.getTime()) ? null : date);
+			}
+			continue;
+		}
+		if (property.type === "map" && property.properties && typeof value === "object" && !Array.isArray(value)) write(key, toViewModelValues(value, property.properties, void 0, resolveCollection));
+	}
+	return out ?? values;
+}
+/**
 * Give a flat row the Entity view-model the admin renders.
 *
 * The address is *derived here* — it is not a column, and the row it came from
@@ -5835,12 +5918,12 @@ function createPrimaryKeyResolver(options) {
 * `primaryKeys` empty falls back to a literal `id` on the row: drivers other
 * than postgres still serve rows with one, and this keeps them working.
 */
-function rowToEntity(row, slug, primaryKeys = []) {
+function rowToEntity(row, slug, primaryKeys = [], toViewModel) {
 	const { _matches, ...values } = row;
 	return {
 		id: primaryKeys.length > 0 ? buildCompositeId(row, primaryKeys) : row.id,
 		path: slug,
-		values,
+		values: toViewModel ? toViewModel(values) : values,
 		..._matches ? { searchMatches: _matches } : {}
 	};
 }
@@ -5860,14 +5943,16 @@ function inlineEnvelope(envelope) {
 * Replace every relation envelope on a row with the target's flat columns.
 *
 * The SDK serves one relation shape — the inlined one (see
-* {@link RestFetchService}) — and reads that come back through a *driver*
-* method rather than the REST pipeline still carry envelopes. Realtime is the
-* one such read left: there is no `listenForRest`, so the rows arrive shaped
-* for the admin and are flattened here instead.
+* {@link RestFetchService}) — and Postgres now serves it on every read, so
+* against that driver this walk finds nothing to do. It stays for the drivers
+* whose own `fetchCollection` still answers with refs: a developer reading
+* through this accessor gets one shape whichever driver is underneath.
 *
 * Only applied where the REST pipeline is the contract (see `find`); a driver
-* without a `restFetchService` keeps whatever it returns, so the admin's own
-* path through {@link buildRebaseData} is untouched.
+* without a `restFetchService` keeps whatever it returns.
+*
+* Note this is NOT how the admin gets its view model — that is built in the
+* browser by {@link toViewModelValues}, from the same flat row.
 */
 function inlineRelationRefs(row) {
 	let out;
@@ -5880,7 +5965,7 @@ function inlineRelationRefs(row) {
 	}
 	return out ?? row;
 }
-function createDriverAccessor(driver, slug, getPks = () => []) {
+function createDriverAccessor(driver, slug, getPks = () => [], toViewModel) {
 	const accessor = {
 		async find(params) {
 			const filter = params?.where ? deserializeFilter(params.where) : void 0;
@@ -5929,7 +6014,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 			const last = rows[rows.length - 1];
 			const nextCursor = hasMore && last && driver.restFetchService?.cursorFor ? driver.restFetchService.cursorFor(slug, last, orderBy) : void 0;
 			return {
-				data: rows.map((row) => rowToEntity(row, slug, getPks())),
+				data: rows.map((row) => rowToEntity(row, slug, getPks(), toViewModel)),
 				meta: {
 					total,
 					limit,
@@ -5945,7 +6030,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 				path: slug,
 				id
 			});
-			return row ? rowToEntity(row, slug, getPks()) : void 0;
+			return row ? rowToEntity(row, slug, getPks(), toViewModel) : void 0;
 		},
 		aggregate: driver.restFetchService?.aggregate ? async (params) => driver.restFetchService.aggregate(slug, {
 			aggregates: params.select.map(toDriverAggregate),
@@ -5961,7 +6046,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 				values: data,
 				id,
 				status: "new"
-			}), slug, getPks());
+			}), slug, getPks(), toViewModel);
 		},
 		createMany: driver.saveMany ? async (data, options) => {
 			return (await driver.saveMany({
@@ -5969,7 +6054,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 				rows: data,
 				upsert: options?.upsert,
 				onConflict: options?.onConflict
-			})).map((row) => rowToEntity(row, slug, getPks()));
+			})).map((row) => rowToEntity(row, slug, getPks(), toViewModel));
 		} : void 0,
 		async update(id, data) {
 			return rowToEntity(await driver.save({
@@ -5977,7 +6062,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 				values: data,
 				id,
 				status: "existing"
-			}), slug, getPks());
+			}), slug, getPks(), toViewModel);
 		},
 		async delete(id) {
 			return driver.delete({ row: {
@@ -5993,7 +6078,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 					id: u.id,
 					values: u.data
 				}))
-			})).map((row) => rowToEntity(row, slug, getPks()));
+			})).map((row) => rowToEntity(row, slug, getPks(), toViewModel));
 		} : void 0,
 		deleteMany: driver.deleteMany ? async (ids) => {
 			await driver.deleteMany({
@@ -6025,7 +6110,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 				vectorSearch: params?.vectorSearch,
 				onUpdate: (entities) => {
 					onUpdate({
-						data: entities.map((row) => rowToEntity(normalize(row), slug, getPks())),
+						data: entities.map((row) => rowToEntity(normalize(row), slug, getPks(), toViewModel)),
 						meta: {
 							total: offset + entities.length,
 							limit,
@@ -6042,7 +6127,7 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 			return driver.listenOne({
 				path: slug,
 				id,
-				onUpdate: (entity) => onUpdate(entity ? rowToEntity(normalize(entity), slug, getPks()) : void 0),
+				onUpdate: (entity) => onUpdate(entity ? rowToEntity(normalize(entity), slug, getPks(), toViewModel) : void 0),
 				onError
 			});
 		} : void 0,
@@ -6084,13 +6169,32 @@ function createDriverAccessor(driver, slug, getPks = () => []) {
 * await data.products.create({ name: "Camera", price: 299 });
 * const { data: items } = await data.products.find({ where: { status: ["==", "published"] } });
 */
+/**
+* The view-model converter for one collection, or `undefined` when there is no
+* collection config to build it from.
+*
+* Absent is the honest answer for every consumer that is not the admin: the
+* flat SDK derives itself from this same layer (`buildSdkData`) and must keep
+* the wire's own types, and it registers no collection resolver.
+*/
+function createViewModelConverter(options) {
+	if (!options?.resolveCollection) return () => void 0;
+	return function converterFor(slug) {
+		return (values) => {
+			const collection = options.resolveCollection?.(slug);
+			if (!collection) return values;
+			return toViewModelValues(values, collection.properties, collection, options.resolveCollection);
+		};
+	};
+}
 function buildRebaseData(driver, options) {
 	const cache = /* @__PURE__ */ new Map();
 	const primaryKeysFor = createPrimaryKeyResolver(options);
+	const viewModelFor = createViewModelConverter(options);
 	function getAccessor(slug) {
 		let accessor = cache.get(slug);
 		if (!accessor) {
-			accessor = createDriverAccessor(driver, slug, () => primaryKeysFor(slug));
+			accessor = createDriverAccessor(driver, slug, () => primaryKeysFor(slug), viewModelFor(slug));
 			cache.set(slug, accessor);
 		}
 		return accessor;
@@ -6355,29 +6459,29 @@ function toSdkCollectionClient(snap, slug = "collection") {
 * {@link CollectionAccessor}. Every returned row is re-wrapped into the
 * `{ id, path, values }` view-model the admin panel renders.
 */
-function toEntityAccessor(sdk, slug, getPks = () => []) {
+function toEntityAccessor(sdk, slug, getPks = () => [], toViewModel) {
 	const accessor = {
 		async find(params) {
 			const res = await sdk.find(params);
 			return {
-				data: res.data.map((row) => rowToEntity(row, slug, getPks())),
+				data: res.data.map((row) => rowToEntity(row, slug, getPks(), toViewModel)),
 				meta: res.meta
 			};
 		},
 		async findById(id) {
 			const row = await sdk.findById(id);
-			return row ? rowToEntity(row, slug, getPks()) : void 0;
+			return row ? rowToEntity(row, slug, getPks(), toViewModel) : void 0;
 		},
 		async create(data, id) {
-			return rowToEntity(await sdk.create(data, id), slug, getPks());
+			return rowToEntity(await sdk.create(data, id), slug, getPks(), toViewModel);
 		},
 		createMany: sdk.createMany ? async (data, options) => {
-			return (await sdk.createMany(data, options)).map((row) => rowToEntity(row, slug, getPks()));
+			return (await sdk.createMany(data, options)).map((row) => rowToEntity(row, slug, getPks(), toViewModel));
 		} : void 0,
 		async update(id, data) {
 			const row = await sdk.update(id, data);
 			if (!row) throw new Error(`Update returned no data for id ${id}`);
-			return rowToEntity(row, slug, getPks());
+			return rowToEntity(row, slug, getPks(), toViewModel);
 		},
 		delete(id) {
 			return sdk.delete(id);
@@ -6385,10 +6489,10 @@ function toEntityAccessor(sdk, slug, getPks = () => []) {
 		count: isUnsupported(sdk.count) ? void 0 : (params) => sdk.count(params),
 		aggregate: isUnsupported(sdk.aggregate) ? void 0 : (params) => sdk.aggregate(params),
 		listen: isUnsupported(sdk.listen) ? void 0 : (params, onUpdate, onError) => sdk.listen(params, (res) => onUpdate({
-			data: res.data.map((row) => rowToEntity(row, slug, getPks())),
+			data: res.data.map((row) => rowToEntity(row, slug, getPks(), toViewModel)),
 			meta: res.meta
 		}), onError),
-		listenById: isUnsupported(sdk.listenById) ? void 0 : (id, onUpdate, onError) => sdk.listenById(id, (row) => onUpdate(row ? rowToEntity(row, slug, getPks()) : void 0), onError),
+		listenById: isUnsupported(sdk.listenById) ? void 0 : (id, onUpdate, onError) => sdk.listenById(id, (row) => onUpdate(row ? rowToEntity(row, slug, getPks(), toViewModel) : void 0), onError),
 		where(columnOrCondition, operator, value) {
 			const builder = new QueryBuilder(accessor);
 			if (typeof columnOrCondition === "object") return builder.where(columnOrCondition);
@@ -6424,10 +6528,11 @@ function toEntityAccessor(sdk, slug, getPks = () => []) {
 function wrapAsEntityData(sdkData, options) {
 	const cache = /* @__PURE__ */ new Map();
 	const primaryKeysFor = createPrimaryKeyResolver(options);
+	const viewModelFor = createViewModelConverter(options);
 	function getAccessor(slug) {
 		let accessor = cache.get(slug);
 		if (!accessor) {
-			accessor = toEntityAccessor(sdkData.collection(slug), slug, () => primaryKeysFor(slug));
+			accessor = toEntityAccessor(sdkData.collection(slug), slug, () => primaryKeysFor(slug), viewModelFor(slug));
 			cache.set(slug, accessor);
 		}
 		return accessor;