@graffy/pg 0.15.21 → 0.15.22-alpha.1

package/index.cjs

@@ -201,8 +201,14 @@ 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 vertexSql(array, nullValue) {
+  return sql__default["default"]`array[${sql.join(array.map((num) => num === null ? nullValue : num))}]::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));
+  }
+  return Array.isArray(value[0]) ? sql__default["default"]`cube(${vertexSql(value[0], sql__default["default"]`'-Infinity'`)}, ${vertexSql(value[1], sql__default["default"]`'Infinity'`)})` : sql__default["default"]`cube(${vertexSql(value, 0)})`;
 }
 function castValue(value, type, name, isPut) {
   if (!type)
@@ -214,12 +220,8 @@ function castValue(value, type, name, isPut) {
   if (type === "jsonb") {
     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)})`;
-  }
+  if (type === "cube")
+    return cubeLiteralSql(value);
   return value;
 }
 const getInsert = (row, options) => {
@@ -276,7 +278,7 @@ const opSql = {
   $cts: sql__default["default"]`@>`,
   $ctd: sql__default["default"]`<@`
 };
-function getBinarySql(lhs, type, op, value) {
+function getBinarySql(lhs, type, op, value, textLhs) {
   if (value === null && op === "$eq")
     return sql__default["default"]`${lhs} IS NULL`;
   if (value === null && op === "$neq")
@@ -285,21 +287,23 @@ function getBinarySql(lhs, type, op, value) {
   if (!sqlOp)
     throw Error("pg.getSql_unknown_operator " + op);
   if (op === "$in" || op === "$nin") {
+    if (type === "jsonb" && typeof value[0] === "string")
+      lhs = textLhs;
     return sql__default["default"]`${lhs} ${sqlOp} (${sql.join(value)})`;
   }
   if (op === "$re" || op === "$ire") {
-    const castLhs = type === "text" ? lhs : type === "jsonb" ? sql__default["default"]`(${lhs})#>>'{}'` : sql__default["default"]`(${lhs})::text`;
-    return sql__default["default"]`${castLhs} ${sqlOp} ${String(value)}`;
+    if (type === "jsonb") {
+      lhs = textLhs;
+    } else if (type !== "text") {
+      lhs = sql__default["default"]`(${lhs})::text`;
+    }
+    return sql__default["default"]`${lhs} ${sqlOp} ${String(value)}`;
   }
   if (type === "jsonb") {
     return sql__default["default"]`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
-  if (type === "cube") {
-    if (!Array.isArray(value) || !value.length || Array.isArray(value[0]) && value.length !== 2) {
-      throw Error("pg.getBinarySql_bad_cube" + JSON.stringify(value));
-    }
-    return Array.isArray(value[0]) ? sql__default["default"]`${lhs} ${sqlOp} cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql__default["default"]`${lhs} ${sqlOp} cube(${vertexSql(value)})`;
-  }
+  if (type === "cube")
+    return sql__default["default"]`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
   return sql__default["default"]`${lhs} ${sqlOp} ${value}`;
 }
 function getSql(filter, options) {
@@ -316,11 +320,17 @@ function getSql(filter, options) {
     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);
+    if (types[prefix] === "jsonb") {
+      const [lhs, textLhs] = suffix.length ? [
+        sql__default["default"]`"${sql.raw(prefix)}" #> ${suffix}`,
+        sql__default["default"]`"${sql.raw(prefix)}" #>> ${suffix}`
+      ] : [sql__default["default"]`"${sql.raw(prefix)}"`, sql__default["default"]`"${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__default["default"]`"${sql.raw(prefix)}"`, types[prefix], op, ast[2]);
     }
-    const [lhs, type] = suffix.length ? [sql__default["default"]`"${sql.raw(prefix)}" #> ${suffix}`, "jsonb"] : [sql__default["default"]`"${sql.raw(prefix)}"`, types[prefix]];
-    return getBinarySql(lhs, type, op, ast[2]);
   }
   return getNodeSql(getAst(filter));
 }
@@ -356,14 +366,12 @@ function getArgSql(_a, options) {
   }
   if (!hasRangeArg)
     return { meta: meta(key), where, group, limit: 1 };
-  if (common.isEmpty(rest)) {
-    throw Error("pg_arg.pagination_only_unsupported in " + prefix);
-  }
   const orderCols = ($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql__default["default"]`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem));
   Object.entries({ $after, $before, $since, $until }).forEach(([name, value]) => {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
+  const order = !$group && sql.join(($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql__default["default"]`${lookup(orderItem.slice(1))} ${$last ? sql__default["default"]`ASC` : sql__default["default"]`DESC`}` : sql__default["default"]`${lookup(orderItem)} ${$last ? sql__default["default"]`DESC` : sql__default["default"]`ASC`}`), `, `);
   const orderKey = $order && getJsonBuildTrusted({ $order: sql__default["default"]`${JSON.stringify($order)}::jsonb` });
   const cursorKey = getJsonBuildTrusted({
     $cursor: sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
@@ -372,7 +380,7 @@ function getArgSql(_a, options) {
   return {
     meta: meta(key),
     where,
-    order: $order && sql.join(orderCols.map((col) => sql__default["default"]`${col} ${$last ? sql__default["default"]`DESC` : sql__default["default"]`ASC`}`), `, `),
+    order,
     group,
     limit: $first || $last
   };
@@ -598,7 +606,7 @@ class Db {
       promises.push(getByIds());
     await Promise.all(promises);
     log("dbRead", rootQuery, results);
-    return common.slice(common.finalize(results, common.wrap(query, prefix)), rootQuery).known || [];
+    return common.finalize(results, common.wrap(query, prefix));
   }
   async write(rootChange, tableOptions) {
     const { prefix } = tableOptions;

package/index.mjs

@@ -26,7 +26,7 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, decodeQuery, slice, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
+import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, decodeQuery, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
 import { Pool, Client } from "pg";
 import sql, { join, raw, Sql, empty } from "sql-template-tag";
 import debug from "debug";
@@ -193,8 +193,14 @@ 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 vertexSql(array, nullValue) {
+  return sql`array[${join(array.map((num) => num === null ? nullValue : num))}]::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));
+  }
+  return Array.isArray(value[0]) ? sql`cube(${vertexSql(value[0], sql`'-Infinity'`)}, ${vertexSql(value[1], sql`'Infinity'`)})` : sql`cube(${vertexSql(value, 0)})`;
 }
 function castValue(value, type, name, isPut) {
   if (!type)
@@ -206,12 +212,8 @@ function castValue(value, type, name, isPut) {
   if (type === "jsonb") {
     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)})`;
-  }
+  if (type === "cube")
+    return cubeLiteralSql(value);
   return value;
 }
 const getInsert = (row, options) => {
@@ -268,7 +270,7 @@ const opSql = {
   $cts: sql`@>`,
   $ctd: sql`<@`
 };
-function getBinarySql(lhs, type, op, value) {
+function getBinarySql(lhs, type, op, value, textLhs) {
   if (value === null && op === "$eq")
     return sql`${lhs} IS NULL`;
   if (value === null && op === "$neq")
@@ -277,21 +279,23 @@ function getBinarySql(lhs, type, op, value) {
   if (!sqlOp)
     throw Error("pg.getSql_unknown_operator " + op);
   if (op === "$in" || op === "$nin") {
+    if (type === "jsonb" && typeof value[0] === "string")
+      lhs = textLhs;
     return sql`${lhs} ${sqlOp} (${join(value)})`;
   }
   if (op === "$re" || op === "$ire") {
-    const castLhs = type === "text" ? lhs : type === "jsonb" ? sql`(${lhs})#>>'{}'` : sql`(${lhs})::text`;
-    return sql`${castLhs} ${sqlOp} ${String(value)}`;
+    if (type === "jsonb") {
+      lhs = textLhs;
+    } else if (type !== "text") {
+      lhs = sql`(${lhs})::text`;
+    }
+    return sql`${lhs} ${sqlOp} ${String(value)}`;
   }
   if (type === "jsonb") {
     return sql`${lhs} ${sqlOp} ${JSON.stringify(value)}::jsonb`;
   }
-  if (type === "cube") {
-    if (!Array.isArray(value) || !value.length || Array.isArray(value[0]) && value.length !== 2) {
-      throw Error("pg.getBinarySql_bad_cube" + JSON.stringify(value));
-    }
-    return Array.isArray(value[0]) ? sql`${lhs} ${sqlOp} cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql`${lhs} ${sqlOp} cube(${vertexSql(value)})`;
-  }
+  if (type === "cube")
+    return sql`${lhs} ${sqlOp} ${cubeLiteralSql(value)}`;
   return sql`${lhs} ${sqlOp} ${value}`;
 }
 function getSql(filter, options) {
@@ -308,11 +312,17 @@ function getSql(filter, options) {
     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);
+    if (types[prefix] === "jsonb") {
+      const [lhs, textLhs] = suffix.length ? [
+        sql`"${raw(prefix)}" #> ${suffix}`,
+        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)}"`, types[prefix], op, ast[2]);
     }
-    const [lhs, type] = suffix.length ? [sql`"${raw(prefix)}" #> ${suffix}`, "jsonb"] : [sql`"${raw(prefix)}"`, types[prefix]];
-    return getBinarySql(lhs, type, op, ast[2]);
   }
   return getNodeSql(getAst(filter));
 }
@@ -348,14 +358,12 @@ function getArgSql(_a, options) {
   }
   if (!hasRangeArg)
     return { meta: meta(key), where, group, limit: 1 };
-  if (isEmpty(rest)) {
-    throw Error("pg_arg.pagination_only_unsupported in " + prefix);
-  }
   const orderCols = ($order || [idCol]).map((orderItem) => orderItem[0] === "!" ? sql`-(${lookup(orderItem.slice(1))})::float8` : lookup(orderItem));
   Object.entries({ $after, $before, $since, $until }).forEach(([name, value]) => {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
+  const order = !$group && join(($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 orderKey = $order && getJsonBuildTrusted({ $order: sql`${JSON.stringify($order)}::jsonb` });
   const cursorKey = getJsonBuildTrusted({
     $cursor: sql`jsonb_build_array(${join(groupCols || orderCols)})`
@@ -364,7 +372,7 @@ function getArgSql(_a, options) {
   return {
     meta: meta(key),
     where,
-    order: $order && join(orderCols.map((col) => sql`${col} ${$last ? sql`DESC` : sql`ASC`}`), `, `),
+    order,
     group,
     limit: $first || $last
   };
@@ -590,7 +598,7 @@ class Db {
       promises.push(getByIds());
     await Promise.all(promises);
     log("dbRead", rootQuery, results);
-    return slice(finalize(results, wrap(query, prefix)), rootQuery).known || [];
+    return finalize(results, wrap(query, prefix));
   }
   async write(rootChange, tableOptions) {
     const { prefix } = tableOptions;

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.21",
+  "version": "0.15.22-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.21",
+    "@graffy/common": "0.15.22-alpha.1",
     "sql-template-tag": "^4.1.0",
     "debug": "^4.3.3"
   },

package/types/sql/clauses.d.ts

@@ -1,4 +1,5 @@
-export function vertexSql(array: any): Sql;
+export function vertexSql(array: any, nullValue: any): Sql;
+export function cubeLiteralSql(value: any): Sql;
 export function getJsonBuildTrusted(variadic: any): Sql;
 export function lookup(prop: any): Sql;
 export function getSelectCols(table: any, projection?: any): Sql;

package/types/sql/getArgSql.d.ts

@@ -2,12 +2,15 @@
   Uses the args object (typically passed in the $key attribute)
 
   @param {object} args
-  @param {object} options
+  @param {{prefix: string, idCol: string}} options
 
   @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: object): {
+export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: {
+    prefix: string;
+    idCol: string;
+}): {
     meta: Sql;
     where: Sql[];
     order?: Sql;