@graffy/pg 0.15.20 → 0.15.21-alpha.3

package/Readme.md

@@ -102,7 +102,7 @@ Every tag must be one of *foo*, *bar* or *baz*.
 
 ### Order by
 
-The root of the Graffy filter object must be an object. (Use `$or` if required.) The property `$order` specifies the order. Its value must be an array of order specifiers, each of which may be a string property name or an object with property names, sort direction, collation and text search relevance. (TBD)
+The root of the Graffy filter object must be an object. (Use `$or` if required.) The property `$order` specifies the order. Its value must be an array of order specifiers, each of which may be a string property name. The order is ascending by default; property names may be prefixed with `!` to switch to descending.
 
 ### Full Text Search
 

package/index.cjs

@@ -359,16 +359,16 @@ function getArgSql(_a, options) {
   if (common.isEmpty(rest)) {
     throw Error("pg_arg.pagination_only_unsupported in " + prefix);
   }
-  const orderCols = ($order || [idCol]).map(lookup);
+  const orderCols = ($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql__default["default"]`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem));
   Object.entries({ $after, $before, $since, $until }).forEach(([name, value]) => {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
-  const orderQuery = $order && getJsonBuildTrusted({ $order: sql__default["default"]`${JSON.stringify($order)}::jsonb` });
-  const cursorQuery = getJsonBuildTrusted({
+  const orderKey = $order && getJsonBuildTrusted({ $order: sql__default["default"]`${JSON.stringify($order)}::jsonb` });
+  const cursorKey = getJsonBuildTrusted({
     $cursor: sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
   });
-  key = sql__default["default"]`(${sql.join([key, orderQuery, cursorQuery].filter(Boolean), ` || `)})`;
+  key = sql__default["default"]`(${sql.join([key, orderKey, cursorKey].filter(Boolean), ` || `)})`;
   return {
     meta: meta(key),
     where,

package/index.mjs

@@ -351,16 +351,16 @@ function getArgSql(_a, options) {
   if (isEmpty(rest)) {
     throw Error("pg_arg.pagination_only_unsupported in " + prefix);
   }
-  const orderCols = ($order || [idCol]).map(lookup);
+  const orderCols = ($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem));
   Object.entries({ $after, $before, $since, $until }).forEach(([name, value]) => {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
-  const orderQuery = $order && getJsonBuildTrusted({ $order: sql`${JSON.stringify($order)}::jsonb` });
-  const cursorQuery = getJsonBuildTrusted({
+  const orderKey = $order && getJsonBuildTrusted({ $order: sql`${JSON.stringify($order)}::jsonb` });
+  const cursorKey = getJsonBuildTrusted({
     $cursor: sql`jsonb_build_array(${join(groupCols || orderCols)})`
   });
-  key = sql`(${join([key, orderQuery, cursorQuery].filter(Boolean), ` || `)})`;
+  key = sql`(${join([key, orderKey, cursorKey].filter(Boolean), ` || `)})`;
   return {
     meta: meta(key),
     where,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/pg",
   "description": "The standard Postgres module for Graffy. Each instance this module mounts a Postgres table as a Graffy subtree.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.20",
+  "version": "0.15.21-alpha.3",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.20",
+    "@graffy/common": "0.15.21-alpha.3",
     "sql-template-tag": "^4.1.0",
     "debug": "^4.3.3"
   },