@graffy/pg 0.15.10-alpha.1 → 0.15.11-alpha.2

package/Readme.md

@@ -16,42 +16,3 @@ Connection parameters should be set in environment variables. Uses the [pg](http
 
 In this document, _property names_ and _paths_ refer to the structures in the Graffy graph objects, _columns_ refer to Postgres table columns and _args_ refer to structures in the filtering and pagination arguments of Graffy query objects.
 
-- **table**, the name of the PostgreSQL table
-- **columns**, an object with column names as keys and an objects describing each column as value. Each descriptor object contains a mandatory **role** property, which may be:
-
-  - **primary**, for the primary key column of this table. There must be exactly one primary column.
-  - **simple**, for a normal column, which stores the value of a particular property of this object.
-  - **default**, for a JSON column where all data that isn't mapped to another column is placed. There may be zero or one default column.
-  - **version**, for a numeric column used to store the version number of the object. There must be exactly one version column.
-  - **gin**, for a JSONB column into which some properties are copied, for enabling filtering and sorting using that property.
-  - **tsv**, for an indexed tsvector column for full text searches
-  - **trgm**, for a trigram-indexed text column for typeahead searches
-
-  The descriptor object may also have the following additional properties.
-
-  - **prop**, the property name or path that maps to this column. Valid for **simple** and **primary** columns. Defaults to the name of the column.
-  - **props**, an array of property names or paths to copy into a **gin**, **tsv** or **trgm** column. Mandatory for these columns.
-  - **arg**, the filter argument for querying a **tsv** or **trgm** column. Defaults to the column name.
-
-- **links**, an object with props as keys and link templates as values. The
-  link template is an array of strings and objects, which may contain at any _value_ position (including inside the object) a string `$$` followed by a property name. This string will be replaced with a value of that property in this object.
-- **pollInterval**, the interval at which the table is polled, for watch.
-
-```js
-{
-  table: string, // the name of the PostgreSQL table
-  columns: {
-    [columnName]: {
-      role: 'primary' | 'simple' | 'default' |
-            'version' | 'gin' | 'tsv' | 'trgm',
-      prop: string // primary or simple only
-      props: string[] // gin, tsv or trgm only
-      arg: string // tsv or trgm only
-    }
-  },
-  links: {
-    [prop]: string | (string|object)[]
-  }
-  pollInterval: number
-}
-```

package/index.cjs

@@ -185,10 +185,10 @@ function getCompatibleTypes(value) {
     return "text";
 }
 function getSql(filter, getLookupSql, getColumnType = defaultColumnType) {
-  function lookup(string) {
+  function lookup(string, type) {
     if (string.substr(0, 3) === "el$")
       return sql__default["default"]`"${sql.raw(string)}"`;
-    return getLookupSql(string);
+    return getLookupSql(string, type);
   }
   function binop(op, left, right) {
     const lType = left.substr(0, 3) === "el$" ? "any" : getColumnType(left);
@@ -196,7 +196,7 @@ function getSql(filter, getLookupSql, getColumnType = defaultColumnType) {
     if (lType === "any" || rType === "any" || rType === lType) {
       return sql__default["default"]`${lookup(left)} ${sql.raw(op)} ${right}`;
     } else {
-      return sql__default["default"]`(${lookup(left)})::${sql.raw(rType)} ${sql.raw(op)} ${right}`;
+      return sql__default["default"]`(${lookup(left, rType)})::${sql.raw(rType)} ${sql.raw(op)} ${right}`;
     }
   }
   function getNodeSql(ast) {
@@ -269,7 +269,7 @@ const getJsonBuildValue = (value) => {
     return value;
   if (typeof value === "string")
     return sql__default["default"]`${value}::text`;
-  return sql__default["default"]`${stripAttributes(value)}::jsonb`;
+  return sql__default["default"]`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const getSelectCols = (table) => {
   return sql__default["default"]`to_jsonb("${sql.raw(table)}")`;
@@ -279,13 +279,13 @@ const getInsert = (row, options) => {
   const vals = [];
   Object.entries(row).filter(([name]) => name !== options.verCol && name[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
     cols.push(sql__default["default"]`"${sql.raw(col)}"`);
-    vals.push(val instanceof sql.Sql ? val : stripAttributes(val));
+    vals.push(val instanceof sql.Sql || typeof val !== "object" || !val ? val : sql__default["default"]`${JSON.stringify(stripAttributes(val))}::jsonb`);
   });
   return { cols: sql.join(cols, ", "), vals: sql.join(vals, ", ") };
 };
 const getUpdates = (row, options) => {
   return sql.join(Object.entries(row).filter(([name]) => name !== options.idCol && name[0] !== "$").map(([name, value]) => {
-    return sql__default["default"]`"${sql.raw(name)}" = ${typeof value === "object" && value && !value.$put ? sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : stripAttributes(value)}`;
+    return sql__default["default"]`"${sql.raw(name)}" = ${value instanceof sql.Sql || typeof value !== "object" || !value ? value : !value.$put ? sql__default["default"]`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : sql__default["default"]`${JSON.stringify(stripAttributes(value))}::jsonb`}`;
   }).concat(sql__default["default"]`"${sql.raw(options.verCol)}" = ${nowTimestamp}`), ", ");
 };
 function getJsonUpdate(_a, col, path) {
@@ -304,14 +304,14 @@ function stripAttributes(object) {
   if (typeof object !== "object" || !object)
     return object;
   if (Array.isArray(object)) {
-    return JSON.stringify(object.map((item) => stripAttributes(item)));
+    return object.map((item) => stripAttributes(item));
   }
-  return JSON.stringify(Object.entries(object).reduce((out, [key, val]) => {
+  return Object.entries(object).reduce((out, [key, val]) => {
     if (key === "$put")
       return out;
     out[key] = stripAttributes(val);
     return out;
-  }, {}));
+  }, {});
 }
 const getIdMeta = ({ idCol }) => getJsonBuildObject({
   $key: sql__default["default"]`"${sql.raw(idCol)}"`,
@@ -326,9 +326,10 @@ 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 } = _a, filter = __objRest(_a, ["$order"]);
   const { prefix, idCol } = options;
-  const lookup = (prop) => {
+  const lookup = (prop, type) => {
     const [prefix2, ...suffix] = common.encodePath(prop);
-    return suffix.length ? sql__default["default"]`"${sql.raw(prefix2)}" #> ${suffix}` : sql__default["default"]`"${sql.raw(prefix2)}"`;
+    const op = type === "text" ? sql__default["default"]`#>>` : sql__default["default"]`#>`;
+    return suffix.length ? sql__default["default"]`"${sql.raw(prefix2)}" ${op} ${suffix}` : sql__default["default"]`"${sql.raw(prefix2)}"`;
   };
   const getType = (prop) => {
     const [_prefix, ...suffix] = common.encodePath(prop);
@@ -525,7 +526,7 @@ class Db {
       promises.push(getByIds());
     await Promise.all(promises);
     log("dbRead", rootQuery, results);
-    return common.slice(common.finalize(results, rootQuery), rootQuery).known || [];
+    return common.slice(common.finalize(results, common.wrap(query, prefix)), rootQuery).known || [];
   }
   async write(rootChange, tableOptions) {
     const sqls = [];
@@ -582,7 +583,9 @@ const pg = ({ table, idCol, verCol, links, connection }) => (store) => {
     const writePromise = transactionDb.write(change, tableOpts, writeOpts);
     const remainingChange = common.remove(change, prefix);
     const nextPromise = next(remainingChange);
-    return Promise.all([writePromise, nextPromise]).then(([writeRes, nextRes]) => common.merge(writeRes, nextRes));
+    return Promise.all([writePromise, nextPromise]).then(([writeRes, nextRes]) => {
+      return common.merge(writeRes, nextRes);
+    });
   }
 };
 exports.pg = pg;

package/index.mjs

@@ -26,9 +26,9 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, slice, finalize, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
+import { isEmpty, encodePath, isPlainObject, unwrap, decodeArgs, slice, finalize, wrap, isRange, decodeGraph, mergeObject, merge, encodeGraph, wrapObject, remove } from "@graffy/common";
 import { Pool, Client } from "pg";
-import sql, { join, raw, empty, Sql } from "sql-template-tag";
+import sql, { join, raw, Sql, empty } from "sql-template-tag";
 import debug from "debug";
 const valid = {
   $eq: true,
@@ -177,10 +177,10 @@ function getCompatibleTypes(value) {
     return "text";
 }
 function getSql(filter, getLookupSql, getColumnType = defaultColumnType) {
-  function lookup(string) {
+  function lookup(string, type) {
     if (string.substr(0, 3) === "el$")
       return sql`"${raw(string)}"`;
-    return getLookupSql(string);
+    return getLookupSql(string, type);
   }
   function binop(op, left, right) {
     const lType = left.substr(0, 3) === "el$" ? "any" : getColumnType(left);
@@ -188,7 +188,7 @@ function getSql(filter, getLookupSql, getColumnType = defaultColumnType) {
     if (lType === "any" || rType === "any" || rType === lType) {
       return sql`${lookup(left)} ${raw(op)} ${right}`;
     } else {
-      return sql`(${lookup(left)})::${raw(rType)} ${raw(op)} ${right}`;
+      return sql`(${lookup(left, rType)})::${raw(rType)} ${raw(op)} ${right}`;
     }
   }
   function getNodeSql(ast) {
@@ -261,7 +261,7 @@ const getJsonBuildValue = (value) => {
     return value;
   if (typeof value === "string")
     return sql`${value}::text`;
-  return sql`${stripAttributes(value)}::jsonb`;
+  return sql`${JSON.stringify(stripAttributes(value))}::jsonb`;
 };
 const getSelectCols = (table) => {
   return sql`to_jsonb("${raw(table)}")`;
@@ -271,13 +271,13 @@ const getInsert = (row, options) => {
   const vals = [];
   Object.entries(row).filter(([name]) => name !== options.verCol && name[0] !== "$").concat([[options.verCol, nowTimestamp]]).forEach(([col, val]) => {
     cols.push(sql`"${raw(col)}"`);
-    vals.push(val instanceof Sql ? val : stripAttributes(val));
+    vals.push(val instanceof Sql || typeof val !== "object" || !val ? val : sql`${JSON.stringify(stripAttributes(val))}::jsonb`);
   });
   return { cols: join(cols, ", "), vals: join(vals, ", ") };
 };
 const getUpdates = (row, options) => {
   return join(Object.entries(row).filter(([name]) => name !== options.idCol && name[0] !== "$").map(([name, value]) => {
-    return sql`"${raw(name)}" = ${typeof value === "object" && value && !value.$put ? sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : stripAttributes(value)}`;
+    return sql`"${raw(name)}" = ${value instanceof Sql || typeof value !== "object" || !value ? value : !value.$put ? sql`jsonb_strip_nulls(${getJsonUpdate(value, name, [])})` : sql`${JSON.stringify(stripAttributes(value))}::jsonb`}`;
   }).concat(sql`"${raw(options.verCol)}" = ${nowTimestamp}`), ", ");
 };
 function getJsonUpdate(_a, col, path) {
@@ -296,14 +296,14 @@ function stripAttributes(object) {
   if (typeof object !== "object" || !object)
     return object;
   if (Array.isArray(object)) {
-    return JSON.stringify(object.map((item) => stripAttributes(item)));
+    return object.map((item) => stripAttributes(item));
   }
-  return JSON.stringify(Object.entries(object).reduce((out, [key, val]) => {
+  return Object.entries(object).reduce((out, [key, val]) => {
     if (key === "$put")
       return out;
     out[key] = stripAttributes(val);
     return out;
-  }, {}));
+  }, {});
 }
 const getIdMeta = ({ idCol }) => getJsonBuildObject({
   $key: sql`"${raw(idCol)}"`,
@@ -318,9 +318,10 @@ 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 } = _a, filter = __objRest(_a, ["$order"]);
   const { prefix, idCol } = options;
-  const lookup = (prop) => {
+  const lookup = (prop, type) => {
     const [prefix2, ...suffix] = encodePath(prop);
-    return suffix.length ? sql`"${raw(prefix2)}" #> ${suffix}` : sql`"${raw(prefix2)}"`;
+    const op = type === "text" ? sql`#>>` : sql`#>`;
+    return suffix.length ? sql`"${raw(prefix2)}" ${op} ${suffix}` : sql`"${raw(prefix2)}"`;
   };
   const getType = (prop) => {
     const [_prefix, ...suffix] = encodePath(prop);
@@ -517,7 +518,7 @@ class Db {
       promises.push(getByIds());
     await Promise.all(promises);
     log("dbRead", rootQuery, results);
-    return slice(finalize(results, rootQuery), rootQuery).known || [];
+    return slice(finalize(results, wrap(query, prefix)), rootQuery).known || [];
   }
   async write(rootChange, tableOptions) {
     const sqls = [];
@@ -574,7 +575,9 @@ const pg = ({ table, idCol, verCol, links, connection }) => (store) => {
     const writePromise = transactionDb.write(change, tableOpts, writeOpts);
     const remainingChange = remove(change, prefix);
     const nextPromise = next(remainingChange);
-    return Promise.all([writePromise, nextPromise]).then(([writeRes, nextRes]) => merge(writeRes, nextRes));
+    return Promise.all([writePromise, nextPromise]).then(([writeRes, nextRes]) => {
+      return merge(writeRes, nextRes);
+    });
   }
 };
 export { pg };

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