@graffy/pg 0.15.7 → 0.15.8-alpha.1

package/cjs/Db.js

@@ -19,12 +19,10 @@ exports.default = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
 
-var _now = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/date/now"));
+var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/values"));
 
 var _flat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/flat"));
 
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 
 var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
@@ -33,6 +31,8 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
 
 var _pg = require("pg");
@@ -47,13 +47,13 @@ var _index2 = require("./sql/index.js");
 
 var _debug = _interopRequireDefault(require("debug"));
 
-function _createForOfIteratorHelperLoose(o, allowArrayLike) { var _context12; var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (it) return _bindInstanceProperty(_context12 = (it = it.call(o)).next).call(_context12, it); if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var _context10; var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (it) return _bindInstanceProperty(_context10 = (it = it.call(o)).next).call(_context10, it); if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-function _unsupportedIterableToArray(o, minLen) { var _context11; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context11 = Object.prototype.toString.call(o)).call(_context11, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { var _context9; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context9 = Object.prototype.toString.call(o)).call(_context9, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-var log = (0, _debug.default)('graffy:pg:dbwrap');
+var log = (0, _debug.default)('graffy:pg:db');
 
 var Db = /*#__PURE__*/function () {
   function Db(connection) {
@@ -67,33 +67,31 @@ var Db = /*#__PURE__*/function () {
   var _proto = Db.prototype;
 
   _proto.query = /*#__PURE__*/function () {
-    var _query = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(sqlQuery) {
-      var start, res, duration;
+    var _query = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(sql) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              start = (0, _now.default)();
-              sqlQuery.rowMode = 'array';
-              _context.next = 4;
-              return this.client.query(sqlQuery);
-
-            case 4:
-              res = _context.sent;
-              duration = (0, _now.default)() - start;
-              log('query', {
-                query: sqlQuery.text,
-                duration: duration,
-                res: res
-              });
-              return _context.abrupt("return", res);
+              sql.rowMode = 'array';
+              log('Making SQL query: ' + sql.text, (0, _values.default)(sql));
+              _context.prev = 2;
+              _context.next = 5;
+              return this.client.query(sql);
+
+            case 5:
+              return _context.abrupt("return", _context.sent);
 
             case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](2);
+              throw Error('pg.sql_error ' + _context.t0.message + ' in ' + sql.text + ' with ' + (0, _values.default)(sql));
+
+            case 11:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, this);
+      }, _callee, this, [[2, 8]]);
     }));
 
     function query(_x) {
@@ -150,9 +148,18 @@ var Db = /*#__PURE__*/function () {
             case 2:
               res = _context4.sent;
               log('Rows written', res.rowCount);
-              return _context4.abrupt("return", res.rowCount);
 
-            case 5:
+              if (res.rowCount) {
+                _context4.next = 6;
+                break;
+              }
+
+              throw Error('pg.nothing_written ' + sql.text + ' with ' + (0, _values.default)(sql));
+
+            case 6:
+              return _context4.abrupt("return", res.rows[0][0]);
+
+            case 7:
             case "end":
               return _context4.stop();
           }
@@ -171,11 +178,11 @@ var Db = /*#__PURE__*/function () {
     var _read = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(rootQuery, tableOptions) {
       var _this = this;
 
-      var idQueries, promises, results, refQuery, idCol, prefix, getByArgs, getByIds, query, _iterator, _step, node, args;
+      var idQueries, promises, results, refQuery, idCol, prefix, getByArgs, getByIds, query, _iterator, _step, node, args, _iterator2, _step2, childNode, childArgs;
 
-      return _regenerator.default.wrap(function _callee6$(_context9) {
+      return _regenerator.default.wrap(function _callee6$(_context7) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
               idQueries = {};
               promises = [];
@@ -185,27 +192,24 @@ var Db = /*#__PURE__*/function () {
 
               getByArgs = /*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(args, subQuery) {
-                  var _context5;
-
-                  var result, wrappedQuery, wrappedGraph;
-                  return _regenerator.default.wrap(function _callee4$(_context6) {
+                  var result, wrappedGraph;
+                  return _regenerator.default.wrap(function _callee4$(_context5) {
                     while (1) {
-                      switch (_context6.prev = _context6.next) {
+                      switch (_context5.prev = _context5.next) {
                         case 0:
-                          _context6.next = 2;
+                          _context5.next = 2;
                           return _this.readSql((0, _select.selectByArgs)(args, tableOptions));
 
                         case 2:
-                          result = _context6.sent;
+                          result = _context5.sent;
                           (0, _common.add)(refQuery, (0, _index.linkResult)(result, subQuery, tableOptions));
-                          wrappedQuery = (0, _common.wrap)(subQuery, (0, _concat.default)(_context5 = []).call(_context5, prefix, [args]));
                           wrappedGraph = (0, _common.encodeGraph)((0, _common.wrapObject)(result, prefix));
-                          log('getByArgs', wrappedGraph, wrappedQuery, (0, _common.finalize)(wrappedGraph, wrappedQuery));
-                          (0, _common.merge)(results, (0, _common.finalize)(wrappedGraph, wrappedQuery));
+                          log('getByArgs', wrappedGraph);
+                          (0, _common.merge)(results, wrappedGraph);
 
-                        case 8:
+                        case 7:
                         case "end":
-                          return _context6.stop();
+                          return _context5.stop();
                       }
                     }
                   }, _callee4);
@@ -219,30 +223,27 @@ var Db = /*#__PURE__*/function () {
               getByIds = /*#__PURE__*/function () {
                 var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
                   var result;
-                  return _regenerator.default.wrap(function _callee5$(_context8) {
+                  return _regenerator.default.wrap(function _callee5$(_context6) {
                     while (1) {
-                      switch (_context8.prev = _context8.next) {
+                      switch (_context6.prev = _context6.next) {
                         case 0:
-                          _context8.next = 2;
+                          _context6.next = 2;
                           return _this.readSql((0, _select.selectByIds)((0, _keys.default)(idQueries), tableOptions));
 
                         case 2:
-                          result = _context8.sent;
+                          result = _context6.sent;
                           (0, _forEach.default)(result).call(result, function (object) {
-                            var _context7;
-
                             var id = object[idCol];
                             var subQuery = idQueries[id];
                             (0, _common.add)(refQuery, (0, _index.linkResult)([object], subQuery, tableOptions));
-                            var wrappedQuery = (0, _common.wrap)(subQuery, (0, _concat.default)(_context7 = []).call(_context7, prefix, [id]));
                             var wrappedGraph = (0, _common.encodeGraph)((0, _common.wrapObject)(object, prefix));
-                            log('getByIds', wrappedGraph, wrappedQuery, (0, _common.finalize)(wrappedGraph, wrappedQuery));
-                            (0, _common.merge)(results, (0, _common.finalize)(wrappedGraph, wrappedQuery));
+                            log('getByIds', wrappedGraph);
+                            (0, _common.merge)(results, wrappedGraph);
                           });
 
                         case 4:
                         case "end":
-                          return _context8.stop();
+                          return _context6.stop();
                       }
                     }
                   }, _callee5);
@@ -260,23 +261,31 @@ var Db = /*#__PURE__*/function () {
                 args = (0, _common.decodeArgs)(node);
 
                 if ((0, _common.isPlainObject)(args)) {
-                  promises.push(getByArgs(args, node.children));
+                  if (node.prefix) {
+                    for (_iterator2 = _createForOfIteratorHelperLoose(node.children); !(_step2 = _iterator2()).done;) {
+                      childNode = _step2.value;
+                      childArgs = (0, _common.decodeArgs)(childNode);
+                      promises.push(getByArgs((0, _extends2.default)({}, args, childArgs), childNode.children));
+                    }
+                  } else {
+                    promises.push(getByArgs(args, node.children));
+                  }
                 } else {
                   idQueries[node.key] = node.children;
                 }
               }
 
               if (!(0, _common.isEmpty)(idQueries)) promises.push(getByIds());
-              _context9.next = 12;
+              _context7.next = 12;
               return _promise.default.all(promises);
 
             case 12:
               log('dbRead', rootQuery, results);
-              return _context9.abrupt("return", (0, _sliceInstanceProperty(_common))(results, rootQuery).known || []);
+              return _context7.abrupt("return", (0, _sliceInstanceProperty(_common))((0, _common.finalize)(results, rootQuery), rootQuery).known || []);
 
             case 14:
             case "end":
-              return _context9.stop();
+              return _context7.stop();
           }
         }
       }, _callee6);
@@ -293,11 +302,11 @@ var Db = /*#__PURE__*/function () {
     var _write = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(rootChange, tableOptions) {
       var _this2 = this;
 
-      var sqls, addToQuery, prefix, change, _iterator2, _step2, node, object, arg;
+      var sqls, addToQuery, prefix, change, _iterator3, _step3, node, arg, object, result;
 
-      return _regenerator.default.wrap(function _callee7$(_context10) {
+      return _regenerator.default.wrap(function _callee7$(_context8) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
               sqls = [];
 
@@ -307,53 +316,63 @@ var Db = /*#__PURE__*/function () {
 
               prefix = tableOptions.prefix;
               change = (0, _common.unwrap)(rootChange, prefix);
-              _iterator2 = _createForOfIteratorHelperLoose(change);
+              _iterator3 = _createForOfIteratorHelperLoose(change);
 
             case 5:
-              if ((_step2 = _iterator2()).done) {
-                _context10.next = 16;
+              if ((_step3 = _iterator3()).done) {
+                _context8.next = 17;
                 break;
               }
 
-              node = _step2.value;
+              node = _step3.value;
 
               if (!(0, _common.isRange)(node)) {
-                _context10.next = 9;
+                _context8.next = 9;
                 break;
               }
 
               throw Error(node.key === node.end ? 'pg_write.delete_unsupported' : 'pg_write.write_range_unsupported');
 
             case 9:
-              object = (0, _common.decodeGraph)(node.children);
               arg = (0, _common.decodeArgs)(node);
+              object = (0, _common.decodeGraph)(node.children);
+
+              if ((0, _common.isPlainObject)(arg)) {
+                (0, _common.mergeObject)(object, arg);
+              } else {
+                object.id = arg;
+              }
 
               if (!(object.$put && object.$put !== true)) {
-                _context10.next = 13;
+                _context8.next = 14;
                 break;
               }
 
               throw Error('pg_write.partial_put_unsupported');
 
-            case 13:
+            case 14:
               object.$put ? addToQuery((0, _index2.put)(object, arg, tableOptions)) : addToQuery((0, _index2.patch)(object, arg, tableOptions));
 
-            case 14:
-              _context10.next = 5;
+            case 15:
+              _context8.next = 5;
               break;
 
-            case 16:
-              _context10.next = 18;
+            case 17:
+              result = [];
+              _context8.next = 20;
               return _promise.default.all((0, _map.default)(sqls).call(sqls, function (sql) {
-                return _this2.writeSql(sql);
+                return _this2.writeSql(sql).then(function (object) {
+                  (0, _common.merge)(result, (0, _common.encodeGraph)((0, _common.wrapObject)(object, prefix)));
+                });
               }));
 
-            case 18:
-              return _context10.abrupt("return", rootChange);
+            case 20:
+              log('dbWrite', rootChange, result);
+              return _context8.abrupt("return", result);
 
-            case 19:
+            case 22:
             case "end":
-              return _context10.stop();
+              return _context8.stop();
           }
         }
       }, _callee7);

package/cjs/filter/getSql.js

@@ -19,7 +19,7 @@ var _sqlTemplateTag = _interopRequireWildcard(require("sql-template-tag"));
 
 var _getAst = _interopRequireDefault(require("./getAst.js"));
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21, _templateObject22;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -36,61 +36,72 @@ function getSql(filter, getLookupSql) {
 
     switch (ast[0]) {
       case '$eq':
-        return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["", " = ", ""])), lhs(ast[1]), ast[2]);
+        if (ast[2] === null) return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["", " IS NULL"])), lhs(ast[1]));
+        return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["", " = ", ""])), lhs(ast[1]), ast[2]);
 
-      case '$ne':
-        return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["", " <> ", ""])), lhs(ast[1]), ast[2]);
+      case '$neq':
+        if (ast[2] === null) return (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["", " IS NOT NULL"])), lhs(ast[1]));
+        return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["", " <> ", ""])), lhs(ast[1]), ast[2]);
 
       case '$lt':
-        return (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", ""])), lhs(ast[1]), ast[2]);
 
       case '$lte':
-        return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["", " <= ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["", " <= ", ""])), lhs(ast[1]), ast[2]);
 
       case '$gt':
-        return (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", ""])), lhs(ast[1]), ast[2]);
 
       case '$gte':
-        return (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["", " >= ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteralLoose2.default)(["", " >= ", ""])), lhs(ast[1]), ast[2]);
+
+      case '$re':
+        return (0, _sqlTemplateTag.default)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteralLoose2.default)(["", " ~ ", ""])), lhs(ast[1]), ast[2]);
+
+      case '$ire':
+        return (0, _sqlTemplateTag.default)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["", " ~* ", ""])), lhs(ast[1]), ast[2]);
 
       case '$in':
-        return (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["", " IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteralLoose2.default)(["", " IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
 
       case '$nin':
-        return (0, _sqlTemplateTag.default)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteralLoose2.default)(["", " NOT IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteralLoose2.default)(["", " NOT IN (", ")"])), lhs(ast[1]), (0, _sqlTemplateTag.join)(ast[2]));
 
       case '$cts':
-        return (0, _sqlTemplateTag.default)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteralLoose2.default)(["", " @> ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteralLoose2.default)(["", " @> ", ""])), lhs(ast[1]), ast[2]);
 
       case '$ctd':
-        return (0, _sqlTemplateTag.default)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["", " <@ ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteralLoose2.default)(["", " <@ ", ""])), lhs(ast[1]), ast[2]);
 
       case '$ovp':
-        return (0, _sqlTemplateTag.default)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteralLoose2.default)(["", " && ", ""])), lhs(ast[1]), ast[2]);
+        return (0, _sqlTemplateTag.default)(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteralLoose2.default)(["", " && ", ""])), lhs(ast[1]), ast[2]);
 
       case '$and':
-        return (0, _sqlTemplateTag.default)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context = ast[1]).call(_context, function (node) {
+        return (0, _sqlTemplateTag.default)(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context = ast[1]).call(_context, function (node) {
           return getNodeSql(node);
         }), ") AND ("));
 
       case '$or':
-        return (0, _sqlTemplateTag.default)(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context2 = ast[1]).call(_context2, function (node) {
+        return (0, _sqlTemplateTag.default)(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context2 = ast[1]).call(_context2, function (node) {
           return getNodeSql(node);
         }), ") OR ("));
 
       case '$not':
-        return (0, _sqlTemplateTag.default)(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteralLoose2.default)(["NOT (", ")"])), getNodeSql(ast[1]));
+        return (0, _sqlTemplateTag.default)(_templateObject19 || (_templateObject19 = (0, _taggedTemplateLiteralLoose2.default)(["NOT (", ")"])), getNodeSql(ast[1]));
 
       case '$any':
-        return (0, _sqlTemplateTag.default)(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3]), lhs(ast[1]), lhs(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject20 || (_templateObject20 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3]), lhs(ast[1]), lhs(ast[2]));
 
       case '$all':
-        return (0, _sqlTemplateTag.default)(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_and(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3]), lhs(ast[1]), lhs(ast[2]));
+        return (0, _sqlTemplateTag.default)(_templateObject21 || (_templateObject21 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_and(", ") FROM UNNEST(", ") ", ")"])), getNodeSql(ast[3]), lhs(ast[1]), lhs(ast[2]));
 
       case '$has':
-        return (0, _sqlTemplateTag.default)(_templateObject18 || (_templateObject18 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context3 = ast[3]).call(_context3, function (node) {
+        return (0, _sqlTemplateTag.default)(_templateObject22 || (_templateObject22 = (0, _taggedTemplateLiteralLoose2.default)(["(SELECT bool_or(", ") FROM UNNEST(", ") ", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)(_context3 = ast[3]).call(_context3, function (node) {
           return getNodeSql(node);
         }), ") AND bool_or("), lhs(ast[1]), lhs(ast[2]));
+
+      default:
+        throw Error('pg.getSql_unknown_operator: ' + ast[0]);
     }
   }
 

package/cjs/index.js

@@ -12,6 +12,11 @@ var _Db = _interopRequireDefault(require("./Db.js"));
 var _excluded = ["transactionDb"],
     _excluded2 = ["transactionDb"];
 
+/**
+ *
+ * @param {{table?: string, idCol?: string, verCol?: string, links?: object, connection?: any}} param0
+ * @returns
+ */
 var pg = function pg(_ref) {
   var table = _ref.table,
       idCol = _ref.idCol,

package/cjs/sql/getArgSql.js

@@ -41,7 +41,7 @@ var _clauses = require("./clauses.js");
 
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15;
 
-var _excluded = ["$first", "$last", "$after", "$before", "$since", "$until", "$cursor"],
+var _excluded = ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"],
     _excluded2 = ["$order"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -66,6 +66,7 @@ function getArgSql(_ref, options) {
       $before = _ref.$before,
       $since = _ref.$since,
       $until = _ref.$until,
+      $all = _ref.$all,
       _ = _ref.$cursor,
       rest = (0, _objectWithoutPropertiesLoose2.default)(_ref, _excluded);
   var $order = rest.$order,
@@ -85,7 +86,7 @@ function getArgSql(_ref, options) {
     return (0, _getMeta.getArgMeta)(key, prefix, idCol);
   };
 
-  var hasRangeArg = $before || $after || $since || $until || $first || $last || $order;
+  var hasRangeArg = $before || $after || $since || $until || $first || $last || $all || $order;
   var key;
   var where = [];
 
@@ -99,6 +100,12 @@ function getArgSql(_ref, options) {
     where: where,
     limit: 1
   };
+
+  if ((0, _common.isEmpty)(rest)) {
+    // TODO: Allow these.
+    throw Error('pg_arg.pagination_only_unsupported in ' + prefix);
+  }
+
   var orderCols = (0, _map.default)(_context = $order || [idCol]).call(_context, lookup);
   (0, _forEach.default)(_context2 = (0, _entries.default)({
     $after: $after,
@@ -108,11 +115,10 @@ function getArgSql(_ref, options) {
   })).call(_context2, function (_ref2) {
     var name = _ref2[0],
         value = _ref2[1];
-    // if ($after) where.push(getBoundCond(orderCols, $after, '$after'));
     if (value) where.push(getBoundCond(orderCols, value, name));
   });
   var orderQuery = $order && (0, _clauses.getJsonBuildObject)({
-    $order: (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_array(", ")"])), (0, _sqlTemplateTag.join)((0, _map.default)($order).call($order, lookup)))
+    $order: (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["", "::jsonb"])), (0, _stringify.default)($order))
   });
   var cursorQuery = (0, _clauses.getJsonBuildObject)({
     $cursor: (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_array(", ")"])), (0, _sqlTemplateTag.join)(orderCols))
@@ -130,7 +136,7 @@ function getArgSql(_ref, options) {
 
 function getBoundCond(orderCols, bound, kind) {
   if (!(0, _isArray.default)(bound)) {
-    throw Error('bad_query bound:' + (0, _stringify.default)(bound));
+    throw Error('pg_arg.bad_query bound : ' + (0, _stringify.default)(bound));
   }
 
   var lhs = orderCols[0];

package/cjs/sql/getMeta.js

@@ -11,13 +11,15 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.getArgMeta = exports.getIdMeta = void 0;
 
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+
 var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteralLoose"));
 
 var _sqlTemplateTag = _interopRequireWildcard(require("sql-template-tag"));
 
 var _clauses = require("./clauses");
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -36,7 +38,9 @@ exports.getIdMeta = getIdMeta;
 var getArgMeta = function getArgMeta(key, prefix, idCol) {
   return (0, _clauses.getJsonBuildObject)({
     $key: key,
-    $ref: (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["array[", ", \"", "\"]"])), (0, _sqlTemplateTag.join)(prefix), (0, _sqlTemplateTag.raw)(idCol)),
+    $ref: (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_array(", ", \"", "\")"])), (0, _sqlTemplateTag.join)((0, _map.default)(prefix).call(prefix, function (k) {
+      return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["", "::text"])), k);
+    })), (0, _sqlTemplateTag.raw)(idCol)),
     $ver: _clauses.nowTimestamp
   });
 };

package/cjs/sql/upsert.js

@@ -48,7 +48,7 @@ function patch(object, arg, options) {
   if (!where || !where.length) throw Error('pg_write.no_condition');
   var row = object; // objectToRow(object, options);
 
-  return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["\n    UPDATE \"", "\" SET ", "\n    WHERE ", "\n    RETURNING (", " || ", ")"])), (0, _sqlTemplateTag.raw)(table), (0, _clauses.getUpdates)(row, options), (0, _sqlTemplateTag.join)(where, " AND "), (0, _clauses.getSelectCols)(table), meta);
+  return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["\n    UPDATE \"", "\" SET ", "\n    WHERE ", "\n    LIMIT 1\n    RETURNING (", " || ", ")"])), (0, _sqlTemplateTag.raw)(table), (0, _clauses.getUpdates)(row, options), (0, _sqlTemplateTag.join)(where, " AND "), (0, _clauses.getSelectCols)(table), meta);
 }
 
 function put(object, arg, options) {

package/cjs/test/setup.js

@@ -3,99 +3,223 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.populate = populate;
+exports.setupPgServer = setupPgServer;
+exports.teardownPgServer = teardownPgServer;
+exports.resetTables = resetTables;
+exports.getPool = getPool;
+
+var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteralLoose"));
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
 
-var _now = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/date/now"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
 
-var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteralLoose"));
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
+var _setTimeout2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set-timeout"));
+
+var _child_process = require("child_process");
+
+var _util = require("util");
 
 var _sqlTemplateTag = _interopRequireDefault(require("sql-template-tag"));
 
-var _templateObject, _templateObject2, _templateObject3;
+var _pg = require("pg");
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+
+var connOptions = {
+  host: 'localhost',
+  port: 15432,
+  user: 'postgres',
+  password: 'graffy',
+  database: 'postgres'
+};
+var pool = null;
+var execFile = (0, _util.promisify)(_child_process.execFile);
+
+var sleep = function sleep(ms) {
+  return new _promise.default(function (res) {
+    return (0, _setTimeout2.default)(res, ms);
+  });
+};
+
+var isPgReady = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var client;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            client = new _pg.Client(connOptions);
+            _context.next = 4;
+            return client.connect();
 
-function populate(_x) {
-  return _populate.apply(this, arguments);
-}
+          case 4:
+            _context.next = 6;
+            return client.end();
+
+          case 6:
+            return _context.abrupt("return", true);
+
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](0);
+            return _context.abrupt("return", false);
 
-function _populate() {
-  _populate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pool) {
-    var insert, _insert;
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 9]]);
+  }));
+
+  return function isPgReady() {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+function setupPgServer() {
+  return _setupPgServer.apply(this, arguments);
+}
 
+function _setupPgServer() {
+  _setupPgServer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            _insert = function _insert3() {
-              _insert = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(type, number, builder) {
-                var i, name, now;
-                return _regenerator.default.wrap(function _callee$(_context) {
-                  while (1) {
-                    switch (_context.prev = _context.next) {
-                      case 0:
-                        if (builder === void 0) {
-                          builder = function builder() {};
-                        }
-
-                        i = 0;
-
-                      case 2:
-                        if (!(i < number)) {
-                          _context.next = 10;
-                          break;
-                        }
-
-                        name = builder(i) || {};
-                        now = (0, _now.default)(); // console.log('Inserting ', type, i);
-
-                        _context.next = 7;
-                        return pool.query((0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["INSERT INTO \"users\" (\n        \"id\", \"name\", \"updatedAt\", \"version\"\n      ) VALUES (\n        ", ",\n        ", ",\n        ", ",\n        ", "\n      );"])), type + i, name, now, now));
-
-                      case 7:
-                        i++;
-                        _context.next = 2;
-                        break;
-
-                      case 10:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }
-                }, _callee);
-              }));
-              return _insert.apply(this, arguments);
-            };
-
-            insert = function _insert2(_x2, _x3, _x4) {
-              return _insert.apply(this, arguments);
-            };
-
-            _context2.next = 4;
-            return pool.query((0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["\n    DROP TABLE IF EXISTS \"users\";\n  "]))));
+            _context2.prev = 0;
+            _context2.next = 3;
+            return execFile('docker', ['run', '-d', '--name', 'graffypg', '-p', connOptions.port + ":5432", '-e', "POSTGRES_PASSWORD=" + connOptions.password, 'postgres:alpine']);
+
+          case 3:
+            _context2.next = 9;
+            break;
+
+          case 5:
+            _context2.prev = 5;
+            _context2.t0 = _context2["catch"](0);
+            // eslint-disable-next-line no-console
+            console.error('Could not start a test Postgres server using Docker.\n' + 'Possible reasons:\n' + '1. You might not have Docker installed.\n' + '2. The last test run might not have exited properly.\n' + '   Run yarn pg:clean to fix this.\n' + 'Docker might have printed a detailed error message above.');
+            throw _context2.t0;
+
+          case 9:
+            _context2.next = 11;
+            return isPgReady(connOptions.port);
+
+          case 11:
+            if (_context2.sent) {
+              _context2.next = 16;
+              break;
+            }
+
+            _context2.next = 14;
+            return sleep(200);
+
+          case 14:
+            _context2.next = 9;
+            break;
+
+          case 16:
+            // console.log('Postgres is up in', Date.now() - start, 'ms');
+            pool = new _pg.Pool(connOptions);
+
+          case 17:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2, null, [[0, 5]]);
+  }));
+  return _setupPgServer.apply(this, arguments);
+}
+
+function teardownPgServer() {
+  return _teardownPgServer.apply(this, arguments);
+}
+
+function _teardownPgServer() {
+  _teardownPgServer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!pool) {
+              _context3.next = 4;
+              break;
+            }
+
+            _context3.next = 3;
+            return pool.end();
+
+          case 3:
+            pool = null;
+
+          case 4:
+            _context3.next = 6;
+            return execFile('docker', ['rm', '-f', 'graffypg']);
+
+          case 6:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _teardownPgServer.apply(this, arguments);
+}
+
+function resetTables() {
+  return _resetTables.apply(this, arguments);
+}
+
+function _resetTables() {
+  _resetTables = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+    return _regenerator.default.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            if (pool) {
+              _context4.next = 2;
+              break;
+            }
+
+            throw Error('No pool; Did not setup PG or already torn down.');
+
+          case 2:
+            _context4.next = 4;
+            return pool.query((0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["\n    CREATE EXTENSION IF NOT EXISTS \"pgcrypto\"\n  "]))));
 
           case 4:
-            _context2.next = 6;
-            return pool.query((0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["\n    CREATE TABLE \"users\" (\n      \"id\" text PRIMARY KEY,\n      \"name\" text,\n      \"updatedAt\" int8 NOT NULL,\n      \"version\" int8 NOT NULL\n    );\n  "]))));
+            _context4.next = 6;
+            return pool.query((0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["\n    DROP TABLE IF EXISTS \"users\";\n  "]))));
 
           case 6:
-            _context2.next = 8;
-            return insert('user', 5, function (i) {
-              return "name_" + i;
-            });
+            _context4.next = 8;
+            return pool.query((0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["\n    CREATE UNLOGGED TABLE \"users\" (\n      \"id\" uuid DEFAULT gen_random_uuid() PRIMARY KEY,\n      \"name\" text,\n      \"settings\" jsonb,\n      \"email\" text UNIQUE,\n      \"version\" int8 NOT NULL\n    );\n  "]))));
 
           case 8:
-            _context2.next = 10;
-            return pool.end();
+            _context4.next = 10;
+            return pool.query((0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["\n    DROP TABLE IF EXISTS \"posts\";\n  "]))));
 
           case 10:
+            _context4.next = 12;
+            return pool.query((0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["\n    CREATE UNLOGGED TABLE \"posts\" (\n      \"id\" uuid DEFAULT gen_random_uuid() PRIMARY KEY,\n      \"title\" text,\n      \"authorId\" text,\n      \"version\" int8 NOT NULL\n    );\n  "]))));
+
+          case 12:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
       }
-    }, _callee2);
+    }, _callee4);
   }));
-  return _populate.apply(this, arguments);
+  return _resetTables.apply(this, arguments);
+}
+
+function getPool() {
+  if (!pool) throw Error('No pool; Did not setup PG or already torn down.');
+  return pool;
 }

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.7",
+  "version": "0.15.8-alpha.1",
   "main": "./cjs/index.js",
   "types": "./types/index.d.ts",
   "repository": {
@@ -13,9 +13,9 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.15.3",
     "pg": "^8.7.1",
-    "@graffy/common": "0.15.7",
+    "@graffy/common": "0.15.8-alpha.1",
     "debug": "^4.3.2",
     "sql-template-tag": "^4.0.0",
-    "@graffy/testing": "0.15.7"
+    "@graffy/testing": "0.15.8-alpha.1"
   }
 }

package/types/Db.d.ts

@@ -1,9 +1,9 @@
 export default class Db {
     constructor(connection: any);
     client: any;
-    query(sqlQuery: any): Promise<any>;
+    query(sql: any): Promise<any>;
     readSql(sql: any): Promise<any>;
     writeSql(sql: any): Promise<any>;
     read(rootQuery: any, tableOptions: any): Promise<any>;
-    write(rootChange: any, tableOptions: any): Promise<any>;
+    write(rootChange: any, tableOptions: any): Promise<any[]>;
 }

package/types/index.d.ts

@@ -1,7 +1,7 @@
 export function pg({ table, idCol, verCol, links, connection }: {
-    table: any;
-    idCol: any;
-    verCol: any;
-    links: any;
-    connection: any;
+    table?: string;
+    idCol?: string;
+    verCol?: string;
+    links?: object;
+    connection?: any;
 }): (store: any) => void;

package/types/sql/getArgSql.d.ts

@@ -7,7 +7,7 @@
   @typedef { import('sql-template-tag').Sql } Sql
   @return {{ meta: Sql, where: Sql[], order?: Sql, limit: number }}
 */
-export default function getArgSql({ $first, $last, $after, $before, $since, $until, $cursor: _, ...rest }: object, options: object): {
+export default function getArgSql({ $first, $last, $after, $before, $since, $until, $all, $cursor: _, ...rest }: object, options: object): {
     meta: Sql;
     where: Sql[];
     order?: Sql;