@graffy/pg 0.16.20-alpha.12 → 0.16.20-alpha.13

package/index.cjs

@@ -88,16 +88,13 @@ const getJsonBuildTrusted = (variadic) => {
   return sql`jsonb_build_object(${args})`;
 };
 const getJsonBuildValue = (value) => {
-  if (value instanceof Sql)
-    return value;
-  if (typeof value === "string")
-    return sql`${value}::text`;
+  if (value instanceof Sql) return value;
+  if (typeof value === "string") return sql`${value}::text`;
   return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const lookup = (prop, options) => {
   const [prefix, ...suffix] = prop.split(".");
-  if (!suffix.length)
-    return sql`"${raw(prefix)}"`;
+  if (!suffix.length) return sql`"${raw(prefix)}"`;
   const { types: types2 } = options.schema;
   if (types2[prefix] === "jsonb") {
     return sql`"${raw(prefix)}" #> ${suffix}`;
@@ -119,9 +116,25 @@ const aggSql = {
   $max: (prop) => sql`max((${lookupNumeric(prop)})::numeric)`,
   $min: (prop) => sql`min((${lookupNumeric(prop)})::numeric)`
 };
+const getOptimisedJsonBuild = (object, path = [], parentPropertyName, options) => {
+  const propertyNames = Object.keys(object);
+  const propertyPath = [...path, parentPropertyName];
+  const buildConfig = [];
+  propertyNames.forEach((propertyName) => {
+    const property = object[propertyName];
+    if (typeof property === "object") {
+      const childJSONBuild = getOptimisedJsonBuild(property, propertyPath, propertyName, options);
+      buildConfig.push(sql`${propertyName}::text, jsonb_build_object(${join(childJSONBuild, ", ")})`);
+    } else {
+      if (property === true) {
+        buildConfig.push(sql`${propertyName}::text, ${lookup([...propertyPath, propertyName].join("."), options)}`);
+      }
+    }
+  });
+  return buildConfig;
+};
 const getSelectCols = (options, projection = null) => {
-  if (!projection)
-    return sql`*`;
+  if (!projection) return sql`*`;
   const sqls = [];
   for (const key in projection) {
     if (key === "$count") {
@@ -135,7 +148,12 @@ const getSelectCols = (options, projection = null) => {
         sql`jsonb_build_object(${join(subSqls, ", ")}) AS "${raw(key)}"`
       );
     } else {
-      sqls.push(sql`"${raw(key)}"`);
+      if (typeof projection[key] === "object") {
+        const optimisedJsonBuild = getOptimisedJsonBuild(projection[key], [], key, options);
+        sqls.push(sql`jsonb_build_object(${join(optimisedJsonBuild, ", ")}) AS "${raw(key)}"`);
+      } else {
+        sqls.push(sql`"${raw(key)}"`);
+      }
     }
   }
   return join(sqls, ", ");
@@ -155,45 +173,14 @@ function cubeLiteralSql(value) {
   )})` : sql`cube(${vertexSql(value, 0)})`;
 }
 function castValue(value, type, name, isPut) {
-  if (!type)
-    throw Error(`pg.write_no_column ${name}`);
-  if (value instanceof Sql)
-    return value;
-  if (value === null)
-    return sql`NULL`;
+  if (!type) throw Error(`pg.write_no_column ${name}`);
+  if (value instanceof Sql) return value;
+  if (value === null) return sql`NULL`;
   if (type === "jsonb") {
-    return buildJsonPartial(value, isPut);
+    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, [])[0];
   }
-  if (type === "cube")
-    return cubeLiteralSql(value);
-  if (typeof value === "object" && value.$val) {
-    return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
-  }
-  if (typeof value === "number")
-    return value;
-  if (typeof value === "boolean")
-    return value;
-  if (typeof value === "string")
-    return sql`${value}`;
-  if (Array.isArray(value))
-    return sql`${JSON.stringify(value)}::jsonb`;
-  return sql`${JSON.stringify(value)}::jsonb`;
-}
-function buildJsonPartial(value, isPut) {
-  if (!common.isPlainObject(value)) {
-    return sql`${JSON.stringify(value)}::jsonb`;
-  }
-  if (Object.keys(value).length === 0 && !isPut)
-    return sql`NULL`;
-  const parts = [];
-  for (const k of Object.keys(value)) {
-    parts.push(sql`${k}::text, ${buildJsonPartial(value[k], isPut)}`);
-  }
-  if (!parts.length && isPut)
-    return sql`${JSON.stringify(value)}::jsonb`;
-  const objSql = sql`jsonb_build_object(${join(parts, ", ")})`;
-  const filtered = sql`(select jsonb_object_agg(key, value) from jsonb_each(${objSql}) where value <> 'null'::jsonb)`;
-  return filtered;
+  if (type === "cube") return cubeLiteralSql(value);
+  return value;
 }
 const getInsert = (rows, options) => {
   const { verCol, schema } = options;
@@ -212,8 +199,7 @@ const getInsert = (rows, options) => {
   for (const row of rows) {
     const rowVals = Array(cols.length).fill(sql`default`);
     for (const col of cols) {
-      if (col === verCol || !(col in row))
-        continue;
+      if (col === verCol || !(col in row)) continue;
       const ix = colIx[col];
       colUsed[ix] = true;
       rowVals[ix] = castValue(row[col], schema.types[col], col, row.$put);
@@ -246,21 +232,53 @@ const getUpdates = (row, options) => {
     ", "
   );
 };
+function getJsonUpdate(object, col, path) {
+  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
+    const patch2 = stripAttributes(object);
+    return [sql`${JSON.stringify(patch2)}::jsonb`, patch2 === null];
+  }
+  if ("$val" in object) {
+    const value = object.$val === true ? stripAttributes(object) : object.$val;
+    return [sql`${JSON.stringify({ $val: value })}::jsonb`, false];
+  }
+  const curr = sql`"${raw(col)}"${path.length ? sql`#>${path}` : empty}`;
+  if (common.isEmpty(object)) return [curr, false];
+  const baseSql = sql`case jsonb_typeof(${curr})
+    when 'object' then ${curr}
+    else '{}'::jsonb
+  end`;
+  let maybeNull = true;
+  let hasNulls = false;
+  const patchSqls = Object.entries(object).map(([key, value]) => {
+    const [valSql, nullable] = getJsonUpdate(value, col, path.concat(key));
+    maybeNull && (maybeNull = nullable);
+    hasNulls || (hasNulls = nullable);
+    return sql`${key}::text, ${valSql}`;
+  });
+  let clause = sql`${baseSql} || jsonb_build_object(${join(patchSqls, ", ")})`;
+  if (hasNulls) {
+    clause = sql`(select jsonb_object_agg(key, value)
+      from jsonb_each(${clause}) where value <> 'null'::jsonb)`;
+  }
+  if (maybeNull) {
+    clause = sql`nullif(${clause}, '{}'::jsonb)`;
+  }
+  return [clause, maybeNull];
+}
 function stripAttributes(object) {
-  if (typeof object !== "object" || !object)
-    return object;
-  if (Array.isArray(object))
+  if (typeof object !== "object" || !object) return object;
+  if (Array.isArray(object)) {
     return object.map((item) => stripAttributes(item));
-  const res = {};
-  for (const k in object) {
-    if (k === "$put")
-      continue;
-    const val = stripAttributes(object[k]);
-    if (val === null)
-      continue;
-    res[k] = val;
   }
-  return Object.keys(res).length ? res : null;
+  return Object.entries(object).reduce(
+    (out, [key, val]) => {
+      if (key === "$put" || val === null) return out;
+      if (out === null) out = {};
+      out[key] = stripAttributes(val);
+      return out;
+    },
+    null
+  );
 }
 const valid = {
   $eq: true,
@@ -295,27 +313,21 @@ function getAst(filter) {
   return simplify(construct(filter));
 }
 function isValidSubQuery(node) {
-  if (!node || typeof node !== "object")
-    return false;
+  if (!node || typeof node !== "object") return false;
   const keys = Object.keys(node);
   for (const key of keys) {
-    if (key[0] === "$" && !["$and", "$or", "$not"].includes(key))
-      return false;
-    if (key[0] !== "$")
-      return true;
+    if (key[0] === "$" && !["$and", "$or", "$not"].includes(key)) return false;
+    if (key[0] !== "$") return true;
   }
   for (const key in node) {
-    if (!isValidSubQuery(node[key]))
-      return false;
+    if (!isValidSubQuery(node[key])) return false;
   }
   return false;
 }
 function construct(node, prop, op) {
   if (!node || typeof node !== "object" || prop && op) {
-    if (op && prop)
-      return [op, prop, node];
-    if (prop)
-      return ["$eq", prop, node];
+    if (op && prop) return [op, prop, node];
+    if (prop) return ["$eq", prop, node];
     throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
   }
   if (Array.isArray(node)) {
@@ -334,12 +346,9 @@ function construct(node, prop, op) {
         return [key, construct(val, prop, op)];
       }
       if (key[0] === "$") {
-        if (!valid[key])
-          throw Error(`pgast.invalid_op:${key}`);
-        if (op)
-          throw Error(`pgast.unexpected_op:${op} before:${key}`);
-        if (!prop)
-          throw Error(`pgast.expected_prop_before:${key}`);
+        if (!valid[key]) throw Error(`pgast.invalid_op:${key}`);
+        if (op) throw Error(`pgast.unexpected_op:${op} before:${key}`);
+        if (!prop) throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
       return construct(val, key);
@@ -356,16 +365,12 @@ function simplify(node) {
     node[2] = simplify(node[2]);
   }
   if (op === "$and") {
-    if (!node[1].length)
-      return true;
-    if (node[1].includes(false))
-      return false;
+    if (!node[1].length) return true;
+    if (node[1].includes(false)) return false;
     node[1] = node[1].filter((item) => item !== true);
   } else if (op === "$or") {
-    if (!node[1].length)
-      return false;
-    if (node[1].includes(true))
-      return true;
+    if (!node[1].length) return false;
+    if (node[1].includes(true)) return true;
     node[1] = node[1].filter((item) => item !== false);
   } else if (op === "$not" && typeof node[1] === "boolean") {
     return !node[1];
@@ -426,16 +431,12 @@ const opSql = {
   $keyctd: sql`?&`
 };
 function getBinarySql(lhs, type, op, value, textLhs) {
-  if (value === null && op === "$eq")
-    return sql`${lhs} IS NULL`;
-  if (value === null && op === "$neq")
-    return sql`${lhs} IS NOT NULL`;
+  if (value === null && op === "$eq") return sql`${lhs} IS NULL`;
+  if (value === null && op === "$neq") return sql`${lhs} IS NOT NULL`;
   const sqlOp = opSql[op];
-  if (!sqlOp)
-    throw Error(`pg.getSql_unknown_operator ${op}`);
+  if (!sqlOp) throw Error(`pg.getSql_unknown_operator ${op}`);
   if (op === "$in" || op === "$nin") {
-    if (type === "jsonb" && typeof value[0] === "string")
-      lhs = textLhs;
+    if (type === "jsonb" && typeof value[0] === "string") lhs = textLhs;
     return sql`${lhs} ${sqlOp} (${join(value)})`;
   }
   if (op === "$re" || op === "$ire") {
@@ -454,13 +455,11 @@ function getBinarySql(lhs, type, op, value, textLhs) {
       return sql`${lhs} ${sqlOp} ${value}::text[]`;
     return sql`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
-  if (type === "cube")
-    return sql`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
+  if (type === "cube") return sql`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
   return sql`${lhs} ${sqlOp} ${value}`;
 }
 function getNodeSql(ast, options) {
-  if (typeof ast === "boolean")
-    return ast;
+  if (typeof ast === "boolean") return ast;
   const op = ast[0];
   if (op === "$and" || op === "$or") {
     return sql`(${join(
@@ -473,8 +472,7 @@ function getNodeSql(ast, options) {
   }
   if (op === "$sub") {
     const joinName = ast[1];
-    if (!options.joins[joinName])
-      throw Error(`pg.no_join ${joinName}`);
+    if (!options.joins[joinName]) throw Error(`pg.no_join ${joinName}`);
     const { idCol, schema } = options;
     const joinOptions = options.joins[joinName];
     const { table: joinTable, refCol } = options.joins[joinName];
@@ -484,8 +482,7 @@ function getNodeSql(ast, options) {
   }
   const [prefix, ...suffix] = ast[1].split(".");
   const { types: types2 = {} } = options.schema;
-  if (!types2[prefix])
-    throw Error(`pg.no_column ${prefix}`);
+  if (!types2[prefix]) throw Error(`pg.no_column ${prefix}`);
   if (types2[prefix] === "jsonb") {
     const [lhs, textLhs] = suffix.length ? [
       sql`"${raw(prefix)}" #> ${suffix}`,
@@ -493,8 +490,7 @@ function getNodeSql(ast, options) {
     ] : [sql`"${raw(prefix)}"`, sql`"${raw(prefix)}" #>> '{}'`];
     return getBinarySql(lhs, "jsonb", op, ast[2], textLhs);
   }
-  if (suffix.length)
-    throw Error(`pg.lookup_not_jsonb ${prefix}`);
+  if (suffix.length) throw Error(`pg.lookup_not_jsonb ${prefix}`);
   return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
 }
 function getSql(filter, options) {
@@ -524,8 +520,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   }
   const baseKey = sql`${JSON.stringify(rest)}::jsonb`;
   const where = [];
-  if (!common.isEmpty(filter))
-    where.push(getSql(filter, options));
+  if (!common.isEmpty(filter)) where.push(getSql(filter, options));
   if (!hasRangeArg)
     return {
       meta: meta(baseKey),
@@ -540,8 +535,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   );
   Object.entries({ $after, $before, $since, $until }).forEach(
     ([name, value]) => {
-      if (value)
-        where.push(getBoundCond(orderCols, value, name));
+      if (value) where.push(getBoundCond(orderCols, value, name));
     }
   );
   const order = !$group && join(
@@ -625,8 +619,7 @@ function getSingleSql(arg, options) {
     };
   }
   const { where, meta } = getArgSql(arg, options);
-  if (!(where == null ? void 0 : where.length))
-    throw Error("pg_write.no_condition");
+  if (!(where == null ? void 0 : where.length)) throw Error("pg_write.no_condition");
   return {
     where: sql`"${raw(idCol)}" = (
         SELECT "${raw(idCol)}"
@@ -747,8 +740,7 @@ class Db {
     avoid this query in every operation. 
   */
   async ensureSchema(tableOptions, typeOids) {
-    if (tableOptions.schema)
-      return;
+    if (tableOptions.schema) return;
     const { table, verCol, joins } = tableOptions;
     const tableInfoSchema = (await this.query(sql`
         SELECT table_schema, table_type
@@ -764,8 +756,7 @@ class Db {
         WHERE
           table_name = ${table} AND
           table_schema = ${tableSchema}`)).rows[0].column_types;
-    if (!types2)
-      throw Error(`pg.missing_table ${table}`);
+    if (!types2) throw Error(`pg.missing_table ${table}`);
     typeOids = typeOids || (await this.query(sql`
         SELECT jsonb_object_agg(typname, oid) AS type_oids
         FROM pg_type
@@ -834,8 +825,7 @@ class Db {
         idQueries[args] = node.children;
       }
     }
-    if (!common.isEmpty(idQueries))
-      promises.push(getByIds());
+    if (!common.isEmpty(idQueries)) promises.push(getByIds());
     await Promise.all(promises);
     log("dbRead", rootQuery, results);
     return common.finalize(results, common.wrap(query, prefix));
@@ -872,8 +862,7 @@ class Db {
         sqls.push(patch(object, arg, tableOptions));
       }
     }
-    if (puts.length)
-      sqls.push(...put(puts, tableOptions));
+    if (puts.length) sqls.push(...put(puts, tableOptions));
     const result = [];
     await Promise.all(
       sqls.map(

package/index.mjs

@@ -1,4 +1,4 @@
-import { isPlainObject, isEmpty, encodePath, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, cmp, decodeGraph, mergeObject, wrapObject, merge, encodeGraph, remove } from "@graffy/common";
+import { isEmpty, isPlainObject, encodePath, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, cmp, decodeGraph, mergeObject, wrapObject, merge, encodeGraph, remove } from "@graffy/common";
 import debug from "debug";
 import pg$1 from "pg";
 class Sql {
@@ -86,16 +86,13 @@ const getJsonBuildTrusted = (variadic) => {
   return sql`jsonb_build_object(${args})`;
 };
 const getJsonBuildValue = (value) => {
-  if (value instanceof Sql)
-    return value;
-  if (typeof value === "string")
-    return sql`${value}::text`;
+  if (value instanceof Sql) return value;
+  if (typeof value === "string") return sql`${value}::text`;
   return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const lookup = (prop, options) => {
   const [prefix, ...suffix] = prop.split(".");
-  if (!suffix.length)
-    return sql`"${raw(prefix)}"`;
+  if (!suffix.length) return sql`"${raw(prefix)}"`;
   const { types: types2 } = options.schema;
   if (types2[prefix] === "jsonb") {
     return sql`"${raw(prefix)}" #> ${suffix}`;
@@ -117,9 +114,25 @@ const aggSql = {
   $max: (prop) => sql`max((${lookupNumeric(prop)})::numeric)`,
   $min: (prop) => sql`min((${lookupNumeric(prop)})::numeric)`
 };
+const getOptimisedJsonBuild = (object, path = [], parentPropertyName, options) => {
+  const propertyNames = Object.keys(object);
+  const propertyPath = [...path, parentPropertyName];
+  const buildConfig = [];
+  propertyNames.forEach((propertyName) => {
+    const property = object[propertyName];
+    if (typeof property === "object") {
+      const childJSONBuild = getOptimisedJsonBuild(property, propertyPath, propertyName, options);
+      buildConfig.push(sql`${propertyName}::text, jsonb_build_object(${join(childJSONBuild, ", ")})`);
+    } else {
+      if (property === true) {
+        buildConfig.push(sql`${propertyName}::text, ${lookup([...propertyPath, propertyName].join("."), options)}`);
+      }
+    }
+  });
+  return buildConfig;
+};
 const getSelectCols = (options, projection = null) => {
-  if (!projection)
-    return sql`*`;
+  if (!projection) return sql`*`;
   const sqls = [];
   for (const key in projection) {
     if (key === "$count") {
@@ -133,7 +146,12 @@ const getSelectCols = (options, projection = null) => {
         sql`jsonb_build_object(${join(subSqls, ", ")}) AS "${raw(key)}"`
       );
     } else {
-      sqls.push(sql`"${raw(key)}"`);
+      if (typeof projection[key] === "object") {
+        const optimisedJsonBuild = getOptimisedJsonBuild(projection[key], [], key, options);
+        sqls.push(sql`jsonb_build_object(${join(optimisedJsonBuild, ", ")}) AS "${raw(key)}"`);
+      } else {
+        sqls.push(sql`"${raw(key)}"`);
+      }
     }
   }
   return join(sqls, ", ");
@@ -153,45 +171,14 @@ function cubeLiteralSql(value) {
   )})` : sql`cube(${vertexSql(value, 0)})`;
 }
 function castValue(value, type, name, isPut) {
-  if (!type)
-    throw Error(`pg.write_no_column ${name}`);
-  if (value instanceof Sql)
-    return value;
-  if (value === null)
-    return sql`NULL`;
+  if (!type) throw Error(`pg.write_no_column ${name}`);
+  if (value instanceof Sql) return value;
+  if (value === null) return sql`NULL`;
   if (type === "jsonb") {
-    return buildJsonPartial(value, isPut);
+    return isPut ? JSON.stringify(stripAttributes(value)) : getJsonUpdate(value, name, [])[0];
   }
-  if (type === "cube")
-    return cubeLiteralSql(value);
-  if (typeof value === "object" && value.$val) {
-    return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
-  }
-  if (typeof value === "number")
-    return value;
-  if (typeof value === "boolean")
-    return value;
-  if (typeof value === "string")
-    return sql`${value}`;
-  if (Array.isArray(value))
-    return sql`${JSON.stringify(value)}::jsonb`;
-  return sql`${JSON.stringify(value)}::jsonb`;
-}
-function buildJsonPartial(value, isPut) {
-  if (!isPlainObject(value)) {
-    return sql`${JSON.stringify(value)}::jsonb`;
-  }
-  if (Object.keys(value).length === 0 && !isPut)
-    return sql`NULL`;
-  const parts = [];
-  for (const k of Object.keys(value)) {
-    parts.push(sql`${k}::text, ${buildJsonPartial(value[k], isPut)}`);
-  }
-  if (!parts.length && isPut)
-    return sql`${JSON.stringify(value)}::jsonb`;
-  const objSql = sql`jsonb_build_object(${join(parts, ", ")})`;
-  const filtered = sql`(select jsonb_object_agg(key, value) from jsonb_each(${objSql}) where value <> 'null'::jsonb)`;
-  return filtered;
+  if (type === "cube") return cubeLiteralSql(value);
+  return value;
 }
 const getInsert = (rows, options) => {
   const { verCol, schema } = options;
@@ -210,8 +197,7 @@ const getInsert = (rows, options) => {
   for (const row of rows) {
     const rowVals = Array(cols.length).fill(sql`default`);
     for (const col of cols) {
-      if (col === verCol || !(col in row))
-        continue;
+      if (col === verCol || !(col in row)) continue;
       const ix = colIx[col];
       colUsed[ix] = true;
       rowVals[ix] = castValue(row[col], schema.types[col], col, row.$put);
@@ -244,21 +230,53 @@ const getUpdates = (row, options) => {
     ", "
   );
 };
+function getJsonUpdate(object, col, path) {
+  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
+    const patch2 = stripAttributes(object);
+    return [sql`${JSON.stringify(patch2)}::jsonb`, patch2 === null];
+  }
+  if ("$val" in object) {
+    const value = object.$val === true ? stripAttributes(object) : object.$val;
+    return [sql`${JSON.stringify({ $val: value })}::jsonb`, false];
+  }
+  const curr = sql`"${raw(col)}"${path.length ? sql`#>${path}` : empty}`;
+  if (isEmpty(object)) return [curr, false];
+  const baseSql = sql`case jsonb_typeof(${curr})
+    when 'object' then ${curr}
+    else '{}'::jsonb
+  end`;
+  let maybeNull = true;
+  let hasNulls = false;
+  const patchSqls = Object.entries(object).map(([key, value]) => {
+    const [valSql, nullable] = getJsonUpdate(value, col, path.concat(key));
+    maybeNull && (maybeNull = nullable);
+    hasNulls || (hasNulls = nullable);
+    return sql`${key}::text, ${valSql}`;
+  });
+  let clause = sql`${baseSql} || jsonb_build_object(${join(patchSqls, ", ")})`;
+  if (hasNulls) {
+    clause = sql`(select jsonb_object_agg(key, value)
+      from jsonb_each(${clause}) where value <> 'null'::jsonb)`;
+  }
+  if (maybeNull) {
+    clause = sql`nullif(${clause}, '{}'::jsonb)`;
+  }
+  return [clause, maybeNull];
+}
 function stripAttributes(object) {
-  if (typeof object !== "object" || !object)
-    return object;
-  if (Array.isArray(object))
+  if (typeof object !== "object" || !object) return object;
+  if (Array.isArray(object)) {
     return object.map((item) => stripAttributes(item));
-  const res = {};
-  for (const k in object) {
-    if (k === "$put")
-      continue;
-    const val = stripAttributes(object[k]);
-    if (val === null)
-      continue;
-    res[k] = val;
   }
-  return Object.keys(res).length ? res : null;
+  return Object.entries(object).reduce(
+    (out, [key, val]) => {
+      if (key === "$put" || val === null) return out;
+      if (out === null) out = {};
+      out[key] = stripAttributes(val);
+      return out;
+    },
+    null
+  );
 }
 const valid = {
   $eq: true,
@@ -293,27 +311,21 @@ function getAst(filter) {
   return simplify(construct(filter));
 }
 function isValidSubQuery(node) {
-  if (!node || typeof node !== "object")
-    return false;
+  if (!node || typeof node !== "object") return false;
   const keys = Object.keys(node);
   for (const key of keys) {
-    if (key[0] === "$" && !["$and", "$or", "$not"].includes(key))
-      return false;
-    if (key[0] !== "$")
-      return true;
+    if (key[0] === "$" && !["$and", "$or", "$not"].includes(key)) return false;
+    if (key[0] !== "$") return true;
   }
   for (const key in node) {
-    if (!isValidSubQuery(node[key]))
-      return false;
+    if (!isValidSubQuery(node[key])) return false;
   }
   return false;
 }
 function construct(node, prop, op) {
   if (!node || typeof node !== "object" || prop && op) {
-    if (op && prop)
-      return [op, prop, node];
-    if (prop)
-      return ["$eq", prop, node];
+    if (op && prop) return [op, prop, node];
+    if (prop) return ["$eq", prop, node];
     throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
   }
   if (Array.isArray(node)) {
@@ -332,12 +344,9 @@ function construct(node, prop, op) {
         return [key, construct(val, prop, op)];
       }
       if (key[0] === "$") {
-        if (!valid[key])
-          throw Error(`pgast.invalid_op:${key}`);
-        if (op)
-          throw Error(`pgast.unexpected_op:${op} before:${key}`);
-        if (!prop)
-          throw Error(`pgast.expected_prop_before:${key}`);
+        if (!valid[key]) throw Error(`pgast.invalid_op:${key}`);
+        if (op) throw Error(`pgast.unexpected_op:${op} before:${key}`);
+        if (!prop) throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
       return construct(val, key);
@@ -354,16 +363,12 @@ function simplify(node) {
     node[2] = simplify(node[2]);
   }
   if (op === "$and") {
-    if (!node[1].length)
-      return true;
-    if (node[1].includes(false))
-      return false;
+    if (!node[1].length) return true;
+    if (node[1].includes(false)) return false;
     node[1] = node[1].filter((item) => item !== true);
   } else if (op === "$or") {
-    if (!node[1].length)
-      return false;
-    if (node[1].includes(true))
-      return true;
+    if (!node[1].length) return false;
+    if (node[1].includes(true)) return true;
     node[1] = node[1].filter((item) => item !== false);
   } else if (op === "$not" && typeof node[1] === "boolean") {
     return !node[1];
@@ -424,16 +429,12 @@ const opSql = {
   $keyctd: sql`?&`
 };
 function getBinarySql(lhs, type, op, value, textLhs) {
-  if (value === null && op === "$eq")
-    return sql`${lhs} IS NULL`;
-  if (value === null && op === "$neq")
-    return sql`${lhs} IS NOT NULL`;
+  if (value === null && op === "$eq") return sql`${lhs} IS NULL`;
+  if (value === null && op === "$neq") return sql`${lhs} IS NOT NULL`;
   const sqlOp = opSql[op];
-  if (!sqlOp)
-    throw Error(`pg.getSql_unknown_operator ${op}`);
+  if (!sqlOp) throw Error(`pg.getSql_unknown_operator ${op}`);
   if (op === "$in" || op === "$nin") {
-    if (type === "jsonb" && typeof value[0] === "string")
-      lhs = textLhs;
+    if (type === "jsonb" && typeof value[0] === "string") lhs = textLhs;
     return sql`${lhs} ${sqlOp} (${join(value)})`;
   }
   if (op === "$re" || op === "$ire") {
@@ -452,13 +453,11 @@ function getBinarySql(lhs, type, op, value, textLhs) {
       return sql`${lhs} ${sqlOp} ${value}::text[]`;
     return sql`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
-  if (type === "cube")
-    return sql`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
+  if (type === "cube") return sql`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
   return sql`${lhs} ${sqlOp} ${value}`;
 }
 function getNodeSql(ast, options) {
-  if (typeof ast === "boolean")
-    return ast;
+  if (typeof ast === "boolean") return ast;
   const op = ast[0];
   if (op === "$and" || op === "$or") {
     return sql`(${join(
@@ -471,8 +470,7 @@ function getNodeSql(ast, options) {
   }
   if (op === "$sub") {
     const joinName = ast[1];
-    if (!options.joins[joinName])
-      throw Error(`pg.no_join ${joinName}`);
+    if (!options.joins[joinName]) throw Error(`pg.no_join ${joinName}`);
     const { idCol, schema } = options;
     const joinOptions = options.joins[joinName];
     const { table: joinTable, refCol } = options.joins[joinName];
@@ -482,8 +480,7 @@ function getNodeSql(ast, options) {
   }
   const [prefix, ...suffix] = ast[1].split(".");
   const { types: types2 = {} } = options.schema;
-  if (!types2[prefix])
-    throw Error(`pg.no_column ${prefix}`);
+  if (!types2[prefix]) throw Error(`pg.no_column ${prefix}`);
   if (types2[prefix] === "jsonb") {
     const [lhs, textLhs] = suffix.length ? [
       sql`"${raw(prefix)}" #> ${suffix}`,
@@ -491,8 +488,7 @@ function getNodeSql(ast, options) {
     ] : [sql`"${raw(prefix)}"`, sql`"${raw(prefix)}" #>> '{}'`];
     return getBinarySql(lhs, "jsonb", op, ast[2], textLhs);
   }
-  if (suffix.length)
-    throw Error(`pg.lookup_not_jsonb ${prefix}`);
+  if (suffix.length) throw Error(`pg.lookup_not_jsonb ${prefix}`);
   return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
 }
 function getSql(filter, options) {
@@ -522,8 +518,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   }
   const baseKey = sql`${JSON.stringify(rest)}::jsonb`;
   const where = [];
-  if (!isEmpty(filter))
-    where.push(getSql(filter, options));
+  if (!isEmpty(filter)) where.push(getSql(filter, options));
   if (!hasRangeArg)
     return {
       meta: meta(baseKey),
@@ -538,8 +533,7 @@ function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $curs
   );
   Object.entries({ $after, $before, $since, $until }).forEach(
     ([name, value]) => {
-      if (value)
-        where.push(getBoundCond(orderCols, value, name));
+      if (value) where.push(getBoundCond(orderCols, value, name));
     }
   );
   const order = !$group && join(
@@ -623,8 +617,7 @@ function getSingleSql(arg, options) {
     };
   }
   const { where, meta } = getArgSql(arg, options);
-  if (!(where == null ? void 0 : where.length))
-    throw Error("pg_write.no_condition");
+  if (!(where == null ? void 0 : where.length)) throw Error("pg_write.no_condition");
   return {
     where: sql`"${raw(idCol)}" = (
         SELECT "${raw(idCol)}"
@@ -745,8 +738,7 @@ class Db {
     avoid this query in every operation. 
   */
   async ensureSchema(tableOptions, typeOids) {
-    if (tableOptions.schema)
-      return;
+    if (tableOptions.schema) return;
     const { table, verCol, joins } = tableOptions;
     const tableInfoSchema = (await this.query(sql`
         SELECT table_schema, table_type
@@ -762,8 +754,7 @@ class Db {
         WHERE
           table_name = ${table} AND
           table_schema = ${tableSchema}`)).rows[0].column_types;
-    if (!types2)
-      throw Error(`pg.missing_table ${table}`);
+    if (!types2) throw Error(`pg.missing_table ${table}`);
     typeOids = typeOids || (await this.query(sql`
         SELECT jsonb_object_agg(typname, oid) AS type_oids
         FROM pg_type
@@ -832,8 +823,7 @@ class Db {
         idQueries[args] = node.children;
       }
     }
-    if (!isEmpty(idQueries))
-      promises.push(getByIds());
+    if (!isEmpty(idQueries)) promises.push(getByIds());
     await Promise.all(promises);
     log("dbRead", rootQuery, results);
     return finalize(results, wrap(query, prefix));
@@ -870,8 +860,7 @@ class Db {
         sqls.push(patch(object, arg, tableOptions));
       }
     }
-    if (puts.length)
-      sqls.push(...put(puts, tableOptions));
+    if (puts.length) sqls.push(...put(puts, tableOptions));
     const result = [];
     await Promise.all(
       sqls.map(

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

package/types/Db.d.ts

@@ -6,8 +6,8 @@ export default class Db {
     writeSql(sql: any, tableOptions: any): Promise<any>;
     ensureSchema(tableOptions: any, typeOids: any): Promise<void>;
     read(rootQuery: any, tableOptions: any): Promise<{
-        key: Uint8Array;
-        end: Uint8Array;
+        key: Uint8Array<ArrayBuffer>;
+        end: Uint8Array<ArrayBuffer>;
         version: number;
     }[]>;
     write(rootChange: any, tableOptions: any): Promise<any[]>;

package/types/sql/getArgSql.d.ts

@@ -22,4 +22,4 @@ export default function getArgSql({ $first, $last, $after, $before, $since, $unt
 /**
  * Uses the args object (typically passed in the $key attribute)
  */
-export type Sql = import('sql-template-tag').Sql;
+export type Sql = import("sql-template-tag").Sql;