@graffy/pg 0.15.22 → 0.15.24-alpha.1

package/index.cjs

@@ -178,9 +178,9 @@ const lookup = (prop) => {
 const aggSql = {
   $sum: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
   $card: (prop) => sql__default["default"]`count(distinct(${lookup(prop)}))`,
-  $avg: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
-  $max: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
-  $min: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`
+  $avg: (prop) => sql__default["default"]`avg((${lookup(prop)})::numeric)`,
+  $max: (prop) => sql__default["default"]`max((${lookup(prop)})::numeric)`,
+  $min: (prop) => sql__default["default"]`min((${lookup(prop)})::numeric)`
 };
 const getSelectCols = (table, projection = null) => {
   if (!projection)
@@ -300,6 +300,9 @@ function getBinarySql(lhs, type, op, value, textLhs) {
     return sql__default["default"]`${lhs} ${sqlOp} ${String(value)}`;
   }
   if (type === "jsonb") {
+    if (typeof value === "string") {
+      return sql__default["default"]`${textLhs} ${sqlOp} ${value}`;
+    }
     return sql__default["default"]`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
   if (type === "cube")
@@ -343,10 +346,13 @@ const getArgMeta = (key, { prefix, idCol, verDefault }) => getJsonBuildTrusted({
   $ref: sql__default["default"]`jsonb_build_array(${sql.join(prefix.map((k) => sql__default["default"]`${k}::text`))}, "${sql.raw(idCol)}")`,
   $ver: sql.raw(verDefault)
 });
-const getAggMeta = (key, $group, { verDefault }) => getJsonBuildTrusted({
-  $key: sql.join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || "),
-  $ver: sql.raw(verDefault)
-});
+const getAggMeta = (key, $group, { verDefault }) => {
+  let $key = sql.join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || ");
+  return getJsonBuildTrusted({
+    $key,
+    $ver: sql.raw(verDefault)
+  });
+};
 function getArgSql(_a, options) {
   var _b = _a, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _b, rest = __objRest(_b, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
   const _a2 = rest, { $order, $group } = _a2, filter = __objRest(_a2, ["$order", "$group"]);
@@ -358,14 +364,14 @@ function getArgSql(_a, options) {
   const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
   const group = groupCols ? sql.join(groupCols, ", ") : void 0;
   const hasRangeArg = $before || $after || $since || $until || $first || $last || $all || $order;
-  let key;
+  let filterKey;
   const where = [];
   if (!common.isEmpty(filter)) {
     where.push(getSql(filter, options));
-    key = sql__default["default"]`${JSON.stringify(filter)}::jsonb`;
+    filterKey = sql__default["default"]`${JSON.stringify(filter)}::jsonb`;
   }
   if (!hasRangeArg)
-    return { meta: meta(key), where, group, limit: 1 };
+    return { meta: meta(filterKey), where, group, limit: 1 };
   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)
@@ -373,10 +379,11 @@ function getArgSql(_a, options) {
   });
   const order = !$group && sql.join(($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql__default["default"]`${lookup(orderItem.slice(1))} ${$last ? sql__default["default"]`ASC` : sql__default["default"]`DESC`}` : sql__default["default"]`${lookup(orderItem)} ${$last ? sql__default["default"]`DESC` : sql__default["default"]`ASC`}`), `, `);
   const orderKey = $order && getJsonBuildTrusted({ $order: sql__default["default"]`${JSON.stringify($order)}::jsonb` });
-  const cursorKey = getJsonBuildTrusted({
+  const cursorKey = $group !== true && getJsonBuildTrusted({
     $cursor: sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
   });
-  key = sql__default["default"]`(${sql.join([key, orderKey, cursorKey].filter(Boolean), ` || `)})`;
+  const keys = [filterKey, orderKey, cursorKey].filter(Boolean);
+  const key = keys.length > 0 ? sql__default["default"]`(${sql.join(keys, ` || `)})` : void 0;
   return {
     meta: meta(key),
     where,

package/index.mjs

@@ -170,9 +170,9 @@ const lookup = (prop) => {
 const aggSql = {
   $sum: (prop) => sql`sum((${lookup(prop)})::numeric)`,
   $card: (prop) => sql`count(distinct(${lookup(prop)}))`,
-  $avg: (prop) => sql`sum((${lookup(prop)})::numeric)`,
-  $max: (prop) => sql`sum((${lookup(prop)})::numeric)`,
-  $min: (prop) => sql`sum((${lookup(prop)})::numeric)`
+  $avg: (prop) => sql`avg((${lookup(prop)})::numeric)`,
+  $max: (prop) => sql`max((${lookup(prop)})::numeric)`,
+  $min: (prop) => sql`min((${lookup(prop)})::numeric)`
 };
 const getSelectCols = (table, projection = null) => {
   if (!projection)
@@ -292,6 +292,9 @@ function getBinarySql(lhs, type, op, value, textLhs) {
     return sql`${lhs} ${sqlOp} ${String(value)}`;
   }
   if (type === "jsonb") {
+    if (typeof value === "string") {
+      return sql`${textLhs} ${sqlOp} ${value}`;
+    }
     return sql`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
   if (type === "cube")
@@ -335,10 +338,13 @@ const getArgMeta = (key, { prefix, idCol, verDefault }) => getJsonBuildTrusted({
   $ref: sql`jsonb_build_array(${join(prefix.map((k) => sql`${k}::text`))}, "${raw(idCol)}")`,
   $ver: raw(verDefault)
 });
-const getAggMeta = (key, $group, { verDefault }) => getJsonBuildTrusted({
-  $key: join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || "),
-  $ver: raw(verDefault)
-});
+const getAggMeta = (key, $group, { verDefault }) => {
+  let $key = join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || ");
+  return getJsonBuildTrusted({
+    $key,
+    $ver: raw(verDefault)
+  });
+};
 function getArgSql(_a, options) {
   var _b = _a, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _b, rest = __objRest(_b, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
   const _a2 = rest, { $order, $group } = _a2, filter = __objRest(_a2, ["$order", "$group"]);
@@ -350,14 +356,14 @@ function getArgSql(_a, options) {
   const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
   const group = groupCols ? join(groupCols, ", ") : void 0;
   const hasRangeArg = $before || $after || $since || $until || $first || $last || $all || $order;
-  let key;
+  let filterKey;
   const where = [];
   if (!isEmpty(filter)) {
     where.push(getSql(filter, options));
-    key = sql`${JSON.stringify(filter)}::jsonb`;
+    filterKey = sql`${JSON.stringify(filter)}::jsonb`;
   }
   if (!hasRangeArg)
-    return { meta: meta(key), where, group, limit: 1 };
+    return { meta: meta(filterKey), where, group, limit: 1 };
   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)
@@ -365,10 +371,11 @@ function getArgSql(_a, options) {
   });
   const order = !$group && join(($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql`${lookup(orderItem.slice(1))} ${$last ? sql`ASC` : sql`DESC`}` : sql`${lookup(orderItem)} ${$last ? sql`DESC` : sql`ASC`}`), `, `);
   const orderKey = $order && getJsonBuildTrusted({ $order: sql`${JSON.stringify($order)}::jsonb` });
-  const cursorKey = getJsonBuildTrusted({
+  const cursorKey = $group !== true && getJsonBuildTrusted({
     $cursor: sql`jsonb_build_array(${join(groupCols || orderCols)})`
   });
-  key = sql`(${join([key, orderKey, cursorKey].filter(Boolean), ` || `)})`;
+  const keys = [filterKey, orderKey, cursorKey].filter(Boolean);
+  const key = keys.length > 0 ? sql`(${join(keys, ` || `)})` : void 0;
   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.22",
+  "version": "0.15.24-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.22",
+    "@graffy/common": "0.15.24-alpha.1",
     "sql-template-tag": "^4.1.0",
     "debug": "^4.3.3"
   },