@graffy/pg 0.16.10-alpha.2 → 0.16.11

package/index.cjs

@@ -66,149 +66,6 @@ const empty = raw("");
 function sql(strings, ...values) {
   return new Sql(strings, values);
 }
-const valid = {
-  $eq: true,
-  $lt: true,
-  $gt: true,
-  $lte: true,
-  $gte: true,
-  $re: true,
-  $ire: true,
-  $text: true,
-  $and: true,
-  $or: true,
-  $any: true,
-  $all: true,
-  $has: true,
-  $cts: true,
-  $ctd: true,
-  $keycts: true,
-  $keyctd: true
-};
-const inverse = {
-  $eq: "$neq",
-  $neq: "$eq",
-  $in: "$nin",
-  $nin: "$in",
-  $lt: "$gte",
-  $gte: "$lt",
-  $gt: "$lte",
-  $lte: "$gt"
-};
-function getAst(filter) {
-  return simplify(construct(filter));
-}
-function isValidSubQuery(node) {
-  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;
-  }
-  for (const key in node) {
-    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];
-    throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
-  }
-  if (Array.isArray(node)) {
-    return ["$or", node.map((item) => construct(item, prop, op))];
-  }
-  if (prop && isValidSubQuery(node)) {
-    return ["$sub", prop, construct(node)];
-  }
-  return [
-    "$and",
-    Object.entries(node).map(([key, val]) => {
-      if (key === "$or" || key === "$and") {
-        return [key, construct(val, prop, op)[1]];
-      }
-      if (key === "$not") {
-        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}`);
-        return construct(val, prop, key);
-      }
-      return construct(val, key);
-    })
-  ];
-}
-function simplify(node) {
-  const op = node[0];
-  if (op === "$and" || op === "$or") {
-    node[1] = node[1].map((subnode) => simplify(subnode));
-  } else if (op === "$not") {
-    node[1] = simplify(node[1]);
-  } else if (op === "$sub") {
-    node[2] = simplify(node[2]);
-  }
-  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) => {
-        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;
-      },
-      { 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]]
-        )
-      ];
-    }
-  }
-  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;
-  }
-  return node;
-}
 const getJsonBuildTrusted = (variadic) => {
   const args = join(
     Object.entries(variadic).map(([name, value]) => {
@@ -231,11 +88,11 @@ const lookup = (prop, options) => {
   const { types: types2 } = options.schema;
   if (types2[prefix] === "jsonb") {
     return sql`"${raw(prefix)}" #> ${suffix}`;
-  } else if (types2[prefix] === "cube" && suffix.length === 1) {
+  }
+  if (types2[prefix] === "cube" && suffix.length === 1) {
     return sql`"${raw(prefix)}" ~> ${parseInt(suffix[0])}`;
-  } else {
-    throw Error(`pg.cannot_lookup ${prop}`);
   }
+  throw Error(`pg.cannot_lookup ${prop}`);
 };
 const lookupNumeric = (prop) => {
   const [prefix, ...suffix] = prop.split(".");
@@ -384,6 +241,149 @@ function stripAttributes(object) {
     null
   );
 }
+const valid = {
+  $eq: true,
+  $lt: true,
+  $gt: true,
+  $lte: true,
+  $gte: true,
+  $re: true,
+  $ire: true,
+  $text: true,
+  $and: true,
+  $or: true,
+  $any: true,
+  $all: true,
+  $has: true,
+  $cts: true,
+  $ctd: true,
+  $keycts: true,
+  $keyctd: true
+};
+const inverse = {
+  $eq: "$neq",
+  $neq: "$eq",
+  $in: "$nin",
+  $nin: "$in",
+  $lt: "$gte",
+  $gte: "$lt",
+  $gt: "$lte",
+  $lte: "$gt"
+};
+function getAst(filter) {
+  return simplify(construct(filter));
+}
+function isValidSubQuery(node) {
+  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;
+  }
+  for (const key in node) {
+    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];
+    throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
+  }
+  if (Array.isArray(node)) {
+    return ["$or", node.map((item) => construct(item, prop, op))];
+  }
+  if (prop && isValidSubQuery(node)) {
+    return ["$sub", prop, construct(node)];
+  }
+  return [
+    "$and",
+    Object.entries(node).map(([key, val]) => {
+      if (key === "$or" || key === "$and") {
+        return [key, construct(val, prop, op)[1]];
+      }
+      if (key === "$not") {
+        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}`);
+        return construct(val, prop, key);
+      }
+      return construct(val, key);
+    })
+  ];
+}
+function simplify(node) {
+  const op = node[0];
+  if (op === "$and" || op === "$or") {
+    node[1] = node[1].map((subnode) => simplify(subnode));
+  } else if (op === "$not") {
+    node[1] = simplify(node[1]);
+  } else if (op === "$sub") {
+    node[2] = simplify(node[2]);
+  }
+  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) => {
+        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;
+      },
+      { 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]]
+        )
+      ];
+    }
+  }
+  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;
+  }
+  return node;
+}
 const opSql = {
   $and: "AND",
   $or: "OR",
@@ -445,7 +445,8 @@ function getNodeSql(ast, options) {
       ast[1].map((node) => getNodeSql(node, options)),
       `) ${opSql[op]} (`
     )})`;
-  } else if (op === "$not") {
+  }
+  if (op === "$not") {
     return sql`${opSql[op]} (${getNodeSql(ast[1], options)})`;
   }
   if (op === "$sub") {
@@ -469,11 +470,10 @@ function getNodeSql(ast, options) {
       sql`"${raw(prefix)}" #>> ${suffix}`
     ] : [sql`"${raw(prefix)}"`, 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`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
   }
+  if (suffix.length)
+    throw Error(`pg.lookup_not_jsonb ${prefix}`);
+  return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
 }
 function getSql(filter, options) {
   const ast = getAst(filter);

package/index.mjs

@@ -64,149 +64,6 @@ const empty = raw("");
 function sql(strings, ...values) {
   return new Sql(strings, values);
 }
-const valid = {
-  $eq: true,
-  $lt: true,
-  $gt: true,
-  $lte: true,
-  $gte: true,
-  $re: true,
-  $ire: true,
-  $text: true,
-  $and: true,
-  $or: true,
-  $any: true,
-  $all: true,
-  $has: true,
-  $cts: true,
-  $ctd: true,
-  $keycts: true,
-  $keyctd: true
-};
-const inverse = {
-  $eq: "$neq",
-  $neq: "$eq",
-  $in: "$nin",
-  $nin: "$in",
-  $lt: "$gte",
-  $gte: "$lt",
-  $gt: "$lte",
-  $lte: "$gt"
-};
-function getAst(filter) {
-  return simplify(construct(filter));
-}
-function isValidSubQuery(node) {
-  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;
-  }
-  for (const key in node) {
-    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];
-    throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
-  }
-  if (Array.isArray(node)) {
-    return ["$or", node.map((item) => construct(item, prop, op))];
-  }
-  if (prop && isValidSubQuery(node)) {
-    return ["$sub", prop, construct(node)];
-  }
-  return [
-    "$and",
-    Object.entries(node).map(([key, val]) => {
-      if (key === "$or" || key === "$and") {
-        return [key, construct(val, prop, op)[1]];
-      }
-      if (key === "$not") {
-        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}`);
-        return construct(val, prop, key);
-      }
-      return construct(val, key);
-    })
-  ];
-}
-function simplify(node) {
-  const op = node[0];
-  if (op === "$and" || op === "$or") {
-    node[1] = node[1].map((subnode) => simplify(subnode));
-  } else if (op === "$not") {
-    node[1] = simplify(node[1]);
-  } else if (op === "$sub") {
-    node[2] = simplify(node[2]);
-  }
-  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) => {
-        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;
-      },
-      { 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]]
-        )
-      ];
-    }
-  }
-  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;
-  }
-  return node;
-}
 const getJsonBuildTrusted = (variadic) => {
   const args = join(
     Object.entries(variadic).map(([name, value]) => {
@@ -229,11 +86,11 @@ const lookup = (prop, options) => {
   const { types: types2 } = options.schema;
   if (types2[prefix] === "jsonb") {
     return sql`"${raw(prefix)}" #> ${suffix}`;
-  } else if (types2[prefix] === "cube" && suffix.length === 1) {
+  }
+  if (types2[prefix] === "cube" && suffix.length === 1) {
     return sql`"${raw(prefix)}" ~> ${parseInt(suffix[0])}`;
-  } else {
-    throw Error(`pg.cannot_lookup ${prop}`);
   }
+  throw Error(`pg.cannot_lookup ${prop}`);
 };
 const lookupNumeric = (prop) => {
   const [prefix, ...suffix] = prop.split(".");
@@ -382,6 +239,149 @@ function stripAttributes(object) {
     null
   );
 }
+const valid = {
+  $eq: true,
+  $lt: true,
+  $gt: true,
+  $lte: true,
+  $gte: true,
+  $re: true,
+  $ire: true,
+  $text: true,
+  $and: true,
+  $or: true,
+  $any: true,
+  $all: true,
+  $has: true,
+  $cts: true,
+  $ctd: true,
+  $keycts: true,
+  $keyctd: true
+};
+const inverse = {
+  $eq: "$neq",
+  $neq: "$eq",
+  $in: "$nin",
+  $nin: "$in",
+  $lt: "$gte",
+  $gte: "$lt",
+  $gt: "$lte",
+  $lte: "$gt"
+};
+function getAst(filter) {
+  return simplify(construct(filter));
+}
+function isValidSubQuery(node) {
+  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;
+  }
+  for (const key in node) {
+    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];
+    throw Error(`pgast.expected_prop_before:${JSON.stringify(node)}`);
+  }
+  if (Array.isArray(node)) {
+    return ["$or", node.map((item) => construct(item, prop, op))];
+  }
+  if (prop && isValidSubQuery(node)) {
+    return ["$sub", prop, construct(node)];
+  }
+  return [
+    "$and",
+    Object.entries(node).map(([key, val]) => {
+      if (key === "$or" || key === "$and") {
+        return [key, construct(val, prop, op)[1]];
+      }
+      if (key === "$not") {
+        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}`);
+        return construct(val, prop, key);
+      }
+      return construct(val, key);
+    })
+  ];
+}
+function simplify(node) {
+  const op = node[0];
+  if (op === "$and" || op === "$or") {
+    node[1] = node[1].map((subnode) => simplify(subnode));
+  } else if (op === "$not") {
+    node[1] = simplify(node[1]);
+  } else if (op === "$sub") {
+    node[2] = simplify(node[2]);
+  }
+  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) => {
+        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;
+      },
+      { 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]]
+        )
+      ];
+    }
+  }
+  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;
+  }
+  return node;
+}
 const opSql = {
   $and: "AND",
   $or: "OR",
@@ -443,7 +443,8 @@ function getNodeSql(ast, options) {
       ast[1].map((node) => getNodeSql(node, options)),
       `) ${opSql[op]} (`
     )})`;
-  } else if (op === "$not") {
+  }
+  if (op === "$not") {
     return sql`${opSql[op]} (${getNodeSql(ast[1], options)})`;
   }
   if (op === "$sub") {
@@ -467,11 +468,10 @@ function getNodeSql(ast, options) {
       sql`"${raw(prefix)}" #>> ${suffix}`
     ] : [sql`"${raw(prefix)}"`, 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`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
   }
+  if (suffix.length)
+    throw Error(`pg.lookup_not_jsonb ${prefix}`);
+  return getBinarySql(sql`"${raw(prefix)}"`, types2[prefix], op, ast[2]);
 }
 function getSql(filter, options) {
   const ast = getAst(filter);

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