@graffy/pg 0.15.14 → 0.15.15-alpha.1

package/index.cjs

@@ -159,7 +159,7 @@ function simplify(node) {
   return node;
 }
 const nowTimestamp = sql__default["default"]`cast(extract(epoch from now()) as integer)`;
-const getJsonBuildObject = (variadic) => {
+const getJsonBuildTrusted = (variadic) => {
   const args = sql.join(Object.entries(variadic).map(([name, value]) => {
     return sql__default["default"]`'${sql.raw(name)}', ${getJsonBuildValue(value)}`;
   }));
@@ -205,7 +205,7 @@ const getSelectCols = (table, projection = null) => {
 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) {
+function castValue(value, type, name, isPut) {
   if (!type)
     throw Error("pg.write_no_column " + name);
   if (value instanceof sql.Sql)
@@ -228,24 +228,24 @@ const getInsert = (row, options) => {
   const vals = [];
   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(castValue$1(val, options.schema.types[col], col, row.$put));
+    vals.push(castValue(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(([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}`), ", ");
+  return sql.join(Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql__default["default"]`"${sql.raw(col)}" = ${castValue(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"]);
-  if ($put)
-    return JSON.stringify(object);
+function getJsonUpdate(object, col, path) {
+  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
+    return getJsonBuildValue(object);
+  }
   const curr = sql__default["default"]`"${sql.raw(col)}"${path.length ? sql__default["default"]`#>${path}` : sql.empty}`;
   if (common.isEmpty(object))
     return curr;
   return sql__default["default"]`(case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
-  end) || jsonb_build_object(${sql.join(Object.entries(object).map(([key, value]) => sql__default["default"]`${key}::text, ${typeof value === "object" && value && !Array.isArray(value) ? getJsonUpdate(value, col, path.concat(key)) : sql__default["default"]`${getJsonBuildValue(value)}`}`), ", ")})`;
+  end) || jsonb_build_object(${sql.join(Object.entries(object).map(([key, value]) => sql__default["default"]`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`), ", ")})`;
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -277,27 +277,31 @@ const opSql = {
   $cts: sql__default["default"]`@>`,
   $ctd: sql__default["default"]`<@`
 };
-function castValue(value, type, op) {
+function getBinarySql(lhs, type, op, value) {
   if (value === null && op === "$eq")
-    return sql__default["default"]`IS NULL`;
+    return sql__default["default"]`${lhs} IS NULL`;
   if (value === null && op === "$neq")
-    return sql__default["default"]`IS NOT NULL`;
+    return sql__default["default"]`${lhs} 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)})`;
+    return sql__default["default"]`${lhs} ${sqlOp} (${sql.join(value)})`;
+  }
+  if (op === "$re" || op === "$ire") {
+    const castLhs = type === "text" ? lhs : sql__default["default"]`(${lhs})::text`;
+    return sql__default["default"]`${castLhs} ${sqlOp} ${String(value)}`;
   }
   if (type === "jsonb") {
-    return sql__default["default"]`${sqlOp} ${JSON.stringify(value)}::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.castValue_bad_cube" + JSON.stringify(value));
+      throw Error("pg.getBinarySql_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 Array.isArray(value[0]) ? sql__default["default"]`${lhs} ${sqlOp} cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql__default["default"]`${lhs} ${sqlOp} cube(${vertexSql(value)})`;
   }
-  return sql__default["default"]`${sqlOp} ${value}`;
+  return sql__default["default"]`${lhs} ${sqlOp} ${value}`;
 }
 function getSql(filter, options) {
   function getNodeSql(ast) {
@@ -317,27 +321,26 @@ function getSql(filter, options) {
       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 getBinarySql(lhs, type, op, ast[2]);
   }
   return getNodeSql(getAst(filter));
 }
-const getIdMeta = ({ idCol }) => getJsonBuildObject({
+const getIdMeta = ({ idCol }) => getJsonBuildTrusted({
   $key: sql__default["default"]`"${sql.raw(idCol)}"`,
   $ver: nowTimestamp
 });
-const getArgMeta = (key, prefix, idCol) => getJsonBuildObject({
+const getArgMeta = (key, prefix, idCol) => getJsonBuildTrusted({
   $key: key,
   $ref: sql__default["default"]`jsonb_build_array(${sql.join(prefix.map((k) => sql__default["default"]`${k}::text`))}, "${sql.raw(idCol)}")`,
   $ver: nowTimestamp
 });
-const getAggMeta = (key, $group) => getJsonBuildObject({
-  $key: sql.join([key, getJsonBuildObject({ $group })].filter(Boolean), " || "),
+const getAggMeta = (key, $group) => getJsonBuildTrusted({
+  $key: sql.join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || "),
   $ver: nowTimestamp
 });
-function getArgSql(_c, options) {
-  var _d = _c, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _d, rest = __objRest(_d, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
-  const _a = rest, { $order, $group } = _a, filter = __objRest(_a, ["$order", "$group"]);
+function getArgSql(_a, options) {
+  var _b = _a, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _b, rest = __objRest(_b, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
+  const _a2 = rest, { $order, $group } = _a2, filter = __objRest(_a2, ["$order", "$group"]);
   const { prefix, idCol } = options;
   if ($order && $group) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
@@ -362,8 +365,8 @@ function getArgSql(_c, options) {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
-  const orderQuery = $order && getJsonBuildObject({ $order: sql__default["default"]`${JSON.stringify($order)}::jsonb` });
-  const cursorQuery = getJsonBuildObject({
+  const orderQuery = $order && getJsonBuildTrusted({ $order: sql__default["default"]`${JSON.stringify($order)}::jsonb` });
+  const cursorQuery = getJsonBuildTrusted({
     $cursor: sql__default["default"]`jsonb_build_array(${sql.join(groupCols || orderCols)})`
   });
   key = sql__default["default"]`(${sql.join([key, orderQuery, cursorQuery].filter(Boolean), ` || `)})`;
@@ -481,7 +484,7 @@ function del(arg, options) {
   return sql__default["default"]`
     DELETE FROM "${sql.raw(table)}"
     WHERE ${where}
-    RETURNING (${getJsonBuildObject({ $key: arg })})`;
+    RETURNING (${getJsonBuildTrusted({ $key: arg })})`;
 }
 const log = debug__default["default"]("graffy:pg:db");
 class Db {

package/index.mjs

@@ -151,7 +151,7 @@ function simplify(node) {
   return node;
 }
 const nowTimestamp = sql`cast(extract(epoch from now()) as integer)`;
-const getJsonBuildObject = (variadic) => {
+const getJsonBuildTrusted = (variadic) => {
   const args = join(Object.entries(variadic).map(([name, value]) => {
     return sql`'${raw(name)}', ${getJsonBuildValue(value)}`;
   }));
@@ -197,7 +197,7 @@ const getSelectCols = (table, projection = null) => {
 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) {
+function castValue(value, type, name, isPut) {
   if (!type)
     throw Error("pg.write_no_column " + name);
   if (value instanceof Sql)
@@ -220,24 +220,24 @@ const getInsert = (row, options) => {
   const vals = [];
   Object.entries(row).filter(([col]) => col !== options.verCol && col[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
     cols.push(sql`"${raw(col)}"`);
-    vals.push(castValue$1(val, options.schema.types[col], col, row.$put));
+    vals.push(castValue(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(([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}`), ", ");
+  return join(Object.entries(row).filter(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql`"${raw(col)}" = ${castValue(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"]);
-  if ($put)
-    return JSON.stringify(object);
+function getJsonUpdate(object, col, path) {
+  if (!object || typeof object !== "object" || Array.isArray(object) || object.$put) {
+    return getJsonBuildValue(object);
+  }
   const curr = sql`"${raw(col)}"${path.length ? sql`#>${path}` : empty}`;
   if (isEmpty(object))
     return curr;
   return sql`(case jsonb_typeof(${curr})
     when 'object' then ${curr}
     else '{}'::jsonb
-  end) || jsonb_build_object(${join(Object.entries(object).map(([key, value]) => sql`${key}::text, ${typeof value === "object" && value && !Array.isArray(value) ? getJsonUpdate(value, col, path.concat(key)) : sql`${getJsonBuildValue(value)}`}`), ", ")})`;
+  end) || jsonb_build_object(${join(Object.entries(object).map(([key, value]) => sql`${key}::text, ${getJsonUpdate(value, col, path.concat(key))}`), ", ")})`;
 }
 function stripAttributes(object) {
   if (typeof object !== "object" || !object)
@@ -269,27 +269,31 @@ const opSql = {
   $cts: sql`@>`,
   $ctd: sql`<@`
 };
-function castValue(value, type, op) {
+function getBinarySql(lhs, type, op, value) {
   if (value === null && op === "$eq")
-    return sql`IS NULL`;
+    return sql`${lhs} IS NULL`;
   if (value === null && op === "$neq")
-    return sql`IS NOT NULL`;
+    return sql`${lhs} 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)})`;
+    return sql`${lhs} ${sqlOp} (${join(value)})`;
+  }
+  if (op === "$re" || op === "$ire") {
+    const castLhs = type === "text" ? lhs : sql`(${lhs})::text`;
+    return sql`${castLhs} ${sqlOp} ${String(value)}`;
   }
   if (type === "jsonb") {
-    return sql`${sqlOp} ${JSON.stringify(value)}::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.castValue_bad_cube" + JSON.stringify(value));
+      throw Error("pg.getBinarySql_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 Array.isArray(value[0]) ? sql`${lhs} ${sqlOp} cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql`${lhs} ${sqlOp} cube(${vertexSql(value)})`;
   }
-  return sql`${sqlOp} ${value}`;
+  return sql`${lhs} ${sqlOp} ${value}`;
 }
 function getSql(filter, options) {
   function getNodeSql(ast) {
@@ -309,27 +313,26 @@ function getSql(filter, options) {
       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 getBinarySql(lhs, type, op, ast[2]);
   }
   return getNodeSql(getAst(filter));
 }
-const getIdMeta = ({ idCol }) => getJsonBuildObject({
+const getIdMeta = ({ idCol }) => getJsonBuildTrusted({
   $key: sql`"${raw(idCol)}"`,
   $ver: nowTimestamp
 });
-const getArgMeta = (key, prefix, idCol) => getJsonBuildObject({
+const getArgMeta = (key, prefix, idCol) => getJsonBuildTrusted({
   $key: key,
   $ref: sql`jsonb_build_array(${join(prefix.map((k) => sql`${k}::text`))}, "${raw(idCol)}")`,
   $ver: nowTimestamp
 });
-const getAggMeta = (key, $group) => getJsonBuildObject({
-  $key: join([key, getJsonBuildObject({ $group })].filter(Boolean), " || "),
+const getAggMeta = (key, $group) => getJsonBuildTrusted({
+  $key: join([key, getJsonBuildTrusted({ $group })].filter(Boolean), " || "),
   $ver: nowTimestamp
 });
-function getArgSql(_c, options) {
-  var _d = _c, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _d, rest = __objRest(_d, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
-  const _a = rest, { $order, $group } = _a, filter = __objRest(_a, ["$order", "$group"]);
+function getArgSql(_a, options) {
+  var _b = _a, { $first, $last, $after, $before, $since, $until, $all, $cursor: _ } = _b, rest = __objRest(_b, ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"]);
+  const _a2 = rest, { $order, $group } = _a2, filter = __objRest(_a2, ["$order", "$group"]);
   const { prefix, idCol } = options;
   if ($order && $group) {
     throw Error("pg_arg.order_and_group_unsupported in " + prefix);
@@ -354,8 +357,8 @@ function getArgSql(_c, options) {
     if (value)
       where.push(getBoundCond(orderCols, value, name));
   });
-  const orderQuery = $order && getJsonBuildObject({ $order: sql`${JSON.stringify($order)}::jsonb` });
-  const cursorQuery = getJsonBuildObject({
+  const orderQuery = $order && getJsonBuildTrusted({ $order: sql`${JSON.stringify($order)}::jsonb` });
+  const cursorQuery = getJsonBuildTrusted({
     $cursor: sql`jsonb_build_array(${join(groupCols || orderCols)})`
   });
   key = sql`(${join([key, orderQuery, cursorQuery].filter(Boolean), ` || `)})`;
@@ -473,7 +476,7 @@ function del(arg, options) {
   return sql`
     DELETE FROM "${raw(table)}"
     WHERE ${where}
-    RETURNING (${getJsonBuildObject({ $key: arg })})`;
+    RETURNING (${getJsonBuildTrusted({ $key: arg })})`;
 }
 const log = debug("graffy:pg:db");
 class Db {

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

package/types/sql/clauses.d.ts

@@ -1,6 +1,6 @@
 export function vertexSql(array: any): Sql;
 export const nowTimestamp: Sql;
-export function getJsonBuildObject(variadic: any): Sql;
+export function getJsonBuildTrusted(variadic: any): Sql;
 export function lookup(prop: any): Sql;
 export function getSelectCols(table: any, projection?: any): Sql;
 export function getInsert(row: any, options: any): {