@graffy/pg 0.15.6-alpha.1 → 0.15.8-alpha.2

package/cjs/index.js

@@ -1,187 +1,78 @@
 "use strict";
 
-var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
-
-var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
-
-var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
-
-var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
-
-var _bindInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/bind");
-
-var _Array$isArray = require("@babel/runtime-corejs3/core-js-stable/array/is-array");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
-
-var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
-
-var _now = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/date/now"));
-
-var _setInterval2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set-interval"));
-
-var _index = require("./sql/index.js");
-
-var _index2 = require("./filter/index.js");
-
-var _options = _interopRequireDefault(require("./options.js"));
-
-var _common = require("@graffy/common");
-
-var _stream = require("@graffy/stream");
-
-var _dbRead = _interopRequireDefault(require("./dbRead.js"));
-
-var _dbWrite = _interopRequireDefault(require("./dbWrite.js"));
-
-var _pool = _interopRequireDefault(require("./pool.js"));
-
-function _createForOfIteratorHelperLoose(o, allowArrayLike) { var _context4; var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (it) return _bindInstanceProperty(_context4 = (it = it.call(o)).next).call(_context4, 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 _context3; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context3 = Object.prototype.toString.call(o)).call(_context3, 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; }
-
-// import debug from 'debug';
-// const log = debug('graffy:pg:index');
-// import { format } from '@graffy/testing';
-var _default = function _default(opts) {
-  if (opts === void 0) {
-    opts = {};
-  }
-
+exports.pg = void 0;
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutPropertiesLoose"));
+
+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,
+      verCol = _ref.verCol,
+      links = _ref.links,
+      connection = _ref.connection;
   return function (store) {
     store.on('read', read);
-    store.on('write', write);
-    store.on('watch', watch);
-    var pgOptions = (0, _options.default)(store.path, opts);
-    var watchers = new _set.default();
-    var timestamp = (0, _now.default)();
-
-    function poll() {
-      return _poll.apply(this, arguments);
-    }
-
-    function _poll() {
-      _poll = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var res, _iterator, _step, _step$value, object, _iterator2, _step2, _step2$value, query, push, payload, _iterator3, _step3, node, args;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (watchers.size) {
-                  _context.next = 2;
-                  break;
-                }
-
-                return _context.abrupt("return");
-
-              case 2:
-                _context.next = 4;
-                return (0, _index.readSql)((0, _index.selectUpdatedSince)(timestamp, pgOptions), _pool.default);
-
-              case 4:
-                res = _context.sent;
-
-                for (_iterator = _createForOfIteratorHelperLoose(res); !(_step = _iterator()).done;) {
-                  _step$value = _step.value, object = _step$value[0];
-
-                  for (_iterator2 = _createForOfIteratorHelperLoose(watchers); !(_step2 = _iterator2()).done;) {
-                    _step2$value = _step2.value, query = _step2$value.query, push = _step2$value.push;
-                    payload = [];
-
-                    for (_iterator3 = _createForOfIteratorHelperLoose(query); !(_step3 = _iterator3()).done;) {
-                      node = _step3.value;
-                      args = (0, _common.decodeArgs)(node);
-
-                      if ((0, _common.isPlainObject)(args)) {
-                        if ((0, _index2.filterObject)(args, object)) payload.push(object);
-                      } else {
-                        if (object.id === node.key) payload.push(object);
-                      }
-                    }
-
-                    push((0, _common.wrap)((0, _sliceInstanceProperty(_common))((0, _common.encodeGraph)(payload), query).known, store.path));
-                  }
-                }
-
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-      return _poll.apply(this, arguments);
-    }
-
-    (0, _setInterval2.default)(poll, pgOptions.pollInterval);
-
-    function read(query) {
-      return (0, _dbRead.default)(query, pgOptions, store); // log(format(rootQuery));
-      // const query = unwrap(rootQuery, store.path);
-      // const result = await dbRead(query, pgOptions);
-      // const rootResult = slice(
-      //   finalize(encodeGraph(wrapObject(result, store.path)), rootQuery),
-      //   rootQuery,
-      // ).known;
-      // log(format(rootResult));
-      // return rootResult;
-    }
-
-    function write(_x) {
-      return _write.apply(this, arguments);
+    store.on('write', write); // TODO: Make the defaults smarter using introspection.
+
+    var prefix = store.path;
+    var tableOpts = {
+      prefix: prefix,
+      table: table || prefix[prefix.length - 1] || 'default',
+      idCol: idCol || 'id',
+      verCol: verCol || 'updatedAt',
+      links: links || {}
+    };
+    var defaultDb = new _Db.default(connection);
+
+    function read(query, options) {
+      var _options$transactionD = options.transactionDb,
+          transactionDb = _options$transactionD === void 0 ? defaultDb : _options$transactionD,
+          readOpts = (0, _objectWithoutPropertiesLoose2.default)(options, _excluded);
+      return transactionDb.read(query, tableOpts, readOpts);
     }
 
-    function _write() {
-      _write = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(change) {
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                change = (0, _common.unwrap)(change, store.path);
-                _context2.next = 3;
-                return (0, _dbWrite.default)(change, pgOptions);
-
-              case 3:
-                return _context2.abrupt("return", (0, _common.wrap)(change, store.path));
-
-              case 4:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }));
-      return _write.apply(this, arguments);
-    }
-
-    function watch(query) {
-      query = (0, _common.unwrap)(query, store.path);
-      return (0, _stream.makeStream)(function (push) {
-        var watcher = {
-          query: query,
-          push: push
-        };
-        (0, _dbRead.default)(query, pgOptions).then(function (init) {
-          push((0, _common.wrap)((0, _common.finalize)((0, _common.encodeGraph)(init), query), store.path));
-          watchers.add(watcher);
-        });
-        return function () {
-          return watchers.delete(watcher);
-        };
-      });
+    function write(change, options) {
+      var _options$transactionD2 = options.transactionDb,
+          transactionDb = _options$transactionD2 === void 0 ? defaultDb : _options$transactionD2,
+          writeOpts = (0, _objectWithoutPropertiesLoose2.default)(options, _excluded2);
+      return transactionDb.write(change, tableOpts, writeOpts);
     }
   };
 };
+/*
+  TODO: Uncomment and test in another PR.
+  
+  export const transaction = ({ connection }) => {
+    store.on('write', (change, options, next) => {
+      const client = await pool.connect();
+      await client.query('BEGIN');
+      const transactionDb = new Db(client);
+
+      nextOptions = { ...options, transactionDb };
+      try {
+        const response = await next(change, nextOptions);
+        await client.query('COMMIT');
+      } catch (e) {
+        await client.query('ROLLBACK')
+      } finally {
+        await client.release();
+      }
+    })
+  }
+*/
+
 
-exports.default = _default;
-module.exports = exports.default;
+exports.pg = pg;

package/cjs/link/index.js

@@ -16,7 +16,6 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 
 exports.__esModule = true;
 exports.linkResult = linkResult;
-exports.linkChange = linkChange;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
@@ -30,8 +29,6 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
 
-var _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some"));
-
 var _common = require("@graffy/common");
 
 var _testing = require("@graffy/testing");
@@ -132,48 +129,4 @@ function linkResult(objects, query, _ref) {
 
   log('Linked Result', (0, _stringify.default)(objects, null, 2), (0, _testing.format)(refQueries));
   return refQueries;
-}
-
-function linkChange(object, _ref2) {
-  var linkSpecs = _ref2.links;
-
-  for (var linkProp in linkSpecs) {
-    var _linkSpecs$linkProp = linkSpecs[linkProp],
-        target = _linkSpecs$linkProp.target,
-        prop = _linkSpecs$linkProp.prop,
-        back = _linkSpecs$linkProp.back;
-    if (back) continue;
-    var targetPath = (0, _common.encodePath)(target);
-    var linkPath = (0, _common.encodePath)(linkProp);
-    var idPath = (0, _common.encodePath)(prop);
-    var link = (0, _common.unwrapObject)(object, linkPath);
-
-    if (link) {
-      var _ret = function () {
-        // Remove the link from the object; we don't write it.
-        (0, _common.mergeObject)(object, (0, _common.wrapObject)(null, linkPath)); // If the prop of this link is alread present, do nothing more.
-
-        if ((0, _common.unwrapObject)(object, idPath) !== undefined) return "continue";
-
-        if (!link.$ref) {
-          throw Error("pg_write.missing_ref: " + linkPath.join('.') + " " + (0, _stringify.default)(link));
-        }
-
-        var ref = (0, _common.encodePath)(link.$ref);
-
-        if (ref.length !== targetPath.length + 1 || (0, _some.default)(targetPath).call(targetPath, function (tkey, i) {
-          return ref[i] !== tkey;
-        })) {
-          throw Error("pg_write.incompatible_ref: " + linkPath.join('.') + " " + link.$ref + " " + targetPath.join('.'));
-        }
-
-        var value = ref[ref.length - 1];
-        (0, _common.mergeObject)(object, (0, _common.wrapObject)(value, idPath));
-      }();
-
-      if (_ret === "continue") continue;
-    }
-  }
-
-  return object;
 }

package/cjs/sql/clauses.js

@@ -0,0 +1,92 @@
+"use strict";
+
+var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
+
+var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+
+exports.__esModule = true;
+exports.getUpdates = exports.getInsert = exports.getSelectCols = exports.getJsonBuildObject = exports.nowTimestamp = void 0;
+
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+
+var _entries = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/entries"));
+
+var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
+
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+
+var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteralLoose"));
+
+var _sqlTemplateTag = _interopRequireWildcard(require("sql-template-tag"));
+
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
+
+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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var nowTimestamp = (0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["cast(extract(epoch from now()) as integer)"])));
+exports.nowTimestamp = nowTimestamp;
+
+var getJsonBuildObject = function getJsonBuildObject(variadic) {
+  var _context;
+
+  var args = (0, _sqlTemplateTag.join)((0, _map.default)(_context = (0, _entries.default)(variadic)).call(_context, function (_ref) {
+    var name = _ref[0],
+        value = _ref[1];
+    return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["'", "', ", ""])), (0, _sqlTemplateTag.raw)(name), value);
+  }));
+  return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_object(", ")"])), args);
+};
+
+exports.getJsonBuildObject = getJsonBuildObject;
+
+var getSelectCols = function getSelectCols(table) {
+  // TODO: When we have a query object, get only the requested columns.
+  return (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["to_jsonb(\"", "\")"])), (0, _sqlTemplateTag.raw)(table));
+};
+
+exports.getSelectCols = getSelectCols;
+
+var getInsert = function getInsert(row, options) {
+  var _context2, _context3, _context4;
+
+  var cols = [];
+  var vals = [];
+  (0, _forEach.default)(_context2 = (0, _concat.default)(_context3 = (0, _filter.default)(_context4 = (0, _entries.default)(row)).call(_context4, function (_ref2) {
+    var name = _ref2[0];
+    return name !== options.verCol && name[0] !== '$';
+  })).call(_context3, [[options.verCol, nowTimestamp]])).call(_context2, function (_ref3) {
+    var col = _ref3[0],
+        val = _ref3[1];
+    cols.push((0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\""])), (0, _sqlTemplateTag.raw)(col)));
+    vals.push(val);
+  });
+  return {
+    cols: (0, _sqlTemplateTag.join)(cols, ', '),
+    vals: (0, _sqlTemplateTag.join)(vals, ', ')
+  };
+};
+
+exports.getInsert = getInsert;
+
+var getUpdates = function getUpdates(row, options) {
+  var _context5, _context6, _context7;
+
+  return (0, _sqlTemplateTag.join)((0, _concat.default)(_context5 = (0, _map.default)(_context6 = (0, _filter.default)(_context7 = (0, _entries.default)(row)).call(_context7, function (_ref4) {
+    var name = _ref4[0];
+    return name !== options.idCol && name[0] !== '$';
+  })).call(_context6, function (_ref5) {
+    var name = _ref5[0],
+        value = _ref5[1];
+    return (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" = ", ""])), (0, _sqlTemplateTag.raw)(name), typeof value === 'object' && value ? (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" || ", ""])), (0, _sqlTemplateTag.raw)(name), value) : value);
+  })).call(_context5, (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" = ", ""])), (0, _sqlTemplateTag.raw)(options.verCol), nowTimestamp)), ', ');
+};
+
+exports.getUpdates = getUpdates;