@graffy/pg 0.15.24-alpha.1 → 0.15.24

package/index.cjs

@@ -175,12 +175,16 @@ const lookup = (prop) => {
   const [prefix, ...suffix] = common.encodePath(prop);
   return suffix.length ? sql__default["default"]`"${sql.raw(prefix)}" #> ${suffix}` : sql__default["default"]`"${sql.raw(prefix)}"`;
 };
+const lookupNumeric = (prop) => {
+  const [prefix, ...suffix] = common.encodePath(prop);
+  return suffix.length ? sql__default["default"]`CASE WHEN "${sql.raw(prefix)}" #> ${suffix} = 'null'::jsonb THEN 0 ELSE ("${sql.raw(prefix)}" #> ${suffix})::numeric END` : sql__default["default"]`"${sql.raw(prefix)}"`;
+};
 const aggSql = {
-  $sum: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
+  $sum: (prop) => sql__default["default"]`sum((${lookupNumeric(prop)})::numeric)`,
   $card: (prop) => sql__default["default"]`count(distinct(${lookup(prop)}))`,
-  $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)`
+  $avg: (prop) => sql__default["default"]`avg((${lookupNumeric(prop)})::numeric)`,
+  $max: (prop) => sql__default["default"]`max((${lookupNumeric(prop)})::numeric)`,
+  $min: (prop) => sql__default["default"]`min((${lookupNumeric(prop)})::numeric)`
 };
 const getSelectCols = (table, projection = null) => {
   if (!projection)
@@ -346,44 +350,40 @@ 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 }) => {
-  let $key = sql.join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || ");
-  return getJsonBuildTrusted({
-    $key,
-    $ver: sql.raw(verDefault)
-  });
-};
+const getAggMeta = (key, { verDefault }) => getJsonBuildTrusted({
+  $key: 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"]);
   const { prefix, idCol } = options;
+  const meta = (key2) => $group ? getAggMeta(key2, options) : getArgMeta(key2, options);
+  const hasRangeArg = $before || $after || $since || $until || $first || $last || $all;
   if ($order && $group) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
   }
-  const meta = (key2) => $group ? getAggMeta(key2, $group, options) : getArgMeta(key2, 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 filterKey;
+  if (($order || $group && $group !== true) && !hasRangeArg) {
+    throw Error("pg_arg.range_arg_expected in " + prefix);
+  }
+  const baseKey = sql__default["default"]`${JSON.stringify(rest)}::jsonb`;
   const where = [];
-  if (!common.isEmpty(filter)) {
+  if (!common.isEmpty(filter))
     where.push(getSql(filter, options));
-    filterKey = sql__default["default"]`${JSON.stringify(filter)}::jsonb`;
-  }
   if (!hasRangeArg)
-    return { meta: meta(filterKey), where, group, limit: 1 };
+    return { meta: meta(baseKey), where, limit: 1 };
+  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
+  const group = groupCols ? sql.join(groupCols, ", ") : void 0;
   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 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 = $group !== true && getJsonBuildTrusted({
-    $cursor: sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
+  const cursorKey = getJsonBuildTrusted({
+    $cursor: $group === true ? sql__default["default"]`''` : sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
   });
-  const keys = [filterKey, orderKey, cursorKey].filter(Boolean);
-  const key = keys.length > 0 ? sql__default["default"]`(${sql.join(keys, ` || `)})` : void 0;
+  const key = sql__default["default"]`(${baseKey} || ${cursorKey})`;
   return {
     meta: meta(key),
     where,

package/index.mjs

@@ -167,12 +167,16 @@ const lookup = (prop) => {
   const [prefix, ...suffix] = encodePath(prop);
   return suffix.length ? sql`"${raw(prefix)}" #> ${suffix}` : sql`"${raw(prefix)}"`;
 };
+const lookupNumeric = (prop) => {
+  const [prefix, ...suffix] = encodePath(prop);
+  return suffix.length ? sql`CASE WHEN "${raw(prefix)}" #> ${suffix} = 'null'::jsonb THEN 0 ELSE ("${raw(prefix)}" #> ${suffix})::numeric END` : sql`"${raw(prefix)}"`;
+};
 const aggSql = {
-  $sum: (prop) => sql`sum((${lookup(prop)})::numeric)`,
+  $sum: (prop) => sql`sum((${lookupNumeric(prop)})::numeric)`,
   $card: (prop) => sql`count(distinct(${lookup(prop)}))`,
-  $avg: (prop) => sql`avg((${lookup(prop)})::numeric)`,
-  $max: (prop) => sql`max((${lookup(prop)})::numeric)`,
-  $min: (prop) => sql`min((${lookup(prop)})::numeric)`
+  $avg: (prop) => sql`avg((${lookupNumeric(prop)})::numeric)`,
+  $max: (prop) => sql`max((${lookupNumeric(prop)})::numeric)`,
+  $min: (prop) => sql`min((${lookupNumeric(prop)})::numeric)`
 };
 const getSelectCols = (table, projection = null) => {
   if (!projection)
@@ -338,44 +342,40 @@ 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 }) => {
-  let $key = join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || ");
-  return getJsonBuildTrusted({
-    $key,
-    $ver: raw(verDefault)
-  });
-};
+const getAggMeta = (key, { verDefault }) => getJsonBuildTrusted({
+  $key: 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"]);
   const { prefix, idCol } = options;
+  const meta = (key2) => $group ? getAggMeta(key2, options) : getArgMeta(key2, options);
+  const hasRangeArg = $before || $after || $since || $until || $first || $last || $all;
   if ($order && $group) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
   }
-  const meta = (key2) => $group ? getAggMeta(key2, $group, options) : getArgMeta(key2, 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 filterKey;
+  if (($order || $group && $group !== true) && !hasRangeArg) {
+    throw Error("pg_arg.range_arg_expected in " + prefix);
+  }
+  const baseKey = sql`${JSON.stringify(rest)}::jsonb`;
   const where = [];
-  if (!isEmpty(filter)) {
+  if (!isEmpty(filter))
     where.push(getSql(filter, options));
-    filterKey = sql`${JSON.stringify(filter)}::jsonb`;
-  }
   if (!hasRangeArg)
-    return { meta: meta(filterKey), where, group, limit: 1 };
+    return { meta: meta(baseKey), where, limit: 1 };
+  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
+  const group = groupCols ? join(groupCols, ", ") : void 0;
   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 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 = $group !== true && getJsonBuildTrusted({
-    $cursor: sql`jsonb_build_array(${join(groupCols || orderCols)})`
+  const cursorKey = getJsonBuildTrusted({
+    $cursor: $group === true ? sql`''` : sql`jsonb_build_array(${join(groupCols || orderCols)})`
   });
-  const keys = [filterKey, orderKey, cursorKey].filter(Boolean);
-  const key = keys.length > 0 ? sql`(${join(keys, ` || `)})` : void 0;
+  const key = sql`(${baseKey} || ${cursorKey})`;
   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.24-alpha.1",
+  "version": "0.15.24",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.24-alpha.1",
+    "@graffy/common": "0.15.24",
     "sql-template-tag": "^4.1.0",
     "debug": "^4.3.3"
   },

package/types/sql/clauses.d.ts

@@ -1,6 +1,7 @@
 export function cubeLiteralSql(value: any): Sql;
 export function getJsonBuildTrusted(variadic: any): Sql;
 export function lookup(prop: any): Sql;
+export function lookupNumeric(prop: any): Sql;
 export function getSelectCols(table: any, projection?: any): Sql;
 export function getInsert(row: any, options: any): {
     cols: Sql;

package/types/sql/getArgSql.d.ts

@@ -2,7 +2,7 @@
   Uses the args object (typically passed in the $key attribute)
 
   @param {object} args
-  @param {{prefix: string, idCol: string}} options
+  @param {{prefix: string, idCol: string, verDefault: string}} options
 
   @typedef { import('sql-template-tag').Sql } Sql
   @return {{ meta: Sql, where: Sql[], order?: Sql, group?: Sql, limit: number }}
@@ -10,6 +10,7 @@
 export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: {
     prefix: string;
     idCol: string;
+    verDefault: string;
 }): {
     meta: Sql;
     where: Sql[];

package/types/sql/getMeta.d.ts

@@ -7,6 +7,6 @@ export function getArgMeta(key: any, { prefix, idCol, verDefault }: {
     idCol: any;
     verDefault: any;
 }): import("sql-template-tag").Sql;
-export function getAggMeta(key: any, $group: any, { verDefault }: {
+export function getAggMeta(key: any, { verDefault }: {
     verDefault: any;
 }): import("sql-template-tag").Sql;