@zenstackhq/orm 3.5.0 → 3.5.2

package/dist/index.js

@@ -1652,13 +1652,53 @@ var LateralJoinDialectBase = class extends BaseCrudDialect {
     qb = qb.select((eb) => {
       const objArgs = this.buildRelationObjectArgs(relationModel, relationModelAlias, eb, payload, parentResultName);
       if (relationFieldDef.array) {
-        return this.buildArrayAgg(this.buildJsonObject(objArgs)).as("$data");
+        const orderBy = this.buildRelationOrderByExpressions(relationModel, relationModelAlias, payload);
+        return this.buildArrayAgg(this.buildJsonObject(objArgs), orderBy).as("$data");
       } else {
         return this.buildJsonObject(objArgs).as("$data");
       }
     });
     return qb;
   }
+  /**
+   * Extracts scalar `orderBy` clauses from the relation payload and maps them to
+   * the array-aggregation ordering format.
+   *
+   * For to-many relations aggregated into a JSON array (via lateral joins), this
+   * lets us preserve a stable ordering by passing `{ expr, sort, nulls? }` into
+   * the dialect's `buildArrayAgg` implementation.
+   */
+  buildRelationOrderByExpressions(model, modelAlias, payload) {
+    if (payload === true || !payload.orderBy) {
+      return void 0;
+    }
+    const items = [];
+    for (const orderBy of ensureArray(payload.orderBy)) {
+      for (const [field, value] of Object.entries(orderBy)) {
+        if (!value || requireField(this.schema, model, field).relation) {
+          continue;
+        }
+        const expr = this.fieldRef(model, field, modelAlias);
+        let sort = typeof value === "string" ? value : value.sort;
+        if (payload.take !== void 0 && payload.take < 0) {
+          sort = this.negateSort(sort, true);
+        }
+        if (typeof value === "string") {
+          items.push({
+            expr,
+            sort
+          });
+        } else {
+          items.push({
+            expr,
+            sort,
+            nulls: value.nulls
+          });
+        }
+      }
+    }
+    return items.length > 0 ? items : void 0;
+  }
   buildRelationObjectArgs(relationModel, relationModelAlias, eb, payload, parentResultName) {
     const relationModelDef = requireModel(this.schema, relationModel);
     const objArgs = {};
@@ -1844,7 +1884,7 @@ var MySqlCrudDialect = class extends LateralJoinDialectBase {
   buildExistsExpression(innerQuery) {
     return this.eb.exists(this.eb.selectFrom(innerQuery.as("$exists_sub")).select(this.eb.lit(1).as("_")));
   }
-  buildArrayAgg(arg) {
+  buildArrayAgg(arg, _orderBy) {
     return this.eb.fn.coalesce(sql2`JSON_ARRAYAGG(${arg})`, sql2`JSON_ARRAY()`);
   }
   buildSkipTake(query, skip, take) {
@@ -2156,8 +2196,16 @@ var PostgresCrudDialect = class _PostgresCrudDialect extends LateralJoinDialectB
   }
   // #endregion
   // #region other overrides
-  buildArrayAgg(arg) {
-    return this.eb.fn.coalesce(sql3`jsonb_agg(${arg})`, sql3`'[]'::jsonb`);
+  buildArrayAgg(arg, orderBy) {
+    if (!orderBy || orderBy.length === 0) {
+      return this.eb.fn.coalesce(sql3`jsonb_agg(${arg})`, sql3`'[]'::jsonb`);
+    }
+    const orderBySql = sql3.join(orderBy.map(({ expr, sort, nulls }) => {
+      const dir = sql3.raw(sort.toUpperCase());
+      const nullsSql = nulls ? sql3` NULLS ${sql3.raw(nulls.toUpperCase())}` : sql3``;
+      return sql3`${expr} ${dir}${nullsSql}`;
+    }), sql3.raw(", "));
+    return this.eb.fn.coalesce(sql3`jsonb_agg(${arg} ORDER BY ${orderBySql})`, sql3`'[]'::jsonb`);
   }
   buildSkipTake(query, skip, take) {
     if (take !== void 0) {