@graffy/pg 0.16.6 → 0.16.8

package/index.cjs

@@ -81,7 +81,9 @@ const valid = {
   $all: true,
   $has: true,
   $cts: true,
-  $ctd: true
+  $ctd: true,
+  $keycts: true,
+  $keyctd: true
 };
 const inverse = {
   $eq: "$neq",
@@ -96,6 +98,22 @@ const inverse = {
 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)
@@ -107,6 +125,9 @@ function construct(node, prop, op) {
   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]) => {
@@ -125,9 +146,6 @@ function construct(node, prop, op) {
           throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
-      if (prop) {
-        return ["$sub", prop, construct({ [key]: val })];
-      }
       return construct(val, key);
     })
   ];
@@ -352,7 +370,9 @@ const opSql = {
   $re: sql`~`,
   $ire: sql`~*`,
   $cts: sql`@>`,
-  $ctd: sql`<@`
+  $ctd: sql`<@`,
+  $keycts: sql`?|`,
+  $keyctd: sql`?&`
 };
 function getBinarySql(lhs, type, op, value, textLhs) {
   if (value === null && op === "$eq")
@@ -379,6 +399,8 @@ function getBinarySql(lhs, type, op, value, textLhs) {
     if (typeof value === "string") {
       return sql`${textLhs} ${sqlOp} ${value}`;
     }
+    if ((op === "$keycts" || op === "$keyctd") && Array.isArray(value))
+      return sql`${lhs} ${sqlOp} ${value}::text[]`;
     return sql`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
   if (type === "cube")

package/index.mjs

@@ -79,7 +79,9 @@ const valid = {
   $all: true,
   $has: true,
   $cts: true,
-  $ctd: true
+  $ctd: true,
+  $keycts: true,
+  $keyctd: true
 };
 const inverse = {
   $eq: "$neq",
@@ -94,6 +96,22 @@ const inverse = {
 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)
@@ -105,6 +123,9 @@ function construct(node, prop, op) {
   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]) => {
@@ -123,9 +144,6 @@ function construct(node, prop, op) {
           throw Error(`pgast.expected_prop_before:${key}`);
         return construct(val, prop, key);
       }
-      if (prop) {
-        return ["$sub", prop, construct({ [key]: val })];
-      }
       return construct(val, key);
     })
   ];
@@ -350,7 +368,9 @@ const opSql = {
   $re: sql`~`,
   $ire: sql`~*`,
   $cts: sql`@>`,
-  $ctd: sql`<@`
+  $ctd: sql`<@`,
+  $keycts: sql`?|`,
+  $keyctd: sql`?&`
 };
 function getBinarySql(lhs, type, op, value, textLhs) {
   if (value === null && op === "$eq")
@@ -377,6 +397,8 @@ function getBinarySql(lhs, type, op, value, textLhs) {
     if (typeof value === "string") {
       return sql`${textLhs} ${sqlOp} ${value}`;
     }
+    if ((op === "$keycts" || op === "$keyctd") && Array.isArray(value))
+      return sql`${lhs} ${sqlOp} ${value}::text[]`;
     return sql`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
   if (type === "cube")

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