@graffy/pg 0.15.13 → 0.15.14-alpha.4

package/index.cjs

@@ -53,8 +53,7 @@ const valid = {
   $all: true,
   $has: true,
   $cts: true,
-  $ctd: true,
-  $ovl: true
+  $ctd: true
 };
 const inverse = {
   $eq: "$neq",
@@ -67,10 +66,8 @@ const inverse = {
   $lte: "$gt"
 };
 function getAst(filter) {
-  counter = 0;
   return simplify(construct(filter));
 }
-let counter;
 function construct(node, prop, op) {
   if (!node || typeof node !== "object" || prop && op) {
     if (op && prop)
@@ -91,14 +88,6 @@ function construct(node, prop, op) {
       if (key === "$not") {
         return [key, construct(val, prop, op)];
       }
-      if (key === "$any" || key === "$all") {
-        const elkey = "el$" + counter++;
-        return [key, prop, elkey, construct(val, elkey)];
-      }
-      if (key === "$has") {
-        const elkey = "el$" + counter++;
-        return [key, prop, elkey, construct(val, elkey)[1]];
-      }
       if (key[0] === "$") {
         if (!valid[key])
           throw Error("pgast.invalid_op:" + key);
@@ -123,10 +112,21 @@ function simplify(node) {
     node[1] = node[1].map((subnode) => simplify(subnode));
   } else if (op === "$not") {
     node[1] = simplify(node[1]);
-  } else if (op === "$all" || op === "$any") {
-    node[3] = simplify(node[3]);
-  } else if (op === "$has") {
-    node[3] = node[3].map((subnode) => simplify(subnode));
+  }
+  if (op === "$and") {
+    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;
+    node[1] = node[1].filter((item) => item !== false);
+  } else if (op === "$not" && typeof node[1] === "boolean") {
+    return !node[1];
   }
   if (op === "$or") {
     const { eqmap, noneq, change } = node[1].reduce((acc, item) => {
@@ -148,115 +148,16 @@ function simplify(node) {
       ];
     }
   }
-  if (op === "$and" || op === "$or") {
-    if (!node[1].length)
-      throw Error("pgast.expected_children:" + op);
-    return node[1].length === 1 ? node[1][0] : node;
+  if ((op === "$and" || op === "$or") && node[1].length === 1) {
+    return node[1][0];
   }
   if (op === "$not") {
     const [subop, ...subargs] = node[1];
     const invop = inverse[subop];
     return invop ? [invop, ...subargs] : node;
   }
-  if (op === "$any" || op === "$all") {
-    const [_, list, elkey, subnode] = node;
-    const [subop, elk, val] = subnode;
-    return (subop === "$eq" || subop === "$in") && elkey === elk ? [op === "$any" ? "$ovl" : "$ctd", list, subop === "$eq" ? [val] : val] : node;
-  }
-  if (op === "$has") {
-    const [_, list, elkey, limbs] = node;
-    return limbs.every(([subop, elk]) => subop === "$eq" && elk === elkey) ? ["$cts", list, limbs.map(([_op, _prop, val]) => val)] : node;
-  }
   return node;
 }
-function defaultColumnType(_) {
-  return "any";
-}
-function getCompatibleTypes(value) {
-  if (value === null)
-    return "any";
-  if (Array.isArray(value))
-    return "array";
-  if (typeof value === "object")
-    return "jsonb";
-  if (typeof value === "number")
-    return "numeric";
-  if (typeof value === "string")
-    return "text";
-}
-function getSql(filter, getLookupSql, getColumnType = defaultColumnType) {
-  function lookup2(string, type) {
-    if (string.substr(0, 3) === "el$")
-      return sql__default["default"]`"${sql.raw(string)}"`;
-    return getLookupSql(string, type);
-  }
-  function binop(op, left, right) {
-    const lType = left.substr(0, 3) === "el$" ? "any" : getColumnType(left);
-    const rType = getCompatibleTypes(right);
-    if (lType === "any" || rType === "any" || rType === lType) {
-      return sql__default["default"]`${lookup2(left)} ${sql.raw(op)} ${right}`;
-    } else {
-      return sql__default["default"]`(${lookup2(left, rType)})::${sql.raw(rType)} ${sql.raw(op)} ${right}`;
-    }
-  }
-  function getNodeSql(ast) {
-    switch (ast[0]) {
-      case "$eq":
-        if (ast[2] === null)
-          return sql__default["default"]`${lookup2(ast[1])} IS NULL`;
-        return binop("=", ast[1], ast[2]);
-      case "$neq":
-        if (ast[2] === null)
-          return sql__default["default"]`${lookup2(ast[1])} IS NOT NULL`;
-        return binop("<>", ast[1], ast[2]);
-      case "$lt":
-        return binop("<", ast[1], ast[2]);
-      case "$lte":
-        return binop("<=", ast[1], ast[2]);
-      case "$gt":
-        return binop(">", ast[1], ast[2]);
-      case "$gte":
-        return binop(">=", ast[1], ast[2]);
-      case "$re":
-        return binop("~", ast[1], ast[2]);
-      case "$ire":
-        return binop("~*", ast[1], ast[2]);
-      case "$in":
-        return sql__default["default"]`${lookup2(ast[1])} IN (${sql.join(ast[2])})`;
-      case "$nin":
-        return sql__default["default"]`${lookup2(ast[1])} NOT IN (${sql.join(ast[2])})`;
-      case "$cts":
-        return sql__default["default"]`${lookup2(ast[1])} @> ${ast[2]}`;
-      case "$ctd":
-        return sql__default["default"]`${lookup2(ast[1])} <@ ${ast[2]}`;
-      case "$ovl":
-        switch (getColumnType(ast[1])) {
-          case "jsonb":
-          case "any":
-            return sql__default["default"]`${lookup2(ast[1])} ?| ${Array.isArray(ast[2]) ? ast[2] : Object.keys(ast[2])}`;
-          case "array":
-            return sql__default["default"]`${lookup2(ast[1])} && ${ast[2]}`;
-          default:
-            throw Error("pg.getSql_ovl_unknown_column_type");
-        }
-      case "$and":
-        return sql__default["default"]`(${sql.join(ast[1].map((node) => getNodeSql(node)), `) AND (`)})`;
-      case "$or":
-        return sql__default["default"]`(${sql.join(ast[1].map((node) => getNodeSql(node)), `) OR (`)})`;
-      case "$not":
-        return sql__default["default"]`NOT (${getNodeSql(ast[1])})`;
-      case "$any":
-        return sql__default["default"]`(SELECT bool_or(${getNodeSql(ast[3])}) FROM UNNEST(${lookup2(ast[1])}) ${lookup2(ast[2])})`;
-      case "$all":
-        return sql__default["default"]`(SELECT bool_and(${getNodeSql(ast[3])}) FROM UNNEST(${lookup2(ast[1])}) ${lookup2(ast[2])})`;
-      case "$has":
-        return sql__default["default"]`(SELECT bool_or(${sql.join(ast[3].map((node) => getNodeSql(node)), `) AND bool_or(`)}) FROM UNNEST(${lookup2(ast[1])}) ${lookup2(ast[2])})`;
-      default:
-        throw Error("pg.getSql_unknown_operator: " + ast[0]);
-    }
-  }
-  return getNodeSql(getAst(filter));
-}
 const nowTimestamp = sql__default["default"]`cast(extract(epoch from now()) as integer)`;
 const getJsonBuildObject = (variadic) => {
   const args = sql.join(Object.entries(variadic).map(([name, value]) => {
@@ -271,14 +172,9 @@ const getJsonBuildValue = (value) => {
     return sql__default["default"]`${value}::text`;
   return sql__default["default"]`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
-const lookup = (prop, type) => {
+const lookup = (prop) => {
   const [prefix, ...suffix] = common.encodePath(prop);
-  const op = type === "text" ? sql__default["default"]`#>>` : sql__default["default"]`#>`;
-  return suffix.length ? sql__default["default"]`"${sql.raw(prefix)}" ${op} ${suffix}` : sql__default["default"]`"${sql.raw(prefix)}"`;
-};
-const getType = (prop) => {
-  const [_prefix, ...suffix] = common.encodePath(prop);
-  return suffix.length ? "jsonb" : "any";
+  return suffix.length ? sql__default["default"]`"${sql.raw(prefix)}" #> ${suffix}` : sql__default["default"]`"${sql.raw(prefix)}"`;
 };
 const aggSql = {
   $sum: (prop) => sql__default["default"]`sum((${lookup(prop)})::numeric)`,
@@ -306,19 +202,39 @@ const getSelectCols = (table, projection = null) => {
   }
   return sql__default["default"]`jsonb_build_object(${sql.join(sqls, ", ")})`;
 };
+function vertexSql(array) {
+  return sql__default["default"]`array[${sql.join(array.map((num) => num === Infinity ? sql__default["default"]`'Infinity'` : num === -Infinity ? sql__default["default"]`'-Infinity'` : num))}]::float8[]`;
+}
+function castValue$1(value, type, name, isPut) {
+  if (!type)
+    throw Error("pg.write_no_column " + name);
+  if (value instanceof sql.Sql)
+    return value;
+  if (value === null)
+    return sql__default["default"]`NULL`;
+  if (type === "jsonb") {
+    console.log("jsonb", value, type, name);
+    return isPut ? JSON.stringify(stripAttributes(value)) : sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})`;
+  }
+  if (type === "cube") {
+    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])}, ${vertexSql(value[1])})` : sql__default["default"]`cube(${vertexSql(value)})`;
+  }
+  return value;
+}
 const getInsert = (row, options) => {
   const cols = [];
   const vals = [];
-  Object.entries(row).filter(([name]) => name !== options.verCol && name[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
+  Object.entries(row).filter(([col]) => col !== options.verCol && col[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
     cols.push(sql__default["default"]`"${sql.raw(col)}"`);
-    vals.push(val instanceof sql.Sql || typeof val !== "object" || !val ? val : sql__default["default"]`${JSON.stringify(stripAttributes(val))}::jsonb`);
+    vals.push(castValue$1(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(([name]) => name !== options.idCol && name[0] !== "$").map(([name, value]) => {
-    return sql__default["default"]`"${sql.raw(name)}" = ${value instanceof sql.Sql || typeof value !== "object" || !value ? value : !value.$put ? sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : sql__default["default"]`${JSON.stringify(stripAttributes(value))}::jsonb`}`;
-  }).concat(sql__default["default"]`"${sql.raw(options.verCol)}" = ${nowTimestamp}`), ", ");
+  return sql.join(Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql__default["default"]`"${sql.raw(col)}" = ${castValue$1(val, options.schema.types[col], col, row.$put)}`).concat(sql__default["default"]`"${sql.raw(options.verCol)}" = ${nowTimestamp}`), ", ");
 };
 function getJsonUpdate(_a, col, path) {
   var _b = _a, { $put } = _b, object = __objRest(_b, ["$put"]);
@@ -345,6 +261,68 @@ function stripAttributes(object) {
     return out;
   }, {});
 }
+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"]`<@`
+};
+function castValue(value, type, op) {
+  if (value === null && op === "$eq")
+    return sql__default["default"]`IS NULL`;
+  if (value === null && op === "$neq")
+    return sql__default["default"]`IS NOT NULL`;
+  const sqlOp = opSql[op];
+  if (!sqlOp)
+    throw Error("pg.getSql_unknown_operator " + op);
+  if (op === "$in" || op === "$nin") {
+    return sql__default["default"]`${sqlOp} (${sql.join(value)})`;
+  }
+  if (type === "jsonb") {
+    return sql__default["default"]`${sqlOp} ${JSON.stringify(value)}::jsonb`;
+  }
+  if (type === "cube") {
+    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"]`${sqlOp} cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql__default["default"]`${sqlOp} cube(${vertexSql(value)})`;
+  }
+  return sql__default["default"]`${sqlOp} ${value}`;
+}
+function getSql(filter, options) {
+  function getNodeSql(ast) {
+    if (typeof ast === "boolean")
+      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]} (`)})`;
+    } else if (op === "$not") {
+      return sql__default["default"]`${opSql[op]} (${getNodeSql(ast[1])})`;
+    }
+    const [prefix, ...suffix] = common.encodePath(ast[1]);
+    const { types } = options.schema;
+    if (!types[prefix])
+      throw Error("pg.no_column " + prefix);
+    if (suffix.length && types[prefix] !== "jsonb") {
+      throw Error("pg.lookup_not_jsonb " + prefix);
+    }
+    const [lhs, type] = suffix.length ? [sql__default["default"]`"${sql.raw(prefix)}" #> ${suffix}`, "jsonb"] : [sql__default["default"]`"${sql.raw(prefix)}"`, types[prefix]];
+    const rhs = castValue(ast[2], type, op);
+    return sql__default["default"]`${lhs} ${rhs}`;
+  }
+  return getNodeSql(getAst(filter));
+}
 const getIdMeta = ({ idCol }) => getJsonBuildObject({
   $key: sql__default["default"]`"${sql.raw(idCol)}"`,
   $ver: nowTimestamp
@@ -366,13 +344,13 @@ function getArgSql(_c, options) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
   }
   const meta = (key2) => $group ? getAggMeta(key2, $group) : getArgMeta(key2, prefix, idCol);
-  const groupCols = Array.isArray($group) && $group.length ? $group.map((col) => lookup(col)) : void 0;
+  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
   const group = groupCols ? sql.join(groupCols, ", ") : void 0;
   const hasRangeArg = $before || $after || $since || $until || $first || $last || $all || $order;
   let key;
   const where = [];
   if (!common.isEmpty(filter)) {
-    where.push(getSql(filter, lookup, getType));
+    where.push(getSql(filter, options));
     key = sql__default["default"]`${JSON.stringify(filter)}::jsonb`;
   }
   if (!hasRangeArg)
@@ -533,24 +511,46 @@ class Db {
     }
   }
   async readSql(sql2) {
-    let result = await this.query(sql2);
-    result = result.rows.flat();
+    const result = (await this.query(sql2)).rows.flat();
     log("Read result", result);
     return result;
   }
   async writeSql(sql2) {
-    let res = await this.query(sql2);
+    const res = await this.query(sql2);
     log("Rows written", res.rowCount);
     if (!res.rowCount) {
       throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
     }
     return res.rows[0][0];
   }
+  async ensureSchema(tableOptions) {
+    if (tableOptions.schema)
+      return;
+    const { table } = tableOptions;
+    const types = (await this.query(sql__default["default"]`SELECT jsonb_object_agg(
+          column_name,
+          udt_name
+      )
+      FROM information_schema.columns
+      WHERE
+          table_name = ${table} AND
+          table_schema = (
+              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];
+    if (!types)
+      throw Error(`pg.missing_table ${table}`);
+    log("ensureSchema", types);
+    tableOptions.schema = { types };
+  }
   async read(rootQuery, tableOptions) {
     const idQueries = {};
     const promises = [];
     const results = [];
     const { prefix } = tableOptions;
+    await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
       const result = await this.readSql(selectByArgs(args, projection, tableOptions));
       const wrappedGraph = common.encodeGraph(common.wrapObject(result, prefix));
@@ -591,6 +591,7 @@ class Db {
   }
   async write(rootChange, tableOptions) {
     const { prefix } = tableOptions;
+    await this.ensureSchema(tableOptions);
     const change = common.unwrap(rootChange, prefix);
     const sqls = change.map((node) => {
       const arg = common.decodeArgs(node);
@@ -618,7 +619,7 @@ class Db {
     return result;
   }
 }
-const pg = ({ table, idCol, verCol, connection }) => (store) => {
+const pg = ({ table, idCol, verCol, connection, schema }) => (store) => {
   store.on("read", read);
   store.on("write", write);
   const prefix = store.path;
@@ -626,7 +627,8 @@ const pg = ({ table, idCol, verCol, connection }) => (store) => {
     prefix,
     table: table || prefix[prefix.length - 1] || "default",
     idCol: idCol || "id",
-    verCol: verCol || "updatedAt"
+    verCol: verCol || "updatedAt",
+    schema
   };
   const defaultDb = new Db(connection);
   function read(query, options, next) {

package/index.mjs

@@ -45,8 +45,7 @@ const valid = {
   $all: true,
   $has: true,
   $cts: true,
-  $ctd: true,
-  $ovl: true
+  $ctd: true
 };
 const inverse = {
   $eq: "$neq",
@@ -59,10 +58,8 @@ const inverse = {
   $lte: "$gt"
 };
 function getAst(filter) {
-  counter = 0;
   return simplify(construct(filter));
 }
-let counter;
 function construct(node, prop, op) {
   if (!node || typeof node !== "object" || prop && op) {
     if (op && prop)
@@ -83,14 +80,6 @@ function construct(node, prop, op) {
       if (key === "$not") {
         return [key, construct(val, prop, op)];
       }
-      if (key === "$any" || key === "$all") {
-        const elkey = "el$" + counter++;
-        return [key, prop, elkey, construct(val, elkey)];
-      }
-      if (key === "$has") {
-        const elkey = "el$" + counter++;
-        return [key, prop, elkey, construct(val, elkey)[1]];
-      }
       if (key[0] === "$") {
         if (!valid[key])
           throw Error("pgast.invalid_op:" + key);
@@ -115,10 +104,21 @@ function simplify(node) {
     node[1] = node[1].map((subnode) => simplify(subnode));
   } else if (op === "$not") {
     node[1] = simplify(node[1]);
-  } else if (op === "$all" || op === "$any") {
-    node[3] = simplify(node[3]);
-  } else if (op === "$has") {
-    node[3] = node[3].map((subnode) => simplify(subnode));
+  }
+  if (op === "$and") {
+    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;
+    node[1] = node[1].filter((item) => item !== false);
+  } else if (op === "$not" && typeof node[1] === "boolean") {
+    return !node[1];
   }
   if (op === "$or") {
     const { eqmap, noneq, change } = node[1].reduce((acc, item) => {
@@ -140,115 +140,16 @@ function simplify(node) {
       ];
     }
   }
-  if (op === "$and" || op === "$or") {
-    if (!node[1].length)
-      throw Error("pgast.expected_children:" + op);
-    return node[1].length === 1 ? node[1][0] : node;
+  if ((op === "$and" || op === "$or") && node[1].length === 1) {
+    return node[1][0];
   }
   if (op === "$not") {
     const [subop, ...subargs] = node[1];
     const invop = inverse[subop];
     return invop ? [invop, ...subargs] : node;
   }
-  if (op === "$any" || op === "$all") {
-    const [_, list, elkey, subnode] = node;
-    const [subop, elk, val] = subnode;
-    return (subop === "$eq" || subop === "$in") && elkey === elk ? [op === "$any" ? "$ovl" : "$ctd", list, subop === "$eq" ? [val] : val] : node;
-  }
-  if (op === "$has") {
-    const [_, list, elkey, limbs] = node;
-    return limbs.every(([subop, elk]) => subop === "$eq" && elk === elkey) ? ["$cts", list, limbs.map(([_op, _prop, val]) => val)] : node;
-  }
   return node;
 }
-function defaultColumnType(_) {
-  return "any";
-}
-function getCompatibleTypes(value) {
-  if (value === null)
-    return "any";
-  if (Array.isArray(value))
-    return "array";
-  if (typeof value === "object")
-    return "jsonb";
-  if (typeof value === "number")
-    return "numeric";
-  if (typeof value === "string")
-    return "text";
-}
-function getSql(filter, getLookupSql, getColumnType = defaultColumnType) {
-  function lookup2(string, type) {
-    if (string.substr(0, 3) === "el$")
-      return sql`"${raw(string)}"`;
-    return getLookupSql(string, type);
-  }
-  function binop(op, left, right) {
-    const lType = left.substr(0, 3) === "el$" ? "any" : getColumnType(left);
-    const rType = getCompatibleTypes(right);
-    if (lType === "any" || rType === "any" || rType === lType) {
-      return sql`${lookup2(left)} ${raw(op)} ${right}`;
-    } else {
-      return sql`(${lookup2(left, rType)})::${raw(rType)} ${raw(op)} ${right}`;
-    }
-  }
-  function getNodeSql(ast) {
-    switch (ast[0]) {
-      case "$eq":
-        if (ast[2] === null)
-          return sql`${lookup2(ast[1])} IS NULL`;
-        return binop("=", ast[1], ast[2]);
-      case "$neq":
-        if (ast[2] === null)
-          return sql`${lookup2(ast[1])} IS NOT NULL`;
-        return binop("<>", ast[1], ast[2]);
-      case "$lt":
-        return binop("<", ast[1], ast[2]);
-      case "$lte":
-        return binop("<=", ast[1], ast[2]);
-      case "$gt":
-        return binop(">", ast[1], ast[2]);
-      case "$gte":
-        return binop(">=", ast[1], ast[2]);
-      case "$re":
-        return binop("~", ast[1], ast[2]);
-      case "$ire":
-        return binop("~*", ast[1], ast[2]);
-      case "$in":
-        return sql`${lookup2(ast[1])} IN (${join(ast[2])})`;
-      case "$nin":
-        return sql`${lookup2(ast[1])} NOT IN (${join(ast[2])})`;
-      case "$cts":
-        return sql`${lookup2(ast[1])} @> ${ast[2]}`;
-      case "$ctd":
-        return sql`${lookup2(ast[1])} <@ ${ast[2]}`;
-      case "$ovl":
-        switch (getColumnType(ast[1])) {
-          case "jsonb":
-          case "any":
-            return sql`${lookup2(ast[1])} ?| ${Array.isArray(ast[2]) ? ast[2] : Object.keys(ast[2])}`;
-          case "array":
-            return sql`${lookup2(ast[1])} && ${ast[2]}`;
-          default:
-            throw Error("pg.getSql_ovl_unknown_column_type");
-        }
-      case "$and":
-        return sql`(${join(ast[1].map((node) => getNodeSql(node)), `) AND (`)})`;
-      case "$or":
-        return sql`(${join(ast[1].map((node) => getNodeSql(node)), `) OR (`)})`;
-      case "$not":
-        return sql`NOT (${getNodeSql(ast[1])})`;
-      case "$any":
-        return sql`(SELECT bool_or(${getNodeSql(ast[3])}) FROM UNNEST(${lookup2(ast[1])}) ${lookup2(ast[2])})`;
-      case "$all":
-        return sql`(SELECT bool_and(${getNodeSql(ast[3])}) FROM UNNEST(${lookup2(ast[1])}) ${lookup2(ast[2])})`;
-      case "$has":
-        return sql`(SELECT bool_or(${join(ast[3].map((node) => getNodeSql(node)), `) AND bool_or(`)}) FROM UNNEST(${lookup2(ast[1])}) ${lookup2(ast[2])})`;
-      default:
-        throw Error("pg.getSql_unknown_operator: " + ast[0]);
-    }
-  }
-  return getNodeSql(getAst(filter));
-}
 const nowTimestamp = sql`cast(extract(epoch from now()) as integer)`;
 const getJsonBuildObject = (variadic) => {
   const args = join(Object.entries(variadic).map(([name, value]) => {
@@ -263,14 +164,9 @@ const getJsonBuildValue = (value) => {
     return sql`${value}::text`;
   return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
-const lookup = (prop, type) => {
+const lookup = (prop) => {
   const [prefix, ...suffix] = encodePath(prop);
-  const op = type === "text" ? sql`#>>` : sql`#>`;
-  return suffix.length ? sql`"${raw(prefix)}" ${op} ${suffix}` : sql`"${raw(prefix)}"`;
-};
-const getType = (prop) => {
-  const [_prefix, ...suffix] = encodePath(prop);
-  return suffix.length ? "jsonb" : "any";
+  return suffix.length ? sql`"${raw(prefix)}" #> ${suffix}` : sql`"${raw(prefix)}"`;
 };
 const aggSql = {
   $sum: (prop) => sql`sum((${lookup(prop)})::numeric)`,
@@ -298,19 +194,39 @@ const getSelectCols = (table, projection = null) => {
   }
   return sql`jsonb_build_object(${join(sqls, ", ")})`;
 };
+function vertexSql(array) {
+  return sql`array[${join(array.map((num) => num === Infinity ? sql`'Infinity'` : num === -Infinity ? sql`'-Infinity'` : num))}]::float8[]`;
+}
+function castValue$1(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 === "jsonb") {
+    console.log("jsonb", value, type, name);
+    return isPut ? JSON.stringify(stripAttributes(value)) : sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})`;
+  }
+  if (type === "cube") {
+    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])}, ${vertexSql(value[1])})` : sql`cube(${vertexSql(value)})`;
+  }
+  return value;
+}
 const getInsert = (row, options) => {
   const cols = [];
   const vals = [];
-  Object.entries(row).filter(([name]) => name !== options.verCol && name[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
+  Object.entries(row).filter(([col]) => col !== options.verCol && col[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
     cols.push(sql`"${raw(col)}"`);
-    vals.push(val instanceof Sql || typeof val !== "object" || !val ? val : sql`${JSON.stringify(stripAttributes(val))}::jsonb`);
+    vals.push(castValue$1(val, options.schema.types[col], col, row.$put));
   });
   return { cols: join(cols, ", "), vals: join(vals, ", ") };
 };
 const getUpdates = (row, options) => {
-  return join(Object.entries(row).filter(([name]) => name !== options.idCol && name[0] !== "$").map(([name, value]) => {
-    return sql`"${raw(name)}" = ${value instanceof Sql || typeof value !== "object" || !value ? value : !value.$put ? sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : sql`${JSON.stringify(stripAttributes(value))}::jsonb`}`;
-  }).concat(sql`"${raw(options.verCol)}" = ${nowTimestamp}`), ", ");
+  return join(Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql`"${raw(col)}" = ${castValue$1(val, options.schema.types[col], col, row.$put)}`).concat(sql`"${raw(options.verCol)}" = ${nowTimestamp}`), ", ");
 };
 function getJsonUpdate(_a, col, path) {
   var _b = _a, { $put } = _b, object = __objRest(_b, ["$put"]);
@@ -337,6 +253,68 @@ function stripAttributes(object) {
     return out;
   }, {});
 }
+const opSql = {
+  $and: `AND`,
+  $or: `OR`,
+  $not: sql`NOT`,
+  $eq: sql`=`,
+  $neq: sql`<>`,
+  $in: sql`IN`,
+  $nin: sql`NOT IN`,
+  $lt: sql`<`,
+  $lte: sql`<=`,
+  $gt: sql`>`,
+  $gte: sql`>=`,
+  $re: sql`~`,
+  $ire: sql`~*`,
+  $cts: sql`@>`,
+  $ctd: sql`<@`
+};
+function castValue(value, type, op) {
+  if (value === null && op === "$eq")
+    return sql`IS NULL`;
+  if (value === null && op === "$neq")
+    return sql`IS NOT NULL`;
+  const sqlOp = opSql[op];
+  if (!sqlOp)
+    throw Error("pg.getSql_unknown_operator " + op);
+  if (op === "$in" || op === "$nin") {
+    return sql`${sqlOp} (${join(value)})`;
+  }
+  if (type === "jsonb") {
+    return sql`${sqlOp} ${JSON.stringify(value)}::jsonb`;
+  }
+  if (type === "cube") {
+    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`${sqlOp} cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql`${sqlOp} cube(${vertexSql(value)})`;
+  }
+  return sql`${sqlOp} ${value}`;
+}
+function getSql(filter, options) {
+  function getNodeSql(ast) {
+    if (typeof ast === "boolean")
+      return ast;
+    const op = ast[0];
+    if (op === "$and" || op === "$or") {
+      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])
+      throw Error("pg.no_column " + prefix);
+    if (suffix.length && types[prefix] !== "jsonb") {
+      throw Error("pg.lookup_not_jsonb " + prefix);
+    }
+    const [lhs, type] = suffix.length ? [sql`"${raw(prefix)}" #> ${suffix}`, "jsonb"] : [sql`"${raw(prefix)}"`, types[prefix]];
+    const rhs = castValue(ast[2], type, op);
+    return sql`${lhs} ${rhs}`;
+  }
+  return getNodeSql(getAst(filter));
+}
 const getIdMeta = ({ idCol }) => getJsonBuildObject({
   $key: sql`"${raw(idCol)}"`,
   $ver: nowTimestamp
@@ -358,13 +336,13 @@ function getArgSql(_c, options) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
   }
   const meta = (key2) => $group ? getAggMeta(key2, $group) : getArgMeta(key2, prefix, idCol);
-  const groupCols = Array.isArray($group) && $group.length ? $group.map((col) => lookup(col)) : void 0;
+  const groupCols = Array.isArray($group) && $group.length && $group.map(lookup);
   const group = groupCols ? join(groupCols, ", ") : void 0;
   const hasRangeArg = $before || $after || $since || $until || $first || $last || $all || $order;
   let key;
   const where = [];
   if (!isEmpty(filter)) {
-    where.push(getSql(filter, lookup, getType));
+    where.push(getSql(filter, options));
     key = sql`${JSON.stringify(filter)}::jsonb`;
   }
   if (!hasRangeArg)
@@ -525,24 +503,46 @@ class Db {
     }
   }
   async readSql(sql2) {
-    let result = await this.query(sql2);
-    result = result.rows.flat();
+    const result = (await this.query(sql2)).rows.flat();
     log("Read result", result);
     return result;
   }
   async writeSql(sql2) {
-    let res = await this.query(sql2);
+    const res = await this.query(sql2);
     log("Rows written", res.rowCount);
     if (!res.rowCount) {
       throw Error("pg.nothing_written " + sql2.text + " with " + sql2.values);
     }
     return res.rows[0][0];
   }
+  async ensureSchema(tableOptions) {
+    if (tableOptions.schema)
+      return;
+    const { table } = tableOptions;
+    const types = (await this.query(sql`SELECT jsonb_object_agg(
+          column_name,
+          udt_name
+      )
+      FROM information_schema.columns
+      WHERE
+          table_name = ${table} AND
+          table_schema = (
+              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];
+    if (!types)
+      throw Error(`pg.missing_table ${table}`);
+    log("ensureSchema", types);
+    tableOptions.schema = { types };
+  }
   async read(rootQuery, tableOptions) {
     const idQueries = {};
     const promises = [];
     const results = [];
     const { prefix } = tableOptions;
+    await this.ensureSchema(tableOptions);
     const getByArgs = async (args, projection) => {
       const result = await this.readSql(selectByArgs(args, projection, tableOptions));
       const wrappedGraph = encodeGraph(wrapObject(result, prefix));
@@ -583,6 +583,7 @@ class Db {
   }
   async write(rootChange, tableOptions) {
     const { prefix } = tableOptions;
+    await this.ensureSchema(tableOptions);
     const change = unwrap(rootChange, prefix);
     const sqls = change.map((node) => {
       const arg = decodeArgs(node);
@@ -610,7 +611,7 @@ class Db {
     return result;
   }
 }
-const pg = ({ table, idCol, verCol, connection }) => (store) => {
+const pg = ({ table, idCol, verCol, connection, schema }) => (store) => {
   store.on("read", read);
   store.on("write", write);
   const prefix = store.path;
@@ -618,7 +619,8 @@ const pg = ({ table, idCol, verCol, connection }) => (store) => {
     prefix,
     table: table || prefix[prefix.length - 1] || "default",
     idCol: idCol || "id",
-    verCol: verCol || "updatedAt"
+    verCol: verCol || "updatedAt",
+    schema
   };
   const defaultDb = new Db(connection);
   function read(query, options, next) {

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.13",
+  "version": "0.15.14-alpha.4",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,9 +16,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.13",
-    "debug": "^4.3.2",
-    "sql-template-tag": "^4.0.0"
+    "@graffy/common": "0.15.14-alpha.4",
+    "sql-template-tag": "^4.0.0",
+    "debug": "^4.3.2"
   },
   "peerDependencies": {
     "pg": "^8.0.0"

package/types/Db.d.ts

@@ -4,6 +4,7 @@ export default class Db {
     query(sql: any): Promise<any>;
     readSql(sql: any): Promise<any>;
     writeSql(sql: any): Promise<any>;
+    ensureSchema(tableOptions: any): Promise<void>;
     read(rootQuery: any, tableOptions: any): Promise<any>;
     write(rootChange: any, tableOptions: any): Promise<any[]>;
 }

package/types/filter/getSql.d.ts

@@ -1,3 +1 @@
-export default function getSql(filter: any, getLookupSql: any, getColumnType?: typeof defaultColumnType): any;
-declare function defaultColumnType(_: any): string;
-export {};
+export default function getSql(filter: any, options: any): any;

package/types/index.d.ts

@@ -1,6 +1,7 @@
-export function pg({ table, idCol, verCol, connection }: {
+export function pg({ table, idCol, verCol, connection, schema }: {
     table?: string;
     idCol?: string;
     verCol?: string;
     connection?: any;
+    schema?: any;
 }): (store: any) => void;

package/types/sql/clauses.d.ts

@@ -1,7 +1,7 @@
+export function vertexSql(array: any): Sql;
 export const nowTimestamp: Sql;
 export function getJsonBuildObject(variadic: any): Sql;
-export function lookup(prop: any, type: any): Sql;
-export function getType(prop: any): "any" | "jsonb";
+export function lookup(prop: any): Sql;
 export function getSelectCols(table: any, projection?: any): Sql;
 export function getInsert(row: any, options: any): {
     cols: Sql;