@graffy/pg 0.15.24-alpha.1 → 0.15.25-alpha.2

package/index.cjs

@@ -1,43 +1,13 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports[Symbol.toStringTag] = "Module";
-var common = require("@graffy/common");
-var pg$1 = require("pg");
-var sql = require("sql-template-tag");
-var debug = require("debug");
-function _interopDefaultLegacy(e) {
-  return e && typeof e === "object" && "default" in e ? e : { "default": e };
-}
-var sql__default = /* @__PURE__ */ _interopDefaultLegacy(sql);
-var debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const common = require("@graffy/common");
+const pg$1 = require("pg");
+const sql = require("sql-template-tag");
+const debug = require("debug");
+const _interopDefaultLegacy = (e) => e && typeof e === "object" && "default" in e ? e : { default: e };
+const pg__default = /* @__PURE__ */ _interopDefaultLegacy(pg$1);
+const sql__default = /* @__PURE__ */ _interopDefaultLegacy(sql);
+const debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 const valid = {
   $eq: true,
   $lt: true,
@@ -129,22 +99,27 @@ function simplify(node) {
     return !node[1];
   }
   if (op === "$or") {
-    const { eqmap, noneq, change } = node[1].reduce((acc, item) => {
-      if (item[0] !== "$eq") {
-        acc.noneq.push(item);
-      } else if (acc.eqmap[item[1]]) {
-        acc.change = true;
-        acc.eqmap[item[1]].push(item[2]);
+    const { eqmap, noneq, change } = node[1].reduce(
+      (acc, item) => {
+        if (item[0] !== "$eq") {
+          acc.noneq.push(item);
+        } else if (acc.eqmap[item[1]]) {
+          acc.change = true;
+          acc.eqmap[item[1]].push(item[2]);
+          return acc;
+        } else {
+          acc.eqmap[item[1]] = [item[2]];
+        }
         return acc;
-      } else {
-        acc.eqmap[item[1]] = [item[2]];
-      }
-      return acc;
-    }, { eqmap: {}, noneq: [], change: false });
+      },
+      { eqmap: {}, noneq: [], change: false }
+    );
     if (change) {
       node[1] = [
         ...noneq,
-        ...Object.entries(eqmap).map(([prop, val]) => val.length > 1 ? ["$in", prop, val] : ["$eq", prop, val[0]])
+        ...Object.entries(eqmap).map(
+          ([prop, val]) => val.length > 1 ? ["$in", prop, val] : ["$eq", prop, val[0]]
+        )
       ];
     }
   }
@@ -159,56 +134,71 @@ function simplify(node) {
   return node;
 }
 const getJsonBuildTrusted = (variadic) => {
-  const args = sql.join(Object.entries(variadic).map(([name, value]) => {
-    return sql__default["default"]`'${sql.raw(name)}', ${getJsonBuildValue(value)}`;
-  }));
-  return sql__default["default"]`jsonb_build_object(${args})`;
+  const args = sql.join(
+    Object.entries(variadic).map(([name, value]) => {
+      return sql__default.default`'${sql.raw(name)}', ${getJsonBuildValue(value)}`;
+    })
+  );
+  return sql__default.default`jsonb_build_object(${args})`;
 };
 const getJsonBuildValue = (value) => {
   if (value instanceof sql.Sql)
     return value;
   if (typeof value === "string")
-    return sql__default["default"]`${value}::text`;
-  return sql__default["default"]`${JSON.stringify(stripAttributes(value))}::jsonb`;
+    return sql__default.default`${value}::text`;
+  return sql__default.default`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 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)}"`;
+  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)`,
-  $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)`
+  $sum: (prop) => sql__default.default`sum((${lookupNumeric(prop)})::numeric)`,
+  $card: (prop) => sql__default.default`count(distinct(${lookup(prop)}))`,
+  $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)
-    return sql__default["default"]`to_jsonb("${sql.raw(table)}")`;
+    return sql__default.default`*`;
   const sqls = [];
   for (const key in projection) {
     if (key === "$count") {
-      sqls.push(sql__default["default"]`'$count', count(*)`);
+      sqls.push(sql__default.default`count(*) AS "$count"`);
     } else if (aggSql[key]) {
       const subSqls = [];
       for (const prop in projection[key]) {
-        subSqls.push(sql__default["default"]`${prop}::text, ${aggSql[key](prop)}`);
+        subSqls.push(sql__default.default`${prop}::text, ${aggSql[key](prop)}`);
       }
-      sqls.push(sql__default["default"]`${key}::text, jsonb_build_object(${sql.join(subSqls, ", ")})`);
+      sqls.push(
+        sql__default.default`jsonb_build_object(${sql.join(subSqls, ", ")}) AS "${sql.raw(key)}"`
+      );
     } else {
-      sqls.push(sql__default["default"]`${key}::text, "${sql.raw(key)}"`);
+      sqls.push(sql__default.default`"${sql.raw(key)}"`);
     }
   }
-  return sql__default["default"]`jsonb_build_object(${sql.join(sqls, ", ")})`;
+  return sql.join(sqls, ", ");
 };
 function vertexSql(array, nullValue) {
-  return sql__default["default"]`array[${sql.join(array.map((num) => num === null ? nullValue : num))}]::float8[]`;
+  return sql__default.default`array[${sql.join(
+    array.map((num) => num === null ? nullValue : num)
+  )}]::float8[]`;
 }
 function cubeLiteralSql(value) {
   if (!Array.isArray(value) || !value.length || Array.isArray(value[0]) && value.length !== 2) {
     throw Error("pg.castValue_bad_cube" + JSON.stringify(value));
   }
-  return Array.isArray(value[0]) ? sql__default["default"]`cube(${vertexSql(value[0], sql__default["default"]`'-Infinity'`)}, ${vertexSql(value[1], sql__default["default"]`'Infinity'`)})` : sql__default["default"]`cube(${vertexSql(value, 0)})`;
+  return Array.isArray(value[0]) ? sql__default.default`cube(${vertexSql(value[0], sql__default.default`'-Infinity'`)}, ${vertexSql(
+    value[1],
+    sql__default.default`'Infinity'`
+  )})` : sql__default.default`cube(${vertexSql(value, 0)})`;
 }
 function castValue(value, type, name, isPut) {
   if (!type)
@@ -216,9 +206,9 @@ function castValue(value, type, name, isPut) {
   if (value instanceof sql.Sql)
     return value;
   if (value === null)
-    return sql__default["default"]`NULL`;
+    return sql__default.default`NULL`;
   if (type === "jsonb") {
-    return isPut ? JSON.stringify(stripAttributes(value)) : sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})`;
+    return isPut ? JSON.stringify(stripAttributes(value)) : sql__default.default`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})`;
   }
   if (type === "cube")
     return cubeLiteralSql(value);
@@ -227,26 +217,41 @@ function castValue(value, type, name, isPut) {
 const getInsert = (row, options) => {
   const cols = [];
   const vals = [];
-  Object.entries(row).filter(([col]) => col !== options.verCol && col[0] !== "$").concat([[options.verCol, sql__default["default"]`default`]]).forEach(([col, val]) => {
-    cols.push(sql__default["default"]`"${sql.raw(col)}"`);
+  Object.entries(row).filter(([col]) => col !== options.verCol && col[0] !== "$").concat([[options.verCol, sql__default.default`default`]]).forEach(([col, val]) => {
+    cols.push(sql__default.default`"${sql.raw(col)}"`);
     vals.push(castValue(val, options.schema.types[col], col, row.$put));
   });
   return { cols: sql.join(cols, ", "), vals: sql.join(vals, ", ") };
 };
 const getUpdates = (row, options) => {
-  return sql.join(Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql__default["default"]`"${sql.raw(col)}" = ${castValue(val, options.schema.types[col], col, row.$put)}`).concat(sql__default["default"]`"${sql.raw(options.verCol)}" = default`), ", ");
+  return sql.join(
+    Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(
+      ([col, val]) => sql__default.default`"${sql.raw(col)}" = ${castValue(
+        val,
+        options.schema.types[col],
+        col,
+        row.$put
+      )}`
+    ).concat(sql__default.default`"${sql.raw(options.verCol)}" = default`),
+    ", "
+  );
 };
 function getJsonUpdate(object, col, path) {
   if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
     return getJsonBuildValue(object);
   }
-  const curr = sql__default["default"]`"${sql.raw(col)}"${path.length ? sql__default["default"]`#>${path}` : sql.empty}`;
+  const curr = sql__default.default`"${sql.raw(col)}"${path.length ? sql__default.default`#>${path}` : sql.empty}`;
   if (common.isEmpty(object))
     return curr;
-  return sql__default["default"]`(case jsonb_typeof(${curr})
+  return sql__default.default`(case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
-  end) || jsonb_build_object(${sql.join(Object.entries(object).map(([key, value]) => sql__default["default"]`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`), ", ")})`;
+  end) || jsonb_build_object(${sql.join(
+    Object.entries(object).map(
+      ([key, value]) => sql__default.default`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`
+    ),
+    ", "
+  )})`;
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -264,50 +269,50 @@ function stripAttributes(object) {
 const opSql = {
   $and: `AND`,
   $or: `OR`,
-  $not: sql__default["default"]`NOT`,
-  $eq: sql__default["default"]`=`,
-  $neq: sql__default["default"]`<>`,
-  $in: sql__default["default"]`IN`,
-  $nin: sql__default["default"]`NOT IN`,
-  $lt: sql__default["default"]`<`,
-  $lte: sql__default["default"]`<=`,
-  $gt: sql__default["default"]`>`,
-  $gte: sql__default["default"]`>=`,
-  $re: sql__default["default"]`~`,
-  $ire: sql__default["default"]`~*`,
-  $cts: sql__default["default"]`@>`,
-  $ctd: sql__default["default"]`<@`
+  $not: sql__default.default`NOT`,
+  $eq: sql__default.default`=`,
+  $neq: sql__default.default`<>`,
+  $in: sql__default.default`IN`,
+  $nin: sql__default.default`NOT IN`,
+  $lt: sql__default.default`<`,
+  $lte: sql__default.default`<=`,
+  $gt: sql__default.default`>`,
+  $gte: sql__default.default`>=`,
+  $re: sql__default.default`~`,
+  $ire: sql__default.default`~*`,
+  $cts: sql__default.default`@>`,
+  $ctd: sql__default.default`<@`
 };
 function getBinarySql(lhs, type, op, value, textLhs) {
   if (value === null && op === "$eq")
-    return sql__default["default"]`${lhs} IS NULL`;
+    return sql__default.default`${lhs} IS NULL`;
   if (value === null && op === "$neq")
-    return sql__default["default"]`${lhs} IS NOT NULL`;
+    return sql__default.default`${lhs} IS NOT NULL`;
   const sqlOp = opSql[op];
   if (!sqlOp)
     throw Error("pg.getSql_unknown_operator " + op);
   if (op === "$in" || op === "$nin") {
     if (type === "jsonb" && typeof value[0] === "string")
       lhs = textLhs;
-    return sql__default["default"]`${lhs} ${sqlOp} (${sql.join(value)})`;
+    return sql__default.default`${lhs} ${sqlOp} (${sql.join(value)})`;
   }
   if (op === "$re" || op === "$ire") {
     if (type === "jsonb") {
       lhs = textLhs;
     } else if (type !== "text") {
-      lhs = sql__default["default"]`(${lhs})::text`;
+      lhs = sql__default.default`(${lhs})::text`;
     }
-    return sql__default["default"]`${lhs} ${sqlOp} ${String(value)}`;
+    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`${textLhs} ${sqlOp} ${value}`;
     }
-    return sql__default["default"]`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
+    return sql__default.default`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
   if (type === "cube")
-    return sql__default["default"]`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
-  return sql__default["default"]`${lhs} ${sqlOp} ${value}`;
+    return sql__default.default`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
+  return sql__default.default`${lhs} ${sqlOp} ${value}`;
 }
 function getSql(filter, options) {
   function getNodeSql(ast) {
@@ -315,75 +320,79 @@ function getSql(filter, options) {
       return ast;
     const op = ast[0];
     if (op === "$and" || op === "$or") {
-      return sql__default["default"]`(${sql.join(ast[1].map((node) => getNodeSql(node)), `) ${opSql[op]} (`)})`;
+      return sql__default.default`(${sql.join(
+        ast[1].map((node) => getNodeSql(node)),
+        `) ${opSql[op]} (`
+      )})`;
     } else if (op === "$not") {
-      return sql__default["default"]`${opSql[op]} (${getNodeSql(ast[1])})`;
+      return sql__default.default`${opSql[op]} (${getNodeSql(ast[1])})`;
     }
     const [prefix, ...suffix] = common.encodePath(ast[1]);
-    const { types } = options.schema;
-    if (!types[prefix])
+    const { types: types2 } = options.schema;
+    if (!types2[prefix])
       throw Error("pg.no_column " + prefix);
-    if (types[prefix] === "jsonb") {
+    if (types2[prefix] === "jsonb") {
       const [lhs, textLhs] = suffix.length ? [
-        sql__default["default"]`"${sql.raw(prefix)}" #> ${suffix}`,
-        sql__default["default"]`"${sql.raw(prefix)}" #>> ${suffix}`
-      ] : [sql__default["default"]`"${sql.raw(prefix)}"`, sql__default["default"]`"${sql.raw(prefix)}" #>> '{}'`];
+        sql__default.default`"${sql.raw(prefix)}" #> ${suffix}`,
+        sql__default.default`"${sql.raw(prefix)}" #>> ${suffix}`
+      ] : [sql__default.default`"${sql.raw(prefix)}"`, sql__default.default`"${sql.raw(prefix)}" #>> '{}'`];
       return getBinarySql(lhs, "jsonb", op, ast[2], textLhs);
     } else {
       if (suffix.length)
         throw Error("pg.lookup_not_jsonb " + prefix);
-      return getBinarySql(sql__default["default"]`"${sql.raw(prefix)}"`, types[prefix], op, ast[2]);
+      return getBinarySql(sql__default.default`"${sql.raw(prefix)}"`, types2[prefix], op, ast[2]);
     }
   }
   return getNodeSql(getAst(filter));
 }
-const getIdMeta = ({ idCol, verDefault }) => getJsonBuildTrusted({
-  $key: sql__default["default"]`"${sql.raw(idCol)}"`,
-  $ver: sql.raw(verDefault)
-});
-const getArgMeta = (key, { prefix, idCol, verDefault }) => getJsonBuildTrusted({
-  $key: key,
-  $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)
-  });
-};
-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 getIdMeta = ({ idCol, verDefault }) => sql__default.default`"${sql.raw(idCol)}" AS "$key", ${sql.raw(verDefault)} AS "$ver"`;
+const getArgMeta = (key, { prefix, idCol, verDefault }) => sql__default.default`
+    ${key} AS "$key",
+    ${sql.raw(verDefault)} AS "$ver",
+    array[
+      ${sql.join(prefix.map((k) => sql__default.default`${k}::text`))},
+      "${sql.raw(idCol)}"
+    ]::text[] AS "$ref"
+  `;
+const getAggMeta = (key, { verDefault }) => sql__default.default`${key} AS "$key", ${sql.raw(verDefault)} AS "$ver"`;
+function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }, options) {
+  const { $order, $group, ...filter } = rest;
   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 };
-  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)})`
+    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 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,
@@ -403,21 +412,21 @@ function getBoundCond(orderCols, bound, kind) {
     switch (kind) {
       case "$after":
       case "$since":
-        return sql__default["default"]`${lhs} > ${rhs} OR ${lhs} = ${rhs} AND (${subCond})`;
+        return sql__default.default`${lhs} > ${rhs} OR ${lhs} = ${rhs} AND (${subCond})`;
       case "$before":
       case "$until":
-        return sql__default["default"]`${lhs} < ${rhs} OR ${lhs} = ${rhs} AND (${subCond})`;
+        return sql__default.default`${lhs} < ${rhs} OR ${lhs} = ${rhs} AND (${subCond})`;
     }
   } else {
     switch (kind) {
       case "$after":
-        return sql__default["default"]`${lhs} > ${rhs}`;
+        return sql__default.default`${lhs} > ${rhs}`;
       case "$since":
-        return sql__default["default"]`${lhs} >= ${rhs}`;
+        return sql__default.default`${lhs} >= ${rhs}`;
       case "$before":
-        return sql__default["default"]`${lhs} < ${rhs}`;
+        return sql__default.default`${lhs} < ${rhs}`;
       case "$until":
-        return sql__default["default"]`${lhs} <= ${rhs}`;
+        return sql__default.default`${lhs} <= ${rhs}`;
     }
   }
 }
@@ -426,21 +435,21 @@ function selectByArgs(args, projection, options) {
   const { table } = options;
   const { where, order, group, limit, meta } = getArgSql(args, options);
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
-  return sql__default["default"]`
+  return sql__default.default`
     SELECT
-    ${getSelectCols(table, projection)} || ${meta}
+    ${getSelectCols(table, projection)}, ${meta}
     FROM "${sql.raw(table)}"
-    ${where.length ? sql__default["default"]`WHERE ${sql.join(where, ` AND `)}` : sql.empty}
-    ${group ? sql__default["default"]`GROUP BY ${group}` : sql.empty}
-    ${order ? sql__default["default"]`ORDER BY ${order}` : sql.empty}
+    ${where.length ? sql__default.default`WHERE ${sql.join(where, ` AND `)}` : sql.empty}
+    ${group ? sql__default.default`GROUP BY ${group}` : sql.empty}
+    ${order ? sql__default.default`ORDER BY ${order}` : sql.empty}
     LIMIT ${clampedLimit}
   `;
 }
 function selectByIds(ids, projection, options) {
   const { table, idCol } = options;
-  return sql__default["default"]`
+  return sql__default.default`
     SELECT
-    ${getSelectCols(table, projection)} || ${getIdMeta(options)}
+    ${getSelectCols(table, projection)}, ${getIdMeta(options)}
     FROM "${sql.raw(table)}"
     WHERE "${sql.raw(idCol)}" IN (${sql.join(ids)})
   `;
@@ -449,7 +458,7 @@ function getSingleSql(arg, options) {
   const { table, idCol } = options;
   if (!common.isPlainObject(arg)) {
     return {
-      where: sql__default["default"]`"${sql.raw(idCol)}" = ${arg}`,
+      where: sql__default.default`"${sql.raw(idCol)}" = ${arg}`,
       meta: getIdMeta(options)
     };
   }
@@ -457,7 +466,7 @@ function getSingleSql(arg, options) {
   if (!where || !where.length)
     throw Error("pg_write.no_condition");
   return {
-    where: sql__default["default"]`"${sql.raw(idCol)}" = (
+    where: sql__default.default`"${sql.raw(idCol)}" = (
         SELECT "${sql.raw(idCol)}"
         FROM "${sql.raw(table)}"
         WHERE ${sql.join(where, ` AND `)}
@@ -470,10 +479,10 @@ function patch(object, arg, options) {
   const { table } = options;
   const { where, meta } = getSingleSql(arg, options);
   const row = object;
-  return sql__default["default"]`
+  return sql__default.default`
     UPDATE "${sql.raw(table)}" SET ${getUpdates(row, options)}
     WHERE ${where}
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols()}, ${meta}`;
 }
 function put(object, arg, options) {
   const { idCol, table } = options;
@@ -481,38 +490,46 @@ function put(object, arg, options) {
   let meta, conflictTarget;
   if (common.isPlainObject(arg)) {
     ({ meta } = getArgSql(arg, options));
-    conflictTarget = sql.join(Object.keys(arg).map((col) => sql__default["default"]`"${sql.raw(col)}"`));
+    conflictTarget = sql.join(Object.keys(arg).map((col) => sql__default.default`"${sql.raw(col)}"`));
   } else {
     meta = getIdMeta(options);
-    conflictTarget = sql__default["default"]`"${sql.raw(idCol)}"`;
+    conflictTarget = sql__default.default`"${sql.raw(idCol)}"`;
   }
   const { cols, vals } = getInsert(row, options);
-  return sql__default["default"]`
+  return sql__default.default`
     INSERT INTO "${sql.raw(table)}" (${cols}) VALUES (${vals})
     ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols()}, ${meta}`;
 }
 function del(arg, options) {
   const { table } = options;
   const { where } = getSingleSql(arg, options);
-  return sql__default["default"]`
+  return sql__default.default`
     DELETE FROM "${sql.raw(table)}"
     WHERE ${where}
-    RETURNING (${getJsonBuildTrusted({ $key: arg })})`;
+    RETURNING ${arg} "$key"`;
 }
-const log = debug__default["default"]("graffy:pg:db");
+const log = debug__default.default("graffy:pg:db");
+const { Pool, Client, types } = pg__default.default;
 class Db {
   constructor(connection) {
-    if (typeof connection === "object" && connection && (connection instanceof pg$1.Pool || connection instanceof pg$1.Client)) {
+    if (typeof connection === "object" && connection && (connection instanceof Pool || connection instanceof Client)) {
       this.client = connection;
     } else {
-      this.client = new pg$1.Pool(connection);
+      this.client = new Pool(connection);
     }
   }
   async query(sql2) {
-    sql2.rowMode = "array";
     log("Making SQL query: " + sql2.text, sql2.values);
     try {
+      sql2.types = {
+        getTypeParser: (oid, format) => {
+          if (oid === types.builtins.INT8) {
+            return (value) => parseInt(value, 10);
+          }
+          return types.getTypeParser(oid, format);
+        }
+      };
       return await this.client.query(sql2);
     } catch (e) {
       const message = [
@@ -527,7 +544,7 @@ class Db {
     }
   }
   async readSql(sql2) {
-    const result = (await this.query(sql2)).rows.flat();
+    const result = (await this.query(sql2)).rows;
     log("Read result", result);
     return result;
   }
@@ -537,38 +554,38 @@ class Db {
     if (!res.rowCount) {
       throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
     }
-    return res.rows[0][0];
+    return res.rows[0];
   }
   async ensureSchema(tableOptions) {
     if (tableOptions.schema)
       return;
     const { table, verCol } = tableOptions;
-    const tableSchema = (await this.query(sql__default["default"]`
+    const tableSchema = (await this.query(sql__default.default`
         SELECT table_schema
         FROM information_schema.tables
         WHERE table_name = ${table}
         ORDER BY array_position(current_schemas(false)::text[], table_schema::text) ASC
-        LIMIT 1`)).rows[0][0];
-    const types = (await this.query(sql__default["default"]`
-        SELECT jsonb_object_agg(column_name, udt_name)
+        LIMIT 1`)).rows[0].table_schema;
+    const types2 = (await this.query(sql__default.default`
+        SELECT jsonb_object_agg(column_name, udt_name) AS column_types
         FROM information_schema.columns
         WHERE
           table_name = ${table} AND
-          table_schema = ${tableSchema}`)).rows[0][0];
-    if (!types)
+          table_schema = ${tableSchema}`)).rows[0].column_types;
+    if (!types2)
       throw Error(`pg.missing_table ${table}`);
-    const verDefault = (await this.query(sql__default["default"]`
+    const verDefault = (await this.query(sql__default.default`
         SELECT column_default
         FROM information_schema.columns
         WHERE
           table_name = ${table} AND
           table_schema = ${tableSchema} AND
-          column_name = ${verCol}`)).rows[0][0];
+          column_name = ${verCol}`)).rows[0].column_default;
     if (!verDefault) {
       throw Error(`pg.verCol_without_default ${verCol}`);
     }
-    log("ensureSchema", types);
-    tableOptions.schema = { types };
+    log("ensureSchema", types2);
+    tableOptions.schema = { types: types2 };
     tableOptions.verDefault = verDefault;
   }
   async read(rootQuery, tableOptions) {
@@ -578,13 +595,17 @@ class Db {
     const { prefix } = tableOptions;
     await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
-      const result = await this.readSql(selectByArgs(args, projection, tableOptions));
+      const result = await this.readSql(
+        selectByArgs(args, projection, tableOptions)
+      );
       const wrappedGraph = common.encodeGraph(common.wrapObject(result, prefix));
       log("getByArgs", wrappedGraph);
       common.merge(results, wrappedGraph);
     };
     const getByIds = async () => {
-      const result = await this.readSql(selectByIds(Object.keys(idQueries), null, tableOptions));
+      const result = await this.readSql(
+        selectByIds(Object.keys(idQueries), null, tableOptions)
+      );
       result.forEach((object) => {
         const wrappedGraph = common.encodeGraph(common.wrapObject(object, prefix));
         log("getByIds", wrappedGraph);
@@ -599,7 +620,7 @@ class Db {
           for (const childNode of node.children) {
             const childArgs = common.decodeArgs(childNode);
             const projection = childNode.children ? common.decodeQuery(childNode.children) : null;
-            promises.push(getByArgs(__spreadValues(__spreadValues({}, args), childArgs), projection));
+            promises.push(getByArgs({ ...args, ...childArgs }, projection));
           }
         } else {
           const projection = node.children ? common.decodeQuery(node.children) : null;
@@ -638,9 +659,13 @@ class Db {
       return object.$put ? put(object, arg, tableOptions) : patch(object, arg, tableOptions);
     });
     const result = [];
-    await Promise.all(sqls.map((sql2) => this.writeSql(sql2).then((object) => {
-      common.merge(result, common.encodeGraph(common.wrapObject(object, prefix)));
-    })));
+    await Promise.all(
+      sqls.map(
+        (sql2) => this.writeSql(sql2).then((object) => {
+          common.merge(result, common.encodeGraph(common.wrapObject(object, prefix)));
+        })
+      )
+    );
     log("dbWrite", rootChange, result);
     return result;
   }
@@ -664,9 +689,11 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const readPromise = db.read(query, tableOpts);
     const remainingQuery = common.remove(query, prefix);
     const nextPromise = next(remainingQuery);
-    return Promise.all([readPromise, nextPromise]).then(([readRes, nextRes]) => {
-      return common.merge(readRes, nextRes);
-    });
+    return Promise.all([readPromise, nextPromise]).then(
+      ([readRes, nextRes]) => {
+        return common.merge(readRes, nextRes);
+      }
+    );
   }
   function write(change, options, next) {
     const { pgClient } = options;
@@ -674,9 +701,11 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const writePromise = db.write(change, tableOpts);
     const remainingChange = common.remove(change, prefix);
     const nextPromise = next(remainingChange);
-    return Promise.all([writePromise, nextPromise]).then(([writeRes, nextRes]) => {
-      return common.merge(writeRes, nextRes);
-    });
+    return Promise.all([writePromise, nextPromise]).then(
+      ([writeRes, nextRes]) => {
+        return common.merge(writeRes, nextRes);
+      }
+    );
   }
 };
 exports.pg = pg;

package/index.mjs

@@ -1,33 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
-import { Pool, Client } from "pg";
+import { encodePath, isEmpty, isPlainObject, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
+import pg$1 from "pg";
 import sql, { join, raw, Sql, empty } from "sql-template-tag";
 import debug from "debug";
 const valid = {
@@ -121,22 +93,27 @@ function simplify(node) {
     return !node[1];
   }
   if (op === "$or") {
-    const { eqmap, noneq, change } = node[1].reduce((acc, item) => {
-      if (item[0] !== "$eq") {
-        acc.noneq.push(item);
-      } else if (acc.eqmap[item[1]]) {
-        acc.change = true;
-        acc.eqmap[item[1]].push(item[2]);
+    const { eqmap, noneq, change } = node[1].reduce(
+      (acc, item) => {
+        if (item[0] !== "$eq") {
+          acc.noneq.push(item);
+        } else if (acc.eqmap[item[1]]) {
+          acc.change = true;
+          acc.eqmap[item[1]].push(item[2]);
+          return acc;
+        } else {
+          acc.eqmap[item[1]] = [item[2]];
+        }
         return acc;
-      } else {
-        acc.eqmap[item[1]] = [item[2]];
-      }
-      return acc;
-    }, { eqmap: {}, noneq: [], change: false });
+      },
+      { eqmap: {}, noneq: [], change: false }
+    );
     if (change) {
       node[1] = [
         ...noneq,
-        ...Object.entries(eqmap).map(([prop, val]) => val.length > 1 ? ["$in", prop, val] : ["$eq", prop, val[0]])
+        ...Object.entries(eqmap).map(
+          ([prop, val]) => val.length > 1 ? ["$in", prop, val] : ["$eq", prop, val[0]]
+        )
       ];
     }
   }
@@ -151,9 +128,11 @@ function simplify(node) {
   return node;
 }
 const getJsonBuildTrusted = (variadic) => {
-  const args = join(Object.entries(variadic).map(([name, value]) => {
-    return sql`'${raw(name)}', ${getJsonBuildValue(value)}`;
-  }));
+  const args = join(
+    Object.entries(variadic).map(([name, value]) => {
+      return sql`'${raw(name)}', ${getJsonBuildValue(value)}`;
+    })
+  );
   return sql`jsonb_build_object(${args})`;
 };
 const getJsonBuildValue = (value) => {
@@ -167,40 +146,53 @@ 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)
-    return sql`to_jsonb("${raw(table)}")`;
+    return sql`*`;
   const sqls = [];
   for (const key in projection) {
     if (key === "$count") {
-      sqls.push(sql`'$count', count(*)`);
+      sqls.push(sql`count(*) AS "$count"`);
     } else if (aggSql[key]) {
       const subSqls = [];
       for (const prop in projection[key]) {
         subSqls.push(sql`${prop}::text, ${aggSql[key](prop)}`);
       }
-      sqls.push(sql`${key}::text, jsonb_build_object(${join(subSqls, ", ")})`);
+      sqls.push(
+        sql`jsonb_build_object(${join(subSqls, ", ")}) AS "${raw(key)}"`
+      );
     } else {
-      sqls.push(sql`${key}::text, "${raw(key)}"`);
+      sqls.push(sql`"${raw(key)}"`);
     }
   }
-  return sql`jsonb_build_object(${join(sqls, ", ")})`;
+  return join(sqls, ", ");
 };
 function vertexSql(array, nullValue) {
-  return sql`array[${join(array.map((num) => num === null ? nullValue : num))}]::float8[]`;
+  return sql`array[${join(
+    array.map((num) => num === null ? nullValue : num)
+  )}]::float8[]`;
 }
 function cubeLiteralSql(value) {
   if (!Array.isArray(value) || !value.length || Array.isArray(value[0]) && value.length !== 2) {
     throw Error("pg.castValue_bad_cube" + JSON.stringify(value));
   }
-  return Array.isArray(value[0]) ? sql`cube(${vertexSql(value[0], sql`'-Infinity'`)}, ${vertexSql(value[1], sql`'Infinity'`)})` : sql`cube(${vertexSql(value, 0)})`;
+  return Array.isArray(value[0]) ? sql`cube(${vertexSql(value[0], sql`'-Infinity'`)}, ${vertexSql(
+    value[1],
+    sql`'Infinity'`
+  )})` : sql`cube(${vertexSql(value, 0)})`;
 }
 function castValue(value, type, name, isPut) {
   if (!type)
@@ -226,7 +218,17 @@ const getInsert = (row, options) => {
   return { cols: join(cols, ", "), vals: join(vals, ", ") };
 };
 const getUpdates = (row, options) => {
-  return join(Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql`"${raw(col)}" = ${castValue(val, options.schema.types[col], col, row.$put)}`).concat(sql`"${raw(options.verCol)}" = default`), ", ");
+  return join(
+    Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(
+      ([col, val]) => sql`"${raw(col)}" = ${castValue(
+        val,
+        options.schema.types[col],
+        col,
+        row.$put
+      )}`
+    ).concat(sql`"${raw(options.verCol)}" = default`),
+    ", "
+  );
 };
 function getJsonUpdate(object, col, path) {
   if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
@@ -238,7 +240,12 @@ function getJsonUpdate(object, col, path) {
   return sql`(case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
-  end) || jsonb_build_object(${join(Object.entries(object).map(([key, value]) => sql`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`), ", ")})`;
+  end) || jsonb_build_object(${join(
+    Object.entries(object).map(
+      ([key, value]) => sql`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`
+    ),
+    ", "
+  )})`;
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -307,15 +314,18 @@ function getSql(filter, options) {
       return ast;
     const op = ast[0];
     if (op === "$and" || op === "$or") {
-      return sql`(${join(ast[1].map((node) => getNodeSql(node)), `) ${opSql[op]} (`)})`;
+      return sql`(${join(
+        ast[1].map((node) => getNodeSql(node)),
+        `) ${opSql[op]} (`
+      )})`;
     } else if (op === "$not") {
       return sql`${opSql[op]} (${getNodeSql(ast[1])})`;
     }
     const [prefix, ...suffix] = encodePath(ast[1]);
-    const { types } = options.schema;
-    if (!types[prefix])
+    const { types: types2 } = options.schema;
+    if (!types2[prefix])
       throw Error("pg.no_column " + prefix);
-    if (types[prefix] === "jsonb") {
+    if (types2[prefix] === "jsonb") {
       const [lhs, textLhs] = suffix.length ? [
         sql`"${raw(prefix)}" #> ${suffix}`,
         sql`"${raw(prefix)}" #>> ${suffix}`
@@ -324,58 +334,59 @@ function getSql(filter, options) {
     } else {
       if (suffix.length)
         throw Error("pg.lookup_not_jsonb " + prefix);
-      return getBinarySql(sql`"${raw(prefix)}"`, types[prefix], op, ast[2]);
+      return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
     }
   }
   return getNodeSql(getAst(filter));
 }
-const getIdMeta = ({ idCol, verDefault }) => getJsonBuildTrusted({
-  $key: sql`"${raw(idCol)}"`,
-  $ver: raw(verDefault)
-});
-const getArgMeta = (key, { prefix, idCol, verDefault }) => getJsonBuildTrusted({
-  $key: key,
-  $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)
-  });
-};
-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 getIdMeta = ({ idCol, verDefault }) => sql`"${raw(idCol)}" AS "$key", ${raw(verDefault)} AS "$ver"`;
+const getArgMeta = (key, { prefix, idCol, verDefault }) => sql`
+    ${key} AS "$key",
+    ${raw(verDefault)} AS "$ver",
+    array[
+      ${join(prefix.map((k) => sql`${k}::text`))},
+      "${raw(idCol)}"
+    ]::text[] AS "$ref"
+  `;
+const getAggMeta = (key, { verDefault }) => sql`${key} AS "$key", ${raw(verDefault)} AS "$ver"`;
+function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }, options) {
+  const { $order, $group, ...filter } = rest;
   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 };
-  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)})`
+    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 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,
@@ -420,7 +431,7 @@ function selectByArgs(args, projection, options) {
   const clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
   return sql`
     SELECT
-    ${getSelectCols(table, projection)} || ${meta}
+    ${getSelectCols(table, projection)}, ${meta}
     FROM "${raw(table)}"
     ${where.length ? sql`WHERE ${join(where, ` AND `)}` : empty}
     ${group ? sql`GROUP BY ${group}` : empty}
@@ -432,7 +443,7 @@ function selectByIds(ids, projection, options) {
   const { table, idCol } = options;
   return sql`
     SELECT
-    ${getSelectCols(table, projection)} || ${getIdMeta(options)}
+    ${getSelectCols(table, projection)}, ${getIdMeta(options)}
     FROM "${raw(table)}"
     WHERE "${raw(idCol)}" IN (${join(ids)})
   `;
@@ -465,7 +476,7 @@ function patch(object, arg, options) {
   return sql`
     UPDATE "${raw(table)}" SET ${getUpdates(row, options)}
     WHERE ${where}
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols()}, ${meta}`;
 }
 function put(object, arg, options) {
   const { idCol, table } = options;
@@ -482,7 +493,7 @@ function put(object, arg, options) {
   return sql`
     INSERT INTO "${raw(table)}" (${cols}) VALUES (${vals})
     ON CONFLICT (${conflictTarget}) DO UPDATE SET (${cols}) = (${vals})
-    RETURNING (${getSelectCols(table)} || ${meta})`;
+    RETURNING ${getSelectCols()}, ${meta}`;
 }
 function del(arg, options) {
   const { table } = options;
@@ -490,9 +501,10 @@ function del(arg, options) {
   return sql`
     DELETE FROM "${raw(table)}"
     WHERE ${where}
-    RETURNING (${getJsonBuildTrusted({ $key: arg })})`;
+    RETURNING ${arg} "$key"`;
 }
 const log = debug("graffy:pg:db");
+const { Pool, Client, types } = pg$1;
 class Db {
   constructor(connection) {
     if (typeof connection === "object" && connection && (connection instanceof Pool || connection instanceof Client)) {
@@ -502,9 +514,16 @@ class Db {
     }
   }
   async query(sql2) {
-    sql2.rowMode = "array";
     log("Making SQL query: " + sql2.text, sql2.values);
     try {
+      sql2.types = {
+        getTypeParser: (oid, format) => {
+          if (oid === types.builtins.INT8) {
+            return (value) => parseInt(value, 10);
+          }
+          return types.getTypeParser(oid, format);
+        }
+      };
       return await this.client.query(sql2);
     } catch (e) {
       const message = [
@@ -519,7 +538,7 @@ class Db {
     }
   }
   async readSql(sql2) {
-    const result = (await this.query(sql2)).rows.flat();
+    const result = (await this.query(sql2)).rows;
     log("Read result", result);
     return result;
   }
@@ -529,7 +548,7 @@ class Db {
     if (!res.rowCount) {
       throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
     }
-    return res.rows[0][0];
+    return res.rows[0];
   }
   async ensureSchema(tableOptions) {
     if (tableOptions.schema)
@@ -540,14 +559,14 @@ class Db {
         FROM information_schema.tables
         WHERE table_name = ${table}
         ORDER BY array_position(current_schemas(false)::text[], table_schema::text) ASC
-        LIMIT 1`)).rows[0][0];
-    const types = (await this.query(sql`
-        SELECT jsonb_object_agg(column_name, udt_name)
+        LIMIT 1`)).rows[0].table_schema;
+    const types2 = (await this.query(sql`
+        SELECT jsonb_object_agg(column_name, udt_name) AS column_types
         FROM information_schema.columns
         WHERE
           table_name = ${table} AND
-          table_schema = ${tableSchema}`)).rows[0][0];
-    if (!types)
+          table_schema = ${tableSchema}`)).rows[0].column_types;
+    if (!types2)
       throw Error(`pg.missing_table ${table}`);
     const verDefault = (await this.query(sql`
         SELECT column_default
@@ -555,12 +574,12 @@ class Db {
         WHERE
           table_name = ${table} AND
           table_schema = ${tableSchema} AND
-          column_name = ${verCol}`)).rows[0][0];
+          column_name = ${verCol}`)).rows[0].column_default;
     if (!verDefault) {
       throw Error(`pg.verCol_without_default ${verCol}`);
     }
-    log("ensureSchema", types);
-    tableOptions.schema = { types };
+    log("ensureSchema", types2);
+    tableOptions.schema = { types: types2 };
     tableOptions.verDefault = verDefault;
   }
   async read(rootQuery, tableOptions) {
@@ -570,13 +589,17 @@ class Db {
     const { prefix } = tableOptions;
     await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
-      const result = await this.readSql(selectByArgs(args, projection, tableOptions));
+      const result = await this.readSql(
+        selectByArgs(args, projection, tableOptions)
+      );
       const wrappedGraph = encodeGraph(wrapObject(result, prefix));
       log("getByArgs", wrappedGraph);
       merge(results, wrappedGraph);
     };
     const getByIds = async () => {
-      const result = await this.readSql(selectByIds(Object.keys(idQueries), null, tableOptions));
+      const result = await this.readSql(
+        selectByIds(Object.keys(idQueries), null, tableOptions)
+      );
       result.forEach((object) => {
         const wrappedGraph = encodeGraph(wrapObject(object, prefix));
         log("getByIds", wrappedGraph);
@@ -591,7 +614,7 @@ class Db {
           for (const childNode of node.children) {
             const childArgs = decodeArgs(childNode);
             const projection = childNode.children ? decodeQuery(childNode.children) : null;
-            promises.push(getByArgs(__spreadValues(__spreadValues({}, args), childArgs), projection));
+            promises.push(getByArgs({ ...args, ...childArgs }, projection));
           }
         } else {
           const projection = node.children ? decodeQuery(node.children) : null;
@@ -630,9 +653,13 @@ class Db {
       return object.$put ? put(object, arg, tableOptions) : patch(object, arg, tableOptions);
     });
     const result = [];
-    await Promise.all(sqls.map((sql2) => this.writeSql(sql2).then((object) => {
-      merge(result, encodeGraph(wrapObject(object, prefix)));
-    })));
+    await Promise.all(
+      sqls.map(
+        (sql2) => this.writeSql(sql2).then((object) => {
+          merge(result, encodeGraph(wrapObject(object, prefix)));
+        })
+      )
+    );
     log("dbWrite", rootChange, result);
     return result;
   }
@@ -656,9 +683,11 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const readPromise = db.read(query, tableOpts);
     const remainingQuery = remove(query, prefix);
     const nextPromise = next(remainingQuery);
-    return Promise.all([readPromise, nextPromise]).then(([readRes, nextRes]) => {
-      return merge(readRes, nextRes);
-    });
+    return Promise.all([readPromise, nextPromise]).then(
+      ([readRes, nextRes]) => {
+        return merge(readRes, nextRes);
+      }
+    );
   }
   function write(change, options, next) {
     const { pgClient } = options;
@@ -666,9 +695,13 @@ const pg = ({ table, idCol, verCol, connection, schema, verDefault }) => (store)
     const writePromise = db.write(change, tableOpts);
     const remainingChange = remove(change, prefix);
     const nextPromise = next(remainingChange);
-    return Promise.all([writePromise, nextPromise]).then(([writeRes, nextRes]) => {
-      return merge(writeRes, nextRes);
-    });
+    return Promise.all([writePromise, nextPromise]).then(
+      ([writeRes, nextRes]) => {
+        return merge(writeRes, nextRes);
+      }
+    );
   }
 };
-export { pg };
+export {
+  pg
+};

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.25-alpha.2",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,8 +16,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.24-alpha.1",
-    "sql-template-tag": "^4.1.0",
+    "@graffy/common": "0.15.25-alpha.2",
+    "sql-template-tag": "^5.0.3",
     "debug": "^4.3.3"
   },
   "peerDependencies": {

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,14 +2,15 @@
   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 }}
 */
-export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: {
+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;