@rebasepro/common 0.14.2-canary.gf913b76 → 0.15.0

package/dist/data/sort-dialect.d.ts

@@ -18,6 +18,13 @@ import type { OrderBySpec, OrderByTuple } from "@rebasepro/types";
  * the same value; the two are told apart by whether the first element is
  * itself an array, which no field name ever is.
  *
+ * This is also where a {@link RelationAggregateSort} object stops being an
+ * object. Above this function a sort key may be either spelling; below it,
+ * every key is a string — which is what `OrderByTuple`, the REST parameter, the
+ * driver contract and the cursor all already were. Doing it here means the one
+ * place that already collapses the two *shapes* of a sort also collapses the
+ * two *spellings* of a key, rather than every consumer learning about both.
+ *
  * @returns The keys in order of significance, or `undefined` for no sort. An
  *   empty list also returns `undefined` — "sort by nothing" is no sort, and
  *   letting `[]` through would have every layer below re-deciding what it meant.

package/dist/index.es.js

@@ -1,4 +1,4 @@
-import { ALL_WHERE_FILTER_OPS, ANONYMOUS_USER_ID, ANONYMOUS_USER_IDS, CANONICAL_TO_REST, DEFAULT_DATA_SOURCE_KEY, DEFAULT_LIST_LIMIT, EntityReference, EntityRelation, NULL_OPS, REST_TO_CANONICAL, RLS_ROLES_SQL, RLS_UID_SQL, getDataSourceCapabilities, getDeclaredSubcollections, isAnonymousUid, isManyToMany, isPostgresCollectionConfig, isRelationalCollectionConfig, policy, rewriteLegacyRlsFunctions, toCanonicalOp } from "@rebasepro/types";
+import { ALL_WHERE_FILTER_OPS, ANONYMOUS_USER_ID, ANONYMOUS_USER_IDS, CANONICAL_TO_REST, DEFAULT_DATA_SOURCE_KEY, DEFAULT_LIST_LIMIT, EntityReference, EntityRelation, NULL_OPS, REST_TO_CANONICAL, RLS_ROLES_SQL, RLS_UID_SQL, getDataSourceCapabilities, getDeclaredSubcollections, isAnonymousUid, isManyToMany, isPostgresCollectionConfig, isRelationAggregateSort, isRelationalCollectionConfig, policy, rewriteLegacyRlsFunctions, sortKeyToString, toCanonicalOp } from "@rebasepro/types";
 import { deepClone, firstFreeKey, generateForeignKeyName, getIn, getPolicyNamesForRules, getPolicyOperations, isDefaultFieldConfigId, mergeDeep, prettifyIdentifier, randomString, removeFunctions, toSnakeCase, toWireKey } from "@rebasepro/utils";
 import jsonLogic from "json-logic-js";
 import { deepEqual } from "fast-equals";
@@ -3336,6 +3336,13 @@ var defaultUsersCollection = defineCollection({
 * the same value; the two are told apart by whether the first element is
 * itself an array, which no field name ever is.
 *
+* This is also where a {@link RelationAggregateSort} object stops being an
+* object. Above this function a sort key may be either spelling; below it,
+* every key is a string — which is what `OrderByTuple`, the REST parameter, the
+* driver contract and the cursor all already were. Doing it here means the one
+* place that already collapses the two *shapes* of a sort also collapses the
+* two *spellings* of a key, rather than every consumer learning about both.
+*
 * @returns The keys in order of significance, or `undefined` for no sort. An
 *   empty list also returns `undefined` — "sort by nothing" is no sort, and
 *   letting `[]` through would have every layer below re-deciding what it meant.
@@ -3343,7 +3350,8 @@ var defaultUsersCollection = defineCollection({
 function normalizeOrderBy(orderBy) {
 	if (!orderBy || orderBy.length === 0) return void 0;
 	const list = Array.isArray(orderBy[0]) ? orderBy : [orderBy];
-	return list.length > 0 ? list : void 0;
+	if (list.length === 0) return void 0;
+	return list.map(([key, direction]) => [sortKeyToString(key), direction]);
 }
 /**
 * The most significant sort key, for a caller that can only express one —
@@ -3398,14 +3406,16 @@ function parseOrderBySpecStrict(raw, order) {
 	if (raw === void 0 || raw === null || raw === "") return void 0;
 	if (typeof raw === "string") return normalizeDriverOrderBy(raw, order);
 	if (!Array.isArray(raw) || raw.length === 0) throw new OrderBySpecError(`${typeof raw} is not a field name or a list of sort keys`);
-	if (typeof raw[0] === "string") return [toStrictTuple(raw, 0)];
+	if (typeof raw[0] === "string" || isRelationAggregateSort(raw[0])) return [toStrictTuple(raw, 0)];
 	return raw.map(toStrictTuple);
 }
 function toStrictTuple(raw, index) {
-	if (!Array.isArray(raw) || typeof raw[0] !== "string" || raw[0].trim() === "") throw new OrderBySpecError(`entry ${index} has no field name`);
+	if (!Array.isArray(raw)) throw new OrderBySpecError(`entry ${index} has no field name`);
+	const key = isRelationAggregateSort(raw[0]) ? sortKeyToString(raw[0]) : raw[0];
+	if (typeof key !== "string" || key.trim() === "") throw new OrderBySpecError(`entry ${index} has no field name`);
 	const direction = raw[1];
 	if (direction !== void 0 && direction !== "asc" && direction !== "desc") throw new OrderBySpecError(`entry ${index} has direction '${String(direction)}'`);
-	return [raw[0], direction ?? "asc"];
+	return [key, direction ?? "asc"];
 }
 /**
 * Serialize a sort to the wire.