@graffy/pg 0.15.14-alpha.1 → 0.15.14

package/index.cjs

@@ -158,68 +158,6 @@ function simplify(node) {
   }
   return node;
 }
-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$1(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 !== 2 || !Array.isArray(value[0])) {
-      throw Error("pg.castValue_bad_cube" + JSON.stringify(value));
-    }
-    return sql__default["default"]`${sqlOp} cube(${sql.join(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$1(ast[2], type, op);
-    return sql__default["default"]`${lhs} ${rhs}`;
-  }
-  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]) => {
@@ -264,10 +202,10 @@ const getSelectCols = (table, projection = null) => {
   }
   return sql__default["default"]`jsonb_build_object(${sql.join(sqls, ", ")})`;
 };
-function infJoin(array) {
+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(value, type, name) {
+function castValue$1(value, type, name, isPut) {
   if (!type)
     throw Error("pg.write_no_column " + name);
   if (value instanceof sql.Sql)
@@ -275,13 +213,13 @@ function castValue(value, type, name) {
   if (value === null)
     return sql__default["default"]`NULL`;
   if (type === "jsonb") {
-    return value.$put ? JSON.stringify(stripAttributes(value)) : sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, 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(${infJoin(value[0])}, ${infJoin(value[1])})` : sql__default["default"]`cube(${infJoin(value)})`;
+    return Array.isArray(value[0]) ? sql__default["default"]`cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql__default["default"]`cube(${vertexSql(value)})`;
   }
   return value;
 }
@@ -290,12 +228,12 @@ 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(val, options.schema.types[col], col));
+    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(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql__default["default"]`"${sql.raw(col)}" = ${castValue(val, options.schema.types[col], col)}`).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"]);
@@ -322,6 +260,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

package/index.mjs

@@ -26,7 +26,7 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-import { encodePath, isEmpty, isPlainObject, unwrap, decodeArgs, decodeQuery, slice, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
+import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, decodeQuery, slice, 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";
@@ -150,68 +150,6 @@ function simplify(node) {
   }
   return node;
 }
-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$1(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 !== 2 || !Array.isArray(value[0])) {
-      throw Error("pg.castValue_bad_cube" + JSON.stringify(value));
-    }
-    return sql`${sqlOp} cube(${join(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$1(ast[2], type, op);
-    return sql`${lhs} ${rhs}`;
-  }
-  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]) => {
@@ -256,10 +194,10 @@ const getSelectCols = (table, projection = null) => {
   }
   return sql`jsonb_build_object(${join(sqls, ", ")})`;
 };
-function infJoin(array) {
+function vertexSql(array) {
   return sql`array[${join(array.map((num) => num === Infinity ? sql`'Infinity'` : num === -Infinity ? sql`'-Infinity'` : num))}]::float8[]`;
 }
-function castValue(value, type, name) {
+function castValue$1(value, type, name, isPut) {
   if (!type)
     throw Error("pg.write_no_column " + name);
   if (value instanceof Sql)
@@ -267,13 +205,13 @@ function castValue(value, type, name) {
   if (value === null)
     return sql`NULL`;
   if (type === "jsonb") {
-    return value.$put ? JSON.stringify(stripAttributes(value)) : sql`jsonb_strip_nulls(${getJsonUpdate(value, 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(${infJoin(value[0])}, ${infJoin(value[1])})` : sql`cube(${infJoin(value)})`;
+    return Array.isArray(value[0]) ? sql`cube(${vertexSql(value[0])}, ${vertexSql(value[1])})` : sql`cube(${vertexSql(value)})`;
   }
   return value;
 }
@@ -282,12 +220,12 @@ 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(val, options.schema.types[col], col));
+    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(([col]) => col !== options.idCol && col[0] !== "$").map(([col, val]) => sql`"${raw(col)}" = ${castValue(val, options.schema.types[col], col)}`).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"]);
@@ -314,6 +252,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

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

package/types/sql/clauses.d.ts

@@ -1,3 +1,4 @@
+export function vertexSql(array: any): Sql;
 export const nowTimestamp: Sql;
 export function getJsonBuildObject(variadic: any): Sql;
 export function lookup(prop: any): Sql;