@graffy/pg 0.16.1 → 0.16.2-alpha.1

package/index.cjs

@@ -1,11 +1,8 @@
 "use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common = require("@graffy/common");
 const pg$1 = require("pg");
 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 debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 class Sql {
   constructor(rawStrings, rawValues) {
     if (rawStrings.length - 1 !== rawValues.length) {
@@ -105,7 +102,7 @@ function construct(node, prop, op) {
       return [op, prop, node];
     if (prop)
       return ["$eq", prop, node];
-    throw Error("pgast.expected_prop_before:" + JSON.stringify(node));
+    throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
   }
   if (Array.isArray(node)) {
     return ["$or", node.map((item) => construct(item, prop, op))];
@@ -121,17 +118,17 @@ function construct(node, prop, op) {
       }
       if (key[0] === "$") {
         if (!valid[key])
-          throw Error("pgast.invalid_op:" + key);
+          throw Error(`pgast.invalid_op:${key}`);
         if (op)
-          throw Error("pgast.unexpected_op:" + op + " before:" + key);
+          throw Error(`pgast.unexpected_op:${op} before:${key}`);
         if (!prop)
-          throw Error("pgast.expected_prop_before:" + key);
+          throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
       if (prop) {
         if (key[0] === ".")
           return construct(val, prop + key);
-        throw Error("pgast.unexpected_prop: " + key);
+        throw Error(`pgast.unexpected_prop: ${key}`);
       }
       return construct(val, key);
     })
@@ -253,8 +250,8 @@ function vertexSql(array, nullValue) {
   )}]::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));
+  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],
@@ -263,13 +260,13 @@ function cubeLiteralSql(value) {
 }
 function castValue(value, type, name, isPut) {
   if (!type)
-    throw Error("pg.write_no_column " + name);
+    throw Error(`pg.write_no_column ${name}`);
   if (value instanceof Sql)
     return value;
   if (value === null)
     return sql`NULL`;
   if (type === "jsonb") {
-    return isPut ? JSON.stringify(stripAttributes(value)) : sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})`;
+    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, []);
   }
   if (type === "cube")
     return cubeLiteralSql(value);
@@ -304,7 +301,7 @@ function getJsonUpdate(object, col, path) {
   const curr = sql`"${raw(col)}"${path.length ? sql`#>${path}` : empty}`;
   if (common.isEmpty(object))
     return curr;
-  return sql`(case jsonb_typeof(${curr})
+  return sql`nullif(jsonb_strip_nulls((case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
   end) || jsonb_build_object(${join(
@@ -312,7 +309,7 @@ function getJsonUpdate(object, col, path) {
       ([key, value]) => sql`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`
     ),
     ", "
-  )})`;
+  )})), '{}'::jsonb)`;
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -321,15 +318,17 @@ function stripAttributes(object) {
     return object.map((item) => stripAttributes(item));
   }
   return Object.entries(object).reduce((out, [key, val]) => {
-    if (key === "$put")
+    if (key === "$put" || val === null)
       return out;
+    if (out === null)
+      out = {};
     out[key] = stripAttributes(val);
     return out;
-  }, {});
+  }, null);
 }
 const opSql = {
-  $and: `AND`,
-  $or: `OR`,
+  $and: "AND",
+  $or: "OR",
   $not: sql`NOT`,
   $eq: sql`=`,
   $neq: sql`<>`,
@@ -351,7 +350,7 @@ function getBinarySql(lhs, type, op, value, textLhs) {
     return sql`${lhs} IS NOT NULL`;
   const sqlOp = opSql[op];
   if (!sqlOp)
-    throw Error("pg.getSql_unknown_operator " + op);
+    throw Error(`pg.getSql_unknown_operator ${op}`);
   if (op === "$in" || op === "$nin") {
     if (type === "jsonb" && typeof value[0] === "string")
       lhs = textLhs;
@@ -391,7 +390,7 @@ function getSql(filter, options) {
     const [prefix, ...suffix] = ast[1].split(".");
     const { types: types2 } = options.schema;
     if (!types2[prefix])
-      throw Error("pg.no_column " + prefix);
+      throw Error(`pg.no_column ${prefix}`);
     if (types2[prefix] === "jsonb") {
       const [lhs, textLhs] = suffix.length ? [
         sql`"${raw(prefix)}" #> ${suffix}`,
@@ -400,7 +399,7 @@ function getSql(filter, options) {
       return getBinarySql(lhs, "jsonb", op, ast[2], textLhs);
     } else {
       if (suffix.length)
-        throw Error("pg.lookup_not_jsonb " + prefix);
+        throw Error(`pg.lookup_not_jsonb ${prefix}`);
       return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
     }
   }
@@ -422,10 +421,10 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   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);
+    throw Error(`pg_arg.order_and_group_unsupported in ${prefix}`);
   }
   if (($order || $group && $group !== true) && !hasRangeArg) {
-    throw Error("pg_arg.range_arg_expected in " + prefix);
+    throw Error(`pg_arg.range_arg_expected in ${prefix}`);
   }
   const baseKey = sql`${JSON.stringify(rest)}::jsonb`;
   const where = [];
@@ -448,7 +447,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
     ($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)})`
@@ -464,7 +463,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
 }
 function getBoundCond(orderCols, bound, kind) {
   if (!Array.isArray(bound)) {
-    throw Error("pg_arg.bad_query bound : " + JSON.stringify(bound));
+    throw Error(`pg_arg.bad_query bound : ${JSON.stringify(bound)}`);
   }
   const lhs = orderCols[0];
   const rhs = bound[0];
@@ -500,7 +499,7 @@ function selectByArgs(args, projection, options) {
     SELECT
     ${getSelectCols(table, projection)}, ${meta}
     FROM "${raw(table)}"
-    ${where.length ? sql`WHERE ${join(where, ` AND `)}` : empty}
+    ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
     ${group ? sql`GROUP BY ${group}` : empty}
     ${order ? sql`ORDER BY ${order}` : empty}
     LIMIT ${clampedLimit}
@@ -524,13 +523,13 @@ function getSingleSql(arg, options) {
     };
   }
   const { where, meta } = getArgSql(arg, options);
-  if (!where || !where.length)
+  if (!(where == null ? void 0 : where.length))
     throw Error("pg_write.no_condition");
   return {
     where: sql`"${raw(idCol)}" = (
         SELECT "${raw(idCol)}"
         FROM "${raw(table)}"
-        WHERE ${join(where, ` AND `)}
+        WHERE ${join(where, " AND ")}
         LIMIT 1
       )`,
     meta
@@ -548,7 +547,8 @@ function patch(object, arg, options) {
 function put(object, arg, options) {
   const { idCol, table } = options;
   const row = object;
-  let meta, conflictTarget;
+  let meta;
+  let conflictTarget;
   if (common.isPlainObject(arg)) {
     ({ meta } = getArgSql(arg, options));
     conflictTarget = join(Object.keys(arg).map((col) => sql`"${raw(col)}"`));
@@ -570,8 +570,8 @@ function del(arg, options) {
     WHERE ${where}
     RETURNING ${arg} "$key"`;
 }
-const log = debug__default.default("graffy:pg:db");
-const { Pool, Client, types } = pg__default.default;
+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)) {
@@ -581,7 +581,7 @@ class Db {
     }
   }
   async query(sql2) {
-    log("Making SQL query: " + sql2.text, sql2.values);
+    log(`Making SQL query: ${sql2.text}`, sql2.values);
     try {
       sql2.types = {
         getTypeParser: (oid, format) => {
@@ -601,7 +601,7 @@ class Db {
         sql2.text,
         JSON.stringify(sql2.values)
       ].filter(Boolean).join("; ");
-      throw Error("pg.sql_error " + message);
+      throw Error(`pg.sql_error ${message}`);
     }
   }
   async readSql(sql2) {
@@ -613,7 +613,7 @@ class Db {
     const res = await this.query(sql2);
     log("Rows written", res.rowCount);
     if (!res.rowCount) {
-      throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
+      throw Error(`pg.nothing_written ${sql2.text} with ${sql2.values}`);
     }
     return res.rows[0];
   }

package/index.mjs

@@ -100,7 +100,7 @@ function construct(node, prop, op) {
       return [op, prop, node];
     if (prop)
       return ["$eq", prop, node];
-    throw Error("pgast.expected_prop_before:" + JSON.stringify(node));
+    throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
   }
   if (Array.isArray(node)) {
     return ["$or", node.map((item) => construct(item, prop, op))];
@@ -116,17 +116,17 @@ function construct(node, prop, op) {
       }
       if (key[0] === "$") {
         if (!valid[key])
-          throw Error("pgast.invalid_op:" + key);
+          throw Error(`pgast.invalid_op:${key}`);
         if (op)
-          throw Error("pgast.unexpected_op:" + op + " before:" + key);
+          throw Error(`pgast.unexpected_op:${op} before:${key}`);
         if (!prop)
-          throw Error("pgast.expected_prop_before:" + key);
+          throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
       if (prop) {
         if (key[0] === ".")
           return construct(val, prop + key);
-        throw Error("pgast.unexpected_prop: " + key);
+        throw Error(`pgast.unexpected_prop: ${key}`);
       }
       return construct(val, key);
     })
@@ -248,8 +248,8 @@ function vertexSql(array, nullValue) {
   )}]::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));
+  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],
@@ -258,13 +258,13 @@ function cubeLiteralSql(value) {
 }
 function castValue(value, type, name, isPut) {
   if (!type)
-    throw Error("pg.write_no_column " + name);
+    throw Error(`pg.write_no_column ${name}`);
   if (value instanceof Sql)
     return value;
   if (value === null)
     return sql`NULL`;
   if (type === "jsonb") {
-    return isPut ? JSON.stringify(stripAttributes(value)) : sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})`;
+    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, []);
   }
   if (type === "cube")
     return cubeLiteralSql(value);
@@ -299,7 +299,7 @@ function getJsonUpdate(object, col, path) {
   const curr = sql`"${raw(col)}"${path.length ? sql`#>${path}` : empty}`;
   if (isEmpty(object))
     return curr;
-  return sql`(case jsonb_typeof(${curr})
+  return sql`nullif(jsonb_strip_nulls((case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
   end) || jsonb_build_object(${join(
@@ -307,7 +307,7 @@ function getJsonUpdate(object, col, path) {
       ([key, value]) => sql`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`
     ),
     ", "
-  )})`;
+  )})), '{}'::jsonb)`;
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -316,15 +316,17 @@ function stripAttributes(object) {
     return object.map((item) => stripAttributes(item));
   }
   return Object.entries(object).reduce((out, [key, val]) => {
-    if (key === "$put")
+    if (key === "$put" || val === null)
       return out;
+    if (out === null)
+      out = {};
     out[key] = stripAttributes(val);
     return out;
-  }, {});
+  }, null);
 }
 const opSql = {
-  $and: `AND`,
-  $or: `OR`,
+  $and: "AND",
+  $or: "OR",
   $not: sql`NOT`,
   $eq: sql`=`,
   $neq: sql`<>`,
@@ -346,7 +348,7 @@ function getBinarySql(lhs, type, op, value, textLhs) {
     return sql`${lhs} IS NOT NULL`;
   const sqlOp = opSql[op];
   if (!sqlOp)
-    throw Error("pg.getSql_unknown_operator " + op);
+    throw Error(`pg.getSql_unknown_operator ${op}`);
   if (op === "$in" || op === "$nin") {
     if (type === "jsonb" && typeof value[0] === "string")
       lhs = textLhs;
@@ -386,7 +388,7 @@ function getSql(filter, options) {
     const [prefix, ...suffix] = ast[1].split(".");
     const { types: types2 } = options.schema;
     if (!types2[prefix])
-      throw Error("pg.no_column " + prefix);
+      throw Error(`pg.no_column ${prefix}`);
     if (types2[prefix] === "jsonb") {
       const [lhs, textLhs] = suffix.length ? [
         sql`"${raw(prefix)}" #> ${suffix}`,
@@ -395,7 +397,7 @@ function getSql(filter, options) {
       return getBinarySql(lhs, "jsonb", op, ast[2], textLhs);
     } else {
       if (suffix.length)
-        throw Error("pg.lookup_not_jsonb " + prefix);
+        throw Error(`pg.lookup_not_jsonb ${prefix}`);
       return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
     }
   }
@@ -417,10 +419,10 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   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);
+    throw Error(`pg_arg.order_and_group_unsupported in ${prefix}`);
   }
   if (($order || $group && $group !== true) && !hasRangeArg) {
-    throw Error("pg_arg.range_arg_expected in " + prefix);
+    throw Error(`pg_arg.range_arg_expected in ${prefix}`);
   }
   const baseKey = sql`${JSON.stringify(rest)}::jsonb`;
   const where = [];
@@ -443,7 +445,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
     ($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)})`
@@ -459,7 +461,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
 }
 function getBoundCond(orderCols, bound, kind) {
   if (!Array.isArray(bound)) {
-    throw Error("pg_arg.bad_query bound : " + JSON.stringify(bound));
+    throw Error(`pg_arg.bad_query bound : ${JSON.stringify(bound)}`);
   }
   const lhs = orderCols[0];
   const rhs = bound[0];
@@ -495,7 +497,7 @@ function selectByArgs(args, projection, options) {
     SELECT
     ${getSelectCols(table, projection)}, ${meta}
     FROM "${raw(table)}"
-    ${where.length ? sql`WHERE ${join(where, ` AND `)}` : empty}
+    ${where.length ? sql`WHERE ${join(where, " AND ")}` : empty}
     ${group ? sql`GROUP BY ${group}` : empty}
     ${order ? sql`ORDER BY ${order}` : empty}
     LIMIT ${clampedLimit}
@@ -519,13 +521,13 @@ function getSingleSql(arg, options) {
     };
   }
   const { where, meta } = getArgSql(arg, options);
-  if (!where || !where.length)
+  if (!(where == null ? void 0 : where.length))
     throw Error("pg_write.no_condition");
   return {
     where: sql`"${raw(idCol)}" = (
         SELECT "${raw(idCol)}"
         FROM "${raw(table)}"
-        WHERE ${join(where, ` AND `)}
+        WHERE ${join(where, " AND ")}
         LIMIT 1
       )`,
     meta
@@ -543,7 +545,8 @@ function patch(object, arg, options) {
 function put(object, arg, options) {
   const { idCol, table } = options;
   const row = object;
-  let meta, conflictTarget;
+  let meta;
+  let conflictTarget;
   if (isPlainObject(arg)) {
     ({ meta } = getArgSql(arg, options));
     conflictTarget = join(Object.keys(arg).map((col) => sql`"${raw(col)}"`));
@@ -576,7 +579,7 @@ class Db {
     }
   }
   async query(sql2) {
-    log("Making SQL query: " + sql2.text, sql2.values);
+    log(`Making SQL query: ${sql2.text}`, sql2.values);
     try {
       sql2.types = {
         getTypeParser: (oid, format) => {
@@ -596,7 +599,7 @@ class Db {
         sql2.text,
         JSON.stringify(sql2.values)
       ].filter(Boolean).join("; ");
-      throw Error("pg.sql_error " + message);
+      throw Error(`pg.sql_error ${message}`);
     }
   }
   async readSql(sql2) {
@@ -608,7 +611,7 @@ class Db {
     const res = await this.query(sql2);
     log("Rows written", res.rowCount);
     if (!res.rowCount) {
-      throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
+      throw Error(`pg.nothing_written ${sql2.text} with ${sql2.values}`);
     }
     return res.rows[0];
   }

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.16.1",
+  "version": "0.16.2-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.16.1",
+    "@graffy/common": "0.16.2-alpha.1",
     "debug": "^4.3.3"
   },
   "peerDependencies": {

package/types/sql/getArgSql.d.ts

@@ -7,7 +7,7 @@
   @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;