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

package/cjs/sql/getArgSql.js

@@ -11,76 +11,54 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = getArgSql;
 
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutPropertiesLoose"));
-
 var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteralLoose"));
 
-var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
+var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
 
-var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
 
-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 _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 
+var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
+
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutPropertiesLoose"));
+
 var _sqlTemplateTag = _interopRequireWildcard(require("sql-template-tag"));
 
 var _common = require("@graffy/common");
 
 var _index = require("../filter/index.js");
 
-var _excluded = ["$first", "$last", "$after", "$before", "$since", "$until", "$cursor"],
-    _excluded2 = ["$order"];
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17;
+var _getMeta = require("./getMeta");
 
-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 _clauses = require("./clauses.js");
 
-function getBoundCond(orderCols, bound, kind) {
-  if (!(0, _isArray.default)(bound)) {
-    throw Error('bad_query bound:' + (0, _stringify.default)(bound));
-  }
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15;
 
-  var lhs = orderCols[0];
-  var rhs = bound[0];
-
-  if (orderCols.length > 1 && bound.length > 1) {
-    var subCond = getBoundCond((0, _slice.default)(orderCols).call(orderCols, 1), (0, _slice.default)(bound).call(bound, 1), kind);
-
-    switch (kind) {
-      case '$after':
-      case '$since':
-        return (0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", " OR ", " = ", " AND (", ")"])), lhs, rhs, lhs, rhs, subCond);
+var _excluded = ["$first", "$last", "$after", "$before", "$since", "$until", "$all", "$cursor"],
+    _excluded2 = ["$order"];
 
-      case '$before':
-      case '$until':
-        return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", " OR ", " = ", " AND (", ")"])), lhs, rhs, lhs, rhs, subCond);
-    }
-  } else {
-    switch (kind) {
-      case '$after':
-        return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", ""])), lhs, rhs);
+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); }
 
-      case '$since':
-        return (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["", " >= ", ""])), lhs, rhs);
+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; }
 
-      case '$before':
-        return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", ""])), lhs, rhs);
+/**
+  Uses the args object (typically passed in the $key attribute)
 
-      case '$until':
-        return (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["", " <= ", ""])), lhs, rhs);
-    }
-  }
-}
+  @param {object} args
+  @param {object} options
 
+  @typedef { import('sql-template-tag').Sql } Sql
+  @return {{ meta: Sql, where: Sql[], order?: Sql, limit: number }}
+*/
 function getArgSql(_ref, options) {
-  var _context2, _context3;
+  var _context, _context2, _context3;
 
   var $first = _ref.$first,
       $last = _ref.$last,
@@ -88,73 +66,109 @@ 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,
       filter = (0, _objectWithoutPropertiesLoose2.default)(rest, _excluded2);
-  var args = options.args,
-      prefix = options.prefix;
-
-  var lookupExpr = function lookupExpr(prefix, suffix) {
-    var _context;
-
-    if (suffix === void 0) {
-      suffix = [];
-    }
-
-    var _args$prefix = args[prefix],
-        role = _args$prefix.role,
-        name = _args$prefix.name;
-    return role === 'gin' ? (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" #>> '{\"", "\"}'"])), (0, _sqlTemplateTag.raw)(name), (0, _concat.default)(_context = [prefix]).call(_context, suffix).join('","')) : suffix.length ? (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" #>> '{\"", "\"}'"])), (0, _sqlTemplateTag.raw)(name), suffix.join('","')) : (0, _sqlTemplateTag.default)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\""])), (0, _sqlTemplateTag.raw)(name));
-  };
+  var prefix = options.prefix,
+      idCol = options.idCol;
 
   var lookup = function lookup(prop) {
-    // Fast path for the direct arg lookup case.
-    if (args[prop]) return lookupExpr(prop);
-    var propArray = (0, _common.encodePath)(prop);
-    var suffix = [];
-
-    while (propArray.length) {
-      suffix.unshift(propArray.pop());
-      var propPrefix = propArray.join('.');
-      if (args[propPrefix]) return lookupExpr(propPrefix, suffix);
-    }
+    var _encodePath = (0, _common.encodePath)(prop),
+        prefix = _encodePath[0],
+        suffix = (0, _slice.default)(_encodePath).call(_encodePath, 1);
 
-    throw Error('pg.unknown_arg:' + prop);
+    return suffix.length ? (0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" #>> '{\"", "\"}'"])), (0, _sqlTemplateTag.raw)(prefix), suffix.join('","')) : (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\""])), (0, _sqlTemplateTag.raw)(prefix));
   };
 
-  var attrs = function attrs(key) {
-    return (0, _sqlTemplateTag.default)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_object(\n    '$key', ", ",\n    '$ref', array[", ", \"", "\"],\n    '$ver', now()\n  )"])), key, (0, _sqlTemplateTag.join)(prefix), (0, _sqlTemplateTag.raw)(options.idCol));
+  var meta = function meta(key) {
+    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 = [];
 
   if (!(0, _common.isEmpty)(filter)) {
     where.push((0, _index.getFilterSql)(filter, lookup));
-    key = (0, _sqlTemplateTag.default)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["", "::jsonb"])), (0, _stringify.default)(filter));
+    key = (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["", "::jsonb"])), (0, _stringify.default)(filter));
   }
 
   if (!hasRangeArg) return {
-    attrs: attrs(key),
+    meta: meta(key),
     where: where,
     limit: 1
   };
-  var orderCols = (0, _map.default)(_context2 = $order || [options.idCol]).call(_context2, lookup);
-  if ($after) where.push(getBoundCond(orderCols, $after, '$after'));
-  if ($before) where.push(getBoundCond(orderCols, $before, '$before'));
-  if ($since) where.push(getBoundCond(orderCols, $since, '$since'));
-  if ($until) where.push(getBoundCond(orderCols, $until, '$until'));
-  key = (0, _sqlTemplateTag.default)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _filter.default)(_context3 = [key, $order && (0, _sqlTemplateTag.default)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_object('$order', jsonb_build_array(", "))"])), (0, _sqlTemplateTag.join)($order)), (0, _sqlTemplateTag.default)(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_object('$cursor', jsonb_build_array(", "))"])), (0, _sqlTemplateTag.join)(orderCols))]).call(_context3, Boolean), " || "));
+
+  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,
+    $before: $before,
+    $since: $since,
+    $until: $until
+  })).call(_context2, function (_ref2) {
+    var name = _ref2[0],
+        value = _ref2[1];
+    if (value) where.push(getBoundCond(orderCols, value, name));
+  });
+  var orderQuery = $order && (0, _clauses.getJsonBuildObject)({
+    $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))
+  });
+  key = (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["(", ")"])), (0, _sqlTemplateTag.join)((0, _filter.default)(_context3 = [key, orderQuery, cursorQuery]).call(_context3, Boolean), " || "));
   return {
-    attrs: attrs(key),
+    meta: meta(key),
     where: where,
     order: (0, _sqlTemplateTag.join)((0, _map.default)(orderCols).call(orderCols, function (col) {
-      return (0, _sqlTemplateTag.default)(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteralLoose2.default)(["", " ", ""])), col, $last ? (0, _sqlTemplateTag.default)(_templateObject16 || (_templateObject16 = (0, _taggedTemplateLiteralLoose2.default)(["DESC"]))) : (0, _sqlTemplateTag.default)(_templateObject17 || (_templateObject17 = (0, _taggedTemplateLiteralLoose2.default)(["ASC"]))));
+      return (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["", " ", ""])), col, $last ? (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["DESC"]))) : (0, _sqlTemplateTag.default)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteralLoose2.default)(["ASC"]))));
     }), ", "),
     limit: $first || $last
   };
 }
 
+function getBoundCond(orderCols, bound, kind) {
+  if (!(0, _isArray.default)(bound)) {
+    throw Error('pg_arg.bad_query bound : ' + (0, _stringify.default)(bound));
+  }
+
+  var lhs = orderCols[0];
+  var rhs = bound[0];
+
+  if (orderCols.length > 1 && bound.length > 1) {
+    var subCond = getBoundCond((0, _slice.default)(orderCols).call(orderCols, 1), (0, _slice.default)(bound).call(bound, 1), kind);
+
+    switch (kind) {
+      case '$after':
+      case '$since':
+        return (0, _sqlTemplateTag.default)(_templateObject10 || (_templateObject10 = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", " OR ", " = ", " AND (", ")"])), lhs, rhs, lhs, rhs, subCond);
+
+      case '$before':
+      case '$until':
+        return (0, _sqlTemplateTag.default)(_templateObject11 || (_templateObject11 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", " OR ", " = ", " AND (", ")"])), lhs, rhs, lhs, rhs, subCond);
+    }
+  } else {
+    switch (kind) {
+      case '$after':
+        return (0, _sqlTemplateTag.default)(_templateObject12 || (_templateObject12 = (0, _taggedTemplateLiteralLoose2.default)(["", " > ", ""])), lhs, rhs);
+
+      case '$since':
+        return (0, _sqlTemplateTag.default)(_templateObject13 || (_templateObject13 = (0, _taggedTemplateLiteralLoose2.default)(["", " >= ", ""])), lhs, rhs);
+
+      case '$before':
+        return (0, _sqlTemplateTag.default)(_templateObject14 || (_templateObject14 = (0, _taggedTemplateLiteralLoose2.default)(["", " < ", ""])), lhs, rhs);
+
+      case '$until':
+        return (0, _sqlTemplateTag.default)(_templateObject15 || (_templateObject15 = (0, _taggedTemplateLiteralLoose2.default)(["", " <= ", ""])), lhs, rhs);
+    }
+  }
+}
+
 module.exports = exports.default;

package/cjs/sql/{getIdMeta.js → getMeta.js}

@@ -9,22 +9,40 @@ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-s
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 
 exports.__esModule = true;
-exports.default = void 0;
+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 _templateObject;
+var _clauses = require("./clauses");
+
+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); }
 
 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 _default = function _default(_ref) {
+var getIdMeta = function getIdMeta(_ref) {
   var idCol = _ref.idCol;
-  return (0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["jsonb_build_object('$key', \"", "\", '$ver', now())"])), (0, _sqlTemplateTag.raw)(idCol));
+  return (0, _clauses.getJsonBuildObject)({
+    $key: (0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\""])), (0, _sqlTemplateTag.raw)(idCol)),
+    $ver: _clauses.nowTimestamp
+  });
+};
+
+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)(["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
+  });
 };
 
-exports.default = _default;
-module.exports = exports.default;
+exports.getArgMeta = getArgMeta;

package/cjs/sql/select.js

@@ -11,7 +11,6 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.selectByArgs = selectByArgs;
 exports.selectByIds = selectByIds;
-exports.selectUpdatedSince = selectUpdatedSince;
 
 var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteralLoose"));
 
@@ -19,47 +18,33 @@ var _sqlTemplateTag = _interopRequireWildcard(require("sql-template-tag"));
 
 var _getArgSql2 = _interopRequireDefault(require("./getArgSql.js"));
 
-var _getIdMeta = _interopRequireDefault(require("./getIdMeta.js"));
+var _getMeta = require("./getMeta.js");
 
-var _getSelectCols = _interopRequireDefault(require("./getSelectCols.js"));
+var _clauses = require("./clauses.js");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 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; }
 
-// import debug from 'debug';
-// const log = debug('graffy:pg:select');
 var MAX_LIMIT = 4096;
 
-function selectByArgs(args, options, _temp) {
-  var _ref = _temp === void 0 ? {} : _temp,
-      forUpdate = _ref.forUpdate;
-
+function selectByArgs(args, options) {
   var table = options.table;
 
   var _getArgSql = (0, _getArgSql2.default)(args, options),
       where = _getArgSql.where,
       order = _getArgSql.order,
       limit = _getArgSql.limit,
-      attrs = _getArgSql.attrs;
+      meta = _getArgSql.meta;
 
-  var clampedLimit = forUpdate ? 1 : Math.min(MAX_LIMIT, Math.max(0, limit || 0));
-  return (0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["\n    SELECT\n    ", " || ", "\n    FROM \"", "\"\n    ", "\n    ", "\n    LIMIT ", "\n    ", "\n  "])), (0, _getSelectCols.default)(options), attrs, (0, _sqlTemplateTag.raw)(table), where.length ? (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["WHERE ", ""])), (0, _sqlTemplateTag.join)(where, " AND ")) : _sqlTemplateTag.empty, order ? (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["ORDER BY ", ""])), order) : _sqlTemplateTag.empty, clampedLimit, forUpdate ? (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["FOR UPDATE"]))) : _sqlTemplateTag.empty);
+  var clampedLimit = Math.min(MAX_LIMIT, limit || MAX_LIMIT);
+  return (0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["\n    SELECT\n    ", " || ", "\n    FROM \"", "\"\n    ", "\n    ", "\n    LIMIT ", "\n  "])), (0, _clauses.getSelectCols)(table), meta, (0, _sqlTemplateTag.raw)(table), where.length ? (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["WHERE ", ""])), (0, _sqlTemplateTag.join)(where, " AND ")) : _sqlTemplateTag.empty, order ? (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["ORDER BY ", ""])), order) : _sqlTemplateTag.empty, clampedLimit);
 }
 
-function selectByIds(ids, options, _temp2) {
-  var _ref2 = _temp2 === void 0 ? {} : _temp2,
-      forUpdate = _ref2.forUpdate;
-
+function selectByIds(ids, options) {
   var table = options.table,
       idCol = options.idCol;
-  return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["\n    SELECT\n    ", " || ", "\n    FROM \"", "\"\n    WHERE \"", "\" IN (", ")\n    ", "\n  "])), (0, _getSelectCols.default)(options), (0, _getIdMeta.default)(options), (0, _sqlTemplateTag.raw)(table), (0, _sqlTemplateTag.raw)(idCol), (0, _sqlTemplateTag.join)(ids), forUpdate ? (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["FOR UPDATE"]))) : _sqlTemplateTag.empty);
-}
-
-function selectUpdatedSince(version, options) {
-  var table = options.table,
-      verCol = options.verCol;
-  return (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["\n    SELECT ", " || ", "\n    FROM \"", "\"\n    WHERE \"", "\" > ", "\n    LIMIT ", "\n  "])), (0, _getSelectCols.default)(options), (0, _getIdMeta.default)(options), (0, _sqlTemplateTag.raw)(table), (0, _sqlTemplateTag.raw)(verCol), version, MAX_LIMIT);
+  return (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["\n    SELECT\n    ", " || ", "\n    FROM \"", "\"\n    WHERE \"", "\" IN (", ")\n  "])), (0, _clauses.getSelectCols)(table), (0, _getMeta.getIdMeta)(options), (0, _sqlTemplateTag.raw)(table), (0, _sqlTemplateTag.raw)(idCol), (0, _sqlTemplateTag.join)(ids));
 }

package/cjs/sql/upsert.js

@@ -1,17 +1,5 @@
 "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 _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
@@ -28,16 +16,6 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
-var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
-
-var _now = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/date/now"));
-
-var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
-var _entries = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/entries"));
-
 var _taggedTemplateLiteralLoose2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/taggedTemplateLiteralLoose"));
 
 var _sqlTemplateTag = _interopRequireWildcard(require("sql-template-tag"));
@@ -46,172 +24,57 @@ var _common = require("@graffy/common");
 
 var _getArgSql2 = _interopRequireDefault(require("./getArgSql.js"));
 
-var _getIdMeta = _interopRequireDefault(require("./getIdMeta.js"));
+var _getMeta = require("./getMeta.js");
 
-var _getSelectCols = _interopRequireDefault(require("./getSelectCols.js"));
+var _clauses = require("./clauses.js");
 
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
 
 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; }
 
-function _createForOfIteratorHelperLoose(o, allowArrayLike) { var _context9; var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (it) return _bindInstanceProperty(_context9 = (it = it.call(o)).next).call(_context9, 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 _context8; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context8 = Object.prototype.toString.call(o)).call(_context8, 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; }
-
 function patch(object, arg, options) {
   var table = options.table,
       idCol = options.idCol;
 
   var _ref = (0, _common.isPlainObject)(arg) ? (0, _getArgSql2.default)(arg, options) : {
     where: [(0, _sqlTemplateTag.default)(_templateObject || (_templateObject = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" = ", ""])), (0, _sqlTemplateTag.raw)(idCol), arg)],
-    attrs: (0, _getIdMeta.default)(options)
+    meta: (0, _getMeta.getIdMeta)(options)
   },
       where = _ref.where,
-      attrs = _ref.attrs;
+      meta = _ref.meta;
 
   if (!where || !where.length) throw Error('pg_write.no_condition');
-  var row = objectToRow(object, options);
-  return (0, _sqlTemplateTag.default)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteralLoose2.default)(["\n    UPDATE \"", "\" SET ", "\n    WHERE ", "\n    RETURNING (", " || ", ")"])), (0, _sqlTemplateTag.raw)(table), getUpdates(row, options), (0, _sqlTemplateTag.join)(where, " AND "), (0, _getSelectCols.default)(options), attrs);
+  var row = object; // objectToRow(object, options);
+
+  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) {
   var idCol = options.idCol,
-      table = options.table,
-      props = options.props;
-  var row = objectToRow(object, options);
+      table = options.table;
+  var row = object; // objectToRow(object, options);
+
   var meta, conflictTarget;
 
   if ((0, _common.isPlainObject)(arg)) {
     var _context;
 
-    var _getArgSql = (0, _getArgSql2.default)(arg),
-        attrs = _getArgSql.attrs;
-
-    meta = attrs;
-    conflictTarget = (0, _sqlTemplateTag.join)((0, _map.default)(_context = (0, _keys.default)(arg)).call(_context, function (prop) {
-      var _props$prop;
+    var _getArgSql = (0, _getArgSql2.default)(arg, options);
 
-      var col = (_props$prop = props[prop]) == null ? void 0 : _props$prop.data;
-      if (!col) throw Error('pg_write.bad_put_prop:' + prop);
+    meta = _getArgSql.meta;
+    conflictTarget = (0, _sqlTemplateTag.join)((0, _map.default)(_context = (0, _keys.default)(arg)).call(_context, function (col) {
       return (0, _sqlTemplateTag.default)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\""])), (0, _sqlTemplateTag.raw)(col));
     }));
   } else {
-    meta = (0, _getIdMeta.default)(options);
+    meta = (0, _getMeta.getIdMeta)(options);
     conflictTarget = (0, _sqlTemplateTag.default)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\""])), (0, _sqlTemplateTag.raw)(idCol));
   }
 
-  return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["\n    INSERT INTO \"", "\" (", ")\n    VALUES (", ")\n    ON CONFLICT (", ") DO UPDATE SET\n    (", ") = (", ")\n    RETURNING (", " || ", ")"])), (0, _sqlTemplateTag.raw)(table), getCols(row, options), getVals(row, options), conflictTarget, getCols(row, options), getVals(row, options), (0, _getSelectCols.default)(options), meta);
-}
-
-function objectToRow(object, _ref2) {
-  var props = _ref2.props,
-      defCol = _ref2.defCol;
-  var row = {};
-  var defVal = defCol ? clean(object, false) : {};
-
-  for (var prop in props) {
-    var _props$prop2 = props[prop],
-        data = _props$prop2.data,
-        gin = _props$prop2.gin,
-        tsv = _props$prop2.tsv,
-        trgm = _props$prop2.trgm;
-    var path = (0, _common.encodePath)(prop);
-    var value = (0, _common.unwrapObject)(object, path);
-    if (typeof value === 'undefined') continue;
-
-    if (data) {
-      row[data] = clean(value, false); // Delete this path from the default object
-
-      if (defCol) (0, _common.mergeObject)(defVal, (0, _common.wrapObject)(null, path));
-    }
-
-    if (gin) {
-      for (var _iterator = _createForOfIteratorHelperLoose(gin), _step; !(_step = _iterator()).done;) {
-        var col = _step.value;
-        row[col] = row[col] || {};
-        row[col][prop] = clean(value, true);
-      }
-    }
-
-    if (tsv) {
-      for (var _iterator2 = _createForOfIteratorHelperLoose(tsv), _step2; !(_step2 = _iterator2()).done;) {
-        var _col = _step2.value;
-        row[_col] = row[_col] || [];
-
-        row[_col].push(value);
-      }
-    }
-
-    if (trgm) {
-      for (var _iterator3 = _createForOfIteratorHelperLoose(trgm), _step3; !(_step3 = _iterator3()).done;) {
-        var _col2 = _step3.value;
-        row[_col2] = row[_col2] || [];
-
-        row[_col2].push(value);
-      }
-    }
-  }
-
-  if (defCol) row[defCol] = defVal;
-  return row;
-}
-
-function clean(object, forLookup) {
-  if (typeof object !== 'object' || !object) {
-    return object;
-  }
-
-  var clone = {};
-
-  for (var prop in object) {
-    switch (prop) {
-      case '$key':
-      case '$put':
-      case '$ref':
-        continue;
-
-      case '$val':
-        if (forLookup) return object[prop];
-        clone[prop] = object[prop];
-        continue;
-    }
-
-    var value = clean(object[prop]);
-    if (value === null) continue;
-    clone[prop] = value;
-  }
-
-  return (0, _common.isEmpty)(clone) ? null : clone;
-}
-
-function getCols(row, options) {
-  var _context2, _context3;
-
-  return (0, _sqlTemplateTag.join)((0, _concat.default)(_context2 = (0, _map.default)(_context3 = (0, _keys.default)(row)).call(_context3, function (col) {
-    return (0, _sqlTemplateTag.raw)("\"" + col + "\"");
-  })).call(_context2, (0, _sqlTemplateTag.raw)("\"" + options.verCol + "\"")), ', ');
-}
-
-function getVals(row, _options) {
-  var _context4;
-
-  return (0, _sqlTemplateTag.join)((0, _concat.default)(_context4 = (0, _values.default)(row)).call(_context4, (0, _now.default)()), ', ');
-}
+  var _getInsert = (0, _clauses.getInsert)(row, options),
+      cols = _getInsert.cols,
+      vals = _getInsert.vals;
 
-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 (_ref3) {
-    var name = _ref3[0];
-    return name !== options.idCol;
-  })).call(_context6, function (_ref4) {
-    var name = _ref4[0],
-        value = _ref4[1];
-    var updater = options.updaters[name];
-    return (0, _sqlTemplateTag.default)(_templateObject6 || (_templateObject6 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" = ", ""])), (0, _sqlTemplateTag.raw)(name), updater === '||' ? (0, _sqlTemplateTag.default)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" || ", ""])), (0, _sqlTemplateTag.raw)(name), value) : updater ? (0, _sqlTemplateTag.default)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteralLoose2.default)(["", "(\"", "\", ", ")"])), (0, _sqlTemplateTag.raw)(updater), (0, _sqlTemplateTag.raw)(name), value) : value);
-  })).call(_context5, (0, _sqlTemplateTag.default)(_templateObject9 || (_templateObject9 = (0, _taggedTemplateLiteralLoose2.default)(["\"", "\" = now()"])), (0, _sqlTemplateTag.raw)(options.verCol))), ', ');
+  return (0, _sqlTemplateTag.default)(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteralLoose2.default)(["\n    INSERT INTO \"", "\" (", ") VALUES (", ")\n    ON CONFLICT (", ") DO UPDATE SET (", ") = (", ")\n    RETURNING (", " || ", ")"])), (0, _sqlTemplateTag.raw)(table), cols, vals, conflictTarget, cols, vals, (0, _clauses.getSelectCols)(table), meta);
 }

package/cjs/{sql → test}/expectSql.js

@@ -9,6 +9,7 @@ var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 
 var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/values"));
 
+/** @var {function} expect */
 function expectSql(actual, expected) {
   var normalSql = function normalSql(str) {
     var _context;