Enhance sorting functionality in ObjectStackAdapter and ListView; support multiple sort formats in QueryParams

Author: hotlong

packages/data-objectstack/src/index.ts

@@ -505,10 +505,22 @@ export class ObjectStackAdapter<T = unknown> implements DataSource<T> {
 
     // Sorting - convert to ObjectStack format
     if (params.$orderby) {
-      const sortArray = Object.entries(params.$orderby).map(([field, order]) => {
-        return order === 'desc' ? `-${field}` : field;
-      });
-      options.sort = sortArray;
+      if (Array.isArray(params.$orderby)) {
+        // Handle array format ['name', '-age'] or [{ field: 'name', order: 'asc' }]
+        options.sort = params.$orderby.map(item => {
+          if (typeof item === 'string') return item;
+          // Handle object format { field: 'name', order: 'desc' }
+          const field = item.field;
+          const order = item.order || 'asc';
+          return order === 'desc' ? `-${field}` : field;
+        });
+      } else {
+        // Handle Record format { name: 'asc', age: 'desc' }
+        const sortArray = Object.entries(params.$orderby).map(([field, order]) => {
+          return order === 'desc' ? `-${field}` : field;
+        });
+        options.sort = sortArray;
+      }
     }
 
     // Pagination

packages/plugin-list/src/ListView.tsx

@@ -147,9 +147,11 @@ export const ListView: React.FC<ListViewProps> = ({
         }
 
         // Convert sort to query format
-        // ObjectQL uses simple object: { field: 'asc' }
-        const sort: any = currentSort.length > 0 
-          ? currentSort.reduce((acc, item) => ({ ...acc, [item.field]: item.order }), {})
+        // Use array format to ensure order is preserved (Object keys are not guaranteed ordered)
+        const sort: any = currentSort.length > 0
+          ? currentSort
+              .filter(item => item.field) // Ensure field is selected
+              .map(item => ({ field: item.field, order: item.order }))
           : undefined;
 
         const results = await dataSource.find(schema.objectName, {

packages/types/src/data.ts

@@ -35,9 +35,11 @@ export interface QueryParams {
 
   /**
    * Sort order
+   * Can be a Map { field: 'asc' }, an Array of strings ['field', '-field'], or Array of sort objects
    * @example { createdAt: 'desc', name: 'asc' }
+   * @example ['name', '-createdAt']
    */
-  $orderby?: Record<string, 'asc' | 'desc'>;
+  $orderby?: Record<string, 'asc' | 'desc'> | string[] | Array<{ field: string; order?: 'asc' | 'desc' }>;
 
   /**
    * Number of records to skip (for pagination)